commit 6762867dac4c2d948be86f168b32cb3178a8ad68 Author: Adrien Beudin Date: Tue Feb 11 14:56:25 2014 +0100 first commit diff --git a/conf/nginx.conf b/conf/nginx.conf new file mode 100644 index 0000000..ee1a6fa --- /dev/null +++ b/conf/nginx.conf @@ -0,0 +1,16 @@ +location YNH_WWW_PATH { + alias YNH_WWW_ALIAS ; + if ($scheme = http) { + rewrite ^ https://$server_name$request_uri? permanent; + } + index index.php; + try_files $uri $uri/ index.php; + location ~ [^/]\.php(/|$) { + fastcgi_split_path_info ^(.+?\.php)(/.*)$; + fastcgi_pass unix:/var/run/php5-fpm.sock; + fastcgi_index index.php; + include fastcgi_params; + fastcgi_param REMOTE_USER $remote_user; + fastcgi_param PATH_INFO $fastcgi_path_info; + } +} diff --git a/manifest.json b/manifest.json new file mode 100644 index 0000000..4fd46ec --- /dev/null +++ b/manifest.json @@ -0,0 +1,38 @@ +{ + "name": "Dokuwiki", + "id": "dokuwiki", + "description": { + "en": "DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database" + }, + "developer": { + "name": "loklin" + }, + "multi_instance": "false", + "arguments": { + "install" : [ + { + "name": "domain", + "ask": { + "en": "Choose a domain for DokuWiki" + }, + "example": "domain.org" + }, + { + "name": "path", + "ask": { + "en": "Choose a path for DokuWiki" + }, + "example": "/DokuWiki", + "default": "/DokuWiki" + }, + { + "name": "is_public", + "ask": { + "en": "Is it a public DokuWiki site ?" + }, + "choices": ["Yes", "No"], + "default": "Yes" + } + ] + } +} diff --git a/scripts/install b/scripts/install new file mode 100755 index 0000000..38e4362 --- /dev/null +++ b/scripts/install @@ -0,0 +1,40 @@ +#!/bin/bash + +# Retrieve arguments +domain=$1 +path=$2 +is_public=$3 + +# Check domain/path availability +sudo yunohost app checkurl $domain$path -a dokuwiki +if [[ ! $? -eq 0 ]]; then + exit 1 +fi + +# Copy files to the right place +final_path=/var/www/dokuwiki +sudo mkdir -p $final_path +sudo cp -a ../sources/* $final_path + +# Files owned by root, www-data can just read +sudo find $final_path -type f | xargs sudo chmod 644 +sudo find $final_path -type d | xargs sudo chmod 755 +sudo chown -R root: $final_path + +# except for data, data/tmp and lib/plugin, where www-data must have write permissions +sudo chown www-data:root $final_path/{data,data/tmp,lib/plugins/} +sudo chmod 700 $final_path/{data,data/tmp,lib/plugins/} + + +# Modify Nginx configuration file and copy it to Nginx conf directory +sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf +sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf +sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/dokuwiki.conf + +if [ $is_public = "Yes" ]; +then + sudo yunohost app setting dokuwiki skipped_uris -v "/" +fi + +sudo service nginx reload +sudo yunohost app ssowatconf diff --git a/scripts/remove b/scripts/remove new file mode 100755 index 0000000..f4e5625 --- /dev/null +++ b/scripts/remove @@ -0,0 +1,6 @@ +#!/bin/bash + +domain=$(sudo yunohost app setting dokuwiki domain) + +sudo rm -rf /var/www/dokuwiki +sudo rm -f /etc/nginx/conf.d/$domain.d/dokuwiki.conf diff --git a/scripts/upgrade b/scripts/upgrade new file mode 100644 index 0000000..ae7389a --- /dev/null +++ b/scripts/upgrade @@ -0,0 +1,35 @@ +#!/bin/bash + +domain=$(sudo yunohost app setting dokuwiki domain) +path=$(sudo yunohost app setting dokuwiki path) +is_public=$(sudo yunohost app setting dokuwiki is_public) + +# Remove trailing "/" for next commands +path=${path%/} + +# Copy files to the right place +final_path=/var/www/dokuwiki +sudo mkdir -p $final_path +sudo cp -a ../sources/* $final_path + +# Files owned by root, www-data can just read +sudo find $final_path -type f | xargs sudo chmod 644 +sudo find $final_path -type d | xargs sudo chmod 755 +sudo chown -R root: $final_path + +# except for data and tmp subdir, where www-data must have write permissions +sudo chown www-data:root $final_path/{data,data/tmp,lib/plugins/} +sudo chmod 700 $final_path/{data,data/tmp,lib/plugins/} + +# Modify Nginx configuration file and copy it to Nginx conf directory +sed -i "s@YNH_WWW_PATH@$path@g" ../conf/nginx.conf +sed -i "s@YNH_WWW_ALIAS@$final_path/@g" ../conf/nginx.conf +sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/dokuwiki.conf + +if [ $is_public = "Yes" ]; +then + sudo yunohost app setting dokuwiki skipped_uris -v "/" +fi + +sudo service nginx reload +sudo yunohost app ssowatconf diff --git a/sources/.htaccess.dist b/sources/.htaccess.dist new file mode 100644 index 0000000..5724a6e --- /dev/null +++ b/sources/.htaccess.dist @@ -0,0 +1,35 @@ +## Enable this to restrict editing to logged in users only + +## You should disable Indexes and MultiViews either here or in the +## global config. Symlinks maybe needed for URL rewriting. +#Options -Indexes -MultiViews +FollowSymLinks + +## make sure nobody gets the htaccess, README, COPYING or VERSION files + + Order allow,deny + Deny from all + + +## Uncomment these rules if you want to have nice URLs using +## $conf['userewrite'] = 1 - not needed for rewrite mode 2 +#RewriteEngine on +# +#RewriteRule ^_media/(.*) lib/exe/fetch.php?media=$1 [QSA,L] +#RewriteRule ^_detail/(.*) lib/exe/detail.php?media=$1 [QSA,L] +#RewriteRule ^_export/([^/]+)/(.*) doku.php?do=export_$1&id=$2 [QSA,L] +#RewriteRule ^$ doku.php [L] +#RewriteCond %{REQUEST_FILENAME} !-f +#RewriteCond %{REQUEST_FILENAME} !-d +#RewriteRule (.*) doku.php?id=$1 [QSA,L] +#RewriteRule ^index.php$ doku.php +# +## Not all installations will require the following line. If you do, +## change "/dokuwiki" to the path to your dokuwiki directory relative +## to your document root. +#RewriteBase /dokuwiki +# +## If you enable DokuWikis XML-RPC interface, you should consider to +## restrict access to it over HTTPS only! Uncomment the following two +## rules if your server setup allows HTTPS. +#RewriteCond %{HTTPS} !=on +#RewriteRule ^lib/exe/xmlrpc.php$ https://%{SERVER_NAME}%{REQUEST_URI} [L,R=301] diff --git a/sources/COPYING b/sources/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/sources/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/sources/README b/sources/README new file mode 100644 index 0000000..3b7cb8a --- /dev/null +++ b/sources/README @@ -0,0 +1,10 @@ +All documentation for DokuWiki is available online +at http://www.dokuwiki.org/ + +For Installation Instructions see +http://www.dokuwiki.org/install + +DokuWiki - 2004-2013 (c) Andreas Gohr + and the DokuWiki Community +See COPYING and file headers for license info + diff --git a/sources/VERSION b/sources/VERSION new file mode 100644 index 0000000..508f846 --- /dev/null +++ b/sources/VERSION @@ -0,0 +1 @@ +2013-12-08 "Binky" diff --git a/sources/bin/.htaccess b/sources/bin/.htaccess new file mode 100644 index 0000000..281d5c3 --- /dev/null +++ b/sources/bin/.htaccess @@ -0,0 +1,2 @@ +order allow,deny +deny from all diff --git a/sources/bin/dwpage.php b/sources/bin/dwpage.php new file mode 100755 index 0000000..96f6d3e --- /dev/null +++ b/sources/bin/dwpage.php @@ -0,0 +1,378 @@ +#!/usr/bin/php + [working_file] + + Checks out a file from the repository, using the wiki id and obtaining + a lock for the page. + If a working_file is specified, this is where the page is copied to. + Otherwise defaults to the same as the wiki page in the current + working directory. + + EXAMPLE + $ ./dwpage.php checkout wiki:syntax ./new_syntax.txt + + OPTIONS + -h, --help=: get help + -f: force obtaining a lock for the page (generally bad idea) +"; + break; + case 'commit': + print "Usage: dwpage.php [opts] -m \"Msg\" commit + + Checks in the working_file into the repository using the specified + wiki id, archiving the previous version. + + EXAMPLE + $ ./dwpage.php -m \"Some message\" commit ./new_syntax.txt wiki:syntax + + OPTIONS + -h, --help=: 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; + case 'lock': + print "Usage: dwpage.php [opts] lock + + Obtains or updates a lock for a wiki page + + EXAMPLE + $ ./dwpage.php lock wiki:syntax + + OPTIONS + -h, --help=: get help + -f: force obtaining a lock for the page (generally bad idea) +"; + break; + case 'unlock': + print "Usage: dwpage.php [opts] unlock + + Removes a lock for a wiki page. + + EXAMPLE + $ ./dwpage.php unlock wiki:syntax + + OPTIONS + -h, --help=: get help + -f: force obtaining a lock for the page (generally bad idea) +"; + break; + default: + print "Usage: dwpage.php [opts] + + Utility to help command line Dokuwiki page editing, allow + pages to be checked out for editing then committed after changes + + Normal operation would be; + + + + ACTIONS + checkout: see $ dwpage.php --help=checkout + commit: see $ dwpage.php --help=commit + lock: see $ dwpage.php --help=lock + + OPTIONS + -h, --help=: get help + e.g. $ ./dwpage.php -hcommit + e.g. $ ./dwpage.php --help=commit +"; + break; + } +} + +#------------------------------------------------------------------------------ +function getUser() { + $user = getenv('USER'); + if (empty ($user)) { + $user = getenv('USERNAME'); + } else { + return $user; + } + if (empty ($user)) { + $user = 'admin'; + } + return $user; +} + +#------------------------------------------------------------------------------ +function getSuppliedArgument($OPTS, $short, $long) { + $arg = $OPTS->get($short); + if ( is_null($arg) ) { + $arg = $OPTS->get($long); + } + return $arg; +} + +#------------------------------------------------------------------------------ +function obtainLock($WIKI_ID) { + + global $USERNAME; + + if ( !file_exists(wikiFN($WIKI_ID)) ) { + fwrite( STDERR, "$WIKI_ID does not yet exist\n"); + } + + $_SERVER['REMOTE_USER'] = $USERNAME; + if ( checklock($WIKI_ID) ) { + fwrite( STDERR, "Page $WIKI_ID is already locked by another user\n"); + exit(1); + } + + lock($WIKI_ID); + + $_SERVER['REMOTE_USER'] = '_'.$USERNAME.'_'; + + if ( checklock($WIKI_ID) != $USERNAME ) { + + fwrite( STDERR, "Unable to obtain lock for $WIKI_ID\n" ); + exit(1); + + } +} + +#------------------------------------------------------------------------------ +function clearLock($WIKI_ID) { + + global $USERNAME ; + + if ( !file_exists(wikiFN($WIKI_ID)) ) { + fwrite( STDERR, "$WIKI_ID does not yet exist\n"); + } + + $_SERVER['REMOTE_USER'] = $USERNAME; + if ( checklock($WIKI_ID) ) { + fwrite( STDERR, "Page $WIKI_ID is locked by another user\n"); + exit(1); + } + + unlock($WIKI_ID); + + if ( file_exists(wikiLockFN($WIKI_ID)) ) { + fwrite( STDERR, "Unable to clear lock for $WIKI_ID\n" ); + exit(1); + } + +} + +#------------------------------------------------------------------------------ +function deleteLock($WIKI_ID) { + + $wikiLockFN = wikiLockFN($WIKI_ID); + + if ( file_exists($wikiLockFN) ) { + if ( !unlink($wikiLockFN) ) { + fwrite( STDERR, "Unable to delete $wikiLockFN\n" ); + exit(1); + } + } + +} + +#------------------------------------------------------------------------------ +$USERNAME = getUser(); +$CWD = getcwd(); +$SYSTEM_ID = '127.0.0.1'; + +#------------------------------------------------------------------------------ +$OPTS = Doku_Cli_Opts::getOptions( + __FILE__, + 'h::fm:u:s:t', + array( + 'help==', + 'user=', + 'system=', + 'trivial', + ) +); + +if ( $OPTS->isError() ) { + print $OPTS->getMessage()."\n"; + exit(1); +} + +if ( $OPTS->has('h') or $OPTS->has('help') or !$OPTS->hasArgs() ) { + usage(getSuppliedArgument($OPTS,'h','help')); + exit(0); +} + +if ( $OPTS->has('u') or $OPTS->has('user') ) { + $USERNAME = getSuppliedArgument($OPTS,'u','user'); +} + +if ( $OPTS->has('s') or $OPTS->has('system') ) { + $SYSTEM_ID = getSuppliedArgument($OPTS,'s','system'); +} + +#------------------------------------------------------------------------------ +switch ( $OPTS->arg(0) ) { + + #---------------------------------------------------------------------- + case 'checkout': + + $WIKI_ID = $OPTS->arg(1); + + if ( !$WIKI_ID ) { + fwrite( STDERR, "Wiki page ID required\n"); + exit(1); + } + + $WIKI_FN = wikiFN($WIKI_ID); + + if ( !file_exists($WIKI_FN) ) { + fwrite( STDERR, "$WIKI_ID does not yet exist\n"); + exit(1); + } + + $TARGET_FN = $OPTS->arg(2); + + if ( empty($TARGET_FN) ) { + $TARGET_FN = getcwd().'/'.utf8_basename($WIKI_FN); + } + + if ( !file_exists(dirname($TARGET_FN)) ) { + fwrite( STDERR, "Directory ".dirname($TARGET_FN)." does not exist\n"); + exit(1); + } + + if ( stristr( realpath(dirname($TARGET_FN)), realpath($conf['datadir']) ) !== false ) { + fwrite( STDERR, "Attempt to check out file into data directory - not allowed\n"); + exit(1); + } + + if ( $OPTS->has('f') ) { + deleteLock($WIKI_ID); + } + + obtainLock($WIKI_ID); + + # Need to lock the file first? + if ( !copy($WIKI_FN, $TARGET_FN) ) { + fwrite( STDERR, "Unable to copy $WIKI_FN to $TARGET_FN\n"); + clearLock($WIKI_ID); + exit(1); + } + + print "$WIKI_ID > $TARGET_FN\n"; + exit(0); + + break; + + #---------------------------------------------------------------------- + case 'commit': + + $TARGET_FN = $OPTS->arg(1); + + if ( !$TARGET_FN ) { + fwrite( STDERR, "Target filename required\n"); + exit(1); + } + + if ( !file_exists($TARGET_FN) ) { + fwrite( STDERR, "$TARGET_FN does not exist\n"); + exit(1); + } + + if ( !is_readable($TARGET_FN) ) { + fwrite( STDERR, "Cannot read from $TARGET_FN\n"); + exit(1); + } + + $WIKI_ID = $OPTS->arg(2); + + if ( !$WIKI_ID ) { + fwrite( STDERR, "Wiki page ID required\n"); + exit(1); + } + + if ( !$OPTS->has('m') ) { + fwrite( STDERR, "Summary message required\n"); + exit(1); + } + + if ( $OPTS->has('f') ) { + deleteLock($WIKI_ID); + } + + $_SERVER['REMOTE_USER'] = $USERNAME; + if ( checklock($WIKI_ID) ) { + fwrite( STDERR, "$WIKI_ID is locked by another user\n"); + exit(1); + } + + obtainLock($WIKI_ID); + + saveWikiText($WIKI_ID, file_get_contents($TARGET_FN), $OPTS->get('m'), $OPTS->has('t')); + + clearLock($WIKI_ID); + + exit(0); + + break; + + #---------------------------------------------------------------------- + case 'lock': + + $WIKI_ID = $OPTS->arg(1); + + if ( !$WIKI_ID ) { + fwrite( STDERR, "Wiki page ID required\n"); + exit(1); + } + + if ( $OPTS->has('f') ) { + deleteLock($WIKI_ID); + } + + obtainLock($WIKI_ID); + + print "Locked : $WIKI_ID\n"; + exit(0); + + break; + + #---------------------------------------------------------------------- + case 'unlock': + + $WIKI_ID = $OPTS->arg(1); + + if ( !$WIKI_ID ) { + fwrite( STDERR, "Wiki page ID required\n"); + exit(1); + } + + if ( $OPTS->has('f') ) { + deleteLock($WIKI_ID); + } else { + clearLock($WIKI_ID); + } + + print "Unlocked : $WIKI_ID\n"; + exit(0); + + break; + + #---------------------------------------------------------------------- + default: + + fwrite( STDERR, "Invalid action ".$OPTS->arg(0)."\n" ); + exit(1); + + break; + +} + diff --git a/sources/bin/indexer.php b/sources/bin/indexer.php new file mode 100755 index 0000000..6f6b5d9 --- /dev/null +++ b/sources/bin/indexer.php @@ -0,0 +1,98 @@ +#!/usr/bin/php +isError() ) { + fwrite( STDERR, $OPTS->getMessage() . "\n"); + _usage(); + exit(1); +} +$CLEAR = false; +$QUIET = false; +$INDEXER = null; +foreach ($OPTS->options as $key => $val) { + switch ($key) { + case 'h': + case 'help': + _usage(); + exit; + case 'c': + case 'clear': + $CLEAR = true; + break; + case 'q': + case 'quiet': + $QUIET = true; + break; + } +} + +#------------------------------------------------------------------------------ +# Action + +if($CLEAR) _clearindex(); +_update(); + + + +#------------------------------------------------------------------------------ + +function _usage() { + print "Usage: indexer.php + + Updates the searchindex by indexing all new or changed pages + when the -c option is given the index is cleared first. + + OPTIONS + -h, --help show this help and exit + -c, --clear clear the index before updating + -q, --quiet don't produce any output +"; +} + +function _update(){ + global $conf; + $data = array(); + _quietecho("Searching pages... "); + search($data,$conf['datadir'],'search_allpages',array('skipacl' => true)); + _quietecho(count($data)." pages found.\n"); + + foreach($data as $val){ + _index($val['id']); + } +} + +function _index($id){ + global $CLEAR; + global $QUIET; + + _quietecho("$id... "); + idx_addPage($id, !$QUIET, $CLEAR); + _quietecho("done.\n"); +} + +/** + * Clear all index files + */ +function _clearindex(){ + _quietecho("Clearing index... "); + idx_get_indexer()->clear(); + _quietecho("done.\n"); +} + +function _quietecho($msg) { + global $QUIET; + if(!$QUIET) echo $msg; +} + +//Setup VIM: ex: et ts=2 : diff --git a/sources/bin/render.php b/sources/bin/render.php new file mode 100755 index 0000000..d30ef29 --- /dev/null +++ b/sources/bin/render.php @@ -0,0 +1,67 @@ +#!/usr/bin/php + + */ +if ('cli' != php_sapi_name()) die(); + +ini_set('memory_limit','128M'); +if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +define('NOSESSION',1); +require_once(DOKU_INC.'inc/init.php'); +require_once(DOKU_INC.'inc/common.php'); +require_once(DOKU_INC.'inc/parserutils.php'); +require_once(DOKU_INC.'inc/cliopts.php'); + +// handle options +$short_opts = 'hr:'; +$long_opts = array('help','renderer:'); +$OPTS = Doku_Cli_Opts::getOptions(__FILE__,$short_opts,$long_opts); +if ( $OPTS->isError() ) { + fwrite( STDERR, $OPTS->getMessage() . "\n"); + _usage(); + exit(1); +} +$RENDERER = 'xhtml'; +foreach ($OPTS->options as $key => $val) { + switch ($key) { + case 'h': + case 'help': + _usage(); + exit; + case 'r': + case 'renderer': + $RENDERER = $val; + } +} + + +// do the action +$source = stream_get_contents(STDIN); +$info = array(); +$result = p_render($RENDERER,p_get_instructions($source),$info); +if(is_null($result)) die("No such renderer $RENDERER\n"); +echo $result; + +/** + * Print usage info + */ +function _usage(){ + print "Usage: render.php + + Reads DokuWiki syntax from STDIN and renders it with the given renderer + to STDOUT + + OPTIONS + -h, --help show this help and exit + -r, --renderer the render mode (default: xhtml) +"; +} diff --git a/sources/bin/striplangs.php b/sources/bin/striplangs.php new file mode 100755 index 0000000..ac95626 --- /dev/null +++ b/sources/bin/striplangs.php @@ -0,0 +1,148 @@ +#!/usr/bin/php + + */ +if ('cli' != php_sapi_name()) die(); + +#------------------------------------------------------------------------------ +if(!defined('DOKU_INC')) define('DOKU_INC',realpath(dirname(__FILE__).'/../').'/'); +require_once DOKU_INC.'inc/cliopts.php'; + +#------------------------------------------------------------------------------ +function usage($show_examples = false) { + print "Usage: striplangs.php [-h [-x]] [-e] [-k lang1[,lang2]..[,langN]] + + Removes all languages from the instalation, besides the ones + after the -k option. English language is never removed! + + OPTIONS + -h, --help get this help + -x, --examples get also usage examples + -k, --keep comma separated list of languages, -e is always implied + -e, --english keeps english, dummy to use without -k\n"; + if ( $show_examples ) { + print "\n + EXAMPLES + Strips all languages, but keeps 'en' and 'de': + striplangs -k de + + Strips all but 'en','ca-valencia','cs','de','is','sk': + striplangs --keep ca-valencia,cs,de,is,sk + + Strips all but 'en': + striplangs -e + + No option specified, prints usage and throws error: + striplangs\n"; + } +} + +function getSuppliedArgument($OPTS, $short, $long) { + $arg = $OPTS->get($short); + if ( is_null($arg) ) { + $arg = $OPTS->get($long); + } + return $arg; +} + +function processPlugins($path, $keep_langs) { + if (is_dir($path)) { + $entries = scandir($path); + + foreach ($entries as $entry) { + if ($entry != "." && $entry != "..") { + if ( is_dir($path.'/'.$entry) ) { + + $plugin_langs = $path.'/'.$entry.'/lang'; + + if ( is_dir( $plugin_langs ) ) { + stripDirLangs($plugin_langs, $keep_langs); + } + } + } + } + } +} + +function stripDirLangs($path, $keep_langs) { + $dir = dir($path); + + while(($cur_dir = $dir->read()) !== false) { + if( $cur_dir != '.' and $cur_dir != '..' and is_dir($path.'/'.$cur_dir)) { + + if ( !in_array($cur_dir, $keep_langs, true ) ) { + killDir($path.'/'.$cur_dir); + } + } + } + $dir->close(); +} + +function killDir($dir) { + if (is_dir($dir)) { + $entries = scandir($dir); + + foreach ($entries as $entry) { + if ($entry != "." && $entry != "..") { + if ( is_dir($dir.'/'.$entry) ) { + killDir($dir.'/'.$entry); + } else { + unlink($dir.'/'.$entry); + } + } + } + reset($entries); + rmdir($dir); + } +} +#------------------------------------------------------------------------------ + +// handle options +$short_opts = 'hxk:e'; +$long_opts = array('help', 'examples', 'keep=','english'); + +$OPTS = Doku_Cli_Opts::getOptions(__FILE__, $short_opts, $long_opts); + +if ( $OPTS->isError() ) { + fwrite( STDERR, $OPTS->getMessage() . "\n"); + exit(1); +} + +// handle '--examples' option +$show_examples = ( $OPTS->has('x') or $OPTS->has('examples') ) ? true : false; + +// handle '--help' option +if ( $OPTS->has('h') or $OPTS->has('help') ) { + usage($show_examples); + exit(0); +} + +// handle both '--keep' and '--english' options +if ( $OPTS->has('k') or $OPTS->has('keep') ) { + $preserved_langs = getSuppliedArgument($OPTS,'k','keep'); + $langs = explode(',', $preserved_langs); + + // ! always enforce 'en' lang when using '--keep' (DW relies on it) + if ( !isset($langs['en']) ) { + $langs[]='en'; + } +} elseif ( $OPTS->has('e') or $OPTS->has('english') ) { + // '--english' was specified strip everything besides 'en' + $langs = array ('en'); +} else { + // no option was specified, print usage but don't do anything as + // this run might not be intented + usage(); + print "\n + ERROR + No option specified, use either -h -x to get more info, + or -e to strip every language besides english.\n"; + exit(1); +} + +// Kill all language directories in /inc/lang and /lib/plugins besides those in $langs array +stripDirLangs(realpath(dirname(__FILE__).'/../inc/lang'), $langs); +processPlugins(realpath(dirname(__FILE__).'/../lib/plugins'), $langs); diff --git a/sources/bin/wantedpages.php b/sources/bin/wantedpages.php new file mode 100755 index 0000000..afcb6b2 --- /dev/null +++ b/sources/bin/wantedpages.php @@ -0,0 +1,134 @@ +#!/usr/bin/php + pathID(substr($dir.'/'.$entry,$trunclen)), + 'file'=> $dir.'/'.$entry, + ); + $pages[] = $page; + } + } + closedir($dh); + return $pages; +} + +#------------------------------------------------------------------------------ +function dw_internal_links($page) { + global $conf; + $instructions = p_get_instructions(file_get_contents($page['file'])); + $links = array(); + $cns = getNS($page['id']); + $exists = false; + foreach($instructions as $ins){ + if($ins[0] == 'internallink' || ($conf['camelcase'] && $ins[0] == 'camelcaselink') ){ + $mid = $ins[1][0]; + resolve_pageid($cns,$mid,$exists); + if ( !$exists ) { + list($mid) = explode('#',$mid); //record pages without hashs + $links[] = $mid; + } + } + } + return $links; +} + +#------------------------------------------------------------------------------ +$OPTS = Doku_Cli_Opts::getOptions(__FILE__,'h',array('help')); + +if ( $OPTS->isError() ) { + fwrite( STDERR, $OPTS->getMessage() . "\n"); + exit(1); +} + +if ( $OPTS->has('h') or $OPTS->has('help') ) { + usage(); + exit(0); +} + +$START_DIR = $conf['datadir']; + +if ( $OPTS->numArgs() == 1 ) { + $START_DIR .= '/' . $OPTS->arg(0); +} + +#------------------------------------------------------------------------------ +$WANTED_PAGES = array(); + +foreach ( dw_get_pages($START_DIR) as $WIKI_PAGE ) { + $WANTED_PAGES = array_merge($WANTED_PAGES,dw_internal_links($WIKI_PAGE)); +} +$WANTED_PAGES = array_unique($WANTED_PAGES); +sort($WANTED_PAGES); + +foreach ( $WANTED_PAGES as $WANTED_PAGE ) { + print $WANTED_PAGE."\n"; +} +exit(0); diff --git a/sources/conf/.htaccess b/sources/conf/.htaccess new file mode 100644 index 0000000..bcc3ea0 --- /dev/null +++ b/sources/conf/.htaccess @@ -0,0 +1,3 @@ +## no access to the conf directory +order allow,deny +deny from all diff --git a/sources/conf/acl.auth.php.dist b/sources/conf/acl.auth.php.dist new file mode 100644 index 0000000..14344d7 --- /dev/null +++ b/sources/conf/acl.auth.php.dist @@ -0,0 +1,21 @@ +# acl.auth.php +# +# Don't modify the lines above +# +# Access Control Lists +# +# Editing this file by hand shouldn't be necessary. Use the ACL +# Manager interface instead. +# +# If your auth backend allows special char like spaces in groups +# or user names you need to urlencode them (only chars <128, leave +# UTF-8 multibyte chars as is) +# +# none 0 +# read 1 +# edit 2 +# create 4 +# upload 8 +# delete 16 + +* @ALL 8 diff --git a/sources/conf/acronyms.conf b/sources/conf/acronyms.conf new file mode 100644 index 0000000..9363f94 --- /dev/null +++ b/sources/conf/acronyms.conf @@ -0,0 +1,61 @@ +# Acronyms. + +ACL Access Control List +AFAICS As far as I can see +AFAIK As far as I know +AFAIR As far as I remember +API Application Programming Interface +ASAP As soon as possible +ASCII American Standard Code for Information Interchange +BTW By the way +CMS Content Management System +CSS Cascading Style Sheets +DNS Domain Name System +EOF End of file +EOL End of line +EOM End of message +EOT End of text +FAQ Frequently Asked Questions +FTP File Transfer Protocol +FOSS Free & Open-Source Software +FLOSS Free/Libre and Open Source Software +FUD Fear, Uncertainty, and Doubt +GB Gigabyte +GHz Gigahertz +GPL GNU General Public License +GUI Graphical User Interface +HTML HyperText Markup Language +IANAL I am not a lawyer (but) +IE Internet Explorer +IIRC If I remember correctly +IMHO In my humble opinion +IMO In my opinion +IOW In other words +IRC Internet Relay Chat +IRL In real life +KISS Keep it simple stupid +LAN Local Area Network +LGPL GNU Lesser General Public License +LOL Laughing out loud +MathML Mathematical Markup Language +MB Megabyte +MHz Megahertz +MSIE Microsoft Internet Explorer +OMG Oh my God +OS Operating System +OSS Open Source Software +OTOH On the other hand +PITA Pain in the Ass +RFC Request for Comments +ROTFL Rolling on the floor laughing +RTFM Read The Fine Manual +spec specification +TIA Thanks in advance +TL;DR Too long; didn't read +TOC Table of Contents +URI Uniform Resource Identifier +URL Uniform Resource Locator +W3C World Wide Web Consortium +WTF? What the f*** +WYSIWYG What You See Is What You Get +YMMV Your mileage may vary diff --git a/sources/conf/dokuwiki.php b/sources/conf/dokuwiki.php new file mode 100644 index 0000000..bdc9739 --- /dev/null +++ b/sources/conf/dokuwiki.php @@ -0,0 +1,176 @@ + tags + // 'htmldiff' - diff as HTML table + // 'html' - the full page rendered in XHTML +$conf['rss_media'] = 'both'; //what should be listed? + // 'both' - page and media changes + // 'pages' - page changes only + // 'media' - media changes only +$conf['rss_update'] = 5*60; //Update the RSS feed every n seconds (defaults to 5 minutes) +$conf['rss_show_summary'] = 1; //Add revision summary to title? 0|1 + +/* Advanced Settings */ +$conf['updatecheck'] = 1; //automatically check for new releases? +$conf['userewrite'] = 0; //this makes nice URLs: 0: off 1: .htaccess 2: internal +$conf['useslash'] = 0; //use slash instead of colon? only when rewrite is on +$conf['sepchar'] = '_'; //word separator character in page names; may be a + // letter, a digit, '_', '-', or '.'. +$conf['canonical'] = 0; //Should all URLs use full canonical http://... style? +$conf['fnencode'] = 'url'; //encode filenames (url|safe|utf-8) +$conf['autoplural'] = 0; //try (non)plural form of nonexisting files? +$conf['compression'] = 'gz'; //compress old revisions: (0: off) ('gz': gnuzip) ('bz2': bzip) + // bz2 generates smaller files, but needs more cpu-power +$conf['gzip_output'] = 0; //use gzip content encodeing for the output xhtml (if allowed by browser) +$conf['compress'] = 1; //Strip whitespaces and comments from Styles and JavaScript? 1|0 +$conf['cssdatauri'] = 0; //Maximum byte size of small images to embed into CSS, won't work on IE<8 +$conf['send404'] = 0; //Send a HTTP 404 status for non existing pages? +$conf['broken_iua'] = 0; //Platform with broken ignore_user_abort (IIS+CGI) 0|1 +$conf['xsendfile'] = 0; //Use X-Sendfile (1 = lighttpd, 2 = standard) +$conf['renderer_xhtml'] = 'xhtml'; //renderer to use for main page generation +$conf['readdircache'] = 0; //time cache in second for the readdir operation, 0 to deactivate. + +/* Network Settings */ +$conf['dnslookups'] = 1; //disable to disallow IP to hostname lookups +// Proxy setup - if your Server needs a proxy to access the web set these +$conf['proxy']['host'] = ''; +$conf['proxy']['port'] = ''; +$conf['proxy']['user'] = ''; +$conf['proxy']['pass'] = ''; +$conf['proxy']['ssl'] = 0; +$conf['proxy']['except'] = ''; +// Safemode Hack - read http://www.dokuwiki.org/config:safemodehack ! +$conf['safemodehack'] = 0; +$conf['ftp']['host'] = 'localhost'; +$conf['ftp']['port'] = '21'; +$conf['ftp']['user'] = 'user'; +$conf['ftp']['pass'] = 'password'; +$conf['ftp']['root'] = '/home/user/htdocs'; + + diff --git a/sources/conf/entities.conf b/sources/conf/entities.conf new file mode 100644 index 0000000..be9ed6d --- /dev/null +++ b/sources/conf/entities.conf @@ -0,0 +1,22 @@ +# Typography replacements +# +# Order does matter! +# +# You can use HTML entities here, but it is not recomended because it may break +# non-HTML renderers. Use UTF-8 chars directly instead. + +<-> ↔ +-> → +<- ← +<=> ⇔ +=> ⇒ +<= ⇐ +>> » +<< « +--- — +-- – +(c) © +(tm) ™ +(r) ® +... … + diff --git a/sources/conf/interwiki.conf b/sources/conf/interwiki.conf new file mode 100644 index 0000000..28561a4 --- /dev/null +++ b/sources/conf/interwiki.conf @@ -0,0 +1,36 @@ +# Each URL may contain one of the placeholders {URL} or {NAME} +# {URL} is replaced by the URL encoded representation of the wikiname +# this is the right thing to do in most cases +# {NAME} this is replaced by the wikiname as given in the document +# no further encoding is done +# If no placeholder is defined the urlencoded name is appended to the URL + +# To prevent losing your added InterWiki shortcuts after an upgrade, +# you should add new ones to interwiki.local.conf + +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://ja.wikipedia.org/wiki/{NAME} +wpmeta http://meta.wikipedia.org/wiki/{NAME} +doku http://www.dokuwiki.org/ +dokubug http://bugs.dokuwiki.org/index.php?do=details&task_id= +rfc http://tools.ietf.org/html/rfc +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/ +paypal https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business= +phpfn http://www.php.net/{NAME} +coral http://{HOST}.{PORT}.nyud.net:8090/{PATH}?{QUERY} +freecache http://freecache.org/{NAME} +sb http://www.splitbrain.org/go/ +skype skype:{NAME} +google.de http://www.google.de/search?q= +go http://www.google.com/search?q={URL}&btnI=lucky + +# To support VoIP/SIP links +callto callto://{NAME} + diff --git a/sources/conf/license.php b/sources/conf/license.php new file mode 100644 index 0000000..89728ab --- /dev/null +++ b/sources/conf/license.php @@ -0,0 +1,36 @@ + 'CC0 1.0 Universal', + 'url' => 'http://creativecommons.org/publicdomain/zero/1.0/', +); +$license['publicdomain'] = array( + 'name' => 'Public Domain', + 'url' => 'http://creativecommons.org/licenses/publicdomain/', +); +$license['cc-by'] = array( + 'name' => 'CC Attribution 3.0 Unported', + 'url' => 'http://creativecommons.org/licenses/by/3.0/', +); +$license['cc-by-sa'] = array( + 'name' => 'CC Attribution-Share Alike 3.0 Unported', + 'url' => 'http://creativecommons.org/licenses/by-sa/3.0/', +); +$license['gnufdl'] = array( + 'name' => 'GNU Free Documentation License 1.3', + 'url' => 'http://www.gnu.org/licenses/fdl-1.3.html', +); +$license['cc-by-nc'] = array( + 'name' => 'CC Attribution-Noncommercial 3.0 Unported', + 'url' => 'http://creativecommons.org/licenses/by-nc/3.0/', +); +$license['cc-by-nc-sa'] = array( + 'name' => 'CC Attribution-Noncommercial-Share Alike 3.0 Unported', + 'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/', +); + diff --git a/sources/conf/local.php.dist b/sources/conf/local.php.dist new file mode 100644 index 0000000..0397954 --- /dev/null +++ b/sources/conf/local.php.dist @@ -0,0 +1,16 @@ + array('Iptc.Headline', + 'img_title', + 'text'), + + 20 => array('', + 'img_date', + 'date', + array('Date.EarliestTime')), + + 30 => array('', + 'img_fname', + 'text', + array('File.Name')), + + 40 => array('Iptc.Caption', + 'img_caption', + 'textarea', + array('Exif.UserComment', + 'Exif.TIFFImageDescription', + 'Exif.TIFFUserComment')), + + 50 => array('Iptc.Byline', + 'img_artist', + 'text', + array('Exif.TIFFArtist', + 'Exif.Artist', + 'Iptc.Credit')), + + 60 => array('Iptc.CopyrightNotice', + 'img_copyr', + 'text', + array('Exif.TIFFCopyright', + 'Exif.Copyright')), + + 70 => array('', + 'img_format', + 'text', + array('File.Format')), + + 80 => array('', + 'img_fsize', + 'text', + array('File.NiceSize')), + + 90 => array('', + 'img_width', + 'text', + array('File.Width')), + + 100 => array('', + 'img_height', + 'text', + array('File.Height')), + + 110 => array('', + 'img_camera', + 'text', + array('Simple.Camera')), + + 120 => array('Iptc.Keywords', + 'img_keywords', + 'text', + array('Exif.Category')), +); diff --git a/sources/conf/mime.conf b/sources/conf/mime.conf new file mode 100644 index 0000000..381b93f --- /dev/null +++ b/sources/conf/mime.conf @@ -0,0 +1,65 @@ +# Allowed uploadable file extensions and mimetypes are defined here. +# To extend this file it is recommended to create a mime.local.conf +# file. Mimetypes that should be downloadable and not be opened in the +# should be prefixed with a ! + +jpg image/jpeg +jpeg image/jpeg +gif image/gif +png image/png +ico image/vnd.microsoft.icon + +swf application/x-shockwave-flash +mp3 audio/mpeg +ogg audio/ogg +wav audio/wav + +tgz !application/octet-stream +tar !application/x-gtar +gz !application/octet-stream +bz2 !application/octet-stream +zip !application/zip +rar !application/rar +7z !application/x-7z-compressed + +pdf application/pdf +ps !application/postscript + +rpm !application/octet-stream +deb !application/octet-stream + +doc !application/msword +xls !application/msexcel +ppt !application/mspowerpoint +rtf !application/msword + +docx !application/vnd.openxmlformats-officedocument.wordprocessingml.document +xlsx !application/vnd.openxmlformats-officedocument.spreadsheetml.sheet +pptx !application/vnd.openxmlformats-officedocument.presentationml.presentation + +sxw !application/soffice +sxc !application/soffice +sxi !application/soffice +sxd !application/soffice + +odc !application/vnd.oasis.opendocument.chart +odf !application/vnd.oasis.opendocument.formula +odg !application/vnd.oasis.opendocument.graphics +odi !application/vnd.oasis.opendocument.image +odp !application/vnd.oasis.opendocument.presentation +ods !application/vnd.oasis.opendocument.spreadsheet +odt !application/vnd.oasis.opendocument.text + +# You should enable HTML and Text uploads only for restricted Wikis. +# Spammers are known to upload spam pages through unprotected Wikis. +# Note: Enabling HTML opens Cross Site Scripting vulnerabilities +# through JavaScript. Only enable this with trusted users. You +# need to disable the iexssprotect option additionally to +# adding the mime type here +#html text/html +#htm text/html +#txt text/plain +#conf text/plain +#xml text/xml +#csv text/csv + diff --git a/sources/conf/mysql.conf.php.example b/sources/conf/mysql.conf.php.example new file mode 100644 index 0000000..c67e77c --- /dev/null +++ b/sources/conf/mysql.conf.php.example @@ -0,0 +1,253 @@ + +# Don't modify the lines above +# +# Userfile +# +# Format: +# +# login:passwordhash:Real Name:email:groups,comma,seperated + diff --git a/sources/conf/wordblock.conf b/sources/conf/wordblock.conf new file mode 100644 index 0000000..fc939a4 --- /dev/null +++ b/sources/conf/wordblock.conf @@ -0,0 +1,33 @@ +# This blacklist is maintained by the DokuWiki community +# patches welcome +# +https?:\/\/(\S*?)(-side-effects|top|pharm|pill|discount|discount-|deal|price|order|now|best|cheap|cheap-|online|buy|buy-|sale|sell)(\S*?)(cialis|viagra|prazolam|xanax|zanax|soma|vicodin|zenical|xenical|meridia|paxil|prozac|claritin|allegra|lexapro|wellbutrin|zoloft|retin|valium|levitra|phentermine) +gay\s*sex +bi\s*sex +incest +zoosex +gang\s*bang +facials +ladyboy +fetish +\btits\b +\brape\b +bolea\.com +52crystal +baida\.org +web-directory\.awardspace\.us +korsan-team\.com +BUDA TAMAMDIR +wow-powerleveling-wow\.com +wow gold +wow-gold\.dinmo\.cn +downgrade-vista\.com +downgradetowindowsxp\.com +elegantugg\.com +classicedhardy\.com +research-service\.com +https?:\/\/(\S*?)(2-pay-secure|911essay|academia-research|anypapers|applicationessay|bestbuyessay|bestdissertation|bestessay|bestresume|besttermpaper|businessessay|college-paper|customessay|custom-made-paper|custom-writing|degree-?result|dissertationblog|dissertation-service|dissertations?expert|essaybank|essay-?blog|essaycapital|essaylogic|essaymill|essayontime|essaypaper|essays?land|essaytownsucks|essay-?writ|fastessays|freelancercareers|genuinecontent|genuineessay|genuinepaper|goessay|grandresume|killer-content|ma-dissertation|managementessay|masterpaper|mightystudent|needessay|researchedge|researchpaper-blog|resumecvservice|resumesexperts|resumesplanet|rushessay|samedayessay|superiorcontent|superiorpaper|superiorthesis|term-paper|termpaper-blog|term-paper-research|thesisblog|universalresearch|valwriting|vdwriters|wisetranslation|writersassembly|writers\.com\.ph|writers\.ph) +flatsinmumbai\.co\.in +https?:\/\/(\S*?)penny-?stock +mattressreview\.biz +(just|simply) (my|a) profile (site|webpage|page) diff --git a/sources/data/.htaccess b/sources/data/.htaccess new file mode 100644 index 0000000..281d5c3 --- /dev/null +++ b/sources/data/.htaccess @@ -0,0 +1,2 @@ +order allow,deny +deny from all diff --git a/sources/data/_dummy b/sources/data/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/data/attic/_dummy b/sources/data/attic/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/attic/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/data/cache/_dummy b/sources/data/cache/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/cache/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/data/deleted.files b/sources/data/deleted.files new file mode 100644 index 0000000..63335d3 --- /dev/null +++ b/sources/data/deleted.files @@ -0,0 +1,337 @@ +# This is a list of files that were present in previous DokuWiki releases +# but were removed later. An up to date DokuWiki should not have any of +# the files installed + +# removed in 2013-11-18 +lib/images/arrow_down.gif +lib/images/arrow_up.gif +lib/images/at.gif +lib/images/close.png +lib/images/del.png +lib/images/edit.gif +lib/images/list-minus.gif +lib/images/list-plus.gif +lib/images/pencil.png + +# removed in 2013-10-28 +lib/images/interwiki/meatball.gif +lib/images/interwiki/wiki.gif +lib/plugins/acl/ajax.php +lib/tpl/default/_admin.css +lib/tpl/default/_fileuploader.css +lib/tpl/default/_linkwiz.css +lib/tpl/default/_mediamanager.css +lib/tpl/default/_mediaoptions.css +lib/tpl/default/_subscription.css +lib/tpl/default/_tabs.css +lib/tpl/default/design.css +lib/tpl/default/detail.php +lib/tpl/default/footer.html +lib/tpl/default/images/UWEB.png +lib/tpl/default/images/UWEBshadow.png +lib/tpl/default/images/apple-touch-icon.png +lib/tpl/default/images/bullet.gif +lib/tpl/default/images/button-cc.gif +lib/tpl/default/images/button-css.png +lib/tpl/default/images/button-donate.gif +lib/tpl/default/images/button-dw.png +lib/tpl/default/images/button-php.gif +lib/tpl/default/images/button-rss.png +lib/tpl/default/images/button-xhtml.png +lib/tpl/default/images/buttonshadow.png +lib/tpl/default/images/closed.gif +lib/tpl/default/images/favicon.ico +lib/tpl/default/images/inputshadow.png +lib/tpl/default/images/link_icon.gif +lib/tpl/default/images/mail_icon.gif +lib/tpl/default/images/open.gif +lib/tpl/default/images/resizecol.png +lib/tpl/default/images/tocdot2.gif +lib/tpl/default/images/windows.gif +lib/tpl/default/layout.css +lib/tpl/default/main.php +lib/tpl/default/media.css +lib/tpl/default/mediamanager.php +lib/tpl/default/print.css +lib/tpl/default/rtl.css +lib/tpl/default/style.ini +lib/tpl/default/template.info.txt +lib/tpl/dokuwiki/css/basic.css +lib/tpl/dokuwiki/css/content.css +lib/tpl/dokuwiki/css/design.css +lib/tpl/dokuwiki/css/includes.css +lib/tpl/dokuwiki/css/mobile.css +lib/tpl/dokuwiki/css/pagetools.css +lib/tpl/dokuwiki/css/structure.css + +# removed in 2013-05-10 +lib/plugins/info/lang/sl/lang.php + +# removed in 2013-04-06 +inc/adLDAP.php +inc/auth/ad.class.php +inc/auth/basic.class.php +inc/auth/ldap.class.php +inc/auth/mysql.class.php +inc/auth/pgsql.class.php +inc/auth/plain.class.php + +# removed in 2012-09-10 +lib/images/icon-file.png +lib/images/icon-thumb.png +lib/images/interwiki/skype.png +lib/plugins/acl/rtl.css +lib/plugins/config/rtl.css +lib/plugins/plugin/rtl.css + +# removed in 2011-11-10 +lib/_fla/.htaccess +lib/_fla/MultipleUpload.as +lib/_fla/README +lib/_fla/index.html +lib/_fla/multipleUpload.fla +lib/exe/multipleUpload.swf +lib/images/multiupload.png +lib/scripts/ajax.js +lib/scripts/events.js +lib/scripts/subscriptions.js + +# removed in 2011-05-25 +conf/words.aspell.dist +lib/styles/style.css + +# removed in 2010-11-07 +inc/lang/ar/subscribermail.txt +inc/lang/az/subscribermail.txt +inc/lang/bg/subscribermail.txt +inc/lang/ca/subscribermail.txt +inc/lang/ca-valencia/subscribermail.txt +inc/lang/cs/subscribermail.txt +inc/lang/da/subscribermail.txt +inc/lang/de-informal/subscribermail.txt +inc/lang/el/subscribermail.txt +inc/lang/eo/subscribermail.txt +inc/lang/es/subscribermail.txt +inc/lang/et/subscribermail.txt +inc/lang/eu/subscribermail.txt +inc/lang/fa/subscribermail.txt +inc/lang/fi/subscribermail.txt +inc/lang/fo/subscribermail.txt +inc/lang/fr/subscribermail.txt +inc/lang/gl/subscribermail.txt +inc/lang/he/subscribermail.txt +inc/lang/hr/subscribermail.txt +inc/lang/hu/subscribermail.txt +inc/lang/id/subscribermail.txt +inc/lang/is/subscribermail.txt +inc/lang/it/subscribermail.txt +inc/lang/ja/subscribermail.txt +inc/lang/ko/subscribermail.txt +inc/lang/ku/subscribermail.txt +inc/lang/lt/subscribermail.txt +inc/lang/lv/subscribermail.txt +inc/lang/mr/subscribermail.txt +inc/lang/ne/subscribermail.txt +inc/lang/nl/subscribermail.txt +inc/lang/no/subscribermail.txt +inc/lang/pl/subscribermail.txt +inc/lang/pt-br/subscribermail.txt +inc/lang/pt/subscribermail.txt +inc/lang/ro/subscribermail.txt +inc/lang/ru/subscribermail.txt +inc/lang/sk/subscribermail.txt +inc/lang/sr/subscribermail.txt +inc/lang/sv/subscribermail.txt +inc/lang/th/subscribermail.txt +inc/lang/tr/subscribermail.txt +inc/lang/uk/subscribermail.txt +inc/lang/zh/subscribermail.txt +inc/lang/zh-tw/subscribermail.txt + +# removed in rc2010-10-07 +conf/msg +inc/lang/bg/wordblock.txt +inc/lang/ca-valencia/wordblock.txt +inc/lang/ca/wordblock.txt +inc/lang/cs/wordblock.txt +inc/lang/da/wordblock.txt +inc/lang/de-informal/wordblock.txt +inc/lang/de/subscribermail.txt +inc/lang/de/wordblock.txt +inc/lang/el/wordblock.txt +inc/lang/en/subscribermail.txt +inc/lang/en/wordblock.txt +inc/lang/eo/wordblock.txt +inc/lang/es/wordblock.txt +inc/lang/et/wordblock.txt +inc/lang/eu/wordblock.txt +inc/lang/fa/wordblock.txt +inc/lang/fi/wordblock.txt +inc/lang/fo/wordblock.txt +inc/lang/fr/wordblock.txt +inc/lang/he/wordblock.txt +inc/lang/hr/wordblock.txt +inc/lang/hu/wordblock.txt +inc/lang/id/wordblock.txt +inc/lang/it/wordblock.txt +inc/lang/ja/wordblock.txt +inc/lang/ko/wordblock.txt +inc/lang/ku/wordblock.txt +inc/lang/lt/wordblock.txt +inc/lang/lv/wordblock.txt +inc/lang/mg/wordblock.txt +inc/lang/mr/wordblock.txt +inc/lang/nl/wordblock.txt +inc/lang/no/wordblock.txt +inc/lang/pl/wordblock.txt +inc/lang/pt-br/wordblock.txt +inc/lang/pt/wordblock.txt +inc/lang/ro/wordblock.txt +inc/lang/sk/wordblock.txt +inc/lang/sl/wordblock.txt +inc/lang/sr/wordblock.txt +inc/lang/sv/wordblock.txt +inc/lang/th/wordblock.txt +inc/lang/tr/wordblock.txt +inc/lang/uk/wordblock.txt +inc/lang/vi/wordblock.txt +inc/lang/zh-tw/wordblock.txt +inc/lang/zh/wordblock.txt +lib/scripts/pngbehavior.htc + +# removed in rc2009-12-02 +inc/lang/ar/wordblock.txt +inc/lang/ca-va/ +lib/plugins/acl/lang/ca-va/ +lib/plugins/config/lang/ca-va/ +lib/plugins/plugin/lang/ca-va/ +lib/plugins/popularity/lang/ca-va/ +lib/plugins/revert/lang/ca-va/ +lib/plugins/usermanager/lang/ca-va/ + +# removed in rc2009-01-30 +lib/plugins/upgradeplugindirectory +lib/plugins/upgradeplugindirectory/action.php + +# removed in rc2009-01-26 +inc/auth/punbb.class.php +inc/lang/ko/edit.txt_bak +inc/lang/ko/lang.php_bak +inc/lang/ku/admin_acl.txt +inc/lang/mg/admin_acl.txt +lib/plugins/importoldchangelog +lib/plugins/importoldchangelog/action.php +lib/plugins/importoldindex +lib/plugins/importoldindex/action.php +lib/plugins/usermanager/images/no_user_edit.png +lib/plugins/usermanager/images/user_edit.png +lib/tpl/default/UWEB.css + +# removed in rc2008-03-31 +inc/aspell.php +inc/geshi/css-gen.cfg +inc/lang/fr/admin_acl.txt +lib/exe/spellcheck.php +lib/images/toolbar/spellcheck.png +lib/images/toolbar/spellnoerr.png +lib/images/toolbar/spellstop.png +lib/images/toolbar/spellwait.gif +lib/plugins/acl/lang/ar/intro.txt +lib/plugins/acl/lang/bg/intro.txt +lib/plugins/acl/lang/ca/intro.txt +lib/plugins/acl/lang/cs/intro.txt +lib/plugins/acl/lang/da/intro.txt +lib/plugins/acl/lang/de/intro.txt +lib/plugins/acl/lang/el/intro.txt +lib/plugins/acl/lang/en/intro.txt +lib/plugins/acl/lang/es/intro.txt +lib/plugins/acl/lang/et/intro.txt +lib/plugins/acl/lang/eu/intro.txt +lib/plugins/acl/lang/fi/intro.txt +lib/plugins/acl/lang/fr/intro.txt +lib/plugins/acl/lang/gl/intro.txt +lib/plugins/acl/lang/he/intro.txt +lib/plugins/acl/lang/id/intro.txt +lib/plugins/acl/lang/it/intro.txt +lib/plugins/acl/lang/ja/intro.txt +lib/plugins/acl/lang/ko/intro.txt +lib/plugins/acl/lang/lt/intro.txt +lib/plugins/acl/lang/lv/intro.txt +lib/plugins/acl/lang/nl/intro.txt +lib/plugins/acl/lang/no/intro.txt +lib/plugins/acl/lang/pl/intro.txt +lib/plugins/acl/lang/pt/intro.txt +lib/plugins/acl/lang/ru/intro.txt +lib/plugins/acl/lang/sk/intro.txt +lib/plugins/acl/lang/sr/intro.txt +lib/plugins/acl/lang/sv/intro.txt +lib/plugins/acl/lang/tr/intro.txt +lib/plugins/acl/lang/uk/intro.txt +lib/plugins/acl/lang/vi/intro.txt +lib/plugins/acl/lang/zh/intro.txt +lib/plugins/acl/lang/zh-tw/intro.txt +lib/scripts/spellcheck.js +lib/styles/spellcheck.css + +# removed in 2007-06-26 +inc/parser/wiki.php +lib/images/interwiki/bug.gif +lib/plugins/base.php +lib/plugins/plugin/inc +lib/plugins/plugin/inc/tarlib.class.php +lib/plugins/plugin/inc/zip.lib.php +lib/scripts/domLib.js +lib/scripts/domTT.js + +# removed in 2006-11-06 +inc/admin_acl.php +inc/lang/lt/stopwords.txt +inc/magpie +inc/magpie/rss_cache.inc +inc/magpie/rss_fetch.inc +inc/magpie/rss_parse.inc +inc/magpie/rss_utils.inc +lib/exe/media.php +lib/tpl/default/mediaedit.php +lib/tpl/default/media.php +lib/tpl/default/mediaref.php + +# removed in 2006-03-09 +data/pages/wiki/playground.txt +inc/auth/ldap.php +inc/auth/mysql.php +inc/auth/pgsql.php +inc/auth/plain.php +inc/lang/ca/admin_acl.txt +inc/lang/cs/admin_acl.txt +inc/lang/da/admin_acl.txt +inc/lang/de/admin_acl.txt +inc/lang/en/admin_acl.txt +inc/lang/et/admin_acl.txt +inc/lang/eu/admin_acl.txt +inc/lang/fr/admin_acl.txt +inc/lang/it/admin_acl.txt +inc/lang/ja/admin_acl.txt +inc/lang/lt/admin_acl.txt +inc/lang/lv/admin_acl.txt +inc/lang/nl/admin_acl.txt +inc/lang/no/admin_acl.txt +inc/lang/pl/admin_acl.txt +inc/lang/pt/admin_acl.txt +inc/lang/vi/admin_acl.txt +inc/lang/zh-tw/admin_acl.txt +inc/parser/spamcheck.php +lib/images/favicon.ico +lib/images/thumbup.gif +lib/images/toolbar/code.png +lib/images/toolbar/empty.png +lib/images/toolbar/extlink.png +lib/images/toolbar/fonth1.png +lib/images/toolbar/fonth2.png +lib/images/toolbar/fonth3.png +lib/images/toolbar/fonth4.png +lib/images/toolbar/fonth5.png +lib/images/toolbar/list.png +lib/images/toolbar/list_ul.png +lib/images/toolbar/rule.png +lib/tpl/default/images/interwiki.png diff --git a/sources/data/index/_dummy b/sources/data/index/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/index/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/data/locks/_dummy b/sources/data/locks/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/locks/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/data/media/wiki/dokuwiki-128.png b/sources/data/media/wiki/dokuwiki-128.png new file mode 100644 index 0000000..b2306ac Binary files /dev/null and b/sources/data/media/wiki/dokuwiki-128.png differ diff --git a/sources/data/media_attic/_dummy b/sources/data/media_attic/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/media_attic/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/data/media_meta/_dummy b/sources/data/media_meta/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/media_meta/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/data/meta/_dummy b/sources/data/meta/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/meta/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/data/pages/playground/playground.txt b/sources/data/pages/playground/playground.txt new file mode 100644 index 0000000..a2274bd --- /dev/null +++ b/sources/data/pages/playground/playground.txt @@ -0,0 +1 @@ +====== PlayGround ====== diff --git a/sources/data/pages/wiki/dokuwiki.txt b/sources/data/pages/wiki/dokuwiki.txt new file mode 100644 index 0000000..808aea6 --- /dev/null +++ b/sources/data/pages/wiki/dokuwiki.txt @@ -0,0 +1,64 @@ +====== DokuWiki ====== + +[[doku>wiki:dokuwiki|{{wiki:dokuwiki-128.png }}]] DokuWiki is a simple to use and highly versatile Open Source [[wp>wiki]] software that doesn't require a database. It is loved by users for its clean and readable [[wiki:syntax]]. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in [[doku>acl|access controls]] and [[doku>auth|authentication connectors]] make DokuWiki especially useful in the enterprise context and the large number of [[doku>plugins]] contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki. + +Read the [[doku>manual|DokuWiki Manual]] to unleash the full power of DokuWiki. + +===== Download ===== + +DokuWiki is available at http://www.splitbrain.org/go/dokuwiki + + +===== Read More ===== + +All documentation and additional information besides the [[syntax|syntax description]] is maintained in the DokuWiki at [[doku>|www.dokuwiki.org]]. + +**About DokuWiki** + + * [[doku>features|A feature list]] :!: + * [[doku>users|Happy Users]] + * [[doku>press|Who wrote about it]] + * [[doku>blogroll|What Bloggers think]] + * [[http://www.wikimatrix.org/show/DokuWiki|Compare it with other wiki software]] + +**Installing DokuWiki** + + * [[doku>requirements|System Requirements]] + * [[http://www.splitbrain.org/go/dokuwiki|Download DokuWiki]] :!: + * [[doku>changes|Change Log]] + * [[doku>Install|How to install or upgrade]] :!: + * [[doku>config|Configuration]] + +**Using DokuWiki** + + * [[doku>syntax|Wiki Syntax]] + * [[doku>manual|The manual]] :!: + * [[doku>FAQ|Frequently Asked Questions (FAQ)]] + * [[doku>glossary|Glossary]] + * [[http://search.dokuwiki.org|Search for DokuWiki help and documentation]] + +**Customizing DokuWiki** + + * [[doku>tips|Tips and Tricks]] + * [[doku>Template|How to create and use templates]] + * [[doku>plugins|Installing plugins]] + * [[doku>development|Development Resources]] + +**DokuWiki Feedback and Community** + + * [[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]] + * [[http://www.wikimatrix.org/forum/viewforum.php?id=10|Share your experiences in the WikiMatrix forum]] + * [[doku>thanks|Some humble thanks]] + + +===== Copyright ===== + +2004-2013 (c) Andreas Gohr ((Please do not contact me for help and support -- use the [[doku>mailinglist]] or [[http://forum.dokuwiki.org|forum]] instead)) and the DokuWiki Community + +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 ;-). + +Not sure what this means? See the [[doku>faq:license|FAQ on the Licenses]]. diff --git a/sources/data/pages/wiki/syntax.txt b/sources/data/pages/wiki/syntax.txt new file mode 100644 index 0000000..f2c2864 --- /dev/null +++ b/sources/data/pages/wiki/syntax.txt @@ -0,0 +1,486 @@ +====== Formatting Syntax ====== + +[[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 "Edit this 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 ===== + +DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. Of course you can **__//''combine''//__** all these. + + DokuWiki supports **bold**, //italic//, __underlined__ and ''monospaced'' texts. + Of course you can **__//''combine''//__** all these. + +You can use subscript and superscript, too. + + You can use subscript and superscript, too. + +You can mark something as deleted as well. + + You can mark something as deleted as well. + +**Paragraphs** are created from blank lines. If you want to **force a newline** without a paragraph, you can use two backslashes followed by a whitespace or the end of line. + +This is some text with some linebreaks\\ Note that the +two backslashes are only recognized at the end of a line\\ +or followed by\\ a whitespace \\this happens without it. + + This is some text with some linebreaks\\ Note that the + two backslashes are only recognized at the end of a line\\ + or followed by\\ a whitespace \\this happens without it. + +You should use forced newlines only if really needed. + +===== Links ===== + +DokuWiki supports multiple ways of creating links. + +==== External ==== + +External links are recognized automagically: http://www.google.com or simply www.google.com - You can set the link text as well: [[http://www.google.com|This Link points to google]]. Email addresses like this one: are recognized, too. + + DokuWiki supports multiple ways of creating links. External links are recognized + automagically: http://www.google.com or simply www.google.com - You can set + link text as well: [[http://www.google.com|This Link points to google]]. Email + addresses like this one: are recognized, too. + +==== Internal ==== + +Internal links are created by using square brackets. You can either just give a [[pagename]] or use an additional [[pagename|link text]]. + + 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. + +You can use [[some:namespaces]] by using a colon in the pagename. + + You can use [[some:namespaces]] by using a colon in the pagename. + +For details about namespaces see [[doku>namespaces]]. + +Linking to a specific section is possible, too. Just add the section name behind a hash character as known from HTML. This links to [[syntax#internal|this Section]]. + + This links to [[syntax#internal|this Section]]. + +Notes: + + * Links to [[syntax|existing pages]] are shown in a different style from [[nonexisting]] ones. + * DokuWiki does not use [[wp>CamelCase]] to automatically create links by default, but this behavior can be enabled in the [[doku>config]] file. Hint: If DokuWiki is a link, then it's enabled. + * When a section's heading is changed, its bookmark changes, too. So don't rely on section linking too much. + +==== Interwiki ==== + +DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]]. + + DokuWiki supports [[doku>Interwiki]] links. These are quick links to other Wikis. + For example this is a link to Wikipedia's page about Wikis: [[wp>Wiki]]. + +==== Windows Shares ==== + +Windows shares like [[\\server\share|this]] are recognized, too. Please note that these only make sense in a homogeneous user group like a corporate [[wp>Intranet]]. + + Windows Shares like [[\\server\share|this]] are recognized, too. + +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 different workaround mentioned in the [[http://kb.mozillazine.org/Links_to_local_pages_do_not_work|Mozilla Knowledge Base]]. However, there will still be a JavaScript warning about trying to open a Windows Share. To remove this warning (for all users), put the following line in ''conf/userscript.js'': + + LANG.nosmblinks = ''; + +==== Image Links ==== + +You can also use an image to link to another internal or external page by combining the syntax for links and [[#images_and_other_files|images]] (see below) like this: + + [[http://www.php.net|{{wiki:dokuwiki-128.png}}]] + +[[http://www.php.net|{{wiki:dokuwiki-128.png}}]] + +Please note: The image formatting is the only formatting syntax accepted in link names. + +The whole [[#images_and_other_files|image]] and [[#links|link]] syntax is supported (including image resizing, internal and external images and URLs and interwiki links). + +===== Footnotes ===== + +You can add footnotes ((This is a footnote)) by using double parentheses. + + You can add footnotes ((This is a footnote)) by using double parentheses. + +===== Sectioning ===== + +You can use up to five different levels of headlines to structure your content. If you have more than three headlines, a table of contents is generated automatically -- this can be disabled by including the string ''~~NOTOC~~'' in the document. + +==== Headline Level 3 ==== +=== Headline Level 4 === +== Headline Level 5 == + + ==== Headline Level 3 ==== + === Headline Level 4 === + == Headline Level 5 == + +By using four or more dashes, you can make a horizontal line: + +---- + +===== Images and Other Files ===== + +You can include external and internal [[doku>images]] with curly brackets. Optionally you can specify the size of them. + +Real size: {{wiki:dokuwiki-128.png}} + +Resize to given width: {{wiki:dokuwiki-128.png?50}} + +Resize to given width and height((when the aspect ratio of the given width and height doesn't match that of the image, it will be cropped to the new ratio before resizing)): {{wiki:dokuwiki-128.png?200x50}} + +Resized external image: {{http://de3.php.net/images/php.gif?200x50}} + + Real size: {{wiki:dokuwiki-128.png}} + Resize to given width: {{wiki:dokuwiki-128.png?50}} + Resize to given width and height: {{wiki:dokuwiki-128.png?200x50}} + Resized external image: {{http://de3.php.net/images/php.gif?200x50}} + + +By using left or right whitespaces you can choose the alignment. + +{{ wiki:dokuwiki-128.png}} + +{{wiki:dokuwiki-128.png }} + +{{ wiki:dokuwiki-128.png }} + + {{ wiki:dokuwiki-128.png}} + {{wiki:dokuwiki-128.png }} + {{ wiki:dokuwiki-128.png }} + +Of course, you can add a title (displayed as a tooltip by most browsers), too. + +{{ wiki:dokuwiki-128.png |This is the caption}} + + {{ wiki:dokuwiki-128.png |This is the caption}} + +If you specify a filename (external or internal) that is not an image (''gif, jpeg, png''), then it will be displayed as a link instead. + +For linking an image to another page see [[#Image Links]] above. + +===== Lists ===== + +Dokuwiki supports ordered and unordered lists. To create a list item, indent your text by two spaces and use a ''*'' for unordered lists or a ''-'' for ordered ones. + + * This is a list + * The second item + * You may have different levels + * Another item + + - The same list but ordered + - Another item + - Just use indention for deeper levels + - That's it + + + * This is a list + * The second item + * You may have different levels + * Another item + + - The same list but ordered + - Another item + - Just use indention for deeper levels + - That's it + + +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. + +==== 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 %% + * :-( %% :-( %% + * :-) %% :-) %% + * =) %% =) %% + * :-/ %% :-/ %% + * :-\ %% :-\ %% + * :-? %% :-? %% + * :-D %% :-D %% + * :-P %% :-P %% + * :-O %% :-O %% + * :-X %% :-X %% + * :-| %% :-| %% + * ;-) %% ;-) %% + * ^_^ %% ^_^ %% + * :?: %% :?: %% + * :!: %% :!: %% + * LOL %% LOL %% + * FIXME %% FIXME %% + * DELETEME %% DELETEME %% + +==== Text to HTML Conversions ==== + +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'..." + + +-> <- <-> => <= <=> >> << -- --- 640x480 (c) (tm) (r) +"He thought 'It's a man's world'..." + + +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 ===== + +Some times you want to mark some text to show it's a reply or comment. You can use the following syntax: + + I think we should do it + + > No we shouldn't + + >> Well, I say we should + + > Really? + + >> Yes! + + >>> Then lets do it! + +I think we should do it + +> No we shouldn't + +>> Well, I say we should + +> Really? + +>> Yes! + +>>> Then lets do it! + +===== 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 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 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! + +Vertical tableheaders are possible, too. + +| ^ Heading 1 ^ Heading 2 ^ +^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 | +^ Heading 4 | no colspan this time | | +^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 | + +As you can see, it's the cell separator before a cell which decides about the formatting: + + | ^ Heading 1 ^ Heading 2 ^ + ^ Heading 3 | Row 1 Col 2 | Row 1 Col 3 | + ^ Heading 4 | no colspan this time | | + ^ Heading 5 | Row 2 Col 2 | Row 2 Col 3 | + +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. + +^ Table with alignment ^^^ +| right| center |left | +|left | right| center | +| xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx | + +This is how it looks in the source: + + ^ Table with alignment ^^^ + | right| center |left | + |left | right| center | + | xxxxxxxxxxxx | xxxxxxxxxxxx | xxxxxxxxxxxx | + +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 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. + + +Those blocks were created by this source: + + 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. + + +==== 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 uses the same code and file blocks described in the previous section, but this time the name of the language syntax to be highlighted is included inside the tag, e.g. '''' or ''''. + + +/** + * The HelloWorldApp class implements an application that + * simply displays "Hello World!" to the standard output. + */ +class HelloWorldApp { + public static void main(String[] args) { + System.out.println("Hello World!"); //Display the string. + } +} + + +The following language strings are currently recognized: //4cs, 6502acme, 6502kickass, 6502tasm, 68000devpac, abap, actionscript-french, actionscript, actionscript3, ada, algol68, apache, applescript, asm, asp, autoconf, autohotkey, autoit, avisynth, awk, bascomavr, bash, basic4gl, bf, bibtex, blitzbasic, bnf, boo, c, c_loadrunner, c_mac, caddcl, cadlisp, cfdg, cfm, chaiscript, cil, clojure, cmake, cobol, coffeescript, cpp, cpp-qt, csharp, css, cuesheet, d, dcs, delphi, diff, div, dos, dot, e, epc, ecmascript, eiffel, email, erlang, euphoria, f1, falcon, fo, fortran, freebasic, fsharp, gambas, genero, genie, gdb, glsl, gml, gnuplot, go, groovy, gettext, gwbasic, haskell, hicest, hq9plus, html, html5, icon, idl, ini, inno, intercal, io, j, java5, java, javascript, jquery, kixtart, klonec, klonecpp, latex, lb, lisp, llvm, locobasic, logtalk, lolcode, lotusformulas, lotusscript, lscript, lsl2, lua, m68k, magiksf, make, mapbasic, matlab, mirc, modula2, modula3, mmix, mpasm, mxml, mysql, newlisp, nsis, oberon2, objc, objeck, ocaml-brief, ocaml, oobas, oracle8, oracle11, oxygene, oz, pascal, pcre, perl, perl6, per, pf, php-brief, php, pike, pic16, pixelbender, pli, plsql, postgresql, povray, powerbuilder, powershell, proftpd, progress, prolog, properties, providex, purebasic, pycon, python, q, qbasic, rails, rebol, reg, robots, rpmspec, rsplus, ruby, sas, scala, scheme, scilab, sdlbasic, smalltalk, smarty, sql, systemverilog, tcl, teraterm, text, thinbasic, tsql, typoscript, unicon, uscript, vala, vbnet, vb, verilog, vhdl, vim, visualfoxpro, visualprolog, whitespace, winbatch, whois, xbasic, xml, xorg_conf, xpp, yaml, z80, zxbasic// + +==== Downloadable Code Blocks ==== + +When you use the ''%%%%'' or ''%%%%'' syntax as above, you might want to make the shown code available for download as well. You can do this by specifying a file name after language code like this: + + + + + + + + + + + +If you don't want any highlighting but want a downloadable file, specify a dash (''-'') as the language code: ''%%%%''. + + +===== 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.) + +HTML example: + + + +This is some inline HTML + + +

And this is some block HTML

+ + + + +This is some inline HTML + + +

And this is some block HTML

+ + +PHP example: + + + +echo 'A logo generated by PHP:'; +echo 'PHP Logo !'; +echo '(generated inline HTML)'; + + +echo ''; +echo ''; +echo '
The same, but inside a block level element:PHP Logo !
'; + + + + +echo 'A logo generated by PHP:'; +echo 'PHP Logo !'; +echo '(inline HTML)'; + + +echo ''; +echo ''; +echo '
The same, but inside a block level element:PHP Logo !
'; + + +**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: + +^ Macro ^ Description | +| %%~~NOTOC~~%% | If this macro is found on the page, no table of contents will be created | +| %%~~NOCACHE~~%% | DokuWiki caches all output by default. Sometimes this might not be wanted (eg. when the %%%% syntax above is used), adding this macro will force DokuWiki to rerender a page on every call | + +===== Syntax Plugins ===== + +DokuWiki's syntax can be extended by [[doku>plugins|Plugins]]. How the installed plugins are used is described on their appropriate description pages. The following syntax plugins are available in this particular DokuWiki installation: + +~~INFO:syntaxplugins~~ diff --git a/sources/data/pages/wiki/welcome.txt b/sources/data/pages/wiki/welcome.txt new file mode 100644 index 0000000..6978f1b --- /dev/null +++ b/sources/data/pages/wiki/welcome.txt @@ -0,0 +1,30 @@ +====== Welcome to your new DokuWiki ====== + +Congratulations, your wiki is now up and running. Here are a few more tips to get you started. + +Enjoy your work with DokuWiki,\\ +-- the developers + +===== Create your first pages ===== + +Your wiki needs to have a start page. As long as it doesn't exist, this link will be red: [[:start]]. + +Go on, follow that link and create the page. If you need help with using the syntax you can always refer to the [[wiki:syntax|syntax page]]. + +You might also want to use a sidebar. To create it, just edit the [[:sidebar]] page. Everything in that page will be shown in a margin column on the side. Read our [[doku>faq:sidebar|FAQ on sidebars]] to learn more. + +Please be aware that not all templates support sidebars. + +===== Customize your Wiki ===== + +Once you're comfortable with creating and editing pages you might want to have a look at the [[this>doku.php?do=admin&page=config|configuration settings]] (be sure to login as superuser first). + +You may also want to see what [[doku>plugins|plugins]] and [[doku>templates|templates]] are available at DokuWiki.org to extend the functionality and looks of your DokuWiki installation. + +===== Join the Community ===== + +DokuWiki is an Open Source project that thrives through user contributions. A good way to stay informed on what's going on and to get useful tips in using DokuWiki is subscribing to the [[doku>newsletter]]. + +The [[http://forum.dokuwiki.org|DokuWiki User Forum]] is an excellent way to get in contact with other DokuWiki users and is just one of the many ways to get [[doku>faq:support|support]]. + +Of course we'd be more than happy to have you [[doku>teams:getting_involved|getting involved]] with DokuWiki. diff --git a/sources/data/security.png b/sources/data/security.png new file mode 100644 index 0000000..c4f1a97 Binary files /dev/null and b/sources/data/security.png differ diff --git a/sources/data/security.xcf b/sources/data/security.xcf new file mode 100644 index 0000000..9902878 Binary files /dev/null and b/sources/data/security.xcf differ diff --git a/sources/data/tmp/_dummy b/sources/data/tmp/_dummy new file mode 100644 index 0000000..e492265 --- /dev/null +++ b/sources/data/tmp/_dummy @@ -0,0 +1 @@ +You can safely delete this file. \ No newline at end of file diff --git a/sources/doku.php b/sources/doku.php new file mode 100644 index 0000000..d861aa4 --- /dev/null +++ b/sources/doku.php @@ -0,0 +1,89 @@ + + * + * @global Input $INPUT + */ + +// update message version +$updateVersion = 43; + +// xdebug_start_profiling(); + +if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/'); + +if(isset($_SERVER['HTTP_X_DOKUWIKI_DO'])) { + $ACT = trim(strtolower($_SERVER['HTTP_X_DOKUWIKI_DO'])); +} elseif(!empty($_REQUEST['idx'])) { + $ACT = 'index'; +} elseif(isset($_REQUEST['do'])) { + $ACT = $_REQUEST['do']; +} else { + $ACT = 'show'; +} + +// load and initialize the core system +require_once(DOKU_INC.'inc/init.php'); + +//import variables +$INPUT->set('id', str_replace("\xC2\xAD", '', $INPUT->str('id'))); //soft-hyphen +$QUERY = trim($INPUT->str('id')); +$ID = getID(); + +$REV = $INPUT->int('rev'); +$IDX = $INPUT->str('idx'); +$DATE = $INPUT->int('date'); +$RANGE = $INPUT->str('range'); +$HIGH = $INPUT->param('s'); +if(empty($HIGH)) $HIGH = getGoogleQuery(); + +if($INPUT->post->has('wikitext')) { + $TEXT = cleanText($INPUT->post->str('wikitext')); +} +$PRE = cleanText(substr($INPUT->post->str('prefix'), 0, -1)); +$SUF = cleanText($INPUT->post->str('suffix')); +$SUM = $INPUT->post->str('summary'); + +//make info about the selected page available +$INFO = pageinfo(); + +//export minimal info to JS, plugins can add more +$JSINFO['id'] = $ID; +$JSINFO['namespace'] = (string) $INFO['namespace']; + +// 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' || (!is_array($ACT) && substr($ACT, 0, 7) == 'export_')) +) { + header('HTTP/1.0 404 Not Found'); +} + +//prepare breadcrumbs (initialize a static var) +if($conf['breadcrumbs']) breadcrumbs(); + +// check upstream +checkUpdateMessages(); + +$tmp = array(); // No event data +trigger_event('DOKUWIKI_STARTED', $tmp); + +//close session +session_write_close(); + +//do the work (picks up what to do from global env) +act_dispatch(); + +$tmp = array(); // No event data +trigger_event('DOKUWIKI_DONE', $tmp); + +// xdebug_dump_function_profile(1); diff --git a/sources/feed.php b/sources/feed.php new file mode 100644 index 0000000..bdce666 --- /dev/null +++ b/sources/feed.php @@ -0,0 +1,504 @@ + + * + * @global array $conf + * @global Input $INPUT + */ + +if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/'); +require_once(DOKU_INC.'inc/init.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'] = $INPUT->bool('purge'); + +// 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 { + 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 = tpl_getMediaFile(array(':wiki:favicon.ico', ':favicon.ico', 'images/favicon.ico'), true); +$image->link = DOKU_URL; +$rss->image = $image; + +$data = null; +$modes = array( + 'list' => 'rssListNamespace', + 'search' => 'rssSearch', + 'recent' => 'rssRecentChanges' +); +if(isset($modes[$opt['feed_mode']])) { + $data = $modes[$opt['feed_mode']]($opt); +} else { + $eventData = array( + 'opt' => &$opt, + 'data' => &$data, + ); + $event = new Doku_Event('FEED_MODE_UNKNOWN', $eventData); + if($event->advise_before(true)) { + echo sprintf('Unknown feed mode %s', hsc($opt['feed_mode'])); + exit; + } + $event->advise_after(); +} + +rss_buildItems($rss, $data, $opt); +$feed = $rss->createFeed($opt['feed_type'], 'utf-8'); + +// save cachefile +$cache->storeCache($feed); + +// finally deliver +print $feed; + +// ---------------------------------------------------------------- // + +/** + * Get URL parameters and config options and return an initialized option array + * + * @author Andreas Gohr + */ +function rss_parseOptions() { + global $conf; + global $INPUT; + + $opt = array(); + + foreach(array( + // Basic feed properties + // Plugins may probably want to add new values to these + // properties for implementing own feeds + + // One of: list, search, recent + 'feed_mode' => array('str', 'mode', 'recent'), + // One of: diff, page, rev, current + 'link_to' => array('str', 'linkto', $conf['rss_linkto']), + // One of: abstract, diff, htmldiff, html + 'item_content' => array('str', 'content', $conf['rss_content']), + + // Special feed properties + // These are only used by certain feed_modes + + // String, used for feed title, in list and rc mode + 'namespace' => array('str', 'ns', null), + // Positive integer, only used in rc mode + 'items' => array('int', 'num', $conf['recent']), + // Boolean, only used in rc mode + 'show_minor' => array('bool', 'minor', false), + // String, only used in search mode + 'search_query' => array('str', 'q', null), + // One of: pages, media, both + 'content_type' => array('str', 'view', $conf['rss_media']) + + ) as $name => $val) { + $opt[$name] = $INPUT->$val[0]($val[1], $val[2], true); + } + + $opt['items'] = max(0, (int) $opt['items']); + $opt['show_minor'] = (bool) $opt['show_minor']; + + $opt['guardmail'] = ($conf['mailguard'] != '' && $conf['mailguard'] != 'none'); + + $type = valid_input_set( + 'type', array( + 'rss', 'rss2', 'atom', 'atom1', 'rss1', + 'default' => $conf['rss_type'] + ), + $_REQUEST + ); + switch($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'; + } + + $eventData = array( + 'opt' => &$opt, + ); + trigger_event('FEED_OPTS_POSTPROCESS', $eventData); + return $opt; +} + +/** + * Add recent changed pages to a feed object + * + * @author Andreas Gohr + * @param FeedCreator $rss the FeedCreator Object + * @param array $data the items to add + * @param array $opt the feed options + */ +function rss_buildItems(&$rss, &$data, $opt) { + global $conf; + global $lang; + /* @var auth_basic $auth */ + global $auth; + + $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']; + if(!$ditem['media']) { + $meta = p_get_metadata($id); + } else { + $meta = array(); + } + + // add date + if($ditem['date']) { + $date = $ditem['date']; + } elseif ($ditem['media']) { + $date = @filemtime(mediaFN($id)); + } elseif (@file_exists(wikiFN($id))) { + $date = @filemtime(wikiFN($id)); + } elseif($meta['date']['modified']) { + $date = $meta['date']['modified']; + } else { + $date = 0; + } + 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 item link + switch($opt['link_to']) { + case 'page': + if($ditem['media']) { + $item->link = media_managerURL( + array( + 'image' => $id, + 'ns' => getNS($id), + 'rev' => $date + ), '&', true + ); + } else { + $item->link = wl($id, 'rev='.$date, true, '&'); + } + break; + case 'rev': + if($ditem['media']) { + $item->link = media_managerURL( + array( + 'image' => $id, + 'ns' => getNS($id), + 'rev' => $date, + 'tab_details' => 'history' + ), '&', true + ); + } else { + $item->link = wl($id, 'do=revisions&rev='.$date, true, '&'); + } + break; + case 'current': + if($ditem['media']) { + $item->link = media_managerURL( + array( + 'image' => $id, + 'ns' => getNS($id) + ), '&', true + ); + } else { + $item->link = wl($id, '', true, '&'); + } + break; + case 'diff': + default: + if($ditem['media']) { + $item->link = media_managerURL( + array( + 'image' => $id, + 'ns' => getNS($id), + 'rev' => $date, + 'tab_details' => 'history', + 'mediado' => 'diff' + ), '&', true + ); + } else { + $item->link = wl($id, 'rev='.$date.'&do=diff', true, '&'); + } + } + + // add item content + switch($opt['item_content']) { + case 'diff': + case 'htmldiff': + if($ditem['media']) { + $revs = getRevisions($id, 0, 1, 8192, true); + $rev = $revs[0]; + $src_r = ''; + $src_l = ''; + + if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)), 300)) { + $more = 'w='.$size[0].'&h='.$size[1].'t='.@filemtime(mediaFN($id)); + $src_r = ml($id, $more); + } + if($rev && $size = media_image_preview_size($id, $rev, new JpegMeta(mediaFN($id, $rev)), 300)) { + $more = 'rev='.$rev.'&w='.$size[0].'&h='.$size[1]; + $src_l = ml($id, $more); + } + $content = ''; + if($src_r) { + $content = ''; + $content .= ''; + $content .= ''; + $content .= ''; + $content .= '
'.$rev.''.$lang['current'].'
'; + $content .= ''.$id.'
'; + } + + } else { + require_once(DOKU_INC.'inc/DifferenceEngine.php'); + $revs = getRevisions($id, 0, 1); + $rev = $revs[0]; + + if($rev) { + $df = new Diff(explode("\n", rawWiki($id, $rev)), + explode("\n", rawWiki($id, ''))); + } else { + $df = new Diff(array(''), + explode("\n", rawWiki($id, ''))); + } + + if($opt['item_content'] == 'htmldiff') { + // note: no need to escape diff output, TableDiffFormatter provides 'safe' html + $tdf = new TableDiffFormatter(); + $content = ''; + $content .= ''; + $content .= ''; + $content .= $tdf->format($df); + $content .= '
'.$rev.''.$lang['current'].'
'; + } else { + // note: diff output must be escaped, UnifiedDiffFormatter provides plain text + $udf = new UnifiedDiffFormatter(); + $content = "
\n".hsc($udf->format($df))."\n
"; + } + } + break; + case 'html': + if($ditem['media']) { + if($size = media_image_preview_size($id, false, new JpegMeta(mediaFN($id)))) { + $more = 'w='.$size[0].'&h='.$size[1].'t='.@filemtime(mediaFN($id)); + $src = ml($id, $more); + $content = ''.$id.''; + } else { + $content = ''; + } + } else { + if (@filemtime(wikiFN($id)) === $date) { + $content = p_wiki_xhtml($id, '', false); + } else { + $content = p_wiki_xhtml($id, $date, false); + } + // no TOC in feeds + $content = preg_replace('/().*()/s', '', $content); + + // add alignment for images + $content = preg_replace('/('.$id.''; + } else { + $content = ''; + } + } else { + $content = $meta['description']['abstract']; + } + } + $item->description = $content; //FIXME a plugin hook here could be senseful + + // add user + # FIXME should the user be pulled from metadata as well? + $user = @$ditem['user']; // the @ spares time repeating lookup + $item->author = ''; + if($user && $conf['useacl'] && $auth) { + $userInfo = $auth->getUserData($user); + if($userInfo) { + switch($conf['showuseras']) { + case 'username': + $item->author = $userInfo['name']; + break; + default: + $item->author = $user; + break; + } + } else { + $item->author = $user; + } + if($userInfo && !$opt['guardmail']) { + $item->authorEmail = $userInfo['mail']; + } else { + //cannot obfuscate because some RSS readers may check validity + $item->authorEmail = $user.'@'.$ditem['ip']; + } + } elseif($user) { + // this happens when no ACL but some Apache auth is used + $item->author = $user; + $item->authorEmail = $user.'@'.$ditem['ip']; + } else { + $item->authorEmail = 'anonymous@'.$ditem['ip']; + } + + // add category + if(isset($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); + } + $evt->advise_after(); // for completeness + } + } + $event->advise_after(); +} + +/** + * Add recent changed pages to the feed object + * + * @author Andreas Gohr + */ +function rssRecentChanges($opt) { + global $conf; + $flags = RECENTS_SKIP_DELETED; + if(!$opt['show_minor']) $flags += RECENTS_SKIP_MINORS; + if($opt['content_type'] == 'media' && $conf['mediarevisions']) $flags += RECENTS_MEDIA_CHANGES; + if($opt['content_type'] == 'both' && $conf['mediarevisions']) $flags += RECENTS_MEDIA_PAGES_MIXED; + + $recents = getRecents(0, $opt['items'], $opt['namespace'], $flags); + return $recents; +} + +/** + * Add all pages of a namespace to the feed object + * + * @author Andreas Gohr + */ +function rssListNamespace($opt) { + require_once(DOKU_INC.'inc/search.php'); + global $conf; + + $ns = ':'.cleanID($opt['namespace']); + $ns = str_replace(':', '/', $ns); + + $data = array(); + $search_opts = array( + 'depth' => 1, + 'pagesonly' => true, + 'listfiles' => true + ); + search($data, $conf['datadir'], 'search_universal', $search_opts, $ns); + + return $data; +} + +/** + * Add the result of a full text search to the feed object + * + * @author Andreas Gohr + */ +function rssSearch($opt) { + if(!$opt['search_query']) return array(); + + require_once(DOKU_INC.'inc/fulltext.php'); + $data = ft_pageSearch($opt['search_query'], $poswords); + $data = array_keys($data); + + return $data; +} + +//Setup VIM: ex: et ts=4 : diff --git a/sources/inc/.htaccess b/sources/inc/.htaccess new file mode 100644 index 0000000..2d9c357 --- /dev/null +++ b/sources/inc/.htaccess @@ -0,0 +1,3 @@ +## no access to the inc directory +order allow,deny +deny from all diff --git a/sources/inc/DifferenceEngine.php b/sources/inc/DifferenceEngine.php new file mode 100644 index 0000000..3c955cf --- /dev/null +++ b/sources/inc/DifferenceEngine.php @@ -0,0 +1,1237 @@ + + * @license You may copy this code freely under the conditions of the GPL. + */ +define('USE_ASSERTS', function_exists('assert')); + +class _DiffOp { + var $type; + var $orig; + var $closing; + + function reverse() { + trigger_error("pure virtual", E_USER_ERROR); + } + + function norig() { + return $this->orig ? count($this->orig) : 0; + } + + function nclosing() { + return $this->closing ? count($this->closing) : 0; + } +} + +class _DiffOp_Copy extends _DiffOp { + var $type = 'copy'; + + function __construct($orig, $closing = false) { + if (!is_array($closing)) + $closing = $orig; + $this->orig = $orig; + $this->closing = $closing; + } + + function reverse() { + return new _DiffOp_Copy($this->closing, $this->orig); + } +} + +class _DiffOp_Delete extends _DiffOp { + var $type = 'delete'; + + function __construct($lines) { + $this->orig = $lines; + $this->closing = false; + } + + function reverse() { + return new _DiffOp_Add($this->orig); + } +} + +class _DiffOp_Add extends _DiffOp { + var $type = 'add'; + + function __construct($lines) { + $this->closing = $lines; + $this->orig = false; + } + + function reverse() { + return new _DiffOp_Delete($this->closing); + } +} + +class _DiffOp_Change extends _DiffOp { + var $type = 'change'; + + function __construct($orig, $closing) { + $this->orig = $orig; + $this->closing = $closing; + } + + function reverse() { + return new _DiffOp_Change($this->closing, $this->orig); + } +} + + +/** + * Class used internally by Diff to actually compute the diffs. + * + * The algorithm used here is mostly lifted from the perl module + * Algorithm::Diff (version 1.06) by Ned Konz, which is available at: + * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip + * + * More ideas are taken from: + * http://www.ics.uci.edu/~eppstein/161/960229.html + * + * Some ideas are (and a bit of code) are from from analyze.c, from GNU + * diffutils-2.7, which can be found at: + * ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz + * + * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations) + * are my own. + * + * @author Geoffrey T. Dairiki + * @access private + */ +class _DiffEngine { + + function diff($from_lines, $to_lines) { + $n_from = count($from_lines); + $n_to = count($to_lines); + + $this->xchanged = $this->ychanged = array(); + $this->xv = $this->yv = array(); + $this->xind = $this->yind = array(); + unset($this->seq); + unset($this->in_seq); + unset($this->lcs); + + // Skip leading common lines. + for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) { + if ($from_lines[$skip] != $to_lines[$skip]) + break; + $this->xchanged[$skip] = $this->ychanged[$skip] = false; + } + // Skip trailing common lines. + $xi = $n_from; + $yi = $n_to; + for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) { + if ($from_lines[$xi] != $to_lines[$yi]) + break; + $this->xchanged[$xi] = $this->ychanged[$yi] = false; + } + + // Ignore lines which do not exist in both files. + for ($xi = $skip; $xi < $n_from - $endskip; $xi++) + $xhash[$from_lines[$xi]] = 1; + for ($yi = $skip; $yi < $n_to - $endskip; $yi++) { + $line = $to_lines[$yi]; + if (($this->ychanged[$yi] = empty($xhash[$line]))) + continue; + $yhash[$line] = 1; + $this->yv[] = $line; + $this->yind[] = $yi; + } + for ($xi = $skip; $xi < $n_from - $endskip; $xi++) { + $line = $from_lines[$xi]; + if (($this->xchanged[$xi] = empty($yhash[$line]))) + continue; + $this->xv[] = $line; + $this->xind[] = $xi; + } + + // Find the LCS. + $this->_compareseq(0, count($this->xv), 0, count($this->yv)); + + // Merge edits when possible + $this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged); + $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged); + + // Compute the edit operations. + $edits = array(); + $xi = $yi = 0; + while ($xi < $n_from || $yi < $n_to) { + USE_ASSERTS && assert($yi < $n_to || $this->xchanged[$xi]); + USE_ASSERTS && assert($xi < $n_from || $this->ychanged[$yi]); + + // Skip matching "snake". + $copy = array(); + while ($xi < $n_from && $yi < $n_to && !$this->xchanged[$xi] && !$this->ychanged[$yi]) { + $copy[] = $from_lines[$xi++]; + ++$yi; + } + if ($copy) + $edits[] = new _DiffOp_Copy($copy); + + // Find deletes & adds. + $delete = array(); + while ($xi < $n_from && $this->xchanged[$xi]) + $delete[] = $from_lines[$xi++]; + + $add = array(); + while ($yi < $n_to && $this->ychanged[$yi]) + $add[] = $to_lines[$yi++]; + + if ($delete && $add) + $edits[] = new _DiffOp_Change($delete, $add); + elseif ($delete) + $edits[] = new _DiffOp_Delete($delete); + elseif ($add) + $edits[] = new _DiffOp_Add($add); + } + return $edits; + } + + + /** + * Divide the Largest Common Subsequence (LCS) of the sequences + * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally + * sized segments. + * + * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an + * array of NCHUNKS+1 (X, Y) indexes giving the diving points between + * sub sequences. The first sub-sequence is contained in [X0, X1), + * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note + * that (X0, Y0) == (XOFF, YOFF) and + * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM). + * + * This function assumes that the first lines of the specified portions + * of the two files do not match, and likewise that the last lines do not + * match. The caller must trim matching lines from the beginning and end + * of the portions it is going to specify. + */ + function _diag($xoff, $xlim, $yoff, $ylim, $nchunks) { + $flip = false; + + if ($xlim - $xoff > $ylim - $yoff) { + // Things seems faster (I'm not sure I understand why) + // when the shortest sequence in X. + $flip = true; + list ($xoff, $xlim, $yoff, $ylim) = array($yoff, $ylim, $xoff, $xlim); + } + + if ($flip) + for ($i = $ylim - 1; $i >= $yoff; $i--) + $ymatches[$this->xv[$i]][] = $i; + else + for ($i = $ylim - 1; $i >= $yoff; $i--) + $ymatches[$this->yv[$i]][] = $i; + + $this->lcs = 0; + $this->seq[0]= $yoff - 1; + $this->in_seq = array(); + $ymids[0] = array(); + + $numer = $xlim - $xoff + $nchunks - 1; + $x = $xoff; + for ($chunk = 0; $chunk < $nchunks; $chunk++) { + if ($chunk > 0) + for ($i = 0; $i <= $this->lcs; $i++) + $ymids[$i][$chunk-1] = $this->seq[$i]; + + $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks); + for ( ; $x < $x1; $x++) { + $line = $flip ? $this->yv[$x] : $this->xv[$x]; + if (empty($ymatches[$line])) + continue; + $matches = $ymatches[$line]; + reset($matches); + while (list ($junk, $y) = each($matches)) + if (empty($this->in_seq[$y])) { + $k = $this->_lcs_pos($y); + USE_ASSERTS && assert($k > 0); + $ymids[$k] = $ymids[$k-1]; + break; + } + while (list ($junk, $y) = each($matches)) { + if ($y > $this->seq[$k-1]) { + USE_ASSERTS && assert($y < $this->seq[$k]); + // Optimization: this is a common case: + // next match is just replacing previous match. + $this->in_seq[$this->seq[$k]] = false; + $this->seq[$k] = $y; + $this->in_seq[$y] = 1; + } + else if (empty($this->in_seq[$y])) { + $k = $this->_lcs_pos($y); + USE_ASSERTS && assert($k > 0); + $ymids[$k] = $ymids[$k-1]; + } + } + } + } + + $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff); + $ymid = $ymids[$this->lcs]; + for ($n = 0; $n < $nchunks - 1; $n++) { + $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks); + $y1 = $ymid[$n] + 1; + $seps[] = $flip ? array($y1, $x1) : array($x1, $y1); + } + $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim); + + return array($this->lcs, $seps); + } + + function _lcs_pos($ypos) { + $end = $this->lcs; + if ($end == 0 || $ypos > $this->seq[$end]) { + $this->seq[++$this->lcs] = $ypos; + $this->in_seq[$ypos] = 1; + return $this->lcs; + } + + $beg = 1; + while ($beg < $end) { + $mid = (int)(($beg + $end) / 2); + if ($ypos > $this->seq[$mid]) + $beg = $mid + 1; + else + $end = $mid; + } + + USE_ASSERTS && assert($ypos != $this->seq[$end]); + + $this->in_seq[$this->seq[$end]] = false; + $this->seq[$end] = $ypos; + $this->in_seq[$ypos] = 1; + return $end; + } + + /** + * Find LCS of two sequences. + * + * The results are recorded in the vectors $this->{x,y}changed[], by + * storing a 1 in the element for each line that is an insertion + * or deletion (ie. is not in the LCS). + * + * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1. + * + * Note that XLIM, YLIM are exclusive bounds. + * All line numbers are origin-0 and discarded lines are not counted. + */ + function _compareseq($xoff, $xlim, $yoff, $ylim) { + // Slide down the bottom initial diagonal. + while ($xoff < $xlim && $yoff < $ylim && $this->xv[$xoff] == $this->yv[$yoff]) { + ++$xoff; + ++$yoff; + } + + // Slide up the top initial diagonal. + while ($xlim > $xoff && $ylim > $yoff && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) { + --$xlim; + --$ylim; + } + + if ($xoff == $xlim || $yoff == $ylim) + $lcs = 0; + else { + // This is ad hoc but seems to work well. + //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); + //$nchunks = max(2,min(8,(int)$nchunks)); + $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1; + list ($lcs, $seps) + = $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks); + } + + if ($lcs == 0) { + // X and Y sequences have no common subsequence: + // mark all changed. + while ($yoff < $ylim) + $this->ychanged[$this->yind[$yoff++]] = 1; + while ($xoff < $xlim) + $this->xchanged[$this->xind[$xoff++]] = 1; + } + else { + // Use the partitions to split this problem into subproblems. + reset($seps); + $pt1 = $seps[0]; + while ($pt2 = next($seps)) { + $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]); + $pt1 = $pt2; + } + } + } + + /** + * Adjust inserts/deletes of identical lines to join changes + * as much as possible. + * + * We do something when a run of changed lines include a + * line at one end and has an excluded, identical line at the other. + * We are free to choose which identical line is included. + * `compareseq' usually chooses the one at the beginning, + * but usually it is cleaner to consider the following identical line + * to be the "change". + * + * This is extracted verbatim from analyze.c (GNU diffutils-2.7). + */ + function _shift_boundaries($lines, &$changed, $other_changed) { + $i = 0; + $j = 0; + + USE_ASSERTS && assert('count($lines) == count($changed)'); + $len = count($lines); + $other_len = count($other_changed); + + while (1) { + /* + * Scan forwards to find beginning of another run of changes. + * Also keep track of the corresponding point in the other file. + * + * Throughout this code, $i and $j are adjusted together so that + * the first $i elements of $changed and the first $j elements + * of $other_changed both contain the same number of zeros + * (unchanged lines). + * Furthermore, $j is always kept so that $j == $other_len or + * $other_changed[$j] == false. + */ + while ($j < $other_len && $other_changed[$j]) + $j++; + + while ($i < $len && ! $changed[$i]) { + USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]'); + $i++; + $j++; + while ($j < $other_len && $other_changed[$j]) + $j++; + } + + if ($i == $len) + break; + + $start = $i; + + // Find the end of this run of changes. + while (++$i < $len && $changed[$i]) + continue; + + do { + /* + * Record the length of this run of changes, so that + * we can later determine whether the run has grown. + */ + $runlength = $i - $start; + + /* + * Move the changed region back, so long as the + * previous unchanged line matches the last changed one. + * This merges with previous changed regions. + */ + while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) { + $changed[--$start] = 1; + $changed[--$i] = false; + while ($start > 0 && $changed[$start - 1]) + $start--; + USE_ASSERTS && assert('$j > 0'); + while ($other_changed[--$j]) + continue; + USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]'); + } + + /* + * Set CORRESPONDING to the end of the changed run, at the last + * point where it corresponds to a changed run in the other file. + * CORRESPONDING == LEN means no such point has been found. + */ + $corresponding = $j < $other_len ? $i : $len; + + /* + * Move the changed region forward, so long as the + * first changed line matches the following unchanged one. + * This merges with following changed regions. + * Do this second, so that if there are no merges, + * the changed region is moved forward as far as possible. + */ + while ($i < $len && $lines[$start] == $lines[$i]) { + $changed[$start++] = false; + $changed[$i++] = 1; + while ($i < $len && $changed[$i]) + $i++; + + USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]'); + $j++; + if ($j < $other_len && $other_changed[$j]) { + $corresponding = $i; + while ($j < $other_len && $other_changed[$j]) + $j++; + } + } + } while ($runlength != $i - $start); + + /* + * If possible, move the fully-merged run of changes + * back to a corresponding run in the other file. + */ + while ($corresponding < $i) { + $changed[--$start] = 1; + $changed[--$i] = 0; + USE_ASSERTS && assert('$j > 0'); + while ($other_changed[--$j]) + continue; + USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]'); + } + } + } +} + +/** + * Class representing a 'diff' between two sequences of strings. + */ +class Diff { + + var $edits; + + /** + * Constructor. + * Computes diff between sequences of strings. + * + * @param $from_lines array An array of strings. + * (Typically these are lines from a file.) + * @param $to_lines array An array of strings. + */ + function __construct($from_lines, $to_lines) { + $eng = new _DiffEngine; + $this->edits = $eng->diff($from_lines, $to_lines); + //$this->_check($from_lines, $to_lines); + } + + /** + * Compute reversed Diff. + * + * SYNOPSIS: + * + * $diff = new Diff($lines1, $lines2); + * $rev = $diff->reverse(); + * @return object A Diff object representing the inverse of the + * original diff. + */ + function reverse() { + $rev = $this; + $rev->edits = array(); + foreach ($this->edits as $edit) { + $rev->edits[] = $edit->reverse(); + } + return $rev; + } + + /** + * Check for empty diff. + * + * @return bool True iff two sequences were identical. + */ + function isEmpty() { + foreach ($this->edits as $edit) { + if ($edit->type != 'copy') + return false; + } + return true; + } + + /** + * Compute the length of the Longest Common Subsequence (LCS). + * + * This is mostly for diagnostic purposed. + * + * @return int The length of the LCS. + */ + function lcs() { + $lcs = 0; + foreach ($this->edits as $edit) { + if ($edit->type == 'copy') + $lcs += count($edit->orig); + } + return $lcs; + } + + /** + * Get the original set of lines. + * + * This reconstructs the $from_lines parameter passed to the + * constructor. + * + * @return array The original sequence of strings. + */ + function orig() { + $lines = array(); + + foreach ($this->edits as $edit) { + if ($edit->orig) + array_splice($lines, count($lines), 0, $edit->orig); + } + return $lines; + } + + /** + * Get the closing set of lines. + * + * This reconstructs the $to_lines parameter passed to the + * constructor. + * + * @return array The sequence of strings. + */ + function closing() { + $lines = array(); + + foreach ($this->edits as $edit) { + if ($edit->closing) + array_splice($lines, count($lines), 0, $edit->closing); + } + return $lines; + } + + /** + * Check a Diff for validity. + * + * This is here only for debugging purposes. + */ + function _check($from_lines, $to_lines) { + if (serialize($from_lines) != serialize($this->orig())) + trigger_error("Reconstructed original doesn't match", E_USER_ERROR); + if (serialize($to_lines) != serialize($this->closing())) + trigger_error("Reconstructed closing doesn't match", E_USER_ERROR); + + $rev = $this->reverse(); + if (serialize($to_lines) != serialize($rev->orig())) + trigger_error("Reversed original doesn't match", E_USER_ERROR); + if (serialize($from_lines) != serialize($rev->closing())) + trigger_error("Reversed closing doesn't match", E_USER_ERROR); + + $prevtype = 'none'; + foreach ($this->edits as $edit) { + if ($prevtype == $edit->type) + trigger_error("Edit sequence is non-optimal", E_USER_ERROR); + $prevtype = $edit->type; + } + + $lcs = $this->lcs(); + trigger_error("Diff okay: LCS = $lcs", E_USER_NOTICE); + } +} + +/** + * FIXME: bad name. + */ +class MappedDiff extends Diff { + /** + * Constructor. + * + * Computes diff between sequences of strings. + * + * This can be used to compute things like + * case-insensitve diffs, or diffs which ignore + * changes in white-space. + * + * @param $from_lines array An array of strings. + * (Typically these are lines from a file.) + * + * @param $to_lines array An array of strings. + * + * @param $mapped_from_lines array This array should + * have the same size number of elements as $from_lines. + * The elements in $mapped_from_lines and + * $mapped_to_lines are what is actually compared + * when computing the diff. + * + * @param $mapped_to_lines array This array should + * have the same number of elements as $to_lines. + */ + function __construct($from_lines, $to_lines, $mapped_from_lines, $mapped_to_lines) { + + assert(count($from_lines) == count($mapped_from_lines)); + assert(count($to_lines) == count($mapped_to_lines)); + + parent::__construct($mapped_from_lines, $mapped_to_lines); + + $xi = $yi = 0; + $ecnt = count($this->edits); + for ($i = 0; $i < $ecnt; $i++) { + $orig = &$this->edits[$i]->orig; + if (is_array($orig)) { + $orig = array_slice($from_lines, $xi, count($orig)); + $xi += count($orig); + } + + $closing = &$this->edits[$i]->closing; + if (is_array($closing)) { + $closing = array_slice($to_lines, $yi, count($closing)); + $yi += count($closing); + } + } + } +} + +/** + * A class to format Diffs + * + * This class formats the diff in classic diff format. + * It is intended that this class be customized via inheritance, + * to obtain fancier outputs. + */ +class DiffFormatter { + /** + * Number of leading context "lines" to preserve. + * + * This should be left at zero for this class, but subclasses + * may want to set this to other values. + */ + var $leading_context_lines = 0; + + /** + * Number of trailing context "lines" to preserve. + * + * This should be left at zero for this class, but subclasses + * may want to set this to other values. + */ + var $trailing_context_lines = 0; + + /** + * Format a diff. + * + * @param $diff object A Diff object. + * @return string The formatted output. + */ + function format($diff) { + + $xi = $yi = 1; + $block = false; + $context = array(); + + $nlead = $this->leading_context_lines; + $ntrail = $this->trailing_context_lines; + + $this->_start_diff(); + + foreach ($diff->edits as $edit) { + if ($edit->type == 'copy') { + if (is_array($block)) { + if (count($edit->orig) <= $nlead + $ntrail) { + $block[] = $edit; + } + else{ + if ($ntrail) { + $context = array_slice($edit->orig, 0, $ntrail); + $block[] = new _DiffOp_Copy($context); + } + $this->_block($x0, $ntrail + $xi - $x0, $y0, $ntrail + $yi - $y0, $block); + $block = false; + } + } + $context = $edit->orig; + } + else { + if (! is_array($block)) { + $context = array_slice($context, count($context) - $nlead); + $x0 = $xi - count($context); + $y0 = $yi - count($context); + $block = array(); + if ($context) + $block[] = new _DiffOp_Copy($context); + } + $block[] = $edit; + } + + if ($edit->orig) + $xi += count($edit->orig); + if ($edit->closing) + $yi += count($edit->closing); + } + + if (is_array($block)) + $this->_block($x0, $xi - $x0, $y0, $yi - $y0, $block); + + return $this->_end_diff(); + } + + function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) { + $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen)); + foreach ($edits as $edit) { + if ($edit->type == 'copy') + $this->_context($edit->orig); + elseif ($edit->type == 'add') + $this->_added($edit->closing); + elseif ($edit->type == 'delete') + $this->_deleted($edit->orig); + elseif ($edit->type == 'change') + $this->_changed($edit->orig, $edit->closing); + else + trigger_error("Unknown edit type", E_USER_ERROR); + } + $this->_end_block(); + } + + function _start_diff() { + ob_start(); + } + + function _end_diff() { + $val = ob_get_contents(); + ob_end_clean(); + return $val; + } + + function _block_header($xbeg, $xlen, $ybeg, $ylen) { + if ($xlen > 1) + $xbeg .= "," . ($xbeg + $xlen - 1); + if ($ylen > 1) + $ybeg .= "," . ($ybeg + $ylen - 1); + + return $xbeg . ($xlen ? ($ylen ? 'c' : 'd') : 'a') . $ybeg; + } + + function _start_block($header) { + echo $header; + } + + function _end_block() { + } + + function _lines($lines, $prefix = ' ') { + foreach ($lines as $line) + echo "$prefix ".$this->_escape($line)."\n"; + } + + function _context($lines) { + $this->_lines($lines); + } + + function _added($lines) { + $this->_lines($lines, ">"); + } + function _deleted($lines) { + $this->_lines($lines, "<"); + } + + function _changed($orig, $closing) { + $this->_deleted($orig); + echo "---\n"; + $this->_added($closing); + } + + /** + * Escape string + * + * Override this method within other formatters if escaping required. + * Base class requires $str to be returned WITHOUT escaping. + * + * @param $str string Text string to escape + * @return string The escaped string. + */ + function _escape($str){ + return $str; + } +} + +/** + * Utilityclass for styling HTML formatted diffs + * + * Depends on global var $DIFF_INLINESTYLES, if true some minimal predefined + * inline styles are used. Useful for HTML mails and RSS feeds + * + * @author Andreas Gohr + */ +class HTMLDiff { + /** + * Holds the style names and basic CSS + */ + static public $styles = array( + 'diff-addedline' => 'background-color: #ddffdd;', + 'diff-deletedline' => 'background-color: #ffdddd;', + 'diff-context' => 'background-color: #f5f5f5;', + 'diff-mark' => 'color: #ff0000;', + ); + + /** + * Return a class or style parameter + */ + static function css($classname){ + global $DIFF_INLINESTYLES; + + if($DIFF_INLINESTYLES){ + if(!isset(self::$styles[$classname])) return ''; + return 'style="'.self::$styles[$classname].'"'; + }else{ + return 'class="'.$classname.'"'; + } + } +} + +/** + * Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3 + * + */ + +define('NBSP', "\xC2\xA0"); // utf-8 non-breaking space. + +class _HWLDF_WordAccumulator { + + function __construct() { + $this->_lines = array(); + $this->_line = ''; + $this->_group = ''; + $this->_tag = ''; + } + + function _flushGroup($new_tag) { + if ($this->_group !== '') { + if ($this->_tag == 'mark') + $this->_line .= ''.$this->_escape($this->_group).''; + elseif ($this->_tag == 'add') + $this->_line .= ''.$this->_escape($this->_group).''; + elseif ($this->_tag == 'del') + $this->_line .= ''.$this->_escape($this->_group).''; + else + $this->_line .= $this->_escape($this->_group); + } + $this->_group = ''; + $this->_tag = $new_tag; + } + + function _flushLine($new_tag) { + $this->_flushGroup($new_tag); + if ($this->_line != '') + $this->_lines[] = $this->_line; + $this->_line = ''; + } + + function addWords($words, $tag = '') { + if ($tag != $this->_tag) + $this->_flushGroup($tag); + + foreach ($words as $word) { + // new-line should only come as first char of word. + if ($word == '') + continue; + if ($word[0] == "\n") { + $this->_group .= NBSP; + $this->_flushLine($tag); + $word = substr($word, 1); + } + assert(!strstr($word, "\n")); + $this->_group .= $word; + } + } + + function getLines() { + $this->_flushLine('~done'); + return $this->_lines; + } + + function _escape($str){ + return hsc($str); + } +} + +class WordLevelDiff extends MappedDiff { + + function __construct($orig_lines, $closing_lines) { + list ($orig_words, $orig_stripped) = $this->_split($orig_lines); + list ($closing_words, $closing_stripped) = $this->_split($closing_lines); + + parent::__construct($orig_words, $closing_words, $orig_stripped, $closing_stripped); + } + + function _split($lines) { + if (!preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xsu', + implode("\n", $lines), $m)) { + return array(array(''), array('')); + } + return array($m[0], $m[1]); + } + + function orig() { + $orig = new _HWLDF_WordAccumulator; + + foreach ($this->edits as $edit) { + if ($edit->type == 'copy') + $orig->addWords($edit->orig); + elseif ($edit->orig) + $orig->addWords($edit->orig, 'mark'); + } + return $orig->getLines(); + } + + function closing() { + $closing = new _HWLDF_WordAccumulator; + + foreach ($this->edits as $edit) { + if ($edit->type == 'copy') + $closing->addWords($edit->closing); + elseif ($edit->closing) + $closing->addWords($edit->closing, 'mark'); + } + return $closing->getLines(); + } +} + +class InlineWordLevelDiff extends MappedDiff { + + function __construct($orig_lines, $closing_lines) { + list ($orig_words, $orig_stripped) = $this->_split($orig_lines); + list ($closing_words, $closing_stripped) = $this->_split($closing_lines); + + parent::__construct($orig_words, $closing_words, $orig_stripped, $closing_stripped); + } + + function _split($lines) { + if (!preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xsu', + implode("\n", $lines), $m)) { + return array(array(''), array('')); + } + return array($m[0], $m[1]); + } + + function inline() { + $orig = new _HWLDF_WordAccumulator; + foreach ($this->edits as $edit) { + if ($edit->type == 'copy') + $orig->addWords($edit->closing); + elseif ($edit->type == 'change'){ + $orig->addWords($edit->orig, 'del'); + $orig->addWords($edit->closing, 'add'); + } elseif ($edit->type == 'delete') + $orig->addWords($edit->orig, 'del'); + elseif ($edit->type == 'add') + $orig->addWords($edit->closing, 'add'); + elseif ($edit->orig) + $orig->addWords($edit->orig, 'del'); + } + return $orig->getLines(); + } +} + +/** + * "Unified" diff formatter. + * + * This class formats the diff in classic "unified diff" format. + * + * NOTE: output is plain text and unsafe for use in HTML without escaping. + */ +class UnifiedDiffFormatter extends DiffFormatter { + + function __construct($context_lines = 4) { + $this->leading_context_lines = $context_lines; + $this->trailing_context_lines = $context_lines; + } + + function _block_header($xbeg, $xlen, $ybeg, $ylen) { + if ($xlen != 1) + $xbeg .= "," . $xlen; + if ($ylen != 1) + $ybeg .= "," . $ylen; + return "@@ -$xbeg +$ybeg @@\n"; + } + + function _added($lines) { + $this->_lines($lines, "+"); + } + function _deleted($lines) { + $this->_lines($lines, "-"); + } + function _changed($orig, $final) { + $this->_deleted($orig); + $this->_added($final); + } +} + +/** + * Wikipedia Table style diff formatter. + * + */ +class TableDiffFormatter extends DiffFormatter { + var $colspan = 2; + + function __construct() { + $this->leading_context_lines = 2; + $this->trailing_context_lines = 2; + } + + function format($diff) { + // Preserve whitespaces by converting some to non-breaking spaces. + // Do not convert all of them to allow word-wrap. + $val = parent::format($diff); + $val = str_replace(' ','  ', $val); + $val = preg_replace('/ (?=<)|(?<=[ >]) /', ' ', $val); + return $val; + } + + function _pre($text){ + $text = htmlspecialchars($text); + return $text; + } + + function _block_header($xbeg, $xlen, $ybeg, $ylen) { + global $lang; + $l1 = $lang['line'].' '.$xbeg; + $l2 = $lang['line'].' '.$ybeg; + $r = ''.$l1.":\n". + ''.$l2.":\n". + "\n"; + return $r; + } + + function _start_block($header) { + print($header); + } + + function _end_block() { + } + + function _lines($lines, $prefix=' ', $color="white") { + } + + function addedLine($line,$escaped=false) { + if (!$escaped){ + $line = $this->_escape($line); + } + return '+'. + '' . $line.''; + } + + function deletedLine($line,$escaped=false) { + if (!$escaped){ + $line = $this->_escape($line); + } + return '-'. + '' . $line.''; + } + + function emptyLine() { + return ' '; + } + + function contextLine($line) { + return ' '. + ''.$this->_escape($line).''; + } + + function _added($lines) { + $this->_addedLines($lines,false); + } + + function _addedLines($lines,$escaped=false){ + foreach ($lines as $line) { + print('' . $this->emptyLine() . $this->addedLine($line,$escaped) . "\n"); + } + } + + function _deleted($lines) { + foreach ($lines as $line) { + print('' . $this->deletedLine($line) . $this->emptyLine() . "\n"); + } + } + + function _context($lines) { + foreach ($lines as $line) { + print('' . $this->contextLine($line) . $this->contextLine($line) . "\n"); + } + } + + function _changed($orig, $closing) { + $diff = new WordLevelDiff($orig, $closing); // this escapes the diff data + $del = $diff->orig(); + $add = $diff->closing(); + + while ($line = array_shift($del)) { + $aline = array_shift($add); + print('' . $this->deletedLine($line,true) . $this->addedLine($aline,true) . "\n"); + } + $this->_addedLines($add,true); # If any leftovers + } + + function _escape($str) { + return hsc($str); + } +} + +/** + * Inline style diff formatter. + * + */ +class InlineDiffFormatter extends DiffFormatter { + var $colspan = 2; + + function __construct() { + $this->leading_context_lines = 2; + $this->trailing_context_lines = 2; + } + + function format($diff) { + // Preserve whitespaces by converting some to non-breaking spaces. + // Do not convert all of them to allow word-wrap. + $val = parent::format($diff); + $val = str_replace(' ','  ', $val); + $val = preg_replace('/ (?=<)|(?<=[ >]) /', ' ', $val); + return $val; + } + + function _pre($text){ + $text = htmlspecialchars($text); + return $text; + } + + function _block_header($xbeg, $xlen, $ybeg, $ylen) { + global $lang; + if ($xlen != 1) + $xbeg .= "," . $xlen; + if ($ylen != 1) + $ybeg .= "," . $ylen; + $r = '@@ '.$lang['line']." -$xbeg +$ybeg @@"; + $r .= ' '.$lang['deleted'].''; + $r .= ' '.$lang['created'].''; + $r .= "\n"; + return $r; + } + + function _start_block($header) { + print($header."\n"); + } + + function _end_block() { + } + + function _lines($lines, $prefix=' ', $color="white") { + } + + function _added($lines) { + foreach ($lines as $line) { + print(' '. $this->_escape($line) . "\n"); + } + } + + function _deleted($lines) { + foreach ($lines as $line) { + print(' ' . $this->_escape($line) . "\n"); + } + } + + function _context($lines) { + foreach ($lines as $line) { + print(' '. $this->_escape($line) ."\n"); + } + } + + function _changed($orig, $closing) { + $diff = new InlineWordLevelDiff($orig, $closing); // this escapes the diff data + $add = $diff->inline(); + + foreach ($add as $line) + print(' '.$line."\n"); + } + + function _escape($str) { + return hsc($str); + } +} + + +//Setup VIM: ex: et ts=4 : diff --git a/sources/inc/EmailAddressValidator.php b/sources/inc/EmailAddressValidator.php new file mode 100644 index 0000000..bb4ef0c --- /dev/null +++ b/sources/inc/EmailAddressValidator.php @@ -0,0 +1,191 @@ + + * @link http://code.google.com/p/php-email-address-validation/ + * @license http://www.opensource.org/licenses/bsd-license.php + * @version SVN r10 + Issue 15 fix + Issue 12 fix + */ +class EmailAddressValidator { + /** + * Set true to allow addresses like me@localhost + */ + public $allowLocalAddresses = false; + + /** + * Check email address validity + * @param strEmailAddress Email address to be checked + * @return True if email is valid, false if not + */ + public function check_email_address($strEmailAddress) { + + // If magic quotes is "on", email addresses with quote marks will + // fail validation because of added escape characters. Uncommenting + // the next three lines will allow for this issue. + //if (get_magic_quotes_gpc()) { + // $strEmailAddress = stripslashes($strEmailAddress); + //} + + // Control characters are not allowed + if (preg_match('/[\x00-\x1F\x7F-\xFF]/', $strEmailAddress)) { + return false; + } + + // Check email length - min 3 (a@a), max 256 + if (!$this->check_text_length($strEmailAddress, 3, 256)) { + return false; + } + + // Split it into sections using last instance of "@" + $intAtSymbol = strrpos($strEmailAddress, '@'); + if ($intAtSymbol === false) { + // No "@" symbol in email. + return false; + } + $arrEmailAddress[0] = substr($strEmailAddress, 0, $intAtSymbol); + $arrEmailAddress[1] = substr($strEmailAddress, $intAtSymbol + 1); + + // Count the "@" symbols. Only one is allowed, except where + // contained in quote marks in the local part. Quickest way to + // check this is to remove anything in quotes. We also remove + // characters escaped with backslash, and the backslash + // character. + $arrTempAddress[0] = preg_replace('/\./' + ,'' + ,$arrEmailAddress[0]); + $arrTempAddress[0] = preg_replace('/"[^"]+"/' + ,'' + ,$arrTempAddress[0]); + $arrTempAddress[1] = $arrEmailAddress[1]; + $strTempAddress = $arrTempAddress[0] . $arrTempAddress[1]; + // Then check - should be no "@" symbols. + if (strrpos($strTempAddress, '@') !== false) { + // "@" symbol found + return false; + } + + // Check local portion + if (!$this->check_local_portion($arrEmailAddress[0])) { + return false; + } + + // Check domain portion + if (!$this->check_domain_portion($arrEmailAddress[1])) { + return false; + } + + // If we're still here, all checks above passed. Email is valid. + return true; + + } + + /** + * Checks email section before "@" symbol for validity + * @param strLocalPortion Text to be checked + * @return True if local portion is valid, false if not + */ + protected function check_local_portion($strLocalPortion) { + // Local portion can only be from 1 to 64 characters, inclusive. + // Please note that servers are encouraged to accept longer local + // parts than 64 characters. + if (!$this->check_text_length($strLocalPortion, 1, 64)) { + return false; + } + // Local portion must be: + // 1) a dot-atom (strings separated by periods) + // 2) a quoted string + // 3) an obsolete format string (combination of the above) + $arrLocalPortion = explode('.', $strLocalPortion); + for ($i = 0, $max = sizeof($arrLocalPortion); $i < $max; $i++) { + if (!preg_match('.^(' + . '([A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]' + . '[A-Za-z0-9!#$%&\'*+/=?^_`{|}~-]{0,63})' + .'|' + . '("[^\\\"]{0,62}")' + .')$.' + ,$arrLocalPortion[$i])) { + return false; + } + } + return true; + } + + /** + * Checks email section after "@" symbol for validity + * @param strDomainPortion Text to be checked + * @return True if domain portion is valid, false if not + */ + protected function check_domain_portion($strDomainPortion) { + // Total domain can only be from 1 to 255 characters, inclusive + if (!$this->check_text_length($strDomainPortion, 1, 255)) { + return false; + } + + // some IPv4/v6 regexps borrowed from Feyd + // see: http://forums.devnetwork.net/viewtopic.php?f=38&t=53479 + $dec_octet = '(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|[0-9])'; + $hex_digit = '[A-Fa-f0-9]'; + $h16 = "{$hex_digit}{1,4}"; + $IPv4Address = "$dec_octet\\.$dec_octet\\.$dec_octet\\.$dec_octet"; + $ls32 = "(?:$h16:$h16|$IPv4Address)"; + $IPv6Address = + "(?:(?:{$IPv4Address})|(?:". + "(?:$h16:){6}$ls32" . + "|::(?:$h16:){5}$ls32" . + "|(?:$h16)?::(?:$h16:){4}$ls32" . + "|(?:(?:$h16:){0,1}$h16)?::(?:$h16:){3}$ls32" . + "|(?:(?:$h16:){0,2}$h16)?::(?:$h16:){2}$ls32" . + "|(?:(?:$h16:){0,3}$h16)?::(?:$h16:){1}$ls32" . + "|(?:(?:$h16:){0,4}$h16)?::$ls32" . + "|(?:(?:$h16:){0,5}$h16)?::$h16" . + "|(?:(?:$h16:){0,6}$h16)?::" . + ")(?:\\/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))?)"; + + // Check if domain is IP, possibly enclosed in square brackets. + if (preg_match("/^($IPv4Address|\[$IPv4Address\]|\[$IPv6Address\])$/", + $strDomainPortion)){ + return true; + } else { + $arrDomainPortion = explode('.', $strDomainPortion); + if (!$this->allowLocalAddresses && sizeof($arrDomainPortion) < 2) { + return false; // Not enough parts to domain + } + for ($i = 0, $max = sizeof($arrDomainPortion); $i < $max; $i++) { + // Each portion must be between 1 and 63 characters, inclusive + if (!$this->check_text_length($arrDomainPortion[$i], 1, 63)) { + return false; + } + if (!preg_match('/^(([A-Za-z0-9][A-Za-z0-9-]{0,61}[A-Za-z0-9])|' + .'([A-Za-z0-9]+))$/', $arrDomainPortion[$i])) { + return false; + } + if ($i == $max - 1) { // TLD cannot be only numbers + if (strlen(preg_replace('/[0-9]/', '', $arrDomainPortion[$i])) <= 0) { + return false; + } + } + } + } + return true; + } + + /** + * Check given text length is between defined bounds + * @param strText Text to be checked + * @param intMinimum Minimum acceptable length + * @param intMaximum Maximum acceptable length + * @return True if string is within bounds (inclusive), false if not + */ + protected function check_text_length($strText, $intMinimum, $intMaximum) { + // Minimum and maximum are both inclusive + $intTextLength = strlen($strText); + if (($intTextLength < $intMinimum) || ($intTextLength > $intMaximum)) { + return false; + } else { + return true; + } + } + +} + diff --git a/sources/inc/FeedParser.php b/sources/inc/FeedParser.php new file mode 100644 index 0000000..96d32e8 --- /dev/null +++ b/sources/inc/FeedParser.php @@ -0,0 +1,76 @@ + + */ + +if(!defined('DOKU_INC')) die('meh.'); + +/** + * We override some methods of the original SimplePie class here + */ +class FeedParser extends SimplePie { + + /** + * Constructor. Set some defaults + */ + function __construct(){ + parent::__construct(); + $this->enable_cache(false); + $this->set_file_class('FeedParser_File'); + } + + /** + * Backward compatibility for older plugins + */ + function feed_url($url){ + $this->set_feed_url($url); + } +} + +/** + * Fetch an URL using our own HTTPClient + * + * Replaces SimplePie's own class + */ +class FeedParser_File extends SimplePie_File { + var $http; + var $useragent; + var $success = true; + var $headers = array(); + var $body; + var $error; + + /** + * Inititializes the HTTPClient + * + * We ignore all given parameters - they are set in DokuHTTPClient + */ + function __construct($url, $timeout=10, $redirects=5, + $headers=null, $useragent=null, $force_fsockopen=false) { + $this->http = new DokuHTTPClient(); + $this->success = $this->http->sendRequest($url); + + $this->headers = $this->http->resp_headers; + $this->body = $this->http->resp_body; + $this->error = $this->http->error; + + $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN; + + return $this->success; + } + + function headers(){ + return $this->headers; + } + + function body(){ + return $this->body; + } + + function close(){ + return true; + } + +} diff --git a/sources/inc/HTTPClient.php b/sources/inc/HTTPClient.php new file mode 100644 index 0000000..96954fb --- /dev/null +++ b/sources/inc/HTTPClient.php @@ -0,0 +1,856 @@ + + */ + + +define('HTTP_NL',"\r\n"); + + +/** + * Adds DokuWiki specific configs to the HTTP client + * + * @author Andreas Goetz + */ +class DokuHTTPClient extends HTTPClient { + + /** + * Constructor. + * + * @author Andreas Gohr + */ + function __construct(){ + global $conf; + + // call parent constructor + parent::__construct(); + + // set some values from the config + $this->proxy_host = $conf['proxy']['host']; + $this->proxy_port = $conf['proxy']['port']; + $this->proxy_user = $conf['proxy']['user']; + $this->proxy_pass = conf_decodeString($conf['proxy']['pass']); + $this->proxy_ssl = $conf['proxy']['ssl']; + $this->proxy_except = $conf['proxy']['except']; + } + + + /** + * 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); + } + +} + +class HTTPClientException extends Exception { } + +/** + * This class implements a basic HTTP client + * + * It supports POST and GET, Proxy usage, basic authentication, + * handles cookies and referers. It is based upon the httpclient + * function from the VideoDB project. + * + * @link http://www.splitbrain.org/go/videodb + * @author Andreas Goetz + * @author Andreas Gohr + * @author Tobias Sarnowski + */ +class HTTPClient { + //set these if you like + var $agent; // User agent + var $http; // HTTP version defaults to 1.0 + var $timeout; // read timeout (seconds) + var $cookies; + var $referer; + var $max_redirect; + var $max_bodysize; + var $max_bodysize_abort = true; // if set, abort if the response body is bigger than max_bodysize + var $header_regexp; // if set this RE must match against the headers, else abort + var $headers; + var $debug; + var $start = 0; // for timings + var $keep_alive = true; // keep alive rocks + + // don't set these, read on error + var $error; + var $redirect_count; + + // read these after a successful request + var $status; + var $resp_body; + var $resp_headers; + + // set these to do basic authentication + var $user; + var $pass; + + // set these if you need to use a proxy + var $proxy_host; + var $proxy_port; + var $proxy_user; + var $proxy_pass; + var $proxy_ssl; //boolean set to true if your proxy needs SSL + var $proxy_except; // regexp of URLs to exclude from proxy + + // list of kept alive connections + static $connections = array(); + + // what we use as boundary on multipart/form-data posts + var $boundary = '---DokuWikiHTTPClient--4523452351'; + + /** + * Constructor. + * + * @author Andreas Gohr + */ + function __construct(){ + $this->agent = 'Mozilla/4.0 (compatible; DokuWiki HTTP Client; '.PHP_OS.')'; + $this->timeout = 15; + $this->cookies = array(); + $this->referer = ''; + $this->max_redirect = 3; + $this->redirect_count = 0; + $this->status = 0; + $this->headers = array(); + $this->http = '1.0'; + $this->debug = false; + $this->max_bodysize = 0; + $this->header_regexp= ''; + if(extension_loaded('zlib')) $this->headers['Accept-encoding'] = 'gzip'; + $this->headers['Accept'] = 'text/xml,application/xml,application/xhtml+xml,'. + 'text/html,text/plain,image/png,image/jpeg,image/gif,*/*'; + $this->headers['Accept-Language'] = 'en-us'; + } + + + /** + * Simple function to do a GET request + * + * Returns the wanted page or false on an error; + * + * @param string $url The URL to fetch + * @param bool $sloppy304 Return body on 304 not modified + * @return bool|string response body, false on error + * @author Andreas Gohr + */ + function get($url,$sloppy304=false){ + if(!$this->sendRequest($url)) return false; + if($this->status == 304 && $sloppy304) return $this->resp_body; + if($this->status < 200 || $this->status > 206) return false; + return $this->resp_body; + } + + /** + * Simple function to do a GET request with given parameters + * + * Returns the wanted page or false on an error. + * + * This is a convenience wrapper around get(). The given parameters + * will be correctly encoded and added to the given base URL. + * + * @param string $url The URL to fetch + * @param array $data Associative array of parameters + * @param bool $sloppy304 Return body on 304 not modified + * @return bool|string response body, false on error + * @author Andreas Gohr + */ + function dget($url,$data,$sloppy304=false){ + if(strpos($url,'?')){ + $url .= '&'; + }else{ + $url .= '?'; + } + $url .= $this->_postEncode($data); + return $this->get($url,$sloppy304); + } + + /** + * Simple function to do a POST request + * + * Returns the resulting page or false on an error; + * + * @param string $url The URL to fetch + * @param array $data Associative array of parameters + * @return bool|string response body, false on error + * @author Andreas Gohr + */ + function post($url,$data){ + if(!$this->sendRequest($url,$data,'POST')) return false; + if($this->status < 200 || $this->status > 206) return false; + return $this->resp_body; + } + + /** + * Send an HTTP request + * + * This method handles the whole HTTP communication. It respects set proxy settings, + * builds the request headers, follows redirects and parses the response. + * + * Post data should be passed as associative array. When passed as string it will be + * sent as is. You will need to setup your own Content-Type header then. + * + * @param string $url - the complete URL + * @param mixed $data - the post data either as array or raw data + * @param string $method - HTTP Method usually GET or POST. + * @return bool - true on success + * @author Andreas Goetz + * @author Andreas Gohr + */ + function sendRequest($url,$data='',$method='GET'){ + $this->start = $this->_time(); + $this->error = ''; + $this->status = 0; + $this->status = 0; + $this->resp_body = ''; + $this->resp_headers = array(); + + // 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']; + $path = $uri['path']; + if(empty($path)) $path = '/'; + if(!empty($uri['query'])) $path .= '?'.$uri['query']; + if(!empty($uri['port'])) $port = $uri['port']; + if(isset($uri['user'])) $this->user = $uri['user']; + if(isset($uri['pass'])) $this->pass = $uri['pass']; + + // proxy setup + if($this->proxy_host && (!$this->proxy_except || !preg_match('/'.$this->proxy_except.'/i',$url)) ){ + $request_url = $url; + $server = $this->proxy_host; + $port = $this->proxy_port; + if (empty($port)) $port = 8080; + }else{ + $request_url = $path; + $server = $server; + if (!isset($port)) $port = ($uri['scheme'] == 'https') ? 443 : 80; + } + + // add SSL stream prefix if needed - needs SSL support in PHP + if($port == 443 || $this->proxy_ssl) $server = 'ssl://'.$server; + + // prepare headers + $headers = $this->headers; + $headers['Host'] = $uri['host']; + if(!empty($uri['port'])) $headers['Host'].= ':'.$uri['port']; + $headers['User-Agent'] = $this->agent; + $headers['Referer'] = $this->referer; + + if($method == 'POST'){ + if(is_array($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'; + }elseif($method == 'GET'){ + $data = ''; //no data allowed on GET requests + } + if($this->user) { + $headers['Authorization'] = 'Basic '.base64_encode($this->user.':'.$this->pass); + } + if($this->proxy_user) { + $headers['Proxy-Authorization'] = 'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass); + } + + // already connected? + $connectionId = $this->_uniqueConnectionId($server,$port); + $this->_debug('connection pool', self::$connections); + $socket = null; + if (isset(self::$connections[$connectionId])) { + $this->_debug('reusing connection', $connectionId); + $socket = self::$connections[$connectionId]; + } + if (is_null($socket) || feof($socket)) { + $this->_debug('opening connection', $connectionId); + // open socket + $socket = @fsockopen($server,$port,$errno, $errstr, $this->timeout); + if (!$socket){ + $this->status = -100; + $this->error = "Could not connect to $server:$port\n$errstr ($errno)"; + return false; + } + + // try establish a CONNECT tunnel for SSL + if($this->_ssltunnel($socket, $request_url)){ + // no keep alive for tunnels + $this->keep_alive = false; + // tunnel is authed already + if(isset($headers['Proxy-Authentication'])) unset($headers['Proxy-Authentication']); + } + + // keep alive? + if ($this->keep_alive) { + self::$connections[$connectionId] = $socket; + } else { + unset(self::$connections[$connectionId]); + } + } + + if ($this->keep_alive && !$this->proxy_host) { + // RFC 2068, section 19.7.1: A client MUST NOT send the Keep-Alive + // connection token to a proxy server. We still do keep the connection the + // proxy alive (well except for CONNECT tunnels) + $headers['Connection'] = 'Keep-Alive'; + } else { + $headers['Connection'] = 'Close'; + } + + try { + //set non-blocking + stream_set_blocking($socket, false); + + // build request + $request = "$method $request_url HTTP/".$this->http.HTTP_NL; + $request .= $this->_buildHeaders($headers); + $request .= $this->_getCookies(); + $request .= HTTP_NL; + $request .= $data; + + $this->_debug('request',$request); + $this->_sendData($socket, $request, 'request'); + + // read headers from socket + $r_headers = ''; + do{ + $r_line = $this->_readLine($socket, 'headers'); + $r_headers .= $r_line; + }while($r_line != "\r\n" && $r_line != "\n"); + + $this->_debug('response headers',$r_headers); + + // check if expected body size exceeds allowance + if($this->max_bodysize && preg_match('/\r?\nContent-Length:\s*(\d+)\r?\n/i',$r_headers,$match)){ + if($match[1] > $this->max_bodysize){ + if ($this->max_bodysize_abort) + throw new HTTPClientException('Reported content length exceeds allowed response size'); + else + $this->error = 'Reported content length exceeds allowed response size'; + } + } + + // get Status + if (!preg_match('/^HTTP\/(\d\.\d)\s*(\d+).*?\n/', $r_headers, $m)) + throw new HTTPClientException('Server returned bad answer'); + + $this->status = $m[2]; + + // 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 $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; + } + } + } + + $this->_debug('Object headers',$this->resp_headers); + + // check server status code to follow redirect + if($this->status == 301 || $this->status == 302 ){ + if (empty($this->resp_headers['location'])){ + throw new HTTPClientException('Redirect but no Location Header found'); + }elseif($this->redirect_count == $this->max_redirect){ + throw new HTTPClientException('Maximum number of redirects exceeded'); + }else{ + // close the connection because we don't handle content retrieval here + // that's the easiest way to clean up the connection + fclose($socket); + unset(self::$connections[$connectionId]); + + $this->redirect_count++; + $this->referer = $url; + // handle non-RFC-compliant relative redirects + if (!preg_match('/^http/i', $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'); + } + } + + // check if headers are as expected + if($this->header_regexp && !preg_match($this->header_regexp,$r_headers)) + throw new HTTPClientException('The received headers did not match the given regexp'); + + //read body (with chunked encoding if needed) + $r_body = ''; + if((isset($this->resp_headers['transfer-encoding']) && $this->resp_headers['transfer-encoding'] == 'chunked') + || (isset($this->resp_headers['transfer-coding']) && $this->resp_headers['transfer-coding'] == 'chunked')){ + $abort = false; + do { + $chunk_size = ''; + while (preg_match('/^[a-zA-Z0-9]?$/',$byte=$this->_readData($socket,1,'chunk'))){ + // read chunksize until \r + $chunk_size .= $byte; + if (strlen($chunk_size) > 128) // set an abritrary limit on the size of chunks + throw new HTTPClientException('Allowed response size exceeded'); + } + $this->_readLine($socket, 'chunk'); // readtrailing \n + $chunk_size = hexdec($chunk_size); + + if($this->max_bodysize && $chunk_size+strlen($r_body) > $this->max_bodysize){ + if ($this->max_bodysize_abort) + throw new HTTPClientException('Allowed response size exceeded'); + $this->error = 'Allowed response size exceeded'; + $chunk_size = $this->max_bodysize - strlen($r_body); + $abort = true; + } + + if ($chunk_size > 0) { + $r_body .= $this->_readData($socket, $chunk_size, 'chunk'); + $byte = $this->_readData($socket, 2, 'chunk'); // read trailing \r\n + } + } while ($chunk_size && !$abort); + }elseif(isset($this->resp_headers['content-length']) && !isset($this->resp_headers['transfer-encoding'])){ + /* RFC 2616 + * If a message is received with both a Transfer-Encoding header field and a Content-Length + * header field, the latter MUST be ignored. + */ + + // read up to the content-length or max_bodysize + // for keep alive we need to read the whole message to clean up the socket for the next read + if(!$this->keep_alive && $this->max_bodysize && $this->max_bodysize < $this->resp_headers['content-length']){ + $length = $this->max_bodysize; + }else{ + $length = $this->resp_headers['content-length']; + } + + $r_body = $this->_readData($socket, $length, 'response (content-length limited)', true); + }elseif( !isset($this->resp_headers['transfer-encoding']) && $this->max_bodysize && !$this->keep_alive){ + $r_body = $this->_readData($socket, $this->max_bodysize, 'response (content-length limited)', true); + }else{ + // read entire socket + $r_size = 0; + while (!feof($socket)) { + $r_body .= $this->_readData($socket, 4096, 'response (unlimited)', true); + } + } + + // recheck body size, we might had to read the whole body, so we abort late or trim here + if($this->max_bodysize){ + if(strlen($r_body) > $this->max_bodysize){ + if ($this->max_bodysize_abort) { + throw new HTTPClientException('Allowed response size exceeded'); + } else { + $this->error = 'Allowed response size exceeded'; + } + } + } + + } catch (HTTPClientException $err) { + $this->error = $err->getMessage(); + if ($err->getCode()) + $this->status = $err->getCode(); + unset(self::$connections[$connectionId]); + fclose($socket); + return false; + } + + if (!$this->keep_alive || + (isset($this->resp_headers['connection']) && $this->resp_headers['connection'] == 'Close')) { + // close socket + $status = socket_get_status($socket); + fclose($socket); + unset(self::$connections[$connectionId]); + } + + // decode gzip if needed + 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)); + if($this->resp_body === false){ + $this->error = 'Failed to decompress gzip encoded content'; + $this->resp_body = $r_body; + } + }else{ + $this->resp_body = $r_body; + } + + $this->_debug('response body',$this->resp_body); + $this->redirect_count = 0; + return true; + } + + /** + * Tries to establish a CONNECT tunnel via Proxy + * + * Protocol, Servername and Port will be stripped from the request URL when a successful CONNECT happened + * + * @param resource &$socket + * @param string &$requesturl + * @return bool true if a tunnel was established + */ + function _ssltunnel(&$socket, &$requesturl){ + if(!$this->proxy_host) return false; + $requestinfo = parse_url($requesturl); + if($requestinfo['scheme'] != 'https') return false; + if(!$requestinfo['port']) $requestinfo['port'] = 443; + + // build request + $request = "CONNECT {$requestinfo['host']}:{$requestinfo['port']} HTTP/1.0".HTTP_NL; + $request .= "Host: {$requestinfo['host']}".HTTP_NL; + if($this->proxy_user) { + 'Proxy-Authorization Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass).HTTP_NL; + } + $request .= HTTP_NL; + + $this->_debug('SSL Tunnel CONNECT',$request); + $this->_sendData($socket, $request, 'SSL Tunnel CONNECT'); + + // read headers from socket + $r_headers = ''; + do{ + $r_line = $this->_readLine($socket, 'headers'); + $r_headers .= $r_line; + }while($r_line != "\r\n" && $r_line != "\n"); + + $this->_debug('SSL Tunnel Response',$r_headers); + if(preg_match('/^HTTP\/1\.[01] 200/i',$r_headers)){ + if (stream_socket_enable_crypto($socket, true, STREAM_CRYPTO_METHOD_SSLv3_CLIENT)) { + $requesturl = $requestinfo['path']; + return true; + } + } + return false; + } + + /** + * Safely write data to a socket + * + * @param resource $socket An open socket handle + * @param string $data The data to write + * @param string $message Description of what is being read + * @throws HTTPClientException + * @author Tom N Harris + */ + function _sendData($socket, $data, $message) { + // send request + $towrite = strlen($data); + $written = 0; + while($written < $towrite){ + // check timeout + $time_used = $this->_time() - $this->start; + if($time_used > $this->timeout) + throw new HTTPClientException(sprintf('Timeout while sending %s (%.3fs)',$message, $time_used), -100); + if(feof($socket)) + throw new HTTPClientException("Socket disconnected while writing $message"); + + // select parameters + $sel_r = null; + $sel_w = array($socket); + $sel_e = null; + // wait for stream ready or timeout (1sec) + if(@stream_select($sel_r,$sel_w,$sel_e,1) === false){ + usleep(1000); + continue; + } + + // write to stream + $nbytes = fwrite($socket, substr($data,$written,4096)); + if($nbytes === false) + throw new HTTPClientException("Failed writing to socket while sending $message", -100); + $written += $nbytes; + } + } + + /** + * Safely read data from a socket + * + * Reads up to a given number of bytes or throws an exception if the + * response times out or ends prematurely. + * + * @param resource $socket An open socket handle in non-blocking mode + * @param int $nbytes Number of bytes to read + * @param string $message Description of what is being read + * @param bool $ignore_eof End-of-file is not an error if this is set + * @throws HTTPClientException + * @return string + * @author Tom N Harris + */ + function _readData($socket, $nbytes, $message, $ignore_eof = false) { + $r_data = ''; + // Does not return immediately so timeout and eof can be checked + if ($nbytes < 0) $nbytes = 0; + $to_read = $nbytes; + do { + $time_used = $this->_time() - $this->start; + if ($time_used > $this->timeout) + throw new HTTPClientException( + sprintf('Timeout while reading %s after %d bytes (%.3fs)', $message, + strlen($r_data), $time_used), -100); + if(feof($socket)) { + if(!$ignore_eof) + throw new HTTPClientException("Premature End of File (socket) while reading $message"); + break; + } + + if ($to_read > 0) { + // select parameters + $sel_r = array($socket); + $sel_w = null; + $sel_e = null; + // wait for stream ready or timeout (1sec) + if(@stream_select($sel_r,$sel_w,$sel_e,1) === false){ + usleep(1000); + continue; + } + + $bytes = fread($socket, $to_read); + if($bytes === false) + throw new HTTPClientException("Failed reading from socket while reading $message", -100); + $r_data .= $bytes; + $to_read -= strlen($bytes); + } + } while ($to_read > 0 && strlen($r_data) < $nbytes); + return $r_data; + } + + /** + * Safely read a \n-terminated line from a socket + * + * Always returns a complete line, including the terminating \n. + * + * @param resource $socket An open socket handle in non-blocking mode + * @param string $message Description of what is being read + * @throws HTTPClientException + * @return string + * @author Tom N Harris + */ + function _readLine($socket, $message) { + $r_data = ''; + do { + $time_used = $this->_time() - $this->start; + if ($time_used > $this->timeout) + throw new HTTPClientException( + sprintf('Timeout while reading %s (%.3fs) >%s<', $message, $time_used, $r_data), + -100); + if(feof($socket)) + throw new HTTPClientException("Premature End of File (socket) while reading $message"); + + // select parameters + $sel_r = array($socket); + $sel_w = null; + $sel_e = null; + // wait for stream ready or timeout (1sec) + if(@stream_select($sel_r,$sel_w,$sel_e,1) === false){ + usleep(1000); + continue; + } + + $r_data = fgets($socket, 1024); + } while (!preg_match('/\n$/',$r_data)); + return $r_data; + } + + /** + * print debug info + * + * Uses _debug_text or _debug_html depending on the SAPI name + * + * @author Andreas Gohr + */ + function _debug($info,$var=null){ + if(!$this->debug) return; + if(php_sapi_name() == 'cli'){ + $this->_debug_text($info, $var); + }else{ + $this->_debug_html($info, $var); + } + } + + /** + * print debug info as HTML + * + * @param $info + * @param null $var + */ + function _debug_html($info, $var=null){ + print ''.$info.' '.($this->_time() - $this->start).'s
'; + if(!is_null($var)){ + ob_start(); + print_r($var); + $content = htmlspecialchars(ob_get_contents()); + ob_end_clean(); + print '
'.$content.'
'; + } + } + + /** + * prints debug info as plain text + * + * @param $info + * @param null $var + */ + function _debug_text($info, $var=null){ + print '*'.$info.'* '.($this->_time() - $this->start)."s\n"; + if(!is_null($var)) print_r($var); + print "\n-----------------------------------------------\n"; + } + + /** + * Return current timestamp in microsecond resolution + */ + static function _time(){ + list($usec, $sec) = explode(" ", microtime()); + return ((float)$usec + (float)$sec); + } + + /** + * convert given header string to Header array + * + * All Keys are lowercased. + * + * @author Andreas Gohr + */ + function _parseHeaders($string){ + $headers = array(); + $lines = explode("\n",$string); + array_shift($lines); //skip first line (status) + foreach($lines as $line){ + @list($key, $val) = explode(':',$line,2); + $key = trim($key); + $val = trim($val); + $key = strtolower($key); + if(!$key) continue; + if(isset($headers[$key])){ + if(is_array($headers[$key])){ + $headers[$key][] = $val; + }else{ + $headers[$key] = array($headers[$key],$val); + } + }else{ + $headers[$key] = $val; + } + } + return $headers; + } + + /** + * convert given header array to header string + * + * @author Andreas Gohr + */ + function _buildHeaders($headers){ + $string = ''; + foreach($headers as $key => $value){ + if(empty($value)) continue; + $string .= $key.': '.$value.HTTP_NL; + } + return $string; + } + + /** + * get cookies as http header string + * + * @author Andreas Goetz + */ + function _getCookies(){ + $headers = ''; + foreach ($this->cookies as $key => $val){ + $headers .= "$key=$val; "; + } + $headers = substr($headers, 0, -2); + if ($headers) $headers = "Cookie: $headers".HTTP_NL; + return $headers; + } + + /** + * Encode data for posting + * + * @author Andreas Gohr + */ + function _postEncode($data){ + return http_build_query($data,'','&'); + } + + /** + * 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; + } + + /** + * Generates a unique identifier for a connection. + * + * @param string $server + * @param string $port + * @return string unique identifier + */ + function _uniqueConnectionId($server, $port) { + return "$server:$port"; + } +} + +//Setup VIM: ex: et ts=4 : diff --git a/sources/inc/IXR_Library.php b/sources/inc/IXR_Library.php new file mode 100644 index 0000000..979dc4d --- /dev/null +++ b/sources/inc/IXR_Library.php @@ -0,0 +1,817 @@ + + */ + + +class IXR_Value { + var $data; + var $type; + function IXR_Value ($data, $type = false) { + $this->data = $data; + if (!$type) { + $type = $this->calculateType(); + } + $this->type = $type; + if ($type == 'struct') { + /* Turn all the values in the array in to new IXR_Value objects */ + foreach ($this->data as $key => $value) { + $this->data[$key] = new IXR_Value($value); + } + } + if ($type == 'array') { + for ($i = 0, $j = count($this->data); $i < $j; $i++) { + $this->data[$i] = new IXR_Value($this->data[$i]); + } + } + } + function calculateType() { + if ($this->data === true || $this->data === false) { + return 'boolean'; + } + if (is_integer($this->data)) { + return 'int'; + } + if (is_double($this->data)) { + return 'double'; + } + // Deal with IXR object types base64 and date + if (is_object($this->data) && is_a($this->data, 'IXR_Date')) { + return 'date'; + } + if (is_object($this->data) && is_a($this->data, 'IXR_Base64')) { + return 'base64'; + } + // If it is a normal PHP object convert it in to a struct + if (is_object($this->data)) { + + $this->data = get_object_vars($this->data); + return 'struct'; + } + if (!is_array($this->data)) { + return 'string'; + } + /* We have an array - is it an array or a struct ? */ + if ($this->isStruct($this->data)) { + return 'struct'; + } else { + return 'array'; + } + } + function getXml() { + /* Return XML for this value */ + switch ($this->type) { + case 'boolean': + return ''.(($this->data) ? '1' : '0').''; + break; + case 'int': + return ''.$this->data.''; + break; + case 'double': + return ''.$this->data.''; + break; + case 'string': + return ''.htmlspecialchars($this->data).''; + break; + case 'array': + $return = ''."\n"; + foreach ($this->data as $item) { + $return .= ' '.$item->getXml()."\n"; + } + $return .= ''; + return $return; + break; + case 'struct': + $return = ''."\n"; + foreach ($this->data as $name => $value) { + $return .= " $name"; + $return .= $value->getXml()."\n"; + } + $return .= ''; + return $return; + break; + case 'date': + case 'base64': + return $this->data->getXml(); + break; + } + return false; + } + function isStruct($array) { + /* Nasty function to check if an array is a struct or not */ + $expected = 0; + foreach ($array as $key => $value) { + if ((string)$key != (string)$expected) { + return true; + } + $expected++; + } + return false; + } +} + + +class IXR_Message { + var $message; + var $messageType; // methodCall / methodResponse / fault + var $faultCode; + var $faultString; + var $methodName; + var $params; + // Current variable stacks + var $_arraystructs = array(); // The stack used to keep track of the current array/struct + var $_arraystructstypes = array(); // Stack keeping track of if things are structs or array + var $_currentStructName = array(); // A stack as well + var $_param; + var $_value; + var $_currentTag; + var $_currentTagContents; + var $_lastseen; + // The XML parser + var $_parser; + function IXR_Message ($message) { + $this->message = $message; + } + function parse() { + // first remove the XML declaration + $this->message = preg_replace('/<\?xml(.*)?\?'.'>/', '', $this->message); + // workaround for a bug in PHP/libxml2, see http://bugs.php.net/bug.php?id=45996 + $this->message = str_replace('<', '<', $this->message); + $this->message = str_replace('>', '>', $this->message); + $this->message = str_replace('&', '&', $this->message); + $this->message = str_replace(''', ''', $this->message); + $this->message = str_replace('"', '"', $this->message); + $this->message = str_replace("\x0b", ' ', $this->message); //vertical tab + if (trim($this->message) == '') { + return false; + } + $this->_parser = xml_parser_create(); + // Set XML parser to take the case of tags in to account + xml_parser_set_option($this->_parser, XML_OPTION_CASE_FOLDING, false); + // Set XML parser callback functions + xml_set_object($this->_parser, $this); + xml_set_element_handler($this->_parser, 'tag_open', 'tag_close'); + xml_set_character_data_handler($this->_parser, 'cdata'); + if (!xml_parse($this->_parser, $this->message)) { + /* die(sprintf('XML error: %s at line %d', + xml_error_string(xml_get_error_code($this->_parser)), + xml_get_current_line_number($this->_parser))); */ + return false; + } + xml_parser_free($this->_parser); + // Grab the error messages, if any + if ($this->messageType == 'fault') { + $this->faultCode = $this->params[0]['faultCode']; + $this->faultString = $this->params[0]['faultString']; + } + return true; + } + function tag_open($parser, $tag, $attr) { + $this->currentTag = $tag; + $this->_currentTagContents = ''; + switch($tag) { + case 'methodCall': + case 'methodResponse': + case 'fault': + $this->messageType = $tag; + break; + /* Deal with stacks of arrays and structs */ + case 'data': // data is to all intents and puposes more interesting than array + $this->_arraystructstypes[] = 'array'; + $this->_arraystructs[] = array(); + break; + case 'struct': + $this->_arraystructstypes[] = 'struct'; + $this->_arraystructs[] = array(); + break; + } + $this->_lastseen = $tag; + } + function cdata($parser, $cdata) { + $this->_currentTagContents .= $cdata; + } + function tag_close($parser, $tag) { + $valueFlag = false; + switch($tag) { + case 'int': + case 'i4': + $value = (int)trim($this->_currentTagContents); + $this->_currentTagContents = ''; + $valueFlag = true; + break; + case 'double': + $value = (double)trim($this->_currentTagContents); + $this->_currentTagContents = ''; + $valueFlag = true; + break; + case 'string': + $value = (string)$this->_currentTagContents; + $this->_currentTagContents = ''; + $valueFlag = true; + break; + case 'dateTime.iso8601': + $value = new IXR_Date(trim($this->_currentTagContents)); + // $value = $iso->getTimestamp(); + $this->_currentTagContents = ''; + $valueFlag = true; + break; + case 'value': + // "If no type is indicated, the type is string." + if($this->_lastseen == 'value'){ + $value = (string)$this->_currentTagContents; + $this->_currentTagContents = ''; + $valueFlag = true; + } + break; + case 'boolean': + $value = (boolean)trim($this->_currentTagContents); + $this->_currentTagContents = ''; + $valueFlag = true; + break; + case 'base64': + $value = base64_decode($this->_currentTagContents); + $this->_currentTagContents = ''; + $valueFlag = true; + break; + /* Deal with stacks of arrays and structs */ + case 'data': + case 'struct': + $value = array_pop($this->_arraystructs); + array_pop($this->_arraystructstypes); + $valueFlag = true; + break; + case 'member': + array_pop($this->_currentStructName); + break; + case 'name': + $this->_currentStructName[] = trim($this->_currentTagContents); + $this->_currentTagContents = ''; + break; + case 'methodName': + $this->methodName = trim($this->_currentTagContents); + $this->_currentTagContents = ''; + break; + } + if ($valueFlag) { + /* + if (!is_array($value) && !is_object($value)) { + $value = trim($value); + } + */ + if (count($this->_arraystructs) > 0) { + // Add value to struct or array + if ($this->_arraystructstypes[count($this->_arraystructstypes)-1] == 'struct') { + // Add to struct + $this->_arraystructs[count($this->_arraystructs)-1][$this->_currentStructName[count($this->_currentStructName)-1]] = $value; + } else { + // Add to array + $this->_arraystructs[count($this->_arraystructs)-1][] = $value; + } + } else { + // Just add as a paramater + $this->params[] = $value; + } + } + $this->_lastseen = $tag; + } +} + + +class IXR_Server { + var $data; + var $callbacks = array(); + var $message; + var $capabilities; + function IXR_Server($callbacks = false, $data = false) { + $this->setCapabilities(); + if ($callbacks) { + $this->callbacks = $callbacks; + } + $this->setCallbacks(); + $this->serve($data); + } + function serve($data = false) { + if (!$data) { + + $postData = trim(http_get_raw_post_data()); + if (!$postData) { + die('XML-RPC server accepts POST requests only.'); + } + $data = $postData; + } + $this->message = new IXR_Message($data); + if (!$this->message->parse()) { + $this->error(-32700, 'parse error. not well formed'); + } + if ($this->message->messageType != 'methodCall') { + $this->error(-32600, 'server error. invalid xml-rpc. not conforming to spec. Request must be a methodCall'); + } + $result = $this->call($this->message->methodName, $this->message->params); + // Is the result an error? + if (is_a($result, 'IXR_Error')) { + $this->error($result); + } + // Encode the result + $r = new IXR_Value($result); + $resultxml = $r->getXml(); + // Create the XML + $xml = << + + + + $resultxml + + + + + +EOD; + // Send it + $this->output($xml); + } + function call($methodname, $args) { + if (!$this->hasMethod($methodname)) { + return new IXR_Error(-32601, 'server error. requested method '.$methodname.' does not exist.'); + } + $method = $this->callbacks[$methodname]; + // Perform the callback and send the response + + # Removed for DokuWiki to have a more consistent interface + # if (count($args) == 1) { + # // If only one paramater just send that instead of the whole array + # $args = $args[0]; + # } + + # Adjusted for DokuWiki to use call_user_func_array + + // args need to be an array + $args = (array) $args; + + // Are we dealing with a function or a method? + if (substr($method, 0, 5) == 'this:') { + // It's a class method - check it exists + $method = substr($method, 5); + if (!method_exists($this, $method)) { + return new IXR_Error(-32601, 'server error. requested class method "'.$method.'" does not exist.'); + } + // Call the method + #$result = $this->$method($args); + $result = call_user_func_array(array(&$this,$method),$args); + } elseif (substr($method, 0, 7) == 'plugin:') { + list($pluginname, $callback) = explode(':', substr($method, 7), 2); + if(!plugin_isdisabled($pluginname)) { + $plugin = plugin_load('action', $pluginname); + return call_user_func_array(array($plugin, $callback), $args); + } else { + return new IXR_Error(-99999, 'server error'); + } + } else { + // It's a function - does it exist? + if (!function_exists($method)) { + return new IXR_Error(-32601, 'server error. requested function "'.$method.'" does not exist.'); + } + // Call the function + #$result = $method($args); + $result = call_user_func_array($method,$args); + } + return $result; + } + + function error($error, $message = false) { + // Accepts either an error object or an error code and message + if ($message && !is_object($error)) { + $error = new IXR_Error($error, $message); + } + $this->output($error->getXml()); + } + function output($xml) { + header('Content-Type: text/xml; charset=utf-8'); + echo '', "\n", $xml; + exit; + } + function hasMethod($method) { + return in_array($method, array_keys($this->callbacks)); + } + function setCapabilities() { + // Initialises capabilities array + $this->capabilities = array( + 'xmlrpc' => array( + 'specUrl' => 'http://www.xmlrpc.com/spec', + 'specVersion' => 1 + ), + 'faults_interop' => array( + 'specUrl' => 'http://xmlrpc-epi.sourceforge.net/specs/rfc.fault_codes.php', + 'specVersion' => 20010516 + ), + 'system.multicall' => array( + 'specUrl' => 'http://www.xmlrpc.com/discuss/msgReader$1208', + 'specVersion' => 1 + ), + ); + } + function getCapabilities() { + return $this->capabilities; + } + function setCallbacks() { + $this->callbacks['system.getCapabilities'] = 'this:getCapabilities'; + $this->callbacks['system.listMethods'] = 'this:listMethods'; + $this->callbacks['system.multicall'] = 'this:multiCall'; + } + function listMethods() { + // Returns a list of methods - uses array_reverse to ensure user defined + // methods are listed before server defined methods + return array_reverse(array_keys($this->callbacks)); + } + function multiCall($methodcalls) { + // See http://www.xmlrpc.com/discuss/msgReader$1208 + $return = array(); + foreach ($methodcalls as $call) { + $method = $call['methodName']; + $params = $call['params']; + if ($method == 'system.multicall') { + $result = new IXR_Error(-32800, 'Recursive calls to system.multicall are forbidden'); + } else { + $result = $this->call($method, $params); + } + if (is_a($result, 'IXR_Error')) { + $return[] = array( + 'faultCode' => $result->code, + 'faultString' => $result->message + ); + } else { + $return[] = array($result); + } + } + return $return; + } +} + +class IXR_Request { + var $method; + var $args; + var $xml; + function IXR_Request($method, $args) { + $this->method = $method; + $this->args = $args; + $this->xml = << + +{$this->method} + + +EOD; + foreach ($this->args as $arg) { + $this->xml .= ''; + $v = new IXR_Value($arg); + $this->xml .= $v->getXml(); + $this->xml .= "\n"; + } + $this->xml .= ''; + } + function getLength() { + return strlen($this->xml); + } + function getXml() { + return $this->xml; + } +} + +/** + * Changed for DokuWiki to use DokuHTTPClient + * + * This should be compatible to the original class, but uses DokuWiki's + * HTTP client library which will respect proxy settings + * + * Because the XMLRPC client is not used in DokuWiki currently this is completely + * untested + */ +class IXR_Client extends DokuHTTPClient { + var $posturl = ''; + var $message = false; + var $xmlerror = false; + + function IXR_Client($server, $path = false, $port = 80) { + parent::__construct(); + if (!$path) { + // Assume we have been given a URL instead + $this->posturl = $server; + }else{ + $this->posturl = 'http://'.$server.':'.$port.$path; + } + } + + function query() { + $args = func_get_args(); + $method = array_shift($args); + $request = new IXR_Request($method, $args); + $xml = $request->getXml(); + + $this->headers['Content-Type'] = 'text/xml'; + if(!$this->sendRequest($this->posturl,$xml,'POST')){ + $this->xmlerror = new IXR_Error(-32300, 'transport error - '.$this->error); + 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->xmlerror = new IXR_Error(-32700, 'parse error. not well formed'); + return false; + } + // Is the message a fault? + if ($this->message->messageType == 'fault') { + $this->xmlerror = new IXR_Error($this->message->faultCode, $this->message->faultString); + return false; + } + // Message must be OK + return true; + } + function getResponse() { + // methodResponses can only have one param - return that + return $this->message->params[0]; + } + function isError() { + return (is_object($this->xmlerror)); + } + function getErrorCode() { + return $this->xmlerror->code; + } + function getErrorMessage() { + return $this->xmlerror->message; + } +} + + +class IXR_Error { + var $code; + var $message; + function IXR_Error($code, $message) { + $this->code = $code; + $this->message = $message; + } + function getXml() { + $xml = << + + + + + faultCode + {$this->code} + + + faultString + {$this->message} + + + + + + +EOD; + return $xml; + } +} + + +class IXR_Date { + var $year; + var $month; + var $day; + var $hour; + var $minute; + var $second; + function IXR_Date($time) { + // $time can be a PHP timestamp or an ISO one + if (is_numeric($time)) { + $this->parseTimestamp($time); + } else { + $this->parseIso($time); + } + } + function parseTimestamp($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) { + if(preg_match('/^(\d\d\d\d)-?(\d\d)-?(\d\d)([T ](\d\d):(\d\d)(:(\d\d))?)?/',$iso,$match)){ + $this->year = (int) $match[1]; + $this->month = (int) $match[2]; + $this->day = (int) $match[3]; + $this->hour = (int) $match[5]; + $this->minute = (int) $match[6]; + $this->second = (int) $match[8]; + } + } + function getIso() { + return $this->year.$this->month.$this->day.'T'.$this->hour.':'.$this->minute.':'.$this->second; + } + function getXml() { + return ''.$this->getIso().''; + } + function getTimestamp() { + return gmmktime($this->hour, $this->minute, $this->second, $this->month, $this->day, $this->year); + } +} + + +class IXR_Base64 { + var $data; + function IXR_Base64($data) { + $this->data = $data; + } + function getXml() { + return ''.base64_encode($this->data).''; + } +} + + +class IXR_IntrospectionServer extends IXR_Server { + var $signatures; + var $help; + function IXR_IntrospectionServer() { + $this->setCallbacks(); + $this->setCapabilities(); + $this->capabilities['introspection'] = array( + 'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html', + 'specVersion' => 1 + ); + $this->addCallback( + 'system.methodSignature', + 'this:methodSignature', + array('array', 'string'), + 'Returns an array describing the return type and required parameters of a method' + ); + $this->addCallback( + 'system.getCapabilities', + 'this:getCapabilities', + array('struct'), + 'Returns a struct describing the XML-RPC specifications supported by this server' + ); + $this->addCallback( + 'system.listMethods', + 'this:listMethods', + array('array'), + 'Returns an array of available methods on this server' + ); + $this->addCallback( + 'system.methodHelp', + 'this:methodHelp', + array('string', 'string'), + 'Returns a documentation string for the specified method' + ); + } + function addCallback($method, $callback, $args, $help) { + $this->callbacks[$method] = $callback; + $this->signatures[$method] = $args; + $this->help[$method] = $help; + } + function call($methodname, $args) { + // Make sure it's in an array + if ($args && !is_array($args)) { + $args = array($args); + } + // Over-rides default call method, adds signature check + if (!$this->hasMethod($methodname)) { + return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.'); + } + $method = $this->callbacks[$methodname]; + $signature = $this->signatures[$methodname]; + $returnType = array_shift($signature); + // Check the number of arguments. Check only, if the minimum count of parameters is specified. More parameters are possible. + // This is a hack to allow optional parameters... + if (count($args) < count($signature)) { + // print 'Num of args: '.count($args).' Num in signature: '.count($signature); + return new IXR_Error(-32602, 'server error. wrong number of method parameters'); + } + // Check the argument types + $ok = true; + $argsbackup = $args; + for ($i = 0, $j = count($args); $i < $j; $i++) { + $arg = array_shift($args); + $type = array_shift($signature); + switch ($type) { + case 'int': + case 'i4': + if (is_array($arg) || !is_int($arg)) { + $ok = false; + } + break; + case 'base64': + case 'string': + if (!is_string($arg)) { + $ok = false; + } + break; + case 'boolean': + if ($arg !== false && $arg !== true) { + $ok = false; + } + break; + case 'float': + case 'double': + if (!is_float($arg)) { + $ok = false; + } + break; + case 'date': + case 'dateTime.iso8601': + if (!is_a($arg, 'IXR_Date')) { + $ok = false; + } + break; + } + if (!$ok) { + return new IXR_Error(-32602, 'server error. invalid method parameters'); + } + } + // It passed the test - run the "real" method call + return parent::call($methodname, $argsbackup); + } + function methodSignature($method) { + if (!$this->hasMethod($method)) { + return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.'); + } + // We should be returning an array of types + $types = $this->signatures[$method]; + $return = array(); + foreach ($types as $type) { + switch ($type) { + case 'string': + $return[] = 'string'; + break; + case 'int': + case 'i4': + $return[] = 42; + break; + case 'double': + $return[] = 3.1415; + break; + case 'dateTime.iso8601': + $return[] = new IXR_Date(time()); + break; + case 'boolean': + $return[] = true; + break; + case 'base64': + $return[] = new IXR_Base64('base64'); + break; + case 'array': + $return[] = array('array'); + break; + case 'struct': + $return[] = array('struct' => 'struct'); + break; + } + } + return $return; + } + function methodHelp($method) { + return $this->help[$method]; + } +} + + +class IXR_ClientMulticall extends IXR_Client { + var $calls = array(); + function IXR_ClientMulticall($server, $path = false, $port = 80) { + parent::IXR_Client($server, $path, $port); + //$this->useragent = 'The Incutio XML-RPC PHP Library (multicall client)'; + } + function addCall() { + $args = func_get_args(); + $methodName = array_shift($args); + $struct = array( + 'methodName' => $methodName, + 'params' => $args + ); + $this->calls[] = $struct; + } + function query() { + // Prepare multicall, then call the parent::query() method + return parent::query('system.multicall', $this->calls); + } +} + diff --git a/sources/inc/Input.class.php b/sources/inc/Input.class.php new file mode 100644 index 0000000..7434d2b --- /dev/null +++ b/sources/inc/Input.class.php @@ -0,0 +1,262 @@ + + */ +class Input { + + /** @var PostInput Access $_POST parameters */ + public $post; + /** @var GetInput Access $_GET parameters */ + public $get; + + protected $access; + + /** + * Intilizes the Input class and it subcomponents + */ + function __construct() { + $this->access = &$_REQUEST; + $this->post = new PostInput(); + $this->get = new GetInput(); + } + + /** + * Check if a parameter was set + * + * Basically a wrapper around isset. When called on the $post and $get subclasses, + * the parameter is set to $_POST or $_GET and to $_REQUEST + * + * @see isset + * @param string $name Parameter name + * @return bool + */ + public function has($name) { + return isset($this->access[$name]); + } + + /** + * Remove a parameter from the superglobals + * + * Basically a wrapper around unset. When NOT called on the $post and $get subclasses, + * the parameter will also be removed from $_POST or $_GET + * + * @see isset + * @param string $name Parameter name + * @return bool + */ + public function remove($name) { + if(isset($this->access[$name])) { + unset($this->access[$name]); + } + // also remove from sub classes + if(isset($this->post) && isset($_POST[$name])) { + unset($_POST[$name]); + } + if(isset($this->get) && isset($_GET[$name])) { + unset($_GET[$name]); + } + } + + /** + * Access a request parameter without any type conversion + * + * @param string $name Parameter name + * @param mixed $default Default to return if parameter isn't set + * @param bool $nonempty Return $default if parameter is set but empty() + * @return mixed + */ + public function param($name, $default = null, $nonempty = false) { + if(!isset($this->access[$name])) return $default; + if($nonempty && empty($this->access[$name])) return $default; + return $this->access[$name]; + } + + /** + * Sets a parameter + * + * @param string $name Parameter name + * @param mixed $value Value to set + */ + public function set($name, $value) { + $this->access[$name] = $value; + } + + /** + * Get a reference to a request parameter + * + * This avoids copying data in memory, when the parameter is not set it will be created + * and intialized with the given $default value before a reference is returned + * + * @param string $name Parameter name + * @param mixed $default If parameter is not set, initialize with this value + * @param bool $nonempty Init with $default if parameter is set but empty() + * @return &mixed + */ + public function &ref($name, $default = '', $nonempty = false) { + if(!isset($this->access[$name]) || ($nonempty && empty($this->access[$name]))) { + $this->set($name, $default); + } + + return $this->access[$name]; + } + + /** + * Access a request parameter as int + * + * @param string $name Parameter name + * @param mixed $default Default to return if parameter isn't set or is an array + * @param bool $nonempty Return $default if parameter is set but empty() + * @return int + */ + public function int($name, $default = 0, $nonempty = false) { + if(!isset($this->access[$name])) return $default; + if(is_array($this->access[$name])) return $default; + if($this->access[$name] === '') return $default; + if($nonempty && empty($this->access[$name])) return $default; + + return (int) $this->access[$name]; + } + + /** + * Access a request parameter as string + * + * @param string $name Parameter name + * @param mixed $default Default to return if parameter isn't set or is an array + * @param bool $nonempty Return $default if parameter is set but empty() + * @return string + */ + public function str($name, $default = '', $nonempty = false) { + if(!isset($this->access[$name])) return $default; + if(is_array($this->access[$name])) return $default; + if($nonempty && empty($this->access[$name])) return $default; + + return (string) $this->access[$name]; + } + + /** + * Access a request parameter as bool + * + * Note: $nonempty is here for interface consistency and makes not much sense for booleans + * + * @param string $name Parameter name + * @param mixed $default Default to return if parameter isn't set + * @param bool $nonempty Return $default if parameter is set but empty() + * @return bool + */ + public function bool($name, $default = false, $nonempty = false) { + if(!isset($this->access[$name])) return $default; + if(is_array($this->access[$name])) return $default; + if($this->access[$name] === '') return $default; + if($nonempty && empty($this->access[$name])) return $default; + + return (bool) $this->access[$name]; + } + + /** + * Access a request parameter as array + * + * @param string $name Parameter name + * @param mixed $default Default to return if parameter isn't set + * @param bool $nonempty Return $default if parameter is set but empty() + * @return array + */ + public function arr($name, $default = array(), $nonempty = false) { + if(!isset($this->access[$name])) return $default; + if(!is_array($this->access[$name])) return $default; + if($nonempty && empty($this->access[$name])) return $default; + + return (array) $this->access[$name]; + } + + /** + * Create a simple key from an array key + * + * This is useful to access keys where the information is given as an array key or as a single array value. + * For example when the information was submitted as the name of a submit button. + * + * This function directly changes the access array. + * + * Eg. $_REQUEST['do']['save']='Speichern' becomes $_REQUEST['do'] = 'save' + * + * This function returns the $INPUT object itself for easy chaining + * + * @param $name + * @return Input + */ + public function extract($name){ + if(!isset($this->access[$name])) return $this; + if(!is_array($this->access[$name])) return $this; + $keys = array_keys($this->access[$name]); + if(!$keys){ + // this was an empty array + $this->remove($name); + return $this; + } + // get the first key + $value = array_shift($keys); + if($value === 0){ + // we had a numeric array, assume the value is not in the key + $value = array_shift($this->access[$name]); + } + + $this->set($name, $value); + return $this; + } +} + +/** + * Internal class used for $_POST access in Input class + */ +class PostInput extends Input { + protected $access; + + /** + * Initialize the $access array, remove subclass members + */ + function __construct() { + $this->access = &$_POST; + } + + /** + * Sets a parameter in $_POST and $_REQUEST + * + * @param string $name Parameter name + * @param mixed $value Value to set + */ + public function set($name, $value) { + parent::set($name, $value); + $_REQUEST[$name] = $value; + } +} + +/** + * Internal class used for $_GET access in Input class + */ +class GetInput extends Input { + protected $access; + + /** + * Initialize the $access array, remove subclass members + */ + function __construct() { + $this->access = &$_GET; + } + + /** + * Sets a parameter in $_GET and $_REQUEST + * + * @param string $name Parameter name + * @param mixed $value Value to set + */ + public function set($name, $value) { + parent::set($name, $value); + $_REQUEST[$name] = $value; + } +} diff --git a/sources/inc/JSON.php b/sources/inc/JSON.php new file mode 100644 index 0000000..7f89005 --- /dev/null +++ b/sources/inc/JSON.php @@ -0,0 +1,648 @@ + + * @author Matt Knapp + * @author Brett Stimmerman + * @copyright 2005 Michal Migurski + * @license http://www.freebsd.org/copyright/freebsd-license.html + * @link http://pear.php.net/pepr/pepr-proposal-show.php?id=198 + */ + +// for DokuWiki +if(!defined('DOKU_INC')) die('meh.'); + +/** + * Marker constant for JSON::decode(), used to flag stack state + */ +define('JSON_SLICE', 1); + +/** + * Marker constant for JSON::decode(), used to flag stack state + */ +define('JSON_IN_STR', 2); + +/** + * Marker constant for JSON::decode(), used to flag stack state + */ +define('JSON_IN_ARR', 4); + +/** + * Marker constant for JSON::decode(), used to flag stack state + */ +define('JSON_IN_OBJ', 8); + +/** + * Marker constant for JSON::decode(), used to flag stack state + */ +define('JSON_IN_CMT', 16); + +/** + * Behavior switch for JSON::decode() + */ +define('JSON_LOOSE_TYPE', 10); + +/** + * Behavior switch for JSON::decode() + */ +define('JSON_STRICT_TYPE', 11); + +/** + * Converts to and from JSON format. + */ +class JSON { + + /** + * Disables the use of PHP5's native json_decode() + * + * You shouldn't change this usually because the native function is much + * faster. However, this non-native will also parse slightly broken JSON + * which might be handy when talking to a non-conform endpoint + */ + public $skipnative = false; + + /** + * constructs a new JSON instance + * + * @param int $use object behavior: when encoding or decoding, + * be loose or strict about object/array usage + * + * possible values: + * JSON_STRICT_TYPE - strict typing, default + * "{...}" syntax creates objects in decode. + * JSON_LOOSE_TYPE - loose typing + * "{...}" syntax creates associative arrays in decode. + */ + function JSON($use=JSON_STRICT_TYPE) { + $this->use = $use; + } + + /** + * encodes an arbitrary variable into JSON format + * If available the native PHP JSON implementation is used. + * + * @param mixed $var any number, boolean, string, array, or object to be encoded. + * see argument 1 to JSON() above for array-parsing behavior. + * if var is a strng, note that encode() always expects it + * to be in ASCII or UTF-8 format! + * + * @return string JSON string representation of input var + * @access public + */ + function encode($var) { + if (!$this->skipnative && function_exists('json_encode')){ + return json_encode($var); + } + switch (gettype($var)) { + case 'boolean': + return $var ? 'true' : 'false'; + + case 'NULL': + return 'null'; + + case 'integer': + return sprintf('%d', $var); + + case 'double': + case 'float': + return sprintf('%f', $var); + + case 'string': + // STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT + $ascii = ''; + $strlen_var = strlen($var); + + /* + * Iterate over every character in the string, + * escaping with a slash or encoding to UTF-8 where necessary + */ + for ($c = 0; $c < $strlen_var; ++$c) { + + $ord_var_c = ord($var{$c}); + + switch ($ord_var_c) { + case 0x08: + $ascii .= '\b'; + break; + case 0x09: + $ascii .= '\t'; + break; + case 0x0A: + $ascii .= '\n'; + break; + case 0x0C: + $ascii .= '\f'; + break; + case 0x0D: + $ascii .= '\r'; + break; + + case 0x22: + case 0x2F: + case 0x5C: + // double quote, slash, slosh + $ascii .= '\\'.$var{$c}; + break; + + case (($ord_var_c >= 0x20) && ($ord_var_c <= 0x7F)): + // characters U-00000000 - U-0000007F (same as ASCII) + $ascii .= $var{$c}; + break; + + case (($ord_var_c & 0xE0) == 0xC0): + // characters U-00000080 - U-000007FF, mask 110XXXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, ord($var{$c+1})); + $c+=1; + //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8'); + $utf16 = utf8_to_utf16be($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xF0) == 0xE0): + // characters U-00000800 - U-0000FFFF, mask 1110XXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c+1}), + ord($var{$c+2})); + $c+=2; + //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8'); + $utf16 = utf8_to_utf16be($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xF8) == 0xF0): + // characters U-00010000 - U-001FFFFF, mask 11110XXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c+1}), + ord($var{$c+2}), + ord($var{$c+3})); + $c+=3; + //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8'); + $utf16 = utf8_to_utf16be($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xFC) == 0xF8): + // characters U-00200000 - U-03FFFFFF, mask 111110XX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c+1}), + ord($var{$c+2}), + ord($var{$c+3}), + ord($var{$c+4})); + $c+=4; + //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8'); + $utf16 = utf8_to_utf16be($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + + case (($ord_var_c & 0xFE) == 0xFC): + // characters U-04000000 - U-7FFFFFFF, mask 1111110X + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $char = pack('C*', $ord_var_c, + ord($var{$c+1}), + ord($var{$c+2}), + ord($var{$c+3}), + ord($var{$c+4}), + ord($var{$c+5})); + $c+=5; + //$utf16 = mb_convert_encoding($char, 'UTF-16', 'UTF-8'); + $utf16 = utf8_to_utf16be($char); + $ascii .= sprintf('\u%04s', bin2hex($utf16)); + break; + } + } + + return '"'.$ascii.'"'; + + case 'array': + /* + * As per JSON spec if any array key is not an integer + * we must treat the the whole array as an object. We + * also try to catch a sparsely populated associative + * array with numeric keys here because some JS engines + * will create an array with empty indexes up to + * max_index which can cause memory issues and because + * the keys, which may be relevant, will be remapped + * otherwise. + * + * As per the ECMA and JSON specification an object may + * have any string as a property. Unfortunately due to + * a hole in the ECMA specification if the key is a + * ECMA reserved word or starts with a digit the + * parameter is only accessible using ECMAScript's + * bracket notation. + */ + + // treat as a JSON object + if (is_array($var) && count($var) && (array_keys($var) !== range(0, count($var) - 1))) { + return sprintf('{%s}', join(',', array_map(array($this, 'name_value'), + array_keys($var), + array_values($var)))); + } + + // treat it like a regular array + return sprintf('[%s]', join(',', array_map(array($this, 'encode'), $var))); + + case 'object': + $vars = get_object_vars($var); + return sprintf('{%s}', join(',', array_map(array($this, 'name_value'), + array_keys($vars), + array_values($vars)))); + + default: + return ''; + } + } + + /** + * encodes an arbitrary variable into JSON format, alias for encode() + */ + function enc($var) { + return $this->encode($var); + } + + /** function name_value + * array-walking function for use in generating JSON-formatted name-value pairs + * + * @param string $name name of key to use + * @param mixed $value reference to an array element to be encoded + * + * @return string JSON-formatted name-value pair, like '"name":value' + * @access private + */ + function name_value($name, $value) { + return (sprintf("%s:%s", $this->encode(strval($name)), $this->encode($value))); + } + + /** + * reduce a string by removing leading and trailing comments and whitespace + * + * @param $str string string value to strip of comments and whitespace + * + * @return string string value stripped of comments and whitespace + * @access private + */ + function reduce_string($str) { + $str = preg_replace(array( + + // eliminate single line comments in '// ...' form + '#^\s*//(.+)$#m', + + // eliminate multi-line comments in '/* ... */' form, at start of string + '#^\s*/\*(.+)\*/#Us', + + // eliminate multi-line comments in '/* ... */' form, at end of string + '#/\*(.+)\*/\s*$#Us' + + ), '', $str); + + // eliminate extraneous space + return trim($str); + } + + /** + * decodes a JSON string into appropriate variable + * If available the native PHP JSON implementation is used. + * + * @param string $str JSON-formatted string + * + * @return mixed number, boolean, string, array, or object + * corresponding to given JSON input string. + * See argument 1 to JSON() above for object-output behavior. + * Note that decode() always returns strings + * in ASCII or UTF-8 format! + * @access public + */ + function decode($str) { + if (!$this->skipnative && function_exists('json_decode')){ + return json_decode($str,($this->use == JSON_LOOSE_TYPE)); + } + + $str = $this->reduce_string($str); + + switch (strtolower($str)) { + case 'true': + return true; + + case 'false': + return false; + + case 'null': + return null; + + default: + if (is_numeric($str)) { + // Lookie-loo, it's a number + + // This would work on its own, but I'm trying to be + // good about returning integers where appropriate: + // return (float)$str; + + // Return float or int, as appropriate + return ((float)$str == (integer)$str) + ? (integer)$str + : (float)$str; + + } elseif (preg_match('/^("|\').+("|\')$/s', $str, $m) && $m[1] == $m[2]) { + // STRINGS RETURNED IN UTF-8 FORMAT + $delim = substr($str, 0, 1); + $chrs = substr($str, 1, -1); + $utf8 = ''; + $strlen_chrs = strlen($chrs); + + for ($c = 0; $c < $strlen_chrs; ++$c) { + + $substr_chrs_c_2 = substr($chrs, $c, 2); + $ord_chrs_c = ord($chrs{$c}); + + switch ($substr_chrs_c_2) { + case '\b': + $utf8 .= chr(0x08); + $c+=1; + break; + case '\t': + $utf8 .= chr(0x09); + $c+=1; + break; + case '\n': + $utf8 .= chr(0x0A); + $c+=1; + break; + case '\f': + $utf8 .= chr(0x0C); + $c+=1; + break; + case '\r': + $utf8 .= chr(0x0D); + $c+=1; + break; + + case '\\"': + case '\\\'': + case '\\\\': + case '\\/': + if (($delim == '"' && $substr_chrs_c_2 != '\\\'') || + ($delim == "'" && $substr_chrs_c_2 != '\\"')) { + $utf8 .= $chrs{++$c}; + } + break; + + default: + if (preg_match('/\\\u[0-9A-F]{4}/i', substr($chrs, $c, 6))) { + // single, escaped unicode character + $utf16 = chr(hexdec(substr($chrs, ($c+2), 2))) + . chr(hexdec(substr($chrs, ($c+4), 2))); + //$utf8 .= mb_convert_encoding($utf16, 'UTF-8', 'UTF-16'); + $utf8 .= utf16be_to_utf8($utf16); + $c+=5; + + } elseif(($ord_chrs_c >= 0x20) && ($ord_chrs_c <= 0x7F)) { + $utf8 .= $chrs{$c}; + + } elseif(($ord_chrs_c & 0xE0) == 0xC0) { + // characters U-00000080 - U-000007FF, mask 110XXXXX + //see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $utf8 .= substr($chrs, $c, 2); + $c += 1; + + } elseif(($ord_chrs_c & 0xF0) == 0xE0) { + // characters U-00000800 - U-0000FFFF, mask 1110XXXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $utf8 .= substr($chrs, $c, 3); + $c += 2; + + } elseif(($ord_chrs_c & 0xF8) == 0xF0) { + // characters U-00010000 - U-001FFFFF, mask 11110XXX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $utf8 .= substr($chrs, $c, 4); + $c += 3; + + } elseif(($ord_chrs_c & 0xFC) == 0xF8) { + // characters U-00200000 - U-03FFFFFF, mask 111110XX + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $utf8 .= substr($chrs, $c, 5); + $c += 4; + + } elseif(($ord_chrs_c & 0xFE) == 0xFC) { + // characters U-04000000 - U-7FFFFFFF, mask 1111110X + // see http://www.cl.cam.ac.uk/~mgk25/unicode.html#utf-8 + $utf8 .= substr($chrs, $c, 6); + $c += 5; + + } + break; + + } + + } + + return $utf8; + + } elseif (preg_match('/^\[.*\]$/s', $str) || preg_match('/^\{.*\}$/s', $str)) { + // array, or object notation + + if ($str{0} == '[') { + $stk = array(JSON_IN_ARR); + $arr = array(); + } else { + if ($this->use == JSON_LOOSE_TYPE) { + $stk = array(JSON_IN_OBJ); + $obj = array(); + } else { + $stk = array(JSON_IN_OBJ); + $obj = new stdClass(); + } + } + + array_push($stk, array('what' => JSON_SLICE, + 'where' => 0, + 'delim' => false)); + + $chrs = substr($str, 1, -1); + $chrs = $this->reduce_string($chrs); + + if ($chrs == '') { + if (reset($stk) == JSON_IN_ARR) { + return $arr; + + } else { + return $obj; + + } + } + + //print("\nparsing {$chrs}\n"); + + $strlen_chrs = strlen($chrs); + + for ($c = 0; $c <= $strlen_chrs; ++$c) { + + $top = end($stk); + $substr_chrs_c_2 = substr($chrs, $c, 2); + + if (($c == $strlen_chrs) || (($chrs{$c} == ',') && ($top['what'] == JSON_SLICE))) { + // found a comma that is not inside a string, array, etc., + // OR we've reached the end of the character list + $slice = substr($chrs, $top['where'], ($c - $top['where'])); + array_push($stk, array('what' => JSON_SLICE, 'where' => ($c + 1), 'delim' => false)); + //print("Found split at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); + + if (reset($stk) == JSON_IN_ARR) { + // we are in an array, so just push an element onto the stack + array_push($arr, $this->decode($slice)); + + } elseif (reset($stk) == JSON_IN_OBJ) { + // we are in an object, so figure + // out the property name and set an + // element in an associative array, + // for now + if (preg_match('/^\s*(["\'].*[^\\\]["\'])\s*:\s*(\S.*),?$/Uis', $slice, $parts)) { + // "name":value pair + $key = $this->decode($parts[1]); + $val = $this->decode($parts[2]); + + if ($this->use == JSON_LOOSE_TYPE) { + $obj[$key] = $val; + } else { + $obj->$key = $val; + } + } elseif (preg_match('/^\s*(\w+)\s*:\s*(\S.*),?$/Uis', $slice, $parts)) { + // name:value pair, where name is unquoted + $key = $parts[1]; + $val = $this->decode($parts[2]); + + if ($this->use == JSON_LOOSE_TYPE) { + $obj[$key] = $val; + } else { + $obj->$key = $val; + } + } + + } + + } elseif ((($chrs{$c} == '"') || ($chrs{$c} == "'")) && ($top['what'] != JSON_IN_STR)) { + // found a quote, and we are not inside a string + array_push($stk, array('what' => JSON_IN_STR, 'where' => $c, 'delim' => $chrs{$c})); + //print("Found start of string at {$c}\n"); + + } elseif (($chrs{$c} == $top['delim']) && + ($top['what'] == JSON_IN_STR) && + ((strlen(substr($chrs, 0, $c)) - strlen(rtrim(substr($chrs, 0, $c), '\\'))) % 2 != 1)) { + // found a quote, we're in a string, and it's not escaped + // we know that it's not escaped becase there is _not_ an + // odd number of backslashes at the end of the string so far + array_pop($stk); + //print("Found end of string at {$c}: ".substr($chrs, $top['where'], (1 + 1 + $c - $top['where']))."\n"); + + } elseif (($chrs{$c} == '[') && + in_array($top['what'], array(JSON_SLICE, JSON_IN_ARR, JSON_IN_OBJ))) { + // found a left-bracket, and we are in an array, object, or slice + array_push($stk, array('what' => JSON_IN_ARR, 'where' => $c, 'delim' => false)); + //print("Found start of array at {$c}\n"); + + } elseif (($chrs{$c} == ']') && ($top['what'] == JSON_IN_ARR)) { + // found a right-bracket, and we're in an array + array_pop($stk); + //print("Found end of array at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); + + } elseif (($chrs{$c} == '{') && + in_array($top['what'], array(JSON_SLICE, JSON_IN_ARR, JSON_IN_OBJ))) { + // found a left-brace, and we are in an array, object, or slice + array_push($stk, array('what' => JSON_IN_OBJ, 'where' => $c, 'delim' => false)); + //print("Found start of object at {$c}\n"); + + } elseif (($chrs{$c} == '}') && ($top['what'] == JSON_IN_OBJ)) { + // found a right-brace, and we're in an object + array_pop($stk); + //print("Found end of object at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); + + } elseif (($substr_chrs_c_2 == '/*') && + in_array($top['what'], array(JSON_SLICE, JSON_IN_ARR, JSON_IN_OBJ))) { + // found a comment start, and we are in an array, object, or slice + array_push($stk, array('what' => JSON_IN_CMT, 'where' => $c, 'delim' => false)); + $c++; + //print("Found start of comment at {$c}\n"); + + } elseif (($substr_chrs_c_2 == '*/') && ($top['what'] == JSON_IN_CMT)) { + // found a comment end, and we're in one now + array_pop($stk); + $c++; + + for ($i = $top['where']; $i <= $c; ++$i) + $chrs = substr_replace($chrs, ' ', $i, 1); + + //print("Found end of comment at {$c}: ".substr($chrs, $top['where'], (1 + $c - $top['where']))."\n"); + + } + + } + + if (reset($stk) == JSON_IN_ARR) { + return $arr; + + } elseif (reset($stk) == JSON_IN_OBJ) { + return $obj; + + } + + } + } + } + + /** + * decodes a JSON string into appropriate variable; alias for decode() + */ + function dec($var) { + return $this->decode($var); + } +} + diff --git a/sources/inc/JpegMeta.php b/sources/inc/JpegMeta.php new file mode 100644 index 0000000..cb17727 --- /dev/null +++ b/sources/inc/JpegMeta.php @@ -0,0 +1,3010 @@ + + * @link http://github.com/sd/jpeg-php + * @author Sebastian Delmont + * @author Andreas Gohr + * @author Hakan Sandell + * @todo Add support for Maker Notes, Extend for GIF and PNG metadata + */ + +// Original copyright notice: +// +// Copyright (c) 2003 Sebastian Delmont +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// 1. Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// 2. Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in the +// documentation and/or other materials provided with the distribution. +// 3. Neither the name of the author nor the names of its contributors +// may be used to endorse or promote products derived from this software +// without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS +// IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED +// TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +// PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +// HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED +// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING +// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE + +class JpegMeta { + var $_fileName; + var $_fp = null; + var $_type = 'unknown'; + + var $_markers; + var $_info; + + + /** + * Constructor + * + * @author Sebastian Delmont + */ + function JpegMeta($fileName) { + + $this->_fileName = $fileName; + + $this->_fp = null; + $this->_type = 'unknown'; + + unset($this->_info); + unset($this->_markers); + } + + /** + * Returns all gathered info as multidim array + * + * @author Sebastian Delmont + */ + function & getRawInfo() { + $this->_parseAll(); + + if ($this->_markers == null) { + return false; + } + + return $this->_info; + } + + /** + * Returns basic image info + * + * @author Sebastian Delmont + */ + function & getBasicInfo() { + $this->_parseAll(); + + $info = array(); + + if ($this->_markers == null) { + return false; + } + + $info['Name'] = $this->_info['file']['Name']; + if (isset($this->_info['file']['Url'])) { + $info['Url'] = $this->_info['file']['Url']; + $info['NiceSize'] = "???KB"; + } else { + $info['Size'] = $this->_info['file']['Size']; + $info['NiceSize'] = $this->_info['file']['NiceSize']; + } + + if (@isset($this->_info['sof']['Format'])) { + $info['Format'] = $this->_info['sof']['Format'] . " JPEG"; + } else { + $info['Format'] = $this->_info['sof']['Format'] . " JPEG"; + } + + if (@isset($this->_info['sof']['ColorChannels'])) { + $info['ColorMode'] = ($this->_info['sof']['ColorChannels'] > 1) ? "Color" : "B&W"; + } + + $info['Width'] = $this->getWidth(); + $info['Height'] = $this->getHeight(); + $info['DimStr'] = $this->getDimStr(); + + $dates = $this->getDates(); + + $info['DateTime'] = $dates['EarliestTime']; + $info['DateTimeStr'] = $dates['EarliestTimeStr']; + + $info['HasThumbnail'] = $this->hasThumbnail(); + + return $info; + } + + + /** + * Convinience function to access nearly all available Data + * through one function + * + * @author Andreas Gohr + */ + function getField($fields) { + if(!is_array($fields)) $fields = array($fields); + $info = false; + foreach($fields as $field){ + if(strtolower(substr($field,0,5)) == 'iptc.'){ + $info = $this->getIPTCField(substr($field,5)); + }elseif(strtolower(substr($field,0,5)) == 'exif.'){ + $info = $this->getExifField(substr($field,5)); + }elseif(strtolower(substr($field,0,4)) == 'xmp.'){ + $info = $this->getXmpField(substr($field,4)); + }elseif(strtolower(substr($field,0,5)) == 'file.'){ + $info = $this->getFileField(substr($field,5)); + }elseif(strtolower(substr($field,0,5)) == 'date.'){ + $info = $this->getDateField(substr($field,5)); + }elseif(strtolower($field) == 'simple.camera'){ + $info = $this->getCamera(); + }elseif(strtolower($field) == 'simple.raw'){ + return $this->getRawInfo(); + }elseif(strtolower($field) == 'simple.title'){ + $info = $this->getTitle(); + }elseif(strtolower($field) == 'simple.shutterspeed'){ + $info = $this->getShutterSpeed(); + }else{ + $info = $this->getExifField($field); + } + if($info != false) break; + } + + if($info === false) $info = ''; + if(is_array($info)){ + if(isset($info['val'])){ + $info = $info['val']; + }else{ + $info = join(', ',$info); + } + } + return trim($info); + } + + /** + * Convinience function to set nearly all available Data + * through one function + * + * @author Andreas Gohr + */ + function setField($field, $value) { + if(strtolower(substr($field,0,5)) == 'iptc.'){ + return $this->setIPTCField(substr($field,5),$value); + }elseif(strtolower(substr($field,0,5)) == 'exif.'){ + return $this->setExifField(substr($field,5),$value); + }else{ + return $this->setExifField($field,$value); + } + } + + /** + * Convinience function to delete nearly all available Data + * through one function + * + * @author Andreas Gohr + */ + function deleteField($field) { + if(strtolower(substr($field,0,5)) == 'iptc.'){ + return $this->deleteIPTCField(substr($field,5)); + }elseif(strtolower(substr($field,0,5)) == 'exif.'){ + return $this->deleteExifField(substr($field,5)); + }else{ + return $this->deleteExifField($field); + } + } + + /** + * Return a date field + * + * @author Andreas Gohr + */ + function getDateField($field) { + if (!isset($this->_info['dates'])) { + $this->_info['dates'] = $this->getDates(); + } + + if (isset($this->_info['dates'][$field])) { + return $this->_info['dates'][$field]; + } + + return false; + } + + /** + * Return a file info field + * + * @author Andreas Gohr + */ + function getFileField($field) { + if (!isset($this->_info['file'])) { + $this->_parseFileInfo(); + } + + if (isset($this->_info['file'][$field])) { + return $this->_info['file'][$field]; + } + + return false; + } + + /** + * Return the camera info (Maker and Model) + * + * @author Andreas Gohr + * @todo handle makernotes + */ + function getCamera(){ + $make = $this->getField(array('Exif.Make','Exif.TIFFMake')); + $model = $this->getField(array('Exif.Model','Exif.TIFFModel')); + $cam = trim("$make $model"); + if(empty($cam)) return false; + return $cam; + } + + /** + * Return shutter speed as a ratio + * + * @author Joe Lapp + */ + function getShutterSpeed() { + if (!isset($this->_info['exif'])) { + $this->_parseMarkerExif(); + } + if(!isset($this->_info['exif']['ExposureTime'])){ + return ''; + } + + $field = $this->_info['exif']['ExposureTime']; + if($field['den'] == 1) return $field['num']; + return $field['num'].'/'.$field['den']; + } + + /** + * Return an EXIF field + * + * @author Sebastian Delmont + */ + function getExifField($field) { + if (!isset($this->_info['exif'])) { + $this->_parseMarkerExif(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['exif'][$field])) { + return $this->_info['exif'][$field]; + } + + return false; + } + + /** + * Return an XMP field + * + * @author Hakan Sandell + */ + function getXmpField($field) { + if (!isset($this->_info['xmp'])) { + $this->_parseMarkerXmp(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['xmp'][$field])) { + return $this->_info['xmp'][$field]; + } + + return false; + } + + /** + * Return an Adobe Field + * + * @author Sebastian Delmont + */ + function getAdobeField($field) { + if (!isset($this->_info['adobe'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['adobe'][$field])) { + return $this->_info['adobe'][$field]; + } + + return false; + } + + /** + * Return an IPTC field + * + * @author Sebastian Delmont + */ + function getIPTCField($field) { + if (!isset($this->_info['iptc'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['iptc'][$field])) { + return $this->_info['iptc'][$field]; + } + + return false; + } + + /** + * Set an EXIF field + * + * @author Sebastian Delmont + * @author Joe Lapp + */ + function setExifField($field, $value) { + if (!isset($this->_info['exif'])) { + $this->_parseMarkerExif(); + } + + if ($this->_markers == null) { + return false; + } + + if ($this->_info['exif'] == false) { + $this->_info['exif'] = array(); + } + + // make sure datetimes are in correct format + if(strlen($field) >= 8 && strtolower(substr($field, 0, 8)) == 'datetime') { + if(strlen($value) < 8 || $value{4} != ':' || $value{7} != ':') { + $value = date('Y:m:d H:i:s', strtotime($value)); + } + } + + $this->_info['exif'][$field] = $value; + + return true; + } + + /** + * Set an Adobe Field + * + * @author Sebastian Delmont + */ + function setAdobeField($field, $value) { + if (!isset($this->_info['adobe'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if ($this->_info['adobe'] == false) { + $this->_info['adobe'] = array(); + } + + $this->_info['adobe'][$field] = $value; + + return true; + } + + /** + * Calculates the multiplier needed to resize the image to the given + * dimensions + * + * @author Andreas Gohr + */ + function getResizeRatio($maxwidth,$maxheight=0){ + if(!$maxheight) $maxheight = $maxwidth; + + $w = $this->getField('File.Width'); + $h = $this->getField('File.Height'); + + $ratio = 1; + if($w >= $h){ + if($w >= $maxwidth){ + $ratio = $maxwidth/$w; + }elseif($h > $maxheight){ + $ratio = $maxheight/$h; + } + }else{ + if($h >= $maxheight){ + $ratio = $maxheight/$h; + }elseif($w > $maxwidth){ + $ratio = $maxwidth/$w; + } + } + return $ratio; + } + + + /** + * Set an IPTC field + * + * @author Sebastian Delmont + */ + function setIPTCField($field, $value) { + if (!isset($this->_info['iptc'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if ($this->_info['iptc'] == false) { + $this->_info['iptc'] = array(); + } + + $this->_info['iptc'][$field] = $value; + + return true; + } + + /** + * Delete an EXIF field + * + * @author Sebastian Delmont + */ + function deleteExifField($field) { + if (!isset($this->_info['exif'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if ($this->_info['exif'] != false) { + unset($this->_info['exif'][$field]); + } + + return true; + } + + /** + * Delete an Adobe field + * + * @author Sebastian Delmont + */ + function deleteAdobeField($field) { + if (!isset($this->_info['adobe'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if ($this->_info['adobe'] != false) { + unset($this->_info['adobe'][$field]); + } + + return true; + } + + /** + * Delete an IPTC field + * + * @author Sebastian Delmont + */ + function deleteIPTCField($field) { + if (!isset($this->_info['iptc'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if ($this->_info['iptc'] != false) { + unset($this->_info['iptc'][$field]); + } + + return true; + } + + /** + * Get the image's title, tries various fields + * + * @param int $max maximum number chars (keeps words) + * @author Andreas Gohr + */ + function getTitle($max=80){ + $cap = ''; + + // try various fields + $cap = $this->getField(array('Iptc.Headline', + 'Iptc.Caption', + 'Xmp.dc:title', + 'Exif.UserComment', + 'Exif.TIFFUserComment', + 'Exif.TIFFImageDescription', + 'File.Name')); + if (empty($cap)) return false; + + if(!$max) return $cap; + // Shorten to 80 chars (keeping words) + $new = preg_replace('/\n.+$/','',wordwrap($cap, $max)); + if($new != $cap) $new .= '...'; + + return $new; + } + + /** + * Gather various date fields + * + * @author Sebastian Delmont + */ + function getDates() { + $this->_parseAll(); + if ($this->_markers == null) { + if (@isset($this->_info['file']['UnixTime'])) { + $dates['FileModified'] = $this->_info['file']['UnixTime']; + $dates['Time'] = $this->_info['file']['UnixTime']; + $dates['TimeSource'] = 'FileModified'; + $dates['TimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']); + $dates['EarliestTime'] = $this->_info['file']['UnixTime']; + $dates['EarliestTimeSource'] = 'FileModified'; + $dates['EarliestTimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']); + $dates['LatestTime'] = $this->_info['file']['UnixTime']; + $dates['LatestTimeSource'] = 'FileModified'; + $dates['LatestTimeStr'] = date("Y-m-d H:i:s", $this->_info['file']['UnixTime']); + return $dates; + } + return false; + } + + $dates = array(); + + $latestTime = 0; + $latestTimeSource = ""; + $earliestTime = time(); + $earliestTimeSource = ""; + + if (@isset($this->_info['exif']['DateTime'])) { + $dates['ExifDateTime'] = $this->_info['exif']['DateTime']; + + $aux = $this->_info['exif']['DateTime']; + $aux{4} = "-"; + $aux{7} = "-"; + $t = strtotime($aux); + + if ($t && $t > $latestTime) { + $latestTime = $t; + $latestTimeSource = "ExifDateTime"; + } + + if ($t && $t < $earliestTime) { + $earliestTime = $t; + $earliestTimeSource = "ExifDateTime"; + } + } + + if (@isset($this->_info['exif']['DateTimeOriginal'])) { + $dates['ExifDateTimeOriginal'] = $this->_info['exif']['DateTime']; + + $aux = $this->_info['exif']['DateTimeOriginal']; + $aux{4} = "-"; + $aux{7} = "-"; + $t = strtotime($aux); + + if ($t && $t > $latestTime) { + $latestTime = $t; + $latestTimeSource = "ExifDateTimeOriginal"; + } + + if ($t && $t < $earliestTime) { + $earliestTime = $t; + $earliestTimeSource = "ExifDateTimeOriginal"; + } + } + + if (@isset($this->_info['exif']['DateTimeDigitized'])) { + $dates['ExifDateTimeDigitized'] = $this->_info['exif']['DateTime']; + + $aux = $this->_info['exif']['DateTimeDigitized']; + $aux{4} = "-"; + $aux{7} = "-"; + $t = strtotime($aux); + + if ($t && $t > $latestTime) { + $latestTime = $t; + $latestTimeSource = "ExifDateTimeDigitized"; + } + + if ($t && $t < $earliestTime) { + $earliestTime = $t; + $earliestTimeSource = "ExifDateTimeDigitized"; + } + } + + if (@isset($this->_info['iptc']['DateCreated'])) { + $dates['IPTCDateCreated'] = $this->_info['iptc']['DateCreated']; + + $aux = $this->_info['iptc']['DateCreated']; + $aux = substr($aux, 0, 4) . "-" . substr($aux, 4, 2) . "-" . substr($aux, 6, 2); + $t = strtotime($aux); + + if ($t && $t > $latestTime) { + $latestTime = $t; + $latestTimeSource = "IPTCDateCreated"; + } + + if ($t && $t < $earliestTime) { + $earliestTime = $t; + $earliestTimeSource = "IPTCDateCreated"; + } + } + + if (@isset($this->_info['file']['UnixTime'])) { + $dates['FileModified'] = $this->_info['file']['UnixTime']; + + $t = $this->_info['file']['UnixTime']; + + if ($t && $t > $latestTime) { + $latestTime = $t; + $latestTimeSource = "FileModified"; + } + + if ($t && $t < $earliestTime) { + $earliestTime = $t; + $earliestTimeSource = "FileModified"; + } + } + + $dates['Time'] = $earliestTime; + $dates['TimeSource'] = $earliestTimeSource; + $dates['TimeStr'] = date("Y-m-d H:i:s", $earliestTime); + $dates['EarliestTime'] = $earliestTime; + $dates['EarliestTimeSource'] = $earliestTimeSource; + $dates['EarliestTimeStr'] = date("Y-m-d H:i:s", $earliestTime); + $dates['LatestTime'] = $latestTime; + $dates['LatestTimeSource'] = $latestTimeSource; + $dates['LatestTimeStr'] = date("Y-m-d H:i:s", $latestTime); + + return $dates; + } + + /** + * Get the image width, tries various fields + * + * @author Sebastian Delmont + */ + function getWidth() { + if (!isset($this->_info['sof'])) { + $this->_parseMarkerSOF(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['sof']['ImageWidth'])) { + return $this->_info['sof']['ImageWidth']; + } + + if (!isset($this->_info['exif'])) { + $this->_parseMarkerExif(); + } + + if (isset($this->_info['exif']['PixelXDimension'])) { + return $this->_info['exif']['PixelXDimension']; + } + + return false; + } + + /** + * Get the image height, tries various fields + * + * @author Sebastian Delmont + */ + function getHeight() { + if (!isset($this->_info['sof'])) { + $this->_parseMarkerSOF(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['sof']['ImageHeight'])) { + return $this->_info['sof']['ImageHeight']; + } + + if (!isset($this->_info['exif'])) { + $this->_parseMarkerExif(); + } + + if (isset($this->_info['exif']['PixelYDimension'])) { + return $this->_info['exif']['PixelYDimension']; + } + + return false; + } + + /** + * Get an dimension string for use in img tag + * + * @author Sebastian Delmont + */ + function getDimStr() { + if ($this->_markers == null) { + return false; + } + + $w = $this->getWidth(); + $h = $this->getHeight(); + + return "width='" . $w . "' height='" . $h . "'"; + } + + /** + * Checks for an embedded thumbnail + * + * @author Sebastian Delmont + */ + function hasThumbnail($which = 'any') { + if (($which == 'any') || ($which == 'exif')) { + if (!isset($this->_info['exif'])) { + $this->_parseMarkerExif(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['exif']) && is_array($this->_info['exif'])) { + if (isset($this->_info['exif']['JFIFThumbnail'])) { + return 'exif'; + } + } + } + + if ($which == 'adobe') { + if (!isset($this->_info['adobe'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['adobe']) && is_array($this->_info['adobe'])) { + if (isset($this->_info['adobe']['ThumbnailData'])) { + return 'exif'; + } + } + } + + return false; + } + + /** + * Send embedded thumbnail to browser + * + * @author Sebastian Delmont + */ + function sendThumbnail($which = 'any') { + $data = null; + + if (($which == 'any') || ($which == 'exif')) { + if (!isset($this->_info['exif'])) { + $this->_parseMarkerExif(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['exif']) && is_array($this->_info['exif'])) { + if (isset($this->_info['exif']['JFIFThumbnail'])) { + $data =& $this->_info['exif']['JFIFThumbnail']; + } + } + } + + if (($which == 'adobe') || ($data == null)){ + if (!isset($this->_info['adobe'])) { + $this->_parseMarkerAdobe(); + } + + if ($this->_markers == null) { + return false; + } + + if (isset($this->_info['adobe']) && is_array($this->_info['adobe'])) { + if (isset($this->_info['adobe']['ThumbnailData'])) { + $data =& $this->_info['adobe']['ThumbnailData']; + } + } + } + + if ($data != null) { + header("Content-type: image/jpeg"); + echo $data; + return true; + } + + return false; + } + + /** + * Save changed Metadata + * + * @author Sebastian Delmont + * @author Andreas Gohr + */ + function save($fileName = "") { + if ($fileName == "") { + $tmpName = tempnam(dirname($this->_fileName),'_metatemp_'); + $this->_writeJPEG($tmpName); + if (@file_exists($tmpName)) { + return io_rename($tmpName, $this->_fileName); + } + } else { + return $this->_writeJPEG($fileName); + } + return false; + } + + /*************************************************************/ + /* PRIVATE FUNCTIONS (Internal Use Only!) */ + /*************************************************************/ + + /*************************************************************/ + function _dispose($fileName = "") { + $this->_fileName = $fileName; + + $this->_fp = null; + $this->_type = 'unknown'; + + unset($this->_markers); + unset($this->_info); + } + + /*************************************************************/ + function _readJPEG() { + unset($this->_markers); + //unset($this->_info); + $this->_markers = array(); + //$this->_info = array(); + + $this->_fp = @fopen($this->_fileName, 'rb'); + if ($this->_fp) { + if (file_exists($this->_fileName)) { + $this->_type = 'file'; + } + else { + $this->_type = 'url'; + } + } else { + $this->_fp = null; + return false; // ERROR: Can't open file + } + + // Check for the JPEG signature + $c1 = ord(fgetc($this->_fp)); + $c2 = ord(fgetc($this->_fp)); + + if ($c1 != 0xFF || $c2 != 0xD8) { // (0xFF + SOI) + $this->_markers = null; + return false; // ERROR: File is not a JPEG + } + + $count = 0; + + $done = false; + $ok = true; + + while (!$done) { + $capture = false; + + // First, skip any non 0xFF bytes + $discarded = 0; + $c = ord(fgetc($this->_fp)); + while (!feof($this->_fp) && ($c != 0xFF)) { + $discarded++; + $c = ord(fgetc($this->_fp)); + } + // Then skip all 0xFF until the marker byte + do { + $marker = ord(fgetc($this->_fp)); + } while (!feof($this->_fp) && ($marker == 0xFF)); + + if (feof($this->_fp)) { + return false; // ERROR: Unexpected EOF + } + if ($discarded != 0) { + return false; // ERROR: Extraneous data + } + + $length = ord(fgetc($this->_fp)) * 256 + ord(fgetc($this->_fp)); + if (feof($this->_fp)) { + return false; // ERROR: Unexpected EOF + } + if ($length < 2) { + return false; // ERROR: Extraneous data + } + $length = $length - 2; // The length we got counts itself + + switch ($marker) { + case 0xC0: // SOF0 + case 0xC1: // SOF1 + case 0xC2: // SOF2 + case 0xC9: // SOF9 + case 0xE0: // APP0: JFIF data + case 0xE1: // APP1: EXIF or XMP data + case 0xED: // APP13: IPTC / Photoshop data + $capture = true; + break; + case 0xDA: // SOS: Start of scan... the image itself and the last block on the file + $capture = false; + $length = -1; // This field has no length... it includes all data until EOF + $done = true; + break; + default: + $capture = true;//false; + break; + } + + $this->_markers[$count] = array(); + $this->_markers[$count]['marker'] = $marker; + $this->_markers[$count]['length'] = $length; + + if ($capture) { + if ($length) + $this->_markers[$count]['data'] = fread($this->_fp, $length); + else + $this->_markers[$count]['data'] = ""; + } + elseif (!$done) { + $result = @fseek($this->_fp, $length, SEEK_CUR); + // fseek doesn't seem to like HTTP 'files', but fgetc has no problem + if (!($result === 0)) { + for ($i = 0; $i < $length; $i++) { + fgetc($this->_fp); + } + } + } + $count++; + } + + if ($this->_fp) { + fclose($this->_fp); + $this->_fp = null; + } + + return $ok; + } + + /*************************************************************/ + function _parseAll() { + if (!isset($this->_info['file'])) { + $this->_parseFileInfo(); + } + if (!isset($this->_markers)) { + $this->_readJPEG(); + } + + if ($this->_markers == null) { + return false; + } + + if (!isset($this->_info['jfif'])) { + $this->_parseMarkerJFIF(); + } + if (!isset($this->_info['jpeg'])) { + $this->_parseMarkerSOF(); + } + if (!isset($this->_info['exif'])) { + $this->_parseMarkerExif(); + } + if (!isset($this->_info['xmp'])) { + $this->_parseMarkerXmp(); + } + if (!isset($this->_info['adobe'])) { + $this->_parseMarkerAdobe(); + } + } + + /*************************************************************/ + function _writeJPEG($outputName) { + $this->_parseAll(); + + $wroteEXIF = false; + $wroteAdobe = false; + + $this->_fp = @fopen($this->_fileName, 'r'); + if ($this->_fp) { + if (file_exists($this->_fileName)) { + $this->_type = 'file'; + } + else { + $this->_type = 'url'; + } + } else { + $this->_fp = null; + return false; // ERROR: Can't open file + } + + $this->_fpout = fopen($outputName, 'wb'); + if (!$this->_fpout) { + $this->_fpout = null; + fclose($this->_fp); + $this->_fp = null; + return false; // ERROR: Can't open output file + } + + // Check for the JPEG signature + $c1 = ord(fgetc($this->_fp)); + $c2 = ord(fgetc($this->_fp)); + + if ($c1 != 0xFF || $c2 != 0xD8) { // (0xFF + SOI) + return false; // ERROR: File is not a JPEG + } + + fputs($this->_fpout, chr(0xFF), 1); + fputs($this->_fpout, chr(0xD8), 1); // (0xFF + SOI) + + $count = 0; + + $done = false; + $ok = true; + + while (!$done) { + // First, skip any non 0xFF bytes + $discarded = 0; + $c = ord(fgetc($this->_fp)); + while (!feof($this->_fp) && ($c != 0xFF)) { + $discarded++; + $c = ord(fgetc($this->_fp)); + } + // Then skip all 0xFF until the marker byte + do { + $marker = ord(fgetc($this->_fp)); + } while (!feof($this->_fp) && ($marker == 0xFF)); + + if (feof($this->_fp)) { + $ok = false; + break; // ERROR: Unexpected EOF + } + if ($discarded != 0) { + $ok = false; + break; // ERROR: Extraneous data + } + + $length = ord(fgetc($this->_fp)) * 256 + ord(fgetc($this->_fp)); + if (feof($this->_fp)) { + $ok = false; + break; // ERROR: Unexpected EOF + } + if ($length < 2) { + $ok = false; + break; // ERROR: Extraneous data + } + $length = $length - 2; // The length we got counts itself + + unset($data); + if ($marker == 0xE1) { // APP1: EXIF data + $data =& $this->_createMarkerEXIF(); + $wroteEXIF = true; + } + elseif ($marker == 0xED) { // APP13: IPTC / Photoshop data + $data =& $this->_createMarkerAdobe(); + $wroteAdobe = true; + } + elseif ($marker == 0xDA) { // SOS: Start of scan... the image itself and the last block on the file + $done = true; + } + + if (!$wroteEXIF && (($marker < 0xE0) || ($marker > 0xEF))) { + if (isset($this->_info['exif']) && is_array($this->_info['exif'])) { + $exif =& $this->_createMarkerEXIF(); + $this->_writeJPEGMarker(0xE1, strlen($exif), $exif, 0); + unset($exif); + } + $wroteEXIF = true; + } + + if (!$wroteAdobe && (($marker < 0xE0) || ($marker > 0xEF))) { + if ((isset($this->_info['adobe']) && is_array($this->_info['adobe'])) + || (isset($this->_info['iptc']) && is_array($this->_info['iptc']))) { + $adobe =& $this->_createMarkerAdobe(); + $this->_writeJPEGMarker(0xED, strlen($adobe), $adobe, 0); + unset($adobe); + } + $wroteAdobe = true; + } + + $origLength = $length; + if (isset($data)) { + $length = strlen($data); + } + + if ($marker != -1) { + $this->_writeJPEGMarker($marker, $length, $data, $origLength); + } + } + + if ($this->_fp) { + fclose($this->_fp); + $this->_fp = null; + } + + if ($this->_fpout) { + fclose($this->_fpout); + $this->_fpout = null; + } + + return $ok; + } + + /*************************************************************/ + function _writeJPEGMarker($marker, $length, &$data, $origLength) { + if ($length <= 0) { + return false; + } + + fputs($this->_fpout, chr(0xFF), 1); + fputs($this->_fpout, chr($marker), 1); + fputs($this->_fpout, chr((($length + 2) & 0x0000FF00) >> 8), 1); + fputs($this->_fpout, chr((($length + 2) & 0x000000FF) >> 0), 1); + + if (isset($data)) { + // Copy the generated data + fputs($this->_fpout, $data, $length); + + if ($origLength > 0) { // Skip the original data + $result = @fseek($this->_fp, $origLength, SEEK_CUR); + // fseek doesn't seem to like HTTP 'files', but fgetc has no problem + if ($result != 0) { + for ($i = 0; $i < $origLength; $i++) { + fgetc($this->_fp); + } + } + } + } else { + if ($marker == 0xDA) { // Copy until EOF + while (!feof($this->_fp)) { + $data = fread($this->_fp, 1024 * 16); + fputs($this->_fpout, $data, strlen($data)); + } + } else { // Copy only $length bytes + $data = @fread($this->_fp, $length); + fputs($this->_fpout, $data, $length); + } + } + + return true; + } + + /** + * Gets basic info from the file - should work with non-JPEGs + * + * @author Sebastian Delmont + * @author Andreas Gohr + */ + function _parseFileInfo() { + if (file_exists($this->_fileName) && is_file($this->_fileName)) { + $this->_info['file'] = array(); + $this->_info['file']['Name'] = utf8_decodeFN(utf8_basename($this->_fileName)); + $this->_info['file']['Path'] = fullpath($this->_fileName); + $this->_info['file']['Size'] = filesize($this->_fileName); + if ($this->_info['file']['Size'] < 1024) { + $this->_info['file']['NiceSize'] = $this->_info['file']['Size'] . 'B'; + } elseif ($this->_info['file']['Size'] < (1024 * 1024)) { + $this->_info['file']['NiceSize'] = round($this->_info['file']['Size'] / 1024) . 'KB'; + } elseif ($this->_info['file']['Size'] < (1024 * 1024 * 1024)) { + $this->_info['file']['NiceSize'] = round($this->_info['file']['Size'] / (1024*1024)) . 'MB'; + } else { + $this->_info['file']['NiceSize'] = $this->_info['file']['Size'] . 'B'; + } + $this->_info['file']['UnixTime'] = filemtime($this->_fileName); + + // get image size directly from file + $size = getimagesize($this->_fileName); + $this->_info['file']['Width'] = $size[0]; + $this->_info['file']['Height'] = $size[1]; + // set mime types and formats + // http://www.php.net/manual/en/function.getimagesize.php + // http://www.php.net/manual/en/function.image-type-to-mime-type.php + switch ($size[2]){ + case 1: + $this->_info['file']['Mime'] = 'image/gif'; + $this->_info['file']['Format'] = 'GIF'; + break; + case 2: + $this->_info['file']['Mime'] = 'image/jpeg'; + $this->_info['file']['Format'] = 'JPEG'; + break; + case 3: + $this->_info['file']['Mime'] = 'image/png'; + $this->_info['file']['Format'] = 'PNG'; + break; + case 4: + $this->_info['file']['Mime'] = 'application/x-shockwave-flash'; + $this->_info['file']['Format'] = 'SWF'; + break; + case 5: + $this->_info['file']['Mime'] = 'image/psd'; + $this->_info['file']['Format'] = 'PSD'; + break; + case 6: + $this->_info['file']['Mime'] = 'image/bmp'; + $this->_info['file']['Format'] = 'BMP'; + break; + case 7: + $this->_info['file']['Mime'] = 'image/tiff'; + $this->_info['file']['Format'] = 'TIFF (Intel)'; + break; + case 8: + $this->_info['file']['Mime'] = 'image/tiff'; + $this->_info['file']['Format'] = 'TIFF (Motorola)'; + break; + case 9: + $this->_info['file']['Mime'] = 'application/octet-stream'; + $this->_info['file']['Format'] = 'JPC'; + break; + case 10: + $this->_info['file']['Mime'] = 'image/jp2'; + $this->_info['file']['Format'] = 'JP2'; + break; + case 11: + $this->_info['file']['Mime'] = 'application/octet-stream'; + $this->_info['file']['Format'] = 'JPX'; + break; + case 12: + $this->_info['file']['Mime'] = 'application/octet-stream'; + $this->_info['file']['Format'] = 'JB2'; + break; + case 13: + $this->_info['file']['Mime'] = 'application/x-shockwave-flash'; + $this->_info['file']['Format'] = 'SWC'; + break; + case 14: + $this->_info['file']['Mime'] = 'image/iff'; + $this->_info['file']['Format'] = 'IFF'; + break; + case 15: + $this->_info['file']['Mime'] = 'image/vnd.wap.wbmp'; + $this->_info['file']['Format'] = 'WBMP'; + break; + case 16: + $this->_info['file']['Mime'] = 'image/xbm'; + $this->_info['file']['Format'] = 'XBM'; + break; + default: + $this->_info['file']['Mime'] = 'image/unknown'; + } + } else { + $this->_info['file'] = array(); + $this->_info['file']['Name'] = utf8_basename($this->_fileName); + $this->_info['file']['Url'] = $this->_fileName; + } + + return true; + } + + /*************************************************************/ + function _parseMarkerJFIF() { + if (!isset($this->_markers)) { + $this->_readJPEG(); + } + + if ($this->_markers == null) { + return false; + } + + $data = null; + $count = count($this->_markers); + for ($i = 0; $i < $count; $i++) { + if ($this->_markers[$i]['marker'] == 0xE0) { + $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 4); + if ($signature == 'JFIF') { + $data =& $this->_markers[$i]['data']; + break; + } + } + } + + if ($data == null) { + $this->_info['jfif'] = false; + return false; + } + + $pos = 0; + $this->_info['jfif'] = array(); + + $vmaj = $this->_getByte($data, 5); + $vmin = $this->_getByte($data, 6); + + $this->_info['jfif']['Version'] = sprintf('%d.%02d', $vmaj, $vmin); + + $units = $this->_getByte($data, 7); + switch ($units) { + case 0: + $this->_info['jfif']['Units'] = 'pixels'; + break; + case 1: + $this->_info['jfif']['Units'] = 'dpi'; + break; + case 2: + $this->_info['jfif']['Units'] = 'dpcm'; + break; + default: + $this->_info['jfif']['Units'] = 'unknown'; + break; + } + + $xdens = $this->_getShort($data, 8); + $ydens = $this->_getShort($data, 10); + + $this->_info['jfif']['XDensity'] = $xdens; + $this->_info['jfif']['YDensity'] = $ydens; + + $thumbx = $this->_getByte($data, 12); + $thumby = $this->_getByte($data, 13); + + $this->_info['jfif']['ThumbnailWidth'] = $thumbx; + $this->_info['jfif']['ThumbnailHeight'] = $thumby; + + return true; + } + + /*************************************************************/ + function _parseMarkerSOF() { + if (!isset($this->_markers)) { + $this->_readJPEG(); + } + + if ($this->_markers == null) { + return false; + } + + $data = null; + $count = count($this->_markers); + for ($i = 0; $i < $count; $i++) { + switch ($this->_markers[$i]['marker']) { + case 0xC0: // SOF0 + case 0xC1: // SOF1 + case 0xC2: // SOF2 + case 0xC9: // SOF9 + $data =& $this->_markers[$i]['data']; + $marker = $this->_markers[$i]['marker']; + break; + } + } + + if ($data == null) { + $this->_info['sof'] = false; + return false; + } + + $pos = 0; + $this->_info['sof'] = array(); + + switch ($marker) { + case 0xC0: // SOF0 + $format = 'Baseline'; + break; + case 0xC1: // SOF1 + $format = 'Progessive'; + break; + case 0xC2: // SOF2 + $format = 'Non-baseline'; + break; + case 0xC9: // SOF9 + $format = 'Arithmetic'; + break; + default: + return false; + break; + } + + $this->_info['sof']['Format'] = $format; + $this->_info['sof']['SamplePrecision'] = $this->_getByte($data, $pos + 0); + $this->_info['sof']['ImageHeight'] = $this->_getShort($data, $pos + 1); + $this->_info['sof']['ImageWidth'] = $this->_getShort($data, $pos + 3); + $this->_info['sof']['ColorChannels'] = $this->_getByte($data, $pos + 5); + + return true; + } + + /** + * Parses the XMP data + * + * @author Hakan Sandell + */ + function _parseMarkerXmp() { + if (!isset($this->_markers)) { + $this->_readJPEG(); + } + + if ($this->_markers == null) { + return false; + } + + $data = null; + $count = count($this->_markers); + for ($i = 0; $i < $count; $i++) { + if ($this->_markers[$i]['marker'] == 0xE1) { + $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 29); + if ($signature == "http://ns.adobe.com/xap/1.0/\0") { + $data = substr($this->_markers[$i]['data'], 29); + break; + } + } + } + + if ($data == null) { + $this->_info['xmp'] = false; + return false; + } + + $parser = xml_parser_create(); + xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0); + xml_parser_set_option($parser, XML_OPTION_SKIP_WHITE, 1); + $result = xml_parse_into_struct($parser, $data, $values, $tags); + xml_parser_free($parser); + + if ($result == 0) { + $this->_info['xmp'] = false; + return false; + } + + $this->_info['xmp'] = array(); + $count = count($values); + for ($i = 0; $i < $count; $i++) { + if ($values[$i]['tag'] == 'rdf:Description' && $values[$i]['type'] == 'open') { + + while ((++$i < $count) && ($values[$i]['tag'] != 'rdf:Description')) { + $this->_parseXmpNode($values, $i, $this->_info['xmp'][$values[$i]['tag']], $count); + } + } + } + return true; + } + + /** + * Parses XMP nodes by recursion + * + * @author Hakan Sandell + */ + function _parseXmpNode($values, &$i, &$meta, $count) { + if ($values[$i]['type'] == 'close') return; + + if ($values[$i]['type'] == 'complete') { + // Simple Type property + $meta = $values[$i]['value']; + return; + } + + $i++; + if ($i >= $count) return; + + if ($values[$i]['tag'] == 'rdf:Bag' || $values[$i]['tag'] == 'rdf:Seq') { + // Array property + $meta = array(); + while ($values[++$i]['tag'] == 'rdf:li') { + $this->_parseXmpNode($values, $i, $meta[], $count); + } + $i++; // skip closing Bag/Seq tag + + } elseif ($values[$i]['tag'] == 'rdf:Alt') { + // Language Alternative property, only the first (default) value is used + if ($values[$i]['type'] == 'open') { + $i++; + $this->_parseXmpNode($values, $i, $meta, $count); + while ((++$i < $count) && ($values[$i]['tag'] != 'rdf:Alt')); + $i++; // skip closing Alt tag + } + + } else { + // Structure property + $meta = array(); + $startTag = $values[$i-1]['tag']; + do { + $this->_parseXmpNode($values, $i, $meta[$values[$i]['tag']], $count); + } while ((++$i < $count) && ($values[$i]['tag'] != $startTag)); + } + } + + /*************************************************************/ + function _parseMarkerExif() { + if (!isset($this->_markers)) { + $this->_readJPEG(); + } + + if ($this->_markers == null) { + return false; + } + + $data = null; + $count = count($this->_markers); + for ($i = 0; $i < $count; $i++) { + if ($this->_markers[$i]['marker'] == 0xE1) { + $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 6); + if ($signature == "Exif\0\0") { + $data =& $this->_markers[$i]['data']; + break; + } + } + } + + if ($data == null) { + $this->_info['exif'] = false; + return false; + } + $pos = 6; + $this->_info['exif'] = array(); + + // We don't increment $pos after this because Exif uses offsets relative to this point + + $byteAlign = $this->_getShort($data, $pos + 0); + + if ($byteAlign == 0x4949) { // "II" + $isBigEndian = false; + } elseif ($byteAlign == 0x4D4D) { // "MM" + $isBigEndian = true; + } else { + return false; // Unexpected data + } + + $alignCheck = $this->_getShort($data, $pos + 2, $isBigEndian); + if ($alignCheck != 0x002A) // That's the expected value + return false; // Unexpected data + + if ($isBigEndian) { + $this->_info['exif']['ByteAlign'] = "Big Endian"; + } else { + $this->_info['exif']['ByteAlign'] = "Little Endian"; + } + + $offsetIFD0 = $this->_getLong($data, $pos + 4, $isBigEndian); + if ($offsetIFD0 < 8) + return false; // Unexpected data + + $offsetIFD1 = $this->_readIFD($data, $pos, $offsetIFD0, $isBigEndian, 'ifd0'); + if ($offsetIFD1 != 0) + $this->_readIFD($data, $pos, $offsetIFD1, $isBigEndian, 'ifd1'); + + return true; + } + + /*************************************************************/ + function _readIFD($data, $base, $offset, $isBigEndian, $mode) { + $EXIFTags = $this->_exifTagNames($mode); + + $numEntries = $this->_getShort($data, $base + $offset, $isBigEndian); + $offset += 2; + + $exifTIFFOffset = 0; + $exifTIFFLength = 0; + $exifThumbnailOffset = 0; + $exifThumbnailLength = 0; + + for ($i = 0; $i < $numEntries; $i++) { + $tag = $this->_getShort($data, $base + $offset, $isBigEndian); + $offset += 2; + $type = $this->_getShort($data, $base + $offset, $isBigEndian); + $offset += 2; + $count = $this->_getLong($data, $base + $offset, $isBigEndian); + $offset += 4; + + if (($type < 1) || ($type > 12)) + return false; // Unexpected Type + + $typeLengths = array( -1, 1, 1, 2, 4, 8, 1, 1, 2, 4, 8, 4, 8 ); + + $dataLength = $typeLengths[$type] * $count; + if ($dataLength > 4) { + $dataOffset = $this->_getLong($data, $base + $offset, $isBigEndian); + $rawValue = $this->_getFixedString($data, $base + $dataOffset, $dataLength); + } else { + $rawValue = $this->_getFixedString($data, $base + $offset, $dataLength); + } + $offset += 4; + + switch ($type) { + case 1: // UBYTE + if ($count == 1) { + $value = $this->_getByte($rawValue, 0); + } else { + $value = array(); + for ($j = 0; $j < $count; $j++) + $value[$j] = $this->_getByte($rawValue, $j); + } + break; + case 2: // ASCII + $value = $rawValue; + break; + case 3: // USHORT + if ($count == 1) { + $value = $this->_getShort($rawValue, 0, $isBigEndian); + } else { + $value = array(); + for ($j = 0; $j < $count; $j++) + $value[$j] = $this->_getShort($rawValue, $j * 2, $isBigEndian); + } + break; + case 4: // ULONG + if ($count == 1) { + $value = $this->_getLong($rawValue, 0, $isBigEndian); + } else { + $value = array(); + for ($j = 0; $j < $count; $j++) + $value[$j] = $this->_getLong($rawValue, $j * 4, $isBigEndian); + } + break; + case 5: // URATIONAL + if ($count == 1) { + $a = $this->_getLong($rawValue, 0, $isBigEndian); + $b = $this->_getLong($rawValue, 4, $isBigEndian); + $value = array(); + $value['val'] = 0; + $value['num'] = $a; + $value['den'] = $b; + if (($a != 0) && ($b != 0)) { + $value['val'] = $a / $b; + } + } else { + $value = array(); + for ($j = 0; $j < $count; $j++) { + $a = $this->_getLong($rawValue, $j * 8, $isBigEndian); + $b = $this->_getLong($rawValue, ($j * 8) + 4, $isBigEndian); + $value = array(); + $value[$j]['val'] = 0; + $value[$j]['num'] = $a; + $value[$j]['den'] = $b; + if (($a != 0) && ($b != 0)) + $value[$j]['val'] = $a / $b; + } + } + break; + case 6: // SBYTE + if ($count == 1) { + $value = $this->_getByte($rawValue, 0); + } else { + $value = array(); + for ($j = 0; $j < $count; $j++) + $value[$j] = $this->_getByte($rawValue, $j); + } + break; + case 7: // UNDEFINED + $value = $rawValue; + break; + case 8: // SSHORT + if ($count == 1) { + $value = $this->_getShort($rawValue, 0, $isBigEndian); + } else { + $value = array(); + for ($j = 0; $j < $count; $j++) + $value[$j] = $this->_getShort($rawValue, $j * 2, $isBigEndian); + } + break; + case 9: // SLONG + if ($count == 1) { + $value = $this->_getLong($rawValue, 0, $isBigEndian); + } else { + $value = array(); + for ($j = 0; $j < $count; $j++) + $value[$j] = $this->_getLong($rawValue, $j * 4, $isBigEndian); + } + break; + case 10: // SRATIONAL + if ($count == 1) { + $a = $this->_getLong($rawValue, 0, $isBigEndian); + $b = $this->_getLong($rawValue, 4, $isBigEndian); + $value = array(); + $value['val'] = 0; + $value['num'] = $a; + $value['den'] = $b; + if (($a != 0) && ($b != 0)) + $value['val'] = $a / $b; + } else { + $value = array(); + for ($j = 0; $j < $count; $j++) { + $a = $this->_getLong($rawValue, $j * 8, $isBigEndian); + $b = $this->_getLong($rawValue, ($j * 8) + 4, $isBigEndian); + $value = array(); + $value[$j]['val'] = 0; + $value[$j]['num'] = $a; + $value[$j]['den'] = $b; + if (($a != 0) && ($b != 0)) + $value[$j]['val'] = $a / $b; + } + } + break; + case 11: // FLOAT + $value = $rawValue; + break; + + case 12: // DFLOAT + $value = $rawValue; + break; + default: + return false; // Unexpected Type + } + + $tagName = ''; + if (($mode == 'ifd0') && ($tag == 0x8769)) { // ExifIFDOffset + $this->_readIFD($data, $base, $value, $isBigEndian, 'exif'); + } elseif (($mode == 'ifd0') && ($tag == 0x8825)) { // GPSIFDOffset + $this->_readIFD($data, $base, $value, $isBigEndian, 'gps'); + } elseif (($mode == 'ifd1') && ($tag == 0x0111)) { // TIFFStripOffsets + $exifTIFFOffset = $value; + } elseif (($mode == 'ifd1') && ($tag == 0x0117)) { // TIFFStripByteCounts + $exifTIFFLength = $value; + } elseif (($mode == 'ifd1') && ($tag == 0x0201)) { // TIFFJFIFOffset + $exifThumbnailOffset = $value; + } elseif (($mode == 'ifd1') && ($tag == 0x0202)) { // TIFFJFIFLength + $exifThumbnailLength = $value; + } elseif (($mode == 'exif') && ($tag == 0xA005)) { // InteropIFDOffset + $this->_readIFD($data, $base, $value, $isBigEndian, 'interop'); + } + // elseif (($mode == 'exif') && ($tag == 0x927C)) { // MakerNote + // } + else { + if (isset($EXIFTags[$tag])) { + $tagName = $EXIFTags[$tag]; + if (isset($this->_info['exif'][$tagName])) { + if (!is_array($this->_info['exif'][$tagName])) { + $aux = array(); + $aux[0] = $this->_info['exif'][$tagName]; + $this->_info['exif'][$tagName] = $aux; + } + + $this->_info['exif'][$tagName][count($this->_info['exif'][$tagName])] = $value; + } else { + $this->_info['exif'][$tagName] = $value; + } + } + /* + else { + echo sprintf("

Unknown tag %02x (t: %d l: %d) %s in %s

", $tag, $type, $count, $mode, $this->_fileName); + // Unknown Tags will be ignored!!! + // That's because the tag might be a pointer (like the Exif tag) + // and saving it without saving the data it points to might + // create an invalid file. + } + */ + } + } + + if (($exifThumbnailOffset > 0) && ($exifThumbnailLength > 0)) { + $this->_info['exif']['JFIFThumbnail'] = $this->_getFixedString($data, $base + $exifThumbnailOffset, $exifThumbnailLength); + } + + if (($exifTIFFOffset > 0) && ($exifTIFFLength > 0)) { + $this->_info['exif']['TIFFStrips'] = $this->_getFixedString($data, $base + $exifTIFFOffset, $exifTIFFLength); + } + + $nextOffset = $this->_getLong($data, $base + $offset, $isBigEndian); + return $nextOffset; + } + + /*************************************************************/ + function & _createMarkerExif() { + $data = null; + $count = count($this->_markers); + for ($i = 0; $i < $count; $i++) { + if ($this->_markers[$i]['marker'] == 0xE1) { + $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 6); + if ($signature == "Exif\0\0") { + $data =& $this->_markers[$i]['data']; + break; + } + } + } + + if (!isset($this->_info['exif'])) { + return false; + } + + $data = "Exif\0\0"; + $pos = 6; + $offsetBase = 6; + + if (isset($this->_info['exif']['ByteAlign']) && ($this->_info['exif']['ByteAlign'] == "Big Endian")) { + $isBigEndian = true; + $aux = "MM"; + $pos = $this->_putString($data, $pos, $aux); + } else { + $isBigEndian = false; + $aux = "II"; + $pos = $this->_putString($data, $pos, $aux); + } + $pos = $this->_putShort($data, $pos, 0x002A, $isBigEndian); + $pos = $this->_putLong($data, $pos, 0x00000008, $isBigEndian); // IFD0 Offset is always 8 + + $ifd0 =& $this->_getIFDEntries($isBigEndian, 'ifd0'); + $ifd1 =& $this->_getIFDEntries($isBigEndian, 'ifd1'); + + $pos = $this->_writeIFD($data, $pos, $offsetBase, $ifd0, $isBigEndian, true); + $pos = $this->_writeIFD($data, $pos, $offsetBase, $ifd1, $isBigEndian, false); + + return $data; + } + + /*************************************************************/ + function _writeIFD(&$data, $pos, $offsetBase, &$entries, $isBigEndian, $hasNext) { + $tiffData = null; + $tiffDataOffsetPos = -1; + + $entryCount = count($entries); + + $dataPos = $pos + 2 + ($entryCount * 12) + 4; + $pos = $this->_putShort($data, $pos, $entryCount, $isBigEndian); + + for ($i = 0; $i < $entryCount; $i++) { + $tag = $entries[$i]['tag']; + $type = $entries[$i]['type']; + + if ($type == -99) { // SubIFD + $pos = $this->_putShort($data, $pos, $tag, $isBigEndian); + $pos = $this->_putShort($data, $pos, 0x04, $isBigEndian); // LONG + $pos = $this->_putLong($data, $pos, 0x01, $isBigEndian); // Count = 1 + $pos = $this->_putLong($data, $pos, $dataPos - $offsetBase, $isBigEndian); + + $dataPos = $this->_writeIFD($data, $dataPos, $offsetBase, $entries[$i]['value'], $isBigEndian, false); + } elseif ($type == -98) { // TIFF Data + $pos = $this->_putShort($data, $pos, $tag, $isBigEndian); + $pos = $this->_putShort($data, $pos, 0x04, $isBigEndian); // LONG + $pos = $this->_putLong($data, $pos, 0x01, $isBigEndian); // Count = 1 + $tiffDataOffsetPos = $pos; + $pos = $this->_putLong($data, $pos, 0x00, $isBigEndian); // For Now + $tiffData =& $entries[$i]['value'] ; + } else { // Regular Entry + $pos = $this->_putShort($data, $pos, $tag, $isBigEndian); + $pos = $this->_putShort($data, $pos, $type, $isBigEndian); + $pos = $this->_putLong($data, $pos, $entries[$i]['count'], $isBigEndian); + if (strlen($entries[$i]['value']) > 4) { + $pos = $this->_putLong($data, $pos, $dataPos - $offsetBase, $isBigEndian); + $dataPos = $this->_putString($data, $dataPos, $entries[$i]['value']); + } else { + $val = str_pad($entries[$i]['value'], 4, "\0"); + $pos = $this->_putString($data, $pos, $val); + } + } + } + + if ($tiffData != null) { + $this->_putLong($data, $tiffDataOffsetPos, $dataPos - $offsetBase, $isBigEndian); + $dataPos = $this->_putString($data, $dataPos, $tiffData); + } + + if ($hasNext) { + $pos = $this->_putLong($data, $pos, $dataPos - $offsetBase, $isBigEndian); + } else { + $pos = $this->_putLong($data, $pos, 0, $isBigEndian); + } + + return $dataPos; + } + + /*************************************************************/ + function & _getIFDEntries($isBigEndian, $mode) { + $EXIFNames = $this->_exifTagNames($mode); + $EXIFTags = $this->_exifNameTags($mode); + $EXIFTypeInfo = $this->_exifTagTypes($mode); + + $ifdEntries = array(); + $entryCount = 0; + + reset($EXIFNames); + while (list($tag, $name) = each($EXIFNames)) { + $type = $EXIFTypeInfo[$tag][0]; + $count = $EXIFTypeInfo[$tag][1]; + $value = null; + + if (($mode == 'ifd0') && ($tag == 0x8769)) { // ExifIFDOffset + if (isset($this->_info['exif']['EXIFVersion'])) { + $value =& $this->_getIFDEntries($isBigEndian, "exif"); + $type = -99; + } + else { + $value = null; + } + } elseif (($mode == 'ifd0') && ($tag == 0x8825)) { // GPSIFDOffset + if (isset($this->_info['exif']['GPSVersionID'])) { + $value =& $this->_getIFDEntries($isBigEndian, "gps"); + $type = -99; + } else { + $value = null; + } + } elseif (($mode == 'ifd1') && ($tag == 0x0111)) { // TIFFStripOffsets + if (isset($this->_info['exif']['TIFFStrips'])) { + $value =& $this->_info['exif']['TIFFStrips']; + $type = -98; + } else { + $value = null; + } + } elseif (($mode == 'ifd1') && ($tag == 0x0117)) { // TIFFStripByteCounts + if (isset($this->_info['exif']['TIFFStrips'])) { + $value = strlen($this->_info['exif']['TIFFStrips']); + } else { + $value = null; + } + } elseif (($mode == 'ifd1') && ($tag == 0x0201)) { // TIFFJFIFOffset + if (isset($this->_info['exif']['JFIFThumbnail'])) { + $value =& $this->_info['exif']['JFIFThumbnail']; + $type = -98; + } else { + $value = null; + } + } elseif (($mode == 'ifd1') && ($tag == 0x0202)) { // TIFFJFIFLength + if (isset($this->_info['exif']['JFIFThumbnail'])) { + $value = strlen($this->_info['exif']['JFIFThumbnail']); + } else { + $value = null; + } + } elseif (($mode == 'exif') && ($tag == 0xA005)) { // InteropIFDOffset + if (isset($this->_info['exif']['InteroperabilityIndex'])) { + $value =& $this->_getIFDEntries($isBigEndian, "interop"); + $type = -99; + } else { + $value = null; + } + } elseif (isset($this->_info['exif'][$name])) { + $origValue =& $this->_info['exif'][$name]; + + // This makes it easier to process variable size elements + if (!is_array($origValue) || isset($origValue['val'])) { + unset($origValue); // Break the reference + $origValue = array($this->_info['exif'][$name]); + } + $origCount = count($origValue); + + if ($origCount == 0 ) { + $type = -1; // To ignore this field + } + + $value = " "; + + switch ($type) { + case 1: // UBYTE + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + + $this->_putByte($value, $j, $origValue[$j]); + $j++; + } + + while ($j < $count) { + $this->_putByte($value, $j, 0); + $j++; + } + break; + case 2: // ASCII + $v = strval($origValue[0]); + if (($count != 0) && (strlen($v) > $count)) { + $v = substr($v, 0, $count); + } + elseif (($count > 0) && (strlen($v) < $count)) { + $v = str_pad($v, $count, "\0"); + } + + $count = strlen($v); + + $this->_putString($value, 0, $v); + break; + case 3: // USHORT + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $this->_putShort($value, $j * 2, $origValue[$j], $isBigEndian); + $j++; + } + + while ($j < $count) { + $this->_putShort($value, $j * 2, 0, $isBigEndian); + $j++; + } + break; + case 4: // ULONG + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $this->_putLong($value, $j * 4, $origValue[$j], $isBigEndian); + $j++; + } + + while ($j < $count) { + $this->_putLong($value, $j * 4, 0, $isBigEndian); + $j++; + } + break; + case 5: // URATIONAL + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $v = $origValue[$j]; + if (is_array($v)) { + $a = $v['num']; + $b = $v['den']; + } + else { + $a = 0; + $b = 0; + // TODO: Allow other types and convert them + } + $this->_putLong($value, $j * 8, $a, $isBigEndian); + $this->_putLong($value, ($j * 8) + 4, $b, $isBigEndian); + $j++; + } + + while ($j < $count) { + $this->_putLong($value, $j * 8, 0, $isBigEndian); + $this->_putLong($value, ($j * 8) + 4, 0, $isBigEndian); + $j++; + } + break; + case 6: // SBYTE + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $this->_putByte($value, $j, $origValue[$j]); + $j++; + } + + while ($j < $count) { + $this->_putByte($value, $j, 0); + $j++; + } + break; + case 7: // UNDEFINED + $v = strval($origValue[0]); + if (($count != 0) && (strlen($v) > $count)) { + $v = substr($v, 0, $count); + } + elseif (($count > 0) && (strlen($v) < $count)) { + $v = str_pad($v, $count, "\0"); + } + + $count = strlen($v); + + $this->_putString($value, 0, $v); + break; + case 8: // SSHORT + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $this->_putShort($value, $j * 2, $origValue[$j], $isBigEndian); + $j++; + } + + while ($j < $count) { + $this->_putShort($value, $j * 2, 0, $isBigEndian); + $j++; + } + break; + case 9: // SLONG + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $this->_putLong($value, $j * 4, $origValue[$j], $isBigEndian); + $j++; + } + + while ($j < $count) { + $this->_putLong($value, $j * 4, 0, $isBigEndian); + $j++; + } + break; + case 10: // SRATIONAL + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $v = $origValue[$j]; + if (is_array($v)) { + $a = $v['num']; + $b = $v['den']; + } + else { + $a = 0; + $b = 0; + // TODO: Allow other types and convert them + } + + $this->_putLong($value, $j * 8, $a, $isBigEndian); + $this->_putLong($value, ($j * 8) + 4, $b, $isBigEndian); + $j++; + } + + while ($j < $count) { + $this->_putLong($value, $j * 8, 0, $isBigEndian); + $this->_putLong($value, ($j * 8) + 4, 0, $isBigEndian); + $j++; + } + break; + case 11: // FLOAT + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $v = strval($origValue[$j]); + if (strlen($v) > 4) { + $v = substr($v, 0, 4); + } + elseif (strlen($v) < 4) { + $v = str_pad($v, 4, "\0"); + } + $this->_putString($value, $j * 4, $v); + $j++; + } + + while ($j < $count) { + $v = "\0\0\0\0"; + $this->_putString($value, $j * 4, $v); + $j++; + } + break; + case 12: // DFLOAT + if ($count == 0) { + $count = $origCount; + } + + $j = 0; + while (($j < $count) && ($j < $origCount)) { + $v = strval($origValue[$j]); + if (strlen($v) > 8) { + $v = substr($v, 0, 8); + } + elseif (strlen($v) < 8) { + $v = str_pad($v, 8, "\0"); + } + $this->_putString($value, $j * 8, $v); + $j++; + } + + while ($j < $count) { + $v = "\0\0\0\0\0\0\0\0"; + $this->_putString($value, $j * 8, $v); + $j++; + } + break; + default: + $value = null; + break; + } + } + + if ($value != null) { + $ifdEntries[$entryCount] = array(); + $ifdEntries[$entryCount]['tag'] = $tag; + $ifdEntries[$entryCount]['type'] = $type; + $ifdEntries[$entryCount]['count'] = $count; + $ifdEntries[$entryCount]['value'] = $value; + + $entryCount++; + } + } + + return $ifdEntries; + } + + /*************************************************************/ + function _parseMarkerAdobe() { + if (!isset($this->_markers)) { + $this->_readJPEG(); + } + + if ($this->_markers == null) { + return false; + } + + $data = null; + $count = count($this->_markers); + for ($i = 0; $i < $count; $i++) { + if ($this->_markers[$i]['marker'] == 0xED) { + $signature = $this->_getFixedString($this->_markers[$i]['data'], 0, 14); + if ($signature == "Photoshop 3.0\0") { + $data =& $this->_markers[$i]['data']; + break; + } + } + } + + if ($data == null) { + $this->_info['adobe'] = false; + $this->_info['iptc'] = false; + return false; + } + $pos = 14; + $this->_info['adobe'] = array(); + $this->_info['adobe']['raw'] = array(); + $this->_info['iptc'] = array(); + + $datasize = strlen($data); + + while ($pos < $datasize) { + $signature = $this->_getFixedString($data, $pos, 4); + if ($signature != '8BIM') + return false; + $pos += 4; + + $type = $this->_getShort($data, $pos); + $pos += 2; + + $strlen = $this->_getByte($data, $pos); + $pos += 1; + $header = ''; + for ($i = 0; $i < $strlen; $i++) { + $header .= $data{$pos + $i}; + } + $pos += $strlen + 1 - ($strlen % 2); // The string is padded to even length, counting the length byte itself + + $length = $this->_getLong($data, $pos); + $pos += 4; + + $basePos = $pos; + + switch ($type) { + case 0x0404: // Caption (IPTC Data) + $pos = $this->_readIPTC($data, $pos); + if ($pos == false) + return false; + break; + case 0x040A: // CopyrightFlag + $this->_info['adobe']['CopyrightFlag'] = $this->_getByte($data, $pos); + $pos += $length; + break; + case 0x040B: // ImageURL + $this->_info['adobe']['ImageURL'] = $this->_getFixedString($data, $pos, $length); + $pos += $length; + break; + case 0x040C: // Thumbnail + $aux = $this->_getLong($data, $pos); + $pos += 4; + if ($aux == 1) { + $this->_info['adobe']['ThumbnailWidth'] = $this->_getLong($data, $pos); + $pos += 4; + $this->_info['adobe']['ThumbnailHeight'] = $this->_getLong($data, $pos); + $pos += 4; + + $pos += 16; // Skip some data + + $this->_info['adobe']['ThumbnailData'] = $this->_getFixedString($data, $pos, $length - 28); + $pos += $length - 28; + } + break; + default: + break; + } + + // We save all blocks, even those we recognized + $label = sprintf('8BIM_0x%04x', $type); + $this->_info['adobe']['raw'][$label] = array(); + $this->_info['adobe']['raw'][$label]['type'] = $type; + $this->_info['adobe']['raw'][$label]['header'] = $header; + $this->_info['adobe']['raw'][$label]['data'] =& $this->_getFixedString($data, $basePos, $length); + + $pos = $basePos + $length + ($length % 2); // Even padding + } + + } + + /*************************************************************/ + function _readIPTC(&$data, $pos = 0) { + $totalLength = strlen($data); + + $IPTCTags = $this->_iptcTagNames(); + + while ($pos < ($totalLength - 5)) { + $signature = $this->_getShort($data, $pos); + if ($signature != 0x1C02) + return $pos; + $pos += 2; + + $type = $this->_getByte($data, $pos); + $pos += 1; + $length = $this->_getShort($data, $pos); + $pos += 2; + + $basePos = $pos; + $label = ''; + + if (isset($IPTCTags[$type])) { + $label = $IPTCTags[$type]; + } else { + $label = sprintf('IPTC_0x%02x', $type); + } + + if ($label != '') { + if (isset($this->_info['iptc'][$label])) { + if (!is_array($this->_info['iptc'][$label])) { + $aux = array(); + $aux[0] = $this->_info['iptc'][$label]; + $this->_info['iptc'][$label] = $aux; + } + $this->_info['iptc'][$label][ count($this->_info['iptc'][$label]) ] = $this->_getFixedString($data, $pos, $length); + } else { + $this->_info['iptc'][$label] = $this->_getFixedString($data, $pos, $length); + } + } + + $pos = $basePos + $length; // No padding + } + return $pos; + } + + /*************************************************************/ + function & _createMarkerAdobe() { + if (isset($this->_info['iptc'])) { + if (!isset($this->_info['adobe'])) { + $this->_info['adobe'] = array(); + } + if (!isset($this->_info['adobe']['raw'])) { + $this->_info['adobe']['raw'] = array(); + } + if (!isset($this->_info['adobe']['raw']['8BIM_0x0404'])) { + $this->_info['adobe']['raw']['8BIM_0x0404'] = array(); + } + $this->_info['adobe']['raw']['8BIM_0x0404']['type'] = 0x0404; + $this->_info['adobe']['raw']['8BIM_0x0404']['header'] = "Caption"; + $this->_info['adobe']['raw']['8BIM_0x0404']['data'] =& $this->_writeIPTC(); + } + + if (isset($this->_info['adobe']['raw']) && (count($this->_info['adobe']['raw']) > 0)) { + $data = "Photoshop 3.0\0"; + $pos = 14; + + reset($this->_info['adobe']['raw']); + while (list($key) = each($this->_info['adobe']['raw'])) { + $pos = $this->_write8BIM( + $data, + $pos, + $this->_info['adobe']['raw'][$key]['type'], + $this->_info['adobe']['raw'][$key]['header'], + $this->_info['adobe']['raw'][$key]['data'] ); + } + } + + return $data; + } + + /*************************************************************/ + function _write8BIM(&$data, $pos, $type, $header, &$value) { + $signature = "8BIM"; + + $pos = $this->_putString($data, $pos, $signature); + $pos = $this->_putShort($data, $pos, $type); + + $len = strlen($header); + + $pos = $this->_putByte($data, $pos, $len); + $pos = $this->_putString($data, $pos, $header); + if (($len % 2) == 0) { // Even padding, including the length byte + $pos = $this->_putByte($data, $pos, 0); + } + + $len = strlen($value); + $pos = $this->_putLong($data, $pos, $len); + $pos = $this->_putString($data, $pos, $value); + if (($len % 2) != 0) { // Even padding + $pos = $this->_putByte($data, $pos, 0); + } + return $pos; + } + + /*************************************************************/ + function & _writeIPTC() { + $data = " "; + $pos = 0; + + $IPTCNames =& $this->_iptcNameTags(); + + reset($this->_info['iptc']); + + while (list($label) = each($this->_info['iptc'])) { + $value =& $this->_info['iptc'][$label]; + $type = -1; + + if (isset($IPTCNames[$label])) { + $type = $IPTCNames[$label]; + } + elseif (substr($label, 0, 7) == "IPTC_0x") { + $type = hexdec(substr($label, 7, 2)); + } + + if ($type != -1) { + if (is_array($value)) { + $vcnt = count($value); + for ($i = 0; $i < $vcnt; $i++) { + $pos = $this->_writeIPTCEntry($data, $pos, $type, $value[$i]); + } + } + else { + $pos = $this->_writeIPTCEntry($data, $pos, $type, $value); + } + } + } + + return $data; + } + + /*************************************************************/ + function _writeIPTCEntry(&$data, $pos, $type, &$value) { + $pos = $this->_putShort($data, $pos, 0x1C02); + $pos = $this->_putByte($data, $pos, $type); + $pos = $this->_putShort($data, $pos, strlen($value)); + $pos = $this->_putString($data, $pos, $value); + + return $pos; + } + + /*************************************************************/ + function _exifTagNames($mode) { + $tags = array(); + + if ($mode == 'ifd0') { + $tags[0x010E] = 'ImageDescription'; + $tags[0x010F] = 'Make'; + $tags[0x0110] = 'Model'; + $tags[0x0112] = 'Orientation'; + $tags[0x011A] = 'XResolution'; + $tags[0x011B] = 'YResolution'; + $tags[0x0128] = 'ResolutionUnit'; + $tags[0x0131] = 'Software'; + $tags[0x0132] = 'DateTime'; + $tags[0x013B] = 'Artist'; + $tags[0x013E] = 'WhitePoint'; + $tags[0x013F] = 'PrimaryChromaticities'; + $tags[0x0211] = 'YCbCrCoefficients'; + $tags[0x0212] = 'YCbCrSubSampling'; + $tags[0x0213] = 'YCbCrPositioning'; + $tags[0x0214] = 'ReferenceBlackWhite'; + $tags[0x8298] = 'Copyright'; + $tags[0x8769] = 'ExifIFDOffset'; + $tags[0x8825] = 'GPSIFDOffset'; + } + if ($mode == 'ifd1') { + $tags[0x00FE] = 'TIFFNewSubfileType'; + $tags[0x00FF] = 'TIFFSubfileType'; + $tags[0x0100] = 'TIFFImageWidth'; + $tags[0x0101] = 'TIFFImageHeight'; + $tags[0x0102] = 'TIFFBitsPerSample'; + $tags[0x0103] = 'TIFFCompression'; + $tags[0x0106] = 'TIFFPhotometricInterpretation'; + $tags[0x0107] = 'TIFFThreshholding'; + $tags[0x0108] = 'TIFFCellWidth'; + $tags[0x0109] = 'TIFFCellLength'; + $tags[0x010A] = 'TIFFFillOrder'; + $tags[0x010E] = 'TIFFImageDescription'; + $tags[0x010F] = 'TIFFMake'; + $tags[0x0110] = 'TIFFModel'; + $tags[0x0111] = 'TIFFStripOffsets'; + $tags[0x0112] = 'TIFFOrientation'; + $tags[0x0115] = 'TIFFSamplesPerPixel'; + $tags[0x0116] = 'TIFFRowsPerStrip'; + $tags[0x0117] = 'TIFFStripByteCounts'; + $tags[0x0118] = 'TIFFMinSampleValue'; + $tags[0x0119] = 'TIFFMaxSampleValue'; + $tags[0x011A] = 'TIFFXResolution'; + $tags[0x011B] = 'TIFFYResolution'; + $tags[0x011C] = 'TIFFPlanarConfiguration'; + $tags[0x0122] = 'TIFFGrayResponseUnit'; + $tags[0x0123] = 'TIFFGrayResponseCurve'; + $tags[0x0128] = 'TIFFResolutionUnit'; + $tags[0x0131] = 'TIFFSoftware'; + $tags[0x0132] = 'TIFFDateTime'; + $tags[0x013B] = 'TIFFArtist'; + $tags[0x013C] = 'TIFFHostComputer'; + $tags[0x0140] = 'TIFFColorMap'; + $tags[0x0152] = 'TIFFExtraSamples'; + $tags[0x0201] = 'TIFFJFIFOffset'; + $tags[0x0202] = 'TIFFJFIFLength'; + $tags[0x0211] = 'TIFFYCbCrCoefficients'; + $tags[0x0212] = 'TIFFYCbCrSubSampling'; + $tags[0x0213] = 'TIFFYCbCrPositioning'; + $tags[0x0214] = 'TIFFReferenceBlackWhite'; + $tags[0x8298] = 'TIFFCopyright'; + $tags[0x9286] = 'TIFFUserComment'; + } elseif ($mode == 'exif') { + $tags[0x829A] = 'ExposureTime'; + $tags[0x829D] = 'FNumber'; + $tags[0x8822] = 'ExposureProgram'; + $tags[0x8824] = 'SpectralSensitivity'; + $tags[0x8827] = 'ISOSpeedRatings'; + $tags[0x8828] = 'OECF'; + $tags[0x9000] = 'EXIFVersion'; + $tags[0x9003] = 'DatetimeOriginal'; + $tags[0x9004] = 'DatetimeDigitized'; + $tags[0x9101] = 'ComponentsConfiguration'; + $tags[0x9102] = 'CompressedBitsPerPixel'; + $tags[0x9201] = 'ShutterSpeedValue'; + $tags[0x9202] = 'ApertureValue'; + $tags[0x9203] = 'BrightnessValue'; + $tags[0x9204] = 'ExposureBiasValue'; + $tags[0x9205] = 'MaxApertureValue'; + $tags[0x9206] = 'SubjectDistance'; + $tags[0x9207] = 'MeteringMode'; + $tags[0x9208] = 'LightSource'; + $tags[0x9209] = 'Flash'; + $tags[0x920A] = 'FocalLength'; + $tags[0x927C] = 'MakerNote'; + $tags[0x9286] = 'UserComment'; + $tags[0x9290] = 'SubSecTime'; + $tags[0x9291] = 'SubSecTimeOriginal'; + $tags[0x9292] = 'SubSecTimeDigitized'; + $tags[0xA000] = 'FlashPixVersion'; + $tags[0xA001] = 'ColorSpace'; + $tags[0xA002] = 'PixelXDimension'; + $tags[0xA003] = 'PixelYDimension'; + $tags[0xA004] = 'RelatedSoundFile'; + $tags[0xA005] = 'InteropIFDOffset'; + $tags[0xA20B] = 'FlashEnergy'; + $tags[0xA20C] = 'SpatialFrequencyResponse'; + $tags[0xA20E] = 'FocalPlaneXResolution'; + $tags[0xA20F] = 'FocalPlaneYResolution'; + $tags[0xA210] = 'FocalPlaneResolutionUnit'; + $tags[0xA214] = 'SubjectLocation'; + $tags[0xA215] = 'ExposureIndex'; + $tags[0xA217] = 'SensingMethod'; + $tags[0xA300] = 'FileSource'; + $tags[0xA301] = 'SceneType'; + $tags[0xA302] = 'CFAPattern'; + } elseif ($mode == 'interop') { + $tags[0x0001] = 'InteroperabilityIndex'; + $tags[0x0002] = 'InteroperabilityVersion'; + $tags[0x1000] = 'RelatedImageFileFormat'; + $tags[0x1001] = 'RelatedImageWidth'; + $tags[0x1002] = 'RelatedImageLength'; + } elseif ($mode == 'gps') { + $tags[0x0000] = 'GPSVersionID'; + $tags[0x0001] = 'GPSLatitudeRef'; + $tags[0x0002] = 'GPSLatitude'; + $tags[0x0003] = 'GPSLongitudeRef'; + $tags[0x0004] = 'GPSLongitude'; + $tags[0x0005] = 'GPSAltitudeRef'; + $tags[0x0006] = 'GPSAltitude'; + $tags[0x0007] = 'GPSTimeStamp'; + $tags[0x0008] = 'GPSSatellites'; + $tags[0x0009] = 'GPSStatus'; + $tags[0x000A] = 'GPSMeasureMode'; + $tags[0x000B] = 'GPSDOP'; + $tags[0x000C] = 'GPSSpeedRef'; + $tags[0x000D] = 'GPSSpeed'; + $tags[0x000E] = 'GPSTrackRef'; + $tags[0x000F] = 'GPSTrack'; + $tags[0x0010] = 'GPSImgDirectionRef'; + $tags[0x0011] = 'GPSImgDirection'; + $tags[0x0012] = 'GPSMapDatum'; + $tags[0x0013] = 'GPSDestLatitudeRef'; + $tags[0x0014] = 'GPSDestLatitude'; + $tags[0x0015] = 'GPSDestLongitudeRef'; + $tags[0x0016] = 'GPSDestLongitude'; + $tags[0x0017] = 'GPSDestBearingRef'; + $tags[0x0018] = 'GPSDestBearing'; + $tags[0x0019] = 'GPSDestDistanceRef'; + $tags[0x001A] = 'GPSDestDistance'; + } + + return $tags; + } + + /*************************************************************/ + function _exifTagTypes($mode) { + $tags = array(); + + if ($mode == 'ifd0') { + $tags[0x010E] = array(2, 0); // ImageDescription -> ASCII, Any + $tags[0x010F] = array(2, 0); // Make -> ASCII, Any + $tags[0x0110] = array(2, 0); // Model -> ASCII, Any + $tags[0x0112] = array(3, 1); // Orientation -> SHORT, 1 + $tags[0x011A] = array(5, 1); // XResolution -> RATIONAL, 1 + $tags[0x011B] = array(5, 1); // YResolution -> RATIONAL, 1 + $tags[0x0128] = array(3, 1); // ResolutionUnit -> SHORT + $tags[0x0131] = array(2, 0); // Software -> ASCII, Any + $tags[0x0132] = array(2, 20); // DateTime -> ASCII, 20 + $tags[0x013B] = array(2, 0); // Artist -> ASCII, Any + $tags[0x013E] = array(5, 2); // WhitePoint -> RATIONAL, 2 + $tags[0x013F] = array(5, 6); // PrimaryChromaticities -> RATIONAL, 6 + $tags[0x0211] = array(5, 3); // YCbCrCoefficients -> RATIONAL, 3 + $tags[0x0212] = array(3, 2); // YCbCrSubSampling -> SHORT, 2 + $tags[0x0213] = array(3, 1); // YCbCrPositioning -> SHORT, 1 + $tags[0x0214] = array(5, 6); // ReferenceBlackWhite -> RATIONAL, 6 + $tags[0x8298] = array(2, 0); // Copyright -> ASCII, Any + $tags[0x8769] = array(4, 1); // ExifIFDOffset -> LONG, 1 + $tags[0x8825] = array(4, 1); // GPSIFDOffset -> LONG, 1 + } + if ($mode == 'ifd1') { + $tags[0x00FE] = array(4, 1); // TIFFNewSubfileType -> LONG, 1 + $tags[0x00FF] = array(3, 1); // TIFFSubfileType -> SHORT, 1 + $tags[0x0100] = array(4, 1); // TIFFImageWidth -> LONG (or SHORT), 1 + $tags[0x0101] = array(4, 1); // TIFFImageHeight -> LONG (or SHORT), 1 + $tags[0x0102] = array(3, 3); // TIFFBitsPerSample -> SHORT, 3 + $tags[0x0103] = array(3, 1); // TIFFCompression -> SHORT, 1 + $tags[0x0106] = array(3, 1); // TIFFPhotometricInterpretation -> SHORT, 1 + $tags[0x0107] = array(3, 1); // TIFFThreshholding -> SHORT, 1 + $tags[0x0108] = array(3, 1); // TIFFCellWidth -> SHORT, 1 + $tags[0x0109] = array(3, 1); // TIFFCellLength -> SHORT, 1 + $tags[0x010A] = array(3, 1); // TIFFFillOrder -> SHORT, 1 + $tags[0x010E] = array(2, 0); // TIFFImageDescription -> ASCII, Any + $tags[0x010F] = array(2, 0); // TIFFMake -> ASCII, Any + $tags[0x0110] = array(2, 0); // TIFFModel -> ASCII, Any + $tags[0x0111] = array(4, 0); // TIFFStripOffsets -> LONG (or SHORT), Any (one per strip) + $tags[0x0112] = array(3, 1); // TIFFOrientation -> SHORT, 1 + $tags[0x0115] = array(3, 1); // TIFFSamplesPerPixel -> SHORT, 1 + $tags[0x0116] = array(4, 1); // TIFFRowsPerStrip -> LONG (or SHORT), 1 + $tags[0x0117] = array(4, 0); // TIFFStripByteCounts -> LONG (or SHORT), Any (one per strip) + $tags[0x0118] = array(3, 0); // TIFFMinSampleValue -> SHORT, Any (SamplesPerPixel) + $tags[0x0119] = array(3, 0); // TIFFMaxSampleValue -> SHORT, Any (SamplesPerPixel) + $tags[0x011A] = array(5, 1); // TIFFXResolution -> RATIONAL, 1 + $tags[0x011B] = array(5, 1); // TIFFYResolution -> RATIONAL, 1 + $tags[0x011C] = array(3, 1); // TIFFPlanarConfiguration -> SHORT, 1 + $tags[0x0122] = array(3, 1); // TIFFGrayResponseUnit -> SHORT, 1 + $tags[0x0123] = array(3, 0); // TIFFGrayResponseCurve -> SHORT, Any (2^BitsPerSample) + $tags[0x0128] = array(3, 1); // TIFFResolutionUnit -> SHORT, 1 + $tags[0x0131] = array(2, 0); // TIFFSoftware -> ASCII, Any + $tags[0x0132] = array(2, 20); // TIFFDateTime -> ASCII, 20 + $tags[0x013B] = array(2, 0); // TIFFArtist -> ASCII, Any + $tags[0x013C] = array(2, 0); // TIFFHostComputer -> ASCII, Any + $tags[0x0140] = array(3, 0); // TIFFColorMap -> SHORT, Any (3 * 2^BitsPerSample) + $tags[0x0152] = array(3, 0); // TIFFExtraSamples -> SHORT, Any (SamplesPerPixel - 3) + $tags[0x0201] = array(4, 1); // TIFFJFIFOffset -> LONG, 1 + $tags[0x0202] = array(4, 1); // TIFFJFIFLength -> LONG, 1 + $tags[0x0211] = array(5, 3); // TIFFYCbCrCoefficients -> RATIONAL, 3 + $tags[0x0212] = array(3, 2); // TIFFYCbCrSubSampling -> SHORT, 2 + $tags[0x0213] = array(3, 1); // TIFFYCbCrPositioning -> SHORT, 1 + $tags[0x0214] = array(5, 6); // TIFFReferenceBlackWhite -> RATIONAL, 6 + $tags[0x8298] = array(2, 0); // TIFFCopyright -> ASCII, Any + $tags[0x9286] = array(2, 0); // TIFFUserComment -> ASCII, Any + } elseif ($mode == 'exif') { + $tags[0x829A] = array(5, 1); // ExposureTime -> RATIONAL, 1 + $tags[0x829D] = array(5, 1); // FNumber -> RATIONAL, 1 + $tags[0x8822] = array(3, 1); // ExposureProgram -> SHORT, 1 + $tags[0x8824] = array(2, 0); // SpectralSensitivity -> ASCII, Any + $tags[0x8827] = array(3, 0); // ISOSpeedRatings -> SHORT, Any + $tags[0x8828] = array(7, 0); // OECF -> UNDEFINED, Any + $tags[0x9000] = array(7, 4); // EXIFVersion -> UNDEFINED, 4 + $tags[0x9003] = array(2, 20); // DatetimeOriginal -> ASCII, 20 + $tags[0x9004] = array(2, 20); // DatetimeDigitized -> ASCII, 20 + $tags[0x9101] = array(7, 4); // ComponentsConfiguration -> UNDEFINED, 4 + $tags[0x9102] = array(5, 1); // CompressedBitsPerPixel -> RATIONAL, 1 + $tags[0x9201] = array(10, 1); // ShutterSpeedValue -> SRATIONAL, 1 + $tags[0x9202] = array(5, 1); // ApertureValue -> RATIONAL, 1 + $tags[0x9203] = array(10, 1); // BrightnessValue -> SRATIONAL, 1 + $tags[0x9204] = array(10, 1); // ExposureBiasValue -> SRATIONAL, 1 + $tags[0x9205] = array(5, 1); // MaxApertureValue -> RATIONAL, 1 + $tags[0x9206] = array(5, 1); // SubjectDistance -> RATIONAL, 1 + $tags[0x9207] = array(3, 1); // MeteringMode -> SHORT, 1 + $tags[0x9208] = array(3, 1); // LightSource -> SHORT, 1 + $tags[0x9209] = array(3, 1); // Flash -> SHORT, 1 + $tags[0x920A] = array(5, 1); // FocalLength -> RATIONAL, 1 + $tags[0x927C] = array(7, 0); // MakerNote -> UNDEFINED, Any + $tags[0x9286] = array(7, 0); // UserComment -> UNDEFINED, Any + $tags[0x9290] = array(2, 0); // SubSecTime -> ASCII, Any + $tags[0x9291] = array(2, 0); // SubSecTimeOriginal -> ASCII, Any + $tags[0x9292] = array(2, 0); // SubSecTimeDigitized -> ASCII, Any + $tags[0xA000] = array(7, 4); // FlashPixVersion -> UNDEFINED, 4 + $tags[0xA001] = array(3, 1); // ColorSpace -> SHORT, 1 + $tags[0xA002] = array(4, 1); // PixelXDimension -> LONG (or SHORT), 1 + $tags[0xA003] = array(4, 1); // PixelYDimension -> LONG (or SHORT), 1 + $tags[0xA004] = array(2, 13); // RelatedSoundFile -> ASCII, 13 + $tags[0xA005] = array(4, 1); // InteropIFDOffset -> LONG, 1 + $tags[0xA20B] = array(5, 1); // FlashEnergy -> RATIONAL, 1 + $tags[0xA20C] = array(7, 0); // SpatialFrequencyResponse -> UNDEFINED, Any + $tags[0xA20E] = array(5, 1); // FocalPlaneXResolution -> RATIONAL, 1 + $tags[0xA20F] = array(5, 1); // FocalPlaneYResolution -> RATIONAL, 1 + $tags[0xA210] = array(3, 1); // FocalPlaneResolutionUnit -> SHORT, 1 + $tags[0xA214] = array(3, 2); // SubjectLocation -> SHORT, 2 + $tags[0xA215] = array(5, 1); // ExposureIndex -> RATIONAL, 1 + $tags[0xA217] = array(3, 1); // SensingMethod -> SHORT, 1 + $tags[0xA300] = array(7, 1); // FileSource -> UNDEFINED, 1 + $tags[0xA301] = array(7, 1); // SceneType -> UNDEFINED, 1 + $tags[0xA302] = array(7, 0); // CFAPattern -> UNDEFINED, Any + } elseif ($mode == 'interop') { + $tags[0x0001] = array(2, 0); // InteroperabilityIndex -> ASCII, Any + $tags[0x0002] = array(7, 4); // InteroperabilityVersion -> UNKNOWN, 4 + $tags[0x1000] = array(2, 0); // RelatedImageFileFormat -> ASCII, Any + $tags[0x1001] = array(4, 1); // RelatedImageWidth -> LONG (or SHORT), 1 + $tags[0x1002] = array(4, 1); // RelatedImageLength -> LONG (or SHORT), 1 + } elseif ($mode == 'gps') { + $tags[0x0000] = array(1, 4); // GPSVersionID -> BYTE, 4 + $tags[0x0001] = array(2, 2); // GPSLatitudeRef -> ASCII, 2 + $tags[0x0002] = array(5, 3); // GPSLatitude -> RATIONAL, 3 + $tags[0x0003] = array(2, 2); // GPSLongitudeRef -> ASCII, 2 + $tags[0x0004] = array(5, 3); // GPSLongitude -> RATIONAL, 3 + $tags[0x0005] = array(2, 2); // GPSAltitudeRef -> ASCII, 2 + $tags[0x0006] = array(5, 1); // GPSAltitude -> RATIONAL, 1 + $tags[0x0007] = array(5, 3); // GPSTimeStamp -> RATIONAL, 3 + $tags[0x0008] = array(2, 0); // GPSSatellites -> ASCII, Any + $tags[0x0009] = array(2, 2); // GPSStatus -> ASCII, 2 + $tags[0x000A] = array(2, 2); // GPSMeasureMode -> ASCII, 2 + $tags[0x000B] = array(5, 1); // GPSDOP -> RATIONAL, 1 + $tags[0x000C] = array(2, 2); // GPSSpeedRef -> ASCII, 2 + $tags[0x000D] = array(5, 1); // GPSSpeed -> RATIONAL, 1 + $tags[0x000E] = array(2, 2); // GPSTrackRef -> ASCII, 2 + $tags[0x000F] = array(5, 1); // GPSTrack -> RATIONAL, 1 + $tags[0x0010] = array(2, 2); // GPSImgDirectionRef -> ASCII, 2 + $tags[0x0011] = array(5, 1); // GPSImgDirection -> RATIONAL, 1 + $tags[0x0012] = array(2, 0); // GPSMapDatum -> ASCII, Any + $tags[0x0013] = array(2, 2); // GPSDestLatitudeRef -> ASCII, 2 + $tags[0x0014] = array(5, 3); // GPSDestLatitude -> RATIONAL, 3 + $tags[0x0015] = array(2, 2); // GPSDestLongitudeRef -> ASCII, 2 + $tags[0x0016] = array(5, 3); // GPSDestLongitude -> RATIONAL, 3 + $tags[0x0017] = array(2, 2); // GPSDestBearingRef -> ASCII, 2 + $tags[0x0018] = array(5, 1); // GPSDestBearing -> RATIONAL, 1 + $tags[0x0019] = array(2, 2); // GPSDestDistanceRef -> ASCII, 2 + $tags[0x001A] = array(5, 1); // GPSDestDistance -> RATIONAL, 1 + } + + return $tags; + } + + /*************************************************************/ + function _exifNameTags($mode) { + $tags = $this->_exifTagNames($mode); + return $this->_names2Tags($tags); + } + + /*************************************************************/ + function _iptcTagNames() { + $tags = array(); + $tags[0x14] = 'SuplementalCategories'; + $tags[0x19] = 'Keywords'; + $tags[0x78] = 'Caption'; + $tags[0x7A] = 'CaptionWriter'; + $tags[0x69] = 'Headline'; + $tags[0x28] = 'SpecialInstructions'; + $tags[0x0F] = 'Category'; + $tags[0x50] = 'Byline'; + $tags[0x55] = 'BylineTitle'; + $tags[0x6E] = 'Credit'; + $tags[0x73] = 'Source'; + $tags[0x74] = 'CopyrightNotice'; + $tags[0x05] = 'ObjectName'; + $tags[0x5A] = 'City'; + $tags[0x5C] = 'Sublocation'; + $tags[0x5F] = 'ProvinceState'; + $tags[0x65] = 'CountryName'; + $tags[0x67] = 'OriginalTransmissionReference'; + $tags[0x37] = 'DateCreated'; + $tags[0x0A] = 'CopyrightFlag'; + + return $tags; + } + + /*************************************************************/ + function & _iptcNameTags() { + $tags = $this->_iptcTagNames(); + return $this->_names2Tags($tags); + } + + /*************************************************************/ + function _names2Tags($tags2Names) { + $names2Tags = array(); + reset($tags2Names); + while (list($tag, $name) = each($tags2Names)) { + $names2Tags[$name] = $tag; + } + + return $names2Tags; + } + + /*************************************************************/ + function _getByte(&$data, $pos) { + return ord($data{$pos}); + } + + /*************************************************************/ + function _putByte(&$data, $pos, $val) { + $val = intval($val); + + $data{$pos} = chr($val); + + return $pos + 1; + } + + /*************************************************************/ + function _getShort(&$data, $pos, $bigEndian = true) { + if ($bigEndian) { + return (ord($data{$pos}) << 8) + + ord($data{$pos + 1}); + } else { + return ord($data{$pos}) + + (ord($data{$pos + 1}) << 8); + } + } + + /*************************************************************/ + function _putShort(&$data, $pos = 0, $val = 0, $bigEndian = true) { + $val = intval($val); + + if ($bigEndian) { + $data{$pos + 0} = chr(($val & 0x0000FF00) >> 8); + $data{$pos + 1} = chr(($val & 0x000000FF) >> 0); + } else { + $data{$pos + 0} = chr(($val & 0x00FF) >> 0); + $data{$pos + 1} = chr(($val & 0xFF00) >> 8); + } + + return $pos + 2; + } + + /*************************************************************/ + function _getLong(&$data, $pos, $bigEndian = true) { + if ($bigEndian) { + return (ord($data{$pos}) << 24) + + (ord($data{$pos + 1}) << 16) + + (ord($data{$pos + 2}) << 8) + + ord($data{$pos + 3}); + } else { + return ord($data{$pos}) + + (ord($data{$pos + 1}) << 8) + + (ord($data{$pos + 2}) << 16) + + (ord($data{$pos + 3}) << 24); + } + } + + /*************************************************************/ + function _putLong(&$data, $pos, $val, $bigEndian = true) { + $val = intval($val); + + if ($bigEndian) { + $data{$pos + 0} = chr(($val & 0xFF000000) >> 24); + $data{$pos + 1} = chr(($val & 0x00FF0000) >> 16); + $data{$pos + 2} = chr(($val & 0x0000FF00) >> 8); + $data{$pos + 3} = chr(($val & 0x000000FF) >> 0); + } else { + $data{$pos + 0} = chr(($val & 0x000000FF) >> 0); + $data{$pos + 1} = chr(($val & 0x0000FF00) >> 8); + $data{$pos + 2} = chr(($val & 0x00FF0000) >> 16); + $data{$pos + 3} = chr(($val & 0xFF000000) >> 24); + } + + return $pos + 4; + } + + /*************************************************************/ + function & _getNullString(&$data, $pos) { + $str = ''; + $max = strlen($data); + + while ($pos < $max) { + if (ord($data{$pos}) == 0) { + return $str; + } else { + $str .= $data{$pos}; + } + $pos++; + } + + return $str; + } + + /*************************************************************/ + function & _getFixedString(&$data, $pos, $length = -1) { + if ($length == -1) { + $length = strlen($data) - $pos; + } + + return substr($data, $pos, $length); + } + + /*************************************************************/ + function _putString(&$data, $pos, &$str) { + $len = strlen($str); + for ($i = 0; $i < $len; $i++) { + $data{$pos + $i} = $str{$i}; + } + + return $pos + $len; + } + + /*************************************************************/ + function _hexDump(&$data, $start = 0, $length = -1) { + if (($length == -1) || (($length + $start) > strlen($data))) { + $end = strlen($data); + } else { + $end = $start + $length; + } + + $ascii = ''; + $count = 0; + + echo "\n"; + + while ($start < $end) { + if (($count % 16) == 0) { + echo sprintf('%04d', $count) . ': '; + } + + $c = ord($data{$start}); + $count++; + $start++; + + $aux = dechex($c); + if (strlen($aux) == 1) + echo '0'; + echo $aux . ' '; + + if ($c == 60) + $ascii .= '<'; + elseif ($c == 62) + $ascii .= '>'; + elseif ($c == 32) + $ascii .= ' '; + elseif ($c > 32) + $ascii .= chr($c); + else + $ascii .= '.'; + + if (($count % 4) == 0) { + echo ' - '; + } + + if (($count % 16) == 0) { + echo ': ' . $ascii . "
\n"; + $ascii = ''; + } + } + + if ($ascii != '') { + while (($count % 16) != 0) { + echo '-- '; + $count++; + if (($count % 4) == 0) { + echo ' - '; + } + } + echo ': ' . $ascii . "
\n"; + } + + echo "\n"; + } + + /*****************************************************************/ +} + +/* vim: set expandtab tabstop=4 shiftwidth=4: */ diff --git a/sources/inc/Mailer.class.php b/sources/inc/Mailer.class.php new file mode 100644 index 0000000..2ac2c1d --- /dev/null +++ b/sources/inc/Mailer.class.php @@ -0,0 +1,680 @@ + + */ + +// end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?) +// think different +if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL', "\n"); +#define('MAILHEADER_ASCIIONLY',1); + +/** + * Mail Handling + */ +class Mailer { + + protected $headers = array(); + protected $attach = array(); + protected $html = ''; + protected $text = ''; + + protected $boundary = ''; + protected $partid = ''; + protected $sendparam = null; + + /** @var EmailAddressValidator */ + protected $validator = null; + protected $allowhtml = true; + + /** + * Constructor + * + * Initializes the boundary strings and part counters + */ + public function __construct() { + global $conf; + + $server = parse_url(DOKU_URL, PHP_URL_HOST); + if(strpos($server,'.') === false) $server = $server.'.localhost'; + + $this->partid = substr(md5(uniqid(rand(), true)),0, 8).'@'.$server; + $this->boundary = '__________'.md5(uniqid(rand(), true)); + + $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server; + $listid = strtolower(trim($listid, '.')); + + $this->allowhtml = (bool)$conf['htmlmail']; + + // add some default headers for mailfiltering FS#2247 + $this->setHeader('X-Mailer', 'DokuWiki'); + $this->setHeader('X-DokuWiki-User', $_SERVER['REMOTE_USER']); + $this->setHeader('X-DokuWiki-Title', $conf['title']); + $this->setHeader('X-DokuWiki-Server', $server); + $this->setHeader('X-Auto-Response-Suppress', 'OOF'); + $this->setHeader('List-Id', $conf['title'].' <'.$listid.'>'); + $this->setHeader('Date', date('r'), false); + } + + /** + * Attach a file + * + * @param string $path Path to the file to attach + * @param string $mime Mimetype of the attached file + * @param string $name The filename to use + * @param string $embed Unique key to reference this file from the HTML part + */ + public function attachFile($path, $mime, $name = '', $embed = '') { + if(!$name) { + $name = utf8_basename($path); + } + + $this->attach[] = array( + 'data' => file_get_contents($path), + 'mime' => $mime, + 'name' => $name, + 'embed' => $embed + ); + } + + /** + * Attach a file + * + * @param string $data The file contents to attach + * @param string $mime Mimetype of the attached file + * @param string $name The filename to use + * @param string $embed Unique key to reference this file from the HTML part + */ + public function attachContent($data, $mime, $name = '', $embed = '') { + if(!$name) { + list(, $ext) = explode('/', $mime); + $name = count($this->attach).".$ext"; + } + + $this->attach[] = array( + 'data' => $data, + 'mime' => $mime, + 'name' => $name, + 'embed' => $embed + ); + } + + /** + * Callback function to automatically embed images referenced in HTML templates + */ + protected function autoembed_cb($matches) { + static $embeds = 0; + $embeds++; + + // get file and mime type + $media = cleanID($matches[1]); + list(, $mime) = mimetype($media); + $file = mediaFN($media); + if(!file_exists($file)) return $matches[0]; //bad reference, keep as is + + // attach it and set placeholder + $this->attachFile($file, $mime, '', 'autoembed'.$embeds); + return '%%autoembed'.$embeds.'%%'; + } + + /** + * Add an arbitrary header to the mail + * + * If an empy value is passed, the header is removed + * + * @param string $header the header name (no trailing colon!) + * @param string $value the value of the header + * @param bool $clean remove all non-ASCII chars and line feeds? + */ + public function setHeader($header, $value, $clean = true) { + $header = str_replace(' ', '-', ucwords(strtolower(str_replace('-', ' ', $header)))); // streamline casing + if($clean) { + $header = preg_replace('/[^a-zA-Z0-9_ \-\.\+\@]+/', '', $header); + $value = preg_replace('/[^a-zA-Z0-9_ \-\.\+\@<>]+/', '', $value); + } + + // empty value deletes + if(is_array($value)){ + $value = array_map('trim', $value); + $value = array_filter($value); + if(!$value) $value = ''; + }else{ + $value = trim($value); + } + if($value === '') { + if(isset($this->headers[$header])) unset($this->headers[$header]); + } else { + $this->headers[$header] = $value; + } + } + + /** + * Set additional parameters to be passed to sendmail + * + * Whatever is set here is directly passed to PHP's mail() command as last + * parameter. Depending on the PHP setup this might break mailing alltogether + */ + public function setParameters($param) { + $this->sendparam = $param; + } + + /** + * Set the text and HTML body and apply replacements + * + * This function applies a whole bunch of default replacements in addition + * to the ones specidifed as parameters + * + * If you pass the HTML part or HTML replacements yourself you have to make + * sure you encode all HTML special chars correctly + * + * @param string $text plain text body + * @param array $textrep replacements to apply on the text part + * @param array $htmlrep replacements to apply on the HTML part, leave null to use $textrep + * @param array $html the HTML body, leave null to create it from $text + * @param bool $wrap wrap the HTML in the default header/Footer + */ + public function setBody($text, $textrep = null, $htmlrep = null, $html = null, $wrap = true) { + global $INFO; + global $conf; + $htmlrep = (array)$htmlrep; + $textrep = (array)$textrep; + + // create HTML from text if not given + if(is_null($html)) { + $html = $text; + $html = hsc($html); + $html = preg_replace('/^-----*$/m', '
', $html); + $html = nl2br($html); + } + if($wrap) { + $wrap = rawLocale('mailwrap', 'html'); + $html = preg_replace('/\n--
.*$/s', '', $html); //strip signature + $html = str_replace('@HTMLBODY@', $html, $wrap); + } + + // copy over all replacements missing for HTML (autolink URLs) + foreach($textrep as $key => $value) { + if(isset($htmlrep[$key])) continue; + if(media_isexternal($value)) { + $htmlrep[$key] = ''.hsc($value).''; + } else { + $htmlrep[$key] = hsc($value); + } + } + + // embed media from templates + $html = preg_replace_callback( + '/@MEDIA\(([^\)]+)\)@/', + array($this, 'autoembed_cb'), $html + ); + + // prepare default replacements + $ip = clientIP(); + $cip = gethostsbyaddrs($ip); + $trep = array( + 'DATE' => dformat(), + 'BROWSER' => $_SERVER['HTTP_USER_AGENT'], + 'IPADDRESS' => $ip, + 'HOSTNAME' => $cip, + 'TITLE' => $conf['title'], + 'DOKUWIKIURL' => DOKU_URL, + 'USER' => $_SERVER['REMOTE_USER'], + 'NAME' => $INFO['userinfo']['name'], + 'MAIL' => $INFO['userinfo']['mail'], + ); + $trep = array_merge($trep, (array)$textrep); + $hrep = array( + 'DATE' => ''.hsc(dformat()).'', + 'BROWSER' => hsc($_SERVER['HTTP_USER_AGENT']), + 'IPADDRESS' => ''.hsc($ip).'', + 'HOSTNAME' => ''.hsc($cip).'', + 'TITLE' => hsc($conf['title']), + 'DOKUWIKIURL' => ''.DOKU_URL.'', + 'USER' => hsc($_SERVER['REMOTE_USER']), + 'NAME' => hsc($INFO['userinfo']['name']), + 'MAIL' => ''. + hsc($INFO['userinfo']['mail']).'', + ); + $hrep = array_merge($hrep, (array)$htmlrep); + + // Apply replacements + foreach($trep as $key => $substitution) { + $text = str_replace('@'.strtoupper($key).'@', $substitution, $text); + } + foreach($hrep as $key => $substitution) { + $html = str_replace('@'.strtoupper($key).'@', $substitution, $html); + } + + $this->setHTML($html); + $this->setText($text); + } + + /** + * Set the HTML part of the mail + * + * Placeholders can be used to reference embedded attachments + * + * You probably want to use setBody() instead + */ + public function setHTML($html) { + $this->html = $html; + } + + /** + * Set the plain text part of the mail + * + * You probably want to use setBody() instead + */ + public function setText($text) { + $this->text = $text; + } + + /** + * Add the To: recipients + * + * @see setAddress + * @param string|array $address Multiple adresses separated by commas or as array + */ + public function to($address) { + $this->setHeader('To', $address, false); + } + + /** + * Add the Cc: recipients + * + * @see setAddress + * @param string|array $address Multiple adresses separated by commas or as array + */ + public function cc($address) { + $this->setHeader('Cc', $address, false); + } + + /** + * Add the Bcc: recipients + * + * @see setAddress + * @param string|array $address Multiple adresses separated by commas or as array + */ + public function bcc($address) { + $this->setHeader('Bcc', $address, false); + } + + /** + * Add the From: address + * + * This is set to $conf['mailfrom'] when not specified so you shouldn't need + * to call this function + * + * @see setAddress + * @param string $address from address + */ + public function from($address) { + $this->setHeader('From', $address, false); + } + + /** + * Add the mail's Subject: header + * + * @param string $subject the mail subject + */ + public function subject($subject) { + $this->headers['Subject'] = $subject; + } + + /** + * Sets an email address header with correct encoding + * + * Unicode characters will be deaccented and encoded base64 + * for headers. Addresses may not contain Non-ASCII data! + * + * Example: + * setAddress("föö , me@somewhere.com","TBcc"); + * + * @param string|array $address Multiple adresses separated by commas or as array + * @return bool|string the prepared header (can contain multiple lines) + */ + public function cleanAddress($addresses) { + // No named recipients for To: in Windows (see FS#652) + $names = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') ? false : true; + + $headers = ''; + if(!is_array($addresses)){ + $addresses = explode(',', $addresses); + } + + foreach($addresses as $part) { + $part = preg_replace('/[\r\n\0]+/', ' ', $part); // remove attack vectors + $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(is_null($this->validator)) { + $this->validator = new EmailAddressValidator(); + $this->validator->allowLocalAddresses = true; + } + if(!$this->validator->check_email_address($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(strpos($text, ',') !== false || !utf8_isASCII($text)) { + $text = '=?UTF-8?B?'.base64_encode($text).'?='; + } + } else { + $text = ''; + } + + // add to header comma seperated + if($headers != '') { + $headers .= ', '; + } + $headers .= $text.' '.$addr; + } + + $headers = trim($headers); + if(empty($headers)) return false; + + return $headers; + } + + + /** + * Prepare the mime multiparts for all attachments + * + * Replaces placeholders in the HTML with the correct CIDs + */ + protected function prepareAttachments() { + $mime = ''; + $part = 1; + // embedded attachments + foreach($this->attach as $media) { + $media['name'] = str_replace(':', '_', cleanID($media['name'], true)); + + // create content id + $cid = 'part'.$part.'.'.$this->partid; + + // replace wildcards + if($media['embed']) { + $this->html = str_replace('%%'.$media['embed'].'%%', 'cid:'.$cid, $this->html); + } + + $mime .= '--'.$this->boundary.MAILHEADER_EOL; + $mime .= $this->wrappedHeaderLine('Content-Type', $media['mime'].'; id="'.$cid.'"'); + $mime .= $this->wrappedHeaderLine('Content-Transfer-Encoding', 'base64'); + $mime .= $this->wrappedHeaderLine('Content-ID',"<$cid>"); + if($media['embed']) { + $mime .= $this->wrappedHeaderLine('Content-Disposition', 'inline; filename='.$media['name']); + } else { + $mime .= $this->wrappedHeaderLine('Content-Disposition', 'attachment; filename='.$media['name']); + } + $mime .= MAILHEADER_EOL; //end of headers + $mime .= chunk_split(base64_encode($media['data']), 74, MAILHEADER_EOL); + + $part++; + } + return $mime; + } + + /** + * Build the body and handles multi part mails + * + * Needs to be called before prepareHeaders! + * + * @return string the prepared mail body, false on errors + */ + protected function prepareBody() { + + // no HTML mails allowed? remove HTML body + if(!$this->allowhtml) { + $this->html = ''; + } + + // check for body + if(!$this->text && !$this->html) { + return false; + } + + // add general headers + $this->headers['MIME-Version'] = '1.0'; + + $body = ''; + + if(!$this->html && !count($this->attach)) { // we can send a simple single part message + $this->headers['Content-Type'] = 'text/plain; charset=UTF-8'; + $this->headers['Content-Transfer-Encoding'] = 'base64'; + $body .= chunk_split(base64_encode($this->text), 72, MAILHEADER_EOL); + } else { // multi part it is + $body .= "This is a multi-part message in MIME format.".MAILHEADER_EOL; + + // prepare the attachments + $attachments = $this->prepareAttachments(); + + // do we have alternative text content? + if($this->text && $this->html) { + $this->headers['Content-Type'] = 'multipart/alternative;'.MAILHEADER_EOL. + ' boundary="'.$this->boundary.'XX"'; + $body .= '--'.$this->boundary.'XX'.MAILHEADER_EOL; + $body .= 'Content-Type: text/plain; charset=UTF-8'.MAILHEADER_EOL; + $body .= 'Content-Transfer-Encoding: base64'.MAILHEADER_EOL; + $body .= MAILHEADER_EOL; + $body .= chunk_split(base64_encode($this->text), 72, MAILHEADER_EOL); + $body .= '--'.$this->boundary.'XX'.MAILHEADER_EOL; + $body .= 'Content-Type: multipart/related;'.MAILHEADER_EOL. + ' boundary="'.$this->boundary.'";'.MAILHEADER_EOL. + ' type="text/html"'.MAILHEADER_EOL; + $body .= MAILHEADER_EOL; + } + + $body .= '--'.$this->boundary.MAILHEADER_EOL; + $body .= 'Content-Type: text/html; charset=UTF-8'.MAILHEADER_EOL; + $body .= 'Content-Transfer-Encoding: base64'.MAILHEADER_EOL; + $body .= MAILHEADER_EOL; + $body .= chunk_split(base64_encode($this->html), 72, MAILHEADER_EOL); + $body .= MAILHEADER_EOL; + $body .= $attachments; + $body .= '--'.$this->boundary.'--'.MAILHEADER_EOL; + + // close open multipart/alternative boundary + if($this->text && $this->html) { + $body .= '--'.$this->boundary.'XX--'.MAILHEADER_EOL; + } + } + + return $body; + } + + /** + * Cleanup and encode the headers array + */ + protected function cleanHeaders() { + global $conf; + + // clean up addresses + if(empty($this->headers['From'])) $this->from($conf['mailfrom']); + $addrs = array('To', 'From', 'Cc', 'Bcc'); + foreach($addrs as $addr) { + if(isset($this->headers[$addr])) { + $this->headers[$addr] = $this->cleanAddress($this->headers[$addr]); + } + } + + if(isset($this->headers['Subject'])) { + // add prefix to subject + if(empty($conf['mailprefix'])) { + if(utf8_strlen($conf['title']) < 20) { + $prefix = '['.$conf['title'].']'; + } else { + $prefix = '['.utf8_substr($conf['title'], 0, 20).'...]'; + } + } else { + $prefix = '['.$conf['mailprefix'].']'; + } + $len = strlen($prefix); + if(substr($this->headers['Subject'], 0, $len) != $prefix) { + $this->headers['Subject'] = $prefix.' '.$this->headers['Subject']; + } + + // encode subject + if(defined('MAILHEADER_ASCIIONLY')) { + $this->headers['Subject'] = utf8_deaccent($this->headers['Subject']); + $this->headers['Subject'] = utf8_strip($this->headers['Subject']); + } + if(!utf8_isASCII($this->headers['Subject'])) { + $this->headers['Subject'] = '=?UTF-8?B?'.base64_encode($this->headers['Subject']).'?='; + } + } + + } + + /** + * Returns a complete, EOL terminated header line, wraps it if necessary + * + * @param $key + * @param $val + * @return string + */ + protected function wrappedHeaderLine($key, $val){ + return wordwrap("$key: $val", 78, MAILHEADER_EOL.' ').MAILHEADER_EOL; + } + + /** + * Create a string from the headers array + * + * @returns string the headers + */ + protected function prepareHeaders() { + $headers = ''; + foreach($this->headers as $key => $val) { + if ($val === '' || is_null($val)) continue; + $headers .= $this->wrappedHeaderLine($key, $val); + } + return $headers; + } + + /** + * return a full email with all headers + * + * This is mainly intended for debugging and testing but could also be + * used for MHT exports + * + * @return string the mail, false on errors + */ + public function dump() { + $this->cleanHeaders(); + $body = $this->prepareBody(); + if($body === false) return false; + $headers = $this->prepareHeaders(); + + return $headers.MAILHEADER_EOL.$body; + } + + /** + * Send the mail + * + * Call this after all data was set + * + * @triggers MAIL_MESSAGE_SEND + * @return bool true if the mail was successfully passed to the MTA + */ + public function send() { + $success = false; + + // prepare hook data + $data = array( + // pass the whole mail class to plugin + 'mail' => $this, + // pass references for backward compatibility + 'to' => &$this->headers['To'], + 'cc' => &$this->headers['Cc'], + 'bcc' => &$this->headers['Bcc'], + 'from' => &$this->headers['From'], + 'subject' => &$this->headers['Subject'], + 'body' => &$this->text, + 'params' => &$this->sendparam, + 'headers' => '', // plugins shouldn't use this + // signal if we mailed successfully to AFTER event + 'success' => &$success, + ); + + // do our thing if BEFORE hook approves + $evt = new Doku_Event('MAIL_MESSAGE_SEND', $data); + if($evt->advise_before(true)) { + // clean up before using the headers + $this->cleanHeaders(); + + // any recipients? + if(trim($this->headers['To']) === '' && + trim($this->headers['Cc']) === '' && + trim($this->headers['Bcc']) === '' + ) return false; + + // The To: header is special + if(array_key_exists('To', $this->headers)) { + $to = (string)$this->headers['To']; + unset($this->headers['To']); + } else { + $to = ''; + } + + // so is the subject + if(array_key_exists('Subject', $this->headers)) { + $subject = (string)$this->headers['Subject']; + unset($this->headers['Subject']); + } else { + $subject = ''; + } + + // make the body + $body = $this->prepareBody(); + if($body === false) return false; + + // cook the headers + $headers = $this->prepareHeaders(); + // add any headers set by legacy plugins + if(trim($data['headers'])) { + $headers .= MAILHEADER_EOL.trim($data['headers']); + } + + // send the thing + if(is_null($this->sendparam)) { + $success = @mail($to, $subject, $body, $headers); + } else { + $success = @mail($to, $subject, $body, $headers, $this->sendparam); + } + } + // any AFTER actions? + $evt->advise_after(); + return $success; + } +} diff --git a/sources/inc/PassHash.class.php b/sources/inc/PassHash.class.php new file mode 100644 index 0000000..db6a3a7 --- /dev/null +++ b/sources/inc/PassHash.class.php @@ -0,0 +1,560 @@ + + * @license LGPL2 + */ +class PassHash { + /** + * Verifies a cleartext password against a crypted hash + * + * The method and salt used for the crypted hash is determined automatically, + * then the clear text password is crypted using the same method. If both hashs + * match true is is returned else false + * + * @author Andreas Gohr + * @param $clear string Clear-Text password + * @param $hash string Hash to compare against + * @return bool + */ + function verify_hash($clear, $hash) { + $method = ''; + $salt = ''; + $magic = ''; + + //determine the used method and salt + $len = strlen($hash); + if(preg_match('/^\$1\$([^\$]{0,8})\$/', $hash, $m)) { + $method = 'smd5'; + $salt = $m[1]; + $magic = '1'; + } elseif(preg_match('/^\$apr1\$([^\$]{0,8})\$/', $hash, $m)) { + $method = 'apr1'; + $salt = $m[1]; + $magic = 'apr1'; + } elseif(preg_match('/^\$P\$(.{31})$/', $hash, $m)) { + $method = 'pmd5'; + $salt = $m[1]; + $magic = 'P'; + } elseif(preg_match('/^\$H\$(.{31})$/', $hash, $m)) { + $method = 'pmd5'; + $salt = $m[1]; + $magic = 'H'; + } elseif(preg_match('/^sha1\$(.{5})\$/', $hash, $m)) { + $method = 'djangosha1'; + $salt = $m[1]; + } elseif(preg_match('/^md5\$(.{5})\$/', $hash, $m)) { + $method = 'djangomd5'; + $salt = $m[1]; + } elseif(preg_match('/^\$2a\$(.{2})\$/', $hash, $m)) { + $method = 'bcrypt'; + $salt = $hash; + } elseif(substr($hash, 0, 6) == '{SSHA}') { + $method = 'ssha'; + $salt = substr(base64_decode(substr($hash, 6)), 20); + } elseif(substr($hash, 0, 6) == '{SMD5}') { + $method = 'lsmd5'; + $salt = substr(base64_decode(substr($hash, 6)), 16); + } elseif(preg_match('/^:B:(.+?):.{32}$/', $hash, $m)) { + $method = 'mediawiki'; + $salt = $m[1]; + } elseif(preg_match('/^\$6\$(.+?)\$/', $hash, $m)) { + $method = 'sha512'; + $salt = $m[1]; + } elseif($len == 32) { + $method = 'md5'; + } elseif($len == 40) { + $method = 'sha1'; + } elseif($len == 16) { + $method = 'mysql'; + } elseif($len == 41 && $hash[0] == '*') { + $method = 'my411'; + } elseif($len == 34) { + $method = 'kmd5'; + $salt = $hash; + } else { + $method = 'crypt'; + $salt = substr($hash, 0, 2); + } + + //crypt and compare + $call = 'hash_'.$method; + if($this->$call($clear, $salt, $magic) === $hash) { + return true; + } + return false; + } + + /** + * Create a random salt + * + * @param int $len The length of the salt + * @return string + */ + public function gen_salt($len = 32) { + $salt = ''; + $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'; + for($i = 0; $i < $len; $i++) { + $salt .= $chars[$this->random(0, 61)]; + } + return $salt; + } + + /** + * Initialize the passed variable with a salt if needed. + * + * If $salt is not null, the value is kept, but the lenght restriction is + * applied (unless, $cut is false). + * + * @param string &$salt The salt, pass null if you want one generated + * @param int $len The length of the salt + * @param bool $cut Apply length restriction to existing salt? + */ + public function init_salt(&$salt, $len = 32, $cut = true) { + if(is_null($salt)) { + $salt = $this->gen_salt($len); + $cut = true; // for new hashes we alway apply length restriction + } + if(strlen($salt) > $len && $cut) $salt = substr($salt, 0, $len); + } + + // Password hashing methods follow below + + /** + * Password hashing method 'smd5' + * + * Uses salted MD5 hashs. Salt is 8 bytes long. + * + * The same mechanism is used by Apache's 'apr1' method. This will + * fallback to a implementation in pure PHP if MD5 support is not + * available in crypt() + * + * @author Andreas Gohr + * @author + * @link http://de.php.net/manual/en/function.crypt.php#73619 + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + */ + public function hash_smd5($clear, $salt = null) { + $this->init_salt($salt, 8); + + if(defined('CRYPT_MD5') && CRYPT_MD5 && $salt !== '') { + return crypt($clear, '$1$'.$salt.'$'); + } else { + // Fall back to PHP-only implementation + return $this->hash_apr1($clear, $salt, '1'); + } + } + + /** + * Password hashing method 'lsmd5' + * + * Uses salted MD5 hashs. Salt is 8 bytes long. + * + * This is the format used by LDAP. + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + */ + public function hash_lsmd5($clear, $salt = null) { + $this->init_salt($salt, 8); + return "{SMD5}".base64_encode(md5($clear.$salt, true).$salt); + } + + /** + * Password hashing method 'apr1' + * + * Uses salted MD5 hashs. Salt is 8 bytes long. + * + * This is basically the same as smd1 above, but as used by Apache. + * + * @author + * @link http://de.php.net/manual/en/function.crypt.php#73619 + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @param string $magic The hash identifier (apr1 or 1) + * @return string Hashed password + */ + public function hash_apr1($clear, $salt = null, $magic = 'apr1') { + $this->init_salt($salt, 8); + + $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}; + } + $bin = pack("H32", md5($text)); + for($i = 0; $i < 1000; $i++) { + $new = ($i & 1) ? $clear : $bin; + if($i % 3) $new .= $salt; + if($i % 7) $new .= $clear; + $new .= ($i & 1) ? $bin : $clear; + $bin = pack("H32", md5($new)); + } + $tmp = ''; + for($i = 0; $i < 5; $i++) { + $k = $i + 6; + $j = $i + 12; + if($j == 16) $j = 5; + $tmp = $bin[$i].$bin[$k].$bin[$j].$tmp; + } + $tmp = chr(0).chr(0).$bin[11].$tmp; + $tmp = strtr( + strrev(substr(base64_encode($tmp), 2)), + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", + "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" + ); + return '$'.$magic.'$'.$salt.'$'.$tmp; + } + + /** + * Password hashing method 'md5' + * + * Uses MD5 hashs. + * + * @param string $clear The clear text to hash + * @return string Hashed password + */ + public function hash_md5($clear) { + return md5($clear); + } + + /** + * Password hashing method 'sha1' + * + * Uses SHA1 hashs. + * + * @param string $clear The clear text to hash + * @return string Hashed password + */ + public function hash_sha1($clear) { + return sha1($clear); + } + + /** + * Password hashing method 'ssha' as used by LDAP + * + * Uses salted SHA1 hashs. Salt is 4 bytes long. + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + */ + public function hash_ssha($clear, $salt = null) { + $this->init_salt($salt, 4); + return '{SSHA}'.base64_encode(pack("H*", sha1($clear.$salt)).$salt); + } + + /** + * Password hashing method 'crypt' + * + * Uses salted crypt hashs. Salt is 2 bytes long. + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + */ + public function hash_crypt($clear, $salt = null) { + $this->init_salt($salt, 2); + return crypt($clear, $salt); + } + + /** + * Password hashing method 'mysql' + * + * This method was used by old MySQL systems + * + * @link http://www.php.net/mysql + * @author + * @param string $clear The clear text to hash + * @return string Hashed password + */ + public function hash_mysql($clear) { + $nr = 0x50305735; + $nr2 = 0x12345671; + $add = 7; + $charArr = preg_split("//", $clear); + foreach($charArr as $char) { + if(($char == '') || ($char == ' ') || ($char == '\t')) continue; + $charVal = ord($char); + $nr ^= ((($nr & 63) + $add) * $charVal) + ($nr << 8); + $nr2 += ($nr2 << 8) ^ $nr; + $add += $charVal; + } + return sprintf("%08x%08x", ($nr & 0x7fffffff), ($nr2 & 0x7fffffff)); + } + + /** + * Password hashing method 'my411' + * + * Uses SHA1 hashs. This method is used by MySQL 4.11 and above + * + * @param string $clear The clear text to hash + * @return string Hashed password + */ + public function hash_my411($clear) { + return '*'.sha1(pack("H*", sha1($clear))); + } + + /** + * Password hashing method 'kmd5' + * + * Uses salted MD5 hashs. + * + * Salt is 2 bytes long, but stored at position 16, so you need to pass at + * least 18 bytes. You can pass the crypted hash as salt. + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + */ + public function hash_kmd5($clear, $salt = null) { + $this->init_salt($salt); + + $key = substr($salt, 16, 2); + $hash1 = strtolower(md5($key.md5($clear))); + $hash2 = substr($hash1, 0, 16).$key.substr($hash1, 16); + return $hash2; + } + + /** + * Password hashing method 'pmd5' + * + * Uses salted MD5 hashs. Salt is 1+8 bytes long, 1st byte is the + * iteration count when given, for null salts $compute is used. + * + * The actual iteration count is the given count squared, maximum is + * 30 (-> 1073741824). If a higher one is given, the function throws + * an exception. + * + * @link http://www.openwall.com/phpass/ + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @param string $magic The hash identifier (P or H) + * @param int $compute The iteration count for new passwords + * @throws Exception + * @return string Hashed password + */ + public function hash_pmd5($clear, $salt = null, $magic = 'P', $compute = 8) { + $itoa64 = './0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'; + if(is_null($salt)) { + $this->init_salt($salt); + $salt = $itoa64[$compute].$salt; // prefix iteration count + } + $iterc = $salt[0]; // pos 0 of salt is iteration count + $iter = strpos($itoa64, $iterc); + + if($iter > 30) { + throw new Exception("Too high iteration count ($iter) in ". + __CLASS__.'::'.__FUNCTION__); + } + + $iter = 1 << $iter; + $salt = substr($salt, 1, 8); + + // iterate + $hash = md5($salt.$clear, true); + do { + $hash = md5($hash.$clear, true); + } while(--$iter); + + // encode + $output = ''; + $count = 16; + $i = 0; + do { + $value = ord($hash[$i++]); + $output .= $itoa64[$value & 0x3f]; + if($i < $count) + $value |= ord($hash[$i]) << 8; + $output .= $itoa64[($value >> 6) & 0x3f]; + if($i++ >= $count) + break; + if($i < $count) + $value |= ord($hash[$i]) << 16; + $output .= $itoa64[($value >> 12) & 0x3f]; + if($i++ >= $count) + break; + $output .= $itoa64[($value >> 18) & 0x3f]; + } while($i < $count); + + return '$'.$magic.'$'.$iterc.$salt.$output; + } + + /** + * Alias for hash_pmd5 + */ + public function hash_hmd5($clear, $salt = null, $magic = 'H', $compute = 8) { + return $this->hash_pmd5($clear, $salt, $magic, $compute); + } + + /** + * Password hashing method 'djangosha1' + * + * Uses salted SHA1 hashs. Salt is 5 bytes long. + * This is used by the Django Python framework + * + * @link http://docs.djangoproject.com/en/dev/topics/auth/#passwords + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + */ + public function hash_djangosha1($clear, $salt = null) { + $this->init_salt($salt, 5); + return 'sha1$'.$salt.'$'.sha1($salt.$clear); + } + + /** + * Password hashing method 'djangomd5' + * + * Uses salted MD5 hashs. Salt is 5 bytes long. + * This is used by the Django Python framework + * + * @link http://docs.djangoproject.com/en/dev/topics/auth/#passwords + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + */ + public function hash_djangomd5($clear, $salt = null) { + $this->init_salt($salt, 5); + return 'md5$'.$salt.'$'.md5($salt.$clear); + } + + /** + * Passwordhashing method 'bcrypt' + * + * Uses a modified blowfish algorithm called eksblowfish + * This method works on PHP 5.3+ only and will throw an exception + * if the needed crypt support isn't available + * + * A full hash should be given as salt (starting with $a2$) or this + * will break. When no salt is given, the iteration count can be set + * through the $compute variable. + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @param int $compute The iteration count (between 4 and 31) + * @throws Exception + * @return string Hashed password + */ + public function hash_bcrypt($clear, $salt = null, $compute = 8) { + if(!defined('CRYPT_BLOWFISH') || CRYPT_BLOWFISH != 1) { + throw new Exception('This PHP installation has no bcrypt support'); + } + + if(is_null($salt)) { + if($compute < 4 || $compute > 31) $compute = 8; + $salt = '$2a$'.str_pad($compute, 2, '0', STR_PAD_LEFT).'$'. + $this->gen_salt(22); + } + + return crypt($clear, $salt); + } + + /** + * Password hashing method SHA512 + * + * This is only supported on PHP 5.3.2 or higher and will throw an exception if + * the needed crypt support is not available + * + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + * @throws Exception + */ + public function hash_sha512($clear, $salt = null) { + if(!defined('CRYPT_SHA512') || CRYPT_SHA512 != 1) { + throw new Exception('This PHP installation has no SHA512 support'); + } + $this->init_salt($salt, 8, false); + return crypt($clear, '$6$'.$salt.'$'); + } + + /** + * Password hashing method 'mediawiki' + * + * Uses salted MD5, this is referred to as Method B in MediaWiki docs. Unsalted md5 + * method 'A' is not supported. + * + * @link http://www.mediawiki.org/wiki/Manual_talk:User_table#user_password_column + * @param string $clear The clear text to hash + * @param string $salt The salt to use, null for random + * @return string Hashed password + */ + public function hash_mediawiki($clear, $salt = null) { + $this->init_salt($salt, 8, false); + return ':B:'.$salt.':'.md5($salt.'-'.md5($clear)); + } + + /** + * Wraps around native hash_hmac() or reimplents it + * + * This is not directly used as password hashing method, and thus isn't callable via the + * verify_hash() method. It should be used to create signatures and might be used in other + * password hashing methods. + * + * @see hash_hmac() + * @author KC Cloyd + * @link http://www.php.net/manual/en/function.hash-hmac.php#93440 + * + * @param string $algo Name of selected hashing algorithm (i.e. "md5", "sha256", "haval160,4", + * etc..) See hash_algos() for a list of supported algorithms. + * @param string $data Message to be hashed. + * @param string $key Shared secret key used for generating the HMAC variant of the message digest. + * @param bool $raw_output When set to TRUE, outputs raw binary data. FALSE outputs lowercase hexits. + * + * @return string + */ + public static function hmac($algo, $data, $key, $raw_output = false) { + // use native function if available and not in unit test + if(function_exists('hash_hmac') && !defined('SIMPLE_TEST')){ + return hash_hmac($algo, $data, $key, $raw_output); + } + + $algo = strtolower($algo); + $pack = 'H' . strlen($algo('test')); + $size = 64; + $opad = str_repeat(chr(0x5C), $size); + $ipad = str_repeat(chr(0x36), $size); + + if(strlen($key) > $size) { + $key = str_pad(pack($pack, $algo($key)), $size, chr(0x00)); + } else { + $key = str_pad($key, $size, chr(0x00)); + } + + for($i = 0; $i < strlen($key) - 1; $i++) { + $opad[$i] = $opad[$i] ^ $key[$i]; + $ipad[$i] = $ipad[$i] ^ $key[$i]; + } + + $output = $algo($opad . pack($pack, $algo($ipad . $data))); + + return ($raw_output) ? pack($pack, $output) : $output; + } + + /** + * Use DokuWiki's secure random generator if available + * + * @param $min + * @param $max + * + * @return int + */ + protected function random($min, $max){ + if(function_exists('auth_random')){ + return auth_random($min, $max); + }else{ + return mt_rand($min, $max); + } + } +} diff --git a/sources/inc/RemoteAPICore.php b/sources/inc/RemoteAPICore.php new file mode 100644 index 0000000..2eb8ea4 --- /dev/null +++ b/sources/inc/RemoteAPICore.php @@ -0,0 +1,780 @@ +api = $api; + } + + function __getRemoteInfo() { + return array( + 'dokuwiki.getVersion' => array( + 'args' => array(), + 'return' => 'string', + 'doc' => 'Returns the running DokuWiki version.' + ), 'dokuwiki.login' => array( + 'args' => array('string', 'string'), + 'return' => 'int', + 'doc' => 'Tries to login with the given credentials and sets auth cookies.', + 'public' => '1' + ), 'dokuwiki.getPagelist' => array( + 'args' => array('string', 'array'), + 'return' => 'array', + 'doc' => 'List all pages within the given namespace.', + 'name' => 'readNamespace' + ), 'dokuwiki.search' => array( + 'args' => array('string'), + 'return' => 'array', + 'doc' => 'Perform a fulltext search and return a list of matching pages' + ), 'dokuwiki.getTime' => array( + 'args' => array(), + 'return' => 'int', + 'doc' => 'Returns the current time at the remote wiki server as Unix timestamp.', + ), 'dokuwiki.setLocks' => array( + 'args' => array('array'), + 'return' => 'array', + 'doc' => 'Lock or unlock pages.' + ), 'dokuwiki.getTitle' => array( + 'args' => array(), + 'return' => 'string', + 'doc' => 'Returns the wiki title.', + 'public' => '1' + ), 'dokuwiki.appendPage' => array( + 'args' => array('string', 'string', 'array'), + 'return' => 'bool', + 'doc' => 'Append text to a wiki page.' + ), 'wiki.getPage' => array( + 'args' => array('string'), + 'return' => 'string', + 'doc' => 'Get the raw Wiki text of page, latest version.', + 'name' => 'rawPage', + ), 'wiki.getPageVersion' => array( + 'args' => array('string', 'int'), + 'name' => 'rawPage', + 'return' => 'string', + 'doc' => 'Return a raw wiki page' + ), 'wiki.getPageHTML' => array( + 'args' => array('string'), + 'return' => 'string', + 'doc' => 'Return page in rendered HTML, latest version.', + 'name' => 'htmlPage' + ), 'wiki.getPageHTMLVersion' => array( + 'args' => array('string', 'int'), + 'return' => 'string', + 'doc' => 'Return page in rendered HTML.', + 'name' => 'htmlPage' + ), 'wiki.getAllPages' => array( + 'args' => array(), + 'return' => 'array', + 'doc' => 'Returns a list of all pages. The result is an array of utf8 pagenames.', + 'name' => 'listPages' + ), 'wiki.getAttachments' => array( + 'args' => array('string', 'array'), + 'return' => 'array', + 'doc' => 'Returns a list of all media files.', + 'name' => 'listAttachments' + ), 'wiki.getBackLinks' => array( + 'args' => array('string'), + 'return' => 'array', + 'doc' => 'Returns the pages that link to this page.', + 'name' => 'listBackLinks' + ), 'wiki.getPageInfo' => array( + 'args' => array('string'), + 'return' => 'array', + 'doc' => 'Returns a struct with info about the page.', + 'name' => 'pageInfo' + ), 'wiki.getPageInfoVersion' => array( + 'args' => array('string', 'int'), + 'return' => 'array', + 'doc' => 'Returns a struct with info about the page.', + 'name' => 'pageInfo' + ), 'wiki.getPageVersions' => array( + 'args' => array('string', 'int'), + 'return' => 'array', + 'doc' => 'Returns the available revisions of the page.', + 'name' => 'pageVersions' + ), 'wiki.putPage' => array( + 'args' => array('string', 'string', 'array'), + 'return' => 'bool', + 'doc' => 'Saves a wiki page.' + ), 'wiki.listLinks' => array( + 'args' => array('string'), + 'return' => 'array', + 'doc' => 'Lists all links contained in a wiki page.' + ), 'wiki.getRecentChanges' => array( + 'args' => array('int'), + 'return' => 'array', + 'Returns a struct about all recent changes since given timestamp.' + ), 'wiki.getRecentMediaChanges' => array( + 'args' => array('int'), + 'return' => 'array', + 'Returns a struct about all recent media changes since given timestamp.' + ), 'wiki.aclCheck' => array( + 'args' => array('string'), + 'return' => 'int', + 'doc' => 'Returns the permissions of a given wiki page.' + ), 'wiki.putAttachment' => array( + 'args' => array('string', 'file', 'array'), + 'return' => 'array', + 'doc' => 'Upload a file to the wiki.' + ), 'wiki.deleteAttachment' => array( + 'args' => array('string'), + 'return' => 'int', + 'doc' => 'Delete a file from the wiki.' + ), 'wiki.getAttachment' => array( + 'args' => array('string'), + 'doc' => 'Return a media file', + 'return' => 'file', + 'name' => 'getAttachment', + ), 'wiki.getAttachmentInfo' => array( + 'args' => array('string'), + 'return' => 'array', + 'doc' => 'Returns a struct with info about the attachment.' + ), 'dokuwiki.getXMLRPCAPIVersion' => array( + 'args' => array(), + 'name' => 'getAPIVersion', + 'return' => 'int', + 'doc' => 'Returns the XMLRPC API version.', + 'public' => '1', + ), 'wiki.getRPCVersionSupported' => array( + 'args' => array(), + 'name' => 'wiki_RPCVersion', + 'return' => 'int', + 'doc' => 'Returns 2 with the supported RPC API version.', + 'public' => '1' + ), + + ); + } + + function getVersion() { + return getVersion(); + } + + function getTime() { + return time(); + } + + /** + * Return a raw wiki page + * @param string $id wiki page id + * @param string $rev revision number of the page + * @return page text. + */ + function rawPage($id,$rev=''){ + $id = $this->resolvePageId($id); + if(auth_quickaclcheck($id) < AUTH_READ){ + throw new RemoteAccessDeniedException('You are not allowed to read this file', 111); + } + $text = rawWiki($id,$rev); + if(!$text) { + return pageTemplate($id); + } else { + return $text; + } + } + + /** + * Return a media file + * + * @author Gina Haeussge + * @param string $id file id + * @return media file + */ + function getAttachment($id){ + $id = cleanID($id); + if (auth_quickaclcheck(getNS($id).':*') < AUTH_READ) { + throw new RemoteAccessDeniedException('You are not allowed to read this file', 211); + } + + $file = mediaFN($id); + if (!@ file_exists($file)) { + throw new RemoteException('The requested file does not exist', 221); + } + + $data = io_readFile($file, false); + return $this->api->toFile($data); + } + + /** + * Return info about a media file + * + * @author Gina Haeussge + */ + function getAttachmentInfo($id){ + $id = cleanID($id); + $info = array( + 'lastModified' => $this->api->toDate(0), + 'size' => 0, + ); + + $file = mediaFN($id); + if ((auth_quickaclcheck(getNS($id).':*') >= AUTH_READ) && file_exists($file)){ + $info['lastModified'] = $this->api->toDate(filemtime($file)); + $info['size'] = filesize($file); + } + + return $info; + } + + /** + * Return a wiki page rendered to html + */ + function htmlPage($id,$rev=''){ + $id = $this->resolvePageId($id); + if(auth_quickaclcheck($id) < AUTH_READ){ + throw new RemoteAccessDeniedException('You are not allowed to read this page', 111); + } + return p_wiki_xhtml($id,$rev,false); + } + + /** + * List all pages - we use the indexer list here + */ + function listPages(){ + $list = array(); + $pages = idx_get_indexer()->getPages(); + $pages = array_filter(array_filter($pages,'isVisiblePage'),'page_exists'); + + foreach(array_keys($pages) as $idx) { + $perm = auth_quickaclcheck($pages[$idx]); + if($perm < AUTH_READ) { + continue; + } + $page = array(); + $page['id'] = trim($pages[$idx]); + $page['perms'] = $perm; + $page['size'] = @filesize(wikiFN($pages[$idx])); + $page['lastModified'] = $this->api->toDate(@filemtime(wikiFN($pages[$idx]))); + $list[] = $page; + } + + return $list; + } + + /** + * List all pages in the given namespace (and below) + */ + function readNamespace($ns,$opts){ + global $conf; + + if(!is_array($opts)) $opts=array(); + + $ns = cleanID($ns); + $dir = utf8_encodeFN(str_replace(':', '/', $ns)); + $data = array(); + $opts['skipacl'] = 0; // no ACL skipping for XMLRPC + search($data, $conf['datadir'], 'search_allpages', $opts, $dir); + return $data; + } + + /** + * List all pages in the given namespace (and below) + */ + function search($query){ + $regex = ''; + $data = ft_pageSearch($query,$regex); + $pages = array(); + + // prepare additional data + $idx = 0; + foreach($data as $id => $score){ + $file = wikiFN($id); + + if($idx < FT_SNIPPET_NUMBER){ + $snippet = ft_snippet($id,$regex); + $idx++; + }else{ + $snippet = ''; + } + + $pages[] = array( + 'id' => $id, + 'score' => intval($score), + 'rev' => filemtime($file), + 'mtime' => filemtime($file), + 'size' => filesize($file), + 'snippet' => $snippet, + 'title' => useHeading('navigation') ? p_get_first_heading($id) : $id + ); + } + return $pages; + } + + /** + * Returns the wiki title. + */ + function getTitle(){ + global $conf; + return $conf['title']; + } + + /** + * List all media files. + * + * Available options are 'recursive' for also including the subnamespaces + * in the listing, and 'pattern' for filtering the returned files against + * a regular expression matching their name. + * + * @author Gina Haeussge + */ + function listAttachments($ns, $options = array()) { + global $conf; + + $ns = cleanID($ns); + + if (!is_array($options)) $options = array(); + $options['skipacl'] = 0; // no ACL skipping for XMLRPC + + if(auth_quickaclcheck($ns.':*') >= AUTH_READ) { + $dir = utf8_encodeFN(str_replace(':', '/', $ns)); + + $data = array(); + search($data, $conf['mediadir'], 'search_media', $options, $dir); + $len = count($data); + if(!$len) return array(); + + for($i=0; $i<$len; $i++) { + unset($data[$i]['meta']); + $data[$i]['perms'] = $data[$i]['perm']; + unset($data[$i]['perm']); + $data[$i]['lastModified'] = $this->api->toDate($data[$i]['mtime']); + } + return $data; + } else { + throw new RemoteAccessDeniedException('You are not allowed to list media files.', 215); + } + } + + /** + * Return a list of backlinks + */ + function listBackLinks($id){ + return ft_backlinks($this->resolvePageId($id)); + } + + /** + * Return some basic data about a page + */ + function pageInfo($id,$rev=''){ + $id = $this->resolvePageId($id); + if(auth_quickaclcheck($id) < AUTH_READ){ + throw new RemoteAccessDeniedException('You are not allowed to read this page', 111); + } + $file = wikiFN($id,$rev); + $time = @filemtime($file); + if(!$time){ + throw new RemoteException('The requested page does not exist', 121); + } + + $info = getRevisionInfo($id, $time, 1024); + + $data = array( + 'name' => $id, + 'lastModified' => $this->api->toDate($time), + 'author' => (($info['user']) ? $info['user'] : $info['ip']), + 'version' => $time + ); + + return ($data); + } + + /** + * Save a wiki page + * + * @author Michael Klier + */ + function putPage($id, $text, $params) { + global $TEXT; + global $lang; + + $id = $this->resolvePageId($id); + $TEXT = cleanText($text); + $sum = $params['sum']; + $minor = $params['minor']; + + if(empty($id)) { + throw new RemoteException('Empty page ID', 131); + } + + if(!page_exists($id) && trim($TEXT) == '' ) { + throw new RemoteException('Refusing to write an empty new wiki page', 132); + } + + if(auth_quickaclcheck($id) < AUTH_EDIT) { + throw new RemoteAccessDeniedException('You are not allowed to edit this page', 112); + } + + // Check, if page is locked + if(checklock($id)) { + throw new RemoteException('The page is currently locked', 133); + } + + // SPAM check + if(checkwordblock()) { + throw new RemoteException('Positive wordblock check', 134); + } + + // autoset summary on new pages + if(!page_exists($id) && empty($sum)) { + $sum = $lang['created']; + } + + // autoset summary on deleted pages + if(page_exists($id) && empty($TEXT) && empty($sum)) { + $sum = $lang['deleted']; + } + + lock($id); + + saveWikiText($id,$TEXT,$sum,$minor); + + unlock($id); + + // run the indexer if page wasn't indexed yet + idx_addPage($id); + + return true; + } + + /** + * Appends text to a wiki page. + */ + function appendPage($id, $text, $params) { + $currentpage = $this->rawPage($id); + if (!is_string($currentpage)) { + return $currentpage; + } + return $this->putPage($id, $currentpage.$text, $params); + } + + /** + * Uploads a file to the wiki. + * + * Michael Klier + */ + function putAttachment($id, $file, $params) { + $id = cleanID($id); + $auth = auth_quickaclcheck(getNS($id).':*'); + + if(!isset($id)) { + throw new RemoteException('Filename not given.', 231); + } + + global $conf; + + $ftmp = $conf['tmpdir'] . '/' . md5($id.clientIP()); + + // save temporary file + @unlink($ftmp); + io_saveFile($ftmp, $file); + + $res = media_save(array('name' => $ftmp), $id, $params['ow'], $auth, 'rename'); + if (is_array($res)) { + throw new RemoteException($res[0], -$res[1]); + } else { + return $res; + } + } + + /** + * Deletes a file from the wiki. + * + * @author Gina Haeussge + */ + function deleteAttachment($id){ + $id = cleanID($id); + $auth = auth_quickaclcheck(getNS($id).':*'); + $res = media_delete($id, $auth); + if ($res & DOKU_MEDIA_DELETED) { + return 0; + } elseif ($res & DOKU_MEDIA_NOT_AUTH) { + throw new RemoteAccessDeniedException('You don\'t have permissions to delete files.', 212); + } elseif ($res & DOKU_MEDIA_INUSE) { + throw new RemoteException('File is still referenced', 232); + } else { + throw new RemoteException('Could not delete file', 233); + } + } + + /** + * Returns the permissions of a given wiki page + */ + function aclCheck($id) { + $id = $this->resolvePageId($id); + return auth_quickaclcheck($id); + } + + /** + * Lists all links contained in a wiki page + * + * @author Michael Klier + */ + function listLinks($id) { + $id = $this->resolvePageId($id); + if(auth_quickaclcheck($id) < AUTH_READ){ + throw new RemoteAccessDeniedException('You are not allowed to read this page', 111); + } + $links = array(); + + // resolve page instructions + $ins = p_cached_instructions(wikiFN($id)); + + // instantiate new Renderer - needed for interwiki links + include(DOKU_INC.'inc/parser/xhtml.php'); + $Renderer = new Doku_Renderer_xhtml(); + $Renderer->interwiki = getInterwiki(); + + // parse parse instructions + foreach($ins as $in) { + $link = array(); + switch($in[0]) { + case 'internallink': + $link['type'] = 'local'; + $link['page'] = $in[1][0]; + $link['href'] = wl($in[1][0]); + array_push($links,$link); + break; + case 'externallink': + $link['type'] = 'extern'; + $link['page'] = $in[1][0]; + $link['href'] = $in[1][0]; + array_push($links,$link); + break; + case 'interwikilink': + $url = $Renderer->_resolveInterWiki($in[1][2],$in[1][3]); + $link['type'] = 'extern'; + $link['page'] = $url; + $link['href'] = $url; + array_push($links,$link); + break; + } + } + + return ($links); + } + + /** + * Returns a list of recent changes since give timestamp + * + * @author Michael Hamann + * @author Michael Klier + */ + function getRecentChanges($timestamp) { + if(strlen($timestamp) != 10) { + throw new RemoteException('The provided value is not a valid timestamp', 311); + } + + $recents = getRecentsSince($timestamp); + + $changes = array(); + + foreach ($recents as $recent) { + $change = array(); + $change['name'] = $recent['id']; + $change['lastModified'] = $this->api->toDate($recent['date']); + $change['author'] = $recent['user']; + $change['version'] = $recent['date']; + $change['perms'] = $recent['perms']; + $change['size'] = @filesize(wikiFN($recent['id'])); + array_push($changes, $change); + } + + if (!empty($changes)) { + return $changes; + } else { + // in case we still have nothing at this point + return new RemoteException('There are no changes in the specified timeframe', 321); + } + } + + /** + * Returns a list of recent media changes since give timestamp + * + * @author Michael Hamann + * @author Michael Klier + */ + function getRecentMediaChanges($timestamp) { + if(strlen($timestamp) != 10) + throw new RemoteException('The provided value is not a valid timestamp', 311); + + $recents = getRecentsSince($timestamp, null, '', RECENTS_MEDIA_CHANGES); + + $changes = array(); + + foreach ($recents as $recent) { + $change = array(); + $change['name'] = $recent['id']; + $change['lastModified'] = $this->api->toDate($recent['date']); + $change['author'] = $recent['user']; + $change['version'] = $recent['date']; + $change['perms'] = $recent['perms']; + $change['size'] = @filesize(mediaFN($recent['id'])); + array_push($changes, $change); + } + + if (!empty($changes)) { + return $changes; + } else { + // in case we still have nothing at this point + throw new RemoteException('There are no changes in the specified timeframe', 321); + } + } + + /** + * Returns a list of available revisions of a given wiki page + * + * @author Michael Klier + */ + function pageVersions($id, $first) { + $id = $this->resolvePageId($id); + if(auth_quickaclcheck($id) < AUTH_READ) { + throw new RemoteAccessDeniedException('You are not allowed to read this page', 111); + } + global $conf; + + $versions = array(); + + if(empty($id)) { + throw new RemoteException('Empty page ID', 131); + } + + $revisions = getRevisions($id, $first, $conf['recent']+1); + + if(count($revisions)==0 && $first!=0) { + $first=0; + $revisions = getRevisions($id, $first, $conf['recent']+1); + } + + if(count($revisions)>0 && $first==0) { + array_unshift($revisions, ''); // include current revision + if ( count($revisions) > $conf['recent'] ){ + array_pop($revisions); // remove extra log entry + } + } + + if(count($revisions) > $conf['recent']) { + array_pop($revisions); // remove extra log entry + } + + if(!empty($revisions)) { + foreach($revisions as $rev) { + $file = wikiFN($id,$rev); + $time = @filemtime($file); + // we check if the page actually exists, if this is not the + // case this can lead to less pages being returned than + // specified via $conf['recent'] + if($time){ + $info = getRevisionInfo($id, $time, 1024); + if(!empty($info)) { + $data['user'] = $info['user']; + $data['ip'] = $info['ip']; + $data['type'] = $info['type']; + $data['sum'] = $info['sum']; + $data['modified'] = $this->api->toDate($info['date']); + $data['version'] = $info['date']; + array_push($versions, $data); + } + } + } + return $versions; + } else { + return array(); + } + } + + /** + * The version of Wiki RPC API supported + */ + function wiki_RPCVersion(){ + return 2; + } + + + /** + * Locks or unlocks a given batch of pages + * + * Give an associative array with two keys: lock and unlock. Both should contain a + * list of pages to lock or unlock + * + * Returns an associative array with the keys locked, lockfail, unlocked and + * unlockfail, each containing lists of pages. + */ + function setLocks($set){ + $locked = array(); + $lockfail = array(); + $unlocked = array(); + $unlockfail = array(); + + foreach((array) $set['lock'] as $id){ + $id = $this->resolvePageId($id); + if(auth_quickaclcheck($id) < AUTH_EDIT || checklock($id)){ + $lockfail[] = $id; + }else{ + lock($id); + $locked[] = $id; + } + } + + foreach((array) $set['unlock'] as $id){ + $id = $this->resolvePageId($id); + if(auth_quickaclcheck($id) < AUTH_EDIT || !unlock($id)){ + $unlockfail[] = $id; + }else{ + $unlocked[] = $id; + } + } + + return array( + 'locked' => $locked, + 'lockfail' => $lockfail, + 'unlocked' => $unlocked, + 'unlockfail' => $unlockfail, + ); + } + + function getAPIVersion(){ + return DOKU_API_VERSION; + } + + function login($user,$pass){ + global $conf; + global $auth; + if(!$conf['useacl']) return 0; + if(!$auth) return 0; + + @session_start(); // reopen session for login + if($auth->canDo('external')){ + $ok = $auth->trustExternal($user,$pass,false); + }else{ + $evdata = array( + 'user' => $user, + 'password' => $pass, + 'sticky' => false, + 'silent' => true, + ); + $ok = trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper'); + } + session_write_close(); // we're done with the session + + return $ok; + } + + private function resolvePageId($id) { + $id = cleanID($id); + if(empty($id)) { + global $conf; + $id = cleanID($conf['start']); + } + return $id; + } + +} + diff --git a/sources/inc/SafeFN.class.php b/sources/inc/SafeFN.class.php new file mode 100644 index 0000000..b9e4a2b --- /dev/null +++ b/sources/inc/SafeFN.class.php @@ -0,0 +1,158 @@ + + * @date 2010-04-02 + */ +class SafeFN { + + // 'safe' characters are a superset of $plain, $pre_indicator and $post_indicator + private static $plain = '-./[_0123456789abcdefghijklmnopqrstuvwxyz'; // these characters aren't converted + private static $pre_indicator = '%'; + private static $post_indicator = ']'; + + /** + * Convert an UTF-8 string to a safe ASCII String + * + * conversion process + * - if codepoint is a plain or post_indicator character, + * - if previous character was "converted", append post_indicator to output, clear "converted" flag + * - append ascii byte for character to output + * (continue to next character) + * + * - if codepoint is a pre_indicator character, + * - append ascii byte for character to output, set "converted" flag + * (continue to next character) + * + * (all remaining characters) + * - reduce codepoint value for non-printable ASCII characters (0x00 - 0x1f). Space becomes our zero. + * - convert reduced value to base36 (0-9a-z) + * - append $pre_indicator characater followed by base36 string to output, set converted flag + * (continue to next character) + * + * @param string $filename a utf8 string, should only include printable characters - not 0x00-0x1f + * @return string an encoded representation of $filename using only 'safe' ASCII characters + * + * @author Christopher Smith + */ + public static function encode($filename) { + return self::unicode_to_safe(utf8_to_unicode($filename)); + } + + /** + * decoding process + * - split the string into substrings at any occurrence of pre or post indicator characters + * - check the first character of the substring + * - if its not a pre_indicator character + * - if previous character was converted, skip over post_indicator character + * - copy codepoint values of remaining characters to the output array + * - clear any converted flag + * (continue to next substring) + * + * _ else (its a pre_indicator character) + * - if string length is 1, copy the post_indicator character to the output array + * (continue to next substring) + * + * - else (string length > 1) + * - skip the pre-indicator character and convert remaining string from base36 to base10 + * - increase codepoint value for non-printable ASCII characters (add 0x20) + * - append codepoint to output array + * (continue to next substring) + * + * @param string $filename a 'safe' encoded ASCII string, + * @return string decoded utf8 representation of $filename + * + * @author Christopher Smith + */ + public static function decode($filename) { + return unicode_to_utf8(self::safe_to_unicode(strtolower($filename))); + } + + public static function validate_printable_utf8($printable_utf8) { + return !preg_match('#[\x01-\x1f]#',$printable_utf8); + } + + public static function validate_safe($safe) { + return !preg_match('#[^'.self::$plain.self::$post_indicator.self::$pre_indicator.']#',$safe); + } + + /** + * convert an array of unicode codepoints into 'safe_filename' format + * + * @param array int $unicode an array of unicode codepoints + * @return string the unicode represented in 'safe_filename' format + * + * @author Christopher Smith + */ + private static function unicode_to_safe($unicode) { + + $safe = ''; + $converted = false; + + foreach ($unicode as $codepoint) { + if ($codepoint < 127 && (strpos(self::$plain.self::$post_indicator,chr($codepoint))!==false)) { + if ($converted) { + $safe .= self::$post_indicator; + $converted = false; + } + $safe .= chr($codepoint); + + } else if ($codepoint == ord(self::$pre_indicator)) { + $safe .= self::$pre_indicator; + $converted = true; + } else { + $safe .= self::$pre_indicator.base_convert((string)($codepoint-32),10,36); + $converted = true; + } + } + if($converted) $safe .= self::$post_indicator; + return $safe; + } + + /** + * convert a 'safe_filename' string into an array of unicode codepoints + * + * @param string $safe a filename in 'safe_filename' format + * @return array int an array of unicode codepoints + * + * @author Christopher Smith + */ + private static function safe_to_unicode($safe) { + + $unicode = array(); + $split = preg_split('#(?=['.self::$post_indicator.self::$pre_indicator.'])#',$safe,-1,PREG_SPLIT_NO_EMPTY); + + $converted = false; + foreach ($split as $sub) { + $len = strlen($sub); + if ($sub[0] != self::$pre_indicator) { + // plain (unconverted) characters, optionally starting with a post_indicator + // set initial value to skip any post_indicator + for ($i=($converted?1:0); $i < $len; $i++) { + $unicode[] = ord($sub[$i]); + } + $converted = false; + } else if ($len==1) { + // a pre_indicator character in the real data + $unicode[] = ord($sub); + $converted = true; + } else { + // a single codepoint in base36, adjusted for initial 32 non-printable chars + $unicode[] = 32 + (int)base_convert(substr($sub,1),36,10); + $converted = true; + } + } + + return $unicode; + } + +} diff --git a/sources/inc/SimplePie.php b/sources/inc/SimplePie.php new file mode 100644 index 0000000..8a90605 --- /dev/null +++ b/sources/inc/SimplePie.php @@ -0,0 +1,17772 @@ +' . SIMPLEPIE_NAME . ''); + +/** + * No Autodiscovery + * @see SimplePie::set_autodiscovery_level() + */ +define('SIMPLEPIE_LOCATOR_NONE', 0); + +/** + * Feed Link Element Autodiscovery + * @see SimplePie::set_autodiscovery_level() + */ +define('SIMPLEPIE_LOCATOR_AUTODISCOVERY', 1); + +/** + * Local Feed Extension Autodiscovery + * @see SimplePie::set_autodiscovery_level() + */ +define('SIMPLEPIE_LOCATOR_LOCAL_EXTENSION', 2); + +/** + * Local Feed Body Autodiscovery + * @see SimplePie::set_autodiscovery_level() + */ +define('SIMPLEPIE_LOCATOR_LOCAL_BODY', 4); + +/** + * Remote Feed Extension Autodiscovery + * @see SimplePie::set_autodiscovery_level() + */ +define('SIMPLEPIE_LOCATOR_REMOTE_EXTENSION', 8); + +/** + * Remote Feed Body Autodiscovery + * @see SimplePie::set_autodiscovery_level() + */ +define('SIMPLEPIE_LOCATOR_REMOTE_BODY', 16); + +/** + * All Feed Autodiscovery + * @see SimplePie::set_autodiscovery_level() + */ +define('SIMPLEPIE_LOCATOR_ALL', 31); + +/** + * No known feed type + */ +define('SIMPLEPIE_TYPE_NONE', 0); + +/** + * RSS 0.90 + */ +define('SIMPLEPIE_TYPE_RSS_090', 1); + +/** + * RSS 0.91 (Netscape) + */ +define('SIMPLEPIE_TYPE_RSS_091_NETSCAPE', 2); + +/** + * RSS 0.91 (Userland) + */ +define('SIMPLEPIE_TYPE_RSS_091_USERLAND', 4); + +/** + * RSS 0.91 (both Netscape and Userland) + */ +define('SIMPLEPIE_TYPE_RSS_091', 6); + +/** + * RSS 0.92 + */ +define('SIMPLEPIE_TYPE_RSS_092', 8); + +/** + * RSS 0.93 + */ +define('SIMPLEPIE_TYPE_RSS_093', 16); + +/** + * RSS 0.94 + */ +define('SIMPLEPIE_TYPE_RSS_094', 32); + +/** + * RSS 1.0 + */ +define('SIMPLEPIE_TYPE_RSS_10', 64); + +/** + * RSS 2.0 + */ +define('SIMPLEPIE_TYPE_RSS_20', 128); + +/** + * RDF-based RSS + */ +define('SIMPLEPIE_TYPE_RSS_RDF', 65); + +/** + * Non-RDF-based RSS (truly intended as syndication format) + */ +define('SIMPLEPIE_TYPE_RSS_SYNDICATION', 190); + +/** + * All RSS + */ +define('SIMPLEPIE_TYPE_RSS_ALL', 255); + +/** + * Atom 0.3 + */ +define('SIMPLEPIE_TYPE_ATOM_03', 256); + +/** + * Atom 1.0 + */ +define('SIMPLEPIE_TYPE_ATOM_10', 512); + +/** + * All Atom + */ +define('SIMPLEPIE_TYPE_ATOM_ALL', 768); + +/** + * All feed types + */ +define('SIMPLEPIE_TYPE_ALL', 1023); + +/** + * No construct + */ +define('SIMPLEPIE_CONSTRUCT_NONE', 0); + +/** + * Text construct + */ +define('SIMPLEPIE_CONSTRUCT_TEXT', 1); + +/** + * HTML construct + */ +define('SIMPLEPIE_CONSTRUCT_HTML', 2); + +/** + * XHTML construct + */ +define('SIMPLEPIE_CONSTRUCT_XHTML', 4); + +/** + * base64-encoded construct + */ +define('SIMPLEPIE_CONSTRUCT_BASE64', 8); + +/** + * IRI construct + */ +define('SIMPLEPIE_CONSTRUCT_IRI', 16); + +/** + * A construct that might be HTML + */ +define('SIMPLEPIE_CONSTRUCT_MAYBE_HTML', 32); + +/** + * All constructs + */ +define('SIMPLEPIE_CONSTRUCT_ALL', 63); + +/** + * Don't change case + */ +define('SIMPLEPIE_SAME_CASE', 1); + +/** + * Change to lowercase + */ +define('SIMPLEPIE_LOWERCASE', 2); + +/** + * Change to uppercase + */ +define('SIMPLEPIE_UPPERCASE', 4); + +/** + * PCRE for HTML attributes + */ +define('SIMPLEPIE_PCRE_HTML_ATTRIBUTE', '((?:[\x09\x0A\x0B\x0C\x0D\x20]+[^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"(?:[^"]*)"|\'(?:[^\']*)\'|(?:[^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?)*)[\x09\x0A\x0B\x0C\x0D\x20]*'); + +/** + * PCRE for XML attributes + */ +define('SIMPLEPIE_PCRE_XML_ATTRIBUTE', '((?:\s+(?:(?:[^\s:]+:)?[^\s:]+)\s*=\s*(?:"(?:[^"]*)"|\'(?:[^\']*)\'))*)\s*'); + +/** + * XML Namespace + */ +define('SIMPLEPIE_NAMESPACE_XML', 'http://www.w3.org/XML/1998/namespace'); + +/** + * Atom 1.0 Namespace + */ +define('SIMPLEPIE_NAMESPACE_ATOM_10', 'http://www.w3.org/2005/Atom'); + +/** + * Atom 0.3 Namespace + */ +define('SIMPLEPIE_NAMESPACE_ATOM_03', 'http://purl.org/atom/ns#'); + +/** + * RDF Namespace + */ +define('SIMPLEPIE_NAMESPACE_RDF', 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'); + +/** + * RSS 0.90 Namespace + */ +define('SIMPLEPIE_NAMESPACE_RSS_090', 'http://my.netscape.com/rdf/simple/0.9/'); + +/** + * RSS 1.0 Namespace + */ +define('SIMPLEPIE_NAMESPACE_RSS_10', 'http://purl.org/rss/1.0/'); + +/** + * RSS 1.0 Content Module Namespace + */ +define('SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT', 'http://purl.org/rss/1.0/modules/content/'); + +/** + * RSS 2.0 Namespace + * (Stupid, I know, but I'm certain it will confuse people less with support.) + */ +define('SIMPLEPIE_NAMESPACE_RSS_20', ''); + +/** + * DC 1.0 Namespace + */ +define('SIMPLEPIE_NAMESPACE_DC_10', 'http://purl.org/dc/elements/1.0/'); + +/** + * DC 1.1 Namespace + */ +define('SIMPLEPIE_NAMESPACE_DC_11', 'http://purl.org/dc/elements/1.1/'); + +/** + * W3C Basic Geo (WGS84 lat/long) Vocabulary Namespace + */ +define('SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO', 'http://www.w3.org/2003/01/geo/wgs84_pos#'); + +/** + * GeoRSS Namespace + */ +define('SIMPLEPIE_NAMESPACE_GEORSS', 'http://www.georss.org/georss'); + +/** + * Media RSS Namespace + */ +define('SIMPLEPIE_NAMESPACE_MEDIARSS', 'http://search.yahoo.com/mrss/'); + +/** + * Wrong Media RSS Namespace. Caused by a long-standing typo in the spec. + */ +define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG', 'http://search.yahoo.com/mrss'); + +/** + * Wrong Media RSS Namespace #2. New namespace introduced in Media RSS 1.5. + */ +define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2', 'http://video.search.yahoo.com/mrss'); + +/** + * Wrong Media RSS Namespace #3. A possible typo of the Media RSS 1.5 namespace. + */ +define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3', 'http://video.search.yahoo.com/mrss/'); + +/** + * Wrong Media RSS Namespace #4. New spec location after the RSS Advisory Board takes it over, but not a valid namespace. + */ +define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4', 'http://www.rssboard.org/media-rss'); + +/** + * Wrong Media RSS Namespace #5. A possible typo of the RSS Advisory Board URL. + */ +define('SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5', 'http://www.rssboard.org/media-rss/'); + +/** + * iTunes RSS Namespace + */ +define('SIMPLEPIE_NAMESPACE_ITUNES', 'http://www.itunes.com/dtds/podcast-1.0.dtd'); + +/** + * XHTML Namespace + */ +define('SIMPLEPIE_NAMESPACE_XHTML', 'http://www.w3.org/1999/xhtml'); + +/** + * IANA Link Relations Registry + */ +define('SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY', 'http://www.iana.org/assignments/relation/'); + +/** + * No file source + */ +define('SIMPLEPIE_FILE_SOURCE_NONE', 0); + +/** + * Remote file source + */ +define('SIMPLEPIE_FILE_SOURCE_REMOTE', 1); + +/** + * Local file source + */ +define('SIMPLEPIE_FILE_SOURCE_LOCAL', 2); + +/** + * fsockopen() file source + */ +define('SIMPLEPIE_FILE_SOURCE_FSOCKOPEN', 4); + +/** + * cURL file source + */ +define('SIMPLEPIE_FILE_SOURCE_CURL', 8); + +/** + * file_get_contents() file source + */ +define('SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS', 16); + +/** + * SimplePie + * + * @package SimplePie + * @subpackage API + */ +class SimplePie +{ + /** + * @var array Raw data + * @access private + */ + public $data = array(); + + /** + * @var mixed Error string + * @access private + */ + public $error; + + /** + * @var object Instance of SimplePie_Sanitize (or other class) + * @see SimplePie::set_sanitize_class() + * @access private + */ + public $sanitize; + + /** + * @var string SimplePie Useragent + * @see SimplePie::set_useragent() + * @access private + */ + public $useragent = SIMPLEPIE_USERAGENT; + + /** + * @var string Feed URL + * @see SimplePie::set_feed_url() + * @access private + */ + public $feed_url; + + /** + * @var object Instance of SimplePie_File to use as a feed + * @see SimplePie::set_file() + * @access private + */ + public $file; + + /** + * @var string Raw feed data + * @see SimplePie::set_raw_data() + * @access private + */ + public $raw_data; + + /** + * @var int Timeout for fetching remote files + * @see SimplePie::set_timeout() + * @access private + */ + public $timeout = 10; + + /** + * @var bool Forces fsockopen() to be used for remote files instead + * of cURL, even if a new enough version is installed + * @see SimplePie::force_fsockopen() + * @access private + */ + public $force_fsockopen = false; + + /** + * @var bool Force the given data/URL to be treated as a feed no matter what + * it appears like + * @see SimplePie::force_feed() + * @access private + */ + public $force_feed = false; + + /** + * @var bool Enable/Disable Caching + * @see SimplePie::enable_cache() + * @access private + */ + public $cache = true; + + /** + * @var int Cache duration (in seconds) + * @see SimplePie::set_cache_duration() + * @access private + */ + public $cache_duration = 3600; + + /** + * @var int Auto-discovery cache duration (in seconds) + * @see SimplePie::set_autodiscovery_cache_duration() + * @access private + */ + public $autodiscovery_cache_duration = 604800; // 7 Days. + + /** + * @var string Cache location (relative to executing script) + * @see SimplePie::set_cache_location() + * @access private + */ + public $cache_location = './cache'; + + /** + * @var string Function that creates the cache filename + * @see SimplePie::set_cache_name_function() + * @access private + */ + public $cache_name_function = 'md5'; + + /** + * @var bool Reorder feed by date descending + * @see SimplePie::enable_order_by_date() + * @access private + */ + public $order_by_date = true; + + /** + * @var mixed Force input encoding to be set to the follow value + * (false, or anything type-cast to false, disables this feature) + * @see SimplePie::set_input_encoding() + * @access private + */ + public $input_encoding = false; + + /** + * @var int Feed Autodiscovery Level + * @see SimplePie::set_autodiscovery_level() + * @access private + */ + public $autodiscovery = SIMPLEPIE_LOCATOR_ALL; + + /** + * Class registry object + * + * @var SimplePie_Registry + */ + public $registry; + + /** + * @var int Maximum number of feeds to check with autodiscovery + * @see SimplePie::set_max_checked_feeds() + * @access private + */ + public $max_checked_feeds = 10; + + /** + * @var array All the feeds found during the autodiscovery process + * @see SimplePie::get_all_discovered_feeds() + * @access private + */ + public $all_discovered_feeds = array(); + + /** + * @var string Web-accessible path to the handler_image.php file. + * @see SimplePie::set_image_handler() + * @access private + */ + public $image_handler = ''; + + /** + * @var array Stores the URLs when multiple feeds are being initialized. + * @see SimplePie::set_feed_url() + * @access private + */ + public $multifeed_url = array(); + + /** + * @var array Stores SimplePie objects when multiple feeds initialized. + * @access private + */ + public $multifeed_objects = array(); + + /** + * @var array Stores the get_object_vars() array for use with multifeeds. + * @see SimplePie::set_feed_url() + * @access private + */ + public $config_settings = null; + + /** + * @var integer Stores the number of items to return per-feed with multifeeds. + * @see SimplePie::set_item_limit() + * @access private + */ + public $item_limit = 0; + + /** + * @var array Stores the default attributes to be stripped by strip_attributes(). + * @see SimplePie::strip_attributes() + * @access private + */ + public $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'); + + /** + * @var array Stores the default tags to be stripped by strip_htmltags(). + * @see SimplePie::strip_htmltags() + * @access private + */ + public $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'); + + /** + * The SimplePie class contains feed level data and options + * + * To use SimplePie, create the SimplePie object with no parameters. You can + * then set configuration options using the provided methods. After setting + * them, you must initialise the feed using $feed->init(). At that point the + * object's methods and properties will be available to you. + * + * Previously, it was possible to pass in the feed URL along with cache + * options directly into the constructor. This has been removed as of 1.3 as + * it caused a lot of confusion. + * + * @since 1.0 Preview Release + */ + public function __construct() + { + if (version_compare(PHP_VERSION, '5.2', '<')) + { + trigger_error('PHP 4.x, 5.0 and 5.1 are no longer supported. Please upgrade to PHP 5.2 or newer.'); + die(); + } + + // Other objects, instances created here so we can set options on them + $this->sanitize = new SimplePie_Sanitize(); + $this->registry = new SimplePie_Registry(); + + if (func_num_args() > 0) + { + $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING; + trigger_error('Passing parameters to the constructor is no longer supported. Please use set_feed_url(), set_cache_location(), and set_cache_location() directly.', $level); + + $args = func_get_args(); + switch (count($args)) { + case 3: + $this->set_cache_duration($args[2]); + case 2: + $this->set_cache_location($args[1]); + case 1: + $this->set_feed_url($args[0]); + $this->init(); + } + } + } + + /** + * Used for converting object to a string + */ + public function __toString() + { + return md5(serialize($this->data)); + } + + /** + * Remove items that link back to this before destroying this object + */ + public function __destruct() + { + if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode')) + { + if (!empty($this->data['items'])) + { + foreach ($this->data['items'] as $item) + { + $item->__destruct(); + } + unset($item, $this->data['items']); + } + if (!empty($this->data['ordered_items'])) + { + foreach ($this->data['ordered_items'] as $item) + { + $item->__destruct(); + } + unset($item, $this->data['ordered_items']); + } + } + } + + /** + * Force the given data/URL to be treated as a feed + * + * This tells SimplePie to ignore the content-type provided by the server. + * Be careful when using this option, as it will also disable autodiscovery. + * + * @since 1.1 + * @param bool $enable Force the given data/URL to be treated as a feed + */ + public function force_feed($enable = false) + { + $this->force_feed = (bool) $enable; + } + + /** + * Set the URL of the feed you want to parse + * + * This allows you to enter the URL of the feed you want to parse, or the + * website you want to try to use auto-discovery on. This takes priority + * over any set raw data. + * + * You can set multiple feeds to mash together by passing an array instead + * of a string for the $url. Remember that with each additional feed comes + * additional processing and resources. + * + * @since 1.0 Preview Release + * @see set_raw_data() + * @param string|array $url This is the URL (or array of URLs) that you want to parse. + */ + public function set_feed_url($url) + { + $this->multifeed_url = array(); + if (is_array($url)) + { + foreach ($url as $value) + { + $this->multifeed_url[] = $this->registry->call('Misc', 'fix_protocol', array($value, 1)); + } + } + else + { + $this->feed_url = $this->registry->call('Misc', 'fix_protocol', array($url, 1)); + } + } + + /** + * Set an instance of {@see SimplePie_File} to use as a feed + * + * @param SimplePie_File &$file + * @return bool True on success, false on failure + */ + public function set_file(&$file) + { + if ($file instanceof SimplePie_File) + { + $this->feed_url = $file->url; + $this->file =& $file; + return true; + } + return false; + } + + /** + * Set the raw XML data to parse + * + * Allows you to use a string of RSS/Atom data instead of a remote feed. + * + * If you have a feed available as a string in PHP, you can tell SimplePie + * to parse that data string instead of a remote feed. Any set feed URL + * takes precedence. + * + * @since 1.0 Beta 3 + * @param string $data RSS or Atom data as a string. + * @see set_feed_url() + */ + public function set_raw_data($data) + { + $this->raw_data = $data; + } + + /** + * Set the the default timeout for fetching remote feeds + * + * This allows you to change the maximum time the feed's server to respond + * and send the feed back. + * + * @since 1.0 Beta 3 + * @param int $timeout The maximum number of seconds to spend waiting to retrieve a feed. + */ + public function set_timeout($timeout = 10) + { + $this->timeout = (int) $timeout; + } + + /** + * Force SimplePie to use fsockopen() instead of cURL + * + * @since 1.0 Beta 3 + * @param bool $enable Force fsockopen() to be used + */ + public function force_fsockopen($enable = false) + { + $this->force_fsockopen = (bool) $enable; + } + + /** + * Enable/disable caching in SimplePie. + * + * This option allows you to disable caching all-together in SimplePie. + * However, disabling the cache can lead to longer load times. + * + * @since 1.0 Preview Release + * @param bool $enable Enable caching + */ + public function enable_cache($enable = true) + { + $this->cache = (bool) $enable; + } + + /** + * Set the length of time (in seconds) that the contents of a feed will be + * cached + * + * @param int $seconds The feed content cache duration + */ + public function set_cache_duration($seconds = 3600) + { + $this->cache_duration = (int) $seconds; + } + + /** + * Set the length of time (in seconds) that the autodiscovered feed URL will + * be cached + * + * @param int $seconds The autodiscovered feed URL cache duration. + */ + public function set_autodiscovery_cache_duration($seconds = 604800) + { + $this->autodiscovery_cache_duration = (int) $seconds; + } + + /** + * Set the file system location where the cached files should be stored + * + * @param string $location The file system location. + */ + public function set_cache_location($location = './cache') + { + $this->cache_location = (string) $location; + } + + /** + * Set whether feed items should be sorted into reverse chronological order + * + * @param bool $enable Sort as reverse chronological order. + */ + public function enable_order_by_date($enable = true) + { + $this->order_by_date = (bool) $enable; + } + + /** + * Set the character encoding used to parse the feed + * + * This overrides the encoding reported by the feed, however it will fall + * back to the normal encoding detection if the override fails + * + * @param string $encoding Character encoding + */ + public function set_input_encoding($encoding = false) + { + if ($encoding) + { + $this->input_encoding = (string) $encoding; + } + else + { + $this->input_encoding = false; + } + } + + /** + * Set how much feed autodiscovery to do + * + * @see SIMPLEPIE_LOCATOR_NONE + * @see SIMPLEPIE_LOCATOR_AUTODISCOVERY + * @see SIMPLEPIE_LOCATOR_LOCAL_EXTENSION + * @see SIMPLEPIE_LOCATOR_LOCAL_BODY + * @see SIMPLEPIE_LOCATOR_REMOTE_EXTENSION + * @see SIMPLEPIE_LOCATOR_REMOTE_BODY + * @see SIMPLEPIE_LOCATOR_ALL + * @param int $level Feed Autodiscovery Level (level can be a combination of the above constants, see bitwise OR operator) + */ + public function set_autodiscovery_level($level = SIMPLEPIE_LOCATOR_ALL) + { + $this->autodiscovery = (int) $level; + } + + /** + * Get the class registry + * + * Use this to override SimplePie's default classes + * @see SimplePie_Registry + * @return SimplePie_Registry + */ + public function &get_registry() + { + return $this->registry; + } + + /**#@+ + * Useful when you are overloading or extending SimplePie's default classes. + * + * @deprecated Use {@see get_registry()} instead + * @link http://php.net/manual/en/language.oop5.basic.php#language.oop5.basic.extends PHP5 extends documentation + * @param string $class Name of custom class + * @return boolean True on success, false otherwise + */ + /** + * Set which class SimplePie uses for caching + */ + public function set_cache_class($class = 'SimplePie_Cache') + { + return $this->registry->register('Cache', $class, true); + } + + /** + * Set which class SimplePie uses for auto-discovery + */ + public function set_locator_class($class = 'SimplePie_Locator') + { + return $this->registry->register('Locator', $class, true); + } + + /** + * Set which class SimplePie uses for XML parsing + */ + public function set_parser_class($class = 'SimplePie_Parser') + { + return $this->registry->register('Parser', $class, true); + } + + /** + * Set which class SimplePie uses for remote file fetching + */ + public function set_file_class($class = 'SimplePie_File') + { + return $this->registry->register('File', $class, true); + } + + /** + * Set which class SimplePie uses for data sanitization + */ + public function set_sanitize_class($class = 'SimplePie_Sanitize') + { + return $this->registry->register('Sanitize', $class, true); + } + + /** + * Set which class SimplePie uses for handling feed items + */ + public function set_item_class($class = 'SimplePie_Item') + { + return $this->registry->register('Item', $class, true); + } + + /** + * Set which class SimplePie uses for handling author data + */ + public function set_author_class($class = 'SimplePie_Author') + { + return $this->registry->register('Author', $class, true); + } + + /** + * Set which class SimplePie uses for handling category data + */ + public function set_category_class($class = 'SimplePie_Category') + { + return $this->registry->register('Category', $class, true); + } + + /** + * Set which class SimplePie uses for feed enclosures + */ + public function set_enclosure_class($class = 'SimplePie_Enclosure') + { + return $this->registry->register('Enclosure', $class, true); + } + + /** + * Set which class SimplePie uses for `` captions + */ + public function set_caption_class($class = 'SimplePie_Caption') + { + return $this->registry->register('Caption', $class, true); + } + + /** + * Set which class SimplePie uses for `` + */ + public function set_copyright_class($class = 'SimplePie_Copyright') + { + return $this->registry->register('Copyright', $class, true); + } + + /** + * Set which class SimplePie uses for `` + */ + public function set_credit_class($class = 'SimplePie_Credit') + { + return $this->registry->register('Credit', $class, true); + } + + /** + * Set which class SimplePie uses for `` + */ + public function set_rating_class($class = 'SimplePie_Rating') + { + return $this->registry->register('Rating', $class, true); + } + + /** + * Set which class SimplePie uses for `` + */ + public function set_restriction_class($class = 'SimplePie_Restriction') + { + return $this->registry->register('Restriction', $class, true); + } + + /** + * Set which class SimplePie uses for content-type sniffing + */ + public function set_content_type_sniffer_class($class = 'SimplePie_Content_Type_Sniffer') + { + return $this->registry->register('Content_Type_Sniffer', $class, true); + } + + /** + * Set which class SimplePie uses item sources + */ + public function set_source_class($class = 'SimplePie_Source') + { + return $this->registry->register('Source', $class, true); + } + /**#@-*/ + + /** + * Set the user agent string + * + * @param string $ua New user agent string. + */ + public function set_useragent($ua = SIMPLEPIE_USERAGENT) + { + $this->useragent = (string) $ua; + } + + /** + * Set callback function to create cache filename with + * + * @param mixed $function Callback function + */ + public function set_cache_name_function($function = 'md5') + { + if (is_callable($function)) + { + $this->cache_name_function = $function; + } + } + + /** + * Set options to make SP as fast as possible + * + * Forgoes a substantial amount of data sanitization in favor of speed. This + * turns SimplePie into a dumb parser of feeds. + * + * @param bool $set Whether to set them or not + */ + public function set_stupidly_fast($set = false) + { + if ($set) + { + $this->enable_order_by_date(false); + $this->remove_div(false); + $this->strip_comments(false); + $this->strip_htmltags(false); + $this->strip_attributes(false); + $this->set_image_handler(false); + } + } + + /** + * Set maximum number of feeds to check with autodiscovery + * + * @param int $max Maximum number of feeds to check + */ + public function set_max_checked_feeds($max = 10) + { + $this->max_checked_feeds = (int) $max; + } + + public function remove_div($enable = true) + { + $this->sanitize->remove_div($enable); + } + + public function strip_htmltags($tags = '', $encode = null) + { + if ($tags === '') + { + $tags = $this->strip_htmltags; + } + $this->sanitize->strip_htmltags($tags); + if ($encode !== null) + { + $this->sanitize->encode_instead_of_strip($tags); + } + } + + public function encode_instead_of_strip($enable = true) + { + $this->sanitize->encode_instead_of_strip($enable); + } + + public function strip_attributes($attribs = '') + { + if ($attribs === '') + { + $attribs = $this->strip_attributes; + } + $this->sanitize->strip_attributes($attribs); + } + + /** + * Set the output encoding + * + * Allows you to override SimplePie's output to match that of your webpage. + * This is useful for times when your webpages are not being served as + * UTF-8. This setting will be obeyed by {@see handle_content_type()}, and + * is similar to {@see set_input_encoding()}. + * + * It should be noted, however, that not all character encodings can support + * all characters. If your page is being served as ISO-8859-1 and you try + * to display a Japanese feed, you'll likely see garbled characters. + * Because of this, it is highly recommended to ensure that your webpages + * are served as UTF-8. + * + * The number of supported character encodings depends on whether your web + * host supports {@link http://php.net/mbstring mbstring}, + * {@link http://php.net/iconv iconv}, or both. See + * {@link http://simplepie.org/wiki/faq/Supported_Character_Encodings} for + * more information. + * + * @param string $encoding + */ + public function set_output_encoding($encoding = 'UTF-8') + { + $this->sanitize->set_output_encoding($encoding); + } + + public function strip_comments($strip = false) + { + $this->sanitize->strip_comments($strip); + } + + /** + * Set element/attribute key/value pairs of HTML attributes + * containing URLs that need to be resolved relative to the feed + * + * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite, + * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite, + * |q|@cite + * + * @since 1.0 + * @param array|null $element_attribute Element/attribute key/value pairs, null for default + */ + public function set_url_replacements($element_attribute = null) + { + $this->sanitize->set_url_replacements($element_attribute); + } + + /** + * Set the handler to enable the display of cached images. + * + * @param str $page Web-accessible path to the handler_image.php file. + * @param str $qs The query string that the value should be passed to. + */ + public function set_image_handler($page = false, $qs = 'i') + { + if ($page !== false) + { + $this->sanitize->set_image_handler($page . '?' . $qs . '='); + } + else + { + $this->image_handler = ''; + } + } + + /** + * Set the limit for items returned per-feed with multifeeds + * + * @param integer $limit The maximum number of items to return. + */ + public function set_item_limit($limit = 0) + { + $this->item_limit = (int) $limit; + } + + /** + * Initialize the feed object + * + * This is what makes everything happen. Period. This is where all of the + * configuration options get processed, feeds are fetched, cached, and + * parsed, and all of that other good stuff. + * + * @return boolean True if successful, false otherwise + */ + public function init() + { + // Check absolute bare minimum requirements. + if (!extension_loaded('xml') || !extension_loaded('pcre')) + { + return false; + } + // Then check the xml extension is sane (i.e., libxml 2.7.x issue on PHP < 5.2.9 and libxml 2.7.0 to 2.7.2 on any version) if we don't have xmlreader. + elseif (!extension_loaded('xmlreader')) + { + static $xml_is_sane = null; + if ($xml_is_sane === null) + { + $parser_check = xml_parser_create(); + xml_parse_into_struct($parser_check, '&', $values); + xml_parser_free($parser_check); + $xml_is_sane = isset($values[0]['value']); + } + if (!$xml_is_sane) + { + return false; + } + } + + if (method_exists($this->sanitize, 'set_registry')) + { + $this->sanitize->set_registry($this->registry); + } + + // Pass whatever was set with config options over to the sanitizer. + // Pass the classes in for legacy support; new classes should use the registry instead + $this->sanitize->pass_cache_data($this->cache, $this->cache_location, $this->cache_name_function, $this->registry->get_class('Cache')); + $this->sanitize->pass_file_data($this->registry->get_class('File'), $this->timeout, $this->useragent, $this->force_fsockopen); + + if (!empty($this->multifeed_url)) + { + $i = 0; + $success = 0; + $this->multifeed_objects = array(); + $this->error = array(); + foreach ($this->multifeed_url as $url) + { + $this->multifeed_objects[$i] = clone $this; + $this->multifeed_objects[$i]->set_feed_url($url); + $single_success = $this->multifeed_objects[$i]->init(); + $success |= $single_success; + if (!$single_success) + { + $this->error[$i] = $this->multifeed_objects[$i]->error(); + } + $i++; + } + return (bool) $success; + } + elseif ($this->feed_url === null && $this->raw_data === null) + { + return false; + } + + $this->error = null; + $this->data = array(); + $this->multifeed_objects = array(); + $cache = false; + + if ($this->feed_url !== null) + { + $parsed_feed_url = $this->registry->call('Misc', 'parse_url', array($this->feed_url)); + + // Decide whether to enable caching + if ($this->cache && $parsed_feed_url['scheme'] !== '') + { + $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $this->feed_url), 'spc')); + } + + // Fetch the data via SimplePie_File into $this->raw_data + if (($fetched = $this->fetch_data($cache)) === true) + { + return true; + } + elseif ($fetched === false) { + return false; + } + + list($headers, $sniffed) = $fetched; + } + + // Set up array of possible encodings + $encodings = array(); + + // First check to see if input has been overridden. + if ($this->input_encoding !== false) + { + $encodings[] = $this->input_encoding; + } + + $application_types = array('application/xml', 'application/xml-dtd', 'application/xml-external-parsed-entity'); + $text_types = array('text/xml', 'text/xml-external-parsed-entity'); + + // RFC 3023 (only applies to sniffed content) + if (isset($sniffed)) + { + if (in_array($sniffed, $application_types) || substr($sniffed, 0, 12) === 'application/' && substr($sniffed, -4) === '+xml') + { + if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset)) + { + $encodings[] = strtoupper($charset[1]); + } + $encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry))); + $encodings[] = 'UTF-8'; + } + elseif (in_array($sniffed, $text_types) || substr($sniffed, 0, 5) === 'text/' && substr($sniffed, -4) === '+xml') + { + if (isset($headers['content-type']) && preg_match('/;\x20?charset=([^;]*)/i', $headers['content-type'], $charset)) + { + $encodings[] = $charset[1]; + } + $encodings[] = 'US-ASCII'; + } + // Text MIME-type default + elseif (substr($sniffed, 0, 5) === 'text/') + { + $encodings[] = 'US-ASCII'; + } + } + + // Fallback to XML 1.0 Appendix F.1/UTF-8/ISO-8859-1 + $encodings = array_merge($encodings, $this->registry->call('Misc', 'xml_encoding', array($this->raw_data, &$this->registry))); + $encodings[] = 'UTF-8'; + $encodings[] = 'ISO-8859-1'; + + // There's no point in trying an encoding twice + $encodings = array_unique($encodings); + + // Loop through each possible encoding, till we return something, or run out of possibilities + foreach ($encodings as $encoding) + { + // Change the encoding to UTF-8 (as we always use UTF-8 internally) + if ($utf8_data = $this->registry->call('Misc', 'change_encoding', array($this->raw_data, $encoding, 'UTF-8'))) + { + // Create new parser + $parser = $this->registry->create('Parser'); + + // If it's parsed fine + if ($parser->parse($utf8_data, 'UTF-8')) + { + $this->data = $parser->get_data(); + if (!($this->get_type() & ~SIMPLEPIE_TYPE_NONE)) + { + $this->error = "A feed could not be found at $this->feed_url. This does not appear to be a valid RSS or Atom feed."; + $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__)); + return false; + } + + if (isset($headers)) + { + $this->data['headers'] = $headers; + } + $this->data['build'] = SIMPLEPIE_BUILD; + + // Cache the file if caching is enabled + if ($cache && !$cache->save($this)) + { + trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); + } + return true; + } + } + } + + if (isset($parser)) + { + // We have an error, just set SimplePie_Misc::error to it and quit + $this->error = sprintf('This XML document is invalid, likely due to invalid characters. XML error: %s at line %d, column %d', $parser->get_error_string(), $parser->get_current_line(), $parser->get_current_column()); + } + else + { + $this->error = 'The data could not be converted to UTF-8. You MUST have either the iconv or mbstring extension installed. Upgrading to PHP 5.x (which includes iconv) is highly recommended.'; + } + + $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__)); + + return false; + } + + /** + * Fetch the data via SimplePie_File + * + * If the data is already cached, attempt to fetch it from there instead + * @param SimplePie_Cache|false $cache Cache handler, or false to not load from the cache + * @return array|true Returns true if the data was loaded from the cache, or an array of HTTP headers and sniffed type + */ + protected function fetch_data(&$cache) + { + // If it's enabled, use the cache + if ($cache) + { + // Load the Cache + $this->data = $cache->load(); + if (!empty($this->data)) + { + // If the cache is for an outdated build of SimplePie + if (!isset($this->data['build']) || $this->data['build'] !== SIMPLEPIE_BUILD) + { + $cache->unlink(); + $this->data = array(); + } + // If we've hit a collision just rerun it with caching disabled + elseif (isset($this->data['url']) && $this->data['url'] !== $this->feed_url) + { + $cache = false; + $this->data = array(); + } + // If we've got a non feed_url stored (if the page isn't actually a feed, or is a redirect) use that URL. + elseif (isset($this->data['feed_url'])) + { + // If the autodiscovery cache is still valid use it. + if ($cache->mtime() + $this->autodiscovery_cache_duration > time()) + { + // Do not need to do feed autodiscovery yet. + if ($this->data['feed_url'] !== $this->data['url']) + { + $this->set_feed_url($this->data['feed_url']); + return $this->init(); + } + + $cache->unlink(); + $this->data = array(); + } + } + // Check if the cache has been updated + elseif ($cache->mtime() + $this->cache_duration < time()) + { + // If we have last-modified and/or etag set + if (isset($this->data['headers']['last-modified']) || isset($this->data['headers']['etag'])) + { + $headers = array( + 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', + ); + if (isset($this->data['headers']['last-modified'])) + { + $headers['if-modified-since'] = $this->data['headers']['last-modified']; + } + if (isset($this->data['headers']['etag'])) + { + $headers['if-none-match'] = $this->data['headers']['etag']; + } + + $file = $this->registry->create('File', array($this->feed_url, $this->timeout/10, 5, $headers, $this->useragent, $this->force_fsockopen)); + + if ($file->success) + { + if ($file->status_code === 304) + { + $cache->touch(); + return true; + } + } + else + { + unset($file); + } + } + } + // If the cache is still valid, just return true + else + { + $this->raw_data = false; + return true; + } + } + // If the cache is empty, delete it + else + { + $cache->unlink(); + $this->data = array(); + } + } + // If we don't already have the file (it'll only exist if we've opened it to check if the cache has been modified), open it. + if (!isset($file)) + { + if ($this->file instanceof SimplePie_File && $this->file->url === $this->feed_url) + { + $file =& $this->file; + } + else + { + $headers = array( + 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', + ); + $file = $this->registry->create('File', array($this->feed_url, $this->timeout, 5, $headers, $this->useragent, $this->force_fsockopen)); + } + } + // If the file connection has an error, set SimplePie::error to that and quit + if (!$file->success && !($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300))) + { + $this->error = $file->error; + return !empty($this->data); + } + + if (!$this->force_feed) + { + // Check if the supplied URL is a feed, if it isn't, look for it. + $locate = $this->registry->create('Locator', array(&$file, $this->timeout, $this->useragent, $this->max_checked_feeds)); + + if (!$locate->is_feed($file)) + { + // We need to unset this so that if SimplePie::set_file() has been called that object is untouched + unset($file); + try + { + if (!($file = $locate->find($this->autodiscovery, $this->all_discovered_feeds))) + { + $this->error = "A feed could not be found at $this->feed_url. A feed with an invalid mime type may fall victim to this error, or " . SIMPLEPIE_NAME . " was unable to auto-discover it.. Use force_feed() if you are certain this URL is a real feed."; + $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, __FILE__, __LINE__)); + return false; + } + } + catch (SimplePie_Exception $e) + { + // This is usually because DOMDocument doesn't exist + $this->error = $e->getMessage(); + $this->registry->call('Misc', 'error', array($this->error, E_USER_NOTICE, $e->getFile(), $e->getLine())); + return false; + } + if ($cache) + { + $this->data = array('url' => $this->feed_url, 'feed_url' => $file->url, 'build' => SIMPLEPIE_BUILD); + if (!$cache->save($this)) + { + trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); + } + $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, call_user_func($this->cache_name_function, $file->url), 'spc')); + } + $this->feed_url = $file->url; + } + $locate = null; + } + + $this->raw_data = $file->body; + + $headers = $file->headers; + $sniffer = $this->registry->create('Content_Type_Sniffer', array(&$file)); + $sniffed = $sniffer->get_type(); + + return array($headers, $sniffed); + } + + /** + * Get the error message for the occured error + * + * @return string|array Error message, or array of messages for multifeeds + */ + public function error() + { + return $this->error; + } + + /** + * Get the raw XML + * + * This is the same as the old `$feed->enable_xml_dump(true)`, but returns + * the data instead of printing it. + * + * @return string|boolean Raw XML data, false if the cache is used + */ + public function get_raw_data() + { + return $this->raw_data; + } + + /** + * Get the character encoding used for output + * + * @since Preview Release + * @return string + */ + public function get_encoding() + { + return $this->sanitize->output_encoding; + } + + /** + * Send the content-type header with correct encoding + * + * This method ensures that the SimplePie-enabled page is being served with + * the correct {@link http://www.iana.org/assignments/media-types/ mime-type} + * and character encoding HTTP headers (character encoding determined by the + * {@see set_output_encoding} config option). + * + * This won't work properly if any content or whitespace has already been + * sent to the browser, because it relies on PHP's + * {@link http://php.net/header header()} function, and these are the + * circumstances under which the function works. + * + * Because it's setting these settings for the entire page (as is the nature + * of HTTP headers), this should only be used once per page (again, at the + * top). + * + * @param string $mime MIME type to serve the page as + */ + public function handle_content_type($mime = 'text/html') + { + if (!headers_sent()) + { + $header = "Content-type: $mime;"; + if ($this->get_encoding()) + { + $header .= ' charset=' . $this->get_encoding(); + } + else + { + $header .= ' charset=UTF-8'; + } + header($header); + } + } + + /** + * Get the type of the feed + * + * This returns a SIMPLEPIE_TYPE_* constant, which can be tested against + * using {@link http://php.net/language.operators.bitwise bitwise operators} + * + * @since 0.8 (usage changed to using constants in 1.0) + * @see SIMPLEPIE_TYPE_NONE Unknown. + * @see SIMPLEPIE_TYPE_RSS_090 RSS 0.90. + * @see SIMPLEPIE_TYPE_RSS_091_NETSCAPE RSS 0.91 (Netscape). + * @see SIMPLEPIE_TYPE_RSS_091_USERLAND RSS 0.91 (Userland). + * @see SIMPLEPIE_TYPE_RSS_091 RSS 0.91. + * @see SIMPLEPIE_TYPE_RSS_092 RSS 0.92. + * @see SIMPLEPIE_TYPE_RSS_093 RSS 0.93. + * @see SIMPLEPIE_TYPE_RSS_094 RSS 0.94. + * @see SIMPLEPIE_TYPE_RSS_10 RSS 1.0. + * @see SIMPLEPIE_TYPE_RSS_20 RSS 2.0.x. + * @see SIMPLEPIE_TYPE_RSS_RDF RDF-based RSS. + * @see SIMPLEPIE_TYPE_RSS_SYNDICATION Non-RDF-based RSS (truly intended as syndication format). + * @see SIMPLEPIE_TYPE_RSS_ALL Any version of RSS. + * @see SIMPLEPIE_TYPE_ATOM_03 Atom 0.3. + * @see SIMPLEPIE_TYPE_ATOM_10 Atom 1.0. + * @see SIMPLEPIE_TYPE_ATOM_ALL Any version of Atom. + * @see SIMPLEPIE_TYPE_ALL Any known/supported feed type. + * @return int SIMPLEPIE_TYPE_* constant + */ + public function get_type() + { + if (!isset($this->data['type'])) + { + $this->data['type'] = SIMPLEPIE_TYPE_ALL; + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'])) + { + $this->data['type'] &= SIMPLEPIE_TYPE_ATOM_10; + } + elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'])) + { + $this->data['type'] &= SIMPLEPIE_TYPE_ATOM_03; + } + elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'])) + { + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['channel']) + || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['image']) + || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']) + || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_10]['textinput'])) + { + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_10; + } + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['channel']) + || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['image']) + || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']) + || isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_090]['textinput'])) + { + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_090; + } + } + elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'])) + { + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_ALL; + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version'])) + { + switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['attribs']['']['version'])) + { + case '0.91': + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_091; + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data'])) + { + switch (trim($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['skiphours']['hour'][0]['data'])) + { + case '0': + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_NETSCAPE; + break; + + case '24': + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_091_USERLAND; + break; + } + } + break; + + case '0.92': + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_092; + break; + + case '0.93': + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_093; + break; + + case '0.94': + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_094; + break; + + case '2.0': + $this->data['type'] &= SIMPLEPIE_TYPE_RSS_20; + break; + } + } + } + else + { + $this->data['type'] = SIMPLEPIE_TYPE_NONE; + } + } + return $this->data['type']; + } + + /** + * Get the URL for the feed + * + * May or may not be different from the URL passed to {@see set_feed_url()}, + * depending on whether auto-discovery was used. + * + * @since Preview Release (previously called `get_feed_url()` since SimplePie 0.8.) + * @todo If we have a perm redirect we should return the new URL + * @todo When we make the above change, let's support as well + * @todo Also, |atom:link|@rel=self + * @return string|null + */ + public function subscribe_url() + { + if ($this->feed_url !== null) + { + return $this->sanitize($this->feed_url, SIMPLEPIE_CONSTRUCT_IRI); + } + else + { + return null; + } + } + + /** + * Get data for an feed-level element + * + * This method allows you to get access to ANY element/attribute that is a + * sub-element of the opening feed tag. + * + * The return value is an indexed array of elements matching the given + * namespace and tag name. Each element has `attribs`, `data` and `child` + * subkeys. For `attribs` and `child`, these contain namespace subkeys. + * `attribs` then has one level of associative name => value data (where + * `value` is a string) after the namespace. `child` has tag-indexed keys + * after the namespace, each member of which is an indexed array matching + * this same format. + * + * For example: + * 
+	 * // This is probably a bad example because we already support
+	 * //  natively, but it shows you how to parse through
+	 * // the nodes.
+	 * $group = $item->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group');
+	 * $content = $group[0]['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'];
+	 * $file = $content[0]['attribs']['']['url'];
+	 * echo $file;
+	 *
+ * + * @since 1.0 + * @see http://simplepie.org/wiki/faq/supported_xml_namespaces + * @param string $namespace The URL of the XML namespace of the elements you're trying to access + * @param string $tag Tag name + * @return array + */ + public function get_feed_tags($namespace, $tag) + { + $type = $this->get_type(); + if ($type & SIMPLEPIE_TYPE_ATOM_10) + { + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag])) + { + return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['child'][$namespace][$tag]; + } + } + if ($type & SIMPLEPIE_TYPE_ATOM_03) + { + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag])) + { + return $this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['child'][$namespace][$tag]; + } + } + if ($type & SIMPLEPIE_TYPE_RSS_RDF) + { + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag])) + { + return $this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['child'][$namespace][$tag]; + } + } + if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION) + { + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag])) + { + return $this->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][$namespace][$tag]; + } + } + return null; + } + + /** + * Get data for an channel-level element + * + * This method allows you to get access to ANY element/attribute in the + * channel/header section of the feed. + * + * See {@see SimplePie::get_feed_tags()} for a description of the return value + * + * @since 1.0 + * @see http://simplepie.org/wiki/faq/supported_xml_namespaces + * @param string $namespace The URL of the XML namespace of the elements you're trying to access + * @param string $tag Tag name + * @return array + */ + public function get_channel_tags($namespace, $tag) + { + $type = $this->get_type(); + if ($type & SIMPLEPIE_TYPE_ATOM_ALL) + { + if ($return = $this->get_feed_tags($namespace, $tag)) + { + return $return; + } + } + if ($type & SIMPLEPIE_TYPE_RSS_10) + { + if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'channel')) + { + if (isset($channel[0]['child'][$namespace][$tag])) + { + return $channel[0]['child'][$namespace][$tag]; + } + } + } + if ($type & SIMPLEPIE_TYPE_RSS_090) + { + if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'channel')) + { + if (isset($channel[0]['child'][$namespace][$tag])) + { + return $channel[0]['child'][$namespace][$tag]; + } + } + } + if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION) + { + if ($channel = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'channel')) + { + if (isset($channel[0]['child'][$namespace][$tag])) + { + return $channel[0]['child'][$namespace][$tag]; + } + } + } + return null; + } + + /** + * Get data for an channel-level element + * + * This method allows you to get access to ANY element/attribute in the + * image/logo section of the feed. + * + * See {@see SimplePie::get_feed_tags()} for a description of the return value + * + * @since 1.0 + * @see http://simplepie.org/wiki/faq/supported_xml_namespaces + * @param string $namespace The URL of the XML namespace of the elements you're trying to access + * @param string $tag Tag name + * @return array + */ + public function get_image_tags($namespace, $tag) + { + $type = $this->get_type(); + if ($type & SIMPLEPIE_TYPE_RSS_10) + { + if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'image')) + { + if (isset($image[0]['child'][$namespace][$tag])) + { + return $image[0]['child'][$namespace][$tag]; + } + } + } + if ($type & SIMPLEPIE_TYPE_RSS_090) + { + if ($image = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'image')) + { + if (isset($image[0]['child'][$namespace][$tag])) + { + return $image[0]['child'][$namespace][$tag]; + } + } + } + if ($type & SIMPLEPIE_TYPE_RSS_SYNDICATION) + { + if ($image = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'image')) + { + if (isset($image[0]['child'][$namespace][$tag])) + { + return $image[0]['child'][$namespace][$tag]; + } + } + } + return null; + } + + /** + * Get the base URL value from the feed + * + * Uses `` if available, otherwise uses the first link in the + * feed, or failing that, the URL of the feed itself. + * + * @see get_link + * @see subscribe_url + * + * @param array $element + * @return string + */ + public function get_base($element = array()) + { + if (!($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION) && !empty($element['xml_base_explicit']) && isset($element['xml_base'])) + { + return $element['xml_base']; + } + elseif ($this->get_link() !== null) + { + return $this->get_link(); + } + else + { + return $this->subscribe_url(); + } + } + + /** + * Sanitize feed data + * + * @access private + * @see SimplePie_Sanitize::sanitize() + * @param string $data Data to sanitize + * @param int $type One of the SIMPLEPIE_CONSTRUCT_* constants + * @param string $base Base URL to resolve URLs against + * @return string Sanitized data + */ + public function sanitize($data, $type, $base = '') + { + return $this->sanitize->sanitize($data, $type, $base); + } + + /** + * Get the title of the feed + * + * Uses ``, `` or `<dc:title>` + * + * @since 1.0 (previously called `get_feed_title` since 0.8) + * @return string|null + */ + public function get_title() + { + if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + return null; + } + } + + /** + * Get a category for the feed + * + * @since Unknown + * @param int $key The category that you want to return. Remember that arrays begin with 0, not 1 + * @return SimplePie_Category|null + */ + public function get_category($key = 0) + { + $categories = $this->get_categories(); + if (isset($categories[$key])) + { + return $categories[$key]; + } + else + { + return null; + } + } + + /** + * Get all categories for the feed + * + * Uses `<atom:category>`, `<category>` or `<dc:subject>` + * + * @since Unknown + * @return array|null List of {@see SimplePie_Category} objects + */ + public function get_categories() + { + $categories = array(); + + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category) + { + $term = null; + $scheme = null; + $label = null; + if (isset($category['attribs']['']['term'])) + { + $term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['scheme'])) + { + $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['label'])) + { + $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category) + { + // This is really the label, but keep this as the term also for BC. + // Label will also work on retrieving because that falls back to term. + $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT); + if (isset($category['attribs']['']['domain'])) + { + $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $scheme = null; + } + $categories[] = $this->registry->create('Category', array($term, $scheme, null)); + } + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category) + { + $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category) + { + $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + + if (!empty($categories)) + { + return array_unique($categories); + } + else + { + return null; + } + } + + /** + * Get an author for the feed + * + * @since 1.1 + * @param int $key The author that you want to return. Remember that arrays begin with 0, not 1 + * @return SimplePie_Author|null + */ + public function get_author($key = 0) + { + $authors = $this->get_authors(); + if (isset($authors[$key])) + { + return $authors[$key]; + } + else + { + return null; + } + } + + /** + * Get all authors for the feed + * + * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>` + * + * @since 1.1 + * @return array|null List of {@see SimplePie_Author} objects + */ + public function get_authors() + { + $authors = array(); + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author) + { + $name = null; + $uri = null; + $email = null; + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])) + { + $name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])) + { + $uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0])); + } + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'])) + { + $email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $uri !== null) + { + $authors[] = $this->registry->create('Author', array($name, $uri, $email)); + } + } + if ($author = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author')) + { + $name = null; + $url = null; + $email = null; + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'])) + { + $name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'])) + { + $url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0])); + } + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'])) + { + $email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $url !== null) + { + $authors[] = $this->registry->create('Author', array($name, $url, $email)); + } + } + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + + if (!empty($authors)) + { + return array_unique($authors); + } + else + { + return null; + } + } + + /** + * Get a contributor for the feed + * + * @since 1.1 + * @param int $key The contrbutor that you want to return. Remember that arrays begin with 0, not 1 + * @return SimplePie_Author|null + */ + public function get_contributor($key = 0) + { + $contributors = $this->get_contributors(); + if (isset($contributors[$key])) + { + return $contributors[$key]; + } + else + { + return null; + } + } + + /** + * Get all contributors for the feed + * + * Uses `<atom:contributor>` + * + * @since 1.1 + * @return array|null List of {@see SimplePie_Author} objects + */ + public function get_contributors() + { + $contributors = array(); + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor) + { + $name = null; + $uri = null; + $email = null; + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])) + { + $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])) + { + $uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0])); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'])) + { + $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $uri !== null) + { + $contributors[] = $this->registry->create('Author', array($name, $uri, $email)); + } + } + foreach ((array) $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor) + { + $name = null; + $url = null; + $email = null; + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'])) + { + $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'])) + { + $url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0])); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'])) + { + $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $url !== null) + { + $contributors[] = $this->registry->create('Author', array($name, $url, $email)); + } + } + + if (!empty($contributors)) + { + return array_unique($contributors); + } + else + { + return null; + } + } + + /** + * Get a single link for the feed + * + * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8) + * @param int $key The link that you want to return. Remember that arrays begin with 0, not 1 + * @param string $rel The relationship of the link to return + * @return string|null Link URL + */ + public function get_link($key = 0, $rel = 'alternate') + { + $links = $this->get_links($rel); + if (isset($links[$key])) + { + return $links[$key]; + } + else + { + return null; + } + } + + /** + * Get the permalink for the item + * + * Returns the first link available with a relationship of "alternate". + * Identical to {@see get_link()} with key 0 + * + * @see get_link + * @since 1.0 (previously called `get_feed_link` since Preview Release, `get_feed_permalink()` since 0.8) + * @internal Added for parity between the parent-level and the item/entry-level. + * @return string|null Link URL + */ + public function get_permalink() + { + return $this->get_link(0); + } + + /** + * Get all links for the feed + * + * Uses `<atom:link>` or `<link>` + * + * @since Beta 2 + * @param string $rel The relationship of links to return + * @return array|null Links found for the feed (strings) + */ + public function get_links($rel = 'alternate') + { + if (!isset($this->data['links'])) + { + $this->data['links'] = array(); + if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link')) + { + foreach ($links as $link) + { + if (isset($link['attribs']['']['href'])) + { + $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate'; + $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link)); + } + } + } + if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link')) + { + foreach ($links as $link) + { + if (isset($link['attribs']['']['href'])) + { + $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate'; + $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link)); + + } + } + } + if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + if ($links = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + + $keys = array_keys($this->data['links']); + foreach ($keys as $key) + { + if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key))) + { + if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key])) + { + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]); + $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]; + } + else + { + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; + } + } + elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY) + { + $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; + } + $this->data['links'][$key] = array_unique($this->data['links'][$key]); + } + } + + if (isset($this->data['links'][$rel])) + { + return $this->data['links'][$rel]; + } + else + { + return null; + } + } + + public function get_all_discovered_feeds() + { + return $this->all_discovered_feeds; + } + + /** + * Get the content for the item + * + * Uses `<atom:subtitle>`, `<atom:tagline>`, `<description>`, + * `<dc:description>`, `<itunes:summary>` or `<itunes:subtitle>` + * + * @since 1.0 (previously called `get_feed_description()` since 0.8) + * @return string|null + */ + public function get_description() + { + if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); + } + else + { + return null; + } + } + + /** + * Get the copyright info for the feed + * + * Uses `<atom:rights>`, `<atom:copyright>` or `<dc:rights>` + * + * @since 1.0 (previously called `get_feed_copyright()` since 0.8) + * @return string|null + */ + public function get_copyright() + { + if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + return null; + } + } + + /** + * Get the language for the feed + * + * Uses `<language>`, `<dc:language>`, or @xml_lang + * + * @since 1.0 (previously called `get_feed_language()` since 0.8) + * @return string|null + */ + public function get_language() + { + if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'])) + { + return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'])) + { + return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (isset($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'])) + { + return $this->sanitize($this->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (isset($this->data['headers']['content-language'])) + { + return $this->sanitize($this->data['headers']['content-language'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + return null; + } + } + + /** + * Get the latitude coordinates for the item + * + * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications + * + * Uses `<geo:lat>` or `<georss:point>` + * + * @since 1.0 + * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo + * @link http://www.georss.org/ GeoRSS + * @return string|null + */ + public function get_latitude() + { + + if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat')) + { + return (float) $return[0]['data']; + } + elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) + { + return (float) $match[1]; + } + else + { + return null; + } + } + + /** + * Get the longitude coordinates for the feed + * + * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications + * + * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>` + * + * @since 1.0 + * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo + * @link http://www.georss.org/ GeoRSS + * @return string|null + */ + public function get_longitude() + { + if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long')) + { + return (float) $return[0]['data']; + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon')) + { + return (float) $return[0]['data']; + } + elseif (($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) + { + return (float) $match[2]; + } + else + { + return null; + } + } + + /** + * Get the feed logo's title + * + * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" title. + * + * Uses `<image><title>` or `<image><dc:title>` + * + * @return string|null + */ + public function get_image_title() + { + if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + return null; + } + } + + /** + * Get the feed logo's URL + * + * RSS 0.9.0, 2.0, Atom 1.0, and feeds with iTunes RSS tags are allowed to + * have a "feed logo" URL. This points directly to the image itself. + * + * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`, + * `<image><title>` or `<image><dc:title>` + * + * @return string|null + */ + public function get_image_url() + { + if ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image')) + { + return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + elseif ($return = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'url')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'url')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + else + { + return null; + } + } + + /** + * Get the feed logo's link + * + * RSS 0.9.0, 1.0 and 2.0 feeds are allowed to have a "feed logo" link. This + * points to a human-readable page that the image should link to. + * + * Uses `<itunes:image>`, `<atom:logo>`, `<atom:icon>`, + * `<image><title>` or `<image><dc:title>` + * + * @return string|null + */ + public function get_image_link() + { + if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + elseif ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + else + { + return null; + } + } + + /** + * Get the feed logo's link + * + * RSS 2.0 feeds are allowed to have a "feed logo" width. + * + * Uses `<image><width>` or defaults to 88.0 if no width is specified and + * the feed is an RSS 2.0 feed. + * + * @return int|float|null + */ + public function get_image_width() + { + if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'width')) + { + return round($return[0]['data']); + } + elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url')) + { + return 88.0; + } + else + { + return null; + } + } + + /** + * Get the feed logo's height + * + * RSS 2.0 feeds are allowed to have a "feed logo" height. + * + * Uses `<image><height>` or defaults to 31.0 if no height is specified and + * the feed is an RSS 2.0 feed. + * + * @return int|float|null + */ + public function get_image_height() + { + if ($return = $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'height')) + { + return round($return[0]['data']); + } + elseif ($this->get_type() & SIMPLEPIE_TYPE_RSS_SYNDICATION && $this->get_image_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'url')) + { + return 31.0; + } + else + { + return null; + } + } + + /** + * Get the number of items in the feed + * + * This is well-suited for {@link http://php.net/for for()} loops with + * {@see get_item()} + * + * @param int $max Maximum value to return. 0 for no limit + * @return int Number of items in the feed + */ + public function get_item_quantity($max = 0) + { + $max = (int) $max; + $qty = count($this->get_items()); + if ($max === 0) + { + return $qty; + } + else + { + return ($qty > $max) ? $max : $qty; + } + } + + /** + * Get a single item from the feed + * + * This is better suited for {@link http://php.net/for for()} loops, whereas + * {@see get_items()} is better suited for + * {@link http://php.net/foreach foreach()} loops. + * + * @see get_item_quantity() + * @since Beta 2 + * @param int $key The item that you want to return. Remember that arrays begin with 0, not 1 + * @return SimplePie_Item|null + */ + public function get_item($key = 0) + { + $items = $this->get_items(); + if (isset($items[$key])) + { + return $items[$key]; + } + else + { + return null; + } + } + + /** + * Get all items from the feed + * + * This is better suited for {@link http://php.net/for for()} loops, whereas + * {@see get_items()} is better suited for + * {@link http://php.net/foreach foreach()} loops. + * + * @see get_item_quantity + * @since Beta 2 + * @param int $start Index to start at + * @param int $end Number of items to return. 0 for all items after `$start` + * @return array|null List of {@see SimplePie_Item} objects + */ + public function get_items($start = 0, $end = 0) + { + if (!isset($this->data['items'])) + { + if (!empty($this->multifeed_objects)) + { + $this->data['items'] = SimplePie::merge_items($this->multifeed_objects, $start, $end, $this->item_limit); + } + else + { + $this->data['items'] = array(); + if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'entry')) + { + $keys = array_keys($items); + foreach ($keys as $key) + { + $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key])); + } + } + if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'entry')) + { + $keys = array_keys($items); + foreach ($keys as $key) + { + $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key])); + } + } + if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'item')) + { + $keys = array_keys($items); + foreach ($keys as $key) + { + $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key])); + } + } + if ($items = $this->get_feed_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'item')) + { + $keys = array_keys($items); + foreach ($keys as $key) + { + $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key])); + } + } + if ($items = $this->get_channel_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'item')) + { + $keys = array_keys($items); + foreach ($keys as $key) + { + $this->data['items'][] = $this->registry->create('Item', array($this, $items[$key])); + } + } + } + } + + if (!empty($this->data['items'])) + { + // If we want to order it by date, check if all items have a date, and then sort it + if ($this->order_by_date && empty($this->multifeed_objects)) + { + if (!isset($this->data['ordered_items'])) + { + $do_sort = true; + foreach ($this->data['items'] as $item) + { + if (!$item->get_date('U')) + { + $do_sort = false; + break; + } + } + $item = null; + $this->data['ordered_items'] = $this->data['items']; + if ($do_sort) + { + usort($this->data['ordered_items'], array(get_class($this), 'sort_items')); + } + } + $items = $this->data['ordered_items']; + } + else + { + $items = $this->data['items']; + } + + // Slice the data as desired + if ($end === 0) + { + return array_slice($items, $start); + } + else + { + return array_slice($items, $start, $end); + } + } + else + { + return array(); + } + } + + /** + * Set the favicon handler + * + * @deprecated Use your own favicon handling instead + */ + public function set_favicon_handler($page = false, $qs = 'i') + { + $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING; + trigger_error('Favicon handling has been removed, please use your own handling', $level); + return false; + } + + /** + * Get the favicon for the current feed + * + * @deprecated Use your own favicon handling instead + */ + public function get_favicon() + { + $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING; + trigger_error('Favicon handling has been removed, please use your own handling', $level); + + if (($url = $this->get_link()) !== null) + { + return 'http://g.etfv.co/' . urlencode($url); + } + + return false; + } + + /** + * Magic method handler + * + * @param string $method Method name + * @param array $args Arguments to the method + * @return mixed + */ + public function __call($method, $args) + { + if (strpos($method, 'subscribe_') === 0) + { + $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING; + trigger_error('subscribe_*() has been deprecated, implement the callback yourself', $level); + return ''; + } + if ($method === 'enable_xml_dump') + { + $level = defined('E_USER_DEPRECATED') ? E_USER_DEPRECATED : E_USER_WARNING; + trigger_error('enable_xml_dump() has been deprecated, use get_raw_data() instead', $level); + return false; + } + + $class = get_class($this); + $trace = debug_backtrace(); + $file = $trace[0]['file']; + $line = $trace[0]['line']; + trigger_error("Call to undefined method $class::$method() in $file on line $line", E_USER_ERROR); + } + + /** + * Sorting callback for items + * + * @access private + * @param SimplePie $a + * @param SimplePie $b + * @return boolean + */ + public static function sort_items($a, $b) + { + return $a->get_date('U') <= $b->get_date('U'); + } + + /** + * Merge items from several feeds into one + * + * If you're merging multiple feeds together, they need to all have dates + * for the items or else SimplePie will refuse to sort them. + * + * @link http://simplepie.org/wiki/tutorial/sort_multiple_feeds_by_time_and_date#if_feeds_require_separate_per-feed_settings + * @param array $urls List of SimplePie feed objects to merge + * @param int $start Starting item + * @param int $end Number of items to return + * @param int $limit Maximum number of items per feed + * @return array + */ + public static function merge_items($urls, $start = 0, $end = 0, $limit = 0) + { + if (is_array($urls) && sizeof($urls) > 0) + { + $items = array(); + foreach ($urls as $arg) + { + if ($arg instanceof SimplePie) + { + $items = array_merge($items, $arg->get_items(0, $limit)); + } + else + { + trigger_error('Arguments must be SimplePie objects', E_USER_WARNING); + } + } + + $do_sort = true; + foreach ($items as $item) + { + if (!$item->get_date('U')) + { + $do_sort = false; + break; + } + } + $item = null; + if ($do_sort) + { + usort($items, array(get_class($urls[0]), 'sort_items')); + } + + if ($end === 0) + { + return array_slice($items, $start); + } + else + { + return array_slice($items, $start, $end); + } + } + else + { + trigger_error('Cannot merge zero SimplePie objects', E_USER_WARNING); + return array(); + } + } +} + +/** + * Manages all author-related data + * + * Used by {@see SimplePie_Item::get_author()} and {@see SimplePie::get_authors()} + * + * This class can be overloaded with {@see SimplePie::set_author_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Author +{ + /** + * Author's name + * + * @var string + * @see get_name() + */ + var $name; + + /** + * Author's link + * + * @var string + * @see get_link() + */ + var $link; + + /** + * Author's email address + * + * @var string + * @see get_email() + */ + var $email; + + /** + * Constructor, used to input the data + * + * @param string $name + * @param string $link + * @param string $email + */ + public function __construct($name = null, $link = null, $email = null) + { + $this->name = $name; + $this->link = $link; + $this->email = $email; + } + + /** + * String-ified version + * + * @return string + */ + public function __toString() + { + // There is no $this->data here + return md5(serialize($this)); + } + + /** + * Author's name + * + * @return string|null + */ + public function get_name() + { + if ($this->name !== null) + { + return $this->name; + } + else + { + return null; + } + } + + /** + * Author's link + * + * @return string|null + */ + public function get_link() + { + if ($this->link !== null) + { + return $this->link; + } + else + { + return null; + } + } + + /** + * Author's email address + * + * @return string|null + */ + public function get_email() + { + if ($this->email !== null) + { + return $this->email; + } + else + { + return null; + } + } +} + +/** + * Base for cache objects + * + * Classes to be used with {@see SimplePie_Cache::register()} are expected + * to implement this interface. + * + * @package SimplePie + * @subpackage Caching + */ +interface SimplePie_Cache_Base +{ + /** + * Feed cache type + * + * @var string + */ + const TYPE_FEED = 'spc'; + + /** + * Image cache type + * + * @var string + */ + const TYPE_IMAGE = 'spi'; + + /** + * Create a new cache object + * + * @param string $location Location string (from SimplePie::$cache_location) + * @param string $name Unique ID for the cache + * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data + */ + public function __construct($location, $name, $type); + + /** + * Save data to the cache + * + * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property + * @return bool Successfulness + */ + public function save($data); + + /** + * Retrieve the data saved to the cache + * + * @return array Data for SimplePie::$data + */ + public function load(); + + /** + * Retrieve the last modified time for the cache + * + * @return int Timestamp + */ + public function mtime(); + + /** + * Set the last modified time to the current time + * + * @return bool Success status + */ + public function touch(); + + /** + * Remove the cache + * + * @return bool Success status + */ + public function unlink(); +} + +/** + * Base class for database-based caches + * + * @package SimplePie + * @subpackage Caching + */ +abstract class SimplePie_Cache_DB implements SimplePie_Cache_Base +{ + /** + * Helper for database conversion + * + * Converts a given {@see SimplePie} object into data to be stored + * + * @param SimplePie $data + * @return array First item is the serialized data for storage, second item is the unique ID for this item + */ + protected static function prepare_simplepie_object_for_cache($data) + { + $items = $data->get_items(); + $items_by_id = array(); + + if (!empty($items)) + { + foreach ($items as $item) + { + $items_by_id[$item->get_id()] = $item; + } + + if (count($items_by_id) !== count($items)) + { + $items_by_id = array(); + foreach ($items as $item) + { + $items_by_id[$item->get_id(true)] = $item; + } + } + + if (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0])) + { + $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]; + } + elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0])) + { + $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]; + } + elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0])) + { + $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]; + } + elseif (isset($data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0])) + { + $channel =& $data->data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]['child'][SIMPLEPIE_NAMESPACE_RSS_20]['channel'][0]; + } + else + { + $channel = null; + } + + if ($channel !== null) + { + if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'])) + { + unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry']); + } + if (isset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry'])) + { + unset($channel['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['entry']); + } + if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item'])) + { + unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_10]['item']); + } + if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item'])) + { + unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_090]['item']); + } + if (isset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item'])) + { + unset($channel['child'][SIMPLEPIE_NAMESPACE_RSS_20]['item']); + } + } + if (isset($data->data['items'])) + { + unset($data->data['items']); + } + if (isset($data->data['ordered_items'])) + { + unset($data->data['ordered_items']); + } + } + return array(serialize($data->data), $items_by_id); + } +} + +/** + * Caches data to the filesystem + * + * @package SimplePie + * @subpackage Caching + */ +class SimplePie_Cache_File implements SimplePie_Cache_Base +{ + /** + * Location string + * + * @see SimplePie::$cache_location + * @var string + */ + protected $location; + + /** + * Filename + * + * @var string + */ + protected $filename; + + /** + * File extension + * + * @var string + */ + protected $extension; + + /** + * File path + * + * @var string + */ + protected $name; + + /** + * Create a new cache object + * + * @param string $location Location string (from SimplePie::$cache_location) + * @param string $name Unique ID for the cache + * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data + */ + public function __construct($location, $name, $type) + { + $this->location = $location; + $this->filename = $name; + $this->extension = $type; + $this->name = "$this->location/$this->filename.$this->extension"; + } + + /** + * Save data to the cache + * + * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property + * @return bool Successfulness + */ + public function save($data) + { + if (file_exists($this->name) && is_writeable($this->name) || file_exists($this->location) && is_writeable($this->location)) + { + if ($data instanceof SimplePie) + { + $data = $data->data; + } + + $data = serialize($data); + return (bool) file_put_contents($this->name, $data); + } + return false; + } + + /** + * Retrieve the data saved to the cache + * + * @return array Data for SimplePie::$data + */ + public function load() + { + if (file_exists($this->name) && is_readable($this->name)) + { + return unserialize(file_get_contents($this->name)); + } + return false; + } + + /** + * Retrieve the last modified time for the cache + * + * @return int Timestamp + */ + public function mtime() + { + if (file_exists($this->name)) + { + return filemtime($this->name); + } + return false; + } + + /** + * Set the last modified time to the current time + * + * @return bool Success status + */ + public function touch() + { + if (file_exists($this->name)) + { + return touch($this->name); + } + return false; + } + + /** + * Remove the cache + * + * @return bool Success status + */ + public function unlink() + { + if (file_exists($this->name)) + { + return unlink($this->name); + } + return false; + } +} + +/** + * Caches data to memcache + * + * Registered for URLs with the "memcache" protocol + * + * For example, `memcache://localhost:11211/?timeout=3600&prefix=sp_` will + * connect to memcache on `localhost` on port 11211. All tables will be + * prefixed with `sp_` and data will expire after 3600 seconds + * + * @package SimplePie + * @subpackage Caching + * @uses Memcache + */ +class SimplePie_Cache_Memcache implements SimplePie_Cache_Base +{ + /** + * Memcache instance + * + * @var Memcache + */ + protected $cache; + + /** + * Options + * + * @var array + */ + protected $options; + + /** + * Cache name + * + * @var string + */ + protected $name; + + /** + * Create a new cache object + * + * @param string $location Location string (from SimplePie::$cache_location) + * @param string $name Unique ID for the cache + * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data + */ + public function __construct($location, $name, $type) + { + $this->options = array( + 'host' => '127.0.0.1', + 'port' => 11211, + 'extras' => array( + 'timeout' => 3600, // one hour + 'prefix' => 'simplepie_', + ), + ); + $parsed = SimplePie_Cache::parse_URL($location); + $this->options['host'] = empty($parsed['host']) ? $this->options['host'] : $parsed['host']; + $this->options['port'] = empty($parsed['port']) ? $this->options['port'] : $parsed['port']; + $this->options['extras'] = array_merge($this->options['extras'], $parsed['extras']); + $this->name = $this->options['extras']['prefix'] . md5("$name:$type"); + + $this->cache = new Memcache(); + $this->cache->addServer($this->options['host'], (int) $this->options['port']); + } + + /** + * Save data to the cache + * + * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property + * @return bool Successfulness + */ + public function save($data) + { + if ($data instanceof SimplePie) + { + $data = $data->data; + } + return $this->cache->set($this->name, serialize($data), MEMCACHE_COMPRESSED, (int) $this->options['extras']['timeout']); + } + + /** + * Retrieve the data saved to the cache + * + * @return array Data for SimplePie::$data + */ + public function load() + { + $data = $this->cache->get($this->name); + + if ($data !== false) + { + return unserialize($data); + } + return false; + } + + /** + * Retrieve the last modified time for the cache + * + * @return int Timestamp + */ + public function mtime() + { + $data = $this->cache->get($this->name); + + if ($data !== false) + { + // essentially ignore the mtime because Memcache expires on it's own + return time(); + } + + return false; + } + + /** + * Set the last modified time to the current time + * + * @return bool Success status + */ + public function touch() + { + $data = $this->cache->get($this->name); + + if ($data !== false) + { + return $this->cache->set($this->name, $data, MEMCACHE_COMPRESSED, (int) $this->duration); + } + + return false; + } + + /** + * Remove the cache + * + * @return bool Success status + */ + public function unlink() + { + return $this->cache->delete($this->name, 0); + } +} + +/** + * Caches data to a MySQL database + * + * Registered for URLs with the "mysql" protocol + * + * For example, `mysql://root:password@localhost:3306/mydb?prefix=sp_` will + * connect to the `mydb` database on `localhost` on port 3306, with the user + * `root` and the password `password`. All tables will be prefixed with `sp_` + * + * @package SimplePie + * @subpackage Caching + */ +class SimplePie_Cache_MySQL extends SimplePie_Cache_DB +{ + /** + * PDO instance + * + * @var PDO + */ + protected $mysql; + + /** + * Options + * + * @var array + */ + protected $options; + + /** + * Cache ID + * + * @var string + */ + protected $id; + + /** + * Create a new cache object + * + * @param string $location Location string (from SimplePie::$cache_location) + * @param string $name Unique ID for the cache + * @param string $type Either TYPE_FEED for SimplePie data, or TYPE_IMAGE for image data + */ + public function __construct($location, $name, $type) + { + $this->options = array( + 'user' => null, + 'pass' => null, + 'host' => '127.0.0.1', + 'port' => '3306', + 'path' => '', + 'extras' => array( + 'prefix' => '', + ), + ); + $this->options = array_merge_recursive($this->options, SimplePie_Cache::parse_URL($location)); + + // Path is prefixed with a "/" + $this->options['dbname'] = substr($this->options['path'], 1); + + try + { + $this->mysql = new PDO("mysql:dbname={$this->options['dbname']};host={$this->options['host']};port={$this->options['port']}", $this->options['user'], $this->options['pass'], array(PDO::MYSQL_ATTR_INIT_COMMAND => 'SET NAMES utf8')); + } + catch (PDOException $e) + { + $this->mysql = null; + return; + } + + $this->id = $name . $type; + + if (!$query = $this->mysql->query('SHOW TABLES')) + { + $this->mysql = null; + return; + } + + $db = array(); + while ($row = $query->fetchColumn()) + { + $db[] = $row; + } + + if (!in_array($this->options['extras']['prefix'] . 'cache_data', $db)) + { + $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'cache_data` (`id` TEXT CHARACTER SET utf8 NOT NULL, `items` SMALLINT NOT NULL DEFAULT 0, `data` BLOB NOT NULL, `mtime` INT UNSIGNED NOT NULL, UNIQUE (`id`(125)))'); + if ($query === false) + { + $this->mysql = null; + } + } + + if (!in_array($this->options['extras']['prefix'] . 'items', $db)) + { + $query = $this->mysql->exec('CREATE TABLE `' . $this->options['extras']['prefix'] . 'items` (`feed_id` TEXT CHARACTER SET utf8 NOT NULL, `id` TEXT CHARACTER SET utf8 NOT NULL, `data` TEXT CHARACTER SET utf8 NOT NULL, `posted` INT UNSIGNED NOT NULL, INDEX `feed_id` (`feed_id`(125)))'); + if ($query === false) + { + $this->mysql = null; + } + } + } + + /** + * Save data to the cache + * + * @param array|SimplePie $data Data to store in the cache. If passed a SimplePie object, only cache the $data property + * @return bool Successfulness + */ + public function save($data) + { + if ($this->mysql === null) + { + return false; + } + + if ($data instanceof SimplePie) + { + $data = clone $data; + + $prepared = self::prepare_simplepie_object_for_cache($data); + + $query = $this->mysql->prepare('SELECT COUNT(*) FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed'); + $query->bindValue(':feed', $this->id); + if ($query->execute()) + { + if ($query->fetchColumn() > 0) + { + $items = count($prepared[1]); + if ($items) + { + $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = :items, `data` = :data, `mtime` = :time WHERE `id` = :feed'; + $query = $this->mysql->prepare($sql); + $query->bindValue(':items', $items); + } + else + { + $sql = 'UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `data` = :data, `mtime` = :time WHERE `id` = :feed'; + $query = $this->mysql->prepare($sql); + } + + $query->bindValue(':data', $prepared[0]); + $query->bindValue(':time', time()); + $query->bindValue(':feed', $this->id); + if (!$query->execute()) + { + return false; + } + } + else + { + $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:feed, :count, :data, :time)'); + $query->bindValue(':feed', $this->id); + $query->bindValue(':count', count($prepared[1])); + $query->bindValue(':data', $prepared[0]); + $query->bindValue(':time', time()); + if (!$query->execute()) + { + return false; + } + } + + $ids = array_keys($prepared[1]); + if (!empty($ids)) + { + foreach ($ids as $id) + { + $database_ids[] = $this->mysql->quote($id); + } + + $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `id` = ' . implode(' OR `id` = ', $database_ids) . ' AND `feed_id` = :feed'); + $query->bindValue(':feed', $this->id); + + if ($query->execute()) + { + $existing_ids = array(); + while ($row = $query->fetchColumn()) + { + $existing_ids[] = $row; + } + + $new_ids = array_diff($ids, $existing_ids); + + foreach ($new_ids as $new_id) + { + if (!($date = $prepared[1][$new_id]->get_date('U'))) + { + $date = time(); + } + + $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'items` (`feed_id`, `id`, `data`, `posted`) VALUES(:feed, :id, :data, :date)'); + $query->bindValue(':feed', $this->id); + $query->bindValue(':id', $new_id); + $query->bindValue(':data', serialize($prepared[1][$new_id]->data)); + $query->bindValue(':date', $date); + if (!$query->execute()) + { + return false; + } + } + return true; + } + } + else + { + return true; + } + } + } + else + { + $query = $this->mysql->prepare('SELECT `id` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :feed'); + $query->bindValue(':feed', $this->id); + if ($query->execute()) + { + if ($query->rowCount() > 0) + { + $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `items` = 0, `data` = :data, `mtime` = :time WHERE `id` = :feed'); + $query->bindValue(':data', serialize($data)); + $query->bindValue(':time', time()); + $query->bindValue(':feed', $this->id); + if ($this->execute()) + { + return true; + } + } + else + { + $query = $this->mysql->prepare('INSERT INTO `' . $this->options['extras']['prefix'] . 'cache_data` (`id`, `items`, `data`, `mtime`) VALUES(:id, 0, :data, :time)'); + $query->bindValue(':id', $this->id); + $query->bindValue(':data', serialize($data)); + $query->bindValue(':time', time()); + if ($query->execute()) + { + return true; + } + } + } + } + return false; + } + + /** + * Retrieve the data saved to the cache + * + * @return array Data for SimplePie::$data + */ + public function load() + { + if ($this->mysql === null) + { + return false; + } + + $query = $this->mysql->prepare('SELECT `items`, `data` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id'); + $query->bindValue(':id', $this->id); + if ($query->execute() && ($row = $query->fetch())) + { + $data = unserialize($row[1]); + + if (isset($this->options['items'][0])) + { + $items = (int) $this->options['items'][0]; + } + else + { + $items = (int) $row[0]; + } + + if ($items !== 0) + { + if (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0])) + { + $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['feed'][0]; + } + elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0])) + { + $feed =& $data['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['feed'][0]; + } + elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0])) + { + $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RDF]['RDF'][0]; + } + elseif (isset($data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0])) + { + $feed =& $data['child'][SIMPLEPIE_NAMESPACE_RSS_20]['rss'][0]; + } + else + { + $feed = null; + } + + if ($feed !== null) + { + $sql = 'SELECT `data` FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :feed ORDER BY `posted` DESC'; + if ($items > 0) + { + $sql .= ' LIMIT ' . $items; + } + + $query = $this->mysql->prepare($sql); + $query->bindValue(':feed', $this->id); + if ($query->execute()) + { + while ($row = $query->fetchColumn()) + { + $feed['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['entry'][] = unserialize($row); + } + } + else + { + return false; + } + } + } + return $data; + } + return false; + } + + /** + * Retrieve the last modified time for the cache + * + * @return int Timestamp + */ + public function mtime() + { + if ($this->mysql === null) + { + return false; + } + + $query = $this->mysql->prepare('SELECT `mtime` FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id'); + $query->bindValue(':id', $this->id); + if ($query->execute() && ($time = $query->fetchColumn())) + { + return $time; + } + else + { + return false; + } + } + + /** + * Set the last modified time to the current time + * + * @return bool Success status + */ + public function touch() + { + if ($this->mysql === null) + { + return false; + } + + $query = $this->mysql->prepare('UPDATE `' . $this->options['extras']['prefix'] . 'cache_data` SET `mtime` = :time WHERE `id` = :id'); + $query->bindValue(':time', time()); + $query->bindValue(':id', $this->id); + if ($query->execute() && $query->rowCount() > 0) + { + return true; + } + else + { + return false; + } + } + + /** + * Remove the cache + * + * @return bool Success status + */ + public function unlink() + { + if ($this->mysql === null) + { + return false; + } + + $query = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'cache_data` WHERE `id` = :id'); + $query->bindValue(':id', $this->id); + $query2 = $this->mysql->prepare('DELETE FROM `' . $this->options['extras']['prefix'] . 'items` WHERE `feed_id` = :id'); + $query2->bindValue(':id', $this->id); + if ($query->execute() && $query2->execute()) + { + return true; + } + else + { + return false; + } + } +} + +/** + * Used to create cache objects + * + * This class can be overloaded with {@see SimplePie::set_cache_class()}, + * although the preferred way is to create your own handler + * via {@see register()} + * + * @package SimplePie + * @subpackage Caching + */ +class SimplePie_Cache +{ + /** + * Cache handler classes + * + * These receive 3 parameters to their constructor, as documented in + * {@see register()} + * @var array + */ + protected static $handlers = array( + 'mysql' => 'SimplePie_Cache_MySQL', + 'memcache' => 'SimplePie_Cache_Memcache', + ); + + /** + * Don't call the constructor. Please. + */ + private function __construct() { } + + /** + * Create a new SimplePie_Cache object + * + * @param string $location URL location (scheme is used to determine handler) + * @param string $filename Unique identifier for cache object + * @param string $extension 'spi' or 'spc' + * @return SimplePie_Cache_Base Type of object depends on scheme of `$location` + */ + public static function get_handler($location, $filename, $extension) + { + $type = explode(':', $location, 2); + $type = $type[0]; + if (!empty(self::$handlers[$type])) + { + $class = self::$handlers[$type]; + return new $class($location, $filename, $extension); + } + + return new SimplePie_Cache_File($location, $filename, $extension); + } + + /** + * Create a new SimplePie_Cache object + * + * @deprecated Use {@see get_handler} instead + */ + public function create($location, $filename, $extension) + { + trigger_error('Cache::create() has been replaced with Cache::get_handler(). Switch to the registry system to use this.', E_USER_DEPRECATED); + return self::get_handler($location, $filename, $extension); + } + + /** + * Register a handler + * + * @param string $type DSN type to register for + * @param string $class Name of handler class. Must implement SimplePie_Cache_Base + */ + public static function register($type, $class) + { + self::$handlers[$type] = $class; + } + + /** + * Parse a URL into an array + * + * @param string $url + * @return array + */ + public static function parse_URL($url) + { + $params = parse_url($url); + $params['extras'] = array(); + if (isset($params['query'])) + { + parse_str($params['query'], $params['extras']); + } + return $params; + } +} + +/** + * Handles `<media:text>` captions as defined in Media RSS. + * + * Used by {@see SimplePie_Enclosure::get_caption()} and {@see SimplePie_Enclosure::get_captions()} + * + * This class can be overloaded with {@see SimplePie::set_caption_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Caption +{ + /** + * Content type + * + * @var string + * @see get_type() + */ + var $type; + + /** + * Language + * + * @var string + * @see get_language() + */ + var $lang; + + /** + * Start time + * + * @var string + * @see get_starttime() + */ + var $startTime; + + /** + * End time + * + * @var string + * @see get_endtime() + */ + var $endTime; + + /** + * Caption text + * + * @var string + * @see get_text() + */ + var $text; + + /** + * Constructor, used to input the data + * + * For documentation on all the parameters, see the corresponding + * properties and their accessors + */ + public function __construct($type = null, $lang = null, $startTime = null, $endTime = null, $text = null) + { + $this->type = $type; + $this->lang = $lang; + $this->startTime = $startTime; + $this->endTime = $endTime; + $this->text = $text; + } + + /** + * String-ified version + * + * @return string + */ + public function __toString() + { + // There is no $this->data here + return md5(serialize($this)); + } + + /** + * Get the end time + * + * @return string|null Time in the format 'hh:mm:ss.SSS' + */ + public function get_endtime() + { + if ($this->endTime !== null) + { + return $this->endTime; + } + else + { + return null; + } + } + + /** + * Get the language + * + * @link http://tools.ietf.org/html/rfc3066 + * @return string|null Language code as per RFC 3066 + */ + public function get_language() + { + if ($this->lang !== null) + { + return $this->lang; + } + else + { + return null; + } + } + + /** + * Get the start time + * + * @return string|null Time in the format 'hh:mm:ss.SSS' + */ + public function get_starttime() + { + if ($this->startTime !== null) + { + return $this->startTime; + } + else + { + return null; + } + } + + /** + * Get the text of the caption + * + * @return string|null + */ + public function get_text() + { + if ($this->text !== null) + { + return $this->text; + } + else + { + return null; + } + } + + /** + * Get the content type (not MIME type) + * + * @return string|null Either 'text' or 'html' + */ + public function get_type() + { + if ($this->type !== null) + { + return $this->type; + } + else + { + return null; + } + } +} + +/** + * Manages all category-related data + * + * Used by {@see SimplePie_Item::get_category()} and {@see SimplePie_Item::get_categories()} + * + * This class can be overloaded with {@see SimplePie::set_category_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Category +{ + /** + * Category identifier + * + * @var string + * @see get_term + */ + var $term; + + /** + * Categorization scheme identifier + * + * @var string + * @see get_scheme() + */ + var $scheme; + + /** + * Human readable label + * + * @var string + * @see get_label() + */ + var $label; + + /** + * Constructor, used to input the data + * + * @param string $term + * @param string $scheme + * @param string $label + */ + public function __construct($term = null, $scheme = null, $label = null) + { + $this->term = $term; + $this->scheme = $scheme; + $this->label = $label; + } + + /** + * String-ified version + * + * @return string + */ + public function __toString() + { + // There is no $this->data here + return md5(serialize($this)); + } + + /** + * Get the category identifier + * + * @return string|null + */ + public function get_term() + { + if ($this->term !== null) + { + return $this->term; + } + else + { + return null; + } + } + + /** + * Get the categorization scheme identifier + * + * @return string|null + */ + public function get_scheme() + { + if ($this->scheme !== null) + { + return $this->scheme; + } + else + { + return null; + } + } + + /** + * Get the human readable label + * + * @return string|null + */ + public function get_label() + { + if ($this->label !== null) + { + return $this->label; + } + else + { + return $this->get_term(); + } + } +} + +/** + * Content-type sniffing + * + * Based on the rules in http://tools.ietf.org/html/draft-abarth-mime-sniff-06 + * + * This is used since we can't always trust Content-Type headers, and is based + * upon the HTML5 parsing rules. + * + * + * This class can be overloaded with {@see SimplePie::set_content_type_sniffer_class()} + * + * @package SimplePie + * @subpackage HTTP + */ +class SimplePie_Content_Type_Sniffer +{ + /** + * File object + * + * @var SimplePie_File + */ + var $file; + + /** + * Create an instance of the class with the input file + * + * @param SimplePie_Content_Type_Sniffer $file Input file + */ + public function __construct($file) + { + $this->file = $file; + } + + /** + * Get the Content-Type of the specified file + * + * @return string Actual Content-Type + */ + public function get_type() + { + if (isset($this->file->headers['content-type'])) + { + if (!isset($this->file->headers['content-encoding']) + && ($this->file->headers['content-type'] === 'text/plain' + || $this->file->headers['content-type'] === 'text/plain; charset=ISO-8859-1' + || $this->file->headers['content-type'] === 'text/plain; charset=iso-8859-1' + || $this->file->headers['content-type'] === 'text/plain; charset=UTF-8')) + { + return $this->text_or_binary(); + } + + if (($pos = strpos($this->file->headers['content-type'], ';')) !== false) + { + $official = substr($this->file->headers['content-type'], 0, $pos); + } + else + { + $official = $this->file->headers['content-type']; + } + $official = trim(strtolower($official)); + + if ($official === 'unknown/unknown' + || $official === 'application/unknown') + { + return $this->unknown(); + } + elseif (substr($official, -4) === '+xml' + || $official === 'text/xml' + || $official === 'application/xml') + { + return $official; + } + elseif (substr($official, 0, 6) === 'image/') + { + if ($return = $this->image()) + { + return $return; + } + else + { + return $official; + } + } + elseif ($official === 'text/html') + { + return $this->feed_or_html(); + } + else + { + return $official; + } + } + else + { + return $this->unknown(); + } + } + + /** + * Sniff text or binary + * + * @return string Actual Content-Type + */ + public function text_or_binary() + { + if (substr($this->file->body, 0, 2) === "\xFE\xFF" + || substr($this->file->body, 0, 2) === "\xFF\xFE" + || substr($this->file->body, 0, 4) === "\x00\x00\xFE\xFF" + || substr($this->file->body, 0, 3) === "\xEF\xBB\xBF") + { + return 'text/plain'; + } + elseif (preg_match('/[\x00-\x08\x0E-\x1A\x1C-\x1F]/', $this->file->body)) + { + return 'application/octect-stream'; + } + else + { + return 'text/plain'; + } + } + + /** + * Sniff unknown + * + * @return string Actual Content-Type + */ + public function unknown() + { + $ws = strspn($this->file->body, "\x09\x0A\x0B\x0C\x0D\x20"); + if (strtolower(substr($this->file->body, $ws, 14)) === '<!doctype html' + || strtolower(substr($this->file->body, $ws, 5)) === '<html' + || strtolower(substr($this->file->body, $ws, 7)) === '<script') + { + return 'text/html'; + } + elseif (substr($this->file->body, 0, 5) === '%PDF-') + { + return 'application/pdf'; + } + elseif (substr($this->file->body, 0, 11) === '%!PS-Adobe-') + { + return 'application/postscript'; + } + elseif (substr($this->file->body, 0, 6) === 'GIF87a' + || substr($this->file->body, 0, 6) === 'GIF89a') + { + return 'image/gif'; + } + elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A") + { + return 'image/png'; + } + elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF") + { + return 'image/jpeg'; + } + elseif (substr($this->file->body, 0, 2) === "\x42\x4D") + { + return 'image/bmp'; + } + elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00") + { + return 'image/vnd.microsoft.icon'; + } + else + { + return $this->text_or_binary(); + } + } + + /** + * Sniff images + * + * @return string Actual Content-Type + */ + public function image() + { + if (substr($this->file->body, 0, 6) === 'GIF87a' + || substr($this->file->body, 0, 6) === 'GIF89a') + { + return 'image/gif'; + } + elseif (substr($this->file->body, 0, 8) === "\x89\x50\x4E\x47\x0D\x0A\x1A\x0A") + { + return 'image/png'; + } + elseif (substr($this->file->body, 0, 3) === "\xFF\xD8\xFF") + { + return 'image/jpeg'; + } + elseif (substr($this->file->body, 0, 2) === "\x42\x4D") + { + return 'image/bmp'; + } + elseif (substr($this->file->body, 0, 4) === "\x00\x00\x01\x00") + { + return 'image/vnd.microsoft.icon'; + } + else + { + return false; + } + } + + /** + * Sniff HTML + * + * @return string Actual Content-Type + */ + public function feed_or_html() + { + $len = strlen($this->file->body); + $pos = strspn($this->file->body, "\x09\x0A\x0D\x20"); + + while ($pos < $len) + { + switch ($this->file->body[$pos]) + { + case "\x09": + case "\x0A": + case "\x0D": + case "\x20": + $pos += strspn($this->file->body, "\x09\x0A\x0D\x20", $pos); + continue 2; + + case '<': + $pos++; + break; + + default: + return 'text/html'; + } + + if (substr($this->file->body, $pos, 3) === '!--') + { + $pos += 3; + if ($pos < $len && ($pos = strpos($this->file->body, '-->', $pos)) !== false) + { + $pos += 3; + } + else + { + return 'text/html'; + } + } + elseif (substr($this->file->body, $pos, 1) === '!') + { + if ($pos < $len && ($pos = strpos($this->file->body, '>', $pos)) !== false) + { + $pos++; + } + else + { + return 'text/html'; + } + } + elseif (substr($this->file->body, $pos, 1) === '?') + { + if ($pos < $len && ($pos = strpos($this->file->body, '?>', $pos)) !== false) + { + $pos += 2; + } + else + { + return 'text/html'; + } + } + elseif (substr($this->file->body, $pos, 3) === 'rss' + || substr($this->file->body, $pos, 7) === 'rdf:RDF') + { + return 'application/rss+xml'; + } + elseif (substr($this->file->body, $pos, 4) === 'feed') + { + return 'application/atom+xml'; + } + else + { + return 'text/html'; + } + } + + return 'text/html'; + } +} + +/** + * Manages `<media:copyright>` copyright tags as defined in Media RSS + * + * Used by {@see SimplePie_Enclosure::get_copyright()} + * + * This class can be overloaded with {@see SimplePie::set_copyright_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Copyright +{ + /** + * Copyright URL + * + * @var string + * @see get_url() + */ + var $url; + + /** + * Attribution + * + * @var string + * @see get_attribution() + */ + var $label; + + /** + * Constructor, used to input the data + * + * For documentation on all the parameters, see the corresponding + * properties and their accessors + */ + public function __construct($url = null, $label = null) + { + $this->url = $url; + $this->label = $label; + } + + /** + * String-ified version + * + * @return string + */ + public function __toString() + { + // There is no $this->data here + return md5(serialize($this)); + } + + /** + * Get the copyright URL + * + * @return string|null URL to copyright information + */ + public function get_url() + { + if ($this->url !== null) + { + return $this->url; + } + else + { + return null; + } + } + + /** + * Get the attribution text + * + * @return string|null + */ + public function get_attribution() + { + if ($this->label !== null) + { + return $this->label; + } + else + { + return null; + } + } +} + +/** + * SimplePie class. + * + * Class for backward compatibility. + * + * @deprecated Use {@see SimplePie} directly + * @package SimplePie + * @subpackage API + */ +class SimplePie_Core extends SimplePie +{ + +} + +/** + * Handles `<media:credit>` as defined in Media RSS + * + * Used by {@see SimplePie_Enclosure::get_credit()} and {@see SimplePie_Enclosure::get_credits()} + * + * This class can be overloaded with {@see SimplePie::set_credit_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Credit +{ + /** + * Credited role + * + * @var string + * @see get_role() + */ + var $role; + + /** + * Organizational scheme + * + * @var string + * @see get_scheme() + */ + var $scheme; + + /** + * Credited name + * + * @var string + * @see get_name() + */ + var $name; + + /** + * Constructor, used to input the data + * + * For documentation on all the parameters, see the corresponding + * properties and their accessors + */ + public function __construct($role = null, $scheme = null, $name = null) + { + $this->role = $role; + $this->scheme = $scheme; + $this->name = $name; + } + + /** + * String-ified version + * + * @return string + */ + public function __toString() + { + // There is no $this->data here + return md5(serialize($this)); + } + + /** + * Get the role of the person receiving credit + * + * @return string|null + */ + public function get_role() + { + if ($this->role !== null) + { + return $this->role; + } + else + { + return null; + } + } + + /** + * Get the organizational scheme + * + * @return string|null + */ + public function get_scheme() + { + if ($this->scheme !== null) + { + return $this->scheme; + } + else + { + return null; + } + } + + /** + * Get the credited person/entity's name + * + * @return string|null + */ + public function get_name() + { + if ($this->name !== null) + { + return $this->name; + } + else + { + return null; + } + } +} + +/** + * Decode HTML Entities + * + * This implements HTML5 as of revision 967 (2007-06-28) + * + * @deprecated Use DOMDocument instead! + * @package SimplePie + */ +class SimplePie_Decode_HTML_Entities +{ + /** + * Data to be parsed + * + * @access private + * @var string + */ + var $data = ''; + + /** + * Currently consumed bytes + * + * @access private + * @var string + */ + var $consumed = ''; + + /** + * Position of the current byte being parsed + * + * @access private + * @var int + */ + var $position = 0; + + /** + * Create an instance of the class with the input data + * + * @access public + * @param string $data Input data + */ + public function __construct($data) + { + $this->data = $data; + } + + /** + * Parse the input data + * + * @access public + * @return string Output data + */ + public function parse() + { + while (($this->position = strpos($this->data, '&', $this->position)) !== false) + { + $this->consume(); + $this->entity(); + $this->consumed = ''; + } + return $this->data; + } + + /** + * Consume the next byte + * + * @access private + * @return mixed The next byte, or false, if there is no more data + */ + public function consume() + { + if (isset($this->data[$this->position])) + { + $this->consumed .= $this->data[$this->position]; + return $this->data[$this->position++]; + } + else + { + return false; + } + } + + /** + * Consume a range of characters + * + * @access private + * @param string $chars Characters to consume + * @return mixed A series of characters that match the range, or false + */ + public function consume_range($chars) + { + if ($len = strspn($this->data, $chars, $this->position)) + { + $data = substr($this->data, $this->position, $len); + $this->consumed .= $data; + $this->position += $len; + return $data; + } + else + { + return false; + } + } + + /** + * Unconsume one byte + * + * @access private + */ + public function unconsume() + { + $this->consumed = substr($this->consumed, 0, -1); + $this->position--; + } + + /** + * Decode an entity + * + * @access private + */ + public function entity() + { + switch ($this->consume()) + { + case "\x09": + case "\x0A": + case "\x0B": + case "\x0B": + case "\x0C": + case "\x20": + case "\x3C": + case "\x26": + case false: + break; + + case "\x23": + switch ($this->consume()) + { + case "\x78": + case "\x58": + $range = '0123456789ABCDEFabcdef'; + $hex = true; + break; + + default: + $range = '0123456789'; + $hex = false; + $this->unconsume(); + break; + } + + if ($codepoint = $this->consume_range($range)) + { + static $windows_1252_specials = array(0x0D => "\x0A", 0x80 => "\xE2\x82\xAC", 0x81 => "\xEF\xBF\xBD", 0x82 => "\xE2\x80\x9A", 0x83 => "\xC6\x92", 0x84 => "\xE2\x80\x9E", 0x85 => "\xE2\x80\xA6", 0x86 => "\xE2\x80\xA0", 0x87 => "\xE2\x80\xA1", 0x88 => "\xCB\x86", 0x89 => "\xE2\x80\xB0", 0x8A => "\xC5\xA0", 0x8B => "\xE2\x80\xB9", 0x8C => "\xC5\x92", 0x8D => "\xEF\xBF\xBD", 0x8E => "\xC5\xBD", 0x8F => "\xEF\xBF\xBD", 0x90 => "\xEF\xBF\xBD", 0x91 => "\xE2\x80\x98", 0x92 => "\xE2\x80\x99", 0x93 => "\xE2\x80\x9C", 0x94 => "\xE2\x80\x9D", 0x95 => "\xE2\x80\xA2", 0x96 => "\xE2\x80\x93", 0x97 => "\xE2\x80\x94", 0x98 => "\xCB\x9C", 0x99 => "\xE2\x84\xA2", 0x9A => "\xC5\xA1", 0x9B => "\xE2\x80\xBA", 0x9C => "\xC5\x93", 0x9D => "\xEF\xBF\xBD", 0x9E => "\xC5\xBE", 0x9F => "\xC5\xB8"); + + if ($hex) + { + $codepoint = hexdec($codepoint); + } + else + { + $codepoint = intval($codepoint); + } + + if (isset($windows_1252_specials[$codepoint])) + { + $replacement = $windows_1252_specials[$codepoint]; + } + else + { + $replacement = SimplePie_Misc::codepoint_to_utf8($codepoint); + } + + if (!in_array($this->consume(), array(';', false), true)) + { + $this->unconsume(); + } + + $consumed_length = strlen($this->consumed); + $this->data = substr_replace($this->data, $replacement, $this->position - $consumed_length, $consumed_length); + $this->position += strlen($replacement) - $consumed_length; + } + break; + + default: + static $entities = array( + 'Aacute' => "\xC3\x81", + 'aacute' => "\xC3\xA1", + 'Aacute;' => "\xC3\x81", + 'aacute;' => "\xC3\xA1", + 'Acirc' => "\xC3\x82", + 'acirc' => "\xC3\xA2", + 'Acirc;' => "\xC3\x82", + 'acirc;' => "\xC3\xA2", + 'acute' => "\xC2\xB4", + 'acute;' => "\xC2\xB4", + 'AElig' => "\xC3\x86", + 'aelig' => "\xC3\xA6", + 'AElig;' => "\xC3\x86", + 'aelig;' => "\xC3\xA6", + 'Agrave' => "\xC3\x80", + 'agrave' => "\xC3\xA0", + 'Agrave;' => "\xC3\x80", + 'agrave;' => "\xC3\xA0", + 'alefsym;' => "\xE2\x84\xB5", + 'Alpha;' => "\xCE\x91", + 'alpha;' => "\xCE\xB1", + 'AMP' => "\x26", + 'amp' => "\x26", + 'AMP;' => "\x26", + 'amp;' => "\x26", + 'and;' => "\xE2\x88\xA7", + 'ang;' => "\xE2\x88\xA0", + 'apos;' => "\x27", + 'Aring' => "\xC3\x85", + 'aring' => "\xC3\xA5", + 'Aring;' => "\xC3\x85", + 'aring;' => "\xC3\xA5", + 'asymp;' => "\xE2\x89\x88", + 'Atilde' => "\xC3\x83", + 'atilde' => "\xC3\xA3", + 'Atilde;' => "\xC3\x83", + 'atilde;' => "\xC3\xA3", + 'Auml' => "\xC3\x84", + 'auml' => "\xC3\xA4", + 'Auml;' => "\xC3\x84", + 'auml;' => "\xC3\xA4", + 'bdquo;' => "\xE2\x80\x9E", + 'Beta;' => "\xCE\x92", + 'beta;' => "\xCE\xB2", + 'brvbar' => "\xC2\xA6", + 'brvbar;' => "\xC2\xA6", + 'bull;' => "\xE2\x80\xA2", + 'cap;' => "\xE2\x88\xA9", + 'Ccedil' => "\xC3\x87", + 'ccedil' => "\xC3\xA7", + 'Ccedil;' => "\xC3\x87", + 'ccedil;' => "\xC3\xA7", + 'cedil' => "\xC2\xB8", + 'cedil;' => "\xC2\xB8", + 'cent' => "\xC2\xA2", + 'cent;' => "\xC2\xA2", + 'Chi;' => "\xCE\xA7", + 'chi;' => "\xCF\x87", + 'circ;' => "\xCB\x86", + 'clubs;' => "\xE2\x99\xA3", + 'cong;' => "\xE2\x89\x85", + 'COPY' => "\xC2\xA9", + 'copy' => "\xC2\xA9", + 'COPY;' => "\xC2\xA9", + 'copy;' => "\xC2\xA9", + 'crarr;' => "\xE2\x86\xB5", + 'cup;' => "\xE2\x88\xAA", + 'curren' => "\xC2\xA4", + 'curren;' => "\xC2\xA4", + 'Dagger;' => "\xE2\x80\xA1", + 'dagger;' => "\xE2\x80\xA0", + 'dArr;' => "\xE2\x87\x93", + 'darr;' => "\xE2\x86\x93", + 'deg' => "\xC2\xB0", + 'deg;' => "\xC2\xB0", + 'Delta;' => "\xCE\x94", + 'delta;' => "\xCE\xB4", + 'diams;' => "\xE2\x99\xA6", + 'divide' => "\xC3\xB7", + 'divide;' => "\xC3\xB7", + 'Eacute' => "\xC3\x89", + 'eacute' => "\xC3\xA9", + 'Eacute;' => "\xC3\x89", + 'eacute;' => "\xC3\xA9", + 'Ecirc' => "\xC3\x8A", + 'ecirc' => "\xC3\xAA", + 'Ecirc;' => "\xC3\x8A", + 'ecirc;' => "\xC3\xAA", + 'Egrave' => "\xC3\x88", + 'egrave' => "\xC3\xA8", + 'Egrave;' => "\xC3\x88", + 'egrave;' => "\xC3\xA8", + 'empty;' => "\xE2\x88\x85", + 'emsp;' => "\xE2\x80\x83", + 'ensp;' => "\xE2\x80\x82", + 'Epsilon;' => "\xCE\x95", + 'epsilon;' => "\xCE\xB5", + 'equiv;' => "\xE2\x89\xA1", + 'Eta;' => "\xCE\x97", + 'eta;' => "\xCE\xB7", + 'ETH' => "\xC3\x90", + 'eth' => "\xC3\xB0", + 'ETH;' => "\xC3\x90", + 'eth;' => "\xC3\xB0", + 'Euml' => "\xC3\x8B", + 'euml' => "\xC3\xAB", + 'Euml;' => "\xC3\x8B", + 'euml;' => "\xC3\xAB", + 'euro;' => "\xE2\x82\xAC", + 'exist;' => "\xE2\x88\x83", + 'fnof;' => "\xC6\x92", + 'forall;' => "\xE2\x88\x80", + 'frac12' => "\xC2\xBD", + 'frac12;' => "\xC2\xBD", + 'frac14' => "\xC2\xBC", + 'frac14;' => "\xC2\xBC", + 'frac34' => "\xC2\xBE", + 'frac34;' => "\xC2\xBE", + 'frasl;' => "\xE2\x81\x84", + 'Gamma;' => "\xCE\x93", + 'gamma;' => "\xCE\xB3", + 'ge;' => "\xE2\x89\xA5", + 'GT' => "\x3E", + 'gt' => "\x3E", + 'GT;' => "\x3E", + 'gt;' => "\x3E", + 'hArr;' => "\xE2\x87\x94", + 'harr;' => "\xE2\x86\x94", + 'hearts;' => "\xE2\x99\xA5", + 'hellip;' => "\xE2\x80\xA6", + 'Iacute' => "\xC3\x8D", + 'iacute' => "\xC3\xAD", + 'Iacute;' => "\xC3\x8D", + 'iacute;' => "\xC3\xAD", + 'Icirc' => "\xC3\x8E", + 'icirc' => "\xC3\xAE", + 'Icirc;' => "\xC3\x8E", + 'icirc;' => "\xC3\xAE", + 'iexcl' => "\xC2\xA1", + 'iexcl;' => "\xC2\xA1", + 'Igrave' => "\xC3\x8C", + 'igrave' => "\xC3\xAC", + 'Igrave;' => "\xC3\x8C", + 'igrave;' => "\xC3\xAC", + 'image;' => "\xE2\x84\x91", + 'infin;' => "\xE2\x88\x9E", + 'int;' => "\xE2\x88\xAB", + 'Iota;' => "\xCE\x99", + 'iota;' => "\xCE\xB9", + 'iquest' => "\xC2\xBF", + 'iquest;' => "\xC2\xBF", + 'isin;' => "\xE2\x88\x88", + 'Iuml' => "\xC3\x8F", + 'iuml' => "\xC3\xAF", + 'Iuml;' => "\xC3\x8F", + 'iuml;' => "\xC3\xAF", + 'Kappa;' => "\xCE\x9A", + 'kappa;' => "\xCE\xBA", + 'Lambda;' => "\xCE\x9B", + 'lambda;' => "\xCE\xBB", + 'lang;' => "\xE3\x80\x88", + 'laquo' => "\xC2\xAB", + 'laquo;' => "\xC2\xAB", + 'lArr;' => "\xE2\x87\x90", + 'larr;' => "\xE2\x86\x90", + 'lceil;' => "\xE2\x8C\x88", + 'ldquo;' => "\xE2\x80\x9C", + 'le;' => "\xE2\x89\xA4", + 'lfloor;' => "\xE2\x8C\x8A", + 'lowast;' => "\xE2\x88\x97", + 'loz;' => "\xE2\x97\x8A", + 'lrm;' => "\xE2\x80\x8E", + 'lsaquo;' => "\xE2\x80\xB9", + 'lsquo;' => "\xE2\x80\x98", + 'LT' => "\x3C", + 'lt' => "\x3C", + 'LT;' => "\x3C", + 'lt;' => "\x3C", + 'macr' => "\xC2\xAF", + 'macr;' => "\xC2\xAF", + 'mdash;' => "\xE2\x80\x94", + 'micro' => "\xC2\xB5", + 'micro;' => "\xC2\xB5", + 'middot' => "\xC2\xB7", + 'middot;' => "\xC2\xB7", + 'minus;' => "\xE2\x88\x92", + 'Mu;' => "\xCE\x9C", + 'mu;' => "\xCE\xBC", + 'nabla;' => "\xE2\x88\x87", + 'nbsp' => "\xC2\xA0", + 'nbsp;' => "\xC2\xA0", + 'ndash;' => "\xE2\x80\x93", + 'ne;' => "\xE2\x89\xA0", + 'ni;' => "\xE2\x88\x8B", + 'not' => "\xC2\xAC", + 'not;' => "\xC2\xAC", + 'notin;' => "\xE2\x88\x89", + 'nsub;' => "\xE2\x8A\x84", + 'Ntilde' => "\xC3\x91", + 'ntilde' => "\xC3\xB1", + 'Ntilde;' => "\xC3\x91", + 'ntilde;' => "\xC3\xB1", + 'Nu;' => "\xCE\x9D", + 'nu;' => "\xCE\xBD", + 'Oacute' => "\xC3\x93", + 'oacute' => "\xC3\xB3", + 'Oacute;' => "\xC3\x93", + 'oacute;' => "\xC3\xB3", + 'Ocirc' => "\xC3\x94", + 'ocirc' => "\xC3\xB4", + 'Ocirc;' => "\xC3\x94", + 'ocirc;' => "\xC3\xB4", + 'OElig;' => "\xC5\x92", + 'oelig;' => "\xC5\x93", + 'Ograve' => "\xC3\x92", + 'ograve' => "\xC3\xB2", + 'Ograve;' => "\xC3\x92", + 'ograve;' => "\xC3\xB2", + 'oline;' => "\xE2\x80\xBE", + 'Omega;' => "\xCE\xA9", + 'omega;' => "\xCF\x89", + 'Omicron;' => "\xCE\x9F", + 'omicron;' => "\xCE\xBF", + 'oplus;' => "\xE2\x8A\x95", + 'or;' => "\xE2\x88\xA8", + 'ordf' => "\xC2\xAA", + 'ordf;' => "\xC2\xAA", + 'ordm' => "\xC2\xBA", + 'ordm;' => "\xC2\xBA", + 'Oslash' => "\xC3\x98", + 'oslash' => "\xC3\xB8", + 'Oslash;' => "\xC3\x98", + 'oslash;' => "\xC3\xB8", + 'Otilde' => "\xC3\x95", + 'otilde' => "\xC3\xB5", + 'Otilde;' => "\xC3\x95", + 'otilde;' => "\xC3\xB5", + 'otimes;' => "\xE2\x8A\x97", + 'Ouml' => "\xC3\x96", + 'ouml' => "\xC3\xB6", + 'Ouml;' => "\xC3\x96", + 'ouml;' => "\xC3\xB6", + 'para' => "\xC2\xB6", + 'para;' => "\xC2\xB6", + 'part;' => "\xE2\x88\x82", + 'permil;' => "\xE2\x80\xB0", + 'perp;' => "\xE2\x8A\xA5", + 'Phi;' => "\xCE\xA6", + 'phi;' => "\xCF\x86", + 'Pi;' => "\xCE\xA0", + 'pi;' => "\xCF\x80", + 'piv;' => "\xCF\x96", + 'plusmn' => "\xC2\xB1", + 'plusmn;' => "\xC2\xB1", + 'pound' => "\xC2\xA3", + 'pound;' => "\xC2\xA3", + 'Prime;' => "\xE2\x80\xB3", + 'prime;' => "\xE2\x80\xB2", + 'prod;' => "\xE2\x88\x8F", + 'prop;' => "\xE2\x88\x9D", + 'Psi;' => "\xCE\xA8", + 'psi;' => "\xCF\x88", + 'QUOT' => "\x22", + 'quot' => "\x22", + 'QUOT;' => "\x22", + 'quot;' => "\x22", + 'radic;' => "\xE2\x88\x9A", + 'rang;' => "\xE3\x80\x89", + 'raquo' => "\xC2\xBB", + 'raquo;' => "\xC2\xBB", + 'rArr;' => "\xE2\x87\x92", + 'rarr;' => "\xE2\x86\x92", + 'rceil;' => "\xE2\x8C\x89", + 'rdquo;' => "\xE2\x80\x9D", + 'real;' => "\xE2\x84\x9C", + 'REG' => "\xC2\xAE", + 'reg' => "\xC2\xAE", + 'REG;' => "\xC2\xAE", + 'reg;' => "\xC2\xAE", + 'rfloor;' => "\xE2\x8C\x8B", + 'Rho;' => "\xCE\xA1", + 'rho;' => "\xCF\x81", + 'rlm;' => "\xE2\x80\x8F", + 'rsaquo;' => "\xE2\x80\xBA", + 'rsquo;' => "\xE2\x80\x99", + 'sbquo;' => "\xE2\x80\x9A", + 'Scaron;' => "\xC5\xA0", + 'scaron;' => "\xC5\xA1", + 'sdot;' => "\xE2\x8B\x85", + 'sect' => "\xC2\xA7", + 'sect;' => "\xC2\xA7", + 'shy' => "\xC2\xAD", + 'shy;' => "\xC2\xAD", + 'Sigma;' => "\xCE\xA3", + 'sigma;' => "\xCF\x83", + 'sigmaf;' => "\xCF\x82", + 'sim;' => "\xE2\x88\xBC", + 'spades;' => "\xE2\x99\xA0", + 'sub;' => "\xE2\x8A\x82", + 'sube;' => "\xE2\x8A\x86", + 'sum;' => "\xE2\x88\x91", + 'sup;' => "\xE2\x8A\x83", + 'sup1' => "\xC2\xB9", + 'sup1;' => "\xC2\xB9", + 'sup2' => "\xC2\xB2", + 'sup2;' => "\xC2\xB2", + 'sup3' => "\xC2\xB3", + 'sup3;' => "\xC2\xB3", + 'supe;' => "\xE2\x8A\x87", + 'szlig' => "\xC3\x9F", + 'szlig;' => "\xC3\x9F", + 'Tau;' => "\xCE\xA4", + 'tau;' => "\xCF\x84", + 'there4;' => "\xE2\x88\xB4", + 'Theta;' => "\xCE\x98", + 'theta;' => "\xCE\xB8", + 'thetasym;' => "\xCF\x91", + 'thinsp;' => "\xE2\x80\x89", + 'THORN' => "\xC3\x9E", + 'thorn' => "\xC3\xBE", + 'THORN;' => "\xC3\x9E", + 'thorn;' => "\xC3\xBE", + 'tilde;' => "\xCB\x9C", + 'times' => "\xC3\x97", + 'times;' => "\xC3\x97", + 'TRADE;' => "\xE2\x84\xA2", + 'trade;' => "\xE2\x84\xA2", + 'Uacute' => "\xC3\x9A", + 'uacute' => "\xC3\xBA", + 'Uacute;' => "\xC3\x9A", + 'uacute;' => "\xC3\xBA", + 'uArr;' => "\xE2\x87\x91", + 'uarr;' => "\xE2\x86\x91", + 'Ucirc' => "\xC3\x9B", + 'ucirc' => "\xC3\xBB", + 'Ucirc;' => "\xC3\x9B", + 'ucirc;' => "\xC3\xBB", + 'Ugrave' => "\xC3\x99", + 'ugrave' => "\xC3\xB9", + 'Ugrave;' => "\xC3\x99", + 'ugrave;' => "\xC3\xB9", + 'uml' => "\xC2\xA8", + 'uml;' => "\xC2\xA8", + 'upsih;' => "\xCF\x92", + 'Upsilon;' => "\xCE\xA5", + 'upsilon;' => "\xCF\x85", + 'Uuml' => "\xC3\x9C", + 'uuml' => "\xC3\xBC", + 'Uuml;' => "\xC3\x9C", + 'uuml;' => "\xC3\xBC", + 'weierp;' => "\xE2\x84\x98", + 'Xi;' => "\xCE\x9E", + 'xi;' => "\xCE\xBE", + 'Yacute' => "\xC3\x9D", + 'yacute' => "\xC3\xBD", + 'Yacute;' => "\xC3\x9D", + 'yacute;' => "\xC3\xBD", + 'yen' => "\xC2\xA5", + 'yen;' => "\xC2\xA5", + 'yuml' => "\xC3\xBF", + 'Yuml;' => "\xC5\xB8", + 'yuml;' => "\xC3\xBF", + 'Zeta;' => "\xCE\x96", + 'zeta;' => "\xCE\xB6", + 'zwj;' => "\xE2\x80\x8D", + 'zwnj;' => "\xE2\x80\x8C" + ); + + for ($i = 0, $match = null; $i < 9 && $this->consume() !== false; $i++) + { + $consumed = substr($this->consumed, 1); + if (isset($entities[$consumed])) + { + $match = $consumed; + } + } + + if ($match !== null) + { + $this->data = substr_replace($this->data, $entities[$match], $this->position - strlen($consumed) - 1, strlen($match) + 1); + $this->position += strlen($entities[$match]) - strlen($consumed) - 1; + } + break; + } + } +} + +/** + * Handles everything related to enclosures (including Media RSS and iTunes RSS) + * + * Used by {@see SimplePie_Item::get_enclosure()} and {@see SimplePie_Item::get_enclosures()} + * + * This class can be overloaded with {@see SimplePie::set_enclosure_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Enclosure +{ + /** + * @var string + * @see get_bitrate() + */ + var $bitrate; + + /** + * @var array + * @see get_captions() + */ + var $captions; + + /** + * @var array + * @see get_categories() + */ + var $categories; + + /** + * @var int + * @see get_channels() + */ + var $channels; + + /** + * @var SimplePie_Copyright + * @see get_copyright() + */ + var $copyright; + + /** + * @var array + * @see get_credits() + */ + var $credits; + + /** + * @var string + * @see get_description() + */ + var $description; + + /** + * @var int + * @see get_duration() + */ + var $duration; + + /** + * @var string + * @see get_expression() + */ + var $expression; + + /** + * @var string + * @see get_framerate() + */ + var $framerate; + + /** + * @var string + * @see get_handler() + */ + var $handler; + + /** + * @var array + * @see get_hashes() + */ + var $hashes; + + /** + * @var string + * @see get_height() + */ + var $height; + + /** + * @deprecated + * @var null + */ + var $javascript; + + /** + * @var array + * @see get_keywords() + */ + var $keywords; + + /** + * @var string + * @see get_language() + */ + var $lang; + + /** + * @var string + * @see get_length() + */ + var $length; + + /** + * @var string + * @see get_link() + */ + var $link; + + /** + * @var string + * @see get_medium() + */ + var $medium; + + /** + * @var string + * @see get_player() + */ + var $player; + + /** + * @var array + * @see get_ratings() + */ + var $ratings; + + /** + * @var array + * @see get_restrictions() + */ + var $restrictions; + + /** + * @var string + * @see get_sampling_rate() + */ + var $samplingrate; + + /** + * @var array + * @see get_thumbnails() + */ + var $thumbnails; + + /** + * @var string + * @see get_title() + */ + var $title; + + /** + * @var string + * @see get_type() + */ + var $type; + + /** + * @var string + * @see get_width() + */ + var $width; + + /** + * Constructor, used to input the data + * + * For documentation on all the parameters, see the corresponding + * properties and their accessors + * + * @uses idna_convert If available, this will convert an IDN + */ + public function __construct($link = null, $type = null, $length = null, $javascript = null, $bitrate = null, $captions = null, $categories = null, $channels = null, $copyright = null, $credits = null, $description = null, $duration = null, $expression = null, $framerate = null, $hashes = null, $height = null, $keywords = null, $lang = null, $medium = null, $player = null, $ratings = null, $restrictions = null, $samplingrate = null, $thumbnails = null, $title = null, $width = null) + { + $this->bitrate = $bitrate; + $this->captions = $captions; + $this->categories = $categories; + $this->channels = $channels; + $this->copyright = $copyright; + $this->credits = $credits; + $this->description = $description; + $this->duration = $duration; + $this->expression = $expression; + $this->framerate = $framerate; + $this->hashes = $hashes; + $this->height = $height; + $this->keywords = $keywords; + $this->lang = $lang; + $this->length = $length; + $this->link = $link; + $this->medium = $medium; + $this->player = $player; + $this->ratings = $ratings; + $this->restrictions = $restrictions; + $this->samplingrate = $samplingrate; + $this->thumbnails = $thumbnails; + $this->title = $title; + $this->type = $type; + $this->width = $width; + + if (class_exists('idna_convert')) + { + $idn = new idna_convert(); + $parsed = SimplePie_Misc::parse_url($link); + $this->link = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']); + } + $this->handler = $this->get_handler(); // Needs to load last + } + + /** + * String-ified version + * + * @return string + */ + public function __toString() + { + // There is no $this->data here + return md5(serialize($this)); + } + + /** + * Get the bitrate + * + * @return string|null + */ + public function get_bitrate() + { + if ($this->bitrate !== null) + { + return $this->bitrate; + } + else + { + return null; + } + } + + /** + * Get a single caption + * + * @param int $key + * @return SimplePie_Caption|null + */ + public function get_caption($key = 0) + { + $captions = $this->get_captions(); + if (isset($captions[$key])) + { + return $captions[$key]; + } + else + { + return null; + } + } + + /** + * Get all captions + * + * @return array|null Array of {@see SimplePie_Caption} objects + */ + public function get_captions() + { + if ($this->captions !== null) + { + return $this->captions; + } + else + { + return null; + } + } + + /** + * Get a single category + * + * @param int $key + * @return SimplePie_Category|null + */ + public function get_category($key = 0) + { + $categories = $this->get_categories(); + if (isset($categories[$key])) + { + return $categories[$key]; + } + else + { + return null; + } + } + + /** + * Get all categories + * + * @return array|null Array of {@see SimplePie_Category} objects + */ + public function get_categories() + { + if ($this->categories !== null) + { + return $this->categories; + } + else + { + return null; + } + } + + /** + * Get the number of audio channels + * + * @return int|null + */ + public function get_channels() + { + if ($this->channels !== null) + { + return $this->channels; + } + else + { + return null; + } + } + + /** + * Get the copyright information + * + * @return SimplePie_Copyright|null + */ + public function get_copyright() + { + if ($this->copyright !== null) + { + return $this->copyright; + } + else + { + return null; + } + } + + /** + * Get a single credit + * + * @param int $key + * @return SimplePie_Credit|null + */ + public function get_credit($key = 0) + { + $credits = $this->get_credits(); + if (isset($credits[$key])) + { + return $credits[$key]; + } + else + { + return null; + } + } + + /** + * Get all credits + * + * @return array|null Array of {@see SimplePie_Credit} objects + */ + public function get_credits() + { + if ($this->credits !== null) + { + return $this->credits; + } + else + { + return null; + } + } + + /** + * Get the description of the enclosure + * + * @return string|null + */ + public function get_description() + { + if ($this->description !== null) + { + return $this->description; + } + else + { + return null; + } + } + + /** + * Get the duration of the enclosure + * + * @param string $convert Convert seconds into hh:mm:ss + * @return string|int|null 'hh:mm:ss' string if `$convert` was specified, otherwise integer (or null if none found) + */ + public function get_duration($convert = false) + { + if ($this->duration !== null) + { + if ($convert) + { + $time = SimplePie_Misc::time_hms($this->duration); + return $time; + } + else + { + return $this->duration; + } + } + else + { + return null; + } + } + + /** + * Get the expression + * + * @return string Probably one of 'sample', 'full', 'nonstop', 'clip'. Defaults to 'full' + */ + public function get_expression() + { + if ($this->expression !== null) + { + return $this->expression; + } + else + { + return 'full'; + } + } + + /** + * Get the file extension + * + * @return string|null + */ + public function get_extension() + { + if ($this->link !== null) + { + $url = SimplePie_Misc::parse_url($this->link); + if ($url['path'] !== '') + { + return pathinfo($url['path'], PATHINFO_EXTENSION); + } + } + return null; + } + + /** + * Get the framerate (in frames-per-second) + * + * @return string|null + */ + public function get_framerate() + { + if ($this->framerate !== null) + { + return $this->framerate; + } + else + { + return null; + } + } + + /** + * Get the preferred handler + * + * @return string|null One of 'flash', 'fmedia', 'quicktime', 'wmedia', 'mp3' + */ + public function get_handler() + { + return $this->get_real_type(true); + } + + /** + * Get a single hash + * + * @link http://www.rssboard.org/media-rss#media-hash + * @param int $key + * @return string|null Hash as per `media:hash`, prefixed with "$algo:" + */ + public function get_hash($key = 0) + { + $hashes = $this->get_hashes(); + if (isset($hashes[$key])) + { + return $hashes[$key]; + } + else + { + return null; + } + } + + /** + * Get all credits + * + * @return array|null Array of strings, see {@see get_hash()} + */ + public function get_hashes() + { + if ($this->hashes !== null) + { + return $this->hashes; + } + else + { + return null; + } + } + + /** + * Get the height + * + * @return string|null + */ + public function get_height() + { + if ($this->height !== null) + { + return $this->height; + } + else + { + return null; + } + } + + /** + * Get the language + * + * @link http://tools.ietf.org/html/rfc3066 + * @return string|null Language code as per RFC 3066 + */ + public function get_language() + { + if ($this->lang !== null) + { + return $this->lang; + } + else + { + return null; + } + } + + /** + * Get a single keyword + * + * @param int $key + * @return string|null + */ + public function get_keyword($key = 0) + { + $keywords = $this->get_keywords(); + if (isset($keywords[$key])) + { + return $keywords[$key]; + } + else + { + return null; + } + } + + /** + * Get all keywords + * + * @return array|null Array of strings + */ + public function get_keywords() + { + if ($this->keywords !== null) + { + return $this->keywords; + } + else + { + return null; + } + } + + /** + * Get length + * + * @return float Length in bytes + */ + public function get_length() + { + if ($this->length !== null) + { + return $this->length; + } + else + { + return null; + } + } + + /** + * Get the URL + * + * @return string|null + */ + public function get_link() + { + if ($this->link !== null) + { + return urldecode($this->link); + } + else + { + return null; + } + } + + /** + * Get the medium + * + * @link http://www.rssboard.org/media-rss#media-content + * @return string|null Should be one of 'image', 'audio', 'video', 'document', 'executable' + */ + public function get_medium() + { + if ($this->medium !== null) + { + return $this->medium; + } + else + { + return null; + } + } + + /** + * Get the player URL + * + * Typically the same as {@see get_permalink()} + * @return string|null Player URL + */ + public function get_player() + { + if ($this->player !== null) + { + return $this->player; + } + else + { + return null; + } + } + + /** + * Get a single rating + * + * @param int $key + * @return SimplePie_Rating|null + */ + public function get_rating($key = 0) + { + $ratings = $this->get_ratings(); + if (isset($ratings[$key])) + { + return $ratings[$key]; + } + else + { + return null; + } + } + + /** + * Get all ratings + * + * @return array|null Array of {@see SimplePie_Rating} objects + */ + public function get_ratings() + { + if ($this->ratings !== null) + { + return $this->ratings; + } + else + { + return null; + } + } + + /** + * Get a single restriction + * + * @param int $key + * @return SimplePie_Restriction|null + */ + public function get_restriction($key = 0) + { + $restrictions = $this->get_restrictions(); + if (isset($restrictions[$key])) + { + return $restrictions[$key]; + } + else + { + return null; + } + } + + /** + * Get all restrictions + * + * @return array|null Array of {@see SimplePie_Restriction} objects + */ + public function get_restrictions() + { + if ($this->restrictions !== null) + { + return $this->restrictions; + } + else + { + return null; + } + } + + /** + * Get the sampling rate (in kHz) + * + * @return string|null + */ + public function get_sampling_rate() + { + if ($this->samplingrate !== null) + { + return $this->samplingrate; + } + else + { + return null; + } + } + + /** + * Get the file size (in MiB) + * + * @return float|null File size in mebibytes (1048 bytes) + */ + public function get_size() + { + $length = $this->get_length(); + if ($length !== null) + { + return round($length/1048576, 2); + } + else + { + return null; + } + } + + /** + * Get a single thumbnail + * + * @param int $key + * @return string|null Thumbnail URL + */ + public function get_thumbnail($key = 0) + { + $thumbnails = $this->get_thumbnails(); + if (isset($thumbnails[$key])) + { + return $thumbnails[$key]; + } + else + { + return null; + } + } + + /** + * Get all thumbnails + * + * @return array|null Array of thumbnail URLs + */ + public function get_thumbnails() + { + if ($this->thumbnails !== null) + { + return $this->thumbnails; + } + else + { + return null; + } + } + + /** + * Get the title + * + * @return string|null + */ + public function get_title() + { + if ($this->title !== null) + { + return $this->title; + } + else + { + return null; + } + } + + /** + * Get mimetype of the enclosure + * + * @see get_real_type() + * @return string|null MIME type + */ + public function get_type() + { + if ($this->type !== null) + { + return $this->type; + } + else + { + return null; + } + } + + /** + * Get the width + * + * @return string|null + */ + public function get_width() + { + if ($this->width !== null) + { + return $this->width; + } + else + { + return null; + } + } + + /** + * Embed the enclosure using `<embed>` + * + * @deprecated Use the second parameter to {@see embed} instead + * + * @param array|string $options See first paramter to {@see embed} + * @return string HTML string to output + */ + public function native_embed($options='') + { + return $this->embed($options, true); + } + + /** + * Embed the enclosure using Javascript + * + * `$options` is an array or comma-separated key:value string, with the + * following properties: + * + * - `alt` (string): Alternate content for when an end-user does not have + * the appropriate handler installed or when a file type is + * unsupported. Can be any text or HTML. Defaults to blank. + * - `altclass` (string): If a file type is unsupported, the end-user will + * see the alt text (above) linked directly to the content. That link + * will have this value as its class name. Defaults to blank. + * - `audio` (string): This is an image that should be used as a + * placeholder for audio files before they're loaded (QuickTime-only). + * Can be any relative or absolute URL. Defaults to blank. + * - `bgcolor` (string): The background color for the media, if not + * already transparent. Defaults to `#ffffff`. + * - `height` (integer): The height of the embedded media. Accepts any + * numeric pixel value (such as `360`) or `auto`. Defaults to `auto`, + * and it is recommended that you use this default. + * - `loop` (boolean): Do you want the media to loop when its done? + * Defaults to `false`. + * - `mediaplayer` (string): The location of the included + * `mediaplayer.swf` file. This allows for the playback of Flash Video + * (`.flv`) files, and is the default handler for non-Odeo MP3's. + * Defaults to blank. + * - `video` (string): This is an image that should be used as a + * placeholder for video files before they're loaded (QuickTime-only). + * Can be any relative or absolute URL. Defaults to blank. + * - `width` (integer): The width of the embedded media. Accepts any + * numeric pixel value (such as `480`) or `auto`. Defaults to `auto`, + * and it is recommended that you use this default. + * - `widescreen` (boolean): Is the enclosure widescreen or standard? + * This applies only to video enclosures, and will automatically resize + * the content appropriately. Defaults to `false`, implying 4:3 mode. + * + * Note: Non-widescreen (4:3) mode with `width` and `height` set to `auto` + * will default to 480x360 video resolution. Widescreen (16:9) mode with + * `width` and `height` set to `auto` will default to 480x270 video resolution. + * + * @todo If the dimensions for media:content are defined, use them when width/height are set to 'auto'. + * @param array|string $options Comma-separated key:value list, or array + * @param bool $native Use `<embed>` + * @return string HTML string to output + */ + public function embed($options = '', $native = false) + { + // Set up defaults + $audio = ''; + $video = ''; + $alt = ''; + $altclass = ''; + $loop = 'false'; + $width = 'auto'; + $height = 'auto'; + $bgcolor = '#ffffff'; + $mediaplayer = ''; + $widescreen = false; + $handler = $this->get_handler(); + $type = $this->get_real_type(); + + // Process options and reassign values as necessary + if (is_array($options)) + { + extract($options); + } + else + { + $options = explode(',', $options); + foreach($options as $option) + { + $opt = explode(':', $option, 2); + if (isset($opt[0], $opt[1])) + { + $opt[0] = trim($opt[0]); + $opt[1] = trim($opt[1]); + switch ($opt[0]) + { + case 'audio': + $audio = $opt[1]; + break; + + case 'video': + $video = $opt[1]; + break; + + case 'alt': + $alt = $opt[1]; + break; + + case 'altclass': + $altclass = $opt[1]; + break; + + case 'loop': + $loop = $opt[1]; + break; + + case 'width': + $width = $opt[1]; + break; + + case 'height': + $height = $opt[1]; + break; + + case 'bgcolor': + $bgcolor = $opt[1]; + break; + + case 'mediaplayer': + $mediaplayer = $opt[1]; + break; + + case 'widescreen': + $widescreen = $opt[1]; + break; + } + } + } + } + + $mime = explode('/', $type, 2); + $mime = $mime[0]; + + // Process values for 'auto' + if ($width === 'auto') + { + if ($mime === 'video') + { + if ($height === 'auto') + { + $width = 480; + } + elseif ($widescreen) + { + $width = round((intval($height)/9)*16); + } + else + { + $width = round((intval($height)/3)*4); + } + } + else + { + $width = '100%'; + } + } + + if ($height === 'auto') + { + if ($mime === 'audio') + { + $height = 0; + } + elseif ($mime === 'video') + { + if ($width === 'auto') + { + if ($widescreen) + { + $height = 270; + } + else + { + $height = 360; + } + } + elseif ($widescreen) + { + $height = round((intval($width)/16)*9); + } + else + { + $height = round((intval($width)/4)*3); + } + } + else + { + $height = 376; + } + } + elseif ($mime === 'audio') + { + $height = 0; + } + + // Set proper placeholder value + if ($mime === 'audio') + { + $placeholder = $audio; + } + elseif ($mime === 'video') + { + $placeholder = $video; + } + + $embed = ''; + + // Flash + if ($handler === 'flash') + { + if ($native) + { + $embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>"; + } + else + { + $embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>"; + } + } + + // Flash Media Player file types. + // Preferred handler for MP3 file types. + elseif ($handler === 'fmedia' || ($handler === 'mp3' && $mediaplayer !== '')) + { + $height += 20; + if ($native) + { + $embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>"; + } + else + { + $embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>"; + } + } + + // QuickTime 7 file types. Need to test with QuickTime 6. + // Only handle MP3's if the Flash Media Player is not present. + elseif ($handler === 'quicktime' || ($handler === 'mp3' && $mediaplayer === '')) + { + $height += 16; + if ($native) + { + if ($placeholder !== '') + { + $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>"; + } + else + { + $embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>"; + } + } + else + { + $embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>"; + } + } + + // Windows Media + elseif ($handler === 'wmedia') + { + $height += 45; + if ($native) + { + $embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>"; + } + else + { + $embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>"; + } + } + + // Everything else + else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>'; + + return $embed; + } + + /** + * Get the real media type + * + * Often, feeds lie to us, necessitating a bit of deeper inspection. This + * converts types to their canonical representations based on the file + * extension + * + * @see get_type() + * @param bool $find_handler Internal use only, use {@see get_handler()} instead + * @return string MIME type + */ + public function get_real_type($find_handler = false) + { + // Mime-types by handler. + $types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash + $types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player + $types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime + $types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media + $types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3 + + if ($this->get_type() !== null) + { + $type = strtolower($this->type); + } + else + { + $type = null; + } + + // If we encounter an unsupported mime-type, check the file extension and guess intelligently. + if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3))) + { + switch (strtolower($this->get_extension())) + { + // Audio mime-types + case 'aac': + case 'adts': + $type = 'audio/acc'; + break; + + case 'aif': + case 'aifc': + case 'aiff': + case 'cdda': + $type = 'audio/aiff'; + break; + + case 'bwf': + $type = 'audio/wav'; + break; + + case 'kar': + case 'mid': + case 'midi': + case 'smf': + $type = 'audio/midi'; + break; + + case 'm4a': + $type = 'audio/x-m4a'; + break; + + case 'mp3': + case 'swa': + $type = 'audio/mp3'; + break; + + case 'wav': + $type = 'audio/wav'; + break; + + case 'wax': + $type = 'audio/x-ms-wax'; + break; + + case 'wma': + $type = 'audio/x-ms-wma'; + break; + + // Video mime-types + case '3gp': + case '3gpp': + $type = 'video/3gpp'; + break; + + case '3g2': + case '3gp2': + $type = 'video/3gpp2'; + break; + + case 'asf': + $type = 'video/x-ms-asf'; + break; + + case 'flv': + $type = 'video/x-flv'; + break; + + case 'm1a': + case 'm1s': + case 'm1v': + case 'm15': + case 'm75': + case 'mp2': + case 'mpa': + case 'mpeg': + case 'mpg': + case 'mpm': + case 'mpv': + $type = 'video/mpeg'; + break; + + case 'm4v': + $type = 'video/x-m4v'; + break; + + case 'mov': + case 'qt': + $type = 'video/quicktime'; + break; + + case 'mp4': + case 'mpg4': + $type = 'video/mp4'; + break; + + case 'sdv': + $type = 'video/sd-video'; + break; + + case 'wm': + $type = 'video/x-ms-wm'; + break; + + case 'wmv': + $type = 'video/x-ms-wmv'; + break; + + case 'wvx': + $type = 'video/x-ms-wvx'; + break; + + // Flash mime-types + case 'spl': + $type = 'application/futuresplash'; + break; + + case 'swf': + $type = 'application/x-shockwave-flash'; + break; + } + } + + if ($find_handler) + { + if (in_array($type, $types_flash)) + { + return 'flash'; + } + elseif (in_array($type, $types_fmedia)) + { + return 'fmedia'; + } + elseif (in_array($type, $types_quicktime)) + { + return 'quicktime'; + } + elseif (in_array($type, $types_wmedia)) + { + return 'wmedia'; + } + elseif (in_array($type, $types_mp3)) + { + return 'mp3'; + } + else + { + return null; + } + } + else + { + return $type; + } + } +} + +/** + * General SimplePie exception class + * + * @package SimplePie + */ +class SimplePie_Exception extends Exception +{ +} + +/** + * Used for fetching remote files and reading local files + * + * Supports HTTP 1.0 via cURL or fsockopen, with spotty HTTP 1.1 support + * + * This class can be overloaded with {@see SimplePie::set_file_class()} + * + * @package SimplePie + * @subpackage HTTP + * @todo Move to properly supporting RFC2616 (HTTP/1.1) + */ +class SimplePie_File +{ + var $url; + var $useragent; + var $success = true; + var $headers = array(); + var $body; + var $status_code; + var $redirects = 0; + var $error; + var $method = SIMPLEPIE_FILE_SOURCE_NONE; + + public function __construct($url, $timeout = 10, $redirects = 5, $headers = null, $useragent = null, $force_fsockopen = false) + { + if (class_exists('idna_convert')) + { + $idn = new idna_convert(); + $parsed = SimplePie_Misc::parse_url($url); + $url = SimplePie_Misc::compress_parse_url($parsed['scheme'], $idn->encode($parsed['authority']), $parsed['path'], $parsed['query'], $parsed['fragment']); + } + $this->url = $url; + $this->useragent = $useragent; + if (preg_match('/^http(s)?:\/\//i', $url)) + { + if ($useragent === null) + { + $useragent = ini_get('user_agent'); + $this->useragent = $useragent; + } + if (!is_array($headers)) + { + $headers = array(); + } + if (!$force_fsockopen && function_exists('curl_exec')) + { + $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_CURL; + $fp = curl_init(); + $headers2 = array(); + foreach ($headers as $key => $value) + { + $headers2[] = "$key: $value"; + } + if (version_compare(SimplePie_Misc::get_curl_version(), '7.10.5', '>=')) + { + curl_setopt($fp, CURLOPT_ENCODING, ''); + } + curl_setopt($fp, CURLOPT_URL, $url); + curl_setopt($fp, CURLOPT_HEADER, 1); + curl_setopt($fp, CURLOPT_RETURNTRANSFER, 1); + curl_setopt($fp, CURLOPT_TIMEOUT, $timeout); + curl_setopt($fp, CURLOPT_CONNECTTIMEOUT, $timeout); + curl_setopt($fp, CURLOPT_REFERER, $url); + curl_setopt($fp, CURLOPT_USERAGENT, $useragent); + curl_setopt($fp, CURLOPT_HTTPHEADER, $headers2); + if (!ini_get('open_basedir') && !ini_get('safe_mode') && version_compare(SimplePie_Misc::get_curl_version(), '7.15.2', '>=')) + { + curl_setopt($fp, CURLOPT_FOLLOWLOCATION, 1); + curl_setopt($fp, CURLOPT_MAXREDIRS, $redirects); + } + + $this->headers = curl_exec($fp); + if (curl_errno($fp) === 23 || curl_errno($fp) === 61) + { + curl_setopt($fp, CURLOPT_ENCODING, 'none'); + $this->headers = curl_exec($fp); + } + if (curl_errno($fp)) + { + $this->error = 'cURL error ' . curl_errno($fp) . ': ' . curl_error($fp); + $this->success = false; + } + else + { + $info = curl_getinfo($fp); + curl_close($fp); + $this->headers = explode("\r\n\r\n", $this->headers, $info['redirect_count'] + 1); + $this->headers = array_pop($this->headers); + $parser = new SimplePie_HTTP_Parser($this->headers); + if ($parser->parse()) + { + $this->headers = $parser->headers; + $this->body = $parser->body; + $this->status_code = $parser->status_code; + if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects) + { + $this->redirects++; + $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url); + return $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen); + } + } + } + } + else + { + $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE | SIMPLEPIE_FILE_SOURCE_FSOCKOPEN; + $url_parts = parse_url($url); + $socket_host = $url_parts['host']; + if (isset($url_parts['scheme']) && strtolower($url_parts['scheme']) === 'https') + { + $socket_host = "ssl://$url_parts[host]"; + $url_parts['port'] = 443; + } + if (!isset($url_parts['port'])) + { + $url_parts['port'] = 80; + } + $fp = @fsockopen($socket_host, $url_parts['port'], $errno, $errstr, $timeout); + if (!$fp) + { + $this->error = 'fsockopen error: ' . $errstr; + $this->success = false; + } + else + { + stream_set_timeout($fp, $timeout); + if (isset($url_parts['path'])) + { + if (isset($url_parts['query'])) + { + $get = "$url_parts[path]?$url_parts[query]"; + } + else + { + $get = $url_parts['path']; + } + } + else + { + $get = '/'; + } + $out = "GET $get HTTP/1.1\r\n"; + $out .= "Host: $url_parts[host]\r\n"; + $out .= "User-Agent: $useragent\r\n"; + if (extension_loaded('zlib')) + { + $out .= "Accept-Encoding: x-gzip,gzip,deflate\r\n"; + } + + if (isset($url_parts['user']) && isset($url_parts['pass'])) + { + $out .= "Authorization: Basic " . base64_encode("$url_parts[user]:$url_parts[pass]") . "\r\n"; + } + foreach ($headers as $key => $value) + { + $out .= "$key: $value\r\n"; + } + $out .= "Connection: Close\r\n\r\n"; + fwrite($fp, $out); + + $info = stream_get_meta_data($fp); + + $this->headers = ''; + while (!$info['eof'] && !$info['timed_out']) + { + $this->headers .= fread($fp, 1160); + $info = stream_get_meta_data($fp); + } + if (!$info['timed_out']) + { + $parser = new SimplePie_HTTP_Parser($this->headers); + if ($parser->parse()) + { + $this->headers = $parser->headers; + $this->body = $parser->body; + $this->status_code = $parser->status_code; + if ((in_array($this->status_code, array(300, 301, 302, 303, 307)) || $this->status_code > 307 && $this->status_code < 400) && isset($this->headers['location']) && $this->redirects < $redirects) + { + $this->redirects++; + $location = SimplePie_Misc::absolutize_url($this->headers['location'], $url); + return $this->__construct($location, $timeout, $redirects, $headers, $useragent, $force_fsockopen); + } + if (isset($this->headers['content-encoding'])) + { + // Hey, we act dumb elsewhere, so let's do that here too + switch (strtolower(trim($this->headers['content-encoding'], "\x09\x0A\x0D\x20"))) + { + case 'gzip': + case 'x-gzip': + $decoder = new SimplePie_gzdecode($this->body); + if (!$decoder->parse()) + { + $this->error = 'Unable to decode HTTP "gzip" stream'; + $this->success = false; + } + else + { + $this->body = $decoder->data; + } + break; + + case 'deflate': + if (($decompressed = gzinflate($this->body)) !== false) + { + $this->body = $decompressed; + } + else if (($decompressed = gzuncompress($this->body)) !== false) + { + $this->body = $decompressed; + } + else if (function_exists('gzdecode') && ($decompressed = gzdecode($this->body)) !== false) + { + $this->body = $decompressed; + } + else + { + $this->error = 'Unable to decode HTTP "deflate" stream'; + $this->success = false; + } + break; + + default: + $this->error = 'Unknown content coding'; + $this->success = false; + } + } + } + } + else + { + $this->error = 'fsocket timed out'; + $this->success = false; + } + fclose($fp); + } + } + } + else + { + $this->method = SIMPLEPIE_FILE_SOURCE_LOCAL | SIMPLEPIE_FILE_SOURCE_FILE_GET_CONTENTS; + if (!$this->body = file_get_contents($url)) + { + $this->error = 'file_get_contents could not read the file'; + $this->success = false; + } + } + } +} + +/** + * Decode 'gzip' encoded HTTP data + * + * @package SimplePie + * @subpackage HTTP + * @link http://www.gzip.org/format.txt + */ +class SimplePie_gzdecode +{ + /** + * Compressed data + * + * @access private + * @var string + * @see gzdecode::$data + */ + var $compressed_data; + + /** + * Size of compressed data + * + * @access private + * @var int + */ + var $compressed_size; + + /** + * Minimum size of a valid gzip string + * + * @access private + * @var int + */ + var $min_compressed_size = 18; + + /** + * Current position of pointer + * + * @access private + * @var int + */ + var $position = 0; + + /** + * Flags (FLG) + * + * @access private + * @var int + */ + var $flags; + + /** + * Uncompressed data + * + * @access public + * @see gzdecode::$compressed_data + * @var string + */ + var $data; + + /** + * Modified time + * + * @access public + * @var int + */ + var $MTIME; + + /** + * Extra Flags + * + * @access public + * @var int + */ + var $XFL; + + /** + * Operating System + * + * @access public + * @var int + */ + var $OS; + + /** + * Subfield ID 1 + * + * @access public + * @see gzdecode::$extra_field + * @see gzdecode::$SI2 + * @var string + */ + var $SI1; + + /** + * Subfield ID 2 + * + * @access public + * @see gzdecode::$extra_field + * @see gzdecode::$SI1 + * @var string + */ + var $SI2; + + /** + * Extra field content + * + * @access public + * @see gzdecode::$SI1 + * @see gzdecode::$SI2 + * @var string + */ + var $extra_field; + + /** + * Original filename + * + * @access public + * @var string + */ + var $filename; + + /** + * Human readable comment + * + * @access public + * @var string + */ + var $comment; + + /** + * Don't allow anything to be set + * + * @param string $name + * @param mixed $value + */ + public function __set($name, $value) + { + trigger_error("Cannot write property $name", E_USER_ERROR); + } + + /** + * Set the compressed string and related properties + * + * @param string $data + */ + public function __construct($data) + { + $this->compressed_data = $data; + $this->compressed_size = strlen($data); + } + + /** + * Decode the GZIP stream + * + * @return bool Successfulness + */ + public function parse() + { + if ($this->compressed_size >= $this->min_compressed_size) + { + // Check ID1, ID2, and CM + if (substr($this->compressed_data, 0, 3) !== "\x1F\x8B\x08") + { + return false; + } + + // Get the FLG (FLaGs) + $this->flags = ord($this->compressed_data[3]); + + // FLG bits above (1 << 4) are reserved + if ($this->flags > 0x1F) + { + return false; + } + + // Advance the pointer after the above + $this->position += 4; + + // MTIME + $mtime = substr($this->compressed_data, $this->position, 4); + // Reverse the string if we're on a big-endian arch because l is the only signed long and is machine endianness + if (current(unpack('S', "\x00\x01")) === 1) + { + $mtime = strrev($mtime); + } + $this->MTIME = current(unpack('l', $mtime)); + $this->position += 4; + + // Get the XFL (eXtra FLags) + $this->XFL = ord($this->compressed_data[$this->position++]); + + // Get the OS (Operating System) + $this->OS = ord($this->compressed_data[$this->position++]); + + // Parse the FEXTRA + if ($this->flags & 4) + { + // Read subfield IDs + $this->SI1 = $this->compressed_data[$this->position++]; + $this->SI2 = $this->compressed_data[$this->position++]; + + // SI2 set to zero is reserved for future use + if ($this->SI2 === "\x00") + { + return false; + } + + // Get the length of the extra field + $len = current(unpack('v', substr($this->compressed_data, $this->position, 2))); + $this->position += 2; + + // Check the length of the string is still valid + $this->min_compressed_size += $len + 4; + if ($this->compressed_size >= $this->min_compressed_size) + { + // Set the extra field to the given data + $this->extra_field = substr($this->compressed_data, $this->position, $len); + $this->position += $len; + } + else + { + return false; + } + } + + // Parse the FNAME + if ($this->flags & 8) + { + // Get the length of the filename + $len = strcspn($this->compressed_data, "\x00", $this->position); + + // Check the length of the string is still valid + $this->min_compressed_size += $len + 1; + if ($this->compressed_size >= $this->min_compressed_size) + { + // Set the original filename to the given string + $this->filename = substr($this->compressed_data, $this->position, $len); + $this->position += $len + 1; + } + else + { + return false; + } + } + + // Parse the FCOMMENT + if ($this->flags & 16) + { + // Get the length of the comment + $len = strcspn($this->compressed_data, "\x00", $this->position); + + // Check the length of the string is still valid + $this->min_compressed_size += $len + 1; + if ($this->compressed_size >= $this->min_compressed_size) + { + // Set the original comment to the given string + $this->comment = substr($this->compressed_data, $this->position, $len); + $this->position += $len + 1; + } + else + { + return false; + } + } + + // Parse the FHCRC + if ($this->flags & 2) + { + // Check the length of the string is still valid + $this->min_compressed_size += $len + 2; + if ($this->compressed_size >= $this->min_compressed_size) + { + // Read the CRC + $crc = current(unpack('v', substr($this->compressed_data, $this->position, 2))); + + // Check the CRC matches + if ((crc32(substr($this->compressed_data, 0, $this->position)) & 0xFFFF) === $crc) + { + $this->position += 2; + } + else + { + return false; + } + } + else + { + return false; + } + } + + // Decompress the actual data + if (($this->data = gzinflate(substr($this->compressed_data, $this->position, -8))) === false) + { + return false; + } + else + { + $this->position = $this->compressed_size - 8; + } + + // Check CRC of data + $crc = current(unpack('V', substr($this->compressed_data, $this->position, 4))); + $this->position += 4; + /*if (extension_loaded('hash') && sprintf('%u', current(unpack('V', hash('crc32b', $this->data)))) !== sprintf('%u', $crc)) + { + return false; + }*/ + + // Check ISIZE of data + $isize = current(unpack('V', substr($this->compressed_data, $this->position, 4))); + $this->position += 4; + if (sprintf('%u', strlen($this->data) & 0xFFFFFFFF) !== sprintf('%u', $isize)) + { + return false; + } + + // Wow, against all odds, we've actually got a valid gzip string + return true; + } + else + { + return false; + } + } +} + +/** + * HTTP Response Parser + * + * @package SimplePie + * @subpackage HTTP + */ +class SimplePie_HTTP_Parser +{ + /** + * HTTP Version + * + * @var float + */ + public $http_version = 0.0; + + /** + * Status code + * + * @var int + */ + public $status_code = 0; + + /** + * Reason phrase + * + * @var string + */ + public $reason = ''; + + /** + * Key/value pairs of the headers + * + * @var array + */ + public $headers = array(); + + /** + * Body of the response + * + * @var string + */ + public $body = ''; + + /** + * Current state of the state machine + * + * @var string + */ + protected $state = 'http_version'; + + /** + * Input data + * + * @var string + */ + protected $data = ''; + + /** + * Input data length (to avoid calling strlen() everytime this is needed) + * + * @var int + */ + protected $data_length = 0; + + /** + * Current position of the pointer + * + * @var int + */ + protected $position = 0; + + /** + * Name of the hedaer currently being parsed + * + * @var string + */ + protected $name = ''; + + /** + * Value of the hedaer currently being parsed + * + * @var string + */ + protected $value = ''; + + /** + * Create an instance of the class with the input data + * + * @param string $data Input data + */ + public function __construct($data) + { + $this->data = $data; + $this->data_length = strlen($this->data); + } + + /** + * Parse the input data + * + * @return bool true on success, false on failure + */ + public function parse() + { + while ($this->state && $this->state !== 'emit' && $this->has_data()) + { + $state = $this->state; + $this->$state(); + } + $this->data = ''; + if ($this->state === 'emit' || $this->state === 'body') + { + return true; + } + else + { + $this->http_version = ''; + $this->status_code = ''; + $this->reason = ''; + $this->headers = array(); + $this->body = ''; + return false; + } + } + + /** + * Check whether there is data beyond the pointer + * + * @return bool true if there is further data, false if not + */ + protected function has_data() + { + return (bool) ($this->position < $this->data_length); + } + + /** + * See if the next character is LWS + * + * @return bool true if the next character is LWS, false if not + */ + protected function is_linear_whitespace() + { + return (bool) ($this->data[$this->position] === "\x09" + || $this->data[$this->position] === "\x20" + || ($this->data[$this->position] === "\x0A" + && isset($this->data[$this->position + 1]) + && ($this->data[$this->position + 1] === "\x09" || $this->data[$this->position + 1] === "\x20"))); + } + + /** + * Parse the HTTP version + */ + protected function http_version() + { + if (strpos($this->data, "\x0A") !== false && strtoupper(substr($this->data, 0, 5)) === 'HTTP/') + { + $len = strspn($this->data, '0123456789.', 5); + $this->http_version = substr($this->data, 5, $len); + $this->position += 5 + $len; + if (substr_count($this->http_version, '.') <= 1) + { + $this->http_version = (float) $this->http_version; + $this->position += strspn($this->data, "\x09\x20", $this->position); + $this->state = 'status'; + } + else + { + $this->state = false; + } + } + else + { + $this->state = false; + } + } + + /** + * Parse the status code + */ + protected function status() + { + if ($len = strspn($this->data, '0123456789', $this->position)) + { + $this->status_code = (int) substr($this->data, $this->position, $len); + $this->position += $len; + $this->state = 'reason'; + } + else + { + $this->state = false; + } + } + + /** + * Parse the reason phrase + */ + protected function reason() + { + $len = strcspn($this->data, "\x0A", $this->position); + $this->reason = trim(substr($this->data, $this->position, $len), "\x09\x0D\x20"); + $this->position += $len + 1; + $this->state = 'new_line'; + } + + /** + * Deal with a new line, shifting data around as needed + */ + protected function new_line() + { + $this->value = trim($this->value, "\x0D\x20"); + if ($this->name !== '' && $this->value !== '') + { + $this->name = strtolower($this->name); + // We should only use the last Content-Type header. c.f. issue #1 + if (isset($this->headers[$this->name]) && $this->name !== 'content-type') + { + $this->headers[$this->name] .= ', ' . $this->value; + } + else + { + $this->headers[$this->name] = $this->value; + } + } + $this->name = ''; + $this->value = ''; + if (substr($this->data[$this->position], 0, 2) === "\x0D\x0A") + { + $this->position += 2; + $this->state = 'body'; + } + elseif ($this->data[$this->position] === "\x0A") + { + $this->position++; + $this->state = 'body'; + } + else + { + $this->state = 'name'; + } + } + + /** + * Parse a header name + */ + protected function name() + { + $len = strcspn($this->data, "\x0A:", $this->position); + if (isset($this->data[$this->position + $len])) + { + if ($this->data[$this->position + $len] === "\x0A") + { + $this->position += $len; + $this->state = 'new_line'; + } + else + { + $this->name = substr($this->data, $this->position, $len); + $this->position += $len + 1; + $this->state = 'value'; + } + } + else + { + $this->state = false; + } + } + + /** + * Parse LWS, replacing consecutive LWS characters with a single space + */ + protected function linear_whitespace() + { + do + { + if (substr($this->data, $this->position, 2) === "\x0D\x0A") + { + $this->position += 2; + } + elseif ($this->data[$this->position] === "\x0A") + { + $this->position++; + } + $this->position += strspn($this->data, "\x09\x20", $this->position); + } while ($this->has_data() && $this->is_linear_whitespace()); + $this->value .= "\x20"; + } + + /** + * See what state to move to while within non-quoted header values + */ + protected function value() + { + if ($this->is_linear_whitespace()) + { + $this->linear_whitespace(); + } + else + { + switch ($this->data[$this->position]) + { + case '"': + // Workaround for ETags: we have to include the quotes as + // part of the tag. + if (strtolower($this->name) === 'etag') + { + $this->value .= '"'; + $this->position++; + $this->state = 'value_char'; + break; + } + $this->position++; + $this->state = 'quote'; + break; + + case "\x0A": + $this->position++; + $this->state = 'new_line'; + break; + + default: + $this->state = 'value_char'; + break; + } + } + } + + /** + * Parse a header value while outside quotes + */ + protected function value_char() + { + $len = strcspn($this->data, "\x09\x20\x0A\"", $this->position); + $this->value .= substr($this->data, $this->position, $len); + $this->position += $len; + $this->state = 'value'; + } + + /** + * See what state to move to while within quoted header values + */ + protected function quote() + { + if ($this->is_linear_whitespace()) + { + $this->linear_whitespace(); + } + else + { + switch ($this->data[$this->position]) + { + case '"': + $this->position++; + $this->state = 'value'; + break; + + case "\x0A": + $this->position++; + $this->state = 'new_line'; + break; + + case '\\': + $this->position++; + $this->state = 'quote_escaped'; + break; + + default: + $this->state = 'quote_char'; + break; + } + } + } + + /** + * Parse a header value while within quotes + */ + protected function quote_char() + { + $len = strcspn($this->data, "\x09\x20\x0A\"\\", $this->position); + $this->value .= substr($this->data, $this->position, $len); + $this->position += $len; + $this->state = 'value'; + } + + /** + * Parse an escaped character within quotes + */ + protected function quote_escaped() + { + $this->value .= $this->data[$this->position]; + $this->position++; + $this->state = 'quote'; + } + + /** + * Parse the body + */ + protected function body() + { + $this->body = substr($this->data, $this->position); + if (!empty($this->headers['transfer-encoding'])) + { + unset($this->headers['transfer-encoding']); + $this->state = 'chunked'; + } + else + { + $this->state = 'emit'; + } + } + + /** + * Parsed a "Transfer-Encoding: chunked" body + */ + protected function chunked() + { + if (!preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($this->body))) + { + $this->state = 'emit'; + return; + } + + $decoded = ''; + $encoded = $this->body; + + while (true) + { + $is_chunked = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $encoded, $matches ); + if (!$is_chunked) + { + // Looks like it's not chunked after all + $this->state = 'emit'; + return; + } + + $length = hexdec(trim($matches[1])); + if ($length === 0) + { + // Ignore trailer headers + $this->state = 'emit'; + $this->body = $decoded; + return; + } + + $chunk_length = strlen($matches[0]); + $decoded .= $part = substr($encoded, $chunk_length, $length); + $encoded = substr($encoded, $chunk_length + $length + 2); + + if (trim($encoded) === '0' || empty($encoded)) + { + $this->state = 'emit'; + $this->body = $decoded; + return; + } + } + } +} + +/** + * IRI parser/serialiser/normaliser + * + * @package SimplePie + * @subpackage HTTP + * @author Geoffrey Sneddon + * @author Steve Minutillo + * @author Ryan McCue + * @copyright 2007-2012 Geoffrey Sneddon, Steve Minutillo, Ryan McCue + * @license http://www.opensource.org/licenses/bsd-license.php + */ +class SimplePie_IRI +{ + /** + * Scheme + * + * @var string + */ + protected $scheme = null; + + /** + * User Information + * + * @var string + */ + protected $iuserinfo = null; + + /** + * ihost + * + * @var string + */ + protected $ihost = null; + + /** + * Port + * + * @var string + */ + protected $port = null; + + /** + * ipath + * + * @var string + */ + protected $ipath = ''; + + /** + * iquery + * + * @var string + */ + protected $iquery = null; + + /** + * ifragment + * + * @var string + */ + protected $ifragment = null; + + /** + * Normalization database + * + * Each key is the scheme, each value is an array with each key as the IRI + * part and value as the default value for that part. + */ + protected $normalization = array( + 'acap' => array( + 'port' => 674 + ), + 'dict' => array( + 'port' => 2628 + ), + 'file' => array( + 'ihost' => 'localhost' + ), + 'http' => array( + 'port' => 80, + 'ipath' => '/' + ), + 'https' => array( + 'port' => 443, + 'ipath' => '/' + ), + ); + + /** + * Return the entire IRI when you try and read the object as a string + * + * @return string + */ + public function __toString() + { + return $this->get_iri(); + } + + /** + * Overload __set() to provide access via properties + * + * @param string $name Property name + * @param mixed $value Property value + */ + public function __set($name, $value) + { + if (method_exists($this, 'set_' . $name)) + { + call_user_func(array($this, 'set_' . $name), $value); + } + elseif ( + $name === 'iauthority' + || $name === 'iuserinfo' + || $name === 'ihost' + || $name === 'ipath' + || $name === 'iquery' + || $name === 'ifragment' + ) + { + call_user_func(array($this, 'set_' . substr($name, 1)), $value); + } + } + + /** + * Overload __get() to provide access via properties + * + * @param string $name Property name + * @return mixed + */ + public function __get($name) + { + // isset() returns false for null, we don't want to do that + // Also why we use array_key_exists below instead of isset() + $props = get_object_vars($this); + + if ( + $name === 'iri' || + $name === 'uri' || + $name === 'iauthority' || + $name === 'authority' + ) + { + $return = $this->{"get_$name"}(); + } + elseif (array_key_exists($name, $props)) + { + $return = $this->$name; + } + // host -> ihost + elseif (($prop = 'i' . $name) && array_key_exists($prop, $props)) + { + $name = $prop; + $return = $this->$prop; + } + // ischeme -> scheme + elseif (($prop = substr($name, 1)) && array_key_exists($prop, $props)) + { + $name = $prop; + $return = $this->$prop; + } + else + { + trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE); + $return = null; + } + + if ($return === null && isset($this->normalization[$this->scheme][$name])) + { + return $this->normalization[$this->scheme][$name]; + } + else + { + return $return; + } + } + + /** + * Overload __isset() to provide access via properties + * + * @param string $name Property name + * @return bool + */ + public function __isset($name) + { + if (method_exists($this, 'get_' . $name) || isset($this->$name)) + { + return true; + } + else + { + return false; + } + } + + /** + * Overload __unset() to provide access via properties + * + * @param string $name Property name + */ + public function __unset($name) + { + if (method_exists($this, 'set_' . $name)) + { + call_user_func(array($this, 'set_' . $name), ''); + } + } + + /** + * Create a new IRI object, from a specified string + * + * @param string $iri + */ + public function __construct($iri = null) + { + $this->set_iri($iri); + } + + /** + * Create a new IRI object by resolving a relative IRI + * + * Returns false if $base is not absolute, otherwise an IRI. + * + * @param IRI|string $base (Absolute) Base IRI + * @param IRI|string $relative Relative IRI + * @return IRI|false + */ + public static function absolutize($base, $relative) + { + if (!($relative instanceof SimplePie_IRI)) + { + $relative = new SimplePie_IRI($relative); + } + if (!$relative->is_valid()) + { + return false; + } + elseif ($relative->scheme !== null) + { + return clone $relative; + } + else + { + if (!($base instanceof SimplePie_IRI)) + { + $base = new SimplePie_IRI($base); + } + if ($base->scheme !== null && $base->is_valid()) + { + if ($relative->get_iri() !== '') + { + if ($relative->iuserinfo !== null || $relative->ihost !== null || $relative->port !== null) + { + $target = clone $relative; + $target->scheme = $base->scheme; + } + else + { + $target = new SimplePie_IRI; + $target->scheme = $base->scheme; + $target->iuserinfo = $base->iuserinfo; + $target->ihost = $base->ihost; + $target->port = $base->port; + if ($relative->ipath !== '') + { + if ($relative->ipath[0] === '/') + { + $target->ipath = $relative->ipath; + } + elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '') + { + $target->ipath = '/' . $relative->ipath; + } + elseif (($last_segment = strrpos($base->ipath, '/')) !== false) + { + $target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath; + } + else + { + $target->ipath = $relative->ipath; + } + $target->ipath = $target->remove_dot_segments($target->ipath); + $target->iquery = $relative->iquery; + } + else + { + $target->ipath = $base->ipath; + if ($relative->iquery !== null) + { + $target->iquery = $relative->iquery; + } + elseif ($base->iquery !== null) + { + $target->iquery = $base->iquery; + } + } + $target->ifragment = $relative->ifragment; + } + } + else + { + $target = clone $base; + $target->ifragment = null; + } + $target->scheme_normalization(); + return $target; + } + else + { + return false; + } + } + } + + /** + * Parse an IRI into scheme/authority/path/query/fragment segments + * + * @param string $iri + * @return array + */ + protected function parse_iri($iri) + { + $iri = trim($iri, "\x20\x09\x0A\x0C\x0D"); + if (preg_match('/^((?P<scheme>[^:\/?#]+):)?(\/\/(?P<authority>[^\/?#]*))?(?P<path>[^?#]*)(\?(?P<query>[^#]*))?(#(?P<fragment>.*))?$/', $iri, $match)) + { + if ($match[1] === '') + { + $match['scheme'] = null; + } + if (!isset($match[3]) || $match[3] === '') + { + $match['authority'] = null; + } + if (!isset($match[5])) + { + $match['path'] = ''; + } + if (!isset($match[6]) || $match[6] === '') + { + $match['query'] = null; + } + if (!isset($match[8]) || $match[8] === '') + { + $match['fragment'] = null; + } + return $match; + } + else + { + // This can occur when a paragraph is accidentally parsed as a URI + return false; + } + } + + /** + * Remove dot segments from a path + * + * @param string $input + * @return string + */ + protected function remove_dot_segments($input) + { + $output = ''; + while (strpos($input, './') !== false || strpos($input, '/.') !== false || $input === '.' || $input === '..') + { + // A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise, + if (strpos($input, '../') === 0) + { + $input = substr($input, 3); + } + elseif (strpos($input, './') === 0) + { + $input = substr($input, 2); + } + // B: if the input buffer begins with a prefix of "/./" or "/.", where "." is a complete path segment, then replace that prefix with "/" in the input buffer; otherwise, + elseif (strpos($input, '/./') === 0) + { + $input = substr($input, 2); + } + elseif ($input === '/.') + { + $input = '/'; + } + // C: if the input buffer begins with a prefix of "/../" or "/..", where ".." is a complete path segment, then replace that prefix with "/" in the input buffer and remove the last segment and its preceding "/" (if any) from the output buffer; otherwise, + elseif (strpos($input, '/../') === 0) + { + $input = substr($input, 3); + $output = substr_replace($output, '', strrpos($output, '/')); + } + elseif ($input === '/..') + { + $input = '/'; + $output = substr_replace($output, '', strrpos($output, '/')); + } + // D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise, + elseif ($input === '.' || $input === '..') + { + $input = ''; + } + // E: move the first path segment in the input buffer to the end of the output buffer, including the initial "/" character (if any) and any subsequent characters up to, but not including, the next "/" character or the end of the input buffer + elseif (($pos = strpos($input, '/', 1)) !== false) + { + $output .= substr($input, 0, $pos); + $input = substr_replace($input, '', 0, $pos); + } + else + { + $output .= $input; + $input = ''; + } + } + return $output . $input; + } + + /** + * Replace invalid character with percent encoding + * + * @param string $string Input string + * @param string $extra_chars Valid characters not in iunreserved or + * iprivate (this is ASCII-only) + * @param bool $iprivate Allow iprivate + * @return string + */ + protected function replace_invalid_with_pct_encoding($string, $extra_chars, $iprivate = false) + { + // Normalize as many pct-encoded sections as possible + $string = preg_replace_callback('/(?:%[A-Fa-f0-9]{2})+/', array($this, 'remove_iunreserved_percent_encoded'), $string); + + // Replace invalid percent characters + $string = preg_replace('/%(?![A-Fa-f0-9]{2})/', '%25', $string); + + // Add unreserved and % to $extra_chars (the latter is safe because all + // pct-encoded sections are now valid). + $extra_chars .= 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-._~%'; + + // Now replace any bytes that aren't allowed with their pct-encoded versions + $position = 0; + $strlen = strlen($string); + while (($position += strspn($string, $extra_chars, $position)) < $strlen) + { + $value = ord($string[$position]); + + // Start position + $start = $position; + + // By default we are valid + $valid = true; + + // No one byte sequences are valid due to the while. + // Two byte sequence: + if (($value & 0xE0) === 0xC0) + { + $character = ($value & 0x1F) << 6; + $length = 2; + $remaining = 1; + } + // Three byte sequence: + elseif (($value & 0xF0) === 0xE0) + { + $character = ($value & 0x0F) << 12; + $length = 3; + $remaining = 2; + } + // Four byte sequence: + elseif (($value & 0xF8) === 0xF0) + { + $character = ($value & 0x07) << 18; + $length = 4; + $remaining = 3; + } + // Invalid byte: + else + { + $valid = false; + $length = 1; + $remaining = 0; + } + + if ($remaining) + { + if ($position + $length <= $strlen) + { + for ($position++; $remaining; $position++) + { + $value = ord($string[$position]); + + // Check that the byte is valid, then add it to the character: + if (($value & 0xC0) === 0x80) + { + $character |= ($value & 0x3F) << (--$remaining * 6); + } + // If it is invalid, count the sequence as invalid and reprocess the current byte: + else + { + $valid = false; + $position--; + break; + } + } + } + else + { + $position = $strlen - 1; + $valid = false; + } + } + + // Percent encode anything invalid or not in ucschar + if ( + // Invalid sequences + !$valid + // Non-shortest form sequences are invalid + || $length > 1 && $character <= 0x7F + || $length > 2 && $character <= 0x7FF + || $length > 3 && $character <= 0xFFFF + // Outside of range of ucschar codepoints + // Noncharacters + || ($character & 0xFFFE) === 0xFFFE + || $character >= 0xFDD0 && $character <= 0xFDEF + || ( + // Everything else not in ucschar + $character > 0xD7FF && $character < 0xF900 + || $character < 0xA0 + || $character > 0xEFFFD + ) + && ( + // Everything not in iprivate, if it applies + !$iprivate + || $character < 0xE000 + || $character > 0x10FFFD + ) + ) + { + // If we were a character, pretend we weren't, but rather an error. + if ($valid) + $position--; + + for ($j = $start; $j <= $position; $j++) + { + $string = substr_replace($string, sprintf('%%%02X', ord($string[$j])), $j, 1); + $j += 2; + $position += 2; + $strlen += 2; + } + } + } + + return $string; + } + + /** + * Callback function for preg_replace_callback. + * + * Removes sequences of percent encoded bytes that represent UTF-8 + * encoded characters in iunreserved + * + * @param array $match PCRE match + * @return string Replacement + */ + protected function remove_iunreserved_percent_encoded($match) + { + // As we just have valid percent encoded sequences we can just explode + // and ignore the first member of the returned array (an empty string). + $bytes = explode('%', $match[0]); + + // Initialize the new string (this is what will be returned) and that + // there are no bytes remaining in the current sequence (unsurprising + // at the first byte!). + $string = ''; + $remaining = 0; + + // Loop over each and every byte, and set $value to its value + for ($i = 1, $len = count($bytes); $i < $len; $i++) + { + $value = hexdec($bytes[$i]); + + // If we're the first byte of sequence: + if (!$remaining) + { + // Start position + $start = $i; + + // By default we are valid + $valid = true; + + // One byte sequence: + if ($value <= 0x7F) + { + $character = $value; + $length = 1; + } + // Two byte sequence: + elseif (($value & 0xE0) === 0xC0) + { + $character = ($value & 0x1F) << 6; + $length = 2; + $remaining = 1; + } + // Three byte sequence: + elseif (($value & 0xF0) === 0xE0) + { + $character = ($value & 0x0F) << 12; + $length = 3; + $remaining = 2; + } + // Four byte sequence: + elseif (($value & 0xF8) === 0xF0) + { + $character = ($value & 0x07) << 18; + $length = 4; + $remaining = 3; + } + // Invalid byte: + else + { + $valid = false; + $remaining = 0; + } + } + // Continuation byte: + else + { + // Check that the byte is valid, then add it to the character: + if (($value & 0xC0) === 0x80) + { + $remaining--; + $character |= ($value & 0x3F) << ($remaining * 6); + } + // If it is invalid, count the sequence as invalid and reprocess the current byte as the start of a sequence: + else + { + $valid = false; + $remaining = 0; + $i--; + } + } + + // If we've reached the end of the current byte sequence, append it to Unicode::$data + if (!$remaining) + { + // Percent encode anything invalid or not in iunreserved + if ( + // Invalid sequences + !$valid + // Non-shortest form sequences are invalid + || $length > 1 && $character <= 0x7F + || $length > 2 && $character <= 0x7FF + || $length > 3 && $character <= 0xFFFF + // Outside of range of iunreserved codepoints + || $character < 0x2D + || $character > 0xEFFFD + // Noncharacters + || ($character & 0xFFFE) === 0xFFFE + || $character >= 0xFDD0 && $character <= 0xFDEF + // Everything else not in iunreserved (this is all BMP) + || $character === 0x2F + || $character > 0x39 && $character < 0x41 + || $character > 0x5A && $character < 0x61 + || $character > 0x7A && $character < 0x7E + || $character > 0x7E && $character < 0xA0 + || $character > 0xD7FF && $character < 0xF900 + ) + { + for ($j = $start; $j <= $i; $j++) + { + $string .= '%' . strtoupper($bytes[$j]); + } + } + else + { + for ($j = $start; $j <= $i; $j++) + { + $string .= chr(hexdec($bytes[$j])); + } + } + } + } + + // If we have any bytes left over they are invalid (i.e., we are + // mid-way through a multi-byte sequence) + if ($remaining) + { + for ($j = $start; $j < $len; $j++) + { + $string .= '%' . strtoupper($bytes[$j]); + } + } + + return $string; + } + + protected function scheme_normalization() + { + if (isset($this->normalization[$this->scheme]['iuserinfo']) && $this->iuserinfo === $this->normalization[$this->scheme]['iuserinfo']) + { + $this->iuserinfo = null; + } + if (isset($this->normalization[$this->scheme]['ihost']) && $this->ihost === $this->normalization[$this->scheme]['ihost']) + { + $this->ihost = null; + } + if (isset($this->normalization[$this->scheme]['port']) && $this->port === $this->normalization[$this->scheme]['port']) + { + $this->port = null; + } + if (isset($this->normalization[$this->scheme]['ipath']) && $this->ipath === $this->normalization[$this->scheme]['ipath']) + { + $this->ipath = ''; + } + if (isset($this->normalization[$this->scheme]['iquery']) && $this->iquery === $this->normalization[$this->scheme]['iquery']) + { + $this->iquery = null; + } + if (isset($this->normalization[$this->scheme]['ifragment']) && $this->ifragment === $this->normalization[$this->scheme]['ifragment']) + { + $this->ifragment = null; + } + } + + /** + * Check if the object represents a valid IRI. This needs to be done on each + * call as some things change depending on another part of the IRI. + * + * @return bool + */ + public function is_valid() + { + $isauthority = $this->iuserinfo !== null || $this->ihost !== null || $this->port !== null; + if ($this->ipath !== '' && + ( + $isauthority && ( + $this->ipath[0] !== '/' || + substr($this->ipath, 0, 2) === '//' + ) || + ( + $this->scheme === null && + !$isauthority && + strpos($this->ipath, ':') !== false && + (strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/')) + ) + ) + ) + { + return false; + } + + return true; + } + + /** + * Set the entire IRI. Returns true on success, false on failure (if there + * are any invalid characters). + * + * @param string $iri + * @return bool + */ + public function set_iri($iri) + { + static $cache; + if (!$cache) + { + $cache = array(); + } + + if ($iri === null) + { + return true; + } + elseif (isset($cache[$iri])) + { + list($this->scheme, + $this->iuserinfo, + $this->ihost, + $this->port, + $this->ipath, + $this->iquery, + $this->ifragment, + $return) = $cache[$iri]; + return $return; + } + else + { + $parsed = $this->parse_iri((string) $iri); + if (!$parsed) + { + return false; + } + + $return = $this->set_scheme($parsed['scheme']) + && $this->set_authority($parsed['authority']) + && $this->set_path($parsed['path']) + && $this->set_query($parsed['query']) + && $this->set_fragment($parsed['fragment']); + + $cache[$iri] = array($this->scheme, + $this->iuserinfo, + $this->ihost, + $this->port, + $this->ipath, + $this->iquery, + $this->ifragment, + $return); + return $return; + } + } + + /** + * Set the scheme. Returns true on success, false on failure (if there are + * any invalid characters). + * + * @param string $scheme + * @return bool + */ + public function set_scheme($scheme) + { + if ($scheme === null) + { + $this->scheme = null; + } + elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme)) + { + $this->scheme = null; + return false; + } + else + { + $this->scheme = strtolower($scheme); + } + return true; + } + + /** + * Set the authority. Returns true on success, false on failure (if there are + * any invalid characters). + * + * @param string $authority + * @return bool + */ + public function set_authority($authority) + { + static $cache; + if (!$cache) + $cache = array(); + + if ($authority === null) + { + $this->iuserinfo = null; + $this->ihost = null; + $this->port = null; + return true; + } + elseif (isset($cache[$authority])) + { + list($this->iuserinfo, + $this->ihost, + $this->port, + $return) = $cache[$authority]; + + return $return; + } + else + { + $remaining = $authority; + if (($iuserinfo_end = strrpos($remaining, '@')) !== false) + { + $iuserinfo = substr($remaining, 0, $iuserinfo_end); + $remaining = substr($remaining, $iuserinfo_end + 1); + } + else + { + $iuserinfo = null; + } + if (($port_start = strpos($remaining, ':', strpos($remaining, ']'))) !== false) + { + if (($port = substr($remaining, $port_start + 1)) === false) + { + $port = null; + } + $remaining = substr($remaining, 0, $port_start); + } + else + { + $port = null; + } + + $return = $this->set_userinfo($iuserinfo) && + $this->set_host($remaining) && + $this->set_port($port); + + $cache[$authority] = array($this->iuserinfo, + $this->ihost, + $this->port, + $return); + + return $return; + } + } + + /** + * Set the iuserinfo. + * + * @param string $iuserinfo + * @return bool + */ + public function set_userinfo($iuserinfo) + { + if ($iuserinfo === null) + { + $this->iuserinfo = null; + } + else + { + $this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:'); + $this->scheme_normalization(); + } + + return true; + } + + /** + * Set the ihost. Returns true on success, false on failure (if there are + * any invalid characters). + * + * @param string $ihost + * @return bool + */ + public function set_host($ihost) + { + if ($ihost === null) + { + $this->ihost = null; + return true; + } + elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']') + { + if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1))) + { + $this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']'; + } + else + { + $this->ihost = null; + return false; + } + } + else + { + $ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;='); + + // Lowercase, but ignore pct-encoded sections (as they should + // remain uppercase). This must be done after the previous step + // as that can add unescaped characters. + $position = 0; + $strlen = strlen($ihost); + while (($position += strcspn($ihost, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ%', $position)) < $strlen) + { + if ($ihost[$position] === '%') + { + $position += 3; + } + else + { + $ihost[$position] = strtolower($ihost[$position]); + $position++; + } + } + + $this->ihost = $ihost; + } + + $this->scheme_normalization(); + + return true; + } + + /** + * Set the port. Returns true on success, false on failure (if there are + * any invalid characters). + * + * @param string $port + * @return bool + */ + public function set_port($port) + { + if ($port === null) + { + $this->port = null; + return true; + } + elseif (strspn($port, '0123456789') === strlen($port)) + { + $this->port = (int) $port; + $this->scheme_normalization(); + return true; + } + else + { + $this->port = null; + return false; + } + } + + /** + * Set the ipath. + * + * @param string $ipath + * @return bool + */ + public function set_path($ipath) + { + static $cache; + if (!$cache) + { + $cache = array(); + } + + $ipath = (string) $ipath; + + if (isset($cache[$ipath])) + { + $this->ipath = $cache[$ipath][(int) ($this->scheme !== null)]; + } + else + { + $valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/'); + $removed = $this->remove_dot_segments($valid); + + $cache[$ipath] = array($valid, $removed); + $this->ipath = ($this->scheme !== null) ? $removed : $valid; + } + + $this->scheme_normalization(); + return true; + } + + /** + * Set the iquery. + * + * @param string $iquery + * @return bool + */ + public function set_query($iquery) + { + if ($iquery === null) + { + $this->iquery = null; + } + else + { + $this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true); + $this->scheme_normalization(); + } + return true; + } + + /** + * Set the ifragment. + * + * @param string $ifragment + * @return bool + */ + public function set_fragment($ifragment) + { + if ($ifragment === null) + { + $this->ifragment = null; + } + else + { + $this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?'); + $this->scheme_normalization(); + } + return true; + } + + /** + * Convert an IRI to a URI (or parts thereof) + * + * @return string + */ + public function to_uri($string) + { + static $non_ascii; + if (!$non_ascii) + { + $non_ascii = implode('', range("\x80", "\xFF")); + } + + $position = 0; + $strlen = strlen($string); + while (($position += strcspn($string, $non_ascii, $position)) < $strlen) + { + $string = substr_replace($string, sprintf('%%%02X', ord($string[$position])), $position, 1); + $position += 3; + $strlen += 2; + } + + return $string; + } + + /** + * Get the complete IRI + * + * @return string + */ + public function get_iri() + { + if (!$this->is_valid()) + { + return false; + } + + $iri = ''; + if ($this->scheme !== null) + { + $iri .= $this->scheme . ':'; + } + if (($iauthority = $this->get_iauthority()) !== null) + { + $iri .= '//' . $iauthority; + } + if ($this->ipath !== '') + { + $iri .= $this->ipath; + } + elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '') + { + $iri .= $this->normalization[$this->scheme]['ipath']; + } + if ($this->iquery !== null) + { + $iri .= '?' . $this->iquery; + } + if ($this->ifragment !== null) + { + $iri .= '#' . $this->ifragment; + } + + return $iri; + } + + /** + * Get the complete URI + * + * @return string + */ + public function get_uri() + { + return $this->to_uri($this->get_iri()); + } + + /** + * Get the complete iauthority + * + * @return string + */ + protected function get_iauthority() + { + if ($this->iuserinfo !== null || $this->ihost !== null || $this->port !== null) + { + $iauthority = ''; + if ($this->iuserinfo !== null) + { + $iauthority .= $this->iuserinfo . '@'; + } + if ($this->ihost !== null) + { + $iauthority .= $this->ihost; + } + if ($this->port !== null) + { + $iauthority .= ':' . $this->port; + } + return $iauthority; + } + else + { + return null; + } + } + + /** + * Get the complete authority + * + * @return string + */ + protected function get_authority() + { + $iauthority = $this->get_iauthority(); + if (is_string($iauthority)) + return $this->to_uri($iauthority); + else + return $iauthority; + } +} + +/** + * Manages all item-related data + * + * Used by {@see SimplePie::get_item()} and {@see SimplePie::get_items()} + * + * This class can be overloaded with {@see SimplePie::set_item_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Item +{ + /** + * Parent feed + * + * @access private + * @var SimplePie + */ + var $feed; + + /** + * Raw data + * + * @access private + * @var array + */ + var $data = array(); + + /** + * Registry object + * + * @see set_registry + * @var SimplePie_Registry + */ + protected $registry; + + /** + * Create a new item object + * + * This is usually used by {@see SimplePie::get_items} and + * {@see SimplePie::get_item}. Avoid creating this manually. + * + * @param SimplePie $feed Parent feed + * @param array $data Raw data + */ + public function __construct($feed, $data) + { + $this->feed = $feed; + $this->data = $data; + } + + /** + * Set the registry handler + * + * This is usually used by {@see SimplePie_Registry::create} + * + * @since 1.3 + * @param SimplePie_Registry $registry + */ + public function set_registry(SimplePie_Registry $registry) + { + $this->registry = $registry; + } + + /** + * Get a string representation of the item + * + * @return string + */ + public function __toString() + { + return md5(serialize($this->data)); + } + + /** + * Remove items that link back to this before destroying this object + */ + public function __destruct() + { + if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode')) + { + unset($this->feed); + } + } + + /** + * Get data for an item-level element + * + * This method allows you to get access to ANY element/attribute that is a + * sub-element of the item/entry tag. + * + * See {@see SimplePie::get_feed_tags()} for a description of the return value + * + * @since 1.0 + * @see http://simplepie.org/wiki/faq/supported_xml_namespaces + * @param string $namespace The URL of the XML namespace of the elements you're trying to access + * @param string $tag Tag name + * @return array + */ + public function get_item_tags($namespace, $tag) + { + if (isset($this->data['child'][$namespace][$tag])) + { + return $this->data['child'][$namespace][$tag]; + } + else + { + return null; + } + } + + /** + * Get the base URL value from the parent feed + * + * Uses `<xml:base>` + * + * @param array $element + * @return string + */ + public function get_base($element = array()) + { + return $this->feed->get_base($element); + } + + /** + * Sanitize feed data + * + * @access private + * @see SimplePie::sanitize() + * @param string $data Data to sanitize + * @param int $type One of the SIMPLEPIE_CONSTRUCT_* constants + * @param string $base Base URL to resolve URLs against + * @return string Sanitized data + */ + public function sanitize($data, $type, $base = '') + { + return $this->feed->sanitize($data, $type, $base); + } + + /** + * Get the parent feed + * + * Note: this may not work as you think for multifeeds! + * + * @link http://simplepie.org/faq/typical_multifeed_gotchas#missing_data_from_feed + * @since 1.0 + * @return SimplePie + */ + public function get_feed() + { + return $this->feed; + } + + /** + * Get the unique identifier for the item + * + * This is usually used when writing code to check for new items in a feed. + * + * Uses `<atom:id>`, `<guid>`, `<dc:identifier>` or the `about` attribute + * for RDF. If none of these are supplied (or `$hash` is true), creates an + * MD5 hash based on the permalink and title. If either of those are not + * supplied, creates a hash based on the full feed data. + * + * @since Beta 2 + * @param boolean $hash Should we force using a hash instead of the supplied ID? + * @return string + */ + public function get_id($hash = false) + { + if (!$hash) + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'])) + { + return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (($return = $this->get_permalink()) !== null) + { + return $return; + } + elseif (($return = $this->get_title()) !== null) + { + return $return; + } + } + if ($this->get_permalink() !== null || $this->get_title() !== null) + { + return md5($this->get_permalink() . $this->get_title()); + } + else + { + return md5(serialize($this->data)); + } + } + + /** + * Get the title of the item + * + * Uses `<atom:title>`, `<title>` or `<dc:title>` + * + * @since Beta 2 (previously called `get_item_title` since 0.8) + * @return string|null + */ + public function get_title() + { + if (!isset($this->data['title'])) + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title')) + { + $this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title')) + { + $this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title')) + { + $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title')) + { + $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title')) + { + $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title')) + { + $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title')) + { + $this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $this->data['title'] = null; + } + } + return $this->data['title']; + } + + /** + * Get the content for the item + * + * Prefers summaries over full content , but will return full content if a + * summary does not exist. + * + * To prefer full content instead, use {@see get_content} + * + * Uses `<atom:summary>`, `<description>`, `<dc:description>` or + * `<itunes:subtitle>` + * + * @since 0.8 + * @param boolean $description_only Should we avoid falling back to the content? + * @return string|null + */ + public function get_description($description_only = false) + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML); + } + + elseif (!$description_only) + { + return $this->get_content(true); + } + else + { + return null; + } + } + + /** + * Get the content for the item + * + * Prefers full content over summaries, but will return a summary if full + * content does not exist. + * + * To prefer summaries instead, use {@see get_description} + * + * Uses `<atom:content>` or `<content:encoded>` (RSS 1.0 Content Module) + * + * @since 1.0 + * @param boolean $content_only Should we avoid falling back to the description? + * @return string|null + */ + public function get_content($content_only = false) + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); + } + elseif (!$content_only) + { + return $this->get_description(true); + } + else + { + return null; + } + } + + /** + * Get a category for the item + * + * @since Beta 3 (previously called `get_categories()` since Beta 2) + * @param int $key The category that you want to return. Remember that arrays begin with 0, not 1 + * @return SimplePie_Category|null + */ + public function get_category($key = 0) + { + $categories = $this->get_categories(); + if (isset($categories[$key])) + { + return $categories[$key]; + } + else + { + return null; + } + } + + /** + * Get all categories for the item + * + * Uses `<atom:category>`, `<category>` or `<dc:subject>` + * + * @since Beta 3 + * @return array|null List of {@see SimplePie_Category} objects + */ + public function get_categories() + { + $categories = array(); + + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category) + { + $term = null; + $scheme = null; + $label = null; + if (isset($category['attribs']['']['term'])) + { + $term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['scheme'])) + { + $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['label'])) + { + $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category) + { + // This is really the label, but keep this as the term also for BC. + // Label will also work on retrieving because that falls back to term. + $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT); + if (isset($category['attribs']['']['domain'])) + { + $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $scheme = null; + } + $categories[] = $this->registry->create('Category', array($term, $scheme, null)); + } + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category) + { + $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category) + { + $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + + if (!empty($categories)) + { + return array_unique($categories); + } + else + { + return null; + } + } + + /** + * Get an author for the item + * + * @since Beta 2 + * @param int $key The author that you want to return. Remember that arrays begin with 0, not 1 + * @return SimplePie_Author|null + */ + public function get_author($key = 0) + { + $authors = $this->get_authors(); + if (isset($authors[$key])) + { + return $authors[$key]; + } + else + { + return null; + } + } + + /** + * Get a contributor for the item + * + * @since 1.1 + * @param int $key The contrbutor that you want to return. Remember that arrays begin with 0, not 1 + * @return SimplePie_Author|null + */ + public function get_contributor($key = 0) + { + $contributors = $this->get_contributors(); + if (isset($contributors[$key])) + { + return $contributors[$key]; + } + else + { + return null; + } + } + + /** + * Get all contributors for the item + * + * Uses `<atom:contributor>` + * + * @since 1.1 + * @return array|null List of {@see SimplePie_Author} objects + */ + public function get_contributors() + { + $contributors = array(); + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor) + { + $name = null; + $uri = null; + $email = null; + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])) + { + $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])) + { + $uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0])); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'])) + { + $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $uri !== null) + { + $contributors[] = $this->registry->create('Author', array($name, $uri, $email)); + } + } + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor) + { + $name = null; + $url = null; + $email = null; + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'])) + { + $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'])) + { + $url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0])); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'])) + { + $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $url !== null) + { + $contributors[] = $this->registry->create('Author', array($name, $url, $email)); + } + } + + if (!empty($contributors)) + { + return array_unique($contributors); + } + else + { + return null; + } + } + + /** + * Get all authors for the item + * + * Uses `<atom:author>`, `<author>`, `<dc:creator>` or `<itunes:author>` + * + * @since Beta 2 + * @return array|null List of {@see SimplePie_Author} objects + */ + public function get_authors() + { + $authors = array(); + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author) + { + $name = null; + $uri = null; + $email = null; + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])) + { + $name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])) + { + $uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0])); + } + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'])) + { + $email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $uri !== null) + { + $authors[] = $this->registry->create('Author', array($name, $uri, $email)); + } + } + if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author')) + { + $name = null; + $url = null; + $email = null; + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'])) + { + $name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'])) + { + $url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0])); + } + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'])) + { + $email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $url !== null) + { + $authors[] = $this->registry->create('Author', array($name, $url, $email)); + } + } + if ($author = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'author')) + { + $authors[] = $this->registry->create('Author', array(null, null, $this->sanitize($author[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT))); + } + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + + if (!empty($authors)) + { + return array_unique($authors); + } + elseif (($source = $this->get_source()) && ($authors = $source->get_authors())) + { + return $authors; + } + elseif ($authors = $this->feed->get_authors()) + { + return $authors; + } + else + { + return null; + } + } + + /** + * Get the copyright info for the item + * + * Uses `<atom:rights>` or `<dc:rights>` + * + * @since 1.1 + * @return string + */ + public function get_copyright() + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + return null; + } + } + + /** + * Get the posting date/time for the item + * + * Uses `<atom:published>`, `<atom:updated>`, `<atom:issued>`, + * `<atom:modified>`, `<pubDate>` or `<dc:date>` + * + * Note: obeys PHP's timezone setting. To get a UTC date/time, use + * {@see get_gmdate} + * + * @since Beta 2 (previously called `get_item_date` since 0.8) + * + * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data) + * @return int|string|null + */ + public function get_date($date_format = 'j F Y, g:i a') + { + if (!isset($this->data['date'])) + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published')) + { + $this->data['date']['raw'] = $return[0]['data']; + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated')) + { + $this->data['date']['raw'] = $return[0]['data']; + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued')) + { + $this->data['date']['raw'] = $return[0]['data']; + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created')) + { + $this->data['date']['raw'] = $return[0]['data']; + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified')) + { + $this->data['date']['raw'] = $return[0]['data']; + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate')) + { + $this->data['date']['raw'] = $return[0]['data']; + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date')) + { + $this->data['date']['raw'] = $return[0]['data']; + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date')) + { + $this->data['date']['raw'] = $return[0]['data']; + } + + if (!empty($this->data['date']['raw'])) + { + $parser = $this->registry->call('Parse_Date', 'get'); + $this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']); + } + else + { + $this->data['date'] = null; + } + } + if ($this->data['date']) + { + $date_format = (string) $date_format; + switch ($date_format) + { + case '': + return $this->sanitize($this->data['date']['raw'], SIMPLEPIE_CONSTRUCT_TEXT); + + case 'U': + return $this->data['date']['parsed']; + + default: + return date($date_format, $this->data['date']['parsed']); + } + } + else + { + return null; + } + } + + /** + * Get the update date/time for the item + * + * Uses `<atom:updated>` + * + * Note: obeys PHP's timezone setting. To get a UTC date/time, use + * {@see get_gmdate} + * + * @param string $date_format Supports any PHP date format from {@see http://php.net/date} (empty for the raw data) + * @return int|string|null + */ + public function get_updated_date($date_format = 'j F Y, g:i a') + { + if (!isset($this->data['updated'])) + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated')) + { + $this->data['updated']['raw'] = $return[0]['data']; + } + + if (!empty($this->data['updated']['raw'])) + { + $parser = $this->registry->call('Parse_Date', 'get'); + $this->data['updated']['parsed'] = $parser->parse($this->data['date']['raw']); + } + else + { + $this->data['updated'] = null; + } + } + if ($this->data['updated']) + { + $date_format = (string) $date_format; + switch ($date_format) + { + case '': + return $this->sanitize($this->data['updated']['raw'], SIMPLEPIE_CONSTRUCT_TEXT); + + case 'U': + return $this->data['updated']['parsed']; + + default: + return date($date_format, $this->data['updated']['parsed']); + } + } + else + { + return null; + } + } + + /** + * Get the localized posting date/time for the item + * + * Returns the date formatted in the localized language. To display in + * languages other than the server's default, you need to change the locale + * with {@link http://php.net/setlocale setlocale()}. The available + * localizations depend on which ones are installed on your web server. + * + * @since 1.0 + * + * @param string $date_format Supports any PHP date format from {@see http://php.net/strftime} (empty for the raw data) + * @return int|string|null + */ + public function get_local_date($date_format = '%c') + { + if (!$date_format) + { + return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (($date = $this->get_date('U')) !== null && $date !== false) + { + return strftime($date_format, $date); + } + else + { + return null; + } + } + + /** + * Get the posting date/time for the item (UTC time) + * + * @see get_date + * @param string $date_format Supports any PHP date format from {@see http://php.net/date} + * @return int|string|null + */ + public function get_gmdate($date_format = 'j F Y, g:i a') + { + $date = $this->get_date('U'); + if ($date === null) + { + return null; + } + + return gmdate($date_format, $date); + } + + /** + * Get the update date/time for the item (UTC time) + * + * @see get_updated_date + * @param string $date_format Supports any PHP date format from {@see http://php.net/date} + * @return int|string|null + */ + public function get_updated_gmdate($date_format = 'j F Y, g:i a') + { + $date = $this->get_updated_date('U'); + if ($date === null) + { + return null; + } + + return gmdate($date_format, $date); + } + + /** + * Get the permalink for the item + * + * Returns the first link available with a relationship of "alternate". + * Identical to {@see get_link()} with key 0 + * + * @see get_link + * @since 0.8 + * @return string|null Permalink URL + */ + public function get_permalink() + { + $link = $this->get_link(); + $enclosure = $this->get_enclosure(0); + if ($link !== null) + { + return $link; + } + elseif ($enclosure !== null) + { + return $enclosure->get_link(); + } + else + { + return null; + } + } + + /** + * Get a single link for the item + * + * @since Beta 3 + * @param int $key The link that you want to return. Remember that arrays begin with 0, not 1 + * @param string $rel The relationship of the link to return + * @return string|null Link URL + */ + public function get_link($key = 0, $rel = 'alternate') + { + $links = $this->get_links($rel); + if ($links[$key] !== null) + { + return $links[$key]; + } + else + { + return null; + } + } + + /** + * Get all links for the item + * + * Uses `<atom:link>`, `<link>` or `<guid>` + * + * @since Beta 2 + * @param string $rel The relationship of links to return + * @return array|null Links found for the item (strings) + */ + public function get_links($rel = 'alternate') + { + if (!isset($this->data['links'])) + { + $this->data['links'] = array(); + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link) + { + if (isset($link['attribs']['']['href'])) + { + $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate'; + $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link)); + + } + } + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link) + { + if (isset($link['attribs']['']['href'])) + { + $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate'; + $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link)); + } + } + if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid')) + { + if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true') + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + } + + $keys = array_keys($this->data['links']); + foreach ($keys as $key) + { + if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key))) + { + if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key])) + { + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]); + $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]; + } + else + { + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; + } + } + elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY) + { + $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; + } + $this->data['links'][$key] = array_unique($this->data['links'][$key]); + } + } + if (isset($this->data['links'][$rel])) + { + return $this->data['links'][$rel]; + } + else + { + return null; + } + } + + /** + * Get an enclosure from the item + * + * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS. + * + * @since Beta 2 + * @todo Add ability to prefer one type of content over another (in a media group). + * @param int $key The enclosure that you want to return. Remember that arrays begin with 0, not 1 + * @return SimplePie_Enclosure|null + */ + public function get_enclosure($key = 0, $prefer = null) + { + $enclosures = $this->get_enclosures(); + if (isset($enclosures[$key])) + { + return $enclosures[$key]; + } + else + { + return null; + } + } + + /** + * Get all available enclosures (podcasts, etc.) + * + * Supports the <enclosure> RSS tag, as well as Media RSS and iTunes RSS. + * + * At this point, we're pretty much assuming that all enclosures for an item + * are the same content. Anything else is too complicated to + * properly support. + * + * @since Beta 2 + * @todo Add support for end-user defined sorting of enclosures by type/handler (so we can prefer the faster-loading FLV over MP4). + * @todo If an element exists at a level, but it's value is empty, we should fall back to the value from the parent (if it exists). + * @return array|null List of SimplePie_Enclosure items + */ + public function get_enclosures() + { + if (!isset($this->data['enclosures'])) + { + $this->data['enclosures'] = array(); + + // Elements + $captions_parent = null; + $categories_parent = null; + $copyrights_parent = null; + $credits_parent = null; + $description_parent = null; + $duration_parent = null; + $hashes_parent = null; + $keywords_parent = null; + $player_parent = null; + $ratings_parent = null; + $restrictions_parent = null; + $thumbnails_parent = null; + $title_parent = null; + + // Let's do the channel and item-level ones first, and just re-use them if we need to. + $parent = $this->get_feed(); + + // CAPTIONS + if ($captions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text')) + { + foreach ($captions as $caption) + { + $caption_type = null; + $caption_lang = null; + $caption_startTime = null; + $caption_endTime = null; + $caption_text = null; + if (isset($caption['attribs']['']['type'])) + { + $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['lang'])) + { + $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['start'])) + { + $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['end'])) + { + $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['data'])) + { + $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text)); + } + } + elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text')) + { + foreach ($captions as $caption) + { + $caption_type = null; + $caption_lang = null; + $caption_startTime = null; + $caption_endTime = null; + $caption_text = null; + if (isset($caption['attribs']['']['type'])) + { + $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['lang'])) + { + $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['start'])) + { + $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['end'])) + { + $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['data'])) + { + $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text)); + } + } + if (is_array($captions_parent)) + { + $captions_parent = array_values(array_unique($captions_parent)); + } + + // CATEGORIES + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category) + { + $term = null; + $scheme = null; + $label = null; + if (isset($category['data'])) + { + $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['scheme'])) + { + $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $scheme = 'http://search.yahoo.com/mrss/category_schema'; + } + if (isset($category['attribs']['']['label'])) + { + $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'category') as $category) + { + $term = null; + $scheme = null; + $label = null; + if (isset($category['data'])) + { + $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['scheme'])) + { + $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $scheme = 'http://search.yahoo.com/mrss/category_schema'; + } + if (isset($category['attribs']['']['label'])) + { + $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + foreach ((array) $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'category') as $category) + { + $term = null; + $scheme = 'http://www.itunes.com/dtds/podcast-1.0.dtd'; + $label = null; + if (isset($category['attribs']['']['text'])) + { + $label = $this->sanitize($category['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label)); + + if (isset($category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category'])) + { + foreach ((array) $category['child'][SIMPLEPIE_NAMESPACE_ITUNES]['category'] as $subcategory) + { + if (isset($subcategory['attribs']['']['text'])) + { + $label = $this->sanitize($subcategory['attribs']['']['text'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories_parent[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + } + } + if (is_array($categories_parent)) + { + $categories_parent = array_values(array_unique($categories_parent)); + } + + // COPYRIGHT + if ($copyright = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright')) + { + $copyright_url = null; + $copyright_label = null; + if (isset($copyright[0]['attribs']['']['url'])) + { + $copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($copyright[0]['data'])) + { + $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label)); + } + elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright')) + { + $copyright_url = null; + $copyright_label = null; + if (isset($copyright[0]['attribs']['']['url'])) + { + $copyright_url = $this->sanitize($copyright[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($copyright[0]['data'])) + { + $copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label)); + } + + // CREDITS + if ($credits = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit')) + { + foreach ($credits as $credit) + { + $credit_role = null; + $credit_scheme = null; + $credit_name = null; + if (isset($credit['attribs']['']['role'])) + { + $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($credit['attribs']['']['scheme'])) + { + $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $credit_scheme = 'urn:ebu'; + } + if (isset($credit['data'])) + { + $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name)); + } + } + elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit')) + { + foreach ($credits as $credit) + { + $credit_role = null; + $credit_scheme = null; + $credit_name = null; + if (isset($credit['attribs']['']['role'])) + { + $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($credit['attribs']['']['scheme'])) + { + $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $credit_scheme = 'urn:ebu'; + } + if (isset($credit['data'])) + { + $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name)); + } + } + if (is_array($credits_parent)) + { + $credits_parent = array_values(array_unique($credits_parent)); + } + + // DESCRIPTION + if ($description_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description')) + { + if (isset($description_parent[0]['data'])) + { + $description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + } + elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description')) + { + if (isset($description_parent[0]['data'])) + { + $description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + } + + // DURATION + if ($duration_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'duration')) + { + $seconds = null; + $minutes = null; + $hours = null; + if (isset($duration_parent[0]['data'])) + { + $temp = explode(':', $this->sanitize($duration_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); + if (sizeof($temp) > 0) + { + $seconds = (int) array_pop($temp); + } + if (sizeof($temp) > 0) + { + $minutes = (int) array_pop($temp); + $seconds += $minutes * 60; + } + if (sizeof($temp) > 0) + { + $hours = (int) array_pop($temp); + $seconds += $hours * 3600; + } + unset($temp); + $duration_parent = $seconds; + } + } + + // HASHES + if ($hashes_iterator = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash')) + { + foreach ($hashes_iterator as $hash) + { + $value = null; + $algo = null; + if (isset($hash['data'])) + { + $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($hash['attribs']['']['algo'])) + { + $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $algo = 'md5'; + } + $hashes_parent[] = $algo.':'.$value; + } + } + elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash')) + { + foreach ($hashes_iterator as $hash) + { + $value = null; + $algo = null; + if (isset($hash['data'])) + { + $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($hash['attribs']['']['algo'])) + { + $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $algo = 'md5'; + } + $hashes_parent[] = $algo.':'.$value; + } + } + if (is_array($hashes_parent)) + { + $hashes_parent = array_values(array_unique($hashes_parent)); + } + + // KEYWORDS + if ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords')) + { + if (isset($keywords[0]['data'])) + { + $temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); + foreach ($temp as $word) + { + $keywords_parent[] = trim($word); + } + } + unset($temp); + } + elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords')) + { + if (isset($keywords[0]['data'])) + { + $temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); + foreach ($temp as $word) + { + $keywords_parent[] = trim($word); + } + } + unset($temp); + } + elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords')) + { + if (isset($keywords[0]['data'])) + { + $temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); + foreach ($temp as $word) + { + $keywords_parent[] = trim($word); + } + } + unset($temp); + } + elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords')) + { + if (isset($keywords[0]['data'])) + { + $temp = explode(',', $this->sanitize($keywords[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); + foreach ($temp as $word) + { + $keywords_parent[] = trim($word); + } + } + unset($temp); + } + if (is_array($keywords_parent)) + { + $keywords_parent = array_values(array_unique($keywords_parent)); + } + + // PLAYER + if ($player_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player')) + { + if (isset($player_parent[0]['attribs']['']['url'])) + { + $player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + } + elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player')) + { + if (isset($player_parent[0]['attribs']['']['url'])) + { + $player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + } + + // RATINGS + if ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating')) + { + foreach ($ratings as $rating) + { + $rating_scheme = null; + $rating_value = null; + if (isset($rating['attribs']['']['scheme'])) + { + $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $rating_scheme = 'urn:simple'; + } + if (isset($rating['data'])) + { + $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value)); + } + } + elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit')) + { + foreach ($ratings as $rating) + { + $rating_scheme = 'urn:itunes'; + $rating_value = null; + if (isset($rating['data'])) + { + $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value)); + } + } + elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating')) + { + foreach ($ratings as $rating) + { + $rating_scheme = null; + $rating_value = null; + if (isset($rating['attribs']['']['scheme'])) + { + $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $rating_scheme = 'urn:simple'; + } + if (isset($rating['data'])) + { + $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value)); + } + } + elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit')) + { + foreach ($ratings as $rating) + { + $rating_scheme = 'urn:itunes'; + $rating_value = null; + if (isset($rating['data'])) + { + $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value)); + } + } + if (is_array($ratings_parent)) + { + $ratings_parent = array_values(array_unique($ratings_parent)); + } + + // RESTRICTIONS + if ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction')) + { + foreach ($restrictions as $restriction) + { + $restriction_relationship = null; + $restriction_type = null; + $restriction_value = null; + if (isset($restriction['attribs']['']['relationship'])) + { + $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['attribs']['']['type'])) + { + $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['data'])) + { + $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value)); + } + } + elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block')) + { + foreach ($restrictions as $restriction) + { + $restriction_relationship = 'allow'; + $restriction_type = null; + $restriction_value = 'itunes'; + if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes') + { + $restriction_relationship = 'deny'; + } + $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value)); + } + } + elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction')) + { + foreach ($restrictions as $restriction) + { + $restriction_relationship = null; + $restriction_type = null; + $restriction_value = null; + if (isset($restriction['attribs']['']['relationship'])) + { + $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['attribs']['']['type'])) + { + $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['data'])) + { + $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value)); + } + } + elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block')) + { + foreach ($restrictions as $restriction) + { + $restriction_relationship = 'allow'; + $restriction_type = null; + $restriction_value = 'itunes'; + if (isset($restriction['data']) && strtolower($restriction['data']) === 'yes') + { + $restriction_relationship = 'deny'; + } + $restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value)); + } + } + if (is_array($restrictions_parent)) + { + $restrictions_parent = array_values(array_unique($restrictions_parent)); + } + else + { + $restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default')); + } + + // THUMBNAILS + if ($thumbnails = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail')) + { + foreach ($thumbnails as $thumbnail) + { + if (isset($thumbnail['attribs']['']['url'])) + { + $thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + } + } + elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail')) + { + foreach ($thumbnails as $thumbnail) + { + if (isset($thumbnail['attribs']['']['url'])) + { + $thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + } + } + + // TITLES + if ($title_parent = $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title')) + { + if (isset($title_parent[0]['data'])) + { + $title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + } + elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title')) + { + if (isset($title_parent[0]['data'])) + { + $title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + } + + // Clear the memory + unset($parent); + + // Attributes + $bitrate = null; + $channels = null; + $duration = null; + $expression = null; + $framerate = null; + $height = null; + $javascript = null; + $lang = null; + $length = null; + $medium = null; + $samplingrate = null; + $type = null; + $url = null; + $width = null; + + // Elements + $captions = null; + $categories = null; + $copyrights = null; + $credits = null; + $description = null; + $hashes = null; + $keywords = null; + $player = null; + $ratings = null; + $restrictions = null; + $thumbnails = null; + $title = null; + + // If we have media:group tags, loop through them. + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group) + { + if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'])) + { + // If we have media:content tags, loop through them. + foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content) + { + if (isset($content['attribs']['']['url'])) + { + // Attributes + $bitrate = null; + $channels = null; + $duration = null; + $expression = null; + $framerate = null; + $height = null; + $javascript = null; + $lang = null; + $length = null; + $medium = null; + $samplingrate = null; + $type = null; + $url = null; + $width = null; + + // Elements + $captions = null; + $categories = null; + $copyrights = null; + $credits = null; + $description = null; + $hashes = null; + $keywords = null; + $player = null; + $ratings = null; + $restrictions = null; + $thumbnails = null; + $title = null; + + // Start checking the attributes of media:content + if (isset($content['attribs']['']['bitrate'])) + { + $bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['channels'])) + { + $channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['duration'])) + { + $duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $duration = $duration_parent; + } + if (isset($content['attribs']['']['expression'])) + { + $expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['framerate'])) + { + $framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['height'])) + { + $height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['lang'])) + { + $lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['fileSize'])) + { + $length = ceil($content['attribs']['']['fileSize']); + } + if (isset($content['attribs']['']['medium'])) + { + $medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['samplingrate'])) + { + $samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['type'])) + { + $type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['width'])) + { + $width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + + // Checking the other optional media: elements. Priority: media:content, media:group, item, channel + + // CAPTIONS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption) + { + $caption_type = null; + $caption_lang = null; + $caption_startTime = null; + $caption_endTime = null; + $caption_text = null; + if (isset($caption['attribs']['']['type'])) + { + $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['lang'])) + { + $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['start'])) + { + $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['end'])) + { + $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['data'])) + { + $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text)); + } + if (is_array($captions)) + { + $captions = array_values(array_unique($captions)); + } + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'])) + { + foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption) + { + $caption_type = null; + $caption_lang = null; + $caption_startTime = null; + $caption_endTime = null; + $caption_text = null; + if (isset($caption['attribs']['']['type'])) + { + $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['lang'])) + { + $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['start'])) + { + $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['end'])) + { + $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['data'])) + { + $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text)); + } + if (is_array($captions)) + { + $captions = array_values(array_unique($captions)); + } + } + else + { + $captions = $captions_parent; + } + + // CATEGORIES + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'])) + { + foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category) + { + $term = null; + $scheme = null; + $label = null; + if (isset($category['data'])) + { + $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['scheme'])) + { + $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $scheme = 'http://search.yahoo.com/mrss/category_schema'; + } + if (isset($category['attribs']['']['label'])) + { + $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + } + if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'])) + { + foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category) + { + $term = null; + $scheme = null; + $label = null; + if (isset($category['data'])) + { + $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['scheme'])) + { + $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $scheme = 'http://search.yahoo.com/mrss/category_schema'; + } + if (isset($category['attribs']['']['label'])) + { + $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + } + if (is_array($categories) && is_array($categories_parent)) + { + $categories = array_values(array_unique(array_merge($categories, $categories_parent))); + } + elseif (is_array($categories)) + { + $categories = array_values(array_unique($categories)); + } + elseif (is_array($categories_parent)) + { + $categories = array_values(array_unique($categories_parent)); + } + + // COPYRIGHTS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'])) + { + $copyright_url = null; + $copyright_label = null; + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'])) + { + $copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'])) + { + $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label)); + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'])) + { + $copyright_url = null; + $copyright_label = null; + if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'])) + { + $copyright_url = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'])) + { + $copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label)); + } + else + { + $copyrights = $copyrights_parent; + } + + // CREDITS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit) + { + $credit_role = null; + $credit_scheme = null; + $credit_name = null; + if (isset($credit['attribs']['']['role'])) + { + $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($credit['attribs']['']['scheme'])) + { + $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $credit_scheme = 'urn:ebu'; + } + if (isset($credit['data'])) + { + $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name)); + } + if (is_array($credits)) + { + $credits = array_values(array_unique($credits)); + } + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'])) + { + foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit) + { + $credit_role = null; + $credit_scheme = null; + $credit_name = null; + if (isset($credit['attribs']['']['role'])) + { + $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($credit['attribs']['']['scheme'])) + { + $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $credit_scheme = 'urn:ebu'; + } + if (isset($credit['data'])) + { + $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name)); + } + if (is_array($credits)) + { + $credits = array_values(array_unique($credits)); + } + } + else + { + $credits = $credits_parent; + } + + // DESCRIPTION + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'])) + { + $description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'])) + { + $description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $description = $description_parent; + } + + // HASHES + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash) + { + $value = null; + $algo = null; + if (isset($hash['data'])) + { + $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($hash['attribs']['']['algo'])) + { + $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $algo = 'md5'; + } + $hashes[] = $algo.':'.$value; + } + if (is_array($hashes)) + { + $hashes = array_values(array_unique($hashes)); + } + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'])) + { + foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash) + { + $value = null; + $algo = null; + if (isset($hash['data'])) + { + $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($hash['attribs']['']['algo'])) + { + $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $algo = 'md5'; + } + $hashes[] = $algo.':'.$value; + } + if (is_array($hashes)) + { + $hashes = array_values(array_unique($hashes)); + } + } + else + { + $hashes = $hashes_parent; + } + + // KEYWORDS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'])) + { + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'])) + { + $temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); + foreach ($temp as $word) + { + $keywords[] = trim($word); + } + unset($temp); + } + if (is_array($keywords)) + { + $keywords = array_values(array_unique($keywords)); + } + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'])) + { + if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'])) + { + $temp = explode(',', $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); + foreach ($temp as $word) + { + $keywords[] = trim($word); + } + unset($temp); + } + if (is_array($keywords)) + { + $keywords = array_values(array_unique($keywords)); + } + } + else + { + $keywords = $keywords_parent; + } + + // PLAYER + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'])) + { + $player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'])) + { + $player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + else + { + $player = $player_parent; + } + + // RATINGS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating) + { + $rating_scheme = null; + $rating_value = null; + if (isset($rating['attribs']['']['scheme'])) + { + $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $rating_scheme = 'urn:simple'; + } + if (isset($rating['data'])) + { + $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value)); + } + if (is_array($ratings)) + { + $ratings = array_values(array_unique($ratings)); + } + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'])) + { + foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating) + { + $rating_scheme = null; + $rating_value = null; + if (isset($rating['attribs']['']['scheme'])) + { + $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $rating_scheme = 'urn:simple'; + } + if (isset($rating['data'])) + { + $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value)); + } + if (is_array($ratings)) + { + $ratings = array_values(array_unique($ratings)); + } + } + else + { + $ratings = $ratings_parent; + } + + // RESTRICTIONS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction) + { + $restriction_relationship = null; + $restriction_type = null; + $restriction_value = null; + if (isset($restriction['attribs']['']['relationship'])) + { + $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['attribs']['']['type'])) + { + $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['data'])) + { + $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value)); + } + if (is_array($restrictions)) + { + $restrictions = array_values(array_unique($restrictions)); + } + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'])) + { + foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction) + { + $restriction_relationship = null; + $restriction_type = null; + $restriction_value = null; + if (isset($restriction['attribs']['']['relationship'])) + { + $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['attribs']['']['type'])) + { + $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['data'])) + { + $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value)); + } + if (is_array($restrictions)) + { + $restrictions = array_values(array_unique($restrictions)); + } + } + else + { + $restrictions = $restrictions_parent; + } + + // THUMBNAILS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail) + { + $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + if (is_array($thumbnails)) + { + $thumbnails = array_values(array_unique($thumbnails)); + } + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'])) + { + foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail) + { + $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + if (is_array($thumbnails)) + { + $thumbnails = array_values(array_unique($thumbnails)); + } + } + else + { + $thumbnails = $thumbnails_parent; + } + + // TITLES + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'])) + { + $title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'])) + { + $title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $title = $title_parent; + } + + $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width)); + } + } + } + } + + // If we have standalone media:content tags, loop through them. + if (isset($this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'])) + { + foreach ((array) $this->data['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content) + { + if (isset($content['attribs']['']['url']) || isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'])) + { + // Attributes + $bitrate = null; + $channels = null; + $duration = null; + $expression = null; + $framerate = null; + $height = null; + $javascript = null; + $lang = null; + $length = null; + $medium = null; + $samplingrate = null; + $type = null; + $url = null; + $width = null; + + // Elements + $captions = null; + $categories = null; + $copyrights = null; + $credits = null; + $description = null; + $hashes = null; + $keywords = null; + $player = null; + $ratings = null; + $restrictions = null; + $thumbnails = null; + $title = null; + + // Start checking the attributes of media:content + if (isset($content['attribs']['']['bitrate'])) + { + $bitrate = $this->sanitize($content['attribs']['']['bitrate'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['channels'])) + { + $channels = $this->sanitize($content['attribs']['']['channels'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['duration'])) + { + $duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $duration = $duration_parent; + } + if (isset($content['attribs']['']['expression'])) + { + $expression = $this->sanitize($content['attribs']['']['expression'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['framerate'])) + { + $framerate = $this->sanitize($content['attribs']['']['framerate'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['height'])) + { + $height = $this->sanitize($content['attribs']['']['height'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['lang'])) + { + $lang = $this->sanitize($content['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['fileSize'])) + { + $length = ceil($content['attribs']['']['fileSize']); + } + if (isset($content['attribs']['']['medium'])) + { + $medium = $this->sanitize($content['attribs']['']['medium'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['samplingrate'])) + { + $samplingrate = $this->sanitize($content['attribs']['']['samplingrate'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['type'])) + { + $type = $this->sanitize($content['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['width'])) + { + $width = $this->sanitize($content['attribs']['']['width'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['attribs']['']['url'])) + { + $url = $this->sanitize($content['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + // Checking the other optional media: elements. Priority: media:content, media:group, item, channel + + // CAPTIONS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption) + { + $caption_type = null; + $caption_lang = null; + $caption_startTime = null; + $caption_endTime = null; + $caption_text = null; + if (isset($caption['attribs']['']['type'])) + { + $caption_type = $this->sanitize($caption['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['lang'])) + { + $caption_lang = $this->sanitize($caption['attribs']['']['lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['start'])) + { + $caption_startTime = $this->sanitize($caption['attribs']['']['start'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['attribs']['']['end'])) + { + $caption_endTime = $this->sanitize($caption['attribs']['']['end'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($caption['data'])) + { + $caption_text = $this->sanitize($caption['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $captions[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text)); + } + if (is_array($captions)) + { + $captions = array_values(array_unique($captions)); + } + } + else + { + $captions = $captions_parent; + } + + // CATEGORIES + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'])) + { + foreach ((array) $content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['category'] as $category) + { + $term = null; + $scheme = null; + $label = null; + if (isset($category['data'])) + { + $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['scheme'])) + { + $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $scheme = 'http://search.yahoo.com/mrss/category_schema'; + } + if (isset($category['attribs']['']['label'])) + { + $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + } + if (is_array($categories) && is_array($categories_parent)) + { + $categories = array_values(array_unique(array_merge($categories, $categories_parent))); + } + elseif (is_array($categories)) + { + $categories = array_values(array_unique($categories)); + } + elseif (is_array($categories_parent)) + { + $categories = array_values(array_unique($categories_parent)); + } + else + { + $categories = null; + } + + // COPYRIGHTS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'])) + { + $copyright_url = null; + $copyright_label = null; + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'])) + { + $copyright_url = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'])) + { + $copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label)); + } + else + { + $copyrights = $copyrights_parent; + } + + // CREDITS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit) + { + $credit_role = null; + $credit_scheme = null; + $credit_name = null; + if (isset($credit['attribs']['']['role'])) + { + $credit_role = $this->sanitize($credit['attribs']['']['role'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($credit['attribs']['']['scheme'])) + { + $credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $credit_scheme = 'urn:ebu'; + } + if (isset($credit['data'])) + { + $credit_name = $this->sanitize($credit['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $credits[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name)); + } + if (is_array($credits)) + { + $credits = array_values(array_unique($credits)); + } + } + else + { + $credits = $credits_parent; + } + + // DESCRIPTION + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'])) + { + $description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $description = $description_parent; + } + + // HASHES + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash) + { + $value = null; + $algo = null; + if (isset($hash['data'])) + { + $value = $this->sanitize($hash['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($hash['attribs']['']['algo'])) + { + $algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $algo = 'md5'; + } + $hashes[] = $algo.':'.$value; + } + if (is_array($hashes)) + { + $hashes = array_values(array_unique($hashes)); + } + } + else + { + $hashes = $hashes_parent; + } + + // KEYWORDS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'])) + { + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'])) + { + $temp = explode(',', $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT)); + foreach ($temp as $word) + { + $keywords[] = trim($word); + } + unset($temp); + } + if (is_array($keywords)) + { + $keywords = array_values(array_unique($keywords)); + } + } + else + { + $keywords = $keywords_parent; + } + + // PLAYER + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'])) + { + $player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + else + { + $player = $player_parent; + } + + // RATINGS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating) + { + $rating_scheme = null; + $rating_value = null; + if (isset($rating['attribs']['']['scheme'])) + { + $rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $rating_scheme = 'urn:simple'; + } + if (isset($rating['data'])) + { + $rating_value = $this->sanitize($rating['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $ratings[] = $this->registry->create('Rating', array($rating_scheme, $rating_value)); + } + if (is_array($ratings)) + { + $ratings = array_values(array_unique($ratings)); + } + } + else + { + $ratings = $ratings_parent; + } + + // RESTRICTIONS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction) + { + $restriction_relationship = null; + $restriction_type = null; + $restriction_value = null; + if (isset($restriction['attribs']['']['relationship'])) + { + $restriction_relationship = $this->sanitize($restriction['attribs']['']['relationship'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['attribs']['']['type'])) + { + $restriction_type = $this->sanitize($restriction['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($restriction['data'])) + { + $restriction_value = $this->sanitize($restriction['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $restrictions[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value)); + } + if (is_array($restrictions)) + { + $restrictions = array_values(array_unique($restrictions)); + } + } + else + { + $restrictions = $restrictions_parent; + } + + // THUMBNAILS + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'])) + { + foreach ($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail) + { + $thumbnails[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI); + } + if (is_array($thumbnails)) + { + $thumbnails = array_values(array_unique($thumbnails)); + } + } + else + { + $thumbnails = $thumbnails_parent; + } + + // TITLES + if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'])) + { + $title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $title = $title_parent; + } + + $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions, $categories, $channels, $copyrights, $credits, $description, $duration, $expression, $framerate, $hashes, $height, $keywords, $lang, $medium, $player, $ratings, $restrictions, $samplingrate, $thumbnails, $title, $width)); + } + } + } + + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link) + { + if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure') + { + // Attributes + $bitrate = null; + $channels = null; + $duration = null; + $expression = null; + $framerate = null; + $height = null; + $javascript = null; + $lang = null; + $length = null; + $medium = null; + $samplingrate = null; + $type = null; + $url = null; + $width = null; + + $url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link)); + if (isset($link['attribs']['']['type'])) + { + $type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($link['attribs']['']['length'])) + { + $length = ceil($link['attribs']['']['length']); + } + + // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor + $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width)); + } + } + + foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link) + { + if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure') + { + // Attributes + $bitrate = null; + $channels = null; + $duration = null; + $expression = null; + $framerate = null; + $height = null; + $javascript = null; + $lang = null; + $length = null; + $medium = null; + $samplingrate = null; + $type = null; + $url = null; + $width = null; + + $url = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link)); + if (isset($link['attribs']['']['type'])) + { + $type = $this->sanitize($link['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($link['attribs']['']['length'])) + { + $length = ceil($link['attribs']['']['length']); + } + + // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor + $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width)); + } + } + + if ($enclosure = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'enclosure')) + { + if (isset($enclosure[0]['attribs']['']['url'])) + { + // Attributes + $bitrate = null; + $channels = null; + $duration = null; + $expression = null; + $framerate = null; + $height = null; + $javascript = null; + $lang = null; + $length = null; + $medium = null; + $samplingrate = null; + $type = null; + $url = null; + $width = null; + + $url = $this->sanitize($enclosure[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($enclosure[0])); + if (isset($enclosure[0]['attribs']['']['type'])) + { + $type = $this->sanitize($enclosure[0]['attribs']['']['type'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($enclosure[0]['attribs']['']['length'])) + { + $length = ceil($enclosure[0]['attribs']['']['length']); + } + + // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor + $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width)); + } + } + + if (sizeof($this->data['enclosures']) === 0 && ($url || $type || $length || $bitrate || $captions_parent || $categories_parent || $channels || $copyrights_parent || $credits_parent || $description_parent || $duration_parent || $expression || $framerate || $hashes_parent || $height || $keywords_parent || $lang || $medium || $player_parent || $ratings_parent || $restrictions_parent || $samplingrate || $thumbnails_parent || $title_parent || $width)) + { + // Since we don't have group or content for these, we'll just pass the '*_parent' variables directly to the constructor + $this->data['enclosures'][] = $this->registry->create('Enclosure', array($url, $type, $length, null, $bitrate, $captions_parent, $categories_parent, $channels, $copyrights_parent, $credits_parent, $description_parent, $duration_parent, $expression, $framerate, $hashes_parent, $height, $keywords_parent, $lang, $medium, $player_parent, $ratings_parent, $restrictions_parent, $samplingrate, $thumbnails_parent, $title_parent, $width)); + } + + $this->data['enclosures'] = array_values(array_unique($this->data['enclosures'])); + } + if (!empty($this->data['enclosures'])) + { + return $this->data['enclosures']; + } + else + { + return null; + } + } + + /** + * Get the latitude coordinates for the item + * + * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications + * + * Uses `<geo:lat>` or `<georss:point>` + * + * @since 1.0 + * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo + * @link http://www.georss.org/ GeoRSS + * @return string|null + */ + public function get_latitude() + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat')) + { + return (float) $return[0]['data']; + } + elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) + { + return (float) $match[1]; + } + else + { + return null; + } + } + + /** + * Get the longitude coordinates for the item + * + * Compatible with the W3C WGS84 Basic Geo and GeoRSS specifications + * + * Uses `<geo:long>`, `<geo:lon>` or `<georss:point>` + * + * @since 1.0 + * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo + * @link http://www.georss.org/ GeoRSS + * @return string|null + */ + public function get_longitude() + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long')) + { + return (float) $return[0]['data']; + } + elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon')) + { + return (float) $return[0]['data']; + } + elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) + { + return (float) $match[2]; + } + else + { + return null; + } + } + + /** + * Get the `<atom:source>` for the item + * + * @since 1.1 + * @return SimplePie_Source|null + */ + public function get_source() + { + if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source')) + { + return $this->registry->create('Source', array($this, $return[0])); + } + else + { + return null; + } + } +} + +/** + * Used for feed auto-discovery + * + * + * This class can be overloaded with {@see SimplePie::set_locator_class()} + * + * @package SimplePie + */ +class SimplePie_Locator +{ + var $useragent; + var $timeout; + var $file; + var $local = array(); + var $elsewhere = array(); + var $cached_entities = array(); + var $http_base; + var $base; + var $base_location = 0; + var $checked_feeds = 0; + var $max_checked_feeds = 10; + protected $registry; + + public function __construct(SimplePie_File $file, $timeout = 10, $useragent = null, $max_checked_feeds = 10) + { + $this->file = $file; + $this->useragent = $useragent; + $this->timeout = $timeout; + $this->max_checked_feeds = $max_checked_feeds; + + if (class_exists('DOMDocument')) + { + $this->dom = new DOMDocument(); + + set_error_handler(array('SimplePie_Misc', 'silence_errors')); + $this->dom->loadHTML($this->file->body); + restore_error_handler(); + } + else + { + $this->dom = null; + } + } + + public function set_registry(SimplePie_Registry $registry) + { + $this->registry = $registry; + } + + public function find($type = SIMPLEPIE_LOCATOR_ALL, &$working) + { + if ($this->is_feed($this->file)) + { + return $this->file; + } + + if ($this->file->method & SIMPLEPIE_FILE_SOURCE_REMOTE) + { + $sniffer = $this->registry->create('Content_Type_Sniffer', array($this->file)); + if ($sniffer->get_type() !== 'text/html') + { + return null; + } + } + + if ($type & ~SIMPLEPIE_LOCATOR_NONE) + { + $this->get_base(); + } + + if ($type & SIMPLEPIE_LOCATOR_AUTODISCOVERY && $working = $this->autodiscovery()) + { + return $working[0]; + } + + if ($type & (SIMPLEPIE_LOCATOR_LOCAL_EXTENSION | SIMPLEPIE_LOCATOR_LOCAL_BODY | SIMPLEPIE_LOCATOR_REMOTE_EXTENSION | SIMPLEPIE_LOCATOR_REMOTE_BODY) && $this->get_links()) + { + if ($type & SIMPLEPIE_LOCATOR_LOCAL_EXTENSION && $working = $this->extension($this->local)) + { + return $working; + } + + if ($type & SIMPLEPIE_LOCATOR_LOCAL_BODY && $working = $this->body($this->local)) + { + return $working; + } + + if ($type & SIMPLEPIE_LOCATOR_REMOTE_EXTENSION && $working = $this->extension($this->elsewhere)) + { + return $working; + } + + if ($type & SIMPLEPIE_LOCATOR_REMOTE_BODY && $working = $this->body($this->elsewhere)) + { + return $working; + } + } + return null; + } + + public function is_feed($file) + { + if ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE) + { + $sniffer = $this->registry->create('Content_Type_Sniffer', array($file)); + $sniffed = $sniffer->get_type(); + if (in_array($sniffed, array('application/rss+xml', 'application/rdf+xml', 'text/rdf', 'application/atom+xml', 'text/xml', 'application/xml'))) + { + return true; + } + else + { + return false; + } + } + elseif ($file->method & SIMPLEPIE_FILE_SOURCE_LOCAL) + { + return true; + } + else + { + return false; + } + } + + public function get_base() + { + if ($this->dom === null) + { + throw new SimplePie_Exception('DOMDocument not found, unable to use locator'); + } + $this->http_base = $this->file->url; + $this->base = $this->http_base; + $elements = $this->dom->getElementsByTagName('base'); + foreach ($elements as $element) + { + if ($element->hasAttribute('href')) + { + $base = $this->registry->call('Misc', 'absolutize_url', array(trim($element->getAttribute('href')), $this->http_base)); + if ($base === false) + { + continue; + } + $this->base = $base; + $this->base_location = method_exists($element, 'getLineNo') ? $element->getLineNo() : 0; + break; + } + } + } + + public function autodiscovery() + { + $done = array(); + $feeds = array(); + $feeds = array_merge($feeds, $this->search_elements_by_tag('link', $done, $feeds)); + $feeds = array_merge($feeds, $this->search_elements_by_tag('a', $done, $feeds)); + $feeds = array_merge($feeds, $this->search_elements_by_tag('area', $done, $feeds)); + + if (!empty($feeds)) + { + return array_values($feeds); + } + else + { + return null; + } + } + + protected function search_elements_by_tag($name, &$done, $feeds) + { + if ($this->dom === null) + { + throw new SimplePie_Exception('DOMDocument not found, unable to use locator'); + } + + $links = $this->dom->getElementsByTagName($name); + foreach ($links as $link) + { + if ($this->checked_feeds === $this->max_checked_feeds) + { + break; + } + if ($link->hasAttribute('href') && $link->hasAttribute('rel')) + { + $rel = array_unique($this->registry->call('Misc', 'space_seperated_tokens', array(strtolower($link->getAttribute('rel'))))); + $line = method_exists($link, 'getLineNo') ? $link->getLineNo() : 1; + + if ($this->base_location < $line) + { + $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base)); + } + else + { + $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base)); + } + if ($href === false) + { + continue; + } + + if (!in_array($href, $done) && in_array('feed', $rel) || (in_array('alternate', $rel) && !in_array('stylesheet', $rel) && $link->hasAttribute('type') && in_array(strtolower($this->registry->call('Misc', 'parse_mime', array($link->getAttribute('type')))), array('application/rss+xml', 'application/atom+xml'))) && !isset($feeds[$href])) + { + $this->checked_feeds++; + $headers = array( + 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', + ); + $feed = $this->registry->create('File', array($href, $this->timeout, 5, $headers, $this->useragent)); + if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) + { + $feeds[$href] = $feed; + } + } + $done[] = $href; + } + } + + return $feeds; + } + + public function get_links() + { + if ($this->dom === null) + { + throw new SimplePie_Exception('DOMDocument not found, unable to use locator'); + } + + $links = $this->dom->getElementsByTagName('a'); + foreach ($links as $link) + { + if ($link->hasAttribute('href')) + { + $href = trim($link->getAttribute('href')); + $parsed = $this->registry->call('Misc', 'parse_url', array($href)); + if ($parsed['scheme'] === '' || preg_match('/^(http(s)|feed)?$/i', $parsed['scheme'])) + { + if ($this->base_location < $link->getLineNo()) + { + $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->base)); + } + else + { + $href = $this->registry->call('Misc', 'absolutize_url', array(trim($link->getAttribute('href')), $this->http_base)); + } + if ($href === false) + { + continue; + } + + $current = $this->registry->call('Misc', 'parse_url', array($this->file->url)); + + if ($parsed['authority'] === '' || $parsed['authority'] === $current['authority']) + { + $this->local[] = $href; + } + else + { + $this->elsewhere[] = $href; + } + } + } + } + $this->local = array_unique($this->local); + $this->elsewhere = array_unique($this->elsewhere); + if (!empty($this->local) || !empty($this->elsewhere)) + { + return true; + } + return null; + } + + public function extension(&$array) + { + foreach ($array as $key => $value) + { + if ($this->checked_feeds === $this->max_checked_feeds) + { + break; + } + if (in_array(strtolower(strrchr($value, '.')), array('.rss', '.rdf', '.atom', '.xml'))) + { + $this->checked_feeds++; + + $headers = array( + 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', + ); + $feed = $this->registry->create('File', array($value, $this->timeout, 5, $headers, $this->useragent)); + if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) + { + return $feed; + } + else + { + unset($array[$key]); + } + } + } + return null; + } + + public function body(&$array) + { + foreach ($array as $key => $value) + { + if ($this->checked_feeds === $this->max_checked_feeds) + { + break; + } + if (preg_match('/(rss|rdf|atom|xml)/i', $value)) + { + $this->checked_feeds++; + $headers = array( + 'Accept' => 'application/atom+xml, application/rss+xml, application/rdf+xml;q=0.9, application/xml;q=0.8, text/xml;q=0.8, text/html;q=0.7, unknown/unknown;q=0.1, application/unknown;q=0.1, */*;q=0.1', + ); + $feed = $this->registry->create('File', array($value, $this->timeout, 5, null, $this->useragent)); + if ($feed->success && ($feed->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($feed->status_code === 200 || $feed->status_code > 206 && $feed->status_code < 300)) && $this->is_feed($feed)) + { + return $feed; + } + else + { + unset($array[$key]); + } + } + } + return null; + } +} + +/** + * Miscellanous utilities + * + * @package SimplePie + */ +class SimplePie_Misc +{ + public static function time_hms($seconds) + { + $time = ''; + + $hours = floor($seconds / 3600); + $remainder = $seconds % 3600; + if ($hours > 0) + { + $time .= $hours.':'; + } + + $minutes = floor($remainder / 60); + $seconds = $remainder % 60; + if ($minutes < 10 && $hours > 0) + { + $minutes = '0' . $minutes; + } + if ($seconds < 10) + { + $seconds = '0' . $seconds; + } + + $time .= $minutes.':'; + $time .= $seconds; + + return $time; + } + + public static function absolutize_url($relative, $base) + { + $iri = SimplePie_IRI::absolutize(new SimplePie_IRI($base), $relative); + if ($iri === false) + { + return false; + } + return $iri->get_uri(); + } + + /** + * Get a HTML/XML element from a HTML string + * + * @deprecated Use DOMDocument instead (parsing HTML with regex is bad!) + * @param string $realname Element name (including namespace prefix if applicable) + * @param string $string HTML document + * @return array + */ + public static function get_element($realname, $string) + { + $return = array(); + $name = preg_quote($realname, '/'); + if (preg_match_all("/<($name)" . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . "(>(.*)<\/$name>|(\/)?>)/siU", $string, $matches, PREG_SET_ORDER | PREG_OFFSET_CAPTURE)) + { + for ($i = 0, $total_matches = count($matches); $i < $total_matches; $i++) + { + $return[$i]['tag'] = $realname; + $return[$i]['full'] = $matches[$i][0][0]; + $return[$i]['offset'] = $matches[$i][0][1]; + if (strlen($matches[$i][3][0]) <= 2) + { + $return[$i]['self_closing'] = true; + } + else + { + $return[$i]['self_closing'] = false; + $return[$i]['content'] = $matches[$i][4][0]; + } + $return[$i]['attribs'] = array(); + if (isset($matches[$i][2][0]) && preg_match_all('/[\x09\x0A\x0B\x0C\x0D\x20]+([^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3D\x3E]*)(?:[\x09\x0A\x0B\x0C\x0D\x20]*=[\x09\x0A\x0B\x0C\x0D\x20]*(?:"([^"]*)"|\'([^\']*)\'|([^\x09\x0A\x0B\x0C\x0D\x20\x22\x27\x3E][^\x09\x0A\x0B\x0C\x0D\x20\x3E]*)?))?/', ' ' . $matches[$i][2][0] . ' ', $attribs, PREG_SET_ORDER)) + { + for ($j = 0, $total_attribs = count($attribs); $j < $total_attribs; $j++) + { + if (count($attribs[$j]) === 2) + { + $attribs[$j][2] = $attribs[$j][1]; + } + $return[$i]['attribs'][strtolower($attribs[$j][1])]['data'] = SimplePie_Misc::entities_decode(end($attribs[$j]), 'UTF-8'); + } + } + } + } + return $return; + } + + public static function element_implode($element) + { + $full = "<$element[tag]"; + foreach ($element['attribs'] as $key => $value) + { + $key = strtolower($key); + $full .= " $key=\"" . htmlspecialchars($value['data']) . '"'; + } + if ($element['self_closing']) + { + $full .= ' />'; + } + else + { + $full .= ">$element[content]</$element[tag]>"; + } + return $full; + } + + public static function error($message, $level, $file, $line) + { + if ((ini_get('error_reporting') & $level) > 0) + { + switch ($level) + { + case E_USER_ERROR: + $note = 'PHP Error'; + break; + case E_USER_WARNING: + $note = 'PHP Warning'; + break; + case E_USER_NOTICE: + $note = 'PHP Notice'; + break; + default: + $note = 'Unknown Error'; + break; + } + + $log_error = true; + if (!function_exists('error_log')) + { + $log_error = false; + } + + $log_file = @ini_get('error_log'); + if (!empty($log_file) && ('syslog' !== $log_file) && !@is_writable($log_file)) + { + $log_error = false; + } + + if ($log_error) + { + @error_log("$note: $message in $file on line $line", 0); + } + } + + return $message; + } + + public static function fix_protocol($url, $http = 1) + { + $url = SimplePie_Misc::normalize_url($url); + $parsed = SimplePie_Misc::parse_url($url); + if ($parsed['scheme'] !== '' && $parsed['scheme'] !== 'http' && $parsed['scheme'] !== 'https') + { + 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); + } + + if ($http === 2 && $parsed['scheme'] !== '') + { + return "feed:$url"; + } + elseif ($http === 3 && strtolower($parsed['scheme']) === 'http') + { + return substr_replace($url, 'podcast', 0, 4); + } + elseif ($http === 4 && strtolower($parsed['scheme']) === 'http') + { + return substr_replace($url, 'itpc', 0, 4); + } + else + { + return $url; + } + } + + public static function parse_url($url) + { + $iri = new SimplePie_IRI($url); + return array( + 'scheme' => (string) $iri->scheme, + 'authority' => (string) $iri->authority, + 'path' => (string) $iri->path, + 'query' => (string) $iri->query, + 'fragment' => (string) $iri->fragment + ); + } + + public static function compress_parse_url($scheme = '', $authority = '', $path = '', $query = '', $fragment = '') + { + $iri = new SimplePie_IRI(''); + $iri->scheme = $scheme; + $iri->authority = $authority; + $iri->path = $path; + $iri->query = $query; + $iri->fragment = $fragment; + return $iri->get_uri(); + } + + public static function normalize_url($url) + { + $iri = new SimplePie_IRI($url); + return $iri->get_uri(); + } + + public static function percent_encoding_normalization($match) + { + $integer = hexdec($match[1]); + if ($integer >= 0x41 && $integer <= 0x5A || $integer >= 0x61 && $integer <= 0x7A || $integer >= 0x30 && $integer <= 0x39 || $integer === 0x2D || $integer === 0x2E || $integer === 0x5F || $integer === 0x7E) + { + return chr($integer); + } + else + { + return strtoupper($match[0]); + } + } + + /** + * Converts a Windows-1252 encoded string to a UTF-8 encoded string + * + * @static + * @param string $string Windows-1252 encoded string + * @return string UTF-8 encoded string + */ + public static function windows_1252_to_utf8($string) + { + static $convert_table = array("\x80" => "\xE2\x82\xAC", "\x81" => "\xEF\xBF\xBD", "\x82" => "\xE2\x80\x9A", "\x83" => "\xC6\x92", "\x84" => "\xE2\x80\x9E", "\x85" => "\xE2\x80\xA6", "\x86" => "\xE2\x80\xA0", "\x87" => "\xE2\x80\xA1", "\x88" => "\xCB\x86", "\x89" => "\xE2\x80\xB0", "\x8A" => "\xC5\xA0", "\x8B" => "\xE2\x80\xB9", "\x8C" => "\xC5\x92", "\x8D" => "\xEF\xBF\xBD", "\x8E" => "\xC5\xBD", "\x8F" => "\xEF\xBF\xBD", "\x90" => "\xEF\xBF\xBD", "\x91" => "\xE2\x80\x98", "\x92" => "\xE2\x80\x99", "\x93" => "\xE2\x80\x9C", "\x94" => "\xE2\x80\x9D", "\x95" => "\xE2\x80\xA2", "\x96" => "\xE2\x80\x93", "\x97" => "\xE2\x80\x94", "\x98" => "\xCB\x9C", "\x99" => "\xE2\x84\xA2", "\x9A" => "\xC5\xA1", "\x9B" => "\xE2\x80\xBA", "\x9C" => "\xC5\x93", "\x9D" => "\xEF\xBF\xBD", "\x9E" => "\xC5\xBE", "\x9F" => "\xC5\xB8", "\xA0" => "\xC2\xA0", "\xA1" => "\xC2\xA1", "\xA2" => "\xC2\xA2", "\xA3" => "\xC2\xA3", "\xA4" => "\xC2\xA4", "\xA5" => "\xC2\xA5", "\xA6" => "\xC2\xA6", "\xA7" => "\xC2\xA7", "\xA8" => "\xC2\xA8", "\xA9" => "\xC2\xA9", "\xAA" => "\xC2\xAA", "\xAB" => "\xC2\xAB", "\xAC" => "\xC2\xAC", "\xAD" => "\xC2\xAD", "\xAE" => "\xC2\xAE", "\xAF" => "\xC2\xAF", "\xB0" => "\xC2\xB0", "\xB1" => "\xC2\xB1", "\xB2" => "\xC2\xB2", "\xB3" => "\xC2\xB3", "\xB4" => "\xC2\xB4", "\xB5" => "\xC2\xB5", "\xB6" => "\xC2\xB6", "\xB7" => "\xC2\xB7", "\xB8" => "\xC2\xB8", "\xB9" => "\xC2\xB9", "\xBA" => "\xC2\xBA", "\xBB" => "\xC2\xBB", "\xBC" => "\xC2\xBC", "\xBD" => "\xC2\xBD", "\xBE" => "\xC2\xBE", "\xBF" => "\xC2\xBF", "\xC0" => "\xC3\x80", "\xC1" => "\xC3\x81", "\xC2" => "\xC3\x82", "\xC3" => "\xC3\x83", "\xC4" => "\xC3\x84", "\xC5" => "\xC3\x85", "\xC6" => "\xC3\x86", "\xC7" => "\xC3\x87", "\xC8" => "\xC3\x88", "\xC9" => "\xC3\x89", "\xCA" => "\xC3\x8A", "\xCB" => "\xC3\x8B", "\xCC" => "\xC3\x8C", "\xCD" => "\xC3\x8D", "\xCE" => "\xC3\x8E", "\xCF" => "\xC3\x8F", "\xD0" => "\xC3\x90", "\xD1" => "\xC3\x91", "\xD2" => "\xC3\x92", "\xD3" => "\xC3\x93", "\xD4" => "\xC3\x94", "\xD5" => "\xC3\x95", "\xD6" => "\xC3\x96", "\xD7" => "\xC3\x97", "\xD8" => "\xC3\x98", "\xD9" => "\xC3\x99", "\xDA" => "\xC3\x9A", "\xDB" => "\xC3\x9B", "\xDC" => "\xC3\x9C", "\xDD" => "\xC3\x9D", "\xDE" => "\xC3\x9E", "\xDF" => "\xC3\x9F", "\xE0" => "\xC3\xA0", "\xE1" => "\xC3\xA1", "\xE2" => "\xC3\xA2", "\xE3" => "\xC3\xA3", "\xE4" => "\xC3\xA4", "\xE5" => "\xC3\xA5", "\xE6" => "\xC3\xA6", "\xE7" => "\xC3\xA7", "\xE8" => "\xC3\xA8", "\xE9" => "\xC3\xA9", "\xEA" => "\xC3\xAA", "\xEB" => "\xC3\xAB", "\xEC" => "\xC3\xAC", "\xED" => "\xC3\xAD", "\xEE" => "\xC3\xAE", "\xEF" => "\xC3\xAF", "\xF0" => "\xC3\xB0", "\xF1" => "\xC3\xB1", "\xF2" => "\xC3\xB2", "\xF3" => "\xC3\xB3", "\xF4" => "\xC3\xB4", "\xF5" => "\xC3\xB5", "\xF6" => "\xC3\xB6", "\xF7" => "\xC3\xB7", "\xF8" => "\xC3\xB8", "\xF9" => "\xC3\xB9", "\xFA" => "\xC3\xBA", "\xFB" => "\xC3\xBB", "\xFC" => "\xC3\xBC", "\xFD" => "\xC3\xBD", "\xFE" => "\xC3\xBE", "\xFF" => "\xC3\xBF"); + + return strtr($string, $convert_table); + } + + /** + * Change a string from one encoding to another + * + * @param string $data Raw data in $input encoding + * @param string $input Encoding of $data + * @param string $output Encoding you want + * @return string|boolean False if we can't convert it + */ + public static function change_encoding($data, $input, $output) + { + $input = SimplePie_Misc::encoding($input); + $output = SimplePie_Misc::encoding($output); + + // We fail to fail on non US-ASCII bytes + if ($input === 'US-ASCII') + { + static $non_ascii_octects = ''; + if (!$non_ascii_octects) + { + for ($i = 0x80; $i <= 0xFF; $i++) + { + $non_ascii_octects .= chr($i); + } + } + $data = substr($data, 0, strcspn($data, $non_ascii_octects)); + } + + // This is first, as behaviour of this is completely predictable + if ($input === 'windows-1252' && $output === 'UTF-8') + { + return SimplePie_Misc::windows_1252_to_utf8($data); + } + // This is second, as behaviour of this varies only with PHP version (the middle part of this expression checks the encoding is supported). + elseif (function_exists('mb_convert_encoding') && ($return = SimplePie_Misc::change_encoding_mbstring($data, $input, $output))) + { + return $return; + } + // This is last, as behaviour of this varies with OS userland and PHP version + elseif (function_exists('iconv') && ($return = SimplePie_Misc::change_encoding_iconv($data, $input, $output))) + { + return $return; + } + // If we can't do anything, just fail + else + { + return false; + } + } + + protected static function change_encoding_mbstring($data, $input, $output) + { + if ($input === 'windows-949') + { + $input = 'EUC-KR'; + } + if ($output === 'windows-949') + { + $output = 'EUC-KR'; + } + if ($input === 'Windows-31J') + { + $input = 'SJIS'; + } + if ($output === 'Windows-31J') + { + $output = 'SJIS'; + } + + // Check that the encoding is supported + if (@mb_convert_encoding("\x80", 'UTF-16BE', $input) === "\x00\x80") + { + return false; + } + if (!in_array($input, mb_list_encodings())) + { + return false; + } + + // Let's do some conversion + if ($return = @mb_convert_encoding($data, $output, $input)) + { + return $return; + } + + return false; + } + + protected static function change_encoding_iconv($data, $input, $output) + { + return @iconv($input, $output, $data); + } + + /** + * Normalize an encoding name + * + * This is automatically generated by create.php + * + * To generate it, run `php create.php` on the command line, and copy the + * output to replace this function. + * + * @param string $charset Character set to standardise + * @return string Standardised name + */ + public static function encoding($charset) + { + // Normalization from UTS #22 + switch (strtolower(preg_replace('/(?:[^a-zA-Z0-9]+|([^0-9])0+)/', '\1', $charset))) + { + case 'adobestandardencoding': + case 'csadobestandardencoding': + return 'Adobe-Standard-Encoding'; + + case 'adobesymbolencoding': + case 'cshppsmath': + return 'Adobe-Symbol-Encoding'; + + case 'ami1251': + case 'amiga1251': + return 'Amiga-1251'; + + case 'ansix31101983': + case 'csat5001983': + case 'csiso99naplps': + case 'isoir99': + case 'naplps': + return 'ANSI_X3.110-1983'; + + case 'arabic7': + case 'asmo449': + case 'csiso89asmo449': + case 'iso9036': + case 'isoir89': + return 'ASMO_449'; + + case 'big5': + case 'csbig5': + return 'Big5'; + + case 'big5hkscs': + return 'Big5-HKSCS'; + + case 'bocu1': + case 'csbocu1': + return 'BOCU-1'; + + case 'brf': + case 'csbrf': + return 'BRF'; + + case 'bs4730': + case 'csiso4unitedkingdom': + case 'gb': + case 'iso646gb': + case 'isoir4': + case 'uk': + return 'BS_4730'; + + case 'bsviewdata': + case 'csiso47bsviewdata': + case 'isoir47': + return 'BS_viewdata'; + + case 'cesu8': + case 'cscesu8': + return 'CESU-8'; + + case 'ca': + case 'csa71': + case 'csaz243419851': + case 'csiso121canadian1': + case 'iso646ca': + case 'isoir121': + return 'CSA_Z243.4-1985-1'; + + case 'csa72': + case 'csaz243419852': + case 'csiso122canadian2': + case 'iso646ca2': + case 'isoir122': + return 'CSA_Z243.4-1985-2'; + + case 'csaz24341985gr': + case 'csiso123csaz24341985gr': + case 'isoir123': + return 'CSA_Z243.4-1985-gr'; + + case 'csiso139csn369103': + case 'csn369103': + case 'isoir139': + return 'CSN_369103'; + + case 'csdecmcs': + case 'dec': + case 'decmcs': + return 'DEC-MCS'; + + case 'csiso21german': + case 'de': + case 'din66003': + case 'iso646de': + case 'isoir21': + return 'DIN_66003'; + + case 'csdkus': + case 'dkus': + return 'dk-us'; + + case 'csiso646danish': + case 'dk': + case 'ds2089': + case 'iso646dk': + return 'DS_2089'; + + case 'csibmebcdicatde': + case 'ebcdicatde': + return 'EBCDIC-AT-DE'; + + case 'csebcdicatdea': + case 'ebcdicatdea': + return 'EBCDIC-AT-DE-A'; + + case 'csebcdiccafr': + case 'ebcdiccafr': + return 'EBCDIC-CA-FR'; + + case 'csebcdicdkno': + case 'ebcdicdkno': + return 'EBCDIC-DK-NO'; + + case 'csebcdicdknoa': + case 'ebcdicdknoa': + return 'EBCDIC-DK-NO-A'; + + case 'csebcdices': + case 'ebcdices': + return 'EBCDIC-ES'; + + case 'csebcdicesa': + case 'ebcdicesa': + return 'EBCDIC-ES-A'; + + case 'csebcdicess': + case 'ebcdicess': + return 'EBCDIC-ES-S'; + + case 'csebcdicfise': + case 'ebcdicfise': + return 'EBCDIC-FI-SE'; + + case 'csebcdicfisea': + case 'ebcdicfisea': + return 'EBCDIC-FI-SE-A'; + + case 'csebcdicfr': + case 'ebcdicfr': + return 'EBCDIC-FR'; + + case 'csebcdicit': + case 'ebcdicit': + return 'EBCDIC-IT'; + + case 'csebcdicpt': + case 'ebcdicpt': + return 'EBCDIC-PT'; + + case 'csebcdicuk': + case 'ebcdicuk': + return 'EBCDIC-UK'; + + case 'csebcdicus': + case 'ebcdicus': + return 'EBCDIC-US'; + + case 'csiso111ecmacyrillic': + case 'ecmacyrillic': + case 'isoir111': + case 'koi8e': + return 'ECMA-cyrillic'; + + case 'csiso17spanish': + case 'es': + case 'iso646es': + case 'isoir17': + return 'ES'; + + case 'csiso85spanish2': + case 'es2': + case 'iso646es2': + case 'isoir85': + return 'ES2'; + + case 'cseucpkdfmtjapanese': + case 'eucjp': + case 'extendedunixcodepackedformatforjapanese': + return 'EUC-JP'; + + case 'cseucfixwidjapanese': + case 'extendedunixcodefixedwidthforjapanese': + return 'Extended_UNIX_Code_Fixed_Width_for_Japanese'; + + case 'gb18030': + return 'GB18030'; + + case 'chinese': + case 'cp936': + case 'csgb2312': + case 'csiso58gb231280': + case 'gb2312': + case 'gb231280': + case 'gbk': + case 'isoir58': + case 'ms936': + case 'windows936': + return 'GBK'; + + case 'cn': + case 'csiso57gb1988': + case 'gb198880': + case 'iso646cn': + case 'isoir57': + return 'GB_1988-80'; + + case 'csiso153gost1976874': + case 'gost1976874': + case 'isoir153': + case 'stsev35888': + return 'GOST_19768-74'; + + case 'csiso150': + case 'csiso150greekccitt': + case 'greekccitt': + case 'isoir150': + return 'greek-ccitt'; + + case 'csiso88greek7': + case 'greek7': + case 'isoir88': + return 'greek7'; + + case 'csiso18greek7old': + case 'greek7old': + case 'isoir18': + return 'greek7-old'; + + case 'cshpdesktop': + case 'hpdesktop': + return 'HP-DeskTop'; + + case 'cshplegal': + case 'hplegal': + return 'HP-Legal'; + + case 'cshpmath8': + case 'hpmath8': + return 'HP-Math8'; + + case 'cshppifont': + case 'hppifont': + return 'HP-Pi-font'; + + case 'cshproman8': + case 'hproman8': + case 'r8': + case 'roman8': + return 'hp-roman8'; + + case 'hzgb2312': + return 'HZ-GB-2312'; + + case 'csibmsymbols': + case 'ibmsymbols': + return 'IBM-Symbols'; + + case 'csibmthai': + case 'ibmthai': + return 'IBM-Thai'; + + case 'cp37': + case 'csibm37': + case 'ebcdiccpca': + case 'ebcdiccpnl': + case 'ebcdiccpus': + case 'ebcdiccpwt': + case 'ibm37': + return 'IBM037'; + + case 'cp38': + case 'csibm38': + case 'ebcdicint': + case 'ibm38': + return 'IBM038'; + + case 'cp273': + case 'csibm273': + case 'ibm273': + return 'IBM273'; + + case 'cp274': + case 'csibm274': + case 'ebcdicbe': + case 'ibm274': + return 'IBM274'; + + case 'cp275': + case 'csibm275': + case 'ebcdicbr': + case 'ibm275': + return 'IBM275'; + + case 'csibm277': + case 'ebcdiccpdk': + case 'ebcdiccpno': + case 'ibm277': + return 'IBM277'; + + case 'cp278': + case 'csibm278': + case 'ebcdiccpfi': + case 'ebcdiccpse': + case 'ibm278': + return 'IBM278'; + + case 'cp280': + case 'csibm280': + case 'ebcdiccpit': + case 'ibm280': + return 'IBM280'; + + case 'cp281': + case 'csibm281': + case 'ebcdicjpe': + case 'ibm281': + return 'IBM281'; + + case 'cp284': + case 'csibm284': + case 'ebcdiccpes': + case 'ibm284': + return 'IBM284'; + + case 'cp285': + case 'csibm285': + case 'ebcdiccpgb': + case 'ibm285': + return 'IBM285'; + + case 'cp290': + case 'csibm290': + case 'ebcdicjpkana': + case 'ibm290': + return 'IBM290'; + + case 'cp297': + case 'csibm297': + case 'ebcdiccpfr': + case 'ibm297': + return 'IBM297'; + + case 'cp420': + case 'csibm420': + case 'ebcdiccpar1': + case 'ibm420': + return 'IBM420'; + + case 'cp423': + case 'csibm423': + case 'ebcdiccpgr': + case 'ibm423': + return 'IBM423'; + + case 'cp424': + case 'csibm424': + case 'ebcdiccphe': + case 'ibm424': + return 'IBM424'; + + case '437': + case 'cp437': + case 'cspc8codepage437': + case 'ibm437': + return 'IBM437'; + + case 'cp500': + case 'csibm500': + case 'ebcdiccpbe': + case 'ebcdiccpch': + case 'ibm500': + return 'IBM500'; + + case 'cp775': + case 'cspc775baltic': + case 'ibm775': + return 'IBM775'; + + case '850': + case 'cp850': + case 'cspc850multilingual': + case 'ibm850': + return 'IBM850'; + + case '851': + case 'cp851': + case 'csibm851': + case 'ibm851': + return 'IBM851'; + + case '852': + case 'cp852': + case 'cspcp852': + case 'ibm852': + return 'IBM852'; + + case '855': + case 'cp855': + case 'csibm855': + case 'ibm855': + return 'IBM855'; + + case '857': + case 'cp857': + case 'csibm857': + case 'ibm857': + return 'IBM857'; + + case 'ccsid858': + case 'cp858': + case 'ibm858': + case 'pcmultilingual850euro': + return 'IBM00858'; + + case '860': + case 'cp860': + case 'csibm860': + case 'ibm860': + return 'IBM860'; + + case '861': + case 'cp861': + case 'cpis': + case 'csibm861': + case 'ibm861': + return 'IBM861'; + + case '862': + case 'cp862': + case 'cspc862latinhebrew': + case 'ibm862': + return 'IBM862'; + + case '863': + case 'cp863': + case 'csibm863': + case 'ibm863': + return 'IBM863'; + + case 'cp864': + case 'csibm864': + case 'ibm864': + return 'IBM864'; + + case '865': + case 'cp865': + case 'csibm865': + case 'ibm865': + return 'IBM865'; + + case '866': + case 'cp866': + case 'csibm866': + case 'ibm866': + return 'IBM866'; + + case 'cp868': + case 'cpar': + case 'csibm868': + case 'ibm868': + return 'IBM868'; + + case '869': + case 'cp869': + case 'cpgr': + case 'csibm869': + case 'ibm869': + return 'IBM869'; + + case 'cp870': + case 'csibm870': + case 'ebcdiccproece': + case 'ebcdiccpyu': + case 'ibm870': + return 'IBM870'; + + case 'cp871': + case 'csibm871': + case 'ebcdiccpis': + case 'ibm871': + return 'IBM871'; + + case 'cp880': + case 'csibm880': + case 'ebcdiccyrillic': + case 'ibm880': + return 'IBM880'; + + case 'cp891': + case 'csibm891': + case 'ibm891': + return 'IBM891'; + + case 'cp903': + case 'csibm903': + case 'ibm903': + return 'IBM903'; + + case '904': + case 'cp904': + case 'csibbm904': + case 'ibm904': + return 'IBM904'; + + case 'cp905': + case 'csibm905': + case 'ebcdiccptr': + case 'ibm905': + return 'IBM905'; + + case 'cp918': + case 'csibm918': + case 'ebcdiccpar2': + case 'ibm918': + return 'IBM918'; + + case 'ccsid924': + case 'cp924': + case 'ebcdiclatin9euro': + case 'ibm924': + return 'IBM00924'; + + case 'cp1026': + case 'csibm1026': + case 'ibm1026': + return 'IBM1026'; + + case 'ibm1047': + return 'IBM1047'; + + case 'ccsid1140': + case 'cp1140': + case 'ebcdicus37euro': + case 'ibm1140': + return 'IBM01140'; + + case 'ccsid1141': + case 'cp1141': + case 'ebcdicde273euro': + case 'ibm1141': + return 'IBM01141'; + + case 'ccsid1142': + case 'cp1142': + case 'ebcdicdk277euro': + case 'ebcdicno277euro': + case 'ibm1142': + return 'IBM01142'; + + case 'ccsid1143': + case 'cp1143': + case 'ebcdicfi278euro': + case 'ebcdicse278euro': + case 'ibm1143': + return 'IBM01143'; + + case 'ccsid1144': + case 'cp1144': + case 'ebcdicit280euro': + case 'ibm1144': + return 'IBM01144'; + + case 'ccsid1145': + case 'cp1145': + case 'ebcdices284euro': + case 'ibm1145': + return 'IBM01145'; + + case 'ccsid1146': + case 'cp1146': + case 'ebcdicgb285euro': + case 'ibm1146': + return 'IBM01146'; + + case 'ccsid1147': + case 'cp1147': + case 'ebcdicfr297euro': + case 'ibm1147': + return 'IBM01147'; + + case 'ccsid1148': + case 'cp1148': + case 'ebcdicinternational500euro': + case 'ibm1148': + return 'IBM01148'; + + case 'ccsid1149': + case 'cp1149': + case 'ebcdicis871euro': + case 'ibm1149': + return 'IBM01149'; + + case 'csiso143iecp271': + case 'iecp271': + case 'isoir143': + return 'IEC_P27-1'; + + case 'csiso49inis': + case 'inis': + case 'isoir49': + return 'INIS'; + + case 'csiso50inis8': + case 'inis8': + case 'isoir50': + return 'INIS-8'; + + case 'csiso51iniscyrillic': + case 'iniscyrillic': + case 'isoir51': + return 'INIS-cyrillic'; + + case 'csinvariant': + case 'invariant': + return 'INVARIANT'; + + case 'iso2022cn': + return 'ISO-2022-CN'; + + case 'iso2022cnext': + return 'ISO-2022-CN-EXT'; + + case 'csiso2022jp': + case 'iso2022jp': + return 'ISO-2022-JP'; + + case 'csiso2022jp2': + case 'iso2022jp2': + return 'ISO-2022-JP-2'; + + case 'csiso2022kr': + case 'iso2022kr': + return 'ISO-2022-KR'; + + case 'cswindows30latin1': + case 'iso88591windows30latin1': + return 'ISO-8859-1-Windows-3.0-Latin-1'; + + case 'cswindows31latin1': + case 'iso88591windows31latin1': + return 'ISO-8859-1-Windows-3.1-Latin-1'; + + case 'csisolatin2': + case 'iso88592': + case 'iso885921987': + case 'isoir101': + case 'l2': + case 'latin2': + return 'ISO-8859-2'; + + case 'cswindows31latin2': + case 'iso88592windowslatin2': + return 'ISO-8859-2-Windows-Latin-2'; + + case 'csisolatin3': + case 'iso88593': + case 'iso885931988': + case 'isoir109': + case 'l3': + case 'latin3': + return 'ISO-8859-3'; + + case 'csisolatin4': + case 'iso88594': + case 'iso885941988': + case 'isoir110': + case 'l4': + case 'latin4': + return 'ISO-8859-4'; + + case 'csisolatincyrillic': + case 'cyrillic': + case 'iso88595': + case 'iso885951988': + case 'isoir144': + return 'ISO-8859-5'; + + case 'arabic': + case 'asmo708': + case 'csisolatinarabic': + case 'ecma114': + case 'iso88596': + case 'iso885961987': + case 'isoir127': + return 'ISO-8859-6'; + + case 'csiso88596e': + case 'iso88596e': + return 'ISO-8859-6-E'; + + case 'csiso88596i': + case 'iso88596i': + return 'ISO-8859-6-I'; + + case 'csisolatingreek': + case 'ecma118': + case 'elot928': + case 'greek': + case 'greek8': + case 'iso88597': + case 'iso885971987': + case 'isoir126': + return 'ISO-8859-7'; + + case 'csisolatinhebrew': + case 'hebrew': + case 'iso88598': + case 'iso885981988': + case 'isoir138': + return 'ISO-8859-8'; + + case 'csiso88598e': + case 'iso88598e': + return 'ISO-8859-8-E'; + + case 'csiso88598i': + case 'iso88598i': + return 'ISO-8859-8-I'; + + case 'cswindows31latin5': + case 'iso88599windowslatin5': + return 'ISO-8859-9-Windows-Latin-5'; + + case 'csisolatin6': + case 'iso885910': + case 'iso8859101992': + case 'isoir157': + case 'l6': + case 'latin6': + return 'ISO-8859-10'; + + case 'iso885913': + return 'ISO-8859-13'; + + case 'iso885914': + case 'iso8859141998': + case 'isoceltic': + case 'isoir199': + case 'l8': + case 'latin8': + return 'ISO-8859-14'; + + case 'iso885915': + case 'latin9': + return 'ISO-8859-15'; + + case 'iso885916': + case 'iso8859162001': + case 'isoir226': + case 'l10': + case 'latin10': + return 'ISO-8859-16'; + + case 'iso10646j1': + return 'ISO-10646-J-1'; + + case 'csunicode': + case 'iso10646ucs2': + return 'ISO-10646-UCS-2'; + + case 'csucs4': + case 'iso10646ucs4': + return 'ISO-10646-UCS-4'; + + case 'csunicodeascii': + case 'iso10646ucsbasic': + return 'ISO-10646-UCS-Basic'; + + case 'csunicodelatin1': + case 'iso10646': + case 'iso10646unicodelatin1': + return 'ISO-10646-Unicode-Latin1'; + + case 'csiso10646utf1': + case 'iso10646utf1': + return 'ISO-10646-UTF-1'; + + case 'csiso115481': + case 'iso115481': + case 'isotr115481': + return 'ISO-11548-1'; + + case 'csiso90': + case 'isoir90': + return 'iso-ir-90'; + + case 'csunicodeibm1261': + case 'isounicodeibm1261': + return 'ISO-Unicode-IBM-1261'; + + case 'csunicodeibm1264': + case 'isounicodeibm1264': + return 'ISO-Unicode-IBM-1264'; + + case 'csunicodeibm1265': + case 'isounicodeibm1265': + return 'ISO-Unicode-IBM-1265'; + + case 'csunicodeibm1268': + case 'isounicodeibm1268': + return 'ISO-Unicode-IBM-1268'; + + case 'csunicodeibm1276': + case 'isounicodeibm1276': + return 'ISO-Unicode-IBM-1276'; + + case 'csiso646basic1983': + case 'iso646basic1983': + case 'ref': + return 'ISO_646.basic:1983'; + + case 'csiso2intlrefversion': + case 'irv': + case 'iso646irv1983': + case 'isoir2': + return 'ISO_646.irv:1983'; + + case 'csiso2033': + case 'e13b': + case 'iso20331983': + case 'isoir98': + return 'ISO_2033-1983'; + + case 'csiso5427cyrillic': + case 'iso5427': + case 'isoir37': + return 'ISO_5427'; + + case 'iso5427cyrillic1981': + case 'iso54271981': + case 'isoir54': + return 'ISO_5427:1981'; + + case 'csiso5428greek': + case 'iso54281980': + case 'isoir55': + return 'ISO_5428:1980'; + + case 'csiso6937add': + case 'iso6937225': + case 'isoir152': + return 'ISO_6937-2-25'; + + case 'csisotextcomm': + case 'iso69372add': + case 'isoir142': + return 'ISO_6937-2-add'; + + case 'csiso8859supp': + case 'iso8859supp': + case 'isoir154': + case 'latin125': + return 'ISO_8859-supp'; + + case 'csiso10367box': + case 'iso10367box': + case 'isoir155': + return 'ISO_10367-box'; + + case 'csiso15italian': + case 'iso646it': + case 'isoir15': + case 'it': + return 'IT'; + + case 'csiso13jisc6220jp': + case 'isoir13': + case 'jisc62201969': + case 'jisc62201969jp': + case 'katakana': + case 'x2017': + return 'JIS_C6220-1969-jp'; + + case 'csiso14jisc6220ro': + case 'iso646jp': + case 'isoir14': + case 'jisc62201969ro': + case 'jp': + return 'JIS_C6220-1969-ro'; + + case 'csiso42jisc62261978': + case 'isoir42': + case 'jisc62261978': + return 'JIS_C6226-1978'; + + case 'csiso87jisx208': + case 'isoir87': + case 'jisc62261983': + case 'jisx2081983': + case 'x208': + return 'JIS_C6226-1983'; + + case 'csiso91jisc62291984a': + case 'isoir91': + case 'jisc62291984a': + case 'jpocra': + return 'JIS_C6229-1984-a'; + + case 'csiso92jisc62991984b': + case 'iso646jpocrb': + case 'isoir92': + case 'jisc62291984b': + case 'jpocrb': + return 'JIS_C6229-1984-b'; + + case 'csiso93jis62291984badd': + case 'isoir93': + case 'jisc62291984badd': + case 'jpocrbadd': + return 'JIS_C6229-1984-b-add'; + + case 'csiso94jis62291984hand': + case 'isoir94': + case 'jisc62291984hand': + case 'jpocrhand': + return 'JIS_C6229-1984-hand'; + + case 'csiso95jis62291984handadd': + case 'isoir95': + case 'jisc62291984handadd': + case 'jpocrhandadd': + return 'JIS_C6229-1984-hand-add'; + + case 'csiso96jisc62291984kana': + case 'isoir96': + case 'jisc62291984kana': + return 'JIS_C6229-1984-kana'; + + case 'csjisencoding': + case 'jisencoding': + return 'JIS_Encoding'; + + case 'cshalfwidthkatakana': + case 'jisx201': + case 'x201': + return 'JIS_X0201'; + + case 'csiso159jisx2121990': + case 'isoir159': + case 'jisx2121990': + case 'x212': + return 'JIS_X0212-1990'; + + case 'csiso141jusib1002': + case 'iso646yu': + case 'isoir141': + case 'js': + case 'jusib1002': + case 'yu': + return 'JUS_I.B1.002'; + + case 'csiso147macedonian': + case 'isoir147': + case 'jusib1003mac': + case 'macedonian': + return 'JUS_I.B1.003-mac'; + + case 'csiso146serbian': + case 'isoir146': + case 'jusib1003serb': + case 'serbian': + return 'JUS_I.B1.003-serb'; + + case 'koi7switched': + return 'KOI7-switched'; + + case 'cskoi8r': + case 'koi8r': + return 'KOI8-R'; + + case 'koi8u': + return 'KOI8-U'; + + case 'csksc5636': + case 'iso646kr': + case 'ksc5636': + return 'KSC5636'; + + case 'cskz1048': + case 'kz1048': + case 'rk1048': + case 'strk10482002': + return 'KZ-1048'; + + case 'csiso19latingreek': + case 'isoir19': + case 'latingreek': + return 'latin-greek'; + + case 'csiso27latingreek1': + case 'isoir27': + case 'latingreek1': + return 'Latin-greek-1'; + + case 'csiso158lap': + case 'isoir158': + case 'lap': + case 'latinlap': + return 'latin-lap'; + + case 'csmacintosh': + case 'mac': + case 'macintosh': + return 'macintosh'; + + case 'csmicrosoftpublishing': + case 'microsoftpublishing': + return 'Microsoft-Publishing'; + + case 'csmnem': + case 'mnem': + return 'MNEM'; + + case 'csmnemonic': + case 'mnemonic': + return 'MNEMONIC'; + + case 'csiso86hungarian': + case 'hu': + case 'iso646hu': + case 'isoir86': + case 'msz77953': + return 'MSZ_7795.3'; + + case 'csnatsdano': + case 'isoir91': + case 'natsdano': + return 'NATS-DANO'; + + case 'csnatsdanoadd': + case 'isoir92': + case 'natsdanoadd': + return 'NATS-DANO-ADD'; + + case 'csnatssefi': + case 'isoir81': + case 'natssefi': + return 'NATS-SEFI'; + + case 'csnatssefiadd': + case 'isoir82': + case 'natssefiadd': + return 'NATS-SEFI-ADD'; + + case 'csiso151cuba': + case 'cuba': + case 'iso646cu': + case 'isoir151': + case 'ncnc1081': + return 'NC_NC00-10:81'; + + case 'csiso69french': + case 'fr': + case 'iso646fr': + case 'isoir69': + case 'nfz62010': + return 'NF_Z_62-010'; + + case 'csiso25french': + case 'iso646fr1': + case 'isoir25': + case 'nfz620101973': + return 'NF_Z_62-010_(1973)'; + + case 'csiso60danishnorwegian': + case 'csiso60norwegian1': + case 'iso646no': + case 'isoir60': + case 'no': + case 'ns45511': + return 'NS_4551-1'; + + case 'csiso61norwegian2': + case 'iso646no2': + case 'isoir61': + case 'no2': + case 'ns45512': + return 'NS_4551-2'; + + case 'osdebcdicdf3irv': + return 'OSD_EBCDIC_DF03_IRV'; + + case 'osdebcdicdf41': + return 'OSD_EBCDIC_DF04_1'; + + case 'osdebcdicdf415': + return 'OSD_EBCDIC_DF04_15'; + + case 'cspc8danishnorwegian': + case 'pc8danishnorwegian': + return 'PC8-Danish-Norwegian'; + + case 'cspc8turkish': + case 'pc8turkish': + return 'PC8-Turkish'; + + case 'csiso16portuguese': + case 'iso646pt': + case 'isoir16': + case 'pt': + return 'PT'; + + case 'csiso84portuguese2': + case 'iso646pt2': + case 'isoir84': + case 'pt2': + return 'PT2'; + + case 'cp154': + case 'csptcp154': + case 'cyrillicasian': + case 'pt154': + case 'ptcp154': + return 'PTCP154'; + + case 'scsu': + return 'SCSU'; + + case 'csiso10swedish': + case 'fi': + case 'iso646fi': + case 'iso646se': + case 'isoir10': + case 'se': + case 'sen850200b': + return 'SEN_850200_B'; + + case 'csiso11swedishfornames': + case 'iso646se2': + case 'isoir11': + case 'se2': + case 'sen850200c': + return 'SEN_850200_C'; + + case 'csiso102t617bit': + case 'isoir102': + case 't617bit': + return 'T.61-7bit'; + + case 'csiso103t618bit': + case 'isoir103': + case 't61': + case 't618bit': + return 'T.61-8bit'; + + case 'csiso128t101g2': + case 'isoir128': + case 't101g2': + return 'T.101-G2'; + + case 'cstscii': + case 'tscii': + return 'TSCII'; + + case 'csunicode11': + case 'unicode11': + return 'UNICODE-1-1'; + + case 'csunicode11utf7': + case 'unicode11utf7': + return 'UNICODE-1-1-UTF-7'; + + case 'csunknown8bit': + case 'unknown8bit': + return 'UNKNOWN-8BIT'; + + case 'ansix341968': + case 'ansix341986': + case 'ascii': + case 'cp367': + case 'csascii': + case 'ibm367': + case 'iso646irv1991': + case 'iso646us': + case 'isoir6': + case 'us': + case 'usascii': + return 'US-ASCII'; + + case 'csusdk': + case 'usdk': + return 'us-dk'; + + case 'utf7': + return 'UTF-7'; + + case 'utf8': + return 'UTF-8'; + + case 'utf16': + return 'UTF-16'; + + case 'utf16be': + return 'UTF-16BE'; + + case 'utf16le': + return 'UTF-16LE'; + + case 'utf32': + return 'UTF-32'; + + case 'utf32be': + return 'UTF-32BE'; + + case 'utf32le': + return 'UTF-32LE'; + + case 'csventurainternational': + case 'venturainternational': + return 'Ventura-International'; + + case 'csventuramath': + case 'venturamath': + return 'Ventura-Math'; + + case 'csventuraus': + case 'venturaus': + return 'Ventura-US'; + + case 'csiso70videotexsupp1': + case 'isoir70': + case 'videotexsuppl': + return 'videotex-suppl'; + + case 'csviqr': + case 'viqr': + return 'VIQR'; + + case 'csviscii': + case 'viscii': + return 'VISCII'; + + case 'csshiftjis': + case 'cswindows31j': + case 'mskanji': + case 'shiftjis': + case 'windows31j': + return 'Windows-31J'; + + case 'iso885911': + case 'tis620': + return 'windows-874'; + + case 'cseuckr': + case 'csksc56011987': + case 'euckr': + case 'isoir149': + case 'korean': + case 'ksc5601': + case 'ksc56011987': + case 'ksc56011989': + case 'windows949': + return 'windows-949'; + + case 'windows1250': + return 'windows-1250'; + + case 'windows1251': + return 'windows-1251'; + + case 'cp819': + case 'csisolatin1': + case 'ibm819': + case 'iso88591': + case 'iso885911987': + case 'isoir100': + case 'l1': + case 'latin1': + case 'windows1252': + return 'windows-1252'; + + case 'windows1253': + return 'windows-1253'; + + case 'csisolatin5': + case 'iso88599': + case 'iso885991989': + case 'isoir148': + case 'l5': + case 'latin5': + case 'windows1254': + return 'windows-1254'; + + case 'windows1255': + return 'windows-1255'; + + case 'windows1256': + return 'windows-1256'; + + case 'windows1257': + return 'windows-1257'; + + case 'windows1258': + return 'windows-1258'; + + default: + return $charset; + } + } + + public static function get_curl_version() + { + if (is_array($curl = curl_version())) + { + $curl = $curl['version']; + } + elseif (substr($curl, 0, 5) === 'curl/') + { + $curl = substr($curl, 5, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 5)); + } + elseif (substr($curl, 0, 8) === 'libcurl/') + { + $curl = substr($curl, 8, strcspn($curl, "\x09\x0A\x0B\x0C\x0D", 8)); + } + else + { + $curl = 0; + } + return $curl; + } + + /** + * Strip HTML comments + * + * @param string $data Data to strip comments from + * @return string Comment stripped string + */ + public static function strip_comments($data) + { + $output = ''; + while (($start = strpos($data, '<!--')) !== false) + { + $output .= substr($data, 0, $start); + if (($end = strpos($data, '-->', $start)) !== false) + { + $data = substr_replace($data, '', 0, $end + 3); + } + else + { + $data = ''; + } + } + return $output . $data; + } + + public static function parse_date($dt) + { + $parser = SimplePie_Parse_Date::get(); + return $parser->parse($dt); + } + + /** + * Decode HTML entities + * + * @deprecated Use DOMDocument instead + * @param string $data Input data + * @return string Output data + */ + public static function entities_decode($data) + { + $decoder = new SimplePie_Decode_HTML_Entities($data); + return $decoder->parse(); + } + + /** + * Remove RFC822 comments + * + * @param string $data Data to strip comments from + * @return string Comment stripped string + */ + public static function uncomment_rfc822($string) + { + $string = (string) $string; + $position = 0; + $length = strlen($string); + $depth = 0; + + $output = ''; + + while ($position < $length && ($pos = strpos($string, '(', $position)) !== false) + { + $output .= substr($string, $position, $pos - $position); + $position = $pos + 1; + if ($string[$pos - 1] !== '\\') + { + $depth++; + while ($depth && $position < $length) + { + $position += strcspn($string, '()', $position); + if ($string[$position - 1] === '\\') + { + $position++; + continue; + } + elseif (isset($string[$position])) + { + switch ($string[$position]) + { + case '(': + $depth++; + break; + + case ')': + $depth--; + break; + } + $position++; + } + else + { + break; + } + } + } + else + { + $output .= '('; + } + } + $output .= substr($string, $position); + + return $output; + } + + public static function parse_mime($mime) + { + if (($pos = strpos($mime, ';')) === false) + { + return trim($mime); + } + else + { + return trim(substr($mime, 0, $pos)); + } + } + + public static function atom_03_construct_type($attribs) + { + if (isset($attribs['']['mode']) && strtolower(trim($attribs['']['mode']) === 'base64')) + { + $mode = SIMPLEPIE_CONSTRUCT_BASE64; + } + else + { + $mode = SIMPLEPIE_CONSTRUCT_NONE; + } + if (isset($attribs['']['type'])) + { + switch (strtolower(trim($attribs['']['type']))) + { + case 'text': + case 'text/plain': + return SIMPLEPIE_CONSTRUCT_TEXT | $mode; + + case 'html': + case 'text/html': + return SIMPLEPIE_CONSTRUCT_HTML | $mode; + + case 'xhtml': + case 'application/xhtml+xml': + return SIMPLEPIE_CONSTRUCT_XHTML | $mode; + + default: + return SIMPLEPIE_CONSTRUCT_NONE | $mode; + } + } + else + { + return SIMPLEPIE_CONSTRUCT_TEXT | $mode; + } + } + + public static function atom_10_construct_type($attribs) + { + if (isset($attribs['']['type'])) + { + switch (strtolower(trim($attribs['']['type']))) + { + case 'text': + return SIMPLEPIE_CONSTRUCT_TEXT; + + case 'html': + return SIMPLEPIE_CONSTRUCT_HTML; + + case 'xhtml': + return SIMPLEPIE_CONSTRUCT_XHTML; + + default: + return SIMPLEPIE_CONSTRUCT_NONE; + } + } + return SIMPLEPIE_CONSTRUCT_TEXT; + } + + public static function atom_10_content_construct_type($attribs) + { + if (isset($attribs['']['type'])) + { + $type = strtolower(trim($attribs['']['type'])); + switch ($type) + { + case 'text': + return SIMPLEPIE_CONSTRUCT_TEXT; + + case 'html': + return SIMPLEPIE_CONSTRUCT_HTML; + + case 'xhtml': + return SIMPLEPIE_CONSTRUCT_XHTML; + } + if (in_array(substr($type, -4), array('+xml', '/xml')) || substr($type, 0, 5) === 'text/') + { + return SIMPLEPIE_CONSTRUCT_NONE; + } + else + { + return SIMPLEPIE_CONSTRUCT_BASE64; + } + } + else + { + return SIMPLEPIE_CONSTRUCT_TEXT; + } + } + + public static function is_isegment_nz_nc($string) + { + return (bool) preg_match('/^([A-Za-z0-9\-._~\x{A0}-\x{D7FF}\x{F900}-\x{FDCF}\x{FDF0}-\x{FFEF}\x{10000}-\x{1FFFD}\x{20000}-\x{2FFFD}\x{30000}-\x{3FFFD}\x{40000}-\x{4FFFD}\x{50000}-\x{5FFFD}\x{60000}-\x{6FFFD}\x{70000}-\x{7FFFD}\x{80000}-\x{8FFFD}\x{90000}-\x{9FFFD}\x{A0000}-\x{AFFFD}\x{B0000}-\x{BFFFD}\x{C0000}-\x{CFFFD}\x{D0000}-\x{DFFFD}\x{E1000}-\x{EFFFD}!$&\'()*+,;=@]|(%[0-9ABCDEF]{2}))+$/u', $string); + } + + public static function space_seperated_tokens($string) + { + $space_characters = "\x20\x09\x0A\x0B\x0C\x0D"; + $string_length = strlen($string); + + $position = strspn($string, $space_characters); + $tokens = array(); + + while ($position < $string_length) + { + $len = strcspn($string, $space_characters, $position); + $tokens[] = substr($string, $position, $len); + $position += $len; + $position += strspn($string, $space_characters, $position); + } + + return $tokens; + } + + /** + * Converts a unicode codepoint to a UTF-8 character + * + * @static + * @param int $codepoint Unicode codepoint + * @return string UTF-8 character + */ + public static function codepoint_to_utf8($codepoint) + { + $codepoint = (int) $codepoint; + if ($codepoint < 0) + { + return false; + } + else if ($codepoint <= 0x7f) + { + return chr($codepoint); + } + else if ($codepoint <= 0x7ff) + { + return chr(0xc0 | ($codepoint >> 6)) . chr(0x80 | ($codepoint & 0x3f)); + } + else if ($codepoint <= 0xffff) + { + return chr(0xe0 | ($codepoint >> 12)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f)); + } + else if ($codepoint <= 0x10ffff) + { + return chr(0xf0 | ($codepoint >> 18)) . chr(0x80 | (($codepoint >> 12) & 0x3f)) . chr(0x80 | (($codepoint >> 6) & 0x3f)) . chr(0x80 | ($codepoint & 0x3f)); + } + else + { + // U+FFFD REPLACEMENT CHARACTER + return "\xEF\xBF\xBD"; + } + } + + /** + * Similar to parse_str() + * + * Returns an associative array of name/value pairs, where the value is an + * array of values that have used the same name + * + * @static + * @param string $str The input string. + * @return array + */ + public static function parse_str($str) + { + $return = array(); + $str = explode('&', $str); + + foreach ($str as $section) + { + if (strpos($section, '=') !== false) + { + list($name, $value) = explode('=', $section, 2); + $return[urldecode($name)][] = urldecode($value); + } + else + { + $return[urldecode($section)][] = null; + } + } + + return $return; + } + + /** + * Detect XML encoding, as per XML 1.0 Appendix F.1 + * + * @todo Add support for EBCDIC + * @param string $data XML data + * @param SimplePie_Registry $registry Class registry + * @return array Possible encodings + */ + public static function xml_encoding($data, $registry) + { + // UTF-32 Big Endian BOM + if (substr($data, 0, 4) === "\x00\x00\xFE\xFF") + { + $encoding[] = 'UTF-32BE'; + } + // UTF-32 Little Endian BOM + elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00") + { + $encoding[] = 'UTF-32LE'; + } + // UTF-16 Big Endian BOM + elseif (substr($data, 0, 2) === "\xFE\xFF") + { + $encoding[] = 'UTF-16BE'; + } + // UTF-16 Little Endian BOM + elseif (substr($data, 0, 2) === "\xFF\xFE") + { + $encoding[] = 'UTF-16LE'; + } + // UTF-8 BOM + elseif (substr($data, 0, 3) === "\xEF\xBB\xBF") + { + $encoding[] = 'UTF-8'; + } + // UTF-32 Big Endian Without BOM + elseif (substr($data, 0, 20) === "\x00\x00\x00\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C") + { + if ($pos = strpos($data, "\x00\x00\x00\x3F\x00\x00\x00\x3E")) + { + $parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32BE', 'UTF-8'))); + if ($parser->parse()) + { + $encoding[] = $parser->encoding; + } + } + $encoding[] = 'UTF-32BE'; + } + // UTF-32 Little Endian Without BOM + elseif (substr($data, 0, 20) === "\x3C\x00\x00\x00\x3F\x00\x00\x00\x78\x00\x00\x00\x6D\x00\x00\x00\x6C\x00\x00\x00") + { + if ($pos = strpos($data, "\x3F\x00\x00\x00\x3E\x00\x00\x00")) + { + $parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 20), 'UTF-32LE', 'UTF-8'))); + if ($parser->parse()) + { + $encoding[] = $parser->encoding; + } + } + $encoding[] = 'UTF-32LE'; + } + // UTF-16 Big Endian Without BOM + elseif (substr($data, 0, 10) === "\x00\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C") + { + if ($pos = strpos($data, "\x00\x3F\x00\x3E")) + { + $parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16BE', 'UTF-8'))); + if ($parser->parse()) + { + $encoding[] = $parser->encoding; + } + } + $encoding[] = 'UTF-16BE'; + } + // UTF-16 Little Endian Without BOM + elseif (substr($data, 0, 10) === "\x3C\x00\x3F\x00\x78\x00\x6D\x00\x6C\x00") + { + if ($pos = strpos($data, "\x3F\x00\x3E\x00")) + { + $parser = $registry->create('XML_Declaration_Parser', array(SimplePie_Misc::change_encoding(substr($data, 20, $pos - 10), 'UTF-16LE', 'UTF-8'))); + if ($parser->parse()) + { + $encoding[] = $parser->encoding; + } + } + $encoding[] = 'UTF-16LE'; + } + // US-ASCII (or superset) + elseif (substr($data, 0, 5) === "\x3C\x3F\x78\x6D\x6C") + { + if ($pos = strpos($data, "\x3F\x3E")) + { + $parser = $registry->create('XML_Declaration_Parser', array(substr($data, 5, $pos - 5))); + if ($parser->parse()) + { + $encoding[] = $parser->encoding; + } + } + $encoding[] = 'UTF-8'; + } + // Fallback to UTF-8 + else + { + $encoding[] = 'UTF-8'; + } + return $encoding; + } + + public static function output_javascript() + { + if (function_exists('ob_gzhandler')) + { + ob_start('ob_gzhandler'); + } + header('Content-type: text/javascript; charset: UTF-8'); + header('Cache-Control: must-revalidate'); + header('Expires: ' . gmdate('D, d M Y H:i:s', time() + 604800) . ' GMT'); // 7 days + ?> +function embed_quicktime(type, bgcolor, width, height, link, placeholder, loop) { + if (placeholder != '') { + document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" href="'+link+'" src="'+placeholder+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="false" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>'); + } + else { + document.writeln('<embed type="'+type+'" style="cursor:hand; cursor:pointer;" src="'+link+'" width="'+width+'" height="'+height+'" autoplay="false" target="myself" controller="true" loop="'+loop+'" scale="aspect" bgcolor="'+bgcolor+'" pluginspage="http://www.apple.com/quicktime/download/"></embed>'); + } +} + +function embed_flash(bgcolor, width, height, link, loop, type) { + document.writeln('<embed src="'+link+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="'+type+'" quality="high" width="'+width+'" height="'+height+'" bgcolor="'+bgcolor+'" loop="'+loop+'"></embed>'); +} + +function embed_flv(width, height, link, placeholder, loop, player) { + document.writeln('<embed src="'+player+'" pluginspage="http://www.macromedia.com/go/getflashplayer" type="application/x-shockwave-flash" quality="high" width="'+width+'" height="'+height+'" wmode="transparent" flashvars="file='+link+'&autostart=false&repeat='+loop+'&showdigits=true&showfsbutton=false"></embed>'); +} + +function embed_wmedia(width, height, link) { + document.writeln('<embed type="application/x-mplayer2" src="'+link+'" autosize="1" width="'+width+'" height="'+height+'" showcontrols="1" showstatusbar="0" showdisplay="0" autostart="0"></embed>'); +} + <?php + } + + /** + * Get the SimplePie build timestamp + * + * Uses the git index if it exists, otherwise uses the modification time + * of the newest file. + */ + public static function get_build() + { + $root = dirname(dirname(__FILE__)); + if (file_exists($root . '/.git/index')) + { + return filemtime($root . '/.git/index'); + } + elseif (file_exists($root . '/SimplePie')) + { + $time = 0; + foreach (glob($root . '/SimplePie/*.php') as $file) + { + if (($mtime = filemtime($file)) > $time) + { + $time = $mtime; + } + } + return $time; + } + elseif (file_exists(dirname(__FILE__) . '/Core.php')) + { + return filemtime(dirname(__FILE__) . '/Core.php'); + } + else + { + return filemtime(__FILE__); + } + } + + /** + * Format debugging information + */ + public static function debug(&$sp) + { + $info = 'SimplePie ' . SIMPLEPIE_VERSION . ' Build ' . SIMPLEPIE_BUILD . "\n"; + $info .= 'PHP ' . PHP_VERSION . "\n"; + if ($sp->error() !== null) + { + $info .= 'Error occurred: ' . $sp->error() . "\n"; + } + else + { + $info .= "No error found.\n"; + } + $info .= "Extensions:\n"; + $extensions = array('pcre', 'curl', 'zlib', 'mbstring', 'iconv', 'xmlreader', 'xml'); + foreach ($extensions as $ext) + { + if (extension_loaded($ext)) + { + $info .= " $ext loaded\n"; + switch ($ext) + { + case 'pcre': + $info .= ' Version ' . PCRE_VERSION . "\n"; + break; + case 'curl': + $version = curl_version(); + $info .= ' Version ' . $version['version'] . "\n"; + break; + case 'mbstring': + $info .= ' Overloading: ' . mb_get_info('func_overload') . "\n"; + break; + case 'iconv': + $info .= ' Version ' . ICONV_VERSION . "\n"; + break; + case 'xml': + $info .= ' Version ' . LIBXML_DOTTED_VERSION . "\n"; + break; + } + } + else + { + $info .= " $ext not loaded\n"; + } + } + return $info; + } + + public static function silence_errors($num, $str) + { + // No-op + } +} + +/** + * Class to validate and to work with IPv6 addresses. + * + * @package SimplePie + * @subpackage HTTP + * @copyright 2003-2005 The PHP Group + * @license http://www.opensource.org/licenses/bsd-license.php + * @link http://pear.php.net/package/Net_IPv6 + * @author Alexander Merz <alexander.merz@web.de> + * @author elfrink at introweb dot nl + * @author Josh Peck <jmp at joshpeck dot org> + * @author Geoffrey Sneddon <geoffers@gmail.com> + */ +class SimplePie_Net_IPv6 +{ + /** + * Uncompresses an IPv6 address + * + * RFC 4291 allows you to compress concecutive zero pieces in an address to + * '::'. This method expects a valid IPv6 address and expands the '::' to + * the required number of zero pieces. + * + * Example: FF01::101 -> FF01:0:0:0:0:0:0:101 + * ::1 -> 0:0:0:0:0:0:0:1 + * + * @author Alexander Merz <alexander.merz@web.de> + * @author elfrink at introweb dot nl + * @author Josh Peck <jmp at joshpeck dot org> + * @copyright 2003-2005 The PHP Group + * @license http://www.opensource.org/licenses/bsd-license.php + * @param string $ip An IPv6 address + * @return string The uncompressed IPv6 address + */ + public static function uncompress($ip) + { + $c1 = -1; + $c2 = -1; + if (substr_count($ip, '::') === 1) + { + list($ip1, $ip2) = explode('::', $ip); + if ($ip1 === '') + { + $c1 = -1; + } + else + { + $c1 = substr_count($ip1, ':'); + } + if ($ip2 === '') + { + $c2 = -1; + } + else + { + $c2 = substr_count($ip2, ':'); + } + if (strpos($ip2, '.') !== false) + { + $c2++; + } + // :: + if ($c1 === -1 && $c2 === -1) + { + $ip = '0:0:0:0:0:0:0:0'; + } + // ::xxx + else if ($c1 === -1) + { + $fill = str_repeat('0:', 7 - $c2); + $ip = str_replace('::', $fill, $ip); + } + // xxx:: + else if ($c2 === -1) + { + $fill = str_repeat(':0', 7 - $c1); + $ip = str_replace('::', $fill, $ip); + } + // xxx::xxx + else + { + $fill = ':' . str_repeat('0:', 6 - $c2 - $c1); + $ip = str_replace('::', $fill, $ip); + } + } + return $ip; + } + + /** + * Compresses an IPv6 address + * + * RFC 4291 allows you to compress concecutive zero pieces in an address to + * '::'. This method expects a valid IPv6 address and compresses consecutive + * zero pieces to '::'. + * + * Example: FF01:0:0:0:0:0:0:101 -> FF01::101 + * 0:0:0:0:0:0:0:1 -> ::1 + * + * @see uncompress() + * @param string $ip An IPv6 address + * @return string The compressed IPv6 address + */ + public static function compress($ip) + { + // Prepare the IP to be compressed + $ip = self::uncompress($ip); + $ip_parts = self::split_v6_v4($ip); + + // Replace all leading zeros + $ip_parts[0] = preg_replace('/(^|:)0+([0-9])/', '\1\2', $ip_parts[0]); + + // Find bunches of zeros + if (preg_match_all('/(?:^|:)(?:0(?::|$))+/', $ip_parts[0], $matches, PREG_OFFSET_CAPTURE)) + { + $max = 0; + $pos = null; + foreach ($matches[0] as $match) + { + if (strlen($match[0]) > $max) + { + $max = strlen($match[0]); + $pos = $match[1]; + } + } + + $ip_parts[0] = substr_replace($ip_parts[0], '::', $pos, $max); + } + + if ($ip_parts[1] !== '') + { + return implode(':', $ip_parts); + } + else + { + return $ip_parts[0]; + } + } + + /** + * Splits an IPv6 address into the IPv6 and IPv4 representation parts + * + * RFC 4291 allows you to represent the last two parts of an IPv6 address + * using the standard IPv4 representation + * + * Example: 0:0:0:0:0:0:13.1.68.3 + * 0:0:0:0:0:FFFF:129.144.52.38 + * + * @param string $ip An IPv6 address + * @return array [0] contains the IPv6 represented part, and [1] the IPv4 represented part + */ + private static function split_v6_v4($ip) + { + if (strpos($ip, '.') !== false) + { + $pos = strrpos($ip, ':'); + $ipv6_part = substr($ip, 0, $pos); + $ipv4_part = substr($ip, $pos + 1); + return array($ipv6_part, $ipv4_part); + } + else + { + return array($ip, ''); + } + } + + /** + * Checks an IPv6 address + * + * Checks if the given IP is a valid IPv6 address + * + * @param string $ip An IPv6 address + * @return bool true if $ip is a valid IPv6 address + */ + public static function check_ipv6($ip) + { + $ip = self::uncompress($ip); + list($ipv6, $ipv4) = self::split_v6_v4($ip); + $ipv6 = explode(':', $ipv6); + $ipv4 = explode('.', $ipv4); + if (count($ipv6) === 8 && count($ipv4) === 1 || count($ipv6) === 6 && count($ipv4) === 4) + { + foreach ($ipv6 as $ipv6_part) + { + // The section can't be empty + if ($ipv6_part === '') + return false; + + // Nor can it be over four characters + if (strlen($ipv6_part) > 4) + return false; + + // Remove leading zeros (this is safe because of the above) + $ipv6_part = ltrim($ipv6_part, '0'); + if ($ipv6_part === '') + $ipv6_part = '0'; + + // Check the value is valid + $value = hexdec($ipv6_part); + if (dechex($value) !== strtolower($ipv6_part) || $value < 0 || $value > 0xFFFF) + return false; + } + if (count($ipv4) === 4) + { + foreach ($ipv4 as $ipv4_part) + { + $value = (int) $ipv4_part; + if ((string) $value !== $ipv4_part || $value < 0 || $value > 0xFF) + return false; + } + } + return true; + } + else + { + return false; + } + } + + /** + * Checks if the given IP is a valid IPv6 address + * + * @codeCoverageIgnore + * @deprecated Use {@see SimplePie_Net_IPv6::check_ipv6()} instead + * @see check_ipv6 + * @param string $ip An IPv6 address + * @return bool true if $ip is a valid IPv6 address + */ + public static function checkIPv6($ip) + { + return self::check_ipv6($ip); + } +} + +/** + * Date Parser + * + * @package SimplePie + * @subpackage Parsing + */ +class SimplePie_Parse_Date +{ + /** + * Input data + * + * @access protected + * @var string + */ + var $date; + + /** + * List of days, calendar day name => ordinal day number in the week + * + * @access protected + * @var array + */ + var $day = array( + // English + 'mon' => 1, + 'monday' => 1, + 'tue' => 2, + 'tuesday' => 2, + 'wed' => 3, + 'wednesday' => 3, + 'thu' => 4, + 'thursday' => 4, + 'fri' => 5, + 'friday' => 5, + 'sat' => 6, + 'saturday' => 6, + 'sun' => 7, + 'sunday' => 7, + // Dutch + 'maandag' => 1, + 'dinsdag' => 2, + 'woensdag' => 3, + 'donderdag' => 4, + 'vrijdag' => 5, + 'zaterdag' => 6, + 'zondag' => 7, + // French + 'lundi' => 1, + 'mardi' => 2, + 'mercredi' => 3, + 'jeudi' => 4, + 'vendredi' => 5, + 'samedi' => 6, + 'dimanche' => 7, + // German + 'montag' => 1, + 'dienstag' => 2, + 'mittwoch' => 3, + 'donnerstag' => 4, + 'freitag' => 5, + 'samstag' => 6, + 'sonnabend' => 6, + 'sonntag' => 7, + // Italian + 'lunedì' => 1, + 'martedì' => 2, + 'mercoledì' => 3, + 'giovedì' => 4, + 'venerdì' => 5, + 'sabato' => 6, + 'domenica' => 7, + // Spanish + 'lunes' => 1, + 'martes' => 2, + 'miércoles' => 3, + 'jueves' => 4, + 'viernes' => 5, + 'sábado' => 6, + 'domingo' => 7, + // Finnish + 'maanantai' => 1, + 'tiistai' => 2, + 'keskiviikko' => 3, + 'torstai' => 4, + 'perjantai' => 5, + 'lauantai' => 6, + 'sunnuntai' => 7, + // Hungarian + 'hétfő' => 1, + 'kedd' => 2, + 'szerda' => 3, + 'csütörtok' => 4, + 'péntek' => 5, + 'szombat' => 6, + 'vasárnap' => 7, + // Greek + 'Δευ' => 1, + 'Τρι' => 2, + 'Τετ' => 3, + 'Πεμ' => 4, + 'Παρ' => 5, + 'Σαβ' => 6, + 'Κυρ' => 7, + ); + + /** + * List of months, calendar month name => calendar month number + * + * @access protected + * @var array + */ + var $month = array( + // English + 'jan' => 1, + 'january' => 1, + 'feb' => 2, + 'february' => 2, + 'mar' => 3, + 'march' => 3, + 'apr' => 4, + 'april' => 4, + 'may' => 5, + // No long form of May + 'jun' => 6, + 'june' => 6, + 'jul' => 7, + 'july' => 7, + 'aug' => 8, + 'august' => 8, + 'sep' => 9, + 'september' => 8, + 'oct' => 10, + 'october' => 10, + 'nov' => 11, + 'november' => 11, + 'dec' => 12, + 'december' => 12, + // Dutch + 'januari' => 1, + 'februari' => 2, + 'maart' => 3, + 'april' => 4, + 'mei' => 5, + 'juni' => 6, + 'juli' => 7, + 'augustus' => 8, + 'september' => 9, + 'oktober' => 10, + 'november' => 11, + 'december' => 12, + // French + 'janvier' => 1, + 'février' => 2, + 'mars' => 3, + 'avril' => 4, + 'mai' => 5, + 'juin' => 6, + 'juillet' => 7, + 'août' => 8, + 'septembre' => 9, + 'octobre' => 10, + 'novembre' => 11, + 'décembre' => 12, + // German + 'januar' => 1, + 'februar' => 2, + 'märz' => 3, + 'april' => 4, + 'mai' => 5, + 'juni' => 6, + 'juli' => 7, + 'august' => 8, + 'september' => 9, + 'oktober' => 10, + 'november' => 11, + 'dezember' => 12, + // Italian + 'gennaio' => 1, + 'febbraio' => 2, + 'marzo' => 3, + 'aprile' => 4, + 'maggio' => 5, + 'giugno' => 6, + 'luglio' => 7, + 'agosto' => 8, + 'settembre' => 9, + 'ottobre' => 10, + 'novembre' => 11, + 'dicembre' => 12, + // Spanish + 'enero' => 1, + 'febrero' => 2, + 'marzo' => 3, + 'abril' => 4, + 'mayo' => 5, + 'junio' => 6, + 'julio' => 7, + 'agosto' => 8, + 'septiembre' => 9, + 'setiembre' => 9, + 'octubre' => 10, + 'noviembre' => 11, + 'diciembre' => 12, + // Finnish + 'tammikuu' => 1, + 'helmikuu' => 2, + 'maaliskuu' => 3, + 'huhtikuu' => 4, + 'toukokuu' => 5, + 'kesäkuu' => 6, + 'heinäkuu' => 7, + 'elokuu' => 8, + 'suuskuu' => 9, + 'lokakuu' => 10, + 'marras' => 11, + 'joulukuu' => 12, + // Hungarian + 'január' => 1, + 'február' => 2, + 'március' => 3, + 'április' => 4, + 'május' => 5, + 'június' => 6, + 'július' => 7, + 'augusztus' => 8, + 'szeptember' => 9, + 'október' => 10, + 'november' => 11, + 'december' => 12, + // Greek + 'Ιαν' => 1, + 'Φεβ' => 2, + 'Μάώ' => 3, + 'Μαώ' => 3, + 'Απρ' => 4, + 'Μάι' => 5, + 'Μαϊ' => 5, + 'Μαι' => 5, + 'Ιούν' => 6, + 'Ιον' => 6, + 'Ιούλ' => 7, + 'Ιολ' => 7, + 'Αύγ' => 8, + 'Αυγ' => 8, + 'Σεπ' => 9, + 'Οκτ' => 10, + 'Νοέ' => 11, + 'Δεκ' => 12, + ); + + /** + * List of timezones, abbreviation => offset from UTC + * + * @access protected + * @var array + */ + var $timezone = array( + 'ACDT' => 37800, + 'ACIT' => 28800, + 'ACST' => 34200, + 'ACT' => -18000, + 'ACWDT' => 35100, + 'ACWST' => 31500, + 'AEDT' => 39600, + 'AEST' => 36000, + 'AFT' => 16200, + 'AKDT' => -28800, + 'AKST' => -32400, + 'AMDT' => 18000, + 'AMT' => -14400, + 'ANAST' => 46800, + 'ANAT' => 43200, + 'ART' => -10800, + 'AZOST' => -3600, + 'AZST' => 18000, + 'AZT' => 14400, + 'BIOT' => 21600, + 'BIT' => -43200, + 'BOT' => -14400, + 'BRST' => -7200, + 'BRT' => -10800, + 'BST' => 3600, + 'BTT' => 21600, + 'CAST' => 18000, + 'CAT' => 7200, + 'CCT' => 23400, + 'CDT' => -18000, + 'CEDT' => 7200, + 'CET' => 3600, + 'CGST' => -7200, + 'CGT' => -10800, + 'CHADT' => 49500, + 'CHAST' => 45900, + 'CIST' => -28800, + 'CKT' => -36000, + 'CLDT' => -10800, + 'CLST' => -14400, + 'COT' => -18000, + 'CST' => -21600, + 'CVT' => -3600, + 'CXT' => 25200, + 'DAVT' => 25200, + 'DTAT' => 36000, + 'EADT' => -18000, + 'EAST' => -21600, + 'EAT' => 10800, + 'ECT' => -18000, + 'EDT' => -14400, + 'EEST' => 10800, + 'EET' => 7200, + 'EGT' => -3600, + 'EKST' => 21600, + 'EST' => -18000, + 'FJT' => 43200, + 'FKDT' => -10800, + 'FKST' => -14400, + 'FNT' => -7200, + 'GALT' => -21600, + 'GEDT' => 14400, + 'GEST' => 10800, + 'GFT' => -10800, + 'GILT' => 43200, + 'GIT' => -32400, + 'GST' => 14400, + 'GST' => -7200, + 'GYT' => -14400, + 'HAA' => -10800, + 'HAC' => -18000, + 'HADT' => -32400, + 'HAE' => -14400, + 'HAP' => -25200, + 'HAR' => -21600, + 'HAST' => -36000, + 'HAT' => -9000, + 'HAY' => -28800, + 'HKST' => 28800, + 'HMT' => 18000, + 'HNA' => -14400, + 'HNC' => -21600, + 'HNE' => -18000, + 'HNP' => -28800, + 'HNR' => -25200, + 'HNT' => -12600, + 'HNY' => -32400, + 'IRDT' => 16200, + 'IRKST' => 32400, + 'IRKT' => 28800, + 'IRST' => 12600, + 'JFDT' => -10800, + 'JFST' => -14400, + 'JST' => 32400, + 'KGST' => 21600, + 'KGT' => 18000, + 'KOST' => 39600, + 'KOVST' => 28800, + 'KOVT' => 25200, + 'KRAST' => 28800, + 'KRAT' => 25200, + 'KST' => 32400, + 'LHDT' => 39600, + 'LHST' => 37800, + 'LINT' => 50400, + 'LKT' => 21600, + 'MAGST' => 43200, + 'MAGT' => 39600, + 'MAWT' => 21600, + 'MDT' => -21600, + 'MESZ' => 7200, + 'MEZ' => 3600, + 'MHT' => 43200, + 'MIT' => -34200, + 'MNST' => 32400, + 'MSDT' => 14400, + 'MSST' => 10800, + 'MST' => -25200, + 'MUT' => 14400, + 'MVT' => 18000, + 'MYT' => 28800, + 'NCT' => 39600, + 'NDT' => -9000, + 'NFT' => 41400, + 'NMIT' => 36000, + 'NOVST' => 25200, + 'NOVT' => 21600, + 'NPT' => 20700, + 'NRT' => 43200, + 'NST' => -12600, + 'NUT' => -39600, + 'NZDT' => 46800, + 'NZST' => 43200, + 'OMSST' => 25200, + 'OMST' => 21600, + 'PDT' => -25200, + 'PET' => -18000, + 'PETST' => 46800, + 'PETT' => 43200, + 'PGT' => 36000, + 'PHOT' => 46800, + 'PHT' => 28800, + 'PKT' => 18000, + 'PMDT' => -7200, + 'PMST' => -10800, + 'PONT' => 39600, + 'PST' => -28800, + 'PWT' => 32400, + 'PYST' => -10800, + 'PYT' => -14400, + 'RET' => 14400, + 'ROTT' => -10800, + 'SAMST' => 18000, + 'SAMT' => 14400, + 'SAST' => 7200, + 'SBT' => 39600, + 'SCDT' => 46800, + 'SCST' => 43200, + 'SCT' => 14400, + 'SEST' => 3600, + 'SGT' => 28800, + 'SIT' => 28800, + 'SRT' => -10800, + 'SST' => -39600, + 'SYST' => 10800, + 'SYT' => 7200, + 'TFT' => 18000, + 'THAT' => -36000, + 'TJT' => 18000, + 'TKT' => -36000, + 'TMT' => 18000, + 'TOT' => 46800, + 'TPT' => 32400, + 'TRUT' => 36000, + 'TVT' => 43200, + 'TWT' => 28800, + 'UYST' => -7200, + 'UYT' => -10800, + 'UZT' => 18000, + 'VET' => -14400, + 'VLAST' => 39600, + 'VLAT' => 36000, + 'VOST' => 21600, + 'VUT' => 39600, + 'WAST' => 7200, + 'WAT' => 3600, + 'WDT' => 32400, + 'WEST' => 3600, + 'WFT' => 43200, + 'WIB' => 25200, + 'WIT' => 32400, + 'WITA' => 28800, + 'WKST' => 18000, + 'WST' => 28800, + 'YAKST' => 36000, + 'YAKT' => 32400, + 'YAPT' => 36000, + 'YEKST' => 21600, + 'YEKT' => 18000, + ); + + /** + * Cached PCRE for SimplePie_Parse_Date::$day + * + * @access protected + * @var string + */ + var $day_pcre; + + /** + * Cached PCRE for SimplePie_Parse_Date::$month + * + * @access protected + * @var string + */ + var $month_pcre; + + /** + * Array of user-added callback methods + * + * @access private + * @var array + */ + var $built_in = array(); + + /** + * Array of user-added callback methods + * + * @access private + * @var array + */ + var $user = array(); + + /** + * Create new SimplePie_Parse_Date object, and set self::day_pcre, + * self::month_pcre, and self::built_in + * + * @access private + */ + public function __construct() + { + $this->day_pcre = '(' . implode(array_keys($this->day), '|') . ')'; + $this->month_pcre = '(' . implode(array_keys($this->month), '|') . ')'; + + static $cache; + if (!isset($cache[get_class($this)])) + { + $all_methods = get_class_methods($this); + + foreach ($all_methods as $method) + { + if (strtolower(substr($method, 0, 5)) === 'date_') + { + $cache[get_class($this)][] = $method; + } + } + } + + foreach ($cache[get_class($this)] as $method) + { + $this->built_in[] = $method; + } + } + + /** + * Get the object + * + * @access public + */ + public static function get() + { + static $object; + if (!$object) + { + $object = new SimplePie_Parse_Date; + } + return $object; + } + + /** + * Parse a date + * + * @final + * @access public + * @param string $date Date to parse + * @return int Timestamp corresponding to date string, or false on failure + */ + public function parse($date) + { + foreach ($this->user as $method) + { + if (($returned = call_user_func($method, $date)) !== false) + { + return $returned; + } + } + + foreach ($this->built_in as $method) + { + if (($returned = call_user_func(array($this, $method), $date)) !== false) + { + return $returned; + } + } + + return false; + } + + /** + * Add a callback method to parse a date + * + * @final + * @access public + * @param callback $callback + */ + public function add_callback($callback) + { + if (is_callable($callback)) + { + $this->user[] = $callback; + } + else + { + trigger_error('User-supplied function must be a valid callback', E_USER_WARNING); + } + } + + /** + * Parse a superset of W3C-DTF (allows hyphens and colons to be omitted, as + * well as allowing any of upper or lower case "T", horizontal tabs, or + * spaces to be used as the time seperator (including more than one)) + * + * @access protected + * @return int Timestamp + */ + public function date_w3cdtf($date) + { + static $pcre; + if (!$pcre) + { + $year = '([0-9]{4})'; + $month = $day = $hour = $minute = $second = '([0-9]{2})'; + $decimal = '([0-9]*)'; + $zone = '(?:(Z)|([+\-])([0-9]{1,2}):?([0-9]{1,2}))'; + $pcre = '/^' . $year . '(?:-?' . $month . '(?:-?' . $day . '(?:[Tt\x09\x20]+' . $hour . '(?::?' . $minute . '(?::?' . $second . '(?:.' . $decimal . ')?)?)?' . $zone . ')?)?)?$/'; + } + if (preg_match($pcre, $date, $match)) + { + /* + Capturing subpatterns: + 1: Year + 2: Month + 3: Day + 4: Hour + 5: Minute + 6: Second + 7: Decimal fraction of a second + 8: Zulu + 9: Timezone ± + 10: Timezone hours + 11: Timezone minutes + */ + + // Fill in empty matches + for ($i = count($match); $i <= 3; $i++) + { + $match[$i] = '1'; + } + + for ($i = count($match); $i <= 7; $i++) + { + $match[$i] = '0'; + } + + // Numeric timezone + if (isset($match[9]) && $match[9] !== '') + { + $timezone = $match[10] * 3600; + $timezone += $match[11] * 60; + if ($match[9] === '-') + { + $timezone = 0 - $timezone; + } + } + else + { + $timezone = 0; + } + + // Convert the number of seconds to an integer, taking decimals into account + $second = round($match[6] + $match[7] / pow(10, strlen($match[7]))); + + return gmmktime($match[4], $match[5], $second, $match[2], $match[3], $match[1]) - $timezone; + } + else + { + return false; + } + } + + /** + * Remove RFC822 comments + * + * @access protected + * @param string $data Data to strip comments from + * @return string Comment stripped string + */ + public function remove_rfc2822_comments($string) + { + $string = (string) $string; + $position = 0; + $length = strlen($string); + $depth = 0; + + $output = ''; + + while ($position < $length && ($pos = strpos($string, '(', $position)) !== false) + { + $output .= substr($string, $position, $pos - $position); + $position = $pos + 1; + if ($string[$pos - 1] !== '\\') + { + $depth++; + while ($depth && $position < $length) + { + $position += strcspn($string, '()', $position); + if ($string[$position - 1] === '\\') + { + $position++; + continue; + } + elseif (isset($string[$position])) + { + switch ($string[$position]) + { + case '(': + $depth++; + break; + + case ')': + $depth--; + break; + } + $position++; + } + else + { + break; + } + } + } + else + { + $output .= '('; + } + } + $output .= substr($string, $position); + + return $output; + } + + /** + * Parse RFC2822's date format + * + * @access protected + * @return int Timestamp + */ + public function date_rfc2822($date) + { + static $pcre; + if (!$pcre) + { + $wsp = '[\x09\x20]'; + $fws = '(?:' . $wsp . '+|' . $wsp . '*(?:\x0D\x0A' . $wsp . '+)+)'; + $optional_fws = $fws . '?'; + $day_name = $this->day_pcre; + $month = $this->month_pcre; + $day = '([0-9]{1,2})'; + $hour = $minute = $second = '([0-9]{2})'; + $year = '([0-9]{2,4})'; + $num_zone = '([+\-])([0-9]{2})([0-9]{2})'; + $character_zone = '([A-Z]{1,5})'; + $zone = '(?:' . $num_zone . '|' . $character_zone . ')'; + $pcre = '/(?:' . $optional_fws . $day_name . $optional_fws . ',)?' . $optional_fws . $day . $fws . $month . $fws . $year . $fws . $hour . $optional_fws . ':' . $optional_fws . $minute . '(?:' . $optional_fws . ':' . $optional_fws . $second . ')?' . $fws . $zone . '/i'; + } + if (preg_match($pcre, $this->remove_rfc2822_comments($date), $match)) + { + /* + Capturing subpatterns: + 1: Day name + 2: Day + 3: Month + 4: Year + 5: Hour + 6: Minute + 7: Second + 8: Timezone ± + 9: Timezone hours + 10: Timezone minutes + 11: Alphabetic timezone + */ + + // Find the month number + $month = $this->month[strtolower($match[3])]; + + // Numeric timezone + if ($match[8] !== '') + { + $timezone = $match[9] * 3600; + $timezone += $match[10] * 60; + if ($match[8] === '-') + { + $timezone = 0 - $timezone; + } + } + // Character timezone + elseif (isset($this->timezone[strtoupper($match[11])])) + { + $timezone = $this->timezone[strtoupper($match[11])]; + } + // Assume everything else to be -0000 + else + { + $timezone = 0; + } + + // Deal with 2/3 digit years + if ($match[4] < 50) + { + $match[4] += 2000; + } + elseif ($match[4] < 1000) + { + $match[4] += 1900; + } + + // Second is optional, if it is empty set it to zero + if ($match[7] !== '') + { + $second = $match[7]; + } + else + { + $second = 0; + } + + return gmmktime($match[5], $match[6], $second, $month, $match[2], $match[4]) - $timezone; + } + else + { + return false; + } + } + + /** + * Parse RFC850's date format + * + * @access protected + * @return int Timestamp + */ + public function date_rfc850($date) + { + static $pcre; + if (!$pcre) + { + $space = '[\x09\x20]+'; + $day_name = $this->day_pcre; + $month = $this->month_pcre; + $day = '([0-9]{1,2})'; + $year = $hour = $minute = $second = '([0-9]{2})'; + $zone = '([A-Z]{1,5})'; + $pcre = '/^' . $day_name . ',' . $space . $day . '-' . $month . '-' . $year . $space . $hour . ':' . $minute . ':' . $second . $space . $zone . '$/i'; + } + if (preg_match($pcre, $date, $match)) + { + /* + Capturing subpatterns: + 1: Day name + 2: Day + 3: Month + 4: Year + 5: Hour + 6: Minute + 7: Second + 8: Timezone + */ + + // Month + $month = $this->month[strtolower($match[3])]; + + // Character timezone + if (isset($this->timezone[strtoupper($match[8])])) + { + $timezone = $this->timezone[strtoupper($match[8])]; + } + // Assume everything else to be -0000 + else + { + $timezone = 0; + } + + // Deal with 2 digit year + if ($match[4] < 50) + { + $match[4] += 2000; + } + else + { + $match[4] += 1900; + } + + return gmmktime($match[5], $match[6], $match[7], $month, $match[2], $match[4]) - $timezone; + } + else + { + return false; + } + } + + /** + * Parse C99's asctime()'s date format + * + * @access protected + * @return int Timestamp + */ + public function date_asctime($date) + { + static $pcre; + if (!$pcre) + { + $space = '[\x09\x20]+'; + $wday_name = $this->day_pcre; + $mon_name = $this->month_pcre; + $day = '([0-9]{1,2})'; + $hour = $sec = $min = '([0-9]{2})'; + $year = '([0-9]{4})'; + $terminator = '\x0A?\x00?'; + $pcre = '/^' . $wday_name . $space . $mon_name . $space . $day . $space . $hour . ':' . $min . ':' . $sec . $space . $year . $terminator . '$/i'; + } + if (preg_match($pcre, $date, $match)) + { + /* + Capturing subpatterns: + 1: Day name + 2: Month + 3: Day + 4: Hour + 5: Minute + 6: Second + 7: Year + */ + + $month = $this->month[strtolower($match[2])]; + return gmmktime($match[4], $match[5], $match[6], $month, $match[3], $match[7]); + } + else + { + return false; + } + } + + /** + * Parse dates using strtotime() + * + * @access protected + * @return int Timestamp + */ + public function date_strtotime($date) + { + $strtotime = strtotime($date); + if ($strtotime === -1 || $strtotime === false) + { + return false; + } + else + { + return $strtotime; + } + } +} + +/** + * Parses XML into something sane + * + * + * This class can be overloaded with {@see SimplePie::set_parser_class()} + * + * @package SimplePie + * @subpackage Parsing + */ +class SimplePie_Parser +{ + var $error_code; + var $error_string; + var $current_line; + var $current_column; + var $current_byte; + var $separator = ' '; + var $namespace = array(''); + var $element = array(''); + var $xml_base = array(''); + var $xml_base_explicit = array(false); + var $xml_lang = array(''); + var $data = array(); + var $datas = array(array()); + var $current_xhtml_construct = -1; + var $encoding; + protected $registry; + + public function set_registry(SimplePie_Registry $registry) + { + $this->registry = $registry; + } + + public function parse(&$data, $encoding) + { + // Use UTF-8 if we get passed US-ASCII, as every US-ASCII character is a UTF-8 character + if (strtoupper($encoding) === 'US-ASCII') + { + $this->encoding = 'UTF-8'; + } + else + { + $this->encoding = $encoding; + } + + // Strip BOM: + // UTF-32 Big Endian BOM + if (substr($data, 0, 4) === "\x00\x00\xFE\xFF") + { + $data = substr($data, 4); + } + // UTF-32 Little Endian BOM + elseif (substr($data, 0, 4) === "\xFF\xFE\x00\x00") + { + $data = substr($data, 4); + } + // UTF-16 Big Endian BOM + elseif (substr($data, 0, 2) === "\xFE\xFF") + { + $data = substr($data, 2); + } + // UTF-16 Little Endian BOM + elseif (substr($data, 0, 2) === "\xFF\xFE") + { + $data = substr($data, 2); + } + // UTF-8 BOM + elseif (substr($data, 0, 3) === "\xEF\xBB\xBF") + { + $data = substr($data, 3); + } + + if (substr($data, 0, 5) === '<?xml' && strspn(substr($data, 5, 1), "\x09\x0A\x0D\x20") && ($pos = strpos($data, '?>')) !== false) + { + $declaration = $this->registry->create('XML_Declaration_Parser', array(substr($data, 5, $pos - 5))); + if ($declaration->parse()) + { + $data = substr($data, $pos + 2); + $data = '<?xml version="' . $declaration->version . '" encoding="' . $encoding . '" standalone="' . (($declaration->standalone) ? 'yes' : 'no') . '"?>' . $data; + } + else + { + $this->error_string = 'SimplePie bug! Please report this!'; + return false; + } + } + + $return = true; + + static $xml_is_sane = null; + if ($xml_is_sane === null) + { + $parser_check = xml_parser_create(); + xml_parse_into_struct($parser_check, '<foo>&</foo>', $values); + xml_parser_free($parser_check); + $xml_is_sane = isset($values[0]['value']); + } + + // Create the parser + if ($xml_is_sane) + { + $xml = xml_parser_create_ns($this->encoding, $this->separator); + xml_parser_set_option($xml, XML_OPTION_SKIP_WHITE, 1); + xml_parser_set_option($xml, XML_OPTION_CASE_FOLDING, 0); + xml_set_object($xml, $this); + xml_set_character_data_handler($xml, 'cdata'); + xml_set_element_handler($xml, 'tag_open', 'tag_close'); + + // Parse! + if (!xml_parse($xml, $data, true)) + { + $this->error_code = xml_get_error_code($xml); + $this->error_string = xml_error_string($this->error_code); + $return = false; + } + $this->current_line = xml_get_current_line_number($xml); + $this->current_column = xml_get_current_column_number($xml); + $this->current_byte = xml_get_current_byte_index($xml); + xml_parser_free($xml); + return $return; + } + else + { + libxml_clear_errors(); + $xml = new XMLReader(); + $xml->xml($data); + while (@$xml->read()) + { + switch ($xml->nodeType) + { + + case constant('XMLReader::END_ELEMENT'): + if ($xml->namespaceURI !== '') + { + $tagName = $xml->namespaceURI . $this->separator . $xml->localName; + } + else + { + $tagName = $xml->localName; + } + $this->tag_close(null, $tagName); + break; + case constant('XMLReader::ELEMENT'): + $empty = $xml->isEmptyElement; + if ($xml->namespaceURI !== '') + { + $tagName = $xml->namespaceURI . $this->separator . $xml->localName; + } + else + { + $tagName = $xml->localName; + } + $attributes = array(); + while ($xml->moveToNextAttribute()) + { + if ($xml->namespaceURI !== '') + { + $attrName = $xml->namespaceURI . $this->separator . $xml->localName; + } + else + { + $attrName = $xml->localName; + } + $attributes[$attrName] = $xml->value; + } + $this->tag_open(null, $tagName, $attributes); + if ($empty) + { + $this->tag_close(null, $tagName); + } + break; + case constant('XMLReader::TEXT'): + + case constant('XMLReader::CDATA'): + $this->cdata(null, $xml->value); + break; + } + } + if ($error = libxml_get_last_error()) + { + $this->error_code = $error->code; + $this->error_string = $error->message; + $this->current_line = $error->line; + $this->current_column = $error->column; + return false; + } + else + { + return true; + } + } + } + + public function get_error_code() + { + return $this->error_code; + } + + public function get_error_string() + { + return $this->error_string; + } + + public function get_current_line() + { + return $this->current_line; + } + + public function get_current_column() + { + return $this->current_column; + } + + public function get_current_byte() + { + return $this->current_byte; + } + + public function get_data() + { + return $this->data; + } + + public function tag_open($parser, $tag, $attributes) + { + list($this->namespace[], $this->element[]) = $this->split_ns($tag); + + $attribs = array(); + foreach ($attributes as $name => $value) + { + list($attrib_namespace, $attribute) = $this->split_ns($name); + $attribs[$attrib_namespace][$attribute] = $value; + } + + if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['base'])) + { + $base = $this->registry->call('Misc', 'absolutize_url', array($attribs[SIMPLEPIE_NAMESPACE_XML]['base'], end($this->xml_base))); + if ($base !== false) + { + $this->xml_base[] = $base; + $this->xml_base_explicit[] = true; + } + } + else + { + $this->xml_base[] = end($this->xml_base); + $this->xml_base_explicit[] = end($this->xml_base_explicit); + } + + if (isset($attribs[SIMPLEPIE_NAMESPACE_XML]['lang'])) + { + $this->xml_lang[] = $attribs[SIMPLEPIE_NAMESPACE_XML]['lang']; + } + else + { + $this->xml_lang[] = end($this->xml_lang); + } + + if ($this->current_xhtml_construct >= 0) + { + $this->current_xhtml_construct++; + if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML) + { + $this->data['data'] .= '<' . end($this->element); + if (isset($attribs[''])) + { + foreach ($attribs[''] as $name => $value) + { + $this->data['data'] .= ' ' . $name . '="' . htmlspecialchars($value, ENT_COMPAT, $this->encoding) . '"'; + } + } + $this->data['data'] .= '>'; + } + } + else + { + $this->datas[] =& $this->data; + $this->data =& $this->data['child'][end($this->namespace)][end($this->element)][]; + $this->data = array('data' => '', 'attribs' => $attribs, 'xml_base' => end($this->xml_base), 'xml_base_explicit' => end($this->xml_base_explicit), 'xml_lang' => end($this->xml_lang)); + if ((end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_03 && in_array(end($this->element), array('title', 'tagline', 'copyright', 'info', 'summary', 'content')) && isset($attribs['']['mode']) && $attribs['']['mode'] === 'xml') + || (end($this->namespace) === SIMPLEPIE_NAMESPACE_ATOM_10 && in_array(end($this->element), array('rights', 'subtitle', 'summary', 'info', 'title', 'content')) && isset($attribs['']['type']) && $attribs['']['type'] === 'xhtml') + || (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_20 && in_array(end($this->element), array('title'))) + || (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_090 && in_array(end($this->element), array('title'))) + || (end($this->namespace) === SIMPLEPIE_NAMESPACE_RSS_10 && in_array(end($this->element), array('title')))) + { + $this->current_xhtml_construct = 0; + } + } + } + + public function cdata($parser, $cdata) + { + if ($this->current_xhtml_construct >= 0) + { + $this->data['data'] .= htmlspecialchars($cdata, ENT_QUOTES, $this->encoding); + } + else + { + $this->data['data'] .= $cdata; + } + } + + public function tag_close($parser, $tag) + { + if ($this->current_xhtml_construct >= 0) + { + $this->current_xhtml_construct--; + if (end($this->namespace) === SIMPLEPIE_NAMESPACE_XHTML && !in_array(end($this->element), array('area', 'base', 'basefont', 'br', 'col', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param'))) + { + $this->data['data'] .= '</' . end($this->element) . '>'; + } + } + if ($this->current_xhtml_construct === -1) + { + $this->data =& $this->datas[count($this->datas) - 1]; + array_pop($this->datas); + } + + array_pop($this->element); + array_pop($this->namespace); + array_pop($this->xml_base); + array_pop($this->xml_base_explicit); + array_pop($this->xml_lang); + } + + public function split_ns($string) + { + static $cache = array(); + if (!isset($cache[$string])) + { + if ($pos = strpos($string, $this->separator)) + { + static $separator_length; + if (!$separator_length) + { + $separator_length = strlen($this->separator); + } + $namespace = substr($string, 0, $pos); + $local_name = substr($string, $pos + $separator_length); + if (strtolower($namespace) === SIMPLEPIE_NAMESPACE_ITUNES) + { + $namespace = SIMPLEPIE_NAMESPACE_ITUNES; + } + + // Normalize the Media RSS namespaces + if ($namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG || + $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG2 || + $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG3 || + $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG4 || + $namespace === SIMPLEPIE_NAMESPACE_MEDIARSS_WRONG5 ) + { + $namespace = SIMPLEPIE_NAMESPACE_MEDIARSS; + } + $cache[$string] = array($namespace, $local_name); + } + else + { + $cache[$string] = array('', $string); + } + } + return $cache[$string]; + } +} + +/** + * Handles `<media:rating>` or `<itunes:explicit>` tags as defined in Media RSS and iTunes RSS respectively + * + * Used by {@see SimplePie_Enclosure::get_rating()} and {@see SimplePie_Enclosure::get_ratings()} + * + * This class can be overloaded with {@see SimplePie::set_rating_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Rating +{ + /** + * Rating scheme + * + * @var string + * @see get_scheme() + */ + var $scheme; + + /** + * Rating value + * + * @var string + * @see get_value() + */ + var $value; + + /** + * Constructor, used to input the data + * + * For documentation on all the parameters, see the corresponding + * properties and their accessors + */ + public function __construct($scheme = null, $value = null) + { + $this->scheme = $scheme; + $this->value = $value; + } + + /** + * String-ified version + * + * @return string + */ + public function __toString() + { + // There is no $this->data here + return md5(serialize($this)); + } + + /** + * Get the organizational scheme for the rating + * + * @return string|null + */ + public function get_scheme() + { + if ($this->scheme !== null) + { + return $this->scheme; + } + else + { + return null; + } + } + + /** + * Get the value of the rating + * + * @return string|null + */ + public function get_value() + { + if ($this->value !== null) + { + return $this->value; + } + else + { + return null; + } + } +} + +/** + * Handles creating objects and calling methods + * + * Access this via {@see SimplePie::get_registry()} + * + * @package SimplePie + */ +class SimplePie_Registry +{ + /** + * Default class mapping + * + * Overriding classes *must* subclass these. + * + * @var array + */ + protected $default = array( + 'Cache' => 'SimplePie_Cache', + 'Locator' => 'SimplePie_Locator', + 'Parser' => 'SimplePie_Parser', + 'File' => 'SimplePie_File', + 'Sanitize' => 'SimplePie_Sanitize', + 'Item' => 'SimplePie_Item', + 'Author' => 'SimplePie_Author', + 'Category' => 'SimplePie_Category', + 'Enclosure' => 'SimplePie_Enclosure', + 'Caption' => 'SimplePie_Caption', + 'Copyright' => 'SimplePie_Copyright', + 'Credit' => 'SimplePie_Credit', + 'Rating' => 'SimplePie_Rating', + 'Restriction' => 'SimplePie_Restriction', + 'Content_Type_Sniffer' => 'SimplePie_Content_Type_Sniffer', + 'Source' => 'SimplePie_Source', + 'Misc' => 'SimplePie_Misc', + 'XML_Declaration_Parser' => 'SimplePie_XML_Declaration_Parser', + 'Parse_Date' => 'SimplePie_Parse_Date', + ); + + /** + * Class mapping + * + * @see register() + * @var array + */ + protected $classes = array(); + + /** + * Legacy classes + * + * @see register() + * @var array + */ + protected $legacy = array(); + + /** + * Constructor + * + * No-op + */ + public function __construct() { } + + /** + * Register a class + * + * @param string $type See {@see $default} for names + * @param string $class Class name, must subclass the corresponding default + * @param bool $legacy Whether to enable legacy support for this class + * @return bool Successfulness + */ + public function register($type, $class, $legacy = false) + { + if (!is_subclass_of($class, $this->default[$type])) + { + return false; + } + + $this->classes[$type] = $class; + + if ($legacy) + { + $this->legacy[] = $class; + } + + return true; + } + + /** + * Get the class registered for a type + * + * Where possible, use {@see create()} or {@see call()} instead + * + * @param string $type + * @return string|null + */ + public function get_class($type) + { + if (!empty($this->classes[$type])) + { + return $this->classes[$type]; + } + if (!empty($this->default[$type])) + { + return $this->default[$type]; + } + + return null; + } + + /** + * Create a new instance of a given type + * + * @param string $type + * @param array $parameters Parameters to pass to the constructor + * @return object Instance of class + */ + public function &create($type, $parameters = array()) + { + $class = $this->get_class($type); + + if (in_array($class, $this->legacy)) + { + switch ($type) + { + case 'locator': + // Legacy: file, timeout, useragent, file_class, max_checked_feeds, content_type_sniffer_class + // Specified: file, timeout, useragent, max_checked_feeds + $replacement = array($this->get_class('file'), $parameters[3], $this->get_class('content_type_sniffer')); + array_splice($parameters, 3, 1, $replacement); + break; + } + } + + if (!method_exists($class, '__construct')) + { + $instance = new $class; + } + else + { + $reflector = new ReflectionClass($class); + $instance = $reflector->newInstanceArgs($parameters); + } + + if (method_exists($instance, 'set_registry')) + { + $instance->set_registry($this); + } + return $instance; + } + + /** + * Call a static method for a type + * + * @param string $type + * @param string $method + * @param array $parameters + * @return mixed + */ + public function &call($type, $method, $parameters = array()) + { + $class = $this->get_class($type); + + if (in_array($class, $this->legacy)) + { + switch ($type) + { + case 'Cache': + // For backwards compatibility with old non-static + // Cache::create() methods + if ($method === 'get_handler') + { + $result = @call_user_func_array(array($class, 'create'), $parameters); + return $result; + } + break; + } + } + + $result = call_user_func_array(array($class, $method), $parameters); + return $result; + } +} + +/** + * Handles `<media:restriction>` as defined in Media RSS + * + * Used by {@see SimplePie_Enclosure::get_restriction()} and {@see SimplePie_Enclosure::get_restrictions()} + * + * This class can be overloaded with {@see SimplePie::set_restriction_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Restriction +{ + /** + * Relationship ('allow'/'deny') + * + * @var string + * @see get_relationship() + */ + var $relationship; + + /** + * Type of restriction + * + * @var string + * @see get_type() + */ + var $type; + + /** + * Restricted values + * + * @var string + * @see get_value() + */ + var $value; + + /** + * Constructor, used to input the data + * + * For documentation on all the parameters, see the corresponding + * properties and their accessors + */ + public function __construct($relationship = null, $type = null, $value = null) + { + $this->relationship = $relationship; + $this->type = $type; + $this->value = $value; + } + + /** + * String-ified version + * + * @return string + */ + public function __toString() + { + // There is no $this->data here + return md5(serialize($this)); + } + + /** + * Get the relationship + * + * @return string|null Either 'allow' or 'deny' + */ + public function get_relationship() + { + if ($this->relationship !== null) + { + return $this->relationship; + } + else + { + return null; + } + } + + /** + * Get the type + * + * @return string|null + */ + public function get_type() + { + if ($this->type !== null) + { + return $this->type; + } + else + { + return null; + } + } + + /** + * Get the list of restricted things + * + * @return string|null + */ + public function get_value() + { + if ($this->value !== null) + { + return $this->value; + } + else + { + return null; + } + } +} + +/** + * Used for data cleanup and post-processing + * + * + * This class can be overloaded with {@see SimplePie::set_sanitize_class()} + * + * @package SimplePie + * @todo Move to using an actual HTML parser (this will allow tags to be properly stripped, and to switch between HTML and XHTML), this will also make it easier to shorten a string while preserving HTML tags + */ +class SimplePie_Sanitize +{ + // Private vars + var $base; + + // Options + var $remove_div = true; + var $image_handler = ''; + var $strip_htmltags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style'); + var $encode_instead_of_strip = false; + var $strip_attributes = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc'); + var $strip_comments = false; + var $output_encoding = 'UTF-8'; + var $enable_cache = true; + var $cache_location = './cache'; + var $cache_name_function = 'md5'; + var $timeout = 10; + var $useragent = ''; + var $force_fsockopen = false; + var $replace_url_attributes = null; + + public function __construct() + { + // Set defaults + $this->set_url_replacements(null); + } + + public function remove_div($enable = true) + { + $this->remove_div = (bool) $enable; + } + + public function set_image_handler($page = false) + { + if ($page) + { + $this->image_handler = (string) $page; + } + else + { + $this->image_handler = false; + } + } + + public function set_registry(SimplePie_Registry $registry) + { + $this->registry = $registry; + } + + public function pass_cache_data($enable_cache = true, $cache_location = './cache', $cache_name_function = 'md5', $cache_class = 'SimplePie_Cache') + { + if (isset($enable_cache)) + { + $this->enable_cache = (bool) $enable_cache; + } + + if ($cache_location) + { + $this->cache_location = (string) $cache_location; + } + + if ($cache_name_function) + { + $this->cache_name_function = (string) $cache_name_function; + } + } + + public function pass_file_data($file_class = 'SimplePie_File', $timeout = 10, $useragent = '', $force_fsockopen = false) + { + if ($timeout) + { + $this->timeout = (string) $timeout; + } + + if ($useragent) + { + $this->useragent = (string) $useragent; + } + + if ($force_fsockopen) + { + $this->force_fsockopen = (string) $force_fsockopen; + } + } + + public function strip_htmltags($tags = array('base', 'blink', 'body', 'doctype', 'embed', 'font', 'form', 'frame', 'frameset', 'html', 'iframe', 'input', 'marquee', 'meta', 'noscript', 'object', 'param', 'script', 'style')) + { + if ($tags) + { + if (is_array($tags)) + { + $this->strip_htmltags = $tags; + } + else + { + $this->strip_htmltags = explode(',', $tags); + } + } + else + { + $this->strip_htmltags = false; + } + } + + public function encode_instead_of_strip($encode = false) + { + $this->encode_instead_of_strip = (bool) $encode; + } + + public function strip_attributes($attribs = array('bgsound', 'class', 'expr', 'id', 'style', 'onclick', 'onerror', 'onfinish', 'onmouseover', 'onmouseout', 'onfocus', 'onblur', 'lowsrc', 'dynsrc')) + { + if ($attribs) + { + if (is_array($attribs)) + { + $this->strip_attributes = $attribs; + } + else + { + $this->strip_attributes = explode(',', $attribs); + } + } + else + { + $this->strip_attributes = false; + } + } + + public function strip_comments($strip = false) + { + $this->strip_comments = (bool) $strip; + } + + public function set_output_encoding($encoding = 'UTF-8') + { + $this->output_encoding = (string) $encoding; + } + + /** + * Set element/attribute key/value pairs of HTML attributes + * containing URLs that need to be resolved relative to the feed + * + * Defaults to |a|@href, |area|@href, |blockquote|@cite, |del|@cite, + * |form|@action, |img|@longdesc, |img|@src, |input|@src, |ins|@cite, + * |q|@cite + * + * @since 1.0 + * @param array|null $element_attribute Element/attribute key/value pairs, null for default + */ + public function set_url_replacements($element_attribute = null) + { + if ($element_attribute === null) + { + $element_attribute = array( + 'a' => 'href', + 'area' => 'href', + 'blockquote' => 'cite', + 'del' => 'cite', + 'form' => 'action', + 'img' => array( + 'longdesc', + 'src' + ), + 'input' => 'src', + 'ins' => 'cite', + 'q' => 'cite' + ); + } + $this->replace_url_attributes = (array) $element_attribute; + } + + public function sanitize($data, $type, $base = '') + { + $data = trim($data); + if ($data !== '' || $type & SIMPLEPIE_CONSTRUCT_IRI) + { + if ($type & SIMPLEPIE_CONSTRUCT_MAYBE_HTML) + { + if (preg_match('/(&(#(x[0-9a-fA-F]+|[0-9]+)|[a-zA-Z0-9]+)|<\/[A-Za-z][^\x09\x0A\x0B\x0C\x0D\x20\x2F\x3E]*' . SIMPLEPIE_PCRE_HTML_ATTRIBUTE . '>)/', $data)) + { + $type |= SIMPLEPIE_CONSTRUCT_HTML; + } + else + { + $type |= SIMPLEPIE_CONSTRUCT_TEXT; + } + } + + if ($type & SIMPLEPIE_CONSTRUCT_BASE64) + { + $data = base64_decode($data); + } + + if ($type & (SIMPLEPIE_CONSTRUCT_HTML | SIMPLEPIE_CONSTRUCT_XHTML)) + { + if (!class_exists('DOMDocument')) + { + $this->registry->call('Misc', 'error', array('DOMDocument not found, unable to use sanitizer', E_USER_WARNING, __FILE__, __LINE__)); + return ''; + } + $document = new DOMDocument(); + $document->encoding = 'UTF-8'; + $data = $this->preprocess($data, $type); + + set_error_handler(array('SimplePie_Misc', 'silence_errors')); + $document->loadHTML($data); + restore_error_handler(); + + // Strip comments + if ($this->strip_comments) + { + $xpath = new DOMXPath($document); + $comments = $xpath->query('//comment()'); + + foreach ($comments as $comment) + { + $comment->parentNode->removeChild($comment); + } + } + + // Strip out HTML tags and attributes that might cause various security problems. + // Based on recommendations by Mark Pilgrim at: + // http://diveintomark.org/archives/2003/06/12/how_to_consume_rss_safely + if ($this->strip_htmltags) + { + foreach ($this->strip_htmltags as $tag) + { + $this->strip_tag($tag, $document, $type); + } + } + + if ($this->strip_attributes) + { + foreach ($this->strip_attributes as $attrib) + { + $this->strip_attr($attrib, $document); + } + } + + // Replace relative URLs + $this->base = $base; + foreach ($this->replace_url_attributes as $element => $attributes) + { + $this->replace_urls($document, $element, $attributes); + } + + // If image handling (caching, etc.) is enabled, cache and rewrite all the image tags. + if (isset($this->image_handler) && ((string) $this->image_handler) !== '' && $this->enable_cache) + { + $images = $document->getElementsByTagName('img'); + foreach ($images as $img) + { + if ($img->hasAttribute('src')) + { + $image_url = call_user_func($this->cache_name_function, $img->getAttribute('src')); + $cache = $this->registry->call('Cache', 'get_handler', array($this->cache_location, $image_url, 'spi')); + + if ($cache->load()) + { + $img->setAttribute('src', $this->image_handler . $image_url); + } + else + { + $file = $this->registry->create('File', array($img['attribs']['src']['data'], $this->timeout, 5, array('X-FORWARDED-FOR' => $_SERVER['REMOTE_ADDR']), $this->useragent, $this->force_fsockopen)); + $headers = $file->headers; + + if ($file->success && ($file->method & SIMPLEPIE_FILE_SOURCE_REMOTE === 0 || ($file->status_code === 200 || $file->status_code > 206 && $file->status_code < 300))) + { + if ($cache->save(array('headers' => $file->headers, 'body' => $file->body))) + { + $img->setAttribute('src', $this->image_handler . $image_url); + } + else + { + trigger_error("$this->cache_location is not writeable. Make sure you've set the correct relative or absolute path, and that the location is server-writable.", E_USER_WARNING); + } + } + } + } + } + } + + // Remove the DOCTYPE + // Seems to cause segfaulting if we don't do this + if ($document->firstChild instanceof DOMDocumentType) + { + $document->removeChild($document->firstChild); + } + + // Move everything from the body to the root + $real_body = $document->getElementsByTagName('body')->item(0)->childNodes->item(0); + $document->replaceChild($real_body, $document->firstChild); + + // Finally, convert to a HTML string + $data = trim($document->saveHTML()); + + if ($this->remove_div) + { + $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '', $data); + $data = preg_replace('/<\/div>$/', '', $data); + } + else + { + $data = preg_replace('/^<div' . SIMPLEPIE_PCRE_XML_ATTRIBUTE . '>/', '<div>', $data); + } + } + + if ($type & SIMPLEPIE_CONSTRUCT_IRI) + { + $absolute = $this->registry->call('Misc', 'absolutize_url', array($data, $base)); + if ($absolute !== false) + { + $data = $absolute; + } + } + + if ($type & (SIMPLEPIE_CONSTRUCT_TEXT | SIMPLEPIE_CONSTRUCT_IRI)) + { + $data = htmlspecialchars($data, ENT_COMPAT, 'UTF-8'); + } + + if ($this->output_encoding !== 'UTF-8') + { + $data = $this->registry->call('Misc', 'change_encoding', array($data, 'UTF-8', $this->output_encoding)); + } + } + return $data; + } + + protected function preprocess($html, $type) + { + $ret = ''; + if ($type & ~SIMPLEPIE_CONSTRUCT_XHTML) + { + // Atom XHTML constructs are wrapped with a div by default + // Note: No protection if $html contains a stray </div>! + $html = '<div>' . $html . '</div>'; + $ret .= '<!DOCTYPE html>'; + $content_type = 'text/html'; + } + else + { + $ret .= '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'; + $content_type = 'application/xhtml+xml'; + } + + $ret .= '<html><head>'; + $ret .= '<meta http-equiv="Content-Type" content="' . $content_type . '; charset=utf-8" />'; + $ret .= '</head><body>' . $html . '</body></html>'; + return $ret; + } + + public function replace_urls($document, $tag, $attributes) + { + if (!is_array($attributes)) + { + $attributes = array($attributes); + } + + if (!is_array($this->strip_htmltags) || !in_array($tag, $this->strip_htmltags)) + { + $elements = $document->getElementsByTagName($tag); + foreach ($elements as $element) + { + foreach ($attributes as $attribute) + { + if ($element->hasAttribute($attribute)) + { + $value = $this->registry->call('Misc', 'absolutize_url', array($element->getAttribute($attribute), $this->base)); + if ($value !== false) + { + $element->setAttribute($attribute, $value); + } + } + } + } + } + } + + public function do_strip_htmltags($match) + { + if ($this->encode_instead_of_strip) + { + if (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style'))) + { + $match[1] = htmlspecialchars($match[1], ENT_COMPAT, 'UTF-8'); + $match[2] = htmlspecialchars($match[2], ENT_COMPAT, 'UTF-8'); + return "<$match[1]$match[2]>$match[3]</$match[1]>"; + } + else + { + return htmlspecialchars($match[0], ENT_COMPAT, 'UTF-8'); + } + } + elseif (isset($match[4]) && !in_array(strtolower($match[1]), array('script', 'style'))) + { + return $match[4]; + } + else + { + return ''; + } + } + + protected function strip_tag($tag, $document, $type) + { + $xpath = new DOMXPath($document); + $elements = $xpath->query('body//' . $tag); + if ($this->encode_instead_of_strip) + { + foreach ($elements as $element) + { + $fragment = $document->createDocumentFragment(); + + // For elements which aren't script or style, include the tag itself + if (!in_array($tag, array('script', 'style'))) + { + $text = '<' . $tag; + if ($element->hasAttributes()) + { + $attrs = array(); + foreach ($element->attributes as $name => $attr) + { + $value = $attr->value; + + // In XHTML, empty values should never exist, so we repeat the value + if (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_XHTML)) + { + $value = $name; + } + // For HTML, empty is fine + elseif (empty($value) && ($type & SIMPLEPIE_CONSTRUCT_HTML)) + { + $attrs[] = $name; + continue; + } + + // Standard attribute text + $attrs[] = $name . '="' . $attr->value . '"'; + } + $text .= ' ' . implode(' ', $attrs); + } + $text .= '>'; + $fragment->appendChild(new DOMText($text)); + } + + $number = $element->childNodes->length; + for ($i = $number; $i > 0; $i--) + { + $child = $element->childNodes->item(0); + $fragment->appendChild($child); + } + + if (!in_array($tag, array('script', 'style'))) + { + $fragment->appendChild(new DOMText('</' . $tag . '>')); + } + + $element->parentNode->replaceChild($fragment, $element); + } + + return; + } + elseif (in_array($tag, array('script', 'style'))) + { + foreach ($elements as $element) + { + $element->parentNode->removeChild($element); + } + + return; + } + else + { + foreach ($elements as $element) + { + $fragment = $document->createDocumentFragment(); + $number = $element->childNodes->length; + for ($i = $number; $i > 0; $i--) + { + $child = $element->childNodes->item(0); + $fragment->appendChild($child); + } + + $element->parentNode->replaceChild($fragment, $element); + } + } + } + + protected function strip_attr($attrib, $document) + { + $xpath = new DOMXPath($document); + $elements = $xpath->query('//*[@' . $attrib . ']'); + + foreach ($elements as $element) + { + $element->removeAttribute($attrib); + } + } +} + +/** + * Handles `<atom:source>` + * + * Used by {@see SimplePie_Item::get_source()} + * + * This class can be overloaded with {@see SimplePie::set_source_class()} + * + * @package SimplePie + * @subpackage API + */ +class SimplePie_Source +{ + var $item; + var $data = array(); + protected $registry; + + public function __construct($item, $data) + { + $this->item = $item; + $this->data = $data; + } + + public function set_registry(SimplePie_Registry $registry) + { + $this->registry = $registry; + } + + public function __toString() + { + return md5(serialize($this->data)); + } + + public function get_source_tags($namespace, $tag) + { + if (isset($this->data['child'][$namespace][$tag])) + { + return $this->data['child'][$namespace][$tag]; + } + else + { + return null; + } + } + + public function get_base($element = array()) + { + return $this->item->get_base($element); + } + + public function sanitize($data, $type, $base = '') + { + return $this->item->sanitize($data, $type, $base); + } + + public function get_item() + { + return $this->item; + } + + public function get_title() + { + if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + return null; + } + } + + public function get_category($key = 0) + { + $categories = $this->get_categories(); + if (isset($categories[$key])) + { + return $categories[$key]; + } + else + { + return null; + } + } + + public function get_categories() + { + $categories = array(); + + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'category') as $category) + { + $term = null; + $scheme = null; + $label = null; + if (isset($category['attribs']['']['term'])) + { + $term = $this->sanitize($category['attribs']['']['term'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['scheme'])) + { + $scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($category['attribs']['']['label'])) + { + $label = $this->sanitize($category['attribs']['']['label'], SIMPLEPIE_CONSTRUCT_TEXT); + } + $categories[] = $this->registry->create('Category', array($term, $scheme, $label)); + } + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'category') as $category) + { + // This is really the label, but keep this as the term also for BC. + // Label will also work on retrieving because that falls back to term. + $term = $this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT); + if (isset($category['attribs']['']['domain'])) + { + $scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + $scheme = null; + } + $categories[] = $this->registry->create('Category', array($term, $scheme, null)); + } + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'subject') as $category) + { + $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'subject') as $category) + { + $categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + + if (!empty($categories)) + { + return array_unique($categories); + } + else + { + return null; + } + } + + public function get_author($key = 0) + { + $authors = $this->get_authors(); + if (isset($authors[$key])) + { + return $authors[$key]; + } + else + { + return null; + } + } + + public function get_authors() + { + $authors = array(); + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'author') as $author) + { + $name = null; + $uri = null; + $email = null; + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])) + { + $name = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])) + { + $uri = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0])); + } + if (isset($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'])) + { + $email = $this->sanitize($author['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $uri !== null) + { + $authors[] = $this->registry->create('Author', array($name, $uri, $email)); + } + } + if ($author = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'author')) + { + $name = null; + $url = null; + $email = null; + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'])) + { + $name = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'])) + { + $url = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0])); + } + if (isset($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'])) + { + $email = $this->sanitize($author[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $url !== null) + { + $authors[] = $this->registry->create('Author', array($name, $url, $email)); + } + } + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'creator') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'creator') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'author') as $author) + { + $authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null)); + } + + if (!empty($authors)) + { + return array_unique($authors); + } + else + { + return null; + } + } + + public function get_contributor($key = 0) + { + $contributors = $this->get_contributors(); + if (isset($contributors[$key])) + { + return $contributors[$key]; + } + else + { + return null; + } + } + + public function get_contributors() + { + $contributors = array(); + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'contributor') as $contributor) + { + $name = null; + $uri = null; + $email = null; + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'])) + { + $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'])) + { + $uri = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['uri'][0])); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'])) + { + $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $uri !== null) + { + $contributors[] = $this->registry->create('Author', array($name, $uri, $email)); + } + } + foreach ((array) $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'contributor') as $contributor) + { + $name = null; + $url = null; + $email = null; + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'])) + { + $name = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['name'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'])) + { + $url = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['url'][0])); + } + if (isset($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'])) + { + $email = $this->sanitize($contributor['child'][SIMPLEPIE_NAMESPACE_ATOM_03]['email'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + if ($name !== null || $email !== null || $url !== null) + { + $contributors[] = $this->registry->create('Author', array($name, $url, $email)); + } + } + + if (!empty($contributors)) + { + return array_unique($contributors); + } + else + { + return null; + } + } + + public function get_link($key = 0, $rel = 'alternate') + { + $links = $this->get_links($rel); + if (isset($links[$key])) + { + return $links[$key]; + } + else + { + return null; + } + } + + /** + * Added for parity between the parent-level and the item/entry-level. + */ + public function get_permalink() + { + return $this->get_link(0); + } + + public function get_links($rel = 'alternate') + { + if (!isset($this->data['links'])) + { + $this->data['links'] = array(); + if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link')) + { + foreach ($links as $link) + { + if (isset($link['attribs']['']['href'])) + { + $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate'; + $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link)); + } + } + } + if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link')) + { + foreach ($links as $link) + { + if (isset($link['attribs']['']['href'])) + { + $link_rel = (isset($link['attribs']['']['rel'])) ? $link['attribs']['']['rel'] : 'alternate'; + $this->data['links'][$link_rel][] = $this->sanitize($link['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($link)); + + } + } + } + if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + if ($links = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'link')) + { + $this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0])); + } + + $keys = array_keys($this->data['links']); + foreach ($keys as $key) + { + if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key))) + { + if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key])) + { + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]); + $this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]; + } + else + { + $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key]; + } + } + elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY) + { + $this->data['links'][substr($key, 41)] =& $this->data['links'][$key]; + } + $this->data['links'][$key] = array_unique($this->data['links'][$key]); + } + } + + if (isset($this->data['links'][$rel])) + { + return $this->data['links'][$rel]; + } + else + { + return null; + } + } + + public function get_description() + { + if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'subtitle')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'tagline')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0])); + } + else + { + return null; + } + } + + public function get_copyright() + { + if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'copyright')) + { + return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'copyright')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + return null; + } + } + + public function get_language() + { + if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'language')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_11, 'language')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_DC_10, 'language')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT); + } + elseif (isset($this->data['xml_lang'])) + { + return $this->sanitize($this->data['xml_lang'], SIMPLEPIE_CONSTRUCT_TEXT); + } + else + { + return null; + } + } + + public function get_latitude() + { + if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat')) + { + return (float) $return[0]['data']; + } + elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) + { + return (float) $match[1]; + } + else + { + return null; + } + } + + public function get_longitude() + { + if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long')) + { + return (float) $return[0]['data']; + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon')) + { + return (float) $return[0]['data']; + } + elseif (($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match)) + { + return (float) $match[2]; + } + else + { + return null; + } + } + + public function get_image_url() + { + if ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'image')) + { + return $this->sanitize($return[0]['attribs']['']['href'], SIMPLEPIE_CONSTRUCT_IRI); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'logo')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + elseif ($return = $this->get_source_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'icon')) + { + return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($return[0])); + } + else + { + return null; + } + } +} + +/** + * Parses the XML Declaration + * + * @package SimplePie + * @subpackage Parsing + */ +class SimplePie_XML_Declaration_Parser +{ + /** + * XML Version + * + * @access public + * @var string + */ + var $version = '1.0'; + + /** + * Encoding + * + * @access public + * @var string + */ + var $encoding = 'UTF-8'; + + /** + * Standalone + * + * @access public + * @var bool + */ + var $standalone = false; + + /** + * Current state of the state machine + * + * @access private + * @var string + */ + var $state = 'before_version_name'; + + /** + * Input data + * + * @access private + * @var string + */ + var $data = ''; + + /** + * Input data length (to avoid calling strlen() everytime this is needed) + * + * @access private + * @var int + */ + var $data_length = 0; + + /** + * Current position of the pointer + * + * @var int + * @access private + */ + var $position = 0; + + /** + * Create an instance of the class with the input data + * + * @access public + * @param string $data Input data + */ + public function __construct($data) + { + $this->data = $data; + $this->data_length = strlen($this->data); + } + + /** + * Parse the input data + * + * @access public + * @return bool true on success, false on failure + */ + public function parse() + { + while ($this->state && $this->state !== 'emit' && $this->has_data()) + { + $state = $this->state; + $this->$state(); + } + $this->data = ''; + if ($this->state === 'emit') + { + return true; + } + else + { + $this->version = ''; + $this->encoding = ''; + $this->standalone = ''; + return false; + } + } + + /** + * Check whether there is data beyond the pointer + * + * @access private + * @return bool true if there is further data, false if not + */ + public function has_data() + { + return (bool) ($this->position < $this->data_length); + } + + /** + * Advance past any whitespace + * + * @return int Number of whitespace characters passed + */ + public function skip_whitespace() + { + $whitespace = strspn($this->data, "\x09\x0A\x0D\x20", $this->position); + $this->position += $whitespace; + return $whitespace; + } + + /** + * Read value + */ + public function get_value() + { + $quote = substr($this->data, $this->position, 1); + if ($quote === '"' || $quote === "'") + { + $this->position++; + $len = strcspn($this->data, $quote, $this->position); + if ($this->has_data()) + { + $value = substr($this->data, $this->position, $len); + $this->position += $len + 1; + return $value; + } + } + return false; + } + + public function before_version_name() + { + if ($this->skip_whitespace()) + { + $this->state = 'version_name'; + } + else + { + $this->state = false; + } + } + + public function version_name() + { + if (substr($this->data, $this->position, 7) === 'version') + { + $this->position += 7; + $this->skip_whitespace(); + $this->state = 'version_equals'; + } + else + { + $this->state = false; + } + } + + public function version_equals() + { + if (substr($this->data, $this->position, 1) === '=') + { + $this->position++; + $this->skip_whitespace(); + $this->state = 'version_value'; + } + else + { + $this->state = false; + } + } + + public function version_value() + { + if ($this->version = $this->get_value()) + { + $this->skip_whitespace(); + if ($this->has_data()) + { + $this->state = 'encoding_name'; + } + else + { + $this->state = 'emit'; + } + } + else + { + $this->state = false; + } + } + + public function encoding_name() + { + if (substr($this->data, $this->position, 8) === 'encoding') + { + $this->position += 8; + $this->skip_whitespace(); + $this->state = 'encoding_equals'; + } + else + { + $this->state = 'standalone_name'; + } + } + + public function encoding_equals() + { + if (substr($this->data, $this->position, 1) === '=') + { + $this->position++; + $this->skip_whitespace(); + $this->state = 'encoding_value'; + } + else + { + $this->state = false; + } + } + + public function encoding_value() + { + if ($this->encoding = $this->get_value()) + { + $this->skip_whitespace(); + if ($this->has_data()) + { + $this->state = 'standalone_name'; + } + else + { + $this->state = 'emit'; + } + } + else + { + $this->state = false; + } + } + + public function standalone_name() + { + if (substr($this->data, $this->position, 10) === 'standalone') + { + $this->position += 10; + $this->skip_whitespace(); + $this->state = 'standalone_equals'; + } + else + { + $this->state = false; + } + } + + public function standalone_equals() + { + if (substr($this->data, $this->position, 1) === '=') + { + $this->position++; + $this->skip_whitespace(); + $this->state = 'standalone_value'; + } + else + { + $this->state = false; + } + } + + public function standalone_value() + { + if ($standalone = $this->get_value()) + { + switch ($standalone) + { + case 'yes': + $this->standalone = true; + break; + + case 'no': + $this->standalone = false; + break; + + default: + $this->state = false; + return; + } + + $this->skip_whitespace(); + if ($this->has_data()) + { + $this->state = false; + } + else + { + $this->state = 'emit'; + } + } + else + { + $this->state = false; + } + } +} + diff --git a/sources/inc/Sitemapper.php b/sources/inc/Sitemapper.php new file mode 100644 index 0000000..bf89a31 --- /dev/null +++ b/sources/inc/Sitemapper.php @@ -0,0 +1,214 @@ +<?php +/** + * Sitemap handling functions + * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * @author Michael Hamann <michael@content-space.de> + */ + +if(!defined('DOKU_INC')) die('meh.'); + +/** + * A class for building sitemaps and pinging search engines with the sitemap URL. + * + * @author Michael Hamann + */ +class Sitemapper { + /** + * Builds a Google Sitemap of all public pages known to the indexer + * + * The map is placed in the cache directory named sitemap.xml.gz - This + * file needs to be writable! + * + * @author Michael Hamann + * @author Andreas Gohr + * @link https://www.google.com/webmasters/sitemaps/docs/en/about.html + * @link http://www.sitemaps.org/ + */ + public static function generate(){ + global $conf; + if($conf['sitemap'] < 1 || !is_numeric($conf['sitemap'])) return false; + + $sitemap = Sitemapper::getFilePath(); + + if(@file_exists($sitemap)){ + if(!is_writable($sitemap)) return false; + }else{ + if(!is_writable(dirname($sitemap))) return false; + } + + if(@filesize($sitemap) && + @filemtime($sitemap) > (time()-($conf['sitemap']*86400))){ // 60*60*24=86400 + dbglog('Sitemapper::generate(): Sitemap up to date'); + return false; + } + + dbglog("Sitemapper::generate(): using $sitemap"); + + $pages = idx_get_indexer()->getPages(); + dbglog('Sitemapper::generate(): creating sitemap using '.count($pages).' pages'); + $items = array(); + + // build the sitemap items + foreach($pages as $id){ + //skip hidden, non existing and restricted files + if(isHiddenPage($id)) continue; + if(auth_aclcheck($id,'','') < AUTH_READ) continue; + $item = SitemapItem::createFromID($id); + if ($item !== null) + $items[] = $item; + } + + $eventData = array('items' => &$items, 'sitemap' => &$sitemap); + $event = new Doku_Event('SITEMAP_GENERATE', $eventData); + if ($event->advise_before(true)) { + //save the new sitemap + $event->result = io_saveFile($sitemap, Sitemapper::getXML($items)); + } + $event->advise_after(); + + return $event->result; + } + + /** + * Builds the sitemap XML string from the given array auf SitemapItems. + * + * @param $items array The SitemapItems that shall be included in the sitemap. + * @return string The sitemap XML. + * @author Michael Hamann + */ + private static function getXML($items) { + ob_start(); + echo '<?xml version="1.0" encoding="UTF-8"?>'.NL; + echo '<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">'.NL; + foreach ($items as $item) { + /** @var SitemapItem $item */ + echo $item->toXML(); + } + echo '</urlset>'.NL; + $result = ob_get_contents(); + ob_end_clean(); + return $result; + } + + /** + * Helper function for getting the path to the sitemap file. + * + * @return string The path to the sitemap file. + * @author Michael Hamann + */ + public static function getFilePath() { + global $conf; + + $sitemap = $conf['cachedir'].'/sitemap.xml'; + if (self::sitemapIsCompressed()) { + $sitemap .= '.gz'; + } + + return $sitemap; + } + + /** + * Helper function for checking if the sitemap is compressed + * + * @return bool If the sitemap file is compressed + */ + public static function sitemapIsCompressed() { + global $conf; + return $conf['compression'] === 'bz2' || $conf['compression'] === 'gz'; + } + + /** + * Pings search engines with the sitemap url. Plugins can add or remove + * urls to ping using the SITEMAP_PING event. + * + * @author Michael Hamann + */ + public static function pingSearchEngines() { + //ping search engines... + $http = new DokuHTTPClient(); + $http->timeout = 8; + + $encoded_sitemap_url = urlencode(wl('', array('do' => 'sitemap'), true, '&')); + $ping_urls = array( + 'google' => 'http://www.google.com/webmasters/sitemaps/ping?sitemap='.$encoded_sitemap_url, + 'yahoo' => 'http://search.yahooapis.com/SiteExplorerService/V1/updateNotification?appid=dokuwiki&url='.$encoded_sitemap_url, + 'microsoft' => 'http://www.bing.com/webmaster/ping.aspx?siteMap='.$encoded_sitemap_url, + ); + + $data = array('ping_urls' => $ping_urls, + 'encoded_sitemap_url' => $encoded_sitemap_url + ); + $event = new Doku_Event('SITEMAP_PING', $data); + if ($event->advise_before(true)) { + foreach ($data['ping_urls'] as $name => $url) { + dbglog("Sitemapper::PingSearchEngines(): pinging $name"); + $resp = $http->get($url); + if($http->error) dbglog("Sitemapper:pingSearchengines(): $http->error"); + dbglog('Sitemapper:pingSearchengines(): '.preg_replace('/[\n\r]/',' ',strip_tags($resp))); + } + } + $event->advise_after(); + + return true; + } +} + +/** + * An item of a sitemap. + * + * @author Michael Hamann + */ +class SitemapItem { + public $url; + public $lastmod; + public $changefreq; + public $priority; + + /** + * Create a new item. + * + * @param $url string The url of the item + * @param $lastmod int Timestamp of the last modification + * @param $changefreq string How frequently the item is likely to change. Valid values: always, hourly, daily, weekly, monthly, yearly, never. + * @param $priority float|string The priority of the item relative to other URLs on your site. Valid values range from 0.0 to 1.0. + */ + public function __construct($url, $lastmod, $changefreq = null, $priority = null) { + $this->url = $url; + $this->lastmod = $lastmod; + $this->changefreq = $changefreq; + $this->priority = $priority; + } + + /** + * Helper function for creating an item for a wikipage id. + * + * @param $id string A wikipage id. + * @param $changefreq string How frequently the item is likely to change. Valid values: always, hourly, daily, weekly, monthly, yearly, never. + * @param $priority float|string The priority of the item relative to other URLs on your site. Valid values range from 0.0 to 1.0. + * @return SitemapItem The sitemap item. + */ + public static function createFromID($id, $changefreq = null, $priority = null) { + $id = trim($id); + $date = @filemtime(wikiFN($id)); + if(!$date) return null; + return new SitemapItem(wl($id, '', true), $date, $changefreq, $priority); + } + + /** + * Get the XML representation of the sitemap item. + * + * @return string The XML representation. + */ + public function toXML() { + $result = ' <url>'.NL + .' <loc>'.hsc($this->url).'</loc>'.NL + .' <lastmod>'.date_iso8601($this->lastmod).'</lastmod>'.NL; + if ($this->changefreq !== null) + $result .= ' <changefreq>'.hsc($this->changefreq).'</changefreq>'.NL; + if ($this->priority !== null) + $result .= ' <priority>'.hsc($this->priority).'</priority>'.NL; + $result .= ' </url>'.NL; + return $result; + } +} diff --git a/sources/inc/Tar.class.php b/sources/inc/Tar.class.php new file mode 100644 index 0000000..bc87d7d --- /dev/null +++ b/sources/inc/Tar.class.php @@ -0,0 +1,631 @@ +<?php +/** + * This class allows the extraction of existing and the creation of new Unix TAR archives. + * To keep things simple, the modification of existing archives is not supported. It handles + * uncompressed, gzip and bzip2 compressed tar files. + * + * Long pathnames (>100 chars) are supported in POSIX ustar and GNU longlink formats. + * + * To list the contents of an existing TAR archive, open() it and use contents() on it: + * + * $tar = new Tar(); + * $tar->open('myfile.tgz'); + * $toc = $tar->contents(); + * print_r($toc); + * + * To extract the contents of an existing TAR archive, open() it and use extract() on it: + * + * $tar = new Tar(); + * $tar->open('myfile.tgz'); + * $tar->extract('/tmp'); + * + * To create a new TAR archive directly on the filesystem (low memory requirements), create() it, + * add*() files and close() it: + * + * $tar = new Tar(); + * $tar->create('myfile.tgz'); + * $tar->addFile(...); + * $tar->addData(...); + * ... + * $tar->close(); + * + * To create a TAR archive directly in memory, create() it, add*() files and then either save() + * or getData() it: + * + * $tar = new Tar(); + * $tar->create(); + * $tar->addFile(...); + * $tar->addData(...); + * ... + * $tar->save('myfile.tgz'); // compresses and saves it + * echo $tar->getArchive(Tar::COMPRESS_GZIP); // compresses and returns it + * + * @author Andreas Gohr <andi@splitbrain.org> + * @author Bouchon <tarlib@bouchon.org> (Maxg) + * @license GPL 2 + */ +class Tar { + + const COMPRESS_AUTO = 0; + const COMPRESS_NONE = 1; + const COMPRESS_GZIP = 2; + const COMPRESS_BZIP = 3; + + protected $file = ''; + protected $comptype = Tar::COMPRESS_AUTO; + protected $fh; + protected $memory = ''; + protected $closed = true; + protected $writeaccess = false; + + /** + * Open an existing TAR file for reading + * + * @param string $file + * @param int $comptype + * @throws TarIOException + */ + public function open($file, $comptype = Tar::COMPRESS_AUTO) { + // determine compression + if($comptype == Tar::COMPRESS_AUTO) $comptype = $this->filetype($file); + $this->compressioncheck($comptype); + + $this->comptype = $comptype; + $this->file = $file; + + if($this->comptype === Tar::COMPRESS_GZIP) { + $this->fh = @gzopen($this->file, 'rb'); + } elseif($this->comptype === Tar::COMPRESS_BZIP) { + $this->fh = @bzopen($this->file, 'r'); + } else { + $this->fh = @fopen($this->file, 'rb'); + } + + if(!$this->fh) throw new TarIOException('Could not open file for reading: '.$this->file); + $this->closed = false; + } + + /** + * Read the contents of a TAR archive + * + * This function lists the files stored in the archive, and returns an indexed array of associative + * arrays containing for each file the following information: + * + * checksum Tar Checksum of the file + * filename The full name of the stored file (up to 100 c.) + * mode UNIX permissions in DECIMAL, not octal + * uid The Owner ID + * gid The Group ID + * size Uncompressed filesize + * mtime Timestamp of last modification + * typeflag Empty for files, set for folders + * link Is it a symlink? + * uname Owner name + * gname Group name + * + * The archive is closed afer reading the contents, because rewinding is not possible in bzip2 streams. + * Reopen the file with open() again if you want to do additional operations + */ + public function contents() { + if($this->closed || !$this->file) throw new TarIOException('Can not read from a closed archive'); + + $result = array(); + while($read = $this->readbytes(512)) { + $header = $this->parseHeader($read); + if(!is_array($header)) continue; + + $this->skipbytes(ceil($header['size'] / 512) * 512, 1); + $result[] = $header; + } + + $this->close(); + return $result; + } + + /** + * Extract an existing TAR archive + * + * The $strip parameter allows you to strip a certain number of path components from the filenames + * found in the tar file, similar to the --strip-components feature of GNU tar. This is triggered when + * an integer is passed as $strip. + * Alternatively a fixed string prefix may be passed in $strip. If the filename matches this prefix, + * the prefix will be stripped. It is recommended to give prefixes with a trailing slash. + * + * By default this will extract all files found in the archive. You can restrict the output using the $include + * and $exclude parameter. Both expect a full regular expression (including delimiters and modifiers). If + * $include is set only files that match this expression will be extracted. Files that match the $exclude + * expression will never be extracted. Both parameters can be used in combination. Expressions are matched against + * stripped filenames as described above. + * + * The archive is closed afer reading the contents, because rewinding is not possible in bzip2 streams. + * Reopen the file with open() again if you want to do additional operations + * + * @param string $outdir the target directory for extracting + * @param int|string $strip either the number of path components or a fixed prefix to strip + * @param string $exclude a regular expression of files to exclude + * @param string $include a regular expression of files to include + * @throws TarIOException + * @return array + */ + function extract($outdir, $strip = '', $exclude = '', $include = '') { + if($this->closed || !$this->file) throw new TarIOException('Can not read from a closed archive'); + + $outdir = rtrim($outdir, '/'); + io_mkdir_p($outdir); + $striplen = strlen($strip); + + $extracted = array(); + + while($dat = $this->readbytes(512)) { + // read the file header + $header = $this->parseHeader($dat); + if(!is_array($header)) continue; + if(!$header['filename']) continue; + + // strip prefix + $filename = $this->cleanPath($header['filename']); + if(is_int($strip)) { + // if $strip is an integer we strip this many path components + $parts = explode('/', $filename); + if(!$header['typeflag']) { + $base = array_pop($parts); // keep filename itself + } else { + $base = ''; + } + $filename = join('/', array_slice($parts, $strip)); + if($base) $filename .= "/$base"; + } else { + // ifstrip is a string, we strip a prefix here + if(substr($filename, 0, $striplen) == $strip) $filename = substr($filename, $striplen); + } + + // check if this should be extracted + $extract = true; + if(!$filename) { + $extract = false; + } else { + if($include) { + if(preg_match($include, $filename)) { + $extract = true; + } else { + $extract = false; + } + } + if($exclude && preg_match($exclude, $filename)) { + $extract = false; + } + } + + // Now do the extraction (or not) + if($extract) { + $extracted[] = $header; + + $output = "$outdir/$filename"; + $directory = ($header['typeflag']) ? $output : dirname($output); + io_mkdir_p($directory); + + // is this a file? + if(!$header['typeflag']) { + $fp = fopen($output, "wb"); + if(!$fp) throw new TarIOException('Could not open file for writing: '.$output); + + $size = floor($header['size'] / 512); + for($i = 0; $i < $size; $i++) { + fwrite($fp, $this->readbytes(512), 512); + } + if(($header['size'] % 512) != 0) fwrite($fp, $this->readbytes(512), $header['size'] % 512); + + fclose($fp); + touch($output, $header['mtime']); + chmod($output, $header['perm']); + } else { + $this->skipbytes(ceil($header['size'] / 512) * 512); // the size is usually 0 for directories + } + } else { + $this->skipbytes(ceil($header['size'] / 512) * 512); + } + } + + $this->close(); + return $extracted; + } + + /** + * Create a new TAR file + * + * If $file is empty, the tar file will be created in memory + * + * @param string $file + * @param int $comptype + * @param int $complevel + * @throws TarIOException + * @throws TarIllegalCompressionException + */ + public function create($file = '', $comptype = Tar::COMPRESS_AUTO, $complevel = 9) { + // determine compression + if($comptype == Tar::COMPRESS_AUTO) $comptype = $this->filetype($file); + $this->compressioncheck($comptype); + + $this->comptype = $comptype; + $this->file = $file; + $this->memory = ''; + $this->fh = 0; + + if($this->file) { + if($this->comptype === Tar::COMPRESS_GZIP) { + $this->fh = @gzopen($this->file, 'wb'.$complevel); + } elseif($this->comptype === Tar::COMPRESS_BZIP) { + $this->fh = @bzopen($this->file, 'w'); + } else { + $this->fh = @fopen($this->file, 'wb'); + } + + if(!$this->fh) throw new TarIOException('Could not open file for writing: '.$this->file); + } + $this->writeaccess = true; + $this->closed = false; + } + + /** + * Add a file to the current TAR archive using an existing file in the filesystem + * + * @todo handle directory adding + * @param string $file the original file + * @param string $name the name to use for the file in the archive + * @throws TarIOException + */ + public function addFile($file, $name = '') { + if($this->closed) throw new TarIOException('Archive has been closed, files can no longer be added'); + + if(!$name) $name = $file; + $name = $this->cleanPath($name); + + $fp = fopen($file, 'rb'); + if(!$fp) throw new TarIOException('Could not open file for reading: '.$file); + + // create file header and copy all stat info from the original file + clearstatcache(false, $file); + $stat = stat($file); + $this->writeFileHeader( + $name, + $stat[4], + $stat[5], + fileperms($file), + filesize($file), + filemtime($file) + ); + + while(!feof($fp)) { + $data = fread($fp, 512); + if($data === false) break; + if($data === '') break; + $packed = pack("a512", $data); + $this->writebytes($packed); + } + fclose($fp); + } + + /** + * Add a file to the current TAR archive using the given $data as content + * + * @param string $name + * @param string $data + * @param int $uid + * @param int $gid + * @param int $perm + * @param int $mtime + * @throws TarIOException + */ + public function addData($name, $data, $uid = 0, $gid = 0, $perm = 0666, $mtime = 0) { + if($this->closed) throw new TarIOException('Archive has been closed, files can no longer be added'); + + $name = $this->cleanPath($name); + $len = strlen($data); + + $this->writeFileHeader( + $name, + $uid, + $gid, + $perm, + $len, + ($mtime) ? $mtime : time() + ); + + for($s = 0; $s < $len; $s += 512) { + $this->writebytes(pack("a512", substr($data, $s, 512))); + } + } + + /** + * Add the closing footer to the archive if in write mode, close all file handles + * + * After a call to this function no more data can be added to the archive, for + * read access no reading is allowed anymore + * + * "Physically, an archive consists of a series of file entries terminated by an end-of-archive entry, which + * consists of two 512 blocks of zero bytes" + * + * @link http://www.gnu.org/software/tar/manual/html_chapter/tar_8.html#SEC134 + */ + public function close() { + if($this->closed) return; // we did this already + + // write footer + if($this->writeaccess) { + $this->writebytes(pack("a512", "")); + $this->writebytes(pack("a512", "")); + } + + // close file handles + if($this->file) { + if($this->comptype === Tar::COMPRESS_GZIP) { + gzclose($this->fh); + } elseif($this->comptype === Tar::COMPRESS_BZIP) { + bzclose($this->fh); + } else { + fclose($this->fh); + } + + $this->file = ''; + $this->fh = 0; + } + + $this->closed = true; + } + + /** + * Returns the created in-memory archive data + * + * This implicitly calls close() on the Archive + */ + public function getArchive($comptype = Tar::COMPRESS_AUTO, $complevel = 9) { + $this->close(); + + if($comptype === Tar::COMPRESS_AUTO) $comptype = $this->comptype; + $this->compressioncheck($comptype); + + if($comptype === Tar::COMPRESS_GZIP) return gzcompress($this->memory, $complevel); + if($comptype === Tar::COMPRESS_BZIP) return bzcompress($this->memory); + return $this->memory; + } + + /** + * Save the created in-memory archive data + * + * Note: It more memory effective to specify the filename in the create() function and + * let the library work on the new file directly. + * + * @param $file + * @param int $comptype + * @param int $complevel + * @throws TarIOException + */ + public function save($file, $comptype = Tar::COMPRESS_AUTO, $complevel = 9) { + if($comptype === Tar::COMPRESS_AUTO) $comptype = $this->filetype($file); + + if(!file_put_contents($file, $this->getArchive($comptype, $complevel))) { + throw new TarIOException('Could not write to file: '.$file); + } + } + + /** + * Read from the open file pointer + * + * @param int $length bytes to read + * @return string + */ + protected function readbytes($length) { + if($this->comptype === Tar::COMPRESS_GZIP) { + return @gzread($this->fh, $length); + } elseif($this->comptype === Tar::COMPRESS_BZIP) { + return @bzread($this->fh, $length); + } else { + return @fread($this->fh, $length); + } + } + + /** + * Write to the open filepointer or memory + * + * @param string $data + * @throws TarIOException + * @return int number of bytes written + */ + protected function writebytes($data) { + if(!$this->file) { + $this->memory .= $data; + $written = strlen($data); + } elseif($this->comptype === Tar::COMPRESS_GZIP) { + $written = @gzwrite($this->fh, $data); + } elseif($this->comptype === Tar::COMPRESS_BZIP) { + $written = @bzwrite($this->fh, $data); + } else { + $written = @fwrite($this->fh, $data); + } + if($written === false) throw new TarIOException('Failed to write to archive stream'); + return $written; + } + + /** + * Skip forward in the open file pointer + * + * This is basically a wrapper around seek() (and a workaround for bzip2) + * + * @param int $bytes seek to this position + */ + function skipbytes($bytes) { + if($this->comptype === Tar::COMPRESS_GZIP) { + @gzseek($this->fh, $bytes, SEEK_CUR); + } elseif($this->comptype === Tar::COMPRESS_BZIP) { + // there is no seek in bzip2, we simply read on + @bzread($this->fh, $bytes); + } else { + @fseek($this->fh, $bytes, SEEK_CUR); + } + } + + /** + * Write a file header + * + * @param string $name + * @param int $uid + * @param int $gid + * @param int $perm + * @param int $size + * @param int $mtime + * @param string $typeflag Set to '5' for directories + */ + protected function writeFileHeader($name, $uid, $gid, $perm, $size, $mtime, $typeflag = '') { + // handle filename length restrictions + $prefix = ''; + $namelen = strlen($name); + if($namelen > 100) { + $file = basename($name); + $dir = dirname($name); + if(strlen($file) > 100 || strlen($dir) > 155) { + // we're still too large, let's use GNU longlink + $this->writeFileHeader('././@LongLink', 0, 0, 0, $namelen, 0, 'L'); + for($s = 0; $s < $namelen; $s += 512) { + $this->writebytes(pack("a512", substr($name, $s, 512))); + } + $name = substr($name, 0, 100); // cut off name + } else { + // we're fine when splitting, use POSIX ustar + $prefix = $dir; + $name = $file; + } + } + + // values are needed in octal + $uid = sprintf("%6s ", decoct($uid)); + $gid = sprintf("%6s ", decoct($gid)); + $perm = sprintf("%6s ", decoct($perm)); + $size = sprintf("%11s ", decoct($size)); + $mtime = sprintf("%11s", decoct($mtime)); + + $data_first = pack("a100a8a8a8a12A12", $name, $perm, $uid, $gid, $size, $mtime); + $data_last = pack("a1a100a6a2a32a32a8a8a155a12", $typeflag, '', 'ustar', '', '', '', '', '', $prefix, ""); + + for($i = 0, $chks = 0; $i < 148; $i++) + $chks += ord($data_first[$i]); + + for($i = 156, $chks += 256, $j = 0; $i < 512; $i++, $j++) + $chks += ord($data_last[$j]); + + $this->writebytes($data_first); + + $chks = pack("a8", sprintf("%6s ", decoct($chks))); + $this->writebytes($chks.$data_last); + } + + /** + * Decode the given tar file header + * + * @param string $block a 512 byte block containign the header data + * @return array|bool + */ + protected function parseHeader($block) { + if(!$block || strlen($block) != 512) return false; + + for($i = 0, $chks = 0; $i < 148; $i++) + $chks += ord($block[$i]); + + for($i = 156, $chks += 256; $i < 512; $i++) + $chks += ord($block[$i]); + + $header = @unpack("a100filename/a8perm/a8uid/a8gid/a12size/a12mtime/a8checksum/a1typeflag/a100link/a6magic/a2version/a32uname/a32gname/a8devmajor/a8devminor/a155prefix", $block); + if(!$header) return false; + + $return['checksum'] = OctDec(trim($header['checksum'])); + if($return['checksum'] != $chks) return false; + + $return['filename'] = trim($header['filename']); + $return['perm'] = OctDec(trim($header['perm'])); + $return['uid'] = OctDec(trim($header['uid'])); + $return['gid'] = OctDec(trim($header['gid'])); + $return['size'] = OctDec(trim($header['size'])); + $return['mtime'] = OctDec(trim($header['mtime'])); + $return['typeflag'] = $header['typeflag']; + $return['link'] = trim($header['link']); + $return['uname'] = trim($header['uname']); + $return['gname'] = trim($header['gname']); + + // Handle ustar Posix compliant path prefixes + if(trim($header['prefix'])) $return['filename'] = trim($header['prefix']).'/'.$return['filename']; + + // Handle Long-Link entries from GNU Tar + if($return['typeflag'] == 'L') { + // following data block(s) is the filename + $filename = trim($this->readbytes(ceil($header['size'] / 512) * 512)); + // next block is the real header + $block = $this->readbytes(512); + $return = $this->parseHeader($block); + // overwrite the filename + $return['filename'] = $filename; + } + + return $return; + } + + /** + * Cleans up a path and removes relative parts, also strips leading slashes + * + * @param string $p_dir + * @return string + */ + public function cleanPath($path) { + $path=explode('/', $path); + $newpath=array(); + foreach($path as $p) { + if ($p === '' || $p === '.') continue; + if ($p==='..') { + array_pop($newpath); + continue; + } + array_push($newpath, $p); + } + return trim(implode('/', $newpath), '/'); + } + + /** + * Checks if the given compression type is available and throws an exception if not + * + * @param $comptype + * @throws TarIllegalCompressionException + */ + protected function compressioncheck($comptype) { + if($comptype === Tar::COMPRESS_GZIP && !function_exists('gzopen')) { + throw new TarIllegalCompressionException('No gzip support available'); + } + + if($comptype === Tar::COMPRESS_BZIP && !function_exists('bzopen')) { + throw new TarIllegalCompressionException('No bzip2 support available'); + } + } + + /** + * Guesses the wanted compression from the given filename extension + * + * You don't need to call this yourself. It's used when you pass Tar::COMPRESS_AUTO somewhere + * + * @param string $file + * @return int + */ + public function filetype($file) { + $file = strtolower($file); + if(substr($file, -3) == '.gz' || substr($file, -4) == '.tgz') { + $comptype = Tar::COMPRESS_GZIP; + } elseif(substr($file, -4) == '.bz2' || substr($file, -4) == '.tbz') { + $comptype = Tar::COMPRESS_BZIP; + } else { + $comptype = Tar::COMPRESS_NONE; + } + return $comptype; + } +} + +class TarIOException extends Exception { +} + +class TarIllegalCompressionException extends Exception { +} diff --git a/sources/inc/TarLib.class.php b/sources/inc/TarLib.class.php new file mode 100644 index 0000000..ae08039 --- /dev/null +++ b/sources/inc/TarLib.class.php @@ -0,0 +1,87 @@ +<?php + +/** + * This is a compatibility wrapper around the new Tar class + * + * Use of this library is strongly discouraged. Only basic extraction is wrapped, + * everything else will fail. + * + * @deprecated 2012-11-06 + */ +class TarLib { + + const COMPRESS_GZIP = 1; + const COMPRESS_BZIP = 2; + const COMPRESS_AUTO = 3; + const COMPRESS_NONE = 0; + const TARLIB_VERSION = '1.2'; + const FULL_ARCHIVE = -1; + const ARCHIVE_DYNAMIC = 0; + const ARCHIVE_RENAMECOMP = 5; + const COMPRESS_DETECT = -1; + + private $file = ''; + private $tar; + + public $_result = true; + + function __construct($file, $comptype = TarLib::COMPRESS_AUTO, $complevel = 9) { + if(!$file) $this->error('__construct', '$file'); + + $this->file = $file; + switch($comptype) { + case TarLib::COMPRESS_AUTO: + case TarLib::COMPRESS_DETECT: + $comptype = Tar::COMPRESS_AUTO; + break; + case TarLib::COMPRESS_GZIP: + $comptype = Tar::COMPRESS_GZIP; + break; + case TarLib::COMPRESS_BZIP: + $comptype = Tar::COMPRESS_BZIP; + break; + default: + $comptype = Tar::COMPRESS_NONE; + } + + $this->complevel = $complevel; + + try { + $this->tar = new Tar(); + $this->tar->open($file, $comptype); + } catch(Exception $e) { + $this->_result = false; + } + } + + function Extract($p_what = TarLib::FULL_ARCHIVE, $p_to = '.', $p_remdir = '', $p_mode = 0755) { + if($p_what != TarLib::FULL_ARCHIVE) { + $this->error('Extract', 'Ep_what'); + return 0; + } + + try { + $this->tar->extract($p_to, $p_remdir); + } catch(Exception $e) { + return 0; + } + return 1; + } + + function error($func, $param = '') { + $error = 'TarLib is deprecated and should no longer be used.'; + + if($param) { + $error .= "In this compatibility wrapper, the function '$func' does not accept your value for". + "the parameter '$param' anymore."; + } else { + $error .= "The function '$func' no longer exists in this compatibility wrapper."; + } + + msg($error, -1); + } + + function __call($name, $arguments) { + $this->error($name); + } +} \ No newline at end of file diff --git a/sources/inc/ZipLib.class.php b/sources/inc/ZipLib.class.php new file mode 100644 index 0000000..918d385 --- /dev/null +++ b/sources/inc/ZipLib.class.php @@ -0,0 +1,504 @@ +<?php + +/** + * @author bouchon + * @link http://dev.maxg.info + * @link http://forum.maxg.info + * + * Modified for Dokuwiki + * @author Christopher Smith <chris@jalakai.co.uk> + */ +class ZipLib { + + var $datasec; + var $ctrl_dir = array(); + var $eof_ctrl_dir = "\x50\x4b\x05\x06\x00\x00\x00\x00"; + var $old_offset = 0; + var $dirs = Array("."); + + function get_List($zip_name) { + $zip = @fopen($zip_name, 'rb'); + if(!$zip) return(0); + $centd = $this->ReadCentralDir($zip,$zip_name); + + @rewind($zip); + @fseek($zip, $centd['offset']); + + for ($i=0; $i<$centd['entries']; $i++) { + $header = $this->ReadCentralFileHeaders($zip); + $header['index'] = $i; + + $info['filename'] = $header['filename']; + $info['stored_filename'] = $header['stored_filename']; + $info['size'] = $header['size']; + $info['compressed_size'] = $header['compressed_size']; + $info['crc'] = strtoupper(dechex( $header['crc'] )); + $info['mtime'] = $header['mtime']; + $info['comment'] = $header['comment']; + $info['folder'] = ($header['external']==0x41FF0010||$header['external']==16)?1:0; + $info['index'] = $header['index']; + $info['status'] = $header['status']; + $ret[]=$info; + + unset($header); + } + return $ret; + } + + function Add($files,$compact) { + if(!is_array($files[0])) $files=Array($files); + + for($i=0;$files[$i];$i++){ + $fn = $files[$i]; + if(!in_Array(dirname($fn[0]),$this->dirs)) + $this->add_Dir(dirname($fn[0])); + if(utf8_basename($fn[0])) + $ret[utf8_basename($fn[0])]=$this->add_File($fn[1],$fn[0],$compact); + } + return $ret; + } + + /** + * Zips recursively the $folder directory, from the $basedir directory + */ + function Compress($folder, $basedir=null, $parent=null) { + $full_path = $basedir."/".$parent.$folder; + $zip_path = $parent.$folder; + if ($zip_path) { + $zip_path .= "/"; + $this->add_dir($zip_path); + } + $dir = new DirectoryIterator($full_path); + foreach($dir as $file) { + if(!$file->isDot()) { + $filename = $file->getFilename(); + if($file->isDir()) { + $this->Compress($filename, $basedir, $zip_path); + } else { + $content = join('', file($full_path.'/'.$filename)); + $this->add_File($content, $zip_path.$filename); + } + } + } + } + + /** + * Returns the Zip file + */ + function get_file() { + $data = implode('', $this -> datasec); + $ctrldir = implode('', $this -> ctrl_dir); + + return $data . $ctrldir . $this -> eof_ctrl_dir . + pack('v', count($this->ctrl_dir)).pack('v', count($this->ctrl_dir)). + pack('V', strlen($ctrldir)) . pack('V', strlen($data)) . "\x00\x00"; + } + + function add_dir($name) { + $name = str_replace("\\", "/", $name); + $fr = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00"; + + $fr .= pack("V",0).pack("V",0).pack("V",0).pack("v", strlen($name) ); + $fr .= pack("v", 0 ).$name.pack("V", 0).pack("V", 0).pack("V", 0); + $this -> datasec[] = $fr; + + $new_offset = strlen(implode("", $this->datasec)); + + $cdrec = "\x50\x4b\x01\x02\x00\x00\x0a\x00\x00\x00\x00\x00\x00\x00\x00\x00"; + $cdrec .= pack("V",0).pack("V",0).pack("V",0).pack("v", strlen($name) ); + $cdrec .= pack("v", 0 ).pack("v", 0 ).pack("v", 0 ).pack("v", 0 ); + $ext = "\xff\xff\xff\xff"; + $cdrec .= pack("V", 16 ).pack("V", $this -> old_offset ).$name; + + $this -> ctrl_dir[] = $cdrec; + $this -> old_offset = $new_offset; + $this -> dirs[] = $name; + } + + /** + * Add a file named $name from a string $data + */ + function add_File($data, $name, $compact = 1) { + $name = str_replace('\\', '/', $name); + $dtime = dechex($this->DosTime()); + + $hexdtime = pack('H*',$dtime[6].$dtime[7]. + $dtime[4].$dtime[5]. + $dtime[2].$dtime[3]. + $dtime[0].$dtime[1]); + + if($compact){ + $fr = "\x50\x4b\x03\x04\x14\x00\x00\x00\x08\x00".$hexdtime; + }else{ + $fr = "\x50\x4b\x03\x04\x0a\x00\x00\x00\x00\x00".$hexdtime; + } + $unc_len = strlen($data); + $crc = crc32($data); + + if($compact){ + $zdata = gzcompress($data); + $c_len = strlen($zdata); + $zdata = substr(substr($zdata, 0, strlen($zdata) - 4), 2); + }else{ + $zdata = $data; + } + $c_len=strlen($zdata); + $fr .= pack('V', $crc).pack('V', $c_len).pack('V', $unc_len); + $fr .= pack('v', strlen($name)).pack('v', 0).$name.$zdata; + + $fr .= pack('V', $crc).pack('V', $c_len).pack('V', $unc_len); + + $this -> datasec[] = $fr; + $new_offset = strlen(implode('', $this->datasec)); + if($compact) { + $cdrec = "\x50\x4b\x01\x02\x00\x00\x14\x00\x00\x00\x08\x00"; + } else { + $cdrec = "\x50\x4b\x01\x02\x14\x00\x0a\x00\x00\x00\x00\x00"; + } + $cdrec .= $hexdtime.pack('V', $crc).pack('V', $c_len).pack('V', $unc_len); + $cdrec .= pack('v', strlen($name) ).pack('v', 0 ).pack('v', 0 ); + $cdrec .= pack('v', 0 ).pack('v', 0 ).pack('V', 32 ); + $cdrec .= pack('V', $this -> old_offset ); + + $this -> old_offset = $new_offset; + $cdrec .= $name; + $this -> ctrl_dir[] = $cdrec; + return true; + } + + function DosTime() { + $timearray = getdate(); + if ($timearray['year'] < 1980) { + $timearray['year'] = 1980; + $timearray['mon'] = 1; + $timearray['mday'] = 1; + $timearray['hours'] = 0; + $timearray['minutes'] = 0; + $timearray['seconds'] = 0; + } + return (($timearray['year'] - 1980) << 25) | + ($timearray['mon'] << 21) | + ($timearray['mday'] << 16) | + ($timearray['hours'] << 11) | + ($timearray['minutes'] << 5) | + ($timearray['seconds'] >> 1); + } + + /** + * Extract a zip file $zn to the $to directory + */ + function Extract ( $zn, $to, $index = Array(-1) ) { + if(!@is_dir($to)) $this->_mkdir($to); + $ok = 0; + $zip = @fopen($zn,'rb'); + if(!$zip) return(-1); + $cdir = $this->ReadCentralDir($zip,$zn); + $pos_entry = $cdir['offset']; + + if(!is_array($index)){ + $index = array($index); + } + for($i=0; isset($index[$i]);$i++){ + if(intval($index[$i])!=$index[$i]||$index[$i]>$cdir['entries']) + return(-1); + } + + for ($i=0; $i<$cdir['entries']; $i++) { + @fseek($zip, $pos_entry); + $header = $this->ReadCentralFileHeaders($zip); + $header['index'] = $i; + $pos_entry = ftell($zip); + @rewind($zip); + fseek($zip, $header['offset']); + if(in_array("-1",$index)||in_array($i,$index)){ + $stat[$header['filename']]=$this->ExtractFile($header, $to, $zip); + } + } + fclose($zip); + return $stat; + } + + function ReadFileHeader($zip, $header) { + $binary_data = fread($zip, 30); + $data = unpack('vchk/vid/vversion/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len', $binary_data); + + $header['filename'] = fread($zip, $data['filename_len']); + if ($data['extra_len'] != 0) { + $header['extra'] = fread($zip, $data['extra_len']); + } else { + $header['extra'] = ''; + } + + $header['compression'] = $data['compression']; + foreach (array('size','compressed_size','crc') as $hd) { // On ODT files, these headers are 0. Keep the previous value. + if ($data[$hd] != 0) $header[$hd] = $data[$hd]; + } + $header['flag'] = $data['flag']; + $header['mdate'] = $data['mdate']; + $header['mtime'] = $data['mtime']; + + if ($header['mdate'] && $header['mtime']){ + $hour = ($header['mtime']&0xF800)>>11; + $minute = ($header['mtime']&0x07E0)>>5; + $seconde = ($header['mtime']&0x001F)*2; + $year = (($header['mdate']&0xFE00)>>9)+1980; + $month = ($header['mdate']&0x01E0)>>5; + $day = $header['mdate']&0x001F; + $header['mtime'] = mktime($hour, $minute, $seconde, $month, $day, $year); + } else { + $header['mtime'] = time(); + } + + $header['stored_filename'] = $header['filename']; + $header['status'] = "ok"; + return $header; + } + + function ReadCentralFileHeaders($zip){ + $binary_data = fread($zip, 46); + $header = unpack('vchkid/vid/vversion/vversion_extracted/vflag/vcompression/vmtime/vmdate/Vcrc/Vcompressed_size/Vsize/vfilename_len/vextra_len/vcomment_len/vdisk/vinternal/Vexternal/Voffset', $binary_data); + + if ($header['filename_len'] != 0){ + $header['filename'] = fread($zip,$header['filename_len']); + }else{ + $header['filename'] = ''; + } + + if ($header['extra_len'] != 0){ + $header['extra'] = fread($zip, $header['extra_len']); + }else{ + $header['extra'] = ''; + } + + if ($header['comment_len'] != 0){ + $header['comment'] = fread($zip, $header['comment_len']); + }else{ + $header['comment'] = ''; + } + + if ($header['mdate'] && $header['mtime']) { + $hour = ($header['mtime'] & 0xF800) >> 11; + $minute = ($header['mtime'] & 0x07E0) >> 5; + $seconde = ($header['mtime'] & 0x001F)*2; + $year = (($header['mdate'] & 0xFE00) >> 9) + 1980; + $month = ($header['mdate'] & 0x01E0) >> 5; + $day = $header['mdate'] & 0x001F; + $header['mtime'] = mktime($hour, $minute, $seconde, $month, $day, $year); + } else { + $header['mtime'] = time(); + } + + $header['stored_filename'] = $header['filename']; + $header['status'] = 'ok'; + if (substr($header['filename'], -1) == '/') $header['external'] = 0x41FF0010; + + return $header; + } + + function ReadCentralDir($zip,$zip_name) { + $size = filesize($zip_name); + if ($size < 277){ + $maximum_size = $size; + } else { + $maximum_size=277; + } + + @fseek($zip, $size-$maximum_size); + $pos = ftell($zip); + $bytes = 0x00000000; + + while ($pos < $size) { + $byte = @fread($zip, 1); + $bytes=(($bytes << 8) & 0xFFFFFFFF) | Ord($byte); + if ($bytes == 0x504b0506){ + $pos++; + break; + } + $pos++; + } + + $data=unpack('vdisk/vdisk_start/vdisk_entries/ventries/Vsize/Voffset/vcomment_size', + fread($zip, 18)); + + if ($data['comment_size'] != 0){ + $centd['comment'] = fread($zip, $data['comment_size']); + } else { + $centd['comment'] = ''; + } + $centd['entries'] = $data['entries']; + $centd['disk_entries'] = $data['disk_entries']; + $centd['offset'] = $data['offset']; + $centd['disk_start'] = $data['disk_start']; + $centd['size'] = $data['size']; + $centd['disk'] = $data['disk']; + return $centd; + } + + function ExtractFile($header,$to,$zip) { + $header = $this->readfileheader($zip, $header); + + if(substr($to,-1)!="/") $to.="/"; + if(substr($header['filename'],-1)=="/") { + $this->_mkdir($to.$header['filename']); + return +2; + } + + if (!$this->_mkdir($to.dirname($header['filename']))) return (-1); + + if (!array_key_exists("external", $header) || (!($header['external']==0x41FF0010)&&!($header['external']==16))) { + if ($header['compression']==0) { + $fp = @fopen($to.$header['filename'], 'wb'); + if(!$fp) return(-1); + $size = $header['compressed_size']; + + while ($size != 0) { + $read_size = ($size < 2048 ? $size : 2048); + $buffer = fread($zip, $read_size); + $binary_data = pack('a'.$read_size, $buffer); + @fwrite($fp, $binary_data, $read_size); + $size -= $read_size; + } + fclose($fp); + touch($to.$header['filename'], $header['mtime']); + + }else{ + if (!is_dir(dirname($to.$header['filename']))) $this->_mkdir(dirname($to.$header['filename'])); + $fp = fopen($to.$header['filename'].'.gz','wb'); + if(!$fp) return(-1); + $binary_data = pack('va1a1Va1a1', 0x8b1f, Chr($header['compression']), + Chr(0x00), time(), Chr(0x00), Chr(3)); + + fwrite($fp, $binary_data, 10); + $size = $header['compressed_size']; + + while ($size != 0) { + $read_size = ($size < 1024 ? $size : 1024); + $buffer = fread($zip, $read_size); + $binary_data = pack('a'.$read_size, $buffer); + @fwrite($fp, $binary_data, $read_size); + $size -= $read_size; + } + + $binary_data = pack('VV', $header['crc'], $header['size']); + fwrite($fp, $binary_data,8); + fclose($fp); + + $gzp = @gzopen($to.$header['filename'].'.gz','rb'); + if(!$gzp){ + @gzclose($gzp); + @unlink($to.$header['filename']); + die("Archive is compressed whereas ZLIB is not enabled."); + } + $fp = @fopen($to.$header['filename'],'wb'); + if(!$fp) return(-1); + $size = $header['size']; + + while ($size != 0) { + $read_size = ($size < 2048 ? $size : 2048); + $buffer = gzread($gzp, $read_size); + $binary_data = pack('a'.$read_size, $buffer); + @fwrite($fp, $binary_data, $read_size); + $size -= $read_size; + } + fclose($fp); + gzclose($gzp); + + touch($to.$header['filename'], $header['mtime']); + @unlink($to.$header['filename'].'.gz'); + } + } + return true; + } + + /** + * centralize mkdir calls and use dokuwiki io functions + * + * @author Christopher Smith <chris@jalakai.co.uk> + */ + function _mkdir($d) { + return io_mkdir_p($d); + } + + + function ExtractStr($zn, $name) { + $ok = 0; + $zip = @fopen($zn,'rb'); + if(!$zip) return(null); + $cdir = $this->ReadCentralDir($zip,$zn); + $pos_entry = $cdir['offset']; + + for ($i=0; $i<$cdir['entries']; $i++) { + @fseek($zip, $pos_entry); + $header = $this->ReadCentralFileHeaders($zip); + $header['index'] = $i; + $pos_entry = ftell($zip); + @rewind($zip); + fseek($zip, $header['offset']); + if ($name == $header['stored_filename'] || $name == $header['filename']) { + $str = $this->ExtractStrFile($header, $zip); + fclose($zip); + return $str; + } + + } + fclose($zip); + return null; + } + + function ExtractStrFile($header,$zip) { + $hdr = $this->readfileheader($zip); + $binary_data = ''; + if (!($header['external']==0x41FF0010) && !($header['external']==16)) { + if ($header['compression']==0) { + while ($size != 0) { + $read_size = ($size < 2048 ? $size : 2048); + $buffer = fread($zip, $read_size); + $binary_data .= pack('a'.$read_size, $buffer); + $size -= $read_size; + } + return $binary_data; + } else { + $size = $header['compressed_size']; + if ($size == 0) { + return ''; + } + //Just in case + if ($size > ($this->_ret_bytes(ini_get('memory_limit'))/2)) { + die("Compressed file is to huge to be uncompress in memory."); + } + while ($size != 0) + { + $read_size = ($size < 2048 ? $size : 2048); + $buffer = fread($zip, $read_size); + $binary_data .= pack('a'.$read_size, $buffer); + $size -= $read_size; + } + $str = gzinflate($binary_data, $header['size']); + if ($header['crc'] == crc32($str)) { + return $str; + } else { + die("Crc Error"); + } + } + } + return null; + } + + function _ret_bytes($val) { + $val = trim($val); + $last = $val{strlen($val)-1}; + switch($last) { + case 'k': + case 'K': + return (int) $val * 1024; + break; + case 'm': + case 'M': + return (int) $val * 1048576; + break; + default: + return $val; + } + } +} + diff --git a/sources/inc/actions.php b/sources/inc/actions.php new file mode 100644 index 0000000..50cbe36 --- /dev/null +++ b/sources/inc/actions.php @@ -0,0 +1,819 @@ +<?php +/** + * DokuWiki Actions + * + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + * @author Andreas Gohr <andi@splitbrain.org> + */ + +if(!defined('DOKU_INC')) die('meh.'); + +/** + * Call the needed action handlers + * + * @author Andreas Gohr <andi@splitbrain.org> + * @triggers ACTION_ACT_PREPROCESS + * @triggers ACTION_HEADERS_SEND + */ +function act_dispatch(){ + global $ACT; + global $ID; + global $INFO; + global $QUERY; + global $INPUT; + global $lang; + global $conf; + + $preact = $ACT; + + // give plugins an opportunity to process the action + $evt = new Doku_Event('ACTION_ACT_PREPROCESS',$ACT); + if ($evt->advise_before()) { + + //sanitize $ACT + $ACT = act_validate($ACT); + + //check if searchword was given - else just show + $s = cleanID($QUERY); + if($ACT == 'search' && empty($s)){ + $ACT = 'show'; + } + + //login stuff + if(in_array($ACT,array('login','logout'))){ + $ACT = act_auth($ACT); + } + + //check if user is asking to (un)subscribe a page + if($ACT == 'subscribe') { + try { + $ACT = act_subscription($ACT); + } catch (Exception $e) { + msg($e->getMessage(), -1); + } + } + + //display some info + if($ACT == 'check'){ + check(); + $ACT = 'show'; + } + + //check permissions + $ACT = act_permcheck($ACT); + + //sitemap + if ($ACT == 'sitemap'){ + act_sitemap($ACT); + } + + //recent changes + if ($ACT == 'recent'){ + $show_changes = $INPUT->str('show_changes'); + if (!empty($show_changes)) { + set_doku_pref('show_changes', $show_changes); + } + } + + //diff + if ($ACT == 'diff'){ + $difftype = $INPUT->str('difftype'); + if (!empty($difftype)) { + set_doku_pref('difftype', $difftype); + } + } + + //register + if($ACT == 'register' && $INPUT->post->bool('save') && register()){ + $ACT = 'login'; + } + + if ($ACT == 'resendpwd' && act_resendpwd()) { + $ACT = 'login'; + } + + // user profile changes + if (in_array($ACT, array('profile','profile_delete'))) { + if(!$_SERVER['REMOTE_USER']) { + $ACT = 'login'; + } else { + switch ($ACT) { + case 'profile' : + if(updateprofile()) { + msg($lang['profchanged'],1); + $ACT = 'show'; + } + break; + case 'profile_delete' : + if(auth_deleteprofile()){ + msg($lang['profdeleted'],1); + $ACT = 'show'; + } else { + $ACT = 'profile'; + } + break; + } + } + } + + //revert + if($ACT == 'revert'){ + if(checkSecurityToken()){ + $ACT = act_revert($ACT); + }else{ + $ACT = 'show'; + } + } + + //save + if($ACT == 'save'){ + if(checkSecurityToken()){ + $ACT = act_save($ACT); + }else{ + $ACT = 'preview'; + } + } + + //cancel conflicting edit + if($ACT == 'cancel') + $ACT = 'show'; + + //draft deletion + if($ACT == 'draftdel') + $ACT = act_draftdel($ACT); + + //draft saving on preview + if($ACT == 'preview') + $ACT = act_draftsave($ACT); + + //edit + if(in_array($ACT, array('edit', 'preview', 'recover'))) { + $ACT = act_edit($ACT); + }else{ + unlock($ID); //try to unlock + } + + //handle export + if(substr($ACT,0,7) == 'export_') + $ACT = act_export($ACT); + + //handle admin tasks + if($ACT == 'admin'){ + // retrieve admin plugin name from $_REQUEST['page'] + if (($page = $INPUT->str('page', '', true)) != '') { + $pluginlist = plugin_list('admin'); + if (in_array($page, $pluginlist)) { + // attempt to load the plugin + + if (($plugin = plugin_load('admin',$page)) !== null){ + /** @var DokuWiki_Admin_Plugin $plugin */ + if($plugin->forAdminOnly() && !$INFO['isadmin']){ + // a manager tried to load a plugin that's for admins only + $INPUT->remove('page'); + msg('For admins only',-1); + }else{ + $plugin->handle(); + } + } + } + } + } + + // check permissions again - the action may have changed + $ACT = act_permcheck($ACT); + } // end event ACTION_ACT_PREPROCESS default action + $evt->advise_after(); + // Make sure plugs can handle 'denied' + if($conf['send404'] && $ACT == 'denied') { + http_status(403); + } + unset($evt); + + // when action 'show', the intial not 'show' and POST, do a redirect + if($ACT == 'show' && $preact != 'show' && strtolower($_SERVER['REQUEST_METHOD']) == 'post'){ + act_redirect($ID,$preact); + } + + global $INFO; + global $conf; + global $license; + + //call template FIXME: all needed vars available? + $headers[] = 'Content-Type: text/html; charset=utf-8'; + trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders'); + + include(template('main.php')); + // output for the commands is now handled in inc/templates.php + // in function tpl_content() +} + +/** + * Send the given headers using header() + * + * @param array $headers The headers that shall be sent + */ +function act_sendheaders($headers) { + foreach ($headers as $hdr) header($hdr); +} + +/** + * Sanitize the action command + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function act_clean($act){ + // check if the action was given as array key + if(is_array($act)){ + list($act) = array_keys($act); + } + + //remove all bad chars + $act = strtolower($act); + $act = preg_replace('/[^1-9a-z_]+/','',$act); + + if($act == 'export_html') $act = 'export_xhtml'; + if($act == 'export_htmlbody') $act = 'export_xhtmlbody'; + + if($act === '') $act = 'show'; + return $act; +} + +/** + * Sanitize and validate action commands. + * + * Add all allowed commands here. + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function act_validate($act) { + global $conf; + global $INFO; + + $act = act_clean($act); + + // check if action is disabled + if(!actionOK($act)){ + msg('Command disabled: '.htmlspecialchars($act),-1); + return 'show'; + } + + //disable all acl related commands if ACL is disabled + if(!$conf['useacl'] && in_array($act,array('login','logout','register','admin', + 'subscribe','unsubscribe','profile','revert', + 'resendpwd','profile_delete'))){ + msg('Command unavailable: '.htmlspecialchars($act),-1); + return 'show'; + } + + //is there really a draft? + if($act == 'draft' && !file_exists($INFO['draft'])) return 'edit'; + + if(!in_array($act,array('login','logout','register','save','cancel','edit','draft', + 'preview','search','show','check','index','revisions', + 'diff','recent','backlink','admin','subscribe','revert', + 'unsubscribe','profile','profile_delete','resendpwd','recover', + 'draftdel','sitemap','media')) && substr($act,0,7) != 'export_' ) { + msg('Command unknown: '.htmlspecialchars($act),-1); + return 'show'; + } + return $act; +} + +/** + * Run permissionchecks + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function act_permcheck($act){ + global $INFO; + global $conf; + + if(in_array($act,array('save','preview','edit','recover'))){ + if($INFO['exists']){ + if($act == 'edit'){ + //the edit function will check again and do a source show + //when no AUTH_EDIT available + $permneed = AUTH_READ; + }else{ + $permneed = AUTH_EDIT; + } + }else{ + $permneed = AUTH_CREATE; + } + }elseif(in_array($act,array('login','search','recent','profile','profile_delete','index', 'sitemap'))){ + $permneed = AUTH_NONE; + }elseif($act == 'revert'){ + $permneed = AUTH_ADMIN; + if($INFO['ismanager']) $permneed = AUTH_EDIT; + }elseif($act == 'register'){ + $permneed = AUTH_NONE; + }elseif($act == 'resendpwd'){ + $permneed = AUTH_NONE; + }elseif($act == 'admin'){ + if($INFO['ismanager']){ + // if the manager has the needed permissions for a certain admin + // action is checked later + $permneed = AUTH_READ; + }else{ + $permneed = AUTH_ADMIN; + } + }else{ + $permneed = AUTH_READ; + } + if($INFO['perm'] >= $permneed) return $act; + + return 'denied'; +} + +/** + * Handle 'draftdel' + * + * Deletes the draft for the current page and user + */ +function act_draftdel($act){ + global $INFO; + @unlink($INFO['draft']); + $INFO['draft'] = null; + return 'show'; +} + +/** + * Saves a draft on preview + * + * @todo this currently duplicates code from ajax.php :-/ + */ +function act_draftsave($act){ + global $INFO; + global $ID; + global $INPUT; + global $conf; + if($conf['usedraft'] && $INPUT->post->has('wikitext')) { + $draft = array('id' => $ID, + 'prefix' => substr($INPUT->post->str('prefix'), 0, -1), + 'text' => $INPUT->post->str('wikitext'), + 'suffix' => $INPUT->post->str('suffix'), + 'date' => $INPUT->post->int('date'), + 'client' => $INFO['client'], + ); + $cname = getCacheName($draft['client'].$ID,'.draft'); + if(io_saveFile($cname,serialize($draft))){ + $INFO['draft'] = $cname; + } + } + return $act; +} + +/** + * Handle 'save' + * + * Checks for spam and conflicts and saves the page. + * Does a redirect to show the page afterwards or + * returns a new action. + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function act_save($act){ + global $ID; + global $DATE; + global $PRE; + global $TEXT; + global $SUF; + global $SUM; + global $lang; + global $INFO; + global $INPUT; + + //spam check + if(checkwordblock()) { + msg($lang['wordblock'], -1); + return 'edit'; + } + //conflict check + if($DATE != 0 && $INFO['meta']['date']['modified'] > $DATE ) + return 'conflict'; + + //save it + saveWikiText($ID,con($PRE,$TEXT,$SUF,1),$SUM,$INPUT->bool('minor')); //use pretty mode for con + //unlock it + unlock($ID); + + //delete draft + act_draftdel($act); + session_write_close(); + + // when done, show page + return 'show'; +} + +/** + * Revert to a certain revision + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function act_revert($act){ + global $ID; + global $REV; + global $lang; + // FIXME $INFO['writable'] currently refers to the attic version + // global $INFO; + // if (!$INFO['writable']) { + // return 'show'; + // } + + // 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 = sprintf($lang['restored'], dformat($REV)); + } + + // spam check + + if (checkwordblock($text)) { + msg($lang['wordblock'], -1); + return 'edit'; + } + + 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 + */ +function act_redirect($id,$preact){ + global $PRE; + global $TEXT; + + $opts = array( + 'id' => $id, + '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'); +} + +/** + * Execute the redirect + * + * @param array $opts id and fragment for the redirect + */ +function act_redirect_execute($opts){ + $go = wl($opts['id'],'',true); + if(isset($opts['fragment'])) $go .= '#'.$opts['fragment']; + + //show it + send_redirect($go); +} + +/** + * Handle 'login', 'logout' + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function act_auth($act){ + global $ID; + global $INFO; + + //already logged in? + if(isset($_SERVER['REMOTE_USER']) && $act=='login'){ + return 'show'; + } + + //handle logout + if($act=='logout'){ + $lockedby = checklock($ID); //page still locked? + if($lockedby == $_SERVER['REMOTE_USER']) + unlock($ID); //try to unlock + + // do the logout stuff + auth_logoff(); + + // rebuild info array + $INFO = pageinfo(); + + act_redirect($ID,'login'); + } + + return $act; +} + +/** + * Handle 'edit', 'preview', 'recover' + * + * @author Andreas Gohr <andi@splitbrain.org> + */ +function act_edit($act){ + global $ID; + global $INFO; + + global $TEXT; + global $RANGE; + global $PRE; + global $SUF; + global $REV; + global $SUM; + global $lang; + global $DATE; + + if (!isset($TEXT)) { + if ($INFO['exists']) { + if ($RANGE) { + list($PRE,$TEXT,$SUF) = rawWikiSlices($RANGE,$ID,$REV); + } else { + $TEXT = rawWiki($ID,$REV); + } + } else { + $TEXT = pageTemplate($ID); + } + } + + //set summary default + if(!$SUM){ + if($REV){ + $SUM = sprintf($lang['restored'], dformat($REV)); + }elseif(!$INFO['exists']){ + $SUM = $lang['created']; + } + } + + // Use the date of the newest revision, not of the revision we edit + // This is used for conflict detection + if(!$DATE) $DATE = @filemtime(wikiFN($ID)); + + //check if locked by anyone - if not lock for my self + //do not lock when the user can't edit anyway + if ($INFO['writable']) { + $lockedby = checklock($ID); + if($lockedby) return 'locked'; + + lock($ID); + } + + return $act; +} + +/** + * Export a wiki page for various formats + * + * Triggers ACTION_EXPORT_POSTPROCESS + * + * Event data: + * data['id'] -- page id + * data['mode'] -- requested export mode + * data['headers'] -- export headers + * data['output'] -- export output + * + * @author Andreas Gohr <andi@splitbrain.org> + * @author Michael Klier <chi@chimeric.de> + */ +function act_export($act){ + global $ID; + global $REV; + global $conf; + global $lang; + + $pre = ''; + $post = ''; + $output = ''; + $headers = array(); + + // search engines: never cache exported docs! (Google only currently) + $headers['X-Robots-Tag'] = 'noindex'; + + $mode = substr($act,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': + $pre .= '<!DOCTYPE html>' . DOKU_LF; + $pre .= '<html lang="'.$conf['lang'].'" dir="'.$lang['direction'].'">' . DOKU_LF; + $pre .= '<head>' . DOKU_LF; + $pre .= ' <meta charset="utf-8" />' . DOKU_LF; + $pre .= ' <title>'.$ID.'' . DOKU_LF; + + // get metaheaders + ob_start(); + tpl_metaheaders(); + $pre .= ob_get_clean(); + + $pre .= '' . DOKU_LF; + $pre .= '' . DOKU_LF; + $pre .= '
' . DOKU_LF; + + // get toc + $pre .= tpl_toc(true); + + $headers['Content-Type'] = 'text/html; charset=utf-8'; + $output = p_wiki_xhtml($ID,$REV,false); + + $post .= '
' . DOKU_LF; + $post .= '' . DOKU_LF; + $post .= '' . DOKU_LF; + break; + case 'xhtmlbody': + $headers['Content-Type'] = 'text/html; charset=utf-8'; + $output = p_wiki_xhtml($ID,$REV,false); + break; + default: + $output = p_cached_output(wikiFN($ID,$REV), $mode); + $headers = p_get_metadata($ID,"format $mode"); + break; + } + + // prepare event data + $data = array(); + $data['id'] = $ID; + $data['mode'] = $mode; + $data['headers'] = $headers; + $data['output'] =& $output; + + trigger_event('ACTION_EXPORT_POSTPROCESS', $data); + + if(!empty($data['output'])){ + if(is_array($data['headers'])) foreach($data['headers'] as $key => $val){ + header("$key: $val"); + } + print $pre.$data['output'].$post; + exit; + } + return 'show'; +} + +/** + * Handle sitemap delivery + * + * @author Michael Hamann + */ +function act_sitemap($act) { + global $conf; + + if ($conf['sitemap'] < 1 || !is_numeric($conf['sitemap'])) { + http_status(404); + print "Sitemap generation is disabled."; + exit; + } + + $sitemap = Sitemapper::getFilePath(); + if (Sitemapper::sitemapIsCompressed()) { + $mime = 'application/x-gzip'; + }else{ + $mime = 'application/xml; charset=utf-8'; + } + + // Check if sitemap file exists, otherwise create it + if (!is_readable($sitemap)) { + Sitemapper::generate(); + } + + if (is_readable($sitemap)) { + // Send headers + header('Content-Type: '.$mime); + header('Content-Disposition: attachment; filename='.utf8_basename($sitemap)); + + http_conditionalRequest(filemtime($sitemap)); + + // Send file + //use x-sendfile header to pass the delivery to compatible webservers + if (http_sendfile($sitemap)) exit; + + readfile($sitemap); + exit; + } + + http_status(500); + print "Could not read the sitemap file - bad permissions?"; + exit; +} + +/** + * Handle page 'subscribe' + * + * Throws exception on error. + * + * @author Adrian Lang + */ +function act_subscription($act){ + global $lang; + global $INFO; + global $ID; + global $INPUT; + + // subcriptions work for logged in users only + if(!$_SERVER['REMOTE_USER']) return 'show'; + + // get and preprocess data. + $params = array(); + foreach(array('target', 'style', 'action') as $param) { + if ($INPUT->has("sub_$param")) { + $params[$param] = $INPUT->str("sub_$param"); + } + } + + // any action given? if not just return and show the subscription page + if(!$params['action'] || !checkSecurityToken()) return $act; + + // Handle POST data, may throw exception. + trigger_event('ACTION_HANDLE_SUBSCRIBE', $params, 'subscription_handle_post'); + + $target = $params['target']; + $style = $params['style']; + $action = $params['action']; + + // Perform action. + $sub = new Subscription(); + if($action == 'unsubscribe'){ + $ok = $sub->remove($target, $_SERVER['REMOTE_USER'], $style); + }else{ + $ok = $sub->add($target, $_SERVER['REMOTE_USER'], $style); + } + + if($ok) { + msg(sprintf($lang["subscr_{$action}_success"], hsc($INFO['userinfo']['name']), + prettyprint_id($target)), 1); + act_redirect($ID, $act); + } else { + throw new Exception(sprintf($lang["subscr_{$action}_error"], + hsc($INFO['userinfo']['name']), + prettyprint_id($target))); + } + + // Assure that we have valid data if act_redirect somehow fails. + $INFO['subscribed'] = $sub->user_subscription(); + return 'show'; +} + +/** + * Validate POST data + * + * Validates POST data for a subscribe or unsubscribe request. This is the + * default action for the event ACTION_HANDLE_SUBSCRIBE. + * + * @author Adrian Lang + */ +function subscription_handle_post(&$params) { + global $INFO; + global $lang; + + // Get and validate parameters. + if (!isset($params['target'])) { + throw new Exception('no subscription target given'); + } + $target = $params['target']; + $valid_styles = array('every', 'digest'); + if (substr($target, -1, 1) === ':') { + // Allow “list” subscribe style since the target is a namespace. + $valid_styles[] = 'list'; + } + $style = valid_input_set('style', $valid_styles, $params, + 'invalid subscription style given'); + $action = valid_input_set('action', array('subscribe', 'unsubscribe'), + $params, 'invalid subscription action given'); + + // Check other conditions. + if ($action === 'subscribe') { + if ($INFO['userinfo']['mail'] === '') { + throw new Exception($lang['subscr_subscribe_noaddress']); + } + } elseif ($action === 'unsubscribe') { + $is = false; + foreach($INFO['subscribed'] as $subscr) { + if ($subscr['target'] === $target) { + $is = true; + } + } + if ($is === false) { + throw new Exception(sprintf($lang['subscr_not_subscribed'], + $_SERVER['REMOTE_USER'], + prettyprint_id($target))); + } + // subscription_set deletes a subscription if style = null. + $style = null; + } + + $params = compact('target', 'style', 'action'); +} + +//Setup VIM: ex: et ts=2 : diff --git a/sources/inc/auth.php b/sources/inc/auth.php new file mode 100644 index 0000000..b793f5d --- /dev/null +++ b/sources/inc/auth.php @@ -0,0 +1,1320 @@ + + */ + +if(!defined('DOKU_INC')) die('meh.'); + +// 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); + +/** + * Initialize the auth system. + * + * This function is automatically called at the end of init.php + * + * This used to be the main() of the auth.php + * + * @todo backend loading maybe should be handled by the class autoloader + * @todo maybe split into multiple functions at the XXX marked positions + * @triggers AUTH_LOGIN_CHECK + * @return bool + */ +function auth_setup() { + global $conf; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + /* @var Input $INPUT */ + global $INPUT; + global $AUTH_ACL; + global $lang; + /* @var Doku_Plugin_Controller $plugin_controller */ + global $plugin_controller; + $AUTH_ACL = array(); + + if(!$conf['useacl']) return false; + + // try to load auth backend from plugins + foreach ($plugin_controller->getList('auth') as $plugin) { + if ($conf['authtype'] === $plugin) { + $auth = $plugin_controller->load('auth', $plugin); + break; + } elseif ('auth' . $conf['authtype'] === $plugin) { + // matches old auth backends (pre-Weatherwax) + $auth = $plugin_controller->load('auth', $plugin); + msg('Your authtype setting is deprecated. You must set $conf[\'authtype\'] = "auth' . $conf['authtype'] . '"' + . ' in your configuration (see Authentication Backends)',-1,'','',MSG_ADMINS_ONLY); + } + } + + if(!isset($auth) || !$auth){ + msg($lang['authtempfail'], -1); + return false; + } + + if ($auth->success == false) { + // degrade to unauthenticated user + unset($auth); + auth_logoff(); + msg($lang['authtempfail'], -1); + return false; + } + + // do the login either by cookie or provided credentials XXX + $INPUT->set('http_credentials', false); + if(!$conf['rememberme']) $INPUT->set('r', false); + + // handle renamed HTTP_AUTHORIZATION variable (can happen when a fix like + // the one presented at + // http://www.besthostratings.com/articles/http-auth-php-cgi.html is used + // for enabling HTTP authentication with CGI/SuExec) + if(isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION'])) + $_SERVER['HTTP_AUTHORIZATION'] = $_SERVER['REDIRECT_HTTP_AUTHORIZATION']; + // 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(!$INPUT->str('u') && empty($_COOKIE[DOKU_COOKIE]) && !empty($_SERVER['PHP_AUTH_USER'])) { + $INPUT->set('u', $_SERVER['PHP_AUTH_USER']); + $INPUT->set('p', $_SERVER['PHP_AUTH_PW']); + $INPUT->set('http_credentials', true); + } + + // apply cleaning + if (true === $auth->success) { + $INPUT->set('u', $auth->cleanUser($INPUT->str('u'))); + } + + if($INPUT->str('authtok')) { + // when an authentication token is given, trust the session + auth_validateToken($INPUT->str('authtok')); + } elseif(!is_null($auth) && $auth->canDo('external')) { + // external trust mechanism in place + $auth->trustExternal($INPUT->str('u'), $INPUT->str('p'), $INPUT->bool('r')); + } else { + $evdata = array( + 'user' => $INPUT->str('u'), + 'password' => $INPUT->str('p'), + 'sticky' => $INPUT->bool('r'), + 'silent' => $INPUT->bool('http_credentials') + ); + trigger_event('AUTH_LOGIN_CHECK', $evdata, 'auth_login_wrapper'); + } + + //load ACL into a global array XXX + $AUTH_ACL = auth_loadACL(); + + return true; +} + +/** + * Loads the ACL setup and handle user wildcards + * + * @author Andreas Gohr + * @return array + */ +function auth_loadACL() { + global $config_cascade; + global $USERINFO; + + if(!is_readable($config_cascade['acl']['default'])) return array(); + + $acl = file($config_cascade['acl']['default']); + + $out = array(); + foreach($acl as $line) { + $line = trim($line); + if(empty($line) || ($line{0} == '#')) continue; // skip blank lines & comments + list($id,$rest) = preg_split('/[ \t]+/',$line,2); + + // substitute user wildcard first (its 1:1) + if(strstr($line, '%USER%')){ + // if user is not logged in, this ACL line is meaningless - skip it + if (!isset($_SERVER['REMOTE_USER'])) continue; + + $id = str_replace('%USER%',cleanID($_SERVER['REMOTE_USER']),$id); + $rest = str_replace('%USER%',auth_nameencode($_SERVER['REMOTE_USER']),$rest); + } + + // substitute group wildcard (its 1:m) + if(strstr($line, '%GROUP%')){ + // if user is not logged in, grps is empty, no output will be added (i.e. skipped) + foreach((array) $USERINFO['grps'] as $grp){ + $nid = str_replace('%GROUP%',cleanID($grp),$id); + $nrest = str_replace('%GROUP%','@'.auth_nameencode($grp),$rest); + $out[] = "$nid\t$nrest"; + } + } else { + $out[] = "$id\t$rest"; + } + } + + return $out; +} + +/** + * Event hook callback for AUTH_LOGIN_CHECK + * + * @param $evdata + * @return bool + */ +function auth_login_wrapper($evdata) { + return auth_login( + $evdata['user'], + $evdata['password'], + $evdata['sticky'], + $evdata['silent'] + ); +} + +/** + * This tries to login the user based on the sent auth credentials + * + * The authentication works like this: if a username was given + * a new login is assumed and user/password are checked. If they + * are correct the password is encrypted with blowfish and stored + * together with the username in a cookie - the same info is stored + * in the session, too. Additonally a browserID is stored in the + * session. + * + * If no username was given the cookie is checked: if the username, + * crypted password and browserID match between session and cookie + * no further testing is done and the user is accepted + * + * If a cookie was found but no session info was availabe the + * blowfish encrypted password from the cookie is decrypted and + * together with username rechecked by calling this function again. + * + * On a successful login $_SERVER[REMOTE_USER] and $USERINFO + * are set. + * + * @author Andreas Gohr + * + * @param string $user Username + * @param string $pass Cleartext Password + * @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; + /* @var DokuWiki_Auth_Plugin $auth */ + 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; + $secret = auth_cookiesalt(!$sticky, true); //bind non-sticky to session + auth_setCookie($user, auth_encrypt($pass, $secret), $sticky); + return true; + } else { + //invalid credentials - log off + if(!$silent) msg($lang['badlogin'], -1); + auth_logoff(); + return false; + } + } else { + // read cookie information + list($user, $sticky, $pass) = auth_getCookie(); + if($user && $pass) { + // we got a cookie - see if we can trust it + + // get session info + $session = $_SESSION[DOKU_COOKIE]['auth']; + if(isset($session) && + $auth->useSessionCache($user) && + ($session['time'] >= time() - $conf['auth_security_timeout']) && + ($session['user'] == $user) && + ($session['pass'] == sha1($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 + $secret = auth_cookiesalt(!$sticky, true); //bind non-sticky to session + $pass = auth_decrypt($pass, $secret); + return auth_login($user, $pass, $sticky, true); + } + } + //just to be sure + auth_logoff(true); + return false; +} + +/** + * Checks if a given authentication token was stored in the session + * + * Will setup authentication data using data from the session if the + * token is correct. Will exit with a 401 Status if not. + * + * @author Andreas Gohr + * @param string $token The authentication token + * @return boolean true (or will exit on failure) + */ +function auth_validateToken($token) { + if(!$token || $token != $_SESSION[DOKU_COOKIE]['auth']['token']) { + // bad token + http_status(401); + print 'Invalid auth token - maybe the session timed out'; + unset($_SESSION[DOKU_COOKIE]['auth']['token']); // no second chance + exit; + } + // still here? trust the session data + global $USERINFO; + $_SERVER['REMOTE_USER'] = $_SESSION[DOKU_COOKIE]['auth']['user']; + $USERINFO = $_SESSION[DOKU_COOKIE]['auth']['info']; + return true; +} + +/** + * Create an auth token and store it in the session + * + * NOTE: this is completely unrelated to the getSecurityToken() function + * + * @author Andreas Gohr + * @return string The auth token + */ +function auth_createToken() { + $token = md5(auth_randombytes(16)); + @session_start(); // reopen the session if needed + $_SESSION[DOKU_COOKIE]['auth']['token'] = $token; + session_write_close(); + return $token; +} + +/** + * Builds a pseudo UID from browser and IP data + * + * This is neither unique nor unfakable - still it adds some + * security. Using the first part of the IP makes sure + * proxy farms like AOLs are still okay. + * + * @author Andreas Gohr + * + * @return string a MD5 sum of various browser headers + */ +function auth_browseruid() { + $ip = clientIP(true); + $uid = ''; + $uid .= $_SERVER['HTTP_USER_AGENT']; + $uid .= $_SERVER['HTTP_ACCEPT_ENCODING']; + $uid .= $_SERVER['HTTP_ACCEPT_CHARSET']; + $uid .= substr($ip, 0, strpos($ip, '.')); + $uid = strtolower($uid); + return md5($uid); +} + +/** + * Creates a random key to encrypt the password in cookies + * + * This function tries to read the password for encrypting + * cookies from $conf['metadir'].'/_htcookiesalt' + * if no such file is found a random key is created and + * and stored in this file. + * + * @author Andreas Gohr + * @param bool $addsession if true, the sessionid is added to the salt + * @param bool $secure if security is more important than keeping the old value + * @return string + */ +function auth_cookiesalt($addsession = false, $secure = false) { + global $conf; + $file = $conf['metadir'].'/_htcookiesalt'; + if ($secure || !file_exists($file)) { + $file = $conf['metadir'].'/_htcookiesalt2'; + } + $salt = io_readFile($file); + if(empty($salt)) { + $salt = bin2hex(auth_randombytes(64)); + io_saveFile($file, $salt); + } + if($addsession) { + $salt .= session_id(); + } + return $salt; +} + +/** + * Return truly (pseudo) random bytes if available, otherwise fall back to mt_rand + * + * @author Mark Seecof + * @author Michael Hamann + * @link http://www.php.net/manual/de/function.mt-rand.php#83655 + * @param int $length number of bytes to get + * @return string binary random strings + */ +function auth_randombytes($length) { + $strong = false; + $rbytes = false; + + if (function_exists('openssl_random_pseudo_bytes') + && (version_compare(PHP_VERSION, '5.3.4') >= 0 + || strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') + ) { + $rbytes = openssl_random_pseudo_bytes($length, $strong); + } + + if (!$strong && function_exists('mcrypt_create_iv') + && (version_compare(PHP_VERSION, '5.3.7') >= 0 + || strtoupper(substr(PHP_OS, 0, 3)) !== 'WIN') + ) { + $rbytes = mcrypt_create_iv($length, MCRYPT_DEV_URANDOM); + if ($rbytes !== false && strlen($rbytes) === $length) { + $strong = true; + } + } + + // If no strong randoms available, try OS the specific ways + if(!$strong) { + // Unix/Linux platform + $fp = @fopen('/dev/urandom', 'rb'); + if($fp !== false) { + $rbytes = fread($fp, $length); + fclose($fp); + } + + // MS-Windows platform + if(class_exists('COM')) { + // http://msdn.microsoft.com/en-us/library/aa388176(VS.85).aspx + try { + $CAPI_Util = new COM('CAPICOM.Utilities.1'); + $rbytes = $CAPI_Util->GetRandom($length, 0); + + // if we ask for binary data PHP munges it, so we + // request base64 return value. + if($rbytes) $rbytes = base64_decode($rbytes); + } catch(Exception $ex) { + // fail + } + } + } + if(strlen($rbytes) < $length) $rbytes = false; + + // still no random bytes available - fall back to mt_rand() + if($rbytes === false) { + $rbytes = ''; + for ($i = 0; $i < $length; ++$i) { + $rbytes .= chr(mt_rand(0, 255)); + } + } + + return $rbytes; +} + +/** + * Random number generator using the best available source + * + * @author Michael Samuel + * @author Michael Hamann + * @param int $min + * @param int $max + * @return int + */ +function auth_random($min, $max) { + $abs_max = $max - $min; + + $nbits = 0; + for ($n = $abs_max; $n > 0; $n >>= 1) { + ++$nbits; + } + + $mask = (1 << $nbits) - 1; + do { + $bytes = auth_randombytes(PHP_INT_SIZE); + $integers = unpack('Inum', $bytes); + $integer = $integers["num"] & $mask; + } while ($integer > $abs_max); + + return $min + $integer; +} + +/** + * Encrypt data using the given secret using AES + * + * The mode is CBC with a random initialization vector, the key is derived + * using pbkdf2. + * + * @param string $data The data that shall be encrypted + * @param string $secret The secret/password that shall be used + * @return string The ciphertext + */ +function auth_encrypt($data, $secret) { + $iv = auth_randombytes(16); + $cipher = new Crypt_AES(); + $cipher->setPassword($secret); + + /* + this uses the encrypted IV as IV as suggested in + http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf, Appendix C + for unique but necessarily random IVs. The resulting ciphertext is + compatible to ciphertext that was created using a "normal" IV. + */ + return $cipher->encrypt($iv.$data); +} + +/** + * Decrypt the given AES ciphertext + * + * The mode is CBC, the key is derived using pbkdf2 + * + * @param string $ciphertext The encrypted data + * @param string $secret The secret/password that shall be used + * @return string The decrypted data + */ +function auth_decrypt($ciphertext, $secret) { + $iv = substr($ciphertext, 0, 16); + $cipher = new Crypt_AES(); + $cipher->setPassword($secret); + $cipher->setIV($iv); + + return $cipher->decrypt(substr($ciphertext, 16)); +} + +/** + * Log out the current user + * + * This clears all authentication data and thus log the user + * off. It also clears session data. + * + * @author Andreas Gohr + * @param bool $keepbc - when true, the breadcrumb data is not cleared + */ +function auth_logoff($keepbc = false) { + global $conf; + global $USERINFO; + /* @var DokuWiki_Auth_Plugin $auth */ + 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 + + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; + if(version_compare(PHP_VERSION, '5.2.0', '>')) { + setcookie(DOKU_COOKIE, '', time() - 600000, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true); + } else { + setcookie(DOKU_COOKIE, '', time() - 600000, $cookieDir, '', ($conf['securecookie'] && is_ssl())); + } + + if($auth) $auth->logOff(); +} + +/** + * Check if a user is a manager + * + * Should usually be called without any parameters to check the current + * user. + * + * The info is available through $INFO['ismanager'], too + * + * @author Andreas Gohr + * @see auth_isadmin + * @param string $user Username + * @param array $groups List of groups the user is in + * @param bool $adminonly when true checks if user is admin + * @return bool + */ +function auth_ismanager($user = null, $groups = null, $adminonly = false) { + global $conf; + global $USERINFO; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + + if(!$auth) return false; + if(is_null($user)) { + if(!isset($_SERVER['REMOTE_USER'])) { + return false; + } else { + $user = $_SERVER['REMOTE_USER']; + } + } + if(is_null($groups)) { + $groups = (array) $USERINFO['grps']; + } + + // check superuser match + if(auth_isMember($conf['superuser'], $user, $groups)) return true; + if($adminonly) return false; + // check managers + if(auth_isMember($conf['manager'], $user, $groups)) return true; + + return false; +} + +/** + * Check if a user is admin + * + * Alias to auth_ismanager with adminonly=true + * + * The info is available through $INFO['isadmin'], too + * + * @author Andreas Gohr + * @see auth_ismanager() + * @param string $user Username + * @param array $groups List of groups the user is in + * @return bool + */ +function auth_isadmin($user = null, $groups = null) { + return auth_ismanager($user, $groups, true); +} + +/** + * Match a user and his groups against a comma separated list of + * users and groups to determine membership status + * + * Note: all input should NOT be nameencoded. + * + * @param $memberlist string commaseparated list of allowed users and groups + * @param $user string user to match against + * @param $groups array groups the user is member of + * @return bool true for membership acknowledged + */ +function auth_isMember($memberlist, $user, array $groups) { + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + if(!$auth) return false; + + // clean user and groups + if(!$auth->isCaseSensitive()) { + $user = utf8_strtolower($user); + $groups = array_map('utf8_strtolower', $groups); + } + $user = $auth->cleanUser($user); + $groups = array_map(array($auth, 'cleanGroup'), $groups); + + // extract the memberlist + $members = explode(',', $memberlist); + $members = array_map('trim', $members); + $members = array_unique($members); + $members = array_filter($members); + + // compare cleaned values + foreach($members as $member) { + if(!$auth->isCaseSensitive()) $member = utf8_strtolower($member); + if($member[0] == '@') { + $member = $auth->cleanGroup(substr($member, 1)); + if(in_array($member, $groups)) return true; + } else { + $member = $auth->cleanUser($member); + if($member == $user) return true; + } + } + + // still here? not a member! + return false; +} + +/** + * Convinience function for auth_aclcheck() + * + * This checks the permissions for the current user + * + * @author Andreas Gohr + * + * @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']); +} + +/** + * Returns the maximum rights a user has for + * the given ID or its namespace + * + * @author Andreas Gohr + * + * @param string $id page ID (needs to be resolved and cleaned) + * @param string $user Username + * @param array|null $groups Array of groups the user is in + * @return int permission level + */ +function auth_aclcheck($id, $user, $groups) { + global $conf; + global $AUTH_ACL; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + + // 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; + } + + if(!$auth->isCaseSensitive()) { + $user = utf8_strtolower($user); + $groups = array_map('utf8_strtolower', $groups); + } + $user = $auth->cleanUser($user); + $groups = array_map(array($auth, 'cleanGroup'), (array) $groups); + $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; + } else { + $groups[] = '@ALL'; + } + + //check exact match first + $matches = preg_grep('/^'.preg_quote($id, '/').'[ \t]+([^ \t]+)[ \t]+/', $AUTH_ACL); + if(count($matches)) { + foreach($matches as $match) { + $match = preg_replace('/#.*$/', '', $match); //ignore comments + $acl = preg_split('/[ \t]+/', $match); + if(!$auth->isCaseSensitive() && $acl[1] !== '@ALL') { + $acl[1] = utf8_strtolower($acl[1]); + } + if(!in_array($acl[1], $groups)) { + continue; + } + 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 (int) $perm; + } + } + + //still here? do the namespace checks + if($ns) { + $path = $ns.':*'; + } else { + $path = '*'; //root document + } + + do { + $matches = preg_grep('/^'.preg_quote($path, '/').'[ \t]+([^ \t]+)[ \t]+/', $AUTH_ACL); + if(count($matches)) { + foreach($matches as $match) { + $match = preg_replace('/#.*$/', '', $match); //ignore comments + $acl = preg_split('/[ \t]+/', $match); + if(!$auth->isCaseSensitive() && $acl[1] !== '@ALL') { + $acl[1] = utf8_strtolower($acl[1]); + } + if(!in_array($acl[1], $groups)) { + continue; + } + 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 + if($perm != -1) { + return (int) $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 + return AUTH_NONE; +} + +/** + * Encode ASCII special chars + * + * Some auth backends allow special chars in their user and groupnames + * The special chars are encoded with this function. Only ASCII chars + * are encoded UTF-8 multibyte are left as is (different from usual + * urlencoding!). + * + * Decoding can be done with rawurldecode + * + * @author Andreas Gohr + * @see rawurldecode() + */ +function auth_nameencode($name, $skip_group = false) { + global $cache_authname; + $cache =& $cache_authname; + $name = (string) $name; + + // never encode wildcard FS#1955 + if($name == '%USER%') return $name; + if($name == '%GROUP%') return $name; + + if(!isset($cache[$name][$skip_group])) { + if($skip_group && $name{0} == '@') { + $cache[$name][$skip_group] = '@'.preg_replace_callback( + '/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/', + 'auth_nameencode_callback', substr($name, 1) + ); + } else { + $cache[$name][$skip_group] = preg_replace_callback( + '/([\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f])/', + 'auth_nameencode_callback', $name + ); + } + } + + return $cache[$name][$skip_group]; +} + +function auth_nameencode_callback($matches) { + return '%'.dechex(ord(substr($matches[1],-1))); +} + +/** + * Create a pronouncable password + * + * The $foruser variable might be used by plugins to run additional password + * policy checks, but is not used by the default implementation + * + * @author Andreas Gohr + * @link http://www.phpbuilder.com/annotate/message.php3?id=1014451 + * @triggers AUTH_PASSWORD_GENERATE + * + * @param string $foruser username for which the password is generated + * @return string pronouncable password + */ +function auth_pwgen($foruser = '') { + $data = array( + 'password' => '', + 'foruser' => $foruser + ); + + $evt = new Doku_Event('AUTH_PASSWORD_GENERATE', $data); + if($evt->advise_before(true)) { + $c = 'bcdfghjklmnprstvwz'; //consonants except hard to speak ones + $v = 'aeiou'; //vowels + $a = $c.$v; //both + $s = '!$%&?+*~#-_:.;,'; // specials + + //use thre syllables... + for($i = 0; $i < 3; $i++) { + $data['password'] .= $c[auth_random(0, strlen($c) - 1)]; + $data['password'] .= $v[auth_random(0, strlen($v) - 1)]; + $data['password'] .= $a[auth_random(0, strlen($a) - 1)]; + } + //... and add a nice number and special + $data['password'] .= auth_random(10, 99).$s[auth_random(0, strlen($s) - 1)]; + } + $evt->advise_after(); + + return $data['password']; +} + +/** + * Sends a password to the given user + * + * @author Andreas Gohr + * @param string $user Login name of the user + * @param string $password The new password in clear text + * @return bool true on success + */ +function auth_sendPassword($user, $password) { + global $lang; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + if(!$auth) return false; + + $user = $auth->cleanUser($user); + $userinfo = $auth->getUserData($user); + + if(!$userinfo['mail']) return false; + + $text = rawLocale('password'); + $trep = array( + 'FULLNAME' => $userinfo['name'], + 'LOGIN' => $user, + 'PASSWORD' => $password + ); + + $mail = new Mailer(); + $mail->to($userinfo['name'].' <'.$userinfo['mail'].'>'); + $mail->subject($lang['regpwmail']); + $mail->setBody($text, $trep); + return $mail->send(); +} + +/** + * Register a new user + * + * This registers a new user - Data is read directly from $_POST + * + * @author Andreas Gohr + * @return bool true on success, false on any error + */ +function register() { + global $lang; + global $conf; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + global $INPUT; + + if(!$INPUT->post->bool('save')) return false; + if(!actionOK('register')) return false; + + // gather input + $login = trim($auth->cleanUser($INPUT->post->str('login'))); + $fullname = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/', '', $INPUT->post->str('fullname'))); + $email = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/', '', $INPUT->post->str('email'))); + $pass = $INPUT->post->str('pass'); + $passchk = $INPUT->post->str('passchk'); + + if(empty($login) || empty($fullname) || empty($email)) { + msg($lang['regmissing'], -1); + return false; + } + + if($conf['autopasswd']) { + $pass = auth_pwgen($login); // automatically generate password + } elseif(empty($pass) || empty($passchk)) { + msg($lang['regmissing'], -1); // complain about missing passwords + return false; + } elseif($pass != $passchk) { + msg($lang['regbadpass'], -1); // complain about misspelled passwords + return false; + } + + //check mail + if(!mail_isvalid($email)) { + msg($lang['regbadmail'], -1); + return false; + } + + //okay try to create the user + if(!$auth->triggerUserMod('create', array($login, $pass, $fullname, $email))) { + msg($lang['reguexists'], -1); + return false; + } + + // send notification about the new user + $subscription = new Subscription(); + $subscription->send_register($login, $fullname, $email); + + // are we done? + if(!$conf['autopasswd']) { + msg($lang['regsuccess2'], 1); + return true; + } + + // autogenerated password? then send password to user + if(auth_sendPassword($login, $pass)) { + msg($lang['regsuccess'], 1); + return true; + } else { + msg($lang['regmailfail'], -1); + return false; + } +} + +/** + * Update user profile + * + * @author Christopher Smith + */ +function updateprofile() { + global $conf; + global $lang; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + /* @var Input $INPUT */ + global $INPUT; + + if(!$INPUT->post->bool('save')) return false; + if(!checkSecurityToken()) return false; + + if(!actionOK('profile')) { + msg($lang['profna'], -1); + return false; + } + + $changes = array(); + $changes['pass'] = $INPUT->post->str('newpass'); + $changes['name'] = $INPUT->post->str('fullname'); + $changes['mail'] = $INPUT->post->str('email'); + + // check misspelled passwords + if($changes['pass'] != $INPUT->post->str('passchk')) { + msg($lang['regbadpass'], -1); + return false; + } + + // clean fullname and email + $changes['name'] = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/', '', $changes['name'])); + $changes['mail'] = trim(preg_replace('/[\x00-\x1f:<>&%,;]+/', '', $changes['mail'])); + + // no empty name and email (except the backend doesn't support them) + if((empty($changes['name']) && $auth->canDo('modName')) || + (empty($changes['mail']) && $auth->canDo('modMail')) + ) { + msg($lang['profnoempty'], -1); + return false; + } + if(!mail_isvalid($changes['mail']) && $auth->canDo('modMail')) { + msg($lang['regbadmail'], -1); + return false; + } + + $changes = array_filter($changes); + + // check for unavailable capabilities + if(!$auth->canDo('modName')) unset($changes['name']); + if(!$auth->canDo('modMail')) unset($changes['mail']); + if(!$auth->canDo('modPass')) unset($changes['pass']); + + // anything to do? + if(!count($changes)) { + msg($lang['profnochange'], -1); + return false; + } + + if($conf['profileconfirm']) { + if(!$auth->checkPass($_SERVER['REMOTE_USER'], $INPUT->post->str('oldpass'))) { + msg($lang['badpassconfirm'], -1); + return false; + } + } + + if($result = $auth->triggerUserMod('modify', array($_SERVER['REMOTE_USER'], $changes))) { + // update cookie and session with the changed data + if($changes['pass']) { + list( /*user*/, $sticky, /*pass*/) = auth_getCookie(); + $pass = auth_encrypt($changes['pass'], auth_cookiesalt(!$sticky, true)); + auth_setCookie($_SERVER['REMOTE_USER'], $pass, (bool) $sticky); + } + return true; + } + + return false; +} + +function auth_deleteprofile(){ + global $conf; + global $lang; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + /* @var Input $INPUT */ + global $INPUT; + + if(!$INPUT->post->bool('delete')) return false; + if(!checkSecurityToken()) return false; + + // action prevented or auth module disallows + if(!actionOK('profile_delete') || !$auth->canDo('delUser')) { + msg($lang['profnodelete'], -1); + return false; + } + + if(!$INPUT->post->bool('confirm_delete')){ + msg($lang['profconfdeletemissing'], -1); + return false; + } + + if($conf['profileconfirm']) { + if(!$auth->checkPass($_SERVER['REMOTE_USER'], $INPUT->post->str('oldpass'))) { + msg($lang['badpassconfirm'], -1); + return false; + } + } + + $deleted[] = $_SERVER['REMOTE_USER']; + if($auth->triggerUserMod('delete', array($deleted))) { + // force and immediate logout including removing the sticky cookie + auth_logoff(); + return true; + } + + return false; +} + +/** + * Send a new password + * + * This function handles both phases of the password reset: + * + * - handling the first request of password reset + * - validating the password reset auth token + * + * @author Benoit Chesneau + * @author Chris Smith + * @author Andreas Gohr + * + * @return bool true on success, false on any error + */ +function act_resendpwd() { + global $lang; + global $conf; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + /* @var Input $INPUT */ + global $INPUT; + + if(!actionOK('resendpwd')) { + msg($lang['resendna'], -1); + return false; + } + + $token = preg_replace('/[^a-f0-9]+/', '', $INPUT->str('pwauth')); + + if($token) { + // we're in token phase - get user info from token + + $tfile = $conf['cachedir'].'/'.$token{0}.'/'.$token.'.pwauth'; + if(!@file_exists($tfile)) { + msg($lang['resendpwdbadauth'], -1); + $INPUT->remove('pwauth'); + return false; + } + // token is only valid for 3 days + if((time() - filemtime($tfile)) > (3 * 60 * 60 * 24)) { + msg($lang['resendpwdbadauth'], -1); + $INPUT->remove('pwauth'); + @unlink($tfile); + return false; + } + + $user = io_readfile($tfile); + $userinfo = $auth->getUserData($user); + if(!$userinfo['mail']) { + msg($lang['resendpwdnouser'], -1); + return false; + } + + if(!$conf['autopasswd']) { // we let the user choose a password + $pass = $INPUT->str('pass'); + + // password given correctly? + if(!$pass) return false; + if($pass != $INPUT->str('passchk')) { + msg($lang['regbadpass'], -1); + return false; + } + + // change it + if(!$auth->triggerUserMod('modify', array($user, array('pass' => $pass)))) { + msg('error modifying user data', -1); + return false; + } + + } else { // autogenerate the password and send by mail + + $pass = auth_pwgen($user); + if(!$auth->triggerUserMod('modify', array($user, array('pass' => $pass)))) { + msg('error modifying user data', -1); + return false; + } + + if(auth_sendPassword($user, $pass)) { + msg($lang['resendpwdsuccess'], 1); + } else { + msg($lang['regmailfail'], -1); + } + } + + @unlink($tfile); + return true; + + } else { + // we're in request phase + + if(!$INPUT->post->bool('save')) return false; + + if(!$INPUT->post->str('login')) { + msg($lang['resendpwdmissing'], -1); + return false; + } else { + $user = trim($auth->cleanUser($INPUT->post->str('login'))); + } + + $userinfo = $auth->getUserData($user); + if(!$userinfo['mail']) { + msg($lang['resendpwdnouser'], -1); + return false; + } + + // generate auth token + $token = md5(auth_randombytes(16)); // random secret + $tfile = $conf['cachedir'].'/'.$token{0}.'/'.$token.'.pwauth'; + $url = wl('', array('do'=> 'resendpwd', 'pwauth'=> $token), true, '&'); + + io_saveFile($tfile, $user); + + $text = rawLocale('pwconfirm'); + $trep = array( + 'FULLNAME' => $userinfo['name'], + 'LOGIN' => $user, + 'CONFIRM' => $url + ); + + $mail = new Mailer(); + $mail->to($userinfo['name'].' <'.$userinfo['mail'].'>'); + $mail->subject($lang['regpwmail']); + $mail->setBody($text, $trep); + if($mail->send()) { + msg($lang['resendpwdconfirm'], 1); + } else { + msg($lang['regmailfail'], -1); + } + return true; + } + // never reached +} + +/** + * Encrypts a password using the given method and salt + * + * If the selected method needs a salt and none was given, a random one + * is chosen. + * + * @author Andreas Gohr + * @param string $clear The clear text password + * @param string $method The hashing method + * @param string $salt A salt, null for random + * @return string The crypted password + */ +function auth_cryptPassword($clear, $method = '', $salt = null) { + global $conf; + if(empty($method)) $method = $conf['passcrypt']; + + $pass = new PassHash(); + $call = 'hash_'.$method; + + if(!method_exists($pass, $call)) { + msg("Unsupported crypt method $method", -1); + return false; + } + + return $pass->$call($clear, $salt); +} + +/** + * Verifies a cleartext password against a crypted hash + * + * @author Andreas Gohr + * @param string $clear The clear text password + * @param string $crypt The hash to compare with + * @return bool true if both match + */ +function auth_verifyPassword($clear, $crypt) { + $pass = new PassHash(); + return $pass->verify_hash($clear, $crypt); +} + +/** + * Set the authentication cookie and add user identification data to the session + * + * @param string $user username + * @param string $pass encrypted password + * @param bool $sticky whether or not the cookie will last beyond the session + * @return bool + */ +function auth_setCookie($user, $pass, $sticky) { + global $conf; + /* @var DokuWiki_Auth_Plugin $auth */ + global $auth; + global $USERINFO; + + if(!$auth) return false; + $USERINFO = $auth->getUserData($user); + + // set cookie + $cookie = base64_encode($user).'|'.((int) $sticky).'|'.base64_encode($pass); + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; + $time = $sticky ? (time() + 60 * 60 * 24 * 365) : 0; //one year + if(version_compare(PHP_VERSION, '5.2.0', '>')) { + setcookie(DOKU_COOKIE, $cookie, $time, $cookieDir, '', ($conf['securecookie'] && is_ssl()), true); + } else { + setcookie(DOKU_COOKIE, $cookie, $time, $cookieDir, '', ($conf['securecookie'] && is_ssl())); + } + // set session + $_SESSION[DOKU_COOKIE]['auth']['user'] = $user; + $_SESSION[DOKU_COOKIE]['auth']['pass'] = sha1($pass); + $_SESSION[DOKU_COOKIE]['auth']['buid'] = auth_browseruid(); + $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO; + $_SESSION[DOKU_COOKIE]['auth']['time'] = time(); + + return true; +} + +/** + * 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 : diff --git a/sources/inc/blowfish.php b/sources/inc/blowfish.php new file mode 100644 index 0000000..bcf5804 --- /dev/null +++ b/sources/inc/blowfish.php @@ -0,0 +1,514 @@ + + * + * See the enclosed file COPYING for license information (LGPL). If you + * did not receive this file, see http://www.fsf.org/copyleft/lgpl.html. + * + * @author Mike Cochrane + * @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 +{ + /* Pi Array */ + var $p = array( + 0x243F6A88, 0x85A308D3, 0x13198A2E, 0x03707344, + 0xA4093822, 0x299F31D0, 0x082EFA98, 0xEC4E6C89, + 0x452821E6, 0x38D01377, 0xBE5466CF, 0x34E90C6C, + 0xC0AC29B7, 0xC97C50DD, 0x3F84D5B5, 0xB5470917, + 0x9216D5D9, 0x8979FB1B); + + /* S Boxes */ + var $s1 = array( + 0xD1310BA6, 0x98DFB5AC, 0x2FFD72DB, 0xD01ADFB7, + 0xB8E1AFED, 0x6A267E96, 0xBA7C9045, 0xF12C7F99, + 0x24A19947, 0xB3916CF7, 0x0801F2E2, 0x858EFC16, + 0x636920D8, 0x71574E69, 0xA458FEA3, 0xF4933D7E, + 0x0D95748F, 0x728EB658, 0x718BCD58, 0x82154AEE, + 0x7B54A41D, 0xC25A59B5, 0x9C30D539, 0x2AF26013, + 0xC5D1B023, 0x286085F0, 0xCA417918, 0xB8DB38EF, + 0x8E79DCB0, 0x603A180E, 0x6C9E0E8B, 0xB01E8A3E, + 0xD71577C1, 0xBD314B27, 0x78AF2FDA, 0x55605C60, + 0xE65525F3, 0xAA55AB94, 0x57489862, 0x63E81440, + 0x55CA396A, 0x2AAB10B6, 0xB4CC5C34, 0x1141E8CE, + 0xA15486AF, 0x7C72E993, 0xB3EE1411, 0x636FBC2A, + 0x2BA9C55D, 0x741831F6, 0xCE5C3E16, 0x9B87931E, + 0xAFD6BA33, 0x6C24CF5C, 0x7A325381, 0x28958677, + 0x3B8F4898, 0x6B4BB9AF, 0xC4BFE81B, 0x66282193, + 0x61D809CC, 0xFB21A991, 0x487CAC60, 0x5DEC8032, + 0xEF845D5D, 0xE98575B1, 0xDC262302, 0xEB651B88, + 0x23893E81, 0xD396ACC5, 0x0F6D6FF3, 0x83F44239, + 0x2E0B4482, 0xA4842004, 0x69C8F04A, 0x9E1F9B5E, + 0x21C66842, 0xF6E96C9A, 0x670C9C61, 0xABD388F0, + 0x6A51A0D2, 0xD8542F68, 0x960FA728, 0xAB5133A3, + 0x6EEF0B6C, 0x137A3BE4, 0xBA3BF050, 0x7EFB2A98, + 0xA1F1651D, 0x39AF0176, 0x66CA593E, 0x82430E88, + 0x8CEE8619, 0x456F9FB4, 0x7D84A5C3, 0x3B8B5EBE, + 0xE06F75D8, 0x85C12073, 0x401A449F, 0x56C16AA6, + 0x4ED3AA62, 0x363F7706, 0x1BFEDF72, 0x429B023D, + 0x37D0D724, 0xD00A1248, 0xDB0FEAD3, 0x49F1C09B, + 0x075372C9, 0x80991B7B, 0x25D479D8, 0xF6E8DEF7, + 0xE3FE501A, 0xB6794C3B, 0x976CE0BD, 0x04C006BA, + 0xC1A94FB6, 0x409F60C4, 0x5E5C9EC2, 0x196A2463, + 0x68FB6FAF, 0x3E6C53B5, 0x1339B2EB, 0x3B52EC6F, + 0x6DFC511F, 0x9B30952C, 0xCC814544, 0xAF5EBD09, + 0xBEE3D004, 0xDE334AFD, 0x660F2807, 0x192E4BB3, + 0xC0CBA857, 0x45C8740F, 0xD20B5F39, 0xB9D3FBDB, + 0x5579C0BD, 0x1A60320A, 0xD6A100C6, 0x402C7279, + 0x679F25FE, 0xFB1FA3CC, 0x8EA5E9F8, 0xDB3222F8, + 0x3C7516DF, 0xFD616B15, 0x2F501EC8, 0xAD0552AB, + 0x323DB5FA, 0xFD238760, 0x53317B48, 0x3E00DF82, + 0x9E5C57BB, 0xCA6F8CA0, 0x1A87562E, 0xDF1769DB, + 0xD542A8F6, 0x287EFFC3, 0xAC6732C6, 0x8C4F5573, + 0x695B27B0, 0xBBCA58C8, 0xE1FFA35D, 0xB8F011A0, + 0x10FA3D98, 0xFD2183B8, 0x4AFCB56C, 0x2DD1D35B, + 0x9A53E479, 0xB6F84565, 0xD28E49BC, 0x4BFB9790, + 0xE1DDF2DA, 0xA4CB7E33, 0x62FB1341, 0xCEE4C6E8, + 0xEF20CADA, 0x36774C01, 0xD07E9EFE, 0x2BF11FB4, + 0x95DBDA4D, 0xAE909198, 0xEAAD8E71, 0x6B93D5A0, + 0xD08ED1D0, 0xAFC725E0, 0x8E3C5B2F, 0x8E7594B7, + 0x8FF6E2FB, 0xF2122B64, 0x8888B812, 0x900DF01C, + 0x4FAD5EA0, 0x688FC31C, 0xD1CFF191, 0xB3A8C1AD, + 0x2F2F2218, 0xBE0E1777, 0xEA752DFE, 0x8B021FA1, + 0xE5A0CC0F, 0xB56F74E8, 0x18ACF3D6, 0xCE89E299, + 0xB4A84FE0, 0xFD13E0B7, 0x7CC43B81, 0xD2ADA8D9, + 0x165FA266, 0x80957705, 0x93CC7314, 0x211A1477, + 0xE6AD2065, 0x77B5FA86, 0xC75442F5, 0xFB9D35CF, + 0xEBCDAF0C, 0x7B3E89A0, 0xD6411BD3, 0xAE1E7E49, + 0x00250E2D, 0x2071B35E, 0x226800BB, 0x57B8E0AF, + 0x2464369B, 0xF009B91E, 0x5563911D, 0x59DFA6AA, + 0x78C14389, 0xD95A537F, 0x207D5BA2, 0x02E5B9C5, + 0x83260376, 0x6295CFA9, 0x11C81968, 0x4E734A41, + 0xB3472DCA, 0x7B14A94A, 0x1B510052, 0x9A532915, + 0xD60F573F, 0xBC9BC6E4, 0x2B60A476, 0x81E67400, + 0x08BA6FB5, 0x571BE91F, 0xF296EC6B, 0x2A0DD915, + 0xB6636521, 0xE7B9F9B6, 0xFF34052E, 0xC5855664, + 0x53B02D5D, 0xA99F8FA1, 0x08BA4799, 0x6E85076A); + var $s2 = array( + 0x4B7A70E9, 0xB5B32944, 0xDB75092E, 0xC4192623, + 0xAD6EA6B0, 0x49A7DF7D, 0x9CEE60B8, 0x8FEDB266, + 0xECAA8C71, 0x699A17FF, 0x5664526C, 0xC2B19EE1, + 0x193602A5, 0x75094C29, 0xA0591340, 0xE4183A3E, + 0x3F54989A, 0x5B429D65, 0x6B8FE4D6, 0x99F73FD6, + 0xA1D29C07, 0xEFE830F5, 0x4D2D38E6, 0xF0255DC1, + 0x4CDD2086, 0x8470EB26, 0x6382E9C6, 0x021ECC5E, + 0x09686B3F, 0x3EBAEFC9, 0x3C971814, 0x6B6A70A1, + 0x687F3584, 0x52A0E286, 0xB79C5305, 0xAA500737, + 0x3E07841C, 0x7FDEAE5C, 0x8E7D44EC, 0x5716F2B8, + 0xB03ADA37, 0xF0500C0D, 0xF01C1F04, 0x0200B3FF, + 0xAE0CF51A, 0x3CB574B2, 0x25837A58, 0xDC0921BD, + 0xD19113F9, 0x7CA92FF6, 0x94324773, 0x22F54701, + 0x3AE5E581, 0x37C2DADC, 0xC8B57634, 0x9AF3DDA7, + 0xA9446146, 0x0FD0030E, 0xECC8C73E, 0xA4751E41, + 0xE238CD99, 0x3BEA0E2F, 0x3280BBA1, 0x183EB331, + 0x4E548B38, 0x4F6DB908, 0x6F420D03, 0xF60A04BF, + 0x2CB81290, 0x24977C79, 0x5679B072, 0xBCAF89AF, + 0xDE9A771F, 0xD9930810, 0xB38BAE12, 0xDCCF3F2E, + 0x5512721F, 0x2E6B7124, 0x501ADDE6, 0x9F84CD87, + 0x7A584718, 0x7408DA17, 0xBC9F9ABC, 0xE94B7D8C, + 0xEC7AEC3A, 0xDB851DFA, 0x63094366, 0xC464C3D2, + 0xEF1C1847, 0x3215D908, 0xDD433B37, 0x24C2BA16, + 0x12A14D43, 0x2A65C451, 0x50940002, 0x133AE4DD, + 0x71DFF89E, 0x10314E55, 0x81AC77D6, 0x5F11199B, + 0x043556F1, 0xD7A3C76B, 0x3C11183B, 0x5924A509, + 0xF28FE6ED, 0x97F1FBFA, 0x9EBABF2C, 0x1E153C6E, + 0x86E34570, 0xEAE96FB1, 0x860E5E0A, 0x5A3E2AB3, + 0x771FE71C, 0x4E3D06FA, 0x2965DCB9, 0x99E71D0F, + 0x803E89D6, 0x5266C825, 0x2E4CC978, 0x9C10B36A, + 0xC6150EBA, 0x94E2EA78, 0xA5FC3C53, 0x1E0A2DF4, + 0xF2F74EA7, 0x361D2B3D, 0x1939260F, 0x19C27960, + 0x5223A708, 0xF71312B6, 0xEBADFE6E, 0xEAC31F66, + 0xE3BC4595, 0xA67BC883, 0xB17F37D1, 0x018CFF28, + 0xC332DDEF, 0xBE6C5AA5, 0x65582185, 0x68AB9802, + 0xEECEA50F, 0xDB2F953B, 0x2AEF7DAD, 0x5B6E2F84, + 0x1521B628, 0x29076170, 0xECDD4775, 0x619F1510, + 0x13CCA830, 0xEB61BD96, 0x0334FE1E, 0xAA0363CF, + 0xB5735C90, 0x4C70A239, 0xD59E9E0B, 0xCBAADE14, + 0xEECC86BC, 0x60622CA7, 0x9CAB5CAB, 0xB2F3846E, + 0x648B1EAF, 0x19BDF0CA, 0xA02369B9, 0x655ABB50, + 0x40685A32, 0x3C2AB4B3, 0x319EE9D5, 0xC021B8F7, + 0x9B540B19, 0x875FA099, 0x95F7997E, 0x623D7DA8, + 0xF837889A, 0x97E32D77, 0x11ED935F, 0x16681281, + 0x0E358829, 0xC7E61FD6, 0x96DEDFA1, 0x7858BA99, + 0x57F584A5, 0x1B227263, 0x9B83C3FF, 0x1AC24696, + 0xCDB30AEB, 0x532E3054, 0x8FD948E4, 0x6DBC3128, + 0x58EBF2EF, 0x34C6FFEA, 0xFE28ED61, 0xEE7C3C73, + 0x5D4A14D9, 0xE864B7E3, 0x42105D14, 0x203E13E0, + 0x45EEE2B6, 0xA3AAABEA, 0xDB6C4F15, 0xFACB4FD0, + 0xC742F442, 0xEF6ABBB5, 0x654F3B1D, 0x41CD2105, + 0xD81E799E, 0x86854DC7, 0xE44B476A, 0x3D816250, + 0xCF62A1F2, 0x5B8D2646, 0xFC8883A0, 0xC1C7B6A3, + 0x7F1524C3, 0x69CB7492, 0x47848A0B, 0x5692B285, + 0x095BBF00, 0xAD19489D, 0x1462B174, 0x23820E00, + 0x58428D2A, 0x0C55F5EA, 0x1DADF43E, 0x233F7061, + 0x3372F092, 0x8D937E41, 0xD65FECF1, 0x6C223BDB, + 0x7CDE3759, 0xCBEE7460, 0x4085F2A7, 0xCE77326E, + 0xA6078084, 0x19F8509E, 0xE8EFD855, 0x61D99735, + 0xA969A7AA, 0xC50C06C2, 0x5A04ABFC, 0x800BCADC, + 0x9E447A2E, 0xC3453484, 0xFDD56705, 0x0E1E9EC9, + 0xDB73DBD3, 0x105588CD, 0x675FDA79, 0xE3674340, + 0xC5C43465, 0x713E38D8, 0x3D28F89E, 0xF16DFF20, + 0x153E21E7, 0x8FB03D4A, 0xE6E39F2B, 0xDB83ADF7); + var $s3 = array( + 0xE93D5A68, 0x948140F7, 0xF64C261C, 0x94692934, + 0x411520F7, 0x7602D4F7, 0xBCF46B2E, 0xD4A20068, + 0xD4082471, 0x3320F46A, 0x43B7D4B7, 0x500061AF, + 0x1E39F62E, 0x97244546, 0x14214F74, 0xBF8B8840, + 0x4D95FC1D, 0x96B591AF, 0x70F4DDD3, 0x66A02F45, + 0xBFBC09EC, 0x03BD9785, 0x7FAC6DD0, 0x31CB8504, + 0x96EB27B3, 0x55FD3941, 0xDA2547E6, 0xABCA0A9A, + 0x28507825, 0x530429F4, 0x0A2C86DA, 0xE9B66DFB, + 0x68DC1462, 0xD7486900, 0x680EC0A4, 0x27A18DEE, + 0x4F3FFEA2, 0xE887AD8C, 0xB58CE006, 0x7AF4D6B6, + 0xAACE1E7C, 0xD3375FEC, 0xCE78A399, 0x406B2A42, + 0x20FE9E35, 0xD9F385B9, 0xEE39D7AB, 0x3B124E8B, + 0x1DC9FAF7, 0x4B6D1856, 0x26A36631, 0xEAE397B2, + 0x3A6EFA74, 0xDD5B4332, 0x6841E7F7, 0xCA7820FB, + 0xFB0AF54E, 0xD8FEB397, 0x454056AC, 0xBA489527, + 0x55533A3A, 0x20838D87, 0xFE6BA9B7, 0xD096954B, + 0x55A867BC, 0xA1159A58, 0xCCA92963, 0x99E1DB33, + 0xA62A4A56, 0x3F3125F9, 0x5EF47E1C, 0x9029317C, + 0xFDF8E802, 0x04272F70, 0x80BB155C, 0x05282CE3, + 0x95C11548, 0xE4C66D22, 0x48C1133F, 0xC70F86DC, + 0x07F9C9EE, 0x41041F0F, 0x404779A4, 0x5D886E17, + 0x325F51EB, 0xD59BC0D1, 0xF2BCC18F, 0x41113564, + 0x257B7834, 0x602A9C60, 0xDFF8E8A3, 0x1F636C1B, + 0x0E12B4C2, 0x02E1329E, 0xAF664FD1, 0xCAD18115, + 0x6B2395E0, 0x333E92E1, 0x3B240B62, 0xEEBEB922, + 0x85B2A20E, 0xE6BA0D99, 0xDE720C8C, 0x2DA2F728, + 0xD0127845, 0x95B794FD, 0x647D0862, 0xE7CCF5F0, + 0x5449A36F, 0x877D48FA, 0xC39DFD27, 0xF33E8D1E, + 0x0A476341, 0x992EFF74, 0x3A6F6EAB, 0xF4F8FD37, + 0xA812DC60, 0xA1EBDDF8, 0x991BE14C, 0xDB6E6B0D, + 0xC67B5510, 0x6D672C37, 0x2765D43B, 0xDCD0E804, + 0xF1290DC7, 0xCC00FFA3, 0xB5390F92, 0x690FED0B, + 0x667B9FFB, 0xCEDB7D9C, 0xA091CF0B, 0xD9155EA3, + 0xBB132F88, 0x515BAD24, 0x7B9479BF, 0x763BD6EB, + 0x37392EB3, 0xCC115979, 0x8026E297, 0xF42E312D, + 0x6842ADA7, 0xC66A2B3B, 0x12754CCC, 0x782EF11C, + 0x6A124237, 0xB79251E7, 0x06A1BBE6, 0x4BFB6350, + 0x1A6B1018, 0x11CAEDFA, 0x3D25BDD8, 0xE2E1C3C9, + 0x44421659, 0x0A121386, 0xD90CEC6E, 0xD5ABEA2A, + 0x64AF674E, 0xDA86A85F, 0xBEBFE988, 0x64E4C3FE, + 0x9DBC8057, 0xF0F7C086, 0x60787BF8, 0x6003604D, + 0xD1FD8346, 0xF6381FB0, 0x7745AE04, 0xD736FCCC, + 0x83426B33, 0xF01EAB71, 0xB0804187, 0x3C005E5F, + 0x77A057BE, 0xBDE8AE24, 0x55464299, 0xBF582E61, + 0x4E58F48F, 0xF2DDFDA2, 0xF474EF38, 0x8789BDC2, + 0x5366F9C3, 0xC8B38E74, 0xB475F255, 0x46FCD9B9, + 0x7AEB2661, 0x8B1DDF84, 0x846A0E79, 0x915F95E2, + 0x466E598E, 0x20B45770, 0x8CD55591, 0xC902DE4C, + 0xB90BACE1, 0xBB8205D0, 0x11A86248, 0x7574A99E, + 0xB77F19B6, 0xE0A9DC09, 0x662D09A1, 0xC4324633, + 0xE85A1F02, 0x09F0BE8C, 0x4A99A025, 0x1D6EFE10, + 0x1AB93D1D, 0x0BA5A4DF, 0xA186F20F, 0x2868F169, + 0xDCB7DA83, 0x573906FE, 0xA1E2CE9B, 0x4FCD7F52, + 0x50115E01, 0xA70683FA, 0xA002B5C4, 0x0DE6D027, + 0x9AF88C27, 0x773F8641, 0xC3604C06, 0x61A806B5, + 0xF0177A28, 0xC0F586E0, 0x006058AA, 0x30DC7D62, + 0x11E69ED7, 0x2338EA63, 0x53C2DD94, 0xC2C21634, + 0xBBCBEE56, 0x90BCB6DE, 0xEBFC7DA1, 0xCE591D76, + 0x6F05E409, 0x4B7C0188, 0x39720A3D, 0x7C927C24, + 0x86E3725F, 0x724D9DB9, 0x1AC15BB4, 0xD39EB8FC, + 0xED545578, 0x08FCA5B5, 0xD83D7CD3, 0x4DAD0FC4, + 0x1E50EF5E, 0xB161E6F8, 0xA28514D9, 0x6C51133C, + 0x6FD5C7E7, 0x56E14EC4, 0x362ABFCE, 0xDDC6C837, + 0xD79A3234, 0x92638212, 0x670EFA8E, 0x406000E0); + var $s4 = array( + 0x3A39CE37, 0xD3FAF5CF, 0xABC27737, 0x5AC52D1B, + 0x5CB0679E, 0x4FA33742, 0xD3822740, 0x99BC9BBE, + 0xD5118E9D, 0xBF0F7315, 0xD62D1C7E, 0xC700C47B, + 0xB78C1B6B, 0x21A19045, 0xB26EB1BE, 0x6A366EB4, + 0x5748AB2F, 0xBC946E79, 0xC6A376D2, 0x6549C2C8, + 0x530FF8EE, 0x468DDE7D, 0xD5730A1D, 0x4CD04DC6, + 0x2939BBDB, 0xA9BA4650, 0xAC9526E8, 0xBE5EE304, + 0xA1FAD5F0, 0x6A2D519A, 0x63EF8CE2, 0x9A86EE22, + 0xC089C2B8, 0x43242EF6, 0xA51E03AA, 0x9CF2D0A4, + 0x83C061BA, 0x9BE96A4D, 0x8FE51550, 0xBA645BD6, + 0x2826A2F9, 0xA73A3AE1, 0x4BA99586, 0xEF5562E9, + 0xC72FEFD3, 0xF752F7DA, 0x3F046F69, 0x77FA0A59, + 0x80E4A915, 0x87B08601, 0x9B09E6AD, 0x3B3EE593, + 0xE990FD5A, 0x9E34D797, 0x2CF0B7D9, 0x022B8B51, + 0x96D5AC3A, 0x017DA67D, 0xD1CF3ED6, 0x7C7D2D28, + 0x1F9F25CF, 0xADF2B89B, 0x5AD6B472, 0x5A88F54C, + 0xE029AC71, 0xE019A5E6, 0x47B0ACFD, 0xED93FA9B, + 0xE8D3C48D, 0x283B57CC, 0xF8D56629, 0x79132E28, + 0x785F0191, 0xED756055, 0xF7960E44, 0xE3D35E8C, + 0x15056DD4, 0x88F46DBA, 0x03A16125, 0x0564F0BD, + 0xC3EB9E15, 0x3C9057A2, 0x97271AEC, 0xA93A072A, + 0x1B3F6D9B, 0x1E6321F5, 0xF59C66FB, 0x26DCF319, + 0x7533D928, 0xB155FDF5, 0x03563482, 0x8ABA3CBB, + 0x28517711, 0xC20AD9F8, 0xABCC5167, 0xCCAD925F, + 0x4DE81751, 0x3830DC8E, 0x379D5862, 0x9320F991, + 0xEA7A90C2, 0xFB3E7BCE, 0x5121CE64, 0x774FBE32, + 0xA8B6E37E, 0xC3293D46, 0x48DE5369, 0x6413E680, + 0xA2AE0810, 0xDD6DB224, 0x69852DFD, 0x09072166, + 0xB39A460A, 0x6445C0DD, 0x586CDECF, 0x1C20C8AE, + 0x5BBEF7DD, 0x1B588D40, 0xCCD2017F, 0x6BB4E3BB, + 0xDDA26A7E, 0x3A59FF45, 0x3E350A44, 0xBCB4CDD5, + 0x72EACEA8, 0xFA6484BB, 0x8D6612AE, 0xBF3C6F47, + 0xD29BE463, 0x542F5D9E, 0xAEC2771B, 0xF64E6370, + 0x740E0D8D, 0xE75B1357, 0xF8721671, 0xAF537D5D, + 0x4040CB08, 0x4EB4E2CC, 0x34D2466A, 0x0115AF84, + 0xE1B00428, 0x95983A1D, 0x06B89FB4, 0xCE6EA048, + 0x6F3F3B82, 0x3520AB82, 0x011A1D4B, 0x277227F8, + 0x611560B1, 0xE7933FDC, 0xBB3A792B, 0x344525BD, + 0xA08839E1, 0x51CE794B, 0x2F32C9B7, 0xA01FBAC9, + 0xE01CC87E, 0xBCC7D1F6, 0xCF0111C3, 0xA1E8AAC7, + 0x1A908749, 0xD44FBD9A, 0xD0DADECB, 0xD50ADA38, + 0x0339C32A, 0xC6913667, 0x8DF9317C, 0xE0B12B4F, + 0xF79E59B7, 0x43F5BB3A, 0xF2D519FF, 0x27D9459C, + 0xBF97222C, 0x15E6FC2A, 0x0F91FC71, 0x9B941525, + 0xFAE59361, 0xCEB69CEB, 0xC2A86459, 0x12BAA8D1, + 0xB6C1075E, 0xE3056A0C, 0x10D25065, 0xCB03A442, + 0xE0EC6E0E, 0x1698DB3B, 0x4C98A0BE, 0x3278E964, + 0x9F1F9532, 0xE0D392DF, 0xD3A0342B, 0x8971F21E, + 0x1B0A7441, 0x4BA3348C, 0xC5BE7120, 0xC37632D8, + 0xDF359F8D, 0x9B992F2E, 0xE60B6F47, 0x0FE3F11D, + 0xE54CDA54, 0x1EDAD891, 0xCE6279CF, 0xCD3E7E6F, + 0x1618B166, 0xFD2C1D05, 0x848FD2C5, 0xF6FB2299, + 0xF523F357, 0xA6327623, 0x93A83531, 0x56CCCD02, + 0xACF08162, 0x5A75EBB5, 0x6E163697, 0x88D273CC, + 0xDE966292, 0x81B949D0, 0x4C50901B, 0x71C65614, + 0xE6C6C7BD, 0x327A140A, 0x45E1D006, 0xC3F27B9A, + 0xC9AA53FD, 0x62A80F00, 0xBB25BFE2, 0x35BDD2F6, + 0x71126905, 0xB2040222, 0xB6CBCF7C, 0xCD769C2B, + 0x53113EC0, 0x1640E3D3, 0x38ABBD60, 0x2547ADF0, + 0xBA38209C, 0xF746CE76, 0x77AFA1C5, 0x20756060, + 0x85CBFE4E, 0x8AE88DD8, 0x7AAAF9B0, 0x4CF9AA7E, + 0x1948C25C, 0x02FB8A8C, 0x01C36AE4, 0xD6EBE1F9, + 0x90D4F869, 0xA65CDEA0, 0x3F09252D, 0xC208E69F, + 0xB74E6132, 0xCE77E25B, 0x578FDFE3, 0x3AC372E6); + + /* The number of rounds to do */ + var $_rounds = 16; + + /** + * Set the key to be used for en/decryption + * + * @param String $key The key to use + */ + function setKey($key) { + $key = $this->_formatKey($key); + $keyPos = $keyXor = 0; + + $iMax = count($this->p); + $keyLen = count($key); + for ($i = 0; $i < $iMax; $i++) { + for ($t = 0; $t < 4; $t++) { + $keyXor = ($keyXor << 8) | (($key[$keyPos]) & 0x0ff); + if (++$keyPos == $keyLen) { + $keyPos = 0; + } + } + $this->p[$i] = $this->p[$i] ^ $keyXor; + } + + $encZero = array('L' => 0, 'R' => 0); + for ($i = 0; $i + 1 < $iMax; $i += 2) { + $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']); + $this->p[$i] = $encZero['L']; + $this->p[$i + 1] = $encZero['R']; + } + + $iMax = count($this->s1); + for ($i = 0; $i < $iMax; $i += 2) { + $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']); + $this->s1[$i] = $encZero['L']; + $this->s1[$i + 1] = $encZero['R']; + } + + $iMax = count($this->s2); + for ($i = 0; $i < $iMax; $i += 2) { + $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']); + $this->s2[$i] = $encZero['L']; + $this->s2[$i + 1] = $encZero['R']; + } + + $iMax = count($this->s3); + for ($i = 0; $i < $iMax; $i += 2) { + $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']); + $this->s3[$i] = $encZero['L']; + $this->s3[$i + 1] = $encZero['R']; + } + + $iMax = count($this->s4); + for ($i = 0; $i < $iMax; $i += 2) { + $encZero = $this->_encryptBlock($encZero['L'], $encZero['R']); + $this->s4[$i] = $encZero['L']; + $this->s4[$i + 1] = $encZero['R']; + } + + } + + /** + * Encrypt a block on data. + * + * @param String $block The data to encrypt + * @param optional String $key The key to use + * + * @return String the encrypted output + */ + function encryptBlock($block, $key = null) { + if (!is_null($key)) { + $this->setKey($key); + } + + list($L, $R) = array_values(unpack('N*', $block)); + $parts = $this->_encryptBlock($L, $R); + return pack("NN", $parts['L'], $parts['R']); + } + + /** + * Encrypt a block on data. + * + * @param String $L The data to encrypt. + * @param String $R The data to encrypt. + * + * @return String The encrypted output. + */ + function _encryptBlock($L, $R) { + $L ^= $this->p[0]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[1]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[2]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[3]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[4]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[5]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[6]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[7]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[8]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[9]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[10]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[11]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[12]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[13]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[14]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[15]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[16]; + $R ^= $this->p[17]; + + return array('L' => $R, 'R' => $L); + } + + /** + * Decrypt a block on data. + * + * @param String $block The data to decrypt + * @param optional String $key The key to use + * + * @return String the decrypted output + */ + function decryptBlock($block, $key = null) { + if (!is_null($key)) { + $this->setKey($key); + } + + // change for phpMyAdmin + $L = null; + $R = null; + + $retarray = array_values(unpack('N*', $block)); + if (isset($retarray[0])) { + $L = $retarray[0]; + } + if (isset($retarray[1])) { + $R = $retarray[1]; + } + // end change for phpMyAdmin + + $L ^= $this->p[17]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[16]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[15]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[14]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[13]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[12]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[11]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[10]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[9]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[8]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[7]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[6]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[5]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[4]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[3]; + $R ^= ((($this->s1[($L >> 24) & 0xFF] + $this->s2[($L >> 16) & 0x0ff]) ^ $this->s3[($L >> 8) & 0x0ff]) + $this->s4[$L & 0x0ff]) ^ $this->p[2]; + $L ^= ((($this->s1[($R >> 24) & 0xFF] + $this->s2[($R >> 16) & 0x0ff]) ^ $this->s3[($R >> 8) & 0x0ff]) + $this->s4[$R & 0x0ff]) ^ $this->p[1]; + + $decrypted = pack("NN", $R ^ $this->p[0], $L); + return $decrypted; + } + + /** + * Converts a text key into an array. + * + * @return array The key. + */ + function _formatKey($key) { + return array_values(unpack('C*', $key)); + } + +} + +// higher-level functions: +/** + * Encryption using blowfish algorithm + * + * @param string original data + * @param string the secret + * + * @return string the encrypted result + * + * @access public + * + * @author lem9 + */ +function PMA_blowfish_encrypt($data, $secret) { + $pma_cipher = new Horde_Cipher_blowfish; + $encrypt = ''; + + $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); +} + +/** + * Decryption using blowfish algorithm + * + * @param string encrypted data + * @param string the secret + * + * @return string original data + * + * @access public + * + * @author lem9 + */ +function PMA_blowfish_decrypt($encdata, $secret) { + $pma_cipher = new Horde_Cipher_blowfish; + $decrypt = ''; + $data = base64_decode($encdata); + + foreach (str_split($data, 8) as $chunk) { + $decrypt .= $pma_cipher->decryptBlock($chunk, $secret); + } + return substr(rtrim($decrypt, "\0"), 0, -1); // triming fixed for DokuWiki FS#1690 FS#1713 +} diff --git a/sources/inc/cache.php b/sources/inc/cache.php new file mode 100644 index 0000000..5eac949 --- /dev/null +++ b/sources/inc/cache.php @@ -0,0 +1,270 @@ + + */ + +if(!defined('DOKU_INC')) die('meh.'); + +class cache { + var $key = ''; // primary identifier for this item + var $ext = ''; // file ext for cache data, secondary identifier for this item + var $cache = ''; // cache file name + var $depends = array(); // array containing cache dependency information, + // used by _useCache to determine cache validity + + var $_event = ''; // event to be triggered during useCache + + function cache($key,$ext) { + $this->key = $key; + $this->ext = $ext; + $this->cache = getCacheName($key,$ext); + } + + /** + * public method to determine whether the cache can be used + * + * 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: + * 'age' => max age of the cache in seconds + * 'files' => cache must be younger than mtime of each file + * (nb. dependency passes if file doesn't exist) + * + * @return bool true if cache can be used, false otherwise + */ + function useCache($depends=array()) { + $this->depends = $depends; + $this->_addDependencies(); + + if ($this->_event) { + return $this->_stats(trigger_event($this->_event,$this,array($this,'_useCache'))); + } else { + return $this->_stats($this->_useCache()); + } + } + + /** + * private method containing cache use decision logic + * + * this function processes the following keys in the depends array + * purge - force a purge on any non empty value + * age - expire cache if older than age (seconds) + * files - expire cache if any file in this array was updated more recently than the cache + * + * can be overridden + * + * @return bool see useCache() + */ + function _useCache() { + + if (!empty($this->depends['purge'])) return false; // purge requested? + if (!($this->_time = @filemtime($this->cache))) return false; // cache exists? + + // cache too old? + if (!empty($this->depends['age']) && ((time() - $this->_time) > $this->depends['age'])) return false; + + if (!empty($this->depends['files'])) { + foreach ($this->depends['files'] as $file) { + if ($this->_time <= @filemtime($file)) return false; // cache older than files it depends on? + } + } + + return true; + } + + /** + * add dependencies to the depends array + * + * this method should only add dependencies, + * it should not remove any existing dependencies and + * it should only overwrite a dependency when the new value is more stringent than the old + */ + function _addDependencies() { + global $INPUT; + if ($INPUT->has('purge')) $this->depends['purge'] = true; // purge requested + } + + /** + * retrieve the cached data + * + * @param bool $clean true to clean line endings, false to leave line endings alone + * @return string cache contents + */ + function retrieveCache($clean=true) { + return io_readFile($this->cache, $clean); + } + + /** + * cache $data + * + * @param string $data the data to be cached + * @return bool true on success, false otherwise + */ + function storeCache($data) { + return io_savefile($this->cache, $data); + } + + /** + * remove any cached data associated with this cache instance + */ + function removeCache() { + @unlink($this->cache); + } + + /** + * Record cache hits statistics. + * (Only when debugging allowed, to reduce overhead.) + * + * @param bool $success result of this cache use attempt + * @return bool pass-thru $success value + */ + function _stats($success) { + global $conf; + static $stats = null; + static $file; + + if (!$conf['allowdebug']) { return $success; } + + if (is_null($stats)) { + $file = $conf['cachedir'].'/cache_stats.txt'; + $lines = explode("\n",io_readFile($file)); + + foreach ($lines as $line) { + $i = strpos($line,','); + $stats[substr($line,0,$i)] = $line; + } + } + + if (isset($stats[$this->ext])) { + list($ext,$count,$hits) = explode(',',$stats[$this->ext]); + } else { + $ext = $this->ext; + $count = 0; + $hits = 0; + } + + $count++; + if ($success) $hits++; + $stats[$this->ext] = "$ext,$count,$hits"; + + io_saveFile($file,join("\n",$stats)); + + return $success; + } +} + +class cache_parser extends cache { + + var $file = ''; // source file for cache + var $mode = ''; // input mode (represents the processing the input file will undergo) + + var $_event = 'PARSER_CACHE_USE'; + + function cache_parser($id, $file, $mode) { + if ($id) $this->page = $id; + $this->file = $file; + $this->mode = $mode; + + parent::cache($file.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.'.$mode); + } + + function _useCache() { + + if (!@file_exists($this->file)) return false; // source exists? + return parent::_useCache(); + } + + function _addDependencies() { + global $conf, $config_cascade; + + $this->depends['age'] = isset($this->depends['age']) ? + min($this->depends['age'],$conf['cachetime']) : $conf['cachetime']; + + // parser cache file dependencies ... + $files = array($this->file, // ... source + DOKU_INC.'inc/parser/parser.php', // ... parser + DOKU_INC.'inc/parser/handler.php', // ... handler + ); + $files = array_merge($files, getConfigFiles('main')); // ... wiki settings + + $this->depends['files'] = !empty($this->depends['files']) ? array_merge($files, $this->depends['files']) : $files; + parent::_addDependencies(); + } + +} + +class cache_renderer extends cache_parser { + function _useCache() { + global $conf; + + if (!parent::_useCache()) return false; + + if (!isset($this->page)) { + return true; + } + + if ($this->_time < @filemtime(metaFN($this->page,'.meta'))) return false; // meta cache older than file it depends on? + + // 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 + $metadata = p_get_metadata($this->page); + + 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; + } + + function _addDependencies() { + + // renderer cache file dependencies ... + $files = array( + DOKU_INC.'inc/parser/'.$this->mode.'.php', // ... the renderer + ); + + // page implies metadata and possibly some other dependencies + if (isset($this->page)) { + + $valid = p_get_metadata($this->page, 'date valid'); // for xhtml this will render the metadata if needed + if (!empty($valid['age'])) { + $this->depends['age'] = isset($this->depends['age']) ? + min($this->depends['age'],$valid['age']) : $valid['age']; + } + } + + $this->depends['files'] = !empty($this->depends['files']) ? array_merge($files, $this->depends['files']) : $files; + parent::_addDependencies(); + } +} + +class cache_instructions extends cache_parser { + + function cache_instructions($id, $file) { + parent::cache_parser($id, $file, 'i'); + } + + function retrieveCache($clean=true) { + $contents = io_readFile($this->cache, false); + return !empty($contents) ? unserialize($contents) : array(); + } + + function storeCache($instructions) { + return io_savefile($this->cache,serialize($instructions)); + } +} diff --git a/sources/inc/changelog.php b/sources/inc/changelog.php new file mode 100644 index 0000000..6ff1e0e --- /dev/null +++ b/sources/inc/changelog.php @@ -0,0 +1,548 @@ + + */ + +// Constants for known core changelog line types. +// Use these in place of string literals for more readable code. +define('DOKU_CHANGE_TYPE_CREATE', 'C'); +define('DOKU_CHANGE_TYPE_EDIT', 'E'); +define('DOKU_CHANGE_TYPE_MINOR_EDIT', 'e'); +define('DOKU_CHANGE_TYPE_DELETE', 'D'); +define('DOKU_CHANGE_TYPE_REVERT', 'R'); + +/** + * parses a changelog line into it's components + * + * @author Ben Coburn + */ +function parseChangelogLine($line) { + $tmp = explode("\t", $line); + if ($tmp!==false && count($tmp)>1) { + $info = array(); + $info['date'] = (int)$tmp[0]; // unix timestamp + $info['ip'] = $tmp[1]; // IPv4 address (127.0.0.1) + $info['type'] = $tmp[2]; // log line type + $info['id'] = $tmp[3]; // page id + $info['user'] = $tmp[4]; // user name + $info['sum'] = $tmp[5]; // edit summary (or action reason) + $info['extra'] = rtrim($tmp[6], "\n"); // extra data (varies by line type) + return $info; + } else { return false; } +} + +/** + * Add's an entry to the changelog and saves the metadata for the page + * + * @param int $date Timestamp of the change + * @param String $id Name of the affected page + * @param String $type Type of the change see DOKU_CHANGE_TYPE_* + * @param String $summary Summary of the change + * @param mixed $extra In case of a revert the revision (timestmp) of the reverted page + * @param array $flags Additional flags in a key value array. + * Availible flags: + * - ExternalEdit - mark as an external edit. + * + * @author Andreas Gohr + * @author Esther Brunner + * @author Ben Coburn + */ +function addLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){ + global $conf, $INFO; + + // check for special flags as keys + if (!is_array($flags)) { $flags = array(); } + $flagExternalEdit = isset($flags['ExternalEdit']); + + $id = cleanid($id); + $file = wikiFN($id); + $created = @filectime($file); + $minor = ($type===DOKU_CHANGE_TYPE_MINOR_EDIT); + $wasRemoved = ($type===DOKU_CHANGE_TYPE_DELETE); + + if(!$date) $date = time(); //use current time if none supplied + $remote = (!$flagExternalEdit)?clientIP(true):'127.0.0.1'; + $user = (!$flagExternalEdit)?$_SERVER['REMOTE_USER']:''; + + $strip = array("\t", "\n"); + $logline = array( + 'date' => $date, + 'ip' => $remote, + 'type' => str_replace($strip, '', $type), + 'id' => $id, + 'user' => $user, + 'sum' => utf8_substr(str_replace($strip, '', $summary),0,255), + 'extra' => str_replace($strip, '', $extra) + ); + + // update metadata + if (!$wasRemoved) { + $oldmeta = p_read_metadata($id); + $meta = array(); + if (!$INFO['exists'] && empty($oldmeta['persistent']['date']['created'])){ // newly created + $meta['date']['created'] = $created; + if ($user){ + $meta['creator'] = $INFO['userinfo']['name']; + $meta['user'] = $user; + } + } elseif (!$INFO['exists'] && !empty($oldmeta['persistent']['date']['created'])) { // re-created / restored + $meta['date']['created'] = $oldmeta['persistent']['date']['created']; + $meta['date']['modified'] = $created; // use the files ctime here + $meta['creator'] = $oldmeta['persistent']['creator']; + if ($user) $meta['contributor'][$user] = $INFO['userinfo']['name']; + } elseif (!$minor) { // non-minor modification + $meta['date']['modified'] = $date; + if ($user) $meta['contributor'][$user] = $INFO['userinfo']['name']; + } + $meta['last_change'] = $logline; + p_set_metadata($id, $meta); + } + + // add changelog lines + $logline = implode("\t", $logline)."\n"; + io_saveFile(metaFN($id,'.changes'),$logline,true); //page changelog + io_saveFile($conf['changelog'],$logline,true); //global changelog cache +} + +/** + * Add's an entry to the media changelog + * + * @author Michael Hamann + * @author Andreas Gohr + * @author Esther Brunner + * @author Ben Coburn + */ +function addMediaLogEntry($date, $id, $type=DOKU_CHANGE_TYPE_EDIT, $summary='', $extra='', $flags=null){ + global $conf; + + $id = cleanid($id); + + if(!$date) $date = time(); //use current time if none supplied + $remote = clientIP(true); + $user = $_SERVER['REMOTE_USER']; + + $strip = array("\t", "\n"); + $logline = array( + 'date' => $date, + 'ip' => $remote, + 'type' => str_replace($strip, '', $type), + 'id' => $id, + 'user' => $user, + 'sum' => utf8_substr(str_replace($strip, '', $summary),0,255), + 'extra' => str_replace($strip, '', $extra) + ); + + // add changelog lines + $logline = implode("\t", $logline)."\n"; + io_saveFile($conf['media_changelog'],$logline,true); //global media changelog cache + io_saveFile(mediaMetaFN($id,'.changes'),$logline,true); //media file's changelog +} + +/** + * returns an array of recently changed files using the + * changelog + * + * The following constants can be used to control which changes are + * included. Add them together as needed. + * + * RECENTS_SKIP_DELETED - don't include deleted pages + * RECENTS_SKIP_MINORS - don't include minor changes + * RECENTS_SKIP_SUBSPACES - don't include subspaces + * RECENTS_MEDIA_CHANGES - return media changes instead of page changes + * RECENTS_MEDIA_PAGES_MIXED - return both media changes and page changes + * + * @param int $first number of first entry returned (for paginating + * @param int $num return $num entries + * @param string $ns restrict to given namespace + * @param int $flags see above + * @return array recently changed files + * + * @author Ben Coburn + * @author Kate Arzamastseva + */ +function getRecents($first,$num,$ns='',$flags=0){ + global $conf; + $recent = array(); + $count = 0; + + if(!$num) + return $recent; + + // read all recent changes. (kept short) + if ($flags & RECENTS_MEDIA_CHANGES) { + $lines = @file($conf['media_changelog']); + } else { + $lines = @file($conf['changelog']); + } + $lines_position = count($lines)-1; + $media_lines_position = 0; + $media_lines = array(); + + if ($flags & RECENTS_MEDIA_PAGES_MIXED) { + $media_lines = @file($conf['media_changelog']); + $media_lines_position = count($media_lines)-1; + } + + $seen = array(); // caches seen lines, _handleRecent() skips them + + // handle lines + while ($lines_position >= 0 || (($flags & RECENTS_MEDIA_PAGES_MIXED) && $media_lines_position >=0)) { + if (empty($rec) && $lines_position >= 0) { + $rec = _handleRecent(@$lines[$lines_position], $ns, $flags, $seen); + if (!$rec) { + $lines_position --; + continue; + } + } + if (($flags & RECENTS_MEDIA_PAGES_MIXED) && empty($media_rec) && $media_lines_position >= 0) { + $media_rec = _handleRecent(@$media_lines[$media_lines_position], $ns, $flags | RECENTS_MEDIA_CHANGES, $seen); + if (!$media_rec) { + $media_lines_position --; + continue; + } + } + if (($flags & RECENTS_MEDIA_PAGES_MIXED) && @$media_rec['date'] >= @$rec['date']) { + $media_lines_position--; + $x = $media_rec; + $x['media'] = true; + $media_rec = false; + } else { + $lines_position--; + $x = $rec; + if ($flags & RECENTS_MEDIA_CHANGES) $x['media'] = true; + $rec = false; + } + if(--$first >= 0) continue; // skip first entries + $recent[] = $x; + $count++; + // break when we have enough entries + if($count >= $num){ break; } + } + return $recent; +} + +/** + * returns an array of files changed since a given time using the + * changelog + * + * The following constants can be used to control which changes are + * included. Add them together as needed. + * + * RECENTS_SKIP_DELETED - don't include deleted pages + * RECENTS_SKIP_MINORS - don't include minor changes + * RECENTS_SKIP_SUBSPACES - don't include subspaces + * RECENTS_MEDIA_CHANGES - return media changes instead of page changes + * + * @param int $from date of the oldest entry to return + * @param int $to date of the newest entry to return (for pagination, optional) + * @param string $ns restrict to given namespace (optional) + * @param int $flags see above (optional) + * @return array of files + * + * @author Michael Hamann + * @author Ben Coburn + */ +function getRecentsSince($from,$to=null,$ns='',$flags=0){ + global $conf; + $recent = array(); + + if($to && $to < $from) + return $recent; + + // read all recent changes. (kept short) + if ($flags & RECENTS_MEDIA_CHANGES) { + $lines = @file($conf['media_changelog']); + } else { + $lines = @file($conf['changelog']); + } + if(!$lines) return $recent; + + // we start searching at the end of the list + $lines = array_reverse($lines); + + // handle lines + $seen = array(); // caches seen lines, _handleRecent() skips them + + foreach($lines as $line){ + $rec = _handleRecent($line, $ns, $flags, $seen); + if($rec !== false) { + if ($rec['date'] >= $from) { + if (!$to || $rec['date'] <= $to) { + $recent[] = $rec; + } + } else { + break; + } + } + } + + return array_reverse($recent); +} + +/** + * Internal function used by getRecents + * + * don't call directly + * + * @see getRecents() + * @author Andreas Gohr + * @author Ben Coburn + */ +function _handleRecent($line,$ns,$flags,&$seen){ + if(empty($line)) return false; //skip empty lines + + // split the line into parts + $recent = parseChangelogLine($line); + if ($recent===false) { return false; } + + // skip seen ones + if(isset($seen[$recent['id']])) return false; + + // skip minors + if($recent['type']===DOKU_CHANGE_TYPE_MINOR_EDIT && ($flags & RECENTS_SKIP_MINORS)) return false; + + // remember in seen to skip additional sights + $seen[$recent['id']] = 1; + + // check if it's a hidden page + if(isHiddenPage($recent['id'])) return false; + + // filter namespace + if (($ns) && (strpos($recent['id'],$ns.':') !== 0)) return false; + + // exclude subnamespaces + if (($flags & RECENTS_SKIP_SUBSPACES) && (getNS($recent['id']) != $ns)) return false; + + // check ACL + if ($flags & RECENTS_MEDIA_CHANGES) { + $recent['perms'] = auth_quickaclcheck(getNS($recent['id']).':*'); + } else { + $recent['perms'] = auth_quickaclcheck($recent['id']); + } + if ($recent['perms'] < AUTH_READ) return false; + + // check existance + if($flags & RECENTS_SKIP_DELETED){ + $fn = (($flags & RECENTS_MEDIA_CHANGES) ? mediaFN($recent['id']) : wikiFN($recent['id'])); + if(!@file_exists($fn)) return false; + } + + return $recent; +} + +/** + * Get the changelog information for a specific page id + * and revision (timestamp). Adjacent changelog lines + * are optimistically parsed and cached to speed up + * consecutive calls to getRevisionInfo. For large + * changelog files, only the chunk containing the + * requested changelog line is read. + * + * @author Ben Coburn + * @author Kate Arzamastseva + */ +function getRevisionInfo($id, $rev, $chunk_size=8192, $media=false) { + global $cache_revinfo; + $cache =& $cache_revinfo; + if (!isset($cache[$id])) { $cache[$id] = array(); } + $rev = max($rev, 0); + + // check if it's already in the memory cache + if (isset($cache[$id]) && isset($cache[$id][$rev])) { + return $cache[$id][$rev]; + } + + if ($media) { + $file = mediaMetaFN($id, '.changes'); + } else { + $file = metaFN($id, '.changes'); + } + if (!@file_exists($file)) { return false; } + if (filesize($file)<$chunk_size || $chunk_size==0) { + // read whole file + $lines = file($file); + if ($lines===false) { return false; } + } else { + // read by chunk + $fp = fopen($file, 'rb'); // "file pointer" + if ($fp===false) { return false; } + $head = 0; + fseek($fp, 0, SEEK_END); + $tail = ftell($fp); + $finger = 0; + $finger_rev = 0; + + // find chunk + while ($tail-$head>$chunk_size) { + $finger = $head+floor(($tail-$head)/2.0); + fseek($fp, $finger); + fgets($fp); // slip the finger forward to a new line + $finger = ftell($fp); + $tmp = fgets($fp); // then read at that location + $tmp = parseChangelogLine($tmp); + $finger_rev = $tmp['date']; + if ($finger==$head || $finger==$tail) { break; } + if ($finger_rev>$rev) { + $tail = $finger; + } else { + $head = $finger; + } + } + + if ($tail-$head<1) { + // cound not find chunk, assume requested rev is missing + fclose($fp); + return false; + } + + // read chunk + $chunk = ''; + $chunk_size = max($tail-$head, 0); // found chunk size + $got = 0; + fseek($fp, $head); + while ($got<$chunk_size && !feof($fp)) { + $tmp = @fread($fp, max($chunk_size-$got, 0)); + if ($tmp===false) { break; } //error state + $got += strlen($tmp); + $chunk .= $tmp; + } + $lines = explode("\n", $chunk); + array_pop($lines); // remove trailing newline + fclose($fp); + } + + // parse and cache changelog lines + foreach ($lines as $value) { + $tmp = parseChangelogLine($value); + if ($tmp!==false) { + $cache[$id][$tmp['date']] = $tmp; + } + } + if (!isset($cache[$id][$rev])) { return false; } + return $cache[$id][$rev]; +} + +/** + * Return a list of page revisions numbers + * Does not guarantee that the revision exists in the attic, + * only that a line with the date exists in the changelog. + * By default the current revision is skipped. + * + * id: the page of interest + * first: skip the first n changelog lines + * num: number of revisions to return + * + * The current revision is automatically skipped when the page exists. + * See $INFO['meta']['last_change'] for the current revision. + * + * For efficiency, the log lines are parsed and cached for later + * calls to getRevisionInfo. Large changelog files are read + * backwards in chunks until the requested number of changelog + * lines are recieved. + * + * @author Ben Coburn + * @author Kate Arzamastseva + */ +function getRevisions($id, $first, $num, $chunk_size=8192, $media=false) { + global $cache_revinfo; + $cache =& $cache_revinfo; + if (!isset($cache[$id])) { $cache[$id] = array(); } + + $revs = array(); + $lines = array(); + $count = 0; + if ($media) { + $file = mediaMetaFN($id, '.changes'); + } else { + $file = metaFN($id, '.changes'); + } + $num = max($num, 0); + if ($num == 0) { return $revs; } + + $chunk_size = max($chunk_size, 0); + if ($first<0) { + $first = 0; + } else if (!$media && @file_exists(wikiFN($id)) || $media && @file_exists(mediaFN($id))) { + // skip current revision if the page exists + $first = max($first+1, 0); + } + + if (!@file_exists($file)) { return $revs; } + if (filesize($file)<$chunk_size || $chunk_size==0) { + // read whole file + $lines = file($file); + if ($lines===false) { return $revs; } + } else { + // read chunks backwards + $fp = fopen($file, 'rb'); // "file pointer" + if ($fp===false) { return $revs; } + fseek($fp, 0, SEEK_END); + $tail = ftell($fp); + + // chunk backwards + $finger = max($tail-$chunk_size, 0); + while ($count<$num+$first) { + fseek($fp, $finger); + $nl = $finger; + if ($finger>0) { + fgets($fp); // slip the finger forward to a new line + $nl = ftell($fp); + } + + // was the chunk big enough? if not, take another bite + if($nl > 0 && $tail <= $nl){ + $finger = max($finger-$chunk_size, 0); + continue; + }else{ + $finger = $nl; + } + + // read chunk + $chunk = ''; + $read_size = max($tail-$finger, 0); // found chunk size + $got = 0; + while ($got<$read_size && !feof($fp)) { + $tmp = @fread($fp, max($read_size-$got, 0)); + if ($tmp===false) { break; } //error state + $got += strlen($tmp); + $chunk .= $tmp; + } + $tmp = explode("\n", $chunk); + array_pop($tmp); // remove trailing newline + + // combine with previous chunk + $count += count($tmp); + $lines = array_merge($tmp, $lines); + + // next chunk + if ($finger==0) { break; } // already read all the lines + else { + $tail = $finger; + $finger = max($tail-$chunk_size, 0); + } + } + fclose($fp); + } + + // skip parsing extra lines + $num = max(min(count($lines)-$first, $num), 0); + if ($first>0 && $num>0) { $lines = array_slice($lines, max(count($lines)-$first-$num, 0), $num); } + else if ($first>0 && $num==0) { $lines = array_slice($lines, 0, max(count($lines)-$first, 0)); } + else if ($first==0 && $num>0) { $lines = array_slice($lines, max(count($lines)-$num, 0)); } + + // handle lines in reverse order + for ($i = count($lines)-1; $i >= 0; $i--) { + $tmp = parseChangelogLine($lines[$i]); + if ($tmp!==false) { + $cache[$id][$tmp['date']] = $tmp; + $revs[] = $tmp['date']; + } + } + + return $revs; +} + + diff --git a/sources/inc/cliopts.php b/sources/inc/cliopts.php new file mode 100644 index 0000000..9cea686 --- /dev/null +++ b/sources/inc/cliopts.php @@ -0,0 +1,502 @@ + + * @modified Harry Fuecks hfuecks gmail.com + * @modified Tanguy Ortolo + * @license http://www.opensource.org/licenses/bsd-license.php New BSD License + * @version CVS: $Id$ + * @link http://pear.php.net/package/Console_Getopt + * + */ + +//------------------------------------------------------------------------------ +/** + * Sets up CLI environment based on SAPI and PHP version + * Helps resolve some issues between the CGI and CLI SAPIs + * as well is inconsistencies between PHP 4.3+ and older versions + */ +if (version_compare(phpversion(), '4.3.0', '<') || php_sapi_name() == 'cgi') { + // Handle output buffering + @ob_end_flush(); + ob_implicit_flush(true); + + // PHP ini settings + set_time_limit(0); + ini_set('track_errors', true); + ini_set('html_errors', false); + ini_set('magic_quotes_runtime', false); + + // Define stream constants + define('STDIN', fopen('php://stdin', 'r')); + define('STDOUT', fopen('php://stdout', 'w')); + define('STDERR', fopen('php://stderr', 'w')); + + // Close the streams on script termination + register_shutdown_function( + create_function('', + 'fclose(STDIN); fclose(STDOUT); fclose(STDERR); return true;') + ); +} + +//------------------------------------------------------------------------------ +/** +* Error codes +*/ +define('DOKU_CLI_OPTS_UNKNOWN_OPT',1); //Unrecognized option +define('DOKU_CLI_OPTS_OPT_ARG_REQUIRED',2); //Option requires argument +define('DOKU_CLI_OPTS_OPT_ARG_DENIED',3); //Option not allowed argument +define('DOKU_CLI_OPTS_OPT_ABIGUOUS',4);//Option abiguous +define('DOKU_CLI_OPTS_ARG_READ',5);//Could not read argv + +//------------------------------------------------------------------------------ +/** + * Command-line options parsing class. + * + * @author Andrei Zmievski + * + */ +class Doku_Cli_Opts { + + /** + * + * @see http://www.sitepoint.com/article/php-command-line-1/3 + * @param string executing file name - this MUST be passed the __FILE__ constant + * @param string short options + * @param array (optional) long options + * @return Doku_Cli_Opts_Container or Doku_Cli_Opts_Error + */ + function & getOptions($bin_file, $short_options, $long_options = null) { + $args = Doku_Cli_Opts::readPHPArgv(); + + if ( Doku_Cli_Opts::isError($args) ) { + return $args; + } + + // Compatibility between "php extensions.php" and "./extensions.php" + if ( realpath($_SERVER['argv'][0]) == $bin_file ) { + $options = Doku_Cli_Opts::getOpt($args,$short_options,$long_options); + } else { + $options = Doku_Cli_Opts::getOpt2($args,$short_options,$long_options); + } + + if ( Doku_Cli_Opts::isError($options) ) { + return $options; + } + + $container = new Doku_Cli_Opts_Container($options); + return $container; + } + + /** + * Parses the command-line options. + * + * The first parameter to this function should be the list of command-line + * arguments without the leading reference to the running program. + * + * The second parameter is a string of allowed short options. Each of the + * option letters can be followed by a colon ':' to specify that the option + * requires an argument, or a double colon '::' to specify that the option + * takes an optional argument. + * + * The third argument is an optional array of allowed long options. The + * leading '--' should not be included in the option name. Options that + * require an argument should be followed by '=', and options that take an + * option argument should be followed by '=='. + * + * The return value is an array of two elements: the list of parsed + * options and the list of non-option command-line arguments. Each entry in + * the list of parsed options is a pair of elements - the first one + * specifies the option, and the second one specifies the option argument, + * if there was one. + * + * Long and short options can be mixed. + * + * Most of the semantics of this function are based on GNU getopt_long(). + * + * @param array $args an array of command-line arguments + * @param string $short_options specifies the list of allowed short options + * @param array $long_options specifies the list of allowed long options + * + * @return array two-element array containing the list of parsed options and + * the non-option arguments + * @access public + */ + function getopt2($args, $short_options, $long_options = null) { + return Doku_Cli_Opts::doGetopt( + 2, $args, $short_options, $long_options + ); + } + + /** + * This function expects $args to start with the script name (POSIX-style). + * Preserved for backwards compatibility. + * + * @param array $args an array of command-line arguments + * @param string $short_options specifies the list of allowed short options + * @param array $long_options specifies the list of allowed long options + * + * @see getopt2() + * @return array two-element array containing the list of parsed options and + * the non-option arguments + */ + function getopt($args, $short_options, $long_options = null) { + return Doku_Cli_Opts::doGetopt( + 1, $args, $short_options, $long_options + ); + } + + /** + * The actual implementation of the argument parsing code. + * + * @param int $version Version to use + * @param array $args an array of command-line arguments + * @param string $short_options specifies the list of allowed short options + * @param array $long_options specifies the list of allowed long options + * + * @return array + */ + function doGetopt($version, $args, $short_options, $long_options = null) { + + // in case you pass directly readPHPArgv() as the first arg + if (Doku_Cli_Opts::isError($args)) { + return $args; + } + if (empty($args)) { + return array(array(), array()); + } + $opts = array(); + $non_opts = array(); + + settype($args, 'array'); + + if ($long_options && is_array($long_options)) { + sort($long_options); + } + + /* + * Preserve backwards compatibility with callers that relied on + * erroneous POSIX fix. + */ + if ($version < 2) { + if (isset($args[0]{0}) && $args[0]{0} != '-') { + array_shift($args); + } + } + + reset($args); + while (list($i, $arg) = each($args)) { + + /* The special element '--' means explicit end of + options. Treat the rest of the arguments as non-options + and end the loop. */ + if ($arg == '--') { + $non_opts = array_merge($non_opts, array_slice($args, $i + 1)); + break; + } + + if ($arg{0} != '-' || (strlen($arg) > 1 && $arg{1} == '-' && !$long_options)) { + $non_opts = array_merge($non_opts, array_slice($args, $i)); + break; + } elseif (strlen($arg) > 1 && $arg{1} == '-') { + $error = Doku_Cli_Opts::_parseLongOption(substr($arg, 2), $long_options, $opts, $args); + if (Doku_Cli_Opts::isError($error)) + return $error; + } elseif ($arg == '-') { + // - is stdin + $non_opts = array_merge($non_opts, array_slice($args, $i)); + break; + } else { + $error = Doku_Cli_Opts::_parseShortOption(substr($arg, 1), $short_options, $opts, $args); + if (Doku_Cli_Opts::isError($error)) + return $error; + } + } + + return array($opts, $non_opts); + } + + /** + * Parse short option + * + * @param string $arg Argument + * @param string[] $short_options Available short options + * @param string[][] &$opts + * @param string[] &$args + * + * @access private + * @return void + */ + function _parseShortOption($arg, $short_options, &$opts, &$args) { + $len = strlen($arg); + for ($i = 0; $i < $len; $i++) { + $opt = $arg{$i}; + $opt_arg = null; + + /* Try to find the short option in the specifier string. */ + if (($spec = strstr($short_options, $opt)) === false || $arg{$i} == ':') + { + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_UNKNOWN_OPT, + "Unrecognized option -- $opt" + ); + } + + if (strlen($spec) > 1 && $spec{1} == ':') { + if (strlen($spec) > 2 && $spec{2} == ':') { + if ($i + 1 < strlen($arg)) { + /* Option takes an optional argument. Use the remainder of + the arg string if there is anything left. */ + $opts[] = array($opt, substr($arg, $i + 1)); + break; + } + } else { + /* Option requires an argument. Use the remainder of the arg + string if there is anything left. */ + if ($i + 1 < strlen($arg)) { + $opts[] = array($opt, substr($arg, $i + 1)); + break; + } else if (list(, $opt_arg) = each($args)) { + /* Else use the next argument. */; + if (Doku_Cli_Opts::_isShortOpt($opt_arg) || Doku_Cli_Opts::_isLongOpt($opt_arg)) + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_OPT_ARG_REQUIRED, + "option requires an argument --$opt" + ); + } + else + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_OPT_ARG_REQUIRED, + "Option requires an argument -- $opt" + ); + } + } + + $opts[] = array($opt, $opt_arg); + } + } + + /** + * Checks if an argument is a short option + * + * @param string $arg Argument to check + * + * @access private + * @return bool + */ + function _isShortOpt($arg){ + return strlen($arg) == 2 && $arg[0] == '-' + && preg_match('/[a-zA-Z]/', $arg[1]); + } + + /** + * Checks if an argument is a long option + * + * @param string $arg Argument to check + * + * @access private + * @return bool + */ + function _isLongOpt($arg){ + return strlen($arg) > 2 && $arg[0] == '-' && $arg[1] == '-' && + preg_match('/[a-zA-Z]+$/', substr($arg, 2)); + } + + /** + * Parse long option + * + * @param string $arg Argument + * @param string[] $long_options Available long options + * @param string[][] &$opts + * @param string[] &$args + * + * @access private + * @return void|PEAR_Error + */ + function _parseLongOption($arg, $long_options, &$opts, &$args) { + @list($opt, $opt_arg) = explode('=', $arg, 2); + $opt_len = strlen($opt); + $opt_cnt = count($long_options); + + for ($i = 0; $i < $opt_cnt; $i++) { + $long_opt = $long_options[$i]; + $opt_start = substr($long_opt, 0, $opt_len); + + $long_opt_name = str_replace('=', '', $long_opt); + + /* Option doesn't match. Go on to the next one. */ + if ($opt_start != $opt) + continue; + + $opt_rest = substr($long_opt, $opt_len); + + /* Check that the options uniquely matches one of the allowed + options. */ + if ($i + 1 < count($long_options)) { + $next_option_rest = substr($long_options[$i + 1], $opt_len); + } else { + $next_option_rest = ''; + } + + if ($opt_rest != '' && $opt{0} != '=' && + $i + 1 < $opt_cnt && + $opt == substr($long_options[$i+1], 0, $opt_len) && + $next_option_rest != '' && + $next_option_rest{0} != '=') { + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_OPT_ABIGUOUS, + "Option --$opt is ambiguous" + ); + } + + if (substr($long_opt, -1) == '=') { + if (substr($long_opt, -2) != '==') { + /* Long option requires an argument. + Take the next argument if one wasn't specified. */; + if (!strlen($opt_arg) && !(list(, $opt_arg) = each($args))) { + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_OPT_ARG_REQUIRED, + "Option --$opt requires an argument" + ); + } + + if (Doku_Cli_Opts::_isShortOpt($opt_arg) + || Doku_Cli_Opts::_isLongOpt($opt_arg)) + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_OPT_ARG_REQUIRED, + "Option --$opt requires an argument" + ); + } + } else if ($opt_arg) { + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_OPT_ARG_DENIED, + "Option --$opt doesn't allow an argument" + ); + } + + $opts[] = array('--' . $opt, $opt_arg); + return; + } + + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_UNKNOWN_OPT, + "Unrecognized option --$opt" + ); + } + + /** + * Safely read the $argv PHP array across different PHP configurations. + * Will take care on register_globals and register_argc_argv ini directives + * + * @access public + * @return mixed the $argv PHP array or PEAR error if not registered + */ + function readPHPArgv() { + global $argv; + if (!is_array($argv)) { + if (!@is_array($_SERVER['argv'])) { + if (!@is_array($GLOBALS['HTTP_SERVER_VARS']['argv'])) { + return Doku_Cli_Opts::raiseError( + DOKU_CLI_OPTS_ARG_READ, + "Could not read cmd args (register_argc_argv=Off?)" + ); + } + return $GLOBALS['HTTP_SERVER_VARS']['argv']; + } + return $_SERVER['argv']; + } + return $argv; + } + + function raiseError($code, $msg) { + return new Doku_Cli_Opts_Error($code, $msg); + } + + function isError($obj) { + return is_a($obj, 'Doku_Cli_Opts_Error'); + } + +} + +//------------------------------------------------------------------------------ +class Doku_Cli_Opts_Error { + + var $code; + var $msg; + + function Doku_Cli_Opts_Error($code, $msg) { + $this->code = $code; + $this->msg = $msg; + } + + function getMessage() { + return $this->msg; + } + + function isError() { + return true; + } + +} + +//------------------------------------------------------------------------------ +class Doku_Cli_Opts_Container { + + var $options = array(); + var $args = array(); + + function Doku_Cli_Opts_Container($options) { + foreach ( $options[0] as $option ) { + if ( false !== ( strpos($option[0], '--') ) ) { + $opt_name = substr($option[0], 2); + } else { + $opt_name = $option[0]; + } + $this->options[$opt_name] = $option[1]; + } + + $this->args = $options[1]; + } + + function has($option) { + return array_key_exists($option, $this->options); + } + + function get($option) { + if ( isset($this->options[$option]) ) { + return ( $this->options[$option] ) ; + } + } + + function arg($index) { + if ( isset($this->args[$index]) ) { + return $this->args[$index]; + } + } + + function numArgs() { + return count($this->args); + } + + function hasArgs() { + return count($this->args) !== 0; + } + + function isError() { + return false; + } + +} diff --git a/sources/inc/common.php b/sources/inc/common.php new file mode 100644 index 0000000..3277128 --- /dev/null +++ b/sources/inc/common.php @@ -0,0 +1,1633 @@ + + */ + +if(!defined('DOKU_INC')) die('meh.'); + +/** + * These constants are used with the recents function + */ +define('RECENTS_SKIP_DELETED', 2); +define('RECENTS_SKIP_MINORS', 4); +define('RECENTS_SKIP_SUBSPACES', 8); +define('RECENTS_MEDIA_CHANGES', 16); +define('RECENTS_MEDIA_PAGES_MIXED', 32); + +/** + * Wrapper around htmlspecialchars() + * + * @author Andreas Gohr + * @see htmlspecialchars() + */ +function hsc($string) { + return htmlspecialchars($string, ENT_QUOTES, 'UTF-8'); +} + +/** + * print a newline terminated string + * + * You can give an indention as optional parameter + * + * @author Andreas Gohr + */ +function ptln($string, $indent = 0) { + echo str_repeat(' ', $indent)."$string\n"; +} + +/** + * strips control characters (<32) from the given string + * + * @author Andreas Gohr + */ +function stripctl($string) { + return preg_replace('/[\x00-\x1F]+/s', '', $string); +} + +/** + * Return a secret token to be used for CSRF attack prevention + * + * @author Andreas Gohr + * @link http://en.wikipedia.org/wiki/Cross-site_request_forgery + * @link http://christ1an.blogspot.com/2007/04/preventing-csrf-efficiently.html + * @return string + */ +function getSecurityToken() { + return PassHash::hmac('md5', session_id().$_SERVER['REMOTE_USER'], auth_cookiesalt()); +} + +/** + * Check the secret CSRF token + */ +function checkSecurityToken($token = null) { + global $INPUT; + if(empty($_SERVER['REMOTE_USER'])) return true; // no logged in user, no need for a check + + if(is_null($token)) $token = $INPUT->str('sectok'); + if(getSecurityToken() != $token) { + msg('Security Token did not match. Possible CSRF attack.', -1); + return false; + } + return true; +} + +/** + * Print a hidden form field with a secret CSRF token + * + * @author Andreas Gohr + */ +function formSecurityToken($print = true) { + $ret = '
'."\n"; + if($print) echo $ret; + return $ret; +} + +/** + * Determine basic information for a request of $id + * + * @author Andreas Gohr + * @author Chris Smith + */ +function basicinfo($id, $htmlClient=true){ + global $USERINFO; + + // 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['client'] = $_SERVER['REMOTE_USER']; + + if($info['perm'] == AUTH_ADMIN) { + $info['isadmin'] = true; + $info['ismanager'] = true; + } elseif(auth_ismanager()) { + $info['ismanager'] = true; + } + + // if some outside auth were used only REMOTE_USER is set + if(!$info['userinfo']['name']) { + $info['userinfo']['name'] = $_SERVER['REMOTE_USER']; + } + + } else { + $info['perm'] = auth_aclcheck($id, '', null); + $info['client'] = clientIP(true); + } + + $info['namespace'] = getNS($id); + + // mobile detection + if ($htmlClient) { + $info['ismobile'] = clientismobile(); + } + + return $info; + } + +/** + * Return info about the current document as associative + * array. + * + * @author Andreas Gohr + */ +function pageinfo() { + global $ID; + global $REV; + global $RANGE; + global $lang; + + $info = basicinfo($ID); + + // include ID & REV not redundant, as some parts of DokuWiki may temporarily change $ID, e.g. p_wiki_xhtml + // FIXME ... perhaps it would be better to ensure the temporary changes weren't necessary + $info['id'] = $ID; + $info['rev'] = $REV; + + if(isset($_SERVER['REMOTE_USER'])) { + $sub = new Subscription(); + $info['subscribed'] = $sub->user_subscription(); + } else { + $info['subscribed'] = false; + } + + $info['locked'] = checklock($ID); + $info['filepath'] = fullpath(wikiFN($ID)); + $info['exists'] = @file_exists($info['filepath']); + if($REV) { + //check if current revision was meant + if($info['exists'] && (@filemtime($info['filepath']) == $REV)) { + $REV = ''; + } elseif($RANGE) { + //section editing does not work with old revisions! + $REV = ''; + $RANGE = ''; + msg($lang['nosecedit'], 0); + } else { + //really use old revision + $info['filepath'] = fullpath(wikiFN($ID, $REV)); + $info['exists'] = @file_exists($info['filepath']); + } + } + $info['rev'] = $REV; + if($info['exists']) { + $info['writable'] = (is_writable($info['filepath']) && + ($info['perm'] >= AUTH_EDIT)); + } else { + $info['writable'] = ($info['perm'] >= AUTH_CREATE); + } + $info['editable'] = ($info['writable'] && empty($info['locked'])); + $info['lastmod'] = @filemtime($info['filepath']); + + //load page meta data + $info['meta'] = p_get_metadata($ID); + + //who's the editor + if($REV) { + $revinfo = getRevisionInfo($ID, $REV, 1024); + } else { + if(is_array($info['meta']['last_change'])) { + $revinfo = $info['meta']['last_change']; + } else { + $revinfo = getRevisionInfo($ID, $info['lastmod'], 1024); + // cache most recent changelog line in metadata if missing and still valid + if($revinfo !== false) { + $info['meta']['last_change'] = $revinfo; + p_set_metadata($ID, array('last_change' => $revinfo)); + } + } + } + //and check for an external edit + if($revinfo !== false && $revinfo['date'] != $info['lastmod']) { + // cached changelog line no longer valid + $revinfo = false; + $info['meta']['last_change'] = $revinfo; + p_set_metadata($ID, array('last_change' => $revinfo)); + } + + $info['ip'] = $revinfo['ip']; + $info['user'] = $revinfo['user']; + $info['sum'] = $revinfo['sum']; + // See also $INFO['meta']['last_change'] which is the most recent log line for page $ID. + // Use $INFO['meta']['last_change']['type']===DOKU_CHANGE_TYPE_MINOR_EDIT in place of $info['minor']. + + if($revinfo['user']) { + $info['editor'] = $revinfo['user']; + } else { + $info['editor'] = $revinfo['ip']; + } + + // draft + $draft = getCacheName($info['client'].$ID, '.draft'); + if(@file_exists($draft)) { + if(@filemtime($draft) < @filemtime(wikiFN($ID))) { + // remove stale draft + @unlink($draft); + } else { + $info['draft'] = $draft; + } + } + + return $info; +} + +/** + * Return information about the current media item as an associative array. + */ +function mediainfo(){ + global $NS; + global $IMG; + + $info = basicinfo("$NS:*"); + $info['image'] = $IMG; + + return $info; +} + +/** + * Build an string of URL parameters + * + * @author Andreas Gohr + */ +function buildURLparams($params, $sep = '&') { + $url = ''; + $amp = false; + foreach($params as $key => $val) { + if($amp) $url .= $sep; + + $url .= rawurlencode($key).'='; + $url .= rawurlencode((string) $val); + $amp = true; + } + return $url; +} + +/** + * Build an string of html tag attributes + * + * Skips keys starting with '_', values get HTML encoded + * + * @author Andreas Gohr + */ +function buildAttributes($params, $skipempty = false) { + $url = ''; + $white = false; + foreach($params as $key => $val) { + if($key{0} == '_') continue; + if($val === '' && $skipempty) continue; + if($white) $url .= ' '; + + $url .= $key.'="'; + $url .= htmlspecialchars($val); + $url .= '"'; + $white = true; + } + return $url; +} + +/** + * This builds the breadcrumb trail and returns it as array + * + * @author Andreas Gohr + */ +function breadcrumbs() { + // we prepare the breadcrumbs early for quick session closing + static $crumbs = null; + if($crumbs != null) return $crumbs; + + global $ID; + global $ACT; + global $conf; + + //first visit? + $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)) { + $_SESSION[DOKU_COOKIE]['bc'] = $crumbs; + return $crumbs; + } + + // page names + $name = noNSorNS($ID); + if(useHeading('navigation')) { + // get page title + $title = p_get_first_heading($ID, METADATA_RENDER_USING_SIMPLE_CACHE); + if($title) { + $name = $title; + } + } + + //remove ID from array + if(isset($crumbs[$ID])) { + unset($crumbs[$ID]); + } + + //add to array + $crumbs[$ID] = $name; + //reduce size + while(count($crumbs) > $conf['breadcrumbs']) { + array_shift($crumbs); + } + //save to session + $_SESSION[DOKU_COOKIE]['bc'] = $crumbs; + return $crumbs; +} + +/** + * Filter for page IDs + * + * This is run on a ID before it is outputted somewhere + * currently used to replace the colon with something else + * on Windows (non-IIS) systems and to have proper URL encoding + * + * See discussions at https://github.com/splitbrain/dokuwiki/pull/84 and + * https://github.com/splitbrain/dokuwiki/pull/173 why we use a whitelist of + * unaffected servers instead of blacklisting affected servers here. + * + * Urlencoding is ommitted when the second parameter is false + * + * @author Andreas Gohr + */ +function idfilter($id, $ue = true) { + global $conf; + if($conf['useslash'] && $conf['userewrite']) { + $id = strtr($id, ':', '/'); + } elseif(strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' && + $conf['userewrite'] && + strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS') === false + ) { + $id = strtr($id, ':', ';'); + } + if($ue) { + $id = rawurlencode($id); + $id = str_replace('%3A', ':', $id); //keep as colon + $id = str_replace('%2F', '/', $id); //keep as slash + } + return $id; +} + +/** + * This builds a link to a wikipage + * + * It handles URL rewriting and adds additional parameter if + * given in $more + * + * @author Andreas Gohr + */ +function wl($id = '', $urlParameters = '', $absolute = false, $separator = '&') { + global $conf; + if(is_array($urlParameters)) { + $urlParameters = buildURLparams($urlParameters, $separator); + } else { + $urlParameters = str_replace(',', $separator, $urlParameters); + } + if($id === '') { + $id = $conf['start']; + } + $id = idfilter($id); + if($absolute) { + $xlink = DOKU_URL; + } else { + $xlink = DOKU_BASE; + } + + if($conf['userewrite'] == 2) { + $xlink .= DOKU_SCRIPT.'/'.$id; + if($urlParameters) $xlink .= '?'.$urlParameters; + } elseif($conf['userewrite']) { + $xlink .= $id; + if($urlParameters) $xlink .= '?'.$urlParameters; + } elseif($id) { + $xlink .= DOKU_SCRIPT.'?id='.$id; + if($urlParameters) $xlink .= $separator.$urlParameters; + } else { + $xlink .= DOKU_SCRIPT; + if($urlParameters) $xlink .= '?'.$urlParameters; + } + + return $xlink; +} + +/** + * This builds a link to an alternate page format + * + * Handles URL rewriting if enabled. Follows the style of wl(). + * + * @author Ben Coburn + */ +function exportlink($id = '', $format = 'raw', $more = '', $abs = false, $sep = '&') { + global $conf; + if(is_array($more)) { + $more = buildURLparams($more, $sep); + } else { + $more = str_replace(',', $sep, $more); + } + + $format = rawurlencode($format); + $id = idfilter($id); + if($abs) { + $xlink = DOKU_URL; + } else { + $xlink = DOKU_BASE; + } + + if($conf['userewrite'] == 2) { + $xlink .= DOKU_SCRIPT.'/'.$id.'?do=export_'.$format; + if($more) $xlink .= $sep.$more; + } elseif($conf['userewrite'] == 1) { + $xlink .= '_export/'.$format.'/'.$id; + if($more) $xlink .= '?'.$more; + } else { + $xlink .= DOKU_SCRIPT.'?do=export_'.$format.$sep.'id='.$id; + if($more) $xlink .= $sep.$more; + } + + return $xlink; +} + +/** + * Build a link to a media file + * + * Will return a link to the detail page if $direct is false + * + * The $more parameter should always be given as array, the function then + * will strip default parameters to produce even cleaner URLs + * + * @param string $id the media file id or URL + * @param mixed $more string or array with additional parameters + * @param bool $direct link to detail page if false + * @param string $sep URL parameter separator + * @param bool $abs Create an absolute URL + * @return string + */ +function ml($id = '', $more = '', $direct = true, $sep = '&', $abs = false) { + global $conf; + $isexternalimage = media_isexternal($id); + if(!$isexternalimage) { + $id = cleanID($id); + } + + if(is_array($more)) { + // add token for resized images + if(!empty($more['w']) || !empty($more['h']) || $isexternalimage){ + $more['tok'] = media_get_token($id,$more['w'],$more['h']); + } + // strip defaults for shorter URLs + if(isset($more['cache']) && $more['cache'] == 'cache') unset($more['cache']); + if(empty($more['w'])) unset($more['w']); + if(empty($more['h'])) unset($more['h']); + if(isset($more['id']) && $direct) unset($more['id']); + $more = buildURLparams($more, $sep); + } else { + $matches = array(); + if (preg_match_all('/\b(w|h)=(\d*)\b/',$more,$matches,PREG_SET_ORDER) || $isexternalimage){ + $resize = array('w'=>0, 'h'=>0); + foreach ($matches as $match){ + $resize[$match[1]] = $match[2]; + } + $more .= $more === '' ? '' : $sep; + $more .= 'tok='.media_get_token($id,$resize['w'],$resize['h']); + } + $more = str_replace('cache=cache', '', $more); //skip default + $more = str_replace(',,', ',', $more); + $more = str_replace(',', $sep, $more); + } + + if($abs) { + $xlink = DOKU_URL; + } else { + $xlink = DOKU_BASE; + } + + // external URLs are always direct without rewriting + if($isexternalimage) { + $xlink .= 'lib/exe/fetch.php'; + $xlink .= '?'.$more; + $xlink .= $sep.'media='.rawurlencode($id); + return $xlink; + } + + $id = idfilter($id); + + // decide on scriptname + if($direct) { + if($conf['userewrite'] == 1) { + $script = '_media'; + } else { + $script = 'lib/exe/fetch.php'; + } + } else { + if($conf['userewrite'] == 1) { + $script = '_detail'; + } else { + $script = 'lib/exe/detail.php'; + } + } + + // build URL based on rewrite mode + if($conf['userewrite']) { + $xlink .= $script.'/'.$id; + if($more) $xlink .= '?'.$more; + } else { + if($more) { + $xlink .= $script.'?'.$more; + $xlink .= $sep.'media='.$id; + } else { + $xlink .= $script.'?media='.$id; + } + } + + return $xlink; +} + +/** + * Returns the URL to the DokuWiki base script + * + * Consider using wl() instead, unless you absoutely need the doku.php endpoint + * + * @author Andreas Gohr + */ +function script() { + return DOKU_BASE.DOKU_SCRIPT; +} + +/** + * Spamcheck against wordlist + * + * Checks the wikitext against a list of blocked expressions + * returns true if the text contains any bad words + * + * Triggers COMMON_WORDBLOCK_BLOCKED + * + * Action Plugins can use this event to inspect the blocked data + * and gain information about the user who was blocked. + * + * Event data: + * data['matches'] - array of matches + * data['userinfo'] - information about the blocked user + * [ip] - ip address + * [user] - username (if logged in) + * [mail] - mail address (if logged in) + * [name] - real name (if logged in) + * + * @author Andreas Gohr + * @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($text = '') { + global $TEXT; + global $PRE; + global $SUF; + global $SUM; + global $conf; + global $INFO; + + if(!$conf['usewordblock']) return false; + + if(!$text) $text = "$PRE $TEXT $SUF $SUM"; + + // 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); + + $wordblocks = getWordblocks(); + // how many lines to read at once (to work around some PCRE limits) + if(version_compare(phpversion(), '4.3.0', '<')) { + // old versions of PCRE define a maximum of parenthesises even if no + // backreferences are used - the maximum is 99 + // this is very bad performancewise and may even be too high still + $chunksize = 40; + } else { + // read file in chunks of 200 - this should work around the + // MAX_PATTERN_SIZE in modern PCRE + $chunksize = 200; + } + while($blocks = array_splice($wordblocks, 0, $chunksize)) { + $re = array(); + // build regexp from blocks + foreach($blocks as $block) { + $block = preg_replace('/#.*$/', '', $block); + $block = trim($block); + if(empty($block)) continue; + $re[] = $block; + } + if(count($re) && preg_match('#('.join('|', $re).')#si', $text, $matches)) { + // prepare event data + $data['matches'] = $matches; + $data['userinfo']['ip'] = $_SERVER['REMOTE_ADDR']; + if($_SERVER['REMOTE_USER']) { + $data['userinfo']['user'] = $_SERVER['REMOTE_USER']; + $data['userinfo']['name'] = $INFO['userinfo']['name']; + $data['userinfo']['mail'] = $INFO['userinfo']['mail']; + } + $callback = create_function('', 'return true;'); + return trigger_event('COMMON_WORDBLOCK_BLOCKED', $data, $callback, true); + } + } + return false; +} + +/** + * Return the IP of the client + * + * Honours X-Forwarded-For and X-Real-IP Proxy Headers + * + * It returns a comma separated list of IPs if the above mentioned + * headers are set. If the single parameter is set, it tries to return + * a routable public address, prefering the ones suplied in the X + * headers + * + * @author Andreas Gohr + * @param boolean $single If set only a single IP is returned + * @return string + */ +function clientIP($single = false) { + $ip = array(); + $ip[] = $_SERVER['REMOTE_ADDR']; + if(!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) + $ip = array_merge($ip, explode(',', str_replace(' ', '', $_SERVER['HTTP_X_FORWARDED_FOR']))); + if(!empty($_SERVER['HTTP_X_REAL_IP'])) + $ip = array_merge($ip, explode(',', str_replace(' ', '', $_SERVER['HTTP_X_REAL_IP']))); + + // some IPv4/v6 regexps borrowed from Feyd + // see: http://forums.devnetwork.net/viewtopic.php?f=38&t=53479 + $dec_octet = '(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|[0-9])'; + $hex_digit = '[A-Fa-f0-9]'; + $h16 = "{$hex_digit}{1,4}"; + $IPv4Address = "$dec_octet\\.$dec_octet\\.$dec_octet\\.$dec_octet"; + $ls32 = "(?:$h16:$h16|$IPv4Address)"; + $IPv6Address = + "(?:(?:{$IPv4Address})|(?:". + "(?:$h16:){6}$ls32". + "|::(?:$h16:){5}$ls32". + "|(?:$h16)?::(?:$h16:){4}$ls32". + "|(?:(?:$h16:){0,1}$h16)?::(?:$h16:){3}$ls32". + "|(?:(?:$h16:){0,2}$h16)?::(?:$h16:){2}$ls32". + "|(?:(?:$h16:){0,3}$h16)?::(?:$h16:){1}$ls32". + "|(?:(?:$h16:){0,4}$h16)?::$ls32". + "|(?:(?:$h16:){0,5}$h16)?::$h16". + "|(?:(?:$h16:){0,6}$h16)?::". + ")(?:\\/(?:12[0-8]|1[0-1][0-9]|[1-9][0-9]|[0-9]))?)"; + + // remove any non-IP stuff + $cnt = count($ip); + $match = array(); + for($i = 0; $i < $cnt; $i++) { + if(preg_match("/^$IPv4Address$/", $ip[$i], $match) || preg_match("/^$IPv6Address$/", $ip[$i], $match)) { + $ip[$i] = $match[0]; + } else { + $ip[$i] = ''; + } + if(empty($ip[$i])) unset($ip[$i]); + } + $ip = array_values(array_unique($ip)); + if(!$ip[0]) $ip[0] = '0.0.0.0'; // for some strange reason we don't have a IP + + if(!$single) return join(',', $ip); + + // decide which IP to use, trying to avoid local addresses + $ip = array_reverse($ip); + foreach($ip as $i) { + if(preg_match('/^(::1|[fF][eE]80:|127\.|10\.|192\.168\.|172\.((1[6-9])|(2[0-9])|(3[0-1]))\.)/', $i)) { + continue; + } else { + return $i; + } + } + // still here? just use the first (last) address + return $ip[0]; +} + +/** + * Check if the browser is on a mobile device + * + * Adapted from the example code at url below + * + * @link http://www.brainhandles.com/2007/10/15/detecting-mobile-browsers/#code + */ +function clientismobile() { + + if(isset($_SERVER['HTTP_X_WAP_PROFILE'])) return true; + + if(preg_match('/wap\.|\.wap/i', $_SERVER['HTTP_ACCEPT'])) return true; + + if(!isset($_SERVER['HTTP_USER_AGENT'])) return false; + + $uamatches = 'midp|j2me|avantg|docomo|novarra|palmos|palmsource|240x320|opwv|chtml|pda|windows ce|mmp\/|blackberry|mib\/|symbian|wireless|nokia|hand|mobi|phone|cdm|up\.b|audio|SIE\-|SEC\-|samsung|HTC|mot\-|mitsu|sagem|sony|alcatel|lg|erics|vx|NEC|philips|mmm|xx|panasonic|sharp|wap|sch|rover|pocket|benq|java|pt|pg|vox|amoi|bird|compal|kg|voda|sany|kdd|dbt|sendo|sgh|gradi|jb|\d\d\di|moto'; + + if(preg_match("/$uamatches/i", $_SERVER['HTTP_USER_AGENT'])) return true; + + return false; +} + +/** + * Convert one or more comma separated IPs to hostnames + * + * If $conf['dnslookups'] is disabled it simply returns the input string + * + * @author Glen Harris + * @param string $ips comma separated list of IP addresses + * @return string a comma separated list of hostnames + */ +function gethostsbyaddrs($ips) { + global $conf; + if(!$conf['dnslookups']) return $ips; + + $hosts = array(); + $ips = explode(',', $ips); + + if(is_array($ips)) { + foreach($ips as $ip) { + $hosts[] = gethostbyaddr(trim($ip)); + } + return join(',', $hosts); + } else { + return gethostbyaddr(trim($ips)); + } +} + +/** + * Checks if a given page is currently locked. + * + * removes stale lockfiles + * + * @author Andreas Gohr + */ +function checklock($id) { + global $conf; + $lock = wikiLockFN($id); + + //no lockfile + if(!@file_exists($lock)) return false; + + //lockfile expired + if((time() - filemtime($lock)) > $conf['locktime']) { + @unlink($lock); + return false; + } + + //my own lock + list($ip, $session) = explode("\n", io_readFile($lock)); + if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) { + return false; + } + + return $ip; +} + +/** + * Lock a page for editing + * + * @author Andreas Gohr + */ +function lock($id) { + global $conf; + + if($conf['locktime'] == 0) { + return; + } + + $lock = wikiLockFN($id); + if($_SERVER['REMOTE_USER']) { + io_saveFile($lock, $_SERVER['REMOTE_USER']); + } else { + io_saveFile($lock, clientIP()."\n".session_id()); + } +} + +/** + * Unlock a page if it was locked by the user + * + * @author Andreas Gohr + * @param string $id page id to unlock + * @return bool true if a lock was removed + */ +function unlock($id) { + $lock = wikiLockFN($id); + if(@file_exists($lock)) { + list($ip, $session) = explode("\n", io_readFile($lock)); + if($ip == $_SERVER['REMOTE_USER'] || $ip == clientIP() || $session == session_id()) { + @unlink($lock); + return true; + } + } + return false; +} + +/** + * convert line ending to unix format + * + * also makes sure the given text is valid UTF-8 + * + * @see formText() for 2crlf conversion + * @author Andreas Gohr + */ +function cleanText($text) { + $text = preg_replace("/(\015\012)|(\015)/", "\012", $text); + + // if the text is not valid UTF-8 we simply assume latin1 + // this won't break any worse than it breaks with the wrong encoding + // but might actually fix the problem in many cases + if(!utf8_check($text)) $text = utf8_encode($text); + + return $text; +} + +/** + * Prepares text for print in Webforms by encoding special chars. + * It also converts line endings to Windows format which is + * pseudo standard for webforms. + * + * @see cleanText() for 2unix conversion + * @author Andreas Gohr + */ +function formText($text) { + $text = str_replace("\012", "\015\012", $text); + return htmlspecialchars($text); +} + +/** + * Returns the specified local text in raw format + * + * @author Andreas Gohr + */ +function rawLocale($id, $ext = 'txt') { + return io_readFile(localeFN($id, $ext)); +} + +/** + * Returns the raw WikiText + * + * @author Andreas Gohr + */ +function rawWiki($id, $rev = '') { + return io_readWikiPage(wikiFN($id, $rev), $id, $rev); +} + +/** + * Returns the pagetemplate contents for the ID's namespace + * + * @triggers COMMON_PAGETPL_LOAD + * @author Andreas Gohr + */ +function pageTemplate($id) { + global $conf; + + if(is_array($id)) $id = $id[0]; + + // prepare initial event data + $data = array( + 'id' => $id, // the id of the page to be created + 'tpl' => '', // the text used as template + 'tplfile' => '', // the file above text was/should be loaded from + 'doreplace' => true // should wildcard replacements be done on the text? + ); + + $evt = new Doku_Event('COMMON_PAGETPL_LOAD', $data); + if($evt->advise_before(true)) { + // the before event might have loaded the content already + if(empty($data['tpl'])) { + // if the before event did not set a template file, try to find one + if(empty($data['tplfile'])) { + $path = dirname(wikiFN($id)); + if(@file_exists($path.'/_template.txt')) { + $data['tplfile'] = $path.'/_template.txt'; + } else { + // search upper namespaces for templates + $len = strlen(rtrim($conf['datadir'], '/')); + while(strlen($path) >= $len) { + if(@file_exists($path.'/__template.txt')) { + $data['tplfile'] = $path.'/__template.txt'; + break; + } + $path = substr($path, 0, strrpos($path, '/')); + } + } + } + // load the content + $data['tpl'] = io_readFile($data['tplfile']); + } + if($data['doreplace']) parsePageTemplate($data); + } + $evt->advise_after(); + unset($evt); + + return $data['tpl']; +} + +/** + * Performs common page template replacements + * This works on data from COMMON_PAGETPL_LOAD + * + * @author Andreas Gohr + */ +function parsePageTemplate(&$data) { + /** + * @var string $id the id of the page to be created + * @var string $tpl the text used as template + * @var string $tplfile the file above text was/should be loaded from + * @var bool $doreplace should wildcard replacements be done on the text? + */ + extract($data); + + global $USERINFO; + global $conf; + + // replace placeholders + $file = noNS($id); + $page = strtr($file, $conf['sepchar'], ' '); + + $tpl = str_replace( + array( + '@ID@', + '@NS@', + '@FILE@', + '@!FILE@', + '@!FILE!@', + '@PAGE@', + '@!PAGE@', + '@!!PAGE@', + '@!PAGE!@', + '@USER@', + '@NAME@', + '@MAIL@', + '@DATE@', + ), + array( + $id, + getNS($id), + $file, + utf8_ucfirst($file), + utf8_strtoupper($file), + $page, + utf8_ucfirst($page), + utf8_ucwords($page), + utf8_strtoupper($page), + $_SERVER['REMOTE_USER'], + $USERINFO['name'], + $USERINFO['mail'], + $conf['dformat'], + ), $tpl + ); + + // we need the callback to work around strftime's char limit + $tpl = preg_replace_callback('/%./', create_function('$m', 'return strftime($m[0]);'), $tpl); + $data['tpl'] = $tpl; + return $tpl; +} + +/** + * Returns the raw Wiki Text in three slices. + * + * The range parameter needs to have the form "from-to" + * and gives the range of the section in bytes - no + * UTF-8 awareness is needed. + * The returned order is prefix, section and suffix. + * + * @author Andreas Gohr + */ +function rawWikiSlices($range, $id, $rev = '') { + $text = io_readWikiPage(wikiFN($id, $rev), $id, $rev); + + // Parse range + list($from, $to) = explode('-', $range, 2); + // Make range zero-based, use defaults if marker is missing + $from = !$from ? 0 : ($from - 1); + $to = !$to ? strlen($text) : ($to - 1); + + $slices[0] = substr($text, 0, $from); + $slices[1] = substr($text, $from, $to - $from); + $slices[2] = substr($text, $to); + return $slices; +} + +/** + * Joins wiki text slices + * + * function to join the text slices. + * When the pretty parameter is set to true it adds additional empty + * lines between sections if needed (used on saving). + * + * @author Andreas Gohr + */ +function con($pre, $text, $suf, $pretty = false) { + if($pretty) { + if($pre !== '' && substr($pre, -1) !== "\n" && + substr($text, 0, 1) !== "\n" + ) { + $pre .= "\n"; + } + if($suf !== '' && substr($text, -1) !== "\n" && + substr($suf, 0, 1) !== "\n" + ) { + $text .= "\n"; + } + } + + return $pre.$text.$suf; +} + +/** + * Saves a wikitext by calling io_writeWikiPage. + * Also directs changelog and attic updates. + * + * @author Andreas Gohr + * @author Ben Coburn + */ +function saveWikiText($id, $text, $summary, $minor = false) { + /* Note to developers: + This code is subtle and delicate. Test the behavior of + the attic and changelog with dokuwiki and external edits + after any changes. External edits change the wiki page + directly without using php or dokuwiki. + */ + global $conf; + global $lang; + global $REV; + // ignore if no changes were made + if($text == rawWiki($id, '')) { + return; + } + + $file = wikiFN($id); + $old = @filemtime($file); // from page + $wasRemoved = (trim($text) == ''); // check for empty or whitespace only + $wasCreated = !@file_exists($file); + $wasReverted = ($REV == true); + $newRev = false; + $oldRev = getRevisions($id, -1, 1, 1024); // from changelog + $oldRev = (int) (empty($oldRev) ? 0 : $oldRev[0]); + if(!@file_exists(wikiFN($id, $old)) && @file_exists($file) && $old >= $oldRev) { + // add old revision to the attic if missing + saveOldRevision($id); + // add a changelog entry if this edit came from outside dokuwiki + if($old > $oldRev) { + addLogEntry($old, $id, DOKU_CHANGE_TYPE_EDIT, $lang['external_edit'], '', array('ExternalEdit'=> true)); + // remove soon to be stale instructions + $cache = new cache_instructions($id, $file); + $cache->removeCache(); + } + } + + if($wasRemoved) { + // Send "update" event with empty data, so plugins can react to page deletion + $data = array(array($file, '', false), getNS($id), noNS($id), false); + trigger_event('IO_WIKIPAGE_WRITE', $data); + // pre-save deleted revision + @touch($file); + clearstatcache(); + $newRev = saveOldRevision($id); + // remove empty file + @unlink($file); + // don't remove old meta info as it should be saved, plugins can use IO_WIKIPAGE_WRITE for removing their metadata... + // purge non-persistant meta data + p_purge_metadata($id); + $del = true; + // autoset summary on deletion + if(empty($summary)) $summary = $lang['deleted']; + // remove empty namespaces + io_sweepNS($id, 'datadir'); + io_sweepNS($id, 'mediadir'); + } else { + // save file (namespace dir is created in io_writeWikiPage) + io_writeWikiPage($file, $text, $id); + // pre-save the revision, to keep the attic in sync + $newRev = saveOldRevision($id); + $del = false; + } + + // select changelog line type + $extra = ''; + $type = DOKU_CHANGE_TYPE_EDIT; + if($wasReverted) { + $type = DOKU_CHANGE_TYPE_REVERT; + $extra = $REV; + } else if($wasCreated) { + $type = DOKU_CHANGE_TYPE_CREATE; + } else if($wasRemoved) { + $type = DOKU_CHANGE_TYPE_DELETE; + } else if($minor && $conf['useacl'] && $_SERVER['REMOTE_USER']) { + $type = DOKU_CHANGE_TYPE_MINOR_EDIT; + } //minor edits only for logged in users + + addLogEntry($newRev, $id, $type, $summary, $extra); + // send notify mails + notify($id, 'admin', $old, $summary, $minor); + notify($id, 'subscribers', $old, $summary, $minor); + + // update the purgefile (timestamp of the last time anything within the wiki was changed) + io_saveFile($conf['cachedir'].'/purgefile', time()); + + // if useheading is enabled, purge the cache of all linking pages + if(useHeading('content')) { + $pages = ft_backlinks($id, true); + foreach($pages as $page) { + $cache = new cache_renderer($page, wikiFN($page), 'xhtml'); + $cache->removeCache(); + } + } +} + +/** + * moves the current version to the attic and returns its + * revision date + * + * @author Andreas Gohr + */ +function saveOldRevision($id) { + global $conf; + $oldf = wikiFN($id); + if(!@file_exists($oldf)) return ''; + $date = filemtime($oldf); + $newf = wikiFN($id, $date); + io_writeWikiPage($newf, rawWiki($id), $id, $date); + return $date; +} + +/** + * Sends a notify mail on page change or registration + * + * @param string $id The changed page + * @param string $who Who to notify (admin|subscribers|register) + * @param int|string $rev Old page revision + * @param string $summary What changed + * @param boolean $minor Is this a minor edit? + * @param array $replace Additional string substitutions, @KEY@ to be replaced by value + * + * @return bool + * @author Andreas Gohr + */ +function notify($id, $who, $rev = '', $summary = '', $minor = false, $replace = array()) { + global $conf; + + // decide if there is something to do, eg. whom to mail + if($who == 'admin') { + if(empty($conf['notify'])) return false; //notify enabled? + $tpl = 'mailtext'; + $to = $conf['notify']; + } elseif($who == 'subscribers') { + if(!actionOK('subscribe')) return false; //subscribers enabled? + if($conf['useacl'] && $_SERVER['REMOTE_USER'] && $minor) return false; //skip minors + $data = array('id' => $id, 'addresslist' => '', 'self' => false); + trigger_event( + 'COMMON_NOTIFY_ADDRESSLIST', $data, + array(new Subscription(), 'notifyaddresses') + ); + $to = $data['addresslist']; + if(empty($to)) return false; + $tpl = 'subscr_single'; + } else { + return false; //just to be safe + } + + // prepare content + $subscription = new Subscription(); + return $subscription->send_diff($to, $tpl, $id, $rev, $summary); +} + +/** + * extracts the query from a search engine referrer + * + * @author Andreas Gohr + * @author Todd Augsburger + */ +function getGoogleQuery() { + if(!isset($_SERVER['HTTP_REFERER'])) { + return ''; + } + $url = parse_url($_SERVER['HTTP_REFERER']); + + // only handle common SEs + if(!preg_match('/(google|bing|yahoo|ask|duckduckgo|babylon|aol|yandex)/',$url['host'])) 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']; + }elseif(isset($query['p'])){ + $q = $query['p']; + }elseif(isset($query['query'])){ + $q = $query['query']; + } + $q = trim($q); + + if(!$q) return ''; + $q = preg_split('/[\s\'"\\\\`()\]\[?:!\.{};,#+*<>\\/]+/', $q, -1, PREG_SPLIT_NO_EMPTY); + return $q; +} + +/** + * Return the human readable size of a file + * + * @param int $size A file size + * @param int $dec A number of decimal places + * @author Martin Benjamin + * @author Aidan Lister + * @version 1.0.0 + */ +function filesize_h($size, $dec = 1) { + $sizes = array('B', 'KB', 'MB', 'GB'); + $count = count($sizes); + $i = 0; + + while($size >= 1024 && ($i < $count - 1)) { + $size /= 1024; + $i++; + } + + return round($size, $dec).' '.$sizes[$i]; +} + +/** + * 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); +} + +/** + * Formats a timestamp as ISO 8601 date + * + * @author + * @link http://www.php.net/manual/en/function.date.php#54072 + * @param int $int_date: current date in UNIX timestamp + * @return string + */ +function date_iso8601($int_date) { + $date_mod = date('Y-m-d\TH:i:s', $int_date); + $pre_timezone = date('O', $int_date); + $time_zone = substr($pre_timezone, 0, 3).":".substr($pre_timezone, 3, 2); + $date_mod .= $time_zone; + return $date_mod; +} + +/** + * return an obfuscated email address in line with $conf['mailguard'] setting + * + * @author Harry Fuecks + * @author Christopher Smith + */ +function obfuscate($email) { + global $conf; + + switch($conf['mailguard']) { + case 'visible' : + $obfuscate = array('@' => ' [at] ', '.' => ' [dot] ', '-' => ' [dash] '); + return strtr($email, $obfuscate); + + case 'hex' : + $encode = ''; + $len = strlen($email); + for($x = 0; $x < $len; $x++) { + $encode .= '&#x'.bin2hex($email{$x}).';'; + } + return $encode; + + case 'none' : + default : + return $email; + } +} + +/** + * Removes quoting backslashes + * + * @author Andreas Gohr + */ +function unslash($string, $char = "'") { + return str_replace('\\'.$char, $char, $string); +} + +/** + * Convert php.ini shorthands to byte + * + * @author + * @link http://de3.php.net/manual/en/ini.core.php#79564 + */ +function php_to_byte($v) { + $l = substr($v, -1); + $ret = substr($v, 0, -1); + switch(strtoupper($l)) { + case 'P': + $ret *= 1024; + case 'T': + $ret *= 1024; + case 'G': + $ret *= 1024; + case 'M': + $ret *= 1024; + case 'K': + $ret *= 1024; + break; + default; + $ret *= 10; + break; + } + return $ret; +} + +/** + * Wrapper around preg_quote adding the default delimiter + */ +function preg_quote_cb($string) { + return preg_quote($string, '/'); +} + +/** + * Shorten a given string by removing data from the middle + * + * 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. + * + * @param string $keep the part to keep + * @param string $short the part to shorten + * @param int $max maximum chars you want for the whole string + * @param int $min minimum number of chars to have left for middle shortening + * @param string $char the shortening character to use + * @return string + */ +function shorten($keep, $short, $max, $min = 9, $char = '…') { + $max = $max - utf8_strlen($keep); + if($max < $min) return $keep; + $len = utf8_strlen($short); + if($len <= $max) return $keep.$short; + $half = floor($max / 2); + return $keep.utf8_substr($short, 0, $half - 1).$char.utf8_substr($short, $len - $half); +} + +/** + * Return the users realname or e-mail address for use + * in page footer and recent changes pages + * + * @author Andy Webber + */ +function editorinfo($username) { + global $conf; + global $auth; + + switch($conf['showuseras']) { + case 'username': + case 'email': + case 'email_link': + if($auth) $info = $auth->getUserData($username); + break; + default: + return hsc($username); + } + + if(isset($info) && $info) { + switch($conf['showuseras']) { + case 'username': + return hsc($info['name']); + case 'email': + return obfuscate($info['mail']); + case 'email_link': + $mail = obfuscate($info['mail']); + return ''.$mail.''; + default: + return hsc($username); + } + } else { + return hsc($username); + } +} + +/** + * Returns the path to a image file for the currently chosen license. + * When no image exists, returns an empty string + * + * @author Andreas Gohr + * @param string $type - type of image 'badge' or 'button' + * @return string + */ +function license_img($type) { + global $license; + global $conf; + if(!$conf['license']) return ''; + if(!is_array($license[$conf['license']])) return ''; + $lic = $license[$conf['license']]; + $try = array(); + $try[] = 'lib/images/license/'.$type.'/'.$conf['license'].'.png'; + $try[] = 'lib/images/license/'.$type.'/'.$conf['license'].'.gif'; + if(substr($conf['license'], 0, 3) == 'cc-') { + $try[] = 'lib/images/license/'.$type.'/cc.png'; + } + foreach($try as $src) { + if(@file_exists(DOKU_INC.$src)) return $src; + } + return ''; +} + +/** + * Checks if the given amount of memory is available + * + * If the memory_get_usage() function is not available the + * function just assumes $bytes of already allocated memory + * + * @author Filip Oscadal + * @author Andreas Gohr + * + * @param int $mem Size of memory you want to allocate in bytes + * @param int $bytes + * @internal param int $used already allocated memory (see above) + * @return bool + */ +function is_mem_available($mem, $bytes = 1048576) { + $limit = trim(ini_get('memory_limit')); + if(empty($limit)) return true; // no limit set! + + // parse limit to bytes + $limit = php_to_byte($limit); + + // get used memory if possible + if(function_exists('memory_get_usage')) { + $used = memory_get_usage(); + } else { + $used = $bytes; + } + + if($used + $mem > $limit) { + return false; + } + + return true; +} + +/** + * Send a HTTP redirect to the browser + * + * Works arround Microsoft IIS cookie sending bug. Exits the script. + * + * @link http://support.microsoft.com/kb/q176113/ + * @author Andreas Gohr + */ +function send_redirect($url) { + //are there any undisplayed messages? keep them in session for display + global $MSG; + if(isset($MSG) && count($MSG) && !defined('NOSESSION')) { + //reopen session, store data and close session again + @session_start(); + $_SESSION[DOKU_COOKIE]['msg'] = $MSG; + } + + // always close the session + session_write_close(); + + // work around IE bug + // http://www.ianhoar.com/2008/11/16/internet-explorer-6-and-redirected-anchor-links/ + list($url, $hash) = explode('#', $url); + if($hash) { + if(strpos($url, '?')) { + $url = $url.'&#'.$hash; + } else { + $url = $url.'?&#'.$hash; + } + } + + // check if running on IIS < 6 with CGI-PHP + if(isset($_SERVER['SERVER_SOFTWARE']) && isset($_SERVER['GATEWAY_INTERFACE']) && + (strpos($_SERVER['GATEWAY_INTERFACE'], 'CGI') !== false) && + (preg_match('|^Microsoft-IIS/(\d)\.\d$|', trim($_SERVER['SERVER_SOFTWARE']), $matches)) && + $matches[1] < 6 + ) { + header('Refresh: 0;url='.$url); + } else { + header('Location: '.$url); + } + exit; +} + +/** + * Validate a value using a set of valid values + * + * This function checks whether a specified value is set and in the array + * $valid_values. If not, the function returns a default value or, if no + * default is specified, throws an exception. + * + * @param string $param The name of the parameter + * @param array $valid_values A set of valid values; Optionally a default may + * be marked by the key “default”. + * @param array $array The array containing the value (typically $_POST + * or $_GET) + * @param string $exc The text of the raised exception + * + * @throws Exception + * @return mixed + * @author Adrian Lang + */ +function valid_input_set($param, $valid_values, $array, $exc = '') { + if(isset($array[$param]) && in_array($array[$param], $valid_values)) { + return $array[$param]; + } elseif(isset($valid_values['default'])) { + return $valid_values['default']; + } else { + throw new Exception($exc); + } +} + +/** + * Read a preference from the DokuWiki cookie + * (remembering both keys & values are urlencoded) + */ +function get_doku_pref($pref, $default) { + $enc_pref = urlencode($pref); + if(strpos($_COOKIE['DOKU_PREFS'], $enc_pref) !== false) { + $parts = explode('#', $_COOKIE['DOKU_PREFS']); + $cnt = count($parts); + for($i = 0; $i < $cnt; $i += 2) { + if($parts[$i] == $enc_pref) { + return urldecode($parts[$i + 1]); + } + } + } + return $default; +} + +/** + * Add a preference to the DokuWiki cookie + * (remembering $_COOKIE['DOKU_PREFS'] is urlencoded) + */ +function set_doku_pref($pref, $val) { + global $conf; + $orig = get_doku_pref($pref, false); + $cookieVal = ''; + + if($orig && ($orig != $val)) { + $parts = explode('#', $_COOKIE['DOKU_PREFS']); + $cnt = count($parts); + // urlencode $pref for the comparison + $enc_pref = rawurlencode($pref); + for($i = 0; $i < $cnt; $i += 2) { + if($parts[$i] == $enc_pref) { + $parts[$i + 1] = rawurlencode($val); + break; + } + } + $cookieVal = implode('#', $parts); + } else if (!$orig) { + $cookieVal = ($_COOKIE['DOKU_PREFS'] ? $_COOKIE['DOKU_PREFS'].'#' : '').rawurlencode($pref).'#'.rawurlencode($val); + } + + if (!empty($cookieVal)) { + $cookieDir = empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir']; + setcookie('DOKU_PREFS', $cookieVal, time()+365*24*3600, $cookieDir, '', ($conf['securecookie'] && is_ssl())); + } +} + +//Setup VIM: ex: et ts=2 : diff --git a/sources/inc/compatibility.php b/sources/inc/compatibility.php new file mode 100644 index 0000000..ae780e5 --- /dev/null +++ b/sources/inc/compatibility.php @@ -0,0 +1,36 @@ + 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'), + ), + 'userstyle' => array( + 'screen' => DOKU_CONF.'userstyle.css', + 'print' => DOKU_CONF.'userprint.css', + 'feed' => DOKU_CONF.'userfeed.css', + 'all' => DOKU_CONF.'userall.css', + ), + 'userscript' => array( + 'default' => DOKU_CONF.'userscript.js' + ), + 'acl' => array( + 'default' => DOKU_CONF.'acl.auth.php', + ), + 'plainauth.users' => array( + 'default' => DOKU_CONF.'users.auth.php', + ), + + 'plugins' => array( + 'default' => array(DOKU_CONF.'plugins.php'), + 'local' => array(DOKU_CONF.'plugins.local.php'), + 'protected' => array( + DOKU_CONF.'plugins.required.php', + DOKU_CONF.'plugins.protected.php', + ), + ), + ), + $config_cascade +); + diff --git a/sources/inc/confutils.php b/sources/inc/confutils.php new file mode 100644 index 0000000..0ac003b --- /dev/null +++ b/sources/inc/confutils.php @@ -0,0 +1,345 @@ + + */ + + +/** + * 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, $knownonly=true){ + $mtypes = getMimeTypes(); // known mimetypes + $ext = strrpos($file, '.'); + if ($ext === false) { + return array(false, false, false); + } + $ext = strtolower(substr($file, $ext + 1)); + if (!isset($mtypes[$ext])){ + if ($knownonly) { + return array(false, false, false); + } else { + return array($ext, 'application/octet-stream', true); + } + } + if($mtypes[$ext][0] == '!'){ + return array($ext, substr($mtypes[$ext],1), true); + }else{ + return array($ext, $mtypes[$ext], false); + } +} + +/** + * returns a hash of mimetypes + * + * @author Andreas Gohr + */ +function getMimeTypes() { + static $mime = null; + if ( !$mime ) { + $mime = retrieveConfig('mime','confToHash'); + } + return $mime; +} + +/** + * returns a hash of acronyms + * + * @author Harry Fuecks + */ +function getAcronyms() { + static $acronyms = null; + if ( !$acronyms ) { + $acronyms = retrieveConfig('acronyms','confToHash'); + } + return $acronyms; +} + +/** + * returns a hash of smileys + * + * @author Harry Fuecks + */ +function getSmileys() { + static $smileys = null; + if ( !$smileys ) { + $smileys = retrieveConfig('smileys','confToHash'); + } + return $smileys; +} + +/** + * returns a hash of entities + * + * @author Harry Fuecks + */ +function getEntities() { + static $entities = null; + if ( !$entities ) { + $entities = retrieveConfig('entities','confToHash'); + } + return $entities; +} + +/** + * returns a hash of interwikilinks + * + * @author Harry Fuecks + */ +function getInterwiki() { + static $wikis = null; + if ( !$wikis ) { + $wikis = retrieveConfig('interwiki','confToHash',array(true)); + } + //add sepecial case 'this' + $wikis['this'] = DOKU_URL.'{NAME}'; + return $wikis; +} + +/** + * returns array of wordblock patterns + * + */ +function getWordblocks() { + static $wordblocks = null; + if ( !$wordblocks ) { + $wordblocks = retrieveConfig('wordblock','file'); + } + return $wordblocks; +} + +/** + * Gets the list of configured schemes + * + * @return array the schemes + */ +function getSchemes() { + static $schemes = null; + if ( !$schemes ) { + $schemes = retrieveConfig('scheme','file'); + } + $schemes = array_map('trim', $schemes); + $schemes = preg_replace('/^#.*/', '', $schemes); + $schemes = array_filter($schemes); + return $schemes; +} + +/** + * 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 linesToHash($lines, $lower=false) { + $conf = array(); + // remove BOM + if (isset($lines[0]) && substr($lines[0],0,3) == pack('CCC',0xef,0xbb,0xbf)) + $lines[0] = substr($lines[0],3); + 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 + * + * @param string $type the configuration settings to be read, must correspond to a key/array in $config_cascade + * @param callback $fn the function used to process the configuration file into an array + * @param array $params optional additional params to pass to the callback + * @return array configuration values + */ +function retrieveConfig($type,$fn,$params=null) { + global $config_cascade; + + if(!is_array($params)) $params = array(); + + $combined = array(); + if (!is_array($config_cascade[$type])) trigger_error('Missing config cascade for "'.$type.'"',E_USER_WARNING); + foreach (array('default','local','protected') as $config_group) { + if (empty($config_cascade[$type][$config_group])) continue; + foreach ($config_cascade[$type][$config_group] as $file) { + if (@file_exists($file)) { + $config = call_user_func_array($fn,array_merge(array($file),$params)); + $combined = array_merge($combined, $config); + } + } + } + + return $combined; +} + +/** + * Include the requested configuration information + * + * @author Chris Smith + * + * @param string $type the configuration settings to be read, must correspond to a key/array in $config_cascade + * @return array list of files, default before local before protected + */ +function getConfigFiles($type) { + global $config_cascade; + $files = array(); + + if (!is_array($config_cascade[$type])) trigger_error('Missing config cascade for "'.$type.'"',E_USER_WARNING); + foreach (array('default','local','protected') as $config_group) { + if (empty($config_cascade[$type][$config_group])) continue; + $files = array_merge($files, $config_cascade[$type][$config_group]); + } + + return $files; +} + +/** + * check if the given action was disabled in config + * + * @author Andreas Gohr + * @returns boolean true if enabled, false if disabled + */ +function actionOK($action){ + static $disabled = null; + if(is_null($disabled) || defined('SIMPLE_TEST')){ + global $conf; + /** @var auth_basic $auth */ + global $auth; + + // prepare disabled actions array and handle legacy options + $disabled = explode(',',$conf['disableactions']); + $disabled = array_map('trim',$disabled); + if((isset($conf['openregister']) && !$conf['openregister']) || is_null($auth) || !$auth->canDo('addUser')) { + $disabled[] = 'register'; + } + if((isset($conf['resendpasswd']) && !$conf['resendpasswd']) || is_null($auth) || !$auth->canDo('modPass')) { + $disabled[] = 'resendpwd'; + } + if((isset($conf['subscribers']) && !$conf['subscribers']) || is_null($auth)) { + $disabled[] = 'subscribe'; + } + if (is_null($auth) || !$auth->canDo('Profile')) { + $disabled[] = 'profile'; + } + if (is_null($auth) || !$auth->canDo('delUser')) { + $disabled[] = 'profile_delete'; + } + if (is_null($auth)) { + $disabled[] = 'login'; + } + if (is_null($auth) || !$auth->canDo('logout')) { + $disabled[] = 'logout'; + } + $disabled = array_unique($disabled); + } + + return !in_array($action,$disabled); +} + +/** + * check if headings should be used as link text for the specified link type + * + * @author Chris Smith + * + * @param string $linktype 'content'|'navigation', content applies to links in wiki text + * navigation applies to all other links + * @return boolean true if headings should be used for $linktype, false otherwise + */ +function useHeading($linktype) { + static $useHeading = null; + + if (is_null($useHeading)) { + global $conf; + + if (!empty($conf['useheading'])) { + switch ($conf['useheading']) { + case 'content': + $useHeading['content'] = true; + break; + + case 'navigation': + $useHeading['navigation'] = true; + break; + default: + $useHeading['content'] = true; + $useHeading['navigation'] = true; + } + } else { + $useHeading = array(); + } + } + + return (!empty($useHeading[$linktype])); +} + +/** + * obscure config data so information isn't plain text + * + * @param string $str data to be encoded + * @param string $code encoding method, values: plain, base64, uuencode. + * @return string the encoded value + */ +function conf_encodeString($str,$code) { + switch ($code) { + case 'base64' : return ''.base64_encode($str); + case 'uuencode' : return ''.convert_uuencode($str); + case 'plain': + default: + return $str; + } +} +/** + * return obscured data as plain text + * + * @param string $str encoded data + * @return string plain text + */ +function conf_decodeString($str) { + switch (substr($str,0,3)) { + case '' : return base64_decode(substr($str,3)); + case '' : return convert_uudecode(substr($str,3)); + default: // not encode (or unknown) + return $str; + } +} +//Setup VIM: ex: et ts=4 : diff --git a/sources/inc/events.php b/sources/inc/events.php new file mode 100644 index 0000000..f7b1a7a --- /dev/null +++ b/sources/inc/events.php @@ -0,0 +1,197 @@ + + */ + +if(!defined('DOKU_INC')) die('meh.'); + +class Doku_Event { + + // public properties + var $name = ''; // READONLY event name, objects must register against this name to see the event + var $data = null; // READWRITE data relevant to the event, no standardised format (YET!) + var $result = null; // READWRITE the results of the event action, only relevant in "_AFTER" advise + // event handlers may modify this if they are preventing the default action + // to provide the after event handlers with event results + var $canPreventDefault = true; // READONLY if true, event handlers can prevent the events default action + + // private properties, event handlers can effect these through the provided methods + var $_default = true; // whether or not to carry out the default action associated with the event + var $_continue = true; // whether or not to continue propagating the event to other handlers + + /** + * event constructor + */ + function Doku_Event($name, &$data) { + + $this->name = $name; + $this->data =& $data; + + } + + /** + * advise functions + * + * advise all registered handlers of this event + * + * if these methods are used by functions outside of this object, they must + * properly handle correct processing of any default action and issue an + * advise_after() signal. e.g. + * $evt = new Doku_Event(name, data); + * if ($evt->advise_before(canPreventDefault) { + * // default action code block + * } + * $evt->advise_after(); + * unset($evt); + * + * @return results of processing the event, usually $this->_default + */ + function advise_before($enablePreventDefault=true) { + global $EVENT_HANDLER; + + $this->canPreventDefault = $enablePreventDefault; + $EVENT_HANDLER->process_event($this,'BEFORE'); + + return (!$enablePreventDefault || $this->_default); + } + + function advise_after() { + global $EVENT_HANDLER; + + $this->_continue = true; + $EVENT_HANDLER->process_event($this,'AFTER'); + } + + /** + * trigger + * + * - advise all registered (_BEFORE) handlers that this event is about to take place + * - carry out the default action using $this->data based on $enablePrevent and + * $this->_default, all of which may have been modified by the event handlers. + * - advise all registered (_AFTER) handlers that the event has taken place + * + * @return $event->results + * the value set by any _before or handlers if the default action is prevented + * or the results of the default action (as modified by _after handlers) + * or NULL no action took place and no handler modified the value + */ + function trigger($action=null, $enablePrevent=true) { + + if (!is_callable($action)) $enablePrevent = false; + + if ($this->advise_before($enablePrevent) && is_callable($action)) { + if (is_array($action)) { + list($obj,$method) = $action; + $this->result = $obj->$method($this->data); + } else { + $this->result = $action($this->data); + } + } + + $this->advise_after(); + + return $this->result; + } + + /** + * stopPropagation + * + * stop any further processing of the event by event handlers + * this function does not prevent the default action taking place + */ + function stopPropagation() { $this->_continue = false; } + + /** + * preventDefault + * + * prevent the default action taking place + */ + function preventDefault() { $this->_default = false; } +} + +class Doku_Event_Handler { + + // public properties: none + + // private properties + var $_hooks = array(); // array of events and their registered handlers + + /** + * event_handler + * + * constructor, loads all action plugins and calls their register() method giving them + * an opportunity to register any hooks they require + */ + function Doku_Event_Handler() { + + // load action plugins + $plugin = null; + $pluginlist = plugin_list('action'); + + foreach ($pluginlist as $plugin_name) { + $plugin = plugin_load('action',$plugin_name); + + if ($plugin !== null) $plugin->register($this); + } + } + + /** + * register_hook + * + * register a hook for an event + * + * @param $event (string) name used by the event, (incl '_before' or '_after' for triggers) + * @param $obj (obj) object in whose scope method is to be executed, + * if NULL, method is assumed to be a globally available function + * @param $method (function) event handler function + * @param $param (mixed) data passed to the event handler + */ + function register_hook($event, $advise, $obj, $method, $param=null) { + $this->_hooks[$event.'_'.$advise][] = array($obj, $method, $param); + } + + function process_event(&$event,$advise='') { + + $evt_name = $event->name . ($advise ? '_'.$advise : '_BEFORE'); + + if (!empty($this->_hooks[$evt_name])) { + foreach ($this->_hooks[$evt_name] as $hook) { + // list($obj, $method, $param) = $hook; + $obj =& $hook[0]; + $method = $hook[1]; + $param = $hook[2]; + + if (is_null($obj)) { + $method($event, $param); + } else { + $obj->$method($event, $param); + } + + if (!$event->_continue) break; + } + } + } +} + +/** + * trigger_event + * + * function wrapper to process (create, trigger and destroy) an event + * + * @param $name (string) name for the event + * @param $data (mixed) event data + * @param $action (callback) (optional, default=NULL) default action, a php callback function + * @param $canPreventDefault (bool) (optional, default=true) can hooks prevent the default action + * + * @return (mixed) the event results value after all event processing is complete + * by default this is the return value of the default action however + * it can be set or modified by event handler hooks + */ +function trigger_event($name, &$data, $action=null, $canPreventDefault=true) { + + $evt = new Doku_Event($name, $data); + return $evt->trigger($action, $canPreventDefault); +} diff --git a/sources/inc/farm.php b/sources/inc/farm.php new file mode 100644 index 0000000..cee6181 --- /dev/null +++ b/sources/inc/farm.php @@ -0,0 +1,146 @@ +/subdir/ will need the subdirectory '$farm/subdir/'. + * * A virtual host based setup needs animal directory names which have to reflect + * the domain name: If an animal resides in http://www.example.org:8080/mysite/test/, + * directories that will match range from '$farm/8080.www.example.org.mysite.test/' + * to a simple '$farm/domain/'. + * + * @author Anika Henke + * @author Michael Klier + * @author Christopher Smith + * @author virtual host part of farm_confpath() based on conf_path() from Drupal.org's /includes/bootstrap.inc + * (see https://github.com/drupal/drupal/blob/7.x/includes/bootstrap.inc#L537) + * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) + */ + +// DOKU_FARMDIR needs to be set in preload.php, here the fallback is the same as DOKU_INC would be (if it was set already) +if(!defined('DOKU_FARMDIR')) define('DOKU_FARMDIR', fullpath(dirname(__FILE__).'/../').'/'); +if(!defined('DOKU_CONF')) define('DOKU_CONF', farm_confpath(DOKU_FARMDIR)); +if(!defined('DOKU_FARM')) define('DOKU_FARM', false); + + +/** + * Find the appropriate configuration directory. + * + * If the .htaccess based setup is used, the configuration directory can be + * any subdirectory of the farm directory. + * + * Otherwise try finding a matching configuration directory by stripping the + * website's hostname from left to right and pathname from right to left. The + * first configuration file found will be used; the remaining will ignored. + * If no configuration file is found, return the default confdir './conf'. + */ +function farm_confpath($farm) { + + // htaccess based or cli + // cli usage example: animal=your_animal bin/indexer.php + if(isset($_REQUEST['animal']) || ('cli' == php_sapi_name() && isset($_SERVER['animal']))) { + $mode = isset($_REQUEST['animal']) ? 'htaccess' : 'cli'; + $animal = $mode == 'htaccess' ? $_REQUEST['animal'] : $_SERVER['animal']; + // check that $animal is a string and just a directory name and not a path + if (!is_string($animal) || strpbrk($animal, '\\/') !== false) + nice_die('Sorry! Invalid animal name!'); + if(!is_dir($farm.'/'.$animal)) + nice_die("Sorry! This Wiki doesn't exist!"); + if(!defined('DOKU_FARM')) define('DOKU_FARM', $mode); + return $farm.'/'.$animal.'/conf/'; + } + + // virtual host based + $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_SERVER['SCRIPT_FILENAME']); + $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.'))))); + for ($i = count($uri) - 1; $i > 0; $i--) { + for ($j = count($server); $j > 0; $j--) { + $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i)); + if(is_dir("$farm/$dir/conf/")) { + if(!defined('DOKU_FARM')) define('DOKU_FARM', 'virtual'); + return "$farm/$dir/conf/"; + } + } + } + + // default conf directory in farm + if(is_dir("$farm/default/conf/")) { + if(!defined('DOKU_FARM')) define('DOKU_FARM', 'default'); + return "$farm/default/conf/"; + } + // farmer + return DOKU_INC.'conf/'; +} + +/* Use default config files and local animal config files */ +$config_cascade = array( + 'main' => array( + 'default' => array(DOKU_INC.'conf/dokuwiki.php'), + 'local' => array(DOKU_CONF.'local.php'), + 'protected' => array(DOKU_CONF.'local.protected.php'), + ), + 'acronyms' => array( + 'default' => array(DOKU_INC.'conf/acronyms.conf'), + 'local' => array(DOKU_CONF.'acronyms.local.conf'), + ), + 'entities' => array( + 'default' => array(DOKU_INC.'conf/entities.conf'), + 'local' => array(DOKU_CONF.'entities.local.conf'), + ), + 'interwiki' => array( + 'default' => array(DOKU_INC.'conf/interwiki.conf'), + 'local' => array(DOKU_CONF.'interwiki.local.conf'), + ), + 'license' => array( + 'default' => array(DOKU_INC.'conf/license.php'), + 'local' => array(DOKU_CONF.'license.local.php'), + ), + 'mediameta' => array( + 'default' => array(DOKU_INC.'conf/mediameta.php'), + 'local' => array(DOKU_CONF.'mediameta.local.php'), + ), + 'mime' => array( + 'default' => array(DOKU_INC.'conf/mime.conf'), + 'local' => array(DOKU_CONF.'mime.local.conf'), + ), + 'scheme' => array( + 'default' => array(DOKU_INC.'conf/scheme.conf'), + 'local' => array(DOKU_CONF.'scheme.local.conf'), + ), + 'smileys' => array( + 'default' => array(DOKU_INC.'conf/smileys.conf'), + 'local' => array(DOKU_CONF.'smileys.local.conf'), + ), + 'wordblock' => array( + 'default' => array(DOKU_INC.'conf/wordblock.conf'), + 'local' => array(DOKU_CONF.'wordblock.local.conf'), + ), + 'acl' => array( + 'default' => DOKU_CONF.'acl.auth.php', + ), + 'plainauth.users' => array( + 'default' => DOKU_CONF.'users.auth.php', + ), + 'plugins' => array( // needed since Angua + 'default' => array(DOKU_INC.'conf/plugins.php'), + 'local' => array(DOKU_CONF.'plugins.local.php'), + 'protected' => array( + DOKU_INC.'conf/plugins.required.php', + DOKU_CONF.'plugins.protected.php', + ), + ), + 'userstyle' => array( + 'screen' => DOKU_CONF.'userstyle.css', + 'print' => DOKU_CONF.'userprint.css', + 'feed' => DOKU_CONF.'userfeed.css', + 'all' => DOKU_CONF.'userall.css', + ), + 'userscript' => array( + 'default' => DOKU_CONF.'userscript.js' + ), +); diff --git a/sources/inc/feedcreator.class.php b/sources/inc/feedcreator.class.php new file mode 100644 index 0000000..670a1bc --- /dev/null +++ b/sources/inc/feedcreator.class.php @@ -0,0 +1,1580 @@ + + * @since 1.3 + */ +class FeedItem extends HtmlDescribable { + /** + * Mandatory attributes of an item. + */ + var $title, $description, $link; + + /** + * Optional attributes of an item. + */ + var $author, $authorEmail, $image, $category, $comments, $guid, $source, $creator; + + /** + * Publishing date of an item. May be in one of the following formats: + * + * RFC 822: + * "Mon, 20 Jan 03 18:05:41 +0400" + * "20 Jan 03 18:05:41 +0000" + * + * ISO 8601: + * "2003-01-20T18:05:41+04:00" + * + * Unix: + * 1043082341 + */ + var $date; + + /** + * Add element tag RSS 2.0 + * modified by : Mohammad Hafiz bin Ismail (mypapit@gmail.com) + * + * + * display : + * + * + */ + var $enclosure; + + /** + * Any additional elements to include as an assiciated array. All $key => $value pairs + * will be included unencoded in the feed item in the form + * <$key>$value + * Again: No encoding will be used! This means you can invalidate or enhance the feed + * if $value contains markup. This may be abused to embed tags not implemented by + * the FeedCreator class used. + */ + var $additionalElements = Array(); + + // on hold + // var $source; +} + +class EnclosureItem extends HtmlDescribable { + /* + * + * core variables + * + **/ + var $url,$length,$type; + + /* + * For use with another extension like Yahoo mRSS + * Warning : + * These variables might not show up in + * later release / not finalize yet! + * + */ + var $width, $height, $title, $description, $keywords, $thumburl; + + var $additionalElements = Array(); + +} + + +/** + * An FeedImage may be added to a FeedCreator feed. + * @author Kai Blankenhorn + * @since 1.3 + */ +class FeedImage extends HtmlDescribable { + /** + * Mandatory attributes of an image. + */ + var $title, $url, $link; + + /** + * Optional attributes of an image. + */ + var $width, $height, $description; +} + + + +/** + * An HtmlDescribable is an item within a feed that can have a description that may + * include HTML markup. + */ +class HtmlDescribable { + /** + * Indicates whether the description field should be rendered in HTML. + */ + var $descriptionHtmlSyndicated; + + /** + * Indicates whether and to how many characters a description should be truncated. + */ + var $descriptionTruncSize; + + /** + * Returns a formatted description field, depending on descriptionHtmlSyndicated and + * $descriptionTruncSize properties + * @return string the formatted description + */ + function getDescription() { + $descriptionField = new FeedHtmlField($this->description); + $descriptionField->syndicateHtml = $this->descriptionHtmlSyndicated; + $descriptionField->truncSize = $this->descriptionTruncSize; + return $descriptionField->output(); + } + +} + + + +/** + * An FeedHtmlField describes and generates + * a feed, item or image html field (probably a description). Output is + * generated based on $truncSize, $syndicateHtml properties. + * @author Pascal Van Hecke + * @version 1.6 + */ +class FeedHtmlField { + /** + * Mandatory attributes of a FeedHtmlField. + */ + var $rawFieldContent; + + /** + * Optional attributes of a FeedHtmlField. + * + */ + var $truncSize, $syndicateHtml; + + /** + * Creates a new instance of FeedHtmlField. + * @param $string: if given, sets the rawFieldContent property + */ + function FeedHtmlField($parFieldContent) { + if ($parFieldContent) { + $this->rawFieldContent = $parFieldContent; + } + } + + + /** + * Creates the right output, depending on $truncSize, $syndicateHtml properties. + * @return string the formatted field + */ + function output() { + // when field available and syndicated in html we assume + // - valid html in $rawFieldContent and we enclose in CDATA tags + // - no truncation (truncating risks producing invalid html) + if (!$this->rawFieldContent) { + $result = ""; + } elseif ($this->syndicateHtml) { + $result = "rawFieldContent."]]>"; + } else { + if ($this->truncSize and is_int($this->truncSize)) { + $result = FeedCreator::iTrunc(htmlspecialchars($this->rawFieldContent),$this->truncSize); + } else { + $result = htmlspecialchars($this->rawFieldContent); + } + } + return $result; + } + +} + + + +/** + * UniversalFeedCreator lets you choose during runtime which + * format to build. + * For general usage of a feed class, see the FeedCreator class + * below or the example above. + * + * @since 1.3 + * @author Kai Blankenhorn + */ +class UniversalFeedCreator extends FeedCreator { + var $_feed; + + function _setFormat($format) { + switch (strtoupper($format)) { + + case "2.0": + // fall through + case "RSS2.0": + $this->_feed = new RSSCreator20(); + break; + + case "1.0": + // fall through + case "RSS1.0": + $this->_feed = new RSSCreator10(); + break; + + case "0.91": + // fall through + case "RSS0.91": + $this->_feed = new RSSCreator091(); + break; + + case "PIE0.1": + $this->_feed = new PIECreator01(); + break; + + case "MBOX": + $this->_feed = new MBOXCreator(); + break; + + case "OPML": + $this->_feed = new OPMLCreator(); + break; + + case "ATOM": + // fall through: always the latest ATOM version + case "ATOM1.0": + $this->_feed = new AtomCreator10(); + break; + + case "ATOM0.3": + $this->_feed = new AtomCreator03(); + break; + + case "HTML": + $this->_feed = new HTMLCreator(); + break; + + case "JS": + // fall through + case "JAVASCRIPT": + $this->_feed = new JSCreator(); + break; + + default: + $this->_feed = new RSSCreator091(); + break; + } + + $vars = get_object_vars($this); + foreach ($vars as $key => $value) { + // prevent overwriting of properties "contentType", "encoding"; do not copy "_feed" itself + if (!in_array($key, array("_feed", "contentType", "encoding"))) { + $this->_feed->{$key} = $this->{$key}; + } + } + } + + function _sendMIME() { + header('Content-Type: '.$this->contentType.'; charset='.$this->encoding, true); + } + + /** + * Creates a syndication feed based on the items previously added. + * + * @see FeedCreator::addItem() + * @param string format format the feed should comply to. Valid values are: + * "PIE0.1", "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3", "HTML", "JS" + * @return string the contents of the feed. + */ + function createFeed($format = "RSS0.91") { + $this->_setFormat($format); + return $this->_feed->createFeed(); + } + + /** + * Saves this feed as a file on the local disk. After the file is saved, an HTTP redirect + * header may be sent to redirect the use to the newly created file. + * @since 1.4 + * + * @param string format format the feed should comply to. Valid values are: + * "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM", "ATOM0.3", "HTML", "JS" + * @param string filename optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). + * @param boolean displayContents optional send the content of the file or not. If true, the file will be sent in the body of the response. + */ + function saveFeed($format="RSS0.91", $filename="", $displayContents=true) { + $this->_setFormat($format); + $this->_feed->saveFeed($filename, $displayContents); + } + + + /** + * Turns on caching and checks if there is a recent version of this feed in the cache. + * If there is, an HTTP redirect header is sent. + * To effectively use caching, you should create the FeedCreator object and call this method + * before anything else, especially before you do the time consuming task to build the feed + * (web fetching, for example). + * + * @param string format format the feed should comply to. Valid values are: + * "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3". + * @param filename string optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). + * @param timeout int optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour) + */ + function useCached($format="RSS0.91", $filename="", $timeout=3600) { + $this->_setFormat($format); + $this->_feed->useCached($filename, $timeout); + } + + + /** + * Outputs feed to the browser - needed for on-the-fly feed generation (like it is done in WordPress, etc.) + * + * @param format string format the feed should comply to. Valid values are: + * "PIE0.1" (deprecated), "mbox", "RSS0.91", "RSS1.0", "RSS2.0", "OPML", "ATOM0.3". + */ + function outputFeed($format='RSS0.91') { + $this->_setFormat($format); + $this->_sendMIME(); + $this->_feed->outputFeed(); + } + + +} + + +/** + * FeedCreator is the abstract base implementation for concrete + * implementations that implement a specific format of syndication. + * + * @abstract + * @author Kai Blankenhorn + * @since 1.4 + */ +class FeedCreator extends HtmlDescribable { + + /** + * Mandatory attributes of a feed. + */ + var $title, $description, $link; + + + /** + * Optional attributes of a feed. + */ + var $syndicationURL, $image, $language, $copyright, $pubDate, $lastBuildDate, $editor, $editorEmail, $webmaster, $category, $docs, $ttl, $rating, $skipHours, $skipDays; + + /** + * The url of the external xsl stylesheet used to format the naked rss feed. + * Ignored in the output when empty. + */ + var $xslStyleSheet = ""; + + + /** + * @access private + */ + var $items = Array(); + + + /** + * This feed's MIME content type. + * @since 1.4 + * @access private + */ + var $contentType = "application/xml"; + + + /** + * This feed's character encoding. + * @since 1.6.1 + **/ + var $encoding = "utf-8"; + + + /** + * Any additional elements to include as an assiciated array. All $key => $value pairs + * will be included unencoded in the feed in the form + * <$key>$value + * Again: No encoding will be used! This means you can invalidate or enhance the feed + * if $value contains markup. This may be abused to embed tags not implemented by + * the FeedCreator class used. + */ + var $additionalElements = Array(); + + + /** + * Adds an FeedItem to the feed. + * + * @param object FeedItem $item The FeedItem to add to the feed. + * @access public + */ + function addItem($item) { + $this->items[] = $item; + } + + + /** + * Truncates a string to a certain length at the most sensible point. + * First, if there's a '.' character near the end of the string, the string is truncated after this character. + * If there is no '.', the string is truncated after the last ' ' character. + * If the string is truncated, " ..." is appended. + * If the string is already shorter than $length, it is returned unchanged. + * + * @static + * @param string string A string to be truncated. + * @param int length the maximum length the string should be truncated to + * @return string the truncated string + */ + function iTrunc($string, $length) { + if (strlen($string)<=$length) { + return $string; + } + + $pos = strrpos($string,"."); + if ($pos>=$length-4) { + $string = substr($string,0,$length-4); + $pos = strrpos($string,"."); + } + if ($pos>=$length*0.4) { + return substr($string,0,$pos+1)." ..."; + } + + $pos = strrpos($string," "); + if ($pos>=$length-4) { + $string = substr($string,0,$length-4); + $pos = strrpos($string," "); + } + if ($pos>=$length*0.4) { + return substr($string,0,$pos)." ..."; + } + + return substr($string,0,$length-4)." ..."; + + } + + + /** + * Creates a comment indicating the generator of this feed. + * The format of this comment seems to be recognized by + * Syndic8.com. + */ + function _createGeneratorComment() { + return "\n"; + } + + + /** + * Creates a string containing all additional elements specified in + * $additionalElements. + * @param elements array an associative array containing key => value pairs + * @param indentString string a string that will be inserted before every generated line + * @return string the XML tags corresponding to $additionalElements + */ + function _createAdditionalElements($elements, $indentString="") { + $ae = ""; + if (is_array($elements)) { + foreach($elements AS $key => $value) { + $ae.= $indentString."<$key>$value\n"; + } + } + return $ae; + } + + function _createStylesheetReferences() { + $xml = ""; + if ($this->cssStyleSheet) $xml .= "cssStyleSheet."\" type=\"text/css\"?>\n"; + if ($this->xslStyleSheet) $xml .= "xslStyleSheet."\" type=\"text/xsl\"?>\n"; + return $xml; + } + + + /** + * Builds the feed's text. + * @abstract + * @return string the feed's complete text + */ + function createFeed() { + } + + /** + * Generate a filename for the feed cache file. The result will be $_SERVER["PHP_SELF"] with the extension changed to .xml. + * For example: + * + * echo $_SERVER["PHP_SELF"]."\n"; + * echo FeedCreator::_generateFilename(); + * + * would produce: + * + * /rss/latestnews.php + * latestnews.xml + * + * @return string the feed cache filename + * @since 1.4 + * @access private + */ + function _generateFilename() { + $fileInfo = pathinfo($_SERVER["PHP_SELF"]); + return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".xml"; + } + + + /** + * @since 1.4 + * @access private + */ + function _redirect($filename) { + // attention, heavily-commented-out-area + + // maybe use this in addition to file time checking + //Header("Expires: ".date("r",time()+$this->_timeout)); + + /* no caching at all, doesn't seem to work as good: + Header("Cache-Control: no-cache"); + Header("Pragma: no-cache"); + */ + + // HTTP redirect, some feed readers' simple HTTP implementations don't follow it + //Header("Location: ".$filename); + + header("Content-Type: ".$this->contentType."; charset=".$this->encoding."; filename=".utf8_basename($filename)); + header("Content-Disposition: inline; filename=".utf8_basename($filename)); + readfile($filename); + die(); + } + + /** + * Turns on caching and checks if there is a recent version of this feed in the cache. + * If there is, an HTTP redirect header is sent. + * To effectively use caching, you should create the FeedCreator object and call this method + * before anything else, especially before you do the time consuming task to build the feed + * (web fetching, for example). + * @since 1.4 + * @param filename string optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). + * @param timeout int optional the timeout in seconds before a cached version is refreshed (defaults to 3600 = 1 hour) + */ + function useCached($filename="", $timeout=3600) { + $this->_timeout = $timeout; + if ($filename=="") { + $filename = $this->_generateFilename(); + } + if (file_exists($filename) AND (time()-filemtime($filename) < $timeout)) { + $this->_redirect($filename); + } + } + + + /** + * Saves this feed as a file on the local disk. After the file is saved, a redirect + * header may be sent to redirect the user to the newly created file. + * @since 1.4 + * + * @param filename string optional the filename where a recent version of the feed is saved. If not specified, the filename is $_SERVER["PHP_SELF"] with the extension changed to .xml (see _generateFilename()). + * @param redirect boolean optional send an HTTP redirect header or not. If true, the user will be automatically redirected to the created file. + */ + function saveFeed($filename="", $displayContents=true) { + if ($filename=="") { + $filename = $this->_generateFilename(); + } + $feedFile = fopen($filename, "w+"); + if ($feedFile) { + fputs($feedFile,$this->createFeed()); + fclose($feedFile); + if ($displayContents) { + $this->_redirect($filename); + } + } else { + echo "
Error creating feed file, please check write permissions.
"; + } + } + + /** + * Outputs this feed directly to the browser - for on-the-fly feed generation + * @since 1.7.2-mod + * + * still missing: proper header output - currently you have to add it manually + */ + function outputFeed() { + echo $this->createFeed(); + } + + +} + + +/** + * FeedDate is an internal class that stores a date for a feed or feed item. + * Usually, you won't need to use this. + */ +class FeedDate { + var $unix; + + /** + * Creates a new instance of FeedDate representing a given date. + * Accepts RFC 822, ISO 8601 date formats as well as unix time stamps. + * @param mixed $dateString optional the date this FeedDate will represent. If not specified, the current date and time is used. + */ + function FeedDate($dateString="") { + if ($dateString=="") $dateString = date("r"); + + if (is_numeric($dateString)) { + $this->unix = $dateString; + return; + } + if (preg_match("~(?:(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun),\\s+)?(\\d{1,2})\\s+([a-zA-Z]{3})\\s+(\\d{4})\\s+(\\d{2}):(\\d{2}):(\\d{2})\\s+(.*)~",$dateString,$matches)) { + $months = Array("Jan"=>1,"Feb"=>2,"Mar"=>3,"Apr"=>4,"May"=>5,"Jun"=>6,"Jul"=>7,"Aug"=>8,"Sep"=>9,"Oct"=>10,"Nov"=>11,"Dec"=>12); + $this->unix = mktime($matches[4],$matches[5],$matches[6],$months[$matches[2]],$matches[1],$matches[3]); + if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') { + $tzOffset = (((int) substr($matches[7],0,3) * 60) + + (int) substr($matches[7],-2)) * 60; + } else { + if (strlen($matches[7])==1) { + $oneHour = 3600; + $ord = ord($matches[7]); + if ($ord < ord("M")) { + $tzOffset = (ord("A") - $ord - 1) * $oneHour; + } elseif ($ord >= ord("M") AND $matches[7]!="Z") { + $tzOffset = ($ord - ord("M")) * $oneHour; + } elseif ($matches[7]=="Z") { + $tzOffset = 0; + } + } + switch ($matches[7]) { + case "UT": + case "GMT": $tzOffset = 0; + } + } + $this->unix += $tzOffset; + return; + } + if (preg_match("~(\\d{4})-(\\d{2})-(\\d{2})T(\\d{2}):(\\d{2}):(\\d{2})(.*)~",$dateString,$matches)) { + $this->unix = mktime($matches[4],$matches[5],$matches[6],$matches[2],$matches[3],$matches[1]); + if (substr($matches[7],0,1)=='+' OR substr($matches[7],0,1)=='-') { + $tzOffset = (((int) substr($matches[7],0,3) * 60) + + (int) substr($matches[7],-2)) * 60; + } else { + if ($matches[7]=="Z") { + $tzOffset = 0; + } + } + $this->unix += $tzOffset; + return; + } + $this->unix = 0; + } + + /** + * Gets the date stored in this FeedDate as an RFC 822 date. + * + * @return a date in RFC 822 format + */ + function rfc822() { + //return gmdate("r",$this->unix); + $date = gmdate("D, d M Y H:i:s", $this->unix); + if (TIME_ZONE!="") $date .= " ".str_replace(":","",TIME_ZONE); + return $date; + } + + /** + * Gets the date stored in this FeedDate as an ISO 8601 date. + * + * @return a date in ISO 8601 (RFC 3339) format + */ + function iso8601() { + $date = gmdate("Y-m-d\TH:i:sO",$this->unix); + if (TIME_ZONE!="") $date = str_replace("+0000",TIME_ZONE,$date); + $date = substr($date,0,22) . ':' . substr($date,-2); + return $date; + } + + + /** + * Gets the date stored in this FeedDate as unix time stamp. + * + * @return a date as a unix time stamp + */ + function unix() { + return $this->unix; + } +} + + +/** + * RSSCreator10 is a FeedCreator that implements RDF Site Summary (RSS) 1.0. + * + * @see http://www.purl.org/rss/1.0/ + * @since 1.3 + * @author Kai Blankenhorn + */ +class RSSCreator10 extends FeedCreator { + + /** + * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0. + * The feed will contain all items previously added in the same order. + * @return string the feed's complete text + */ + function createFeed() { + $feed = "encoding."\"?>\n"; + $feed.= $this->_createGeneratorComment(); + if ($this->cssStyleSheet=="") { + $cssStyleSheet = "http://www.w3.org/2000/08/w3c-synd/style.css"; + } + $feed.= $this->_createStylesheetReferences(); + $feed.= "\n"; + $feed.= " syndicationURL."\">\n"; + $feed.= " ".htmlspecialchars($this->title)."\n"; + $feed.= " ".htmlspecialchars($this->description)."\n"; + $feed.= " ".$this->link."\n"; + if ($this->image!=null) { + $feed.= " image->url."\" />\n"; + } + $now = new FeedDate(); + $feed.= " ".htmlspecialchars($now->iso8601())."\n"; + $feed.= " \n"; + $feed.= " \n"; + $icnt = count($this->items); + for ($i=0; $i<$icnt; $i++) { + $feed.= " items[$i]->link)."\"/>\n"; + } + $feed.= " \n"; + $feed.= " \n"; + $feed.= " \n"; + if ($this->image!=null) { + $feed.= " image->url."\">\n"; + $feed.= " ".htmlspecialchars($this->image->title)."\n"; + $feed.= " ".$this->image->link."\n"; + $feed.= " ".$this->image->url."\n"; + $feed.= " \n"; + } + $feed.= $this->_createAdditionalElements($this->additionalElements, " "); + + $icnt = count($this->items); + for ($i=0; $i<$icnt; $i++) { + $feed.= " items[$i]->link)."\">\n"; + //$feed.= " Posting\n"; + $feed.= " text/html\n"; + if ($this->items[$i]->date!=null) { + $itemDate = new FeedDate($this->items[$i]->date); + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + } + if ($this->items[$i]->source!="") { + $feed.= " ".htmlspecialchars($this->items[$i]->source)."\n"; + } + if ($this->items[$i]->author!="") { + $feed.= " ".htmlspecialchars($this->items[$i]->author)."\n"; + } + $feed.= " ".htmlspecialchars(strip_tags(strtr($this->items[$i]->title,"\n\r"," ")))."\n"; + $feed.= " ".htmlspecialchars($this->items[$i]->link)."\n"; + $feed.= " ".htmlspecialchars($this->items[$i]->description)."\n"; + $feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, " "); + $feed.= " \n"; + } + $feed.= "\n"; + return $feed; + } +} + + + +/** + * RSSCreator091 is a FeedCreator that implements RSS 0.91 Spec, revision 3. + * + * @see http://my.netscape.com/publish/formats/rss-spec-0.91.html + * @since 1.3 + * @author Kai Blankenhorn + */ +class RSSCreator091 extends FeedCreator { + + /** + * Stores this RSS feed's version number. + * @access private + */ + var $RSSVersion; + + function RSSCreator091() { + $this->_setRSSVersion("0.91"); + $this->contentType = "application/rss+xml"; + } + + /** + * Sets this RSS feed's version number. + * @access private + */ + function _setRSSVersion($version) { + $this->RSSVersion = $version; + } + + /** + * Builds the RSS feed's text. The feed will be compliant to RDF Site Summary (RSS) 1.0. + * The feed will contain all items previously added in the same order. + * @return string the feed's complete text + */ + function createFeed() { + $feed = "encoding."\"?>\n"; + $feed.= $this->_createGeneratorComment(); + $feed.= $this->_createStylesheetReferences(); + $feed.= "RSSVersion."\">\n"; + $feed.= " \n"; + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."\n"; + $this->descriptionTruncSize = 500; + $feed.= " ".$this->getDescription()."\n"; + $feed.= " ".$this->link."\n"; + $now = new FeedDate(); + $feed.= " ".htmlspecialchars($now->rfc822())."\n"; + $feed.= " ".FEEDCREATOR_VERSION."\n"; + + if ($this->image!=null) { + $feed.= " \n"; + $feed.= " ".$this->image->url."\n"; + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->image->title),100)."\n"; + $feed.= " ".$this->image->link."\n"; + if ($this->image->width!="") { + $feed.= " ".$this->image->width."\n"; + } + if ($this->image->height!="") { + $feed.= " ".$this->image->height."\n"; + } + if ($this->image->description!="") { + $feed.= " ".$this->image->getDescription()."\n"; + } + $feed.= " \n"; + } + if ($this->language!="") { + $feed.= " ".$this->language."\n"; + } + if ($this->copyright!="") { + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->copyright),100)."\n"; + } + if ($this->editor!="") { + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->editor),100)."\n"; + } + if ($this->webmaster!="") { + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->webmaster),100)."\n"; + } + if ($this->pubDate!="") { + $pubDate = new FeedDate($this->pubDate); + $feed.= " ".htmlspecialchars($pubDate->rfc822())."\n"; + } + if ($this->category!="") { + // Changed for DokuWiki: multiple categories are possible + if(is_array($this->category)) foreach($this->category as $cat){ + $feed.= " ".htmlspecialchars($cat)."\n"; + }else{ + $feed.= " ".htmlspecialchars($this->category)."\n"; + } + } + if ($this->docs!="") { + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->docs),500)."\n"; + } + if ($this->ttl!="") { + $feed.= " ".htmlspecialchars($this->ttl)."\n"; + } + if ($this->rating!="") { + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->rating),500)."\n"; + } + if ($this->skipHours!="") { + $feed.= " ".htmlspecialchars($this->skipHours)."\n"; + } + if ($this->skipDays!="") { + $feed.= " ".htmlspecialchars($this->skipDays)."\n"; + } + $feed.= $this->_createAdditionalElements($this->additionalElements, " "); + + $icnt = count($this->items); + for ($i=0; $i<$icnt; $i++) { + $feed.= " \n"; + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."\n"; + $feed.= " ".htmlspecialchars($this->items[$i]->link)."\n"; + $feed.= " ".$this->items[$i]->getDescription()."\n"; + + if ($this->items[$i]->author!="") { + $feed.= " ".htmlspecialchars($this->items[$i]->author)."\n"; + } + /* + // on hold + if ($this->items[$i]->source!="") { + $feed.= " ".htmlspecialchars($this->items[$i]->source)."\n"; + } + */ + if ($this->items[$i]->category!="") { + // Changed for DokuWiki: multiple categories are possible + if(is_array($this->items[$i]->category)) foreach($this->items[$i]->category as $cat){ + $feed.= " ".htmlspecialchars($cat)."\n"; + }else{ + $feed.= " ".htmlspecialchars($this->items[$i]->category)."\n"; + } + } + + if ($this->items[$i]->comments!="") { + $feed.= " ".htmlspecialchars($this->items[$i]->comments)."\n"; + } + if ($this->items[$i]->date!="") { + $itemDate = new FeedDate($this->items[$i]->date); + $feed.= " ".htmlspecialchars($itemDate->rfc822())."\n"; + } + if ($this->items[$i]->guid!="") { + $feed.= " ".htmlspecialchars($this->items[$i]->guid)."\n"; + } + $feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, " "); + + if ($this->RSSVersion == "2.0" && $this->items[$i]->enclosure != null) { + $feed.= " items[$i]->enclosure->url; + $feed.= "\" length=\""; + $feed.= $this->items[$i]->enclosure->length; + $feed.= "\" type=\""; + $feed.= $this->items[$i]->enclosure->type; + $feed.= "\"/>\n"; + } + + $feed.= " \n"; + } + + $feed.= " \n"; + $feed.= "\n"; + return $feed; + } +} + + + +/** + * RSSCreator20 is a FeedCreator that implements RDF Site Summary (RSS) 2.0. + * + * @see http://backend.userland.com/rss + * @since 1.3 + * @author Kai Blankenhorn + */ +class RSSCreator20 extends RSSCreator091 { + + function RSSCreator20() { + parent::_setRSSVersion("2.0"); + } + +} + + +/** + * PIECreator01 is a FeedCreator that implements the emerging PIE specification, + * as in http://intertwingly.net/wiki/pie/Syntax. + * + * @deprecated + * @since 1.3 + * @author Scott Reynen and Kai Blankenhorn + */ +class PIECreator01 extends FeedCreator { + + function PIECreator01() { + $this->encoding = "utf-8"; + } + + function createFeed() { + $feed = "encoding."\"?>\n"; + $feed.= $this->_createStylesheetReferences(); + $feed.= "\n"; + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars($this->title),100)."\n"; + $this->truncSize = 500; + $feed.= " ".$this->getDescription()."\n"; + $feed.= " ".$this->link."\n"; + $icnt = count($this->items); + for ($i=0; $i<$icnt; $i++) { + $feed.= " \n"; + $feed.= " ".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100)."\n"; + $feed.= " ".htmlspecialchars($this->items[$i]->link)."\n"; + $itemDate = new FeedDate($this->items[$i]->date); + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + $feed.= " ".htmlspecialchars($this->items[$i]->guid)."\n"; + if ($this->items[$i]->author!="") { + $feed.= " \n"; + $feed.= " ".htmlspecialchars($this->items[$i]->author)."\n"; + if ($this->items[$i]->authorEmail!="") { + $feed.= " ".$this->items[$i]->authorEmail."\n"; + } + $feed.=" \n"; + } + $feed.= " \n"; + $feed.= "
".$this->items[$i]->getDescription()."
\n"; + $feed.= " \n"; + $feed.= " \n"; + } + $feed.= "\n"; + return $feed; + } +} + +/** + * AtomCreator10 is a FeedCreator that implements the atom specification, + * as in http://www.atomenabled.org/developers/syndication/atom-format-spec.php + * Please note that just by using AtomCreator10 you won't automatically + * produce valid atom files. For example, you have to specify either an editor + * for the feed or an author for every single feed item. + * + * Some elements have not been implemented yet. These are (incomplete list): + * author URL, item author's email and URL, item contents, alternate links, + * other link content types than text/html. Some of them may be created with + * AtomCreator10::additionalElements. + * + * @see FeedCreator#additionalElements + * @since 1.7.2-mod (modified) + * @author Mohammad Hafiz Ismail (mypapit@gmail.com) + */ +class AtomCreator10 extends FeedCreator { + + function AtomCreator10() { + $this->contentType = "application/atom+xml"; + $this->encoding = "utf-8"; + } + + function createFeed() { + $feed = "encoding."\"?>\n"; + $feed.= $this->_createGeneratorComment(); + $feed.= $this->_createStylesheetReferences(); + $feed.= "language!="") { + $feed.= " xml:lang=\"".$this->language."\""; + } + $feed.= ">\n"; + $feed.= " ".htmlspecialchars($this->title)."\n"; + $feed.= " ".htmlspecialchars($this->description)."\n"; + $feed.= " link)."\"/>\n"; + $feed.= " ".htmlspecialchars($this->link)."\n"; + $now = new FeedDate(); + $feed.= " ".htmlspecialchars($now->iso8601())."\n"; + if ($this->editor!="") { + $feed.= " \n"; + $feed.= " ".$this->editor."\n"; + if ($this->editorEmail!="") { + $feed.= " ".$this->editorEmail."\n"; + } + $feed.= " \n"; + } + $feed.= " ".FEEDCREATOR_VERSION."\n"; + $feed.= "syndicationURL . "\" />\n"; + $feed.= $this->_createAdditionalElements($this->additionalElements, " "); + $icnt = count($this->items); + for ($i=0; $i<$icnt; $i++) { + $feed.= " \n"; + $feed.= " ".htmlspecialchars(strip_tags($this->items[$i]->title))."\n"; + $feed.= " items[$i]->link)."\"/>\n"; + if ($this->items[$i]->date=="") { + $this->items[$i]->date = time(); + } + $itemDate = new FeedDate($this->items[$i]->date); + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + $feed.= " ".htmlspecialchars($this->items[$i]->link)."\n"; + $feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, " "); + if ($this->items[$i]->author!="") { + $feed.= " \n"; + $feed.= " ".htmlspecialchars($this->items[$i]->author)."\n"; + $feed.= " \n"; + } + if ($this->items[$i]->description!="") { + $feed.= " ".htmlspecialchars($this->items[$i]->description)."\n"; + } + if ($this->items[$i]->enclosure != null) { + $feed.=" items[$i]->enclosure->url ."\" type=\"". $this->items[$i]->enclosure->type."\" length=\"". $this->items[$i]->enclosure->length . "\" />\n"; + } + $feed.= " \n"; + } + $feed.= "\n"; + return $feed; + } + + +} + + +/** + * AtomCreator03 is a FeedCreator that implements the atom specification, + * as in http://www.intertwingly.net/wiki/pie/FrontPage. + * Please note that just by using AtomCreator03 you won't automatically + * produce valid atom files. For example, you have to specify either an editor + * for the feed or an author for every single feed item. + * + * Some elements have not been implemented yet. These are (incomplete list): + * author URL, item author's email and URL, item contents, alternate links, + * other link content types than text/html. Some of them may be created with + * AtomCreator03::additionalElements. + * + * @see FeedCreator#additionalElements + * @since 1.6 + * @author Kai Blankenhorn , Scott Reynen + */ +class AtomCreator03 extends FeedCreator { + + function AtomCreator03() { + $this->contentType = "application/atom+xml"; + $this->encoding = "utf-8"; + } + + function createFeed() { + $feed = "encoding."\"?>\n"; + $feed.= $this->_createGeneratorComment(); + $feed.= $this->_createStylesheetReferences(); + $feed.= "language!="") { + $feed.= " xml:lang=\"".$this->language."\""; + } + $feed.= ">\n"; + $feed.= " ".htmlspecialchars($this->title)."\n"; + $feed.= " ".htmlspecialchars($this->description)."\n"; + $feed.= " link)."\"/>\n"; + $feed.= " ".htmlspecialchars($this->link)."\n"; + $now = new FeedDate(); + $feed.= " ".htmlspecialchars($now->iso8601())."\n"; + if ($this->editor!="") { + $feed.= " \n"; + $feed.= " ".$this->editor."\n"; + if ($this->editorEmail!="") { + $feed.= " ".$this->editorEmail."\n"; + } + $feed.= " \n"; + } + $feed.= " ".FEEDCREATOR_VERSION."\n"; + $feed.= $this->_createAdditionalElements($this->additionalElements, " "); + $icnt = count($this->items); + for ($i=0; $i<$icnt; $i++) { + $feed.= " \n"; + $feed.= " ".htmlspecialchars(strip_tags($this->items[$i]->title))."\n"; + $feed.= " items[$i]->link)."\"/>\n"; + if ($this->items[$i]->date=="") { + $this->items[$i]->date = time(); + } + $itemDate = new FeedDate($this->items[$i]->date); + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + $feed.= " ".htmlspecialchars($itemDate->iso8601())."\n"; + $feed.= " ".htmlspecialchars($this->items[$i]->link)."\n"; + $feed.= $this->_createAdditionalElements($this->items[$i]->additionalElements, " "); + if ($this->items[$i]->author!="") { + $feed.= " \n"; + $feed.= " ".htmlspecialchars($this->items[$i]->author)."\n"; + $feed.= " \n"; + } + if ($this->items[$i]->description!="") { + $feed.= " ".htmlspecialchars($this->items[$i]->description)."\n"; + } + $feed.= " \n"; + } + $feed.= "\n"; + return $feed; + } +} + + +/** + * MBOXCreator is a FeedCreator that implements the mbox format + * as described in http://www.qmail.org/man/man5/mbox.html + * + * @since 1.3 + * @author Kai Blankenhorn + */ +class MBOXCreator extends FeedCreator { + + function MBOXCreator() { + $this->contentType = "text/plain"; + $this->encoding = "utf-8"; + } + + function qp_enc($input = "", $line_max = 76) { + $hex = array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'); + $lines = preg_split("/(?:\r\n|\r|\n)/", $input); + $eol = "\r\n"; + $escape = "="; + $output = ""; + while( list(, $line) = each($lines) ) { + //$line = rtrim($line); // remove trailing white space -> no =20\r\n necessary + $linlen = strlen($line); + $newline = ""; + for($i = 0; $i < $linlen; $i++) { + $c = substr($line, $i, 1); + $dec = ord($c); + if ( ($dec == 32) && ($i == ($linlen - 1)) ) { // convert space at eol only + $c = "=20"; + } elseif ( ($dec == 61) || ($dec < 32 ) || ($dec > 126) ) { // always encode "\t", which is *not* required + $h2 = floor($dec/16); + $h1 = floor($dec%16); + $c = $escape.$hex["$h2"].$hex["$h1"]; + } + if ( (strlen($newline) + strlen($c)) >= $line_max ) { // CRLF is not counted + $output .= $newline.$escape.$eol; // soft line break; " =\r\n" is okay + $newline = ""; + } + $newline .= $c; + } // end of for + $output .= $newline.$eol; + } + return trim($output); + } + + + /** + * Builds the MBOX contents. + * @return string the feed's complete text + */ + function createFeed() { + $icnt = count($this->items); + for ($i=0; $i<$icnt; $i++) { + if ($this->items[$i]->author!="") { + $from = $this->items[$i]->author; + } else { + $from = $this->title; + } + $itemDate = new FeedDate($this->items[$i]->date); + $feed.= "From ".strtr(MBOXCreator::qp_enc($from)," ","_")." ".date("D M d H:i:s Y",$itemDate->unix())."\n"; + $feed.= "Content-Type: text/plain;\n"; + $feed.= " charset=\"".$this->encoding."\"\n"; + $feed.= "Content-Transfer-Encoding: quoted-printable\n"; + $feed.= "Content-Type: text/plain\n"; + $feed.= "From: \"".MBOXCreator::qp_enc($from)."\"\n"; + $feed.= "Date: ".$itemDate->rfc822()."\n"; + $feed.= "Subject: ".MBOXCreator::qp_enc(FeedCreator::iTrunc($this->items[$i]->title,100))."\n"; + $feed.= "\n"; + $body = chunk_split(MBOXCreator::qp_enc($this->items[$i]->description)); + $feed.= preg_replace("~\nFrom ([^\n]*)(\n?)~","\n>From $1$2\n",$body); + $feed.= "\n"; + $feed.= "\n"; + } + return $feed; + } + + /** + * Generate a filename for the feed cache file. Overridden from FeedCreator to prevent XML data types. + * @return string the feed cache filename + * @since 1.4 + * @access private + */ + function _generateFilename() { + $fileInfo = pathinfo($_SERVER["PHP_SELF"]); + return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".mbox"; + } +} + + +/** + * OPMLCreator is a FeedCreator that implements OPML 1.0. + * + * @see http://opml.scripting.com/spec + * @author Dirk Clemens, Kai Blankenhorn + * @since 1.5 + */ +class OPMLCreator extends FeedCreator { + + function OPMLCreator() { + $this->encoding = "utf-8"; + } + + function createFeed() { + $feed = "encoding."\"?>\n"; + $feed.= $this->_createGeneratorComment(); + $feed.= $this->_createStylesheetReferences(); + $feed.= "\n"; + $feed.= " \n"; + $feed.= " ".htmlspecialchars($this->title)."\n"; + if ($this->pubDate!="") { + $date = new FeedDate($this->pubDate); + $feed.= " ".$date->rfc822()."\n"; + } + if ($this->lastBuildDate!="") { + $date = new FeedDate($this->lastBuildDate); + $feed.= " ".$date->rfc822()."\n"; + } + if ($this->editor!="") { + $feed.= " ".$this->editor."\n"; + } + if ($this->editorEmail!="") { + $feed.= " ".$this->editorEmail."\n"; + } + $feed.= " \n"; + $feed.= " \n"; + $icnt = count($this->items); + for ($i=0;$i<$icnt; $i++) { + $feed.= " items[$i]->title,"\n\r"," "))); + $feed.= " title=\"".$title."\""; + $feed.= " text=\"".$title."\""; + //$feed.= " description=\"".htmlspecialchars($this->items[$i]->description)."\""; + $feed.= " url=\"".htmlspecialchars($this->items[$i]->link)."\""; + $feed.= "/>\n"; + } + $feed.= " \n"; + $feed.= "\n"; + return $feed; + } +} + + + +/** + * HTMLCreator is a FeedCreator that writes an HTML feed file to a specific + * location, overriding the createFeed method of the parent FeedCreator. + * The HTML produced can be included over http by scripting languages, or serve + * as the source for an IFrame. + * All output by this class is embedded in
tags to enable formatting + * using CSS. + * + * @author Pascal Van Hecke + * @since 1.7 + */ +class HTMLCreator extends FeedCreator { + + var $contentType = "text/html"; + + /** + * Contains HTML to be output at the start of the feed's html representation. + */ + var $header; + + /** + * Contains HTML to be output at the end of the feed's html representation. + */ + var $footer ; + + /** + * Contains HTML to be output between entries. A separator is only used in + * case of multiple entries. + */ + var $separator; + + /** + * Used to prefix the stylenames to make sure they are unique + * and do not clash with stylenames on the users' page. + */ + var $stylePrefix; + + /** + * Determines whether the links open in a new window or not. + */ + var $openInNewWindow = true; + + var $imageAlign ="right"; + + /** + * In case of very simple output you may want to get rid of the style tags, + * hence this variable. There's no equivalent on item level, but of course you can + * add strings to it while iterating over the items ($this->stylelessOutput .= ...) + * and when it is non-empty, ONLY the styleless output is printed, the rest is ignored + * in the function createFeed(). + */ + var $stylelessOutput =""; + + /** + * Writes the HTML. + * @return string the scripts's complete text + */ + function createFeed() { + // if there is styleless output, use the content of this variable and ignore the rest + if ($this->stylelessOutput!="") { + return $this->stylelessOutput; + } + + //if no stylePrefix is set, generate it yourself depending on the script name + if ($this->stylePrefix=="") { + $this->stylePrefix = str_replace(".", "_", $this->_generateFilename())."_"; + } + + //set an openInNewWindow_token_to be inserted or not + if ($this->openInNewWindow) { + $targetInsert = " target='_blank'"; + } + + // use this array to put the lines in and implode later with "document.write" javascript + $feedArray = array(); + if ($this->image!=null) { + $imageStr = "". + "". + FeedCreator::iTrunc(htmlspecialchars($this->image->title),100). + "image->width) { + $imageStr .=" width='".$this->image->width. "' "; + } + if ($this->image->height) { + $imageStr .=" height='".$this->image->height."' "; + } + $imageStr .="/>"; + $feedArray[] = $imageStr; + } + + if ($this->title) { + $feedArray[] = "
". + FeedCreator::iTrunc(htmlspecialchars($this->title),100)."
"; + } + if ($this->getDescription()) { + $feedArray[] = "
". + str_replace("]]>", "", str_replace("getDescription())). + "
"; + } + + if ($this->header) { + $feedArray[] = "
".$this->header."
"; + } + + $icnt = count($this->items); + for ($i=0; $i<$icnt; $i++) { + if ($this->separator and $i > 0) { + $feedArray[] = "
".$this->separator."
"; + } + + if ($this->items[$i]->title) { + if ($this->items[$i]->link) { + $feedArray[] = + "
".FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100). + "
"; + } else { + $feedArray[] = + "
". + FeedCreator::iTrunc(htmlspecialchars(strip_tags($this->items[$i]->title)),100). + "
"; + } + } + if ($this->items[$i]->getDescription()) { + $feedArray[] = + "
". + str_replace("]]>", "", str_replace("items[$i]->getDescription())). + "
"; + } + } + if ($this->footer) { + $feedArray[] = "
".$this->footer."
"; + } + + $feed= "".join($feedArray, "\r\n"); + return $feed; + } + + /** + * Overrrides parent to produce .html extensions + * + * @return string the feed cache filename + * @since 1.4 + * @access private + */ + function _generateFilename() { + $fileInfo = pathinfo($_SERVER["PHP_SELF"]); + return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".html"; + } +} + + +/** + * JSCreator is a class that writes a js file to a specific + * location, overriding the createFeed method of the parent HTMLCreator. + * + * @author Pascal Van Hecke + */ +class JSCreator extends HTMLCreator { + var $contentType = "text/javascript"; + + /** + * writes the javascript + * @return string the scripts's complete text + */ + function createFeed() { + $feed = parent::createFeed(); + $feedArray = explode("\n",$feed); + + $jsFeed = ""; + foreach ($feedArray as $value) { + $jsFeed .= "document.write('".trim(addslashes($value))."');\n"; + } + return $jsFeed; + } + + /** + * Overrrides parent to produce .js extensions + * + * @return string the feed cache filename + * @since 1.4 + * @access private + */ + function _generateFilename() { + $fileInfo = pathinfo($_SERVER["PHP_SELF"]); + return substr($fileInfo["basename"],0,-(strlen($fileInfo["extension"])+1)).".js"; + } + +} + +/** + * This class allows to override the hardcoded charset + * + * @author Andreas Gohr + */ +class DokuWikiFeedCreator extends UniversalFeedCreator{ + function createFeed($format = "RSS0.91",$encoding='iso-8859-15') { + $this->_setFormat($format); + $this->_feed->encoding = $encoding; + return $this->_feed->createFeed(); + } +} + + + +//Setup VIM: ex: et ts=4 : diff --git a/sources/inc/fetch.functions.php b/sources/inc/fetch.functions.php new file mode 100644 index 0000000..207ad9e --- /dev/null +++ b/sources/inc/fetch.functions.php @@ -0,0 +1,152 @@ + + * @author Ben Coburn + * @param string $file local file to send + * @param string $mime mime type of the file + * @param bool $dl set to true to force a browser download + * @param int $cache remaining cache time in seconds (-1 for $conf['cache'], 0 for no-cache) + * @param bool $public is this a public ressource or a private one? + */ +function sendFile($file, $mime, $dl, $cache, $public = false) { + global $conf; + // send mime headers + header("Content-Type: $mime"); + + // calculate cache times + if($cache == -1) { + $maxage = max($conf['cachetime'], 3600); // cachetime or one hour + $expires = time() + $maxage; + } else if($cache > 0) { + $maxage = $cache; // given time + $expires = time() + $maxage; + } else { // $cache == 0 + $maxage = 0; + $expires = 0; // 1970-01-01 + } + + // smart http caching headers + if($maxage) { + if($public) { + // cache publically + header('Expires: '.gmdate("D, d M Y H:i:s", $expires).' GMT'); + header('Cache-Control: public, proxy-revalidate, no-transform, max-age='.$maxage); + header('Pragma: public'); + } else { + // cache in browser + header('Expires: '.gmdate("D, d M Y H:i:s", $expires).' GMT'); + header('Cache-Control: private, no-transform, max-age='.$maxage); + header('Pragma: no-cache'); + } + } else { + // no cache at all + header('Expires: Thu, 01 Jan 1970 00:00:00 GMT'); + header('Cache-Control: no-cache, no-transform'); + header('Pragma: no-cache'); + } + + //send important headers first, script stops here if '304 Not Modified' response + $fmtime = @filemtime($file); + http_conditionalRequest($fmtime); + + //download or display? + if($dl) { + header('Content-Disposition: attachment; filename="'.utf8_basename($file).'";'); + } else { + header('Content-Disposition: inline; filename="'.utf8_basename($file).'";'); + } + + //use x-sendfile header to pass the delivery to compatible webservers + if(http_sendfile($file)) exit; + + // send file contents + $fp = @fopen($file, "rb"); + if($fp) { + http_rangeRequest($fp, filesize($file), $mime); + } else { + http_status(500); + print "Could not read $file - bad permissions?"; + } +} + +/** + * Check for media for preconditions and return correct status code + * + * READ: MEDIA, MIME, EXT, CACHE + * WRITE: MEDIA, FILE, array( STATUS, STATUSMESSAGE ) + * + * @author Gerry Weissbach + * @param string $media reference to the media id + * @param string $file reference to the file variable + * @param string $rev + * @param int $width + * @param int $height + * @return array(STATUS, STATUSMESSAGE) + */ +function checkFileStatus(&$media, &$file, $rev = '', $width=0, $height=0) { + global $MIME, $EXT, $CACHE, $INPUT; + + //media to local file + if(media_isexternal($media)) { + //check token for external image and additional for resized and cached images + if(media_get_token($media, $width, $height) !== $INPUT->str('tok')) { + return array(412, 'Precondition Failed'); + } + //handle external images + if(strncmp($MIME, 'image/', 6) == 0) $file = media_get_from_URL($media, $EXT, $CACHE); + if(!$file) { + //download failed - redirect to original URL + return array(302, $media); + } + } else { + $media = cleanID($media); + if(empty($media)) { + return array(400, 'Bad request'); + } + // check token for resized images + if (($width || $height) && media_get_token($media, $width, $height) !== $INPUT->str('tok')) { + return array(412, 'Precondition Failed'); + } + + //check permissions (namespace only) + if(auth_quickaclcheck(getNS($media).':X') < AUTH_READ) { + return array(403, 'Forbidden'); + } + $file = mediaFN($media, $rev); + } + + //check file existance + if(!@file_exists($file)) { + return array(404, 'Not Found'); + } + + return array(200, null); +} + +/** + * Returns the wanted cachetime in seconds + * + * Resolves named constants + * + * @author Andreas Gohr + */ +function calc_cache($cache) { + global $conf; + + if(strtolower($cache) == 'nocache') return 0; //never cache + if(strtolower($cache) == 'recache') return $conf['cachetime']; //use standard cache + return -1; //cache endless +} diff --git a/sources/inc/form.php b/sources/inc/form.php new file mode 100644 index 0000000..a4cd2e6 --- /dev/null +++ b/sources/inc/form.php @@ -0,0 +1,951 @@ + + */ + +if(!defined('DOKU_INC')) die('meh.'); + +/** + * Class for creating simple HTML forms. + * + * The forms is built from a list of pseudo-tags (arrays with expected keys). + * Every pseudo-tag must have the key '_elem' set to the name of the element. + * When printed, the form class calls functions named 'form_$type' for each + * element it contains. + * + * Standard practice is for non-attribute keys in a pseudo-element to start + * with '_'. Other keys are HTML attributes that will be included in the element + * tag. That way, the element output functions can pass the pseudo-element + * directly to buildAttributes. + * + * See the form_make* functions later in this file. + * + * @author Tom N Harris + */ +class Doku_Form { + + // Form id attribute + var $params = array(); + + // 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; + } + + /** + * 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]; + } + + /** + * 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,false) . '>
' . 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(); + } + + /** + * Add a radio set + * + * This function adds a set of radio buttons to the form. If $_POST[$name] + * is set, this radio is preselected, else the first radio button. + * + * @param string $name The HTML field name + * @param array $entries An array of entries $value => $caption + * + * @author Adrian Lang + */ + + function addRadioSet($name, $entries) { + global $INPUT; + $value = (array_key_exists($INPUT->post->str($name), $entries)) ? + $INPUT->str($name) : key($entries); + foreach($entries as $val => $cap) { + $data = ($value === $val) ? array('checked' => 'checked') : array(); + $this->addElement(form_makeRadioField($name, $val, $cap, '', '', $data)); + } + } + +} + +/** + * form_makeTag + * + * Create a form element for a non-specific empty tag. + * + * @param string $tag Tag name. + * @param array $attrs Optional attributes. + * @return array pseudo-tag + * @author Tom N Harris + */ +function form_makeTag($tag, $attrs=array()) { + $elem = array('_elem'=>'tag', '_tag'=>$tag); + return array_merge($elem, $attrs); +} + +/** + * form_makeOpenTag + * + * Create a form element for a non-specific opening tag. + * Remember to put a matching close tag after this as well. + * + * @param string $tag Tag name. + * @param array $attrs Optional attributes. + * @return array pseudo-tag + * @author Tom N Harris + */ +function form_makeOpenTag($tag, $attrs=array()) { + $elem = array('_elem'=>'opentag', '_tag'=>$tag); + return array_merge($elem, $attrs); +} + +/** + * form_makeCloseTag + * + * Create a form element for a non-specific closing tag. + * Careless use of this will result in invalid XHTML. + * + * @param string $tag Tag name. + * @return array pseudo-tag + * @author Tom N Harris + */ +function form_makeCloseTag($tag) { + return array('_elem'=>'closetag', '_tag'=>$tag); +} + +/** + * form_makeWikiText + * + * Create a form element for a textarea containing wiki text. + * Only one wikitext element is allowed on a page. It will have + * a name of 'wikitext' and id 'wiki__text'. The text will + * be passed to formText() before printing. + * + * @param string $text Text to fill the field with. + * @param array $attrs Optional attributes. + * @return array pseudo-tag + * @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); +} + +/** + * form_makeButton + * + * Create a form element for an action button. + * A title will automatically be generated using the value and + * accesskey attributes, unless you provide one. + * + * @param string $type Type attribute. 'submit' or 'cancel' + * @param string $act Wiki action of the button, will be used as the do= parameter + * @param string $value (optional) Displayed label. Uses $act if not provided. + * @param array $attrs Optional attributes. + * @return array pseudo-tag + * @author Tom N Harris + */ +function form_makeButton($type, $act, $value='', $attrs=array()) { + 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); +} + +/** + * form_makeField + * + * Create a form element for a labelled input element. + * The label text will be printed before the input. + * + * @param string $type Type attribute of input. + * @param string $name Name attribute of the input. + * @param string $value (optional) Default value. + * @param string $class Class attribute of the label. If this is 'block', + * then a line break will be added after the field. + * @param string $label Label that will be printed before the input. + * @param string $id ID attribute of the input. If set, the label will + * reference it with a 'for' attribute. + * @param array $attrs Optional attributes. + * @return array pseudo-tag + * @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); +} + +/** + * form_makeFieldRight + * + * Create a form element for a labelled input element. + * The label text will be printed after the input. + * + * @see form_makeField + * @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); +} + +/** + * form_makeTextField + * + * Create a form element for a text input element with label. + * + * @see form_makeField + * @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); +} + +/** + * form_makePasswordField + * + * Create a form element for a password input element with label. + * Password elements have no default value, for obvious reasons. + * + * @see form_makeField + * @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); +} + +/** + * 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); +} + +/** + * form_makeCheckboxField + * + * Create a form element for a checkbox input element with label. + * If $value is an array, a hidden field with the same name and the value + * $value[1] is constructed as well. + * + * @see form_makeFieldRight + * @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); +} + +/** + * form_makeRadioField + * + * Create a form element for a radio button input element with label. + * + * @see form_makeFieldRight + * @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); +} + +/** + * form_makeMenuField + * + * Create a form element for a drop-down menu with label. + * The list of values can be strings, arrays of (value,text), + * or an associative array with the values as keys and labels as values. + * An item is selected by supplying its value or integer index. + * If the list of values is an associative array, the selected item must be + * a string. + * + * @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); +} + +/** + * form_makeListboxField + * + * Create a form element for a list box with label. + * The list of values can be strings, arrays of (value,text), + * or an associative array with the values as keys and labels as values. + * Items are selected by supplying its value or an array of values. + * + * @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); +} + +/** + * form_tag + * + * Print the HTML for a generic empty tag. + * Requires '_tag' key with name of the tag. + * Attributes are passed to buildAttributes() + * + * @author Tom N Harris + */ +function form_tag($attrs) { + return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'/>'; +} + +/** + * form_opentag + * + * Print the HTML for a generic opening tag. + * Requires '_tag' key with name of the tag. + * Attributes are passed to buildAttributes() + * + * @author Tom N Harris + */ +function form_opentag($attrs) { + return '<'.$attrs['_tag'].' '.buildAttributes($attrs,true).'>'; +} + +/** + * form_closetag + * + * Print the HTML for a generic closing tag. + * Requires '_tag' key with name of the tag. + * There are no attributes. + * + * @author Tom N Harris + */ +function form_closetag($attrs) { + return ''; +} + +/** + * form_openfieldset + * + * Print the HTML for an opening fieldset tag. + * Uses the '_legend' key. + * Attributes are passed to buildAttributes() + * + * @author Tom N Harris + */ +function form_openfieldset($attrs) { + $s = '
'; + if (!is_null($attrs['_legend'])) $s .= ''.$attrs['_legend'].''; + return $s; +} + +/** + * form_closefieldset + * + * Print the HTML for a closing fieldset tag. + * There are no attributes. + * + * @author Tom N Harris + */ +function form_closefieldset() { + return '
'; +} + +/** + * form_hidden + * + * Print the HTML for a hidden input element. + * Uses only 'name' and 'value' attributes. + * Value is passed to formText() + * + * @author Tom N Harris + */ +function form_hidden($attrs) { + return ''; +} + +/** + * form_wikitext + * + * Print the HTML for the wiki textarea. + * Requires '_text' with default text of the field. + * Text will be passed to formText(), attributes to buildAttributes() + * + * @author Tom N Harris + */ +function form_wikitext($attrs) { + // mandatory attributes + unset($attrs['name']); + unset($attrs['id']); + return ''; +} + +/** + * form_button + * + * Print the HTML for a form button. + * If '_action' is set, the button name will be "do[_action]". + * Other attributes are passed to buildAttributes() + * + * @author Tom N Harris + */ +function form_button($attrs) { + $p = (!empty($attrs['_action'])) ? 'name="do['.$attrs['_action'].']" ' : ''; + return ''; +} + +/** + * form_field + * + * Print the HTML for a form input field. + * _class : class attribute used on the label tag + * _text : Text to display before the input. Not escaped. + * Other attributes are passed to buildAttributes() for the input tag. + * + * @author Tom N Harris + */ +function form_field($attrs) { + $s = ''; + $s .= ' '; + if (preg_match('/(^| )block($| )/', $attrs['_class'])) + $s .= '
'; + return $s; +} + +/** + * form_fieldright + * + * Print the HTML for a form input field. (right-aligned) + * _class : class attribute used on the label tag + * _text : Text to display after the input. Not escaped. + * Other attributes are passed to buildAttributes() for the input tag. + * + * @author Tom N Harris + */ +function form_fieldright($attrs) { + $s = ''; + $s .= ' '.$attrs['_text'].''; + if (preg_match('/(^| )block($| )/', $attrs['_class'])) + $s .= '
'; + return $s; +} + +/** + * form_textfield + * + * Print the HTML for a text input field. + * _class : class attribute used on the label tag + * _text : Text to display before the input. Not escaped. + * Other attributes are passed to buildAttributes() for the input tag. + * + * @author Tom N Harris + */ +function form_textfield($attrs) { + // mandatory attributes + unset($attrs['type']); + $s = ' '; + $s .= ''; + if (preg_match('/(^| )block($| )/', $attrs['_class'])) + $s .= '
'; + return $s; +} + +/** + * form_passwordfield + * + * Print the HTML for a password input field. + * _class : class attribute used on the label tag + * _text : Text to display before the input. Not escaped. + * Other attributes are passed to buildAttributes() for the input tag. + * + * @author Tom N Harris + */ +function form_passwordfield($attrs) { + // mandatory attributes + unset($attrs['type']); + $s = ' '; + $s .= ''; + if (preg_match('/(^| )block($| )/', $attrs['_class'])) + $s .= '
'; + return $s; +} + +/** + * form_filefield + * + * Print the HTML for a file input field. + * _class : class attribute used on the label tag + * _text : Text to display before the input. Not escaped + * _maxlength : Allowed size in byte + * _accept : Accepted mime-type + * Other attributes are passed to buildAttributes() for the input tag + * + * @author Michael Klier + */ +function form_filefield($attrs) { + $s = ' '; + $s .= ' + */ +function form_checkboxfield($attrs) { + // mandatory attributes + unset($attrs['type']); + $s = ''; + $attrs['value'] = $attrs['value'][0]; + } + $s .= ''; + $s .= ' '.$attrs['_text'].''; + if (preg_match('/(^| )block($| )/', $attrs['_class'])) + $s .= '
'; + return $s; +} + +/** + * form_radiofield + * + * Print the HTML for a radio button input field. + * _class : class attribute used on the label tag + * _text : Text to display after the input. Not escaped. + * Other attributes are passed to buildAttributes() for the input tag. + * + * @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; +} + +/** + * form_menufield + * + * Print the HTML for a drop-down menu. + * _options : Array of (value,text,selected) for the menu. + * Text can be omitted. Text and value are passed to formText() + * Only one item can be selected. + * _class : class attribute used on the label tag + * _text : Text to display before the menu. Not escaped. + * Other attributes are passed to buildAttributes() for the input tag. + * + * @author Tom N Harris + */ +function form_menufield($attrs) { + $attrs['size'] = '1'; + $s = ''; + $s .= ' '; + if (preg_match('/(^| )block($| )/', $attrs['_class'])) + $s .= '
'; + return $s; +} + +/** + * form_listboxfield + * + * Print the HTML for a list box. + * _options : Array of (value,text,selected) for the list. + * Text can be omitted. Text and value are passed to formText() + * _class : class attribute used on the label tag + * _text : Text to display before the menu. Not escaped. + * Other attributes are passed to buildAttributes() for the input tag. + * + * @author Tom N Harris + */ +function form_listboxfield($attrs) { + $s = ' '; + $s .= ''; + if (preg_match('/(^| )block($| )/', $attrs['_class'])) + $s .= '
'; + return $s; +} diff --git a/sources/inc/fulltext.php b/sources/inc/fulltext.php new file mode 100644 index 0000000..bd8e6b8 --- /dev/null +++ b/sources/inc/fulltext.php @@ -0,0 +1,756 @@ + + */ + +if(!defined('DOKU_INC')) die('meh.'); + +/** + * create snippets for the first few results only + */ +if(!defined('FT_SNIPPET_NUMBER')) define('FT_SNIPPET_NUMBER',15); + +/** + * The fulltext search + * + * Returns a list of matching documents for the given query + * + * refactored into ft_pageSearch(), _ft_pageSearch() and trigger_event() + * + */ +function ft_pageSearch($query,&$highlight){ + + $data['query'] = $query; + $data['highlight'] =& $highlight; + + return trigger_event('SEARCH_QUERY_FULLPAGE', $data, '_ft_pageSearch'); +} + +/** + * Returns a list of matching documents for the given query + * + * @author Andreas Gohr + * @author Kazutaka Miyasaka + */ +function _ft_pageSearch(&$data) { + $Indexer = idx_get_indexer(); + + // parse the given query + $q = ft_queryParser($Indexer, $data['query']); + $data['highlight'] = $q['highlight']; + + if (empty($q['parsed_ary'])) return array(); + + // lookup all words found in the query + $lookup = $Indexer->lookup($q['words']); + + // get all pages in this dokuwiki site (!: includes nonexistent pages) + $pages_all = array(); + foreach ($Indexer->getPages() as $id) { + $pages_all[$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 (empty($docs)) return array(); + + // 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]); + } + } + + // sort docs by count + arsort($docs); + + return $docs; +} + +/** + * Returns the backlinks for a given page + * + * Uses the metadata index. + * + * @param string $id The id for which links shall be returned + * @param bool $ignore_perms Ignore the fact that pages are hidden or read-protected + * @return array The pages that contain links to the given page + */ +function ft_backlinks($id, $ignore_perms = false){ + $result = idx_get_indexer()->lookupKey('relation_references', $id); + + if(!count($result)) return $result; + + // check ACL permissions + foreach(array_keys($result) as $idx){ + if(($ignore_perms !== true && ( + isHiddenPage($result[$idx]) || auth_quickaclcheck($result[$idx]) < AUTH_READ + )) || !page_exists($result[$idx], '', false)){ + unset($result[$idx]); + } + } + + sort($result); + return $result; +} + +/** + * Returns the pages that use a given media file + * + * Uses the relation media metadata property and the metadata index. + * + * Note that before 2013-07-31 the second parameter was the maximum number of results and + * permissions were ignored. That's why the parameter is now checked to be explicitely set + * to true (with type bool) in order to be compatible with older uses of the function. + * + * @param string $id The media id to look for + * @param bool $ignore_perms Ignore hidden pages and acls (optional, default: false) + * @return array A list of pages that use the given media file + */ +function ft_mediause($id, $ignore_perms = false){ + $result = idx_get_indexer()->lookupKey('relation_media', $id); + + if(!count($result)) return $result; + + // check ACL permissions + foreach(array_keys($result) as $idx){ + if(($ignore_perms !== true && ( + isHiddenPage($result[$idx]) || auth_quickaclcheck($result[$idx]) < AUTH_READ + )) || !page_exists($result[$idx], '', false)){ + unset($result[$idx]); + } + } + + sort($result); + return $result; +} + + + +/** + * Quicksearch for pagenames + * + * By default it only matches the pagename and ignores the + * namespace. This can be changed with the second parameter. + * The third parameter allows to search in titles as well. + * + * The function always returns titles as well + * + * @triggers SEARCH_QUERY_PAGELOOKUP + * @author Andreas Gohr + * @author Adrian Lang + */ +function ft_pageLookup($id, $in_ns=false, $in_title=false){ + $data = compact('id', 'in_ns', 'in_title'); + $data['has_titles'] = true; // for plugin backward compatibility check + return trigger_event('SEARCH_QUERY_PAGELOOKUP', $data, '_ft_pageLookup'); +} + +function _ft_pageLookup(&$data){ + // split out original parameters + $id = $data['id']; + if (preg_match('/(?:^| )@(\w+)/', $id, $matches)) { + $ns = cleanID($matches[1]) . ':'; + $id = str_replace($matches[0], '', $id); + } + + $in_ns = $data['in_ns']; + $in_title = $data['in_title']; + $cleaned = cleanID($id); + + $Indexer = idx_get_indexer(); + $page_idx = $Indexer->getPages(); + + $pages = array(); + if ($id !== '' && $cleaned !== '') { + foreach ($page_idx as $p_id) { + if ((strpos($in_ns ? $p_id : noNSorNS($p_id), $cleaned) !== false)) { + if (!isset($pages[$p_id])) + $pages[$p_id] = p_get_first_heading($p_id, METADATA_DONT_RENDER); + } + } + if ($in_title) { + foreach ($Indexer->lookupKey('title', $id, '_ft_pageLookupTitleCompare') as $p_id) { + if (!isset($pages[$p_id])) + $pages[$p_id] = p_get_first_heading($p_id, METADATA_DONT_RENDER); + } + } + } + + if (isset($ns)) { + foreach (array_keys($pages) as $p_id) { + if (strpos($p_id, $ns) !== 0) { + unset($pages[$p_id]); + } + } + } + + // discard hidden pages + // discard nonexistent pages + // check ACL permissions + foreach(array_keys($pages) as $idx){ + if(!isVisiblePage($idx) || !page_exists($idx) || + auth_quickaclcheck($idx) < AUTH_READ) { + unset($pages[$idx]); + } + } + + uksort($pages,'ft_pagesorter'); + return $pages; +} + +/** + * Tiny helper function for comparing the searched title with the title + * from the search index. This function is a wrapper around stripos with + * adapted argument order and return value. + */ +function _ft_pageLookupTitleCompare($search, $title) { + return stripos($title, $search) !== false; +} + +/** + * Sort pages based on their namespace level first, then on their string + * values. This makes higher hierarchy pages rank higher than lower hierarchy + * pages. + */ +function ft_pagesorter($a, $b){ + $ac = count(explode(':',$a)); + $bc = count(explode(':',$b)); + if($ac < $bc){ + return -1; + }elseif($ac > $bc){ + return 1; + } + return strcmp ($a,$b); +} + +/** + * Creates a snippet extract + * + * @author Andreas Gohr + * @triggers FULLTEXT_SNIPPET_CREATE + */ +function ft_snippet($id,$highlight){ + $text = rawWiki($id); + $text = str_replace("\xC2\xAD",'',$text); // remove soft-hyphens + $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('ft_snippet_re_preprocess', 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); + } + + $m = "\1"; + $snippets = preg_replace('/'.$re1.'/iu',$m.'$1'.$m,$snippets); + $snippet = preg_replace('/'.$m.'([^'.$m.']*?)'.$m.'/iu','$1',hsc(join('... ',$snippets))); + + $evdata['snippet'] = $snippet; + } + $evt->advise_after(); + unset($evt); + + return $evdata['snippet']; +} + +/** + * Wraps a search term in regex boundary checks. + */ +function ft_snippet_re_preprocess($term) { + // do not process asian terms where word boundaries are not explicit + if(preg_match('/'.IDX_ASIAN.'/u',$term)){ + return $term; + } + + if (UTF8_PROPERTYSUPPORT) { + // unicode word boundaries + // see http://stackoverflow.com/a/2449017/172068 + $BL = '(? 1) { + foreach ($args[0] as $key => $value) { + $result[$key] = $value; + for ($i = 1; $i !== $array_count; $i++) { + if (!isset($args[$i][$key])) { + unset($result[$key]); + break; + } + $result[$key] += $args[$i][$key]; + } + } + } + return $result; +} + +/** + * 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() + * + * @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($Indexer, $query){ + /** + * 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($Indexer, $matches[2], 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($Indexer, $matches[1]).')'; + } else { + // word-include + $parsed .= ft_termParser($Indexer, $token); + } + } + } + $parsed_query .= $parsed; + } + + // 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); + } + 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'][] = $body; + $q['and'][] = $body; // for backward compatibility + break; + case 'P-:': + $q['phrases'][] = $body; + break; + case 'P+:': + $q['phrases'][] = $body; + $q['highlight'][] = $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($Indexer, $term, $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) { + $phrase_mode = $phrase_mode ? true : preg_match('/'.IDX_ASIAN.'/u', $word); + $parsed .= ft_termParser($Indexer, $word, false, $phrase_mode); + } + } else { + $term_noparen = str_replace(array('(', ')'), ' ', $term); + $words = $Indexer->tokenizer($term_noparen, 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 : diff --git a/sources/inc/geshi.php b/sources/inc/geshi.php new file mode 100644 index 0000000..c6ff9ef --- /dev/null +++ b/sources/inc/geshi.php @@ -0,0 +1,4775 @@ +, Benny Baumann + * @copyright (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2008 Benny Baumann + * @license http://gnu.org/copyleft/gpl.html GNU GPL + * + */ + +// +// GeSHi Constants +// You should use these constant names in your programs instead of +// their values - you never know when a value may change in a future +// version +// + +/** The version of this GeSHi file */ +define('GESHI_VERSION', '1.0.8.11'); + +// Define the root directory for the GeSHi code tree +if (!defined('GESHI_ROOT')) { + /** The root directory for GeSHi */ + define('GESHI_ROOT', dirname(__FILE__) . DIRECTORY_SEPARATOR); +} +/** The language file directory for GeSHi + @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 */ +define('GESHI_NO_LINE_NUMBERS', 0); +/** Use normal line numbers when building the result */ +define('GESHI_NORMAL_LINE_NUMBERS', 1); +/** Use fancy line numbers when building the result */ +define('GESHI_FANCY_LINE_NUMBERS', 2); + +// Container HTML type +/** Use nothing to surround the source */ +define('GESHI_HEADER_NONE', 0); +/** Use a "div" to surround the source */ +define('GESHI_HEADER_DIV', 1); +/** Use a "pre" to surround the source */ +define('GESHI_HEADER_PRE', 2); +/** Use a pre to wrap lines when line numbers are enabled or to wrap the whole code. */ +define('GESHI_HEADER_PRE_VALID', 3); +/** + * Use a "table" to surround the source: + * + * + * + * + * + *
$header
$linenumbers
$code>
$footer
+ * + * this is essentially only a workaround for Firefox, see sf#1651996 or take a look at + * https://bugzilla.mozilla.org/show_bug.cgi?id=365805 + * @note when linenumbers are disabled this is essentially the same as GESHI_HEADER_PRE + */ +define('GESHI_HEADER_PRE_TABLE', 4); + +// Capatalisation constants +/** Lowercase keywords found */ +define('GESHI_CAPS_NO_CHANGE', 0); +/** Uppercase keywords found */ +define('GESHI_CAPS_UPPER', 1); +/** Leave keywords found as the case that they are */ +define('GESHI_CAPS_LOWER', 2); + +// Link style constants +/** Links in the source in the :link state */ +define('GESHI_LINK', 0); +/** Links in the source in the :hover state */ +define('GESHI_HOVER', 1); +/** Links in the source in the :active state */ +define('GESHI_ACTIVE', 2); +/** Links in the source in the :visited state */ +define('GESHI_VISITED', 3); + +// Important string starter/finisher +// Note that if you change these, they should be as-is: i.e., don't +// write them as if they had been run through htmlentities() +/** The starter for important parts of the source */ +define('GESHI_START_IMPORTANT', ''); +/** The ender for important parts of the source */ +define('GESHI_END_IMPORTANT', ''); + +/**#@+ + * @access private + */ +// When strict mode applies for a language +/** Strict mode never applies (this is the most common) */ +define('GESHI_NEVER', 0); +/** Strict mode *might* apply, and can be enabled or + disabled by {@link GeSHi->enable_strict_mode()} */ +define('GESHI_MAYBE', 1); +/** Strict mode always applies */ +define('GESHI_ALWAYS', 2); + +// Advanced regexp handling constants, used in language files +/** The key of the regex array defining what to search for */ +define('GESHI_SEARCH', 0); +/** The key of the regex array defining what bracket group in a + matched search to use as a replacement */ +define('GESHI_REPLACE', 1); +/** The key of the regex array defining any modifiers to the regular expression */ +define('GESHI_MODIFIERS', 2); +/** The key of the regex array defining what bracket group in a + matched search to put before the replacement */ +define('GESHI_BEFORE', 3); +/** The key of the regex array defining what bracket group in a + matched search to put after the replacement */ +define('GESHI_AFTER', 4); +/** The key of the regex array defining a custom keyword to use + for this regexp's html tag class */ +define('GESHI_CLASS', 5); + +/** Used in language files to mark comments */ +define('GESHI_COMMENTS', 0); + +/** Used to work around missing PHP features **/ +define('GESHI_PHP_PRE_433', !(version_compare(PHP_VERSION, '4.3.3') === 1)); + +/** make sure we can call stripos **/ +if (!function_exists('stripos')) { + // the offset param of preg_match is not supported below PHP 4.3.3 + if (GESHI_PHP_PRE_433) { + /** + * @ignore + */ + function stripos($haystack, $needle, $offset = null) { + if (!is_null($offset)) { + $haystack = substr($haystack, $offset); + } + if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE)) { + return $match[0][1]; + } + return false; + } + } + else { + /** + * @ignore + */ + function stripos($haystack, $needle, $offset = null) { + if (preg_match('/'. preg_quote($needle, '/') . '/', $haystack, $match, PREG_OFFSET_CAPTURE, $offset)) { + return $match[0][1]; + } + return false; + } + } +} + +/** 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() + **/ +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 */ +define('GESHI_NUMBER_INT_BASIC', 1); //Default integers \d+ +/** Enhanced number format for integers like seen in C */ +define('GESHI_NUMBER_INT_CSTYLE', 2); //Default C-Style \d+[lL]? +/** Number format to highlight binary numbers with a suffix "b" */ +define('GESHI_NUMBER_BIN_SUFFIX', 16); //[01]+[bB] +/** Number format to highlight binary numbers with a prefix % */ +define('GESHI_NUMBER_BIN_PREFIX_PERCENT', 32); //%[01]+ +/** Number format to highlight binary numbers with a prefix 0b (C) */ +define('GESHI_NUMBER_BIN_PREFIX_0B', 64); //0b[01]+ +/** Number format to highlight octal numbers with a leading zero */ +define('GESHI_NUMBER_OCT_PREFIX', 256); //0[0-7]+ +/** Number format to highlight octal numbers with a prefix 0o (logtalk) */ +define('GESHI_NUMBER_OCT_PREFIX_0O', 512); //0[0-7]+ +/** Number format to highlight octal numbers with a leading @ (Used in HiSofts Devpac series). */ +define('GESHI_NUMBER_OCT_PREFIX_AT', 1024); //@[0-7]+ +/** Number format to highlight octal numbers with a suffix of o */ +define('GESHI_NUMBER_OCT_SUFFIX', 2048); //[0-7]+[oO] +/** Number format to highlight hex numbers with a prefix 0x */ +define('GESHI_NUMBER_HEX_PREFIX', 4096); //0x[0-9a-fA-F]+ +/** Number format to highlight hex numbers with a prefix $ */ +define('GESHI_NUMBER_HEX_PREFIX_DOLLAR', 8192); //$[0-9a-fA-F]+ +/** Number format to highlight hex numbers with a suffix of h */ +define('GESHI_NUMBER_HEX_SUFFIX', 16384); //[0-9][0-9a-fA-F]*h +/** Number format to highlight floating-point numbers without support for scientific notation */ +define('GESHI_NUMBER_FLT_NONSCI', 65536); //\d+\.\d+ +/** Number format to highlight floating-point numbers without support for scientific notation */ +define('GESHI_NUMBER_FLT_NONSCI_F', 131072); //\d+(\.\d+)?f +/** Number format to highlight floating-point numbers with support for scientific notation (E) and optional leading zero */ +define('GESHI_NUMBER_FLT_SCI_SHORT', 262144); //\.\d+e\d+ +/** Number format to highlight floating-point numbers with support for scientific notation (E) and required leading digit */ +define('GESHI_NUMBER_FLT_SCI_ZERO', 524288); //\d+(\.\d+)?e\d+ +//Custom formats are passed by RX array + +// Error detection - use these to analyse faults +/** No sourcecode to highlight was specified + * @deprecated + */ +define('GESHI_ERROR_NO_INPUT', 1); +/** The language specified does not exist */ +define('GESHI_ERROR_NO_SUCH_LANG', 2); +/** GeSHi could not open a file for reading (generally a language file) */ +define('GESHI_ERROR_FILE_NOT_READABLE', 3); +/** The header type passed to {@link GeSHi->set_header_type()} was invalid */ +define('GESHI_ERROR_INVALID_HEADER_TYPE', 4); +/** The line number type passed to {@link GeSHi->enable_line_numbers()} was invalid */ +define('GESHI_ERROR_INVALID_LINE_NUMBER_TYPE', 5); +/**#@-*/ + + +/** + * The GeSHi Class. + * + * Please refer to the documentation for GeSHi 1.0.X that is available + * at http://qbnz.com/highlighter/documentation.php for more information + * about how to use this class. + * + * @package geshi + * @author Nigel McNie , Benny Baumann + * @copyright (C) 2004 - 2007 Nigel McNie, (C) 2007 - 2008 Benny Baumann + */ +class GeSHi { + /**#@+ + * @access private + */ + /** + * The source code to highlight + * @var string + */ + var $source = ''; + + /** + * The language to use when highlighting + * @var string + */ + var $language = ''; + + /** + * The data for the language used + * @var array + */ + var $language_data = array(); + + /** + * The path to the language files + * @var string + */ + var $language_path = GESHI_LANG_ROOT; + + /** + * The error message associated with an error + * @var string + * @todo check err reporting works + */ + var $error = false; + + /** + * Possible error messages + * @var array + */ + var $error_messages = array( + GESHI_ERROR_NO_SUCH_LANG => 'GeSHi could not find the language {LANGUAGE} (using path {PATH})', + GESHI_ERROR_FILE_NOT_READABLE => 'The file specified for load_from_file was not readable', + GESHI_ERROR_INVALID_HEADER_TYPE => 'The header type specified is invalid', + GESHI_ERROR_INVALID_LINE_NUMBER_TYPE => 'The line number type specified is invalid' + ); + + /** + * Whether highlighting is strict or not + * @var boolean + */ + var $strict_mode = false; + + /** + * Whether to use CSS classes in output + * @var boolean + */ + var $use_classes = false; + + /** + * The type of header to use. Can be one of the following + * values: + * + * - GESHI_HEADER_PRE: Source is outputted in a "pre" HTML element. + * - GESHI_HEADER_DIV: Source is outputted in a "div" HTML element. + * - GESHI_HEADER_NONE: No header is outputted. + * + * @var int + */ + var $header_type = GESHI_HEADER_PRE; + + /** + * Array of permissions for which lexics should be highlighted + * @var array + */ + var $lexic_permissions = array( + 'KEYWORDS' => array(), + 'COMMENTS' => array('MULTI' => true), + 'REGEXPS' => array(), + 'ESCAPE_CHAR' => true, + 'BRACKETS' => true, + 'SYMBOLS' => false, + 'STRINGS' => true, + 'NUMBERS' => true, + 'METHODS' => true, + 'SCRIPT' => true + ); + + /** + * The time it took to parse the code + * @var double + */ + var $time = 0; + + /** + * The content of the header block + * @var string + */ + var $header_content = ''; + + /** + * The content of the footer block + * @var string + */ + var $footer_content = ''; + + /** + * The style of the header block + * @var string + */ + var $header_content_style = ''; + + /** + * The style of the footer block + * @var string + */ + var $footer_content_style = ''; + + /** + * Tells if a block around the highlighted source should be forced + * if not using line numbering + * @var boolean + */ + var $force_code_block = false; + + /** + * The styles for hyperlinks in the code + * @var array + */ + var $link_styles = array(); + + /** + * Whether important blocks should be recognised or not + * @var boolean + * @deprecated + * @todo REMOVE THIS FUNCTIONALITY! + */ + var $enable_important_blocks = false; + + /** + * Styles for important parts of the code + * @var string + * @deprecated + * @todo As above - rethink the whole idea of important blocks as it is buggy and + * will be hard to implement in 1.2 + */ + var $important_styles = 'font-weight: bold; color: red;'; // Styles for important parts of the code + + /** + * Whether CSS IDs should be added to the code + * @var boolean + */ + var $add_ids = false; + + /** + * Lines that should be highlighted extra + * @var array + */ + var $highlight_extra_lines = array(); + + /** + * Styles of lines that should be highlighted extra + * @var array + */ + var $highlight_extra_lines_styles = array(); + + /** + * Styles of extra-highlighted lines + * @var string + */ + var $highlight_extra_lines_style = 'background-color: #ffc;'; + + /** + * The line ending + * If null, nl2br() will be used on the result string. + * Otherwise, all instances of \n will be replaced with $line_ending + * @var string + */ + var $line_ending = null; + + /** + * Number at which line numbers should start at + * @var int + */ + var $line_numbers_start = 1; + + /** + * The overall style for this code block + * @var string + */ + var $overall_style = 'font-family:monospace;'; + + /** + * The style for the actual code + * @var string + */ + 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 + * @var string + */ + var $overall_class = ''; + + /** + * The overall ID for this code block + * @var string + */ + var $overall_id = ''; + + /** + * Line number styles + * @var string + */ + var $line_style1 = 'font-weight: normal; vertical-align:top;'; + + /** + * Line number styles for fancy lines + * @var string + */ + 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;text-align:right;margin:0;padding:0 2px;vertical-align:top;'; + + /** + * Flag for how line numbers are displayed + * @var boolean + */ + var $line_numbers = GESHI_NO_LINE_NUMBERS; + + /** + * Flag to decide if multi line spans are allowed. Set it to false to make sure + * each tag is closed before and reopened after each linefeed. + * @var boolean + */ + var $allow_multiline_span = true; + + /** + * The "nth" value for fancy line highlighting + * @var int + */ + var $line_nth_row = 0; + + /** + * The size of tab stops + * @var int + */ + var $tab_width = 8; + + /** + * Should we use language-defined tab stop widths? + * @var int + */ + var $use_language_tab_width = false; + + /** + * Default target for keyword links + * @var string + */ + var $link_target = ''; + + /** + * The encoding to use for entity encoding + * NOTE: Used with Escape Char Sequences to fix UTF-8 handling (cf. SF#2037598) + * @var string + */ + var $encoding = 'utf-8'; + + /** + * Should keywords be linked? + * @var boolean + */ + var $keyword_links = true; + + /** + * Currently loaded language file + * @var string + * @since 1.0.7.22 + */ + var $loaded_language = ''; + + /** + * Wether the caches needed for parsing are built or not + * + * @var bool + * @since 1.0.8 + */ + var $parse_cache_built = false; + + /** + * Work around for Suhosin Patch with disabled /e modifier + * + * Note from suhosins author in config file: + *
+ * The /e modifier inside preg_replace() allows code execution. + * Often it is the cause for remote code execution exploits. It is wise to + * deactivate this feature and test where in the application it is used. + * The developer using the /e modifier should be made aware that he should + * use preg_replace_callback() instead + *
+ * + * @var array + * @since 1.0.8 + */ + var $_kw_replace_group = 0; + var $_rx_key = 0; + + /** + * some "callback parameters" for handle_multiline_regexps + * + * @since 1.0.8 + * @access private + * @var string + */ + var $_hmr_before = ''; + var $_hmr_replace = ''; + var $_hmr_after = ''; + var $_hmr_key = 0; + + /**#@-*/ + + /** + * Creates a new GeSHi object, with source and language + * + * @param string The source code to highlight + * @param string The language to highlight the source with + * @param string The path to the language file directory. This + * is deprecated! I've backported the auto path + * detection from the 1.1.X dev branch, so now it + * should be automatically set correctly. If you have + * renamed the language directory however, you will + * still need to set the path using this parameter or + * {@link GeSHi->set_language_path()} + * @since 1.0.0 + */ + function GeSHi($source = '', $language = '', $path = '') { + if (!empty($source)) { + $this->set_source($source); + } + if (!empty($language)) { + $this->set_language($language); + } + $this->set_language_path($path); + } + + /** + * Returns the version of GeSHi + * + * @return string + * @since 1 0.8.11 + */ + function get_version() + { + return GESHI_VERSION; + } + + /** + * Returns an error message associated with the last GeSHi operation, + * or false if no error has occured + * + * @return string|false An error message if there has been an error, else false + * @since 1.0.0 + */ + function error() { + if ($this->error) { + //Put some template variables for debugging here ... + $debug_tpl_vars = array( + '{LANGUAGE}' => $this->language, + '{PATH}' => $this->language_path + ); + $msg = str_replace( + array_keys($debug_tpl_vars), + array_values($debug_tpl_vars), + $this->error_messages[$this->error]); + + return "
GeSHi Error: $msg (code {$this->error})
"; + } + return false; + } + + /** + * Gets a human-readable language name (thanks to Simon Patterson + * for the idea :)) + * + * @return string The name for the current language + * @since 1.0.2 + */ + function get_language_name() { + if (GESHI_ERROR_NO_SUCH_LANG == $this->error) { + return $this->language_data['LANG_NAME'] . ' (Unknown Language)'; + } + return $this->language_data['LANG_NAME']; + } + + /** + * Sets the source code for this object + * + * @param string The source code to highlight + * @since 1.0.0 + */ + function set_source($source) { + $this->source = $source; + $this->highlight_extra_lines = array(); + } + + /** + * Sets the language for this object + * + * @note since 1.0.8 this function won't reset language-settings by default anymore! + * if you need this set $force_reset = true + * + * @param string The name of the language to use + * @since 1.0.0 + */ + function set_language($language, $force_reset = false) { + if ($force_reset) { + $this->loaded_language = false; + } + + //Clean up the language name to prevent malicious code injection + $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language); + + $language = strtolower($language); + + //Retreive the full filename + $file_name = $this->language_path . $language . '.php'; + if ($file_name == $this->loaded_language) { + // this language is already loaded! + return; + } + + $this->language = $language; + + $this->error = false; + $this->strict_mode = GESHI_NEVER; + + //Check if we can read the desired file + if (!is_readable($file_name)) { + $this->error = GESHI_ERROR_NO_SUCH_LANG; + return; + } + + // Load the language for parsing + $this->load_language($file_name); + } + + /** + * Sets the path to the directory containing the language files. Note + * that this path is relative to the directory of the script that included + * geshi.php, NOT geshi.php itself. + * + * @param string The path to the language directory + * @since 1.0.0 + * @deprecated The path to the language files should now be automatically + * detected, so this method should no longer be needed. The + * 1.1.X branch handles manual setting of the path differently + * 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 + } + } + + /** + * Get supported langs or an associative array lang=>full_name. + * @param boolean $longnames + * @return array + */ + function get_supported_languages($full_names=false) + { + // return array + $back = array(); + + // we walk the lang root + $dir = dir($this->language_path); + + // foreach entry + while (false !== ($entry = $dir->read())) + { + $full_path = $this->language_path.$entry; + + // Skip all dirs + if (is_dir($full_path)) { + continue; + } + + // we only want lang.php files + if (!preg_match('/^([^.]+)\.php$/', $entry, $matches)) { + continue; + } + + // Raw lang name is here + $langname = $matches[1]; + + // We want the fullname too? + if ($full_names === true) + { + if (false !== ($fullname = $this->get_language_fullname($langname))) + { + $back[$langname] = $fullname; // we go associative + } + } + else + { + // just store raw langname + $back[] = $langname; + } + } + + $dir->close(); + + return $back; + } + + /** + * Get full_name for a lang or false. + * @param string $language short langname (html4strict for example) + * @return mixed + */ + function get_language_fullname($language) + { + //Clean up the language name to prevent malicious code injection + $language = preg_replace('#[^a-zA-Z0-9\-_]#', '', $language); + + $language = strtolower($language); + + // get fullpath-filename for a langname + $fullpath = $this->language_path.$language.'.php'; + + // we need to get contents :S + if (false === ($data = file_get_contents($fullpath))) { + $this->error = sprintf('Geshi::get_lang_fullname() Unknown Language: %s', $language); + return false; + } + + // match the langname + if (!preg_match('/\'LANG_NAME\'\s*=>\s*\'((?:[^\']|\\\')+?)\'/', $data, $matches)) { + $this->error = sprintf('Geshi::get_lang_fullname(%s): Regex can not detect language', $language); + return false; + } + + // return fullname for langname + return stripcslashes($matches[1]); + } + + /** + * Sets the type of header to be used. + * + * If GESHI_HEADER_DIV is used, the code is surrounded in a "div".This + * means more source code but more control over tab width and line-wrapping. + * GESHI_HEADER_PRE means that a "pre" is used - less source, but less + * control. Default is GESHI_HEADER_PRE. + * + * From 1.0.7.2, you can use GESHI_HEADER_NONE to specify that no header code + * should be outputted. + * + * @param int The type of header to be used + * @since 1.0.0 + */ + function set_header_type($type) { + //Check if we got a valid header type + if (!in_array($type, array(GESHI_HEADER_NONE, GESHI_HEADER_DIV, + GESHI_HEADER_PRE, GESHI_HEADER_PRE_VALID, GESHI_HEADER_PRE_TABLE))) { + $this->error = GESHI_ERROR_INVALID_HEADER_TYPE; + return; + } + + //Set that new header type + $this->header_type = $type; + } + + /** + * Sets the styles for the code that will be outputted + * when this object is parsed. The style should be a + * string of valid stylesheet declarations + * + * @param string The overall style for the outputted code block + * @param boolean Whether to merge the styles with the current styles or not + * @since 1.0.0 + */ + function set_overall_style($style, $preserve_defaults = false) { + if (!$preserve_defaults) { + $this->overall_style = $style; + } else { + $this->overall_style .= $style; + } + } + + /** + * Sets the overall classname for this block of code. This + * class can then be used in a stylesheet to style this object's + * output + * + * @param string The class name to use for this block of code + * @since 1.0.0 + */ + function set_overall_class($class) { + $this->overall_class = $class; + } + + /** + * Sets the overall id for this block of code. This id can then + * be used in a stylesheet to style this object's output + * + * @param string The ID to use for this block of code + * @since 1.0.0 + */ + function set_overall_id($id) { + $this->overall_id = $id; + } + + /** + * Sets whether CSS classes should be used to highlight the source. Default + * is off, calling this method with no arguments will turn it on + * + * @param boolean Whether to turn classes on or not + * @since 1.0.0 + */ + function enable_classes($flag = true) { + $this->use_classes = ($flag) ? true : false; + } + + /** + * Sets the style for the actual code. This should be a string + * containing valid stylesheet declarations. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * Note: Use this method to override any style changes you made to + * the line numbers if you are using line numbers, else the line of + * code will have the same style as the line number! Consult the + * GeSHi documentation for more information about this. + * + * @param string The style to use for actual code + * @param boolean Whether to merge the current styles with the new styles + * @since 1.0.2 + */ + function set_code_style($style, $preserve_defaults = false) { + if (!$preserve_defaults) { + $this->code_style = $style; + } else { + $this->code_style .= $style; + } + } + + /** + * Sets the styles for the line numbers. + * + * @param string The style for the line numbers that are "normal" + * @param string|boolean If a string, this is the style of the line + * numbers that are "fancy", otherwise if boolean then this + * defines whether the normal styles should be merged with the + * new normal styles or not + * @param boolean If set, is the flag for whether to merge the "fancy" + * styles with the current styles or not + * @since 1.0.2 + */ + function set_line_style($style1, $style2 = '', $preserve_defaults = false) { + //Check if we got 2 or three parameters + if (is_bool($style2)) { + $preserve_defaults = $style2; + $style2 = ''; + } + + //Actually set the new styles + if (!$preserve_defaults) { + $this->line_style1 = $style1; + $this->line_style2 = $style2; + } else { + $this->line_style1 .= $style1; + $this->line_style2 .= $style2; + } + } + + /** + * Sets whether line numbers should be displayed. + * + * Valid values for the first parameter are: + * + * - GESHI_NO_LINE_NUMBERS: Line numbers will not be displayed + * - GESHI_NORMAL_LINE_NUMBERS: Line numbers will be displayed + * - GESHI_FANCY_LINE_NUMBERS: Fancy line numbers will be displayed + * + * For fancy line numbers, the second parameter is used to signal which lines + * are to be fancy. For example, if the value of this parameter is 5 then every + * 5th line will be fancy. + * + * @param int How line numbers should be displayed + * @param int Defines which lines are fancy + * @since 1.0.0 + */ + function enable_line_numbers($flag, $nth_row = 5) { + if (GESHI_NO_LINE_NUMBERS != $flag && GESHI_NORMAL_LINE_NUMBERS != $flag + && GESHI_FANCY_LINE_NUMBERS != $flag) { + $this->error = GESHI_ERROR_INVALID_LINE_NUMBER_TYPE; + } + $this->line_numbers = $flag; + $this->line_nth_row = $nth_row; + } + + /** + * Sets wether spans and other HTML markup generated by GeSHi can + * span over multiple lines or not. Defaults to true to reduce overhead. + * Set it to false if you want to manipulate the output or manually display + * the code in an ordered list. + * + * @param boolean Wether multiline spans are allowed or not + * @since 1.0.7.22 + */ + function enable_multiline_span($flag) { + $this->allow_multiline_span = (bool) $flag; + } + + /** + * Get current setting for multiline spans, see GeSHi->enable_multiline_span(). + * + * @see enable_multiline_span + * @return bool + */ + function get_multiline_span() { + return $this->allow_multiline_span; + } + + /** + * Sets the style for a keyword group. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param int The key of the keyword group to change the styles of + * @param string The style to make the keywords + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_keyword_group_style($key, $style, $preserve_defaults = false) { + //Set the style for this keyword group + if (!$preserve_defaults) { + $this->language_data['STYLES']['KEYWORDS'][$key] = $style; + } else { + $this->language_data['STYLES']['KEYWORDS'][$key] .= $style; + } + + //Update the lexic permissions + if (!isset($this->lexic_permissions['KEYWORDS'][$key])) { + $this->lexic_permissions['KEYWORDS'][$key] = true; + } + } + + /** + * Turns highlighting on/off for a keyword group + * + * @param int The key of the keyword group to turn on or off + * @param boolean Whether to turn highlighting for that group on or off + * @since 1.0.0 + */ + function set_keyword_group_highlighting($key, $flag = true) { + $this->lexic_permissions['KEYWORDS'][$key] = ($flag) ? true : false; + } + + /** + * Sets the styles for comment groups. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param int The key of the comment group to change the styles of + * @param string The style to make the comments + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_comments_style($key, $style, $preserve_defaults = false) { + if (!$preserve_defaults) { + $this->language_data['STYLES']['COMMENTS'][$key] = $style; + } else { + $this->language_data['STYLES']['COMMENTS'][$key] .= $style; + } + } + + /** + * Turns highlighting on/off for comment groups + * + * @param int The key of the comment group to turn on or off + * @param boolean Whether to turn highlighting for that group on or off + * @since 1.0.0 + */ + function set_comments_highlighting($key, $flag = true) { + $this->lexic_permissions['COMMENTS'][$key] = ($flag) ? true : false; + } + + /** + * Sets the styles for escaped characters. 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 escape characters + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_escape_characters_style($style, $preserve_defaults = false, $group = 0) { + if (!$preserve_defaults) { + $this->language_data['STYLES']['ESCAPE_CHAR'][$group] = $style; + } else { + $this->language_data['STYLES']['ESCAPE_CHAR'][$group] .= $style; + } + } + + /** + * Turns highlighting on/off for escaped characters + * + * @param boolean Whether to turn highlighting for escape characters on or off + * @since 1.0.0 + */ + function set_escape_characters_highlighting($flag = true) { + $this->lexic_permissions['ESCAPE_CHAR'] = ($flag) ? true : false; + } + + /** + * Sets the styles for brackets. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * This method is DEPRECATED: use set_symbols_style instead. + * This method will be removed in 1.2.X + * + * @param string The style to make the brackets + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + * @deprecated In favour of set_symbols_style + */ + function set_brackets_style($style, $preserve_defaults = false) { + if (!$preserve_defaults) { + $this->language_data['STYLES']['BRACKETS'][0] = $style; + } else { + $this->language_data['STYLES']['BRACKETS'][0] .= $style; + } + } + + /** + * Turns highlighting on/off for brackets + * + * This method is DEPRECATED: use set_symbols_highlighting instead. + * This method will be remove in 1.2.X + * + * @param boolean Whether to turn highlighting for brackets on or off + * @since 1.0.0 + * @deprecated In favour of set_symbols_highlighting + */ + function set_brackets_highlighting($flag) { + $this->lexic_permissions['BRACKETS'] = ($flag) ? true : false; + } + + /** + * Sets the styles for symbols. 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 symbols + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @param int Tells the group of symbols for which style should be set. + * @since 1.0.1 + */ + function set_symbols_style($style, $preserve_defaults = false, $group = 0) { + // Update the style of symbols + if (!$preserve_defaults) { + $this->language_data['STYLES']['SYMBOLS'][$group] = $style; + } else { + $this->language_data['STYLES']['SYMBOLS'][$group] .= $style; + } + + // For backward compatibility + if (0 == $group) { + $this->set_brackets_style ($style, $preserve_defaults); + } + } + + /** + * Turns highlighting on/off for symbols + * + * @param boolean Whether to turn highlighting for symbols on or off + * @since 1.0.0 + */ + function set_symbols_highlighting($flag) { + // Update lexic permissions for this symbol group + $this->lexic_permissions['SYMBOLS'] = ($flag) ? true : false; + + // For backward compatibility + $this->set_brackets_highlighting ($flag); + } + + /** + * Sets the styles for strings. 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 escape characters + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @param int Tells the group of strings for which style should be set. + * @since 1.0.0 + */ + function set_strings_style($style, $preserve_defaults = false, $group = 0) { + if (!$preserve_defaults) { + $this->language_data['STYLES']['STRINGS'][$group] = $style; + } else { + $this->language_data['STYLES']['STRINGS'][$group] .= $style; + } + } + + /** + * Turns highlighting on/off for strings + * + * @param boolean Whether to turn highlighting for strings on or off + * @since 1.0.0 + */ + function set_strings_highlighting($flag) { + $this->lexic_permissions['STRINGS'] = ($flag) ? true : false; + } + + /** + * 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 + * + * @param string The style to make the numbers + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @param int Tells the group of numbers for which style should be set. + * @since 1.0.0 + */ + function set_numbers_style($style, $preserve_defaults = false, $group = 0) { + if (!$preserve_defaults) { + $this->language_data['STYLES']['NUMBERS'][$group] = $style; + } else { + $this->language_data['STYLES']['NUMBERS'][$group] .= $style; + } + } + + /** + * Turns highlighting on/off for numbers + * + * @param boolean Whether to turn highlighting for numbers on or off + * @since 1.0.0 + */ + function set_numbers_highlighting($flag) { + $this->lexic_permissions['NUMBERS'] = ($flag) ? true : false; + } + + /** + * Sets the styles for methods. $key is a number that references the + * appropriate "object splitter" - see the language file for the language + * you are highlighting to get this number. If $preserve_defaults is + * true, then styles are merged with the default styles, with the + * user defined styles having priority + * + * @param int The key of the object splitter to change the styles of + * @param string The style to make the methods + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_methods_style($key, $style, $preserve_defaults = false) { + if (!$preserve_defaults) { + $this->language_data['STYLES']['METHODS'][$key] = $style; + } else { + $this->language_data['STYLES']['METHODS'][$key] .= $style; + } + } + + /** + * Turns highlighting on/off for methods + * + * @param boolean Whether to turn highlighting for methods on or off + * @since 1.0.0 + */ + function set_methods_highlighting($flag) { + $this->lexic_permissions['METHODS'] = ($flag) ? true : false; + } + + /** + * Sets the styles for regexps. 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 regular expression matches + * @param boolean Whether to merge the new styles with the old or just + * to overwrite them + * @since 1.0.0 + */ + function set_regexps_style($key, $style, $preserve_defaults = false) { + if (!$preserve_defaults) { + $this->language_data['STYLES']['REGEXPS'][$key] = $style; + } else { + $this->language_data['STYLES']['REGEXPS'][$key] .= $style; + } + } + + /** + * Turns highlighting on/off for regexps + * + * @param int The key of the regular expression group to turn on or off + * @param boolean Whether to turn highlighting for the regular expression group on or off + * @since 1.0.0 + */ + function set_regexps_highlighting($key, $flag) { + $this->lexic_permissions['REGEXPS'][$key] = ($flag) ? true : false; + } + + /** + * Sets whether a set of keywords are checked for in a case sensitive manner + * + * @param int The key of the keyword group to change the case sensitivity of + * @param boolean Whether to check in a case sensitive manner or not + * @since 1.0.0 + */ + function set_case_sensitivity($key, $case) { + $this->language_data['CASE_SENSITIVE'][$key] = ($case) ? true : false; + } + + /** + * Sets the case that keywords should use when found. Use the constants: + * + * - GESHI_CAPS_NO_CHANGE: leave keywords as-is + * - GESHI_CAPS_UPPER: convert all keywords to uppercase where found + * - GESHI_CAPS_LOWER: convert all keywords to lowercase where found + * + * @param int A constant specifying what to do with matched keywords + * @since 1.0.1 + */ + function set_case_keywords($case) { + if (in_array($case, array( + GESHI_CAPS_NO_CHANGE, GESHI_CAPS_UPPER, GESHI_CAPS_LOWER))) { + $this->language_data['CASE_KEYWORDS'] = $case; + } + } + + /** + * Sets how many spaces a tab is substituted for + * + * Widths below zero are ignored + * + * @param int The tab width + * @since 1.0.0 + */ + function set_tab_width($width) { + $this->tab_width = intval($width); + + //Check if it fit's the constraints: + if ($this->tab_width < 1) { + //Return it to the default + $this->tab_width = 8; + } + } + + /** + * Sets whether or not to use tab-stop width specifed by language + * + * @param boolean Whether to use language-specific tab-stop widths + * @since 1.0.7.20 + */ + function set_use_language_tab_width($use) { + $this->use_language_tab_width = (bool) $use; + } + + /** + * Returns the tab width to use, based on the current language and user + * preference + * + * @return int Tab width + * @since 1.0.7.20 + */ + function get_real_tab_width() { + if (!$this->use_language_tab_width || + !isset($this->language_data['TAB_WIDTH'])) { + return $this->tab_width; + } else { + return $this->language_data['TAB_WIDTH']; + } + } + + /** + * Enables/disables strict highlighting. Default is off, calling this + * method without parameters will turn it on. See documentation + * for more details on strict mode and where to use it. + * + * @param boolean Whether to enable strict mode or not + * @since 1.0.0 + */ + function enable_strict_mode($mode = true) { + if (GESHI_MAYBE == $this->language_data['STRICT_MODE_APPLIES']) { + $this->strict_mode = ($mode) ? GESHI_ALWAYS : GESHI_NEVER; + } + } + + /** + * Disables all highlighting + * + * @since 1.0.0 + * @todo Rewrite with array traversal + * @deprecated In favour of enable_highlighting + */ + function disable_highlighting() { + $this->enable_highlighting(false); + } + + /** + * Enables all highlighting + * + * The optional flag parameter was added in version 1.0.7.21 and can be used + * to enable (true) or disable (false) all highlighting. + * + * @since 1.0.0 + * @param boolean A flag specifying whether to enable or disable all highlighting + * @todo Rewrite with array traversal + */ + function enable_highlighting($flag = true) { + $flag = $flag ? true : false; + foreach ($this->lexic_permissions as $key => $value) { + if (is_array($value)) { + foreach ($value as $k => $v) { + $this->lexic_permissions[$key][$k] = $flag; + } + } else { + $this->lexic_permissions[$key] = $flag; + } + } + + // Context blocks + $this->enable_important_blocks = $flag; + } + + /** + * Given a file extension, this method returns either a valid geshi language + * name, or the empty string if it couldn't be found + * + * @param string The extension to get a language name for + * @param array A lookup array to use instead of the default one + * @since 1.0.5 + * @todo Re-think about how this method works (maybe make it private and/or make it + * a extension->lang lookup?) + * @todo static? + */ + function get_language_name_from_extension( $extension, $lookup = array() ) { + $extension = strtolower($extension); + + if ( !is_array($lookup) || empty($lookup)) { + $lookup = array( + '6502acme' => array( 'a', 's', 'asm', 'inc' ), + '6502tasm' => array( 'a', 's', 'asm', 'inc' ), + '6502kickass' => array( 'a', 's', 'asm', 'inc' ), + '68000devpac' => array( 'a', 's', 'asm', 'inc' ), + 'abap' => array('abap'), + 'actionscript' => array('as'), + 'ada' => array('a', 'ada', 'adb', 'ads'), + 'apache' => array('conf'), + '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', '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'), + 'gdb' => array('kcrash', 'crash', 'bt'), + 'gettext' => array('po', 'pot'), + 'gml' => array('gml'), + 'gnuplot' => array('plt'), + 'groovy' => array('groovy'), + 'haskell' => array('hs'), + 'haxe' => array('hx'), + '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(), + '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'), + 'text' => array('txt'), + 'vb' => array('bas'), + 'vbnet' => array(), + 'visualfoxpro' => array(), + 'whitespace' => array('ws'), + 'xml' => array('xml', 'svg', 'xrc'), + 'z80' => array('z80', 'asm', 'inc') + ); + } + + foreach ($lookup as $lang => $extensions) { + if (in_array($extension, $extensions)) { + return $lang; + } + } + + return 'text'; + } + + /** + * Given a file name, this method loads its contents in, and attempts + * to set the language automatically. An optional lookup table can be + * passed for looking up the language name. If not specified a default + * table is used + * + * The language table is in the form + * 
array(
+     *   'lang_name' => array('extension', 'extension', ...),
+     *   'lang_name' ...
+     * );
+ * + * @param string The filename to load the source from + * @param array A lookup array to use instead of the default one + * @todo Complete rethink of this and above method + * @since 1.0.5 + */ + function load_from_file($file_name, $lookup = array()) { + if (is_readable($file_name)) { + $this->set_source(file_get_contents($file_name)); + $this->set_language($this->get_language_name_from_extension(substr(strrchr($file_name, '.'), 1), $lookup)); + } else { + $this->error = GESHI_ERROR_FILE_NOT_READABLE; + } + } + + /** + * Adds a keyword to a keyword group for highlighting + * + * @param int The key of the keyword group to add the keyword to + * @param string The word to add to the keyword group + * @since 1.0.0 + */ + function add_keyword($key, $word) { + if (!is_array($this->language_data['KEYWORDS'][$key])) { + $this->language_data['KEYWORDS'][$key] = array(); + } + if (!in_array($word, $this->language_data['KEYWORDS'][$key])) { + $this->language_data['KEYWORDS'][$key][] = $word; + + //NEW in 1.0.8 don't recompile the whole optimized regexp, simply append it + if ($this->parse_cache_built) { + $subkey = count($this->language_data['CACHED_KEYWORD_LISTS'][$key]) - 1; + $this->language_data['CACHED_KEYWORD_LISTS'][$key][$subkey] .= '|' . preg_quote($word, '/'); + } + } + } + + /** + * Removes a keyword from a keyword group + * + * @param int The key of the keyword group to remove the keyword from + * @param string The word to remove from the keyword group + * @param bool Wether to automatically recompile the optimized regexp list or not. + * Note: if you set this to false and @see GeSHi->parse_code() was already called once, + * for the current language, you have to manually call @see GeSHi->optimize_keyword_group() + * or the removed keyword will stay in cache and still be highlighted! On the other hand + * it might be too expensive to recompile the regexp list for every removal if you want to + * remove a lot of keywords. + * @since 1.0.0 + */ + function remove_keyword($key, $word, $recompile = true) { + $key_to_remove = array_search($word, $this->language_data['KEYWORDS'][$key]); + if ($key_to_remove !== false) { + unset($this->language_data['KEYWORDS'][$key][$key_to_remove]); + + //NEW in 1.0.8, optionally recompile keyword group + if ($recompile && $this->parse_cache_built) { + $this->optimize_keyword_group($key); + } + } + } + + /** + * Creates a new keyword group + * + * @param int The key of the keyword group to create + * @param string The styles for the keyword group + * @param boolean Whether the keyword group is case sensitive ornot + * @param array The words to use for the keyword group + * @since 1.0.0 + */ + function add_keyword_group($key, $styles, $case_sensitive = true, $words = array()) { + $words = (array) $words; + if (empty($words)) { + // empty word lists mess up highlighting + return false; + } + + //Add the new keyword group internally + $this->language_data['KEYWORDS'][$key] = $words; + $this->lexic_permissions['KEYWORDS'][$key] = true; + $this->language_data['CASE_SENSITIVE'][$key] = $case_sensitive; + $this->language_data['STYLES']['KEYWORDS'][$key] = $styles; + + //NEW in 1.0.8, cache keyword regexp + if ($this->parse_cache_built) { + $this->optimize_keyword_group($key); + } + } + + /** + * Removes a keyword group + * + * @param int The key of the keyword group to remove + * @since 1.0.0 + */ + function remove_keyword_group ($key) { + //Remove the keyword group internally + unset($this->language_data['KEYWORDS'][$key]); + unset($this->lexic_permissions['KEYWORDS'][$key]); + unset($this->language_data['CASE_SENSITIVE'][$key]); + unset($this->language_data['STYLES']['KEYWORDS'][$key]); + + //NEW in 1.0.8 + unset($this->language_data['CACHED_KEYWORD_LISTS'][$key]); + } + + /** + * compile optimized regexp list for keyword group + * + * @param int The key of the keyword group to compile & optimize + * @since 1.0.8 + */ + 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); + } + } + } + + /** + * Sets the content of the header block + * + * @param string The content of the header block + * @since 1.0.2 + */ + function set_header_content($content) { + $this->header_content = $content; + } + + /** + * Sets the content of the footer block + * + * @param string The content of the footer block + * @since 1.0.2 + */ + function set_footer_content($content) { + $this->footer_content = $content; + } + + /** + * Sets the style for the header content + * + * @param string The style for the header content + * @since 1.0.2 + */ + function set_header_content_style($style) { + $this->header_content_style = $style; + } + + /** + * Sets the style for the footer content + * + * @param string The style for the footer content + * @since 1.0.2 + */ + function set_footer_content_style($style) { + $this->footer_content_style = $style; + } + + /** + * Sets whether to force a surrounding block around + * the highlighted code or not + * + * @param boolean Tells whether to enable or disable this feature + * @since 1.0.7.20 + */ + function enable_inner_code_block($flag) { + $this->force_code_block = (bool)$flag; + } + + /** + * Sets the base URL to be used for keywords + * + * @param int The key of the keyword group to set the URL for + * @param string The URL to set for the group. If {FNAME} is in + * the url somewhere, it is replaced by the keyword + * that the URL is being made for + * @since 1.0.2 + */ + function set_url_for_keyword_group($group, $url) { + $this->language_data['URLS'][$group] = $url; + } + + /** + * Sets styles for links in code + * + * @param int A constant that specifies what state the style is being + * set for - e.g. :hover or :visited + * @param string The styles to use for that state + * @since 1.0.2 + */ + function set_link_styles($type, $styles) { + $this->link_styles[$type] = $styles; + } + + /** + * Sets the target for links in code + * + * @param string The target for links in the code, e.g. _blank + * @since 1.0.3 + */ + function set_link_target($target) { + if (!$target) { + $this->link_target = ''; + } else { + $this->link_target = ' target="' . $target . '"'; + } + } + + /** + * Sets styles for important parts of the code + * + * @param string The styles to use on important parts of the code + * @since 1.0.2 + */ + function set_important_styles($styles) { + $this->important_styles = $styles; + } + + /** + * Sets whether context-important blocks are highlighted + * + * @param boolean Tells whether to enable or disable highlighting of important blocks + * @todo REMOVE THIS SHIZ FROM GESHI! + * @deprecated + * @since 1.0.2 + */ + function enable_important_blocks($flag) { + $this->enable_important_blocks = ( $flag ) ? true : false; + } + + /** + * Whether CSS IDs should be added to each line + * + * @param boolean If true, IDs will be added to each line. + * @since 1.0.2 + */ + function enable_ids($flag = true) { + $this->add_ids = ($flag) ? true : false; + } + + /** + * Specifies which lines to highlight extra + * + * The extra style parameter was added in 1.0.7.21. + * + * @param mixed An array of line numbers to highlight, or just a line + * number on its own. + * @param string A string specifying the style to use for this line. + * If null is specified, the default style is used. + * If false is specified, the line will be removed from + * special highlighting + * @since 1.0.2 + * @todo Some data replication here that could be cut down on + */ + function highlight_lines_extra($lines, $style = null) { + if (is_array($lines)) { + //Split up the job using single lines at a time + foreach ($lines as $line) { + $this->highlight_lines_extra($line, $style); + } + } else { + //Mark the line as being highlighted specially + $lines = intval($lines); + $this->highlight_extra_lines[$lines] = $lines; + + //Decide on which style to use + if ($style === null) { //Check if we should use default style + unset($this->highlight_extra_lines_styles[$lines]); + } elseif ($style === false) { //Check if to remove this line + unset($this->highlight_extra_lines[$lines]); + unset($this->highlight_extra_lines_styles[$lines]); + } else { + $this->highlight_extra_lines_styles[$lines] = $style; + } + } + } + + /** + * Sets the style for extra-highlighted lines + * + * @param string The style for extra-highlighted lines + * @since 1.0.2 + */ + function set_highlight_lines_extra_style($styles) { + $this->highlight_extra_lines_style = $styles; + } + + /** + * Sets the line-ending + * + * @param string The new line-ending + * @since 1.0.2 + */ + function set_line_ending($line_ending) { + $this->line_ending = (string)$line_ending; + } + + /** + * Sets what number line numbers should start at. Should + * be a positive integer, and will be converted to one. + * + * Warning: Using this method will add the "start" + * attribute to the <ol> that is used for line numbering. + * This is not valid XHTML strict, so if that's what you + * care about then don't use this method. Firefox is getting + * support for the CSS method of doing this in 1.1 and Opera + * has support for the CSS method, but (of course) IE doesn't + * so it's not worth doing it the CSS way yet. + * + * @param int The number to start line numbers at + * @since 1.0.2 + */ + function start_line_numbers_at($number) { + $this->line_numbers_start = abs(intval($number)); + } + + /** + * Sets the encoding used for htmlspecialchars(), for international + * support. + * + * NOTE: This is not needed for now because htmlspecialchars() is not + * being used (it has a security hole in PHP4 that has not been patched). + * Maybe in a future version it may make a return for speed reasons, but + * I doubt it. + * + * @param string The encoding to use for the source + * @since 1.0.3 + */ + function set_encoding($encoding) { + if ($encoding) { + $this->encoding = strtolower($encoding); + } + } + + /** + * Turns linking of keywords on or off. + * + * @param boolean If true, links will be added to keywords + * @since 1.0.2 + */ + function enable_keyword_links($enable = true) { + $this->keyword_links = (bool) $enable; + } + + /** + * Setup caches needed for styling. This is automatically called in + * parse_code() and get_stylesheet() when appropriate. This function helps + * stylesheet generators as they rely on some style information being + * preprocessed + * + * @since 1.0.8 + * @access private + */ + function build_style_cache() { + //Build the style cache needed to highlight numbers appropriate + if($this->lexic_permissions['NUMBERS']) { + //First check what way highlighting information for numbers are given + if(!isset($this->language_data['NUMBERS'])) { + $this->language_data['NUMBERS'] = 0; + } + + if(is_array($this->language_data['NUMBERS'])) { + $this->language_data['NUMBERS_CACHE'] = $this->language_data['NUMBERS']; + } else { + $this->language_data['NUMBERS_CACHE'] = array(); + if(!$this->language_data['NUMBERS']) { + $this->language_data['NUMBERS'] = + GESHI_NUMBER_INT_BASIC | + GESHI_NUMBER_FLT_NONSCI; + } + + for($i = 0, $j = $this->language_data['NUMBERS']; $j > 0; ++$i, $j>>=1) { + //Rearrange style indices if required ... + if(isset($this->language_data['STYLES']['NUMBERS'][1<<$i])) { + $this->language_data['STYLES']['NUMBERS'][$i] = + $this->language_data['STYLES']['NUMBERS'][1<<$i]; + unset($this->language_data['STYLES']['NUMBERS'][1<<$i]); + } + + //Check if this bit is set for highlighting + if($j&1) { + //So this bit is set ... + //Check if it belongs to group 0 or the actual stylegroup + if(isset($this->language_data['STYLES']['NUMBERS'][$i])) { + $this->language_data['NUMBERS_CACHE'][$i] = 1 << $i; + } else { + if(!isset($this->language_data['NUMBERS_CACHE'][0])) { + $this->language_data['NUMBERS_CACHE'][0] = 0; + } + $this->language_data['NUMBERS_CACHE'][0] |= 1 << $i; + } + } + } + } + } + } + + /** + * Setup caches needed for parsing. This is automatically called in parse_code() when appropriate. + * This function makes stylesheet generators much faster as they do not need these caches. + * + * @since 1.0.8 + * @access private + */ + function build_parse_cache() { + // cache symbol regexp + //As this is a costy operation, we avoid doing it for multiple groups ... + //Instead we perform it for all symbols at once. + // + //For this to work, we need to reorganize the data arrays. + if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) { + $this->language_data['MULTIPLE_SYMBOL_GROUPS'] = count($this->language_data['STYLES']['SYMBOLS']) > 1; + + $this->language_data['SYMBOL_DATA'] = array(); + $symbol_preg_multi = array(); // multi char symbols + $symbol_preg_single = array(); // single char symbols + foreach ($this->language_data['SYMBOLS'] as $key => $symbols) { + if (is_array($symbols)) { + foreach ($symbols as $sym) { + $sym = $this->hsc($sym); + if (!isset($this->language_data['SYMBOL_DATA'][$sym])) { + $this->language_data['SYMBOL_DATA'][$sym] = $key; + if (isset($sym[1])) { // multiple chars + $symbol_preg_multi[] = preg_quote($sym, '/'); + } else { // single char + if ($sym == '-') { + // don't trigger range out of order error + $symbol_preg_single[] = '\-'; + } else { + $symbol_preg_single[] = preg_quote($sym, '/'); + } + } + } + } + } else { + $symbols = $this->hsc($symbols); + if (!isset($this->language_data['SYMBOL_DATA'][$symbols])) { + $this->language_data['SYMBOL_DATA'][$symbols] = 0; + if (isset($symbols[1])) { // multiple chars + $symbol_preg_multi[] = preg_quote($symbols, '/'); + } elseif ($symbols == '-') { + // don't trigger range out of order error + $symbol_preg_single[] = '\-'; + } else { // single char + $symbol_preg_single[] = preg_quote($symbols, '/'); + } + } + } + } + + //Now we have an array with each possible symbol as the key and the style as the actual data. + //This way we can set the correct style just the moment we highlight ... + // + //Now we need to rewrite our array to get a search string that + $symbol_preg = array(); + 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); + } + + // cache optimized regexp for keyword matching + // remove old cache + $this->language_data['CACHED_KEYWORD_LISTS'] = array(); + foreach (array_keys($this->language_data['KEYWORDS']) as $key) { + if (!isset($this->lexic_permissions['KEYWORDS'][$key]) || + $this->lexic_permissions['KEYWORDS'][$key]) { + $this->optimize_keyword_group($key); + } + } + + // brackets + if ($this->lexic_permissions['BRACKETS']) { + $this->language_data['CACHE_BRACKET_MATCH'] = array('[', ']', '(', ')', '{', '}'); + if (!$this->use_classes && isset($this->language_data['STYLES']['BRACKETS'][0])) { + $this->language_data['CACHE_BRACKET_REPLACE'] = array( + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">[|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">]|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">(|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">)|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">{|>', + '<| style="' . $this->language_data['STYLES']['BRACKETS'][0] . '">}|>', + ); + } + else { + $this->language_data['CACHE_BRACKET_REPLACE'] = array( + '<| class="br0">[|>', + '<| class="br0">]|>', + '<| class="br0">(|>', + '<| class="br0">)|>', + '<| class="br0">{|>', + '<| class="br0">}|>', + ); + } + } + + //Build the parse cache needed to highlight numbers appropriate + if($this->lexic_permissions['NUMBERS']) { + //Check if the style rearrangements have been processed ... + //This also does some preprocessing to check which style groups are useable ... + if(!isset($this->language_data['NUMBERS_CACHE'])) { + $this->build_style_cache(); + } + + //Number format specification + //All this formats are matched case-insensitively! + static $numbers_format = array( + GESHI_NUMBER_INT_BASIC => + '(?:(? + '(? + '(? + '(? + '(? + '(? + '(? + '(? + '(? + '(? + '(? + '(? + '(? + '(? + '(? + '(?language_data['NUMBERS_RXCACHE'] = array(); + foreach($this->language_data['NUMBERS_CACHE'] as $key => $rxdata) { + if(is_string($rxdata)) { + $regexp = $rxdata; + } else { + //This is a bitfield of number flags to highlight: + //Build an array, implode them together and make this the actual RX + $rxuse = array(); + for($i = 1; $i <= $rxdata; $i<<=1) { + if($rxdata & $i) { + $rxuse[] = $numbers_format[$i]; + } + } + $regexp = implode("|", $rxuse); + } + + $this->language_data['NUMBERS_RXCACHE'][$key] = + "/(?)($regexp)(?!(?:|(?>[^\<]))+>)(?![^<]*>)(?!\|>)(?!\/>)/i"; // + } + + if(!isset($this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'])) { + $this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'] = '#\d#'; + } + } + + $this->parse_cache_built = true; + } + + /** + * Returns the code in $this->source, highlighted and surrounded by the + * nessecary HTML. + * + * This should only be called ONCE, cos it's SLOW! If you want to highlight + * the same source multiple times, you're better off doing a whole lot of + * str_replaces to replace the <span>s + * + * @since 1.0.0 + */ + function parse_code () { + // Start the timer + $start_time = microtime(); + + // Replace all newlines to a common form. + $code = str_replace("\r\n", "\n", $this->source); + $code = str_replace("\r", "\n", $code); + + // Firstly, if there is an error, we won't highlight + if ($this->error) { + //Escape the source for output + $result = $this->hsc($this->source); + + //This fix is related to SF#1923020, but has to be applied regardless of + //actually highlighting symbols. + $result = str_replace(array('', ''), array(';', '|'), $result); + + // Timing is irrelevant + $this->set_time($start_time, $start_time); + $this->finalise($result); + return $result; + } + + // make sure the parse cache is up2date + if (!$this->parse_cache_built) { + $this->build_parse_cache(); + } + + // Initialise various stuff + $length = strlen($code); + $COMMENT_MATCHED = false; + $stuff_to_parse = ''; + $endresult = ''; + + // "Important" selections are handled like multiline comments + // @todo GET RID OF THIS SHIZ + if ($this->enable_important_blocks) { + $this->language_data['COMMENT_MULTI'][GESHI_START_IMPORTANT] = GESHI_END_IMPORTANT; + } + + if ($this->strict_mode) { + // Break the source into bits. Each bit will be a portion of the code + // within script delimiters - for example, HTML between < and > + $k = 0; + $parts = array(); + $matches = array(); + $next_match_pointer = null; + // we use a copy to unset delimiters on demand (when they are not found) + $delim_copy = $this->language_data['SCRIPT_DELIMITERS']; + $i = 0; + while ($i < $length) { + $next_match_pos = $length + 1; // never true + foreach ($delim_copy as $dk => $delimiters) { + if(is_array($delimiters)) { + foreach ($delimiters as $open => $close) { + // make sure the cache is setup properly + if (!isset($matches[$dk][$open])) { + $matches[$dk][$open] = array( + 'next_match' => -1, + 'dk' => $dk, + + 'open' => $open, // needed for grouping of adjacent code blocks (see below) + 'open_strlen' => strlen($open), + + 'close' => $close, + 'close_strlen' => strlen($close), + ); + } + // Get the next little bit for this opening string + if ($matches[$dk][$open]['next_match'] < $i) { + // only find the next pos if it was not already cached + $open_pos = strpos($code, $open, $i); + if ($open_pos === false) { + // no match for this delimiter ever + unset($delim_copy[$dk][$open]); + continue; + } + $matches[$dk][$open]['next_match'] = $open_pos; + } + if ($matches[$dk][$open]['next_match'] < $next_match_pos) { + //So we got a new match, update the close_pos + $matches[$dk][$open]['close_pos'] = + strpos($code, $close, $matches[$dk][$open]['next_match']+1); + + $next_match_pointer =& $matches[$dk][$open]; + $next_match_pos = $matches[$dk][$open]['next_match']; + } + } + } else { + //So we should match an RegExp as Strict Block ... + /** + * The value in $delimiters is expected to be an RegExp + * containing exactly 2 matching groups: + * - Group 1 is the opener + * - Group 2 is the closer + */ + 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 ... + 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['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]); + continue; + } + + if ($matches[$dk]['next_match'] <= $next_match_pos) { + $next_match_pointer =& $matches[$dk]; + $next_match_pos = $matches[$dk]['next_match']; + } + } + } + + // non-highlightable text + $parts[$k] = array( + 1 => substr($code, $i, $next_match_pos - $i) + ); + ++$k; + + if ($next_match_pos > $length) { + // out of bounds means no next match was found + break; + } + + // highlightable code + $parts[$k][0] = $next_match_pointer['dk']; + + //Only combine for non-rx script blocks + if(is_array($delim_copy[$next_match_pointer['dk']])) { + // group adjacent script blocks, e.g. should be one block, not three! + $i = $next_match_pos + $next_match_pointer['open_strlen']; + while (true) { + $close_pos = strpos($code, $next_match_pointer['close'], $i); + if ($close_pos == false) { + break; + } + $i = $close_pos + $next_match_pointer['close_strlen']; + if ($i == $length) { + break; + } + if ($code[$i] == $next_match_pointer['open'][0] && ($next_match_pointer['open_strlen'] == 1 || + substr($code, $i, $next_match_pointer['open_strlen']) == $next_match_pointer['open'])) { + // merge adjacent but make sure we don't merge things like + foreach ($matches as $submatches) { + foreach ($submatches as $match) { + if ($match['next_match'] == $i) { + // a different block already matches here! + break 3; + } + } + } + } else { + break; + } + } + } else { + $close_pos = $next_match_pointer['close_pos'] + $next_match_pointer['close_strlen']; + $i = $close_pos; + } + + if ($close_pos === false) { + // no closing delimiter found! + $parts[$k][1] = substr($code, $next_match_pos); + ++$k; + break; + } else { + $parts[$k][1] = substr($code, $next_match_pos, $i - $next_match_pos); + ++$k; + } + } + unset($delim_copy, $next_match_pointer, $next_match_pos, $matches); + $num_parts = $k; + + if ($num_parts == 1 && $this->strict_mode == GESHI_MAYBE) { + // when we have only one part, we don't have anything to highlight at all. + // if we have a "maybe" strict language, this should be handled as highlightable code + $parts = array( + 0 => array( + 0 => '', + 1 => '' + ), + 1 => array( + 0 => null, + 1 => $parts[0][1] + ) + ); + $num_parts = 2; + } + + } else { + // Not strict mode - simply dump the source into + // the array at index 1 (the first highlightable block) + $parts = array( + 0 => array( + 0 => '', + 1 => '' + ), + 1 => array( + 0 => null, + 1 => $code + ) + ); + $num_parts = 2; + } + + //Unset variables we won't need any longer + unset($code); + + //Preload some repeatedly used values regarding hardquotes ... + $hq = isset($this->language_data['HARDQUOTE']) ? $this->language_data['HARDQUOTE'][0] : false; + $hq_strlen = strlen($hq); + + //Preload if line numbers are to be generated afterwards + //Added a check if line breaks should be forced even without line numbers, fixes SF#1727398 + $check_linenumbers = $this->line_numbers != GESHI_NO_LINE_NUMBERS || + !empty($this->highlight_extra_lines) || !$this->allow_multiline_span; + + //preload the escape char for faster checking ... + $escaped_escape_char = $this->hsc($this->language_data['ESCAPE_CHAR']); + + // this is used for single-line comments + $sc_disallowed_before = ""; + $sc_disallowed_after = ""; + + if (isset($this->language_data['PARSER_CONTROL'])) { + if (isset($this->language_data['PARSER_CONTROL']['COMMENTS'])) { + if (isset($this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_BEFORE'])) { + $sc_disallowed_before = $this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_BEFORE']; + } + if (isset($this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_AFTER'])) { + $sc_disallowed_after = $this->language_data['PARSER_CONTROL']['COMMENTS']['DISALLOWED_AFTER']; + } + } + } + + //Fix for SF#1932083: Multichar Quotemarks unsupported + $is_string_starter = array(); + if ($this->lexic_permissions['STRINGS']) { + foreach ($this->language_data['QUOTEMARKS'] as $quotemark) { + if (!isset($is_string_starter[$quotemark[0]])) { + $is_string_starter[$quotemark[0]] = (string)$quotemark; + } elseif (is_string($is_string_starter[$quotemark[0]])) { + $is_string_starter[$quotemark[0]] = array( + $is_string_starter[$quotemark[0]], + $quotemark); + } else { + $is_string_starter[$quotemark[0]][] = $quotemark; + } + } + } + + // Now we go through each part. We know that even-indexed parts are + // code that shouldn't be highlighted, and odd-indexed parts should + // be highlighted + for ($key = 0; $key < $num_parts; ++$key) { + $STRICTATTRS = ''; + + // If this block should be highlighted... + if (!($key & 1)) { + // Else not a block to highlight + $endresult .= $this->hsc($parts[$key][1]); + unset($parts[$key]); + continue; + } + + $result = ''; + $part = $parts[$key][1]; + + $highlight_part = true; + if ($this->strict_mode && !is_null($parts[$key][0])) { + // get the class key for this block of code + $script_key = $parts[$key][0]; + $highlight_part = $this->language_data['HIGHLIGHT_STRICT_BLOCK'][$script_key]; + if ($this->language_data['STYLES']['SCRIPT'][$script_key] != '' && + $this->lexic_permissions['SCRIPT']) { + // Add a span element around the source to + // highlight the overall source block + if (!$this->use_classes && + $this->language_data['STYLES']['SCRIPT'][$script_key] != '') { + $attributes = ' style="' . $this->language_data['STYLES']['SCRIPT'][$script_key] . '"'; + } else { + $attributes = ' class="sc' . $script_key . '"'; + } + $result .= ""; + $STRICTATTRS = $attributes; + } + } + + if ($highlight_part) { + // Now, highlight the code in this block. This code + // is really the engine of GeSHi (along with the method + // parse_non_string_part). + + // cache comment regexps incrementally + $next_comment_regexp_key = ''; + $next_comment_regexp_pos = -1; + $next_comment_multi_pos = -1; + $next_comment_single_pos = -1; + $comment_regexp_cache_per_key = array(); + $comment_multi_cache_per_key = array(); + $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) { + // Get the next char + $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']; + } elseif ( + //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])) { + // Possibly the start of a new string ... + + //Check which starter it was ... + //Fix for SF#1932083: Multichar Quotemarks unsupported + if (is_array($is_string_starter[$char])) { + $char_new = ''; + foreach ($is_string_starter[$char] as $testchar) { + if ($testchar === substr($part, $i, strlen($testchar)) && + strlen($testchar) > strlen($char_new)) { + $char_new = $testchar; + $string_started = true; + } + } + if ($string_started) { + $char = $char_new; + } + } else { + $testchar = $is_string_starter[$char]; + if ($testchar === substr($part, $i, strlen($testchar))) { + $char = $testchar; + $string_started = true; + } + } + $char_len = strlen($char); + } + + 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]) || + !isset($this->language_data['STYLES']['ESCAPE_CHAR'][$string_key])) { + $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] . '"'; + } else { + $string_attributes = ' class="st'.$string_key.'"'; + } + + // now handle the string + $string = "" . GeSHi::hsc($char); + $start = $i + $char_len; + $string_open = true; + + 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']; + } elseif ( + //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; + } + } + } + } + + //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; + } + + 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; + + //Add the stuff not in the string yet ... + $string .= $this->hsc(substr($part, $start, $es_pos - $start)); + + //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"'; + } + + //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 + $string .= "\n"; + $start = $es_pos + 2; + } elseif (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($part, $es_pos+1, 16), 0, 1, $this->encoding); + $string .= $es_char_m . ''; + } elseif (!GESHI_PHP_PRE_433 && 'utf-8' == $this->encoding) { + if(preg_match("/[\xC2-\xDF][\x80-\xBF]". + "|\xE0[\xA0-\xBF][\x80-\xBF]". + "|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}". + "|\xED[\x80-\x9F][\x80-\xBF]". + "|\xF0[\x90-\xBF][\x80-\xBF]{2}". + "|[\xF1-\xF3][\x80-\xBF]{3}". + "|\xF4[\x80-\x8F][\x80-\xBF]{2}/s", + $part, $es_char_m, null, $es_pos + 1)) { + $es_char_m = $es_char_m[0]; + } else { + $es_char_m = $es_char; + } + $string .= $this->hsc($es_char_m) . ''; + } else { + $es_char_m = $this->hsc($es_char); + } + $start = $es_pos + strlen($es_char_m) + 1; + } else { + $string .= $this->hsc($es_char) . ''; + $start = $es_pos + 2; + } + } elseif ($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; + } + } while($string_open); + + if ($check_linenumbers) { + // Are line numbers used? If, we should end the string before + // the newline and begin it again (so when
  • s are put in the source + // remains XHTML compliant) + // note to self: This opens up possibility of config files specifying + // that languages can/cannot have multiline strings??? + $string = str_replace("\n", "\n", $string); + } + + $result .= $string; + $string = ''; + $i = $start - 1; + continue; + } elseif ($this->lexic_permissions['STRINGS'] && $hq && $hq[0] == $char && + 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']['HARD'] . '"'; + $escape_char_attributes = ' style="' . $this->language_data['STYLES']['ESCAPE_CHAR']['HARD'] . '"'; + } else { + $string_attributes = ' class="st_h"'; + $escape_char_attributes = ' class="es_h"'; + } + // parse the stuff before this + $result .= $this->parse_non_string_part($stuff_to_parse); + $stuff_to_parse = ''; + + // now handle the string + $string = ''; + + // look for closing quote + $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['HARDCHAR'] && + (($i + $hq_strlen) != ($close_pos))) { //Support empty string for HQ escapes if Starter = Escape + // 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['HARDCHAR']) { + --$escape_char_pos; + } + if (($close_pos - $escape_char_pos) & 1) { + // uneven number of escape chars => this quote is escaped + continue 2; + } + } + } + } + + // found closing quote + break; + } + + //Found the closing delimiter? + if (!$close_pos) { + // span till the end of this $part when no closing delimiter is found + $close_pos = $length; + } + + //Get the actual string + $string = substr($part, $i, $close_pos - $i + 1); + $i = $close_pos; + + // 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)) { + // hmtl escape stuff before + $new_string .= $this->hsc(substr($string, $start, $es_pos - $start)); + // check if this is a hard escape + foreach ($this->language_data['HARDESCAPE'] as $hardescape) { + if (substr($string, $es_pos, strlen($hardescape)) == $hardescape) { + // indeed, this is a hardescape + $new_string .= "" . + $this->hsc($hardescape) . ''; + $start = $es_pos + strlen($hardescape); + continue 2; + } + } + // not a hard escape, but a normal escape + // they come in pairs of two + $c = 0; + while (isset($string[$es_pos + $c]) && isset($string[$es_pos + $c + 1]) + && $string[$es_pos + $c] == $this->language_data['ESCAPE_CHAR'] + && $string[$es_pos + $c + 1] == $this->language_data['ESCAPE_CHAR']) { + $c += 2; + } + if ($c) { + $new_string .= "" . + str_repeat($escaped_escape_char, $c) . + ''; + $start = $es_pos + $c; + } else { + // this is just a single lonely escape char... + $new_string .= $escaped_escape_char; + $start = $es_pos + 1; + } + } + $string = $new_string . $this->hsc(substr($string, $start)); + } else { + $string = $this->hsc($string); + } + + if ($check_linenumbers) { + // Are line numbers used? If, we should end the string before + // the newline and begin it again (so when
  • s are put in the source + // remains XHTML compliant) + // note to self: This opens up possibility of config files specifying + // that languages can/cannot have multiline strings??? + $string = str_replace("\n", "\n", $string); + } + + $result .= "" . $string . ''; + $string = ''; + continue; + } else { + //Have a look for regexp comments + if ($i == $next_comment_regexp_pos) { + $COMMENT_MATCHED = true; + $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 + if ($this->lexic_permissions['COMMENTS']['MULTI']) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment['key']] . '"'; + } else { + $attributes = ' class="co' . $comment['key'] . '"'; + } + + $test_str = "" . $test_str . ""; + + // Short-cut through all the multiline code + if ($check_linenumbers) { + // strreplace to put close span and open span around multiline newlines + $test_str = str_replace( + "\n", "\n", + str_replace("\n ", "\n ", $test_str) + ); + } + } + + $i += $comment['length'] - 1; + + // parse the rest + $result .= $this->parse_non_string_part($stuff_to_parse); + $stuff_to_parse = ''; + } + + // If we haven't matched a regexp comment, try multi-line comments + if (!$COMMENT_MATCHED) { + // Is this a multiline comment? + if (!empty($this->language_data['COMMENT_MULTI']) && $next_comment_multi_pos < $i) { + $next_comment_multi_pos = $length; + 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] === 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]; + } elseif (($match_i = stripos($part, $open, $i)) !== false) { + $comment_multi_cache_per_key[$open] = $match_i; + } else { + $comment_multi_cache_per_key[$open] = false; + continue; + } + if ($match_i !== false && $match_i < $next_comment_multi_pos) { + $next_comment_multi_pos = $match_i; + $next_open_comment_multi = $open; + if ($match_i === $i) { + break; + } + } + } + } + if ($i == $next_comment_multi_pos) { + $open = $next_open_comment_multi; + $close = $this->language_data['COMMENT_MULTI'][$open]; + $open_strlen = strlen($open); + $close_strlen = strlen($close); + $COMMENT_MATCHED = true; + $test_str_match = $open; + //@todo If remove important do remove here + if ($this->lexic_permissions['COMMENTS']['MULTI'] || + $open == GESHI_START_IMPORTANT) { + if ($open != GESHI_START_IMPORTANT) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS']['MULTI'] . '"'; + } else { + $attributes = ' class="coMULTI"'; + } + $test_str = "" . $this->hsc($open); + } else { + if (!$this->use_classes) { + $attributes = ' style="' . $this->important_styles . '"'; + } else { + $attributes = ' class="imp"'; + } + + // We don't include the start of the comment if it's an + // "important" part + $test_str = ""; + } + } else { + $test_str = $this->hsc($open); + } + + $close_pos = strpos( $part, $close, $i + $open_strlen ); + + if ($close_pos === false) { + $close_pos = $length; + } + + // Short-cut through all the multiline code + $rest_of_comment = $this->hsc(substr($part, $i + $open_strlen, $close_pos - $i - $open_strlen + $close_strlen)); + if (($this->lexic_permissions['COMMENTS']['MULTI'] || + $test_str_match == GESHI_START_IMPORTANT) && + $check_linenumbers) { + + // strreplace to put close span and open span around multiline newlines + $test_str .= str_replace( + "\n", "\n", + str_replace("\n ", "\n ", $rest_of_comment) + ); + } else { + $test_str .= $rest_of_comment; + } + + if ($this->lexic_permissions['COMMENTS']['MULTI'] || + $test_str_match == GESHI_START_IMPORTANT) { + $test_str .= ''; + } + + $i = $close_pos + $close_strlen - 1; + + // parse the rest + $result .= $this->parse_non_string_part($stuff_to_parse); + $stuff_to_parse = ''; + } + } + + // If we haven't matched a multiline comment, try single-line comments + if (!$COMMENT_MATCHED) { + // cache potential single line comment occurances + if (!empty($this->language_data['COMMENT_SINGLE']) && $next_comment_single_pos < $i) { + $next_comment_single_pos = $length; + 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] === 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]; + } elseif ( + // case sensitive comments + ($this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] && + ($match_i = stripos($part, $comment_mark, $i)) !== false) || + // non case sensitive + (!$this->language_data['CASE_SENSITIVE'][GESHI_COMMENTS] && + (($match_i = strpos($part, $comment_mark, $i)) !== false))) { + $comment_single_cache_per_key[$comment_key] = $match_i; + } else { + $comment_single_cache_per_key[$comment_key] = false; + continue; + } + if ($match_i !== false && $match_i < $next_comment_single_pos) { + $next_comment_single_pos = $match_i; + $next_comment_single_key = $comment_key; + if ($match_i === $i) { + break; + } + } + } + } + if ($next_comment_single_pos == $i) { + $comment_key = $next_comment_single_key; + $comment_mark = $this->language_data['COMMENT_SINGLE'][$comment_key]; + $com_len = strlen($comment_mark); + + // This check will find special variables like $# in bash + // or compiler directives of Delphi beginning {$ + if ((empty($sc_disallowed_before) || ($i == 0) || + (false === strpos($sc_disallowed_before, $part[$i-1]))) && + (empty($sc_disallowed_after) || ($length <= $i + $com_len) || + (false === strpos($sc_disallowed_after, $part[$i + $com_len])))) + { + // this is a valid comment + $COMMENT_MATCHED = true; + if ($this->lexic_permissions['COMMENTS'][$comment_key]) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['COMMENTS'][$comment_key] . '"'; + } else { + $attributes = ' class="co' . $comment_key . '"'; + } + $test_str = "" . $this->hsc($this->change_case($comment_mark)); + } else { + $test_str = $this->hsc($comment_mark); + } + + //Check if this comment is the last in the source + $close_pos = strpos($part, "\n", $i); + $oops = false; + if ($close_pos === false) { + $close_pos = $length; + $oops = true; + } + $test_str .= $this->hsc(substr($part, $i + $com_len, $close_pos - $i - $com_len)); + if ($this->lexic_permissions['COMMENTS'][$comment_key]) { + $test_str .= ""; + } + + // Take into account that the comment might be the last in the source + if (!$oops) { + $test_str .= "\n"; + } + + $i = $close_pos; + + // parse the rest + $result .= $this->parse_non_string_part($stuff_to_parse); + $stuff_to_parse = ''; + } + } + } + } + + // Where are we adding this char? + if (!$COMMENT_MATCHED) { + $stuff_to_parse .= $char; + } else { + $result .= $test_str; + unset($test_str); + $COMMENT_MATCHED = false; + } + } + // Parse the last bit + $result .= $this->parse_non_string_part($stuff_to_parse); + $stuff_to_parse = ''; + } else { + $result .= $this->hsc($part); + } + // Close the that surrounds the block + if ($STRICTATTRS != '') { + $result = str_replace("\n", "\n", $result); + $result .= ''; + } + + $endresult .= $result; + unset($part, $parts[$key], $result); + } + + //This fix is related to SF#1923020, but has to be applied regardless of + //actually highlighting symbols. + /** NOTE: memorypeak #3 */ + $endresult = str_replace(array('', ''), array(';', '|'), $endresult); + +// // Parse the last stuff (redundant?) +// $result .= $this->parse_non_string_part($stuff_to_parse); + + // Lop off the very first and last spaces +// $result = substr($result, 1, -1); + + // We're finished: stop timing + $this->set_time($start_time, microtime()); + + $this->finalise($endresult); + return $endresult; + } + + /** + * Swaps out spaces and tabs for HTML indentation. Not needed if + * the code is in a pre block... + * + * @param string The source to indent (reference!) + * @since 1.0.0 + * @access private + */ + function indent(&$result) { + /// Replace tabs with the correct number of spaces + if (false !== strpos($result, "\t")) { + $lines = explode("\n", $result); + $result = null;//Save memory while we process the lines individually + $tab_width = $this->get_real_tab_width(); + $tab_string = ' ' . str_repeat(' ', $tab_width); + + for ($key = 0, $n = count($lines); $key < $n; $key++) { + $line = $lines[$key]; + if (false === strpos($line, "\t")) { + continue; + } + + $pos = 0; + $length = strlen($line); + $lines[$key] = ''; // reduce memory + + $IN_TAG = false; + for ($i = 0; $i < $length; ++$i) { + $char = $line[$i]; + // Simple engine to work out whether we're in a tag. + // If we are we modify $pos. This is so we ignore HTML + // in the line and only workout the tab replacement + // via the actual content of the string + // This test could be improved to include strings in the + // html so that < or > would be allowed in user's styles + // (e.g. quotes: '<' '>'; or similar) + if ($IN_TAG) { + if ('>' == $char) { + $IN_TAG = false; + } + $lines[$key] .= $char; + } elseif ('<' == $char) { + $IN_TAG = true; + $lines[$key] .= '<'; + } elseif ('&' == $char) { + $substr = substr($line, $i + 3, 5); + $posi = strpos($substr, ';'); + if (false === $posi) { + ++$pos; + } else { + $pos -= $posi+2; + } + $lines[$key] .= $char; + } elseif ("\t" == $char) { + $str = ''; + // OPTIMISE - move $strs out. Make an array: + // $tabs = array( + // 1 => ' ', + // 2 => '  ', + // 3 => '   ' etc etc + // to use instead of building a string every time + $tab_end_width = $tab_width - ($pos % $tab_width); //Moved out of the look as it doesn't change within the loop + if (($pos & 1) || 1 == $tab_end_width) { + $str .= substr($tab_string, 6, $tab_end_width); + } else { + $str .= substr($tab_string, 0, $tab_end_width+5); + } + $lines[$key] .= $str; + $pos += $tab_end_width; + + if (false === strpos($line, "\t", $i + 1)) { + $lines[$key] .= substr($line, $i + 1); + break; + } + } elseif (0 == $pos && ' ' == $char) { + $lines[$key] .= ' '; + ++$pos; + } else { + $lines[$key] .= $char; + ++$pos; + } + } + } + $result = implode("\n", $lines); + unset($lines);//We don't need the lines separated beyond this --- free them! + } + // Other whitespace + // BenBE: Fix to reduce the number of replacements to be done + $result = preg_replace('/^ /m', ' ', $result); + $result = str_replace(' ', '  ', $result); + + if ($this->line_numbers == GESHI_NO_LINE_NUMBERS && $this->header_type != GESHI_HEADER_PRE_TABLE) { + if ($this->line_ending === null) { + $result = nl2br($result); + } else { + $result = str_replace("\n", $this->line_ending, $result); + } + } + } + + /** + * Changes the case of a keyword for those languages where a change is asked for + * + * @param string The keyword to change the case of + * @return string The keyword with its case changed + * @since 1.0.0 + * @access private + */ + function change_case($instr) { + switch ($this->language_data['CASE_KEYWORDS']) { + case GESHI_CAPS_UPPER: + return strtoupper($instr); + case GESHI_CAPS_LOWER: + return strtolower($instr); + default: + return $instr; + } + } + + /** + * Handles replacements of keywords to include markup and links if requested + * + * @param string The keyword to add the Markup to + * @return The HTML for the match found + * @since 1.0.8 + * @access private + * + * @todo Get rid of ender in keyword links + */ + function handle_keyword_replace($match) { + $k = $this->_kw_replace_group; + $keyword = $match[0]; + $keyword_match = $match[1]; + + $before = ''; + $after = ''; + + if ($this->keyword_links) { + // Keyword links have been ebabled + + if (isset($this->language_data['URLS'][$k]) && + $this->language_data['URLS'][$k] != '') { + // There is a base group for this keyword + + // Old system: strtolower + //$keyword = ( $this->language_data['CASE_SENSITIVE'][$group] ) ? $keyword : strtolower($keyword); + // New system: get keyword from language file to get correct case + if (!$this->language_data['CASE_SENSITIVE'][$k] && + strpos($this->language_data['URLS'][$k], '{FNAME}') !== false) { + foreach ($this->language_data['KEYWORDS'][$k] as $word) { + if (strcasecmp($word, $keyword_match) == 0) { + break; + } + } + } else { + $word = $keyword_match; + } + + $before = '<|UR1|"' . + str_replace( + 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 = ''; + } + } + + return $before . '<|/'. $k .'/>' . $this->change_case($keyword) . '|>' . $after; + } + + /** + * handles regular expressions highlighting-definitions with callback functions + * + * @note this is a callback, don't use it directly + * + * @param array the matches array + * @return The highlighted string + * @since 1.0.8 + * @access private + */ + function handle_regexps_callback($matches) { + // before: "' style=\"' . call_user_func(\"$func\", '\\1') . '\"\\1|>'", + return ' style="' . call_user_func($this->language_data['STYLES']['REGEXPS'][$this->_rx_key], $matches[1]) . '"'. $matches[1] . '|>'; + } + + /** + * handles newlines in REGEXPS matches. Set the _hmr_* vars before calling this + * + * @note this is a callback, don't use it directly + * + * @param array the matches array + * @return string + * @since 1.0.8 + * @access private + */ + function handle_multiline_regexps($matches) { + $before = $this->_hmr_before; + $after = $this->_hmr_after; + if ($this->_hmr_replace) { + $replace = $this->_hmr_replace; + $search = array(); + + foreach (array_keys($matches) as $k) { + $search[] = '\\' . $k; + } + + $before = str_replace($search, $matches, $before); + $after = str_replace($search, $matches, $after); + $replace = str_replace($search, $matches, $replace); + } else { + $replace = $matches[0]; + } + return $before + . '<|!REG3XP' . $this->_hmr_key .'!>' + . str_replace("\n", "|>\n<|!REG3XP" . $this->_hmr_key . '!>', $replace) + . '|>' + . $after; + } + + /** + * Takes a string that has no strings or comments in it, and highlights + * stuff like keywords, numbers and methods. + * + * @param string The string to parse for keyword, numbers etc. + * @since 1.0.0 + * @access private + * @todo BUGGY! Why? Why not build string and return? + */ + function parse_non_string_part($stuff_to_parse) { + $stuff_to_parse = ' ' . $this->hsc($stuff_to_parse); + + // Highlight keywords + $disallowed_before = "(?lexic_permissions['STRINGS']) { + $quotemarks = preg_quote(implode($this->language_data['QUOTEMARKS']), '/'); + $disallowed_before .= $quotemarks; + $disallowed_after .= $quotemarks; + } + $disallowed_before .= "])"; + $disallowed_after .= "])"; + + $parser_control_pergroup = false; + if (isset($this->language_data['PARSER_CONTROL'])) { + if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'])) { + $x = 0; // check wether per-keyword-group parser_control is enabled + if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE'])) { + $disallowed_before = $this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_BEFORE']; + ++$x; + } + if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER'])) { + $disallowed_after = $this->language_data['PARSER_CONTROL']['KEYWORDS']['DISALLOWED_AFTER']; + ++$x; + } + $parser_control_pergroup = (count($this->language_data['PARSER_CONTROL']['KEYWORDS']) - $x) > 0; + } + } + + foreach (array_keys($this->language_data['KEYWORDS']) as $k) { + if (!isset($this->lexic_permissions['KEYWORDS'][$k]) || + $this->lexic_permissions['KEYWORDS'][$k]) { + + $case_sensitive = $this->language_data['CASE_SENSITIVE'][$k]; + $modifiers = $case_sensitive ? '' : 'i'; + + // NEW in 1.0.8 - per-keyword-group parser control + $disallowed_before_local = $disallowed_before; + $disallowed_after_local = $disallowed_after; + if ($parser_control_pergroup && isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k])) { + if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_BEFORE'])) { + $disallowed_before_local = + $this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_BEFORE']; + } + + if (isset($this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_AFTER'])) { + $disallowed_after_local = + $this->language_data['PARSER_CONTROL']['KEYWORDS'][$k]['DISALLOWED_AFTER']; + } + } + + $this->_kw_replace_group = $k; + + //NEW in 1.0.8, the cached regexp list + // since we don't want PHP / PCRE to crash due to too large patterns we split them into smaller chunks + for ($set = 0, $set_length = count($this->language_data['CACHED_KEYWORD_LISTS'][$k]); $set < $set_length; ++$set) { + $keywordset =& $this->language_data['CACHED_KEYWORD_LISTS'][$k][$set]; + // Might make a more unique string for putting the number in soon + // Basically, we don't put the styles in yet because then the styles themselves will + // get highlighted if the language has a CSS keyword in it (like CSS, for example ;)) + $stuff_to_parse = preg_replace_callback( + "/$disallowed_before_local({$keywordset})(?!\(?:htm|php|aspx?))$disallowed_after_local/$modifiers", + array($this, 'handle_keyword_replace'), + $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 different types of numbers + $numbers_found = false; + + if ($this->lexic_permissions['NUMBERS'] && preg_match($this->language_data['PARSER_CONTROL']['NUMBERS']['PRECHECK_RX'], $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 + // + foreach (array_keys($this->language_data['KEYWORDS']) as $k) { + if (!$this->use_classes) { + $attributes = ' style="' . + (isset($this->language_data['STYLES']['KEYWORDS'][$k]) ? + $this->language_data['STYLES']['KEYWORDS'][$k] : "") . '"'; + } else { + $attributes = ' class="kw' . $k . '"'; + } + $stuff_to_parse = str_replace("<|/$k/>", "<|$attributes>", $stuff_to_parse); + } + + 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.'"'; + } + + //Set in the correct styles ... + $stuff_to_parse = str_replace("/NUM!$id/", $attributes, $stuff_to_parse); + // } + } + } + + // Highlight methods and fields in objects + if ($this->lexic_permissions['METHODS'] && $this->language_data['OOLANG']) { + $oolang_spaces = "[\s]*"; + $oolang_before = ""; + $oolang_after = "[a-zA-Z][a-zA-Z0-9_]*"; + if (isset($this->language_data['PARSER_CONTROL'])) { + if (isset($this->language_data['PARSER_CONTROL']['OOLANG'])) { + if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_BEFORE'])) { + $oolang_before = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_BEFORE']; + } + if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_AFTER'])) { + $oolang_after = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_AFTER']; + } + if (isset($this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_SPACES'])) { + $oolang_spaces = $this->language_data['PARSER_CONTROL']['OOLANG']['MATCH_SPACES']; + } + } + } + + foreach ($this->language_data['OBJECT_SPLITTERS'] as $key => $splitter) { + if (false !== strpos($stuff_to_parse, $splitter)) { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['METHODS'][$key] . '"'; + } else { + $attributes = ' class="me' . $key . '"'; + } + $stuff_to_parse = preg_replace("/($oolang_before)(" . preg_quote($this->language_data['OBJECT_SPLITTERS'][$key], '/') . ")($oolang_spaces)($oolang_after)/", "\\1\\2\\3<|$attributes>\\4|>", $stuff_to_parse); + } + } + } + + // + // Highlight brackets. Yes, I've tried adding a semi-colon to this list. + // You try it, and see what happens ;) + // TODO: Fix lexic permissions not converting entities if shouldn't + // be highlighting regardless + // + if ($this->lexic_permissions['BRACKETS']) { + $stuff_to_parse = str_replace( $this->language_data['CACHE_BRACKET_MATCH'], + $this->language_data['CACHE_BRACKET_REPLACE'], $stuff_to_parse ); + } + + + //FIX for symbol highlighting ... + if ($this->lexic_permissions['SYMBOLS'] && !empty($this->language_data['SYMBOLS'])) { + //Get all matches and throw away those witin a block that is already highlighted... (i.e. matched by a regexp) + $n_symbols = preg_match_all("/<\|(?:|[^>])+>(?:(?!\|>).*?)\|>|<\/a>|(?:" . $this->language_data['SYMBOL_SEARCH'] . ")+(?![^<]+?>)/", $stuff_to_parse, $pot_symbols, PREG_OFFSET_CAPTURE | PREG_SET_ORDER); + $global_offset = 0; + for ($s_id = 0; $s_id < $n_symbols; ++$s_id) { + $symbol_match = $pot_symbols[$s_id][0][0]; + 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 + // 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); + $symbol_offset = $pot_symbols[$s_id][0][1]; + unset($pot_symbols[$s_id]); + $symbol_end = $symbol_length + $symbol_offset; + $symbol_hl = ""; + + // if we have multiple styles, we have to handle them properly + if ($this->language_data['MULTIPLE_SYMBOL_GROUPS']) { + $old_sym = -1; + // Split the current stuff to replace into its atomic symbols ... + preg_match_all("/" . $this->language_data['SYMBOL_SEARCH'] . "/", $symbol_match, $sym_match_syms, PREG_PATTERN_ORDER); + foreach ($sym_match_syms[0] as $sym_ms) { + //Check if consequtive symbols belong to the same group to save output ... + if (isset($this->language_data['SYMBOL_DATA'][$sym_ms]) + && ($this->language_data['SYMBOL_DATA'][$sym_ms] != $old_sym)) { + if (-1 != $old_sym) { + $symbol_hl .= "|>"; + } + $old_sym = $this->language_data['SYMBOL_DATA'][$sym_ms]; + if (!$this->use_classes) { + $symbol_hl .= '<| style="' . $this->language_data['STYLES']['SYMBOLS'][$old_sym] . '">'; + } else { + $symbol_hl .= '<| class="sy' . $old_sym . '">'; + } + } + $symbol_hl .= $sym_ms; + } + unset($sym_match_syms); + + //Close remaining tags and insert the replacement at the right position ... + //Take caution if symbol_hl is empty to avoid doubled closing spans. + if (-1 != $old_sym) { + $symbol_hl .= "|>"; + } + } else { + if (!$this->use_classes) { + $symbol_hl = '<| style="' . $this->language_data['STYLES']['SYMBOLS'][0] . '">'; + } else { + $symbol_hl = '<| class="sy0">'; + } + $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, + // we'll have to keep track of the differences + $global_offset += strlen($symbol_hl) - $symbol_length; + } + } + //FIX for symbol highlighting ... + + // Add class/style for regexps + foreach (array_keys($this->language_data['REGEXPS']) as $key) { + if ($this->lexic_permissions['REGEXPS'][$key]) { + if (is_callable($this->language_data['STYLES']['REGEXPS'][$key])) { + $this->_rx_key = $key; + $stuff_to_parse = preg_replace_callback("/!REG3XP$key!(.*)\|>/U", + array($this, 'handle_regexps_callback'), + $stuff_to_parse); + } else { + if (!$this->use_classes) { + $attributes = ' style="' . $this->language_data['STYLES']['REGEXPS'][$key] . '"'; + } else { + if (is_array($this->language_data['REGEXPS'][$key]) && + array_key_exists(GESHI_CLASS, $this->language_data['REGEXPS'][$key])) { + $attributes = ' class="' . + $this->language_data['REGEXPS'][$key][GESHI_CLASS] . '"'; + } else { + $attributes = ' class="re' . $key . '"'; + } + } + $stuff_to_parse = str_replace("!REG3XP$key!", "$attributes", $stuff_to_parse); + } + } + } + + // Replace with . for urls + $stuff_to_parse = str_replace('', '.', $stuff_to_parse); + // Replace <|UR1| with link_styles[GESHI_LINK])) { + if ($this->use_classes) { + $stuff_to_parse = str_replace('<|UR1|', 'link_target . ' href=', $stuff_to_parse); + } else { + $stuff_to_parse = str_replace('<|UR1|', 'link_target . ' style="' . $this->link_styles[GESHI_LINK] . '" href=', $stuff_to_parse); + } + } else { + $stuff_to_parse = str_replace('<|UR1|', 'link_target . ' href=', $stuff_to_parse); + } + + // + // NOW we add the span thingy ;) + // + + $stuff_to_parse = str_replace('<|', '', '', $stuff_to_parse ); + return substr($stuff_to_parse, 1); + } + + /** + * Sets the time taken to parse the code + * + * @param microtime The time when parsing started + * @param microtime The time when parsing ended + * @since 1.0.2 + * @access private + */ + function set_time($start_time, $end_time) { + $start = explode(' ', $start_time); + $end = explode(' ', $end_time); + $this->time = $end[0] + $end[1] - $start[0] - $start[1]; + } + + /** + * Gets the time taken to parse the code + * + * @return double The time taken to parse the code + * @since 1.0.2 + */ + function get_time() { + return $this->time; + } + + /** + * Merges arrays recursively, overwriting values of the first array with values of later arrays + * + * @since 1.0.8 + * @access private + */ + function merge_arrays() { + $arrays = func_get_args(); + $narrays = count($arrays); + + // check arguments + // comment out if more performance is necessary (in this case the foreach loop will trigger a warning if the argument is not an array) + for ($i = 0; $i < $narrays; $i ++) { + if (!is_array($arrays[$i])) { + // also array_merge_recursive returns nothing in this case + trigger_error('Argument #' . ($i+1) . ' is not an array - trying to merge array with scalar! Returning false!', E_USER_WARNING); + return false; + } + } + + // the first array is in the output set in every case + $ret = $arrays[0]; + + // merege $ret with the remaining arrays + for ($i = 1; $i < $narrays; $i ++) { + foreach ($arrays[$i] as $key => $value) { + if (is_array($value) && isset($ret[$key])) { + // if $ret[$key] is not an array you try to merge an scalar value with an array - the result is not defined (incompatible arrays) + // in this case the call will trigger an E_USER_WARNING and the $ret[$key] will be false. + $ret[$key] = $this->merge_arrays($ret[$key], $value); + } else { + $ret[$key] = $value; + } + } + } + + return $ret; + } + + /** + * Gets language information and stores it for later use + * + * @param string The filename of the language file you want to load + * @since 1.0.0 + * @access private + * @todo Needs to load keys for lexic permissions for keywords, regexps etc + */ + function load_language($file_name) { + if ($file_name == $this->loaded_language) { + // this file is already loaded! + return; + } + + //Prepare some stuff before actually loading the language file + $this->loaded_language = $file_name; + $this->parse_cache_built = false; + $this->enable_highlighting(); + $language_data = array(); + + //Load the language file + require $file_name; + + // Perhaps some checking might be added here later to check that + // $language data is a valid thing but maybe not + $this->language_data = $language_data; + + // Set strict mode if should be set + $this->strict_mode = $this->language_data['STRICT_MODE_APPLIES']; + + // Set permissions for all lexics to true + // so they'll be highlighted by default + foreach (array_keys($this->language_data['KEYWORDS']) as $key) { + if (!empty($this->language_data['KEYWORDS'][$key])) { + $this->lexic_permissions['KEYWORDS'][$key] = true; + } else { + $this->lexic_permissions['KEYWORDS'][$key] = false; + } + } + + foreach (array_keys($this->language_data['COMMENT_SINGLE']) as $key) { + $this->lexic_permissions['COMMENTS'][$key] = true; + } + foreach (array_keys($this->language_data['REGEXPS']) as $key) { + $this->lexic_permissions['REGEXPS'][$key] = true; + } + + // for BenBE and future code reviews: + // we can use empty here since we only check for existance and emptiness of an array + // if it is not an array at all but rather false or null this will work as intended as well + // even if $this->language_data['PARSER_CONTROL'] is undefined this won't trigger a notice + if (!empty($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS'])) { + foreach ($this->language_data['PARSER_CONTROL']['ENABLE_FLAGS'] as $flag => $value) { + // it's either true or false and maybe is true as well + $perm = $value !== GESHI_NEVER; + if ($flag == 'ALL') { + $this->enable_highlighting($perm); + continue; + } + if (!isset($this->lexic_permissions[$flag])) { + // unknown lexic permission + continue; + } + if (is_array($this->lexic_permissions[$flag])) { + foreach ($this->lexic_permissions[$flag] as $key => $val) { + $this->lexic_permissions[$flag][$key] = $perm; + } + } else { + $this->lexic_permissions[$flag] = $perm; + } + } + 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)) { + //Clear any style_data that could have been set before ... + if (isset($style_data)) { + unset($style_data); + } + + //Read the Style Information from the style file + include $style_filename; + + //Apply the new styles to our current language styles + if (isset($style_data) && is_array($style_data)) { + $this->language_data['STYLES'] = + $this->merge_arrays($this->language_data['STYLES'], $style_data); + } + } + } + + /** + * Takes the parsed code and various options, and creates the HTML + * surrounding it to make it look nice. + * + * @param string The code already parsed (reference!) + * @since 1.0.0 + * @access private + */ + function finalise(&$parsed_code) { + // Remove end parts of important declarations + // This is BUGGY!! My fault for bad code: fix coming in 1.2 + // @todo Remove this crap + if ($this->enable_important_blocks && + (strpos($parsed_code, $this->hsc(GESHI_START_IMPORTANT)) === false)) { + $parsed_code = str_replace($this->hsc(GESHI_END_IMPORTANT), '', $parsed_code); + } + + // Add HTML whitespace stuff if we're using the
    header + if ($this->header_type != GESHI_HEADER_PRE && $this->header_type != GESHI_HEADER_PRE_VALID) { + $this->indent($parsed_code); + } + + // purge some unnecessary stuff + /** NOTE: memorypeak #1 */ + $parsed_code = preg_replace('#]+>(\s*)#', '\\1', $parsed_code); + + // If we are using IDs for line numbers, there needs to be an overall + // ID set to prevent collisions. + if ($this->add_ids && !$this->overall_id) { + $this->overall_id = 'geshi-' . substr(md5(microtime()), 0, 4); + } + + // Get code into lines + /** NOTE: memorypeak #2 */ + $code = explode("\n", $parsed_code); + $parsed_code = $this->header(); + + // If we're using line numbers, we insert
  • s and appropriate + // markup to style them (otherwise we don't need to do anything) + if ($this->line_numbers != GESHI_NO_LINE_NUMBERS && $this->header_type != GESHI_HEADER_PRE_TABLE) { + // If we're using the 
     header, we shouldn't add newlines because
+            // the 
     will line-break them (and the 
  • s already do this for us)
+            $ls = ($this->header_type != GESHI_HEADER_PRE && $this->header_type != GESHI_HEADER_PRE_VALID) ? "\n" : '';
+
+            // Set vars to defaults for following loop
+            $i = 0;
+
+            // Foreach line...
+            for ($i = 0, $n = count($code); $i < $n;) {
+                //Reset the attributes for a new line ...
+                $attrs = array();
+
+                // Make lines have at least one space in them if they're empty
+                // BenBE: Checking emptiness using trim instead of relying on blanks
+                if ('' == trim($code[$i])) {
+                    $code[$i] = ' ';
+                }
+
+                // If this is a "special line"...
+                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) {
+                        //$attr = ' class="li2"';
+                        $attrs['class'][] = 'li2';
+                        $def_attr = ' class="de2"';
+                    } else {
+                        //$attr = ' style="' . $this->line_style2 . '"';
+                        $attrs['style'][] = $this->line_style2;
+                        // 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
+                        $def_attr = ' style="' . $this->code_style . '"';
+                    }
+                } else {
+                    if ($this->use_classes) {
+                        //$attr = ' class="li1"';
+                        $attrs['class'][] = 'li1';
+                        $def_attr = ' class="de1"';
+                    } else {
+                        //$attr = ' style="' . $this->line_style1 . '"';
+                        $attrs['style'][] = $this->line_style1;
+                        $def_attr = ' style="' . $this->code_style . '"';
+                    }
+                }
+
+                //Check which type of tag to insert for this line
+                if ($this->header_type == GESHI_HEADER_PRE_VALID) {
+                    $start = "";
+                    $end = '
    • ';
+                } else {
+                    // Span or div?
+                    $start = "";
+                    $end = '';
+                }
+
+                ++$i;
+
+                // Are we supposed to use ids? If so, add them
+                if ($this->add_ids) {
+                    $attrs['id'][] = "$this->overall_id-$i";
+                }
+
+                //Is this some line with extra styles???
+                if (in_array($i, $this->highlight_extra_lines)) {
+                    if ($this->use_classes) {
+                        if (isset($this->highlight_extra_lines_styles[$i])) {
+                            $attrs['class'][] = "lx$i";
+                        } else {
+                            $attrs['class'][] = "ln-xtra";
+                        }
+                    } else {
+                        array_push($attrs['style'], $this->get_line_style($i));
+                    }
+                }
+
+                // Add in the line surrounded by appropriate list HTML
+                $attr_string = '';
+                foreach ($attrs as $key => $attr) {
+                    $attr_string .= ' ' . $key . '="' . implode(' ', $attr) . '"';
+                }
+
+                $parsed_code .= "$start{$code[$i-1]}$end
    • $ls"; + unset($code[$i - 1]); + } + } else { + $n = count($code); + if ($this->use_classes) { + $attributes = ' class="de1"'; + } else { + $attributes = ' style="'. $this->code_style .'"'; + } + if ($this->header_type == GESHI_HEADER_PRE_VALID) { + $parsed_code .= ''; + } elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) { + if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) { + if ($this->use_classes) { + $attrs = ' class="ln"'; + } else { + $attrs = ' style="'. $this->table_linenumber_style .'"'; + } + $parsed_code .= ''; + // get linenumbers + // we don't merge it with the for below, since it should be better for + // memory consumption this way + // @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); + } elseif ($i != $n) { + $parsed_code .= "\n"; + } + } + $parsed_code .= ''; + } + $parsed_code .= ''; + } + // No line numbers, but still need to handle highlighting lines extra. + // Have to use divs so the full width of the code is highlighted + $close = 0; + for ($i = 0; $i < $n; ++$i) { + // Make lines have at least one space in them if they're empty + // BenBE: Checking emptiness using trim instead of relying on blanks + if ('' == trim($code[$i])) { + $code[$i] = ' '; + } + // 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 .= $code[$i]; + + if ($close) { + $parsed_code .= str_repeat('', $close); + $close = 0; + } + elseif ($i + 1 < $n) { + $parsed_code .= "\n"; + } + unset($code[$i]); + } + + if ($this->header_type == GESHI_HEADER_PRE_VALID || $this->header_type == GESHI_HEADER_PRE_TABLE) { + $parsed_code .= ''; + } + if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) { + $parsed_code .= ''; + } + } + + $parsed_code .= $this->footer(); + } + + /** + * Creates the header for the code block (with correct attributes) + * + * @return string The header for the code block + * @since 1.0.0 + * @access private + */ + function header() { + // Get attributes needed + /** + * @todo Document behaviour change - class is outputted regardless of whether + * we're using classes or not. Same with style + */ + $attributes = ' class="' . $this->_genCSSName($this->language); + if ($this->overall_class != '') { + $attributes .= " ".$this->_genCSSName($this->overall_class); + } + $attributes .= '"'; + + if ($this->overall_id != '') { + $attributes .= " id=\"{$this->overall_id}\""; + } + if ($this->overall_style != '' && !$this->use_classes) { + $attributes .= ' style="' . $this->overall_style . '"'; + } + + $ol_attributes = ''; + + if ($this->line_numbers_start != 1) { + $ol_attributes .= ' start="' . $this->line_numbers_start . '"'; + } + + // Get the header HTML + $header = $this->header_content; + if ($header) { + if ($this->header_type == GESHI_HEADER_PRE || $this->header_type == GESHI_HEADER_PRE_VALID) { + $header = str_replace("\n", '', $header); + } + $header = $this->replace_keywords($header); + + if ($this->use_classes) { + $attr = ' class="head"'; + } else { + $attr = " style=\"{$this->header_content_style}\""; + } + if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) { + $header = "$header"; + } else { + $header = "$header"; + } + } + + if (GESHI_HEADER_NONE == $this->header_type) { + if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) { + return "$header"; + } + return $header . ($this->force_code_block ? '
    ' : ''); + } + + // Work out what to return and do it + if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) { + if ($this->header_type == GESHI_HEADER_PRE) { + return "$header"; + } elseif ($this->header_type == GESHI_HEADER_DIV || + $this->header_type == GESHI_HEADER_PRE_VALID) { + return "$header"; + } elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) { + return "$header"; + } + } else { + if ($this->header_type == GESHI_HEADER_PRE) { + return "$header" . + ($this->force_code_block ? '
    ' : ''); + } else { + return "$header" . + ($this->force_code_block ? '
    ' : ''); + } + } + } + + /** + * Returns the footer for the code block. + * + * @return string The footer for the code block + * @since 1.0.0 + * @access private + */ + function footer() { + $footer = $this->footer_content; + if ($footer) { + if ($this->header_type == GESHI_HEADER_PRE) { + $footer = str_replace("\n", '', $footer);; + } + $footer = $this->replace_keywords($footer); + + if ($this->use_classes) { + $attr = ' class="foot"'; + } else { + $attr = " style=\"{$this->footer_content_style}\""; + } + if ($this->header_type == GESHI_HEADER_PRE_TABLE && $this->line_numbers != GESHI_NO_LINE_NUMBERS) { + $footer = "$footer"; + } else { + $footer = "$footer
    "; + } + } + + if (GESHI_HEADER_NONE == $this->header_type) { + return ($this->line_numbers != GESHI_NO_LINE_NUMBERS) ? '' . $footer : $footer; + } + + if ($this->header_type == GESHI_HEADER_DIV || $this->header_type == GESHI_HEADER_PRE_VALID) { + if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) { + return "$footer
    "; + } + return ($this->force_code_block ? '
    ' : '') . + "$footer"; + } + elseif ($this->header_type == GESHI_HEADER_PRE_TABLE) { + if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) { + return "$footer"; + } + return ($this->force_code_block ? '' : '') . + "$footer"; + } + else { + if ($this->line_numbers != GESHI_NO_LINE_NUMBERS) { + return "$footer"; + } + return ($this->force_code_block ? '' : '') . + "$footer"; + } + } + + /** + * Replaces certain keywords in the header and footer with + * certain configuration values + * + * @param string The header or footer content to do replacement on + * @return string The header or footer with replaced keywords + * @since 1.0.2 + * @access private + */ + function replace_keywords($instr) { + $keywords = $replacements = array(); + + $keywords[] = '
      to have no effect at all if there are line numbers + // (
        s have margins that should be destroyed so all layout is + // controlled by the set_overall_style method, which works on the + // 
         or 
         container). Additionally, set default styles for lines
+        if (!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) {
+            //$stylesheet .= "$selector, {$selector}ol, {$selector}ol li {margin: 0;}\n";
+            $stylesheet .= "$selector.de1, $selector.de2 {{$this->code_style}}\n";
+        }
+
+        // Add overall styles
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->overall_style != '') {
+            $stylesheet .= "$selector {{$this->overall_style}}\n";
+        }
+
+        // Add styles for links
+        // note: economy mode does not make _any_ sense here
+        //       either the style is empty and thus no selector is needed
+        //       or the appropriate key is given.
+        foreach ($this->link_styles as $key => $style) {
+            if ($style != '') {
+                switch ($key) {
+                    case GESHI_LINK:
+                        $stylesheet .= "{$selector}a:link {{$style}}\n";
+                        break;
+                    case GESHI_HOVER:
+                        $stylesheet .= "{$selector}a:hover {{$style}}\n";
+                        break;
+                    case GESHI_ACTIVE:
+                        $stylesheet .= "{$selector}a:active {{$style}}\n";
+                        break;
+                    case GESHI_VISITED:
+                        $stylesheet .= "{$selector}a:visited {{$style}}\n";
+                        break;
+                }
+            }
+        }
+
+        // Header and footer
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->header_content_style != '') {
+            $stylesheet .= "$selector.head {{$this->header_content_style}}\n";
+        }
+        if ($this->footer_content_style != '') {
+            $stylesheet .= "$selector.foot {{$this->footer_content_style}}\n";
+        }
+
+        // Styles for important stuff
+        // note: neglect economy_mode, empty styles are meaningless
+        if ($this->important_styles != '') {
+            $stylesheet .= "$selector.imp {{$this->important_styles}}\n";
+        }
+
+        // Simple line number styles
+        if ((!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) && $this->line_style1 != '') {
+            $stylesheet .= "{$selector}li, {$selector}.li1 {{$this->line_style1}}\n";
+        }
+        if ((!$economy_mode || $this->line_numbers != GESHI_NO_LINE_NUMBERS) && $this->table_linenumber_style != '') {
+            $stylesheet .= "{$selector}.ln {{$this->table_linenumber_style}}\n";
+        }
+        // If there is a style set for fancy line numbers, echo it out
+        if ((!$economy_mode || $this->line_numbers == GESHI_FANCY_LINE_NUMBERS) && $this->line_style2 != '') {
+            $stylesheet .= "{$selector}.li2 {{$this->line_style2}}\n";
+        }
+
+        // note: empty styles are meaningless
+        foreach ($this->language_data['STYLES']['KEYWORDS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['KEYWORDS'][$group]) &&
+                $this->lexic_permissions['KEYWORDS'][$group]))) {
+                $stylesheet .= "$selector.kw$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['COMMENTS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['COMMENTS'][$group]) &&
+                $this->lexic_permissions['COMMENTS'][$group]) ||
+                (!empty($this->language_data['COMMENT_REGEXP']) &&
+                !empty($this->language_data['COMMENT_REGEXP'][$group])))) {
+                $stylesheet .= "$selector.co$group {{$styles}}\n";
+            }
+        }
+        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') {
+                    $group = '_h';
+                }
+                $stylesheet .= "$selector.es$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['BRACKETS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['BRACKETS'])) {
+                $stylesheet .= "$selector.br$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['SYMBOLS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['SYMBOLS'])) {
+                $stylesheet .= "$selector.sy$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['STRINGS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['STRINGS'])) {
+                // NEW: since 1.0.8 we have to handle hardquotes
+                if ($group === 'HARD') {
+                    $group = '_h';
+                }
+                $stylesheet .= "$selector.st$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['NUMBERS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['NUMBERS'])) {
+                $stylesheet .= "$selector.nu$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['METHODS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode || $this->lexic_permissions['METHODS'])) {
+                $stylesheet .= "$selector.me$group {{$styles}}\n";
+            }
+        }
+        // note: neglect economy_mode, empty styles are meaningless
+        foreach ($this->language_data['STYLES']['SCRIPT'] as $group => $styles) {
+            if ($styles != '') {
+                $stylesheet .= "$selector.sc$group {{$styles}}\n";
+            }
+        }
+        foreach ($this->language_data['STYLES']['REGEXPS'] as $group => $styles) {
+            if ($styles != '' && (!$economy_mode ||
+                (isset($this->lexic_permissions['REGEXPS'][$group]) &&
+                $this->lexic_permissions['REGEXPS'][$group]))) {
+                if (is_array($this->language_data['REGEXPS'][$group]) &&
+                    array_key_exists(GESHI_CLASS, $this->language_data['REGEXPS'][$group])) {
+                    $stylesheet .= "$selector.";
+                    $stylesheet .= $this->language_data['REGEXPS'][$group][GESHI_CLASS];
+                    $stylesheet .= " {{$styles}}\n";
+                } else {
+                    $stylesheet .= "$selector.re$group {{$styles}}\n";
+                }
+            }
+        }
+        // Styles for lines being highlighted extra
+        if (!$economy_mode || (count($this->highlight_extra_lines)!=count($this->highlight_extra_lines_styles))) {
+            $stylesheet .= "{$selector}.ln-xtra, {$selector}li.ln-xtra, {$selector}div.ln-xtra {{$this->highlight_extra_lines_style}}\n";
+        }
+        $stylesheet .= "{$selector}span.xtra { display:block; }\n";
+        foreach ($this->highlight_extra_lines_styles as $lineid => $linestyle) {
+            $stylesheet .= "{$selector}.lx$lineid, {$selector}li.lx$lineid, {$selector}div.lx$lineid {{$linestyle}}\n";
+        }
+
+        return $stylesheet;
+    }
+
+    /**
+     * Get's the style that is used for the specified line
+     *
+     * @param int The line number information is requested for
+     * @access private
+     * @since 1.0.7.21
+     */
+    function get_line_style($line) {
+        //$style = null;
+        $style = null;
+        if (isset($this->highlight_extra_lines_styles[$line])) {
+            $style = $this->highlight_extra_lines_styles[$line];
+        } else { // if no "extra" style assigned
+            $style = $this->highlight_extra_lines_style;
+        }
+
+        return $style;
+    }
+
+    /**
+    * this functions creates an optimized regular expression list
+    * of an array of strings.
+    *
+    * Example:
+    * $list = array('faa', 'foo', 'foobar');
+    *          => string 'f(aa|oo(bar)?)'
+    *
+    * @param $list array of (unquoted) strings
+    * @param $regexp_delimiter your regular expression delimiter, @see preg_quote()
+    * @return string for regular expression
+    * @author Milian Wolff 
+    * @since 1.0.8
+    * @access private
+    */
+    function optimize_regexp_list($list, $regexp_delimiter = '/') {
+        $regex_chars = array('.', '\\', '+', '-', '*', '?', '[', '^', ']', '$',
+            '(', ')', '{', '}', '=', '!', '<', '>', '|', ':', $regexp_delimiter);
+        sort($list);
+        $regexp_list = array('');
+        $num_subpatterns = 0;
+        $list_key = 0;
+
+        // the tokens which we will use to generate the regexp list
+        $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;
+            // properly assign the new entry to the correct position in the token array
+            // possibly generate smaller common denominator keys
+            while (true) {
+                // get the common denominator
+                if (isset($prev_keys[$level])) {
+                    if ($prev_keys[$level] == $entry) {
+                        // this is a duplicate entry, skip it
+                        continue 2;
+                    }
+                    $char = 0;
+                    while (isset($entry[$char]) && isset($prev_keys[$level][$char])
+                            && $entry[$char] == $prev_keys[$level][$char]) {
+                        ++$char;
+                    }
+                    if ($char > 0) {
+                        // this entry has at least some chars in common with the current key
+                        if ($char == strlen($prev_keys[$level])) {
+                            // current key is totally matched, i.e. this entry has just some bits appended
+                            $pointer = &$pointer[$prev_keys[$level]];
+                        } else {
+                            // 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
+                                $pointer[$new_key_part1] = array($new_key_part2 => $pointer[$prev_keys[$level]]);
+                                unset($pointer[$prev_keys[$level]]);
+                                $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;
+                        $entry = substr($entry, $char);
+                        continue;
+                    }
+                    // else: fall trough, i.e. no common denominator was found
+                }
+                if ($level == 0 && !empty($tokens)) {
+                    // we can dump current tokens into the string and throw them away afterwards
+                    $new_entry = $this->_optimize_regexp_list_tokens_to_string($tokens);
+                    $new_subpatterns = substr_count($new_entry, '(?:');
+                    if (GESHI_MAX_PCRE_SUBPATTERNS && $num_subpatterns + $new_subpatterns > GESHI_MAX_PCRE_SUBPATTERNS) {
+                        $regexp_list[++$list_key] = $new_entry;
+                        $num_subpatterns = $new_subpatterns;
+                    } else {
+                        if (!empty($regexp_list[$list_key])) {
+                            $new_entry = '|' . $new_entry;
+                        }
+                        $regexp_list[$list_key] .= $new_entry;
+                        $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]);
+        }
+        // make sure the last tokens get converted as well
+        $new_entry = $this->_optimize_regexp_list_tokens_to_string($tokens);
+        if (GESHI_MAX_PCRE_SUBPATTERNS && $num_subpatterns + substr_count($new_entry, '(?:') > GESHI_MAX_PCRE_SUBPATTERNS) {
+            if ( !empty($regexp_list[$list_key]) ) {
+              ++$list_key;
+            }
+            $regexp_list[$list_key] = $new_entry;
+        } else {
+            if (!empty($regexp_list[$list_key])) {
+                $new_entry = '|' . $new_entry;
+            }
+            $regexp_list[$list_key] .= $new_entry;
+        }
+        return $regexp_list;
+    }
+    /**
+    * this function creates the appropriate regexp string of an token array
+    * you should not call this function directly, @see $this->optimize_regexp_list().
+    *
+    * @param &$tokens array of tokens
+    * @param $recursed bool to know wether we recursed or not
+    * @return string
+    * @author Milian Wolff 
+    * @since 1.0.8
+    * @access private
+    */
+    function _optimize_regexp_list_tokens_to_string(&$tokens, $recursed = false) {
+        $list = '';
+        foreach ($tokens as $token => $sub_tokens) {
+            $list .= $token;
+            $close_entry = isset($sub_tokens['']);
+            unset($sub_tokens['']);
+            if (!empty($sub_tokens)) {
+                $list .= '(?:' . $this->_optimize_regexp_list_tokens_to_string($sub_tokens, true) . ')';
+                if ($close_entry) {
+                    // make sub_tokens optional
+                    $list .= '?';
+                }
+            }
+            $list .= '|';
+        }
+        if (!$recursed) {
+            // do some optimizations
+            // common trailing strings
+            // BUGGY!
+            //$list = preg_replace_callback('#(?<=^|\:|\|)\w+?(\w+)(?:\|.+\1)+(?=\|)#', create_function(
+            //    '$matches', 'return "(?:" . preg_replace("#" . preg_quote($matches[1], "#") . "(?=\||$)#", "", $matches[0]) . ")" . $matches[1];'), $list);
+            // (?:p)? => p?
+            $list = preg_replace('#\(\?\:(.)\)\?#', '\1?', $list);
+            // (?:a|b|c|d|...)? => [abcd...]?
+            // TODO: a|bb|c => [ac]|bb
+            static $callback_2;
+            if (!isset($callback_2)) {
+                $callback_2 = create_function('$matches', 'return "[" . str_replace("|", "", $matches[1]) . "]";');
+            }
+            $list = preg_replace_callback('#\(\?\:((?:.\|)+.)\)#', $callback_2, $list);
+        }
+        // return $list without trailing pipe
+        return substr($list, 0, -1);
+    }
+} // End Class GeSHi
+
+
+if (!function_exists('geshi_highlight')) {
+    /**
+     * Easy way to highlight stuff. Behaves just like highlight_string
+     *
+     * @param string The code to highlight
+     * @param string The language to highlight the code in
+     * @param string The path to the language files. You can leave this blank if you need
+     *               as from version 1.0.7 the path should be automatically detected
+     * @param boolean Whether to return the result or to echo
+     * @return string The code highlighted (if $return is true)
+     * @since 1.0.2
+     */
+    function geshi_highlight($string, $language, $path = null, $return = false) {
+        $geshi = new GeSHi($string, $language, $path);
+        $geshi->set_header_type(GESHI_HEADER_NONE);
+
+        if ($return) {
+            return '' . $geshi->parse_code() . '';
+        }
+
+        echo '' . $geshi->parse_code() . '';
+
+        if ($geshi->error()) {
+            return false;
+        }
+        return true;
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/4cs.php b/sources/inc/geshi/4cs.php
new file mode 100644
index 0000000..5209c51
--- /dev/null
+++ b/sources/inc/geshi/4cs.php
@@ -0,0 +1,139 @@
+ 'GADV 4CS',
+    'COMMENT_SINGLE' => array(1 => "//"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'All', 'AllMatches', 'And', 'And_Filters', 'As', 'Asc', 'BasedOn',
+            'BestMatch', 'Block', 'Buffer', 'ByRef', 'ByVal', 'Call', 'Channel',
+            'Chr', 'Clear', 'Close', 'Confirm', 'Const', 'Continue', 'Cos',
+            'Critical', 'Declare', 'Default', 'DefaultChannel', 'DefaultDelayTime',
+            'DefaultReceiveMode', 'DefaultResponseTime', '#Define', 'DelayTime',
+            'Delete', 'Div', 'Else', '#Else', 'ElseIf', '#ElseIf', 'End', 'EndCritical',
+            'EndInlineC', 'EndFunction', 'EndIf', '#EndIf', 'EndInputList',
+            'EndLocalChannel', 'EndScenario', 'EndSub', 'EndWhile', 'Error',
+            'ErrorLevelOff', 'ErrorLevelOn', 'ErrorLevelSet', 'ErrorLevelSetRaw',
+            'Event', 'EventMode', 'EventOff', 'EventOn', 'EventSet', 'EventSetRaw',
+            'Execute', 'Exit', 'Exp', 'FileClose', 'FilterClear', 'FileEOF', 'FileOpen',
+            'FileRead', 'FileSize', 'FileWrite', 'FilterAdd', 'FilterMode',
+            'FilterOff', 'FilterOn', 'For', 'Format', 'Function', 'GoOnline', 'GoTo',
+            'Handle', 'Hide', 'If', '#If', '#IfDef', '#IfNDef', 'Ignore', '#Include',
+            'InlineC', 'Input', 'InputItem', 'InputList', 'Kill', 'LBound', 'LocalChannel',
+            'Local', 'Log', 'Log10', 'LogOff', 'LogOn', 'Loop', 'Message', 'Mod',
+            'MonitorChannel', 'MostFormat', 'MostMessage', 'Named', 'Never', 'Next',
+            'NoOrder', 'Not', 'Nothing', 'NoWait', 'Numeric', 'OnError', 'OnEvent',
+            'Or', 'Or_Filters', 'Order', 'Pass', 'Pow', 'Prototype', 'Quit', 'Raise',
+            'Random', 'Receive', 'ReceiveMode', 'ReceiveRaw', 'Redim', 'Remote', 'Repeat',
+            'Repeated', 'ResponseTime', 'Resume', 'ResumeCritical', 'RT_Common',
+            'RT_Dll_Call', 'RT_FILEIO', 'RT_General', 'RT_HardwareAccess',
+            'RT_MessageVariableAccess', 'RT_Scenario', 'RT_VariableAccess', 'Runtime',
+            'Scenario', 'ScenarioEnd', 'ScenarioStart', 'ScenarioStatus', 'ScenarioTerminate',
+            'Send', 'SendRaw', 'Set', 'SetError', 'Sin', 'Single', 'Show', 'Start',
+            'StartCritical', 'Starts', 'Static', 'Step', 'Stop', 'String', 'Sub',
+            'System_Error', 'TerminateAllChilds', 'Terminates', 'Then', 'Throw', 'TimeOut',
+            'To', 'TooLate', 'Trunc', 'UBound', 'Unexpected', 'Until', 'User_Error',
+            'View', 'Wait', 'Warning', 'While', 'XOr'
+            ),
+        2 => array(
+            'alias', 'winapi', 'long', 'char', 'double', 'float', 'int', 'short', 'lib'
+            )
+        ),
+    'SYMBOLS' => array(
+        '=', ':=', '<', '>', '<>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000C0; font-weight: bold;',
+            2 => 'color: #808080;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000080;'
+            ),
+        '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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/6502acme.php b/sources/inc/geshi/6502acme.php
new file mode 100644
index 0000000..203e04d
--- /dev/null
+++ b/sources/inc/geshi/6502acme.php
@@ -0,0 +1,230 @@
+ 'MOS 6502 (6510) ACME Cross Assembler format',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* 6502/6510 Opcodes. */
+        1 => array(
+            'adc', 'and', 'asl', 'bcc', 'bcs', 'beq', 'bit', 'bmi',
+            'bne', 'bpl', 'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli',
+            'clv', 'cmp', 'cpx', 'cpy', 'dec', 'dex', 'dey', 'eor',
+            'inc', 'inx', 'iny', 'jmp', 'jsr', 'lda', 'ldx', 'ldy',
+            'lsr', 'nop', 'ora', 'pha', 'php', 'pla', 'plp', 'rol',
+            'ror', 'rti', 'rts', 'sbc', 'sec', 'sed', 'sei', 'sta',
+            'stx', 'sty', 'tax', 'tay', 'tsx', 'txa', 'txs', 'tya',
+            ),
+        /* Index Registers, yes the 6502 has other registers by they are only
+        * accessable by specific opcodes. The 65816 also has access to the stack pointer S. */
+        2 => array(
+            'x', 'y', 's'
+            ),
+        /* Directives or "pseudo opcodes" as defined by ACME 0.93 file AllPOs.txt. */
+        3 => array(
+            '!8', '!08', '!by', '!byte',
+            '!16', '!wo', '!word',
+            '!24', '!32',
+            '!fi', '!fill',
+            '!align',
+            '!ct', '!convtab',
+            '!tx', '!text',
+            '!pet',
+            '!raw',
+            '!scrxor',
+            '!to',
+            '!source',
+            '!bin', '!binary',
+            '!zn', '!zone',
+            '!sl',
+            '!svl',
+            '!sal',
+            '!if', '!ifdef',
+            '!for',
+            '!set',
+            '!do', 'while', 'until',
+            '!eof', '!endoffile',
+            '!warn', '!error', '!serious',
+            '!macro',
+//            , '*='        // Not a valid keyword (uses both * and = signs) moved to symbols instead.
+            '!initmem',
+            '!pseudopc',
+            '!cpu',
+            '!al', '!as', '!rl', '!rs',
+            ),
+
+        /* 6502/6510 undocumented opcodes (often referred to as illegal instructions).
+        *  These are present in the 6502/6510 but NOT in the newer CMOS revisions of the 65C02 or 65816.
+        *  As they are undocumented instructions there are no "official" names for them, there are also
+        *  several more that mainly perform various forms of crash and are not supported by ACME 0.93.
+        */
+        4 => array(
+            'anc', 'arr', 'asr', 'dcp', 'dop', 'isc', 'jam', 'lax',
+            'rla', 'rra', 'sax', 'sbx', 'slo', 'sre', 'top',
+            ),
+        /* 65c02 instructions, MOS added a few (much needed) instructions in the CMOS version of the 6502, but stupidly removed the undocumented/illegal opcodes.
+        *  ACME 0.93 does not support the rmb0-7 and smb0-7 instructions (they are currently rem'ed out).  */
+        5 => array(
+            'bra', 'phx', 'phy', 'plx', 'ply', 'stz', 'trb', 'tsb'
+            ),
+        /* 65816 instructions. */
+        6 => array(
+            'brl', 'cop', 'jml', 'jsl', 'mvn', 'mvp', 'pea', 'pei',
+            'per', 'phb', 'phd', 'phk', 'plb', 'pld', 'rep', 'rtl',
+            'sep', 'tcd', 'tcs', 'tdc', 'tsc', 'txy', 'tyx', 'wdm',
+            'xba', 'xce',
+            ),
+        /* Deprecated directives or "pseudo opcodes" as defined by ACME 0.93 file AllPOs.txt. */
+        7 => array(
+            '!cbm',
+            '!sz', '!subzone',
+            '!realpc',
+            ),
+        /* Math functions, some are aliases for the symbols. */
+        8 => array(
+            'not', 'div', 'mod', 'xor', 'or', 'sin', 'cos', 'tan',
+            'arcsin', 'arccos', 'arctan', 'int', 'float',
+
+            ),
+
+        ),
+    'SYMBOLS' => array(
+//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
+        '*=', '#', '!', '^', '-', '*', '/',
+        '%', '+', '-', '<<', '>>', '>>>',
+        '<', '>', '^', '<=', '<', '>=', '>', '!=',
+        '=', '&', '|', '<>',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00f; font-weight:bold;',
+            2 => 'color: #00f; font-weight:bold;',
+            3 => 'color: #080; font-weight:bold;',
+            4 => 'color: #f00; font-weight:bold;',
+            5 => 'color: #80f; font-weight:bold;',
+            6 => 'color: #f08; font-weight:bold;',
+            7 => 'color: #a04; font-weight:bold; font-style: italic;',
+            8 => 'color: #000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #080;'
+            ),
+        'NUMBERS' => array(
+            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX         => 'color: #f00;',
+            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
+            GESHI_NUMBER_FLT_NONSCI         => 'color: #f00;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0   => 'color: #f00;'
+            , 1 => 'color: #933;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_BIN_PREFIX_PERCENT,
+        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
+    'REGEXPS' => array(
+        //ACME .# Binary number format. e.g. %..##..##..##
+        0 => '\%[\.\#]{1,64}',
+        //ACME Local Labels
+        1 => '\.[_a-zA-Z][_a-zA-Z0-9]*',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'NUMBERS' => array(
+            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/6502kickass.php b/sources/inc/geshi/6502kickass.php
new file mode 100644
index 0000000..8042826
--- /dev/null
+++ b/sources/inc/geshi/6502kickass.php
@@ -0,0 +1,241 @@
+ 'MOS 6502 (6510) Kick Assembler format',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* 6502/6510 Opcodes including undocumented opcodes as Kick Assembler 3.13 does not make a distinction - they are ALL valid. */
+        1 => array(
+            'adc', 'ahx', 'alr', 'anc', 'anc2', 'and', 'arr', 'asl',
+            'axs', 'bcc', 'bcs', 'beq', 'bit', 'bmi', 'bne', 'bpl',
+            'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli', 'clv', 'cmp',
+            'cpx', 'cpy', 'dcp', 'dec', 'dex', 'dey', 'eor', 'inc',
+            'inx', 'iny', 'isc', 'jmp', 'jsr', 'las', 'lax', 'lda',
+            'ldx', 'ldy', 'lsr', 'nop', 'ora', 'pha', 'php', 'pla',
+            'plp', 'rla', 'rol', 'ror', 'rra', 'rti', 'rts', 'sax',
+            'sbc', 'sbc2', 'sec', 'sed', 'sei', 'shx', 'shy', 'slo',
+            'sre', 'sta', 'stx', 'sty', 'tas', 'tax', 'tay', 'tsx',
+            'txa', 'txs', 'tya', 'xaa',
+            ),
+        /* DTV additional Opcodes. */
+        2 => array(
+            'bra', 'sac', 'sir'
+            ),
+        /* Index Registers, yes the 6502 has other registers by they are only
+        * accessable by specific opcodes. */
+        3 => array(
+            'x', 'y'
+            ),
+        /* Directives. */
+        4 => array(
+            '.pc', '.pseudopc', 'virtual', '.align', '.byte', '.word', '.text', '.fill',
+            '.import source', '.import binary', '.import c64', '.import text', '.import', '.print', '.printnow',
+            '.error', '.var', '.eval', '.const', '.eval const', '.enum', '.label', '.define', '.struct',
+            'if', '.for', '.macro', '.function', '.return', '.pseudocommand', '.namespace', '.filenamespace',
+            '.assert', '.asserterror',
+            ),
+        /* Kick Assembler 3.13 Functions/Operators. */
+        5 => array(
+            'size', 'charAt', 'substring', 'asNumber', 'asBoolean', 'toIntString', 'toBinaryString', 'toOctalString',
+            'toHexString', 'lock',                                       // String functions/operators.
+            'get', 'set', 'add', 'remove', 'shuffle',                    // List functions.
+            'put', 'keys',                                               // Hashtable functions.
+            'getType', 'getValue', 'CmdArgument',                        // Pseudo Commands functions.
+            'asmCommandSize',                                            // Opcode Constants functions.
+            'LoadBinary', 'getSize',
+            'LoadSid', 'getData',
+            'LoadPicture', 'width', 'height', 'getPixel', 'getSinglecolorByte', 'getMulticolorByte',
+            'createFile', 'writeln',
+            'cmdLineVars',
+            'getX', 'getY', 'getZ',                                             // Vector functions.
+            'RotationMatrix', 'ScaleMatrix', 'MoveMatrix', 'PerspectiveMatrix', // Matrix functions.
+
+            ),
+
+        /* Kick Assembler 3.13 Math Functions. */
+        6 => array(
+            'abs', 'acos', 'asin', 'atan', 'atan2', 'cbrt', 'ceil', 'cos', 'cosh',
+            'exp', 'expm1', 'floor', 'hypot', 'IEEEremainder', 'log', 'log10',
+            'log1p', 'max', 'min', 'pow', 'mod', 'random', 'round', 'signum',
+            'sin', 'sinh', 'sqrt', 'tan', 'tanh', 'toDegrees', 'toRadians',
+            ),
+
+        /* Kick Assembler 3.13 Objects/Data Types. */
+        7 => array(
+            'List',          // List() Object.
+            'Hashtable',     // Hashtable() Object.
+            'Vector',        // Vector() Object.
+            'Matrix',        // Matrix() Object.
+            ),
+
+        /* Kick Assembler 3.13 Constants. */
+        8 => array(
+            'PI', 'E',                                                         // Math Constants.
+            'AT_ABSOLUTE' , 'AT_ABSOLUTEX' , 'AT_ABSOLUTEY' , 'AT_IMMEDIATE',  // Pseudo Commands Constants.
+            'AT_INDIRECT' , 'AT_IZEROPAGEX' , 'AT_IZEROPAGEY' , 'AT_NONE',
+            'BLACK', 'WHITE', 'RED', 'CYAN', 'PURPLE', 'GREEN', 'BLUE',        // Colour Constants.
+            'YELLOW', 'ORANGE', 'BROWN', 'LIGHT_RED', 'DARK_GRAY', 'GRAY',
+            'LIGHT_GREEN', 'LIGHT_BLUE', 'LIGHT_GRAY',
+            'C64FILE',                                                         // Template Tag names.
+            'BF_C64FILE', 'BF_BITMAP_SINGLECOLOR', 'BF_KOALA' , 'BF_FLI',      // Binary format constant
+            ),
+
+        ),
+    'SYMBOLS' => array(
+//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
+        '-', '+', '-', '*', '/', '>', '<', '<<', '>>', '&', '|', '^', '=', '==',
+        '!=', '>=', '<=', '!', '&&', '||', '#',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00f; font-weight:bold;',
+            2 => 'color: #00f; font-weight:bold;',
+            3 => 'color: #00f; font-weight:bold;',
+            4 => 'color: #080; font-weight:bold;',
+            5 => 'color: #80f; font-weight:bold;',
+            6 => 'color: #f08; font-weight:bold;',
+            7 => 'color: #a04; font-weight:bold; font-style: italic;',
+            8 => 'color: #f08; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #080;'
+            ),
+        'NUMBERS' => array(
+            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
+            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
+            GESHI_NUMBER_FLT_NONSCI         => 'color: #f00;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #933;',
+            1 => 'color: #933;',
+            2 => 'color: #933;',
+            3 => 'color: #00f; font-weight:bold;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
+        GESHI_NUMBER_BIN_PREFIX_PERCENT,
+        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
+    'REGEXPS' => array(
+        //Labels end with a collon.
+        0 => '[!]{0,1}[_a-zA-Z][_a-zA-Z0-9]*\:',
+        //Multi Labels (local labels) references start with ! and end with + or - for forward/backward reference.
+        1 => '![_a-zA-Z][_a-zA-Z0-9]*[+-]',
+        //Macros start with a colon :Macro.
+        2 => ':[_a-zA-Z][_a-zA-Z0-9]*',
+        // Opcode Constants, such as LDA_IMM, STA_IZPY are basically all 6502 opcodes
+        // in UPPER case followed by _underscore_ and the ADDRESS MODE.
+        // As you might imagine that is rather a lot ( 78 supported Opcodes * 12 Addressing modes = 936 variations)
+        // So I thought it better and easier to maintain as a regular expression.
+        // NOTE: The order of the Address Modes must be maintained or it wont work properly (eg. place ZP first and find out!)
+        3 => '[A-Z]{3}[2]?_(?:IMM|IND|IZPX|IZPY|ZPX|ZPY|ABSX|ABSY|REL|ABS|ZP)',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'NUMBERS'  => array(
+            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
+            ),
+        'KEYWORDS' => array(
+            5 => array (
+                'DISALLOWED_BEFORE' => "(?|^&'\"])"
+                ),
+            6 => array (
+                'DISALLOWED_BEFORE' => "(?|^&'\"])"
+                ),
+            8 => array (
+                'DISALLOWED_BEFORE' => "(?|^&'\"])"
+                )
+            )
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/6502tasm.php b/sources/inc/geshi/6502tasm.php
new file mode 100644
index 0000000..86aa479
--- /dev/null
+++ b/sources/inc/geshi/6502tasm.php
@@ -0,0 +1,189 @@
+ 'MOS 6502 (6510) TASM/64TASS 1.46 Assembler format',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* 6502/6510 Opcodes. */
+        1 => array(
+            'adc', 'and', 'asl', 'bcc', 'bcs', 'beq', 'bit', 'bmi',
+            'bne', 'bpl', 'brk', 'bvc', 'bvs', 'clc', 'cld', 'cli',
+            'clv', 'cmp', 'cpx', 'cpy', 'dec', 'dex', 'dey', 'eor',
+            'inc', 'inx', 'iny', 'jmp', 'jsr', 'lda', 'ldx', 'ldy',
+            'lsr', 'nop', 'ora', 'pha', 'php', 'pla', 'plp', 'rol',
+            'ror', 'rti', 'rts', 'sbc', 'sec', 'sed', 'sei', 'sta',
+            'stx', 'sty', 'tax', 'tay', 'tsx', 'txa', 'txs', 'tya',
+            ),
+        /* Index Registers, yes the 6502 has other registers by they are only
+        * accessable by specific opcodes. The 65816 also has access to the stack pointer S. */
+        2 => array(
+            'x', 'y', 's'
+            ),
+        /* Directives. */
+        3 => array(
+            '.al', '.align', '.as', '.assert', '.binary', '.byte', '.cerror', '.char',
+            '.comment', '.cpu', '.cwarn', '.databank', '.dpage', '.else', '.elsif',
+            '.enc', '.endc', '.endif', '.endm', '.endp', '.error', '.fi', '.fill',
+            '.for', '.here', '.if', '.ifeq', '.ifmi', '.ifne', '.ifpl',
+            '.include', '.int', '.logical', '.long', '.macro', '.next', '.null', '.offs',
+            '.page', '.pend', '.proc', '.rept', '.rta', '.shift', '.text', '.warn', '.word',
+            '.xl', '.xs',
+//            , '*='        // Not a valid keyword (uses both * and = signs) moved to symbols instead.
+            ),
+
+        /* 6502/6510 undocumented opcodes (often referred to as illegal instructions).
+        *  These are present in the 6502/6510 but NOT in the newer CMOS revisions of the 65C02 or 65816.
+        *  As they are undocumented instructions there are no "official" names for them, these are the names
+        *  used by 64TASS V1.46.
+        */
+        4 => array(
+            'ahx', 'alr', 'anc', 'ane', 'arr', 'asr', 'axs', 'dcm',
+            'dcp', 'ins', 'isb', 'isc', 'jam', 'lae', 'las', 'lax',
+            'lds', 'lxa', 'rla', 'rra', 'sax', 'sbx', 'sha', 'shs',
+            'shx', 'shy', 'slo', 'sre', 'tas', 'xaa',
+            ),
+        /* 65c02 instructions, MOS added a few (much needed) instructions in the
+        *  CMOS version of the 6502, but stupidly removed the undocumented/illegal opcodes.  */
+        5 => array(
+            'bra', 'dea', 'gra', 'ina', 'phx', 'phy', 'plx', 'ply',
+            'stz', 'trb', 'tsb',
+            ),
+        /* 65816 instructions. */
+        6 => array(
+            'brl', 'cop', 'jml', 'jsl', 'mvn', 'mvp', 'pea', 'pei',
+            'per', 'phb', 'phd', 'phk', 'plb', 'pld', 'rep', 'rtl',
+            'sep', 'stp', 'swa', 'tad', 'tcd', 'tcs', 'tda',
+            'tdc', 'tsa', 'tsc', 'txy', 'tyx', 'wai', 'xba', 'xce',
+            ),
+        /* Deprecated directives (or yet to be implemented). */
+        7 => array(
+            '.global', '.check'
+            ),
+        ),
+    'SYMBOLS' => array(
+//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
+        '*=', '#', '<', '>', '`', '=', '<', '>',
+        '!=', '>=', '<=', '+', '-', '*', '/', '//', '|',
+        '^', '&', '<<', '>>', '-', '~', '!',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00f; font-weight:bold;',
+            2 => 'color: #00f; font-weight:bold;',
+            3 => 'color: #080; font-weight:bold;',
+            4 => 'color: #f00; font-weight:bold;',
+            5 => 'color: #80f; font-weight:bold;',
+            6 => 'color: #f08; font-weight:bold;',
+            7 => 'color: #a04; font-weight:bold; font-style: italic;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #080;'
+            ),
+        'NUMBERS' => array(
+            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
+            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
+        GESHI_NUMBER_BIN_PREFIX_PERCENT,
+        // AMCE Octal format not support and gets picked up as Decimal unfortunately.
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'NUMBERS' => array(
+            'PRECHECK_RX' => '/[\da-fA-F\.\$\%]/'
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/68000devpac.php b/sources/inc/geshi/68000devpac.php
new file mode 100644
index 0000000..f46387a
--- /dev/null
+++ b/sources/inc/geshi/68000devpac.php
@@ -0,0 +1,168 @@
+ 'Motorola 68000 - HiSoft Devpac ST 2 Assembler format',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Directives. */
+        1 => array(
+            'end', 'include', 'incbin', 'opt', 'even', 'cnop', 'dc.b', 'dc.w',
+            'dc.l', 'ds.b', 'ds.w', 'ds.l', 'dcb.b', 'dcb.w', 'dcb.l',
+            'fail', 'output', '__g2', 'rept', 'endr', 'list', 'nolist', 'plen',
+            'llen', 'ttl', 'subttl', 'spc', 'page', 'listchar', 'format',
+            'equ', 'equr', 'set', 'reg', 'rs.b', 'rs.w', 'rs.l', 'rsreset',
+            'rsset', '__rs', 'ifeq', 'ifne', 'ifgt', 'ifge', 'iflt', 'ifle', 'endc',
+            'ifd', 'ifnd', 'ifc', 'ifnc', 'elseif', 'iif', 'macro', 'endm', 'mexit',
+            'narg', '\@', 'section', 'text', 'data', 'bss', 'xdef', 'xref', 'org',
+            'offset', '__lk', 'comment',
+            ),
+        /* 68000 Opcodes. */
+        2 => array(
+            'abcd',    'add', 'adda', 'addi', 'addq', 'addx',  'and', 'andi',
+            'asl',     'asr',  'bcc', 'bchg', 'bclr',  'bcs',  'beq',  'bge',
+            'bgt',     'bhi',  'ble',  'bls',  'blt',  'bmi',  'bne',  'bpl',
+            'bra',    'bset',  'bsr', 'btst',  'bvc',  'bvs',  'chk',  'clr',
+            'cmp',    'cmpa', 'cmpi', 'cmpm', 'dbcc', 'dbcs', 'dbeq',  'dbf',
+            'dbge',   'dbgt', 'dbhi', 'dble', 'dbls', 'dblt', 'dbmi', 'dbne',
+            'dbpl',   'dbra',  'dbt', 'dbvc', 'dbvs', 'divs', 'divu',  'eor',
+            'eori',    'exg',  'ext','illegal','jmp',  'jsr',  'lea', 'link',
+            'lsl',     'lsr', 'move','movea','movem','movep','moveq', 'muls',
+            'mulu',   'nbcd',  'neg', 'negx',  'nop',  'not',   'or',  'ori',
+            'pea',   'reset',  'rol',  'ror', 'roxl', 'roxr',  'rte',  'rtr',
+            'rts',    'sbcd',  'scc',  'scs',  'seq',   'sf',  'sge',  'sgt',
+            'shi',     'sle',  'sls',  'slt',  'smi',  'sne',  'spl',   'st',
+            'stop',    'sub', 'suba', 'subi', 'subq', 'subx',  'svc',  'svs',
+            'swap',    'tas', 'trap','trapv',  'tst', 'unlk',
+            ),
+        /* oprand sizes. */
+        3 => array(
+            'b', 'w', 'l' , 's'
+            ),
+        /* 68000 Registers. */
+        4 => array(
+            'd0', 'd1', 'd2', 'd3', 'd4', 'd5', 'd6', 'd7',
+            'a0', 'a1', 'a2', 'a3', 'a4', 'a5', 'a6', 'a7', 'sp', 'usp', 'ssp',
+            'pc', 'ccr', 'sr',
+            ),
+        ),
+    'SYMBOLS' => array(
+//        '[', ']', '(', ')', '{', '}',    // These are already defined by GeSHi as BRACKETS.
+        '+', '-', '~', '<<', '>>', '&',
+        '!', '^', '*', '/', '=', '<', '>',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #f08; font-weight:bold;',
+            2 => 'color: #00f; font-weight:bold;',
+            3 => 'color: #00f; font-weight:bold;',
+            4 => 'color: #080; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #999; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #080;'
+            ),
+        'NUMBERS' => array(
+            GESHI_NUMBER_INT_BASIC          => 'color: #f00;',
+            GESHI_NUMBER_HEX_PREFIX_DOLLAR  => 'color: #f00;',
+            GESHI_NUMBER_BIN_PREFIX_PERCENT => 'color: #f00;',
+            GESHI_NUMBER_OCT_PREFIX_AT      => 'color: #f00;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #933;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_HEX_PREFIX_DOLLAR |
+        GESHI_NUMBER_OCT_PREFIX_AT |
+        GESHI_NUMBER_BIN_PREFIX_PERCENT,
+    'REGEXPS' => array(
+        //Labels may end in a colon.
+        0 => '(?<=\A\x20|\r|\n|^)[\._a-zA-Z][\._a-zA-Z0-9]*[\:]?[\s]'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'NUMBERS' => array(
+            'PRECHECK_RX' => '/[\da-fA-F\.\$\%\@]/'
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/abap.php b/sources/inc/geshi/abap.php
new file mode 100644
index 0000000..5acd261
--- /dev/null
+++ b/sources/inc/geshi/abap.php
@@ -0,0 +1,1409 @@
+.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
+ *
+ *************************************************************************************
+ *
+ *     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' => 'ABAP',
+    '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(
+        1 => "'",
+        2 => "`"
+        ),
+    'ESCAPE_CHAR' => '',
+
+    'KEYWORDS' => array(
+        //***********************************************
+        // Section 2 : process sequences of several tokens
+        //***********************************************
+
+        7 => array(
+            'at new',
+            'at end of',
+            'at first',
+            'at last',
+            'loop at',
+            'loop at screen',
+            ),
+
+        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(
+            '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(
+            '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,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            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;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #4da619;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #3399ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #808080;',
+            1 => 'color: #800080;',
+            2 => 'color: #0000ff;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        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 => '=>'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    '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
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/actionscript-french.php b/sources/inc/geshi/actionscript-french.php
new file mode 100644
index 0000000..e816050
--- /dev/null
+++ b/sources/inc/geshi/actionscript-french.php
@@ -0,0 +1,957 @@
+ 'Actionscript',
+	'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+	'COMMENT_MULTI' => array('/*' => '*/'),
+	'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+	'QUOTEMARKS' => array("'", '"'),
+	'ESCAPE_CHAR' => '\\',
+	'KEYWORDS' => array(
+		1 => array(
+			'#include', 
+			'for', 
+			'foreach', 
+			'if', 
+			'elseif', 
+			'else', 
+			'while', 
+			'do', 
+			'dowhile',
+			'endwhile', 
+			'endif', 
+			'switch', 
+			'case', 
+			'endswitch', 
+			'break', 
+			'continue', 
+			'in',
+			'null', 
+			'false', 
+			'true', 
+			'var',
+			'default',
+			'new', 
+			'_global',
+			'undefined',
+			'super'	
+			),
+		2 => array(
+			'static',
+			'private',
+			'public',
+			'class',
+			'extends',
+			'implements',
+			'import',
+			'return',
+			'trace',
+			'_quality',
+			'_root',
+			'set',
+			'setInterval',
+			'setProperty',
+			'stopAllSounds',
+			'targetPath',
+			'this',
+			'typeof',
+			'unescape',
+			'updateAfterEvent'
+			),
+		3 => array (
+			'Accessibility',
+			'Array',
+			'Boolean',
+			'Button',
+			'Camera',
+			'Color',
+			'ContextMenuItem',
+			'ContextMenu',
+			'Cookie',
+			'Date',
+			'Error',
+			'function',
+			'FWEndCommand',
+			'FWJavascript',
+			'Key',
+			'LoadMovieNum',
+			'LoadMovie',
+			'LoadVariablesNum',
+			'LoadVariables',
+			'LoadVars',
+			'LocalConnection',
+			'Math',
+			'Microphone',
+			'MMExecute',
+			'MMEndCommand',
+			'MMSave',
+			'Mouse',
+			'MovieClipLoader',
+			'MovieClip',
+			'NetConnexion',
+			'NetStream',
+			'Number',
+			'Object',
+			'printAsBitmapNum',
+			'printNum',
+			'printAsBitmap',
+			'printJob',
+			'print',
+			'Selection',
+			'SharedObject',
+			'Sound',
+			'Stage',
+			'String',
+			'System',
+			'TextField',
+			'TextFormat',
+			'Tween',
+			'Video',
+			'XMLUI',
+			'XMLNode',
+			'XMLSocket',
+			'XML'
+			),
+		4 => array (	
+			'isactive',
+			'updateProperties'
+			),
+		5 => array (	
+			'callee',
+			'caller',
+			),
+		6 => array (	
+			'concat',
+			'join',
+			'pop',
+			'push',
+			'reverse',
+			'shift',
+			'slice',
+			'sort',
+			'sortOn',
+			'splice',
+			'toString',
+			'unshift'
+			),
+		7 => array (
+			'valueOf'
+			),
+		8 => array (	
+			'onDragOut',
+			'onDragOver',
+			'onKeyUp',
+			'onKillFocus',
+			'onPress',
+			'onRelease',
+			'onReleaseOutside',
+			'onRollOut',
+			'onRollOver',
+			'onSetFocus'
+			),
+		9 => array (	
+			'setMode',
+			'setMotionLevel',
+			'setQuality',
+			'activityLevel',
+			'bandwidth',
+			'currentFps',
+			'fps',
+			'index',
+			'motionLevel',
+			'motionTimeOut',
+			'muted',
+			'names',
+			'quality',
+			'onActivity',
+			'onStatus'
+			),
+		10 => array (	
+			'getRGB',
+			'setRGB',
+			'getTransform',
+			'setTransform'
+			),
+		11 => array (	
+			'caption',
+			'enabled',
+			'separatorBefore',
+			'visible',
+			'onSelect'
+			),
+		12 => array (	
+			'setCookie',
+			'getcookie'
+			),	
+		13 => array (	
+			'hideBuiltInItems',
+			'builtInItems',
+			'customItems',
+			'onSelect'
+			),
+		14 => array (	
+			'CustomActions.get',
+			'CustomActions.install',
+			'CustomActions.list',
+			'CustomActions.uninstall',
+			),		
+		15 => array (	
+			'getDate',
+			'getDay',
+			'getFullYear',
+			'getHours',
+			'getMilliseconds',
+			'getMinutes',
+			'getMonth',
+			'getSeconds',
+			'getTime',
+			'getTimezoneOffset',
+			'getUTCDate',
+			'getUTCDay',
+			'getUTCFullYear',
+			'getUTCHours',
+			'getUTCMinutes',
+			'getUTCMilliseconds',
+			'getUTCMonth',
+			'getUTCSeconds',
+			'getYear',
+			'setDate',
+			'setFullYear',
+			'setHours',
+			'setMilliseconds',
+			'setMinutes',
+			'setMonth',
+			'setSeconds',
+			'setTime',
+			'setUTCDate',
+			'setUTCDay',
+			'setUTCFullYear',
+			'setUTCHours',
+			'setUTCMinutes',
+			'setUTCMilliseconds',
+			'setUTCMonth',
+			'setUTCSeconds',
+			'setYear',
+			'UTC'
+			),	
+		16 => array (	
+			'message',
+			'name',
+			'throw',
+			'try',
+			'catch',
+			'finally'
+			),
+		17 => array (	
+			'apply',
+			'call'
+			),
+		18 => array (	
+			'BACKSPACE',
+			'CAPSLOCK',
+			'CONTROL',
+			'DELETEKEY',
+			'DOWN',
+			'END',
+			'ENTER',
+			'ESCAPE',
+			'getAscii',
+			'getCode',
+			'HOME',
+			'INSERT',
+			'isDown',
+			'isToggled',
+			'LEFT',
+			'onKeyDown',
+			'onKeyUp',
+			'PGDN',
+			'PGUP',
+			'RIGHT',
+			'SPACE',
+			'TAB',
+			'UP'
+			),
+		19 => array (
+			'addRequestHeader',
+			'contentType',
+			'decode'
+			),
+		20 => array (
+			'allowDomain',
+			'allowInsecureDomain',
+			'close',
+			'domain'
+			),
+		21 => array (
+			'abs',
+			'acos',
+			'asin',
+			'atan',
+			'atan2',
+			'ceil',
+			'cos',
+			'exp',
+			'floor',
+			'log',
+			'LN2',
+			'LN10',
+			'LOG2E',
+			'LOG10E',
+			'max',
+			'min',
+			'PI',
+			'pow',
+			'random',
+			'sin',
+			'SQRT1_2',
+			'sqrt',
+			'tan',
+			'round',
+			'SQRT2'
+			),
+		22 => array (
+			'activityLevel',
+			'muted',
+			'names',
+			'onActivity',
+			'onStatus',
+			'setRate',
+			'setGain',
+			'gain',
+			'rate',
+			'setSilenceLevel',
+			'setUseEchoSuppression',
+			'silenceLevel',
+			'silenceTimeOut',
+			'useEchoSuppression'
+			),
+		23 => array (
+			'hide',
+			'onMouseDown',
+			'onMouseMove',
+			'onMouseUp',
+			'onMouseWeel',
+			'show'
+			),
+		24 => array (
+			'_alpha',
+			'attachAudio',
+			'attachMovie',
+			'beginFill',
+			'beginGradientFill',
+			'clear',
+			'createEmptyMovieClip',
+			'createTextField',
+			'_current',
+			'curveTo',
+			'_dropTarget',
+			'duplicateMovieClip',
+			'endFill',
+			'focusEnabled',
+			'enabled',
+			'_focusrec',
+			'_framesLoaded',
+			'getBounds',
+			'getBytesLoaded',
+			'getBytesTotal',
+			'getDepth',
+			'getInstanceAtDepth',
+			'getNextHighestDepth',
+			'getSWFVersion',
+			'getTextSnapshot',
+			'getURL',
+			'globalToLocal',
+			'gotoAndPlay',
+			'gotoAndStop',
+			'_height',
+			'hitArea',
+			'hitTest',
+			'lineStyle',
+			'lineTo',
+			'localToGlobal',
+			'_lockroot',
+			'menu',
+			'onUnload',
+			'_parent',
+			'play',
+			'prevFrame',
+			'_quality',
+			'removeMovieClip',
+			'_rotation',
+			'setMask',
+			'_soundbuftime',
+			'startDrag',
+			'stopDrag',
+			'stop',
+			'swapDepths',
+			'tabChildren',
+			'_target',
+			'_totalFrames',
+			'trackAsMenu',
+			'unloadMovie',
+			'useHandCursor',
+			'_visible',
+			'_width',
+			'_xmouse',
+			'_xscale',
+			'_x',
+			'_ymouse',
+			'_yscale',
+			'_y'
+			),
+		25 => array (
+			'getProgress',
+			'loadClip',
+			'onLoadComplete',
+			'onLoadError',
+			'onLoadInit',
+			'onLoadProgress',
+			'onLoadStart'
+			),
+		26 => array (
+			'bufferLength',
+			'currentFps',
+			'seek',
+			'setBufferTime',
+			'bufferTime',
+			'time',
+			'pause'
+			),
+		27 => array (
+			'MAX_VALUE',
+			'MIN_VALUE',
+			'NEGATIVE_INFINITY',
+			'POSITIVE_INFINITY'
+			),
+		28 => array (
+			'addProperty',
+			'constructor',
+			'__proto__',
+			'registerClass',
+			'__resolve',
+			'unwatch',
+			'watch',
+			'onUpDate'
+			),
+		29 => array (
+			'addPage'
+			),
+		30 => array (
+			'getBeginIndex',
+			'getCaretIndex',
+			'getEndIndex',
+			'setSelection'
+			),
+		31 => array (
+			'flush',
+			'getLocal',
+			'getSize'
+			),
+		32 => array (
+			'attachSound',
+			'duration',
+			'getPan',
+			'getVolume',
+			'onID3',
+			'loadSound',
+			'id3',
+			'onSoundComplete',
+			'position',
+			'setPan',
+			'setVolume'
+			),
+		33 => array (
+			'getBeginIndex',
+			'getCaretIndex',
+			'getEndIndex',
+			'setSelection'
+			),
+		34 => array (
+			'getEndIndex',
+			),
+		35 => array (
+			'align',
+			'height',
+			'width',
+			'onResize',
+			'scaleMode',
+			'showMenu'
+			),
+		36 => array (
+			'charAt',
+			'charCodeAt',
+			'concat',
+			'fromCharCode',
+			'indexOf',
+			'lastIndexOf',
+			'substr',
+			'substring',
+			'toLowerCase',
+			'toUpperCase'
+			),
+		37 => array (
+			'avHardwareDisable',
+			'hasAccessibility',
+			'hasAudioEncoder',
+			'hasAudio',
+			'hasEmbeddedVideo',
+			'hasMP3',
+			'hasPrinting',
+			'hasScreenBroadcast',
+			'hasScreenPlayback',
+			'hasStreamingAudio',
+			'hasStreamingVideo',
+			'hasVideoEncoder',
+			'isDebugger',
+			'language',
+			'localFileReadDisable',
+			'manufacturer',
+			'os',
+			'pixelAspectRatio',
+			'playerType',
+			'screenColor',
+			'screenDPI',
+			'screenResolutionX',
+			'screenResolutionY',
+			'serverString',
+			'version'
+			),
+		38 => array (
+			'allowDomain',
+			'allowInsecureDomain',
+			'loadPolicyFile'
+			),
+		39 => array (
+			'exactSettings',
+			'setClipboard',
+			'showSettings',
+			'useCodepage'
+			),
+		40 => array (
+			'getStyle',
+			'getStyleNames',
+			'parseCSS',
+			'setStyle',
+			'transform'
+			),
+		41 => array (
+			'autoSize',
+			'background',
+			'backgroundColor',
+			'border',
+			'borderColor',
+			'bottomScroll',
+			'condenseWhite',
+			'embedFonts',
+			'getFontList',
+			'getNewTextFormat',
+			'getTextFormat',
+			'hscroll',
+			'htmlText',
+			'html',
+			'maxChars',
+			'maxhscroll',
+			'maxscroll',
+			'mouseWheelEnabled',
+			'multiline',
+			'onScroller',
+			'password',
+			'removeTextField',
+			'replaceSel',
+			'replaceText',
+			'restrict',
+			'scroll',
+			'selectable',
+			'setNewTextFormat',
+			'setTextFormat',
+			'styleSheet',
+			'tabEnabled',
+			'tabIndex',
+			'textColor',
+			'textHeight',
+			'textWidth',
+			'text',
+			'type',
+			'_url',
+			'variable',
+			'wordWrap'
+			),
+		42 => array (	
+			'blockIndent',
+			'bold',
+			'bullet',
+			'font',
+			'getTextExtent',
+			'indent',
+			'italic',
+			'leading',
+			'leftMargin',
+			'rightMargin',
+			'size',
+			'tabStops',
+			'underline'
+			),
+		43 => array (	
+			'findText',
+			'getCount',
+			'getSelected',
+			'getSelectedText',
+			'getText',
+			'hitTestTextNearPos',
+			'setSelectColor',
+			'setSelected'
+			),
+		44 => array (	
+			'begin',
+			'change',
+			'continueTo',
+			'fforward',
+			'finish',
+			'func',
+			'FPS',
+			'getPosition',
+			'isPlaying',
+			'looping',
+			'obj',
+			'onMotionChanged',
+			'onMotionFinished',
+			'onMotionLooped',
+			'onMotionStarted',
+			'onMotionResumed',
+			'onMotionStopped',
+			'prop',
+			'rewind',
+			'resume',
+			'setPosition',
+			'time',
+			'userSeconds',
+			'yoyo'
+			),
+		45 => array (	
+			'attachVideo',
+			'deblocking',
+			'smoothing'
+			),
+		46 => array (	
+			'addRequestHeader',
+			'appendChild',
+			'attributes',
+			'childNodes',
+			'cloneNode',
+			'contentType',
+			'createElement',
+			'createTextNode',
+			'docTypeDecl',
+			'firstChild',
+			'hasChildNodes',
+			'ignoreWhite',
+			'insertBefore',
+			'lastChild',
+			'nextSibling',
+			'nodeName',
+			'nodeType',
+			'nodeValue',
+			'parentNode',
+			'parseXML',
+			'previousSibling',
+			'removeNode',
+			'xmlDecl'
+			),
+		47 => array (	
+			'onClose',
+			'onXML'
+			),
+		48 => array (	
+			'add',
+			'and',
+			'_highquality',
+			'chr',
+			'eq',
+			'ge',
+			'ifFrameLoaded',
+			'int',
+			'le',
+			'it',
+			'mbchr',
+			'mblength',
+			'mbord',
+			'ne',
+			'not',
+			'or',
+			'ord',
+			'tellTarget',
+			'toggleHighQuality'
+			),
+		49 => array (
+			'ASSetPropFlags',
+			'ASnative',
+			'ASconstructor',
+			'AsSetupError',
+			'FWEndCommand',
+			'FWJavascript',
+			'MMEndCommand',
+			'MMSave',
+			'XMLUI'
+		), 
+		50 => array (
+			'System.capabilities'
+		),
+		51 => array (
+			'System.security'
+		),
+		52 => array (
+			'TextField.StyleSheet'
+		)
+		),
+	'SYMBOLS' => array(
+		'(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>','='
+		),
+	'CASE_SENSITIVE' => array(
+		GESHI_COMMENTS => false,
+		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,
+		18 => true,
+		19 => true,
+		20 => true,
+		21 => true,
+		22 => true,
+		23 => true,
+		24 => true,
+		25 => true,
+		26 => true,
+		27 => true,
+		28 => true,
+		29 => true,
+		30 => true,
+		31 => true,
+		32 => true,
+		33 => true,
+		34 => true,
+		35 => true,
+		36 => true,
+		37 => true,
+		38 => true,
+		39 => true,
+		40 => true,
+		41 => true,
+		42 => true,
+		43 => true,
+		44 => true,
+		45 => true,
+		46 => true,
+		47 => true,
+		48 => true,
+		49 => true,
+		50 => true,
+		51 => true,
+		52 => true
+		),
+	'STYLES' => array(
+		'KEYWORDS' => array(
+			1 => 'color: #0000ff;',
+			2 => 'color: #006600;',
+			3 => 'color: #000080;',
+			4 => 'color: #006600;',
+			5 => 'color: #006600;',
+			6 => 'color: #006600;',
+			7 => 'color: #006600;',
+			8 => 'color: #006600;',
+			9 => 'color: #006600;',
+			10 => 'color: #006600;',
+			11 => 'color: #006600;',
+			12 => 'color: #006600;',
+			13 => 'color: #006600;',
+			14 => 'color: #006600;',
+			15 => 'color: #006600;',
+			16 => 'color: #006600;',
+			17 => 'color: #006600;',
+			18 => 'color: #006600;',
+			19 => 'color: #006600;',
+			20 => 'color: #006600;',
+			21 => 'color: #006600;',
+			22 => 'color: #006600;',
+			23 => 'color: #006600;',
+			24 => 'color: #006600;',
+			25 => 'color: #006600;',
+			26 => 'color: #006600;',
+			27 => 'color: #006600;',
+			28 => 'color: #006600;',
+			29 => 'color: #006600;',
+			30 => 'color: #006600;',
+			31 => 'color: #006600;',
+			32 => 'color: #006600;',
+			33 => 'color: #006600;',
+			34 => 'color: #006600;',
+			35 => 'color: #006600;',
+			36 => 'color: #006600;',
+			37 => 'color: #006600;',
+			38 => 'color: #006600;',
+			39 => 'color: #006600;',
+			40 => 'color: #006600;',
+			41 => 'color: #006600;',
+			42 => 'color: #006600;',
+			43 => 'color: #006600;',
+			44 => 'color: #006600;',
+			45 => 'color: #006600;',
+			46 => 'color: #006600;',
+			47 => 'color: #006600;',
+			48 => 'color: #CC0000;',
+			49 => 'color: #5700d1;',
+			50 => 'color: #006600;',
+			51 => 'color: #006600;',
+			52 => 'color: #CC0000;'
+			),
+		'COMMENTS' => array(
+			1 => 'color: #ff8000; font-style: italic;',
+			2 => 'color: #ff8000; font-style: italic;',
+			'MULTI' => 'color: #ff8000; font-style: italic;'
+			),
+		'ESCAPE_CHAR' => array(
+			0 => 'color: #000099; font-weight: bold;'
+			),
+		'BRACKETS' => array(
+			0 => 'color: #333333;'
+			),
+		'STRINGS' => array(
+			0 => 'color: #333333; background-color: #eeeeee;'
+			),
+		'NUMBERS' => array(
+			0 => 'color: #c50000;'
+			),
+
+		'SYMBOLS' => array(
+			0 => 'color: #000000;'
+			),
+		'METHODS' => array(
+			1 => 'color: #006600;'
+			),
+		'REGEXPS' => array(
+			),
+		'SCRIPT' => array(
+			)
+		),
+	'URLS' => array(
+		1 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		2 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		3 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		4 => 'http://wiki.media-box.net/documentation/flash/accessibility/{FNAME}',
+		5 => 'http://wiki.media-box.net/documentation/flash/arguments/{FNAME}',
+		6 => 'http://wiki.media-box.net/documentation/flash/array/{FNAME}',
+		7 => 'http://wiki.media-box.net/documentation/flash/boolean/{FNAME}',
+		8 => 'http://wiki.media-box.net/documentation/flash/button/{FNAME}',
+		9 => 'http://wiki.media-box.net/documentation/flash/camera/{FNAME}',
+		10 => 'http://wiki.media-box.net/documentation/flash/color/{FNAME}',
+		11 => 'http://wiki.media-box.net/documentation/flash/contextmenuitem/{FNAME}',
+		12 => 'http://wiki.media-box.net/documentation/flash/contextmenu/{FNAME}',
+		13 => 'http://wiki.media-box.net/documentation/flash/cookie/{FNAME}',
+		14 => 'http://wiki.media-box.net/documentation/flash/customactions/{FNAME}',
+		15 => 'http://wiki.media-box.net/documentation/flash/date/{FNAME}',
+		16 => 'http://wiki.media-box.net/documentation/flash/error/{FNAME}',
+		17 => 'http://wiki.media-box.net/documentation/flash/function/{FNAME}',
+		18 => 'http://wiki.media-box.net/documentation/flash/key/{FNAME}',
+		19 => 'http://wiki.media-box.net/documentation/flash/loadvars/{FNAME}',
+		20 => 'http://wiki.media-box.net/documentation/flash/localconnection/{FNAME}',
+		21 => 'http://wiki.media-box.net/documentation/flash/math/{FNAME}',
+		22 => 'http://wiki.media-box.net/documentation/flash/microphone/{FNAME}',
+		23 => 'http://wiki.media-box.net/documentation/flash/mouse/{FNAME}',
+		24 => 'http://wiki.media-box.net/documentation/flash/movieclip/{FNAME}',
+		25 => 'http://wiki.media-box.net/documentation/flash/moviecliploader/{FNAME}',
+		26 => 'http://wiki.media-box.net/documentation/flash/netstream/{FNAME}',
+		27 => 'http://wiki.media-box.net/documentation/flash/number/{FNAME}',
+		28 => 'http://wiki.media-box.net/documentation/flash/object/{FNAME}',
+		29 => 'http://wiki.media-box.net/documentation/flash/printJob/{FNAME}',
+		30 => 'http://wiki.media-box.net/documentation/flash/selection/{FNAME}',
+		31 => 'http://wiki.media-box.net/documentation/flash/sharedobject/{FNAME}',
+		32 => 'http://wiki.media-box.net/documentation/flash/sound/{FNAME}',
+		33 => 'http://wiki.media-box.net/documentation/flash/selection/{FNAME}',
+		34 => 'http://wiki.media-box.net/documentation/flash/sharedobject/{FNAME}',
+		35 => 'http://wiki.media-box.net/documentation/flash/stage/{FNAME}',
+		36 => 'http://wiki.media-box.net/documentation/flash/string/{FNAME}',
+		37 => 'http://wiki.media-box.net/documentation/flash/system/capabilities/{FNAME}',
+		38 => 'http://wiki.media-box.net/documentation/flash/system/security/{FNAME}',
+		39 => 'http://wiki.media-box.net/documentation/flash/system/{FNAME}',
+		40 => 'http://wiki.media-box.net/documentation/flash/textfield/stylesheet/{FNAME}',
+		41 => 'http://wiki.media-box.net/documentation/flash/textfield/{FNAME}',
+		42 => 'http://wiki.media-box.net/documentation/flash/textformat/{FNAME}',
+		43 => 'http://wiki.media-box.net/documentation/flash/textsnapshot/{FNAME}',
+		44 => 'http://wiki.media-box.net/documentation/flash/tween/{FNAME}',
+		45 => 'http://wiki.media-box.net/documentation/flash/video/{FNAME}',
+		46 => 'http://wiki.media-box.net/documentation/flash/xml/{FNAME}',
+		47 => 'http://wiki.media-box.net/documentation/flash/xmlsocket/{FNAME}',
+		48 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		49 => 'http://wiki.media-box.net/documentation/flash/{FNAME}',
+		50 => 'http://wiki.media-box.net/documentation/flash/system/capabilities',
+		51 => 'http://wiki.media-box.net/documentation/flash/system/security',
+		52 => 'http://wiki.media-box.net/documentation/flash/textfield/stylesheet'
+		),
+	'OOLANG' => true,
+	'OBJECT_SPLITTERS' => array(
+		1 => '.'
+		),
+	'REGEXPS' => array(
+		),
+	'STRICT_MODE_APPLIES' => GESHI_NEVER,
+	'SCRIPT_DELIMITERS' => array(),
+	'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff --git a/sources/inc/geshi/actionscript.php b/sources/inc/geshi/actionscript.php
new file mode 100644
index 0000000..08e5b49
--- /dev/null
+++ b/sources/inc/geshi/actionscript.php
@@ -0,0 +1,197 @@
+ 'ActionScript',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '#include', 'for', 'foreach', 'each', 'if', 'elseif', 'else', 'while', 'do', 'dowhile',
+            'endwhile', 'endif', 'switch', 'case', 'endswitch', 'return', 'break', 'continue', 'in'
+            ),
+        2 => array(
+            'null', 'false', 'true', 'var',
+            'default', 'function', 'class',
+            'new', '_global'
+            ),
+        3 => array(
+            '#endinitclip', '#initclip', '__proto__', '_accProps', '_alpha', '_currentframe',
+            '_droptarget', '_focusrect', '_framesloaded', '_height', '_highquality', '_lockroot',
+            '_name', '_parent', '_quality', '_root', '_rotation', '_soundbuftime', '_target', '_totalframes',
+            '_url', '_visible', '_width', '_x', '_xmouse', '_xscale', '_y', '_ymouse', '_yscale', 'abs',
+            'Accessibility', 'acos', 'activityLevel', 'add', 'addListener', 'addPage', 'addProperty',
+            'addRequestHeader', 'align', 'allowDomain', 'allowInsecureDomain', 'and', 'appendChild',
+            'apply', 'Arguments', 'Array', 'asfunction', 'asin', 'atan', 'atan2', 'attachAudio', 'attachMovie',
+            'attachSound', 'attachVideo', 'attributes', 'autosize', 'avHardwareDisable', 'background',
+            'backgroundColor', 'BACKSPACE', 'bandwidth', 'beginFill', 'beginGradientFill', 'blockIndent',
+            'bold', 'Boolean', 'border', 'borderColor', 'bottomScroll', 'bufferLength', 'bufferTime',
+            'builtInItems', 'bullet', 'Button', 'bytesLoaded', 'bytesTotal', 'call', 'callee', 'caller',
+            'Camera', 'capabilities', 'CAPSLOCK', 'caption', 'catch', 'ceil', 'charAt', 'charCodeAt',
+            'childNodes', 'chr', 'clear', 'clearInterval', 'cloneNode', 'close', 'Color', 'concat',
+            'connect', 'condenseWhite', 'constructor', 'contentType', 'ContextMenu', 'ContextMenuItem',
+            'CONTROL', 'copy', 'cos', 'createElement', 'createEmptyMovieClip', 'createTextField',
+            'createTextNode', 'currentFps', 'curveTo', 'CustomActions', 'customItems', 'data', 'Date',
+            'deblocking', 'delete', 'DELETEKEY', 'docTypeDecl', 'domain', 'DOWN',
+            'duplicateMovieClip', 'duration', 'dynamic', 'E', 'embedFonts', 'enabled',
+            'END', 'endFill', 'ENTER', 'eq', 'Error', 'ESCAPE(Konstante)', 'escape(Funktion)', 'eval',
+            'exactSettings', 'exp', 'extends', 'finally', 'findText', 'firstChild', 'floor',
+            'flush', 'focusEnabled', 'font', 'fps', 'fromCharCode', 'fscommand',
+            'gain', 'ge', 'get', 'getAscii', 'getBeginIndex', 'getBounds', 'getBytesLoaded', 'getBytesTotal',
+            'getCaretIndex', 'getCode', 'getCount', 'getDate', 'getDay', 'getDepth', 'getEndIndex', 'getFocus',
+            'getFontList', 'getFullYear', 'getHours', 'getInstanceAtDepth', 'getLocal', 'getMilliseconds',
+            'getMinutes', 'getMonth', 'getNewTextFormat', 'getNextHighestDepth', 'getPan', 'getProgress',
+            'getProperty', 'getRGB', 'getSeconds', 'getSelected', 'getSelectedText', 'getSize', 'getStyle',
+            'getStyleNames', 'getSWFVersion', 'getText', 'getTextExtent', 'getTextFormat', 'getTextSnapshot',
+            'getTime', 'getTimer', 'getTimezoneOffset', 'getTransform', 'getURL', 'getUTCDate', 'getUTCDay',
+            'getUTCFullYear', 'getUTCHours', 'getUTCMilliseconds', 'getUTCMinutes', 'getUTCMonth', 'getUTCSeconds',
+            'getVersion', 'getVolume', 'getYear', 'globalToLocal', 'goto', 'gotoAndPlay', 'gotoAndStop',
+            'hasAccessibility', 'hasAudio', 'hasAudioEncoder', 'hasChildNodes', 'hasEmbeddedVideo', 'hasMP3',
+            'hasPrinting', 'hasScreenBroadcast', 'hasScreenPlayback', 'hasStreamingAudio', 'hasStreamingVideo',
+            'hasVideoEncoder', 'height', 'hide', 'hideBuiltInItems', 'hitArea', 'hitTest', 'hitTestTextNearPos',
+            'HOME', 'hscroll', 'html', 'htmlText', 'ID3', 'ifFrameLoaded', 'ignoreWhite', 'implements',
+            'import', 'indent', 'index', 'indexOf', 'Infinity', '-Infinity', 'INSERT', 'insertBefore', 'install',
+            'instanceof', 'int', 'interface', 'isActive', 'isDebugger', 'isDown', 'isFinite', 'isNaN', 'isToggled',
+            'italic', 'join', 'Key', 'language', 'lastChild', 'lastIndexOf', 'le', 'leading', 'LEFT', 'leftMargin',
+            'length', 'level', 'lineStyle', 'lineTo', 'list', 'LN10', 'LN2', 'load', 'loadClip', 'loaded', 'loadMovie',
+            'loadMovieNum', 'loadSound', 'loadVariables', 'loadVariablesNum', 'LoadVars', 'LocalConnection',
+            'localFileReadDisable', 'localToGlobal', 'log', 'LOG10E', 'LOG2E', 'manufacturer', 'Math', 'max',
+            'MAX_VALUE', 'maxChars', 'maxhscroll', 'maxscroll', 'mbchr', 'mblength', 'mbord', 'mbsubstring', 'menu',
+            'message', 'Microphone', 'min', 'MIN_VALUE', 'MMExecute', 'motionLevel', 'motionTimeOut', 'Mouse',
+            'mouseWheelEnabled', 'moveTo', 'Movieclip', 'MovieClipLoader', 'multiline', 'muted', 'name', 'names', 'NaN',
+            'ne', 'NEGATIVE_INFINITY', 'NetConnection', 'NetStream', 'newline', 'nextFrame',
+            'nextScene', 'nextSibling', 'nodeName', 'nodeType', 'nodeValue', 'not', 'Number', 'Object',
+            'on', 'onActivity', 'onChanged', 'onClipEvent', 'onClose', 'onConnect', 'onData', 'onDragOut',
+            'onDragOver', 'onEnterFrame', 'onID3', 'onKeyDown', 'onKeyUp', 'onKillFocus', 'onLoad', 'onLoadComplete',
+            'onLoadError', 'onLoadInit', 'onLoadProgress', 'onLoadStart', 'onMouseDown', 'onMouseMove', 'onMouseUp',
+            'onMouseWheel', 'onPress', 'onRelease', 'onReleaseOutside', 'onResize', 'onRollOut', 'onRollOver',
+            'onScroller', 'onSelect', 'onSetFocus', 'onSoundComplete', 'onStatus', 'onUnload', 'onUpdate', 'onXML',
+            'or(logischesOR)', 'ord', 'os', 'parentNode', 'parseCSS', 'parseFloat', 'parseInt', 'parseXML', 'password',
+            'pause', 'PGDN', 'PGUP', 'PI', 'pixelAspectRatio', 'play', 'playerType', 'pop', 'position',
+            'POSITIVE_INFINITY', 'pow', 'prevFrame', 'previousSibling', 'prevScene', 'print', 'printAsBitmap',
+            'printAsBitmapNum', 'PrintJob', 'printNum', 'private', 'prototype', 'public', 'push', 'quality',
+            'random', 'rate', 'registerClass', 'removeListener', 'removeMovieClip', 'removeNode', 'removeTextField',
+            'replaceSel', 'replaceText', 'resolutionX', 'resolutionY', 'restrict', 'reverse', 'RIGHT',
+            'rightMargin', 'round', 'scaleMode', 'screenColor', 'screenDPI', 'screenResolutionX', 'screenResolutionY',
+            'scroll', 'seek', 'selectable', 'Selection', 'send', 'sendAndLoad', 'separatorBefore', 'serverString',
+            'set', 'setvariable', 'setBufferTime', 'setClipboard', 'setDate', 'setFocus', 'setFullYear', 'setGain',
+            'setHours', 'setInterval', 'setMask', 'setMilliseconds', 'setMinutes', 'setMode', 'setMonth',
+            'setMotionLevel', 'setNewTextFormat', 'setPan', 'setProperty', 'setQuality', 'setRate', 'setRGB',
+            'setSeconds', 'setSelectColor', 'setSelected', 'setSelection', 'setSilenceLevel', 'setStyle',
+            'setTextFormat', 'setTime', 'setTransform', 'setUseEchoSuppression', 'setUTCDate', 'setUTCFullYear',
+            'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds', 'setVolume',
+            'setYear', 'SharedObject', 'SHIFT(Konstante)', 'shift(Methode)', 'show', 'showMenu', 'showSettings',
+            'silenceLevel', 'silenceTimeout', 'sin', 'size', 'slice', 'smoothing', 'sort', 'sortOn', 'Sound', 'SPACE',
+            'splice', 'split', 'sqrt', 'SQRT1_2', 'SQRT2', 'Stage', 'start', 'startDrag', 'static', 'status', 'stop',
+            'stopAllSounds', 'stopDrag', 'String', 'StyleSheet(Klasse)', 'styleSheet(Eigenschaft)', 'substr',
+            'substring', 'super', 'swapDepths', 'System', 'TAB', 'tabChildren', 'tabEnabled', 'tabIndex',
+            'tabStops', 'tan', 'target', 'targetPath', 'tellTarget', 'text', 'textColor', 'TextField', 'TextFormat',
+            'textHeight', 'TextSnapshot', 'textWidth', 'this', 'throw', 'time', 'toggleHighQuality', 'toLowerCase',
+            'toString', 'toUpperCase', 'trace', 'trackAsMenu', 'try', 'type', 'typeof', 'undefined',
+            'underline', 'unescape', 'uninstall', 'unloadClip', 'unloadMovie', 'unLoadMovieNum', 'unshift', 'unwatch',
+            'UP', 'updateAfterEvent', 'updateProperties', 'url', 'useCodePage', 'useEchoSuppression', 'useHandCursor',
+            'UTC', 'valueOf', 'variable', 'version', 'Video', 'visible', 'void', 'watch', 'width',
+            'with', 'wordwrap', 'XML', 'xmlDecl', 'XMLNode', 'XMLSocket'
+            )
+        ),
+    '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: #0066CC;'
+            ),
+        '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;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/actionscript3.php b/sources/inc/geshi/actionscript3.php
new file mode 100644
index 0000000..189d714
--- /dev/null
+++ b/sources/inc/geshi/actionscript3.php
@@ -0,0 +1,473 @@
+ 'ActionScript 3',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Regular expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(? GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'with', 'while', 'void', 'undefined', 'typeof', 'try', 'true',
+            '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',
+            'extends', 'override'
+            ),
+        2 => array(
+            'var'
+            ),
+        3 => array(
+            'function'
+            ),
+        4 => array(
+            'class', 'package'
+            ),
+        6 => array(
+            'flash.xml', 'flash.utils', 'flash.ui', 'flash.text',
+            'flash.system', 'flash.profiler', 'flash.printing', 'flash.net',
+            'flash.media', 'flash.geom', 'flash.filters', 'flash.external',
+            'flash.events', 'flash.errors', 'flash.display',
+            'flash.accessibility'
+            ),
+        7 => array(
+            'zoom', 'year', 'y', 'xmlDecl', 'x', 'writeUnsignedInt',
+            'writeUTFBytes', 'writeUTF', 'writeShort', 'writeObject',
+            'writeMultiByte', 'writeInt', 'writeFloat', 'writeExternal',
+            'writeDynamicProperty', 'writeDynamicProperties', 'writeDouble',
+            'writeBytes', 'writeByte', 'writeBoolean', 'wordWrap',
+            'willTrigger', 'width', 'volume', 'visible', 'videoWidth',
+            'videoHeight', 'version', 'valueOf', 'value', 'usingTLS',
+            'useRichTextClipboard', 'useHandCursor', 'useEchoSuppression',
+            'useCodePage', 'url', 'uri', 'uploadCompleteData', 'upload',
+            'updateProperties', 'updateAfterEvent', 'upState', 'unshift',
+            'unlock', 'unload', 'union', 'unescapeMultiByte', 'unescape',
+            'underline', 'uncompress', 'type', 'ty', 'tx', 'transparent',
+            'translate', 'transformPoint', 'transform', 'trackAsMenu', 'track',
+            'trace', 'totalMemory', 'totalFrames', 'topLeft', 'top',
+            'togglePause', 'toXMLString', 'toUpperCase', 'toUTCString',
+            'toTimeString', 'toString', 'toPrecision', 'toLowerCase',
+            'toLocaleUpperCase', 'toLocaleTimeString', 'toLocaleString',
+            'toLocaleLowerCase', 'toLocaleDateString', 'toFixed',
+            'toExponential', 'toDateString', 'timezoneOffset', 'timerComplete',
+            'timer', 'time', 'threshold', 'thickness', 'textWidth',
+            'textSnapshot', 'textInput', 'textHeight', 'textColor', 'text',
+            'test', 'target', 'tan', 'tabStops', 'tabIndexChange', 'tabIndex',
+            'tabEnabledChange', 'tabEnabled', 'tabChildrenChange',
+            'tabChildren', 'sync', 'swfVersion', 'swapChildrenAt',
+            'swapChildren', 'subtract', 'substring', 'substr', 'styleSheet',
+            'styleNames', 'strength', 'stopPropagation',
+            'stopImmediatePropagation', 'stopDrag', 'stopAll', 'stop', 'status',
+            'startDrag', 'start', 'stageY', 'stageX', 'stageWidth',
+            'stageHeight', 'stageFocusRect', 'stage', 'sqrt', 'split', 'splice',
+            'source', 'soundTransform', 'soundComplete', 'sortOn', 'sort',
+            'songName', 'some', 'socketData', 'smoothing', 'slice', 'size',
+            'sin', 'silent', 'silenceTimeout', 'silenceLevel', 'showSettings',
+            'showRedrawRegions', 'showDefaultContextMenu', 'show', 'shortcut',
+            'shiftKey', 'shift', 'sharpness', 'sharedEvents', 'shadowColor',
+            'shadowAlpha', 'settings', 'setUseEchoSuppression', 'setUTCSeconds',
+            'setUTCMonth', 'setUTCMinutes', 'setUTCMilliseconds', 'setUTCHours',
+            'setUTCFullYear', 'setUTCDate', 'setTimeout', 'setTime',
+            'setTextFormat', 'setStyle', 'setSilenceLevel', 'setSettings',
+            'setSelection', 'setSelected', 'setSelectColor', 'setSeconds',
+            'setQuality', 'setPropertyIsEnumerable', 'setProperty', 'setPixels',
+            'setPixel32', 'setPixel', 'setNamespace', 'setName',
+            'setMotionLevel', 'setMonth', 'setMode', 'setMinutes',
+            'setMilliseconds', 'setLoopback', 'setLoopBack', 'setLocalName',
+            'setKeyFrameInterval', 'setInterval', 'setHours', 'setFullYear',
+            'setEmpty', 'setDirty', 'setDate', 'setCompositionString',
+            'setClipboard', 'setChildren', 'setChildIndex',
+            'setAdvancedAntiAliasingTable', 'serverString', 'separatorBefore',
+            'sendToURL', 'send', 'selectionEndIndex', 'selectionBeginIndex',
+            'selectable', 'select', 'seek', 'securityError', 'securityDomain',
+            'secondsUTC', 'seconds', 'search', 'scrollV', 'scrollRect',
+            'scrollH', 'scroll', 'screenResolutionY', 'screenResolutionX',
+            'screenDPI', 'screenColor', 'scenes', 'scaleY', 'scaleX',
+            'scaleMode', 'scale9Grid', 'scale', 'save', 'sandboxType',
+            'sameDomain', 'running', 'round', 'rotation', 'rotate', 'root',
+            'rollOver', 'rollOut', 'rightToRight', 'rightToLeft', 'rightPeak',
+            'rightMargin', 'right', 'rewind', 'reverse', 'resume', 'restrict',
+            'resize', 'reset', 'requestHeaders', 'replaceText',
+            'replaceSelectedText', 'replace', 'repeatCount', 'render',
+            'removedFromStage', 'removed', 'removeNode', 'removeNamespace',
+            'removeEventListener', 'removeChildAt', 'removeChild',
+            'relatedObject', 'registerFont', 'registerClassAlias', 'redOffset',
+            'redMultiplier', 'rect', 'receiveVideo', 'receiveAudio',
+            'readUnsignedShort', 'readUnsignedInt', 'readUnsignedByte',
+            'readUTFBytes', 'readUTF', 'readShort', 'readObject',
+            'readMultiByte', 'readInt', 'readFloat', 'readExternal',
+            'readDouble', 'readBytes', 'readByte', 'readBoolean', 'ratios',
+            'rate', 'random', 'quality', 'push', 'publish', 'proxyType',
+            'prototype', 'propertyIsEnumerable', 'progress',
+            'processingInstructions', 'printAsBitmap', 'print',
+            'previousSibling', 'preventDefault', 'prevScene', 'prevFrame',
+            'prettyPrinting', 'prettyIndent', 'preserveAlpha', 'prependChild',
+            'prefix', 'pow', 'position', 'pop', 'polar', 'playerType', 'play',
+            'pixelSnapping', 'pixelDissolve', 'pixelBounds', 'pixelAspectRatio',
+            'perlinNoise', 'pause', 'parseXML', 'parseInt', 'parseFloat',
+            'parseCSS', 'parse', 'parentNode', 'parentDomain',
+            'parentAllowsChild', 'parent', 'parameters', 'paperWidth',
+            'paperHeight', 'pan', 'paletteMap', 'pageWidth', 'pageHeight',
+            'overState', 'outsideCutoff', 'os', 'orientation', 'open',
+            'opaqueBackground', 'onPlayStatus', 'onMetaData', 'onCuePoint',
+            'offsetPoint', 'offset', 'objectID', 'objectEncoding', 'numLock',
+            'numLines', 'numFrames', 'numChildren', 'normalize', 'noise',
+            'nodeValue', 'nodeType', 'nodeName', 'nodeKind', 'noAutoLabeling',
+            'nextValue', 'nextSibling', 'nextScene', 'nextNameIndex',
+            'nextName', 'nextFrame', 'netStatus', 'navigateToURL',
+            'namespaceURI', 'namespaceDeclarations', 'namespace', 'names',
+            'name', 'muted', 'multiline', 'moveTo', 'mouseY', 'mouseX',
+            'mouseWheelEnabled', 'mouseWheel', 'mouseUp', 'mouseTarget',
+            'mouseOver', 'mouseOut', 'mouseMove', 'mouseLeave',
+            'mouseFocusChange', 'mouseEnabled', 'mouseDown', 'mouseChildren',
+            'motionTimeout', 'motionLevel', 'monthUTC', 'month',
+            'modificationDate', 'mode', 'minutesUTC', 'minutes', 'min',
+            'millisecondsUTC', 'milliseconds', 'method', 'message', 'merge',
+            'menuSelect', 'menuItemSelect', 'maxScrollV', 'maxScrollH',
+            'maxLevel', 'maxChars', 'max', 'matrixY', 'matrixX', 'matrix',
+            'match', 'mask', 'mapPoint', 'mapBitmap', 'map', 'manufacturer',
+            'macType', 'loopback', 'loop', 'log', 'lock', 'localeCompare',
+            'localY', 'localX', 'localToGlobal', 'localName',
+            'localFileReadDisable', 'loaderURL', 'loaderInfo', 'loader',
+            'loadPolicyFile', 'loadBytes', 'load', 'liveDelay', 'link',
+            'lineTo', 'lineStyle', 'lineGradientStyle', 'level',
+            'letterSpacing', 'length', 'leftToRight', 'leftToLeft', 'leftPeak',
+            'leftMargin', 'left', 'leading', 'lastIndexOf', 'lastIndex',
+            'lastChild', 'language', 'labels', 'knockout', 'keyUp',
+            'keyLocation', 'keyFrameInterval', 'keyFocusChange', 'keyDown',
+            'keyCode', 'kerning', 'join', 'italic', 'isXMLName',
+            'isPrototypeOf', 'isNaN', 'isFocusInaccessible', 'isFinite',
+            'isEmpty', 'isDefaultPrevented', 'isDebugger', 'isBuffering',
+            'isAttribute', 'isAccessible', 'ioError', 'invert', 'invalidate',
+            'intersects', 'intersection', 'interpolate', 'insideCutoff',
+            'insertChildBefore', 'insertChildAfter', 'insertBefore', 'inner',
+            'init', 'info', 'inflatePoint', 'inflate', 'indexOf', 'index',
+            'indent', 'inScopeNamespaces', 'imeComposition', 'ime',
+            'ignoreWhitespace', 'ignoreWhite', 'ignoreProcessingInstructions',
+            'ignoreComments', 'ignoreCase', 'identity', 'idMap', 'id3',
+            'httpStatus', 'htmlText', 'hoursUTC', 'hours', 'hitTestTextNearPos',
+            'hitTestState', 'hitTestPoint', 'hitTestObject', 'hitTest',
+            'hitArea', 'highlightColor', 'highlightAlpha', 'hideObject',
+            'hideBuiltInItems', 'hide', 'height', 'hasVideoEncoder', 'hasTLS',
+            'hasStreamingVideo', 'hasStreamingAudio', 'hasSimpleContent',
+            'hasScreenPlayback', 'hasScreenBroadcast', 'hasProperty',
+            'hasPrinting', 'hasOwnProperty', 'hasMP3', 'hasIME', 'hasGlyphs',
+            'hasEventListener', 'hasEmbeddedVideo', 'hasDefinition',
+            'hasComplexContent', 'hasChildNodes', 'hasAudioEncoder', 'hasAudio',
+            'hasAccessibility', 'gridFitType', 'greenOffset', 'greenMultiplier',
+            'graphics', 'gotoAndStop', 'gotoAndPlay', 'globalToLocal', 'global',
+            'getUTCSeconds', 'getUTCMonth', 'getUTCMinutes',
+            'getUTCMilliseconds', 'getUTCHours', 'getUTCFullYear', 'getUTCDay',
+            'getUTCDate', 'getTimezoneOffset', 'getTimer', 'getTime',
+            'getTextRunInfo', 'getTextFormat', 'getText', 'getStyle',
+            'getStackTrace', 'getSelectedText', 'getSelected', 'getSeconds',
+            'getRemote', 'getRect', 'getQualifiedSuperclassName',
+            'getQualifiedClassName', 'getProperty', 'getPrefixForNamespace',
+            'getPixels', 'getPixel32', 'getPixel', 'getParagraphLength',
+            'getObjectsUnderPoint', 'getNamespaceForPrefix', 'getMonth',
+            'getMinutes', 'getMilliseconds', 'getMicrophone', 'getLocal',
+            'getLineText', 'getLineOffset', 'getLineMetrics', 'getLineLength',
+            'getLineIndexOfChar', 'getLineIndexAtPoint', 'getImageReference',
+            'getHours', 'getFullYear', 'getFirstCharInParagraph',
+            'getDescendants', 'getDefinitionByName', 'getDefinition', 'getDay',
+            'getDate', 'getColorBoundsRect', 'getClassByAlias', 'getChildIndex',
+            'getChildByName', 'getChildAt', 'getCharIndexAtPoint',
+            'getCharBoundaries', 'getCamera', 'getBounds', 'genre',
+            'generateFilterRect', 'gain', 'fullYearUTC', 'fullYear',
+            'fullScreen', 'fscommand', 'fromCharCode', 'framesLoaded',
+            'frameRate', 'frame', 'fps', 'forwardAndBack', 'formatToString',
+            'forceSimple', 'forEach', 'fontType', 'fontStyle', 'fontSize',
+            'fontName', 'font', 'focusRect', 'focusOut', 'focusIn', 'focus',
+            'flush', 'floor', 'floodFill', 'firstChild', 'findText', 'filters',
+            'filter', 'fillRect', 'fileList', 'extension', 'extended', 'exp',
+            'exec', 'exactSettings', 'every', 'eventPhase', 'escapeMultiByte',
+            'escape', 'errorID', 'error', 'equals', 'enumerateFonts',
+            'enterFrame', 'endian', 'endFill', 'encodeURIComponent',
+            'encodeURI', 'enabled', 'embedFonts', 'elements',
+            'dynamicPropertyWriter', 'dropTarget', 'drawRoundRect', 'drawRect',
+            'drawEllipse', 'drawCircle', 'draw', 'download', 'downState',
+            'doubleClickEnabled', 'doubleClick', 'dotall', 'domain',
+            'docTypeDecl', 'doConversion', 'divisor', 'distance', 'dispose',
+            'displayState', 'displayMode', 'displayAsPassword', 'dispatchEvent',
+            'description', 'describeType', 'descent', 'descendants',
+            'deltaTransformPoint', 'delta', 'deleteProperty', 'delay',
+            'defaultTextFormat', 'defaultSettings', 'defaultObjectEncoding',
+            'decodeURIComponent', 'decodeURI', 'decode', 'deblocking',
+            'deactivate', 'dayUTC', 'day', 'dateUTC', 'date', 'dataFormat',
+            'data', 'd', 'customItems', 'curveTo', 'currentTarget',
+            'currentScene', 'currentLabels', 'currentLabel', 'currentFrame',
+            'currentFPS', 'currentDomain', 'currentCount', 'ctrlKey', 'creator',
+            'creationDate', 'createTextNode', 'createGradientBox',
+            'createElement', 'createBox', 'cos', 'copyPixels', 'copyChannel',
+            'copy', 'conversionMode', 'contextMenuOwner', 'contextMenu',
+            'contentType', 'contentLoaderInfo', 'content', 'containsRect',
+            'containsPoint', 'contains', 'constructor', 'connectedProxyType',
+            'connected', 'connect', 'condenseWhite', 'concatenatedMatrix',
+            'concatenatedColorTransform', 'concat', 'computeSpectrum',
+            'compress', 'componentY', 'componentX', 'complete', 'compare',
+            'comments', 'comment', 'colors', 'colorTransform', 'color', 'code',
+            'close', 'cloneNode', 'clone', 'client', 'click', 'clearTimeout',
+            'clearInterval', 'clear', 'clamp', 'children', 'childNodes',
+            'childIndex', 'childAllowsParent', 'child', 'checkPolicyFile',
+            'charCount', 'charCodeAt', 'charCode', 'charAt', 'changeList',
+            'change', 'ceil', 'caretIndex', 'caption', 'capsLock', 'cancelable',
+            'cancel', 'callee', 'callProperty', 'call', 'cacheAsBitmap', 'c',
+            'bytesTotal', 'bytesLoaded', 'bytesAvailable', 'buttonMode',
+            'buttonDown', 'bullet', 'builtInItems', 'bufferTime',
+            'bufferLength', 'bubbles', 'browse', 'bottomScrollV', 'bottomRight',
+            'bottom', 'borderColor', 'border', 'bold', 'blurY', 'blurX',
+            'blueOffset', 'blueMultiplier', 'blockIndent', 'blendMode',
+            'bitmapData', 'bias', 'beginGradientFill', 'beginFill',
+            'beginBitmapFill', 'bandwidth', 'backgroundColor', 'background',
+            'b', 'available', 'avHardwareDisable', 'autoSize', 'attributes',
+            'attribute', 'attachNetStream', 'attachCamera', 'attachAudio',
+            'atan2', 'atan', 'asyncError', 'asin', 'ascent', 'artist',
+            'areSoundsInaccessible', 'areInaccessibleObjectsUnderPoint',
+            'applyFilter', 'apply', 'applicationDomain', 'appendText',
+            'appendChild', 'antiAliasType', 'angle', 'alwaysShowSelection',
+            'altKey', 'alphas', 'alphaOffset', 'alphaMultiplier', 'alpha',
+            'allowInsecureDomain', 'allowDomain', 'align', 'album',
+            'addedToStage', 'added', 'addPage', 'addNamespace', 'addHeader',
+            'addEventListener', 'addChildAt', 'addChild', 'addCallback', 'add',
+            'activityLevel', 'activity', 'active', 'activating', 'activate',
+            'actionScriptVersion', 'acos', 'accessibilityProperties', 'abs'
+            ),
+        8 => array(
+            'WRAP', 'VERTICAL', 'VARIABLES',
+            'UTC', 'UPLOAD_COMPLETE_DATA', 'UP', 'UNLOAD', 'UNKNOWN',
+            'UNIQUESORT', 'TOP_RIGHT', 'TOP_LEFT', 'TOP', 'TIMER_COMPLETE',
+            'TIMER', 'TEXT_NODE', 'TEXT_INPUT', 'TEXT', 'TAB_INDEX_CHANGE',
+            'TAB_ENABLED_CHANGE', 'TAB_CHILDREN_CHANGE', 'TAB', 'SYNC',
+            'SUBTRACT', 'SUBPIXEL', 'STATUS', 'STANDARD', 'SQUARE', 'SQRT2',
+            'SQRT1_2', 'SPACE', 'SOUND_COMPLETE', 'SOCKET_DATA', 'SHOW_ALL',
+            'SHIFT', 'SETTINGS_MANAGER', 'SELECT', 'SECURITY_ERROR', 'SCROLL',
+            'SCREEN', 'ROUND', 'ROLL_OVER', 'ROLL_OUT', 'RIGHT', 'RGB',
+            'RETURNINDEXEDARRAY', 'RESIZE', 'REPEAT', 'RENDER',
+            'REMOVED_FROM_STAGE', 'REMOVED', 'REMOTE', 'REGULAR', 'REFLECT',
+            'RED', 'RADIAL', 'PROGRESS', 'PRIVACY', 'POST', 'POSITIVE_INFINITY',
+            'PORTRAIT', 'PIXEL', 'PI', 'PENDING', 'PAGE_UP', 'PAGE_DOWN', 'PAD',
+            'OVERLAY', 'OUTER', 'OPEN', 'NaN', 'NUM_PAD', 'NUMPAD_SUBTRACT',
+            'NUMPAD_MULTIPLY', 'NUMPAD_ENTER', 'NUMPAD_DIVIDE',
+            'NUMPAD_DECIMAL', 'NUMPAD_ADD', 'NUMPAD_9', 'NUMPAD_8', 'NUMPAD_7',
+            'NUMPAD_6', 'NUMPAD_5', 'NUMPAD_4', 'NUMPAD_3', 'NUMPAD_2',
+            'NUMPAD_1', 'NUMPAD_0', 'NUMERIC', 'NO_SCALE', 'NO_BORDER',
+            'NORMAL', 'NONE', 'NEVER', 'NET_STATUS', 'NEGATIVE_INFINITY',
+            'MULTIPLY', 'MOUSE_WHEEL', 'MOUSE_UP', 'MOUSE_OVER', 'MOUSE_OUT',
+            'MOUSE_MOVE', 'MOUSE_LEAVE', 'MOUSE_FOCUS_CHANGE', 'MOUSE_DOWN',
+            'MITER', 'MIN_VALUE', 'MICROPHONE', 'MENU_SELECT',
+            'MENU_ITEM_SELECT', 'MEDIUM', 'MAX_VALUE', 'LOW', 'LOG2E', 'LOG10E',
+            'LOCAL_WITH_NETWORK', 'LOCAL_WITH_FILE', 'LOCAL_TRUSTED',
+            'LOCAL_STORAGE', 'LN2', 'LN10', 'LITTLE_ENDIAN', 'LINK',
+            'LINEAR_RGB', 'LINEAR', 'LIGHT_COLOR', 'LIGHTEN', 'LEFT', 'LCD',
+            'LAYER', 'LANDSCAPE', 'KOREAN', 'KEY_UP', 'KEY_FOCUS_CHANGE',
+            'KEY_DOWN', 'JUSTIFY', 'JAPANESE_KATAKANA_HALF',
+            'JAPANESE_KATAKANA_FULL', 'JAPANESE_HIRAGANA', 'Infinity', 'ITALIC',
+            'IO_ERROR', 'INVERT', 'INSERT', 'INPUT', 'INNER', 'INIT',
+            'IME_COMPOSITION', 'IGNORE', 'ID3', 'HTTP_STATUS', 'HORIZONTAL',
+            'HOME', 'HIGH', 'HARDLIGHT', 'GREEN', 'GET', 'FULLSCREEN', 'FULL',
+            'FOCUS_OUT', 'FOCUS_IN', 'FLUSHED', 'FLASH9', 'FLASH8', 'FLASH7',
+            'FLASH6', 'FLASH5', 'FLASH4', 'FLASH3', 'FLASH2', 'FLASH1', 'F9',
+            'F8', 'F7', 'F6', 'F5', 'F4', 'F3', 'F2', 'F15', 'F14', 'F13',
+            'F12', 'F11', 'F10', 'F1', 'EXACT_FIT', 'ESCAPE', 'ERROR', 'ERASE',
+            'ENTER_FRAME', 'ENTER', 'END', 'EMBEDDED', 'ELEMENT_NODE', 'E',
+            'DYNAMIC', 'DOWN', 'DOUBLE_CLICK', 'DIFFERENCE', 'DEVICE',
+            'DESCENDING', 'DELETE', 'DEFAULT', 'DEACTIVATE', 'DATA',
+            'DARK_COLOR', 'DARKEN', 'CRT', 'CONTROL', 'CONNECT', 'COMPLETE',
+            'COLOR', 'CLOSE', 'CLICK', 'CLAMP', 'CHINESE', 'CHANGE', 'CENTER',
+            'CASEINSENSITIVE', 'CAPTURING_PHASE', 'CAPS_LOCK', 'CANCEL',
+            'CAMERA', 'BUBBLING_PHASE', 'BOTTOM_RIGHT', 'BOTTOM_LEFT', 'BOTTOM',
+            'BOLD_ITALIC', 'BOLD', 'BLUE', 'BINARY', 'BIG_ENDIAN', 'BEVEL',
+            'BEST', 'BACKSPACE', 'AUTO', 'AT_TARGET', 'ASYNC_ERROR', 'AMF3',
+            '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,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0033ff; font-weight: bold;',
+            2 => 'color: #6699cc; font-weight: bold;',
+            3 => 'color: #339966; font-weight: bold;',
+            4 => 'color: #9900cc; font-weight: bold;',
+            5 => 'color: #004993;',
+            6 => 'color: #004993;',
+            7 => 'color: #004993;',
+            8 => 'color: #004993;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #009900; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            '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: #000066; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://www.google.com/search?q={FNAMEL}%20inurl:http://livedocs.adobe.com/flex/201/langref/%20inurl:{FNAMEL}.html',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => false,//Save some time as OO identifiers aren't used
+    'OBJECT_SPLITTERS' => array(
+        // commented out because it's not very relevant for AS, as all properties, methods and constants are dot-accessed.
+        // I believe it's preferable to have package highlighting for example, which is not possible with this enabled.
+        // 0 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/ada.php b/sources/inc/geshi/ada.php
new file mode 100644
index 0000000..c4ef2c3
--- /dev/null
+++ b/sources/inc/geshi/ada.php
@@ -0,0 +1,135 @@
+ 'Ada',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'begin', 'declare', 'do', 'else', 'elsif', 'exception', 'for', 'if',
+            'is', 'loop', 'while', 'then', 'end', 'select', 'case', 'until',
+            'goto', 'return'
+            ),
+        2 => array(
+            'abs', 'and', 'at', 'mod', 'not', 'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abort', 'abstract', 'accept', 'access', 'aliased', 'all', 'array',
+            'body', 'constant', 'delay', 'delta', 'digits', 'entry', 'exit',
+            'function', 'generic', 'in', 'interface', 'limited', 'new', 'null',
+            'of', 'others', 'out', 'overriding', 'package', 'pragma', 'private',
+            'procedure', 'protected', 'raise', 'range', 'record', 'renames',
+            'requeue', 'reverse', 'separate', 'subtype', 'synchronized',
+            'tagged', 'task', 'terminate', 'type', 'use', 'when', 'with'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; 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: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/algol68.php b/sources/inc/geshi/algol68.php
new file mode 100644
index 0000000..5b1e5aa
--- /dev/null
+++ b/sources/inc/geshi/algol68.php
@@ -0,0 +1,329 @@
+ $prebits.$LONGS."(?:".$bl.")".$postbits,
+            "INT" => $preint.$LONGS."(?:".$il.")".$postint,
+            "REAL" => $prereal.$LONGS."(?:".$rl.")".$postreal,
+
+            "BOLD" => 'color: #b1b100; font-weight: bold;',
+            "ITALIC" => 'color: #b1b100;', # procedures traditionally italic #
+            "NONSTD" => 'color: #FF0000; font-weight: bold;', # RED #
+            "COMMENT" => 'color: #666666; font-style: italic;'
+        );
+    }
+}
+$a68=geshi_langfile_algol68_vars();
+
+$language_data = array(
+    'LANG_NAME' => 'ALGOL 68',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(
+        '¢' => '¢',
+        '£' => '£',
+        '#' => '#',
+        ),
+    'COMMENT_REGEXP' => array(
+        1 => '/\bCO((?:MMENT)?)\b.*?\bCO\\1\b/i',
+        2 => '/\bPR((?:AGMAT)?)\b.*?\bPR\\1\b/i',
+        3 => '/\bQUOTE\b.*?\bQUOTE\b/i'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '"',
+    'NUMBERS' => GESHI_NUMBER_HEX_SUFFIX,  # Warning: Feature!! #
+#                GESHI_NUMBER_HEX_SUFFIX, # Attempt ignore default #
+    'KEYWORDS' => array(
+# Extensions
+        1 => array('KEEP', 'FINISH', 'USE', 'SYSPROCS', 'IOSTATE', 'USING', 'ENVIRON', 'PROGRAM', 'CONTEXT'),
+#        2 => array('CASE', 'IN', 'OUSE', 'IN', 'OUT', 'ESAC', '(', '|', '|:', ')', 'FOR', 'FROM', 'TO', 'BY', 'WHILE', 'DO', 'OD', 'IF', 'THEN', 'ELIF', 'THEN', 'ELSE', 'FI', 'PAR', 'BEGIN', 'EXIT', 'END', 'GO', 'GOTO', 'FORALL', 'UPTO', 'DOWNTO', 'FOREACH', 'ASSERT'), #
+        2 => array('CASE', 'IN', 'OUSE', /* 'IN',*/ 'OUT', 'ESAC', 'PAR', 'BEGIN', 'EXIT', 'END', 'GO TO', 'GOTO', 'FOR', 'FROM', 'TO', 'BY', 'WHILE', 'DO', 'OD', 'IF', 'THEN', 'ELIF', /* 'THEN',*/ 'ELSE', 'FI' ),
+        3 => array('BITS', 'BOOL', 'BYTES', 'CHAR', 'COMPL', 'INT', 'REAL', 'SEMA', 'STRING', 'VOID'),
+        4 => array('MODE', 'OP', 'PRIO', 'PROC', 'FLEX', 'HEAP', 'LOC', 'REF', 'LONG', 'SHORT', 'EITHER'),
+# Extensions or deprecated keywords
+# 'PIPE': keyword somehow interferes with the internal operation of GeSHi
+        5 => array('FORALL', 'UPTO', 'DOWNTO', 'FOREACH', 'ASSERT', 'CTB', 'CT', 'CTAB', 'COMPLEX', 'VECTOR', 'SOUND' /*, 'PIPE'*/),
+        6 => array('CHANNEL', 'FILE', 'FORMAT', 'STRUCT', 'UNION', 'OF'),
+# '(', '|', '|:', ')',  #
+#        7 => array('OF', 'AT', '@', 'IS', ':=:', 'ISNT', ':/=:', ':≠:', 'CTB', 'CT', '::', 'CTAB', '::=', 'TRUE', 'FALSE', 'EMPTY', 'NIL', '○', 'SKIP', '~'),
+        7 => array('AT', 'IS', 'ISNT', 'TRUE', 'FALSE', 'EMPTY', 'NIL', 'SKIP'),
+        8 => array('NOT', 'UP', 'DOWN', 'LWB', 'UPB', /* '-',*/ 'ABS', 'ARG', 'BIN', 'ENTIER', 'LENG', 'LEVEL', 'ODD', 'REPR', 'ROUND', 'SHORTEN', 'CONJ', 'SIGN'),
+# OPERATORS ordered roughtly by PRIORITY #
+#       9 => array('¬', '↑', '↓', '⌊', '⌈', '~', '⎩', '⎧'),
+#        10 => array('+*', 'I', '+×', '⊥', '!', '⏨'),
+        10 => array('I'),
+#        11 => array('SHL', 'SHR', '**', 'UP', 'DOWN', 'LWB', 'UPB', '↑', '↓', '⌊', '⌈', '⎩', '⎧'),
+        11 => array('SHL', 'SHR', /*'UP', 'DOWN', 'LWB', 'UPB'*/),
+#        12 => array('*', '/', '%', 'OVER', '%*', 'MOD', 'ELEM', '×', '÷', '÷×', '÷*', '%×', '□', '÷:'),
+        12 => array('OVER', 'MOD', 'ELEM'),
+#        13 => array('-', '+'),
+#        14 => array('<', 'LT', '<=', 'LE', '>=', 'GE', '>', 'GT', '≤', '≥'),
+        14 => array('LT', 'LE', 'GE', 'GT'),
+#        15 => array('=', 'EQ', '/=', 'NE', '≠', '~='),
+        15 => array('EQ', 'NE'),
+#        16 => array('&', 'AND', '∧', 'OR', '∨', '/\\', '\\/'),
+        16 => array('AND', 'OR'),
+        17 => array('MINUSAB', 'PLUSAB', 'TIMESAB', 'DIVAB', 'OVERAB', 'MODAB', 'PLUSTO'),
+#        18 => array('-:=', '+:=', '*:=', '/:=', '%:=', '%*:=', '+=:', '×:=', '÷:=', '÷×:=', '÷*:=', '%×:=', '÷::=', 'MINUS', 'PLUS', 'DIV', 'MOD', 'PRUS'),
+# Extensions or deprecated keywords
+        18 => array('MINUS', 'PLUS', 'DIV', /* 'MOD',*/ 'PRUS', 'IS NOT'),
+# Extensions or deprecated keywords
+        19 => array('THEF', 'ANDF', 'ORF', 'ANDTH', 'OREL', 'ANDTHEN', 'ORELSE'),
+# Built in procedures - from standard prelude #
+        20 => array('int lengths', 'intlengths', 'int shorths', 'intshorths', 'max int', 'maxint', 'real lengths', 'reallengths', 'real shorths', 'realshorths', 'bits lengths', 'bitslengths', 'bits shorths', 'bitsshorths', 'bytes lengths', 'byteslengths', 'bytes shorths', 'bytesshorths', 'max abs char', 'maxabschar', 'int width', 'intwidth', 'long int width', 'longintwidth', 'long long int width', 'longlongintwidth', 'real width', 'realwidth', 'long real width', 'longrealwidth', 'long long real width', 'longlongrealwidth', 'exp width', 'expwidth', 'long exp width', 'longexpwidth', 'long long exp width', 'longlongexpwidth', 'bits width', 'bitswidth', 'long bits width', 'longbitswidth', 'long long bits width', 'longlongbitswidth', 'bytes width', 'byteswidth', 'long bytes width', 'longbyteswidth', 'max real', 'maxreal', 'small real', 'smallreal', 'long max int', 'longmaxint', 'long long max int', 'longlongmaxint', 'long max real', 'longmaxreal', 'long small real', 'longsmallreal', 'long long max real', 'longlongmaxreal', 'long long small real', 'longlongsmallreal', 'long max bits', 'longmaxbits', 'long long max bits', 'longlongmaxbits', 'null character', 'nullcharacter', 'blank', 'flip', 'flop', 'error char', 'errorchar', 'exp char', 'expchar', 'newline char', 'newlinechar', 'formfeed char', 'formfeedchar', 'tab char', 'tabchar'),
+        21 => array('stand in channel', 'standinchannel', 'stand out channel', 'standoutchannel', 'stand back channel', 'standbackchannel', 'stand draw channel', 'standdrawchannel', 'stand error channel', 'standerrorchannel'),
+        22 => array('put possible', 'putpossible', 'get possible', 'getpossible', 'bin possible', 'binpossible', 'set possible', 'setpossible', 'reset possible', 'resetpossible', 'reidf possible', 'reidfpossible', 'draw possible', 'drawpossible', 'compressible', 'on logical file end', 'onlogicalfileend', 'on physical file end', 'onphysicalfileend', 'on line end', 'onlineend', 'on page end', 'onpageend', 'on format end', 'onformatend', 'on value error', 'onvalueerror', 'on open error', 'onopenerror', 'on transput error', 'ontransputerror', 'on format error', 'onformaterror', 'open', 'establish', 'create', 'associate', 'close', 'lock', 'scratch', 'space', 'new line', 'newline', 'print', 'write f', 'writef', 'print f', 'printf', 'write bin', 'writebin', 'print bin', 'printbin', 'read f', 'readf', 'read bin', 'readbin', 'put f', 'putf', 'get f', 'getf', 'make term', 'maketerm', 'make device', 'makedevice', 'idf', 'term', 'read int', 'readint', 'read long int', 'readlongint', 'read long long int', 'readlonglongint', 'read real', 'readreal', 'read long real', 'readlongreal', 'read long long real', 'readlonglongreal', 'read complex', 'readcomplex', 'read long complex', 'readlongcomplex', 'read long long complex', 'readlonglongcomplex', 'read bool', 'readbool', 'read bits', 'readbits', 'read long bits', 'readlongbits', 'read long long bits', 'readlonglongbits', 'read char', 'readchar', 'read string', 'readstring', 'print int', 'printint', 'print long int', 'printlongint', 'print long long int', 'printlonglongint', 'print real', 'printreal', 'print long real', 'printlongreal', 'print long long real', 'printlonglongreal', 'print complex', 'printcomplex', 'print long complex', 'printlongcomplex', 'print long long complex', 'printlonglongcomplex', 'print bool', 'printbool', 'print bits', 'printbits', 'print long bits', 'printlongbits', 'print long long bits', 'printlonglongbits', 'print char', 'printchar', 'print string', 'printstring', 'whole', 'fixed', 'float'),
+        23 => array('pi', 'long pi', 'longpi', 'long long pi', 'longlongpi'),
+        24 => array('sqrt', 'curt', 'cbrt', 'exp', 'ln', 'log', 'sin', 'arc sin', 'arcsin', 'cos', 'arc cos', 'arccos', 'tan', 'arc tan', 'arctan', 'long sqrt', 'longsqrt', 'long curt', 'longcurt', 'long cbrt', 'longcbrt', 'long exp', 'longexp', 'long ln', 'longln', 'long log', 'longlog', 'long sin', 'longsin', 'long arc sin', 'longarcsin', 'long cos', 'longcos', 'long arc cos', 'longarccos', 'long tan', 'longtan', 'long arc tan', 'longarctan', 'long long sqrt', 'longlongsqrt', 'long long curt', 'longlongcurt', 'long long cbrt', 'longlongcbrt', 'long long exp', 'longlongexp', 'long long ln', 'longlongln', 'long long log', 'longlonglog', 'long long sin', 'longlongsin', 'long long arc sin', 'longlongarcsin', 'long long cos', 'longlongcos', 'long long arc cos', 'longlongarccos', 'long long tan', 'longlongtan', 'long long arc tan', 'longlongarctan'),
+        25 => array('first random', 'firstrandom', 'next random', 'nextrandom', 'long next random', 'longnextrandom', 'long long next random', 'longlongnextrandom'),
+        26 => array('real', 'bits pack', 'bitspack', 'long bits pack', 'longbitspack', 'long long bits pack', 'longlongbitspack', 'bytes pack', 'bytespack', 'long bytes pack', 'longbytespack', 'char in string', 'charinstring', 'last char in string', 'lastcharinstring', 'string in string', 'stringinstring'),
+        27 => array('utc time', 'utctime', 'local time', 'localtime', 'argc', 'argv', 'get env', 'getenv', 'reset errno', 'reseterrno', 'errno', 'strerror'),
+        28 => array('sinh', 'long sinh', 'longsinh', 'long long sinh', 'longlongsinh', 'arc sinh', 'arcsinh', 'long arc sinh', 'longarcsinh', 'long long arc sinh', 'longlongarcsinh', 'cosh', 'long cosh', 'longcosh', 'long long cosh', 'longlongcosh', 'arc cosh', 'arccosh', 'long arc cosh', 'longarccosh', 'long long arc cosh', 'longlongarccosh', 'tanh', 'long tanh', 'longtanh', 'long long tanh', 'longlongtanh', 'arc tanh', 'arctanh', 'long arc tanh', 'longarctanh', 'long long arc tanh', 'longlongarctanh', 'arc tan2', 'arctan2', 'long arc tan2', 'longarctan2', 'long long arc tan2', 'longlongarctan2'),
+        29 => array('complex sqrt', 'complexsqrt', 'long complex sqrt', 'longcomplexsqrt', 'long long complex sqrt', 'longlongcomplexsqrt', 'complex exp', 'complexexp', 'long complex exp', 'longcomplexexp', 'long long complex exp', 'longlongcomplexexp', 'complex ln', 'complexln', 'long complex ln', 'longcomplexln', 'long long complex ln', 'longlongcomplexln', 'complex sin', 'complexsin', 'long complex sin', 'longcomplexsin', 'long long complex sin', 'longlongcomplexsin', 'complex arc sin', 'complexarcsin', 'long complex arc sin', 'longcomplexarcsin', 'long long complex arc sin', 'longlongcomplexarcsin', 'complex cos', 'complexcos', 'long complex cos', 'longcomplexcos', 'long long complex cos', 'longlongcomplexcos', 'complex arc cos', 'complexarccos', 'long complex arc cos', 'longcomplexarccos', 'long long complex arc cos', 'longlongcomplexarccos', 'complex tan', 'complextan', 'long complex tan', 'longcomplextan', 'long long complex tan', 'longlongcomplextan', 'complex arc tan', 'complexarctan', 'long complex arc tan', 'longcomplexarctan', 'long long complex arc tan', 'longlongcomplexarctan', 'complex sinh', 'complexsinh', 'complex arc sinh', 'complexarcsinh', 'complex cosh', 'complexcosh', 'complex arc cosh', 'complexarccosh', 'complex tanh', 'complextanh', 'complex arc tanh', 'complexarctanh')
+        ),
+    'SYMBOLS' => array(
+        1 => array( /* reverse length sorted... */ '÷×:=', '%×:=', ':≠:', '÷*:=', '÷::=', '%*:=', ':/=:', '×:=', '÷:=', '÷×', '%:=', '%×', '*:=', '+:=', '+=:', '+×', '-:=', '/:=', '::=', ':=:', '÷*', '÷:', '↑', '↓', '∧', '∨', '≠', '≤', '≥', '⊥', '⌈', '⌊', '⎧', '⎩', /* '⏨', */ '□', '○', '%*', '**', '+*', '/=', '::', '/\\', '\\/', '<=', '>=', '|:', '~=', '¬', '×', '÷', '!', '%', '&', '(', ')', '*', '+', ',', '-', '/', ':', ';', '<', '=', '>', '?', '@', '[', ']', '^', '{', '|', '}', '~')
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        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,
+        18 => true,
+        19 => true,
+        20 => true,
+        21 => true,
+        22 => true,
+        23 => true,
+        24 => true,
+        25 => true,
+        26 => true,
+        27 => true,
+        28 => true,
+        29 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => $a68['NONSTD'], 2 => $a68['BOLD'], 3 => $a68['BOLD'], 4 => $a68['BOLD'],
+            5 => $a68['NONSTD'], 6 => $a68['BOLD'], 7 => $a68['BOLD'], 8 => $a68['BOLD'],
+            /* 9 => $a68['BOLD'],*/ 10 => $a68['BOLD'], 11 => $a68['BOLD'], 12 => $a68['BOLD'],
+            /* 13 => $a68['BOLD'],*/ 14 => $a68['BOLD'], 15 => $a68['BOLD'], 16 => $a68['BOLD'], 17 => $a68['BOLD'],
+            18 => $a68['NONSTD'], 19 => $a68['NONSTD'],
+            20 => $a68['ITALIC'], 21 => $a68['ITALIC'], 22 => $a68['ITALIC'], 23 => $a68['ITALIC'],
+            24 => $a68['ITALIC'], 25 => $a68['ITALIC'], 26 => $a68['ITALIC'], 27 => $a68['ITALIC'],
+            28 => $a68['ITALIC'], 29 => $a68['ITALIC']
+            ),
+        'COMMENTS' => array(
+            1 => $a68['COMMENT'], 2 => $a68['COMMENT'], 3 => $a68['COMMENT'], /* 4 => $a68['COMMENT'],
+            5 => $a68['COMMENT'],*/ 'MULTI' => $a68['COMMENT']
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;',
+            1 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0  => 'color: #cc66cc;',   # BITS #
+            1  => 'color: #cc66cc;',   # REAL #
+            /* 2  => 'color: #cc66cc;',   # INT # */
+            ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+#        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+#        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => '',
+        18 => '',
+        19 => '',
+        20 => '',
+        21 => '',
+        22 => '',
+        23 => '',
+        24 => '',
+        25 => '',
+        26 => '',
+        27 => '',
+        28 => '',
+        29 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        0 => '→',
+        1 => 'OF'
+        ),
+    'REGEXPS' => array(
+        0 => $a68['BITS'],
+        1 => $a68['REAL']
+        # 2 => $a68['INT'], # Breaks formatting for some reason #
+        # 2 => $GESHI_NUMBER_INT_BASIC # Also breaks formatting  #
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+unset($a68);
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/apache.php b/sources/inc/geshi/apache.php
new file mode 100644
index 0000000..c944443
--- /dev/null
+++ b/sources/inc/geshi/apache.php
@@ -0,0 +1,483 @@
+ 'Apache configuration',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            //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_upload_progress
+            'ReportUploads', 'TrackUploads', 'UploadProgressSharedMemorySize',
+
+            //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(
+            'all','on','off','standalone','inetd','indexes',
+            'force-response-1.0','downgrade-1.0','nokeepalive',
+            'includes','followsymlinks','none',
+            'x-compress','x-gzip'
+        ),
+        /*keywords 3*/
+        3 => array(
+            //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(
+        '+', '-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000000; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #339933;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        '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(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=<|<\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/applescript.php b/sources/inc/geshi/applescript.php
new file mode 100644
index 0000000..603fa4a
--- /dev/null
+++ b/sources/inc/geshi/applescript.php
@@ -0,0 +1,157 @@
+ 'AppleScript',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array( '(*' => '*)'),
+    'COMMENT_REGEXP' => array(
+        2 => '/(?<=[a-z])\'/i',
+        3 => '/(? GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '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','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', 'as',
+            'div','mod','and','not','or','contains','equal','equals','isnt', 'less', 'greater'
+            ),
+        3 => 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','is', 'copy'
+            )
+        ),
+    'SYMBOLS' => array(
+        ')','+','-','^','*','/','&','<','>=','<','<=','=','�'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0066ff;',
+            2 => 'color: #ff0033;',
+            3 => 'color: #ff0033; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => '',
+            3 => 'color: #ff0000;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #339933;',
+            4 => 'color: #0066ff;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => ',+-=<>/?^&*'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*',
+        //File descriptors
+        4 => '<[a-zA-Z_][a-zA-Z0-9_]*>',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'SPACE_AS_WHITESPACE' => true
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/apt_sources.php b/sources/inc/geshi/apt_sources.php
new file mode 100644
index 0000000..9f1ed04
--- /dev/null
+++ b/sources/inc/geshi/apt_sources.php
@@ -0,0 +1,148 @@
+ 'Apt sources',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            'deb-src', 'deb'
+            ),
+        2 => array(
+            //Generic
+            'stable', 'old-stable', 'testing', 'testing-proposed-updates',
+            'unstable', 'unstable-proposed-updates', 'experimental',
+            'non-US', 'security', 'volatile', 'volatile-sloppy',
+            'apt-build',
+            'stable/updates',
+            //Debian
+            'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato', 'woody', 'sarge',
+            'etch', 'lenny', 'wheezy', 'sid',
+            //Ubuntu
+            'warty', 'warty-updates', 'warty-security', 'warty-proposed', 'warty-backports',
+            'hoary', 'hoary-updates', 'hoary-security', 'hoary-proposed', 'hoary-backports',
+            'breezy', 'breezy-updates', 'breezy-security', 'breezy-proposed', 'breezy-backports',
+            'dapper', 'dapper-updates', 'dapper-security', 'dapper-proposed', 'dapper-backports',
+            'edgy', 'edgy-updates', 'edgy-security', 'edgy-proposed', 'edgy-backports',
+            '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',
+            'jaunty', 'jaunty-updates', 'jaunty-security', 'jaunty-proposed', 'jaunty-backports',
+            'karmic', 'karmic-updates', 'karmic-security', 'karmic-proposed', 'karmic-backports',
+            'lucid', 'lucid-updates', 'lucid-security', 'lucid-proposed', 'lucid-backports',
+            'maverick', 'maverick-updates', 'maverick-security', 'maverick-proposed', 'maverick-backports'
+            ),
+        3 => array(
+            'main', 'restricted', 'preview', 'contrib', 'non-free',
+            'commercial', 'universe', 'multiverse'
+            )
+    ),
+    'REGEXPS' => array(
+        0 => "(((http|ftp):\/\/|file:\/)[^\s]+)|(cdrom:\[[^\]]*\][^\s]*)",
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b16000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #009900;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+            'METHODS' => GESHI_NEVER,
+            'SCRIPT' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'ESCAPE_CHAR' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?|^\/])',
+            'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\.])'
+        )
+    ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/arm.php b/sources/inc/geshi/arm.php
new file mode 100644
index 0000000..8e3c0a3
--- /dev/null
+++ b/sources/inc/geshi/arm.php
@@ -0,0 +1,3318 @@
+ 'ARM ASSEMBLER',
+    'COMMENT_SINGLE' => array(
+        1 => ';'
+        ),
+    'COMMENT_MULTI' => array(),
+    //Line address prefix suppression
+    'COMMENT_REGEXP' => array(
+        2 => "/^(?:[0-9a-f]{0,4}:)?[0-9a-f]{4}(?:[0-9a-f]{4})?/mi"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Unconditional Data Processing Instructions */
+        1 => array(
+            /* Data Processing: Unconditional Addition & Subtraction */
+            'adc.w','adcal.w',
+            'adc','adcal',
+            'add.w','addal.w',
+            'add','addal',
+            'addw','addwal',
+            'rsb.w','rsbal.w',
+            'rsb','rsbal',
+            'rsc','rscal',
+            'sbc.w','sbcal.w',
+            'sbc','sbcal',
+            'sub.w','subal.w',
+            'sub','subal',
+            'neg.w','negal.w',
+            'neg','negal',
+            'adr.w','adral.w',
+            'adr','adral',
+            /* Data Processing: Unconditional Logical */
+            'and.w','andal.w',
+            'and','andal',
+            'bic.w','bical.w',
+            'bic','bical',
+            'orr.w','orral.w',
+            'orr','orral',
+            'orn.w','ornal.w',
+            'orn','ornal',
+            'eor.w','eoral.w',
+            'eor','eoral',
+            'mov.w','moval.w',
+            'mov','moval',
+            'movw','movwal',
+            'movt','movtal',
+            'cpy','cpyal',
+            'mvn.w','mvnal.w',
+            'mvn','mvnal',
+            /* Data Processing: Unconditional Shifts and Rotates */
+            'asr.w','asral.w',
+            'asr','asral',
+            'lsl.w','lslal.w',
+            'lsl','lslal',
+            'lsr.w','lsral.w',
+            'lsr','lsral',
+            'ror.w','roral.w',
+            'ror','roral',
+            'rrx','rrxal',
+            /* Data Processing: Unconditional Word Multiply and Multiply-Add */
+            'mul','mulal',
+            'mla','mlaal',
+            'mls','mlsal',
+            'smull','smullal',
+            'muls','mulsal',
+            'umull','umullal',
+            'smlal','smlalal',
+            'umlal','umlalal',
+            /* Data Processing: Unconditional Halfword Multiply and Multiply-Add (ARMv5TE) */
+            'smulbb','smulbbal',
+            'smulbt','smulbtal',
+            'smultb','smultbal',
+            'smultt','smulttal',
+            'smulwb','smulwbal',
+            'smulwt','smulwtal',
+            'smlalbb','smlalbbal',
+            'smlalbt','smlalbtal',
+            'smlaltb','smlaltbal',
+            'smlaltt','smlalttal',
+            'smlabb','smlabbal',
+            'smlabt','smlabtal',
+            'smlatb','smlatbal',
+            'smlatt','smlattal',
+            'smlawb','smlawbal',
+            'smlawt','smlawtal',
+            /* Data Processing: Unconditional Bit Operations */
+            'ubfx','ubfxal',
+            'sbfx','sbfxal',
+            'bfc','bfcal',
+            'bfi','bfial',
+            'clz','clzal',
+            /* Data Processing: Unconditional Divide (ARMv7-R) */
+            'sdiv','sdival',
+            'udiv','udival'
+            ),
+        /* Conditional Data Processing Instructions */
+        2 => array(
+            /* Data Processing: Conditional Addition & Subtraction */
+            'adceq.w','adcne.w','adccs.w','adchs.w','adccc.w','adclo.w','adcmi.w','adcpl.w','adcvs.w','adcvc.w','adchi.w','adcls.w','adcge.w','adclt.w','adcgt.w','adcle.w',
+            'adceq','adcne','adccs','adchs','adccc','adclo','adcmi','adcpl','adcvs','adcvc','adchi','adcls','adcge','adclt','adcgt','adcle',
+            'addeq.w','addne.w','addcs.w','addhs.w','addcc.w','addlo.w','addmi.w','addpl.w','addvs.w','addvc.w','addhi.w','addls.w','addge.w','addlt.w','addgt.w','addle.w',
+            'addeq','addne','addcs','addhs','addcc','addlo','addmi','addpl','addvs','addvc','addhi','addls','addge','addlt','addgt','addle',
+            'addweq','addwne','addwcs','addwhs','addwcc','addwlo','addwmi','addwpl','addwvs','addwvc','addwhi','addwls','addwge','addwlt','addwgt','addwle',
+            'rsbeq.w','rsbne.w','rsbcs.w','rsbhs.w','rsbcc.w','rsblo.w','rsbmi.w','rsbpl.w','rsbvs.w','rsbvc.w','rsbhi.w','rsbls.w','rsbge.w','rsblt.w','rsbgt.w','rsble.w',
+            'rsbeq','rsbne','rsbcs','rsbhs','rsbcc','rsblo','rsbmi','rsbpl','rsbvs','rsbvc','rsbhi','rsbls','rsbge','rsblt','rsbgt','rsble',
+            'rsceq','rscne','rsccs','rschs','rsccc','rsclo','rscmi','rscpl','rscvs','rscvc','rschi','rscls','rscge','rsclt','rscgt','rscle',
+            'sbceq.w','sbcne.w','sbccs.w','sbchs.w','sbccc.w','sbclo.w','sbcmi.w','sbcpl.w','sbcvs.w','sbcvc.w','sbchi.w','sbcls.w','sbcge.w','sbclt.w','sbcgt.w','sbcle.w',
+            'sbceq','sbcne','sbccs','sbchs','sbccc','sbclo','sbcmi','sbcpl','sbcvs','sbcvc','sbchi','sbcls','sbcge','sbclt','sbcgt','sbcle',
+            'subeq.w','subne.w','subcs.w','subhs.w','subcc.w','sublo.w','submi.w','subpl.w','subvs.w','subvc.w','subhi.w','subls.w','subge.w','sublt.w','subgt.w','suble.w',
+            'subeq','subne','subcs','subhs','subcc','sublo','submi','subpl','subvs','subvc','subhi','subls','subge','sublt','subgt','suble',
+            'negeq.w','negne.w','negcs.w','neghs.w','negcc.w','neglo.w','negmi.w','negpl.w','negvs.w','negvc.w','neghi.w','negls.w','negge.w','neglt.w','neggt.w','negle.w',
+            'negeq','negne','negcs','neghs','negcc','neglo','negmi','negpl','negvs','negvc','neghi','negls','negge','neglt','neggt','negle',
+            'adreq.w','adrne.w','adrcs.w','adrhs.w','adrcc.w','adrlo.w','adrmi.w','adrpl.w','adrvs.w','adrvc.w','adrhi.w','adrls.w','adrge.w','adrlt.w','adrgt.w','adrle.w',
+            'adreq','adrne','adrcs','adrhs','adrcc','adrlo','adrmi','adrpl','adrvs','adrvc','adrhi','adrls','adrge','adrlt','adrgt','adrle',
+            /* Data Processing: Conditional Logical */
+            'andeq.w','andne.w','andcs.w','andhs.w','andcc.w','andlo.w','andmi.w','andpl.w','andvs.w','andvc.w','andhi.w','andls.w','andge.w','andlt.w','andgt.w','andle.w',
+            'andeq','andne','andcs','andhs','andcc','andlo','andmi','andpl','andvs','andvc','andhi','andls','andge','andlt','andgt','andle',
+            'biceq.w','bicne.w','biccs.w','bichs.w','biccc.w','biclo.w','bicmi.w','bicpl.w','bicvs.w','bicvc.w','bichi.w','bicls.w','bicge.w','biclt.w','bicgt.w','bicle.w',
+            'biceq','bicne','biccs','bichs','biccc','biclo','bicmi','bicpl','bicvs','bicvc','bichi','bicls','bicge','biclt','bicgt','bicle',
+            'orreq.w','orrne.w','orrcs.w','orrhs.w','orrcc.w','orrlo.w','orrmi.w','orrpl.w','orrvs.w','orrvc.w','orrhi.w','orrls.w','orrge.w','orrlt.w','orrgt.w','orrle.w',
+            'orreq','orrne','orrcs','orrhs','orrcc','orrlo','orrmi','orrpl','orrvs','orrvc','orrhi','orrls','orrge','orrlt','orrgt','orrle',
+            'orneq.w','ornne.w','orncs.w','ornhs.w','orncc.w','ornlo.w','ornmi.w','ornpl.w','ornvs.w','ornvc.w','ornhi.w','ornls.w','ornge.w','ornlt.w','orngt.w','ornle.w',
+            'orneq','ornne','orncs','ornhs','orncc','ornlo','ornmi','ornpl','ornvs','ornvc','ornhi','ornls','ornge','ornlt','orngt','ornle',
+            'eoreq.w','eorne.w','eorcs.w','eorhs.w','eorcc.w','eorlo.w','eormi.w','eorpl.w','eorvs.w','eorvc.w','eorhi.w','eorls.w','eorge.w','eorlt.w','eorgt.w','eorle.w',
+            'eoreq','eorne','eorcs','eorhs','eorcc','eorlo','eormi','eorpl','eorvs','eorvc','eorhi','eorls','eorge','eorlt','eorgt','eorle',
+            'moveq.w','movne.w','movcs.w','movhs.w','movcc.w','movlo.w','movmi.w','movpl.w','movvs.w','movvc.w','movhi.w','movls.w','movge.w','movlt.w','movgt.w','movle.w',
+            'moveq','movne','movcs','movhs','movcc','movlo','movmi','movpl','movvs','movvc','movhi','movls','movge','movlt','movgt','movle',
+            'movweq','movwne','movwcs','movwhs','movwcc','movwlo','movwmi','movwpl','movwvs','movwvc','movwhi','movwls','movwge','movwlt','movwgt','movwle',
+            'movteq','movtne','movtcs','movths','movtcc','movtlo','movtmi','movtpl','movtvs','movtvc','movthi','movtls','movtge','movtlt','movtgt','movtle',
+            'cpyeq','cpyne','cpycs','cpyhs','cpycc','cpylo','cpymi','cpypl','cpyvs','cpyvc','cpyhi','cpyls','cpyge','cpylt','cpygt','cpyle',
+            'mvneq.w','mvnne.w','mvncs.w','mvnhs.w','mvncc.w','mvnlo.w','mvnmi.w','mvnpl.w','mvnvs.w','mvnvc.w','mvnhi.w','mvnls.w','mvnge.w','mvnlt.w','mvngt.w','mvnle.w',
+            'mvneq','mvnne','mvncs','mvnhs','mvncc','mvnlo','mvnmi','mvnpl','mvnvs','mvnvc','mvnhi','mvnls','mvnge','mvnlt','mvngt','mvnle',
+            /* Data Processing: Conditional Shifts and Rotates */
+            'asreq.w','asrne.w','asrcs.w','asrhs.w','asrcc.w','asrlo.w','asrmi.w','asrpl.w','asrvs.w','asrvc.w','asrhi.w','asrls.w','asrge.w','asrlt.w','asrgt.w','asrle.w',
+            'asreq','asrne','asrcs','asrhs','asrcc','asrlo','asrmi','asrpl','asrvs','asrvc','asrhi','asrls','asrge','asrlt','asrgt','asrle',
+            'lsleq.w','lslne.w','lslcs.w','lslhs.w','lslcc.w','lsllo.w','lslmi.w','lslpl.w','lslvs.w','lslvc.w','lslhi.w','lslls.w','lslge.w','lsllt.w','lslgt.w','lslle.w',
+            'lsleq','lslne','lslcs','lslhs','lslcc','lsllo','lslmi','lslpl','lslvs','lslvc','lslhi','lslls','lslge','lsllt','lslgt','lslle',
+            'lsreq.w','lsrne.w','lsrcs.w','lsrhs.w','lsrcc.w','lsrlo.w','lsrmi.w','lsrpl.w','lsrvs.w','lsrvc.w','lsrhi.w','lsrls.w','lsrge.w','lsrlt.w','lsrgt.w','lsrle.w',
+            'lsreq','lsrne','lsrcs','lsrhs','lsrcc','lsrlo','lsrmi','lsrpl','lsrvs','lsrvc','lsrhi','lsrls','lsrge','lsrlt','lsrgt','lsrle',
+            'roreq.w','rorne.w','rorcs.w','rorhs.w','rorcc.w','rorlo.w','rormi.w','rorpl.w','rorvs.w','rorvc.w','rorhi.w','rorls.w','rorge.w','rorlt.w','rorgt.w','rorle.w',
+            'roreq','rorne','rorcs','rorhs','rorcc','rorlo','rormi','rorpl','rorvs','rorvc','rorhi','rorls','rorge','rorlt','rorgt','rorle',
+            'rrxeq','rrxne','rrxcs','rrxhs','rrxcc','rrxlo','rrxmi','rrxpl','rrxvs','rrxvc','rrxhi','rrxls','rrxge','rrxlt','rrxgt','rrxle',
+            /* Data Processing: Conditional Word Multiply and Multiply-Add */
+            'muleq','mulne','mulcs','mulhs','mulcc','mullo','mulmi','mulpl','mulvs','mulvc','mulhi','mulls','mulge','mullt','mulgt','mulle',
+            'mlaeq','mlane','mlacs','mlahs','mlacc','mlalo','mlami','mlapl','mlavs','mlavc','mlahi','mlals','mlage','mlalt','mlagt','mlale',
+            'mlseq','mlsne','mlscs','mlshs','mlscc','mlslo','mlsmi','mlspl','mlsvs','mlsvc','mlshi','mlsls','mlsge','mlslt','mlsgt','mlsle',
+            'smulleq','smullne','smullcs','smullhs','smullcc','smulllo','smullmi','smullpl','smullvs','smullvc','smullhi','smullls','smullge','smulllt','smullgt','smullle',
+            'mulseq','mulsne','mulscs','mulshs','mulscc','mulslo','mulsmi','mulspl','mulsvs','mulsvc','mulshi','mulsls','mulsge','mulslt','mulsgt','mulsle',
+            'umulleq','umullne','umullcs','umullhs','umullcc','umulllo','umullmi','umullpl','umullvs','umullvc','umullhi','umullls','umullge','umulllt','umullgt','umullle',
+            'smlaleq','smlalne','smlalcs','smlalhs','smlalcc','smlallo','smlalmi','smlalpl','smlalvs','smlalvc','smlalhi','smlalls','smlalge','smlallt','smlalgt','smlalle',
+            'umlaleq','umlalne','umlalcs','umlalhs','umlalcc','umlallo','umlalmi','umlalpl','umlalvs','umlalvc','umlalhi','umlalls','umlalge','umlallt','umlalgt','umlalle',
+            /* Data Processing: Conditional Halfword Multiply and Multiply-Add (ARMv5TE) */
+            'smulbbeq','smulbbne','smulbbcs','smulbbhs','smulbbcc','smulbblo','smulbbmi','smulbbpl','smulbbvs','smulbbvc','smulbbhi','smulbbls','smulbbge','smulbblt','smulbbgt','smulbble',
+            'smulbteq','smulbtne','smulbtcs','smulbths','smulbtcc','smulbtlo','smulbtmi','smulbtpl','smulbtvs','smulbtvc','smulbthi','smulbtls','smulbtge','smulbtlt','smulbtgt','smulbtle',
+            'smultbeq','smultbne','smultbcs','smultbhs','smultbcc','smultblo','smultbmi','smultbpl','smultbvs','smultbvc','smultbhi','smultbls','smultbge','smultblt','smultbgt','smultble',
+            'smultteq','smulttne','smulttcs','smultths','smulttcc','smulttlo','smulttmi','smulttpl','smulttvs','smulttvc','smultthi','smulttls','smulttge','smulttlt','smulttgt','smulttle',
+            'smulwbeq','smulwbne','smulwbcs','smulwbhs','smulwbcc','smulwblo','smulwbmi','smulwbpl','smulwbvs','smulwbvc','smulwbhi','smulwbls','smulwbge','smulwblt','smulwbgt','smulwble',
+            'smulwteq','smulwtne','smulwtcs','smulwths','smulwtcc','smulwtlo','smulwtmi','smulwtpl','smulwtvs','smulwtvc','smulwthi','smulwtls','smulwtge','smulwtlt','smulwtgt','smulwtle',
+            'smlalbbeq','smlalbbne','smlalbbcs','smlalbbhs','smlalbbcc','smlalbblo','smlalbbmi','smlalbbpl','smlalbbvs','smlalbbvc','smlalbbhi','smlalbbls','smlalbbge','smlalbblt','smlalbbgt','smlalbble',
+            'smlalbteq','smlalbtne','smlalbtcs','smlalbths','smlalbtcc','smlalbtlo','smlalbtmi','smlalbtpl','smlalbtvs','smlalbtvc','smlalbthi','smlalbtls','smlalbtge','smlalbtlt','smlalbtgt','smlalbtle',
+            'smlaltbeq','smlaltbne','smlaltbcs','smlaltbhs','smlaltbcc','smlaltblo','smlaltbmi','smlaltbpl','smlaltbvs','smlaltbvc','smlaltbhi','smlaltbls','smlaltbge','smlaltblt','smlaltbgt','smlaltble',
+            'smlaltteq','smlalttne','smlalttcs','smlaltths','smlalttcc','smlalttlo','smlalttmi','smlalttpl','smlalttvs','smlalttvc','smlaltthi','smlalttls','smlalttge','smlalttlt','smlalttgt','smlalttle',
+            'smlabbeq','smlabbne','smlabbcs','smlabbhs','smlabbcc','smlabblo','smlabbmi','smlabbpl','smlabbvs','smlabbvc','smlabbhi','smlabbls','smlabbge','smlabblt','smlabbgt','smlabble',
+            'smlabteq','smlabtne','smlabtcs','smlabths','smlabtcc','smlabtlo','smlabtmi','smlabtpl','smlabtvs','smlabtvc','smlabthi','smlabtls','smlabtge','smlabtlt','smlabtgt','smlabtle',
+            'smlatbeq','smlatbne','smlatbcs','smlatbhs','smlatbcc','smlatblo','smlatbmi','smlatbpl','smlatbvs','smlatbvc','smlatbhi','smlatbls','smlatbge','smlatblt','smlatbgt','smlatble',
+            'smlatteq','smlattne','smlattcs','smlatths','smlattcc','smlattlo','smlattmi','smlattpl','smlattvs','smlattvc','smlatthi','smlattls','smlattge','smlattlt','smlattgt','smlattle',
+            'smlawbeq','smlawbne','smlawbcs','smlawbhs','smlawbcc','smlawblo','smlawbmi','smlawbpl','smlawbvs','smlawbvc','smlawbhi','smlawbls','smlawbge','smlawblt','smlawbgt','smlawble',
+            'smlawteq','smlawtne','smlawtcs','smlawths','smlawtcc','smlawtlo','smlawtmi','smlawtpl','smlawtvs','smlawtvc','smlawthi','smlawtls','smlawtge','smlawtlt','smlawtgt','smlawtle',
+            /* Data Processing: Conditional Bit Operations */
+            'ubfxeq','ubfxne','ubfxcs','ubfxhs','ubfxcc','ubfxlo','ubfxmi','ubfxpl','ubfxvs','ubfxvc','ubfxhi','ubfxls','ubfxge','ubfxlt','ubfxgt','ubfxle',
+            'sbfxeq','sbfxne','sbfxcs','sbfxhs','sbfxcc','sbfxlo','sbfxmi','sbfxpl','sbfxvs','sbfxvc','sbfxhi','sbfxls','sbfxge','sbfxlt','sbfxgt','sbfxle',
+            'bfceq','bfcne','bfccs','bfchs','bfccc','bfclo','bfcmi','bfcpl','bfcvs','bfcvc','bfchi','bfcls','bfcge','bfclt','bfcgt','bfcle',
+            'bfieq','bfine','bfics','bfihs','bficc','bfilo','bfimi','bfipl','bfivs','bfivc','bfihi','bfils','bfige','bfilt','bfigt','bfile',
+            'clzeq','clzne','clzcs','clzhs','clzcc','clzlo','clzmi','clzpl','clzvs','clzvc','clzhi','clzls','clzge','clzlt','clzgt','clzle',
+            /* ARMv7-R: Conditional Divide */
+            'sdiveq','sdivne','sdivcs','sdivhs','sdivcc','sdivlo','sdivmi','sdivpl','sdivvs','sdivvc','sdivhi','sdivls','sdivge','sdivlt','sdivgt','sdivle',
+            'udiveq','udivne','udivcs','udivhs','udivcc','udivlo','udivmi','udivpl','udivvs','udivvc','udivhi','udivls','udivge','udivlt','udivgt','udivle'
+            ),
+        /* Unconditional Memory Access */
+        3 => array(
+            /* Memory Access: Unconditional Memory Loads and Prefetches */
+            'ldm.w','ldmal.w',
+            'ldm','ldmal',
+            'ldmda','ldmdaal',
+            'ldmdb','ldmdbal',
+            'ldmib','ldmibal',
+            'ldmia','ldmiaal',
+            'ldmea','ldmeaal',
+            'ldmed','ldmedal',
+            'ldmfa','ldmfaal',
+            'ldmfd','ldmfdal',
+            'ldrd','ldrdal',
+            'ldr.w','ldral.w',
+            'ldr','ldral',
+            'ldrh.w','ldrhal.w',
+            'ldrh','ldrhal',
+            'ldrb.w','ldrbal.w',
+            'ldrb','ldrbal',
+            'ldrsh.w','ldrshal.w',
+            'ldrsh','ldrshal',
+            'ldrsb.w','ldrsbal.w',
+            'ldrsb','ldrsbal',
+            'ldrt','ldrtal',
+            'ldrht','ldrhtal',
+            'ldrbt','ldrbtal',
+            'ldrsht','ldrshtal',
+            'ldrsbt','ldrsbtal',
+            'pop.w','popal.w',
+            'pop','popal',
+            'pld','pldal',
+            'pldw','pldwal',
+            'pli','plial',
+            /* Memory Access: Unconditional Memory Stores */
+            'stm.w','stmal.w',
+            'stm','stmal',
+            'stmda','stmdaal',
+            'stmdb','stmdbal',
+            'stmib','stmibal',
+            'stmia','stmiaal',
+            'stmea','stmeaal',
+            'stmed','stmedal',
+            'stdfa','stdfaal',
+            'stdfd','stdfdal',
+            'strd','strdal',
+            'str.w','stral.w',
+            'str','stral',
+            'strh.w','strhal.w',
+            'strh','strhal',
+            'strb.w','strbal.w',
+            'strb','strbal',
+            'strt','strtal',
+            'strht','strhtal',
+            'strbt','strbtal',
+            'push.w','pushal.w',
+            'push','pushal'
+            ),
+        /* Conditional Memory Access */
+        4 => array(
+            /* Memory Access: Conditional Memory Loads and Prefetches */
+            'ldmeq.w','ldmne.w','ldmcs.w','ldmhs.w','ldmcc.w','ldmlo.w','ldmmi.w','ldmpl.w','ldmvs.w','ldmvc.w','ldmhi.w','ldmls.w','ldmge.w','ldmlt.w','ldmgt.w','ldmle.w',
+            'ldmeq','ldmne','ldmcs','ldmhs','ldmcc','ldmlo','ldmmi','ldmpl','ldmvs','ldmvc','ldmhi','ldmls','ldmge','ldmlt','ldmgt','ldmle',
+            'ldmdaeq','ldmdane','ldmdacs','ldmdahs','ldmdacc','ldmdalo','ldmdami','ldmdapl','ldmdavs','ldmdavc','ldmdahi','ldmdals','ldmdage','ldmdalt','ldmdagt','ldmdale',
+            'ldmdbeq','ldmdbne','ldmdbcs','ldmdbhs','ldmdbcc','ldmdblo','ldmdbmi','ldmdbpl','ldmdbvs','ldmdbvc','ldmdbhi','ldmdbls','ldmdbge','ldmdblt','ldmdbgt','ldmdble',
+            'ldmibeq','ldmibne','ldmibcs','ldmibhs','ldmibcc','ldmiblo','ldmibmi','ldmibpl','ldmibvs','ldmibvc','ldmibhi','ldmibls','ldmibge','ldmiblt','ldmibgt','ldmible',
+            'ldmiaeq','ldmiane','ldmiacs','ldmiahs','ldmiacc','ldmialo','ldmiami','ldmiapl','ldmiavs','ldmiavc','ldmiahi','ldmials','ldmiage','ldmialt','ldmiagt','ldmiale',
+            'ldmeaeq','ldmeane','ldmeacs','ldmeahs','ldmeacc','ldmealo','ldmeami','ldmeapl','ldmeavs','ldmeavc','ldmeahi','ldmeals','ldmeage','ldmealt','ldmeagt','ldmeale',
+            'ldmedeq','ldmedne','ldmedcs','ldmedhs','ldmedcc','ldmedlo','ldmedmi','ldmedpl','ldmedvs','ldmedvc','ldmedhi','ldmedls','ldmedge','ldmedlt','ldmedgt','ldmedle',
+            'ldmfaeq','ldmfane','ldmfacs','ldmfahs','ldmfacc','ldmfalo','ldmfami','ldmfapl','ldmfavs','ldmfavc','ldmfahi','ldmfals','ldmfage','ldmfalt','ldmfagt','ldmfale',
+            'ldmfdeq','ldmfdne','ldmfdcs','ldmfdhs','ldmfdcc','ldmfdlo','ldmfdmi','ldmfdpl','ldmfdvs','ldmfdvc','ldmfdhi','ldmfdls','ldmfdge','ldmfdlt','ldmfdgt','ldmfdle',
+            'ldrdeq','ldrdne','ldrdcs','ldrdhs','ldrdcc','ldrdlo','ldrdmi','ldrdpl','ldrdvs','ldrdvc','ldrdhi','ldrdls','ldrdge','ldrdlt','ldrdgt','ldrdle',
+            'ldreq.w','ldrne.w','ldrcs.w','ldrhs.w','ldrcc.w','ldrlo.w','ldrmi.w','ldrpl.w','ldrvs.w','ldrvc.w','ldrhi.w','ldrls.w','ldrge.w','ldrlt.w','ldrgt.w','ldrle.w',
+            'ldreq','ldrne','ldrcs','ldrhs','ldrcc','ldrlo','ldrmi','ldrpl','ldrvs','ldrvc','ldrhi','ldrls','ldrge','ldrlt','ldrgt','ldrle',
+            'ldrheq.w','ldrhne.w','ldrhcs.w','ldrhhs.w','ldrhcc.w','ldrhlo.w','ldrhmi.w','ldrhpl.w','ldrhvs.w','ldrhvc.w','ldrhhi.w','ldrhls.w','ldrhge.w','ldrhlt.w','ldrhgt.w','ldrhle.w',
+            'ldrheq','ldrhne','ldrhcs','ldrhhs','ldrhcc','ldrhlo','ldrhmi','ldrhpl','ldrhvs','ldrhvc','ldrhhi','ldrhls','ldrhge','ldrhlt','ldrhgt','ldrhle',
+            'ldrbeq.w','ldrbne.w','ldrbcs.w','ldrbhs.w','ldrbcc.w','ldrblo.w','ldrbmi.w','ldrbpl.w','ldrbvs.w','ldrbvc.w','ldrbhi.w','ldrbls.w','ldrbge.w','ldrblt.w','ldrbgt.w','ldrble.w',
+            'ldrbeq','ldrbne','ldrbcs','ldrbhs','ldrbcc','ldrblo','ldrbmi','ldrbpl','ldrbvs','ldrbvc','ldrbhi','ldrbls','ldrbge','ldrblt','ldrbgt','ldrble',
+            'ldrsheq.w','ldrshne.w','ldrshcs.w','ldrshhs.w','ldrshcc.w','ldrshlo.w','ldrshmi.w','ldrshpl.w','ldrshvs.w','ldrshvc.w','ldrshhi.w','ldrshls.w','ldrshge.w','ldrshlt.w','ldrshgt.w','ldrshle.w',
+            'ldrsheq','ldrshne','ldrshcs','ldrshhs','ldrshcc','ldrshlo','ldrshmi','ldrshpl','ldrshvs','ldrshvc','ldrshhi','ldrshls','ldrshge','ldrshlt','ldrshgt','ldrshle',
+            'ldrsbeq.w','ldrsbne.w','ldrsbcs.w','ldrsbhs.w','ldrsbcc.w','ldrsblo.w','ldrsbmi.w','ldrsbpl.w','ldrsbvs.w','ldrsbvc.w','ldrsbhi.w','ldrsbls.w','ldrsbge.w','ldrsblt.w','ldrsbgt.w','ldrsble.w',
+            'ldrsbeq','ldrsbne','ldrsbcs','ldrsbhs','ldrsbcc','ldrsblo','ldrsbmi','ldrsbpl','ldrsbvs','ldrsbvc','ldrsbhi','ldrsbls','ldrsbge','ldrsblt','ldrsbgt','ldrsble',
+            'ldrteq','ldrtne','ldrtcs','ldrths','ldrtcc','ldrtlo','ldrtmi','ldrtpl','ldrtvs','ldrtvc','ldrthi','ldrtls','ldrtge','ldrtlt','ldrtgt','ldrtle',
+            'ldrhteq','ldrhtne','ldrhtcs','ldrhths','ldrhtcc','ldrhtlo','ldrhtmi','ldrhtpl','ldrhtvs','ldrhtvc','ldrhthi','ldrhtls','ldrhtge','ldrhtlt','ldrhtgt','ldrhtle',
+            'ldrbteq','ldrbtne','ldrbtcs','ldrbths','ldrbtcc','ldrbtlo','ldrbtmi','ldrbtpl','ldrbtvs','ldrbtvc','ldrbthi','ldrbtls','ldrbtge','ldrbtlt','ldrbtgt','ldrbtle',
+            'ldrshteq','ldrshtne','ldrshtcs','ldrshths','ldrshtcc','ldrshtlo','ldrshtmi','ldrshtpl','ldrshtvs','ldrshtvc','ldrshthi','ldrshtls','ldrshtge','ldrshtlt','ldrshtgt','ldrshtle',
+            'ldrsbteq','ldrsbtne','ldrsbtcs','ldrsbths','ldrsbtcc','ldrsbtlo','ldrsbtmi','ldrsbtpl','ldrsbtvs','ldrsbtvc','ldrsbthi','ldrsbtls','ldrsbtge','ldrsbtlt','ldrsbtgt','ldrsbtle',
+            'popeq.w','popne.w','popcs.w','pophs.w','popcc.w','poplo.w','popmi.w','poppl.w','popvs.w','popvc.w','pophi.w','popls.w','popge.w','poplt.w','popgt.w','pople.w',
+            'popeq','popne','popcs','pophs','popcc','poplo','popmi','poppl','popvs','popvc','pophi','popls','popge','poplt','popgt','pople',
+            'pldeq','pldne','pldcs','pldhs','pldcc','pldlo','pldmi','pldpl','pldvs','pldvc','pldhi','pldls','pldge','pldlt','pldgt','pldle',
+            'pldweq','pldwne','pldwcs','pldwhs','pldwcc','pldwlo','pldwmi','pldwpl','pldwvs','pldwvc','pldwhi','pldwls','pldwge','pldwlt','pldwgt','pldwle',
+            'plieq','pline','plics','plihs','plicc','plilo','plimi','plipl','plivs','plivc','plihi','plils','plige','plilt','pligt','plile',
+            /* Memory Access: Conditional Memory Stores */
+            'stmeq.w','stmne.w','stmcs.w','stmhs.w','stmcc.w','stmlo.w','stmmi.w','stmpl.w','stmvs.w','stmvc.w','stmhi.w','stmls.w','stmge.w','stmlt.w','stmgt.w','stmle.w',
+            'stmeq','stmne','stmcs','stmhs','stmcc','stmlo','stmmi','stmpl','stmvs','stmvc','stmhi','stmls','stmge','stmlt','stmgt','stmle',
+            'stmdaeq','stmdane','stmdacs','stmdahs','stmdacc','stmdalo','stmdami','stmdapl','stmdavs','stmdavc','stmdahi','stmdals','stmdage','stmdalt','stmdagt','stmdale',
+            'stmdbeq','stmdbne','stmdbcs','stmdbhs','stmdbcc','stmdblo','stmdbmi','stmdbpl','stmdbvs','stmdbvc','stmdbhi','stmdbls','stmdbge','stmdblt','stmdbgt','stmdble',
+            'stmibeq','stmibne','stmibcs','stmibhs','stmibcc','stmiblo','stmibmi','stmibpl','stmibvs','stmibvc','stmibhi','stmibls','stmibge','stmiblt','stmibgt','stmible',
+            'stmiaeq','stmiane','stmiacs','stmiahs','stmiacc','stmialo','stmiami','stmiapl','stmiavs','stmiavc','stmiahi','stmials','stmiage','stmialt','stmiagt','stmiale',
+            'stmeaeq','stmeane','stmeacs','stmeahs','stmeacc','stmealo','stmeami','stmeapl','stmeavs','stmeavc','stmeahi','stmeals','stmeage','stmealt','stmeagt','stmeale',
+            'stmedeq','stmedne','stmedcs','stmedhs','stmedcc','stmedlo','stmedmi','stmedpl','stmedvs','stmedvc','stmedhi','stmedls','stmedge','stmedlt','stmedgt','stmedle',
+            'stdfaeq','stdfane','stdfacs','stdfahs','stdfacc','stdfalo','stdfami','stdfapl','stdfavs','stdfavc','stdfahi','stdfals','stdfage','stdfalt','stdfagt','stdfale',
+            'stdfdeq','stdfdne','stdfdcs','stdfdhs','stdfdcc','stdfdlo','stdfdmi','stdfdpl','stdfdvs','stdfdvc','stdfdhi','stdfdls','stdfdge','stdfdlt','stdfdgt','stdfdle',
+            'strdeq','strdne','strdcs','strdhs','strdcc','strdlo','strdmi','strdpl','strdvs','strdvc','strdhi','strdls','strdge','strdlt','strdgt','strdle',
+            'streq.w','strne.w','strcs.w','strhs.w','strcc.w','strlo.w','strmi.w','strpl.w','strvs.w','strvc.w','strhi.w','strls.w','strge.w','strlt.w','strgt.w','strle.w',
+            'streq','strne','strcs','strhs','strcc','strlo','strmi','strpl','strvs','strvc','strhi','strls','strge','strlt','strgt','strle',
+            'strheq.w','strhne.w','strhcs.w','strhhs.w','strhcc.w','strhlo.w','strhmi.w','strhpl.w','strhvs.w','strhvc.w','strhhi.w','strhls.w','strhge.w','strhlt.w','strhgt.w','strhle.w',
+            'strheq','strhne','strhcs','strhhs','strhcc','strhlo','strhmi','strhpl','strhvs','strhvc','strhhi','strhls','strhge','strhlt','strhgt','strhle',
+            'strbeq.w','strbne.w','strbcs.w','strbhs.w','strbcc.w','strblo.w','strbmi.w','strbpl.w','strbvs.w','strbvc.w','strbhi.w','strbls.w','strbge.w','strblt.w','strbgt.w','strble.w',
+            'strbeq','strbne','strbcs','strbhs','strbcc','strblo','strbmi','strbpl','strbvs','strbvc','strbhi','strbls','strbge','strblt','strbgt','strble',
+            'strteq','strtne','strtcs','strths','strtcc','strtlo','strtmi','strtpl','strtvs','strtvc','strthi','strtls','strtge','strtlt','strtgt','strtle',
+            'strhteq','strhtne','strhtcs','strhths','strhtcc','strhtlo','strhtmi','strhtpl','strhtvs','strhtvc','strhthi','strhtls','strhtge','strhtlt','strhtgt','strhtle',
+            'strbteq','strbtne','strbtcs','strbths','strbtcc','strbtlo','strbtmi','strbtpl','strbtvs','strbtvc','strbthi','strbtls','strbtge','strbtlt','strbtgt','strbtle',
+            'pusheq.w','pushne.w','pushcs.w','pushhs.w','pushcc.w','pushlo.w','pushmi.w','pushpl.w','pushvs.w','pushvc.w','pushhi.w','pushls.w','pushge.w','pushlt.w','pushgt.w','pushle.w',
+            'pusheq','pushne','pushcs','pushhs','pushcc','pushlo','pushmi','pushpl','pushvs','pushvc','pushhi','pushls','pushge','pushlt','pushgt','pushle'
+            ),
+        /* Unconditional Flags-Affecting Instructions */
+        5 => array(
+            /* Set Flags: Unconditional Addition and Subtraction */
+            'adds.w','addsal.w',
+            'adds','addsal',
+            'subs.w','subsal.w',
+            'subs','subsal',
+            'rsbs.w','rsbsal.w',
+            'rsbs','rsbsal',
+            'negs.w','negsal.w',
+            'negs','negsal',
+            'adcs.w','adcsal.w',
+            'adcs','adcsal',
+            'sbcs.w','sbcsal.w',
+            'sbcs','sbcsal',
+            'rscs','rscsal',
+            'cmp.w','cmpal.w',
+            'cmp','cmpal',
+            'cmn.w','cmnal.w',
+            'cmn','cmnal',
+            /* Set Flags: Unconditional Logical */
+            'ands.w','andsal.w',
+            'ands','andsal',
+            'bics.w','bicsal.w',
+            'bics','bicsal',
+            'orrs.w','orrsal.w',
+            'orrs','orrsal',
+            'orns.w','ornsal.w',
+            'orns','ornsal',
+            'eors.w','eorsal.w',
+            'eors','eorsal',
+            'mvns.w','mvnsal.w',
+            'mvns','mvnsal',
+            'movs.w','movsal.w',
+            'movs','movsal',
+            'teq','teqal',
+            'tst.w','tstal.w',
+            'tst','tstal',
+            'mrs','mrsal',
+            'msr','msral',
+            /* Set Flags: Unconditional Shifts and Rotates */
+            'asrs.w','asrsal.w',
+            'asrs','asrsal',
+            'lsls.w','lslsal.w',
+            'lsls','lslsal',
+            'lsrs.w','lsrsal.w',
+            'lsrs','lsrsal',
+            'rors.w','rorsal.w',
+            'rors','rorsal',
+            'rrxs','rrxsal',
+            /* Set Flags: Unconditional Multiply and Multiply-Add */
+            'mlas','mlasal',
+            'smulls','smullsal',
+            'umulls','umullsal',
+            'smlals','smlalsal',
+            'umlals','umlalsal'
+            ),
+        /* Conditional Flags-Affecting Instructions */
+        6 => array(
+            /* Set Flags: Conditional Addition and Subtraction */
+            'addseq.w','addsne.w','addscs.w','addshs.w','addscc.w','addslo.w','addsmi.w','addspl.w','addsvs.w','addsvc.w','addshi.w','addsls.w','addsge.w','addslt.w','addsgt.w','addsle.w',
+            'addseq','addsne','addscs','addshs','addscc','addslo','addsmi','addspl','addsvs','addsvc','addshi','addsls','addsge','addslt','addsgt','addsle',
+            'subseq.w','subsne.w','subscs.w','subshs.w','subscc.w','subslo.w','subsmi.w','subspl.w','subsvs.w','subsvc.w','subshi.w','subsls.w','subsge.w','subslt.w','subsgt.w','subsle.w',
+            'subseq','subsne','subscs','subshs','subscc','subslo','subsmi','subspl','subsvs','subsvc','subshi','subsls','subsge','subslt','subsgt','subsle',
+            'rsbseq.w','rsbsne.w','rsbscs.w','rsbshs.w','rsbscc.w','rsbslo.w','rsbsmi.w','rsbspl.w','rsbsvs.w','rsbsvc.w','rsbshi.w','rsbsls.w','rsbsge.w','rsbslt.w','rsbsgt.w','rsbsle.w',
+            'rsbseq','rsbsne','rsbscs','rsbshs','rsbscc','rsbslo','rsbsmi','rsbspl','rsbsvs','rsbsvc','rsbshi','rsbsls','rsbsge','rsbslt','rsbsgt','rsbsle',
+            'negseq.w','negsne.w','negscs.w','negshs.w','negscc.w','negslo.w','negsmi.w','negspl.w','negsvs.w','negsvc.w','negshi.w','negsls.w','negsge.w','negslt.w','negsgt.w','negsle.w',
+            'negseq','negsne','negscs','negshs','negscc','negslo','negsmi','negspl','negsvs','negsvc','negshi','negsls','negsge','negslt','negsgt','negsle',
+            'adcseq.w','adcsne.w','adcscs.w','adcshs.w','adcscc.w','adcslo.w','adcsmi.w','adcspl.w','adcsvs.w','adcsvc.w','adcshi.w','adcsls.w','adcsge.w','adcslt.w','adcsgt.w','adcsle.w',
+            'adcseq','adcsne','adcscs','adcshs','adcscc','adcslo','adcsmi','adcspl','adcsvs','adcsvc','adcshi','adcsls','adcsge','adcslt','adcsgt','adcsle',
+            'sbcseq.w','sbcsne.w','sbcscs.w','sbcshs.w','sbcscc.w','sbcslo.w','sbcsmi.w','sbcspl.w','sbcsvs.w','sbcsvc.w','sbcshi.w','sbcsls.w','sbcsge.w','sbcslt.w','sbcsgt.w','sbcsle.w',
+            'sbcseq','sbcsne','sbcscs','sbcshs','sbcscc','sbcslo','sbcsmi','sbcspl','sbcsvs','sbcsvc','sbcshi','sbcsls','sbcsge','sbcslt','sbcsgt','sbcsle',
+            'rscseq','rscsne','rscscs','rscshs','rscscc','rscslo','rscsmi','rscspl','rscsvs','rscsvc','rscshi','rscsls','rscsge','rscslt','rscsgt','rscsle',
+            'cmpeq.w','cmpne.w','cmpcs.w','cmphs.w','cmpcc.w','cmplo.w','cmpmi.w','cmppl.w','cmpvs.w','cmpvc.w','cmphi.w','cmpls.w','cmpge.w','cmplt.w','cmpgt.w','cmple.w',
+            'cmpeq','cmpne','cmpcs','cmphs','cmpcc','cmplo','cmpmi','cmppl','cmpvs','cmpvc','cmphi','cmpls','cmpge','cmplt','cmpgt','cmple',
+            'cmneq.w','cmnne.w','cmncs.w','cmnhs.w','cmncc.w','cmnlo.w','cmnmi.w','cmnpl.w','cmnvs.w','cmnvc.w','cmnhi.w','cmnls.w','cmnge.w','cmnlt.w','cmngt.w','cmnle.w',
+            'cmneq','cmnne','cmncs','cmnhs','cmncc','cmnlo','cmnmi','cmnpl','cmnvs','cmnvc','cmnhi','cmnls','cmnge','cmnlt','cmngt','cmnle',
+            /* Set Flags: Conditional Logical */
+            'andseq.w','andsne.w','andscs.w','andshs.w','andscc.w','andslo.w','andsmi.w','andspl.w','andsvs.w','andsvc.w','andshi.w','andsls.w','andsge.w','andslt.w','andsgt.w','andsle.w',
+            'andseq','andsne','andscs','andshs','andscc','andslo','andsmi','andspl','andsvs','andsvc','andshi','andsls','andsge','andslt','andsgt','andsle',
+            'bicseq.w','bicsne.w','bicscs.w','bicshs.w','bicscc.w','bicslo.w','bicsmi.w','bicspl.w','bicsvs.w','bicsvc.w','bicshi.w','bicsls.w','bicsge.w','bicslt.w','bicsgt.w','bicsle.w',
+            'bicseq','bicsne','bicscs','bicshs','bicscc','bicslo','bicsmi','bicspl','bicsvs','bicsvc','bicshi','bicsls','bicsge','bicslt','bicsgt','bicsle',
+            'orrseq.w','orrsne.w','orrscs.w','orrshs.w','orrscc.w','orrslo.w','orrsmi.w','orrspl.w','orrsvs.w','orrsvc.w','orrshi.w','orrsls.w','orrsge.w','orrslt.w','orrsgt.w','orrsle.w',
+            'orrseq','orrsne','orrscs','orrshs','orrscc','orrslo','orrsmi','orrspl','orrsvs','orrsvc','orrshi','orrsls','orrsge','orrslt','orrsgt','orrsle',
+            'ornseq.w','ornsne.w','ornscs.w','ornshs.w','ornscc.w','ornslo.w','ornsmi.w','ornspl.w','ornsvs.w','ornsvc.w','ornshi.w','ornsls.w','ornsge.w','ornslt.w','ornsgt.w','ornsle.w',
+            'ornseq','ornsne','ornscs','ornshs','ornscc','ornslo','ornsmi','ornspl','ornsvs','ornsvc','ornshi','ornsls','ornsge','ornslt','ornsgt','ornsle',
+            'eorseq.w','eorsne.w','eorscs.w','eorshs.w','eorscc.w','eorslo.w','eorsmi.w','eorspl.w','eorsvs.w','eorsvc.w','eorshi.w','eorsls.w','eorsge.w','eorslt.w','eorsgt.w','eorsle.w',
+            'eorseq','eorsne','eorscs','eorshs','eorscc','eorslo','eorsmi','eorspl','eorsvs','eorsvc','eorshi','eorsls','eorsge','eorslt','eorsgt','eorsle',
+            'mvnseq.w','mvnsne.w','mvnscs.w','mvnshs.w','mvnscc.w','mvnslo.w','mvnsmi.w','mvnspl.w','mvnsvs.w','mvnsvc.w','mvnshi.w','mvnsls.w','mvnsge.w','mvnslt.w','mvnsgt.w','mvnsle.w',
+            'mvnseq','mvnsne','mvnscs','mvnshs','mvnscc','mvnslo','mvnsmi','mvnspl','mvnsvs','mvnsvc','mvnshi','mvnsls','mvnsge','mvnslt','mvnsgt','mvnsle',
+            'movseq.w','movsne.w','movscs.w','movshs.w','movscc.w','movslo.w','movsmi.w','movspl.w','movsvs.w','movsvc.w','movshi.w','movsls.w','movsge.w','movslt.w','movsgt.w','movsle.w',
+            'movseq','movsne','movscs','movshs','movscc','movslo','movsmi','movspl','movsvs','movsvc','movshi','movsls','movsge','movslt','movsgt','movsle',
+            'teqeq','teqne','teqcs','teqhs','teqcc','teqlo','teqmi','teqpl','teqvs','teqvc','teqhi','teqls','teqge','teqlt','teqgt','teqle',
+            'tsteq.w','tstne.w','tstcs.w','tsths.w','tstcc.w','tstlo.w','tstmi.w','tstpl.w','tstvs.w','tstvc.w','tsthi.w','tstls.w','tstge.w','tstlt.w','tstgt.w','tstle.w',
+            'tsteq','tstne','tstcs','tsths','tstcc','tstlo','tstmi','tstpl','tstvs','tstvc','tsthi','tstls','tstge','tstlt','tstgt','tstle',
+            'mrseq','mrsne','mrscs','mrshs','mrscc','mrslo','mrsmi','mrspl','mrsvs','mrsvc','mrshi','mrsls','mrsge','mrslt','mrsgt','mrsle',
+            'msreq','msrne','msrcs','msrhs','msrcc','msrlo','msrmi','msrpl','msrvs','msrvc','msrhi','msrls','msrge','msrlt','msrgt','msrle',
+            /* Set Flags: Conditional Shifts and Rotates */
+            'asrseq.w','asrsne.w','asrscs.w','asrshs.w','asrscc.w','asrslo.w','asrsmi.w','asrspl.w','asrsvs.w','asrsvc.w','asrshi.w','asrsls.w','asrsge.w','asrslt.w','asrsgt.w','asrsle.w',
+            'asrseq','asrsne','asrscs','asrshs','asrscc','asrslo','asrsmi','asrspl','asrsvs','asrsvc','asrshi','asrsls','asrsge','asrslt','asrsgt','asrsle',
+            'lslseq.w','lslsne.w','lslscs.w','lslshs.w','lslscc.w','lslslo.w','lslsmi.w','lslspl.w','lslsvs.w','lslsvc.w','lslshi.w','lslsls.w','lslsge.w','lslslt.w','lslsgt.w','lslsle.w',
+            'lslseq','lslsne','lslscs','lslshs','lslscc','lslslo','lslsmi','lslspl','lslsvs','lslsvc','lslshi','lslsls','lslsge','lslslt','lslsgt','lslsle',
+            'lsrseq.w','lsrsne.w','lsrscs.w','lsrshs.w','lsrscc.w','lsrslo.w','lsrsmi.w','lsrspl.w','lsrsvs.w','lsrsvc.w','lsrshi.w','lsrsls.w','lsrsge.w','lsrslt.w','lsrsgt.w','lsrsle.w',
+            'lsrseq','lsrsne','lsrscs','lsrshs','lsrscc','lsrslo','lsrsmi','lsrspl','lsrsvs','lsrsvc','lsrshi','lsrsls','lsrsge','lsrslt','lsrsgt','lsrsle',
+            'rorseq.w','rorsne.w','rorscs.w','rorshs.w','rorscc.w','rorslo.w','rorsmi.w','rorspl.w','rorsvs.w','rorsvc.w','rorshi.w','rorsls.w','rorsge.w','rorslt.w','rorsgt.w','rorsle.w',
+            'rorseq','rorsne','rorscs','rorshs','rorscc','rorslo','rorsmi','rorspl','rorsvs','rorsvc','rorshi','rorsls','rorsge','rorslt','rorsgt','rorsle',
+            'rrxseq','rrxsne','rrxscs','rrxshs','rrxscc','rrxslo','rrxsmi','rrxspl','rrxsvs','rrxsvc','rrxshi','rrxsls','rrxsge','rrxslt','rrxsgt','rrxsle',
+            /* Set Flags: Conditional Multiply and Multiply-Add */
+            'mlaseq','mlasne','mlascs','mlashs','mlascc','mlaslo','mlasmi','mlaspl','mlasvs','mlasvc','mlashi','mlasls','mlasge','mlaslt','mlasgt','mlasle',
+            'smullseq','smullsne','smullscs','smullshs','smullscc','smullslo','smullsmi','smullspl','smullsvs','smullsvc','smullshi','smullsls','smullsge','smullslt','smullsgt','smullsle',
+            'umullseq','umullsne','umullscs','umullshs','umullscc','umullslo','umullsmi','umullspl','umullsvs','umullsvc','umullshi','umullsls','umullsge','umullslt','umullsgt','umullsle',
+            'smlalseq','smlalsne','smlalscs','smlalshs','smlalscc','smlalslo','smlalsmi','smlalspl','smlalsvs','smlalsvc','smlalshi','smlalsls','smlalsge','smlalslt','smlalsgt','smlalsle',
+            'umlalseq','umlalsne','umlalscs','umlalshs','umlalscc','umlalslo','umlalsmi','umlalspl','umlalsvs','umlalsvc','umlalshi','umlalsls','umlalsge','umlalslt','umlalsgt','umlalsle'
+            ),
+        /* Unconditional Flow Control Instructions */
+        7 => array(
+            /* Flow Control: Unconditional Branch and If-Then-Else */
+            'b.w','bal.w',
+            'b','bal',
+            'bl','blal',
+            'bx','bxal',
+            'blx','blxal',
+            'bxj','bxjal',
+            'cbnz',
+            'cbz',
+            'tbb','tbbal',
+            'tbh','tbhal',
+            'it',
+            'itt',
+            'ite',
+            'ittt',
+            'itet',
+            'itte',
+            'itee',
+            'itttt',
+            'itett',
+            'ittet',
+            'iteet',
+            'ittte',
+            'itete',
+            'ittee',
+            'iteee'
+            ),
+        /* Conditional Flow Control Instructions */
+        8 => array(
+            /* Flow Control: Conditional Branch and If-Then-Else */
+            'beq.w','bne.w','bcs.w','bhs.w','bcc.w','blo.w','bmi.w','bpl.w','bvs.w','bvc.w','bhi.w','bls.w','bge.w','blt.w','bgt.w','ble.w',
+            'beq','bne','bcs','bhs','bcc','blo','bmi','bpl','bvs','bvc','bhi','bls','bge','blt','bgt','ble',
+            'bleq','blne','blcs','blhs','blcc','bllo','blmi','blpl','blvs','blvc','blhi','blls','blge','bllt','blgt','blle',
+            'bxeq','bxne','bxcs','bxhs','bxcc','bxlo','bxmi','bxpl','bxvs','bxvc','bxhi','bxls','bxge','bxlt','bxgt','bxle',
+            'blxeq','blxne','blxcs','blxhs','blxcc','blxlo','blxmi','blxpl','blxvs','blxvc','blxhi','blxls','blxge','blxlt','blxgt','blxle',
+            'bxjeq','bxjne','bxjcs','bxjhs','bxjcc','bxjlo','bxjmi','bxjpl','bxjvs','bxjvc','bxjhi','bxjls','bxjge','bxjlt','bxjgt','bxjle',
+            'tbbeq','tbbne','tbbcs','tbbhs','tbbcc','tbblo','tbbmi','tbbpl','tbbvs','tbbvc','tbbhi','tbbls','tbbge','tbblt','tbbgt','tbble',
+            'tbheq','tbhne','tbhcs','tbhhs','tbhcc','tbhlo','tbhmi','tbhpl','tbhvs','tbhvc','tbhhi','tbhls','tbhge','tbhlt','tbhgt','tbhle'
+            ),
+        /* Unconditional Syncronization Instructions */
+        9 => array(
+            /* Synchronization: Unconditional Loads, Stores and Barriers */
+            'ldrexd','ldrexdal',
+            'ldrex','ldrexal',
+            'ldrexh','ldrexhal',
+            'ldrexb','ldrexbal',
+            'strexd','strexdal',
+            'strex','strexal',
+            'strexh','strexhal',
+            'strexb','strexbal',
+            'clrex','clrexal',
+            'swp','swpal',
+            'swpb','swpbal',
+            'dbc','dbcal',
+            'dsb','dsbal',
+            'isb','isbal',
+            'yield.w','yieldal.w',
+            'yield','yieldal',
+            'nop.w','nopal.w',
+            'nop','nopal'
+            ),
+        /* Conditional Syncronization Instructions */
+        10 => array(
+            /* Synchronization: Conditional Loads, Stores and Barriers */
+            'ldrexdeq','ldrexdne','ldrexdcs','ldrexdhs','ldrexdcc','ldrexdlo','ldrexdmi','ldrexdpl','ldrexdvs','ldrexdvc','ldrexdhi','ldrexdls','ldrexdge','ldrexdlt','ldrexdgt','ldrexdle',
+            'ldrexeq','ldrexne','ldrexcs','ldrexhs','ldrexcc','ldrexlo','ldrexmi','ldrexpl','ldrexvs','ldrexvc','ldrexhi','ldrexls','ldrexge','ldrexlt','ldrexgt','ldrexle',
+            'ldrexheq','ldrexhne','ldrexhcs','ldrexhhs','ldrexhcc','ldrexhlo','ldrexhmi','ldrexhpl','ldrexhvs','ldrexhvc','ldrexhhi','ldrexhls','ldrexhge','ldrexhlt','ldrexhgt','ldrexhle',
+            'ldrexbeq','ldrexbne','ldrexbcs','ldrexbhs','ldrexbcc','ldrexblo','ldrexbmi','ldrexbpl','ldrexbvs','ldrexbvc','ldrexbhi','ldrexbls','ldrexbge','ldrexblt','ldrexbgt','ldrexble',
+            'strexdeq','strexdne','strexdcs','strexdhs','strexdcc','strexdlo','strexdmi','strexdpl','strexdvs','strexdvc','strexdhi','strexdls','strexdge','strexdlt','strexdgt','strexdle',
+            'strexeq','strexne','strexcs','strexhs','strexcc','strexlo','strexmi','strexpl','strexvs','strexvc','strexhi','strexls','strexge','strexlt','strexgt','strexle',
+            'strexheq','strexhne','strexhcs','strexhhs','strexhcc','strexhlo','strexhmi','strexhpl','strexhvs','strexhvc','strexhhi','strexhls','strexhge','strexhlt','strexhgt','strexhle',
+            'strexbeq','strexbne','strexbcs','strexbhs','strexbcc','strexblo','strexbmi','strexbpl','strexbvs','strexbvc','strexbhi','strexbls','strexbge','strexblt','strexbgt','strexble',
+            'clrexeq','clrexne','clrexcs','clrexhs','clrexcc','clrexlo','clrexmi','clrexpl','clrexvs','clrexvc','clrexhi','clrexls','clrexge','clrexlt','clrexgt','clrexle',
+            'swpeq','swpne','swpcs','swphs','swpcc','swplo','swpmi','swppl','swpvs','swpvc','swphi','swpls','swpge','swplt','swpgt','swple',
+            'swpbeq','swpbne','swpbcs','swpbhs','swpbcc','swpblo','swpbmi','swpbpl','swpbvs','swpbvc','swpbhi','swpbls','swpbge','swpblt','swpbgt','swpble',
+            'dbceq','dbcne','dbccs','dbchs','dbccc','dbclo','dbcmi','dbcpl','dbcvs','dbcvc','dbchi','dbcls','dbcge','dbclt','dbcgt','dbcle',
+            'dsbeq','dsbne','dsbcs','dsbhs','dsbcc','dsblo','dsbmi','dsbpl','dsbvs','dsbvc','dsbhi','dsbls','dsbge','dsblt','dsbgt','dsble',
+            'isbeq','isbne','isbcs','isbhs','isbcc','isblo','isbmi','isbpl','isbvs','isbvc','isbhi','isbls','isbge','isblt','isbgt','isble',
+            'yieldeq.w','yieldne.w','yieldcs.w','yieldhs.w','yieldcc.w','yieldlo.w','yieldmi.w','yieldpl.w','yieldvs.w','yieldvc.w','yieldhi.w','yieldls.w','yieldge.w','yieldlt.w','yieldgt.w','yieldle.w',
+            'yieldeq','yieldne','yieldcs','yieldhs','yieldcc','yieldlo','yieldmi','yieldpl','yieldvs','yieldvc','yieldhi','yieldls','yieldge','yieldlt','yieldgt','yieldle',
+            'nopeq.w','nopne.w','nopcs.w','nophs.w','nopcc.w','noplo.w','nopmi.w','noppl.w','nopvs.w','nopvc.w','nophi.w','nopls.w','nopge.w','noplt.w','nopgt.w','nople.w',
+            'nopeq','nopne','nopcs','nophs','nopcc','noplo','nopmi','noppl','nopvs','nopvc','nophi','nopls','nopge','noplt','nopgt','nople'
+            ),
+        /* Unconditional ARMv6 SIMD */
+        11 => array(
+            /* ARMv6 SIMD: Unconditional Addition, Subtraction & Saturation */
+            'sadd16','sadd16al',
+            'sadd8','sadd8al',
+            'uadd16','uadd16al',
+            'uadd8','uadd8al',
+            'ssub16','ssub16al',
+            'ssub8','ssub8al',
+            'usub16','usub16al',
+            'usub8','usub8al',
+            'sasx','sasxal',
+            'ssax','ssaxal',
+            'uasx','uasxal',
+            'usax','usaxal',
+            'usad8','usad8al',
+            'usada8','usada8al',
+            /* ARMv6 SIMD: Unconditional Halving Addition & Subtraction */
+            'shadd16','shadd16al',
+            'shadd8','shadd8al',
+            'uhadd16','uhadd16al',
+            'uhadd8','uhadd8al',
+            'shsub16','shsub16al',
+            'shsub8','shsub8al',
+            'uhsub16','uhsub16al',
+            'uhsub8','uhsub8al',
+            'shasx','shasxal',
+            'shsax','shsaxal',
+            'uhasx','uhasxal',
+            'uhsax','uhsaxal',
+            /* ARMv6 SIMD: Unconditional Saturating Operations */
+            'qadd','qaddal',
+            'qadd16','qadd16al',
+            'qadd8','qadd8al',
+            'uqadd16','uqadd16al',
+            'uqadd8','uqadd8al',
+            'qsub','qsubal',
+            'qsub16','qsub16al',
+            'qsub8','qsub8al',
+            'uqsub16','uqsub16al',
+            'uqsub8','uqsub8al',
+            'qasx','qasxal',
+            'qsax','qsaxal',
+            'uqasx','uqasxal',
+            'uqsax','uqsaxal',
+            'qdadd','qdaddal',
+            'qdsub','qdsubal',
+            'ssat','ssatal',
+            'ssat16','ssat16al',
+            'usat','usatal',
+            'usat16','usat16al',
+            /* ARMv6 SIMD: Unconditional Permutation and Combine Operations */
+            'sxtah','sxtahal',
+            'sxtab','sxtabal',
+            'sxtab16','sxtab16al',
+            'uxtah','uxtahal',
+            'uxtab','uxtabal',
+            'uxtab16','uxtab16al',
+            'sxth.w','sxthal.w',
+            'sxth','sxthal',
+            'sxtb.w','sxtbal.w',
+            'sxtb','sxtbal',
+            'sxtb16','sxtb16al',
+            'uxth.w','uxthal.w',
+            'uxth','uxthal',
+            'uxtb.w','uxtbal.w',
+            'uxtb','uxtbal',
+            'uxtb16','uxtb16al',
+            'pkhbt','pkhbtal',
+            'pkhtb','pkhtbal',
+            'rbit','rbital',
+            'rev.w','reval.w',
+            'rev','reval',
+            'rev16.w','rev16al.w',
+            'rev16','rev16al',
+            'revsh.w','revshal.w',
+            'revsh','revshal',
+            'sel','selal',
+            /* ARMv6 SIMD: Unconditional Multiply and Multiply-Add */
+            'smlad','smladal',
+            'smladx','smladxal',
+            'smlsd','smlsdal',
+            'smlsdx','smlsdxal',
+            'smlald','smlaldal',
+            'smlaldx','smlaldxal',
+            'smlsld','smlsldal',
+            'smlsldx','smlsldxal',
+            'smmul','smmulal',
+            'smmulr','smmulral',
+            'smmla','smmlaal',
+            'smmlar','smmlaral',
+            'smmls','smmlsal',
+            'smmlsr','smmlsral',
+            'smuad','smuadal',
+            'smuadx','smuadxal',
+            'smusd','smusdal',
+            'smusdx','smusdxal',
+            'umaal','umaalal'
+            ),
+        /* Conditional ARMv6 SIMD */
+        12 => array(
+            /* ARMv6 SIMD: Conditional Addition, Subtraction & Saturation */
+            'sadd16eq','sadd16ne','sadd16cs','sadd16hs','sadd16cc','sadd16lo','sadd16mi','sadd16pl','sadd16vs','sadd16vc','sadd16hi','sadd16ls','sadd16ge','sadd16lt','sadd16gt','sadd16le',
+            'sadd8eq','sadd8ne','sadd8cs','sadd8hs','sadd8cc','sadd8lo','sadd8mi','sadd8pl','sadd8vs','sadd8vc','sadd8hi','sadd8ls','sadd8ge','sadd8lt','sadd8gt','sadd8le',
+            'uadd16eq','uadd16ne','uadd16cs','uadd16hs','uadd16cc','uadd16lo','uadd16mi','uadd16pl','uadd16vs','uadd16vc','uadd16hi','uadd16ls','uadd16ge','uadd16lt','uadd16gt','uadd16le',
+            'uadd8eq','uadd8ne','uadd8cs','uadd8hs','uadd8cc','uadd8lo','uadd8mi','uadd8pl','uadd8vs','uadd8vc','uadd8hi','uadd8ls','uadd8ge','uadd8lt','uadd8gt','uadd8le',
+            'ssub16eq','ssub16ne','ssub16cs','ssub16hs','ssub16cc','ssub16lo','ssub16mi','ssub16pl','ssub16vs','ssub16vc','ssub16hi','ssub16ls','ssub16ge','ssub16lt','ssub16gt','ssub16le',
+            'ssub8eq','ssub8ne','ssub8cs','ssub8hs','ssub8cc','ssub8lo','ssub8mi','ssub8pl','ssub8vs','ssub8vc','ssub8hi','ssub8ls','ssub8ge','ssub8lt','ssub8gt','ssub8le',
+            'usub16eq','usub16ne','usub16cs','usub16hs','usub16cc','usub16lo','usub16mi','usub16pl','usub16vs','usub16vc','usub16hi','usub16ls','usub16ge','usub16lt','usub16gt','usub16le',
+            'usub8eq','usub8ne','usub8cs','usub8hs','usub8cc','usub8lo','usub8mi','usub8pl','usub8vs','usub8vc','usub8hi','usub8ls','usub8ge','usub8lt','usub8gt','usub8le',
+            'sasxeq','sasxne','sasxcs','sasxhs','sasxcc','sasxlo','sasxmi','sasxpl','sasxvs','sasxvc','sasxhi','sasxls','sasxge','sasxlt','sasxgt','sasxle',
+            'ssaxeq','ssaxne','ssaxcs','ssaxhs','ssaxcc','ssaxlo','ssaxmi','ssaxpl','ssaxvs','ssaxvc','ssaxhi','ssaxls','ssaxge','ssaxlt','ssaxgt','ssaxle',
+            'uasxeq','uasxne','uasxcs','uasxhs','uasxcc','uasxlo','uasxmi','uasxpl','uasxvs','uasxvc','uasxhi','uasxls','uasxge','uasxlt','uasxgt','uasxle',
+            'usaxeq','usaxne','usaxcs','usaxhs','usaxcc','usaxlo','usaxmi','usaxpl','usaxvs','usaxvc','usaxhi','usaxls','usaxge','usaxlt','usaxgt','usaxle',
+            'usad8eq','usad8ne','usad8cs','usad8hs','usad8cc','usad8lo','usad8mi','usad8pl','usad8vs','usad8vc','usad8hi','usad8ls','usad8ge','usad8lt','usad8gt','usad8le',
+            'usada8eq','usada8ne','usada8cs','usada8hs','usada8cc','usada8lo','usada8mi','usada8pl','usada8vs','usada8vc','usada8hi','usada8ls','usada8ge','usada8lt','usada8gt','usada8le',
+            /* ARMv6 SIMD: Conditional Halving Addition & Subtraction */
+            'shadd16eq','shadd16ne','shadd16cs','shadd16hs','shadd16cc','shadd16lo','shadd16mi','shadd16pl','shadd16vs','shadd16vc','shadd16hi','shadd16ls','shadd16ge','shadd16lt','shadd16gt','shadd16le',
+            'shadd8eq','shadd8ne','shadd8cs','shadd8hs','shadd8cc','shadd8lo','shadd8mi','shadd8pl','shadd8vs','shadd8vc','shadd8hi','shadd8ls','shadd8ge','shadd8lt','shadd8gt','shadd8le',
+            'uhadd16eq','uhadd16ne','uhadd16cs','uhadd16hs','uhadd16cc','uhadd16lo','uhadd16mi','uhadd16pl','uhadd16vs','uhadd16vc','uhadd16hi','uhadd16ls','uhadd16ge','uhadd16lt','uhadd16gt','uhadd16le',
+            'uhadd8eq','uhadd8ne','uhadd8cs','uhadd8hs','uhadd8cc','uhadd8lo','uhadd8mi','uhadd8pl','uhadd8vs','uhadd8vc','uhadd8hi','uhadd8ls','uhadd8ge','uhadd8lt','uhadd8gt','uhadd8le',
+            'shsub16eq','shsub16ne','shsub16cs','shsub16hs','shsub16cc','shsub16lo','shsub16mi','shsub16pl','shsub16vs','shsub16vc','shsub16hi','shsub16ls','shsub16ge','shsub16lt','shsub16gt','shsub16le',
+            'shsub8eq','shsub8ne','shsub8cs','shsub8hs','shsub8cc','shsub8lo','shsub8mi','shsub8pl','shsub8vs','shsub8vc','shsub8hi','shsub8ls','shsub8ge','shsub8lt','shsub8gt','shsub8le',
+            'uhsub16eq','uhsub16ne','uhsub16cs','uhsub16hs','uhsub16cc','uhsub16lo','uhsub16mi','uhsub16pl','uhsub16vs','uhsub16vc','uhsub16hi','uhsub16ls','uhsub16ge','uhsub16lt','uhsub16gt','uhsub16le',
+            'uhsub8eq','uhsub8ne','uhsub8cs','uhsub8hs','uhsub8cc','uhsub8lo','uhsub8mi','uhsub8pl','uhsub8vs','uhsub8vc','uhsub8hi','uhsub8ls','uhsub8ge','uhsub8lt','uhsub8gt','uhsub8le',
+            'shasxeq','shasxne','shasxcs','shasxhs','shasxcc','shasxlo','shasxmi','shasxpl','shasxvs','shasxvc','shasxhi','shasxls','shasxge','shasxlt','shasxgt','shasxle',
+            'shsaxeq','shsaxne','shsaxcs','shsaxhs','shsaxcc','shsaxlo','shsaxmi','shsaxpl','shsaxvs','shsaxvc','shsaxhi','shsaxls','shsaxge','shsaxlt','shsaxgt','shsaxle',
+            'uhasxeq','uhasxne','uhasxcs','uhasxhs','uhasxcc','uhasxlo','uhasxmi','uhasxpl','uhasxvs','uhasxvc','uhasxhi','uhasxls','uhasxge','uhasxlt','uhasxgt','uhasxle',
+            'uhsaxeq','uhsaxne','uhsaxcs','uhsaxhs','uhsaxcc','uhsaxlo','uhsaxmi','uhsaxpl','uhsaxvs','uhsaxvc','uhsaxhi','uhsaxls','uhsaxge','uhsaxlt','uhsaxgt','uhsaxle',
+            /* ARMv6 SIMD: Conditional Saturating Operations */
+            'qaddeq','qaddne','qaddcs','qaddhs','qaddcc','qaddlo','qaddmi','qaddpl','qaddvs','qaddvc','qaddhi','qaddls','qaddge','qaddlt','qaddgt','qaddle',
+            'qadd16eq','qadd16ne','qadd16cs','qadd16hs','qadd16cc','qadd16lo','qadd16mi','qadd16pl','qadd16vs','qadd16vc','qadd16hi','qadd16ls','qadd16ge','qadd16lt','qadd16gt','qadd16le',
+            'qadd8eq','qadd8ne','qadd8cs','qadd8hs','qadd8cc','qadd8lo','qadd8mi','qadd8pl','qadd8vs','qadd8vc','qadd8hi','qadd8ls','qadd8ge','qadd8lt','qadd8gt','qadd8le',
+            'uqadd16eq','uqadd16ne','uqadd16cs','uqadd16hs','uqadd16cc','uqadd16lo','uqadd16mi','uqadd16pl','uqadd16vs','uqadd16vc','uqadd16hi','uqadd16ls','uqadd16ge','uqadd16lt','uqadd16gt','uqadd16le',
+            'uqadd8eq','uqadd8ne','uqadd8cs','uqadd8hs','uqadd8cc','uqadd8lo','uqadd8mi','uqadd8pl','uqadd8vs','uqadd8vc','uqadd8hi','uqadd8ls','uqadd8ge','uqadd8lt','uqadd8gt','uqadd8le',
+            'qsubeq','qsubne','qsubcs','qsubhs','qsubcc','qsublo','qsubmi','qsubpl','qsubvs','qsubvc','qsubhi','qsubls','qsubge','qsublt','qsubgt','qsuble',
+            'qsub16eq','qsub16ne','qsub16cs','qsub16hs','qsub16cc','qsub16lo','qsub16mi','qsub16pl','qsub16vs','qsub16vc','qsub16hi','qsub16ls','qsub16ge','qsub16lt','qsub16gt','qsub16le',
+            'qsub8eq','qsub8ne','qsub8cs','qsub8hs','qsub8cc','qsub8lo','qsub8mi','qsub8pl','qsub8vs','qsub8vc','qsub8hi','qsub8ls','qsub8ge','qsub8lt','qsub8gt','qsub8le',
+            'uqsub16eq','uqsub16ne','uqsub16cs','uqsub16hs','uqsub16cc','uqsub16lo','uqsub16mi','uqsub16pl','uqsub16vs','uqsub16vc','uqsub16hi','uqsub16ls','uqsub16ge','uqsub16lt','uqsub16gt','uqsub16le',
+            'uqsub8eq','uqsub8ne','uqsub8cs','uqsub8hs','uqsub8cc','uqsub8lo','uqsub8mi','uqsub8pl','uqsub8vs','uqsub8vc','uqsub8hi','uqsub8ls','uqsub8ge','uqsub8lt','uqsub8gt','uqsub8le',
+            'qasxeq','qasxne','qasxcs','qasxhs','qasxcc','qasxlo','qasxmi','qasxpl','qasxvs','qasxvc','qasxhi','qasxls','qasxge','qasxlt','qasxgt','qasxle',
+            'qsaxeq','qsaxne','qsaxcs','qsaxhs','qsaxcc','qsaxlo','qsaxmi','qsaxpl','qsaxvs','qsaxvc','qsaxhi','qsaxls','qsaxge','qsaxlt','qsaxgt','qsaxle',
+            'uqasxeq','uqasxne','uqasxcs','uqasxhs','uqasxcc','uqasxlo','uqasxmi','uqasxpl','uqasxvs','uqasxvc','uqasxhi','uqasxls','uqasxge','uqasxlt','uqasxgt','uqasxle',
+            'uqsaxeq','uqsaxne','uqsaxcs','uqsaxhs','uqsaxcc','uqsaxlo','uqsaxmi','uqsaxpl','uqsaxvs','uqsaxvc','uqsaxhi','uqsaxls','uqsaxge','uqsaxlt','uqsaxgt','uqsaxle',
+            'qdaddeq','qdaddne','qdaddcs','qdaddhs','qdaddcc','qdaddlo','qdaddmi','qdaddpl','qdaddvs','qdaddvc','qdaddhi','qdaddls','qdaddge','qdaddlt','qdaddgt','qdaddle',
+            'qdsubeq','qdsubne','qdsubcs','qdsubhs','qdsubcc','qdsublo','qdsubmi','qdsubpl','qdsubvs','qdsubvc','qdsubhi','qdsubls','qdsubge','qdsublt','qdsubgt','qdsuble',
+            'ssateq','ssatne','ssatcs','ssaths','ssatcc','ssatlo','ssatmi','ssatpl','ssatvs','ssatvc','ssathi','ssatls','ssatge','ssatlt','ssatgt','ssatle',
+            'ssat16eq','ssat16ne','ssat16cs','ssat16hs','ssat16cc','ssat16lo','ssat16mi','ssat16pl','ssat16vs','ssat16vc','ssat16hi','ssat16ls','ssat16ge','ssat16lt','ssat16gt','ssat16le',
+            'usateq','usatne','usatcs','usaths','usatcc','usatlo','usatmi','usatpl','usatvs','usatvc','usathi','usatls','usatge','usatlt','usatgt','usatle',
+            'usat16eq','usat16ne','usat16cs','usat16hs','usat16cc','usat16lo','usat16mi','usat16pl','usat16vs','usat16vc','usat16hi','usat16ls','usat16ge','usat16lt','usat16gt','usat16le',
+            /* ARMv6 SIMD: Conditional Permutation and Combine Operations */
+            'sxtaheq','sxtahne','sxtahcs','sxtahhs','sxtahcc','sxtahlo','sxtahmi','sxtahpl','sxtahvs','sxtahvc','sxtahhi','sxtahls','sxtahge','sxtahlt','sxtahgt','sxtahle',
+            'sxtabeq','sxtabne','sxtabcs','sxtabhs','sxtabcc','sxtablo','sxtabmi','sxtabpl','sxtabvs','sxtabvc','sxtabhi','sxtabls','sxtabge','sxtablt','sxtabgt','sxtable',
+            'sxtab16eq','sxtab16ne','sxtab16cs','sxtab16hs','sxtab16cc','sxtab16lo','sxtab16mi','sxtab16pl','sxtab16vs','sxtab16vc','sxtab16hi','sxtab16ls','sxtab16ge','sxtab16lt','sxtab16gt','sxtab16le',
+            'uxtaheq','uxtahne','uxtahcs','uxtahhs','uxtahcc','uxtahlo','uxtahmi','uxtahpl','uxtahvs','uxtahvc','uxtahhi','uxtahls','uxtahge','uxtahlt','uxtahgt','uxtahle',
+            'uxtabeq','uxtabne','uxtabcs','uxtabhs','uxtabcc','uxtablo','uxtabmi','uxtabpl','uxtabvs','uxtabvc','uxtabhi','uxtabls','uxtabge','uxtablt','uxtabgt','uxtable',
+            'uxtab16eq','uxtab16ne','uxtab16cs','uxtab16hs','uxtab16cc','uxtab16lo','uxtab16mi','uxtab16pl','uxtab16vs','uxtab16vc','uxtab16hi','uxtab16ls','uxtab16ge','uxtab16lt','uxtab16gt','uxtab16le',
+            'sxtheq.w','sxthne.w','sxthcs.w','sxthhs.w','sxthcc.w','sxthlo.w','sxthmi.w','sxthpl.w','sxthvs.w','sxthvc.w','sxthhi.w','sxthls.w','sxthge.w','sxthlt.w','sxthgt.w','sxthle.w',
+            'sxtheq','sxthne','sxthcs','sxthhs','sxthcc','sxthlo','sxthmi','sxthpl','sxthvs','sxthvc','sxthhi','sxthls','sxthge','sxthlt','sxthgt','sxthle',
+            'sxtbeq.w','sxtbne.w','sxtbcs.w','sxtbhs.w','sxtbcc.w','sxtblo.w','sxtbmi.w','sxtbpl.w','sxtbvs.w','sxtbvc.w','sxtbhi.w','sxtbls.w','sxtbge.w','sxtblt.w','sxtbgt.w','sxtble.w',
+            'sxtbeq','sxtbne','sxtbcs','sxtbhs','sxtbcc','sxtblo','sxtbmi','sxtbpl','sxtbvs','sxtbvc','sxtbhi','sxtbls','sxtbge','sxtblt','sxtbgt','sxtble',
+            'sxtb16eq','sxtb16ne','sxtb16cs','sxtb16hs','sxtb16cc','sxtb16lo','sxtb16mi','sxtb16pl','sxtb16vs','sxtb16vc','sxtb16hi','sxtb16ls','sxtb16ge','sxtb16lt','sxtb16gt','sxtb16le',
+            'uxtheq.w','uxthne.w','uxthcs.w','uxthhs.w','uxthcc.w','uxthlo.w','uxthmi.w','uxthpl.w','uxthvs.w','uxthvc.w','uxthhi.w','uxthls.w','uxthge.w','uxthlt.w','uxthgt.w','uxthle.w',
+            'uxtheq','uxthne','uxthcs','uxthhs','uxthcc','uxthlo','uxthmi','uxthpl','uxthvs','uxthvc','uxthhi','uxthls','uxthge','uxthlt','uxthgt','uxthle',
+            'uxtbeq.w','uxtbne.w','uxtbcs.w','uxtbhs.w','uxtbcc.w','uxtblo.w','uxtbmi.w','uxtbpl.w','uxtbvs.w','uxtbvc.w','uxtbhi.w','uxtbls.w','uxtbge.w','uxtblt.w','uxtbgt.w','uxtble.w',
+            'uxtbeq','uxtbne','uxtbcs','uxtbhs','uxtbcc','uxtblo','uxtbmi','uxtbpl','uxtbvs','uxtbvc','uxtbhi','uxtbls','uxtbge','uxtblt','uxtbgt','uxtble',
+            'uxtb16eq','uxtb16ne','uxtb16cs','uxtb16hs','uxtb16cc','uxtb16lo','uxtb16mi','uxtb16pl','uxtb16vs','uxtb16vc','uxtb16hi','uxtb16ls','uxtb16ge','uxtb16lt','uxtb16gt','uxtb16le',
+            'pkhbteq','pkhbtne','pkhbtcs','pkhbths','pkhbtcc','pkhbtlo','pkhbtmi','pkhbtpl','pkhbtvs','pkhbtvc','pkhbthi','pkhbtls','pkhbtge','pkhbtlt','pkhbtgt','pkhbtle',
+            'pkhtbeq','pkhtbne','pkhtbcs','pkhtbhs','pkhtbcc','pkhtblo','pkhtbmi','pkhtbpl','pkhtbvs','pkhtbvc','pkhtbhi','pkhtbls','pkhtbge','pkhtblt','pkhtbgt','pkhtble',
+            'rbiteq','rbitne','rbitcs','rbiths','rbitcc','rbitlo','rbitmi','rbitpl','rbitvs','rbitvc','rbithi','rbitls','rbitge','rbitlt','rbitgt','rbitle',
+            'reveq.w','revne.w','revcs.w','revhs.w','revcc.w','revlo.w','revmi.w','revpl.w','revvs.w','revvc.w','revhi.w','revls.w','revge.w','revlt.w','revgt.w','revle.w',
+            'reveq','revne','revcs','revhs','revcc','revlo','revmi','revpl','revvs','revvc','revhi','revls','revge','revlt','revgt','revle',
+            'rev16eq.w','rev16ne.w','rev16cs.w','rev16hs.w','rev16cc.w','rev16lo.w','rev16mi.w','rev16pl.w','rev16vs.w','rev16vc.w','rev16hi.w','rev16ls.w','rev16ge.w','rev16lt.w','rev16gt.w','rev16le.w',
+            'rev16eq','rev16ne','rev16cs','rev16hs','rev16cc','rev16lo','rev16mi','rev16pl','rev16vs','rev16vc','rev16hi','rev16ls','rev16ge','rev16lt','rev16gt','rev16le',
+            'revsheq.w','revshne.w','revshcs.w','revshhs.w','revshcc.w','revshlo.w','revshmi.w','revshpl.w','revshvs.w','revshvc.w','revshhi.w','revshls.w','revshge.w','revshlt.w','revshgt.w','revshle.w',
+            'revsheq','revshne','revshcs','revshhs','revshcc','revshlo','revshmi','revshpl','revshvs','revshvc','revshhi','revshls','revshge','revshlt','revshgt','revshle',
+            'seleq','selne','selcs','selhs','selcc','sello','selmi','selpl','selvs','selvc','selhi','sells','selge','sellt','selgt','selle',
+            /* ARMv6 SIMD: Conditional Multiply and Multiply-Add */
+            'smladeq','smladne','smladcs','smladhs','smladcc','smladlo','smladmi','smladpl','smladvs','smladvc','smladhi','smladls','smladge','smladlt','smladgt','smladle',
+            'smladxeq','smladxne','smladxcs','smladxhs','smladxcc','smladxlo','smladxmi','smladxpl','smladxvs','smladxvc','smladxhi','smladxls','smladxge','smladxlt','smladxgt','smladxle',
+            'smlsdeq','smlsdne','smlsdcs','smlsdhs','smlsdcc','smlsdlo','smlsdmi','smlsdpl','smlsdvs','smlsdvc','smlsdhi','smlsdls','smlsdge','smlsdlt','smlsdgt','smlsdle',
+            'smlsdxeq','smlsdxne','smlsdxcs','smlsdxhs','smlsdxcc','smlsdxlo','smlsdxmi','smlsdxpl','smlsdxvs','smlsdxvc','smlsdxhi','smlsdxls','smlsdxge','smlsdxlt','smlsdxgt','smlsdxle',
+            'smlaldeq','smlaldne','smlaldcs','smlaldhs','smlaldcc','smlaldlo','smlaldmi','smlaldpl','smlaldvs','smlaldvc','smlaldhi','smlaldls','smlaldge','smlaldlt','smlaldgt','smlaldle',
+            'smlaldxeq','smlaldxne','smlaldxcs','smlaldxhs','smlaldxcc','smlaldxlo','smlaldxmi','smlaldxpl','smlaldxvs','smlaldxvc','smlaldxhi','smlaldxls','smlaldxge','smlaldxlt','smlaldxgt','smlaldxle',
+            'smlsldeq','smlsldne','smlsldcs','smlsldhs','smlsldcc','smlsldlo','smlsldmi','smlsldpl','smlsldvs','smlsldvc','smlsldhi','smlsldls','smlsldge','smlsldlt','smlsldgt','smlsldle',
+            'smlsldxeq','smlsldxne','smlsldxcs','smlsldxhs','smlsldxcc','smlsldxlo','smlsldxmi','smlsldxpl','smlsldxvs','smlsldxvc','smlsldxhi','smlsldxls','smlsldxge','smlsldxlt','smlsldxgt','smlsldxle',
+            'smmuleq','smmulne','smmulcs','smmulhs','smmulcc','smmullo','smmulmi','smmulpl','smmulvs','smmulvc','smmulhi','smmulls','smmulge','smmullt','smmulgt','smmulle',
+            'smmulreq','smmulrne','smmulrcs','smmulrhs','smmulrcc','smmulrlo','smmulrmi','smmulrpl','smmulrvs','smmulrvc','smmulrhi','smmulrls','smmulrge','smmulrlt','smmulrgt','smmulrle',
+            'smmlaeq','smmlane','smmlacs','smmlahs','smmlacc','smmlalo','smmlami','smmlapl','smmlavs','smmlavc','smmlahi','smmlals','smmlage','smmlalt','smmlagt','smmlale',
+            'smmlareq','smmlarne','smmlarcs','smmlarhs','smmlarcc','smmlarlo','smmlarmi','smmlarpl','smmlarvs','smmlarvc','smmlarhi','smmlarls','smmlarge','smmlarlt','smmlargt','smmlarle',
+            'smmlseq','smmlsne','smmlscs','smmlshs','smmlscc','smmlslo','smmlsmi','smmlspl','smmlsvs','smmlsvc','smmlshi','smmlsls','smmlsge','smmlslt','smmlsgt','smmlsle',
+            'smmlsreq','smmlsrne','smmlsrcs','smmlsrhs','smmlsrcc','smmlsrlo','smmlsrmi','smmlsrpl','smmlsrvs','smmlsrvc','smmlsrhi','smmlsrls','smmlsrge','smmlsrlt','smmlsrgt','smmlsrle',
+            'smuadeq','smuadne','smuadcs','smuadhs','smuadcc','smuadlo','smuadmi','smuadpl','smuadvs','smuadvc','smuadhi','smuadls','smuadge','smuadlt','smuadgt','smuadle',
+            'smuadxeq','smuadxne','smuadxcs','smuadxhs','smuadxcc','smuadxlo','smuadxmi','smuadxpl','smuadxvs','smuadxvc','smuadxhi','smuadxls','smuadxge','smuadxlt','smuadxgt','smuadxle',
+            'smusdeq','smusdne','smusdcs','smusdhs','smusdcc','smusdlo','smusdmi','smusdpl','smusdvs','smusdvc','smusdhi','smusdls','smusdge','smusdlt','smusdgt','smusdle',
+            'smusdxeq','smusdxne','smusdxcs','smusdxhs','smusdxcc','smusdxlo','smusdxmi','smusdxpl','smusdxvs','smusdxvc','smusdxhi','smusdxls','smusdxge','smusdxlt','smusdxgt','smusdxle',
+            'umaaleq','umaalne','umaalcs','umaalhs','umaalcc','umaallo','umaalmi','umaalpl','umaalvs','umaalvc','umaalhi','umaalls','umaalge','umaallt','umaalgt','umaalle'
+            ),
+        /* Unconditional Coprocessor Instructions */
+        13 => array(
+            /* Data Processing: Unconditional Coprocessor Instructions */
+            'cdp','cdpal',
+            'cdp2','cdp2al',
+            'ldc','ldcal',
+            'ldcl','ldclal',
+            'ldc2','ldc2al',
+            'ldc2l','ldc2lal',
+            'stc','stcal',
+            'stcl','stclal',
+            'stc2','stc2al',
+            'stc2l','stc2lal',
+            'mcr','mcral',
+            'mcr2','mcr2al',
+            'mcrr','mcrral',
+            'mcrr2','mcrr2al',
+            'mrc','mrcal',
+            'mrc2','mrc2al',
+            'mrrc','mrrcal',
+            'mrrc2','mrrc2al'
+            ),
+        /* Conditional Coprocessor Instructions */
+        14 => array(
+            /* Data Processing: Conditional Coprocessor Instructions */
+            'cdpeq','cdpne','cdpcs','cdphs','cdpcc','cdplo','cdpmi','cdppl','cdpvs','cdpvc','cdphi','cdpls','cdpge','cdplt','cdpgt','cdple',
+            'cdp2eq','cdp2ne','cdp2cs','cdp2hs','cdp2cc','cdp2lo','cdp2mi','cdp2pl','cdp2vs','cdp2vc','cdp2hi','cdp2ls','cdp2ge','cdp2lt','cdp2gt','cdp2le',
+            'ldceq','ldcne','ldccs','ldchs','ldccc','ldclo','ldcmi','ldcpl','ldcvs','ldcvc','ldchi','ldcls','ldcge','ldclt','ldcgt','ldcle',
+            'ldcleq','ldclne','ldclcs','ldclhs','ldclcc','ldcllo','ldclmi','ldclpl','ldclvs','ldclvc','ldclhi','ldclls','ldclge','ldcllt','ldclgt','ldclle',
+            'ldc2eq','ldc2ne','ldc2cs','ldc2hs','ldc2cc','ldc2lo','ldc2mi','ldc2pl','ldc2vs','ldc2vc','ldc2hi','ldc2ls','ldc2ge','ldc2lt','ldc2gt','ldc2le',
+            'ldc2leq','ldc2lne','ldc2lcs','ldc2lhs','ldc2lcc','ldc2llo','ldc2lmi','ldc2lpl','ldc2lvs','ldc2lvc','ldc2lhi','ldc2lls','ldc2lge','ldc2llt','ldc2lgt','ldc2lle',
+            'stceq','stcne','stccs','stchs','stccc','stclo','stcmi','stcpl','stcvs','stcvc','stchi','stcls','stcge','stclt','stcgt','stcle',
+            'stcleq','stclne','stclcs','stclhs','stclcc','stcllo','stclmi','stclpl','stclvs','stclvc','stclhi','stclls','stclge','stcllt','stclgt','stclle',
+            'stc2eq','stc2ne','stc2cs','stc2hs','stc2cc','stc2lo','stc2mi','stc2pl','stc2vs','stc2vc','stc2hi','stc2ls','stc2ge','stc2lt','stc2gt','stc2le',
+            'stc2leq','stc2lne','stc2lcs','stc2lhs','stc2lcc','stc2llo','stc2lmi','stc2lpl','stc2lvs','stc2lvc','stc2lhi','stc2lls','stc2lge','stc2llt','stc2lgt','stc2lle',
+            'mcreq','mcrne','mcrcs','mcrhs','mcrcc','mcrlo','mcrmi','mcrpl','mcrvs','mcrvc','mcrhi','mcrls','mcrge','mcrlt','mcrgt','mcrle',
+            'mcr2eq','mcr2ne','mcr2cs','mcr2hs','mcr2cc','mcr2lo','mcr2mi','mcr2pl','mcr2vs','mcr2vc','mcr2hi','mcr2ls','mcr2ge','mcr2lt','mcr2gt','mcr2le',
+            'mcrreq','mcrrne','mcrrcs','mcrrhs','mcrrcc','mcrrlo','mcrrmi','mcrrpl','mcrrvs','mcrrvc','mcrrhi','mcrrls','mcrrge','mcrrlt','mcrrgt','mcrrle',
+            'mcrr2eq','mcrr2ne','mcrr2cs','mcrr2hs','mcrr2cc','mcrr2lo','mcrr2mi','mcrr2pl','mcrr2vs','mcrr2vc','mcrr2hi','mcrr2ls','mcrr2ge','mcrr2lt','mcrr2gt','mcrr2le',
+            'mrceq','mrcne','mrccs','mrchs','mrccc','mrclo','mrcmi','mrcpl','mrcvs','mrcvc','mrchi','mrcls','mrcge','mrclt','mrcgt','mrcle',
+            'mrc2eq','mrc2ne','mrc2cs','mrc2hs','mrc2cc','mrc2lo','mrc2mi','mrc2pl','mrc2vs','mrc2vc','mrc2hi','mrc2ls','mrc2ge','mrc2lt','mrc2gt','mrc2le',
+            'mrrceq','mrrcne','mrrccs','mrrchs','mrrccc','mrrclo','mrrcmi','mrrcpl','mrrcvs','mrrcvc','mrrchi','mrrcls','mrrcge','mrrclt','mrrcgt','mrrcle',
+            'mrrc2eq','mrrc2ne','mrrc2cs','mrrc2hs','mrrc2cc','mrrc2lo','mrrc2mi','mrrc2pl','mrrc2vs','mrrc2vc','mrrc2hi','mrrc2ls','mrrc2ge','mrrc2lt','mrrc2gt','mrrc2le'
+            ),
+        /* Unconditional System Instructions */
+        15 => array(
+            /* System: Unconditional Debug and State-Change Instructions */
+            'bkpt',
+            'dbg','dbgal',
+            'setend',
+            'svc','svcal',
+            'sev.w','seval.w',
+            'sev','seval',
+            'wfe.w','wfeal.w',
+            'wfe','wfeal',
+            'wfi.w','wfial.w',
+            'wfi','wfial',
+            /* System: Unconditional ThumbEE Instructions */
+            'enterx',
+            'leavex',
+            'chka.n','chkaal.n',
+            'chka','chkaal',
+            'hb.n','hbal.n',
+            'hb','hbal',
+            'hbl.n','hblal.n',
+            'hbl','hblal',
+            'hblp.n','hblpal.n',
+            'hblp','hblpal',
+            'hbp.n','hbpal.n',
+            'hbp','hbpal',
+            /* System: Unconditional Privileged Instructions */
+            'cpsie.n',
+            'cpsie.w',
+            'cpsie',
+            'cpsid.n',
+            'cpsid.w',
+            'cpsid',
+            'smc','smcal',
+            'rfeda','rfedaal',
+            'rfedb','rfedbal',
+            'rfeia','rfeiaal',
+            'rfeib','rfeibal',
+            'srsda','srsdaal',
+            'srsdb','srsdbal',
+            'srsia','srsiaal',
+            'srsib','srsibal'
+            ),
+        /* Conditional System Instructions */
+        16 => array(
+            /* System: Conditional Debug and State-Change Instructions */
+            'dbgeq','dbgne','dbgcs','dbghs','dbgcc','dbglo','dbgmi','dbgpl','dbgvs','dbgvc','dbghi','dbgls','dbgge','dbglt','dbggt','dbgle',
+            'svceq','svcne','svccs','svchs','svccc','svclo','svcmi','svcpl','svcvs','svcvc','svchi','svcls','svcge','svclt','svcgt','svcle',
+            'seveq.w','sevne.w','sevcs.w','sevhs.w','sevcc.w','sevlo.w','sevmi.w','sevpl.w','sevvs.w','sevvc.w','sevhi.w','sevls.w','sevge.w','sevlt.w','sevgt.w','sevle.w',
+            'seveq','sevne','sevcs','sevhs','sevcc','sevlo','sevmi','sevpl','sevvs','sevvc','sevhi','sevls','sevge','sevlt','sevgt','sevle',
+            'wfeeq.w','wfene.w','wfecs.w','wfehs.w','wfecc.w','wfelo.w','wfemi.w','wfepl.w','wfevs.w','wfevc.w','wfehi.w','wfels.w','wfege.w','wfelt.w','wfegt.w','wfele.w',
+            'wfeeq','wfene','wfecs','wfehs','wfecc','wfelo','wfemi','wfepl','wfevs','wfevc','wfehi','wfels','wfege','wfelt','wfegt','wfele',
+            'wfieq.w','wfine.w','wfics.w','wfihs.w','wficc.w','wfilo.w','wfimi.w','wfipl.w','wfivs.w','wfivc.w','wfihi.w','wfils.w','wfige.w','wfilt.w','wfigt.w','wfile.w',
+            'wfieq','wfine','wfics','wfihs','wficc','wfilo','wfimi','wfipl','wfivs','wfivc','wfihi','wfils','wfige','wfilt','wfigt','wfile',
+            /* System: Conditional ThumbEE Instructions */
+            'chkaeq.n','chkane.n','chkacs.n','chkahs.n','chkacc.n','chkalo.n','chkami.n','chkapl.n','chkavs.n','chkavc.n','chkahi.n','chkals.n','chkage.n','chkalt.n','chkagt.n','chkale.n',
+            'chkaeq','chkane','chkacs','chkahs','chkacc','chkalo','chkami','chkapl','chkavs','chkavc','chkahi','chkals','chkage','chkalt','chkagt','chkale',
+            'hbeq.n','hbne.n','hbcs.n','hbhs.n','hbcc.n','hblo.n','hbmi.n','hbpl.n','hbvs.n','hbvc.n','hbhi.n','hbls.n','hbge.n','hblt.n','hbgt.n','hble.n',
+            'hbeq','hbne','hbcs','hbhs','hbcc','hblo','hbmi','hbpl','hbvs','hbvc','hbhi','hbls','hbge','hblt','hbgt','hble',
+            'hbleq.n','hblne.n','hblcs.n','hblhs.n','hblcc.n','hbllo.n','hblmi.n','hblpl.n','hblvs.n','hblvc.n','hblhi.n','hblls.n','hblge.n','hbllt.n','hblgt.n','hblle.n',
+            'hbleq','hblne','hblcs','hblhs','hblcc','hbllo','hblmi','hblpl','hblvs','hblvc','hblhi','hblls','hblge','hbllt','hblgt','hblle',
+            'hblpeq.n','hblpne.n','hblpcs.n','hblphs.n','hblpcc.n','hblplo.n','hblpmi.n','hblppl.n','hblpvs.n','hblpvc.n','hblphi.n','hblpls.n','hblpge.n','hblplt.n','hblpgt.n','hblple.n',
+            'hblpeq','hblpne','hblpcs','hblphs','hblpcc','hblplo','hblpmi','hblppl','hblpvs','hblpvc','hblphi','hblpls','hblpge','hblplt','hblpgt','hblple',
+            'hbpeq.n','hbpne.n','hbpcs.n','hbphs.n','hbpcc.n','hbplo.n','hbpmi.n','hbppl.n','hbpvs.n','hbpvc.n','hbphi.n','hbpls.n','hbpge.n','hbplt.n','hbpgt.n','hbple.n',
+            'hbpeq','hbpne','hbpcs','hbphs','hbpcc','hbplo','hbpmi','hbppl','hbpvs','hbpvc','hbphi','hbpls','hbpge','hbplt','hbpgt','hbple',
+            /* System: Conditional Privileged Instructions */
+            'smceq','smcne','smccs','smchs','smccc','smclo','smcmi','smcpl','smcvs','smcvc','smchi','smcls','smcge','smclt','smcgt','smcle',
+            'rfedaeq','rfedane','rfedacs','rfedahs','rfedacc','rfedalo','rfedami','rfedapl','rfedavs','rfedavc','rfedahi','rfedals','rfedage','rfedalt','rfedagt','rfedale',
+            'rfedbeq','rfedbne','rfedbcs','rfedbhs','rfedbcc','rfedblo','rfedbmi','rfedbpl','rfedbvs','rfedbvc','rfedbhi','rfedbls','rfedbge','rfedblt','rfedbgt','rfedble',
+            'rfeiaeq','rfeiane','rfeiacs','rfeiahs','rfeiacc','rfeialo','rfeiami','rfeiapl','rfeiavs','rfeiavc','rfeiahi','rfeials','rfeiage','rfeialt','rfeiagt','rfeiale',
+            'rfeibeq','rfeibne','rfeibcs','rfeibhs','rfeibcc','rfeiblo','rfeibmi','rfeibpl','rfeibvs','rfeibvc','rfeibhi','rfeibls','rfeibge','rfeiblt','rfeibgt','rfeible',
+            'srsdaeq','srsdane','srsdacs','srsdahs','srsdacc','srsdalo','srsdami','srsdapl','srsdavs','srsdavc','srsdahi','srsdals','srsdage','srsdalt','srsdagt','srsdale',
+            'srsdbeq','srsdbne','srsdbcs','srsdbhs','srsdbcc','srsdblo','srsdbmi','srsdbpl','srsdbvs','srsdbvc','srsdbhi','srsdbls','srsdbge','srsdblt','srsdbgt','srsdble',
+            'srsiaeq','srsiane','srsiacs','srsiahs','srsiacc','srsialo','srsiami','srsiapl','srsiavs','srsiavc','srsiahi','srsials','srsiage','srsialt','srsiagt','srsiale',
+            'srsibeq','srsibne','srsibcs','srsibhs','srsibcc','srsiblo','srsibmi','srsibpl','srsibvs','srsibvc','srsibhi','srsibls','srsibge','srsiblt','srsibgt','srsible'
+            ),
+        /* Unconditional WMMX/WMMX2 instructions */
+        17 => array(
+            /* Unconditional WMMX/WMMX2 SIMD Instructions */
+            'tandcb','tandcbal',
+            'tandch','tandchal',
+            'tandcw','tandcwal',
+            'tbcstb','tbcstbal',
+            'tbcsth','tbcsthal',
+            'tbcstw','tbcstwal',
+            'textrcb','textrcbal',
+            'textrch','textrchal',
+            'textrcw','textrcwal',
+            'textrmsb','textrmsbal',
+            'textrmsh','textrmshal',
+            'textrmsw','textrmswal',
+            'textrmub','textrmubal',
+            'textrmuh','textrmuhal',
+            'textrmuw','textrmuwal',
+            'tinsrb','tinsrbal',
+            'tinsrh','tinsrhal',
+            'tinsrw','tinsrwal',
+            'tmcr','tmcral',
+            'tmcrr','tmcrral',
+            'tmia','tmiaal',
+            'tmiaph','tmiaphal',
+            'tmiabb','tmiabbal',
+            'tmiabt','tmiabtal',
+            'tmiatb','tmiatbal',
+            'tmiatt','tmiattal',
+            'tmovmskb','tmovmskbal',
+            'tmovmskh','tmovmskhal',
+            'tmovmskw','tmovmskwal',
+            'tmrc','tmrcal',
+            'tmrrc','tmrrcal',
+            'torcb','torcbal',
+            'torch','torchal',
+            'torcw','torcwal',
+            'torvscb','torvscbal',
+            'torvsch','torvschal',
+            'torvscw','torvscwal',
+            'wabsb','wabsbal',
+            'wabsh','wabshal',
+            'wabsw','wabswal',
+            'wabsdiffb','wabsdiffbal',
+            'wabsdiffh','wabsdiffhal',
+            'wabsdiffw','wabsdiffwal',
+            'waccb','waccbal',
+            'wacch','wacchal',
+            'waccw','waccwal',
+            'waddb','waddbal',
+            'waddh','waddhal',
+            'waddw','waddwal',
+            'waddbc','waddbcal',
+            'waddhc','waddhcal',
+            'waddwc','waddwcal',
+            'waddbss','waddbssal',
+            'waddhss','waddhssal',
+            'waddwss','waddwssal',
+            'waddbus','waddbusal',
+            'waddhus','waddhusal',
+            'waddwus','waddwusal',
+            'waddsubhx','waddsubhxal',
+            'waligni','walignial',
+            'walignr0','walignr0al',
+            'walignr1','walignr1al',
+            'walignr2','walignr2al',
+            'walignr3','walignr3al',
+            'wand','wandal',
+            'wandn','wandnal',
+            'wavg2b','wavg2bal',
+            'wavg2h','wavg2hal',
+            'wavg2br','wavg2bral',
+            'wavg2hr','wavg2hral',
+            'wavg4','wavg4al',
+            'wavg4r','wavg4ral',
+            'wcmpeqb','wcmpeqbal',
+            'wcmpeqh','wcmpeqhal',
+            'wcmpeqw','wcmpeqwal',
+            'wcmpgtsb','wcmpgtsbal',
+            'wcmpgtsh','wcmpgtshal',
+            'wcmpgtsw','wcmpgtswal',
+            'wcmpgtub','wcmpgtubal',
+            'wcmpgtuh','wcmpgtuhal',
+            'wcmpgtuw','wcmpgtuwal',
+            'wldrb','wldrbal',
+            'wldrh','wldrhal',
+            'wldrw','wldrwal',
+            'wldrd','wldrdal',
+            'wmacs','wmacsal',
+            'wmacu','wmacual',
+            'wmacsz','wmacszal',
+            'wmacuz','wmacuzal',
+            'wmadds','wmaddsal',
+            'wmaddu','wmaddual',
+            'wmaddsx','wmaddsxal',
+            'wmaddux','wmadduxal',
+            'wmaddsn','wmaddsnal',
+            'wmaddun','wmaddunal',
+            'wmaxsb','wmaxsbal',
+            'wmaxsh','wmaxshal',
+            'wmaxsw','wmaxswal',
+            'wmaxub','wmaxubal',
+            'wmaxuh','wmaxuhal',
+            'wmaxuw','wmaxuwal',
+            'wmerge','wmergeal',
+            'wmiabb','wmiabbal',
+            'wmiabt','wmiabtal',
+            'wmiatb','wmiatbal',
+            'wmiatt','wmiattal',
+            'wmiabbn','wmiabbnal',
+            'wmiabtn','wmiabtnal',
+            'wmiatbn','wmiatbnal',
+            'wmiattn','wmiattnal',
+            'wmiawbb','wmiawbbal',
+            'wmiawbt','wmiawbtal',
+            'wmiawtb','wmiawtbal',
+            'wmiawtt','wmiawttal',
+            'wmiawbbn','wmiawbbnal',
+            'wmiawbtn','wmiawbtnal',
+            'wmiawtbn','wmiawtbnal',
+            'wmiawttn','wmiawttnal',
+            'wminsb','wminsbal',
+            'wminsh','wminshal',
+            'wminsw','wminswal',
+            'wminub','wminubal',
+            'wminuh','wminuhal',
+            'wminuw','wminuwal',
+            'wmov','wmoval',
+            'wmulsm','wmulsmal',
+            'wmulsl','wmulslal',
+            'wmulum','wmulumal',
+            'wmulul','wmululal',
+            'wmulsmr','wmulsmral',
+            'wmulslr','wmulslral',
+            'wmulumr','wmulumral',
+            'wmululr','wmululral',
+            'wmulwum','wmulwumal',
+            'wmulwsm','wmulwsmal',
+            'wmulwl','wmulwlal',
+            'wmulwumr','wmulwumral',
+            'wmulwsmr','wmulwsmral',
+            'wor','woral',
+            'wpackhss','wpackhssal',
+            'wpackwss','wpackwssal',
+            'wpackdss','wpackdssal',
+            'wpackhus','wpackhusal',
+            'wpackwus','wpackwusal',
+            'wpackdus','wpackdusal',
+            'wqmiabb','wqmiabbal',
+            'wqmiabt','wqmiabtal',
+            'wqmiatb','wqmiatbal',
+            'wqmiatt','wqmiattal',
+            'wqmiabbn','wqmiabbnal',
+            'wqmiabtn','wqmiabtnal',
+            'wqmiatbn','wqmiatbnal',
+            'wqmiattn','wqmiattnal',
+            'wqmulm','wqmulmal',
+            'wqmulmr','wqmulmral',
+            'wqmulwm','wqmulwmal',
+            'wqmulwmr','wqmulwmral',
+            'wrorh','wrorhal',
+            'wrorw','wrorwal',
+            'wrord','wrordal',
+            'wrorhg','wrorhgal',
+            'wrorwg','wrorwgal',
+            'wrordg','wrordgal',
+            'wsadb','wsadbal',
+            'wsadh','wsadhal',
+            'wsadbz','wsadbzal',
+            'wsadhz','wsadhzal',
+            'wshufh','wshufhal',
+            'wsllh','wsllhal',
+            'wsllw','wsllwal',
+            'wslld','wslldal',
+            'wsllhg','wsllhgal',
+            'wsllwg','wsllwgal',
+            'wslldg','wslldgal',
+            'wsrah','wsrahal',
+            'wsraw','wsrawal',
+            'wsrad','wsradal',
+            'wsrahg','wsrahgal',
+            'wsrawg','wsrawgal',
+            'wsradg','wsradgal',
+            'wsrlh','wsrlhal',
+            'wsrlw','wsrlwal',
+            'wsrld','wsrldal',
+            'wsrlhg','wsrlhgal',
+            'wsrlwg','wsrlwgal',
+            'wsrldg','wsrldgal',
+            'wstrb','wstrbal',
+            'wstrh','wstrhal',
+            'wstrw','wstrwal',
+            'wstrd','wstrdal',
+            'wsubb','wsubbal',
+            'wsubh','wsubhal',
+            'wsubw','wsubwal',
+            'wsubbss','wsubbssal',
+            'wsubhss','wsubhssal',
+            'wsubwss','wsubwssal',
+            'wsubbus','wsubbusal',
+            'wsubhus','wsubhusal',
+            'wsubwus','wsubwusal',
+            'wsubaddhx','wsubaddhxal',
+            'wunpckehsb','wunpckehsbal',
+            'wunpckehsh','wunpckehshal',
+            'wunpckehsw','wunpckehswal',
+            'wunpckehub','wunpckehubal',
+            'wunpckehuh','wunpckehuhal',
+            'wunpckehuw','wunpckehuwal',
+            'wunpckihb','wunpckihbal',
+            'wunpckihh','wunpckihhal',
+            'wunpckihw','wunpckihwal',
+            'wunpckelsb','wunpckelsbal',
+            'wunpckelsh','wunpckelshal',
+            'wunpckelsw','wunpckelswal',
+            'wunpckelub','wunpckelubal',
+            'wunpckeluh','wunpckeluhal',
+            'wunpckeluw','wunpckeluwal',
+            'wunpckilb','wunpckilbal',
+            'wunpckilh','wunpckilhal',
+            'wunpckilw','wunpckilwal',
+            'wxor','wxoral',
+            'wzero','wzeroal'
+            ),
+        /* Conditional WMMX/WMMX2 SIMD Instructions */
+        18 => array(
+            /* Conditional WMMX/WMMX2 SIMD Instructions */
+            'tandcbeq','tandcbne','tandcbcs','tandcbhs','tandcbcc','tandcblo','tandcbmi','tandcbpl','tandcbvs','tandcbvc','tandcbhi','tandcbls','tandcbge','tandcblt','tandcbgt','tandcble',
+            'tandcheq','tandchne','tandchcs','tandchhs','tandchcc','tandchlo','tandchmi','tandchpl','tandchvs','tandchvc','tandchhi','tandchls','tandchge','tandchlt','tandchgt','tandchle',
+            'tandcweq','tandcwne','tandcwcs','tandcwhs','tandcwcc','tandcwlo','tandcwmi','tandcwpl','tandcwvs','tandcwvc','tandcwhi','tandcwls','tandcwge','tandcwlt','tandcwgt','tandcwle',
+            'tbcstbeq','tbcstbne','tbcstbcs','tbcstbhs','tbcstbcc','tbcstblo','tbcstbmi','tbcstbpl','tbcstbvs','tbcstbvc','tbcstbhi','tbcstbls','tbcstbge','tbcstblt','tbcstbgt','tbcstble',
+            'tbcstheq','tbcsthne','tbcsthcs','tbcsthhs','tbcsthcc','tbcsthlo','tbcsthmi','tbcsthpl','tbcsthvs','tbcsthvc','tbcsthhi','tbcsthls','tbcsthge','tbcsthlt','tbcsthgt','tbcsthle',
+            'tbcstweq','tbcstwne','tbcstwcs','tbcstwhs','tbcstwcc','tbcstwlo','tbcstwmi','tbcstwpl','tbcstwvs','tbcstwvc','tbcstwhi','tbcstwls','tbcstwge','tbcstwlt','tbcstwgt','tbcstwle',
+            'textrcbeq','textrcbne','textrcbcs','textrcbhs','textrcbcc','textrcblo','textrcbmi','textrcbpl','textrcbvs','textrcbvc','textrcbhi','textrcbls','textrcbge','textrcblt','textrcbgt','textrcble',
+            'textrcheq','textrchne','textrchcs','textrchhs','textrchcc','textrchlo','textrchmi','textrchpl','textrchvs','textrchvc','textrchhi','textrchls','textrchge','textrchlt','textrchgt','textrchle',
+            'textrcweq','textrcwne','textrcwcs','textrcwhs','textrcwcc','textrcwlo','textrcwmi','textrcwpl','textrcwvs','textrcwvc','textrcwhi','textrcwls','textrcwge','textrcwlt','textrcwgt','textrcwle',
+            'textrmsbeq','textrmsbne','textrmsbcs','textrmsbhs','textrmsbcc','textrmsblo','textrmsbmi','textrmsbpl','textrmsbvs','textrmsbvc','textrmsbhi','textrmsbls','textrmsbge','textrmsblt','textrmsbgt','textrmsble',
+            'textrmsheq','textrmshne','textrmshcs','textrmshhs','textrmshcc','textrmshlo','textrmshmi','textrmshpl','textrmshvs','textrmshvc','textrmshhi','textrmshls','textrmshge','textrmshlt','textrmshgt','textrmshle',
+            'textrmsweq','textrmswne','textrmswcs','textrmswhs','textrmswcc','textrmswlo','textrmswmi','textrmswpl','textrmswvs','textrmswvc','textrmswhi','textrmswls','textrmswge','textrmswlt','textrmswgt','textrmswle',
+            'textrmubeq','textrmubne','textrmubcs','textrmubhs','textrmubcc','textrmublo','textrmubmi','textrmubpl','textrmubvs','textrmubvc','textrmubhi','textrmubls','textrmubge','textrmublt','textrmubgt','textrmuble',
+            'textrmuheq','textrmuhne','textrmuhcs','textrmuhhs','textrmuhcc','textrmuhlo','textrmuhmi','textrmuhpl','textrmuhvs','textrmuhvc','textrmuhhi','textrmuhls','textrmuhge','textrmuhlt','textrmuhgt','textrmuhle',
+            'textrmuweq','textrmuwne','textrmuwcs','textrmuwhs','textrmuwcc','textrmuwlo','textrmuwmi','textrmuwpl','textrmuwvs','textrmuwvc','textrmuwhi','textrmuwls','textrmuwge','textrmuwlt','textrmuwgt','textrmuwle',
+            'tinsrbeq','tinsrbne','tinsrbcs','tinsrbhs','tinsrbcc','tinsrblo','tinsrbmi','tinsrbpl','tinsrbvs','tinsrbvc','tinsrbhi','tinsrbls','tinsrbge','tinsrblt','tinsrbgt','tinsrble',
+            'tinsrheq','tinsrhne','tinsrhcs','tinsrhhs','tinsrhcc','tinsrhlo','tinsrhmi','tinsrhpl','tinsrhvs','tinsrhvc','tinsrhhi','tinsrhls','tinsrhge','tinsrhlt','tinsrhgt','tinsrhle',
+            'tinsrweq','tinsrwne','tinsrwcs','tinsrwhs','tinsrwcc','tinsrwlo','tinsrwmi','tinsrwpl','tinsrwvs','tinsrwvc','tinsrwhi','tinsrwls','tinsrwge','tinsrwlt','tinsrwgt','tinsrwle',
+            'tmcreq','tmcrne','tmcrcs','tmcrhs','tmcrcc','tmcrlo','tmcrmi','tmcrpl','tmcrvs','tmcrvc','tmcrhi','tmcrls','tmcrge','tmcrlt','tmcrgt','tmcrle',
+            'tmcrreq','tmcrrne','tmcrrcs','tmcrrhs','tmcrrcc','tmcrrlo','tmcrrmi','tmcrrpl','tmcrrvs','tmcrrvc','tmcrrhi','tmcrrls','tmcrrge','tmcrrlt','tmcrrgt','tmcrrle',
+            'tmiaeq','tmiane','tmiacs','tmiahs','tmiacc','tmialo','tmiami','tmiapl','tmiavs','tmiavc','tmiahi','tmials','tmiage','tmialt','tmiagt','tmiale',
+            'tmiapheq','tmiaphne','tmiaphcs','tmiaphhs','tmiaphcc','tmiaphlo','tmiaphmi','tmiaphpl','tmiaphvs','tmiaphvc','tmiaphhi','tmiaphls','tmiaphge','tmiaphlt','tmiaphgt','tmiaphle',
+            'tmiabbeq','tmiabbne','tmiabbcs','tmiabbhs','tmiabbcc','tmiabblo','tmiabbmi','tmiabbpl','tmiabbvs','tmiabbvc','tmiabbhi','tmiabbls','tmiabbge','tmiabblt','tmiabbgt','tmiabble',
+            'tmiabteq','tmiabtne','tmiabtcs','tmiabths','tmiabtcc','tmiabtlo','tmiabtmi','tmiabtpl','tmiabtvs','tmiabtvc','tmiabthi','tmiabtls','tmiabtge','tmiabtlt','tmiabtgt','tmiabtle',
+            'tmiatbeq','tmiatbne','tmiatbcs','tmiatbhs','tmiatbcc','tmiatblo','tmiatbmi','tmiatbpl','tmiatbvs','tmiatbvc','tmiatbhi','tmiatbls','tmiatbge','tmiatblt','tmiatbgt','tmiatble',
+            'tmiatteq','tmiattne','tmiattcs','tmiatths','tmiattcc','tmiattlo','tmiattmi','tmiattpl','tmiattvs','tmiattvc','tmiatthi','tmiattls','tmiattge','tmiattlt','tmiattgt','tmiattle',
+            'tmovmskbeq','tmovmskbne','tmovmskbcs','tmovmskbhs','tmovmskbcc','tmovmskblo','tmovmskbmi','tmovmskbpl','tmovmskbvs','tmovmskbvc','tmovmskbhi','tmovmskbls','tmovmskbge','tmovmskblt','tmovmskbgt','tmovmskble',
+            'tmovmskheq','tmovmskhne','tmovmskhcs','tmovmskhhs','tmovmskhcc','tmovmskhlo','tmovmskhmi','tmovmskhpl','tmovmskhvs','tmovmskhvc','tmovmskhhi','tmovmskhls','tmovmskhge','tmovmskhlt','tmovmskhgt','tmovmskhle',
+            'tmovmskweq','tmovmskwne','tmovmskwcs','tmovmskwhs','tmovmskwcc','tmovmskwlo','tmovmskwmi','tmovmskwpl','tmovmskwvs','tmovmskwvc','tmovmskwhi','tmovmskwls','tmovmskwge','tmovmskwlt','tmovmskwgt','tmovmskwle',
+            'tmrceq','tmrcne','tmrccs','tmrchs','tmrccc','tmrclo','tmrcmi','tmrcpl','tmrcvs','tmrcvc','tmrchi','tmrcls','tmrcge','tmrclt','tmrcgt','tmrcle',
+            'tmrrceq','tmrrcne','tmrrccs','tmrrchs','tmrrccc','tmrrclo','tmrrcmi','tmrrcpl','tmrrcvs','tmrrcvc','tmrrchi','tmrrcls','tmrrcge','tmrrclt','tmrrcgt','tmrrcle',
+            'torcbeq','torcbne','torcbcs','torcbhs','torcbcc','torcblo','torcbmi','torcbpl','torcbvs','torcbvc','torcbhi','torcbls','torcbge','torcblt','torcbgt','torcble',
+            'torcheq','torchne','torchcs','torchhs','torchcc','torchlo','torchmi','torchpl','torchvs','torchvc','torchhi','torchls','torchge','torchlt','torchgt','torchle',
+            'torcweq','torcwne','torcwcs','torcwhs','torcwcc','torcwlo','torcwmi','torcwpl','torcwvs','torcwvc','torcwhi','torcwls','torcwge','torcwlt','torcwgt','torcwle',
+            'torvscbeq','torvscbne','torvscbcs','torvscbhs','torvscbcc','torvscblo','torvscbmi','torvscbpl','torvscbvs','torvscbvc','torvscbhi','torvscbls','torvscbge','torvscblt','torvscbgt','torvscble',
+            'torvscheq','torvschne','torvschcs','torvschhs','torvschcc','torvschlo','torvschmi','torvschpl','torvschvs','torvschvc','torvschhi','torvschls','torvschge','torvschlt','torvschgt','torvschle',
+            'torvscweq','torvscwne','torvscwcs','torvscwhs','torvscwcc','torvscwlo','torvscwmi','torvscwpl','torvscwvs','torvscwvc','torvscwhi','torvscwls','torvscwge','torvscwlt','torvscwgt','torvscwle',
+            'wabsbeq','wabsbne','wabsbcs','wabsbhs','wabsbcc','wabsblo','wabsbmi','wabsbpl','wabsbvs','wabsbvc','wabsbhi','wabsbls','wabsbge','wabsblt','wabsbgt','wabsble',
+            'wabsheq','wabshne','wabshcs','wabshhs','wabshcc','wabshlo','wabshmi','wabshpl','wabshvs','wabshvc','wabshhi','wabshls','wabshge','wabshlt','wabshgt','wabshle',
+            'wabsweq','wabswne','wabswcs','wabswhs','wabswcc','wabswlo','wabswmi','wabswpl','wabswvs','wabswvc','wabswhi','wabswls','wabswge','wabswlt','wabswgt','wabswle',
+            'wabsdiffbeq','wabsdiffbne','wabsdiffbcs','wabsdiffbhs','wabsdiffbcc','wabsdiffblo','wabsdiffbmi','wabsdiffbpl','wabsdiffbvs','wabsdiffbvc','wabsdiffbhi','wabsdiffbls','wabsdiffbge','wabsdiffblt','wabsdiffbgt','wabsdiffble',
+            'wabsdiffheq','wabsdiffhne','wabsdiffhcs','wabsdiffhhs','wabsdiffhcc','wabsdiffhlo','wabsdiffhmi','wabsdiffhpl','wabsdiffhvs','wabsdiffhvc','wabsdiffhhi','wabsdiffhls','wabsdiffhge','wabsdiffhlt','wabsdiffhgt','wabsdiffhle',
+            'wabsdiffweq','wabsdiffwne','wabsdiffwcs','wabsdiffwhs','wabsdiffwcc','wabsdiffwlo','wabsdiffwmi','wabsdiffwpl','wabsdiffwvs','wabsdiffwvc','wabsdiffwhi','wabsdiffwls','wabsdiffwge','wabsdiffwlt','wabsdiffwgt','wabsdiffwle',
+            'waccbeq','waccbne','waccbcs','waccbhs','waccbcc','waccblo','waccbmi','waccbpl','waccbvs','waccbvc','waccbhi','waccbls','waccbge','waccblt','waccbgt','waccble',
+            'waccheq','wacchne','wacchcs','wacchhs','wacchcc','wacchlo','wacchmi','wacchpl','wacchvs','wacchvc','wacchhi','wacchls','wacchge','wacchlt','wacchgt','wacchle',
+            'waccweq','waccwne','waccwcs','waccwhs','waccwcc','waccwlo','waccwmi','waccwpl','waccwvs','waccwvc','waccwhi','waccwls','waccwge','waccwlt','waccwgt','waccwle',
+            'waddbeq','waddbne','waddbcs','waddbhs','waddbcc','waddblo','waddbmi','waddbpl','waddbvs','waddbvc','waddbhi','waddbls','waddbge','waddblt','waddbgt','waddble',
+            'waddheq','waddhne','waddhcs','waddhhs','waddhcc','waddhlo','waddhmi','waddhpl','waddhvs','waddhvc','waddhhi','waddhls','waddhge','waddhlt','waddhgt','waddhle',
+            'waddweq','waddwne','waddwcs','waddwhs','waddwcc','waddwlo','waddwmi','waddwpl','waddwvs','waddwvc','waddwhi','waddwls','waddwge','waddwlt','waddwgt','waddwle',
+            'waddbceq','waddbcne','waddbccs','waddbchs','waddbccc','waddbclo','waddbcmi','waddbcpl','waddbcvs','waddbcvc','waddbchi','waddbcls','waddbcge','waddbclt','waddbcgt','waddbcle',
+            'waddhceq','waddhcne','waddhccs','waddhchs','waddhccc','waddhclo','waddhcmi','waddhcpl','waddhcvs','waddhcvc','waddhchi','waddhcls','waddhcge','waddhclt','waddhcgt','waddhcle',
+            'waddwceq','waddwcne','waddwccs','waddwchs','waddwccc','waddwclo','waddwcmi','waddwcpl','waddwcvs','waddwcvc','waddwchi','waddwcls','waddwcge','waddwclt','waddwcgt','waddwcle',
+            'waddbsseq','waddbssne','waddbsscs','waddbsshs','waddbsscc','waddbsslo','waddbssmi','waddbsspl','waddbssvs','waddbssvc','waddbsshi','waddbssls','waddbssge','waddbsslt','waddbssgt','waddbssle',
+            'waddhsseq','waddhssne','waddhsscs','waddhsshs','waddhsscc','waddhsslo','waddhssmi','waddhsspl','waddhssvs','waddhssvc','waddhsshi','waddhssls','waddhssge','waddhsslt','waddhssgt','waddhssle',
+            'waddwsseq','waddwssne','waddwsscs','waddwsshs','waddwsscc','waddwsslo','waddwssmi','waddwsspl','waddwssvs','waddwssvc','waddwsshi','waddwssls','waddwssge','waddwsslt','waddwssgt','waddwssle',
+            'waddbuseq','waddbusne','waddbuscs','waddbushs','waddbuscc','waddbuslo','waddbusmi','waddbuspl','waddbusvs','waddbusvc','waddbushi','waddbusls','waddbusge','waddbuslt','waddbusgt','waddbusle',
+            'waddhuseq','waddhusne','waddhuscs','waddhushs','waddhuscc','waddhuslo','waddhusmi','waddhuspl','waddhusvs','waddhusvc','waddhushi','waddhusls','waddhusge','waddhuslt','waddhusgt','waddhusle',
+            'waddwuseq','waddwusne','waddwuscs','waddwushs','waddwuscc','waddwuslo','waddwusmi','waddwuspl','waddwusvs','waddwusvc','waddwushi','waddwusls','waddwusge','waddwuslt','waddwusgt','waddwusle',
+            'waddsubhxeq','waddsubhxne','waddsubhxcs','waddsubhxhs','waddsubhxcc','waddsubhxlo','waddsubhxmi','waddsubhxpl','waddsubhxvs','waddsubhxvc','waddsubhxhi','waddsubhxls','waddsubhxge','waddsubhxlt','waddsubhxgt','waddsubhxle',
+            'walignieq','walignine','walignics','walignihs','walignicc','walignilo','walignimi','walignipl','walignivs','walignivc','walignihi','walignils','walignige','walignilt','walignigt','walignile',
+            'walignr0eq','walignr0ne','walignr0cs','walignr0hs','walignr0cc','walignr0lo','walignr0mi','walignr0pl','walignr0vs','walignr0vc','walignr0hi','walignr0ls','walignr0ge','walignr0lt','walignr0gt','walignr0le',
+            'walignr1eq','walignr1ne','walignr1cs','walignr1hs','walignr1cc','walignr1lo','walignr1mi','walignr1pl','walignr1vs','walignr1vc','walignr1hi','walignr1ls','walignr1ge','walignr1lt','walignr1gt','walignr1le',
+            'walignr2eq','walignr2ne','walignr2cs','walignr2hs','walignr2cc','walignr2lo','walignr2mi','walignr2pl','walignr2vs','walignr2vc','walignr2hi','walignr2ls','walignr2ge','walignr2lt','walignr2gt','walignr2le',
+            'walignr3eq','walignr3ne','walignr3cs','walignr3hs','walignr3cc','walignr3lo','walignr3mi','walignr3pl','walignr3vs','walignr3vc','walignr3hi','walignr3ls','walignr3ge','walignr3lt','walignr3gt','walignr3le',
+            'wandeq','wandne','wandcs','wandhs','wandcc','wandlo','wandmi','wandpl','wandvs','wandvc','wandhi','wandls','wandge','wandlt','wandgt','wandle',
+            'wandneq','wandnne','wandncs','wandnhs','wandncc','wandnlo','wandnmi','wandnpl','wandnvs','wandnvc','wandnhi','wandnls','wandnge','wandnlt','wandngt','wandnle',
+            'wavg2beq','wavg2bne','wavg2bcs','wavg2bhs','wavg2bcc','wavg2blo','wavg2bmi','wavg2bpl','wavg2bvs','wavg2bvc','wavg2bhi','wavg2bls','wavg2bge','wavg2blt','wavg2bgt','wavg2ble',
+            'wavg2heq','wavg2hne','wavg2hcs','wavg2hhs','wavg2hcc','wavg2hlo','wavg2hmi','wavg2hpl','wavg2hvs','wavg2hvc','wavg2hhi','wavg2hls','wavg2hge','wavg2hlt','wavg2hgt','wavg2hle',
+            'wavg2breq','wavg2brne','wavg2brcs','wavg2brhs','wavg2brcc','wavg2brlo','wavg2brmi','wavg2brpl','wavg2brvs','wavg2brvc','wavg2brhi','wavg2brls','wavg2brge','wavg2brlt','wavg2brgt','wavg2brle',
+            'wavg2hreq','wavg2hrne','wavg2hrcs','wavg2hrhs','wavg2hrcc','wavg2hrlo','wavg2hrmi','wavg2hrpl','wavg2hrvs','wavg2hrvc','wavg2hrhi','wavg2hrls','wavg2hrge','wavg2hrlt','wavg2hrgt','wavg2hrle',
+            'wavg4eq','wavg4ne','wavg4cs','wavg4hs','wavg4cc','wavg4lo','wavg4mi','wavg4pl','wavg4vs','wavg4vc','wavg4hi','wavg4ls','wavg4ge','wavg4lt','wavg4gt','wavg4le',
+            'wavg4req','wavg4rne','wavg4rcs','wavg4rhs','wavg4rcc','wavg4rlo','wavg4rmi','wavg4rpl','wavg4rvs','wavg4rvc','wavg4rhi','wavg4rls','wavg4rge','wavg4rlt','wavg4rgt','wavg4rle',
+            'wcmpeqbeq','wcmpeqbne','wcmpeqbcs','wcmpeqbhs','wcmpeqbcc','wcmpeqblo','wcmpeqbmi','wcmpeqbpl','wcmpeqbvs','wcmpeqbvc','wcmpeqbhi','wcmpeqbls','wcmpeqbge','wcmpeqblt','wcmpeqbgt','wcmpeqble',
+            'wcmpeqheq','wcmpeqhne','wcmpeqhcs','wcmpeqhhs','wcmpeqhcc','wcmpeqhlo','wcmpeqhmi','wcmpeqhpl','wcmpeqhvs','wcmpeqhvc','wcmpeqhhi','wcmpeqhls','wcmpeqhge','wcmpeqhlt','wcmpeqhgt','wcmpeqhle',
+            'wcmpeqweq','wcmpeqwne','wcmpeqwcs','wcmpeqwhs','wcmpeqwcc','wcmpeqwlo','wcmpeqwmi','wcmpeqwpl','wcmpeqwvs','wcmpeqwvc','wcmpeqwhi','wcmpeqwls','wcmpeqwge','wcmpeqwlt','wcmpeqwgt','wcmpeqwle',
+            'wcmpgtsbeq','wcmpgtsbne','wcmpgtsbcs','wcmpgtsbhs','wcmpgtsbcc','wcmpgtsblo','wcmpgtsbmi','wcmpgtsbpl','wcmpgtsbvs','wcmpgtsbvc','wcmpgtsbhi','wcmpgtsbls','wcmpgtsbge','wcmpgtsblt','wcmpgtsbgt','wcmpgtsble',
+            'wcmpgtsheq','wcmpgtshne','wcmpgtshcs','wcmpgtshhs','wcmpgtshcc','wcmpgtshlo','wcmpgtshmi','wcmpgtshpl','wcmpgtshvs','wcmpgtshvc','wcmpgtshhi','wcmpgtshls','wcmpgtshge','wcmpgtshlt','wcmpgtshgt','wcmpgtshle',
+            'wcmpgtsweq','wcmpgtswne','wcmpgtswcs','wcmpgtswhs','wcmpgtswcc','wcmpgtswlo','wcmpgtswmi','wcmpgtswpl','wcmpgtswvs','wcmpgtswvc','wcmpgtswhi','wcmpgtswls','wcmpgtswge','wcmpgtswlt','wcmpgtswgt','wcmpgtswle',
+            'wcmpgtubeq','wcmpgtubne','wcmpgtubcs','wcmpgtubhs','wcmpgtubcc','wcmpgtublo','wcmpgtubmi','wcmpgtubpl','wcmpgtubvs','wcmpgtubvc','wcmpgtubhi','wcmpgtubls','wcmpgtubge','wcmpgtublt','wcmpgtubgt','wcmpgtuble',
+            'wcmpgtuheq','wcmpgtuhne','wcmpgtuhcs','wcmpgtuhhs','wcmpgtuhcc','wcmpgtuhlo','wcmpgtuhmi','wcmpgtuhpl','wcmpgtuhvs','wcmpgtuhvc','wcmpgtuhhi','wcmpgtuhls','wcmpgtuhge','wcmpgtuhlt','wcmpgtuhgt','wcmpgtuhle',
+            'wcmpgtuweq','wcmpgtuwne','wcmpgtuwcs','wcmpgtuwhs','wcmpgtuwcc','wcmpgtuwlo','wcmpgtuwmi','wcmpgtuwpl','wcmpgtuwvs','wcmpgtuwvc','wcmpgtuwhi','wcmpgtuwls','wcmpgtuwge','wcmpgtuwlt','wcmpgtuwgt','wcmpgtuwle',
+            'wldrbeq','wldrbne','wldrbcs','wldrbhs','wldrbcc','wldrblo','wldrbmi','wldrbpl','wldrbvs','wldrbvc','wldrbhi','wldrbls','wldrbge','wldrblt','wldrbgt','wldrble',
+            'wldrheq','wldrhne','wldrhcs','wldrhhs','wldrhcc','wldrhlo','wldrhmi','wldrhpl','wldrhvs','wldrhvc','wldrhhi','wldrhls','wldrhge','wldrhlt','wldrhgt','wldrhle',
+            'wldrweq','wldrwne','wldrwcs','wldrwhs','wldrwcc','wldrwlo','wldrwmi','wldrwpl','wldrwvs','wldrwvc','wldrwhi','wldrwls','wldrwge','wldrwlt','wldrwgt','wldrwle',
+            'wldrdeq','wldrdne','wldrdcs','wldrdhs','wldrdcc','wldrdlo','wldrdmi','wldrdpl','wldrdvs','wldrdvc','wldrdhi','wldrdls','wldrdge','wldrdlt','wldrdgt','wldrdle',
+            'wmacseq','wmacsne','wmacscs','wmacshs','wmacscc','wmacslo','wmacsmi','wmacspl','wmacsvs','wmacsvc','wmacshi','wmacsls','wmacsge','wmacslt','wmacsgt','wmacsle',
+            'wmacueq','wmacune','wmacucs','wmacuhs','wmacucc','wmaculo','wmacumi','wmacupl','wmacuvs','wmacuvc','wmacuhi','wmaculs','wmacuge','wmacult','wmacugt','wmacule',
+            'wmacszeq','wmacszne','wmacszcs','wmacszhs','wmacszcc','wmacszlo','wmacszmi','wmacszpl','wmacszvs','wmacszvc','wmacszhi','wmacszls','wmacszge','wmacszlt','wmacszgt','wmacszle',
+            'wmacuzeq','wmacuzne','wmacuzcs','wmacuzhs','wmacuzcc','wmacuzlo','wmacuzmi','wmacuzpl','wmacuzvs','wmacuzvc','wmacuzhi','wmacuzls','wmacuzge','wmacuzlt','wmacuzgt','wmacuzle',
+            'wmaddseq','wmaddsne','wmaddscs','wmaddshs','wmaddscc','wmaddslo','wmaddsmi','wmaddspl','wmaddsvs','wmaddsvc','wmaddshi','wmaddsls','wmaddsge','wmaddslt','wmaddsgt','wmaddsle',
+            'wmaddueq','wmaddune','wmadducs','wmadduhs','wmadducc','wmaddulo','wmaddumi','wmaddupl','wmadduvs','wmadduvc','wmadduhi','wmadduls','wmadduge','wmaddult','wmaddugt','wmaddule',
+            'wmaddsxeq','wmaddsxne','wmaddsxcs','wmaddsxhs','wmaddsxcc','wmaddsxlo','wmaddsxmi','wmaddsxpl','wmaddsxvs','wmaddsxvc','wmaddsxhi','wmaddsxls','wmaddsxge','wmaddsxlt','wmaddsxgt','wmaddsxle',
+            'wmadduxeq','wmadduxne','wmadduxcs','wmadduxhs','wmadduxcc','wmadduxlo','wmadduxmi','wmadduxpl','wmadduxvs','wmadduxvc','wmadduxhi','wmadduxls','wmadduxge','wmadduxlt','wmadduxgt','wmadduxle',
+            'wmaddsneq','wmaddsnne','wmaddsncs','wmaddsnhs','wmaddsncc','wmaddsnlo','wmaddsnmi','wmaddsnpl','wmaddsnvs','wmaddsnvc','wmaddsnhi','wmaddsnls','wmaddsnge','wmaddsnlt','wmaddsngt','wmaddsnle',
+            'wmadduneq','wmaddunne','wmadduncs','wmaddunhs','wmadduncc','wmaddunlo','wmaddunmi','wmaddunpl','wmaddunvs','wmaddunvc','wmaddunhi','wmaddunls','wmaddunge','wmaddunlt','wmaddungt','wmaddunle',
+            'wmaxsbeq','wmaxsbne','wmaxsbcs','wmaxsbhs','wmaxsbcc','wmaxsblo','wmaxsbmi','wmaxsbpl','wmaxsbvs','wmaxsbvc','wmaxsbhi','wmaxsbls','wmaxsbge','wmaxsblt','wmaxsbgt','wmaxsble',
+            'wmaxsheq','wmaxshne','wmaxshcs','wmaxshhs','wmaxshcc','wmaxshlo','wmaxshmi','wmaxshpl','wmaxshvs','wmaxshvc','wmaxshhi','wmaxshls','wmaxshge','wmaxshlt','wmaxshgt','wmaxshle',
+            'wmaxsweq','wmaxswne','wmaxswcs','wmaxswhs','wmaxswcc','wmaxswlo','wmaxswmi','wmaxswpl','wmaxswvs','wmaxswvc','wmaxswhi','wmaxswls','wmaxswge','wmaxswlt','wmaxswgt','wmaxswle',
+            'wmaxubeq','wmaxubne','wmaxubcs','wmaxubhs','wmaxubcc','wmaxublo','wmaxubmi','wmaxubpl','wmaxubvs','wmaxubvc','wmaxubhi','wmaxubls','wmaxubge','wmaxublt','wmaxubgt','wmaxuble',
+            'wmaxuheq','wmaxuhne','wmaxuhcs','wmaxuhhs','wmaxuhcc','wmaxuhlo','wmaxuhmi','wmaxuhpl','wmaxuhvs','wmaxuhvc','wmaxuhhi','wmaxuhls','wmaxuhge','wmaxuhlt','wmaxuhgt','wmaxuhle',
+            'wmaxuweq','wmaxuwne','wmaxuwcs','wmaxuwhs','wmaxuwcc','wmaxuwlo','wmaxuwmi','wmaxuwpl','wmaxuwvs','wmaxuwvc','wmaxuwhi','wmaxuwls','wmaxuwge','wmaxuwlt','wmaxuwgt','wmaxuwle',
+            'wmergeeq','wmergene','wmergecs','wmergehs','wmergecc','wmergelo','wmergemi','wmergepl','wmergevs','wmergevc','wmergehi','wmergels','wmergege','wmergelt','wmergegt','wmergele',
+            'wmiabbeq','wmiabbne','wmiabbcs','wmiabbhs','wmiabbcc','wmiabblo','wmiabbmi','wmiabbpl','wmiabbvs','wmiabbvc','wmiabbhi','wmiabbls','wmiabbge','wmiabblt','wmiabbgt','wmiabble',
+            'wmiabteq','wmiabtne','wmiabtcs','wmiabths','wmiabtcc','wmiabtlo','wmiabtmi','wmiabtpl','wmiabtvs','wmiabtvc','wmiabthi','wmiabtls','wmiabtge','wmiabtlt','wmiabtgt','wmiabtle',
+            'wmiatbeq','wmiatbne','wmiatbcs','wmiatbhs','wmiatbcc','wmiatblo','wmiatbmi','wmiatbpl','wmiatbvs','wmiatbvc','wmiatbhi','wmiatbls','wmiatbge','wmiatblt','wmiatbgt','wmiatble',
+            'wmiatteq','wmiattne','wmiattcs','wmiatths','wmiattcc','wmiattlo','wmiattmi','wmiattpl','wmiattvs','wmiattvc','wmiatthi','wmiattls','wmiattge','wmiattlt','wmiattgt','wmiattle',
+            'wmiabbneq','wmiabbnne','wmiabbncs','wmiabbnhs','wmiabbncc','wmiabbnlo','wmiabbnmi','wmiabbnpl','wmiabbnvs','wmiabbnvc','wmiabbnhi','wmiabbnls','wmiabbnge','wmiabbnlt','wmiabbngt','wmiabbnle',
+            'wmiabtneq','wmiabtnne','wmiabtncs','wmiabtnhs','wmiabtncc','wmiabtnlo','wmiabtnmi','wmiabtnpl','wmiabtnvs','wmiabtnvc','wmiabtnhi','wmiabtnls','wmiabtnge','wmiabtnlt','wmiabtngt','wmiabtnle',
+            'wmiatbneq','wmiatbnne','wmiatbncs','wmiatbnhs','wmiatbncc','wmiatbnlo','wmiatbnmi','wmiatbnpl','wmiatbnvs','wmiatbnvc','wmiatbnhi','wmiatbnls','wmiatbnge','wmiatbnlt','wmiatbngt','wmiatbnle',
+            'wmiattneq','wmiattnne','wmiattncs','wmiattnhs','wmiattncc','wmiattnlo','wmiattnmi','wmiattnpl','wmiattnvs','wmiattnvc','wmiattnhi','wmiattnls','wmiattnge','wmiattnlt','wmiattngt','wmiattnle',
+            'wmiawbbeq','wmiawbbne','wmiawbbcs','wmiawbbhs','wmiawbbcc','wmiawbblo','wmiawbbmi','wmiawbbpl','wmiawbbvs','wmiawbbvc','wmiawbbhi','wmiawbbls','wmiawbbge','wmiawbblt','wmiawbbgt','wmiawbble',
+            'wmiawbteq','wmiawbtne','wmiawbtcs','wmiawbths','wmiawbtcc','wmiawbtlo','wmiawbtmi','wmiawbtpl','wmiawbtvs','wmiawbtvc','wmiawbthi','wmiawbtls','wmiawbtge','wmiawbtlt','wmiawbtgt','wmiawbtle',
+            'wmiawtbeq','wmiawtbne','wmiawtbcs','wmiawtbhs','wmiawtbcc','wmiawtblo','wmiawtbmi','wmiawtbpl','wmiawtbvs','wmiawtbvc','wmiawtbhi','wmiawtbls','wmiawtbge','wmiawtblt','wmiawtbgt','wmiawtble',
+            'wmiawtteq','wmiawttne','wmiawttcs','wmiawtths','wmiawttcc','wmiawttlo','wmiawttmi','wmiawttpl','wmiawttvs','wmiawttvc','wmiawtthi','wmiawttls','wmiawttge','wmiawttlt','wmiawttgt','wmiawttle',
+            'wmiawbbneq','wmiawbbnne','wmiawbbncs','wmiawbbnhs','wmiawbbncc','wmiawbbnlo','wmiawbbnmi','wmiawbbnpl','wmiawbbnvs','wmiawbbnvc','wmiawbbnhi','wmiawbbnls','wmiawbbnge','wmiawbbnlt','wmiawbbngt','wmiawbbnle',
+            'wmiawbtneq','wmiawbtnne','wmiawbtncs','wmiawbtnhs','wmiawbtncc','wmiawbtnlo','wmiawbtnmi','wmiawbtnpl','wmiawbtnvs','wmiawbtnvc','wmiawbtnhi','wmiawbtnls','wmiawbtnge','wmiawbtnlt','wmiawbtngt','wmiawbtnle',
+            'wmiawtbneq','wmiawtbnne','wmiawtbncs','wmiawtbnhs','wmiawtbncc','wmiawtbnlo','wmiawtbnmi','wmiawtbnpl','wmiawtbnvs','wmiawtbnvc','wmiawtbnhi','wmiawtbnls','wmiawtbnge','wmiawtbnlt','wmiawtbngt','wmiawtbnle',
+            'wmiawttneq','wmiawttnne','wmiawttncs','wmiawttnhs','wmiawttncc','wmiawttnlo','wmiawttnmi','wmiawttnpl','wmiawttnvs','wmiawttnvc','wmiawttnhi','wmiawttnls','wmiawttnge','wmiawttnlt','wmiawttngt','wmiawttnle',
+            'wminsbeq','wminsbne','wminsbcs','wminsbhs','wminsbcc','wminsblo','wminsbmi','wminsbpl','wminsbvs','wminsbvc','wminsbhi','wminsbls','wminsbge','wminsblt','wminsbgt','wminsble',
+            'wminsheq','wminshne','wminshcs','wminshhs','wminshcc','wminshlo','wminshmi','wminshpl','wminshvs','wminshvc','wminshhi','wminshls','wminshge','wminshlt','wminshgt','wminshle',
+            'wminsweq','wminswne','wminswcs','wminswhs','wminswcc','wminswlo','wminswmi','wminswpl','wminswvs','wminswvc','wminswhi','wminswls','wminswge','wminswlt','wminswgt','wminswle',
+            'wminubeq','wminubne','wminubcs','wminubhs','wminubcc','wminublo','wminubmi','wminubpl','wminubvs','wminubvc','wminubhi','wminubls','wminubge','wminublt','wminubgt','wminuble',
+            'wminuheq','wminuhne','wminuhcs','wminuhhs','wminuhcc','wminuhlo','wminuhmi','wminuhpl','wminuhvs','wminuhvc','wminuhhi','wminuhls','wminuhge','wminuhlt','wminuhgt','wminuhle',
+            'wminuweq','wminuwne','wminuwcs','wminuwhs','wminuwcc','wminuwlo','wminuwmi','wminuwpl','wminuwvs','wminuwvc','wminuwhi','wminuwls','wminuwge','wminuwlt','wminuwgt','wminuwle',
+            'wmoveq','wmovne','wmovcs','wmovhs','wmovcc','wmovlo','wmovmi','wmovpl','wmovvs','wmovvc','wmovhi','wmovls','wmovge','wmovlt','wmovgt','wmovle',
+            'wmulsmeq','wmulsmne','wmulsmcs','wmulsmhs','wmulsmcc','wmulsmlo','wmulsmmi','wmulsmpl','wmulsmvs','wmulsmvc','wmulsmhi','wmulsmls','wmulsmge','wmulsmlt','wmulsmgt','wmulsmle',
+            'wmulsleq','wmulslne','wmulslcs','wmulslhs','wmulslcc','wmulsllo','wmulslmi','wmulslpl','wmulslvs','wmulslvc','wmulslhi','wmulslls','wmulslge','wmulsllt','wmulslgt','wmulslle',
+            'wmulumeq','wmulumne','wmulumcs','wmulumhs','wmulumcc','wmulumlo','wmulummi','wmulumpl','wmulumvs','wmulumvc','wmulumhi','wmulumls','wmulumge','wmulumlt','wmulumgt','wmulumle',
+            'wmululeq','wmululne','wmululcs','wmululhs','wmululcc','wmulullo','wmululmi','wmululpl','wmululvs','wmululvc','wmululhi','wmululls','wmululge','wmulullt','wmululgt','wmululle',
+            'wmulsmreq','wmulsmrne','wmulsmrcs','wmulsmrhs','wmulsmrcc','wmulsmrlo','wmulsmrmi','wmulsmrpl','wmulsmrvs','wmulsmrvc','wmulsmrhi','wmulsmrls','wmulsmrge','wmulsmrlt','wmulsmrgt','wmulsmrle',
+            'wmulslreq','wmulslrne','wmulslrcs','wmulslrhs','wmulslrcc','wmulslrlo','wmulslrmi','wmulslrpl','wmulslrvs','wmulslrvc','wmulslrhi','wmulslrls','wmulslrge','wmulslrlt','wmulslrgt','wmulslrle',
+            'wmulumreq','wmulumrne','wmulumrcs','wmulumrhs','wmulumrcc','wmulumrlo','wmulumrmi','wmulumrpl','wmulumrvs','wmulumrvc','wmulumrhi','wmulumrls','wmulumrge','wmulumrlt','wmulumrgt','wmulumrle',
+            'wmululreq','wmululrne','wmululrcs','wmululrhs','wmululrcc','wmululrlo','wmululrmi','wmululrpl','wmululrvs','wmululrvc','wmululrhi','wmululrls','wmululrge','wmululrlt','wmululrgt','wmululrle',
+            'wmulwumeq','wmulwumne','wmulwumcs','wmulwumhs','wmulwumcc','wmulwumlo','wmulwummi','wmulwumpl','wmulwumvs','wmulwumvc','wmulwumhi','wmulwumls','wmulwumge','wmulwumlt','wmulwumgt','wmulwumle',
+            'wmulwsmeq','wmulwsmne','wmulwsmcs','wmulwsmhs','wmulwsmcc','wmulwsmlo','wmulwsmmi','wmulwsmpl','wmulwsmvs','wmulwsmvc','wmulwsmhi','wmulwsmls','wmulwsmge','wmulwsmlt','wmulwsmgt','wmulwsmle',
+            'wmulwleq','wmulwlne','wmulwlcs','wmulwlhs','wmulwlcc','wmulwllo','wmulwlmi','wmulwlpl','wmulwlvs','wmulwlvc','wmulwlhi','wmulwlls','wmulwlge','wmulwllt','wmulwlgt','wmulwlle',
+            'wmulwumreq','wmulwumrne','wmulwumrcs','wmulwumrhs','wmulwumrcc','wmulwumrlo','wmulwumrmi','wmulwumrpl','wmulwumrvs','wmulwumrvc','wmulwumrhi','wmulwumrls','wmulwumrge','wmulwumrlt','wmulwumrgt','wmulwumrle',
+            'wmulwsmreq','wmulwsmrne','wmulwsmrcs','wmulwsmrhs','wmulwsmrcc','wmulwsmrlo','wmulwsmrmi','wmulwsmrpl','wmulwsmrvs','wmulwsmrvc','wmulwsmrhi','wmulwsmrls','wmulwsmrge','wmulwsmrlt','wmulwsmrgt','wmulwsmrle',
+            'woreq','worne','worcs','worhs','worcc','worlo','wormi','worpl','worvs','worvc','worhi','worls','worge','worlt','worgt','worle',
+            'wpackhsseq','wpackhssne','wpackhsscs','wpackhsshs','wpackhsscc','wpackhsslo','wpackhssmi','wpackhsspl','wpackhssvs','wpackhssvc','wpackhsshi','wpackhssls','wpackhssge','wpackhsslt','wpackhssgt','wpackhssle',
+            'wpackwsseq','wpackwssne','wpackwsscs','wpackwsshs','wpackwsscc','wpackwsslo','wpackwssmi','wpackwsspl','wpackwssvs','wpackwssvc','wpackwsshi','wpackwssls','wpackwssge','wpackwsslt','wpackwssgt','wpackwssle',
+            'wpackdsseq','wpackdssne','wpackdsscs','wpackdsshs','wpackdsscc','wpackdsslo','wpackdssmi','wpackdsspl','wpackdssvs','wpackdssvc','wpackdsshi','wpackdssls','wpackdssge','wpackdsslt','wpackdssgt','wpackdssle',
+            'wpackhuseq','wpackhusne','wpackhuscs','wpackhushs','wpackhuscc','wpackhuslo','wpackhusmi','wpackhuspl','wpackhusvs','wpackhusvc','wpackhushi','wpackhusls','wpackhusge','wpackhuslt','wpackhusgt','wpackhusle',
+            'wpackwuseq','wpackwusne','wpackwuscs','wpackwushs','wpackwuscc','wpackwuslo','wpackwusmi','wpackwuspl','wpackwusvs','wpackwusvc','wpackwushi','wpackwusls','wpackwusge','wpackwuslt','wpackwusgt','wpackwusle',
+            'wpackduseq','wpackdusne','wpackduscs','wpackdushs','wpackduscc','wpackduslo','wpackdusmi','wpackduspl','wpackdusvs','wpackdusvc','wpackdushi','wpackdusls','wpackdusge','wpackduslt','wpackdusgt','wpackdusle',
+            'wqmiabbeq','wqmiabbne','wqmiabbcs','wqmiabbhs','wqmiabbcc','wqmiabblo','wqmiabbmi','wqmiabbpl','wqmiabbvs','wqmiabbvc','wqmiabbhi','wqmiabbls','wqmiabbge','wqmiabblt','wqmiabbgt','wqmiabble',
+            'wqmiabteq','wqmiabtne','wqmiabtcs','wqmiabths','wqmiabtcc','wqmiabtlo','wqmiabtmi','wqmiabtpl','wqmiabtvs','wqmiabtvc','wqmiabthi','wqmiabtls','wqmiabtge','wqmiabtlt','wqmiabtgt','wqmiabtle',
+            'wqmiatbeq','wqmiatbne','wqmiatbcs','wqmiatbhs','wqmiatbcc','wqmiatblo','wqmiatbmi','wqmiatbpl','wqmiatbvs','wqmiatbvc','wqmiatbhi','wqmiatbls','wqmiatbge','wqmiatblt','wqmiatbgt','wqmiatble',
+            'wqmiatteq','wqmiattne','wqmiattcs','wqmiatths','wqmiattcc','wqmiattlo','wqmiattmi','wqmiattpl','wqmiattvs','wqmiattvc','wqmiatthi','wqmiattls','wqmiattge','wqmiattlt','wqmiattgt','wqmiattle',
+            'wqmiabbneq','wqmiabbnne','wqmiabbncs','wqmiabbnhs','wqmiabbncc','wqmiabbnlo','wqmiabbnmi','wqmiabbnpl','wqmiabbnvs','wqmiabbnvc','wqmiabbnhi','wqmiabbnls','wqmiabbnge','wqmiabbnlt','wqmiabbngt','wqmiabbnle',
+            'wqmiabtneq','wqmiabtnne','wqmiabtncs','wqmiabtnhs','wqmiabtncc','wqmiabtnlo','wqmiabtnmi','wqmiabtnpl','wqmiabtnvs','wqmiabtnvc','wqmiabtnhi','wqmiabtnls','wqmiabtnge','wqmiabtnlt','wqmiabtngt','wqmiabtnle',
+            'wqmiatbneq','wqmiatbnne','wqmiatbncs','wqmiatbnhs','wqmiatbncc','wqmiatbnlo','wqmiatbnmi','wqmiatbnpl','wqmiatbnvs','wqmiatbnvc','wqmiatbnhi','wqmiatbnls','wqmiatbnge','wqmiatbnlt','wqmiatbngt','wqmiatbnle',
+            'wqmiattneq','wqmiattnne','wqmiattncs','wqmiattnhs','wqmiattncc','wqmiattnlo','wqmiattnmi','wqmiattnpl','wqmiattnvs','wqmiattnvc','wqmiattnhi','wqmiattnls','wqmiattnge','wqmiattnlt','wqmiattngt','wqmiattnle',
+            'wqmulmeq','wqmulmne','wqmulmcs','wqmulmhs','wqmulmcc','wqmulmlo','wqmulmmi','wqmulmpl','wqmulmvs','wqmulmvc','wqmulmhi','wqmulmls','wqmulmge','wqmulmlt','wqmulmgt','wqmulmle',
+            'wqmulmreq','wqmulmrne','wqmulmrcs','wqmulmrhs','wqmulmrcc','wqmulmrlo','wqmulmrmi','wqmulmrpl','wqmulmrvs','wqmulmrvc','wqmulmrhi','wqmulmrls','wqmulmrge','wqmulmrlt','wqmulmrgt','wqmulmrle',
+            'wqmulwmeq','wqmulwmne','wqmulwmcs','wqmulwmhs','wqmulwmcc','wqmulwmlo','wqmulwmmi','wqmulwmpl','wqmulwmvs','wqmulwmvc','wqmulwmhi','wqmulwmls','wqmulwmge','wqmulwmlt','wqmulwmgt','wqmulwmle',
+            'wqmulwmreq','wqmulwmrne','wqmulwmrcs','wqmulwmrhs','wqmulwmrcc','wqmulwmrlo','wqmulwmrmi','wqmulwmrpl','wqmulwmrvs','wqmulwmrvc','wqmulwmrhi','wqmulwmrls','wqmulwmrge','wqmulwmrlt','wqmulwmrgt','wqmulwmrle',
+            'wrorheq','wrorhne','wrorhcs','wrorhhs','wrorhcc','wrorhlo','wrorhmi','wrorhpl','wrorhvs','wrorhvc','wrorhhi','wrorhls','wrorhge','wrorhlt','wrorhgt','wrorhle',
+            'wrorweq','wrorwne','wrorwcs','wrorwhs','wrorwcc','wrorwlo','wrorwmi','wrorwpl','wrorwvs','wrorwvc','wrorwhi','wrorwls','wrorwge','wrorwlt','wrorwgt','wrorwle',
+            'wrordeq','wrordne','wrordcs','wrordhs','wrordcc','wrordlo','wrordmi','wrordpl','wrordvs','wrordvc','wrordhi','wrordls','wrordge','wrordlt','wrordgt','wrordle',
+            'wrorhgeq','wrorhgne','wrorhgcs','wrorhghs','wrorhgcc','wrorhglo','wrorhgmi','wrorhgpl','wrorhgvs','wrorhgvc','wrorhghi','wrorhgls','wrorhgge','wrorhglt','wrorhggt','wrorhgle',
+            'wrorwgeq','wrorwgne','wrorwgcs','wrorwghs','wrorwgcc','wrorwglo','wrorwgmi','wrorwgpl','wrorwgvs','wrorwgvc','wrorwghi','wrorwgls','wrorwgge','wrorwglt','wrorwggt','wrorwgle',
+            'wrordgeq','wrordgne','wrordgcs','wrordghs','wrordgcc','wrordglo','wrordgmi','wrordgpl','wrordgvs','wrordgvc','wrordghi','wrordgls','wrordgge','wrordglt','wrordggt','wrordgle',
+            'wsadbeq','wsadbne','wsadbcs','wsadbhs','wsadbcc','wsadblo','wsadbmi','wsadbpl','wsadbvs','wsadbvc','wsadbhi','wsadbls','wsadbge','wsadblt','wsadbgt','wsadble',
+            'wsadheq','wsadhne','wsadhcs','wsadhhs','wsadhcc','wsadhlo','wsadhmi','wsadhpl','wsadhvs','wsadhvc','wsadhhi','wsadhls','wsadhge','wsadhlt','wsadhgt','wsadhle',
+            'wsadbzeq','wsadbzne','wsadbzcs','wsadbzhs','wsadbzcc','wsadbzlo','wsadbzmi','wsadbzpl','wsadbzvs','wsadbzvc','wsadbzhi','wsadbzls','wsadbzge','wsadbzlt','wsadbzgt','wsadbzle',
+            'wsadhzeq','wsadhzne','wsadhzcs','wsadhzhs','wsadhzcc','wsadhzlo','wsadhzmi','wsadhzpl','wsadhzvs','wsadhzvc','wsadhzhi','wsadhzls','wsadhzge','wsadhzlt','wsadhzgt','wsadhzle',
+            'wshufheq','wshufhne','wshufhcs','wshufhhs','wshufhcc','wshufhlo','wshufhmi','wshufhpl','wshufhvs','wshufhvc','wshufhhi','wshufhls','wshufhge','wshufhlt','wshufhgt','wshufhle',
+            'wsllheq','wsllhne','wsllhcs','wsllhhs','wsllhcc','wsllhlo','wsllhmi','wsllhpl','wsllhvs','wsllhvc','wsllhhi','wsllhls','wsllhge','wsllhlt','wsllhgt','wsllhle',
+            'wsllweq','wsllwne','wsllwcs','wsllwhs','wsllwcc','wsllwlo','wsllwmi','wsllwpl','wsllwvs','wsllwvc','wsllwhi','wsllwls','wsllwge','wsllwlt','wsllwgt','wsllwle',
+            'wslldeq','wslldne','wslldcs','wslldhs','wslldcc','wslldlo','wslldmi','wslldpl','wslldvs','wslldvc','wslldhi','wslldls','wslldge','wslldlt','wslldgt','wslldle',
+            'wsllhgeq','wsllhgne','wsllhgcs','wsllhghs','wsllhgcc','wsllhglo','wsllhgmi','wsllhgpl','wsllhgvs','wsllhgvc','wsllhghi','wsllhgls','wsllhgge','wsllhglt','wsllhggt','wsllhgle',
+            'wsllwgeq','wsllwgne','wsllwgcs','wsllwghs','wsllwgcc','wsllwglo','wsllwgmi','wsllwgpl','wsllwgvs','wsllwgvc','wsllwghi','wsllwgls','wsllwgge','wsllwglt','wsllwggt','wsllwgle',
+            'wslldgeq','wslldgne','wslldgcs','wslldghs','wslldgcc','wslldglo','wslldgmi','wslldgpl','wslldgvs','wslldgvc','wslldghi','wslldgls','wslldgge','wslldglt','wslldggt','wslldgle',
+            'wsraheq','wsrahne','wsrahcs','wsrahhs','wsrahcc','wsrahlo','wsrahmi','wsrahpl','wsrahvs','wsrahvc','wsrahhi','wsrahls','wsrahge','wsrahlt','wsrahgt','wsrahle',
+            'wsraweq','wsrawne','wsrawcs','wsrawhs','wsrawcc','wsrawlo','wsrawmi','wsrawpl','wsrawvs','wsrawvc','wsrawhi','wsrawls','wsrawge','wsrawlt','wsrawgt','wsrawle',
+            'wsradeq','wsradne','wsradcs','wsradhs','wsradcc','wsradlo','wsradmi','wsradpl','wsradvs','wsradvc','wsradhi','wsradls','wsradge','wsradlt','wsradgt','wsradle',
+            'wsrahgeq','wsrahgne','wsrahgcs','wsrahghs','wsrahgcc','wsrahglo','wsrahgmi','wsrahgpl','wsrahgvs','wsrahgvc','wsrahghi','wsrahgls','wsrahgge','wsrahglt','wsrahggt','wsrahgle',
+            'wsrawgeq','wsrawgne','wsrawgcs','wsrawghs','wsrawgcc','wsrawglo','wsrawgmi','wsrawgpl','wsrawgvs','wsrawgvc','wsrawghi','wsrawgls','wsrawgge','wsrawglt','wsrawggt','wsrawgle',
+            'wsradgeq','wsradgne','wsradgcs','wsradghs','wsradgcc','wsradglo','wsradgmi','wsradgpl','wsradgvs','wsradgvc','wsradghi','wsradgls','wsradgge','wsradglt','wsradggt','wsradgle',
+            'wsrlheq','wsrlhne','wsrlhcs','wsrlhhs','wsrlhcc','wsrlhlo','wsrlhmi','wsrlhpl','wsrlhvs','wsrlhvc','wsrlhhi','wsrlhls','wsrlhge','wsrlhlt','wsrlhgt','wsrlhle',
+            'wsrlweq','wsrlwne','wsrlwcs','wsrlwhs','wsrlwcc','wsrlwlo','wsrlwmi','wsrlwpl','wsrlwvs','wsrlwvc','wsrlwhi','wsrlwls','wsrlwge','wsrlwlt','wsrlwgt','wsrlwle',
+            'wsrldeq','wsrldne','wsrldcs','wsrldhs','wsrldcc','wsrldlo','wsrldmi','wsrldpl','wsrldvs','wsrldvc','wsrldhi','wsrldls','wsrldge','wsrldlt','wsrldgt','wsrldle',
+            'wsrlhgeq','wsrlhgne','wsrlhgcs','wsrlhghs','wsrlhgcc','wsrlhglo','wsrlhgmi','wsrlhgpl','wsrlhgvs','wsrlhgvc','wsrlhghi','wsrlhgls','wsrlhgge','wsrlhglt','wsrlhggt','wsrlhgle',
+            'wsrlwgeq','wsrlwgne','wsrlwgcs','wsrlwghs','wsrlwgcc','wsrlwglo','wsrlwgmi','wsrlwgpl','wsrlwgvs','wsrlwgvc','wsrlwghi','wsrlwgls','wsrlwgge','wsrlwglt','wsrlwggt','wsrlwgle',
+            'wsrldgeq','wsrldgne','wsrldgcs','wsrldghs','wsrldgcc','wsrldglo','wsrldgmi','wsrldgpl','wsrldgvs','wsrldgvc','wsrldghi','wsrldgls','wsrldgge','wsrldglt','wsrldggt','wsrldgle',
+            'wstrbeq','wstrbne','wstrbcs','wstrbhs','wstrbcc','wstrblo','wstrbmi','wstrbpl','wstrbvs','wstrbvc','wstrbhi','wstrbls','wstrbge','wstrblt','wstrbgt','wstrble',
+            'wstrheq','wstrhne','wstrhcs','wstrhhs','wstrhcc','wstrhlo','wstrhmi','wstrhpl','wstrhvs','wstrhvc','wstrhhi','wstrhls','wstrhge','wstrhlt','wstrhgt','wstrhle',
+            'wstrweq','wstrwne','wstrwcs','wstrwhs','wstrwcc','wstrwlo','wstrwmi','wstrwpl','wstrwvs','wstrwvc','wstrwhi','wstrwls','wstrwge','wstrwlt','wstrwgt','wstrwle',
+            'wstrdeq','wstrdne','wstrdcs','wstrdhs','wstrdcc','wstrdlo','wstrdmi','wstrdpl','wstrdvs','wstrdvc','wstrdhi','wstrdls','wstrdge','wstrdlt','wstrdgt','wstrdle',
+            'wsubbeq','wsubbne','wsubbcs','wsubbhs','wsubbcc','wsubblo','wsubbmi','wsubbpl','wsubbvs','wsubbvc','wsubbhi','wsubbls','wsubbge','wsubblt','wsubbgt','wsubble',
+            'wsubheq','wsubhne','wsubhcs','wsubhhs','wsubhcc','wsubhlo','wsubhmi','wsubhpl','wsubhvs','wsubhvc','wsubhhi','wsubhls','wsubhge','wsubhlt','wsubhgt','wsubhle',
+            'wsubweq','wsubwne','wsubwcs','wsubwhs','wsubwcc','wsubwlo','wsubwmi','wsubwpl','wsubwvs','wsubwvc','wsubwhi','wsubwls','wsubwge','wsubwlt','wsubwgt','wsubwle',
+            'wsubbsseq','wsubbssne','wsubbsscs','wsubbsshs','wsubbsscc','wsubbsslo','wsubbssmi','wsubbsspl','wsubbssvs','wsubbssvc','wsubbsshi','wsubbssls','wsubbssge','wsubbsslt','wsubbssgt','wsubbssle',
+            'wsubhsseq','wsubhssne','wsubhsscs','wsubhsshs','wsubhsscc','wsubhsslo','wsubhssmi','wsubhsspl','wsubhssvs','wsubhssvc','wsubhsshi','wsubhssls','wsubhssge','wsubhsslt','wsubhssgt','wsubhssle',
+            'wsubwsseq','wsubwssne','wsubwsscs','wsubwsshs','wsubwsscc','wsubwsslo','wsubwssmi','wsubwsspl','wsubwssvs','wsubwssvc','wsubwsshi','wsubwssls','wsubwssge','wsubwsslt','wsubwssgt','wsubwssle',
+            'wsubbuseq','wsubbusne','wsubbuscs','wsubbushs','wsubbuscc','wsubbuslo','wsubbusmi','wsubbuspl','wsubbusvs','wsubbusvc','wsubbushi','wsubbusls','wsubbusge','wsubbuslt','wsubbusgt','wsubbusle',
+            'wsubhuseq','wsubhusne','wsubhuscs','wsubhushs','wsubhuscc','wsubhuslo','wsubhusmi','wsubhuspl','wsubhusvs','wsubhusvc','wsubhushi','wsubhusls','wsubhusge','wsubhuslt','wsubhusgt','wsubhusle',
+            'wsubwuseq','wsubwusne','wsubwuscs','wsubwushs','wsubwuscc','wsubwuslo','wsubwusmi','wsubwuspl','wsubwusvs','wsubwusvc','wsubwushi','wsubwusls','wsubwusge','wsubwuslt','wsubwusgt','wsubwusle',
+            'wsubaddhxeq','wsubaddhxne','wsubaddhxcs','wsubaddhxhs','wsubaddhxcc','wsubaddhxlo','wsubaddhxmi','wsubaddhxpl','wsubaddhxvs','wsubaddhxvc','wsubaddhxhi','wsubaddhxls','wsubaddhxge','wsubaddhxlt','wsubaddhxgt','wsubaddhxle',
+            'wunpckehsbeq','wunpckehsbne','wunpckehsbcs','wunpckehsbhs','wunpckehsbcc','wunpckehsblo','wunpckehsbmi','wunpckehsbpl','wunpckehsbvs','wunpckehsbvc','wunpckehsbhi','wunpckehsbls','wunpckehsbge','wunpckehsblt','wunpckehsbgt','wunpckehsble',
+            'wunpckehsheq','wunpckehshne','wunpckehshcs','wunpckehshhs','wunpckehshcc','wunpckehshlo','wunpckehshmi','wunpckehshpl','wunpckehshvs','wunpckehshvc','wunpckehshhi','wunpckehshls','wunpckehshge','wunpckehshlt','wunpckehshgt','wunpckehshle',
+            'wunpckehsweq','wunpckehswne','wunpckehswcs','wunpckehswhs','wunpckehswcc','wunpckehswlo','wunpckehswmi','wunpckehswpl','wunpckehswvs','wunpckehswvc','wunpckehswhi','wunpckehswls','wunpckehswge','wunpckehswlt','wunpckehswgt','wunpckehswle',
+            'wunpckehubeq','wunpckehubne','wunpckehubcs','wunpckehubhs','wunpckehubcc','wunpckehublo','wunpckehubmi','wunpckehubpl','wunpckehubvs','wunpckehubvc','wunpckehubhi','wunpckehubls','wunpckehubge','wunpckehublt','wunpckehubgt','wunpckehuble',
+            'wunpckehuheq','wunpckehuhne','wunpckehuhcs','wunpckehuhhs','wunpckehuhcc','wunpckehuhlo','wunpckehuhmi','wunpckehuhpl','wunpckehuhvs','wunpckehuhvc','wunpckehuhhi','wunpckehuhls','wunpckehuhge','wunpckehuhlt','wunpckehuhgt','wunpckehuhle',
+            'wunpckehuweq','wunpckehuwne','wunpckehuwcs','wunpckehuwhs','wunpckehuwcc','wunpckehuwlo','wunpckehuwmi','wunpckehuwpl','wunpckehuwvs','wunpckehuwvc','wunpckehuwhi','wunpckehuwls','wunpckehuwge','wunpckehuwlt','wunpckehuwgt','wunpckehuwle',
+            'wunpckihbeq','wunpckihbne','wunpckihbcs','wunpckihbhs','wunpckihbcc','wunpckihblo','wunpckihbmi','wunpckihbpl','wunpckihbvs','wunpckihbvc','wunpckihbhi','wunpckihbls','wunpckihbge','wunpckihblt','wunpckihbgt','wunpckihble',
+            'wunpckihheq','wunpckihhne','wunpckihhcs','wunpckihhhs','wunpckihhcc','wunpckihhlo','wunpckihhmi','wunpckihhpl','wunpckihhvs','wunpckihhvc','wunpckihhhi','wunpckihhls','wunpckihhge','wunpckihhlt','wunpckihhgt','wunpckihhle',
+            'wunpckihweq','wunpckihwne','wunpckihwcs','wunpckihwhs','wunpckihwcc','wunpckihwlo','wunpckihwmi','wunpckihwpl','wunpckihwvs','wunpckihwvc','wunpckihwhi','wunpckihwls','wunpckihwge','wunpckihwlt','wunpckihwgt','wunpckihwle',
+            'wunpckelsbeq','wunpckelsbne','wunpckelsbcs','wunpckelsbhs','wunpckelsbcc','wunpckelsblo','wunpckelsbmi','wunpckelsbpl','wunpckelsbvs','wunpckelsbvc','wunpckelsbhi','wunpckelsbls','wunpckelsbge','wunpckelsblt','wunpckelsbgt','wunpckelsble',
+            'wunpckelsheq','wunpckelshne','wunpckelshcs','wunpckelshhs','wunpckelshcc','wunpckelshlo','wunpckelshmi','wunpckelshpl','wunpckelshvs','wunpckelshvc','wunpckelshhi','wunpckelshls','wunpckelshge','wunpckelshlt','wunpckelshgt','wunpckelshle',
+            'wunpckelsweq','wunpckelswne','wunpckelswcs','wunpckelswhs','wunpckelswcc','wunpckelswlo','wunpckelswmi','wunpckelswpl','wunpckelswvs','wunpckelswvc','wunpckelswhi','wunpckelswls','wunpckelswge','wunpckelswlt','wunpckelswgt','wunpckelswle',
+            'wunpckelubeq','wunpckelubne','wunpckelubcs','wunpckelubhs','wunpckelubcc','wunpckelublo','wunpckelubmi','wunpckelubpl','wunpckelubvs','wunpckelubvc','wunpckelubhi','wunpckelubls','wunpckelubge','wunpckelublt','wunpckelubgt','wunpckeluble',
+            'wunpckeluheq','wunpckeluhne','wunpckeluhcs','wunpckeluhhs','wunpckeluhcc','wunpckeluhlo','wunpckeluhmi','wunpckeluhpl','wunpckeluhvs','wunpckeluhvc','wunpckeluhhi','wunpckeluhls','wunpckeluhge','wunpckeluhlt','wunpckeluhgt','wunpckeluhle',
+            'wunpckeluweq','wunpckeluwne','wunpckeluwcs','wunpckeluwhs','wunpckeluwcc','wunpckeluwlo','wunpckeluwmi','wunpckeluwpl','wunpckeluwvs','wunpckeluwvc','wunpckeluwhi','wunpckeluwls','wunpckeluwge','wunpckeluwlt','wunpckeluwgt','wunpckeluwle',
+            'wunpckilbeq','wunpckilbne','wunpckilbcs','wunpckilbhs','wunpckilbcc','wunpckilblo','wunpckilbmi','wunpckilbpl','wunpckilbvs','wunpckilbvc','wunpckilbhi','wunpckilbls','wunpckilbge','wunpckilblt','wunpckilbgt','wunpckilble',
+            'wunpckilheq','wunpckilhne','wunpckilhcs','wunpckilhhs','wunpckilhcc','wunpckilhlo','wunpckilhmi','wunpckilhpl','wunpckilhvs','wunpckilhvc','wunpckilhhi','wunpckilhls','wunpckilhge','wunpckilhlt','wunpckilhgt','wunpckilhle',
+            'wunpckilweq','wunpckilwne','wunpckilwcs','wunpckilwhs','wunpckilwcc','wunpckilwlo','wunpckilwmi','wunpckilwpl','wunpckilwvs','wunpckilwvc','wunpckilwhi','wunpckilwls','wunpckilwge','wunpckilwlt','wunpckilwgt','wunpckilwle',
+            'wxoreq','wxorne','wxorcs','wxorhs','wxorcc','wxorlo','wxormi','wxorpl','wxorvs','wxorvc','wxorhi','wxorls','wxorge','wxorlt','wxorgt','wxorle',
+            'wzeroeq','wzerone','wzerocs','wzerohs','wzerocc','wzerolo','wzeromi','wzeropl','wzerovs','wzerovc','wzerohi','wzerols','wzeroge','wzerolt','wzerogt','wzerole'
+            ),
+        /* Unconditional VFPv3 & NEON SIMD Memory Access Instructions */
+        19 => array(
+            /* Unconditional VFPv3 & NEON SIMD Memory Access: Loads */
+            'vld.8','vldal.8',
+            'vld.16','vldal.16',
+            'vld.32','vldal.32',
+            'vld.64','vldal.64',
+
+            'vld1.8','vld1al.8',
+            'vld1.16','vld1al.16',
+            'vld1.32','vld1al.32',
+
+            'vld2.8','vld2al.8',
+            'vld2.16','vld2al.16',
+            'vld2.32','vld2al.32',
+
+            'vld3.8','vld3al.8',
+            'vld3.16','vld3al.16',
+            'vld3.32','vld3al.32',
+
+            'vld4.8','vld4al.8',
+            'vld4.16','vld4al.16',
+            'vld4.32','vld4al.32',
+
+            'vldm','vldmal',
+            'vldm.32','vldmal.32',
+            'vldm.64','vldmal.64',
+
+            'vldmia','vldmiaal',
+            'vldmia.32','vldmiaal.32',
+            'vldmia.64','vldmiaal.64',
+
+            'vldmdb','vldmdbal',
+            'vldmdb.32','vldmdbal.32',
+            'vldmdb.64','vldmdbal.64',
+
+            'vldr','vldral',
+            'vldr.32','vldral.32',
+            'vldr.64','vldral.64',
+
+            'vpop','vpopal',
+            'vpop.32','vpopal.32',
+            'vpop.64','vpopal.64',
+
+            /* Unconditional VFPv3 & NEON SIMD Memory Access: Stores */
+            'vst1.8','vst1al.8',
+            'vst1.16','vst1al.16',
+            'vst1.32','vst1al.32',
+            'vst1.64','vst1al.64',
+
+            'vst2.8','vst2al.8',
+            'vst2.16','vst2al.16',
+            'vst2.32','vst2al.32',
+
+            'vst3.8','vst3al.8',
+            'vst3.16','vst3al.16',
+            'vst3.32','vst3al.32',
+
+            'vst4.8','vst4al.8',
+            'vst4.16','vst4al.16',
+            'vst4.32','vst4al.32',
+
+            'vstm','vstmal',
+            'vstm.32','vstmal.32',
+            'vstm.64','vstmal.64',
+
+            'vstmia','vstmiaal',
+            'vstmia.32','vstmiaal.32',
+            'vstmia.64','vstmiaal.64',
+
+            'vstmdb','vstmdbal',
+            'vstmdb.32','vstmdbal.32',
+            'vstmdb.64','vstmdbal.64',
+
+            'vstr','vstral',
+            'vstr.32','vstral.32',
+            'vstr.64','vstral.64',
+
+            'vpush','vpushal',
+            'vpush.32','vpushal.32',
+            'vpush.64','vpushal.64'
+            ),
+        /* Unconditional NEON SIMD Logical Instructions */
+        20 => array(
+            'vand','vandal',
+            'vand.i8','vandal.i8',
+            'vand.i16','vandal.i16',
+            'vand.i32','vandal.i32',
+            'vand.i64','vandal.i64',
+            'vand.s8','vandal.s8',
+            'vand.s16','vandal.s16',
+            'vand.s32','vandal.s32',
+            'vand.s64','vandal.s64',
+            'vand.u8','vandal.u8',
+            'vand.u16','vandal.u16',
+            'vand.u32','vandal.u32',
+            'vand.u64','vandal.u64',
+            'vand.f32','vandal.f32',
+            'vand.f64','vandal.f64',
+
+            'vbic','vbical',
+            'vbic.i8','vbical.i8',
+            'vbic.i16','vbical.i16',
+            'vbic.i32','vbical.i32',
+            'vbic.i64','vbical.i64',
+            'vbic.s8','vbical.s8',
+            'vbic.s16','vbical.s16',
+            'vbic.s32','vbical.s32',
+            'vbic.s64','vbical.s64',
+            'vbic.u8','vbical.u8',
+            'vbic.u16','vbical.u16',
+            'vbic.u32','vbical.u32',
+            'vbic.u64','vbical.u64',
+            'vbic.f32','vbical.f32',
+            'vbic.f64','vbical.f64',
+
+            'vbif','vbifal',
+            'vbif.i8','vbifal.i8',
+            'vbif.i16','vbifal.i16',
+            'vbif.i32','vbifal.i32',
+            'vbif.i64','vbifal.i64',
+            'vbif.s8','vbifal.s8',
+            'vbif.s16','vbifal.s16',
+            'vbif.s32','vbifal.s32',
+            'vbif.s64','vbifal.s64',
+            'vbif.u8','vbifal.u8',
+            'vbif.u16','vbifal.u16',
+            'vbif.u32','vbifal.u32',
+            'vbif.u64','vbifal.u64',
+            'vbif.f32','vbifal.f32',
+            'vbif.f64','vbifal.f64',
+
+            'vbit','vbital',
+            'vbit.i8','vbital.i8',
+            'vbit.i16','vbital.i16',
+            'vbit.i32','vbital.i32',
+            'vbit.i64','vbital.i64',
+            'vbit.s8','vbital.s8',
+            'vbit.s16','vbital.s16',
+            'vbit.s32','vbital.s32',
+            'vbit.s64','vbital.s64',
+            'vbit.u8','vbital.u8',
+            'vbit.u16','vbital.u16',
+            'vbit.u32','vbital.u32',
+            'vbit.u64','vbital.u64',
+            'vbit.f32','vbital.f32',
+            'vbit.f64','vbital.f64',
+
+            'vbsl','vbslal',
+            'vbsl.i8','vbslal.i8',
+            'vbsl.i16','vbslal.i16',
+            'vbsl.i32','vbslal.i32',
+            'vbsl.i64','vbslal.i64',
+            'vbsl.s8','vbslal.s8',
+            'vbsl.s16','vbslal.s16',
+            'vbsl.s32','vbslal.s32',
+            'vbsl.s64','vbslal.s64',
+            'vbsl.u8','vbslal.u8',
+            'vbsl.u16','vbslal.u16',
+            'vbsl.u32','vbslal.u32',
+            'vbsl.u64','vbslal.u64',
+            'vbsl.f32','vbslal.f32',
+            'vbsl.f64','vbslal.f64',
+
+            'veor','veoral',
+            'veor.i8','veoral.i8',
+            'veor.i16','veoral.i16',
+            'veor.i32','veoral.i32',
+            'veor.i64','veoral.i64',
+            'veor.s8','veoral.s8',
+            'veor.s16','veoral.s16',
+            'veor.s32','veoral.s32',
+            'veor.s64','veoral.s64',
+            'veor.u8','veoral.u8',
+            'veor.u16','veoral.u16',
+            'veor.u32','veoral.u32',
+            'veor.u64','veoral.u64',
+            'veor.f32','veoral.f32',
+            'veor.f64','veoral.f64',
+
+            'vmov','vmoval',
+            'vmov.8','vmoval.8',
+            'vmov.16','vmoval.16',
+            'vmov.32','vmoval.32',
+            'vmov.i8','vmoval.i8',
+            'vmov.i16','vmoval.i16',
+            'vmov.i32','vmoval.i32',
+            'vmov.i64','vmoval.i64',
+            'vmov.f32','vmoval.f32',
+            'vmov.f64','vmoval.f64',
+
+            'vmvn','vmvnal',
+            'vmvn.s8','vmvnal.s8',
+            'vmvn.s16','vmvnal.s16',
+            'vmvn.s32','vmvnal.s32',
+            'vmvn.s64','vmvnal.s64',
+            'vmvn.u8','vmvnal.u8',
+            'vmvn.u16','vmvnal.u16',
+            'vmvn.u32','vmvnal.u32',
+            'vmvn.u64','vmvnal.u64',
+            'vmvn.i8','vmvnal.i8',
+            'vmvn.i16','vmvnal.i16',
+            'vmvn.i32','vmvnal.i32',
+            'vmvn.i64','vmvnal.i64',
+            'vmvn.f32','vmvnal.f32',
+            'vmvn.f64','vmvnal.f64',
+
+            'vorn','vornal',
+            'vorn.s8','vornal.s8',
+            'vorn.s16','vornal.s16',
+            'vorn.s32','vornal.s32',
+            'vorn.s64','vornal.s64',
+            'vorn.u8','vornal.u8',
+            'vorn.u16','vornal.u16',
+            'vorn.u32','vornal.u32',
+            'vorn.u64','vornal.u64',
+            'vorn.i8','vornal.i8',
+            'vorn.i16','vornal.i16',
+            'vorn.i32','vornal.i32',
+            'vorn.i64','vornal.i64',
+            'vorn.f32','vornal.f32',
+            'vorn.f64','vornal.f64',
+
+            'vorr','vorral',
+            'vorr.s8','vorral.s8',
+            'vorr.s16','vorral.s16',
+            'vorr.s32','vorral.s32',
+            'vorr.s64','vorral.s64',
+            'vorr.u8','vorral.u8',
+            'vorr.u16','vorral.u16',
+            'vorr.u32','vorral.u32',
+            'vorr.u64','vorral.u64',
+            'vorr.i8','vorral.i8',
+            'vorr.i16','vorral.i16',
+            'vorr.i32','vorral.i32',
+            'vorr.i64','vorral.i64',
+            'vorr.f32','vorral.f32',
+            'vorr.f64','vorral.f64',
+
+            'vswp','vswpal',
+            'vswp.s8','vswpal.s8',
+            'vswp.s16','vswpal.s16',
+            'vswp.s32','vswpal.s32',
+            'vswp.s64','vswpal.s64',
+            'vswp.u8','vswpal.u8',
+            'vswp.u16','vswpal.u16',
+            'vswp.u32','vswpal.u32',
+            'vswp.u64','vswpal.u64',
+            'vswp.i8','vswpal.i8',
+            'vswp.i16','vswpal.i16',
+            'vswp.i32','vswpal.i32',
+            'vswp.i64','vswpal.i64',
+            'vswp.f32','vswpal.f32',
+            'vswp.f64','vswpal.f64'
+            ),
+        /* Unconditional NEON SIMD ARM Registers Interop Instructions */
+        21 => array(
+            'vmrs','vmrsal',
+            'vmsr','vmsral'
+            ),
+        /* Unconditional NEON SIMD Bit/Byte-Level Instructions */
+        22 => array(
+            'vcnt.8','vcntal.8',
+            'vdup.8','vdupal.8',
+
+            'vdup.16','vdupal.16',
+            'vdup.32','vdupal.32',
+
+            'vext.8','vextal.8',
+            'vext.16','vextal.16',
+
+            'vext.32','vextal.32',
+            'vext.64','vextal.64',
+
+            'vrev16.8','vrev16al.8',
+            'vrev32.8','vrev32al.8',
+            'vrev32.16','vrev32al.16',
+            'vrev64.8','vrev64al.8',
+            'vrev64.16','vrev64al.16',
+            'vrev64.32','vrev64al.32',
+
+            'vsli.8','vslial.8',
+            'vsli.16','vslial.16',
+            'vsli.32','vslial.32',
+            'vsli.64','vslial.64',
+
+            'vsri.8','vsrial.8',
+            'vsri.16','vsrial.16',
+            'vsri.32','vsrial.32',
+            'vsri.64','vsrial.64',
+
+            'vtbl.8','vtblal.8',
+
+            'vtbx','vtbxal',
+
+            'vtrn.8','vtrnal.8',
+            'vtrn.16','vtrnal.16',
+            'vtrn.32','vtrnal.32',
+
+            'vtst.8','vtstal.8',
+            'vtst.16','vtstal.16',
+            'vtst.32','vtstal.32',
+
+            'vuzp.8','vuzpal.8',
+            'vuzp.16','vuzpal.16',
+            'vuzp.32','vuzpal.32',
+
+            'vzip.8','vzipal.8',
+            'vzip.16','vzipal.16',
+            'vzip.32','vzipal.32',
+
+            'vmull.p8','vmullal.p8'
+            ),
+        /* Unconditional NEON SIMD Universal Integer Instructions */
+        23 => array(
+            'vadd.i8','vaddal.i8',
+            'vadd.i16','vaddal.i16',
+            'vadd.i32','vaddal.i32',
+            'vadd.i64','vaddal.i64',
+
+            'vsub.i8','vsubal.i8',
+            'vsub.i16','vsubal.i16',
+            'vsub.i32','vsubal.i32',
+            'vsub.i64','vsubal.i64',
+
+            'vaddhn.i16','vaddhnal.i16',
+            'vaddhn.i32','vaddhnal.i32',
+            'vaddhn.i64','vaddhnal.i64',
+
+            'vsubhn.i16','vsubhnal.i16',
+            'vsubhn.i32','vsubhnal.i32',
+            'vsubhn.i64','vsubhnal.i64',
+
+            'vraddhn.i16','vraddhnal.i16',
+            'vraddhn.i32','vraddhnal.i32',
+            'vraddhn.i64','vraddhnal.i64',
+
+            'vrsubhn.i16','vrsubhnal.i16',
+            'vrsubhn.i32','vrsubhnal.i32',
+            'vrsubhn.i64','vrsubhnal.i64',
+
+            'vpadd.i8','vpaddal.i8',
+            'vpadd.i16','vpaddal.i16',
+            'vpadd.i32','vpaddal.i32',
+
+            'vceq.i8','vceqal.i8',
+            'vceq.i16','vceqal.i16',
+            'vceq.i32','vceqal.i32',
+
+            'vclz.i8','vclzal.i8',
+            'vclz.i16','vclzal.i16',
+            'vclz.i32','vclzal.i32',
+
+            'vmovn.i16','vmovnal.i16',
+            'vmovn.i32','vmovnal.i32',
+            'vmovn.i64','vmovnal.i64',
+
+            'vmla.s8','vmlaal.s8',
+            'vmla.s16','vmlaal.s16',
+            'vmla.s32','vmlaal.s32',
+            'vmla.u8','vmlaal.u8',
+            'vmla.u16','vmlaal.u16',
+            'vmla.u32','vmlaal.u32',
+            'vmla.i8','vmlaal.i8',
+            'vmla.i16','vmlaal.i16',
+            'vmla.i32','vmlaal.i32',
+
+            'vmls.s8','vmlsal.s8',
+            'vmls.s16','vmlsal.s16',
+            'vmls.s32','vmlsal.s32',
+            'vmls.u8','vmlsal.u8',
+            'vmls.u16','vmlsal.u16',
+            'vmls.u32','vmlsal.u32',
+            'vmls.i8','vmlsal.i8',
+            'vmls.i16','vmlsal.i16',
+            'vmls.i32','vmlsal.i32',
+
+            'vmul.s8','vmulal.s8',
+            'vmul.s16','vmulal.s16',
+            'vmul.s32','vmulal.s32',
+            'vmul.u8','vmulal.u8',
+            'vmul.u16','vmulal.u16',
+            'vmul.u32','vmulal.u32',
+            'vmul.i8','vmulal.i8',
+            'vmul.i16','vmulal.i16',
+            'vmul.i32','vmulal.i32',
+            'vmul.p8','vmulal.p8',
+
+            'vrshrn.i16','vrshrnal.i16',
+            'vrshrn.i32','vrshrnal.i32',
+            'vrshrn.i64','vrshrnal.i64',
+
+            'vshrn.i16','vshrnal.i16',
+            'vshrn.i32','vshrnal.i32',
+            'vshrn.i64','vshrnal.i64',
+
+            'vshl.i8','vshlal.i8',
+            'vshl.i16','vshlal.i16',
+            'vshl.i32','vshlal.i32',
+            'vshl.i64','vshlal.i64',
+
+            'vshll.i8','vshllal.i8',
+            'vshll.i16','vshllal.i16',
+            'vshll.i32','vshllal.i32'
+            ),
+        /* Unconditional NEON SIMD Signed Integer Instructions */
+        24 => array(
+            'vaba.s8','vabaal.s8',
+            'vaba.s16','vabaal.s16',
+            'vaba.s32','vabaal.s32',
+
+            'vabal.s8','vabalal.s8',
+            'vabal.s16','vabalal.s16',
+            'vabal.s32','vabalal.s32',
+
+            'vabd.s8','vabdal.s8',
+            'vabd.s16','vabdal.s16',
+            'vabd.s32','vabdal.s32',
+
+            'vabs.s8','vabsal.s8',
+            'vabs.s16','vabsal.s16',
+            'vabs.s32','vabsal.s32',
+
+            'vaddl.s8','vaddlal.s8',
+            'vaddl.s16','vaddlal.s16',
+            'vaddl.s32','vaddlal.s32',
+
+            'vcge.s8','vcgeal.s8',
+            'vcge.s16','vcgeal.s16',
+            'vcge.s32','vcgeal.s32',
+
+            'vcle.s8','vcleal.s8',
+            'vcle.s16','vcleal.s16',
+            'vcle.s32','vcleal.s32',
+
+            'vcgt.s8','vcgtal.s8',
+            'vcgt.s16','vcgtal.s16',
+            'vcgt.s32','vcgtal.s32',
+
+            'vclt.s8','vcltal.s8',
+            'vclt.s16','vcltal.s16',
+            'vclt.s32','vcltal.s32',
+
+            'vcls.s8','vclsal.s8',
+            'vcls.s16','vclsal.s16',
+            'vcls.s32','vclsal.s32',
+
+            'vaddw.s8','vaddwal.s8',
+            'vaddw.s16','vaddwal.s16',
+            'vaddw.s32','vaddwal.s32',
+
+            'vhadd.s8','vhaddal.s8',
+            'vhadd.s16','vhaddal.s16',
+            'vhadd.s32','vhaddal.s32',
+
+            'vhsub.s8','vhsubal.s8',
+            'vhsub.s16','vhsubal.s16',
+            'vhsub.s32','vhsubal.s32',
+
+            'vmax.s8','vmaxal.s8',
+            'vmax.s16','vmaxal.s16',
+            'vmax.s32','vmaxal.s32',
+
+            'vmin.s8','vminal.s8',
+            'vmin.s16','vminal.s16',
+            'vmin.s32','vminal.s32',
+
+            'vmlal.s8','vmlalal.s8',
+            'vmlal.s16','vmlalal.s16',
+            'vmlal.s32','vmlalal.s32',
+
+            'vmlsl.s8','vmlslal.s8',
+            'vmlsl.s16','vmlslal.s16',
+            'vmlsl.s32','vmlslal.s32',
+
+            'vneg.s8','vnegal.s8',
+            'vneg.s16','vnegal.s16',
+            'vneg.s32','vnegal.s32',
+
+            'vpadal.s8','vpadalal.s8',
+            'vpadal.s16','vpadalal.s16',
+            'vpadal.s32','vpadalal.s32',
+
+            'vmovl.s8','vmovlal.s8',
+            'vmovl.s16','vmovlal.s16',
+            'vmovl.s32','vmovlal.s32',
+
+            'vmull.s8','vmullal.s8',
+            'vmull.s16','vmullal.s16',
+            'vmull.s32','vmullal.s32',
+
+            'vpaddl.s8','vpaddlal.s8',
+            'vpaddl.s16','vpaddlal.s16',
+            'vpaddl.s32','vpaddlal.s32',
+
+            'vpmax.s8','vpmaxal.s8',
+            'vpmax.s16','vpmaxal.s16',
+            'vpmax.s32','vpmaxal.s32',
+
+            'vpmin.s8','vpminal.s8',
+            'vpmin.s16','vpminal.s16',
+            'vpmin.s32','vpminal.s32',
+
+            'vqabs.s8','vqabsal.s8',
+            'vqabs.s16','vqabsal.s16',
+            'vqabs.s32','vqabsal.s32',
+
+            'vqadd.s8','vqaddal.s8',
+            'vqadd.s16','vqaddal.s16',
+            'vqadd.s32','vqaddal.s32',
+            'vqadd.s64','vqaddal.s64',
+
+            'vqdmlal.s16','vqdmlalal.s16',
+            'vqdmlal.s32','vqdmlalal.s32',
+
+            'vqdmlsl.s16','vqdmlslal.s16',
+            'vqdmlsl.s32','vqdmlslal.s32',
+
+            'vqdmulh.s16','vqdmulhal.s16',
+            'vqdmulh.s32','vqdmulhal.s32',
+
+            'vqdmull.s16','vqdmullal.s16',
+            'vqdmull.s32','vqdmullal.s32',
+
+            'vqmovn.s16','vqmovnal.s16',
+            'vqmovn.s32','vqmovnal.s32',
+            'vqmovn.s64','vqmovnal.s64',
+
+            'vqmovun.s16','vqmovunal.s16',
+            'vqmovun.s32','vqmovunal.s32',
+            'vqmovun.s64','vqmovunal.s64',
+
+            'vqneg.s8','vqnegal.s8',
+            'vqneg.s16','vqnegal.s16',
+            'vqneg.s32','vqnegal.s32',
+
+            'vqrdmulh.s16','vqrdmulhal.s16',
+            'vqrdmulh.s32','vqrdmulhal.s32',
+
+            'vqrshl.s8','vqrshlal.s8',
+            'vqrshl.s16','vqrshlal.s16',
+            'vqrshl.s32','vqrshlal.s32',
+            'vqrshl.s64','vqrshlal.s64',
+
+            'vqrshrn.s16','vqrshrnal.s16',
+            'vqrshrn.s32','vqrshrnal.s32',
+            'vqrshrn.s64','vqrshrnal.s64',
+
+            'vqrshrun.s16','vqrshrunal.s16',
+            'vqrshrun.s32','vqrshrunal.s32',
+            'vqrshrun.s64','vqrshrunal.s64',
+
+            'vqshl.s8','vqshlal.s8',
+            'vqshl.s16','vqshlal.s16',
+            'vqshl.s32','vqshlal.s32',
+            'vqshl.s64','vqshlal.s64',
+
+            'vqshlu.s8','vqshlual.s8',
+            'vqshlu.s16','vqshlual.s16',
+            'vqshlu.s32','vqshlual.s32',
+            'vqshlu.s64','vqshlual.s64',
+
+            'vqshrn.s16','vqshrnal.s16',
+            'vqshrn.s32','vqshrnal.s32',
+            'vqshrn.s64','vqshrnal.s64',
+
+            'vqshrun.s16','vqshrunal.s16',
+            'vqshrun.s32','vqshrunal.s32',
+            'vqshrun.s64','vqshrunal.s64',
+
+            'vqsub.s8','vqsubal.s8',
+            'vqsub.s16','vqsubal.s16',
+            'vqsub.s32','vqsubal.s32',
+            'vqsub.s64','vqsubal.s64',
+
+            'vrhadd.s8','vrhaddal.s8',
+            'vrhadd.s16','vrhaddal.s16',
+            'vrhadd.s32','vrhaddal.s32',
+
+            'vrshl.s8','vrshlal.s8',
+            'vrshl.s16','vrshlal.s16',
+            'vrshl.s32','vrshlal.s32',
+            'vrshl.s64','vrshlal.s64',
+
+            'vrshr.s8','vrshral.s8',
+            'vrshr.s16','vrshral.s16',
+            'vrshr.s32','vrshral.s32',
+            'vrshr.s64','vrshral.s64',
+
+            'vrsra.s8','vrsraal.s8',
+            'vrsra.s16','vrsraal.s16',
+            'vrsra.s32','vrsraal.s32',
+            'vrsra.s64','vrsraal.s64',
+
+            'vshl.s8','vshlal.s8',
+            'vshl.s16','vshlal.s16',
+            'vshl.s32','vshlal.s32',
+            'vshl.s64','vshlal.s64',
+
+            'vshll.s8','vshllal.s8',
+            'vshll.s16','vshllal.s16',
+            'vshll.s32','vshllal.s32',
+
+            'vshr.s8','vshral.s8',
+            'vshr.s16','vshral.s16',
+            'vshr.s32','vshral.s32',
+            'vshr.s64','vshral.s64',
+
+            'vsra.s8','vsraal.s8',
+            'vsra.s16','vsraal.s16',
+            'vsra.s32','vsraal.s32',
+            'vsra.s64','vsraal.s64',
+
+            'vsubl.s8','vsublal.s8',
+            'vsubl.s16','vsublal.s16',
+            'vsubl.s32','vsublal.s32',
+
+            'vsubh.s8','vsubhal.s8',
+            'vsubh.s16','vsubhal.s16',
+            'vsubh.s32','vsubhal.s32'
+            ),
+        /* Unconditional NEON SIMD Unsigned Integer Instructions */
+        25 => array(
+            'vaba.u8','vabaal.u8',
+            'vaba.u16','vabaal.u16',
+            'vaba.u32','vabaal.u32',
+
+            'vabal.u8','vabalal.u8',
+            'vabal.u16','vabalal.u16',
+            'vabal.u32','vabalal.u32',
+
+            'vabd.u8','vabdal.u8',
+            'vabd.u16','vabdal.u16',
+            'vabd.u32','vabdal.u32',
+
+            'vaddl.u8','vaddlal.u8',
+            'vaddl.u16','vaddlal.u16',
+            'vaddl.u32','vaddlal.u32',
+
+            'vsubl.u8','vsublal.u8',
+            'vsubl.u16','vsublal.u16',
+            'vsubl.u32','vsublal.u32',
+
+            'vaddw.u8','vaddwal.u8',
+            'vaddw.u16','vaddwal.u16',
+            'vaddw.u32','vaddwal.u32',
+
+            'vsubh.u8','vsubhal.u8',
+            'vsubh.u16','vsubhal.u16',
+            'vsubh.u32','vsubhal.u32',
+
+            'vhadd.u8','vhaddal.u8',
+            'vhadd.u16','vhaddal.u16',
+            'vhadd.u32','vhaddal.u32',
+
+            'vhsub.u8','vhsubal.u8',
+            'vhsub.u16','vhsubal.u16',
+            'vhsub.u32','vhsubal.u32',
+
+            'vpadal.u8','vpadalal.u8',
+            'vpadal.u16','vpadalal.u16',
+            'vpadal.u32','vpadalal.u32',
+
+            'vpaddl.u8','vpaddlal.u8',
+            'vpaddl.u16','vpaddlal.u16',
+            'vpaddl.u32','vpaddlal.u32',
+
+            'vcge.u8','vcgeal.u8',
+            'vcge.u16','vcgeal.u16',
+            'vcge.u32','vcgeal.u32',
+
+            'vcle.u8','vcleal.u8',
+            'vcle.u16','vcleal.u16',
+            'vcle.u32','vcleal.u32',
+
+            'vcgt.u8','vcgtal.u8',
+            'vcgt.u16','vcgtal.u16',
+            'vcgt.u32','vcgtal.u32',
+
+            'vclt.u8','vcltal.u8',
+            'vclt.u16','vcltal.u16',
+            'vclt.u32','vcltal.u32',
+
+            'vmax.u8','vmaxal.u8',
+            'vmax.u16','vmaxal.u16',
+            'vmax.u32','vmaxal.u32',
+
+            'vmin.u8','vminal.u8',
+            'vmin.u16','vminal.u16',
+            'vmin.u32','vminal.u32',
+
+            'vmlal.u8','vmlalal.u8',
+            'vmlal.u16','vmlalal.u16',
+            'vmlal.u32','vmlalal.u32',
+
+            'vmlsl.u8','vmlslal.u8',
+            'vmlsl.u16','vmlslal.u16',
+            'vmlsl.u32','vmlslal.u32',
+
+            'vmull.u8','vmullal.u8',
+            'vmull.u16','vmullal.u16',
+            'vmull.u32','vmullal.u32',
+
+            'vmovl.u8','vmovlal.u8',
+            'vmovl.u16','vmovlal.u16',
+            'vmovl.u32','vmovlal.u32',
+
+            'vshl.u8','vshlal.u8',
+            'vshl.u16','vshlal.u16',
+            'vshl.u32','vshlal.u32',
+            'vshl.u64','vshlal.u64',
+
+            'vshll.u8','vshllal.u8',
+            'vshll.u16','vshllal.u16',
+            'vshll.u32','vshllal.u32',
+
+            'vshr.u8','vshral.u8',
+            'vshr.u16','vshral.u16',
+            'vshr.u32','vshral.u32',
+            'vshr.u64','vshral.u64',
+
+            'vsra.u8','vsraal.u8',
+            'vsra.u16','vsraal.u16',
+            'vsra.u32','vsraal.u32',
+            'vsra.u64','vsraal.u64',
+
+            'vpmax.u8','vpmaxal.u8',
+            'vpmax.u16','vpmaxal.u16',
+            'vpmax.u32','vpmaxal.u32',
+
+            'vpmin.u8','vpminal.u8',
+            'vpmin.u16','vpminal.u16',
+            'vpmin.u32','vpminal.u32',
+
+            'vqadd.u8','vqaddal.u8',
+            'vqadd.u16','vqaddal.u16',
+            'vqadd.u32','vqaddal.u32',
+            'vqadd.u64','vqaddal.u64',
+
+            'vqsub.u8','vqsubal.u8',
+            'vqsub.u16','vqsubal.u16',
+            'vqsub.u32','vqsubal.u32',
+            'vqsub.u64','vqsubal.u64',
+
+            'vqmovn.u16','vqmovnal.u16',
+            'vqmovn.u32','vqmovnal.u32',
+            'vqmovn.u64','vqmovnal.u64',
+
+            'vqshl.u8','vqshlal.u8',
+            'vqshl.u16','vqshlal.u16',
+            'vqshl.u32','vqshlal.u32',
+            'vqshl.u64','vqshlal.u64',
+
+            'vqshrn.u16','vqshrnal.u16',
+            'vqshrn.u32','vqshrnal.u32',
+            'vqshrn.u64','vqshrnal.u64',
+
+            'vqrshl.u8','vqrshlal.u8',
+            'vqrshl.u16','vqrshlal.u16',
+            'vqrshl.u32','vqrshlal.u32',
+            'vqrshl.u64','vqrshlal.u64',
+
+            'vqrshrn.u16','vqrshrnal.u16',
+            'vqrshrn.u32','vqrshrnal.u32',
+            'vqrshrn.u64','vqrshrnal.u64',
+
+            'vrhadd.u8','vrhaddal.u8',
+            'vrhadd.u16','vrhaddal.u16',
+            'vrhadd.u32','vrhaddal.u32',
+
+            'vrshl.u8','vrshlal.u8',
+            'vrshl.u16','vrshlal.u16',
+            'vrshl.u32','vrshlal.u32',
+            'vrshl.u64','vrshlal.u64',
+
+            'vrshr.u8','vrshral.u8',
+            'vrshr.u16','vrshral.u16',
+            'vrshr.u32','vrshral.u32',
+            'vrshr.u64','vrshral.u64',
+
+            'vrsra.u8','vrsraal.u8',
+            'vrsra.u16','vrsraal.u16',
+            'vrsra.u32','vrsraal.u32',
+            'vrsra.u64','vrsraal.u64'
+            ),
+        /* Unconditional VFPv3 & NEON SIMD Floating-Point Instructions */
+        26 => array(
+            'vabd.f32','vabdal.f32',
+
+            'vabs.f32','vabsal.f32',
+            'vabs.f64','vabsal.f64',
+
+            'vacge.f32','vacgeal.f32',
+            'vacgt.f32','vacgtal.f32',
+            'vacle.f32','vacleal.f32',
+            'vaclt.f32','vacltal.f32',
+
+            'vadd.f32','vaddal.f32',
+            'vadd.f64','vaddal.f64',
+
+            'vceq.f32','vceqal.f32',
+            'vcge.f32','vcgeal.f32',
+            'vcle.f32','vcleal.f32',
+            'vcgt.f32','vcgtal.f32',
+            'vclt.f32','vcltal.f32',
+
+            'vcmp.f32','vcmpal.f32',
+            'vcmp.f64','vcmpal.f64',
+
+            'vcmpe.f32','vcmpeal.f32',
+            'vcmpe.f64','vcmpeal.f64',
+
+            'vcvt.s16.f32','vcvtal.s16.f32',
+            'vcvt.s16.f64','vcvtal.s16.f64',
+            'vcvt.s32.f32','vcvtal.s32.f32',
+            'vcvt.s32.f64','vcvtal.s32.f64',
+            'vcvt.u16.f32','vcvtal.u16.f32',
+            'vcvt.u16.f64','vcvtal.u16.f64',
+            'vcvt.u32.f32','vcvtal.u32.f32',
+            'vcvt.u32.f64','vcvtal.u32.f64',
+            'vcvt.f16.f32','vcvtal.f16.f32',
+            'vcvt.f32.s32','vcvtal.f32.s32',
+            'vcvt.f32.u32','vcvtal.f32.u32',
+            'vcvt.f32.f16','vcvtal.f32.f16',
+            'vcvt.f32.f64','vcvtal.f32.f64',
+            'vcvt.f64.s32','vcvtal.f64.s32',
+            'vcvt.f64.u32','vcvtal.f64.u32',
+            'vcvt.f64.f32','vcvtal.f64.f32',
+
+            'vcvtr.s32.f32','vcvtral.s32.f32',
+            'vcvtr.s32.f64','vcvtral.s32.f64',
+            'vcvtr.u32.f32','vcvtral.u32.f32',
+            'vcvtr.u32.f64','vcvtral.u32.f64',
+
+            'vcvtb.f16.f32','vcvtbal.f16.f32',
+            'vcvtb.f32.f16','vcvtbal.f32.f16',
+
+            'vcvtt.f16.f32','vcvttal.f16.f32',
+            'vcvtt.f32.f16','vcvttal.f32.f16',
+
+            'vdiv.f32','vdival.f32',
+            'vdiv.f64','vdival.f64',
+
+            'vmax.f32','vmaxal.f32',
+            'vmin.f32','vminal.f32',
+
+            'vmla.f32','vmlaal.f32',
+            'vmla.f64','vmlaal.f64',
+
+            'vmls.f32','vmlsal.f32',
+            'vmls.f64','vmlsal.f64',
+
+            'vmul.f32','vmulal.f32',
+            'vmul.f64','vmulal.f64',
+
+            'vneg.f32','vnegal.f32',
+            'vneg.f64','vnegal.f64',
+
+            'vnmla.f32','vnmlaal.f32',
+            'vnmla.f64','vnmlaal.f64',
+
+            'vnmls.f32','vnmlsal.f32',
+            'vnmls.f64','vnmlsal.f64',
+
+            'vnmul.f64','vnmulal.f64',
+            'vnmul.f32','vnmulal.f32',
+
+            'vpadd.f32','vpaddal.f32',
+
+            'vpmax.f32','vpmaxal.f32',
+            'vpmin.f32','vpminal.f32',
+
+            'vrecpe.u32','vrecpeal.u32',
+            'vrecpe.f32','vrecpeal.f32',
+            'vrecps.f32','vrecpsal.f32',
+
+            'vrsqrte.u32','vrsqrteal.u32',
+            'vrsqrte.f32','vrsqrteal.f32',
+            'vrsqrts.f32','vrsqrtsal.f32',
+
+            'vsqrt.f32','vsqrtal.f32',
+            'vsqrt.f64','vsqrtal.f64',
+
+            'vsub.f32','vsubal.f32',
+            'vsub.f64','vsubal.f64'
+            ),
+        /* Conditional VFPv3 & NEON SIMD Memory Access Instructions */
+        27 => array(
+            /* Conditional VFPv3 & NEON SIMD Memory Access: Loads */
+            'vldeq.8','vldne.8','vldcs.8','vldhs.8','vldcc.8','vldlo.8','vldmi.8','vldpl.8','vldvs.8','vldvc.8','vldhi.8','vldls.8','vldge.8','vldlt.8','vldgt.8','vldle.8',
+            'vldeq.16','vldne.16','vldcs.16','vldhs.16','vldcc.16','vldlo.16','vldmi.16','vldpl.16','vldvs.16','vldvc.16','vldhi.16','vldls.16','vldge.16','vldlt.16','vldgt.16','vldle.16',
+            'vldeq.32','vldne.32','vldcs.32','vldhs.32','vldcc.32','vldlo.32','vldmi.32','vldpl.32','vldvs.32','vldvc.32','vldhi.32','vldls.32','vldge.32','vldlt.32','vldgt.32','vldle.32',
+            'vldeq.64','vldne.64','vldcs.64','vldhs.64','vldcc.64','vldlo.64','vldmi.64','vldpl.64','vldvs.64','vldvc.64','vldhi.64','vldls.64','vldge.64','vldlt.64','vldgt.64','vldle.64',
+
+            'vld1eq.8','vld1ne.8','vld1cs.8','vld1hs.8','vld1cc.8','vld1lo.8','vld1mi.8','vld1pl.8','vld1vs.8','vld1vc.8','vld1hi.8','vld1ls.8','vld1ge.8','vld1lt.8','vld1gt.8','vld1le.8',
+            'vld1eq.16','vld1ne.16','vld1cs.16','vld1hs.16','vld1cc.16','vld1lo.16','vld1mi.16','vld1pl.16','vld1vs.16','vld1vc.16','vld1hi.16','vld1ls.16','vld1ge.16','vld1lt.16','vld1gt.16','vld1le.16',
+            'vld1eq.32','vld1ne.32','vld1cs.32','vld1hs.32','vld1cc.32','vld1lo.32','vld1mi.32','vld1pl.32','vld1vs.32','vld1vc.32','vld1hi.32','vld1ls.32','vld1ge.32','vld1lt.32','vld1gt.32','vld1le.32',
+
+            'vld2eq.8','vld2ne.8','vld2cs.8','vld2hs.8','vld2cc.8','vld2lo.8','vld2mi.8','vld2pl.8','vld2vs.8','vld2vc.8','vld2hi.8','vld2ls.8','vld2ge.8','vld2lt.8','vld2gt.8','vld2le.8',
+            'vld2eq.16','vld2ne.16','vld2cs.16','vld2hs.16','vld2cc.16','vld2lo.16','vld2mi.16','vld2pl.16','vld2vs.16','vld2vc.16','vld2hi.16','vld2ls.16','vld2ge.16','vld2lt.16','vld2gt.16','vld2le.16',
+            'vld2eq.32','vld2ne.32','vld2cs.32','vld2hs.32','vld2cc.32','vld2lo.32','vld2mi.32','vld2pl.32','vld2vs.32','vld2vc.32','vld2hi.32','vld2ls.32','vld2ge.32','vld2lt.32','vld2gt.32','vld2le.32',
+
+            'vld3eq.8','vld3ne.8','vld3cs.8','vld3hs.8','vld3cc.8','vld3lo.8','vld3mi.8','vld3pl.8','vld3vs.8','vld3vc.8','vld3hi.8','vld3ls.8','vld3ge.8','vld3lt.8','vld3gt.8','vld3le.8',
+            'vld3eq.16','vld3ne.16','vld3cs.16','vld3hs.16','vld3cc.16','vld3lo.16','vld3mi.16','vld3pl.16','vld3vs.16','vld3vc.16','vld3hi.16','vld3ls.16','vld3ge.16','vld3lt.16','vld3gt.16','vld3le.16',
+            'vld3eq.32','vld3ne.32','vld3cs.32','vld3hs.32','vld3cc.32','vld3lo.32','vld3mi.32','vld3pl.32','vld3vs.32','vld3vc.32','vld3hi.32','vld3ls.32','vld3ge.32','vld3lt.32','vld3gt.32','vld3le.32',
+
+            'vld4eq.8','vld4ne.8','vld4cs.8','vld4hs.8','vld4cc.8','vld4lo.8','vld4mi.8','vld4pl.8','vld4vs.8','vld4vc.8','vld4hi.8','vld4ls.8','vld4ge.8','vld4lt.8','vld4gt.8','vld4le.8',
+            'vld4eq.16','vld4ne.16','vld4cs.16','vld4hs.16','vld4cc.16','vld4lo.16','vld4mi.16','vld4pl.16','vld4vs.16','vld4vc.16','vld4hi.16','vld4ls.16','vld4ge.16','vld4lt.16','vld4gt.16','vld4le.16',
+            'vld4eq.32','vld4ne.32','vld4cs.32','vld4hs.32','vld4cc.32','vld4lo.32','vld4mi.32','vld4pl.32','vld4vs.32','vld4vc.32','vld4hi.32','vld4ls.32','vld4ge.32','vld4lt.32','vld4gt.32','vld4le.32',
+
+            'vldmeq','vldmne','vldmcs','vldmhs','vldmcc','vldmlo','vldmmi','vldmpl','vldmvs','vldmvc','vldmhi','vldmls','vldmge','vldmlt','vldmgt','vldmle',
+            'vldmeq.32','vldmne.32','vldmcs.32','vldmhs.32','vldmcc.32','vldmlo.32','vldmmi.32','vldmpl.32','vldmvs.32','vldmvc.32','vldmhi.32','vldmls.32','vldmge.32','vldmlt.32','vldmgt.32','vldmle.32',
+            'vldmeq.64','vldmne.64','vldmcs.64','vldmhs.64','vldmcc.64','vldmlo.64','vldmmi.64','vldmpl.64','vldmvs.64','vldmvc.64','vldmhi.64','vldmls.64','vldmge.64','vldmlt.64','vldmgt.64','vldmle.64',
+
+            'vldmiaeq','vldmiane','vldmiacs','vldmiahs','vldmiacc','vldmialo','vldmiami','vldmiapl','vldmiavs','vldmiavc','vldmiahi','vldmials','vldmiage','vldmialt','vldmiagt','vldmiale',
+            'vldmiaeq.32','vldmiane.32','vldmiacs.32','vldmiahs.32','vldmiacc.32','vldmialo.32','vldmiami.32','vldmiapl.32','vldmiavs.32','vldmiavc.32','vldmiahi.32','vldmials.32','vldmiage.32','vldmialt.32','vldmiagt.32','vldmiale.32',
+            'vldmiaeq.64','vldmiane.64','vldmiacs.64','vldmiahs.64','vldmiacc.64','vldmialo.64','vldmiami.64','vldmiapl.64','vldmiavs.64','vldmiavc.64','vldmiahi.64','vldmials.64','vldmiage.64','vldmialt.64','vldmiagt.64','vldmiale.64',
+
+            'vldmdbeq','vldmdbne','vldmdbcs','vldmdbhs','vldmdbcc','vldmdblo','vldmdbmi','vldmdbpl','vldmdbvs','vldmdbvc','vldmdbhi','vldmdbls','vldmdbge','vldmdblt','vldmdbgt','vldmdble',
+            'vldmdbeq.32','vldmdbne.32','vldmdbcs.32','vldmdbhs.32','vldmdbcc.32','vldmdblo.32','vldmdbmi.32','vldmdbpl.32','vldmdbvs.32','vldmdbvc.32','vldmdbhi.32','vldmdbls.32','vldmdbge.32','vldmdblt.32','vldmdbgt.32','vldmdble.32',
+            'vldmdbeq.64','vldmdbne.64','vldmdbcs.64','vldmdbhs.64','vldmdbcc.64','vldmdblo.64','vldmdbmi.64','vldmdbpl.64','vldmdbvs.64','vldmdbvc.64','vldmdbhi.64','vldmdbls.64','vldmdbge.64','vldmdblt.64','vldmdbgt.64','vldmdble.64',
+
+            'vldreq','vldrne','vldrcs','vldrhs','vldrcc','vldrlo','vldrmi','vldrpl','vldrvs','vldrvc','vldrhi','vldrls','vldrge','vldrlt','vldrgt','vldrle',
+            'vldreq.32','vldrne.32','vldrcs.32','vldrhs.32','vldrcc.32','vldrlo.32','vldrmi.32','vldrpl.32','vldrvs.32','vldrvc.32','vldrhi.32','vldrls.32','vldrge.32','vldrlt.32','vldrgt.32','vldrle.32',
+            'vldreq.64','vldrne.64','vldrcs.64','vldrhs.64','vldrcc.64','vldrlo.64','vldrmi.64','vldrpl.64','vldrvs.64','vldrvc.64','vldrhi.64','vldrls.64','vldrge.64','vldrlt.64','vldrgt.64','vldrle.64',
+
+            'vpopeq','vpopne','vpopcs','vpophs','vpopcc','vpoplo','vpopmi','vpoppl','vpopvs','vpopvc','vpophi','vpopls','vpopge','vpoplt','vpopgt','vpople',
+            'vpopeq.32','vpopne.32','vpopcs.32','vpophs.32','vpopcc.32','vpoplo.32','vpopmi.32','vpoppl.32','vpopvs.32','vpopvc.32','vpophi.32','vpopls.32','vpopge.32','vpoplt.32','vpopgt.32','vpople.32',
+            'vpopeq.64','vpopne.64','vpopcs.64','vpophs.64','vpopcc.64','vpoplo.64','vpopmi.64','vpoppl.64','vpopvs.64','vpopvc.64','vpophi.64','vpopls.64','vpopge.64','vpoplt.64','vpopgt.64','vpople.64',
+
+            /* Conditional VFPv3 & NEON SIMD Memory Access: Stores */
+            'vst1eq.8','vst1ne.8','vst1cs.8','vst1hs.8','vst1cc.8','vst1lo.8','vst1mi.8','vst1pl.8','vst1vs.8','vst1vc.8','vst1hi.8','vst1ls.8','vst1ge.8','vst1lt.8','vst1gt.8','vst1le.8',
+            'vst1eq.16','vst1ne.16','vst1cs.16','vst1hs.16','vst1cc.16','vst1lo.16','vst1mi.16','vst1pl.16','vst1vs.16','vst1vc.16','vst1hi.16','vst1ls.16','vst1ge.16','vst1lt.16','vst1gt.16','vst1le.16',
+            'vst1eq.32','vst1ne.32','vst1cs.32','vst1hs.32','vst1cc.32','vst1lo.32','vst1mi.32','vst1pl.32','vst1vs.32','vst1vc.32','vst1hi.32','vst1ls.32','vst1ge.32','vst1lt.32','vst1gt.32','vst1le.32',
+            'vst1eq.64','vst1ne.64','vst1cs.64','vst1hs.64','vst1cc.64','vst1lo.64','vst1mi.64','vst1pl.64','vst1vs.64','vst1vc.64','vst1hi.64','vst1ls.64','vst1ge.64','vst1lt.64','vst1gt.64','vst1le.64',
+
+            'vst2eq.8','vst2ne.8','vst2cs.8','vst2hs.8','vst2cc.8','vst2lo.8','vst2mi.8','vst2pl.8','vst2vs.8','vst2vc.8','vst2hi.8','vst2ls.8','vst2ge.8','vst2lt.8','vst2gt.8','vst2le.8',
+            'vst2eq.16','vst2ne.16','vst2cs.16','vst2hs.16','vst2cc.16','vst2lo.16','vst2mi.16','vst2pl.16','vst2vs.16','vst2vc.16','vst2hi.16','vst2ls.16','vst2ge.16','vst2lt.16','vst2gt.16','vst2le.16',
+            'vst2eq.32','vst2ne.32','vst2cs.32','vst2hs.32','vst2cc.32','vst2lo.32','vst2mi.32','vst2pl.32','vst2vs.32','vst2vc.32','vst2hi.32','vst2ls.32','vst2ge.32','vst2lt.32','vst2gt.32','vst2le.32',
+
+            'vst3eq.8','vst3ne.8','vst3cs.8','vst3hs.8','vst3cc.8','vst3lo.8','vst3mi.8','vst3pl.8','vst3vs.8','vst3vc.8','vst3hi.8','vst3ls.8','vst3ge.8','vst3lt.8','vst3gt.8','vst3le.8',
+            'vst3eq.16','vst3ne.16','vst3cs.16','vst3hs.16','vst3cc.16','vst3lo.16','vst3mi.16','vst3pl.16','vst3vs.16','vst3vc.16','vst3hi.16','vst3ls.16','vst3ge.16','vst3lt.16','vst3gt.16','vst3le.16',
+            'vst3eq.32','vst3ne.32','vst3cs.32','vst3hs.32','vst3cc.32','vst3lo.32','vst3mi.32','vst3pl.32','vst3vs.32','vst3vc.32','vst3hi.32','vst3ls.32','vst3ge.32','vst3lt.32','vst3gt.32','vst3le.32',
+
+            'vst4eq.8','vst4ne.8','vst4cs.8','vst4hs.8','vst4cc.8','vst4lo.8','vst4mi.8','vst4pl.8','vst4vs.8','vst4vc.8','vst4hi.8','vst4ls.8','vst4ge.8','vst4lt.8','vst4gt.8','vst4le.8',
+            'vst4eq.16','vst4ne.16','vst4cs.16','vst4hs.16','vst4cc.16','vst4lo.16','vst4mi.16','vst4pl.16','vst4vs.16','vst4vc.16','vst4hi.16','vst4ls.16','vst4ge.16','vst4lt.16','vst4gt.16','vst4le.16',
+            'vst4eq.32','vst4ne.32','vst4cs.32','vst4hs.32','vst4cc.32','vst4lo.32','vst4mi.32','vst4pl.32','vst4vs.32','vst4vc.32','vst4hi.32','vst4ls.32','vst4ge.32','vst4lt.32','vst4gt.32','vst4le.32',
+
+            'vstmeq','vstmne','vstmcs','vstmhs','vstmcc','vstmlo','vstmmi','vstmpl','vstmvs','vstmvc','vstmhi','vstmls','vstmge','vstmlt','vstmgt','vstmle',
+            'vstmeq.32','vstmne.32','vstmcs.32','vstmhs.32','vstmcc.32','vstmlo.32','vstmmi.32','vstmpl.32','vstmvs.32','vstmvc.32','vstmhi.32','vstmls.32','vstmge.32','vstmlt.32','vstmgt.32','vstmle.32',
+            'vstmeq.64','vstmne.64','vstmcs.64','vstmhs.64','vstmcc.64','vstmlo.64','vstmmi.64','vstmpl.64','vstmvs.64','vstmvc.64','vstmhi.64','vstmls.64','vstmge.64','vstmlt.64','vstmgt.64','vstmle.64',
+
+            'vstmiaeq','vstmiane','vstmiacs','vstmiahs','vstmiacc','vstmialo','vstmiami','vstmiapl','vstmiavs','vstmiavc','vstmiahi','vstmials','vstmiage','vstmialt','vstmiagt','vstmiale',
+            'vstmiaeq.32','vstmiane.32','vstmiacs.32','vstmiahs.32','vstmiacc.32','vstmialo.32','vstmiami.32','vstmiapl.32','vstmiavs.32','vstmiavc.32','vstmiahi.32','vstmials.32','vstmiage.32','vstmialt.32','vstmiagt.32','vstmiale.32',
+            'vstmiaeq.64','vstmiane.64','vstmiacs.64','vstmiahs.64','vstmiacc.64','vstmialo.64','vstmiami.64','vstmiapl.64','vstmiavs.64','vstmiavc.64','vstmiahi.64','vstmials.64','vstmiage.64','vstmialt.64','vstmiagt.64','vstmiale.64',
+
+            'vstmdbeq','vstmdbne','vstmdbcs','vstmdbhs','vstmdbcc','vstmdblo','vstmdbmi','vstmdbpl','vstmdbvs','vstmdbvc','vstmdbhi','vstmdbls','vstmdbge','vstmdblt','vstmdbgt','vstmdble',
+            'vstmdbeq.32','vstmdbne.32','vstmdbcs.32','vstmdbhs.32','vstmdbcc.32','vstmdblo.32','vstmdbmi.32','vstmdbpl.32','vstmdbvs.32','vstmdbvc.32','vstmdbhi.32','vstmdbls.32','vstmdbge.32','vstmdblt.32','vstmdbgt.32','vstmdble.32',
+            'vstmdbeq.64','vstmdbne.64','vstmdbcs.64','vstmdbhs.64','vstmdbcc.64','vstmdblo.64','vstmdbmi.64','vstmdbpl.64','vstmdbvs.64','vstmdbvc.64','vstmdbhi.64','vstmdbls.64','vstmdbge.64','vstmdblt.64','vstmdbgt.64','vstmdble.64',
+
+            'vstreq','vstrne','vstrcs','vstrhs','vstrcc','vstrlo','vstrmi','vstrpl','vstrvs','vstrvc','vstrhi','vstrls','vstrge','vstrlt','vstrgt','vstrle',
+            'vstreq.32','vstrne.32','vstrcs.32','vstrhs.32','vstrcc.32','vstrlo.32','vstrmi.32','vstrpl.32','vstrvs.32','vstrvc.32','vstrhi.32','vstrls.32','vstrge.32','vstrlt.32','vstrgt.32','vstrle.32',
+            'vstreq.64','vstrne.64','vstrcs.64','vstrhs.64','vstrcc.64','vstrlo.64','vstrmi.64','vstrpl.64','vstrvs.64','vstrvc.64','vstrhi.64','vstrls.64','vstrge.64','vstrlt.64','vstrgt.64','vstrle.64',
+
+            'vpusheq','vpushne','vpushcs','vpushhs','vpushcc','vpushlo','vpushmi','vpushpl','vpushvs','vpushvc','vpushhi','vpushls','vpushge','vpushlt','vpushgt','vpushle',
+            'vpusheq.32','vpushne.32','vpushcs.32','vpushhs.32','vpushcc.32','vpushlo.32','vpushmi.32','vpushpl.32','vpushvs.32','vpushvc.32','vpushhi.32','vpushls.32','vpushge.32','vpushlt.32','vpushgt.32','vpushle.32',
+            'vpusheq.64','vpushne.64','vpushcs.64','vpushhs.64','vpushcc.64','vpushlo.64','vpushmi.64','vpushpl.64','vpushvs.64','vpushvc.64','vpushhi.64','vpushls.64','vpushge.64','vpushlt.64','vpushgt.64','vpushle.64'
+            ),
+        /* Conditional NEON SIMD Logical Instructions */
+        28 => array(
+            'vandeq','vandne','vandcs','vandhs','vandcc','vandlo','vandmi','vandpl','vandvs','vandvc','vandhi','vandls','vandge','vandlt','vandgt','vandle',
+            'vandeq.i8','vandne.i8','vandcs.i8','vandhs.i8','vandcc.i8','vandlo.i8','vandmi.i8','vandpl.i8','vandvs.i8','vandvc.i8','vandhi.i8','vandls.i8','vandge.i8','vandlt.i8','vandgt.i8','vandle.i8',
+            'vandeq.i16','vandne.i16','vandcs.i16','vandhs.i16','vandcc.i16','vandlo.i16','vandmi.i16','vandpl.i16','vandvs.i16','vandvc.i16','vandhi.i16','vandls.i16','vandge.i16','vandlt.i16','vandgt.i16','vandle.i16',
+            'vandeq.i32','vandne.i32','vandcs.i32','vandhs.i32','vandcc.i32','vandlo.i32','vandmi.i32','vandpl.i32','vandvs.i32','vandvc.i32','vandhi.i32','vandls.i32','vandge.i32','vandlt.i32','vandgt.i32','vandle.i32',
+            'vandeq.i64','vandne.i64','vandcs.i64','vandhs.i64','vandcc.i64','vandlo.i64','vandmi.i64','vandpl.i64','vandvs.i64','vandvc.i64','vandhi.i64','vandls.i64','vandge.i64','vandlt.i64','vandgt.i64','vandle.i64',
+            'vandeq.s8','vandne.s8','vandcs.s8','vandhs.s8','vandcc.s8','vandlo.s8','vandmi.s8','vandpl.s8','vandvs.s8','vandvc.s8','vandhi.s8','vandls.s8','vandge.s8','vandlt.s8','vandgt.s8','vandle.s8',
+            'vandeq.s16','vandne.s16','vandcs.s16','vandhs.s16','vandcc.s16','vandlo.s16','vandmi.s16','vandpl.s16','vandvs.s16','vandvc.s16','vandhi.s16','vandls.s16','vandge.s16','vandlt.s16','vandgt.s16','vandle.s16',
+            'vandeq.s32','vandne.s32','vandcs.s32','vandhs.s32','vandcc.s32','vandlo.s32','vandmi.s32','vandpl.s32','vandvs.s32','vandvc.s32','vandhi.s32','vandls.s32','vandge.s32','vandlt.s32','vandgt.s32','vandle.s32',
+            'vandeq.s64','vandne.s64','vandcs.s64','vandhs.s64','vandcc.s64','vandlo.s64','vandmi.s64','vandpl.s64','vandvs.s64','vandvc.s64','vandhi.s64','vandls.s64','vandge.s64','vandlt.s64','vandgt.s64','vandle.s64',
+            'vandeq.u8','vandne.u8','vandcs.u8','vandhs.u8','vandcc.u8','vandlo.u8','vandmi.u8','vandpl.u8','vandvs.u8','vandvc.u8','vandhi.u8','vandls.u8','vandge.u8','vandlt.u8','vandgt.u8','vandle.u8',
+            'vandeq.u16','vandne.u16','vandcs.u16','vandhs.u16','vandcc.u16','vandlo.u16','vandmi.u16','vandpl.u16','vandvs.u16','vandvc.u16','vandhi.u16','vandls.u16','vandge.u16','vandlt.u16','vandgt.u16','vandle.u16',
+            'vandeq.u32','vandne.u32','vandcs.u32','vandhs.u32','vandcc.u32','vandlo.u32','vandmi.u32','vandpl.u32','vandvs.u32','vandvc.u32','vandhi.u32','vandls.u32','vandge.u32','vandlt.u32','vandgt.u32','vandle.u32',
+            'vandeq.u64','vandne.u64','vandcs.u64','vandhs.u64','vandcc.u64','vandlo.u64','vandmi.u64','vandpl.u64','vandvs.u64','vandvc.u64','vandhi.u64','vandls.u64','vandge.u64','vandlt.u64','vandgt.u64','vandle.u64',
+            'vandeq.f32','vandne.f32','vandcs.f32','vandhs.f32','vandcc.f32','vandlo.f32','vandmi.f32','vandpl.f32','vandvs.f32','vandvc.f32','vandhi.f32','vandls.f32','vandge.f32','vandlt.f32','vandgt.f32','vandle.f32',
+            'vandeq.f64','vandne.f64','vandcs.f64','vandhs.f64','vandcc.f64','vandlo.f64','vandmi.f64','vandpl.f64','vandvs.f64','vandvc.f64','vandhi.f64','vandls.f64','vandge.f64','vandlt.f64','vandgt.f64','vandle.f64',
+
+            'vbiceq','vbicne','vbiccs','vbichs','vbiccc','vbiclo','vbicmi','vbicpl','vbicvs','vbicvc','vbichi','vbicls','vbicge','vbiclt','vbicgt','vbicle',
+            'vbiceq.i8','vbicne.i8','vbiccs.i8','vbichs.i8','vbiccc.i8','vbiclo.i8','vbicmi.i8','vbicpl.i8','vbicvs.i8','vbicvc.i8','vbichi.i8','vbicls.i8','vbicge.i8','vbiclt.i8','vbicgt.i8','vbicle.i8',
+            'vbiceq.i16','vbicne.i16','vbiccs.i16','vbichs.i16','vbiccc.i16','vbiclo.i16','vbicmi.i16','vbicpl.i16','vbicvs.i16','vbicvc.i16','vbichi.i16','vbicls.i16','vbicge.i16','vbiclt.i16','vbicgt.i16','vbicle.i16',
+            'vbiceq.i32','vbicne.i32','vbiccs.i32','vbichs.i32','vbiccc.i32','vbiclo.i32','vbicmi.i32','vbicpl.i32','vbicvs.i32','vbicvc.i32','vbichi.i32','vbicls.i32','vbicge.i32','vbiclt.i32','vbicgt.i32','vbicle.i32',
+            'vbiceq.i64','vbicne.i64','vbiccs.i64','vbichs.i64','vbiccc.i64','vbiclo.i64','vbicmi.i64','vbicpl.i64','vbicvs.i64','vbicvc.i64','vbichi.i64','vbicls.i64','vbicge.i64','vbiclt.i64','vbicgt.i64','vbicle.i64',
+            'vbiceq.s8','vbicne.s8','vbiccs.s8','vbichs.s8','vbiccc.s8','vbiclo.s8','vbicmi.s8','vbicpl.s8','vbicvs.s8','vbicvc.s8','vbichi.s8','vbicls.s8','vbicge.s8','vbiclt.s8','vbicgt.s8','vbicle.s8',
+            'vbiceq.s16','vbicne.s16','vbiccs.s16','vbichs.s16','vbiccc.s16','vbiclo.s16','vbicmi.s16','vbicpl.s16','vbicvs.s16','vbicvc.s16','vbichi.s16','vbicls.s16','vbicge.s16','vbiclt.s16','vbicgt.s16','vbicle.s16',
+            'vbiceq.s32','vbicne.s32','vbiccs.s32','vbichs.s32','vbiccc.s32','vbiclo.s32','vbicmi.s32','vbicpl.s32','vbicvs.s32','vbicvc.s32','vbichi.s32','vbicls.s32','vbicge.s32','vbiclt.s32','vbicgt.s32','vbicle.s32',
+            'vbiceq.s64','vbicne.s64','vbiccs.s64','vbichs.s64','vbiccc.s64','vbiclo.s64','vbicmi.s64','vbicpl.s64','vbicvs.s64','vbicvc.s64','vbichi.s64','vbicls.s64','vbicge.s64','vbiclt.s64','vbicgt.s64','vbicle.s64',
+            'vbiceq.u8','vbicne.u8','vbiccs.u8','vbichs.u8','vbiccc.u8','vbiclo.u8','vbicmi.u8','vbicpl.u8','vbicvs.u8','vbicvc.u8','vbichi.u8','vbicls.u8','vbicge.u8','vbiclt.u8','vbicgt.u8','vbicle.u8',
+            'vbiceq.u16','vbicne.u16','vbiccs.u16','vbichs.u16','vbiccc.u16','vbiclo.u16','vbicmi.u16','vbicpl.u16','vbicvs.u16','vbicvc.u16','vbichi.u16','vbicls.u16','vbicge.u16','vbiclt.u16','vbicgt.u16','vbicle.u16',
+            'vbiceq.u32','vbicne.u32','vbiccs.u32','vbichs.u32','vbiccc.u32','vbiclo.u32','vbicmi.u32','vbicpl.u32','vbicvs.u32','vbicvc.u32','vbichi.u32','vbicls.u32','vbicge.u32','vbiclt.u32','vbicgt.u32','vbicle.u32',
+            'vbiceq.u64','vbicne.u64','vbiccs.u64','vbichs.u64','vbiccc.u64','vbiclo.u64','vbicmi.u64','vbicpl.u64','vbicvs.u64','vbicvc.u64','vbichi.u64','vbicls.u64','vbicge.u64','vbiclt.u64','vbicgt.u64','vbicle.u64',
+            'vbiceq.f32','vbicne.f32','vbiccs.f32','vbichs.f32','vbiccc.f32','vbiclo.f32','vbicmi.f32','vbicpl.f32','vbicvs.f32','vbicvc.f32','vbichi.f32','vbicls.f32','vbicge.f32','vbiclt.f32','vbicgt.f32','vbicle.f32',
+            'vbiceq.f64','vbicne.f64','vbiccs.f64','vbichs.f64','vbiccc.f64','vbiclo.f64','vbicmi.f64','vbicpl.f64','vbicvs.f64','vbicvc.f64','vbichi.f64','vbicls.f64','vbicge.f64','vbiclt.f64','vbicgt.f64','vbicle.f64',
+
+            'vbifeq','vbifne','vbifcs','vbifhs','vbifcc','vbiflo','vbifmi','vbifpl','vbifvs','vbifvc','vbifhi','vbifls','vbifge','vbiflt','vbifgt','vbifle',
+            'vbifeq.i8','vbifne.i8','vbifcs.i8','vbifhs.i8','vbifcc.i8','vbiflo.i8','vbifmi.i8','vbifpl.i8','vbifvs.i8','vbifvc.i8','vbifhi.i8','vbifls.i8','vbifge.i8','vbiflt.i8','vbifgt.i8','vbifle.i8',
+            'vbifeq.i16','vbifne.i16','vbifcs.i16','vbifhs.i16','vbifcc.i16','vbiflo.i16','vbifmi.i16','vbifpl.i16','vbifvs.i16','vbifvc.i16','vbifhi.i16','vbifls.i16','vbifge.i16','vbiflt.i16','vbifgt.i16','vbifle.i16',
+            'vbifeq.i32','vbifne.i32','vbifcs.i32','vbifhs.i32','vbifcc.i32','vbiflo.i32','vbifmi.i32','vbifpl.i32','vbifvs.i32','vbifvc.i32','vbifhi.i32','vbifls.i32','vbifge.i32','vbiflt.i32','vbifgt.i32','vbifle.i32',
+            'vbifeq.i64','vbifne.i64','vbifcs.i64','vbifhs.i64','vbifcc.i64','vbiflo.i64','vbifmi.i64','vbifpl.i64','vbifvs.i64','vbifvc.i64','vbifhi.i64','vbifls.i64','vbifge.i64','vbiflt.i64','vbifgt.i64','vbifle.i64',
+            'vbifeq.s8','vbifne.s8','vbifcs.s8','vbifhs.s8','vbifcc.s8','vbiflo.s8','vbifmi.s8','vbifpl.s8','vbifvs.s8','vbifvc.s8','vbifhi.s8','vbifls.s8','vbifge.s8','vbiflt.s8','vbifgt.s8','vbifle.s8',
+            'vbifeq.s16','vbifne.s16','vbifcs.s16','vbifhs.s16','vbifcc.s16','vbiflo.s16','vbifmi.s16','vbifpl.s16','vbifvs.s16','vbifvc.s16','vbifhi.s16','vbifls.s16','vbifge.s16','vbiflt.s16','vbifgt.s16','vbifle.s16',
+            'vbifeq.s32','vbifne.s32','vbifcs.s32','vbifhs.s32','vbifcc.s32','vbiflo.s32','vbifmi.s32','vbifpl.s32','vbifvs.s32','vbifvc.s32','vbifhi.s32','vbifls.s32','vbifge.s32','vbiflt.s32','vbifgt.s32','vbifle.s32',
+            'vbifeq.s64','vbifne.s64','vbifcs.s64','vbifhs.s64','vbifcc.s64','vbiflo.s64','vbifmi.s64','vbifpl.s64','vbifvs.s64','vbifvc.s64','vbifhi.s64','vbifls.s64','vbifge.s64','vbiflt.s64','vbifgt.s64','vbifle.s64',
+            'vbifeq.u8','vbifne.u8','vbifcs.u8','vbifhs.u8','vbifcc.u8','vbiflo.u8','vbifmi.u8','vbifpl.u8','vbifvs.u8','vbifvc.u8','vbifhi.u8','vbifls.u8','vbifge.u8','vbiflt.u8','vbifgt.u8','vbifle.u8',
+            'vbifeq.u16','vbifne.u16','vbifcs.u16','vbifhs.u16','vbifcc.u16','vbiflo.u16','vbifmi.u16','vbifpl.u16','vbifvs.u16','vbifvc.u16','vbifhi.u16','vbifls.u16','vbifge.u16','vbiflt.u16','vbifgt.u16','vbifle.u16',
+            'vbifeq.u32','vbifne.u32','vbifcs.u32','vbifhs.u32','vbifcc.u32','vbiflo.u32','vbifmi.u32','vbifpl.u32','vbifvs.u32','vbifvc.u32','vbifhi.u32','vbifls.u32','vbifge.u32','vbiflt.u32','vbifgt.u32','vbifle.u32',
+            'vbifeq.u64','vbifne.u64','vbifcs.u64','vbifhs.u64','vbifcc.u64','vbiflo.u64','vbifmi.u64','vbifpl.u64','vbifvs.u64','vbifvc.u64','vbifhi.u64','vbifls.u64','vbifge.u64','vbiflt.u64','vbifgt.u64','vbifle.u64',
+            'vbifeq.f32','vbifne.f32','vbifcs.f32','vbifhs.f32','vbifcc.f32','vbiflo.f32','vbifmi.f32','vbifpl.f32','vbifvs.f32','vbifvc.f32','vbifhi.f32','vbifls.f32','vbifge.f32','vbiflt.f32','vbifgt.f32','vbifle.f32',
+            'vbifeq.f64','vbifne.f64','vbifcs.f64','vbifhs.f64','vbifcc.f64','vbiflo.f64','vbifmi.f64','vbifpl.f64','vbifvs.f64','vbifvc.f64','vbifhi.f64','vbifls.f64','vbifge.f64','vbiflt.f64','vbifgt.f64','vbifle.f64',
+
+            'vbiteq','vbitne','vbitcs','vbiths','vbitcc','vbitlo','vbitmi','vbitpl','vbitvs','vbitvc','vbithi','vbitls','vbitge','vbitlt','vbitgt','vbitle',
+            'vbiteq.i8','vbitne.i8','vbitcs.i8','vbiths.i8','vbitcc.i8','vbitlo.i8','vbitmi.i8','vbitpl.i8','vbitvs.i8','vbitvc.i8','vbithi.i8','vbitls.i8','vbitge.i8','vbitlt.i8','vbitgt.i8','vbitle.i8',
+            'vbiteq.i16','vbitne.i16','vbitcs.i16','vbiths.i16','vbitcc.i16','vbitlo.i16','vbitmi.i16','vbitpl.i16','vbitvs.i16','vbitvc.i16','vbithi.i16','vbitls.i16','vbitge.i16','vbitlt.i16','vbitgt.i16','vbitle.i16',
+            'vbiteq.i32','vbitne.i32','vbitcs.i32','vbiths.i32','vbitcc.i32','vbitlo.i32','vbitmi.i32','vbitpl.i32','vbitvs.i32','vbitvc.i32','vbithi.i32','vbitls.i32','vbitge.i32','vbitlt.i32','vbitgt.i32','vbitle.i32',
+            'vbiteq.i64','vbitne.i64','vbitcs.i64','vbiths.i64','vbitcc.i64','vbitlo.i64','vbitmi.i64','vbitpl.i64','vbitvs.i64','vbitvc.i64','vbithi.i64','vbitls.i64','vbitge.i64','vbitlt.i64','vbitgt.i64','vbitle.i64',
+            'vbiteq.s8','vbitne.s8','vbitcs.s8','vbiths.s8','vbitcc.s8','vbitlo.s8','vbitmi.s8','vbitpl.s8','vbitvs.s8','vbitvc.s8','vbithi.s8','vbitls.s8','vbitge.s8','vbitlt.s8','vbitgt.s8','vbitle.s8',
+            'vbiteq.s16','vbitne.s16','vbitcs.s16','vbiths.s16','vbitcc.s16','vbitlo.s16','vbitmi.s16','vbitpl.s16','vbitvs.s16','vbitvc.s16','vbithi.s16','vbitls.s16','vbitge.s16','vbitlt.s16','vbitgt.s16','vbitle.s16',
+            'vbiteq.s32','vbitne.s32','vbitcs.s32','vbiths.s32','vbitcc.s32','vbitlo.s32','vbitmi.s32','vbitpl.s32','vbitvs.s32','vbitvc.s32','vbithi.s32','vbitls.s32','vbitge.s32','vbitlt.s32','vbitgt.s32','vbitle.s32',
+            'vbiteq.s64','vbitne.s64','vbitcs.s64','vbiths.s64','vbitcc.s64','vbitlo.s64','vbitmi.s64','vbitpl.s64','vbitvs.s64','vbitvc.s64','vbithi.s64','vbitls.s64','vbitge.s64','vbitlt.s64','vbitgt.s64','vbitle.s64',
+            'vbiteq.u8','vbitne.u8','vbitcs.u8','vbiths.u8','vbitcc.u8','vbitlo.u8','vbitmi.u8','vbitpl.u8','vbitvs.u8','vbitvc.u8','vbithi.u8','vbitls.u8','vbitge.u8','vbitlt.u8','vbitgt.u8','vbitle.u8',
+            'vbiteq.u16','vbitne.u16','vbitcs.u16','vbiths.u16','vbitcc.u16','vbitlo.u16','vbitmi.u16','vbitpl.u16','vbitvs.u16','vbitvc.u16','vbithi.u16','vbitls.u16','vbitge.u16','vbitlt.u16','vbitgt.u16','vbitle.u16',
+            'vbiteq.u32','vbitne.u32','vbitcs.u32','vbiths.u32','vbitcc.u32','vbitlo.u32','vbitmi.u32','vbitpl.u32','vbitvs.u32','vbitvc.u32','vbithi.u32','vbitls.u32','vbitge.u32','vbitlt.u32','vbitgt.u32','vbitle.u32',
+            'vbiteq.u64','vbitne.u64','vbitcs.u64','vbiths.u64','vbitcc.u64','vbitlo.u64','vbitmi.u64','vbitpl.u64','vbitvs.u64','vbitvc.u64','vbithi.u64','vbitls.u64','vbitge.u64','vbitlt.u64','vbitgt.u64','vbitle.u64',
+            'vbiteq.f32','vbitne.f32','vbitcs.f32','vbiths.f32','vbitcc.f32','vbitlo.f32','vbitmi.f32','vbitpl.f32','vbitvs.f32','vbitvc.f32','vbithi.f32','vbitls.f32','vbitge.f32','vbitlt.f32','vbitgt.f32','vbitle.f32',
+            'vbiteq.f64','vbitne.f64','vbitcs.f64','vbiths.f64','vbitcc.f64','vbitlo.f64','vbitmi.f64','vbitpl.f64','vbitvs.f64','vbitvc.f64','vbithi.f64','vbitls.f64','vbitge.f64','vbitlt.f64','vbitgt.f64','vbitle.f64',
+
+            'vbsleq','vbslne','vbslcs','vbslhs','vbslcc','vbsllo','vbslmi','vbslpl','vbslvs','vbslvc','vbslhi','vbslls','vbslge','vbsllt','vbslgt','vbslle',
+            'vbsleq.i8','vbslne.i8','vbslcs.i8','vbslhs.i8','vbslcc.i8','vbsllo.i8','vbslmi.i8','vbslpl.i8','vbslvs.i8','vbslvc.i8','vbslhi.i8','vbslls.i8','vbslge.i8','vbsllt.i8','vbslgt.i8','vbslle.i8',
+            'vbsleq.i16','vbslne.i16','vbslcs.i16','vbslhs.i16','vbslcc.i16','vbsllo.i16','vbslmi.i16','vbslpl.i16','vbslvs.i16','vbslvc.i16','vbslhi.i16','vbslls.i16','vbslge.i16','vbsllt.i16','vbslgt.i16','vbslle.i16',
+            'vbsleq.i32','vbslne.i32','vbslcs.i32','vbslhs.i32','vbslcc.i32','vbsllo.i32','vbslmi.i32','vbslpl.i32','vbslvs.i32','vbslvc.i32','vbslhi.i32','vbslls.i32','vbslge.i32','vbsllt.i32','vbslgt.i32','vbslle.i32',
+            'vbsleq.i64','vbslne.i64','vbslcs.i64','vbslhs.i64','vbslcc.i64','vbsllo.i64','vbslmi.i64','vbslpl.i64','vbslvs.i64','vbslvc.i64','vbslhi.i64','vbslls.i64','vbslge.i64','vbsllt.i64','vbslgt.i64','vbslle.i64',
+            'vbsleq.s8','vbslne.s8','vbslcs.s8','vbslhs.s8','vbslcc.s8','vbsllo.s8','vbslmi.s8','vbslpl.s8','vbslvs.s8','vbslvc.s8','vbslhi.s8','vbslls.s8','vbslge.s8','vbsllt.s8','vbslgt.s8','vbslle.s8',
+            'vbsleq.s16','vbslne.s16','vbslcs.s16','vbslhs.s16','vbslcc.s16','vbsllo.s16','vbslmi.s16','vbslpl.s16','vbslvs.s16','vbslvc.s16','vbslhi.s16','vbslls.s16','vbslge.s16','vbsllt.s16','vbslgt.s16','vbslle.s16',
+            'vbsleq.s32','vbslne.s32','vbslcs.s32','vbslhs.s32','vbslcc.s32','vbsllo.s32','vbslmi.s32','vbslpl.s32','vbslvs.s32','vbslvc.s32','vbslhi.s32','vbslls.s32','vbslge.s32','vbsllt.s32','vbslgt.s32','vbslle.s32',
+            'vbsleq.s64','vbslne.s64','vbslcs.s64','vbslhs.s64','vbslcc.s64','vbsllo.s64','vbslmi.s64','vbslpl.s64','vbslvs.s64','vbslvc.s64','vbslhi.s64','vbslls.s64','vbslge.s64','vbsllt.s64','vbslgt.s64','vbslle.s64',
+            'vbsleq.u8','vbslne.u8','vbslcs.u8','vbslhs.u8','vbslcc.u8','vbsllo.u8','vbslmi.u8','vbslpl.u8','vbslvs.u8','vbslvc.u8','vbslhi.u8','vbslls.u8','vbslge.u8','vbsllt.u8','vbslgt.u8','vbslle.u8',
+            'vbsleq.u16','vbslne.u16','vbslcs.u16','vbslhs.u16','vbslcc.u16','vbsllo.u16','vbslmi.u16','vbslpl.u16','vbslvs.u16','vbslvc.u16','vbslhi.u16','vbslls.u16','vbslge.u16','vbsllt.u16','vbslgt.u16','vbslle.u16',
+            'vbsleq.u32','vbslne.u32','vbslcs.u32','vbslhs.u32','vbslcc.u32','vbsllo.u32','vbslmi.u32','vbslpl.u32','vbslvs.u32','vbslvc.u32','vbslhi.u32','vbslls.u32','vbslge.u32','vbsllt.u32','vbslgt.u32','vbslle.u32',
+            'vbsleq.u64','vbslne.u64','vbslcs.u64','vbslhs.u64','vbslcc.u64','vbsllo.u64','vbslmi.u64','vbslpl.u64','vbslvs.u64','vbslvc.u64','vbslhi.u64','vbslls.u64','vbslge.u64','vbsllt.u64','vbslgt.u64','vbslle.u64',
+            'vbsleq.f32','vbslne.f32','vbslcs.f32','vbslhs.f32','vbslcc.f32','vbsllo.f32','vbslmi.f32','vbslpl.f32','vbslvs.f32','vbslvc.f32','vbslhi.f32','vbslls.f32','vbslge.f32','vbsllt.f32','vbslgt.f32','vbslle.f32',
+            'vbsleq.f64','vbslne.f64','vbslcs.f64','vbslhs.f64','vbslcc.f64','vbsllo.f64','vbslmi.f64','vbslpl.f64','vbslvs.f64','vbslvc.f64','vbslhi.f64','vbslls.f64','vbslge.f64','vbsllt.f64','vbslgt.f64','vbslle.f64',
+
+            'veoreq','veorne','veorcs','veorhs','veorcc','veorlo','veormi','veorpl','veorvs','veorvc','veorhi','veorls','veorge','veorlt','veorgt','veorle',
+            'veoreq.i8','veorne.i8','veorcs.i8','veorhs.i8','veorcc.i8','veorlo.i8','veormi.i8','veorpl.i8','veorvs.i8','veorvc.i8','veorhi.i8','veorls.i8','veorge.i8','veorlt.i8','veorgt.i8','veorle.i8',
+            'veoreq.i16','veorne.i16','veorcs.i16','veorhs.i16','veorcc.i16','veorlo.i16','veormi.i16','veorpl.i16','veorvs.i16','veorvc.i16','veorhi.i16','veorls.i16','veorge.i16','veorlt.i16','veorgt.i16','veorle.i16',
+            'veoreq.i32','veorne.i32','veorcs.i32','veorhs.i32','veorcc.i32','veorlo.i32','veormi.i32','veorpl.i32','veorvs.i32','veorvc.i32','veorhi.i32','veorls.i32','veorge.i32','veorlt.i32','veorgt.i32','veorle.i32',
+            'veoreq.i64','veorne.i64','veorcs.i64','veorhs.i64','veorcc.i64','veorlo.i64','veormi.i64','veorpl.i64','veorvs.i64','veorvc.i64','veorhi.i64','veorls.i64','veorge.i64','veorlt.i64','veorgt.i64','veorle.i64',
+            'veoreq.s8','veorne.s8','veorcs.s8','veorhs.s8','veorcc.s8','veorlo.s8','veormi.s8','veorpl.s8','veorvs.s8','veorvc.s8','veorhi.s8','veorls.s8','veorge.s8','veorlt.s8','veorgt.s8','veorle.s8',
+            'veoreq.s16','veorne.s16','veorcs.s16','veorhs.s16','veorcc.s16','veorlo.s16','veormi.s16','veorpl.s16','veorvs.s16','veorvc.s16','veorhi.s16','veorls.s16','veorge.s16','veorlt.s16','veorgt.s16','veorle.s16',
+            'veoreq.s32','veorne.s32','veorcs.s32','veorhs.s32','veorcc.s32','veorlo.s32','veormi.s32','veorpl.s32','veorvs.s32','veorvc.s32','veorhi.s32','veorls.s32','veorge.s32','veorlt.s32','veorgt.s32','veorle.s32',
+            'veoreq.s64','veorne.s64','veorcs.s64','veorhs.s64','veorcc.s64','veorlo.s64','veormi.s64','veorpl.s64','veorvs.s64','veorvc.s64','veorhi.s64','veorls.s64','veorge.s64','veorlt.s64','veorgt.s64','veorle.s64',
+            'veoreq.u8','veorne.u8','veorcs.u8','veorhs.u8','veorcc.u8','veorlo.u8','veormi.u8','veorpl.u8','veorvs.u8','veorvc.u8','veorhi.u8','veorls.u8','veorge.u8','veorlt.u8','veorgt.u8','veorle.u8',
+            'veoreq.u16','veorne.u16','veorcs.u16','veorhs.u16','veorcc.u16','veorlo.u16','veormi.u16','veorpl.u16','veorvs.u16','veorvc.u16','veorhi.u16','veorls.u16','veorge.u16','veorlt.u16','veorgt.u16','veorle.u16',
+            'veoreq.u32','veorne.u32','veorcs.u32','veorhs.u32','veorcc.u32','veorlo.u32','veormi.u32','veorpl.u32','veorvs.u32','veorvc.u32','veorhi.u32','veorls.u32','veorge.u32','veorlt.u32','veorgt.u32','veorle.u32',
+            'veoreq.u64','veorne.u64','veorcs.u64','veorhs.u64','veorcc.u64','veorlo.u64','veormi.u64','veorpl.u64','veorvs.u64','veorvc.u64','veorhi.u64','veorls.u64','veorge.u64','veorlt.u64','veorgt.u64','veorle.u64',
+            'veoreq.f32','veorne.f32','veorcs.f32','veorhs.f32','veorcc.f32','veorlo.f32','veormi.f32','veorpl.f32','veorvs.f32','veorvc.f32','veorhi.f32','veorls.f32','veorge.f32','veorlt.f32','veorgt.f32','veorle.f32',
+            'veoreq.f64','veorne.f64','veorcs.f64','veorhs.f64','veorcc.f64','veorlo.f64','veormi.f64','veorpl.f64','veorvs.f64','veorvc.f64','veorhi.f64','veorls.f64','veorge.f64','veorlt.f64','veorgt.f64','veorle.f64',
+
+            'vmoveq','vmovne','vmovcs','vmovhs','vmovcc','vmovlo','vmovmi','vmovpl','vmovvs','vmovvc','vmovhi','vmovls','vmovge','vmovlt','vmovgt','vmovle',
+            'vmoveq.8','vmovne.8','vmovcs.8','vmovhs.8','vmovcc.8','vmovlo.8','vmovmi.8','vmovpl.8','vmovvs.8','vmovvc.8','vmovhi.8','vmovls.8','vmovge.8','vmovlt.8','vmovgt.8','vmovle.8',
+            'vmoveq.16','vmovne.16','vmovcs.16','vmovhs.16','vmovcc.16','vmovlo.16','vmovmi.16','vmovpl.16','vmovvs.16','vmovvc.16','vmovhi.16','vmovls.16','vmovge.16','vmovlt.16','vmovgt.16','vmovle.16',
+            'vmoveq.32','vmovne.32','vmovcs.32','vmovhs.32','vmovcc.32','vmovlo.32','vmovmi.32','vmovpl.32','vmovvs.32','vmovvc.32','vmovhi.32','vmovls.32','vmovge.32','vmovlt.32','vmovgt.32','vmovle.32',
+            'vmoveq.i8','vmovne.i8','vmovcs.i8','vmovhs.i8','vmovcc.i8','vmovlo.i8','vmovmi.i8','vmovpl.i8','vmovvs.i8','vmovvc.i8','vmovhi.i8','vmovls.i8','vmovge.i8','vmovlt.i8','vmovgt.i8','vmovle.i8',
+            'vmoveq.i16','vmovne.i16','vmovcs.i16','vmovhs.i16','vmovcc.i16','vmovlo.i16','vmovmi.i16','vmovpl.i16','vmovvs.i16','vmovvc.i16','vmovhi.i16','vmovls.i16','vmovge.i16','vmovlt.i16','vmovgt.i16','vmovle.i16',
+            'vmoveq.i32','vmovne.i32','vmovcs.i32','vmovhs.i32','vmovcc.i32','vmovlo.i32','vmovmi.i32','vmovpl.i32','vmovvs.i32','vmovvc.i32','vmovhi.i32','vmovls.i32','vmovge.i32','vmovlt.i32','vmovgt.i32','vmovle.i32',
+            'vmoveq.i64','vmovne.i64','vmovcs.i64','vmovhs.i64','vmovcc.i64','vmovlo.i64','vmovmi.i64','vmovpl.i64','vmovvs.i64','vmovvc.i64','vmovhi.i64','vmovls.i64','vmovge.i64','vmovlt.i64','vmovgt.i64','vmovle.i64',
+            'vmoveq.f32','vmovne.f32','vmovcs.f32','vmovhs.f32','vmovcc.f32','vmovlo.f32','vmovmi.f32','vmovpl.f32','vmovvs.f32','vmovvc.f32','vmovhi.f32','vmovls.f32','vmovge.f32','vmovlt.f32','vmovgt.f32','vmovle.f32',
+            'vmoveq.f64','vmovne.f64','vmovcs.f64','vmovhs.f64','vmovcc.f64','vmovlo.f64','vmovmi.f64','vmovpl.f64','vmovvs.f64','vmovvc.f64','vmovhi.f64','vmovls.f64','vmovge.f64','vmovlt.f64','vmovgt.f64','vmovle.f64',
+
+            'vmvneq','vmvnne','vmvncs','vmvnhs','vmvncc','vmvnlo','vmvnmi','vmvnpl','vmvnvs','vmvnvc','vmvnhi','vmvnls','vmvnge','vmvnlt','vmvngt','vmvnle',
+            'vmvneq.s8','vmvnne.s8','vmvncs.s8','vmvnhs.s8','vmvncc.s8','vmvnlo.s8','vmvnmi.s8','vmvnpl.s8','vmvnvs.s8','vmvnvc.s8','vmvnhi.s8','vmvnls.s8','vmvnge.s8','vmvnlt.s8','vmvngt.s8','vmvnle.s8',
+            'vmvneq.s16','vmvnne.s16','vmvncs.s16','vmvnhs.s16','vmvncc.s16','vmvnlo.s16','vmvnmi.s16','vmvnpl.s16','vmvnvs.s16','vmvnvc.s16','vmvnhi.s16','vmvnls.s16','vmvnge.s16','vmvnlt.s16','vmvngt.s16','vmvnle.s16',
+            'vmvneq.s32','vmvnne.s32','vmvncs.s32','vmvnhs.s32','vmvncc.s32','vmvnlo.s32','vmvnmi.s32','vmvnpl.s32','vmvnvs.s32','vmvnvc.s32','vmvnhi.s32','vmvnls.s32','vmvnge.s32','vmvnlt.s32','vmvngt.s32','vmvnle.s32',
+            'vmvneq.s64','vmvnne.s64','vmvncs.s64','vmvnhs.s64','vmvncc.s64','vmvnlo.s64','vmvnmi.s64','vmvnpl.s64','vmvnvs.s64','vmvnvc.s64','vmvnhi.s64','vmvnls.s64','vmvnge.s64','vmvnlt.s64','vmvngt.s64','vmvnle.s64',
+            'vmvneq.u8','vmvnne.u8','vmvncs.u8','vmvnhs.u8','vmvncc.u8','vmvnlo.u8','vmvnmi.u8','vmvnpl.u8','vmvnvs.u8','vmvnvc.u8','vmvnhi.u8','vmvnls.u8','vmvnge.u8','vmvnlt.u8','vmvngt.u8','vmvnle.u8',
+            'vmvneq.u16','vmvnne.u16','vmvncs.u16','vmvnhs.u16','vmvncc.u16','vmvnlo.u16','vmvnmi.u16','vmvnpl.u16','vmvnvs.u16','vmvnvc.u16','vmvnhi.u16','vmvnls.u16','vmvnge.u16','vmvnlt.u16','vmvngt.u16','vmvnle.u16',
+            'vmvneq.u32','vmvnne.u32','vmvncs.u32','vmvnhs.u32','vmvncc.u32','vmvnlo.u32','vmvnmi.u32','vmvnpl.u32','vmvnvs.u32','vmvnvc.u32','vmvnhi.u32','vmvnls.u32','vmvnge.u32','vmvnlt.u32','vmvngt.u32','vmvnle.u32',
+            'vmvneq.u64','vmvnne.u64','vmvncs.u64','vmvnhs.u64','vmvncc.u64','vmvnlo.u64','vmvnmi.u64','vmvnpl.u64','vmvnvs.u64','vmvnvc.u64','vmvnhi.u64','vmvnls.u64','vmvnge.u64','vmvnlt.u64','vmvngt.u64','vmvnle.u64',
+            'vmvneq.i8','vmvnne.i8','vmvncs.i8','vmvnhs.i8','vmvncc.i8','vmvnlo.i8','vmvnmi.i8','vmvnpl.i8','vmvnvs.i8','vmvnvc.i8','vmvnhi.i8','vmvnls.i8','vmvnge.i8','vmvnlt.i8','vmvngt.i8','vmvnle.i8',
+            'vmvneq.i16','vmvnne.i16','vmvncs.i16','vmvnhs.i16','vmvncc.i16','vmvnlo.i16','vmvnmi.i16','vmvnpl.i16','vmvnvs.i16','vmvnvc.i16','vmvnhi.i16','vmvnls.i16','vmvnge.i16','vmvnlt.i16','vmvngt.i16','vmvnle.i16',
+            'vmvneq.i32','vmvnne.i32','vmvncs.i32','vmvnhs.i32','vmvncc.i32','vmvnlo.i32','vmvnmi.i32','vmvnpl.i32','vmvnvs.i32','vmvnvc.i32','vmvnhi.i32','vmvnls.i32','vmvnge.i32','vmvnlt.i32','vmvngt.i32','vmvnle.i32',
+            'vmvneq.i64','vmvnne.i64','vmvncs.i64','vmvnhs.i64','vmvncc.i64','vmvnlo.i64','vmvnmi.i64','vmvnpl.i64','vmvnvs.i64','vmvnvc.i64','vmvnhi.i64','vmvnls.i64','vmvnge.i64','vmvnlt.i64','vmvngt.i64','vmvnle.i64',
+            'vmvneq.f32','vmvnne.f32','vmvncs.f32','vmvnhs.f32','vmvncc.f32','vmvnlo.f32','vmvnmi.f32','vmvnpl.f32','vmvnvs.f32','vmvnvc.f32','vmvnhi.f32','vmvnls.f32','vmvnge.f32','vmvnlt.f32','vmvngt.f32','vmvnle.f32',
+            'vmvneq.f64','vmvnne.f64','vmvncs.f64','vmvnhs.f64','vmvncc.f64','vmvnlo.f64','vmvnmi.f64','vmvnpl.f64','vmvnvs.f64','vmvnvc.f64','vmvnhi.f64','vmvnls.f64','vmvnge.f64','vmvnlt.f64','vmvngt.f64','vmvnle.f64',
+
+            'vorneq','vornne','vorncs','vornhs','vorncc','vornlo','vornmi','vornpl','vornvs','vornvc','vornhi','vornls','vornge','vornlt','vorngt','vornle',
+            'vorneq.s8','vornne.s8','vorncs.s8','vornhs.s8','vorncc.s8','vornlo.s8','vornmi.s8','vornpl.s8','vornvs.s8','vornvc.s8','vornhi.s8','vornls.s8','vornge.s8','vornlt.s8','vorngt.s8','vornle.s8',
+            'vorneq.s16','vornne.s16','vorncs.s16','vornhs.s16','vorncc.s16','vornlo.s16','vornmi.s16','vornpl.s16','vornvs.s16','vornvc.s16','vornhi.s16','vornls.s16','vornge.s16','vornlt.s16','vorngt.s16','vornle.s16',
+            'vorneq.s32','vornne.s32','vorncs.s32','vornhs.s32','vorncc.s32','vornlo.s32','vornmi.s32','vornpl.s32','vornvs.s32','vornvc.s32','vornhi.s32','vornls.s32','vornge.s32','vornlt.s32','vorngt.s32','vornle.s32',
+            'vorneq.s64','vornne.s64','vorncs.s64','vornhs.s64','vorncc.s64','vornlo.s64','vornmi.s64','vornpl.s64','vornvs.s64','vornvc.s64','vornhi.s64','vornls.s64','vornge.s64','vornlt.s64','vorngt.s64','vornle.s64',
+            'vorneq.u8','vornne.u8','vorncs.u8','vornhs.u8','vorncc.u8','vornlo.u8','vornmi.u8','vornpl.u8','vornvs.u8','vornvc.u8','vornhi.u8','vornls.u8','vornge.u8','vornlt.u8','vorngt.u8','vornle.u8',
+            'vorneq.u16','vornne.u16','vorncs.u16','vornhs.u16','vorncc.u16','vornlo.u16','vornmi.u16','vornpl.u16','vornvs.u16','vornvc.u16','vornhi.u16','vornls.u16','vornge.u16','vornlt.u16','vorngt.u16','vornle.u16',
+            'vorneq.u32','vornne.u32','vorncs.u32','vornhs.u32','vorncc.u32','vornlo.u32','vornmi.u32','vornpl.u32','vornvs.u32','vornvc.u32','vornhi.u32','vornls.u32','vornge.u32','vornlt.u32','vorngt.u32','vornle.u32',
+            'vorneq.u64','vornne.u64','vorncs.u64','vornhs.u64','vorncc.u64','vornlo.u64','vornmi.u64','vornpl.u64','vornvs.u64','vornvc.u64','vornhi.u64','vornls.u64','vornge.u64','vornlt.u64','vorngt.u64','vornle.u64',
+            'vorneq.i8','vornne.i8','vorncs.i8','vornhs.i8','vorncc.i8','vornlo.i8','vornmi.i8','vornpl.i8','vornvs.i8','vornvc.i8','vornhi.i8','vornls.i8','vornge.i8','vornlt.i8','vorngt.i8','vornle.i8',
+            'vorneq.i16','vornne.i16','vorncs.i16','vornhs.i16','vorncc.i16','vornlo.i16','vornmi.i16','vornpl.i16','vornvs.i16','vornvc.i16','vornhi.i16','vornls.i16','vornge.i16','vornlt.i16','vorngt.i16','vornle.i16',
+            'vorneq.i32','vornne.i32','vorncs.i32','vornhs.i32','vorncc.i32','vornlo.i32','vornmi.i32','vornpl.i32','vornvs.i32','vornvc.i32','vornhi.i32','vornls.i32','vornge.i32','vornlt.i32','vorngt.i32','vornle.i32',
+            'vorneq.i64','vornne.i64','vorncs.i64','vornhs.i64','vorncc.i64','vornlo.i64','vornmi.i64','vornpl.i64','vornvs.i64','vornvc.i64','vornhi.i64','vornls.i64','vornge.i64','vornlt.i64','vorngt.i64','vornle.i64',
+            'vorneq.f32','vornne.f32','vorncs.f32','vornhs.f32','vorncc.f32','vornlo.f32','vornmi.f32','vornpl.f32','vornvs.f32','vornvc.f32','vornhi.f32','vornls.f32','vornge.f32','vornlt.f32','vorngt.f32','vornle.f32',
+            'vorneq.f64','vornne.f64','vorncs.f64','vornhs.f64','vorncc.f64','vornlo.f64','vornmi.f64','vornpl.f64','vornvs.f64','vornvc.f64','vornhi.f64','vornls.f64','vornge.f64','vornlt.f64','vorngt.f64','vornle.f64',
+
+            'vorreq','vorrne','vorrcs','vorrhs','vorrcc','vorrlo','vorrmi','vorrpl','vorrvs','vorrvc','vorrhi','vorrls','vorrge','vorrlt','vorrgt','vorrle',
+            'vorreq.s8','vorrne.s8','vorrcs.s8','vorrhs.s8','vorrcc.s8','vorrlo.s8','vorrmi.s8','vorrpl.s8','vorrvs.s8','vorrvc.s8','vorrhi.s8','vorrls.s8','vorrge.s8','vorrlt.s8','vorrgt.s8','vorrle.s8',
+            'vorreq.s16','vorrne.s16','vorrcs.s16','vorrhs.s16','vorrcc.s16','vorrlo.s16','vorrmi.s16','vorrpl.s16','vorrvs.s16','vorrvc.s16','vorrhi.s16','vorrls.s16','vorrge.s16','vorrlt.s16','vorrgt.s16','vorrle.s16',
+            'vorreq.s32','vorrne.s32','vorrcs.s32','vorrhs.s32','vorrcc.s32','vorrlo.s32','vorrmi.s32','vorrpl.s32','vorrvs.s32','vorrvc.s32','vorrhi.s32','vorrls.s32','vorrge.s32','vorrlt.s32','vorrgt.s32','vorrle.s32',
+            'vorreq.s64','vorrne.s64','vorrcs.s64','vorrhs.s64','vorrcc.s64','vorrlo.s64','vorrmi.s64','vorrpl.s64','vorrvs.s64','vorrvc.s64','vorrhi.s64','vorrls.s64','vorrge.s64','vorrlt.s64','vorrgt.s64','vorrle.s64',
+            'vorreq.u8','vorrne.u8','vorrcs.u8','vorrhs.u8','vorrcc.u8','vorrlo.u8','vorrmi.u8','vorrpl.u8','vorrvs.u8','vorrvc.u8','vorrhi.u8','vorrls.u8','vorrge.u8','vorrlt.u8','vorrgt.u8','vorrle.u8',
+            'vorreq.u16','vorrne.u16','vorrcs.u16','vorrhs.u16','vorrcc.u16','vorrlo.u16','vorrmi.u16','vorrpl.u16','vorrvs.u16','vorrvc.u16','vorrhi.u16','vorrls.u16','vorrge.u16','vorrlt.u16','vorrgt.u16','vorrle.u16',
+            'vorreq.u32','vorrne.u32','vorrcs.u32','vorrhs.u32','vorrcc.u32','vorrlo.u32','vorrmi.u32','vorrpl.u32','vorrvs.u32','vorrvc.u32','vorrhi.u32','vorrls.u32','vorrge.u32','vorrlt.u32','vorrgt.u32','vorrle.u32',
+            'vorreq.u64','vorrne.u64','vorrcs.u64','vorrhs.u64','vorrcc.u64','vorrlo.u64','vorrmi.u64','vorrpl.u64','vorrvs.u64','vorrvc.u64','vorrhi.u64','vorrls.u64','vorrge.u64','vorrlt.u64','vorrgt.u64','vorrle.u64',
+            'vorreq.i8','vorrne.i8','vorrcs.i8','vorrhs.i8','vorrcc.i8','vorrlo.i8','vorrmi.i8','vorrpl.i8','vorrvs.i8','vorrvc.i8','vorrhi.i8','vorrls.i8','vorrge.i8','vorrlt.i8','vorrgt.i8','vorrle.i8',
+            'vorreq.i16','vorrne.i16','vorrcs.i16','vorrhs.i16','vorrcc.i16','vorrlo.i16','vorrmi.i16','vorrpl.i16','vorrvs.i16','vorrvc.i16','vorrhi.i16','vorrls.i16','vorrge.i16','vorrlt.i16','vorrgt.i16','vorrle.i16',
+            'vorreq.i32','vorrne.i32','vorrcs.i32','vorrhs.i32','vorrcc.i32','vorrlo.i32','vorrmi.i32','vorrpl.i32','vorrvs.i32','vorrvc.i32','vorrhi.i32','vorrls.i32','vorrge.i32','vorrlt.i32','vorrgt.i32','vorrle.i32',
+            'vorreq.i64','vorrne.i64','vorrcs.i64','vorrhs.i64','vorrcc.i64','vorrlo.i64','vorrmi.i64','vorrpl.i64','vorrvs.i64','vorrvc.i64','vorrhi.i64','vorrls.i64','vorrge.i64','vorrlt.i64','vorrgt.i64','vorrle.i64',
+            'vorreq.f32','vorrne.f32','vorrcs.f32','vorrhs.f32','vorrcc.f32','vorrlo.f32','vorrmi.f32','vorrpl.f32','vorrvs.f32','vorrvc.f32','vorrhi.f32','vorrls.f32','vorrge.f32','vorrlt.f32','vorrgt.f32','vorrle.f32',
+            'vorreq.f64','vorrne.f64','vorrcs.f64','vorrhs.f64','vorrcc.f64','vorrlo.f64','vorrmi.f64','vorrpl.f64','vorrvs.f64','vorrvc.f64','vorrhi.f64','vorrls.f64','vorrge.f64','vorrlt.f64','vorrgt.f64','vorrle.f64',
+
+            'vswpeq','vswpne','vswpcs','vswphs','vswpcc','vswplo','vswpmi','vswppl','vswpvs','vswpvc','vswphi','vswpls','vswpge','vswplt','vswpgt','vswple',
+            'vswpeq.s8','vswpne.s8','vswpcs.s8','vswphs.s8','vswpcc.s8','vswplo.s8','vswpmi.s8','vswppl.s8','vswpvs.s8','vswpvc.s8','vswphi.s8','vswpls.s8','vswpge.s8','vswplt.s8','vswpgt.s8','vswple.s8',
+            'vswpeq.s16','vswpne.s16','vswpcs.s16','vswphs.s16','vswpcc.s16','vswplo.s16','vswpmi.s16','vswppl.s16','vswpvs.s16','vswpvc.s16','vswphi.s16','vswpls.s16','vswpge.s16','vswplt.s16','vswpgt.s16','vswple.s16',
+            'vswpeq.s32','vswpne.s32','vswpcs.s32','vswphs.s32','vswpcc.s32','vswplo.s32','vswpmi.s32','vswppl.s32','vswpvs.s32','vswpvc.s32','vswphi.s32','vswpls.s32','vswpge.s32','vswplt.s32','vswpgt.s32','vswple.s32',
+            'vswpeq.s64','vswpne.s64','vswpcs.s64','vswphs.s64','vswpcc.s64','vswplo.s64','vswpmi.s64','vswppl.s64','vswpvs.s64','vswpvc.s64','vswphi.s64','vswpls.s64','vswpge.s64','vswplt.s64','vswpgt.s64','vswple.s64',
+            'vswpeq.u8','vswpne.u8','vswpcs.u8','vswphs.u8','vswpcc.u8','vswplo.u8','vswpmi.u8','vswppl.u8','vswpvs.u8','vswpvc.u8','vswphi.u8','vswpls.u8','vswpge.u8','vswplt.u8','vswpgt.u8','vswple.u8',
+            'vswpeq.u16','vswpne.u16','vswpcs.u16','vswphs.u16','vswpcc.u16','vswplo.u16','vswpmi.u16','vswppl.u16','vswpvs.u16','vswpvc.u16','vswphi.u16','vswpls.u16','vswpge.u16','vswplt.u16','vswpgt.u16','vswple.u16',
+            'vswpeq.u32','vswpne.u32','vswpcs.u32','vswphs.u32','vswpcc.u32','vswplo.u32','vswpmi.u32','vswppl.u32','vswpvs.u32','vswpvc.u32','vswphi.u32','vswpls.u32','vswpge.u32','vswplt.u32','vswpgt.u32','vswple.u32',
+            'vswpeq.u64','vswpne.u64','vswpcs.u64','vswphs.u64','vswpcc.u64','vswplo.u64','vswpmi.u64','vswppl.u64','vswpvs.u64','vswpvc.u64','vswphi.u64','vswpls.u64','vswpge.u64','vswplt.u64','vswpgt.u64','vswple.u64',
+            'vswpeq.i8','vswpne.i8','vswpcs.i8','vswphs.i8','vswpcc.i8','vswplo.i8','vswpmi.i8','vswppl.i8','vswpvs.i8','vswpvc.i8','vswphi.i8','vswpls.i8','vswpge.i8','vswplt.i8','vswpgt.i8','vswple.i8',
+            'vswpeq.i16','vswpne.i16','vswpcs.i16','vswphs.i16','vswpcc.i16','vswplo.i16','vswpmi.i16','vswppl.i16','vswpvs.i16','vswpvc.i16','vswphi.i16','vswpls.i16','vswpge.i16','vswplt.i16','vswpgt.i16','vswple.i16',
+            'vswpeq.i32','vswpne.i32','vswpcs.i32','vswphs.i32','vswpcc.i32','vswplo.i32','vswpmi.i32','vswppl.i32','vswpvs.i32','vswpvc.i32','vswphi.i32','vswpls.i32','vswpge.i32','vswplt.i32','vswpgt.i32','vswple.i32',
+            'vswpeq.i64','vswpne.i64','vswpcs.i64','vswphs.i64','vswpcc.i64','vswplo.i64','vswpmi.i64','vswppl.i64','vswpvs.i64','vswpvc.i64','vswphi.i64','vswpls.i64','vswpge.i64','vswplt.i64','vswpgt.i64','vswple.i64',
+            'vswpeq.f32','vswpne.f32','vswpcs.f32','vswphs.f32','vswpcc.f32','vswplo.f32','vswpmi.f32','vswppl.f32','vswpvs.f32','vswpvc.f32','vswphi.f32','vswpls.f32','vswpge.f32','vswplt.f32','vswpgt.f32','vswple.f32',
+            'vswpeq.f64','vswpne.f64','vswpcs.f64','vswphs.f64','vswpcc.f64','vswplo.f64','vswpmi.f64','vswppl.f64','vswpvs.f64','vswpvc.f64','vswphi.f64','vswpls.f64','vswpge.f64','vswplt.f64','vswpgt.f64','vswple.f64'
+            ),
+        /* Conditional NEON SIMD ARM Registers Interop Instructions */
+        29 => array(
+            'vmrseq','vmrsne','vmrscs','vmrshs','vmrscc','vmrslo','vmrsmi','vmrspl','vmrsvs','vmrsvc','vmrshi','vmrsls','vmrsge','vmrslt','vmrsgt','vmrsle',
+            'vmsreq','vmsrne','vmsrcs','vmsrhs','vmsrcc','vmsrlo','vmsrmi','vmsrpl','vmsrvs','vmsrvc','vmsrhi','vmsrls','vmsrge','vmsrlt','vmsrgt','vmsrle'
+            ),
+        /* Conditional NEON SIMD Bit/Byte-Level Instructions */
+        30 => array(
+            'vcnteq.8','vcntne.8','vcntcs.8','vcnths.8','vcntcc.8','vcntlo.8','vcntmi.8','vcntpl.8','vcntvs.8','vcntvc.8','vcnthi.8','vcntls.8','vcntge.8','vcntlt.8','vcntgt.8','vcntle.8',
+            'vdupeq.8','vdupne.8','vdupcs.8','vduphs.8','vdupcc.8','vduplo.8','vdupmi.8','vduppl.8','vdupvs.8','vdupvc.8','vduphi.8','vdupls.8','vdupge.8','vduplt.8','vdupgt.8','vduple.8',
+
+            'vdupeq.16','vdupne.16','vdupcs.16','vduphs.16','vdupcc.16','vduplo.16','vdupmi.16','vduppl.16','vdupvs.16','vdupvc.16','vduphi.16','vdupls.16','vdupge.16','vduplt.16','vdupgt.16','vduple.16',
+            'vdupeq.32','vdupne.32','vdupcs.32','vduphs.32','vdupcc.32','vduplo.32','vdupmi.32','vduppl.32','vdupvs.32','vdupvc.32','vduphi.32','vdupls.32','vdupge.32','vduplt.32','vdupgt.32','vduple.32',
+
+            'vexteq.8','vextne.8','vextcs.8','vexths.8','vextcc.8','vextlo.8','vextmi.8','vextpl.8','vextvs.8','vextvc.8','vexthi.8','vextls.8','vextge.8','vextlt.8','vextgt.8','vextle.8',
+            'vexteq.16','vextne.16','vextcs.16','vexths.16','vextcc.16','vextlo.16','vextmi.16','vextpl.16','vextvs.16','vextvc.16','vexthi.16','vextls.16','vextge.16','vextlt.16','vextgt.16','vextle.16',
+
+            'vexteq.32','vextne.32','vextcs.32','vexths.32','vextcc.32','vextlo.32','vextmi.32','vextpl.32','vextvs.32','vextvc.32','vexthi.32','vextls.32','vextge.32','vextlt.32','vextgt.32','vextle.32',
+            'vexteq.64','vextne.64','vextcs.64','vexths.64','vextcc.64','vextlo.64','vextmi.64','vextpl.64','vextvs.64','vextvc.64','vexthi.64','vextls.64','vextge.64','vextlt.64','vextgt.64','vextle.64',
+
+            'vrev16eq.8','vrev16ne.8','vrev16cs.8','vrev16hs.8','vrev16cc.8','vrev16lo.8','vrev16mi.8','vrev16pl.8','vrev16vs.8','vrev16vc.8','vrev16hi.8','vrev16ls.8','vrev16ge.8','vrev16lt.8','vrev16gt.8','vrev16le.8',
+            'vrev32eq.8','vrev32ne.8','vrev32cs.8','vrev32hs.8','vrev32cc.8','vrev32lo.8','vrev32mi.8','vrev32pl.8','vrev32vs.8','vrev32vc.8','vrev32hi.8','vrev32ls.8','vrev32ge.8','vrev32lt.8','vrev32gt.8','vrev32le.8',
+            'vrev32eq.16','vrev32ne.16','vrev32cs.16','vrev32hs.16','vrev32cc.16','vrev32lo.16','vrev32mi.16','vrev32pl.16','vrev32vs.16','vrev32vc.16','vrev32hi.16','vrev32ls.16','vrev32ge.16','vrev32lt.16','vrev32gt.16','vrev32le.16',
+            'vrev64eq.8','vrev64ne.8','vrev64cs.8','vrev64hs.8','vrev64cc.8','vrev64lo.8','vrev64mi.8','vrev64pl.8','vrev64vs.8','vrev64vc.8','vrev64hi.8','vrev64ls.8','vrev64ge.8','vrev64lt.8','vrev64gt.8','vrev64le.8',
+            'vrev64eq.16','vrev64ne.16','vrev64cs.16','vrev64hs.16','vrev64cc.16','vrev64lo.16','vrev64mi.16','vrev64pl.16','vrev64vs.16','vrev64vc.16','vrev64hi.16','vrev64ls.16','vrev64ge.16','vrev64lt.16','vrev64gt.16','vrev64le.16',
+            'vrev64eq.32','vrev64ne.32','vrev64cs.32','vrev64hs.32','vrev64cc.32','vrev64lo.32','vrev64mi.32','vrev64pl.32','vrev64vs.32','vrev64vc.32','vrev64hi.32','vrev64ls.32','vrev64ge.32','vrev64lt.32','vrev64gt.32','vrev64le.32',
+
+            'vslieq.8','vsline.8','vslics.8','vslihs.8','vslicc.8','vslilo.8','vslimi.8','vslipl.8','vslivs.8','vslivc.8','vslihi.8','vslils.8','vslige.8','vslilt.8','vsligt.8','vslile.8',
+            'vslieq.16','vsline.16','vslics.16','vslihs.16','vslicc.16','vslilo.16','vslimi.16','vslipl.16','vslivs.16','vslivc.16','vslihi.16','vslils.16','vslige.16','vslilt.16','vsligt.16','vslile.16',
+            'vslieq.32','vsline.32','vslics.32','vslihs.32','vslicc.32','vslilo.32','vslimi.32','vslipl.32','vslivs.32','vslivc.32','vslihi.32','vslils.32','vslige.32','vslilt.32','vsligt.32','vslile.32',
+            'vslieq.64','vsline.64','vslics.64','vslihs.64','vslicc.64','vslilo.64','vslimi.64','vslipl.64','vslivs.64','vslivc.64','vslihi.64','vslils.64','vslige.64','vslilt.64','vsligt.64','vslile.64',
+
+            'vsrieq.8','vsrine.8','vsrics.8','vsrihs.8','vsricc.8','vsrilo.8','vsrimi.8','vsripl.8','vsrivs.8','vsrivc.8','vsrihi.8','vsrils.8','vsrige.8','vsrilt.8','vsrigt.8','vsrile.8',
+            'vsrieq.16','vsrine.16','vsrics.16','vsrihs.16','vsricc.16','vsrilo.16','vsrimi.16','vsripl.16','vsrivs.16','vsrivc.16','vsrihi.16','vsrils.16','vsrige.16','vsrilt.16','vsrigt.16','vsrile.16',
+            'vsrieq.32','vsrine.32','vsrics.32','vsrihs.32','vsricc.32','vsrilo.32','vsrimi.32','vsripl.32','vsrivs.32','vsrivc.32','vsrihi.32','vsrils.32','vsrige.32','vsrilt.32','vsrigt.32','vsrile.32',
+            'vsrieq.64','vsrine.64','vsrics.64','vsrihs.64','vsricc.64','vsrilo.64','vsrimi.64','vsripl.64','vsrivs.64','vsrivc.64','vsrihi.64','vsrils.64','vsrige.64','vsrilt.64','vsrigt.64','vsrile.64',
+
+            'vtbleq.8','vtblne.8','vtblcs.8','vtblhs.8','vtblcc.8','vtbllo.8','vtblmi.8','vtblpl.8','vtblvs.8','vtblvc.8','vtblhi.8','vtblls.8','vtblge.8','vtbllt.8','vtblgt.8','vtblle.8',
+
+            'vtbxeq','vtbxne','vtbxcs','vtbxhs','vtbxcc','vtbxlo','vtbxmi','vtbxpl','vtbxvs','vtbxvc','vtbxhi','vtbxls','vtbxge','vtbxlt','vtbxgt','vtbxle',
+
+            'vtrneq.8','vtrnne.8','vtrncs.8','vtrnhs.8','vtrncc.8','vtrnlo.8','vtrnmi.8','vtrnpl.8','vtrnvs.8','vtrnvc.8','vtrnhi.8','vtrnls.8','vtrnge.8','vtrnlt.8','vtrngt.8','vtrnle.8',
+            'vtrneq.16','vtrnne.16','vtrncs.16','vtrnhs.16','vtrncc.16','vtrnlo.16','vtrnmi.16','vtrnpl.16','vtrnvs.16','vtrnvc.16','vtrnhi.16','vtrnls.16','vtrnge.16','vtrnlt.16','vtrngt.16','vtrnle.16',
+            'vtrneq.32','vtrnne.32','vtrncs.32','vtrnhs.32','vtrncc.32','vtrnlo.32','vtrnmi.32','vtrnpl.32','vtrnvs.32','vtrnvc.32','vtrnhi.32','vtrnls.32','vtrnge.32','vtrnlt.32','vtrngt.32','vtrnle.32',
+
+            'vtsteq.8','vtstne.8','vtstcs.8','vtsths.8','vtstcc.8','vtstlo.8','vtstmi.8','vtstpl.8','vtstvs.8','vtstvc.8','vtsthi.8','vtstls.8','vtstge.8','vtstlt.8','vtstgt.8','vtstle.8',
+            'vtsteq.16','vtstne.16','vtstcs.16','vtsths.16','vtstcc.16','vtstlo.16','vtstmi.16','vtstpl.16','vtstvs.16','vtstvc.16','vtsthi.16','vtstls.16','vtstge.16','vtstlt.16','vtstgt.16','vtstle.16',
+            'vtsteq.32','vtstne.32','vtstcs.32','vtsths.32','vtstcc.32','vtstlo.32','vtstmi.32','vtstpl.32','vtstvs.32','vtstvc.32','vtsthi.32','vtstls.32','vtstge.32','vtstlt.32','vtstgt.32','vtstle.32',
+
+            'vuzpeq.8','vuzpne.8','vuzpcs.8','vuzphs.8','vuzpcc.8','vuzplo.8','vuzpmi.8','vuzppl.8','vuzpvs.8','vuzpvc.8','vuzphi.8','vuzpls.8','vuzpge.8','vuzplt.8','vuzpgt.8','vuzple.8',
+            'vuzpeq.16','vuzpne.16','vuzpcs.16','vuzphs.16','vuzpcc.16','vuzplo.16','vuzpmi.16','vuzppl.16','vuzpvs.16','vuzpvc.16','vuzphi.16','vuzpls.16','vuzpge.16','vuzplt.16','vuzpgt.16','vuzple.16',
+            'vuzpeq.32','vuzpne.32','vuzpcs.32','vuzphs.32','vuzpcc.32','vuzplo.32','vuzpmi.32','vuzppl.32','vuzpvs.32','vuzpvc.32','vuzphi.32','vuzpls.32','vuzpge.32','vuzplt.32','vuzpgt.32','vuzple.32',
+
+            'vzipeq.8','vzipne.8','vzipcs.8','vziphs.8','vzipcc.8','vziplo.8','vzipmi.8','vzippl.8','vzipvs.8','vzipvc.8','vziphi.8','vzipls.8','vzipge.8','vziplt.8','vzipgt.8','vziple.8',
+            'vzipeq.16','vzipne.16','vzipcs.16','vziphs.16','vzipcc.16','vziplo.16','vzipmi.16','vzippl.16','vzipvs.16','vzipvc.16','vziphi.16','vzipls.16','vzipge.16','vziplt.16','vzipgt.16','vziple.16',
+            'vzipeq.32','vzipne.32','vzipcs.32','vziphs.32','vzipcc.32','vziplo.32','vzipmi.32','vzippl.32','vzipvs.32','vzipvc.32','vziphi.32','vzipls.32','vzipge.32','vziplt.32','vzipgt.32','vziple.32',
+
+            'vmulleq.p8','vmullne.p8','vmullcs.p8','vmullhs.p8','vmullcc.p8','vmulllo.p8','vmullmi.p8','vmullpl.p8','vmullvs.p8','vmullvc.p8','vmullhi.p8','vmullls.p8','vmullge.p8','vmulllt.p8','vmullgt.p8','vmullle.p8'
+            ),
+        /* Conditional NEON SIMD Universal Integer Instructions */
+        31 => array(
+            'vaddeq.i8','vaddne.i8','vaddcs.i8','vaddhs.i8','vaddcc.i8','vaddlo.i8','vaddmi.i8','vaddpl.i8','vaddvs.i8','vaddvc.i8','vaddhi.i8','vaddls.i8','vaddge.i8','vaddlt.i8','vaddgt.i8','vaddle.i8',
+            'vaddeq.i16','vaddne.i16','vaddcs.i16','vaddhs.i16','vaddcc.i16','vaddlo.i16','vaddmi.i16','vaddpl.i16','vaddvs.i16','vaddvc.i16','vaddhi.i16','vaddls.i16','vaddge.i16','vaddlt.i16','vaddgt.i16','vaddle.i16',
+            'vaddeq.i32','vaddne.i32','vaddcs.i32','vaddhs.i32','vaddcc.i32','vaddlo.i32','vaddmi.i32','vaddpl.i32','vaddvs.i32','vaddvc.i32','vaddhi.i32','vaddls.i32','vaddge.i32','vaddlt.i32','vaddgt.i32','vaddle.i32',
+            'vaddeq.i64','vaddne.i64','vaddcs.i64','vaddhs.i64','vaddcc.i64','vaddlo.i64','vaddmi.i64','vaddpl.i64','vaddvs.i64','vaddvc.i64','vaddhi.i64','vaddls.i64','vaddge.i64','vaddlt.i64','vaddgt.i64','vaddle.i64',
+
+            'vsubeq.i8','vsubne.i8','vsubcs.i8','vsubhs.i8','vsubcc.i8','vsublo.i8','vsubmi.i8','vsubpl.i8','vsubvs.i8','vsubvc.i8','vsubhi.i8','vsubls.i8','vsubge.i8','vsublt.i8','vsubgt.i8','vsuble.i8',
+            'vsubeq.i16','vsubne.i16','vsubcs.i16','vsubhs.i16','vsubcc.i16','vsublo.i16','vsubmi.i16','vsubpl.i16','vsubvs.i16','vsubvc.i16','vsubhi.i16','vsubls.i16','vsubge.i16','vsublt.i16','vsubgt.i16','vsuble.i16',
+            'vsubeq.i32','vsubne.i32','vsubcs.i32','vsubhs.i32','vsubcc.i32','vsublo.i32','vsubmi.i32','vsubpl.i32','vsubvs.i32','vsubvc.i32','vsubhi.i32','vsubls.i32','vsubge.i32','vsublt.i32','vsubgt.i32','vsuble.i32',
+            'vsubeq.i64','vsubne.i64','vsubcs.i64','vsubhs.i64','vsubcc.i64','vsublo.i64','vsubmi.i64','vsubpl.i64','vsubvs.i64','vsubvc.i64','vsubhi.i64','vsubls.i64','vsubge.i64','vsublt.i64','vsubgt.i64','vsuble.i64',
+
+            'vaddhneq.i16','vaddhnne.i16','vaddhncs.i16','vaddhnhs.i16','vaddhncc.i16','vaddhnlo.i16','vaddhnmi.i16','vaddhnpl.i16','vaddhnvs.i16','vaddhnvc.i16','vaddhnhi.i16','vaddhnls.i16','vaddhnge.i16','vaddhnlt.i16','vaddhngt.i16','vaddhnle.i16',
+            'vaddhneq.i32','vaddhnne.i32','vaddhncs.i32','vaddhnhs.i32','vaddhncc.i32','vaddhnlo.i32','vaddhnmi.i32','vaddhnpl.i32','vaddhnvs.i32','vaddhnvc.i32','vaddhnhi.i32','vaddhnls.i32','vaddhnge.i32','vaddhnlt.i32','vaddhngt.i32','vaddhnle.i32',
+            'vaddhneq.i64','vaddhnne.i64','vaddhncs.i64','vaddhnhs.i64','vaddhncc.i64','vaddhnlo.i64','vaddhnmi.i64','vaddhnpl.i64','vaddhnvs.i64','vaddhnvc.i64','vaddhnhi.i64','vaddhnls.i64','vaddhnge.i64','vaddhnlt.i64','vaddhngt.i64','vaddhnle.i64',
+
+            'vsubhneq.i16','vsubhnne.i16','vsubhncs.i16','vsubhnhs.i16','vsubhncc.i16','vsubhnlo.i16','vsubhnmi.i16','vsubhnpl.i16','vsubhnvs.i16','vsubhnvc.i16','vsubhnhi.i16','vsubhnls.i16','vsubhnge.i16','vsubhnlt.i16','vsubhngt.i16','vsubhnle.i16',
+            'vsubhneq.i32','vsubhnne.i32','vsubhncs.i32','vsubhnhs.i32','vsubhncc.i32','vsubhnlo.i32','vsubhnmi.i32','vsubhnpl.i32','vsubhnvs.i32','vsubhnvc.i32','vsubhnhi.i32','vsubhnls.i32','vsubhnge.i32','vsubhnlt.i32','vsubhngt.i32','vsubhnle.i32',
+            'vsubhneq.i64','vsubhnne.i64','vsubhncs.i64','vsubhnhs.i64','vsubhncc.i64','vsubhnlo.i64','vsubhnmi.i64','vsubhnpl.i64','vsubhnvs.i64','vsubhnvc.i64','vsubhnhi.i64','vsubhnls.i64','vsubhnge.i64','vsubhnlt.i64','vsubhngt.i64','vsubhnle.i64',
+
+            'vraddhneq.i16','vraddhnne.i16','vraddhncs.i16','vraddhnhs.i16','vraddhncc.i16','vraddhnlo.i16','vraddhnmi.i16','vraddhnpl.i16','vraddhnvs.i16','vraddhnvc.i16','vraddhnhi.i16','vraddhnls.i16','vraddhnge.i16','vraddhnlt.i16','vraddhngt.i16','vraddhnle.i16',
+            'vraddhneq.i32','vraddhnne.i32','vraddhncs.i32','vraddhnhs.i32','vraddhncc.i32','vraddhnlo.i32','vraddhnmi.i32','vraddhnpl.i32','vraddhnvs.i32','vraddhnvc.i32','vraddhnhi.i32','vraddhnls.i32','vraddhnge.i32','vraddhnlt.i32','vraddhngt.i32','vraddhnle.i32',
+            'vraddhneq.i64','vraddhnne.i64','vraddhncs.i64','vraddhnhs.i64','vraddhncc.i64','vraddhnlo.i64','vraddhnmi.i64','vraddhnpl.i64','vraddhnvs.i64','vraddhnvc.i64','vraddhnhi.i64','vraddhnls.i64','vraddhnge.i64','vraddhnlt.i64','vraddhngt.i64','vraddhnle.i64',
+
+            'vrsubhneq.i16','vrsubhnne.i16','vrsubhncs.i16','vrsubhnhs.i16','vrsubhncc.i16','vrsubhnlo.i16','vrsubhnmi.i16','vrsubhnpl.i16','vrsubhnvs.i16','vrsubhnvc.i16','vrsubhnhi.i16','vrsubhnls.i16','vrsubhnge.i16','vrsubhnlt.i16','vrsubhngt.i16','vrsubhnle.i16',
+            'vrsubhneq.i32','vrsubhnne.i32','vrsubhncs.i32','vrsubhnhs.i32','vrsubhncc.i32','vrsubhnlo.i32','vrsubhnmi.i32','vrsubhnpl.i32','vrsubhnvs.i32','vrsubhnvc.i32','vrsubhnhi.i32','vrsubhnls.i32','vrsubhnge.i32','vrsubhnlt.i32','vrsubhngt.i32','vrsubhnle.i32',
+            'vrsubhneq.i64','vrsubhnne.i64','vrsubhncs.i64','vrsubhnhs.i64','vrsubhncc.i64','vrsubhnlo.i64','vrsubhnmi.i64','vrsubhnpl.i64','vrsubhnvs.i64','vrsubhnvc.i64','vrsubhnhi.i64','vrsubhnls.i64','vrsubhnge.i64','vrsubhnlt.i64','vrsubhngt.i64','vrsubhnle.i64',
+
+            'vpaddeq.i8','vpaddne.i8','vpaddcs.i8','vpaddhs.i8','vpaddcc.i8','vpaddlo.i8','vpaddmi.i8','vpaddpl.i8','vpaddvs.i8','vpaddvc.i8','vpaddhi.i8','vpaddls.i8','vpaddge.i8','vpaddlt.i8','vpaddgt.i8','vpaddle.i8',
+            'vpaddeq.i16','vpaddne.i16','vpaddcs.i16','vpaddhs.i16','vpaddcc.i16','vpaddlo.i16','vpaddmi.i16','vpaddpl.i16','vpaddvs.i16','vpaddvc.i16','vpaddhi.i16','vpaddls.i16','vpaddge.i16','vpaddlt.i16','vpaddgt.i16','vpaddle.i16',
+            'vpaddeq.i32','vpaddne.i32','vpaddcs.i32','vpaddhs.i32','vpaddcc.i32','vpaddlo.i32','vpaddmi.i32','vpaddpl.i32','vpaddvs.i32','vpaddvc.i32','vpaddhi.i32','vpaddls.i32','vpaddge.i32','vpaddlt.i32','vpaddgt.i32','vpaddle.i32',
+
+            'vceqeq.i8','vceqne.i8','vceqcs.i8','vceqhs.i8','vceqcc.i8','vceqlo.i8','vceqmi.i8','vceqpl.i8','vceqvs.i8','vceqvc.i8','vceqhi.i8','vceqls.i8','vceqge.i8','vceqlt.i8','vceqgt.i8','vceqle.i8',
+            'vceqeq.i16','vceqne.i16','vceqcs.i16','vceqhs.i16','vceqcc.i16','vceqlo.i16','vceqmi.i16','vceqpl.i16','vceqvs.i16','vceqvc.i16','vceqhi.i16','vceqls.i16','vceqge.i16','vceqlt.i16','vceqgt.i16','vceqle.i16',
+            'vceqeq.i32','vceqne.i32','vceqcs.i32','vceqhs.i32','vceqcc.i32','vceqlo.i32','vceqmi.i32','vceqpl.i32','vceqvs.i32','vceqvc.i32','vceqhi.i32','vceqls.i32','vceqge.i32','vceqlt.i32','vceqgt.i32','vceqle.i32',
+
+            'vclzeq.i8','vclzne.i8','vclzcs.i8','vclzhs.i8','vclzcc.i8','vclzlo.i8','vclzmi.i8','vclzpl.i8','vclzvs.i8','vclzvc.i8','vclzhi.i8','vclzls.i8','vclzge.i8','vclzlt.i8','vclzgt.i8','vclzle.i8',
+            'vclzeq.i16','vclzne.i16','vclzcs.i16','vclzhs.i16','vclzcc.i16','vclzlo.i16','vclzmi.i16','vclzpl.i16','vclzvs.i16','vclzvc.i16','vclzhi.i16','vclzls.i16','vclzge.i16','vclzlt.i16','vclzgt.i16','vclzle.i16',
+            'vclzeq.i32','vclzne.i32','vclzcs.i32','vclzhs.i32','vclzcc.i32','vclzlo.i32','vclzmi.i32','vclzpl.i32','vclzvs.i32','vclzvc.i32','vclzhi.i32','vclzls.i32','vclzge.i32','vclzlt.i32','vclzgt.i32','vclzle.i32',
+
+            'vmovneq.i16','vmovnne.i16','vmovncs.i16','vmovnhs.i16','vmovncc.i16','vmovnlo.i16','vmovnmi.i16','vmovnpl.i16','vmovnvs.i16','vmovnvc.i16','vmovnhi.i16','vmovnls.i16','vmovnge.i16','vmovnlt.i16','vmovngt.i16','vmovnle.i16',
+            'vmovneq.i32','vmovnne.i32','vmovncs.i32','vmovnhs.i32','vmovncc.i32','vmovnlo.i32','vmovnmi.i32','vmovnpl.i32','vmovnvs.i32','vmovnvc.i32','vmovnhi.i32','vmovnls.i32','vmovnge.i32','vmovnlt.i32','vmovngt.i32','vmovnle.i32',
+            'vmovneq.i64','vmovnne.i64','vmovncs.i64','vmovnhs.i64','vmovncc.i64','vmovnlo.i64','vmovnmi.i64','vmovnpl.i64','vmovnvs.i64','vmovnvc.i64','vmovnhi.i64','vmovnls.i64','vmovnge.i64','vmovnlt.i64','vmovngt.i64','vmovnle.i64',
+
+            'vmlaeq.s8','vmlane.s8','vmlacs.s8','vmlahs.s8','vmlacc.s8','vmlalo.s8','vmlami.s8','vmlapl.s8','vmlavs.s8','vmlavc.s8','vmlahi.s8','vmlals.s8','vmlage.s8','vmlalt.s8','vmlagt.s8','vmlale.s8',
+            'vmlaeq.s16','vmlane.s16','vmlacs.s16','vmlahs.s16','vmlacc.s16','vmlalo.s16','vmlami.s16','vmlapl.s16','vmlavs.s16','vmlavc.s16','vmlahi.s16','vmlals.s16','vmlage.s16','vmlalt.s16','vmlagt.s16','vmlale.s16',
+            'vmlaeq.s32','vmlane.s32','vmlacs.s32','vmlahs.s32','vmlacc.s32','vmlalo.s32','vmlami.s32','vmlapl.s32','vmlavs.s32','vmlavc.s32','vmlahi.s32','vmlals.s32','vmlage.s32','vmlalt.s32','vmlagt.s32','vmlale.s32',
+            'vmlaeq.u8','vmlane.u8','vmlacs.u8','vmlahs.u8','vmlacc.u8','vmlalo.u8','vmlami.u8','vmlapl.u8','vmlavs.u8','vmlavc.u8','vmlahi.u8','vmlals.u8','vmlage.u8','vmlalt.u8','vmlagt.u8','vmlale.u8',
+            'vmlaeq.u16','vmlane.u16','vmlacs.u16','vmlahs.u16','vmlacc.u16','vmlalo.u16','vmlami.u16','vmlapl.u16','vmlavs.u16','vmlavc.u16','vmlahi.u16','vmlals.u16','vmlage.u16','vmlalt.u16','vmlagt.u16','vmlale.u16',
+            'vmlaeq.u32','vmlane.u32','vmlacs.u32','vmlahs.u32','vmlacc.u32','vmlalo.u32','vmlami.u32','vmlapl.u32','vmlavs.u32','vmlavc.u32','vmlahi.u32','vmlals.u32','vmlage.u32','vmlalt.u32','vmlagt.u32','vmlale.u32',
+            'vmlaeq.i8','vmlane.i8','vmlacs.i8','vmlahs.i8','vmlacc.i8','vmlalo.i8','vmlami.i8','vmlapl.i8','vmlavs.i8','vmlavc.i8','vmlahi.i8','vmlals.i8','vmlage.i8','vmlalt.i8','vmlagt.i8','vmlale.i8',
+            'vmlaeq.i16','vmlane.i16','vmlacs.i16','vmlahs.i16','vmlacc.i16','vmlalo.i16','vmlami.i16','vmlapl.i16','vmlavs.i16','vmlavc.i16','vmlahi.i16','vmlals.i16','vmlage.i16','vmlalt.i16','vmlagt.i16','vmlale.i16',
+            'vmlaeq.i32','vmlane.i32','vmlacs.i32','vmlahs.i32','vmlacc.i32','vmlalo.i32','vmlami.i32','vmlapl.i32','vmlavs.i32','vmlavc.i32','vmlahi.i32','vmlals.i32','vmlage.i32','vmlalt.i32','vmlagt.i32','vmlale.i32',
+
+            'vmlseq.s8','vmlsne.s8','vmlscs.s8','vmlshs.s8','vmlscc.s8','vmlslo.s8','vmlsmi.s8','vmlspl.s8','vmlsvs.s8','vmlsvc.s8','vmlshi.s8','vmlsls.s8','vmlsge.s8','vmlslt.s8','vmlsgt.s8','vmlsle.s8',
+            'vmlseq.s16','vmlsne.s16','vmlscs.s16','vmlshs.s16','vmlscc.s16','vmlslo.s16','vmlsmi.s16','vmlspl.s16','vmlsvs.s16','vmlsvc.s16','vmlshi.s16','vmlsls.s16','vmlsge.s16','vmlslt.s16','vmlsgt.s16','vmlsle.s16',
+            'vmlseq.s32','vmlsne.s32','vmlscs.s32','vmlshs.s32','vmlscc.s32','vmlslo.s32','vmlsmi.s32','vmlspl.s32','vmlsvs.s32','vmlsvc.s32','vmlshi.s32','vmlsls.s32','vmlsge.s32','vmlslt.s32','vmlsgt.s32','vmlsle.s32',
+            'vmlseq.u8','vmlsne.u8','vmlscs.u8','vmlshs.u8','vmlscc.u8','vmlslo.u8','vmlsmi.u8','vmlspl.u8','vmlsvs.u8','vmlsvc.u8','vmlshi.u8','vmlsls.u8','vmlsge.u8','vmlslt.u8','vmlsgt.u8','vmlsle.u8',
+            'vmlseq.u16','vmlsne.u16','vmlscs.u16','vmlshs.u16','vmlscc.u16','vmlslo.u16','vmlsmi.u16','vmlspl.u16','vmlsvs.u16','vmlsvc.u16','vmlshi.u16','vmlsls.u16','vmlsge.u16','vmlslt.u16','vmlsgt.u16','vmlsle.u16',
+            'vmlseq.u32','vmlsne.u32','vmlscs.u32','vmlshs.u32','vmlscc.u32','vmlslo.u32','vmlsmi.u32','vmlspl.u32','vmlsvs.u32','vmlsvc.u32','vmlshi.u32','vmlsls.u32','vmlsge.u32','vmlslt.u32','vmlsgt.u32','vmlsle.u32',
+            'vmlseq.i8','vmlsne.i8','vmlscs.i8','vmlshs.i8','vmlscc.i8','vmlslo.i8','vmlsmi.i8','vmlspl.i8','vmlsvs.i8','vmlsvc.i8','vmlshi.i8','vmlsls.i8','vmlsge.i8','vmlslt.i8','vmlsgt.i8','vmlsle.i8',
+            'vmlseq.i16','vmlsne.i16','vmlscs.i16','vmlshs.i16','vmlscc.i16','vmlslo.i16','vmlsmi.i16','vmlspl.i16','vmlsvs.i16','vmlsvc.i16','vmlshi.i16','vmlsls.i16','vmlsge.i16','vmlslt.i16','vmlsgt.i16','vmlsle.i16',
+            'vmlseq.i32','vmlsne.i32','vmlscs.i32','vmlshs.i32','vmlscc.i32','vmlslo.i32','vmlsmi.i32','vmlspl.i32','vmlsvs.i32','vmlsvc.i32','vmlshi.i32','vmlsls.i32','vmlsge.i32','vmlslt.i32','vmlsgt.i32','vmlsle.i32',
+
+            'vmuleq.s8','vmulne.s8','vmulcs.s8','vmulhs.s8','vmulcc.s8','vmullo.s8','vmulmi.s8','vmulpl.s8','vmulvs.s8','vmulvc.s8','vmulhi.s8','vmulls.s8','vmulge.s8','vmullt.s8','vmulgt.s8','vmulle.s8',
+            'vmuleq.s16','vmulne.s16','vmulcs.s16','vmulhs.s16','vmulcc.s16','vmullo.s16','vmulmi.s16','vmulpl.s16','vmulvs.s16','vmulvc.s16','vmulhi.s16','vmulls.s16','vmulge.s16','vmullt.s16','vmulgt.s16','vmulle.s16',
+            'vmuleq.s32','vmulne.s32','vmulcs.s32','vmulhs.s32','vmulcc.s32','vmullo.s32','vmulmi.s32','vmulpl.s32','vmulvs.s32','vmulvc.s32','vmulhi.s32','vmulls.s32','vmulge.s32','vmullt.s32','vmulgt.s32','vmulle.s32',
+            'vmuleq.u8','vmulne.u8','vmulcs.u8','vmulhs.u8','vmulcc.u8','vmullo.u8','vmulmi.u8','vmulpl.u8','vmulvs.u8','vmulvc.u8','vmulhi.u8','vmulls.u8','vmulge.u8','vmullt.u8','vmulgt.u8','vmulle.u8',
+            'vmuleq.u16','vmulne.u16','vmulcs.u16','vmulhs.u16','vmulcc.u16','vmullo.u16','vmulmi.u16','vmulpl.u16','vmulvs.u16','vmulvc.u16','vmulhi.u16','vmulls.u16','vmulge.u16','vmullt.u16','vmulgt.u16','vmulle.u16',
+            'vmuleq.u32','vmulne.u32','vmulcs.u32','vmulhs.u32','vmulcc.u32','vmullo.u32','vmulmi.u32','vmulpl.u32','vmulvs.u32','vmulvc.u32','vmulhi.u32','vmulls.u32','vmulge.u32','vmullt.u32','vmulgt.u32','vmulle.u32',
+            'vmuleq.i8','vmulne.i8','vmulcs.i8','vmulhs.i8','vmulcc.i8','vmullo.i8','vmulmi.i8','vmulpl.i8','vmulvs.i8','vmulvc.i8','vmulhi.i8','vmulls.i8','vmulge.i8','vmullt.i8','vmulgt.i8','vmulle.i8',
+            'vmuleq.i16','vmulne.i16','vmulcs.i16','vmulhs.i16','vmulcc.i16','vmullo.i16','vmulmi.i16','vmulpl.i16','vmulvs.i16','vmulvc.i16','vmulhi.i16','vmulls.i16','vmulge.i16','vmullt.i16','vmulgt.i16','vmulle.i16',
+            'vmuleq.i32','vmulne.i32','vmulcs.i32','vmulhs.i32','vmulcc.i32','vmullo.i32','vmulmi.i32','vmulpl.i32','vmulvs.i32','vmulvc.i32','vmulhi.i32','vmulls.i32','vmulge.i32','vmullt.i32','vmulgt.i32','vmulle.i32',
+            'vmuleq.p8','vmulne.p8','vmulcs.p8','vmulhs.p8','vmulcc.p8','vmullo.p8','vmulmi.p8','vmulpl.p8','vmulvs.p8','vmulvc.p8','vmulhi.p8','vmulls.p8','vmulge.p8','vmullt.p8','vmulgt.p8','vmulle.p8',
+
+            'vrshrneq.i16','vrshrnne.i16','vrshrncs.i16','vrshrnhs.i16','vrshrncc.i16','vrshrnlo.i16','vrshrnmi.i16','vrshrnpl.i16','vrshrnvs.i16','vrshrnvc.i16','vrshrnhi.i16','vrshrnls.i16','vrshrnge.i16','vrshrnlt.i16','vrshrngt.i16','vrshrnle.i16',
+            'vrshrneq.i32','vrshrnne.i32','vrshrncs.i32','vrshrnhs.i32','vrshrncc.i32','vrshrnlo.i32','vrshrnmi.i32','vrshrnpl.i32','vrshrnvs.i32','vrshrnvc.i32','vrshrnhi.i32','vrshrnls.i32','vrshrnge.i32','vrshrnlt.i32','vrshrngt.i32','vrshrnle.i32',
+            'vrshrneq.i64','vrshrnne.i64','vrshrncs.i64','vrshrnhs.i64','vrshrncc.i64','vrshrnlo.i64','vrshrnmi.i64','vrshrnpl.i64','vrshrnvs.i64','vrshrnvc.i64','vrshrnhi.i64','vrshrnls.i64','vrshrnge.i64','vrshrnlt.i64','vrshrngt.i64','vrshrnle.i64',
+
+            'vshrneq.i16','vshrnne.i16','vshrncs.i16','vshrnhs.i16','vshrncc.i16','vshrnlo.i16','vshrnmi.i16','vshrnpl.i16','vshrnvs.i16','vshrnvc.i16','vshrnhi.i16','vshrnls.i16','vshrnge.i16','vshrnlt.i16','vshrngt.i16','vshrnle.i16',
+            'vshrneq.i32','vshrnne.i32','vshrncs.i32','vshrnhs.i32','vshrncc.i32','vshrnlo.i32','vshrnmi.i32','vshrnpl.i32','vshrnvs.i32','vshrnvc.i32','vshrnhi.i32','vshrnls.i32','vshrnge.i32','vshrnlt.i32','vshrngt.i32','vshrnle.i32',
+            'vshrneq.i64','vshrnne.i64','vshrncs.i64','vshrnhs.i64','vshrncc.i64','vshrnlo.i64','vshrnmi.i64','vshrnpl.i64','vshrnvs.i64','vshrnvc.i64','vshrnhi.i64','vshrnls.i64','vshrnge.i64','vshrnlt.i64','vshrngt.i64','vshrnle.i64',
+
+            'vshleq.i8','vshlne.i8','vshlcs.i8','vshlhs.i8','vshlcc.i8','vshllo.i8','vshlmi.i8','vshlpl.i8','vshlvs.i8','vshlvc.i8','vshlhi.i8','vshlls.i8','vshlge.i8','vshllt.i8','vshlgt.i8','vshlle.i8',
+            'vshleq.i16','vshlne.i16','vshlcs.i16','vshlhs.i16','vshlcc.i16','vshllo.i16','vshlmi.i16','vshlpl.i16','vshlvs.i16','vshlvc.i16','vshlhi.i16','vshlls.i16','vshlge.i16','vshllt.i16','vshlgt.i16','vshlle.i16',
+            'vshleq.i32','vshlne.i32','vshlcs.i32','vshlhs.i32','vshlcc.i32','vshllo.i32','vshlmi.i32','vshlpl.i32','vshlvs.i32','vshlvc.i32','vshlhi.i32','vshlls.i32','vshlge.i32','vshllt.i32','vshlgt.i32','vshlle.i32',
+            'vshleq.i64','vshlne.i64','vshlcs.i64','vshlhs.i64','vshlcc.i64','vshllo.i64','vshlmi.i64','vshlpl.i64','vshlvs.i64','vshlvc.i64','vshlhi.i64','vshlls.i64','vshlge.i64','vshllt.i64','vshlgt.i64','vshlle.i64',
+
+            'vshlleq.i8','vshllne.i8','vshllcs.i8','vshllhs.i8','vshllcc.i8','vshlllo.i8','vshllmi.i8','vshllpl.i8','vshllvs.i8','vshllvc.i8','vshllhi.i8','vshllls.i8','vshllge.i8','vshlllt.i8','vshllgt.i8','vshllle.i8',
+            'vshlleq.i16','vshllne.i16','vshllcs.i16','vshllhs.i16','vshllcc.i16','vshlllo.i16','vshllmi.i16','vshllpl.i16','vshllvs.i16','vshllvc.i16','vshllhi.i16','vshllls.i16','vshllge.i16','vshlllt.i16','vshllgt.i16','vshllle.i16',
+            'vshlleq.i32','vshllne.i32','vshllcs.i32','vshllhs.i32','vshllcc.i32','vshlllo.i32','vshllmi.i32','vshllpl.i32','vshllvs.i32','vshllvc.i32','vshllhi.i32','vshllls.i32','vshllge.i32','vshlllt.i32','vshllgt.i32','vshllle.i32'
+            ),
+        /* Conditional NEON SIMD Signed Integer Instructions */
+        32 => array(
+            'vabaeq.s8','vabane.s8','vabacs.s8','vabahs.s8','vabacc.s8','vabalo.s8','vabami.s8','vabapl.s8','vabavs.s8','vabavc.s8','vabahi.s8','vabals.s8','vabage.s8','vabalt.s8','vabagt.s8','vabale.s8',
+            'vabaeq.s16','vabane.s16','vabacs.s16','vabahs.s16','vabacc.s16','vabalo.s16','vabami.s16','vabapl.s16','vabavs.s16','vabavc.s16','vabahi.s16','vabals.s16','vabage.s16','vabalt.s16','vabagt.s16','vabale.s16',
+            'vabaeq.s32','vabane.s32','vabacs.s32','vabahs.s32','vabacc.s32','vabalo.s32','vabami.s32','vabapl.s32','vabavs.s32','vabavc.s32','vabahi.s32','vabals.s32','vabage.s32','vabalt.s32','vabagt.s32','vabale.s32',
+
+            'vabaleq.s8','vabalne.s8','vabalcs.s8','vabalhs.s8','vabalcc.s8','vaballo.s8','vabalmi.s8','vabalpl.s8','vabalvs.s8','vabalvc.s8','vabalhi.s8','vaballs.s8','vabalge.s8','vaballt.s8','vabalgt.s8','vaballe.s8',
+            'vabaleq.s16','vabalne.s16','vabalcs.s16','vabalhs.s16','vabalcc.s16','vaballo.s16','vabalmi.s16','vabalpl.s16','vabalvs.s16','vabalvc.s16','vabalhi.s16','vaballs.s16','vabalge.s16','vaballt.s16','vabalgt.s16','vaballe.s16',
+            'vabaleq.s32','vabalne.s32','vabalcs.s32','vabalhs.s32','vabalcc.s32','vaballo.s32','vabalmi.s32','vabalpl.s32','vabalvs.s32','vabalvc.s32','vabalhi.s32','vaballs.s32','vabalge.s32','vaballt.s32','vabalgt.s32','vaballe.s32',
+
+            'vabdeq.s8','vabdne.s8','vabdcs.s8','vabdhs.s8','vabdcc.s8','vabdlo.s8','vabdmi.s8','vabdpl.s8','vabdvs.s8','vabdvc.s8','vabdhi.s8','vabdls.s8','vabdge.s8','vabdlt.s8','vabdgt.s8','vabdle.s8',
+            'vabdeq.s16','vabdne.s16','vabdcs.s16','vabdhs.s16','vabdcc.s16','vabdlo.s16','vabdmi.s16','vabdpl.s16','vabdvs.s16','vabdvc.s16','vabdhi.s16','vabdls.s16','vabdge.s16','vabdlt.s16','vabdgt.s16','vabdle.s16',
+            'vabdeq.s32','vabdne.s32','vabdcs.s32','vabdhs.s32','vabdcc.s32','vabdlo.s32','vabdmi.s32','vabdpl.s32','vabdvs.s32','vabdvc.s32','vabdhi.s32','vabdls.s32','vabdge.s32','vabdlt.s32','vabdgt.s32','vabdle.s32',
+
+            'vabseq.s8','vabsne.s8','vabscs.s8','vabshs.s8','vabscc.s8','vabslo.s8','vabsmi.s8','vabspl.s8','vabsvs.s8','vabsvc.s8','vabshi.s8','vabsls.s8','vabsge.s8','vabslt.s8','vabsgt.s8','vabsle.s8',
+            'vabseq.s16','vabsne.s16','vabscs.s16','vabshs.s16','vabscc.s16','vabslo.s16','vabsmi.s16','vabspl.s16','vabsvs.s16','vabsvc.s16','vabshi.s16','vabsls.s16','vabsge.s16','vabslt.s16','vabsgt.s16','vabsle.s16',
+            'vabseq.s32','vabsne.s32','vabscs.s32','vabshs.s32','vabscc.s32','vabslo.s32','vabsmi.s32','vabspl.s32','vabsvs.s32','vabsvc.s32','vabshi.s32','vabsls.s32','vabsge.s32','vabslt.s32','vabsgt.s32','vabsle.s32',
+
+            'vaddleq.s8','vaddlne.s8','vaddlcs.s8','vaddlhs.s8','vaddlcc.s8','vaddllo.s8','vaddlmi.s8','vaddlpl.s8','vaddlvs.s8','vaddlvc.s8','vaddlhi.s8','vaddlls.s8','vaddlge.s8','vaddllt.s8','vaddlgt.s8','vaddlle.s8',
+            'vaddleq.s16','vaddlne.s16','vaddlcs.s16','vaddlhs.s16','vaddlcc.s16','vaddllo.s16','vaddlmi.s16','vaddlpl.s16','vaddlvs.s16','vaddlvc.s16','vaddlhi.s16','vaddlls.s16','vaddlge.s16','vaddllt.s16','vaddlgt.s16','vaddlle.s16',
+            'vaddleq.s32','vaddlne.s32','vaddlcs.s32','vaddlhs.s32','vaddlcc.s32','vaddllo.s32','vaddlmi.s32','vaddlpl.s32','vaddlvs.s32','vaddlvc.s32','vaddlhi.s32','vaddlls.s32','vaddlge.s32','vaddllt.s32','vaddlgt.s32','vaddlle.s32',
+
+            'vcgeeq.s8','vcgene.s8','vcgecs.s8','vcgehs.s8','vcgecc.s8','vcgelo.s8','vcgemi.s8','vcgepl.s8','vcgevs.s8','vcgevc.s8','vcgehi.s8','vcgels.s8','vcgege.s8','vcgelt.s8','vcgegt.s8','vcgele.s8',
+            'vcgeeq.s16','vcgene.s16','vcgecs.s16','vcgehs.s16','vcgecc.s16','vcgelo.s16','vcgemi.s16','vcgepl.s16','vcgevs.s16','vcgevc.s16','vcgehi.s16','vcgels.s16','vcgege.s16','vcgelt.s16','vcgegt.s16','vcgele.s16',
+            'vcgeeq.s32','vcgene.s32','vcgecs.s32','vcgehs.s32','vcgecc.s32','vcgelo.s32','vcgemi.s32','vcgepl.s32','vcgevs.s32','vcgevc.s32','vcgehi.s32','vcgels.s32','vcgege.s32','vcgelt.s32','vcgegt.s32','vcgele.s32',
+
+            'vcleeq.s8','vclene.s8','vclecs.s8','vclehs.s8','vclecc.s8','vclelo.s8','vclemi.s8','vclepl.s8','vclevs.s8','vclevc.s8','vclehi.s8','vclels.s8','vclege.s8','vclelt.s8','vclegt.s8','vclele.s8',
+            'vcleeq.s16','vclene.s16','vclecs.s16','vclehs.s16','vclecc.s16','vclelo.s16','vclemi.s16','vclepl.s16','vclevs.s16','vclevc.s16','vclehi.s16','vclels.s16','vclege.s16','vclelt.s16','vclegt.s16','vclele.s16',
+            'vcleeq.s32','vclene.s32','vclecs.s32','vclehs.s32','vclecc.s32','vclelo.s32','vclemi.s32','vclepl.s32','vclevs.s32','vclevc.s32','vclehi.s32','vclels.s32','vclege.s32','vclelt.s32','vclegt.s32','vclele.s32',
+
+            'vcgteq.s8','vcgtne.s8','vcgtcs.s8','vcgths.s8','vcgtcc.s8','vcgtlo.s8','vcgtmi.s8','vcgtpl.s8','vcgtvs.s8','vcgtvc.s8','vcgthi.s8','vcgtls.s8','vcgtge.s8','vcgtlt.s8','vcgtgt.s8','vcgtle.s8',
+            'vcgteq.s16','vcgtne.s16','vcgtcs.s16','vcgths.s16','vcgtcc.s16','vcgtlo.s16','vcgtmi.s16','vcgtpl.s16','vcgtvs.s16','vcgtvc.s16','vcgthi.s16','vcgtls.s16','vcgtge.s16','vcgtlt.s16','vcgtgt.s16','vcgtle.s16',
+            'vcgteq.s32','vcgtne.s32','vcgtcs.s32','vcgths.s32','vcgtcc.s32','vcgtlo.s32','vcgtmi.s32','vcgtpl.s32','vcgtvs.s32','vcgtvc.s32','vcgthi.s32','vcgtls.s32','vcgtge.s32','vcgtlt.s32','vcgtgt.s32','vcgtle.s32',
+
+            'vclteq.s8','vcltne.s8','vcltcs.s8','vclths.s8','vcltcc.s8','vcltlo.s8','vcltmi.s8','vcltpl.s8','vcltvs.s8','vcltvc.s8','vclthi.s8','vcltls.s8','vcltge.s8','vcltlt.s8','vcltgt.s8','vcltle.s8',
+            'vclteq.s16','vcltne.s16','vcltcs.s16','vclths.s16','vcltcc.s16','vcltlo.s16','vcltmi.s16','vcltpl.s16','vcltvs.s16','vcltvc.s16','vclthi.s16','vcltls.s16','vcltge.s16','vcltlt.s16','vcltgt.s16','vcltle.s16',
+            'vclteq.s32','vcltne.s32','vcltcs.s32','vclths.s32','vcltcc.s32','vcltlo.s32','vcltmi.s32','vcltpl.s32','vcltvs.s32','vcltvc.s32','vclthi.s32','vcltls.s32','vcltge.s32','vcltlt.s32','vcltgt.s32','vcltle.s32',
+
+            'vclseq.s8','vclsne.s8','vclscs.s8','vclshs.s8','vclscc.s8','vclslo.s8','vclsmi.s8','vclspl.s8','vclsvs.s8','vclsvc.s8','vclshi.s8','vclsls.s8','vclsge.s8','vclslt.s8','vclsgt.s8','vclsle.s8',
+            'vclseq.s16','vclsne.s16','vclscs.s16','vclshs.s16','vclscc.s16','vclslo.s16','vclsmi.s16','vclspl.s16','vclsvs.s16','vclsvc.s16','vclshi.s16','vclsls.s16','vclsge.s16','vclslt.s16','vclsgt.s16','vclsle.s16',
+            'vclseq.s32','vclsne.s32','vclscs.s32','vclshs.s32','vclscc.s32','vclslo.s32','vclsmi.s32','vclspl.s32','vclsvs.s32','vclsvc.s32','vclshi.s32','vclsls.s32','vclsge.s32','vclslt.s32','vclsgt.s32','vclsle.s32',
+
+            'vaddweq.s8','vaddwne.s8','vaddwcs.s8','vaddwhs.s8','vaddwcc.s8','vaddwlo.s8','vaddwmi.s8','vaddwpl.s8','vaddwvs.s8','vaddwvc.s8','vaddwhi.s8','vaddwls.s8','vaddwge.s8','vaddwlt.s8','vaddwgt.s8','vaddwle.s8',
+            'vaddweq.s16','vaddwne.s16','vaddwcs.s16','vaddwhs.s16','vaddwcc.s16','vaddwlo.s16','vaddwmi.s16','vaddwpl.s16','vaddwvs.s16','vaddwvc.s16','vaddwhi.s16','vaddwls.s16','vaddwge.s16','vaddwlt.s16','vaddwgt.s16','vaddwle.s16',
+            'vaddweq.s32','vaddwne.s32','vaddwcs.s32','vaddwhs.s32','vaddwcc.s32','vaddwlo.s32','vaddwmi.s32','vaddwpl.s32','vaddwvs.s32','vaddwvc.s32','vaddwhi.s32','vaddwls.s32','vaddwge.s32','vaddwlt.s32','vaddwgt.s32','vaddwle.s32',
+
+            'vhaddeq.s8','vhaddne.s8','vhaddcs.s8','vhaddhs.s8','vhaddcc.s8','vhaddlo.s8','vhaddmi.s8','vhaddpl.s8','vhaddvs.s8','vhaddvc.s8','vhaddhi.s8','vhaddls.s8','vhaddge.s8','vhaddlt.s8','vhaddgt.s8','vhaddle.s8',
+            'vhaddeq.s16','vhaddne.s16','vhaddcs.s16','vhaddhs.s16','vhaddcc.s16','vhaddlo.s16','vhaddmi.s16','vhaddpl.s16','vhaddvs.s16','vhaddvc.s16','vhaddhi.s16','vhaddls.s16','vhaddge.s16','vhaddlt.s16','vhaddgt.s16','vhaddle.s16',
+            'vhaddeq.s32','vhaddne.s32','vhaddcs.s32','vhaddhs.s32','vhaddcc.s32','vhaddlo.s32','vhaddmi.s32','vhaddpl.s32','vhaddvs.s32','vhaddvc.s32','vhaddhi.s32','vhaddls.s32','vhaddge.s32','vhaddlt.s32','vhaddgt.s32','vhaddle.s32',
+
+            'vhsubeq.s8','vhsubne.s8','vhsubcs.s8','vhsubhs.s8','vhsubcc.s8','vhsublo.s8','vhsubmi.s8','vhsubpl.s8','vhsubvs.s8','vhsubvc.s8','vhsubhi.s8','vhsubls.s8','vhsubge.s8','vhsublt.s8','vhsubgt.s8','vhsuble.s8',
+            'vhsubeq.s16','vhsubne.s16','vhsubcs.s16','vhsubhs.s16','vhsubcc.s16','vhsublo.s16','vhsubmi.s16','vhsubpl.s16','vhsubvs.s16','vhsubvc.s16','vhsubhi.s16','vhsubls.s16','vhsubge.s16','vhsublt.s16','vhsubgt.s16','vhsuble.s16',
+            'vhsubeq.s32','vhsubne.s32','vhsubcs.s32','vhsubhs.s32','vhsubcc.s32','vhsublo.s32','vhsubmi.s32','vhsubpl.s32','vhsubvs.s32','vhsubvc.s32','vhsubhi.s32','vhsubls.s32','vhsubge.s32','vhsublt.s32','vhsubgt.s32','vhsuble.s32',
+
+            'vmaxeq.s8','vmaxne.s8','vmaxcs.s8','vmaxhs.s8','vmaxcc.s8','vmaxlo.s8','vmaxmi.s8','vmaxpl.s8','vmaxvs.s8','vmaxvc.s8','vmaxhi.s8','vmaxls.s8','vmaxge.s8','vmaxlt.s8','vmaxgt.s8','vmaxle.s8',
+            'vmaxeq.s16','vmaxne.s16','vmaxcs.s16','vmaxhs.s16','vmaxcc.s16','vmaxlo.s16','vmaxmi.s16','vmaxpl.s16','vmaxvs.s16','vmaxvc.s16','vmaxhi.s16','vmaxls.s16','vmaxge.s16','vmaxlt.s16','vmaxgt.s16','vmaxle.s16',
+            'vmaxeq.s32','vmaxne.s32','vmaxcs.s32','vmaxhs.s32','vmaxcc.s32','vmaxlo.s32','vmaxmi.s32','vmaxpl.s32','vmaxvs.s32','vmaxvc.s32','vmaxhi.s32','vmaxls.s32','vmaxge.s32','vmaxlt.s32','vmaxgt.s32','vmaxle.s32',
+
+            'vmineq.s8','vminne.s8','vmincs.s8','vminhs.s8','vmincc.s8','vminlo.s8','vminmi.s8','vminpl.s8','vminvs.s8','vminvc.s8','vminhi.s8','vminls.s8','vminge.s8','vminlt.s8','vmingt.s8','vminle.s8',
+            'vmineq.s16','vminne.s16','vmincs.s16','vminhs.s16','vmincc.s16','vminlo.s16','vminmi.s16','vminpl.s16','vminvs.s16','vminvc.s16','vminhi.s16','vminls.s16','vminge.s16','vminlt.s16','vmingt.s16','vminle.s16',
+            'vmineq.s32','vminne.s32','vmincs.s32','vminhs.s32','vmincc.s32','vminlo.s32','vminmi.s32','vminpl.s32','vminvs.s32','vminvc.s32','vminhi.s32','vminls.s32','vminge.s32','vminlt.s32','vmingt.s32','vminle.s32',
+
+            'vmlaleq.s8','vmlalne.s8','vmlalcs.s8','vmlalhs.s8','vmlalcc.s8','vmlallo.s8','vmlalmi.s8','vmlalpl.s8','vmlalvs.s8','vmlalvc.s8','vmlalhi.s8','vmlalls.s8','vmlalge.s8','vmlallt.s8','vmlalgt.s8','vmlalle.s8',
+            'vmlaleq.s16','vmlalne.s16','vmlalcs.s16','vmlalhs.s16','vmlalcc.s16','vmlallo.s16','vmlalmi.s16','vmlalpl.s16','vmlalvs.s16','vmlalvc.s16','vmlalhi.s16','vmlalls.s16','vmlalge.s16','vmlallt.s16','vmlalgt.s16','vmlalle.s16',
+            'vmlaleq.s32','vmlalne.s32','vmlalcs.s32','vmlalhs.s32','vmlalcc.s32','vmlallo.s32','vmlalmi.s32','vmlalpl.s32','vmlalvs.s32','vmlalvc.s32','vmlalhi.s32','vmlalls.s32','vmlalge.s32','vmlallt.s32','vmlalgt.s32','vmlalle.s32',
+
+            'vmlsleq.s8','vmlslne.s8','vmlslcs.s8','vmlslhs.s8','vmlslcc.s8','vmlsllo.s8','vmlslmi.s8','vmlslpl.s8','vmlslvs.s8','vmlslvc.s8','vmlslhi.s8','vmlslls.s8','vmlslge.s8','vmlsllt.s8','vmlslgt.s8','vmlslle.s8',
+            'vmlsleq.s16','vmlslne.s16','vmlslcs.s16','vmlslhs.s16','vmlslcc.s16','vmlsllo.s16','vmlslmi.s16','vmlslpl.s16','vmlslvs.s16','vmlslvc.s16','vmlslhi.s16','vmlslls.s16','vmlslge.s16','vmlsllt.s16','vmlslgt.s16','vmlslle.s16',
+            'vmlsleq.s32','vmlslne.s32','vmlslcs.s32','vmlslhs.s32','vmlslcc.s32','vmlsllo.s32','vmlslmi.s32','vmlslpl.s32','vmlslvs.s32','vmlslvc.s32','vmlslhi.s32','vmlslls.s32','vmlslge.s32','vmlsllt.s32','vmlslgt.s32','vmlslle.s32',
+
+            'vnegeq.s8','vnegne.s8','vnegcs.s8','vneghs.s8','vnegcc.s8','vneglo.s8','vnegmi.s8','vnegpl.s8','vnegvs.s8','vnegvc.s8','vneghi.s8','vnegls.s8','vnegge.s8','vneglt.s8','vneggt.s8','vnegle.s8',
+            'vnegeq.s16','vnegne.s16','vnegcs.s16','vneghs.s16','vnegcc.s16','vneglo.s16','vnegmi.s16','vnegpl.s16','vnegvs.s16','vnegvc.s16','vneghi.s16','vnegls.s16','vnegge.s16','vneglt.s16','vneggt.s16','vnegle.s16',
+            'vnegeq.s32','vnegne.s32','vnegcs.s32','vneghs.s32','vnegcc.s32','vneglo.s32','vnegmi.s32','vnegpl.s32','vnegvs.s32','vnegvc.s32','vneghi.s32','vnegls.s32','vnegge.s32','vneglt.s32','vneggt.s32','vnegle.s32',
+
+            'vpadaleq.s8','vpadalne.s8','vpadalcs.s8','vpadalhs.s8','vpadalcc.s8','vpadallo.s8','vpadalmi.s8','vpadalpl.s8','vpadalvs.s8','vpadalvc.s8','vpadalhi.s8','vpadalls.s8','vpadalge.s8','vpadallt.s8','vpadalgt.s8','vpadalle.s8',
+            'vpadaleq.s16','vpadalne.s16','vpadalcs.s16','vpadalhs.s16','vpadalcc.s16','vpadallo.s16','vpadalmi.s16','vpadalpl.s16','vpadalvs.s16','vpadalvc.s16','vpadalhi.s16','vpadalls.s16','vpadalge.s16','vpadallt.s16','vpadalgt.s16','vpadalle.s16',
+            'vpadaleq.s32','vpadalne.s32','vpadalcs.s32','vpadalhs.s32','vpadalcc.s32','vpadallo.s32','vpadalmi.s32','vpadalpl.s32','vpadalvs.s32','vpadalvc.s32','vpadalhi.s32','vpadalls.s32','vpadalge.s32','vpadallt.s32','vpadalgt.s32','vpadalle.s32',
+
+            'vmovleq.s8','vmovlne.s8','vmovlcs.s8','vmovlhs.s8','vmovlcc.s8','vmovllo.s8','vmovlmi.s8','vmovlpl.s8','vmovlvs.s8','vmovlvc.s8','vmovlhi.s8','vmovlls.s8','vmovlge.s8','vmovllt.s8','vmovlgt.s8','vmovlle.s8',
+            'vmovleq.s16','vmovlne.s16','vmovlcs.s16','vmovlhs.s16','vmovlcc.s16','vmovllo.s16','vmovlmi.s16','vmovlpl.s16','vmovlvs.s16','vmovlvc.s16','vmovlhi.s16','vmovlls.s16','vmovlge.s16','vmovllt.s16','vmovlgt.s16','vmovlle.s16',
+            'vmovleq.s32','vmovlne.s32','vmovlcs.s32','vmovlhs.s32','vmovlcc.s32','vmovllo.s32','vmovlmi.s32','vmovlpl.s32','vmovlvs.s32','vmovlvc.s32','vmovlhi.s32','vmovlls.s32','vmovlge.s32','vmovllt.s32','vmovlgt.s32','vmovlle.s32',
+
+            'vmulleq.s8','vmullne.s8','vmullcs.s8','vmullhs.s8','vmullcc.s8','vmulllo.s8','vmullmi.s8','vmullpl.s8','vmullvs.s8','vmullvc.s8','vmullhi.s8','vmullls.s8','vmullge.s8','vmulllt.s8','vmullgt.s8','vmullle.s8',
+            'vmulleq.s16','vmullne.s16','vmullcs.s16','vmullhs.s16','vmullcc.s16','vmulllo.s16','vmullmi.s16','vmullpl.s16','vmullvs.s16','vmullvc.s16','vmullhi.s16','vmullls.s16','vmullge.s16','vmulllt.s16','vmullgt.s16','vmullle.s16',
+            'vmulleq.s32','vmullne.s32','vmullcs.s32','vmullhs.s32','vmullcc.s32','vmulllo.s32','vmullmi.s32','vmullpl.s32','vmullvs.s32','vmullvc.s32','vmullhi.s32','vmullls.s32','vmullge.s32','vmulllt.s32','vmullgt.s32','vmullle.s32',
+
+            'vpaddleq.s8','vpaddlne.s8','vpaddlcs.s8','vpaddlhs.s8','vpaddlcc.s8','vpaddllo.s8','vpaddlmi.s8','vpaddlpl.s8','vpaddlvs.s8','vpaddlvc.s8','vpaddlhi.s8','vpaddlls.s8','vpaddlge.s8','vpaddllt.s8','vpaddlgt.s8','vpaddlle.s8',
+            'vpaddleq.s16','vpaddlne.s16','vpaddlcs.s16','vpaddlhs.s16','vpaddlcc.s16','vpaddllo.s16','vpaddlmi.s16','vpaddlpl.s16','vpaddlvs.s16','vpaddlvc.s16','vpaddlhi.s16','vpaddlls.s16','vpaddlge.s16','vpaddllt.s16','vpaddlgt.s16','vpaddlle.s16',
+            'vpaddleq.s32','vpaddlne.s32','vpaddlcs.s32','vpaddlhs.s32','vpaddlcc.s32','vpaddllo.s32','vpaddlmi.s32','vpaddlpl.s32','vpaddlvs.s32','vpaddlvc.s32','vpaddlhi.s32','vpaddlls.s32','vpaddlge.s32','vpaddllt.s32','vpaddlgt.s32','vpaddlle.s32',
+
+            'vpmaxeq.s8','vpmaxne.s8','vpmaxcs.s8','vpmaxhs.s8','vpmaxcc.s8','vpmaxlo.s8','vpmaxmi.s8','vpmaxpl.s8','vpmaxvs.s8','vpmaxvc.s8','vpmaxhi.s8','vpmaxls.s8','vpmaxge.s8','vpmaxlt.s8','vpmaxgt.s8','vpmaxle.s8',
+            'vpmaxeq.s16','vpmaxne.s16','vpmaxcs.s16','vpmaxhs.s16','vpmaxcc.s16','vpmaxlo.s16','vpmaxmi.s16','vpmaxpl.s16','vpmaxvs.s16','vpmaxvc.s16','vpmaxhi.s16','vpmaxls.s16','vpmaxge.s16','vpmaxlt.s16','vpmaxgt.s16','vpmaxle.s16',
+            'vpmaxeq.s32','vpmaxne.s32','vpmaxcs.s32','vpmaxhs.s32','vpmaxcc.s32','vpmaxlo.s32','vpmaxmi.s32','vpmaxpl.s32','vpmaxvs.s32','vpmaxvc.s32','vpmaxhi.s32','vpmaxls.s32','vpmaxge.s32','vpmaxlt.s32','vpmaxgt.s32','vpmaxle.s32',
+
+            'vpmineq.s8','vpminne.s8','vpmincs.s8','vpminhs.s8','vpmincc.s8','vpminlo.s8','vpminmi.s8','vpminpl.s8','vpminvs.s8','vpminvc.s8','vpminhi.s8','vpminls.s8','vpminge.s8','vpminlt.s8','vpmingt.s8','vpminle.s8',
+            'vpmineq.s16','vpminne.s16','vpmincs.s16','vpminhs.s16','vpmincc.s16','vpminlo.s16','vpminmi.s16','vpminpl.s16','vpminvs.s16','vpminvc.s16','vpminhi.s16','vpminls.s16','vpminge.s16','vpminlt.s16','vpmingt.s16','vpminle.s16',
+            'vpmineq.s32','vpminne.s32','vpmincs.s32','vpminhs.s32','vpmincc.s32','vpminlo.s32','vpminmi.s32','vpminpl.s32','vpminvs.s32','vpminvc.s32','vpminhi.s32','vpminls.s32','vpminge.s32','vpminlt.s32','vpmingt.s32','vpminle.s32',
+
+            'vqabseq.s8','vqabsne.s8','vqabscs.s8','vqabshs.s8','vqabscc.s8','vqabslo.s8','vqabsmi.s8','vqabspl.s8','vqabsvs.s8','vqabsvc.s8','vqabshi.s8','vqabsls.s8','vqabsge.s8','vqabslt.s8','vqabsgt.s8','vqabsle.s8',
+            'vqabseq.s16','vqabsne.s16','vqabscs.s16','vqabshs.s16','vqabscc.s16','vqabslo.s16','vqabsmi.s16','vqabspl.s16','vqabsvs.s16','vqabsvc.s16','vqabshi.s16','vqabsls.s16','vqabsge.s16','vqabslt.s16','vqabsgt.s16','vqabsle.s16',
+            'vqabseq.s32','vqabsne.s32','vqabscs.s32','vqabshs.s32','vqabscc.s32','vqabslo.s32','vqabsmi.s32','vqabspl.s32','vqabsvs.s32','vqabsvc.s32','vqabshi.s32','vqabsls.s32','vqabsge.s32','vqabslt.s32','vqabsgt.s32','vqabsle.s32',
+
+            'vqaddeq.s8','vqaddne.s8','vqaddcs.s8','vqaddhs.s8','vqaddcc.s8','vqaddlo.s8','vqaddmi.s8','vqaddpl.s8','vqaddvs.s8','vqaddvc.s8','vqaddhi.s8','vqaddls.s8','vqaddge.s8','vqaddlt.s8','vqaddgt.s8','vqaddle.s8',
+            'vqaddeq.s16','vqaddne.s16','vqaddcs.s16','vqaddhs.s16','vqaddcc.s16','vqaddlo.s16','vqaddmi.s16','vqaddpl.s16','vqaddvs.s16','vqaddvc.s16','vqaddhi.s16','vqaddls.s16','vqaddge.s16','vqaddlt.s16','vqaddgt.s16','vqaddle.s16',
+            'vqaddeq.s32','vqaddne.s32','vqaddcs.s32','vqaddhs.s32','vqaddcc.s32','vqaddlo.s32','vqaddmi.s32','vqaddpl.s32','vqaddvs.s32','vqaddvc.s32','vqaddhi.s32','vqaddls.s32','vqaddge.s32','vqaddlt.s32','vqaddgt.s32','vqaddle.s32',
+            'vqaddeq.s64','vqaddne.s64','vqaddcs.s64','vqaddhs.s64','vqaddcc.s64','vqaddlo.s64','vqaddmi.s64','vqaddpl.s64','vqaddvs.s64','vqaddvc.s64','vqaddhi.s64','vqaddls.s64','vqaddge.s64','vqaddlt.s64','vqaddgt.s64','vqaddle.s64',
+
+            'vqdmlaleq.s16','vqdmlalne.s16','vqdmlalcs.s16','vqdmlalhs.s16','vqdmlalcc.s16','vqdmlallo.s16','vqdmlalmi.s16','vqdmlalpl.s16','vqdmlalvs.s16','vqdmlalvc.s16','vqdmlalhi.s16','vqdmlalls.s16','vqdmlalge.s16','vqdmlallt.s16','vqdmlalgt.s16','vqdmlalle.s16',
+            'vqdmlaleq.s32','vqdmlalne.s32','vqdmlalcs.s32','vqdmlalhs.s32','vqdmlalcc.s32','vqdmlallo.s32','vqdmlalmi.s32','vqdmlalpl.s32','vqdmlalvs.s32','vqdmlalvc.s32','vqdmlalhi.s32','vqdmlalls.s32','vqdmlalge.s32','vqdmlallt.s32','vqdmlalgt.s32','vqdmlalle.s32',
+
+            'vqdmlsleq.s16','vqdmlslne.s16','vqdmlslcs.s16','vqdmlslhs.s16','vqdmlslcc.s16','vqdmlsllo.s16','vqdmlslmi.s16','vqdmlslpl.s16','vqdmlslvs.s16','vqdmlslvc.s16','vqdmlslhi.s16','vqdmlslls.s16','vqdmlslge.s16','vqdmlsllt.s16','vqdmlslgt.s16','vqdmlslle.s16',
+            'vqdmlsleq.s32','vqdmlslne.s32','vqdmlslcs.s32','vqdmlslhs.s32','vqdmlslcc.s32','vqdmlsllo.s32','vqdmlslmi.s32','vqdmlslpl.s32','vqdmlslvs.s32','vqdmlslvc.s32','vqdmlslhi.s32','vqdmlslls.s32','vqdmlslge.s32','vqdmlsllt.s32','vqdmlslgt.s32','vqdmlslle.s32',
+
+            'vqdmulheq.s16','vqdmulhne.s16','vqdmulhcs.s16','vqdmulhhs.s16','vqdmulhcc.s16','vqdmulhlo.s16','vqdmulhmi.s16','vqdmulhpl.s16','vqdmulhvs.s16','vqdmulhvc.s16','vqdmulhhi.s16','vqdmulhls.s16','vqdmulhge.s16','vqdmulhlt.s16','vqdmulhgt.s16','vqdmulhle.s16',
+            'vqdmulheq.s32','vqdmulhne.s32','vqdmulhcs.s32','vqdmulhhs.s32','vqdmulhcc.s32','vqdmulhlo.s32','vqdmulhmi.s32','vqdmulhpl.s32','vqdmulhvs.s32','vqdmulhvc.s32','vqdmulhhi.s32','vqdmulhls.s32','vqdmulhge.s32','vqdmulhlt.s32','vqdmulhgt.s32','vqdmulhle.s32',
+
+            'vqdmulleq.s16','vqdmullne.s16','vqdmullcs.s16','vqdmullhs.s16','vqdmullcc.s16','vqdmulllo.s16','vqdmullmi.s16','vqdmullpl.s16','vqdmullvs.s16','vqdmullvc.s16','vqdmullhi.s16','vqdmullls.s16','vqdmullge.s16','vqdmulllt.s16','vqdmullgt.s16','vqdmullle.s16',
+            'vqdmulleq.s32','vqdmullne.s32','vqdmullcs.s32','vqdmullhs.s32','vqdmullcc.s32','vqdmulllo.s32','vqdmullmi.s32','vqdmullpl.s32','vqdmullvs.s32','vqdmullvc.s32','vqdmullhi.s32','vqdmullls.s32','vqdmullge.s32','vqdmulllt.s32','vqdmullgt.s32','vqdmullle.s32',
+
+            'vqmovneq.s16','vqmovnne.s16','vqmovncs.s16','vqmovnhs.s16','vqmovncc.s16','vqmovnlo.s16','vqmovnmi.s16','vqmovnpl.s16','vqmovnvs.s16','vqmovnvc.s16','vqmovnhi.s16','vqmovnls.s16','vqmovnge.s16','vqmovnlt.s16','vqmovngt.s16','vqmovnle.s16',
+            'vqmovneq.s32','vqmovnne.s32','vqmovncs.s32','vqmovnhs.s32','vqmovncc.s32','vqmovnlo.s32','vqmovnmi.s32','vqmovnpl.s32','vqmovnvs.s32','vqmovnvc.s32','vqmovnhi.s32','vqmovnls.s32','vqmovnge.s32','vqmovnlt.s32','vqmovngt.s32','vqmovnle.s32',
+            'vqmovneq.s64','vqmovnne.s64','vqmovncs.s64','vqmovnhs.s64','vqmovncc.s64','vqmovnlo.s64','vqmovnmi.s64','vqmovnpl.s64','vqmovnvs.s64','vqmovnvc.s64','vqmovnhi.s64','vqmovnls.s64','vqmovnge.s64','vqmovnlt.s64','vqmovngt.s64','vqmovnle.s64',
+
+            'vqmovuneq.s16','vqmovunne.s16','vqmovuncs.s16','vqmovunhs.s16','vqmovuncc.s16','vqmovunlo.s16','vqmovunmi.s16','vqmovunpl.s16','vqmovunvs.s16','vqmovunvc.s16','vqmovunhi.s16','vqmovunls.s16','vqmovunge.s16','vqmovunlt.s16','vqmovungt.s16','vqmovunle.s16',
+            'vqmovuneq.s32','vqmovunne.s32','vqmovuncs.s32','vqmovunhs.s32','vqmovuncc.s32','vqmovunlo.s32','vqmovunmi.s32','vqmovunpl.s32','vqmovunvs.s32','vqmovunvc.s32','vqmovunhi.s32','vqmovunls.s32','vqmovunge.s32','vqmovunlt.s32','vqmovungt.s32','vqmovunle.s32',
+            'vqmovuneq.s64','vqmovunne.s64','vqmovuncs.s64','vqmovunhs.s64','vqmovuncc.s64','vqmovunlo.s64','vqmovunmi.s64','vqmovunpl.s64','vqmovunvs.s64','vqmovunvc.s64','vqmovunhi.s64','vqmovunls.s64','vqmovunge.s64','vqmovunlt.s64','vqmovungt.s64','vqmovunle.s64',
+
+            'vqnegeq.s8','vqnegne.s8','vqnegcs.s8','vqneghs.s8','vqnegcc.s8','vqneglo.s8','vqnegmi.s8','vqnegpl.s8','vqnegvs.s8','vqnegvc.s8','vqneghi.s8','vqnegls.s8','vqnegge.s8','vqneglt.s8','vqneggt.s8','vqnegle.s8',
+            'vqnegeq.s16','vqnegne.s16','vqnegcs.s16','vqneghs.s16','vqnegcc.s16','vqneglo.s16','vqnegmi.s16','vqnegpl.s16','vqnegvs.s16','vqnegvc.s16','vqneghi.s16','vqnegls.s16','vqnegge.s16','vqneglt.s16','vqneggt.s16','vqnegle.s16',
+            'vqnegeq.s32','vqnegne.s32','vqnegcs.s32','vqneghs.s32','vqnegcc.s32','vqneglo.s32','vqnegmi.s32','vqnegpl.s32','vqnegvs.s32','vqnegvc.s32','vqneghi.s32','vqnegls.s32','vqnegge.s32','vqneglt.s32','vqneggt.s32','vqnegle.s32',
+
+            'vqrdmulheq.s16','vqrdmulhne.s16','vqrdmulhcs.s16','vqrdmulhhs.s16','vqrdmulhcc.s16','vqrdmulhlo.s16','vqrdmulhmi.s16','vqrdmulhpl.s16','vqrdmulhvs.s16','vqrdmulhvc.s16','vqrdmulhhi.s16','vqrdmulhls.s16','vqrdmulhge.s16','vqrdmulhlt.s16','vqrdmulhgt.s16','vqrdmulhle.s16',
+            'vqrdmulheq.s32','vqrdmulhne.s32','vqrdmulhcs.s32','vqrdmulhhs.s32','vqrdmulhcc.s32','vqrdmulhlo.s32','vqrdmulhmi.s32','vqrdmulhpl.s32','vqrdmulhvs.s32','vqrdmulhvc.s32','vqrdmulhhi.s32','vqrdmulhls.s32','vqrdmulhge.s32','vqrdmulhlt.s32','vqrdmulhgt.s32','vqrdmulhle.s32',
+
+            'vqrshleq.s8','vqrshlne.s8','vqrshlcs.s8','vqrshlhs.s8','vqrshlcc.s8','vqrshllo.s8','vqrshlmi.s8','vqrshlpl.s8','vqrshlvs.s8','vqrshlvc.s8','vqrshlhi.s8','vqrshlls.s8','vqrshlge.s8','vqrshllt.s8','vqrshlgt.s8','vqrshlle.s8',
+            'vqrshleq.s16','vqrshlne.s16','vqrshlcs.s16','vqrshlhs.s16','vqrshlcc.s16','vqrshllo.s16','vqrshlmi.s16','vqrshlpl.s16','vqrshlvs.s16','vqrshlvc.s16','vqrshlhi.s16','vqrshlls.s16','vqrshlge.s16','vqrshllt.s16','vqrshlgt.s16','vqrshlle.s16',
+            'vqrshleq.s32','vqrshlne.s32','vqrshlcs.s32','vqrshlhs.s32','vqrshlcc.s32','vqrshllo.s32','vqrshlmi.s32','vqrshlpl.s32','vqrshlvs.s32','vqrshlvc.s32','vqrshlhi.s32','vqrshlls.s32','vqrshlge.s32','vqrshllt.s32','vqrshlgt.s32','vqrshlle.s32',
+            'vqrshleq.s64','vqrshlne.s64','vqrshlcs.s64','vqrshlhs.s64','vqrshlcc.s64','vqrshllo.s64','vqrshlmi.s64','vqrshlpl.s64','vqrshlvs.s64','vqrshlvc.s64','vqrshlhi.s64','vqrshlls.s64','vqrshlge.s64','vqrshllt.s64','vqrshlgt.s64','vqrshlle.s64',
+
+            'vqrshrneq.s16','vqrshrnne.s16','vqrshrncs.s16','vqrshrnhs.s16','vqrshrncc.s16','vqrshrnlo.s16','vqrshrnmi.s16','vqrshrnpl.s16','vqrshrnvs.s16','vqrshrnvc.s16','vqrshrnhi.s16','vqrshrnls.s16','vqrshrnge.s16','vqrshrnlt.s16','vqrshrngt.s16','vqrshrnle.s16',
+            'vqrshrneq.s32','vqrshrnne.s32','vqrshrncs.s32','vqrshrnhs.s32','vqrshrncc.s32','vqrshrnlo.s32','vqrshrnmi.s32','vqrshrnpl.s32','vqrshrnvs.s32','vqrshrnvc.s32','vqrshrnhi.s32','vqrshrnls.s32','vqrshrnge.s32','vqrshrnlt.s32','vqrshrngt.s32','vqrshrnle.s32',
+            'vqrshrneq.s64','vqrshrnne.s64','vqrshrncs.s64','vqrshrnhs.s64','vqrshrncc.s64','vqrshrnlo.s64','vqrshrnmi.s64','vqrshrnpl.s64','vqrshrnvs.s64','vqrshrnvc.s64','vqrshrnhi.s64','vqrshrnls.s64','vqrshrnge.s64','vqrshrnlt.s64','vqrshrngt.s64','vqrshrnle.s64',
+
+            'vqrshruneq.s16','vqrshrunne.s16','vqrshruncs.s16','vqrshrunhs.s16','vqrshruncc.s16','vqrshrunlo.s16','vqrshrunmi.s16','vqrshrunpl.s16','vqrshrunvs.s16','vqrshrunvc.s16','vqrshrunhi.s16','vqrshrunls.s16','vqrshrunge.s16','vqrshrunlt.s16','vqrshrungt.s16','vqrshrunle.s16',
+            'vqrshruneq.s32','vqrshrunne.s32','vqrshruncs.s32','vqrshrunhs.s32','vqrshruncc.s32','vqrshrunlo.s32','vqrshrunmi.s32','vqrshrunpl.s32','vqrshrunvs.s32','vqrshrunvc.s32','vqrshrunhi.s32','vqrshrunls.s32','vqrshrunge.s32','vqrshrunlt.s32','vqrshrungt.s32','vqrshrunle.s32',
+            'vqrshruneq.s64','vqrshrunne.s64','vqrshruncs.s64','vqrshrunhs.s64','vqrshruncc.s64','vqrshrunlo.s64','vqrshrunmi.s64','vqrshrunpl.s64','vqrshrunvs.s64','vqrshrunvc.s64','vqrshrunhi.s64','vqrshrunls.s64','vqrshrunge.s64','vqrshrunlt.s64','vqrshrungt.s64','vqrshrunle.s64',
+
+            'vqshleq.s8','vqshlne.s8','vqshlcs.s8','vqshlhs.s8','vqshlcc.s8','vqshllo.s8','vqshlmi.s8','vqshlpl.s8','vqshlvs.s8','vqshlvc.s8','vqshlhi.s8','vqshlls.s8','vqshlge.s8','vqshllt.s8','vqshlgt.s8','vqshlle.s8',
+            'vqshleq.s16','vqshlne.s16','vqshlcs.s16','vqshlhs.s16','vqshlcc.s16','vqshllo.s16','vqshlmi.s16','vqshlpl.s16','vqshlvs.s16','vqshlvc.s16','vqshlhi.s16','vqshlls.s16','vqshlge.s16','vqshllt.s16','vqshlgt.s16','vqshlle.s16',
+            'vqshleq.s32','vqshlne.s32','vqshlcs.s32','vqshlhs.s32','vqshlcc.s32','vqshllo.s32','vqshlmi.s32','vqshlpl.s32','vqshlvs.s32','vqshlvc.s32','vqshlhi.s32','vqshlls.s32','vqshlge.s32','vqshllt.s32','vqshlgt.s32','vqshlle.s32',
+            'vqshleq.s64','vqshlne.s64','vqshlcs.s64','vqshlhs.s64','vqshlcc.s64','vqshllo.s64','vqshlmi.s64','vqshlpl.s64','vqshlvs.s64','vqshlvc.s64','vqshlhi.s64','vqshlls.s64','vqshlge.s64','vqshllt.s64','vqshlgt.s64','vqshlle.s64',
+
+            'vqshlueq.s8','vqshlune.s8','vqshlucs.s8','vqshluhs.s8','vqshlucc.s8','vqshlulo.s8','vqshlumi.s8','vqshlupl.s8','vqshluvs.s8','vqshluvc.s8','vqshluhi.s8','vqshluls.s8','vqshluge.s8','vqshlult.s8','vqshlugt.s8','vqshlule.s8',
+            'vqshlueq.s16','vqshlune.s16','vqshlucs.s16','vqshluhs.s16','vqshlucc.s16','vqshlulo.s16','vqshlumi.s16','vqshlupl.s16','vqshluvs.s16','vqshluvc.s16','vqshluhi.s16','vqshluls.s16','vqshluge.s16','vqshlult.s16','vqshlugt.s16','vqshlule.s16',
+            'vqshlueq.s32','vqshlune.s32','vqshlucs.s32','vqshluhs.s32','vqshlucc.s32','vqshlulo.s32','vqshlumi.s32','vqshlupl.s32','vqshluvs.s32','vqshluvc.s32','vqshluhi.s32','vqshluls.s32','vqshluge.s32','vqshlult.s32','vqshlugt.s32','vqshlule.s32',
+            'vqshlueq.s64','vqshlune.s64','vqshlucs.s64','vqshluhs.s64','vqshlucc.s64','vqshlulo.s64','vqshlumi.s64','vqshlupl.s64','vqshluvs.s64','vqshluvc.s64','vqshluhi.s64','vqshluls.s64','vqshluge.s64','vqshlult.s64','vqshlugt.s64','vqshlule.s64',
+
+            'vqshrneq.s16','vqshrnne.s16','vqshrncs.s16','vqshrnhs.s16','vqshrncc.s16','vqshrnlo.s16','vqshrnmi.s16','vqshrnpl.s16','vqshrnvs.s16','vqshrnvc.s16','vqshrnhi.s16','vqshrnls.s16','vqshrnge.s16','vqshrnlt.s16','vqshrngt.s16','vqshrnle.s16',
+            'vqshrneq.s32','vqshrnne.s32','vqshrncs.s32','vqshrnhs.s32','vqshrncc.s32','vqshrnlo.s32','vqshrnmi.s32','vqshrnpl.s32','vqshrnvs.s32','vqshrnvc.s32','vqshrnhi.s32','vqshrnls.s32','vqshrnge.s32','vqshrnlt.s32','vqshrngt.s32','vqshrnle.s32',
+            'vqshrneq.s64','vqshrnne.s64','vqshrncs.s64','vqshrnhs.s64','vqshrncc.s64','vqshrnlo.s64','vqshrnmi.s64','vqshrnpl.s64','vqshrnvs.s64','vqshrnvc.s64','vqshrnhi.s64','vqshrnls.s64','vqshrnge.s64','vqshrnlt.s64','vqshrngt.s64','vqshrnle.s64',
+
+            'vqshruneq.s16','vqshrunne.s16','vqshruncs.s16','vqshrunhs.s16','vqshruncc.s16','vqshrunlo.s16','vqshrunmi.s16','vqshrunpl.s16','vqshrunvs.s16','vqshrunvc.s16','vqshrunhi.s16','vqshrunls.s16','vqshrunge.s16','vqshrunlt.s16','vqshrungt.s16','vqshrunle.s16',
+            'vqshruneq.s32','vqshrunne.s32','vqshruncs.s32','vqshrunhs.s32','vqshruncc.s32','vqshrunlo.s32','vqshrunmi.s32','vqshrunpl.s32','vqshrunvs.s32','vqshrunvc.s32','vqshrunhi.s32','vqshrunls.s32','vqshrunge.s32','vqshrunlt.s32','vqshrungt.s32','vqshrunle.s32',
+            'vqshruneq.s64','vqshrunne.s64','vqshruncs.s64','vqshrunhs.s64','vqshruncc.s64','vqshrunlo.s64','vqshrunmi.s64','vqshrunpl.s64','vqshrunvs.s64','vqshrunvc.s64','vqshrunhi.s64','vqshrunls.s64','vqshrunge.s64','vqshrunlt.s64','vqshrungt.s64','vqshrunle.s64',
+
+            'vqsubeq.s8','vqsubne.s8','vqsubcs.s8','vqsubhs.s8','vqsubcc.s8','vqsublo.s8','vqsubmi.s8','vqsubpl.s8','vqsubvs.s8','vqsubvc.s8','vqsubhi.s8','vqsubls.s8','vqsubge.s8','vqsublt.s8','vqsubgt.s8','vqsuble.s8',
+            'vqsubeq.s16','vqsubne.s16','vqsubcs.s16','vqsubhs.s16','vqsubcc.s16','vqsublo.s16','vqsubmi.s16','vqsubpl.s16','vqsubvs.s16','vqsubvc.s16','vqsubhi.s16','vqsubls.s16','vqsubge.s16','vqsublt.s16','vqsubgt.s16','vqsuble.s16',
+            'vqsubeq.s32','vqsubne.s32','vqsubcs.s32','vqsubhs.s32','vqsubcc.s32','vqsublo.s32','vqsubmi.s32','vqsubpl.s32','vqsubvs.s32','vqsubvc.s32','vqsubhi.s32','vqsubls.s32','vqsubge.s32','vqsublt.s32','vqsubgt.s32','vqsuble.s32',
+            'vqsubeq.s64','vqsubne.s64','vqsubcs.s64','vqsubhs.s64','vqsubcc.s64','vqsublo.s64','vqsubmi.s64','vqsubpl.s64','vqsubvs.s64','vqsubvc.s64','vqsubhi.s64','vqsubls.s64','vqsubge.s64','vqsublt.s64','vqsubgt.s64','vqsuble.s64',
+
+            'vrhaddeq.s8','vrhaddne.s8','vrhaddcs.s8','vrhaddhs.s8','vrhaddcc.s8','vrhaddlo.s8','vrhaddmi.s8','vrhaddpl.s8','vrhaddvs.s8','vrhaddvc.s8','vrhaddhi.s8','vrhaddls.s8','vrhaddge.s8','vrhaddlt.s8','vrhaddgt.s8','vrhaddle.s8',
+            'vrhaddeq.s16','vrhaddne.s16','vrhaddcs.s16','vrhaddhs.s16','vrhaddcc.s16','vrhaddlo.s16','vrhaddmi.s16','vrhaddpl.s16','vrhaddvs.s16','vrhaddvc.s16','vrhaddhi.s16','vrhaddls.s16','vrhaddge.s16','vrhaddlt.s16','vrhaddgt.s16','vrhaddle.s16',
+            'vrhaddeq.s32','vrhaddne.s32','vrhaddcs.s32','vrhaddhs.s32','vrhaddcc.s32','vrhaddlo.s32','vrhaddmi.s32','vrhaddpl.s32','vrhaddvs.s32','vrhaddvc.s32','vrhaddhi.s32','vrhaddls.s32','vrhaddge.s32','vrhaddlt.s32','vrhaddgt.s32','vrhaddle.s32',
+
+            'vrshleq.s8','vrshlne.s8','vrshlcs.s8','vrshlhs.s8','vrshlcc.s8','vrshllo.s8','vrshlmi.s8','vrshlpl.s8','vrshlvs.s8','vrshlvc.s8','vrshlhi.s8','vrshlls.s8','vrshlge.s8','vrshllt.s8','vrshlgt.s8','vrshlle.s8',
+            'vrshleq.s16','vrshlne.s16','vrshlcs.s16','vrshlhs.s16','vrshlcc.s16','vrshllo.s16','vrshlmi.s16','vrshlpl.s16','vrshlvs.s16','vrshlvc.s16','vrshlhi.s16','vrshlls.s16','vrshlge.s16','vrshllt.s16','vrshlgt.s16','vrshlle.s16',
+            'vrshleq.s32','vrshlne.s32','vrshlcs.s32','vrshlhs.s32','vrshlcc.s32','vrshllo.s32','vrshlmi.s32','vrshlpl.s32','vrshlvs.s32','vrshlvc.s32','vrshlhi.s32','vrshlls.s32','vrshlge.s32','vrshllt.s32','vrshlgt.s32','vrshlle.s32',
+            'vrshleq.s64','vrshlne.s64','vrshlcs.s64','vrshlhs.s64','vrshlcc.s64','vrshllo.s64','vrshlmi.s64','vrshlpl.s64','vrshlvs.s64','vrshlvc.s64','vrshlhi.s64','vrshlls.s64','vrshlge.s64','vrshllt.s64','vrshlgt.s64','vrshlle.s64',
+
+            'vrshreq.s8','vrshrne.s8','vrshrcs.s8','vrshrhs.s8','vrshrcc.s8','vrshrlo.s8','vrshrmi.s8','vrshrpl.s8','vrshrvs.s8','vrshrvc.s8','vrshrhi.s8','vrshrls.s8','vrshrge.s8','vrshrlt.s8','vrshrgt.s8','vrshrle.s8',
+            'vrshreq.s16','vrshrne.s16','vrshrcs.s16','vrshrhs.s16','vrshrcc.s16','vrshrlo.s16','vrshrmi.s16','vrshrpl.s16','vrshrvs.s16','vrshrvc.s16','vrshrhi.s16','vrshrls.s16','vrshrge.s16','vrshrlt.s16','vrshrgt.s16','vrshrle.s16',
+            'vrshreq.s32','vrshrne.s32','vrshrcs.s32','vrshrhs.s32','vrshrcc.s32','vrshrlo.s32','vrshrmi.s32','vrshrpl.s32','vrshrvs.s32','vrshrvc.s32','vrshrhi.s32','vrshrls.s32','vrshrge.s32','vrshrlt.s32','vrshrgt.s32','vrshrle.s32',
+            'vrshreq.s64','vrshrne.s64','vrshrcs.s64','vrshrhs.s64','vrshrcc.s64','vrshrlo.s64','vrshrmi.s64','vrshrpl.s64','vrshrvs.s64','vrshrvc.s64','vrshrhi.s64','vrshrls.s64','vrshrge.s64','vrshrlt.s64','vrshrgt.s64','vrshrle.s64',
+
+            'vrsraeq.s8','vrsrane.s8','vrsracs.s8','vrsrahs.s8','vrsracc.s8','vrsralo.s8','vrsrami.s8','vrsrapl.s8','vrsravs.s8','vrsravc.s8','vrsrahi.s8','vrsrals.s8','vrsrage.s8','vrsralt.s8','vrsragt.s8','vrsrale.s8',
+            'vrsraeq.s16','vrsrane.s16','vrsracs.s16','vrsrahs.s16','vrsracc.s16','vrsralo.s16','vrsrami.s16','vrsrapl.s16','vrsravs.s16','vrsravc.s16','vrsrahi.s16','vrsrals.s16','vrsrage.s16','vrsralt.s16','vrsragt.s16','vrsrale.s16',
+            'vrsraeq.s32','vrsrane.s32','vrsracs.s32','vrsrahs.s32','vrsracc.s32','vrsralo.s32','vrsrami.s32','vrsrapl.s32','vrsravs.s32','vrsravc.s32','vrsrahi.s32','vrsrals.s32','vrsrage.s32','vrsralt.s32','vrsragt.s32','vrsrale.s32',
+            'vrsraeq.s64','vrsrane.s64','vrsracs.s64','vrsrahs.s64','vrsracc.s64','vrsralo.s64','vrsrami.s64','vrsrapl.s64','vrsravs.s64','vrsravc.s64','vrsrahi.s64','vrsrals.s64','vrsrage.s64','vrsralt.s64','vrsragt.s64','vrsrale.s64',
+
+            'vshleq.s8','vshlne.s8','vshlcs.s8','vshlhs.s8','vshlcc.s8','vshllo.s8','vshlmi.s8','vshlpl.s8','vshlvs.s8','vshlvc.s8','vshlhi.s8','vshlls.s8','vshlge.s8','vshllt.s8','vshlgt.s8','vshlle.s8',
+            'vshleq.s16','vshlne.s16','vshlcs.s16','vshlhs.s16','vshlcc.s16','vshllo.s16','vshlmi.s16','vshlpl.s16','vshlvs.s16','vshlvc.s16','vshlhi.s16','vshlls.s16','vshlge.s16','vshllt.s16','vshlgt.s16','vshlle.s16',
+            'vshleq.s32','vshlne.s32','vshlcs.s32','vshlhs.s32','vshlcc.s32','vshllo.s32','vshlmi.s32','vshlpl.s32','vshlvs.s32','vshlvc.s32','vshlhi.s32','vshlls.s32','vshlge.s32','vshllt.s32','vshlgt.s32','vshlle.s32',
+            'vshleq.s64','vshlne.s64','vshlcs.s64','vshlhs.s64','vshlcc.s64','vshllo.s64','vshlmi.s64','vshlpl.s64','vshlvs.s64','vshlvc.s64','vshlhi.s64','vshlls.s64','vshlge.s64','vshllt.s64','vshlgt.s64','vshlle.s64',
+
+            'vshlleq.s8','vshllne.s8','vshllcs.s8','vshllhs.s8','vshllcc.s8','vshlllo.s8','vshllmi.s8','vshllpl.s8','vshllvs.s8','vshllvc.s8','vshllhi.s8','vshllls.s8','vshllge.s8','vshlllt.s8','vshllgt.s8','vshllle.s8',
+            'vshlleq.s16','vshllne.s16','vshllcs.s16','vshllhs.s16','vshllcc.s16','vshlllo.s16','vshllmi.s16','vshllpl.s16','vshllvs.s16','vshllvc.s16','vshllhi.s16','vshllls.s16','vshllge.s16','vshlllt.s16','vshllgt.s16','vshllle.s16',
+            'vshlleq.s32','vshllne.s32','vshllcs.s32','vshllhs.s32','vshllcc.s32','vshlllo.s32','vshllmi.s32','vshllpl.s32','vshllvs.s32','vshllvc.s32','vshllhi.s32','vshllls.s32','vshllge.s32','vshlllt.s32','vshllgt.s32','vshllle.s32',
+
+            'vshreq.s8','vshrne.s8','vshrcs.s8','vshrhs.s8','vshrcc.s8','vshrlo.s8','vshrmi.s8','vshrpl.s8','vshrvs.s8','vshrvc.s8','vshrhi.s8','vshrls.s8','vshrge.s8','vshrlt.s8','vshrgt.s8','vshrle.s8',
+            'vshreq.s16','vshrne.s16','vshrcs.s16','vshrhs.s16','vshrcc.s16','vshrlo.s16','vshrmi.s16','vshrpl.s16','vshrvs.s16','vshrvc.s16','vshrhi.s16','vshrls.s16','vshrge.s16','vshrlt.s16','vshrgt.s16','vshrle.s16',
+            'vshreq.s32','vshrne.s32','vshrcs.s32','vshrhs.s32','vshrcc.s32','vshrlo.s32','vshrmi.s32','vshrpl.s32','vshrvs.s32','vshrvc.s32','vshrhi.s32','vshrls.s32','vshrge.s32','vshrlt.s32','vshrgt.s32','vshrle.s32',
+            'vshreq.s64','vshrne.s64','vshrcs.s64','vshrhs.s64','vshrcc.s64','vshrlo.s64','vshrmi.s64','vshrpl.s64','vshrvs.s64','vshrvc.s64','vshrhi.s64','vshrls.s64','vshrge.s64','vshrlt.s64','vshrgt.s64','vshrle.s64',
+
+            'vsraeq.s8','vsrane.s8','vsracs.s8','vsrahs.s8','vsracc.s8','vsralo.s8','vsrami.s8','vsrapl.s8','vsravs.s8','vsravc.s8','vsrahi.s8','vsrals.s8','vsrage.s8','vsralt.s8','vsragt.s8','vsrale.s8',
+            'vsraeq.s16','vsrane.s16','vsracs.s16','vsrahs.s16','vsracc.s16','vsralo.s16','vsrami.s16','vsrapl.s16','vsravs.s16','vsravc.s16','vsrahi.s16','vsrals.s16','vsrage.s16','vsralt.s16','vsragt.s16','vsrale.s16',
+            'vsraeq.s32','vsrane.s32','vsracs.s32','vsrahs.s32','vsracc.s32','vsralo.s32','vsrami.s32','vsrapl.s32','vsravs.s32','vsravc.s32','vsrahi.s32','vsrals.s32','vsrage.s32','vsralt.s32','vsragt.s32','vsrale.s32',
+            'vsraeq.s64','vsrane.s64','vsracs.s64','vsrahs.s64','vsracc.s64','vsralo.s64','vsrami.s64','vsrapl.s64','vsravs.s64','vsravc.s64','vsrahi.s64','vsrals.s64','vsrage.s64','vsralt.s64','vsragt.s64','vsrale.s64',
+
+            'vsubleq.s8','vsublne.s8','vsublcs.s8','vsublhs.s8','vsublcc.s8','vsubllo.s8','vsublmi.s8','vsublpl.s8','vsublvs.s8','vsublvc.s8','vsublhi.s8','vsublls.s8','vsublge.s8','vsubllt.s8','vsublgt.s8','vsublle.s8',
+            'vsubleq.s16','vsublne.s16','vsublcs.s16','vsublhs.s16','vsublcc.s16','vsubllo.s16','vsublmi.s16','vsublpl.s16','vsublvs.s16','vsublvc.s16','vsublhi.s16','vsublls.s16','vsublge.s16','vsubllt.s16','vsublgt.s16','vsublle.s16',
+            'vsubleq.s32','vsublne.s32','vsublcs.s32','vsublhs.s32','vsublcc.s32','vsubllo.s32','vsublmi.s32','vsublpl.s32','vsublvs.s32','vsublvc.s32','vsublhi.s32','vsublls.s32','vsublge.s32','vsubllt.s32','vsublgt.s32','vsublle.s32',
+
+            'vsubheq.s8','vsubhne.s8','vsubhcs.s8','vsubhhs.s8','vsubhcc.s8','vsubhlo.s8','vsubhmi.s8','vsubhpl.s8','vsubhvs.s8','vsubhvc.s8','vsubhhi.s8','vsubhls.s8','vsubhge.s8','vsubhlt.s8','vsubhgt.s8','vsubhle.s8',
+            'vsubheq.s16','vsubhne.s16','vsubhcs.s16','vsubhhs.s16','vsubhcc.s16','vsubhlo.s16','vsubhmi.s16','vsubhpl.s16','vsubhvs.s16','vsubhvc.s16','vsubhhi.s16','vsubhls.s16','vsubhge.s16','vsubhlt.s16','vsubhgt.s16','vsubhle.s16',
+            'vsubheq.s32','vsubhne.s32','vsubhcs.s32','vsubhhs.s32','vsubhcc.s32','vsubhlo.s32','vsubhmi.s32','vsubhpl.s32','vsubhvs.s32','vsubhvc.s32','vsubhhi.s32','vsubhls.s32','vsubhge.s32','vsubhlt.s32','vsubhgt.s32','vsubhle.s32'
+            ),
+        /* Conditional NEON SIMD Unsigned Integer Instructions */
+        33 => array(
+            'vabaeq.u8','vabane.u8','vabacs.u8','vabahs.u8','vabacc.u8','vabalo.u8','vabami.u8','vabapl.u8','vabavs.u8','vabavc.u8','vabahi.u8','vabals.u8','vabage.u8','vabalt.u8','vabagt.u8','vabale.u8',
+            'vabaeq.u16','vabane.u16','vabacs.u16','vabahs.u16','vabacc.u16','vabalo.u16','vabami.u16','vabapl.u16','vabavs.u16','vabavc.u16','vabahi.u16','vabals.u16','vabage.u16','vabalt.u16','vabagt.u16','vabale.u16',
+            'vabaeq.u32','vabane.u32','vabacs.u32','vabahs.u32','vabacc.u32','vabalo.u32','vabami.u32','vabapl.u32','vabavs.u32','vabavc.u32','vabahi.u32','vabals.u32','vabage.u32','vabalt.u32','vabagt.u32','vabale.u32',
+
+            'vabaleq.u8','vabalne.u8','vabalcs.u8','vabalhs.u8','vabalcc.u8','vaballo.u8','vabalmi.u8','vabalpl.u8','vabalvs.u8','vabalvc.u8','vabalhi.u8','vaballs.u8','vabalge.u8','vaballt.u8','vabalgt.u8','vaballe.u8',
+            'vabaleq.u16','vabalne.u16','vabalcs.u16','vabalhs.u16','vabalcc.u16','vaballo.u16','vabalmi.u16','vabalpl.u16','vabalvs.u16','vabalvc.u16','vabalhi.u16','vaballs.u16','vabalge.u16','vaballt.u16','vabalgt.u16','vaballe.u16',
+            'vabaleq.u32','vabalne.u32','vabalcs.u32','vabalhs.u32','vabalcc.u32','vaballo.u32','vabalmi.u32','vabalpl.u32','vabalvs.u32','vabalvc.u32','vabalhi.u32','vaballs.u32','vabalge.u32','vaballt.u32','vabalgt.u32','vaballe.u32',
+
+            'vabdeq.u8','vabdne.u8','vabdcs.u8','vabdhs.u8','vabdcc.u8','vabdlo.u8','vabdmi.u8','vabdpl.u8','vabdvs.u8','vabdvc.u8','vabdhi.u8','vabdls.u8','vabdge.u8','vabdlt.u8','vabdgt.u8','vabdle.u8',
+            'vabdeq.u16','vabdne.u16','vabdcs.u16','vabdhs.u16','vabdcc.u16','vabdlo.u16','vabdmi.u16','vabdpl.u16','vabdvs.u16','vabdvc.u16','vabdhi.u16','vabdls.u16','vabdge.u16','vabdlt.u16','vabdgt.u16','vabdle.u16',
+            'vabdeq.u32','vabdne.u32','vabdcs.u32','vabdhs.u32','vabdcc.u32','vabdlo.u32','vabdmi.u32','vabdpl.u32','vabdvs.u32','vabdvc.u32','vabdhi.u32','vabdls.u32','vabdge.u32','vabdlt.u32','vabdgt.u32','vabdle.u32',
+
+            'vaddleq.u8','vaddlne.u8','vaddlcs.u8','vaddlhs.u8','vaddlcc.u8','vaddllo.u8','vaddlmi.u8','vaddlpl.u8','vaddlvs.u8','vaddlvc.u8','vaddlhi.u8','vaddlls.u8','vaddlge.u8','vaddllt.u8','vaddlgt.u8','vaddlle.u8',
+            'vaddleq.u16','vaddlne.u16','vaddlcs.u16','vaddlhs.u16','vaddlcc.u16','vaddllo.u16','vaddlmi.u16','vaddlpl.u16','vaddlvs.u16','vaddlvc.u16','vaddlhi.u16','vaddlls.u16','vaddlge.u16','vaddllt.u16','vaddlgt.u16','vaddlle.u16',
+            'vaddleq.u32','vaddlne.u32','vaddlcs.u32','vaddlhs.u32','vaddlcc.u32','vaddllo.u32','vaddlmi.u32','vaddlpl.u32','vaddlvs.u32','vaddlvc.u32','vaddlhi.u32','vaddlls.u32','vaddlge.u32','vaddllt.u32','vaddlgt.u32','vaddlle.u32',
+
+            'vsubleq.u8','vsublne.u8','vsublcs.u8','vsublhs.u8','vsublcc.u8','vsubllo.u8','vsublmi.u8','vsublpl.u8','vsublvs.u8','vsublvc.u8','vsublhi.u8','vsublls.u8','vsublge.u8','vsubllt.u8','vsublgt.u8','vsublle.u8',
+            'vsubleq.u16','vsublne.u16','vsublcs.u16','vsublhs.u16','vsublcc.u16','vsubllo.u16','vsublmi.u16','vsublpl.u16','vsublvs.u16','vsublvc.u16','vsublhi.u16','vsublls.u16','vsublge.u16','vsubllt.u16','vsublgt.u16','vsublle.u16',
+            'vsubleq.u32','vsublne.u32','vsublcs.u32','vsublhs.u32','vsublcc.u32','vsubllo.u32','vsublmi.u32','vsublpl.u32','vsublvs.u32','vsublvc.u32','vsublhi.u32','vsublls.u32','vsublge.u32','vsubllt.u32','vsublgt.u32','vsublle.u32',
+
+            'vaddweq.u8','vaddwne.u8','vaddwcs.u8','vaddwhs.u8','vaddwcc.u8','vaddwlo.u8','vaddwmi.u8','vaddwpl.u8','vaddwvs.u8','vaddwvc.u8','vaddwhi.u8','vaddwls.u8','vaddwge.u8','vaddwlt.u8','vaddwgt.u8','vaddwle.u8',
+            'vaddweq.u16','vaddwne.u16','vaddwcs.u16','vaddwhs.u16','vaddwcc.u16','vaddwlo.u16','vaddwmi.u16','vaddwpl.u16','vaddwvs.u16','vaddwvc.u16','vaddwhi.u16','vaddwls.u16','vaddwge.u16','vaddwlt.u16','vaddwgt.u16','vaddwle.u16',
+            'vaddweq.u32','vaddwne.u32','vaddwcs.u32','vaddwhs.u32','vaddwcc.u32','vaddwlo.u32','vaddwmi.u32','vaddwpl.u32','vaddwvs.u32','vaddwvc.u32','vaddwhi.u32','vaddwls.u32','vaddwge.u32','vaddwlt.u32','vaddwgt.u32','vaddwle.u32',
+
+            'vsubheq.u8','vsubhne.u8','vsubhcs.u8','vsubhhs.u8','vsubhcc.u8','vsubhlo.u8','vsubhmi.u8','vsubhpl.u8','vsubhvs.u8','vsubhvc.u8','vsubhhi.u8','vsubhls.u8','vsubhge.u8','vsubhlt.u8','vsubhgt.u8','vsubhle.u8',
+            'vsubheq.u16','vsubhne.u16','vsubhcs.u16','vsubhhs.u16','vsubhcc.u16','vsubhlo.u16','vsubhmi.u16','vsubhpl.u16','vsubhvs.u16','vsubhvc.u16','vsubhhi.u16','vsubhls.u16','vsubhge.u16','vsubhlt.u16','vsubhgt.u16','vsubhle.u16',
+            'vsubheq.u32','vsubhne.u32','vsubhcs.u32','vsubhhs.u32','vsubhcc.u32','vsubhlo.u32','vsubhmi.u32','vsubhpl.u32','vsubhvs.u32','vsubhvc.u32','vsubhhi.u32','vsubhls.u32','vsubhge.u32','vsubhlt.u32','vsubhgt.u32','vsubhle.u32',
+
+            'vhaddeq.u8','vhaddne.u8','vhaddcs.u8','vhaddhs.u8','vhaddcc.u8','vhaddlo.u8','vhaddmi.u8','vhaddpl.u8','vhaddvs.u8','vhaddvc.u8','vhaddhi.u8','vhaddls.u8','vhaddge.u8','vhaddlt.u8','vhaddgt.u8','vhaddle.u8',
+            'vhaddeq.u16','vhaddne.u16','vhaddcs.u16','vhaddhs.u16','vhaddcc.u16','vhaddlo.u16','vhaddmi.u16','vhaddpl.u16','vhaddvs.u16','vhaddvc.u16','vhaddhi.u16','vhaddls.u16','vhaddge.u16','vhaddlt.u16','vhaddgt.u16','vhaddle.u16',
+            'vhaddeq.u32','vhaddne.u32','vhaddcs.u32','vhaddhs.u32','vhaddcc.u32','vhaddlo.u32','vhaddmi.u32','vhaddpl.u32','vhaddvs.u32','vhaddvc.u32','vhaddhi.u32','vhaddls.u32','vhaddge.u32','vhaddlt.u32','vhaddgt.u32','vhaddle.u32',
+
+            'vhsubeq.u8','vhsubne.u8','vhsubcs.u8','vhsubhs.u8','vhsubcc.u8','vhsublo.u8','vhsubmi.u8','vhsubpl.u8','vhsubvs.u8','vhsubvc.u8','vhsubhi.u8','vhsubls.u8','vhsubge.u8','vhsublt.u8','vhsubgt.u8','vhsuble.u8',
+            'vhsubeq.u16','vhsubne.u16','vhsubcs.u16','vhsubhs.u16','vhsubcc.u16','vhsublo.u16','vhsubmi.u16','vhsubpl.u16','vhsubvs.u16','vhsubvc.u16','vhsubhi.u16','vhsubls.u16','vhsubge.u16','vhsublt.u16','vhsubgt.u16','vhsuble.u16',
+            'vhsubeq.u32','vhsubne.u32','vhsubcs.u32','vhsubhs.u32','vhsubcc.u32','vhsublo.u32','vhsubmi.u32','vhsubpl.u32','vhsubvs.u32','vhsubvc.u32','vhsubhi.u32','vhsubls.u32','vhsubge.u32','vhsublt.u32','vhsubgt.u32','vhsuble.u32',
+
+            'vpadaleq.u8','vpadalne.u8','vpadalcs.u8','vpadalhs.u8','vpadalcc.u8','vpadallo.u8','vpadalmi.u8','vpadalpl.u8','vpadalvs.u8','vpadalvc.u8','vpadalhi.u8','vpadalls.u8','vpadalge.u8','vpadallt.u8','vpadalgt.u8','vpadalle.u8',
+            'vpadaleq.u16','vpadalne.u16','vpadalcs.u16','vpadalhs.u16','vpadalcc.u16','vpadallo.u16','vpadalmi.u16','vpadalpl.u16','vpadalvs.u16','vpadalvc.u16','vpadalhi.u16','vpadalls.u16','vpadalge.u16','vpadallt.u16','vpadalgt.u16','vpadalle.u16',
+            'vpadaleq.u32','vpadalne.u32','vpadalcs.u32','vpadalhs.u32','vpadalcc.u32','vpadallo.u32','vpadalmi.u32','vpadalpl.u32','vpadalvs.u32','vpadalvc.u32','vpadalhi.u32','vpadalls.u32','vpadalge.u32','vpadallt.u32','vpadalgt.u32','vpadalle.u32',
+
+            'vpaddleq.u8','vpaddlne.u8','vpaddlcs.u8','vpaddlhs.u8','vpaddlcc.u8','vpaddllo.u8','vpaddlmi.u8','vpaddlpl.u8','vpaddlvs.u8','vpaddlvc.u8','vpaddlhi.u8','vpaddlls.u8','vpaddlge.u8','vpaddllt.u8','vpaddlgt.u8','vpaddlle.u8',
+            'vpaddleq.u16','vpaddlne.u16','vpaddlcs.u16','vpaddlhs.u16','vpaddlcc.u16','vpaddllo.u16','vpaddlmi.u16','vpaddlpl.u16','vpaddlvs.u16','vpaddlvc.u16','vpaddlhi.u16','vpaddlls.u16','vpaddlge.u16','vpaddllt.u16','vpaddlgt.u16','vpaddlle.u16',
+            'vpaddleq.u32','vpaddlne.u32','vpaddlcs.u32','vpaddlhs.u32','vpaddlcc.u32','vpaddllo.u32','vpaddlmi.u32','vpaddlpl.u32','vpaddlvs.u32','vpaddlvc.u32','vpaddlhi.u32','vpaddlls.u32','vpaddlge.u32','vpaddllt.u32','vpaddlgt.u32','vpaddlle.u32',
+
+            'vcgeeq.u8','vcgene.u8','vcgecs.u8','vcgehs.u8','vcgecc.u8','vcgelo.u8','vcgemi.u8','vcgepl.u8','vcgevs.u8','vcgevc.u8','vcgehi.u8','vcgels.u8','vcgege.u8','vcgelt.u8','vcgegt.u8','vcgele.u8',
+            'vcgeeq.u16','vcgene.u16','vcgecs.u16','vcgehs.u16','vcgecc.u16','vcgelo.u16','vcgemi.u16','vcgepl.u16','vcgevs.u16','vcgevc.u16','vcgehi.u16','vcgels.u16','vcgege.u16','vcgelt.u16','vcgegt.u16','vcgele.u16',
+            'vcgeeq.u32','vcgene.u32','vcgecs.u32','vcgehs.u32','vcgecc.u32','vcgelo.u32','vcgemi.u32','vcgepl.u32','vcgevs.u32','vcgevc.u32','vcgehi.u32','vcgels.u32','vcgege.u32','vcgelt.u32','vcgegt.u32','vcgele.u32',
+
+            'vcleeq.u8','vclene.u8','vclecs.u8','vclehs.u8','vclecc.u8','vclelo.u8','vclemi.u8','vclepl.u8','vclevs.u8','vclevc.u8','vclehi.u8','vclels.u8','vclege.u8','vclelt.u8','vclegt.u8','vclele.u8',
+            'vcleeq.u16','vclene.u16','vclecs.u16','vclehs.u16','vclecc.u16','vclelo.u16','vclemi.u16','vclepl.u16','vclevs.u16','vclevc.u16','vclehi.u16','vclels.u16','vclege.u16','vclelt.u16','vclegt.u16','vclele.u16',
+            'vcleeq.u32','vclene.u32','vclecs.u32','vclehs.u32','vclecc.u32','vclelo.u32','vclemi.u32','vclepl.u32','vclevs.u32','vclevc.u32','vclehi.u32','vclels.u32','vclege.u32','vclelt.u32','vclegt.u32','vclele.u32',
+
+            'vcgteq.u8','vcgtne.u8','vcgtcs.u8','vcgths.u8','vcgtcc.u8','vcgtlo.u8','vcgtmi.u8','vcgtpl.u8','vcgtvs.u8','vcgtvc.u8','vcgthi.u8','vcgtls.u8','vcgtge.u8','vcgtlt.u8','vcgtgt.u8','vcgtle.u8',
+            'vcgteq.u16','vcgtne.u16','vcgtcs.u16','vcgths.u16','vcgtcc.u16','vcgtlo.u16','vcgtmi.u16','vcgtpl.u16','vcgtvs.u16','vcgtvc.u16','vcgthi.u16','vcgtls.u16','vcgtge.u16','vcgtlt.u16','vcgtgt.u16','vcgtle.u16',
+            'vcgteq.u32','vcgtne.u32','vcgtcs.u32','vcgths.u32','vcgtcc.u32','vcgtlo.u32','vcgtmi.u32','vcgtpl.u32','vcgtvs.u32','vcgtvc.u32','vcgthi.u32','vcgtls.u32','vcgtge.u32','vcgtlt.u32','vcgtgt.u32','vcgtle.u32',
+
+            'vclteq.u8','vcltne.u8','vcltcs.u8','vclths.u8','vcltcc.u8','vcltlo.u8','vcltmi.u8','vcltpl.u8','vcltvs.u8','vcltvc.u8','vclthi.u8','vcltls.u8','vcltge.u8','vcltlt.u8','vcltgt.u8','vcltle.u8',
+            'vclteq.u16','vcltne.u16','vcltcs.u16','vclths.u16','vcltcc.u16','vcltlo.u16','vcltmi.u16','vcltpl.u16','vcltvs.u16','vcltvc.u16','vclthi.u16','vcltls.u16','vcltge.u16','vcltlt.u16','vcltgt.u16','vcltle.u16',
+            'vclteq.u32','vcltne.u32','vcltcs.u32','vclths.u32','vcltcc.u32','vcltlo.u32','vcltmi.u32','vcltpl.u32','vcltvs.u32','vcltvc.u32','vclthi.u32','vcltls.u32','vcltge.u32','vcltlt.u32','vcltgt.u32','vcltle.u32',
+
+            'vmaxeq.u8','vmaxne.u8','vmaxcs.u8','vmaxhs.u8','vmaxcc.u8','vmaxlo.u8','vmaxmi.u8','vmaxpl.u8','vmaxvs.u8','vmaxvc.u8','vmaxhi.u8','vmaxls.u8','vmaxge.u8','vmaxlt.u8','vmaxgt.u8','vmaxle.u8',
+            'vmaxeq.u16','vmaxne.u16','vmaxcs.u16','vmaxhs.u16','vmaxcc.u16','vmaxlo.u16','vmaxmi.u16','vmaxpl.u16','vmaxvs.u16','vmaxvc.u16','vmaxhi.u16','vmaxls.u16','vmaxge.u16','vmaxlt.u16','vmaxgt.u16','vmaxle.u16',
+            'vmaxeq.u32','vmaxne.u32','vmaxcs.u32','vmaxhs.u32','vmaxcc.u32','vmaxlo.u32','vmaxmi.u32','vmaxpl.u32','vmaxvs.u32','vmaxvc.u32','vmaxhi.u32','vmaxls.u32','vmaxge.u32','vmaxlt.u32','vmaxgt.u32','vmaxle.u32',
+
+            'vmineq.u8','vminne.u8','vmincs.u8','vminhs.u8','vmincc.u8','vminlo.u8','vminmi.u8','vminpl.u8','vminvs.u8','vminvc.u8','vminhi.u8','vminls.u8','vminge.u8','vminlt.u8','vmingt.u8','vminle.u8',
+            'vmineq.u16','vminne.u16','vmincs.u16','vminhs.u16','vmincc.u16','vminlo.u16','vminmi.u16','vminpl.u16','vminvs.u16','vminvc.u16','vminhi.u16','vminls.u16','vminge.u16','vminlt.u16','vmingt.u16','vminle.u16',
+            'vmineq.u32','vminne.u32','vmincs.u32','vminhs.u32','vmincc.u32','vminlo.u32','vminmi.u32','vminpl.u32','vminvs.u32','vminvc.u32','vminhi.u32','vminls.u32','vminge.u32','vminlt.u32','vmingt.u32','vminle.u32',
+
+            'vmlaleq.u8','vmlalne.u8','vmlalcs.u8','vmlalhs.u8','vmlalcc.u8','vmlallo.u8','vmlalmi.u8','vmlalpl.u8','vmlalvs.u8','vmlalvc.u8','vmlalhi.u8','vmlalls.u8','vmlalge.u8','vmlallt.u8','vmlalgt.u8','vmlalle.u8',
+            'vmlaleq.u16','vmlalne.u16','vmlalcs.u16','vmlalhs.u16','vmlalcc.u16','vmlallo.u16','vmlalmi.u16','vmlalpl.u16','vmlalvs.u16','vmlalvc.u16','vmlalhi.u16','vmlalls.u16','vmlalge.u16','vmlallt.u16','vmlalgt.u16','vmlalle.u16',
+            'vmlaleq.u32','vmlalne.u32','vmlalcs.u32','vmlalhs.u32','vmlalcc.u32','vmlallo.u32','vmlalmi.u32','vmlalpl.u32','vmlalvs.u32','vmlalvc.u32','vmlalhi.u32','vmlalls.u32','vmlalge.u32','vmlallt.u32','vmlalgt.u32','vmlalle.u32',
+
+            'vmlsleq.u8','vmlslne.u8','vmlslcs.u8','vmlslhs.u8','vmlslcc.u8','vmlsllo.u8','vmlslmi.u8','vmlslpl.u8','vmlslvs.u8','vmlslvc.u8','vmlslhi.u8','vmlslls.u8','vmlslge.u8','vmlsllt.u8','vmlslgt.u8','vmlslle.u8',
+            'vmlsleq.u16','vmlslne.u16','vmlslcs.u16','vmlslhs.u16','vmlslcc.u16','vmlsllo.u16','vmlslmi.u16','vmlslpl.u16','vmlslvs.u16','vmlslvc.u16','vmlslhi.u16','vmlslls.u16','vmlslge.u16','vmlsllt.u16','vmlslgt.u16','vmlslle.u16',
+            'vmlsleq.u32','vmlslne.u32','vmlslcs.u32','vmlslhs.u32','vmlslcc.u32','vmlsllo.u32','vmlslmi.u32','vmlslpl.u32','vmlslvs.u32','vmlslvc.u32','vmlslhi.u32','vmlslls.u32','vmlslge.u32','vmlsllt.u32','vmlslgt.u32','vmlslle.u32',
+
+            'vmulleq.u8','vmullne.u8','vmullcs.u8','vmullhs.u8','vmullcc.u8','vmulllo.u8','vmullmi.u8','vmullpl.u8','vmullvs.u8','vmullvc.u8','vmullhi.u8','vmullls.u8','vmullge.u8','vmulllt.u8','vmullgt.u8','vmullle.u8',
+            'vmulleq.u16','vmullne.u16','vmullcs.u16','vmullhs.u16','vmullcc.u16','vmulllo.u16','vmullmi.u16','vmullpl.u16','vmullvs.u16','vmullvc.u16','vmullhi.u16','vmullls.u16','vmullge.u16','vmulllt.u16','vmullgt.u16','vmullle.u16',
+            'vmulleq.u32','vmullne.u32','vmullcs.u32','vmullhs.u32','vmullcc.u32','vmulllo.u32','vmullmi.u32','vmullpl.u32','vmullvs.u32','vmullvc.u32','vmullhi.u32','vmullls.u32','vmullge.u32','vmulllt.u32','vmullgt.u32','vmullle.u32',
+
+            'vmovleq.u8','vmovlne.u8','vmovlcs.u8','vmovlhs.u8','vmovlcc.u8','vmovllo.u8','vmovlmi.u8','vmovlpl.u8','vmovlvs.u8','vmovlvc.u8','vmovlhi.u8','vmovlls.u8','vmovlge.u8','vmovllt.u8','vmovlgt.u8','vmovlle.u8',
+            'vmovleq.u16','vmovlne.u16','vmovlcs.u16','vmovlhs.u16','vmovlcc.u16','vmovllo.u16','vmovlmi.u16','vmovlpl.u16','vmovlvs.u16','vmovlvc.u16','vmovlhi.u16','vmovlls.u16','vmovlge.u16','vmovllt.u16','vmovlgt.u16','vmovlle.u16',
+            'vmovleq.u32','vmovlne.u32','vmovlcs.u32','vmovlhs.u32','vmovlcc.u32','vmovllo.u32','vmovlmi.u32','vmovlpl.u32','vmovlvs.u32','vmovlvc.u32','vmovlhi.u32','vmovlls.u32','vmovlge.u32','vmovllt.u32','vmovlgt.u32','vmovlle.u32',
+
+            'vshleq.u8','vshlne.u8','vshlcs.u8','vshlhs.u8','vshlcc.u8','vshllo.u8','vshlmi.u8','vshlpl.u8','vshlvs.u8','vshlvc.u8','vshlhi.u8','vshlls.u8','vshlge.u8','vshllt.u8','vshlgt.u8','vshlle.u8',
+            'vshleq.u16','vshlne.u16','vshlcs.u16','vshlhs.u16','vshlcc.u16','vshllo.u16','vshlmi.u16','vshlpl.u16','vshlvs.u16','vshlvc.u16','vshlhi.u16','vshlls.u16','vshlge.u16','vshllt.u16','vshlgt.u16','vshlle.u16',
+            'vshleq.u32','vshlne.u32','vshlcs.u32','vshlhs.u32','vshlcc.u32','vshllo.u32','vshlmi.u32','vshlpl.u32','vshlvs.u32','vshlvc.u32','vshlhi.u32','vshlls.u32','vshlge.u32','vshllt.u32','vshlgt.u32','vshlle.u32',
+            'vshleq.u64','vshlne.u64','vshlcs.u64','vshlhs.u64','vshlcc.u64','vshllo.u64','vshlmi.u64','vshlpl.u64','vshlvs.u64','vshlvc.u64','vshlhi.u64','vshlls.u64','vshlge.u64','vshllt.u64','vshlgt.u64','vshlle.u64',
+
+            'vshlleq.u8','vshllne.u8','vshllcs.u8','vshllhs.u8','vshllcc.u8','vshlllo.u8','vshllmi.u8','vshllpl.u8','vshllvs.u8','vshllvc.u8','vshllhi.u8','vshllls.u8','vshllge.u8','vshlllt.u8','vshllgt.u8','vshllle.u8',
+            'vshlleq.u16','vshllne.u16','vshllcs.u16','vshllhs.u16','vshllcc.u16','vshlllo.u16','vshllmi.u16','vshllpl.u16','vshllvs.u16','vshllvc.u16','vshllhi.u16','vshllls.u16','vshllge.u16','vshlllt.u16','vshllgt.u16','vshllle.u16',
+            'vshlleq.u32','vshllne.u32','vshllcs.u32','vshllhs.u32','vshllcc.u32','vshlllo.u32','vshllmi.u32','vshllpl.u32','vshllvs.u32','vshllvc.u32','vshllhi.u32','vshllls.u32','vshllge.u32','vshlllt.u32','vshllgt.u32','vshllle.u32',
+
+            'vshreq.u8','vshrne.u8','vshrcs.u8','vshrhs.u8','vshrcc.u8','vshrlo.u8','vshrmi.u8','vshrpl.u8','vshrvs.u8','vshrvc.u8','vshrhi.u8','vshrls.u8','vshrge.u8','vshrlt.u8','vshrgt.u8','vshrle.u8',
+            'vshreq.u16','vshrne.u16','vshrcs.u16','vshrhs.u16','vshrcc.u16','vshrlo.u16','vshrmi.u16','vshrpl.u16','vshrvs.u16','vshrvc.u16','vshrhi.u16','vshrls.u16','vshrge.u16','vshrlt.u16','vshrgt.u16','vshrle.u16',
+            'vshreq.u32','vshrne.u32','vshrcs.u32','vshrhs.u32','vshrcc.u32','vshrlo.u32','vshrmi.u32','vshrpl.u32','vshrvs.u32','vshrvc.u32','vshrhi.u32','vshrls.u32','vshrge.u32','vshrlt.u32','vshrgt.u32','vshrle.u32',
+            'vshreq.u64','vshrne.u64','vshrcs.u64','vshrhs.u64','vshrcc.u64','vshrlo.u64','vshrmi.u64','vshrpl.u64','vshrvs.u64','vshrvc.u64','vshrhi.u64','vshrls.u64','vshrge.u64','vshrlt.u64','vshrgt.u64','vshrle.u64',
+
+            'vsraeq.u8','vsrane.u8','vsracs.u8','vsrahs.u8','vsracc.u8','vsralo.u8','vsrami.u8','vsrapl.u8','vsravs.u8','vsravc.u8','vsrahi.u8','vsrals.u8','vsrage.u8','vsralt.u8','vsragt.u8','vsrale.u8',
+            'vsraeq.u16','vsrane.u16','vsracs.u16','vsrahs.u16','vsracc.u16','vsralo.u16','vsrami.u16','vsrapl.u16','vsravs.u16','vsravc.u16','vsrahi.u16','vsrals.u16','vsrage.u16','vsralt.u16','vsragt.u16','vsrale.u16',
+            'vsraeq.u32','vsrane.u32','vsracs.u32','vsrahs.u32','vsracc.u32','vsralo.u32','vsrami.u32','vsrapl.u32','vsravs.u32','vsravc.u32','vsrahi.u32','vsrals.u32','vsrage.u32','vsralt.u32','vsragt.u32','vsrale.u32',
+            'vsraeq.u64','vsrane.u64','vsracs.u64','vsrahs.u64','vsracc.u64','vsralo.u64','vsrami.u64','vsrapl.u64','vsravs.u64','vsravc.u64','vsrahi.u64','vsrals.u64','vsrage.u64','vsralt.u64','vsragt.u64','vsrale.u64',
+
+            'vpmaxeq.u8','vpmaxne.u8','vpmaxcs.u8','vpmaxhs.u8','vpmaxcc.u8','vpmaxlo.u8','vpmaxmi.u8','vpmaxpl.u8','vpmaxvs.u8','vpmaxvc.u8','vpmaxhi.u8','vpmaxls.u8','vpmaxge.u8','vpmaxlt.u8','vpmaxgt.u8','vpmaxle.u8',
+            'vpmaxeq.u16','vpmaxne.u16','vpmaxcs.u16','vpmaxhs.u16','vpmaxcc.u16','vpmaxlo.u16','vpmaxmi.u16','vpmaxpl.u16','vpmaxvs.u16','vpmaxvc.u16','vpmaxhi.u16','vpmaxls.u16','vpmaxge.u16','vpmaxlt.u16','vpmaxgt.u16','vpmaxle.u16',
+            'vpmaxeq.u32','vpmaxne.u32','vpmaxcs.u32','vpmaxhs.u32','vpmaxcc.u32','vpmaxlo.u32','vpmaxmi.u32','vpmaxpl.u32','vpmaxvs.u32','vpmaxvc.u32','vpmaxhi.u32','vpmaxls.u32','vpmaxge.u32','vpmaxlt.u32','vpmaxgt.u32','vpmaxle.u32',
+
+            'vpmineq.u8','vpminne.u8','vpmincs.u8','vpminhs.u8','vpmincc.u8','vpminlo.u8','vpminmi.u8','vpminpl.u8','vpminvs.u8','vpminvc.u8','vpminhi.u8','vpminls.u8','vpminge.u8','vpminlt.u8','vpmingt.u8','vpminle.u8',
+            'vpmineq.u16','vpminne.u16','vpmincs.u16','vpminhs.u16','vpmincc.u16','vpminlo.u16','vpminmi.u16','vpminpl.u16','vpminvs.u16','vpminvc.u16','vpminhi.u16','vpminls.u16','vpminge.u16','vpminlt.u16','vpmingt.u16','vpminle.u16',
+            'vpmineq.u32','vpminne.u32','vpmincs.u32','vpminhs.u32','vpmincc.u32','vpminlo.u32','vpminmi.u32','vpminpl.u32','vpminvs.u32','vpminvc.u32','vpminhi.u32','vpminls.u32','vpminge.u32','vpminlt.u32','vpmingt.u32','vpminle.u32',
+
+            'vqaddeq.u8','vqaddne.u8','vqaddcs.u8','vqaddhs.u8','vqaddcc.u8','vqaddlo.u8','vqaddmi.u8','vqaddpl.u8','vqaddvs.u8','vqaddvc.u8','vqaddhi.u8','vqaddls.u8','vqaddge.u8','vqaddlt.u8','vqaddgt.u8','vqaddle.u8',
+            'vqaddeq.u16','vqaddne.u16','vqaddcs.u16','vqaddhs.u16','vqaddcc.u16','vqaddlo.u16','vqaddmi.u16','vqaddpl.u16','vqaddvs.u16','vqaddvc.u16','vqaddhi.u16','vqaddls.u16','vqaddge.u16','vqaddlt.u16','vqaddgt.u16','vqaddle.u16',
+            'vqaddeq.u32','vqaddne.u32','vqaddcs.u32','vqaddhs.u32','vqaddcc.u32','vqaddlo.u32','vqaddmi.u32','vqaddpl.u32','vqaddvs.u32','vqaddvc.u32','vqaddhi.u32','vqaddls.u32','vqaddge.u32','vqaddlt.u32','vqaddgt.u32','vqaddle.u32',
+            'vqaddeq.u64','vqaddne.u64','vqaddcs.u64','vqaddhs.u64','vqaddcc.u64','vqaddlo.u64','vqaddmi.u64','vqaddpl.u64','vqaddvs.u64','vqaddvc.u64','vqaddhi.u64','vqaddls.u64','vqaddge.u64','vqaddlt.u64','vqaddgt.u64','vqaddle.u64',
+
+            'vqsubeq.u8','vqsubne.u8','vqsubcs.u8','vqsubhs.u8','vqsubcc.u8','vqsublo.u8','vqsubmi.u8','vqsubpl.u8','vqsubvs.u8','vqsubvc.u8','vqsubhi.u8','vqsubls.u8','vqsubge.u8','vqsublt.u8','vqsubgt.u8','vqsuble.u8',
+            'vqsubeq.u16','vqsubne.u16','vqsubcs.u16','vqsubhs.u16','vqsubcc.u16','vqsublo.u16','vqsubmi.u16','vqsubpl.u16','vqsubvs.u16','vqsubvc.u16','vqsubhi.u16','vqsubls.u16','vqsubge.u16','vqsublt.u16','vqsubgt.u16','vqsuble.u16',
+            'vqsubeq.u32','vqsubne.u32','vqsubcs.u32','vqsubhs.u32','vqsubcc.u32','vqsublo.u32','vqsubmi.u32','vqsubpl.u32','vqsubvs.u32','vqsubvc.u32','vqsubhi.u32','vqsubls.u32','vqsubge.u32','vqsublt.u32','vqsubgt.u32','vqsuble.u32',
+            'vqsubeq.u64','vqsubne.u64','vqsubcs.u64','vqsubhs.u64','vqsubcc.u64','vqsublo.u64','vqsubmi.u64','vqsubpl.u64','vqsubvs.u64','vqsubvc.u64','vqsubhi.u64','vqsubls.u64','vqsubge.u64','vqsublt.u64','vqsubgt.u64','vqsuble.u64',
+
+            'vqmovneq.u16','vqmovnne.u16','vqmovncs.u16','vqmovnhs.u16','vqmovncc.u16','vqmovnlo.u16','vqmovnmi.u16','vqmovnpl.u16','vqmovnvs.u16','vqmovnvc.u16','vqmovnhi.u16','vqmovnls.u16','vqmovnge.u16','vqmovnlt.u16','vqmovngt.u16','vqmovnle.u16',
+            'vqmovneq.u32','vqmovnne.u32','vqmovncs.u32','vqmovnhs.u32','vqmovncc.u32','vqmovnlo.u32','vqmovnmi.u32','vqmovnpl.u32','vqmovnvs.u32','vqmovnvc.u32','vqmovnhi.u32','vqmovnls.u32','vqmovnge.u32','vqmovnlt.u32','vqmovngt.u32','vqmovnle.u32',
+            'vqmovneq.u64','vqmovnne.u64','vqmovncs.u64','vqmovnhs.u64','vqmovncc.u64','vqmovnlo.u64','vqmovnmi.u64','vqmovnpl.u64','vqmovnvs.u64','vqmovnvc.u64','vqmovnhi.u64','vqmovnls.u64','vqmovnge.u64','vqmovnlt.u64','vqmovngt.u64','vqmovnle.u64',
+
+            'vqshleq.u8','vqshlne.u8','vqshlcs.u8','vqshlhs.u8','vqshlcc.u8','vqshllo.u8','vqshlmi.u8','vqshlpl.u8','vqshlvs.u8','vqshlvc.u8','vqshlhi.u8','vqshlls.u8','vqshlge.u8','vqshllt.u8','vqshlgt.u8','vqshlle.u8',
+            'vqshleq.u16','vqshlne.u16','vqshlcs.u16','vqshlhs.u16','vqshlcc.u16','vqshllo.u16','vqshlmi.u16','vqshlpl.u16','vqshlvs.u16','vqshlvc.u16','vqshlhi.u16','vqshlls.u16','vqshlge.u16','vqshllt.u16','vqshlgt.u16','vqshlle.u16',
+            'vqshleq.u32','vqshlne.u32','vqshlcs.u32','vqshlhs.u32','vqshlcc.u32','vqshllo.u32','vqshlmi.u32','vqshlpl.u32','vqshlvs.u32','vqshlvc.u32','vqshlhi.u32','vqshlls.u32','vqshlge.u32','vqshllt.u32','vqshlgt.u32','vqshlle.u32',
+            'vqshleq.u64','vqshlne.u64','vqshlcs.u64','vqshlhs.u64','vqshlcc.u64','vqshllo.u64','vqshlmi.u64','vqshlpl.u64','vqshlvs.u64','vqshlvc.u64','vqshlhi.u64','vqshlls.u64','vqshlge.u64','vqshllt.u64','vqshlgt.u64','vqshlle.u64',
+
+            'vqshrneq.u16','vqshrnne.u16','vqshrncs.u16','vqshrnhs.u16','vqshrncc.u16','vqshrnlo.u16','vqshrnmi.u16','vqshrnpl.u16','vqshrnvs.u16','vqshrnvc.u16','vqshrnhi.u16','vqshrnls.u16','vqshrnge.u16','vqshrnlt.u16','vqshrngt.u16','vqshrnle.u16',
+            'vqshrneq.u32','vqshrnne.u32','vqshrncs.u32','vqshrnhs.u32','vqshrncc.u32','vqshrnlo.u32','vqshrnmi.u32','vqshrnpl.u32','vqshrnvs.u32','vqshrnvc.u32','vqshrnhi.u32','vqshrnls.u32','vqshrnge.u32','vqshrnlt.u32','vqshrngt.u32','vqshrnle.u32',
+            'vqshrneq.u64','vqshrnne.u64','vqshrncs.u64','vqshrnhs.u64','vqshrncc.u64','vqshrnlo.u64','vqshrnmi.u64','vqshrnpl.u64','vqshrnvs.u64','vqshrnvc.u64','vqshrnhi.u64','vqshrnls.u64','vqshrnge.u64','vqshrnlt.u64','vqshrngt.u64','vqshrnle.u64',
+
+            'vqrshleq.u8','vqrshlne.u8','vqrshlcs.u8','vqrshlhs.u8','vqrshlcc.u8','vqrshllo.u8','vqrshlmi.u8','vqrshlpl.u8','vqrshlvs.u8','vqrshlvc.u8','vqrshlhi.u8','vqrshlls.u8','vqrshlge.u8','vqrshllt.u8','vqrshlgt.u8','vqrshlle.u8',
+            'vqrshleq.u16','vqrshlne.u16','vqrshlcs.u16','vqrshlhs.u16','vqrshlcc.u16','vqrshllo.u16','vqrshlmi.u16','vqrshlpl.u16','vqrshlvs.u16','vqrshlvc.u16','vqrshlhi.u16','vqrshlls.u16','vqrshlge.u16','vqrshllt.u16','vqrshlgt.u16','vqrshlle.u16',
+            'vqrshleq.u32','vqrshlne.u32','vqrshlcs.u32','vqrshlhs.u32','vqrshlcc.u32','vqrshllo.u32','vqrshlmi.u32','vqrshlpl.u32','vqrshlvs.u32','vqrshlvc.u32','vqrshlhi.u32','vqrshlls.u32','vqrshlge.u32','vqrshllt.u32','vqrshlgt.u32','vqrshlle.u32',
+            'vqrshleq.u64','vqrshlne.u64','vqrshlcs.u64','vqrshlhs.u64','vqrshlcc.u64','vqrshllo.u64','vqrshlmi.u64','vqrshlpl.u64','vqrshlvs.u64','vqrshlvc.u64','vqrshlhi.u64','vqrshlls.u64','vqrshlge.u64','vqrshllt.u64','vqrshlgt.u64','vqrshlle.u64',
+
+            'vqrshrneq.u16','vqrshrnne.u16','vqrshrncs.u16','vqrshrnhs.u16','vqrshrncc.u16','vqrshrnlo.u16','vqrshrnmi.u16','vqrshrnpl.u16','vqrshrnvs.u16','vqrshrnvc.u16','vqrshrnhi.u16','vqrshrnls.u16','vqrshrnge.u16','vqrshrnlt.u16','vqrshrngt.u16','vqrshrnle.u16',
+            'vqrshrneq.u32','vqrshrnne.u32','vqrshrncs.u32','vqrshrnhs.u32','vqrshrncc.u32','vqrshrnlo.u32','vqrshrnmi.u32','vqrshrnpl.u32','vqrshrnvs.u32','vqrshrnvc.u32','vqrshrnhi.u32','vqrshrnls.u32','vqrshrnge.u32','vqrshrnlt.u32','vqrshrngt.u32','vqrshrnle.u32',
+            'vqrshrneq.u64','vqrshrnne.u64','vqrshrncs.u64','vqrshrnhs.u64','vqrshrncc.u64','vqrshrnlo.u64','vqrshrnmi.u64','vqrshrnpl.u64','vqrshrnvs.u64','vqrshrnvc.u64','vqrshrnhi.u64','vqrshrnls.u64','vqrshrnge.u64','vqrshrnlt.u64','vqrshrngt.u64','vqrshrnle.u64',
+
+            'vrhaddeq.u8','vrhaddne.u8','vrhaddcs.u8','vrhaddhs.u8','vrhaddcc.u8','vrhaddlo.u8','vrhaddmi.u8','vrhaddpl.u8','vrhaddvs.u8','vrhaddvc.u8','vrhaddhi.u8','vrhaddls.u8','vrhaddge.u8','vrhaddlt.u8','vrhaddgt.u8','vrhaddle.u8',
+            'vrhaddeq.u16','vrhaddne.u16','vrhaddcs.u16','vrhaddhs.u16','vrhaddcc.u16','vrhaddlo.u16','vrhaddmi.u16','vrhaddpl.u16','vrhaddvs.u16','vrhaddvc.u16','vrhaddhi.u16','vrhaddls.u16','vrhaddge.u16','vrhaddlt.u16','vrhaddgt.u16','vrhaddle.u16',
+            'vrhaddeq.u32','vrhaddne.u32','vrhaddcs.u32','vrhaddhs.u32','vrhaddcc.u32','vrhaddlo.u32','vrhaddmi.u32','vrhaddpl.u32','vrhaddvs.u32','vrhaddvc.u32','vrhaddhi.u32','vrhaddls.u32','vrhaddge.u32','vrhaddlt.u32','vrhaddgt.u32','vrhaddle.u32',
+
+            'vrshleq.u8','vrshlne.u8','vrshlcs.u8','vrshlhs.u8','vrshlcc.u8','vrshllo.u8','vrshlmi.u8','vrshlpl.u8','vrshlvs.u8','vrshlvc.u8','vrshlhi.u8','vrshlls.u8','vrshlge.u8','vrshllt.u8','vrshlgt.u8','vrshlle.u8',
+            'vrshleq.u16','vrshlne.u16','vrshlcs.u16','vrshlhs.u16','vrshlcc.u16','vrshllo.u16','vrshlmi.u16','vrshlpl.u16','vrshlvs.u16','vrshlvc.u16','vrshlhi.u16','vrshlls.u16','vrshlge.u16','vrshllt.u16','vrshlgt.u16','vrshlle.u16',
+            'vrshleq.u32','vrshlne.u32','vrshlcs.u32','vrshlhs.u32','vrshlcc.u32','vrshllo.u32','vrshlmi.u32','vrshlpl.u32','vrshlvs.u32','vrshlvc.u32','vrshlhi.u32','vrshlls.u32','vrshlge.u32','vrshllt.u32','vrshlgt.u32','vrshlle.u32',
+            'vrshleq.u64','vrshlne.u64','vrshlcs.u64','vrshlhs.u64','vrshlcc.u64','vrshllo.u64','vrshlmi.u64','vrshlpl.u64','vrshlvs.u64','vrshlvc.u64','vrshlhi.u64','vrshlls.u64','vrshlge.u64','vrshllt.u64','vrshlgt.u64','vrshlle.u64',
+
+            'vrshreq.u8','vrshrne.u8','vrshrcs.u8','vrshrhs.u8','vrshrcc.u8','vrshrlo.u8','vrshrmi.u8','vrshrpl.u8','vrshrvs.u8','vrshrvc.u8','vrshrhi.u8','vrshrls.u8','vrshrge.u8','vrshrlt.u8','vrshrgt.u8','vrshrle.u8',
+            'vrshreq.u16','vrshrne.u16','vrshrcs.u16','vrshrhs.u16','vrshrcc.u16','vrshrlo.u16','vrshrmi.u16','vrshrpl.u16','vrshrvs.u16','vrshrvc.u16','vrshrhi.u16','vrshrls.u16','vrshrge.u16','vrshrlt.u16','vrshrgt.u16','vrshrle.u16',
+            'vrshreq.u32','vrshrne.u32','vrshrcs.u32','vrshrhs.u32','vrshrcc.u32','vrshrlo.u32','vrshrmi.u32','vrshrpl.u32','vrshrvs.u32','vrshrvc.u32','vrshrhi.u32','vrshrls.u32','vrshrge.u32','vrshrlt.u32','vrshrgt.u32','vrshrle.u32',
+            'vrshreq.u64','vrshrne.u64','vrshrcs.u64','vrshrhs.u64','vrshrcc.u64','vrshrlo.u64','vrshrmi.u64','vrshrpl.u64','vrshrvs.u64','vrshrvc.u64','vrshrhi.u64','vrshrls.u64','vrshrge.u64','vrshrlt.u64','vrshrgt.u64','vrshrle.u64',
+
+            'vrsraeq.u8','vrsrane.u8','vrsracs.u8','vrsrahs.u8','vrsracc.u8','vrsralo.u8','vrsrami.u8','vrsrapl.u8','vrsravs.u8','vrsravc.u8','vrsrahi.u8','vrsrals.u8','vrsrage.u8','vrsralt.u8','vrsragt.u8','vrsrale.u8',
+            'vrsraeq.u16','vrsrane.u16','vrsracs.u16','vrsrahs.u16','vrsracc.u16','vrsralo.u16','vrsrami.u16','vrsrapl.u16','vrsravs.u16','vrsravc.u16','vrsrahi.u16','vrsrals.u16','vrsrage.u16','vrsralt.u16','vrsragt.u16','vrsrale.u16',
+            'vrsraeq.u32','vrsrane.u32','vrsracs.u32','vrsrahs.u32','vrsracc.u32','vrsralo.u32','vrsrami.u32','vrsrapl.u32','vrsravs.u32','vrsravc.u32','vrsrahi.u32','vrsrals.u32','vrsrage.u32','vrsralt.u32','vrsragt.u32','vrsrale.u32',
+            'vrsraeq.u64','vrsrane.u64','vrsracs.u64','vrsrahs.u64','vrsracc.u64','vrsralo.u64','vrsrami.u64','vrsrapl.u64','vrsravs.u64','vrsravc.u64','vrsrahi.u64','vrsrals.u64','vrsrage.u64','vrsralt.u64','vrsragt.u64','vrsrale.u64',
+            ),
+        /* Conditional VFPv3 & NEON SIMD Floating-Point Instructions */
+        34 => array(
+            'vabdeq.f32','vabdne.f32','vabdcs.f32','vabdhs.f32','vabdcc.f32','vabdlo.f32','vabdmi.f32','vabdpl.f32','vabdvs.f32','vabdvc.f32','vabdhi.f32','vabdls.f32','vabdge.f32','vabdlt.f32','vabdgt.f32','vabdle.f32',
+
+            'vabseq.f32','vabsne.f32','vabscs.f32','vabshs.f32','vabscc.f32','vabslo.f32','vabsmi.f32','vabspl.f32','vabsvs.f32','vabsvc.f32','vabshi.f32','vabsls.f32','vabsge.f32','vabslt.f32','vabsgt.f32','vabsle.f32',
+            'vabseq.f64','vabsne.f64','vabscs.f64','vabshs.f64','vabscc.f64','vabslo.f64','vabsmi.f64','vabspl.f64','vabsvs.f64','vabsvc.f64','vabshi.f64','vabsls.f64','vabsge.f64','vabslt.f64','vabsgt.f64','vabsle.f64',
+
+            'vacgeeq.f32','vacgene.f32','vacgecs.f32','vacgehs.f32','vacgecc.f32','vacgelo.f32','vacgemi.f32','vacgepl.f32','vacgevs.f32','vacgevc.f32','vacgehi.f32','vacgels.f32','vacgege.f32','vacgelt.f32','vacgegt.f32','vacgele.f32',
+            'vacgteq.f32','vacgtne.f32','vacgtcs.f32','vacgths.f32','vacgtcc.f32','vacgtlo.f32','vacgtmi.f32','vacgtpl.f32','vacgtvs.f32','vacgtvc.f32','vacgthi.f32','vacgtls.f32','vacgtge.f32','vacgtlt.f32','vacgtgt.f32','vacgtle.f32',
+            'vacleeq.f32','vaclene.f32','vaclecs.f32','vaclehs.f32','vaclecc.f32','vaclelo.f32','vaclemi.f32','vaclepl.f32','vaclevs.f32','vaclevc.f32','vaclehi.f32','vaclels.f32','vaclege.f32','vaclelt.f32','vaclegt.f32','vaclele.f32',
+            'vaclteq.f32','vacltne.f32','vacltcs.f32','vaclths.f32','vacltcc.f32','vacltlo.f32','vacltmi.f32','vacltpl.f32','vacltvs.f32','vacltvc.f32','vaclthi.f32','vacltls.f32','vacltge.f32','vacltlt.f32','vacltgt.f32','vacltle.f32',
+
+            'vaddeq.f32','vaddne.f32','vaddcs.f32','vaddhs.f32','vaddcc.f32','vaddlo.f32','vaddmi.f32','vaddpl.f32','vaddvs.f32','vaddvc.f32','vaddhi.f32','vaddls.f32','vaddge.f32','vaddlt.f32','vaddgt.f32','vaddle.f32',
+            'vaddeq.f64','vaddne.f64','vaddcs.f64','vaddhs.f64','vaddcc.f64','vaddlo.f64','vaddmi.f64','vaddpl.f64','vaddvs.f64','vaddvc.f64','vaddhi.f64','vaddls.f64','vaddge.f64','vaddlt.f64','vaddgt.f64','vaddle.f64',
+
+            'vceqeq.f32','vceqne.f32','vceqcs.f32','vceqhs.f32','vceqcc.f32','vceqlo.f32','vceqmi.f32','vceqpl.f32','vceqvs.f32','vceqvc.f32','vceqhi.f32','vceqls.f32','vceqge.f32','vceqlt.f32','vceqgt.f32','vceqle.f32',
+            'vcgeeq.f32','vcgene.f32','vcgecs.f32','vcgehs.f32','vcgecc.f32','vcgelo.f32','vcgemi.f32','vcgepl.f32','vcgevs.f32','vcgevc.f32','vcgehi.f32','vcgels.f32','vcgege.f32','vcgelt.f32','vcgegt.f32','vcgele.f32',
+            'vcleeq.f32','vclene.f32','vclecs.f32','vclehs.f32','vclecc.f32','vclelo.f32','vclemi.f32','vclepl.f32','vclevs.f32','vclevc.f32','vclehi.f32','vclels.f32','vclege.f32','vclelt.f32','vclegt.f32','vclele.f32',
+            'vcgteq.f32','vcgtne.f32','vcgtcs.f32','vcgths.f32','vcgtcc.f32','vcgtlo.f32','vcgtmi.f32','vcgtpl.f32','vcgtvs.f32','vcgtvc.f32','vcgthi.f32','vcgtls.f32','vcgtge.f32','vcgtlt.f32','vcgtgt.f32','vcgtle.f32',
+            'vclteq.f32','vcltne.f32','vcltcs.f32','vclths.f32','vcltcc.f32','vcltlo.f32','vcltmi.f32','vcltpl.f32','vcltvs.f32','vcltvc.f32','vclthi.f32','vcltls.f32','vcltge.f32','vcltlt.f32','vcltgt.f32','vcltle.f32',
+
+            'vcmpeq.f32','vcmpne.f32','vcmpcs.f32','vcmphs.f32','vcmpcc.f32','vcmplo.f32','vcmpmi.f32','vcmppl.f32','vcmpvs.f32','vcmpvc.f32','vcmphi.f32','vcmpls.f32','vcmpge.f32','vcmplt.f32','vcmpgt.f32','vcmple.f32',
+            'vcmpeq.f64','vcmpne.f64','vcmpcs.f64','vcmphs.f64','vcmpcc.f64','vcmplo.f64','vcmpmi.f64','vcmppl.f64','vcmpvs.f64','vcmpvc.f64','vcmphi.f64','vcmpls.f64','vcmpge.f64','vcmplt.f64','vcmpgt.f64','vcmple.f64',
+
+            'vcmpeeq.f32','vcmpene.f32','vcmpecs.f32','vcmpehs.f32','vcmpecc.f32','vcmpelo.f32','vcmpemi.f32','vcmpepl.f32','vcmpevs.f32','vcmpevc.f32','vcmpehi.f32','vcmpels.f32','vcmpege.f32','vcmpelt.f32','vcmpegt.f32','vcmpele.f32',
+            'vcmpeeq.f64','vcmpene.f64','vcmpecs.f64','vcmpehs.f64','vcmpecc.f64','vcmpelo.f64','vcmpemi.f64','vcmpepl.f64','vcmpevs.f64','vcmpevc.f64','vcmpehi.f64','vcmpels.f64','vcmpege.f64','vcmpelt.f64','vcmpegt.f64','vcmpele.f64',
+
+            'vcvteq.s16.f32','vcvtne.s16.f32','vcvtcs.s16.f32','vcvths.s16.f32','vcvtcc.s16.f32','vcvtlo.s16.f32','vcvtmi.s16.f32','vcvtpl.s16.f32','vcvtvs.s16.f32','vcvtvc.s16.f32','vcvthi.s16.f32','vcvtls.s16.f32','vcvtge.s16.f32','vcvtlt.s16.f32','vcvtgt.s16.f32','vcvtle.s16.f32',
+            'vcvteq.s16.f64','vcvtne.s16.f64','vcvtcs.s16.f64','vcvths.s16.f64','vcvtcc.s16.f64','vcvtlo.s16.f64','vcvtmi.s16.f64','vcvtpl.s16.f64','vcvtvs.s16.f64','vcvtvc.s16.f64','vcvthi.s16.f64','vcvtls.s16.f64','vcvtge.s16.f64','vcvtlt.s16.f64','vcvtgt.s16.f64','vcvtle.s16.f64',
+            'vcvteq.s32.f32','vcvtne.s32.f32','vcvtcs.s32.f32','vcvths.s32.f32','vcvtcc.s32.f32','vcvtlo.s32.f32','vcvtmi.s32.f32','vcvtpl.s32.f32','vcvtvs.s32.f32','vcvtvc.s32.f32','vcvthi.s32.f32','vcvtls.s32.f32','vcvtge.s32.f32','vcvtlt.s32.f32','vcvtgt.s32.f32','vcvtle.s32.f32',
+            'vcvteq.s32.f64','vcvtne.s32.f64','vcvtcs.s32.f64','vcvths.s32.f64','vcvtcc.s32.f64','vcvtlo.s32.f64','vcvtmi.s32.f64','vcvtpl.s32.f64','vcvtvs.s32.f64','vcvtvc.s32.f64','vcvthi.s32.f64','vcvtls.s32.f64','vcvtge.s32.f64','vcvtlt.s32.f64','vcvtgt.s32.f64','vcvtle.s32.f64',
+            'vcvteq.u16.f32','vcvtne.u16.f32','vcvtcs.u16.f32','vcvths.u16.f32','vcvtcc.u16.f32','vcvtlo.u16.f32','vcvtmi.u16.f32','vcvtpl.u16.f32','vcvtvs.u16.f32','vcvtvc.u16.f32','vcvthi.u16.f32','vcvtls.u16.f32','vcvtge.u16.f32','vcvtlt.u16.f32','vcvtgt.u16.f32','vcvtle.u16.f32',
+            'vcvteq.u16.f64','vcvtne.u16.f64','vcvtcs.u16.f64','vcvths.u16.f64','vcvtcc.u16.f64','vcvtlo.u16.f64','vcvtmi.u16.f64','vcvtpl.u16.f64','vcvtvs.u16.f64','vcvtvc.u16.f64','vcvthi.u16.f64','vcvtls.u16.f64','vcvtge.u16.f64','vcvtlt.u16.f64','vcvtgt.u16.f64','vcvtle.u16.f64',
+            'vcvteq.u32.f32','vcvtne.u32.f32','vcvtcs.u32.f32','vcvths.u32.f32','vcvtcc.u32.f32','vcvtlo.u32.f32','vcvtmi.u32.f32','vcvtpl.u32.f32','vcvtvs.u32.f32','vcvtvc.u32.f32','vcvthi.u32.f32','vcvtls.u32.f32','vcvtge.u32.f32','vcvtlt.u32.f32','vcvtgt.u32.f32','vcvtle.u32.f32',
+            'vcvteq.u32.f64','vcvtne.u32.f64','vcvtcs.u32.f64','vcvths.u32.f64','vcvtcc.u32.f64','vcvtlo.u32.f64','vcvtmi.u32.f64','vcvtpl.u32.f64','vcvtvs.u32.f64','vcvtvc.u32.f64','vcvthi.u32.f64','vcvtls.u32.f64','vcvtge.u32.f64','vcvtlt.u32.f64','vcvtgt.u32.f64','vcvtle.u32.f64',
+            'vcvteq.f16.f32','vcvtne.f16.f32','vcvtcs.f16.f32','vcvths.f16.f32','vcvtcc.f16.f32','vcvtlo.f16.f32','vcvtmi.f16.f32','vcvtpl.f16.f32','vcvtvs.f16.f32','vcvtvc.f16.f32','vcvthi.f16.f32','vcvtls.f16.f32','vcvtge.f16.f32','vcvtlt.f16.f32','vcvtgt.f16.f32','vcvtle.f16.f32',
+            'vcvteq.f32.s32','vcvtne.f32.s32','vcvtcs.f32.s32','vcvths.f32.s32','vcvtcc.f32.s32','vcvtlo.f32.s32','vcvtmi.f32.s32','vcvtpl.f32.s32','vcvtvs.f32.s32','vcvtvc.f32.s32','vcvthi.f32.s32','vcvtls.f32.s32','vcvtge.f32.s32','vcvtlt.f32.s32','vcvtgt.f32.s32','vcvtle.f32.s32',
+            'vcvteq.f32.u32','vcvtne.f32.u32','vcvtcs.f32.u32','vcvths.f32.u32','vcvtcc.f32.u32','vcvtlo.f32.u32','vcvtmi.f32.u32','vcvtpl.f32.u32','vcvtvs.f32.u32','vcvtvc.f32.u32','vcvthi.f32.u32','vcvtls.f32.u32','vcvtge.f32.u32','vcvtlt.f32.u32','vcvtgt.f32.u32','vcvtle.f32.u32',
+            'vcvteq.f32.f16','vcvtne.f32.f16','vcvtcs.f32.f16','vcvths.f32.f16','vcvtcc.f32.f16','vcvtlo.f32.f16','vcvtmi.f32.f16','vcvtpl.f32.f16','vcvtvs.f32.f16','vcvtvc.f32.f16','vcvthi.f32.f16','vcvtls.f32.f16','vcvtge.f32.f16','vcvtlt.f32.f16','vcvtgt.f32.f16','vcvtle.f32.f16',
+            'vcvteq.f32.f64','vcvtne.f32.f64','vcvtcs.f32.f64','vcvths.f32.f64','vcvtcc.f32.f64','vcvtlo.f32.f64','vcvtmi.f32.f64','vcvtpl.f32.f64','vcvtvs.f32.f64','vcvtvc.f32.f64','vcvthi.f32.f64','vcvtls.f32.f64','vcvtge.f32.f64','vcvtlt.f32.f64','vcvtgt.f32.f64','vcvtle.f32.f64',
+            'vcvteq.f64.s32','vcvtne.f64.s32','vcvtcs.f64.s32','vcvths.f64.s32','vcvtcc.f64.s32','vcvtlo.f64.s32','vcvtmi.f64.s32','vcvtpl.f64.s32','vcvtvs.f64.s32','vcvtvc.f64.s32','vcvthi.f64.s32','vcvtls.f64.s32','vcvtge.f64.s32','vcvtlt.f64.s32','vcvtgt.f64.s32','vcvtle.f64.s32',
+            'vcvteq.f64.u32','vcvtne.f64.u32','vcvtcs.f64.u32','vcvths.f64.u32','vcvtcc.f64.u32','vcvtlo.f64.u32','vcvtmi.f64.u32','vcvtpl.f64.u32','vcvtvs.f64.u32','vcvtvc.f64.u32','vcvthi.f64.u32','vcvtls.f64.u32','vcvtge.f64.u32','vcvtlt.f64.u32','vcvtgt.f64.u32','vcvtle.f64.u32',
+            'vcvteq.f64.f32','vcvtne.f64.f32','vcvtcs.f64.f32','vcvths.f64.f32','vcvtcc.f64.f32','vcvtlo.f64.f32','vcvtmi.f64.f32','vcvtpl.f64.f32','vcvtvs.f64.f32','vcvtvc.f64.f32','vcvthi.f64.f32','vcvtls.f64.f32','vcvtge.f64.f32','vcvtlt.f64.f32','vcvtgt.f64.f32','vcvtle.f64.f32',
+
+            'vcvtreq.s32.f32','vcvtrne.s32.f32','vcvtrcs.s32.f32','vcvtrhs.s32.f32','vcvtrcc.s32.f32','vcvtrlo.s32.f32','vcvtrmi.s32.f32','vcvtrpl.s32.f32','vcvtrvs.s32.f32','vcvtrvc.s32.f32','vcvtrhi.s32.f32','vcvtrls.s32.f32','vcvtrge.s32.f32','vcvtrlt.s32.f32','vcvtrgt.s32.f32','vcvtrle.s32.f32',
+            'vcvtreq.s32.f64','vcvtrne.s32.f64','vcvtrcs.s32.f64','vcvtrhs.s32.f64','vcvtrcc.s32.f64','vcvtrlo.s32.f64','vcvtrmi.s32.f64','vcvtrpl.s32.f64','vcvtrvs.s32.f64','vcvtrvc.s32.f64','vcvtrhi.s32.f64','vcvtrls.s32.f64','vcvtrge.s32.f64','vcvtrlt.s32.f64','vcvtrgt.s32.f64','vcvtrle.s32.f64',
+            'vcvtreq.u32.f32','vcvtrne.u32.f32','vcvtrcs.u32.f32','vcvtrhs.u32.f32','vcvtrcc.u32.f32','vcvtrlo.u32.f32','vcvtrmi.u32.f32','vcvtrpl.u32.f32','vcvtrvs.u32.f32','vcvtrvc.u32.f32','vcvtrhi.u32.f32','vcvtrls.u32.f32','vcvtrge.u32.f32','vcvtrlt.u32.f32','vcvtrgt.u32.f32','vcvtrle.u32.f32',
+            'vcvtreq.u32.f64','vcvtrne.u32.f64','vcvtrcs.u32.f64','vcvtrhs.u32.f64','vcvtrcc.u32.f64','vcvtrlo.u32.f64','vcvtrmi.u32.f64','vcvtrpl.u32.f64','vcvtrvs.u32.f64','vcvtrvc.u32.f64','vcvtrhi.u32.f64','vcvtrls.u32.f64','vcvtrge.u32.f64','vcvtrlt.u32.f64','vcvtrgt.u32.f64','vcvtrle.u32.f64',
+
+            'vcvtbeq.f16.f32','vcvtbne.f16.f32','vcvtbcs.f16.f32','vcvtbhs.f16.f32','vcvtbcc.f16.f32','vcvtblo.f16.f32','vcvtbmi.f16.f32','vcvtbpl.f16.f32','vcvtbvs.f16.f32','vcvtbvc.f16.f32','vcvtbhi.f16.f32','vcvtbls.f16.f32','vcvtbge.f16.f32','vcvtblt.f16.f32','vcvtbgt.f16.f32','vcvtble.f16.f32',
+            'vcvtbeq.f32.f16','vcvtbne.f32.f16','vcvtbcs.f32.f16','vcvtbhs.f32.f16','vcvtbcc.f32.f16','vcvtblo.f32.f16','vcvtbmi.f32.f16','vcvtbpl.f32.f16','vcvtbvs.f32.f16','vcvtbvc.f32.f16','vcvtbhi.f32.f16','vcvtbls.f32.f16','vcvtbge.f32.f16','vcvtblt.f32.f16','vcvtbgt.f32.f16','vcvtble.f32.f16',
+
+            'vcvtteq.f16.f32','vcvttne.f16.f32','vcvttcs.f16.f32','vcvtths.f16.f32','vcvttcc.f16.f32','vcvttlo.f16.f32','vcvttmi.f16.f32','vcvttpl.f16.f32','vcvttvs.f16.f32','vcvttvc.f16.f32','vcvtthi.f16.f32','vcvttls.f16.f32','vcvttge.f16.f32','vcvttlt.f16.f32','vcvttgt.f16.f32','vcvttle.f16.f32',
+            'vcvtteq.f32.f16','vcvttne.f32.f16','vcvttcs.f32.f16','vcvtths.f32.f16','vcvttcc.f32.f16','vcvttlo.f32.f16','vcvttmi.f32.f16','vcvttpl.f32.f16','vcvttvs.f32.f16','vcvttvc.f32.f16','vcvtthi.f32.f16','vcvttls.f32.f16','vcvttge.f32.f16','vcvttlt.f32.f16','vcvttgt.f32.f16','vcvttle.f32.f16',
+
+            'vdiveq.f32','vdivne.f32','vdivcs.f32','vdivhs.f32','vdivcc.f32','vdivlo.f32','vdivmi.f32','vdivpl.f32','vdivvs.f32','vdivvc.f32','vdivhi.f32','vdivls.f32','vdivge.f32','vdivlt.f32','vdivgt.f32','vdivle.f32',
+            'vdiveq.f64','vdivne.f64','vdivcs.f64','vdivhs.f64','vdivcc.f64','vdivlo.f64','vdivmi.f64','vdivpl.f64','vdivvs.f64','vdivvc.f64','vdivhi.f64','vdivls.f64','vdivge.f64','vdivlt.f64','vdivgt.f64','vdivle.f64',
+
+            'vmaxeq.f32','vmaxne.f32','vmaxcs.f32','vmaxhs.f32','vmaxcc.f32','vmaxlo.f32','vmaxmi.f32','vmaxpl.f32','vmaxvs.f32','vmaxvc.f32','vmaxhi.f32','vmaxls.f32','vmaxge.f32','vmaxlt.f32','vmaxgt.f32','vmaxle.f32',
+            'vmineq.f32','vminne.f32','vmincs.f32','vminhs.f32','vmincc.f32','vminlo.f32','vminmi.f32','vminpl.f32','vminvs.f32','vminvc.f32','vminhi.f32','vminls.f32','vminge.f32','vminlt.f32','vmingt.f32','vminle.f32',
+
+            'vmlaeq.f32','vmlane.f32','vmlacs.f32','vmlahs.f32','vmlacc.f32','vmlalo.f32','vmlami.f32','vmlapl.f32','vmlavs.f32','vmlavc.f32','vmlahi.f32','vmlals.f32','vmlage.f32','vmlalt.f32','vmlagt.f32','vmlale.f32',
+            'vmlaeq.f64','vmlane.f64','vmlacs.f64','vmlahs.f64','vmlacc.f64','vmlalo.f64','vmlami.f64','vmlapl.f64','vmlavs.f64','vmlavc.f64','vmlahi.f64','vmlals.f64','vmlage.f64','vmlalt.f64','vmlagt.f64','vmlale.f64',
+
+            'vmlseq.f32','vmlsne.f32','vmlscs.f32','vmlshs.f32','vmlscc.f32','vmlslo.f32','vmlsmi.f32','vmlspl.f32','vmlsvs.f32','vmlsvc.f32','vmlshi.f32','vmlsls.f32','vmlsge.f32','vmlslt.f32','vmlsgt.f32','vmlsle.f32',
+            'vmlseq.f64','vmlsne.f64','vmlscs.f64','vmlshs.f64','vmlscc.f64','vmlslo.f64','vmlsmi.f64','vmlspl.f64','vmlsvs.f64','vmlsvc.f64','vmlshi.f64','vmlsls.f64','vmlsge.f64','vmlslt.f64','vmlsgt.f64','vmlsle.f64',
+
+            'vmuleq.f32','vmulne.f32','vmulcs.f32','vmulhs.f32','vmulcc.f32','vmullo.f32','vmulmi.f32','vmulpl.f32','vmulvs.f32','vmulvc.f32','vmulhi.f32','vmulls.f32','vmulge.f32','vmullt.f32','vmulgt.f32','vmulle.f32',
+            'vmuleq.f64','vmulne.f64','vmulcs.f64','vmulhs.f64','vmulcc.f64','vmullo.f64','vmulmi.f64','vmulpl.f64','vmulvs.f64','vmulvc.f64','vmulhi.f64','vmulls.f64','vmulge.f64','vmullt.f64','vmulgt.f64','vmulle.f64',
+
+            'vnegeq.f32','vnegne.f32','vnegcs.f32','vneghs.f32','vnegcc.f32','vneglo.f32','vnegmi.f32','vnegpl.f32','vnegvs.f32','vnegvc.f32','vneghi.f32','vnegls.f32','vnegge.f32','vneglt.f32','vneggt.f32','vnegle.f32',
+            'vnegeq.f64','vnegne.f64','vnegcs.f64','vneghs.f64','vnegcc.f64','vneglo.f64','vnegmi.f64','vnegpl.f64','vnegvs.f64','vnegvc.f64','vneghi.f64','vnegls.f64','vnegge.f64','vneglt.f64','vneggt.f64','vnegle.f64',
+
+            'vnmlaeq.f32','vnmlane.f32','vnmlacs.f32','vnmlahs.f32','vnmlacc.f32','vnmlalo.f32','vnmlami.f32','vnmlapl.f32','vnmlavs.f32','vnmlavc.f32','vnmlahi.f32','vnmlals.f32','vnmlage.f32','vnmlalt.f32','vnmlagt.f32','vnmlale.f32',
+            'vnmlaeq.f64','vnmlane.f64','vnmlacs.f64','vnmlahs.f64','vnmlacc.f64','vnmlalo.f64','vnmlami.f64','vnmlapl.f64','vnmlavs.f64','vnmlavc.f64','vnmlahi.f64','vnmlals.f64','vnmlage.f64','vnmlalt.f64','vnmlagt.f64','vnmlale.f64',
+
+            'vnmlseq.f32','vnmlsne.f32','vnmlscs.f32','vnmlshs.f32','vnmlscc.f32','vnmlslo.f32','vnmlsmi.f32','vnmlspl.f32','vnmlsvs.f32','vnmlsvc.f32','vnmlshi.f32','vnmlsls.f32','vnmlsge.f32','vnmlslt.f32','vnmlsgt.f32','vnmlsle.f32',
+            'vnmlseq.f64','vnmlsne.f64','vnmlscs.f64','vnmlshs.f64','vnmlscc.f64','vnmlslo.f64','vnmlsmi.f64','vnmlspl.f64','vnmlsvs.f64','vnmlsvc.f64','vnmlshi.f64','vnmlsls.f64','vnmlsge.f64','vnmlslt.f64','vnmlsgt.f64','vnmlsle.f64',
+
+            'vnmuleq.f64','vnmulne.f64','vnmulcs.f64','vnmulhs.f64','vnmulcc.f64','vnmullo.f64','vnmulmi.f64','vnmulpl.f64','vnmulvs.f64','vnmulvc.f64','vnmulhi.f64','vnmulls.f64','vnmulge.f64','vnmullt.f64','vnmulgt.f64','vnmulle.f64',
+            'vnmuleq.f32','vnmulne.f32','vnmulcs.f32','vnmulhs.f32','vnmulcc.f32','vnmullo.f32','vnmulmi.f32','vnmulpl.f32','vnmulvs.f32','vnmulvc.f32','vnmulhi.f32','vnmulls.f32','vnmulge.f32','vnmullt.f32','vnmulgt.f32','vnmulle.f32',
+
+            'vpaddeq.f32','vpaddne.f32','vpaddcs.f32','vpaddhs.f32','vpaddcc.f32','vpaddlo.f32','vpaddmi.f32','vpaddpl.f32','vpaddvs.f32','vpaddvc.f32','vpaddhi.f32','vpaddls.f32','vpaddge.f32','vpaddlt.f32','vpaddgt.f32','vpaddle.f32',
+
+            'vpmaxeq.f32','vpmaxne.f32','vpmaxcs.f32','vpmaxhs.f32','vpmaxcc.f32','vpmaxlo.f32','vpmaxmi.f32','vpmaxpl.f32','vpmaxvs.f32','vpmaxvc.f32','vpmaxhi.f32','vpmaxls.f32','vpmaxge.f32','vpmaxlt.f32','vpmaxgt.f32','vpmaxle.f32',
+            'vpmineq.f32','vpminne.f32','vpmincs.f32','vpminhs.f32','vpmincc.f32','vpminlo.f32','vpminmi.f32','vpminpl.f32','vpminvs.f32','vpminvc.f32','vpminhi.f32','vpminls.f32','vpminge.f32','vpminlt.f32','vpmingt.f32','vpminle.f32',
+
+            'vrecpeeq.u32','vrecpene.u32','vrecpecs.u32','vrecpehs.u32','vrecpecc.u32','vrecpelo.u32','vrecpemi.u32','vrecpepl.u32','vrecpevs.u32','vrecpevc.u32','vrecpehi.u32','vrecpels.u32','vrecpege.u32','vrecpelt.u32','vrecpegt.u32','vrecpele.u32',
+            'vrecpeeq.f32','vrecpene.f32','vrecpecs.f32','vrecpehs.f32','vrecpecc.f32','vrecpelo.f32','vrecpemi.f32','vrecpepl.f32','vrecpevs.f32','vrecpevc.f32','vrecpehi.f32','vrecpels.f32','vrecpege.f32','vrecpelt.f32','vrecpegt.f32','vrecpele.f32',
+            'vrecpseq.f32','vrecpsne.f32','vrecpscs.f32','vrecpshs.f32','vrecpscc.f32','vrecpslo.f32','vrecpsmi.f32','vrecpspl.f32','vrecpsvs.f32','vrecpsvc.f32','vrecpshi.f32','vrecpsls.f32','vrecpsge.f32','vrecpslt.f32','vrecpsgt.f32','vrecpsle.f32',
+
+            'vrsqrteeq.u32','vrsqrtene.u32','vrsqrtecs.u32','vrsqrtehs.u32','vrsqrtecc.u32','vrsqrtelo.u32','vrsqrtemi.u32','vrsqrtepl.u32','vrsqrtevs.u32','vrsqrtevc.u32','vrsqrtehi.u32','vrsqrtels.u32','vrsqrtege.u32','vrsqrtelt.u32','vrsqrtegt.u32','vrsqrtele.u32',
+            'vrsqrteeq.f32','vrsqrtene.f32','vrsqrtecs.f32','vrsqrtehs.f32','vrsqrtecc.f32','vrsqrtelo.f32','vrsqrtemi.f32','vrsqrtepl.f32','vrsqrtevs.f32','vrsqrtevc.f32','vrsqrtehi.f32','vrsqrtels.f32','vrsqrtege.f32','vrsqrtelt.f32','vrsqrtegt.f32','vrsqrtele.f32',
+            'vrsqrtseq.f32','vrsqrtsne.f32','vrsqrtscs.f32','vrsqrtshs.f32','vrsqrtscc.f32','vrsqrtslo.f32','vrsqrtsmi.f32','vrsqrtspl.f32','vrsqrtsvs.f32','vrsqrtsvc.f32','vrsqrtshi.f32','vrsqrtsls.f32','vrsqrtsge.f32','vrsqrtslt.f32','vrsqrtsgt.f32','vrsqrtsle.f32',
+
+            'vsqrteq.f32','vsqrtne.f32','vsqrtcs.f32','vsqrths.f32','vsqrtcc.f32','vsqrtlo.f32','vsqrtmi.f32','vsqrtpl.f32','vsqrtvs.f32','vsqrtvc.f32','vsqrthi.f32','vsqrtls.f32','vsqrtge.f32','vsqrtlt.f32','vsqrtgt.f32','vsqrtle.f32',
+            'vsqrteq.f64','vsqrtne.f64','vsqrtcs.f64','vsqrths.f64','vsqrtcc.f64','vsqrtlo.f64','vsqrtmi.f64','vsqrtpl.f64','vsqrtvs.f64','vsqrtvc.f64','vsqrthi.f64','vsqrtls.f64','vsqrtge.f64','vsqrtlt.f64','vsqrtgt.f64','vsqrtle.f64',
+
+            'vsubeq.f32','vsubne.f32','vsubcs.f32','vsubhs.f32','vsubcc.f32','vsublo.f32','vsubmi.f32','vsubpl.f32','vsubvs.f32','vsubvc.f32','vsubhi.f32','vsubls.f32','vsubge.f32','vsublt.f32','vsubgt.f32','vsuble.f32',
+            'vsubeq.f64','vsubne.f64','vsubcs.f64','vsubhs.f64','vsubcc.f64','vsublo.f64','vsubmi.f64','vsubpl.f64','vsubvs.f64','vsubvc.f64','vsubhi.f64','vsubls.f64','vsubge.f64','vsublt.f64','vsubgt.f64','vsuble.f64'
+            ),
+        /* Registers */
+        35 => array(
+            /* General-Purpose Registers */
+            'r0','r1','r2','r3','r4','r5','r6','r7',
+            'r8','r9','r10','r11','r12','r13','r14','r15',
+            /* Scratch Registers */
+            'a1','a2','a3','a4',
+            /* Variable Registers */
+            'v1','v2','v3','v4','v5','v6','v7','v8',
+            /* Other Synonims for General-Purpose Registers */
+            'sb','sl','fp','ip','sp','lr','pc',
+            /* WMMX Data Registers */
+            'wr0','wr1','wr2','wr3','wr4','wr5','wr6','wr7',
+            'wr8','wr9','wr10','wr11','wr12','wr13','wr14','wr15',
+            /* WMMX Control Registers */
+            'wcid','wcon','wcssf','wcasf',
+            /* WMMX-Mapped General-Purpose Registers */
+            'wcgr0','wcgr1','wcgr2','wcgr3',
+            /* VFPv3 Registers */
+            's0','s1','s2','s3','s4','s5','s6','s7',
+            's8','s9','s10','s11','s12','s13','s14','s15',
+            's16','s17','s18','s19','s20','s21','s22','s23',
+            's24','s25','s26','s27','s28','s29','s30','s31',
+            /* VFPv3/NEON Registers */
+            'd0','d1','d2','d3','d4','d5','d6','d7',
+            'd8','d9','d10','d11','d12','d13','d14','d15',
+            'd16','d17','d18','d19','d20','d21','d22','d23',
+            'd24','d25','d26','d27','d28','d29','d30','d31',
+            /* NEON Registers */
+            'q0','q1','q2','q3','q4','q5','q6','q7',
+            'q8','q9','q10','q11','q12','q13','q14','q15'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')',
+        '+', '-', '*', '/', '%',
+        '.', ',', ';', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => 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,
+        28 => false,
+        29 => false,
+        30 => false,
+        31 => false,
+        32 => false,
+        33 => false,
+        34 => false,
+        35 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            /* Unconditional Data Processing Instructions */
+            1 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional Data Processing Instructions */
+            2 => 'color: #00007f; font-weight: normal; font-style: italic;',
+            /* Unconditional Memory Access Instructions */
+            3 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional Memory Access Instructions */
+            4 => 'color: #00007f; font-weight: normal; font-style: italic;',
+            /* Unconditional Flags Changing Instructions */
+            5 => 'color: #00007f; font-weight: bold; font-style: normal;',
+            /* Conditional Flags Changing Instructions */
+            6 => 'color: #00007f; font-weight: bold; font-style: italic;',
+            /* Unconditional Flow Control Instructions */
+            7 => 'color: #0000ff; font-weight: normal; font-style: normal;',
+            /* Conditional Flow Control Instructions */
+            8 => 'color: #0000ff; font-weight: normal; font-style: italic;',
+            /* Unconditional Syncronization Instructions */
+            9 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional Syncronization Instructions */
+            10 => 'color: #00007f; font-weight: normal; font-style: italic;',
+            /* Unonditional ARMv6 SIMD */
+            11 => 'color: #b00040; font-weight: normal; font-style: normal;',
+            /* Conditional ARMv6 SIMD */
+            12 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional Coprocessor Instructions */
+            13 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional Coprocessor Instructions */
+            14 => 'color: #00007f; font-weight: bold; font-style: italic;',
+            /* Unconditional System Instructions */
+            15 => 'color: #00007f; font-weight: normal; font-style: normal;',
+            /* Conditional System Instructions */
+            16 => 'color: #00007f; font-weight: bold; font-style: italic;',
+            /* Unconditional WMMX/WMMX2 SIMD Instructions */
+            17 => 'color: #b00040; font-weight: normal; font-style: normal;',
+            /* Conditional WMMX/WMMX2 SIMD Instructions */
+            18 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional VFPv3 & NEON SIMD Memory Access Instructions */
+            19 => 'color: #b00040; font-weight: normal; font-style: normal;',
+            /* Unconditional NEON SIMD Logical Instructions */
+            20 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD ARM Registers Interop Instructions */
+            21 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD Bit/Byte-Level Instructions */
+            22 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD Universal Integer Instructions */
+            23 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD Signed Integer Instructions */
+            24 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional NEON SIMD Unsigned Integer Instructions */
+            25 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Unconditional VFPv3 & NEON SIMD Floating-Point Instructions */
+            26 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional VFPv3 & NEON SIMD Memory Access Instructions */
+            27 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Logical Instructions */
+            28 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD ARM Registers Interop Instructions */
+            29 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Bit/Byte-Level Instructions */
+            30 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Universal Integer Instructions */
+            31 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Signed Integer Instructions */
+            32 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional NEON SIMD Unsigned Integer Instructions */
+            33 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Conditional VFPv3 & NEON SIMD Floating-Point Instructions */
+            34 => 'color: #b00040; font-weight: normal; font-style: italic;',
+            /* Registers */
+            35 => 'color: #46aa03; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #adadad; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => '',
+        18 => '',
+        19 => '',
+        20 => '',
+        21 => '',
+        22 => '',
+        23 => '',
+        24 => '',
+        25 => '',
+        26 => '',
+        27 => '',
+        28 => '',
+        29 => '',
+        30 => '',
+        31 => '',
+        32 => '',
+        33 => '',
+        34 => '',
+        35 => ''
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_BIN_PREFIX_PERCENT |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX |
+        GESHI_NUMBER_OCT_SUFFIX |
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/asm.php b/sources/inc/geshi/asm.php
new file mode 100644
index 0000000..dd0a7ec
--- /dev/null
+++ b/sources/inc/geshi/asm.php
@@ -0,0 +1,603 @@
+ 'ASM',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    //Line address prefix suppression
+    'COMMENT_REGEXP' => array(2 => "/^(?:[0-9a-f]{0,4}:)?[0-9a-f]{4}(?:[0-9a-f]{4})?/mi"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* General-Purpose */
+        1 => array(
+            /* BCD instructions */
+            'aaa','aad','aam','aas','daa','das',
+            /* Control flow instructions */
+            'ja','jae','jb','jbe','jc','je','jg','jge','jl','jle','jmp','jna',
+            'jnae','jnb','jnbe','jnc','jne','jng','jnge','jnl','jnle','jno','jnp','jns','jnz',
+            'jo','jp','jpe','jpo','js','jz','jcxz','jecxz','jrcxz','loop','loope','loopne',
+            'call','ret','enter','leave','syscall','sysenter','int','into',
+            /* Predicate instructions */
+            'seta','setae','setb','setbe','setc','sete','setg','setge','setl','setle','setna',
+            'setnae','setnb','setnbe','setnc','setne','setng','setnge','setnl','setnle','setno',
+            'setnp','setns','setnz','seto','setp','setpe','setpo','sets','setz','salc',
+            /* Conditional move instructions */
+            'cmovo','cmovno','cmovb','cmovc','cmovnae','cmovae','cmovnb','cmovnc','cmove','cmovz',
+            'cmovne','cmovnz','cmovbe','cmovna','cmova','cmovnbe','cmovs','cmovns','cmovp','cmovpe',
+            'cmovnp','cmovpo','cmovl','cmovnge','cmovge','cmovnl','cmovle','cmovng','cmovg','cmovnle',
+            /* ALU instructions */
+            'add','sub','adc','sbb','neg','cmp','inc','dec','and','or','xor','not','test',
+            'shl','shr','sal','sar','shld','shrd','rol','ror','rcl','rcr',
+            'cbw','cwd','cwde','cdq','cdqe','cqo','bsf','bsr','bt','btc','btr','bts',
+            'idiv','imul','div','mul','bswap','nop',
+            /* Memory instructions */
+            'lea','mov','movsx','movsxd','movzx','xlatb','bound','xchg','xadd','cmpxchg','cmpxchg8b','cmpxchg16b',
+            /* Stack instructions */
+            'push','pop','pusha','popa','pushad','popad','pushf','popf','pushfd','popfd','pushfq','popfq',
+            /* EFLAGS manipulations instructions */
+            'clc','cld','stc','std','cmc','lahf','sahf',
+            /* Prefix instructions */
+            'lock','rep','repe','repz','repne','repnz',
+            /* String instructions */
+            'cmps','cmpsb','cmpsw',/*'cmpsd',*/ 'cmpsq', /*CMPSD conflicts with the SSE2 instructions of the same name*/
+            'movs','movsb','movsw',/*'movsd',*/ 'movsq', /*MOVSD conflicts with the SSE2 instructions of the same name*/
+            'scas','scasb','scasw','scasd','scasq',
+            'stos','stosb','stosw','stosd','stosq',
+            'lods','lodsb','lodsw','lodsd','lodsq',
+            /* Information instructions */
+            'cpuid','rdtsc','rdtscp','rdpmc','xgetbv',
+            'sgdt','sidt','sldt','smsw','str','lar',
+            /* LWP instructions */
+            'llwpcb','slwpcb','lwpval','lwpins',
+            /* Instructions from miscellaneous extensions */
+            'crc32','popcnt','lzcnt','tzcnt','movbe','pclmulqdq','rdrand',
+            /* FSGSBASE instructions */
+            'rdfsbase','rdgsbase','wrfsbase','wrgsbase',
+            /* BMI1 instructions */
+            'andn','bextr','blsi','blsmk','blsr',
+            /* BMI2 instructions */
+            'bzhi','mulx','pdep','pext','rorx','sarx','shlx','shrx',
+            /* TBM instructions */
+            'blcfill','blci','blcic','blcmsk','blcs','blsfill','blsic','t1mskc','tzmsk',
+            /* Legacy instructions */
+            'arpl','ud2','lds','les','lfs','lgs','lss','lsl','verr','verw',
+            /* Privileged instructions */
+            'cli','sti','clts','hlt','rsm','in','insb','insw','insd',
+            'out','outsb','outsw','outsd','clflush','invd','invlpg','invpcid','wbinvd',
+            'iret','iretd','iretq','sysexit','sysret','lidt','lgdt','lldt','lmsw','ltr',
+            'monitor','mwait','rdmsr','wrmsr','swapgs',
+            'fxsave','fxsave64','fxrstor','fxrstor64',
+            'xsave','xsaveopt','xrstor','xsetbv','getsec',
+            /* VMX instructions */
+            'invept','invvpid','vmcall','vmclear','vmlaunch','vmresume',
+            'vmptrld','vmptrst','vmread','vmwrite','vmxoff','vmxon',
+            /* SVM (AMD-V) instructions */
+            'invlpga','skinit','clgi','stgi','vmload','vmsave','vmmcall','vmrun'
+            ),
+        /*FPU*/
+        2 => array(
+            'f2xm1','fabs','fadd','faddp','fbld','fbstp','fchs','fclex','fcom','fcomp','fcompp','fdecstp',
+            'fdisi','fdiv','fdivp','fdivr','fdivrp','feni','ffree','fiadd','ficom','ficomp','fidiv',
+            'fidivr','fild','fimul','fincstp','finit','fist','fistp','fisub','fisubr','fld','fld1',
+            'fldcw','fldenv','fldenvw','fldl2e','fldl2t','fldlg2','fldln2','fldpi','fldz','fmul',
+            'fmulp','fnclex','fndisi','fneni','fninit','fnop','fnsave','fnsavew','fnstcw','fnstenv',
+            'fnstenvw','fnstsw','fpatan','fprem','fptan','frndint','frstor','frstorw','fsave',
+            'fsavew','fscale','fsqrt','fst','fstcw','fstenv','fstenvw','fstp','fstsw','fsub','fsubp',
+            'fsubr','fsubrp','ftst','fwait','fxam','fxch','fxtract','fyl2x','fyl2xp1',
+            'fsetpm','fcos','fldenvd','fnsaved','fnstenvd','fprem1','frstord','fsaved','fsin','fsincos',
+            'fstenvd','fucom','fucomp','fucompp','ffreep',
+            /* FCMOV instructions */
+            'fcomi','fcomip','fucomi','fucomip',
+            'fcmovb','fcmove','fcmovbe','fcmovu','fcmovnb','fcmovne','fcmovnbe','fcmovnu',
+            /* SSE3 instructions */
+            'fisttp'
+            ),
+        /*SIMD*/
+        3 => array(
+            /* MMX instructions */
+            'movd','movq',
+            'paddb','paddw','paddd','paddsb','paddsw','paddusb','paddusw',
+            'psubb','psubw','psubd','psubsb','psubsw','psubusb','psubusw',
+            'pand','pandn','por','pxor',
+            'pcmpeqb','pcmpeqd','pcmpeqw','pcmpgtb','pcmpgtd','pcmpgtw',
+            'pmaddwd','pmulhw','pmullw',
+            'psllw','pslld','psllq','psrlw','psrld','psrlq','psraw','psrad',
+            'packuswb','packsswb','packssdw',
+            'punpcklbw','punpcklwd','punpckldq','punpckhbw','punpckhwd','punpckhdq',
+            'emms',
+            /* MMX+ instructions */
+            'pavgb','pavgw',
+            'pextrw','pinsrw','pmovmskb',
+            'pmaxsw','pmaxub','pminsw','pminub',
+            'pmulhuw','psadbw','pshufw',
+            'prefetchnta','prefetcht0','prefetcht1','prefetcht2',
+            'maskmovq','movntq','sfence',
+            /* EMMX instructions (only available on Cyrix MediaGXm) */
+            'paddsiw','psubsiw',
+            /*'pmulhrw',*/'pmachriw','pmulhriw', /* PMULHRW conflicts with the 3dnow! instruction of the same name */
+            'pmagw','pdistib','paveb',
+            'pmvzb','pmvnzb','pmvlzb','pmvgezb',
+            /* 3dnow! instructions! */
+            'pfacc','pfadd','pfsub','pfsubr','pfmul',
+            'pfcmpeq','pfcmpge','pfcmpgt',
+            'pfmax','pfmin',
+            'pfrcp','pfrcpit1','pfrcpit2','pfrsqit1','pfrsqrt',
+            'pi2fd','pf2id',
+            'pavgusb','pmulhrw',
+            'femms',
+            /* 3dnow!+ instructions */
+            'pfnacc','pfpnacc','pi2fw','pf2iw','pswapd',
+            /* 3dnow! Geode instructions */
+            'pfrsqrtv','pfrcpv',
+            /* 3dnow! Prefetch instructions */
+            'prefetch','prefetchw',
+            /* SSE instructions */
+            'addss','addps','subss','subps',
+            'mulss','mulps','divss','divps','sqrtss','sqrtps',
+            'rcpss','rcpps','rsqrtss','rsqrtps',
+            'maxss','maxps','minss','minps',
+            'cmpss','comiss','ucomiss','cmpps',
+            'cmpeqss','cmpltss','cmpless','cmpunordss','cmpneqss','cmpnltss','cmpnless','cmpordss',
+            'cmpeqps','cmpltps','cmpleps','cmpunordps','cmpneqps','cmpnltps','cmpnleps','cmpordps',
+            'andnps','andps','orps','xorps',
+            'cvtsi2ss','cvtss2si','cvttss2si',
+            'cvtpi2ps','cvtps2pi','cvttps2pi',
+            'movss','movlps','movhps','movlhps','movhlps','movaps','movups','movntps','movmskps',
+            'shufps','unpckhps','unpcklps',
+            'ldmxcsr','stmxcsr',
+            /* SSE2 instructions */
+            'addpd','addsd','subpd','subsd',
+            'mulsd','mulpd','divsd','divpd','sqrtsd','sqrtpd',
+            'maxsd','maxpd','minsd','minpd',
+            'cmpsd','comisd','ucomisd','cmppd',
+            'cmpeqsd','cmpltsd','cmplesd','cmpunordsd','cmpneqsd','cmpnltsd','cmpnlesd','cmpordsd',
+            'cmpeqpd','cmpltpd','cmplepd','cmpunordpd','cmpneqpd','cmpnltpd','cmpnlepd','cmpordpd',
+            'andnpd','andpd','orpd','xorpd',
+            'cvtsd2ss','cvtpd2ps','cvtss2sd','cvtps2pd',
+            'cvtdq2ps','cvtps2dq','cvttps2dq',
+            'cvtdq2pd','cvtpd2dq','cvttpd2dq',
+            'cvtsi2sd','cvtsd2si','cvttsd2si',
+            'cvtpi2pd','cvtpd2pi','cvttpd2pi',
+            'movsd','movlpd','movhpd','movapd','movupd','movntpd','movmskpd',
+            'shufpd','unpckhpd','unpcklpd',
+            'movnti','movdqa','movdqu','movntdq','maskmovdqu',
+            'movdq2q','movq2dq',
+            'paddq','psubq','pmuludq',
+            'pslldq','psrldq',
+            'punpcklqdq','punpckhqdq',
+            'pshufhw','pshuflw','pshufd',
+            'lfence','mfence',
+            /* SSE3 instructions */
+            'addsubps','addsubpd',
+            'haddps','haddpd','hsubps','hsubpd',
+            'movsldup','movshdup','movddup',
+            'lddqu',
+            /* SSSE3 instructions */
+            'psignb','psignw','psignd',
+            'pabsb','pabsw','pabsd',
+            'palignr','pshufb',
+            'pmulhrsw','pmaddubsw',
+            'phaddw','phaddd','phaddsw',
+            'phsubw','phsubd','phsubsw',
+            /* SSE4A instructions */
+            'extrq','insertq','movntsd','movntss',
+            /* SSE4.1 instructions */
+            'mpsadbw','phminposuw',
+            'pmuldq','pmulld',
+            'dpps','dppd',
+            'blendps','blendpd','blendvps','blendvpd','pblendvb','pblendw',
+            'pmaxsb','pmaxuw','pmaxsd','pmaxud','pminsb','pminuw','pminsd','pminud',
+            'roundps','roundss','roundpd','roundsd',
+            'insertps','pinsrb','pinsrd','pinsrq',
+            'extractps','pextrb','pextrd','pextrq',
+            'pmovsxbw','pmovsxbd','pmovsxbq','pmovsxwd','pmovsxwq','pmovsxdq',
+            'pmovzxbw','pmovzxbd','pmovzxbq','pmovzxwd','pmovzxwq','pmovzxdq',
+            'ptest',
+            'pcmpeqq',
+            'packusdw',
+            'movntdqa',
+            /* SSE4.2 instructions */
+            'pcmpgtq',
+            'pcmpestri','pcmpestrm','pcmpistri','pcmpistrm',
+            /* AES instructions */
+            'aesenc','aesenclast','aesdec','aesdeclast','aeskeygenassist','aesimc',
+            /* VIA Padlock instructions */
+            'xcryptcbc','xcryptcfb','xcryptctr','xcryptecb','xcryptofb',
+            'xsha1','xsha256','montmul','xstore',
+            /* AVX instructions */
+            'vaddss','vaddps','vaddsd','vaddpd','vsubss','vsubps','vsubsd','vsubpd',
+            'vaddsubps','vaddsubpd',
+            'vhaddps','vhaddpd','vhsubps','vhsubpd',
+            'vmulss','vmulps','vmulsd','vmulpd',
+            'vmaxss','vmaxps','vmaxsd','vmaxpd','vminss','vminps','vminsd','vminpd',
+            'vandps','vandpd','vandnps','vandnpd','vorps','vorpd','vxorps','vxorpd',
+            'vblendps','vblendpd','vblendvps','vblendvpd',
+            'vcmpss','vcomiss','vucomiss','vcmpsd','vcomisd','vucomisd','vcmpps','vcmppd',
+            'vcmpeqss','vcmpltss','vcmpless','vcmpunordss','vcmpneqss','vcmpnltss','vcmpnless','vcmpordss',
+            'vcmpeq_uqss','vcmpngess','vcmpngtss','vcmpfalsess','vcmpneq_oqss','vcmpgess','vcmpgtss','vcmptruess',
+            'vcmpeq_osss','vcmplt_oqss','vcmple_oqss','vcmpunord_sss','vcmpneq_usss','vcmpnlt_uqss','vcmpnle_uqss','vcmpord_sss',
+            'vcmpeq_usss','vcmpnge_uqss','vcmpngt_uqss','vcmpfalse_osss','vcmpneq_osss','vcmpge_oqss','vcmpgt_oqss','vcmptrue_usss',
+            'vcmpeqps','vcmpltps','vcmpleps','vcmpunordps','vcmpneqps','vcmpnltps','vcmpnleps','vcmpordps',
+            'vcmpeq_uqps','vcmpngeps','vcmpngtps','vcmpfalseps','vcmpneq_oqps','vcmpgeps','vcmpgtps','vcmptrueps',
+            'vcmpeq_osps','vcmplt_oqps','vcmple_oqps','vcmpunord_sps','vcmpneq_usps','vcmpnlt_uqps','vcmpnle_uqps','vcmpord_sps',
+            'vcmpeq_usps','vcmpnge_uqps','vcmpngt_uqps','vcmpfalse_osps','vcmpneq_osps','vcmpge_oqps','vcmpgt_oqps','vcmptrue_usps',
+            'vcmpeqsd','vcmpltsd','vcmplesd','vcmpunordsd','vcmpneqsd','vcmpnltsd','vcmpnlesd','vcmpordsd',
+            'vcmpeq_uqsd','vcmpngesd','vcmpngtsd','vcmpfalsesd','vcmpneq_oqsd','vcmpgesd','vcmpgtsd','vcmptruesd',
+            'vcmpeq_ossd','vcmplt_oqsd','vcmple_oqsd','vcmpunord_ssd','vcmpneq_ussd','vcmpnlt_uqsd','vcmpnle_uqsd','vcmpord_ssd',
+            'vcmpeq_ussd','vcmpnge_uqsd','vcmpngt_uqsd','vcmpfalse_ossd','vcmpneq_ossd','vcmpge_oqsd','vcmpgt_oqsd','vcmptrue_ussd',
+            'vcmpeqpd','vcmpltpd','vcmplepd','vcmpunordpd','vcmpneqpd','vcmpnltpd','vcmpnlepd','vcmpordpd',
+            'vcmpeq_uqpd','vcmpngepd','vcmpngtpd','vcmpfalsepd','vcmpneq_oqpd','vcmpgepd','vcmpgtpd','vcmptruepd',
+            'vcmpeq_ospd','vcmplt_oqpd','vcmple_oqpd','vcmpunord_spd','vcmpneq_uspd','vcmpnlt_uqpd','vcmpnle_uqpd','vcmpord_spd',
+            'vcmpeq_uspd','vcmpnge_uqpd','vcmpngt_uqpd','vcmpfalse_ospd','vcmpneq_ospd','vcmpge_oqpd','vcmpgt_oqpd','vcmptrue_uspd',
+            'vcvtsd2ss','vcvtpd2ps','vcvtss2sd','vcvtps2pd',
+            'vcvtsi2ss','vcvtss2si','vcvttss2si',
+            'vcvtpi2ps','vcvtps2pi','vcvttps2pi',
+            'vcvtdq2ps','vcvtps2dq','vcvttps2dq',
+            'vcvtdq2pd','vcvtpd2dq','vcvttpd2dq',
+            'vcvtsi2sd','vcvtsd2si','vcvttsd2si',
+            'vcvtpi2pd','vcvtpd2pi','vcvttpd2pi',
+            'vdivss','vdivps','vdivsd','vdivpd','vsqrtss','vsqrtps','vsqrtsd','vsqrtpd',
+            'vdpps','vdppd',
+            'vmaskmovps','vmaskmovpd',
+            'vmovss','vmovsd','vmovaps','vmovapd','vmovups','vmovupd','vmovntps','vmovntpd',
+            'vmovhlps','vmovlhps','vmovlps','vmovlpd','vmovhps','vmovhpd',
+            'vmovsldup','vmovshdup','vmovddup',
+            'vmovmskps','vmovmskpd',
+            'vroundss','vroundps','vroundsd','vroundpd',
+            'vrcpss','vrcpps','vrsqrtss','vrsqrtps',
+            'vunpcklps','vunpckhps','vunpcklpd','vunpckhpd',
+            'vbroadcastss','vbroadcastsd','vbroadcastf128',
+            'vextractps','vinsertps','vextractf128','vinsertf128',
+            'vshufps','vshufpd','vpermilps','vpermilpd','vperm2f128',
+            'vtestps','vtestpd',
+            'vpaddb','vpaddusb','vpaddsb','vpaddw','vpaddusw','vpaddsw','vpaddd','vpaddq',
+            'vpsubb','vpsubusb','vpsubsb','vpsubw','vpsubusw','vpsubsw','vpsubd','vpsubq',
+            'vphaddw','vphaddsw','vphaddd','vphsubw','vphsubsw','vphsubd',
+            'vpsllw','vpslld','vpsllq','vpsrlw','vpsrld','vpsrlq','vpsraw','vpsrad',
+            'vpand','vpandn','vpor','vpxor',
+            'vpblendwb','vpblendw',
+            'vpsignb','vpsignw','vpsignd',
+            'vpavgb','vpavgw',
+            'vpabsb','vpabsw','vpabsd',
+            'vmovd','vmovq','vmovdqa','vmovdqu','vlddqu','vmovntdq','vmovntdqa','vmaskmovdqu',
+            'vpmovsxbw','vpmovsxbd','vpmovsxbq','vpmovsxwd','vpmovsxwq','vpmovsxdq',
+            'vpmovzxbw','vpmovzxbd','vpmovzxbq','vpmovzxwd','vpmovzxwq','vpmovzxdq',
+            'vpackuswb','vpacksswb','vpackusdw','vpackssdw',
+            'vpcmpeqb','vpcmpeqw','vpcmpeqd','vpcmpeqq','vpcmpgtb','vpcmpgtw','vpcmpgtd','vpcmpgtq',
+            'vpmaddubsw','vpmaddwd',
+            'vpmullw','vpmulhuw','vpmulhw','vpmulhrsw','vpmulld','vpmuludq','vpmuldq',
+            'vpmaxub','vpmaxsb','vpmaxuw','vpmaxsw','vpmaxud','vpmaxsd',
+            'vpminub','vpminsb','vpminuw','vpminsw','vpminud','vpminsd',
+            'vpmovmskb','vptest',
+            'vpunpcklbw','vpunpcklwd','vpunpckldq','vpunpcklqdq',
+            'vpunpckhbw','vpunpckhwd','vpunpckhdq','vpunpckhqdq',
+            'vpslldq','vpsrldq','vpalignr',
+            'vpshufb','vpshuflw','vpshufhw','vpshufd',
+            'vpextrb','vpextrw','vpextrd','vpextrq','vpinsrb','vpinsrw','vpinsrd','vpinsrq',
+            'vpsadbw','vmpsadbw','vphminposuw',
+            'vpcmpestri','vpcmpestrm','vpcmpistri','vpcmpistrm',
+            'vpclmulqdq','vaesenc','vaesenclast','vaesdec','vaesdeclast','vaeskeygenassist','vaesimc',
+            'vldmxcsr','vstmxcsr','vzeroall','vzeroupper',
+            /* AVX2 instructions */
+            'vbroadcasti128','vpbroadcastb','vpbroadcastw','vpbroadcastd','vpbroadcastq',
+            'vpblendd',
+            'vpermd','vpermq','vperm2i128',
+            'vextracti128','vinserti128',
+            'vpmaskmovd','vpmaskmovq',
+            'vpsllvd','vpsllvq','vpsravd','vpsrlvd',
+            'vpgatherdd','vpgatherqd','vgatherdq','vgatherqq',
+            'vpermps','vpermpd',
+            'vgatherdpd','vgatherqpd','vgatherdps','vgatherqps',
+            /* XOP instructions */
+            'vfrczss','vfrczps','vfrczsd','vfrczpd',
+            'vpermil2ps','vperlil2pd',
+            'vpcomub','vpcomb','vpcomuw','vpcomw','vpcomud','vpcomd','vpcomuq','vpcomq',
+            'vphaddubw','vphaddbw','vphaddubd','vphaddbd','vphaddubq','vphaddbq',
+            'vphadduwd','vphaddwd','vphadduwq','vphaddwq','vphaddudq','vphadddq',
+            'vphsubbw','vphsubwd','vphsubdq',
+            'vpmacsdd','vpmacssdd','vpmacsdql','vpmacssdql','vpmacsdqh','vpmacssdqh',
+            'vpmacsww','vpmacssww','vpmacswd','vpmacsswd',
+            'vpmadcswd','vpmadcsswd',
+            'vpcmov','vpperm',
+            'vprotb','vprotw','vprotd','vprotq',
+            'vpshab','vpshaw','vpshad','vpshaq',
+            'vpshlb','vpshlw','vpshld','vpshlq',
+            /* CVT16 instructions */
+            'vcvtph2ps','vcvtps2ph',
+            /* FMA4 instructions */
+            'vfmaddss','vfmaddps','vfmaddsd','vfmaddpd',
+            'vfmsubss','vfmsubps','vfmsubsd','vfmsubpd',
+            'vnfmaddss','vnfmaddps','vnfmaddsd','vnfmaddpd',
+            'vnfmsubss','vnfmsubps','vnfmsubsd','vnfmsubpd',
+            'vfmaddsubps','vfmaddsubpd','vfmsubaddps','vfmsubaddpd',
+            /* FMA3 instructions */
+            'vfmadd132ss','vfmadd213ss','vfmadd231ss',
+            'vfmadd132ps','vfmadd213ps','vfmadd231ps',
+            'vfmadd132sd','vfmadd213sd','vfmadd231sd',
+            'vfmadd132pd','vfmadd213pd','vfmadd231pd',
+            'vfmaddsub132ps','vfmaddsub213ps','vfmaddsub231ps',
+            'vfmaddsub132pd','vfmaddsub213pd','vfmaddsub231pd',
+            'vfmsubadd132ps','vfmsubadd213ps','vfmsubadd231ps',
+            'vfmsubadd132pd','vfmsubadd213pd','vfmsubadd231pd',
+            'vfmsub132ss','vfmsub213ss','vfmsub231ss',
+            'vfmsub132ps','vfmsub213ps','vfmsub231ps',
+            'vfmsub132sd','vfmsub213sd','vfmsub231sd',
+            'vfmsub132pd','vfmsub213pd','vfmsub231pd',
+            'vfnmadd132ss','vfnmadd213ss','vfnmadd231ss',
+            'vfnmadd132ps','vfnmadd213ps','vfnmadd231ps',
+            'vfnmadd132sd','vfnmadd213sd','vfnmadd231sd',
+            'vfnmadd132pd','vfnmadd213pd','vfnmadd231pd',
+            'vfnmsub132ss','vfnmsub213ss','vfnmsub231ss',
+            'vfnmsub132ps','vfnmsub213ps','vfnmsub231ps',
+            'vfnmsub132sd','vfnmsub213sd','vfnmsub231sd',
+            'vfnmsub132pd','vfnmsub213pd','vfnmsub231pd'
+            ),
+        /*registers*/
+        4 => array(
+            /* General-Purpose Registers */
+            'al','ah','bl','bh','cl','ch','dl','dh','sil','dil','bpl','spl',
+            'r8b','r9b','r10b','r11b','r12b','r13b','r14b','r15b',
+            'ax','bx','cx','dx','si','di','bp','sp',
+            'r8w','r9w','r10w','r11w','r12w','r13w','r14w','r15w',
+            'eax','ebx','ecx','edx','esi','edi','ebp','esp',
+            'r8d','r9d','r10d','r11d','r12d','r13d','r14d','r15d',
+            'rax','rcx','rdx','rbx','rsp','rbp','rsi','rdi',
+            'r8','r9','r10','r11','r12','r13','r14','r15',
+            /* Debug Registers */
+            'dr0','dr1','dr2','dr3','dr6','dr7',
+            /* Control Registers */
+            'cr0','cr2','cr3','cr4','cr8',
+            /* Test Registers (Supported on Intel 486 only) */
+            'tr3','tr4','tr5','tr6','tr7',
+            /* Segment Registers */
+            'cs','ds','es','fs','gs','ss',
+            /* FPU Registers */
+            'st','st0','st1','st2','st3','st4','st5','st6','st7',
+            /* MMX Registers */
+            'mm0','mm1','mm2','mm3','mm4','mm5','mm6','mm7',
+            /* SSE Registers */
+            'xmm0','xmm1','xmm2','xmm3','xmm4','xmm5','xmm6','xmm7',
+            'xmm8','xmm9','xmm10','xmm11','xmm12','xmm13','xmm14','xmm15',
+            /* AVX Registers */
+            'ymm0','ymm1','ymm2','ymm3','ymm4','ymm5','ymm6','ymm7',
+            'ymm8','ymm9','ymm10','ymm11','ymm12','ymm13','ymm14','ymm15'
+            ),
+        /*Directive*/
+        5 => array(
+            'db','dw','dd','dq','dt','do','dy',
+            'resb','resw','resd','resq','rest','reso','resy','incbin','equ','times','safeseh',
+            '__utf16__','__utf32__',
+            'default','cpu','float','start','imagebase','osabi',
+            '..start','..imagebase','..gotpc','..gotoff','..gottpoff','..got','..plt','..sym','..tlsie',
+            'section','segment','__sect__','group','absolute',
+            '.bss','.comment','.data','.lbss','.ldata','.lrodata','.rdata','.rodata','.tbss','.tdata','.text',
+            'alloc','bss','code','exec','data','noalloc','nobits','noexec','nowrite','progbits','rdata','tls','write',
+            'private','public','common','stack','overlay','class',
+            'extern','global','import','export',
+            '%define','%idefine','%xdefine','%ixdefine','%assign','%undef',
+            '%defstr','%idefstr','%deftok','%ideftok',
+            '%strcat','%strlen','%substr',
+            '%macro','%imacro','%rmacro','%exitmacro','%endmacro','%unmacro',
+            '%if','%ifn','%elif','%elifn','%else','%endif',
+            '%ifdef','%ifndef','%elifdef','%elifndef',
+            '%ifmacro','%ifnmacro','%elifmacro','%elifnmacro',
+            '%ifctx','%ifnctx','%elifctx','%elifnctx',
+            '%ifidn','%ifnidn','%elifidn','%elifnidn',
+            '%ifidni','%ifnidni','%elifidni','%elifnidni',
+            '%ifid','%ifnid','%elifid','%elifnid',
+            '%ifnum','%ifnnum','%elifnum','%elifnnum',
+            '%ifstr','%ifnstr','%elifstr','%elifnstr',
+            '%iftoken','%ifntoken','%eliftoken','%elifntoken',
+            '%ifempty','%ifnempty','%elifempty','%elifnempty',
+            '%ifenv','%ifnenv','%elifenv','%elifnenv',
+            '%rep','%exitrep','%endrep',
+            '%while','%exitwhile','%endwhile',
+            '%include','%pathsearch','%depend','%use',
+            '%push','%pop','%repl','%arg','%local','%stacksize','flat','flat64','large','small',
+            '%error','%warning','%fatal',
+            '%00','.nolist','%rotate','%line','%!','%final','%clear',
+            'struc','endstruc','istruc','at','iend',
+            'align','alignb','sectalign',
+            'bits','use16','use32','use64',
+            '__nasm_major__','__nasm_minor__','__nasm_subminor__','___nasm_patchlevel__',
+            '__nasm_version_id__','__nasm_ver__',
+            '__file__','__line__','__pass__','__bits__','__output_format__',
+            '__date__','__time__','__date_num__','__time_num__','__posix_time__',
+            '__utc_date__','__utc_time__','__utc_date_num__','__utc_time_num__',
+            '__float_daz__','__float_round__','__float__',
+            /* Keywords from standard packages */
+            '__use_altreg__',
+            '__use_smartalign__','smartalign','__alignmode__',
+            '__use_fp__','__infinity__','__nan__','__qnan__','__snan__',
+            '__float8__','__float16__','__float32__','__float64__','__float80m__','__float80e__','__float128l__','__float128h__'
+            ),
+        /*Operands*/
+        6 => array(
+            'a16','a32','a64','o16','o32','o64','strict',
+            'byte','word','dword','qword','tword','oword','yword','nosplit',
+            '%0','%1','%2','%3','%4','%5','%6','%7','%8','%9',
+            'abs','rel',
+            'seg','wrt'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+                '[', ']', '(', ')',
+                '+', '-', '*', '/', '%',
+                '.', ',', ';', ':'
+            ),
+        2 => array(
+                '$','$$','%+','%?','%??'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f; font-weight: bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #b00040;',
+            4 => 'color: #46aa03; font-weight: bold;',
+            5 => 'color: #0000ff; font-weight: bold;',
+            6 => 'color: #0000ff; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #adadad; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;',
+            2 => 'color: #0000ff; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_BIN_PREFIX_PERCENT |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX |
+        GESHI_NUMBER_OCT_SUFFIX |
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/asp.php b/sources/inc/geshi/asp.php
new file mode 100644
index 0000000..0096a16
--- /dev/null
+++ b/sources/inc/geshi/asp.php
@@ -0,0 +1,164 @@
+ 'ASP',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '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',
+            'CSTR', 'Fix', 'Is', 'Sgn', 'String', 'Boolean', 'Currency', 'Me', 'Single', 'Long', 'Integer', 'Byte',
+            'Variant', 'Double', 'To', 'Let', 'Xor', 'Resume', 'On', 'Error', 'Imp', 'GoTo', 'Call', 'Global'
+            ),
+        2 => array(
+            'Null', 'Nothing', 'And',
+            'False',
+            'True', 'var', 'Or', 'BOF', 'EOF', 'xor',
+            'Function', 'Class', 'New', 'Sub'
+            ),
+        3 => array(
+            'CreateObject', 'Write', 'Redirect', 'Cookies', 'BinaryRead', 'ClientCertificate', 'Form', 'QueryString',
+            'ServerVariables', 'TotalBytes', 'AddHeader', 'AppendToLog', 'BinaryWrite', 'Buffer', 'CacheControl',
+            'Charset', 'Clear', 'ContentType', 'End()', 'Expires', 'ExpiresAbsolute', 'Flush()', 'IsClientConnected',
+            'PICS', 'Status', 'Connection', 'Recordset', 'Execute', 'Abandon', 'Lock', 'UnLock', 'Command', 'Fields',
+            'Properties', 'Property', 'Send', 'Replace', 'InStr', 'TRIM', 'NOW', 'Day', 'Month', 'Hour', 'Minute', 'Second',
+            'Year', 'MonthName', 'LCase', 'UCase', 'Abs', 'Array', 'As', 'LEN', 'MoveFirst', 'MoveLast', 'MovePrevious',
+            'MoveNext', 'LBound', 'UBound', 'Transfer', 'Open', 'Close', 'MapPath', 'FileExists', 'OpenTextFile', 'ReadAll'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
+            ';', ':', '?', '='),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990099; font-weight: bold;',
+            2 => 'color: #0000ff; font-weight: bold;',
+            3 => 'color: #330066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            2 => 'color: #ff6600;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006600; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #cc0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #9900cc;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600; font-weight: bold;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            ),
+        1 => array(
+            ''
+            ),
+        2 => array(
+            ''
+            ),
+        3 => "/(?P<%=?)(?:\"[^\"]*?\"|\/\*(?!\*\/).*?\*\/|.)*?(?P%>|\Z)/sm"
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/asymptote.php b/sources/inc/geshi/asymptote.php
new file mode 100644
index 0000000..8683588
--- /dev/null
+++ b/sources/inc/geshi/asymptote.php
@@ -0,0 +1,194 @@
+ 'asymptote',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    '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' => '',
+    '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(
+            'and','controls','tension','atleast','curl','if','else','while','for','do','return','break','continue','struct','typedef','new','access','import','unravel','from','include','quote','static','public','private','restricted','this','explicit','true','false','null','cycle','newframe','operator'
+            ),
+        2 => array(
+            'Braid','FitResult','Label','Legend','Segment','Solution','TreeNode','abscissa','arc','arrowhead','binarytree','binarytreeNode','block','bool','bool3','bounds','bqe','circle','conic','coord','coordsys','cputime','ellipse','file','filltype','frame','grid3','guide','horner','hsv','hyperbola','indexedTransform','int','inversion','key','light','line','linefit','marginT','marker','mass','object','pair','parabola','path','path3','pen','picture','point','position','projection','real','revolution','scaleT','scientific','segment','side','slice','solution','splitface','string','surface','tensionSpecifier','ticklocate','ticksgridT','tickvalues','transform','transformation','tree','triangle','trilinear','triple','vector','vertex','void'),
+        3 => array(
+            'AND','Arc','ArcArrow','ArcArrows','Arrow','Arrows','Automatic','AvantGarde','BBox','BWRainbow','BWRainbow2','Bar','Bars','BeginArcArrow','BeginArrow','BeginBar','BeginDotMargin','BeginMargin','BeginPenMargin','Blank','Bookman','Bottom','BottomTop','Bounds','Break','Broken','BrokenLog','CLZ','CTZ','Ceil','Circle','CircleBarIntervalMarker','Cos','Courier','CrossIntervalMarker','DOSendl','DOSnewl','DefaultFormat','DefaultLogFormat','Degrees','Dir','DotMargin','DotMargins','Dotted','Draw','Drawline','Embed','EndArcArrow','EndArrow','EndBar','EndDotMargin','EndMargin','EndPenMargin','Fill','FillDraw','Floor','Format','Full','Gaussian','Gaussrand','Gaussrandpair',
+            'Gradient','Grayscale','Helvetica','Hermite','HookHead','InOutTicks','InTicks','Jn','Label','Landscape','Left','LeftRight','LeftTicks','Legend','Linear','Link','Log','LogFormat','Margin','Margins','Mark','MidArcArrow','MidArrow','NOT','NewCenturySchoolBook','NoBox','NoMargin','NoModifier','NoTicks','NoTicks3','NoZero','NoZeroFormat','None','OR','OmitFormat','OmitTick','OmitTickInterval','OmitTickIntervals','OutTicks','Ox','Oy','Palatino','PaletteTicks','Pen','PenMargin','PenMargins','Pentype','Portrait','RadialShade','RadialShadeDraw','Rainbow','Range','Relative','Right','RightTicks','Rotate','Round','SQR','Scale','ScaleX','ScaleY','ScaleZ','Seascape','Segment','Shift','Sin','Slant','Spline','StickIntervalMarker','Straight','Symbol','Tan','TeXify','Ticks','Ticks3','TildeIntervalMarker','TimesRoman','Top','TrueMargin','UnFill','UpsideDown','Wheel','X','XEquals','XOR','XY','XYEquals','XYZero','XYgrid','XZEquals','XZZero','XZero','XZgrid','Y','YEquals','YXgrid','YZ','YZEquals','YZZero','YZero','YZgrid','Yn','Z','ZX','ZXgrid','ZYgrid','ZapfChancery','ZapfDingbats','_begingroup3','_cputime','_draw','_eval','_image','_labelpath','_projection','_strokepath','_texpath','aCos','aSin','aTan','abort','abs','accel','acos','acosh','acot','acsc','activatequote','add',
+            'addArrow','addMargins','addSaveFunction','addpenarc','addpenline','adjust','alias','align','all','altitude','angabscissa','angle','angpoint','animate','annotate','anticomplementary','antipedal','apply','approximate','arc','arcarrowsize','arccircle','arcdir','arcfromcenter','arcfromfocus','arclength','arcnodesnumber','arcpoint','arcsubtended','arcsubtendedcenter','arctime','arctopath','array','arrow','arrow2','arrowbase','arrowbasepoints','arrowsize','asec','asin','asinh','ask','assert','asy','asycode','asydir','asyfigure','asyfilecode','asyinclude','asywrite','atan','atan2','atanh','atbreakpoint','atexit','attach','attract','atupdate','autoformat','autoscale','autoscale3','axes','axes3','axialshade','axis','axiscoverage','azimuth','babel','background','bangles','bar','barmarksize','barsize','basealign','baseline','bbox','beep','begin','beginclip','begingroup','beginpoint','between','bevel','bezier','bezierP','bezierPP','bezierPPP','bezulate','bibliography','bibliographystyle','binarytree','binarytreeNode','binomial','binput','bins','bisector','bisectorpoint','bispline','blend','blockconnector','boutput','box','bqe','breakpoint','breakpoints','brick','buildRestoreDefaults','buildRestoreThunk','buildcycle','bulletcolor','byte','calculateScaling','canonical','canonicalcartesiansystem','cartesiansystem','case1','case2','case3','case4','cbrt','cd','ceil','center','centerToFocus',
+            'centroid','cevian','change2','changecoordsys','checkSegment','checkconditionlength','checker','checkincreasing','checklengths','checkposition','checktriangle','choose','circle','circlebarframe','circlemarkradius','circlenodesnumber','circumcenter','circumcircle','clamped','clear','clip','clipdraw','close','cmyk','code','colatitude','collect','collinear','color','colorless','colors','colorspace','comma','compassmark','complement','complementary','concat','concurrent','cone','conic','conicnodesnumber','conictype','conj','connect','connected','connectedindex','containmentTree','contains','contour','contour3','contouredges','controlSpecifier','convert','coordinates','coordsys','copy','copyPairOrTriple','cos','cosh','cot','countIntersections','cputime','crop','cropcode','cross',
+            'crossframe','crosshatch','crossmarksize','csc','cubicroots','curabscissa','curlSpecifier','curpoint','currentarrow','currentexitfunction','currentmomarrow','currentpolarconicroutine','curve','cut','cutafter','cutbefore','cyclic','cylinder','deactivatequote','debugger','deconstruct','defaultdir','defaultformat','defaultpen','defined','degenerate','degrees','delete','deletepreamble','determinant','diagonal','diamond','diffdiv','dir','dirSpecifier','dirtime','display','distance',
+            'divisors','do_overpaint','dot','dotframe','dotsize','downcase','draw','drawAll','drawDoubleLine','drawFermion','drawGhost','drawGluon','drawMomArrow','drawPRCcylinder','drawPRCdisk','drawPRCsphere','drawPRCtube','drawPhoton','drawScalar','drawVertex','drawVertexBox','drawVertexBoxO','drawVertexBoxX','drawVertexO','drawVertexOX','drawVertexTriangle','drawVertexTriangleO','drawVertexX','drawarrow','drawarrow2','drawline','drawpixel','drawtick','duplicate','elle','ellipse','ellipsenodesnumber','embed','embed3','empty','enclose','end','endScript','endclip','endgroup','endgroup3','endl','endpoint','endpoints','eof','eol','equation','equations','erase','erasestep','erf','erfc','error','errorbar','errorbars','eval','excenter','excircle','exit','exitXasyMode','exitfunction','exp','expfactors','expi','expm1','exradius','extend','extension','extouch','fabs','factorial','fermat','fft','fhorner','figure','file','filecode','fill','filldraw','filloutside','fillrule','filltype','find','finite','finiteDifferenceJacobian','firstcut','firstframe','fit','fit2','fixedscaling','floor','flush','fmdefaults','fmod','focusToCenter','font','fontcommand','fontsize','foot','format','frac','frequency','fromCenter','fromFocus','fspline','functionshade','gamma','generate_random_backtrace','generateticks','gergonne','getc','getint','getpair','getreal','getstring','gettriple','gluon','gouraudshade','graph','graphic','gray','grestore','grid','grid3','gsave','halfbox','hatch','hdiffdiv','hermite','hex','histogram','history','hline','hprojection',
+            'hsv','hyperbola','hyperbolanodesnumber','hyperlink','hypot','identity','image','incenter','incentral','incircle','increasing','incrementposition','indexedTransform','indexedfigure','initXasyMode','initdefaults','input','inradius','insert','inside','integrate','interactive','interior','interp','interpolate','intersect','intersection','intersectionpoint','intersectionpoints','intersections','intouch','inverse','inversion','invisible','is3D','isCCW','isDuplicate','isogonal','isogonalconjugate','isotomic','isotomicconjugate','isparabola','italic','item','jobname','key','kurtosis','kurtosisexcess','label','labelaxis','labelmargin','labelpath','labels','labeltick','labelx','labelx3','labely','labely3','labelz','labelz3','lastcut','latex','latitude','latticeshade','layer','layout','ldexp','leastsquares','legend','legenditem','length','lexorder','lift','light','limits','line','linear','linecap','lineinversion','linejoin','linemargin','lineskip','linetype','linewidth','link','list','lm_enorm','lm_evaluate_default','lm_lmdif','lm_lmpar','lm_minimize','lm_print_default','lm_print_quiet','lm_qrfac','lm_qrsolv','locale','locate',
+            'locatefile','location','log','log10','log1p','logaxiscoverage','longitude','lookup','makeNode','makedraw','makepen','map','margin','markangle','markangleradius','markanglespace','markarc','marker','markinterval','marknodes','markrightangle','markuniform','mass','masscenter','massformat','math','max','max3','maxAfterTransform','maxbezier','maxbound','maxcoords','maxlength','maxratio','maxtimes','mean','medial','median','midpoint','min','min3','minAfterTransform','minbezier','minbound','minipage','minratio','mintimes','miterlimit','mktemp','momArrowPath','momarrowsize','monotonic','multifigure','nativeformat','natural','needshipout','newl','newpage','newslide','newton','newtree','nextframe','nextnormal','nextpage','nib','nodabscissa','none','norm','normalvideo','notaknot','nowarn','numberpage','nurb','object','offset','onpath','opacity','opposite','orientation','origin','orthic','orthocentercenter','outformat','outline','outname','outprefix','output','overloadedMessage','overwrite','pack','pad','pairs','palette','parabola','parabolanodesnumber','parallel','parallelogram','partialsum','path','path3','pattern','pause','pdf','pedal','periodic','perp','perpendicular','perpendicularmark','phantom','phi1','phi2','phi3','photon','piecewisestraight','point','polar','polarconicroutine','polargraph','polygon','postcontrol','postscript','pow10','ppoint','prc','prc0','precision','precontrol','prepend','printBytecode','print_random_addresses','project','projection','purge','pwhermite','quadrant','quadraticroots','quantize','quarticroots','quotient','radialshade','radians','radicalcenter','radicalline','radius','rand','randompath','rd','readline','realmult','realquarticroots','rectangle','rectangular','rectify','reflect','relabscissa','relative','relativedistance','reldir','relpoint','reltime','remainder','remark','removeDuplicates','rename','replace','report','resetdefaultpen','restore','restoredefaults','reverse','reversevideo','rf','rfind','rgb','rgba','rgbint','rms',
+            'rotate','rotateO','rotation','round','roundbox','roundedpath','roundrectangle','same','samecoordsys','sameside','sample','save','savedefaults','saveline','scale','scale3','scaleO','scaleT','scaleless','scientific','search','searchindex','searchtree','sec','secondaryX','secondaryY','seconds','section','sector','seek','seekeof','segment','sequence','setcontour','setpens','sgn','sgnd','sharpangle','sharpdegrees','shift','shiftless','shipout','shipout3','show','side','simeq','simpson','sin','sinh','size','size3','skewness','skip','slant','sleep','slope','slopefield','solve','solveBVP','sort','sourceline','sphere','split','sqrt','square','srand','standardizecoordsys','startScript','stdev','step','stickframe','stickmarksize','stickmarkspace','stop','straight','straightness','string','stripdirectory','stripextension','stripfile','stripsuffix','strokepath','subdivide','subitem','subpath','substr','sum','surface','symmedial','symmedian','system',
+            'tab','tableau','tan','tangent','tangential','tangents','tanh','tell','tensionSpecifier','tensorshade','tex','texcolor','texify','texpath','texpreamble','texreset','texshipout','texsize','textpath','thick','thin','tick','tickMax','tickMax3','tickMin','tickMin3','ticklabelshift','ticklocate','tildeframe','tildemarksize','tile','tiling','time','times','title','titlepage','topbox','transform','transformation','transpose','trembleFuzz','triangle','triangleAbc','triangleabc','triangulate','tricoef','tridiagonal','trilinear','trim','truepoint','tube','uncycle','unfill','uniform','unique','unit','unitrand','unitsize','unityroot','unstraighten','upcase','updatefunction','uperiodic','upscale','uptodate','usepackage','usersetting','usetypescript','usleep','value','variance','variancebiased','vbox','vector','vectorfield','verbatim','view','vline','vperiodic','vprojection','warn','warning','windingnumber','write','xaxis','xaxis3','xaxis3At','xaxisAt','xequals','xinput','xlimits','xoutput','xpart','xscale','xscaleO','xtick','xtick3','xtrans','yaxis','yaxis3','yaxis3At','yaxisAt','yequals','ylimits','ypart','yscale','yscaleO','ytick','ytick3','ytrans','zaxis3','zaxis3At','zero','zero3','zlimits','zpart','ztick','ztick3','ztrans'
+            ),
+        4 => array(
+            'AliceBlue','Align','Allow','AntiqueWhite','Apricot','Aqua','Aquamarine','Aspect','Azure','BeginPoint','Beige','Bisque','Bittersweet','Black','BlanchedAlmond','Blue','BlueGreen','BlueViolet','Both','Break','BrickRed','Brown','BurlyWood','BurntOrange','CCW','CW','CadetBlue','CarnationPink','Center','Centered','Cerulean','Chartreuse','Chocolate','Coeff','Coral','CornflowerBlue','Cornsilk','Crimson','Crop','Cyan','Dandelion','DarkBlue','DarkCyan','DarkGoldenrod','DarkGray','DarkGreen','DarkKhaki','DarkMagenta','DarkOliveGreen','DarkOrange','DarkOrchid','DarkRed','DarkSalmon','DarkSeaGreen','DarkSlateBlue','DarkSlateGray','DarkTurquoise','DarkViolet','DeepPink','DeepSkyBlue','DefaultHead','DimGray','DodgerBlue','Dotted','Down','Draw','E','ENE','EPS','ESE','E_Euler','E_PC','E_RK2','E_RK3BS','Emerald','EndPoint','Euler','Fill','FillDraw','FireBrick','FloralWhite','ForestGreen','Fuchsia','Gainsboro','GhostWhite','Gold','Goldenrod','Gray','Green','GreenYellow','Honeydew','HookHead','Horizontal','HotPink','I','IgnoreAspect','IndianRed','Indigo','Ivory','JOIN_IN','JOIN_OUT','JungleGreen','Khaki','LM_DWARF','LM_MACHEP','LM_SQRT_DWARF','LM_SQRT_GIANT','LM_USERTOL','Label','Lavender','LavenderBlush','LawnGreen','Left','LeftJustified','LeftSide','LemonChiffon','LightBlue','LightCoral','LightCyan','LightGoldenrodYellow',
+            'LightGreen','LightGrey','LightPink','LightSalmon','LightSeaGreen','LightSkyBlue','LightSlateGray','LightSteelBlue','LightYellow','Lime','LimeGreen','Linear','Linen','Log','Logarithmic','Magenta','Mahogany','Mark','MarkFill','Maroon','Max','MediumAquamarine','MediumBlue','MediumOrchid','MediumPurple','MediumSeaGreen','MediumSlateBlue','MediumSpringGreen','MediumTurquoise','MediumVioletRed','Melon','MidPoint','MidnightBlue','Min','MintCream','MistyRose','Moccasin','Move','MoveQuiet','Mulberry','N','NE','NNE','NNW','NW','NavajoWhite','Navy','NavyBlue','NoAlign','NoCrop','NoFill','NoSide','OldLace','Olive','OliveDrab','OliveGreen','Orange','OrangeRed','Orchid','Ox','Oy','PC','PaleGoldenrod','PaleGreen','PaleTurquoise','PaleVioletRed','PapayaWhip','Peach','PeachPuff','Periwinkle','Peru','PineGreen','Pink','Plum','PowderBlue','ProcessBlue','Purple','RK2','RK3','RK3BS','RK4','RK5','RK5DP','RK5F','RawSienna','Red','RedOrange','RedViolet','Rhodamine','Right','RightJustified','RightSide','RosyBrown','RoyalBlue','RoyalPurple','RubineRed','S','SE','SSE','SSW','SW','SaddleBrown','Salmon','SandyBrown','SeaGreen','Seashell','Sepia','Sienna','Silver','SimpleHead','SkyBlue','SlateBlue','SlateGray','Snow','SpringGreen','SteelBlue','Suppress','SuppressQuiet','Tan','TeXHead','Teal','TealBlue','Thistle','Ticksize','Tomato',
+            'Turquoise','UnFill','Up','VERSION','Value','Vertical','Violet','VioletRed','W','WNW','WSW','Wheat','White','WhiteSmoke','WildStrawberry','XYAlign','YAlign','Yellow','YellowGreen','YellowOrange','addpenarc','addpenline','align','allowstepping','angularsystem','animationdelay','appendsuffix','arcarrowangle','arcarrowfactor','arrow2sizelimit','arrowangle','arrowbarb','arrowdir','arrowfactor','arrowhookfactor','arrowlength','arrowsizelimit','arrowtexfactor','authorpen','axis','axiscoverage','axislabelfactor','background','backgroundcolor','backgroundpen','barfactor','barmarksizefactor','basealign','baselinetemplate','beveljoin','bigvertexpen','bigvertexsize','black','blue','bm','bottom','bp','brown','bullet','byfoci','byvertices','camerafactor','chartreuse','circlemarkradiusfactor','circlenodesnumberfactor','circleprecision','circlescale','cm','codefile','codepen','codeskip','colorPen','coloredNodes','coloredSegments',
+            'conditionlength','conicnodesfactor','count','cputimeformat','crossmarksizefactor','currentcoordsys','currentlight','currentpatterns','currentpen','currentpicture','currentposition','currentprojection','curvilinearsystem','cuttings','cyan','darkblue','darkbrown','darkcyan','darkgray','darkgreen','darkgrey','darkmagenta','darkolive','darkred','dashdotted','dashed','datepen','dateskip','debuggerlines','debugging','deepblue','deepcyan','deepgray','deepgreen','deepgrey','deepmagenta','deepred','default','defaultControl','defaultS','defaultbackpen','defaultcoordsys','defaultexcursion','defaultfilename','defaultformat','defaultmassformat','defaultpen','diagnostics','differentlengths','dot','dotfactor','dotframe','dotted','doublelinepen','doublelinespacing','down','duplicateFuzz','edge','ellipsenodesnumberfactor','eps','epsgeo','epsilon','evenodd','expansionfactor','extendcap','exterior','fermionpen','figureborder','figuremattpen','file3','firstnode','firststep','foregroundcolor','fuchsia','fuzz','gapfactor','ghostpen','gluonamplitude','gluonpen','gluonratio','gray','green','grey','hatchepsilon','havepagenumber','heavyblue','heavycyan','heavygray','heavygreen','heavygrey','heavymagenta','heavyred','hline','hwratio','hyperbola','hyperbolanodesnumberfactor','identity4','ignore','inXasyMode','inch','inches','includegraphicscommand','inf','infinity','institutionpen','intMax','intMin','interior','invert','invisible','itempen','itemskip','itemstep','labelmargin','landscape','lastnode','left','legendhskip','legendlinelength',
+            'legendmargin','legendmarkersize','legendmaxrelativewidth','legendvskip','lightblue','lightcyan','lightgray','lightgreen','lightgrey','lightmagenta','lightolive','lightred','lightyellow','line','linemargin','lm_infmsg','lm_shortmsg','longdashdotted','longdashed','magenta','magneticRadius','mantissaBits','markangleradius','markangleradiusfactor','markanglespace','markanglespacefactor','mediumblue','mediumcyan','mediumgray','mediumgreen','mediumgrey','mediummagenta','mediumred','mediumyellow','middle','minDistDefault','minblockheight','minblockwidth','mincirclediameter','minipagemargin','minipagewidth','minvertexangle','miterjoin','mm','momarrowfactor','momarrowlength','momarrowmargin','momarrowoffset','momarrowpen','monoPen','morepoints','nCircle','newbulletcolor','ngraph','nil','nmesh','nobasealign','nodeMarginDefault','nodesystem','nomarker','nopoint','noprimary','nullpath','nullpen','numarray','ocgindex','oldbulletcolor','olive','orange','origin','overpaint','page','pageheight','pagemargin','pagenumberalign','pagenumberpen','pagenumberposition','pagewidth','paleblue','palecyan','palegray','palegreen','palegrey',
+            'palemagenta','palered','paleyellow','parabolanodesnumberfactor','perpfactor','phi','photonamplitude','photonpen','photonratio','pi','pink','plain','plain_bounds','plain_scaling','plus','preamblenodes','pt','purple','r3','r4a','r4b','randMax','realDigits','realEpsilon','realMax','realMin','red','relativesystem','reverse','right','roundcap','roundjoin','royalblue','salmon','saveFunctions','scalarpen','sequencereal','settings','shipped','signedtrailingzero','solid','springgreen','sqrtEpsilon','squarecap','squarepen','startposition','stdin','stdout','stepfactor','stepfraction','steppagenumberpen','stepping','stickframe','stickmarksizefactor','stickmarkspacefactor','swap','textpen','ticksize','tildeframe','tildemarksizefactor','tinv','titlealign','titlepagepen','titlepageposition','titlepen','titleskip','top','trailingzero','treeLevelStep','treeMinNodeWidth','treeNodeStep','trembleAngle','trembleFrequency','trembleRandom','undefined','unitcircle','unitsquare','up','urlpen','urlskip','version','vertexpen','vertexsize','viewportmargin','viewportsize','vline','white','wye','xformStack','yellow','ylabelwidth','zerotickfuzz','zerowinding'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '{', '}', '[', ']'
+            ),
+        1 => array('<', '>','='),
+        2 => array('+', '-', '*', '/', '%'),
+        3 => array('!', '^', '&', '|'),
+        4 => array('?', ':', ';'),
+        5 => array('..')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000;',
+            4 => 'color: #009900; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            'MULTI' => 'color: #ff0000; 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: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #007788;',
+            2 => 'color: #007788;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000080;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040;',
+            4 => 'color: #008080;',
+            5 => 'color: #009080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(? "(?![a-zA-Z0-9_\|%\\-])"
+            )
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/autoconf.php b/sources/inc/geshi/autoconf.php
new file mode 100644
index 0000000..7a0f1ee
--- /dev/null
+++ b/sources/inc/geshi/autoconf.php
@@ -0,0 +1,512 @@
+ 'Autoconf',
+    'COMMENT_SINGLE' => array(2 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Single Line comment started by dnl
+        3 => '/(? GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => 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(
+            'AC_ACT_IFELSE',
+            'AC_AIX',
+            'AC_ALLOCA',
+            'AC_ARG_ARRAY',
+            'AC_ARG_ENABLE',
+            'AC_ARG_PROGRAM',
+            'AC_ARG_VAR',
+            'AC_ARG_WITH',
+            'AC_AUTOCONF_VERSION',
+            'AC_BEFORE',
+            'AC_C_BACKSLASH_A',
+            'AC_C_BIGENDIAN',
+            'AC_C_CHAR_UNSIGNED',
+            'AC_C_CONST',
+            'AC_C_CROSS',
+            'AC_C_FLEXIBLE_ARRAY_MEMBER',
+            'AC_C_INLINE',
+            'AC_C_LONG_DOUBLE',
+            'AC_C_PROTOTYPES',
+            'AC_C_RESTRICT',
+            'AC_C_STRINGIZE',
+            'AC_C_TYPEOF',
+            'AC_C_VARARRAYS',
+            'AC_C_VOLATILE',
+            'AC_CACHE_CHECK',
+            'AC_CACHE_LOAD',
+            'AC_CACHE_SAVE',
+            'AC_CACHE_VAL',
+            'AC_CANONICAL_BUILD',
+            'AC_CANONICAL_HOST',
+            'AC_CANONICAL_SYSTEM',
+            'AC_CANONICAL_TARGET',
+            'AC_CHAR_UNSIGNED',
+            'AC_CHECK_ALIGNOF',
+            'AC_CHECK_DECL',
+            'AC_CHECK_DECLS',
+            'AC_CHECK_DECLS_ONCE',
+            'AC_CHECK_FILE',
+            'AC_CHECK_FILES',
+            'AC_CHECK_FUNC',
+            'AC_CHECK_FUNCS',
+            'AC_CHECK_FUNCS_ONCE',
+            'AC_CHECK_HEADER',
+            'AC_CHECK_HEADERS',
+            'AC_CHECK_HEADERS_ONCE',
+            'AC_CHECK_LIB',
+            'AC_CHECK_MEMBER',
+            'AC_CHECK_MEMBERS',
+            'AC_CHECK_PROG',
+            'AC_CHECK_PROGS',
+            'AC_CHECK_SIZEOF',
+            'AC_CHECK_TARGET_TOOL',
+            'AC_CHECK_TARGET_TOOLS',
+            'AC_CHECK_TOOL',
+            'AC_CHECK_TOOLS',
+            'AC_CHECK_TYPE',
+            'AC_CHECK_TYPES',
+            'AC_CHECKING',
+            'AC_COMPILE_CHECK',
+            'AC_COMPILE_IFELSE',
+            'AC_COMPUTE_INT',
+            'AC_CONFIG_AUX_DIR',
+            'AC_CONFIG_COMMANDS',
+            'AC_CONFIG_COMMANDS_POST',
+            'AC_CONFIG_COMMANDS_PRE',
+            'AC_CONFIG_FILES',
+            'AC_CONFIG_HEADERS',
+            'AC_CONFIG_ITEMS',
+            'AC_CONFIG_LIBOBJ_DIR',
+            'AC_CONFIG_LINKS',
+            'AC_CONFIG_MACRO_DIR',
+            'AC_CONFIG_SRCDIR',
+            'AC_CONFIG_SUBDIRS',
+            'AC_CONFIG_TESTDIR',
+            'AC_CONST',
+            'AC_COPYRIGHT',
+            'AC_CROSS_CHECK',
+            'AC_CYGWIN',
+            'AC_DATAROOTDIR_CHECKED',
+            'AC_DECL_SYS_SIGLIST',
+            'AC_DECL_YYTEXT',
+            'AC_DEFINE',
+            'AC_DEFINE_UNQUOTED',
+            'AC_DEFUN',
+            'AC_DEFUN_ONCE',
+            'AC_DIAGNOSE',
+            'AC_DIR_HEADER',
+            'AC_DISABLE_OPTION_CHECKING',
+            'AC_DYNIX_SEQ',
+            'AC_EGREP_CPP',
+            'AC_EGREP_HEADER',
+            'AC_EMXOS2',
+            'AC_ENABLE',
+            'AC_ERLANG_CHECK_LIB',
+            'AC_ERLANG_NEED_ERL',
+            'AC_ERLANG_NEED_ERLC',
+            'AC_ERLANG_PATH_ERL',
+            'AC_ERLANG_PATH_ERLC',
+            'AC_ERLANG_SUBST_ERTS_VER',
+            'AC_ERLANG_SUBST_INSTALL_LIB_DIR',
+            'AC_ERLANG_SUBST_INSTALL_LIB_SUBDIR',
+            'AC_ERLANG_SUBST_LIB_DIR',
+            'AC_ERLANG_SUBST_ROOT_DIR',
+            'AC_ERROR',
+            'AC_EXEEXT',
+            'AC_F77_DUMMY_MAIN',
+            'AC_F77_FUNC',
+            'AC_F77_LIBRARY_LDFLAGS',
+            'AC_F77_MAIN',
+            'AC_F77_WRAPPERS',
+            'AC_FATAL',
+            'AC_FC_FREEFORM',
+            'AC_FC_FUNC',
+            'AC_FC_LIBRARY_LDFLAGS',
+            'AC_FC_MAIN',
+            'AC_FC_SRCEXT',
+            'AC_FC_WRAPPERS',
+            'AC_FIND_X',
+            'AC_FIND_XTRA',
+            'AC_FOREACH',
+            'AC_FUNC_ALLOCA',
+            'AC_FUNC_CHECK',
+            'AC_FUNC_CHOWN',
+            'AC_FUNC_CLOSEDIR_VOID',
+            'AC_FUNC_ERROR_AT_LINE',
+            'AC_FUNC_FNMATCH',
+            'AC_FUNC_FNMATCH_GNU',
+            'AC_FUNC_FORK',
+            'AC_FUNC_FSEEKO',
+            'AC_FUNC_GETGROUPS',
+            'AC_FUNC_GETLOADAVG',
+            'AC_FUNC_GETMNTENT',
+            'AC_FUNC_GETPGRP',
+            'AC_FUNC_LSTAT',
+            'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK',
+            'AC_FUNC_MALLOC',
+            'AC_FUNC_MBRTOWC',
+            'AC_FUNC_MEMCMP',
+            'AC_FUNC_MKTIME',
+            'AC_FUNC_MMAP',
+            'AC_FUNC_OBSTACK',
+            'AC_FUNC_REALLOC',
+            'AC_FUNC_SELECT_ARGTYPES',
+            'AC_FUNC_SETPGRP',
+            'AC_FUNC_SETVBUF_REVERSED',
+            'AC_FUNC_STAT',
+            'AC_FUNC_STRCOLL',
+            'AC_FUNC_STRERROR_R',
+            'AC_FUNC_STRFTIME',
+            'AC_FUNC_STRNLEN',
+            'AC_FUNC_STRTOD',
+            'AC_FUNC_STRTOLD',
+            'AC_FUNC_UTIME_NULL',
+            'AC_FUNC_VPRINTF',
+            'AC_FUNC_WAIT3',
+            'AC_GCC_TRADITIONAL',
+            'AC_GETGROUPS_T',
+            'AC_GETLOADAVG',
+            'AC_GNU_SOURCE',
+            'AC_HAVE_FUNCS',
+            'AC_HAVE_HEADERS',
+            'AC_HAVE_LIBRARY',
+            'AC_HAVE_POUNDBANG',
+            'AC_HEADER_ASSERT',
+            'AC_HEADER_CHECK',
+            'AC_HEADER_DIRENT',
+            'AC_HEADER_EGREP',
+            'AC_HEADER_MAJOR',
+            'AC_HEADER_RESOLV',
+            'AC_HEADER_STAT',
+            'AC_HEADER_STDBOOL',
+            'AC_HEADER_STDC',
+            'AC_HEADER_SYS_WAIT',
+            'AC_HEADER_TIME',
+            'AC_HEADER_TIOCGWINSZ',
+            'AC_HELP_STRING',
+            'AC_INCLUDES_DEFAULT',
+            'AC_INIT',
+            'AC_INLINE',
+            'AC_INT_16_BITS',
+            'AC_IRIX_SUN',
+            'AC_ISC_POSIX',
+            'AC_LANG_ASSERT',
+            'AC_LANG_C',
+            'AC_LANG_CALL',
+            'AC_LANG_CONFTEST',
+            'AC_LANG_CPLUSPLUS',
+            'AC_LANG_FORTRAN77',
+            'AC_LANG_FUNC_LINK_TRY',
+            'AC_LANG_POP',
+            'AC_LANG_PROGRAM',
+            'AC_LANG_PUSH',
+            'AC_LANG_RESTORE',
+            'AC_LANG_SAVE',
+            'AC_LANG_SOURCE',
+            'AC_LANG_WERROR',
+            'AC_LIBOBJ',
+            'AC_LIBSOURCE',
+            'AC_LIBSOURCES',
+            'AC_LINK_FILES',
+            'AC_LINK_IFELSE',
+            'AC_LN_S',
+            'AC_LONG_64_BITS',
+            'AC_LONG_DOUBLE',
+            'AC_LONG_FILE_NAMES',
+            'AC_MAJOR_HEADER',
+            'AC_MEMORY_H',
+            'AC_MINGW32',
+            'AC_MINIX',
+            'AC_MINUS_C_MINUS_O',
+            'AC_MMAP',
+            'AC_MODE_T',
+            'AC_MSG_CHECKING',
+            'AC_MSG_ERROR',
+            'AC_MSG_FAILURE',
+            'AC_MSG_NOTICE',
+            'AC_MSG_RESULT',
+            'AC_MSG_WARN',
+            'AC_OBJEXT',
+            'AC_OBSOLETE',
+            'AC_OFF_T',
+            'AC_OPENMP',
+            'AC_OUTPUT',
+            'AC_OUTPUT_COMMANDS',
+            'AC_PACKAGE_BUGREPORT',
+            'AC_PACKAGE_NAME',
+            'AC_PACKAGE_STRING',
+            'AC_PACKAGE_TARNAME',
+            'AC_PACKAGE_URL',
+            'AC_PACKAGE_VERSION',
+            'AC_PATH_PROG',
+            'AC_PATH_PROGS',
+            'AC_PATH_PROGS_FEATURE_CHECK',
+            'AC_PATH_TARGET_TOOL',
+            'AC_PATH_TOOL',
+            'AC_PATH_X',
+            'AC_PATH_XTRA',
+            'AC_PID_T',
+            'AC_PREFIX',
+            'AC_PREFIX_DEFAULT',
+            'AC_PREFIX_PROGRAM',
+            'AC_PREPROC_IFELSE',
+            'AC_PREREQ',
+            'AC_PRESERVE_HELP_ORDER',
+            'AC_PROG_AWK',
+            'AC_PROG_CC',
+            'AC_PROG_CC_C89',
+            'AC_PROG_CC_C99',
+            'AC_PROG_CC_C_O',
+            'AC_PROG_CC_STDC',
+            'AC_PROG_CPP',
+            'AC_PROG_CPP_WERROR',
+            'AC_PROG_CXX',
+            'AC_PROG_CXX_C_O',
+            'AC_PROG_CXXCPP',
+            'AC_PROG_EGREP',
+            'AC_PROG_F77',
+            'AC_PROG_F77_C_O',
+            'AC_PROG_FC',
+            'AC_PROG_FC_C_O',
+            'AC_PROG_FGREP',
+            'AC_PROG_GCC_TRADITIONAL',
+            'AC_PROG_GREP',
+            'AC_PROG_INSTALL',
+            'AC_PROG_LEX',
+            'AC_PROG_LN_S',
+            'AC_PROG_MAKE_SET',
+            'AC_PROG_MKDIR_P',
+            'AC_PROG_OBJC',
+            'AC_PROG_OBJCPP',
+            'AC_PROG_OBJCXX',
+            'AC_PROG_OBJCXXCPP',
+            'AC_PROG_RANLIB',
+            'AC_PROG_SED',
+            'AC_PROG_YACC',
+            'AC_PROGRAM_CHECK',
+            'AC_PROGRAM_EGREP',
+            'AC_PROGRAM_PATH',
+            'AC_PROGRAMS_CHECK',
+            'AC_PROGRAMS_PATH',
+            'AC_REMOTE_TAPE',
+            'AC_REPLACE_FNMATCH',
+            'AC_REPLACE_FUNCS',
+            'AC_REQUIRE',
+            'AC_REQUIRE_AUX_FILE',
+            'AC_REQUIRE_CPP',
+            'AC_RESTARTABLE_SYSCALLS',
+            'AC_RETSIGTYPE',
+            'AC_REVISION',
+            'AC_RSH',
+            'AC_RUN_IFELSE',
+            'AC_SCO_INTL',
+            'AC_SEARCH_LIBS',
+            'AC_SET_MAKE',
+            'AC_SETVBUF_REVERSED',
+            'AC_SIZE_T',
+            'AC_SIZEOF_TYPE',
+            'AC_ST_BLKSIZE',
+            'AC_ST_BLOCKS',
+            'AC_ST_RDEV',
+            'AC_STAT_MACROS_BROKEN',
+            'AC_STDC_HEADERS',
+            'AC_STRCOLL',
+            'AC_STRUCT_DIRENT_D_INO',
+            'AC_STRUCT_DIRENT_D_TYPE',
+            'AC_STRUCT_ST_BLKSIZE',
+            'AC_STRUCT_ST_BLOCKS',
+            'AC_STRUCT_ST_RDEV',
+            'AC_STRUCT_TIMEZONE',
+            'AC_STRUCT_TM',
+            'AC_SUBST',
+            'AC_SUBST_FILE',
+            'AC_SYS_INTERPRETER',
+            'AC_SYS_LARGEFILE',
+            'AC_SYS_LONG_FILE_NAMES',
+            'AC_SYS_POSIX_TERMIOS',
+            'AC_SYS_RESTARTABLE_SYSCALLS',
+            'AC_SYS_SIGLIST_DECLARED',
+            'AC_TEST_CPP',
+            'AC_TEST_PROGRAM',
+            'AC_TIME_WITH_SYS_TIME',
+            'AC_TIMEZONE',
+            'AC_TRY_ACT',
+            'AC_TRY_COMPILE',
+            'AC_TRY_CPP',
+            'AC_TRY_LINK',
+            'AC_TRY_LINK_FUNC',
+            'AC_TRY_RUN',
+            'AC_TYPE_GETGROUPS',
+            'AC_TYPE_INT16_T',
+            'AC_TYPE_INT32_T',
+            'AC_TYPE_INT64_T',
+            'AC_TYPE_INT8_T',
+            'AC_TYPE_INTMAX_T',
+            'AC_TYPE_INTPTR_T',
+            'AC_TYPE_LONG_DOUBLE',
+            'AC_TYPE_LONG_DOUBLE_WIDER',
+            'AC_TYPE_LONG_LONG_INT',
+            'AC_TYPE_MBSTATE_T',
+            'AC_TYPE_MODE_T',
+            'AC_TYPE_OFF_T',
+            'AC_TYPE_PID_T',
+            'AC_TYPE_SIGNAL',
+            'AC_TYPE_SIZE_T',
+            'AC_TYPE_SSIZE_T',
+            'AC_TYPE_UID_T',
+            'AC_TYPE_UINT16_T',
+            'AC_TYPE_UINT32_T',
+            'AC_TYPE_UINT64_T',
+            'AC_TYPE_UINT8_T',
+            'AC_TYPE_UINTMAX_T',
+            'AC_TYPE_UINTPTR_T',
+            'AC_TYPE_UNSIGNED_LONG_LONG_INT',
+            'AC_UID_T',
+            'AC_UNISTD_H',
+            'AC_USE_SYSTEM_EXTENSIONS',
+            'AC_USG',
+            'AC_UTIME_NULL',
+            'AC_VALIDATE_CACHED_SYSTEM_TUPLE',
+            'AC_VERBOSE',
+            'AC_VFORK',
+            'AC_VPRINTF',
+            'AC_WAIT3',
+            'AC_WARN',
+            'AC_WARNING',
+            'AC_WITH',
+            'AC_WORDS_BIGENDIAN',
+            'AC_XENIX_DIR',
+            'AC_YYTEXT_POINTER',
+            'AH_BOTTOM',
+            'AH_HEADER',
+            'AH_TEMPLATE',
+            'AH_TOP',
+            'AH_VERBATIM',
+            'AU_ALIAS',
+            'AU_DEFUN'),
+            ),
+    'SYMBOLS' => array('(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`'),
+    'CASE_SENSITIVE' => array(
+            GESHI_COMMENTS => false,
+                1 => true,
+                ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00ffff;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            3 => 'color: #666666;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;',
+            1 => 'color: #000099;',
+            2 => 'color: #660099;',
+            3 => 'color: #660099;',
+            4 => 'color: #660099;',
+            5 => 'color: #006699;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #996600;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000080;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040;',
+            4 => 'color: #008080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        ),
+    '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(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+            ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?  "(?![\.\-a-zA-Z0-9_%\\/])"
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/autohotkey.php b/sources/inc/geshi/autohotkey.php
new file mode 100644
index 0000000..970684d
--- /dev/null
+++ b/sources/inc/geshi/autohotkey.php
@@ -0,0 +1,373 @@
+ 'Autohotkey',
+    'COMMENT_SINGLE' => array(
+        1 => ';'
+        ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'while','if','and','or','else','return'
+            ),
+        2 => array(
+            // built in variables
+            'A_AhkPath','A_AhkVersion','A_AppData','A_AppDataCommon',
+            'A_AutoTrim','A_BatchLines','A_CaretX','A_CaretY',
+            'A_ComputerName','A_ControlDelay','A_Cursor','A_DD',
+            'A_DDD','A_DDDD','A_DefaultMouseSpeed','A_Desktop',
+            'A_DesktopCommon','A_DetectHiddenText','A_DetectHiddenWindows','A_EndChar',
+            'A_EventInfo','A_ExitReason','A_FormatFloat','A_FormatInteger',
+            'A_Gui','A_GuiEvent','A_GuiControl','A_GuiControlEvent',
+            'A_GuiHeight','A_GuiWidth','A_GuiX','A_GuiY',
+            'A_Hour','A_IconFile','A_IconHidden','A_IconNumber',
+            'A_IconTip','A_Index','A_IPAddress1','A_IPAddress2',
+            'A_IPAddress3','A_IPAddress4','A_ISAdmin','A_IsCompiled',
+            'A_IsCritical','A_IsPaused','A_IsSuspended','A_KeyDelay',
+            'A_Language','A_LastError','A_LineFile','A_LineNumber',
+            'A_LoopField','A_LoopFileAttrib','A_LoopFileDir','A_LoopFileExt',
+            'A_LoopFileFullPath','A_LoopFileLongPath','A_LoopFileName','A_LoopFileShortName',
+            'A_LoopFileShortPath','A_LoopFileSize','A_LoopFileSizeKB','A_LoopFileSizeMB',
+            'A_LoopFileTimeAccessed','A_LoopFileTimeCreated','A_LoopFileTimeModified','A_LoopReadLine',
+            'A_LoopRegKey','A_LoopRegName','A_LoopRegSubkey','A_LoopRegTimeModified',
+            'A_LoopRegType','A_MDAY','A_Min','A_MM',
+            'A_MMM','A_MMMM','A_Mon','A_MouseDelay',
+            'A_MSec','A_MyDocuments','A_Now','A_NowUTC',
+            'A_NumBatchLines','A_OSType','A_OSVersion','A_PriorHotkey',
+            'A_ProgramFiles','A_Programs','A_ProgramsCommon','A_ScreenHeight',
+            'A_ScreenWidth','A_ScriptDir','A_ScriptFullPath','A_ScriptName',
+            'A_Sec','A_Space','A_StartMenu','A_StartMenuCommon',
+            'A_Startup','A_StartupCommon','A_StringCaseSense','A_Tab',
+            'A_Temp','A_ThisFunc','A_ThisHotkey','A_ThisLabel',
+            'A_ThisMenu','A_ThisMenuItem','A_ThisMenuItemPos','A_TickCount',
+            'A_TimeIdle','A_TimeIdlePhysical','A_TimeSincePriorHotkey','A_TimeSinceThisHotkey',
+            'A_TitleMatchMode','A_TitleMatchModeSpeed','A_UserName','A_WDay',
+            'A_WinDelay','A_WinDir','A_WorkingDir','A_YDay',
+            'A_YEAR','A_YWeek','A_YYYY','Clipboard',
+            'ClipboardAll','ComSpec','ErrorLevel','ProgramFiles',
+            ),
+        3 => array(
+            'AutoTrim',
+            'BlockInput','Break','Click',
+            'ClipWait','Continue','Control',
+            'ControlClick','ControlFocus','ControlGet',
+            'ControlGetFocus','ControlGetPos','ControlGetText',
+            'ControlMove','ControlSend','ControlSendRaw',
+            'ControlSetText','CoordMode','Critical',
+            'DetectHiddenText','DetectHiddenWindows','DllCall','Drive',
+            'DriveGet','DriveSpaceFree',
+            'Else','EnvAdd','EnvDiv',
+            'EnvGet','EnvMult','EnvSet',
+            'EnvSub','EnvUpdate','Exit',
+            'ExitApp','FileAppend','FileCopy',
+            'FileCopyDir','FileCreateDir','FileCreateShortcut',
+            'FileDelete','FileGetAttrib','FileGetShortcut',
+            'FileGetSize','FileGetTime','FileGetVersion',
+            'FileInstall','FileMove','FileMoveDir',
+            'FileRead','FileReadLine','FileRecycle',
+            'FileRecycleEmpty','FileRemoveDir','FileSelectFile',
+            'FileSelectFolder','FileSetAttrib','FileSetTime',
+            'FormatTime','Gosub',
+            'Goto','GroupActivate','GroupAdd',
+            'GroupClose','GroupDeactivate','Gui',
+            'GuiControl','GuiControlGet','Hotkey',
+            'IfExist','IfGreater','IfGreaterOrEqual',
+            'IfInString','IfLess','IfLessOrEqual',
+            'IfMsgBox','IfNotEqual','IfNotExist',
+            'IfNotInString','IfWinActive','IfWinExist',
+            'IfWinNotActive','IfWinNotExist','ImageSearch',
+            'IniDelete','IniRead','IniWrite',
+            'Input','InputBox','KeyHistory',
+            'KeyWait','ListHotkeys','ListLines',
+            'ListVars','Loop',
+            'Menu','MouseClick','MouseClickDrag',
+            'MouseGetPos','MouseMove','MsgBox',
+            'OnMessage','OnExit','OutputDebug',
+            'PixelGetColor','PixelSearch','PostMessage',
+            'Process','Progress','Random',
+            'RegExMatch','RegExReplace','RegisterCallback',
+            'RegDelete','RegRead','RegWrite',
+            'Reload','Repeat','Return',
+            'Run','RunAs','RunWait',
+            'Send','SendEvent','SendInput',
+            'SendMessage','SendMode','SendPlay',
+            'SendRaw','SetBatchLines','SetCapslockState',
+            'SetControlDelay','SetDefaultMouseSpeed','SetEnv',
+            'SetFormat','SetKeyDelay','SetMouseDelay',
+            'SetNumlockState','SetScrollLockState','SetStoreCapslockMode',
+            'SetTimer','SetTitleMatchMode','SetWinDelay',
+            'SetWorkingDir','Shutdown','Sleep',
+            'Sort','SoundBeep','SoundGet',
+            'SoundGetWaveVolume','SoundPlay','SoundSet',
+            'SoundSetWaveVolume','SplashImage','SplashTextOff',
+            'SplashTextOn','SplitPath','StatusBarGetText',
+            'StatusBarWait','StringCaseSense','StringGetPos',
+            'StringLeft','StringLen','StringLower',
+            'StringMid','StringReplace','StringRight',
+            'StringSplit','StringTrimLeft','StringTrimRight',
+            'StringUpper','Suspend','SysGet',
+            'Thread','ToolTip','Transform',
+            'TrayTip','URLDownloadToFile','While',
+            'VarSetCapacity',
+            'WinActivate','WinActivateBottom','WinClose',
+            'WinGet','WinGetActiveStats','WinGetActiveTitle',
+            'WinGetClass','WinGetPos','WinGetText',
+            'WinGetTitle','WinHide','WinKill',
+            'WinMaximize','WinMenuSelectItem','WinMinimize',
+            'WinMinimizeAll','WinMinimizeAllUndo','WinMove',
+            'WinRestore','WinSet','WinSetTitle',
+            'WinShow','WinWait','WinWaitActive',
+            'WinWaitClose','WinWaitNotActive'
+            ),
+        4 => array(
+            'Abs','ACos','Asc','ASin',
+            'ATan','Ceil','Chr','Cos',
+            'Exp','FileExist','Floor',
+            'GetKeyState','IL_Add','IL_Create','IL_Destroy',
+            'InStr','IsFunc','IsLabel','Ln',
+            'Log','LV_Add','LV_Delete','LV_DeleteCol',
+            'LV_GetCount','LV_GetNext','LV_GetText','LV_Insert',
+            'LV_InsertCol','LV_Modify','LV_ModifyCol','LV_SetImageList',
+            'Mod','NumGet','NumPut',
+            'Round',
+            'SB_SetIcon','SB_SetParts','SB_SetText','Sin',
+            'Sqrt','StrLen','SubStr','Tan',
+            'TV_Add','TV_Delete','TV_GetChild','TV_GetCount',
+            'TV_GetNext','TV_Get','TV_GetParent','TV_GetPrev',
+            'TV_GetSelection','TV_GetText','TV_Modify',
+            'WinActive','WinExist'
+            ),
+        5 => array(
+            // #Directives
+            'AllowSameLineComments','ClipboardTimeout','CommentFlag',
+            'ErrorStdOut','EscapeChar','HotkeyInterval',
+            'HotkeyModifierTimeout','Hotstring','IfWinActive',
+            'IfWinExist','IfWinNotActive','IfWinNotExist',
+            'Include','IncludeAgain','InstallKeybdHook',
+            'InstallMouseHook','KeyHistory','LTrim',
+            'MaxHotkeysPerInterval','MaxMem','MaxThreads',
+            'MaxThreadsBuffer','MaxThreadsPerHotkey','NoEnv',
+            'NoTrayIcon','Persistent','SingleInstance',
+            'UseHook','WinActivateForce'
+            ),
+        6 => array(
+            'Shift','LShift','RShift',
+            'Alt','LAlt','RAlt',
+            'LControl','RControl',
+            'Ctrl','LCtrl','RCtrl',
+            'LWin','RWin','AppsKey',
+            'AltDown','AltUp','ShiftDown',
+            'ShiftUp','CtrlDown','CtrlUp',
+            'LWinDown','LWinUp','RWinDown',
+            'RWinUp','LButton','RButton',
+            'MButton','WheelUp','WheelDown',
+            'WheelLeft','WheelRight','XButton1',
+            'XButton2','Joy1','Joy2',
+            'Joy3','Joy4','Joy5',
+            'Joy6','Joy7','Joy8',
+            'Joy9','Joy10','Joy11',
+            'Joy12','Joy13','Joy14',
+            'Joy15','Joy16','Joy17',
+            'Joy18','Joy19','Joy20',
+            'Joy21','Joy22','Joy23',
+            'Joy24','Joy25','Joy26',
+            'Joy27','Joy28','Joy29',
+            'Joy30','Joy31','Joy32',
+            'JoyX','JoyY','JoyZ',
+            'JoyR','JoyU','JoyV',
+            'JoyPOV','JoyName','JoyButtons',
+            'JoyAxes','JoyInfo','Space',
+            'Tab','Enter',
+            'Escape','Esc','BackSpace',
+            'BS','Delete','Del',
+            'Insert','Ins','PGUP',
+            'PGDN','Home','End',
+            'Up','Down','Left',
+            'Right','PrintScreen','CtrlBreak',
+            'Pause','ScrollLock','CapsLock',
+            'NumLock','Numpad0','Numpad1',
+            'Numpad2','Numpad3','Numpad4',
+            'Numpad5','Numpad6','Numpad7',
+            'Numpad8','Numpad9','NumpadMult',
+            'NumpadAdd','NumpadSub','NumpadDiv',
+            'NumpadDot','NumpadDel','NumpadIns',
+            'NumpadClear','NumpadUp','NumpadDown',
+            'NumpadLeft','NumpadRight','NumpadHome',
+            'NumpadEnd','NumpadPgup','NumpadPgdn',
+            'NumpadEnter','F1','F2',
+            'F3','F4','F5',
+            'F6','F7','F8',
+            'F9','F10','F11',
+            'F12','F13','F14',
+            'F15','F16','F17',
+            'F18','F19','F20',
+            'F21','F22','F23',
+            'F24','Browser_Back','Browser_Forward',
+            'Browser_Refresh','Browser_Stop','Browser_Search',
+            'Browser_Favorites','Browser_Home','Volume_Mute',
+            'Volume_Down','Volume_Up','Media_Next',
+            'Media_Prev','Media_Stop','Media_Play_Pause',
+            'Launch_Mail','Launch_Media','Launch_App1',
+            'Launch_App2'
+            ),
+        7 => array(
+            // Gui commands
+            'Add',
+            'Show', 'Submit', 'Cancel', 'Destroy',
+            'Font', 'Color', 'Margin', 'Flash', 'Default',
+            'GuiEscape','GuiClose','GuiSize','GuiContextMenu','GuiDropFilesTabStop',
+            ),
+        8 => array(
+            // Gui Controls
+            'Button',
+            'Checkbox','Radio','DropDownList','DDL',
+            'ComboBox','ListBox','ListView',
+            'Text', 'Edit', 'UpDown', 'Picture',
+            'TreeView','DateTime', 'MonthCal',
+            'Slider'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')','[',']',
+        '+','-','*','/','&','^',
+        '=','+=','-=','*=','/=','&=',
+        '==','<','<=','>','>=',':=',
+        ',','.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #AAAAFF; font-weight: bold;',       // reserved #blue
+            2 => 'color: #88FF88;',                         // BIV yellow
+            3 => 'color: #FF00FF; font-style: italic;',       // commands purple
+            4 => 'color: #888844; font-weight: bold;',       // functions #0080FF
+            5 => 'color: #000000; font-style: italic;',    // directives #black
+            6 => 'color: #FF0000; font-style: italic;',      // hotkeys #red
+            7 => 'color: #000000; font-style: italic;',    // gui commands #black
+            8 => 'color: #000000; font-style: italic;'      // gui controls
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'font-style: italic; color: #669900;',
+            1 => 'font-style: italic; color: #009933;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00FF00; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'font-weight: bold; color: #008080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF; font-style: italic; font-weight: italic;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: italic;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight: italic; color: #A00A0;',
+            1 => 'color: #CC0000; font-style: italic;',
+            2 => 'color: #DD0000; font-style: italic;',
+            3 => 'color: #88FF88;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '_'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '%[a-zA-Z_][a-zA-Z0-9_]*%',
+        //hotstrings
+        1 => '::[\w\d]+::',
+        //labels
+        2 => '\w[\w\d]+:\s',
+        //Built-in Variables
+        3 => '\bA_\w+\b(?![^<]*>)'
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://www.autohotkey.com/docs/Variables.htm#{FNAME}',
+        3 => 'http://www.autohotkey.com/docs/commands/{FNAME}.htm',
+        4 => 'http://www.autohotkey.com/docs/Functions.htm#BuiltIn',
+        5 => 'http://www.autohotkey.com/docs/commands/_{FNAME}.htm',
+        6 => '',
+        7 => 'http://www.autohotkey.com/docs/commands/Gui.htm#{FNAME}',
+        8 => 'http://www.autohotkey.com/docs/commands/GuiControls.htm#{FNAME}'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            5 => array(
+                'DISALLOWED_BEFORE' => '(?
\ No newline at end of file
diff --git a/sources/inc/geshi/autoit.php b/sources/inc/geshi/autoit.php
new file mode 100644
index 0000000..ab401b4
--- /dev/null
+++ b/sources/inc/geshi/autoit.php
@@ -0,0 +1,1175 @@
+ 'AutoIt',
+    'COMMENT_SINGLE' => array(';'),
+    'COMMENT_MULTI' => array(
+        '#comments-start' => '#comments-end',
+        '#cs' => '#ce'),
+    'COMMENT_REGEXP' => array(
+        0 => '/(? '/(?<=include)\s+<.*?>/'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    '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'
+            ),
+        2 => array(
+            '@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','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','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(
+            'ce','comments-end','comments-start','cs','include','include-once',
+            'NoTrayIcon','RequireAdmin'
+            ),
+        6 => array(
+            '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,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #800000; font-weight: bold;',
+            3 => 'color: #000080; font-style: italic; font-weight: bold;',
+            4 => 'color: #0080FF; font-style: italic; font-weight: bold;',
+            5 => 'color: #F000FF; font-style: italic;',
+            6 => 'color: #A00FF0; font-style: italic;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'font-style: italic; color: #669900;',
+            0 => 'font-style: italic; color: #009933;',
+            1 => 'font-style: italic; color: #9977BB;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'font-weight: bold; color: #9977BB;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #AC00A9; font-style: italic; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF; font-style: italic; font-weight: bold;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF0000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight: bold; color: #AA0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.autoitscript.com/autoit3/docs/keywords.htm',
+        2 => 'http://www.autoitscript.com/autoit3/docs/macros.htm',
+        3 => 'http://www.autoitscript.com/autoit3/docs/functions/{FNAME}.htm',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '[\\$%@]+[a-zA-Z_][a-zA-Z0-9_]*'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_BEFORE' => '(? array(
+                'DISALLOWED_BEFORE' => '(? array(
+                'DISALLOWED_BEFORE' => '(?
\ No newline at end of file
diff --git a/sources/inc/geshi/avisynth.php b/sources/inc/geshi/avisynth.php
new file mode 100644
index 0000000..88f6628
--- /dev/null
+++ b/sources/inc/geshi/avisynth.php
@@ -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 --git a/sources/inc/geshi/awk.php b/sources/inc/geshi/awk.php
new file mode 100644
index 0000000..1ec239b
--- /dev/null
+++ b/sources/inc/geshi/awk.php
@@ -0,0 +1,158 @@
+ 'awk',
+    'COMMENT_SINGLE' => array(
+        1 => '#'
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array (
+        1 => array(
+            'for', 'in', 'if', 'else', 'while', 'do', 'continue', 'break'
+            ),
+        2 => array(
+            'BEGIN', 'END'
+            ),
+        3 => array(
+            'ARGC', 'ARGV', 'CONVFMT', 'ENVIRON',
+            'FILENAME', 'FNR', 'FS', 'NF', 'NR', 'OFMT',
+            'OFS','ORS','RLENGTH','RS','RSTART','SUBSEP'
+            ),
+        4 => array(
+            'gsub','index','length','match','split',
+            'sprintf','sub','substr','tolower','toupper',
+            'atan2','cos','exp','int','log','rand',
+            'sin','sqrt','srand'
+            ),
+        5 => array(
+            'print','printf','getline','close','fflush','system'
+            ),
+        6 => array(
+            'function', 'return'
+            )
+        ),
+    'SYMBOLS' => array (
+        0 => array(
+            '(',')','[',']','{','}'
+            ),
+        1 => array(
+            '!','||','&&'
+            ),
+        2 => array(
+            '<','>','<=','>=','==','!='
+            ),
+        3 => array(
+            '+','-','*','/','%','^','++','--'
+            ),
+        4 => array(
+            '~','!~'
+            ),
+        5 => array(
+            '?',':'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #C20CB9; font-weight: bold;',
+            3 => 'color: #4107D5; font-weight: bold;',
+            4 => 'color: #07D589; font-weight: bold;',
+            5 => 'color: #0BD507; font-weight: bold;',
+            6 => 'color: #078CD5; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#808080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:black;',
+            1 => 'color:black;',
+            2 => 'color:black;',
+            3 => 'color:black;',
+            4 => 'color:#C4C364;',
+            5 => 'color:black;font-weight:bold;'),
+        'SCRIPT' => array(),
+        'REGEXPS' => array(
+            0 => 'color:#000088;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'METHODS' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array (),
+    'REGEXPS' => array(
+        0 => "\\$[a-zA-Z0-9_]+"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array (),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff --git a/sources/inc/geshi/bascomavr.php b/sources/inc/geshi/bascomavr.php
new file mode 100644
index 0000000..864f74e
--- /dev/null
+++ b/sources/inc/geshi/bascomavr.php
@@ -0,0 +1,185 @@
+ 'BASCOM AVR',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Navy Blue Bold Keywords
+            '1WRESET' , '1WREAD' , '1WWRITE' , '1WSEARCHFIRST' , '1WSEARCHNEXT' ,'1WVERIFY' , '1WIRECOUNT',
+            'CONFIG' , 'ACI' , 'ADC' , 'BCCARD' , 'CLOCK' , 'COM1' ,
+            'COM2' , 'PS2EMU' , 'ATEMU' , 'I2CSLAVE' ,
+            'INPUT', 'OUTPUT', 'GRAPHLCD' , 'KEYBOARD' , 'TIMER0' , 'TIMER1' ,
+            'LCDBUS' , 'LCDMODE' , '1WIRE' , 'LCD' , 'SERIALOUT' ,
+            'SERIALIN' , 'SPI' , 'LCDPIN' , 'SDA' , 'SCL' ,
+            'WATCHDOG' , 'PORT' , 'COUNTER0', 'COUNTER1' , 'TCPIP' , 'TWISLAVE' ,
+            'X10' , 'XRAM' , 'USB',
+            'BCD' , 'GRAY2BIN' , 'BIN2GRAY' , 'BIN' , 'MAKEBCD' , 'MAKEDEC' , 'MAKEINT' , 'FORMAT' , 'FUSING' , 'BINVAL' ,
+            'CRC8' , 'CRC16' , 'CRC16UNI' , 'CRC32' , 'HIGH' , 'HIGHW' , 'LOW',
+            'DATE' , 'TIME'  , 'DATE$' , 'TIME$' , 'DAYOFWEEK' , 'DAYOFYEAR' , 'SECOFDAY' , 'SECELAPSED' , 'SYSDAY' , 'SYSSEC' , 'SYSSECELAPSED',
+            'WAIT'  , 'WAITMS' , 'WAITUS' , 'DELAY',
+            'BSAVE' , 'BLOAD' , 'GET' , 'VER' , 'DISKFREE' , 'DIR' , 'DriveReset' , 'DriveInit' , 'LINE' , 'INITFILESYSTEM' ,
+            'EOF' , 'WRITE' , 'FLUSH' , 'FREEFILE' , 'FILEATTR' , 'FILEDATE' , 'FILETIME' , 'FILEDATETIME' , 'FILELEN' , 'SEEK' ,
+            'KILL' , 'DriveGetIdentity' , 'DriveWriteSector' , 'DriveReadSector' , 'LOC' , 'LOF' , 'PUT' , 'OPEN' , 'CLOSE',
+            'GLCDCMD' , 'GLCDDATA' , 'SETFONT' , 'PSET' , 'SHOWPIC' , 'SHOWPICE' , 'CIRCLE' , 'BOX',
+            'I2CINIT' , 'I2CRECEIVE' , 'I2CSEND' , 'I2CSTART','I2CSTOP','I2CRBYTE','I2CWBYTE',
+            'ALIAS' , 'BITWAIT' , 'TOGGLE' , 'RESET' , 'SET' , 'SHIFTIN' , 'SHIFTOUT' , 'DEBOUNCE' , 'PULSEIN' , 'PULSEOUT',
+            'IDLE' , 'POWERDOWN' , 'POWERSAVE' , 'ON', 'INTERRUPT' , 'ENABLE' , 'DISABLE' , 'START' , 'VERSION' , 'CLOCKDIVISION' , 'CRYSTAL' , 'STOP',
+            'ADR' , 'ADR2' , 'WRITEEEPROM' , 'CPEEK' , 'CPEEKH' , 'PEEK' , 'POKE' , 'OUT' , 'READEEPROM' , 'DATA' , 'INP' , 'READ' , 'RESTORE' , 'LOOKDOWN' , 'LOOKUP' , 'LOOKUPSTR' , 'LOAD' , 'LOADADR' , 'LOADLABEL' , 'LOADWORDADR' , 'MEMCOPY',
+            'RC5SEND' , 'RC6SEND' , 'GETRC5' , 'SONYSEND',
+            'BAUD' , 'BAUD1', 'BUFSPACE' , 'CLEAR', 'ECHO' , 'WAITKEY' , 'ISCHARWAITING' , 'INKEY' , 'INPUTBIN' , 'INPUTHEX' , 'PRINT', 'PRINT1','PRINT0', 'PRINTBIN' , 'SERIN' , 'SEROUT' , 'SPC' , 'MAKEMODBUS',
+            'SPIIN' , 'SPIINIT' , 'SPIMOVE' , 'SPIOUT', 'SINGLE',
+            'ASC' , 'UCASE' , 'LCASE' , 'TRIM' , 'SPLIT' , 'LTRIM' , 'INSTR' , 'SPACE' , 'RTRIM' , 'LEFT' , 'LEN' , 'MID' , 'RIGHT' , 'VAL' , 'STR' , 'CHR' , 'CHECKSUM' , 'HEX' , 'HEXVAL',
+            'BASE64DEC' , 'BASE64ENC' , 'IP2STR' , 'UDPREAD' , 'UDPWRITE' , 'UDPWRITESTR' , 'TCPWRITE' , 'TCPWRITESTR' , 'TCPREAD' , 'GETDSTIP' , 'GETDSTPORT' , 'SOCKETSTAT' , 'SOCKETCONNECT' , 'SOCKETLISTEN' , 'GETSOCKET' , 'CLOSESOCKET' ,
+            'SETTCP' , 'GETTCPREGS' , 'SETTCPREGS' , 'SETIPPROTOCOL' , 'TCPCHECKSUM',
+            'HOME' , 'CURSOR' , 'UPPERLINE' , 'THIRDLINE' , 'INITLCD' , 'LOWERLINE' , 'LCDAT' , 'FOURTHLINE' , 'DISPLAY' , 'LCDCONTRAST' , 'LOCATE' , 'SHIFTCURSOR' , 'DEFLCDCHAR' , 'SHIFTLCD' , 'CLS',
+            'ACOS' , 'ASIN' , 'ATN' , 'ATN2' , 'EXP' , 'RAD2DEG' , 'FRAC' , 'TAN' , 'TANH' , 'COS' , 'COSH' , 'LOG' , 'LOG10' , 'ROUND' , 'ABS' , 'INT' , 'MAX' , 'MIN' , 'SQR' , 'SGN' , 'POWER' , 'SIN' , 'SINH' , 'FIX' , 'INCR' , 'DECR' , 'DEG2RAD',
+            'DBG' , 'DEBUG', 'DTMFOUT' , 'ENCODER' , 'GETADC' , 'GETKBD' , 'GETATKBD' , 'GETRC' , 'VALUE' , 'POPALL' , 'PS2MOUSEXY' , 'PUSHALL' ,
+            'RETURN'  , 'RND' , 'ROTATE' , 'SENDSCAN' , 'SENDSCANKBD' , 'SHIFT' , 'SOUND' , 'STCHECK' , 'SWAP' , 'VARPTR' , 'X10DETECT' , 'X10SEND' , 'READMAGCARD' , 'REM' , 'BITS' , 'BYVAL' , 'CALL' , 'READHITAG',
+            'Buffered', 'Size', 'Dummy', 'Parity', 'None', 'Stopbits', 'Databits', 'Clockpol', 'Synchrone', 'Prescaler', 'Reference', 'int0', 'int1', 'Interrupts',
+            'Auto', 'avcc', 'ack', 'nack', 'Pin', 'Db4', 'Db3', 'Db2', 'Db1', 'Db7', 'Db6', 'Db5', 'Db0',  'e', 'rs', 'twi',
+            ),
+        2 => array(
+            // Red Lowercase Keywords
+            '$ASM' , '$BAUD' , '$BAUD1' , '$BGF' , '$BOOT' , '$CRYSTAL' , '$DATA' , '$DBG' , '$DEFAULT' , '$EEPLEAVE' , '$EEPROM' ,
+            '$EEPROMHEX' , '$EXTERNAL' , '$HWSTACK' , '$INC' , '$INCLUDE' , '$INITMICRO' , '$LCD' , '$LCDRS' , '$LCDPUTCTRL' ,
+            '$LCDPUTDATA' , '$LCDVFO' , '$LIB' , '$LOADER' , '$LOADERSIZE' , '$MAP' , '$NOCOMPILE' , '$NOINIT' , '$NORAMCLEAR' ,
+            '$PROG' , '$PROGRAMMER' , '$REGFILE' , '$RESOURCE' , '$ROMSTART', '$SERIALINPUT', '$SERIALINPUT1' , '$SERIALINPUT2LCD' ,
+            '$SERIALOUTPUT' , '$SERIALOUTPUT1' , '$SIM' , '$SWSTACK' , '$TIMEOUT' , '$TINY' , '$WAITSTATE' , '$XRAMSIZE' , '$XRAMSTART', '$XA',
+            '#IF' , '#ELSE' , '#ENDIF', '$framesize'
+            ),
+        3 => array(
+            // Blue Lowercase Keywords
+            'IF', 'THEN', 'ELSE', 'END', 'WHILE', 'WEND', 'DO', 'LOOP', 'SELECT', 'CASE', 'FOR', 'NEXT',
+            'GOSUB' , 'GOTO' , 'LOCAL' , 'SUB' , 'DEFBIT', 'DEFBYTE', 'DEFINT', 'DEFWORD', 'DEFLNG', 'DEFSNG', 'DEFDBL',
+            'CONST', 'DECLARE', 'FUNCTION', 'DIM', 'EXIT', 'LONG', 'INTEGER', 'BYTE', 'AS', 'STRING', 'WORD'
+            ),
+        4 => array(
+            //light blue
+            'PINA.0', 'PINA.1', 'PINA.2', 'PINA.3', 'PINA.4', 'PINA.5', 'PINA.6', 'PINA.7',
+            'PINB.0', 'PINB.1', 'PINB.2', 'PINB.3', 'PINB.4', 'PINB.5', 'PINB.6', 'PINB.7',
+            'PINC.0', 'PINC.1', 'PINC.2', 'PINC.3', 'PINC.4', 'PINC.5', 'PINC.6', 'PINC.7',
+            'PIND.0', 'PIND.1', 'PIND.2', 'PIND.3', 'PIND.4', 'PIND.5', 'PIND.6', 'PIND.7',
+            'PINE.0', 'PINE.1', 'PINE.2', 'PINE.3', 'PINE.4', 'PINE.5', 'PINE.6', 'PINE.7',
+            'PINF.0', 'PINF.1', 'PINF.2', 'PINF.3', 'PINF.4', 'PINF.5', 'PINF.6', 'PINF.7',
+
+            'PORTA.0', 'PORTA.1', 'PORTA.2', 'PORTA.3', 'PORTA.4', 'PORTA.5', 'PORTA.6', 'PORTA.7',
+            'PORTB.0', 'PORTB.1', 'PORTB.2', 'PORTB.3', 'PORTB.4', 'PORTB.5', 'PORTB.6', 'PORTB.7',
+            'PORTC.0', 'PORTC.1', 'PORTC.2', 'PORTC.3', 'PORTC.4', 'PORTC.5', 'PORTC.6', 'PORTC.7',
+            'PORTD.0', 'PORTD.1', 'PORTD.2', 'PORTD.3', 'PORTD.4', 'PORTD.5', 'PORTD.6', 'PORTD.7',
+            'PORTE.0', 'PORTE.1', 'PORTE.2', 'PORTE.3', 'PORTE.4', 'PORTE.5', 'PORTE.6', 'PORTE.7',
+            'PORTF.0', 'PORTF.1', 'PORTF.2', 'PORTF.3', 'PORTF.4', 'PORTF.5', 'PORTF.6', 'PORTF.7',
+
+            'DDRA.0', 'DDRA.1', 'DDRA.2', 'DDRA.3', 'DDRA.4', 'DDRA.5', 'DDRA.6', 'DDRA.7',
+            'DDRB.0', 'DDRB.1', 'DDRB.2', 'DDRB.3', 'DDRB.4', 'DDRB.5', 'DDRB.6', 'DDRB.7',
+            'DDRC.0', 'DDRC.1', 'DDRC.2', 'DDRC.3', 'DDRC.4', 'DDRC.5', 'DDRC.6', 'DDRC.7',
+            'DDRD.0', 'DDRD.1', 'DDRD.2', 'DDRD.3', 'DDRD.4', 'DDRD.5', 'DDRD.6', 'DDRD.7',
+            'DDRE.0', 'DDRE.1', 'DDRE.2', 'DDRE.3', 'DDRE.4', 'DDRE.5', 'DDRE.6', 'DDRE.7',
+            'DDRF.0', 'DDRF.1', 'DDRF.2', 'DDRF.3', 'DDRF.4', 'DDRF.5', 'DDRF.6', 'DDRF.7',
+
+            'DDRA','DDRB','DDRC','DDRD','DDRE','DDRF',
+            'PORTA','PORTB','PORTC','PORTD','PORTE','PORTF',
+            'PINA','PINB','PINC','PIND','PINE','PINF',
+            )
+        ),
+    'SYMBOLS' => array(
+        '=', '<', '>', '>=', '<=', '+', '-', '*', '/', '%', '(', ')', '{', '}', '[', ']',  ';', ':', '$', '&H'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #FF0000;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #0080FF;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #657CC4; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000080; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        '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(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/bash.php b/sources/inc/geshi/bash.php
new file mode 100644
index 0000000..c69f005
--- /dev/null
+++ b/sources/inc/geshi/bash.php
@@ -0,0 +1,440 @@
+ 'Bash',
+    // Bash DOES have single line comments with # markers. But bash also has
+    // the  $# variable, so comments need special handling (see sf.net
+    // 1564839)
+    'COMMENT_SINGLE' => array('#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Variables
+        1 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        //BASH-style Heredoc
+        2 => '/<<-?\s*?(\'?)([a-zA-Z0-9]+)\1\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Escaped String Starters
+        3 => "/\\\\['\"]/siU",
+        // Single-Line Shell usage: Hide the prompt at the beginning
+        /* 4 => "/\A(?!#!)\s*(?>[\w:@\\/\\-\\._~]*[$#]\s?)?(?=[^\n]+\n?\Z)|^(?!#!)(\w+@)?[\w\\-\\.]+(:~?)[\w\\/\\-\\._]*?[$#]\s?/ms" */
+        4 => "/\A(?!#!)(?:(?>[\w:@\\/\\-\\._~]*)[$#]\s?)(?=(?>[^\n]+)\n?\Z)|^(?!#!)(?:\w+@)?(?>[\w\\-\\.]+)(?>:~?[\w\\/\\-\\._]*?)?[$#]\s?/sm"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    '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',
+            'if', 'in', 'select', 'set', 'then', 'until', 'while', 'time'
+            ),
+        2 => array(
+            'aclocal', 'aconnect', 'apachectl', 'apache2ctl', 'aplay', 'apm',
+            'apmsleep', 'apropos', 'apt-cache', 'apt-cdrom', 'apt-config',
+            'apt-file', 'apt-ftparchive', 'apt-get', 'apt-key', 'apt-listbugs',
+            'apt-listchanges', 'apt-mark', 'apt-mirror', 'apt-sortpkgs',
+            'apt-src', 'apticron', 'aptitude', 'aptsh', 'apxs', 'apxs2', 'ar',
+            'arch', 'arecord', 'as', 'as86', 'ash', 'autoconf', 'autoheader',
+            'automake', 'awk',
+
+            'apachectl start', 'apachectl stop', 'apachectl restart',
+            'apachectl graceful', 'apachectl graceful-stop',
+            'apachectl configtest', 'apachectl status', 'apachectl fullstatus',
+            'apachectl help', 'apache2ctl start', 'apache2ctl stop',
+            'apache2ctl restart', 'apache2ctl graceful',
+            'apache2ctl graceful-stop', 'apache2ctl configtest',
+            'apache2ctl status', 'apache2ctl fullstatus', 'apache2ctl help',
+
+            'apt-cache add', 'apt-cache depends', 'apt-cache dotty',
+            'apt-cache dump', 'apt-cache dumpavail', 'apt-cache gencaches',
+            'apt-cache pkgnames', 'apt-cache policy', 'apt-cache rdepends',
+            'apt-cache search', 'apt-cache show', 'apt-cache showauto',
+            'apt-cache showpkg', 'apt-cache showsrc', 'apt-cache stats',
+            'apt-cache unmet', 'apt-cache xvcg', 'apt-cdrom add',
+            'apt-cdrom ident', 'apt-config dump', 'apt-config shell',
+            'apt-file find', 'apt-file list', 'apt-file purge',
+            'apt-file search', 'apt-file shot', 'apt-file update',
+            'apt-get autoclean', 'apt-get autoremove', 'apt-get build-dep',
+            'apt-get check', 'apt-get clean', 'apt-get dist-upgrade',
+            'apt-get dselect-upgrade', 'apt-get install', 'apt-get markauto',
+            'apt-get purge', 'apt-get remove', 'apt-get source',
+            'apt-get unmarkauto', 'apt-get update', 'apt-get upgrade',
+            'apt-key add', 'apt-key adv', 'apt-key del', 'apt-key export',
+            'apt-key exportall', 'apt-key finger', 'apt-key list',
+            'apt-key net-update', 'apt-key update', 'apt-listbugs apt',
+            'apt-listbugs list', 'apt-listbugs rss', 'apt-src build',
+            'apt-src clean', 'apt-src import', 'apt-src install',
+            'apt-src list', 'apt-src location', 'apt-src name',
+            'apt-src remove', 'apt-src update', 'apt-src upgrade',
+            'apt-src version',
+
+            'basename', 'bash', 'bc', 'bison', 'bunzip2', 'bzcat',
+            'bzcmp', 'bzdiff', 'bzegrep', 'bzfgrep', 'bzgrep',
+            'bzip2', 'bzip2recover', 'bzless', 'bzmore',
+
+            'c++', 'cal', 'cat', 'chattr', 'cc', 'cdda2wav', 'cdparanoia',
+            'cdrdao', 'cd-read', 'cdrecord', 'chfn', 'chgrp', 'chmod',
+            'chown', 'chroot', 'chsh', 'chvt', 'clear', 'cmp', 'comm', 'co',
+            'col', 'cp', 'cpio', 'cpp', 'csh', 'cut', 'cvs', 'cvs-pserver',
+
+            'cvs add', 'cvs admin', 'cvs annotate', 'cvs checkout',
+            'cvs commit', 'cvs diff', 'cvs edit', 'cvs editors', 'cvs export',
+            'cvs history', 'cvs import', 'cvs init', 'cvs log', 'cvs login',
+            'cvs logout', 'cvs ls', 'cvs pserver', 'cvs rannotate',
+            'cvs rdiff', 'cvs release', 'cvs remove', 'cvs rlog', 'cvs rls',
+            'cvs rtag', 'cvs server', 'cvs status', 'cvs tag', 'cvs unedit',
+            'cvs update', 'cvs version', 'cvs watch', 'cvs watchers',
+
+            'dash', 'date', 'dc', 'dch', 'dcop', 'dd', 'ddate', 'ddd',
+            'deallocvt', 'debconf', 'defoma', 'depmod', 'df', 'dh',
+            'dialog', 'diff', 'diff3', 'dig', 'dir', 'dircolors', 'directomatic',
+            'dirname', 'dmesg', 'dnsdomainname', 'domainname', 'dpkg',
+            'dselect', 'du', 'dumpkeys',
+
+            'ed', 'egrep', 'env', 'expr',
+
+            'false', 'fbset', 'fdisk', 'ffmpeg', 'fgconsole','fgrep', 'file',
+            'find', 'flex', 'flex++', 'fmt', 'free', 'ftp', 'funzip', 'fuser',
+
+            'g++', 'gawk', 'gc','gcc', 'gdb', 'getent', 'getkeycodes',
+            'getopt', 'gettext', 'gettextize', 'gimp', 'gimp-remote',
+            'gimptool', 'gmake', 'gocr', 'grep', 'groups', 'gs', 'gunzip',
+            'gzexe', 'gzip',
+
+            'git', 'git add', 'git add--interactive', 'git am', 'git annotate',
+            'git apply', 'git archive', 'git bisect', 'git bisect--helper',
+            'git blame', 'git branch', 'git bundle', 'git cat-file',
+            'git check-attr', 'git checkout', 'git checkout-index',
+            'git check-ref-format', 'git cherry', 'git cherry-pick',
+            'git clean', 'git clone', 'git commit', 'git commit-tree',
+            'git config', 'git count-objects', 'git daemon', 'git describe',
+            'git diff', 'git diff-files', 'git diff-index', 'git difftool',
+            'git difftool--helper', 'git diff-tree', 'git fast-export',
+            'git fast-import', 'git fetch', 'git fetch-pack',
+            'git filter-branch', 'git fmt-merge-msg', 'git for-each-ref',
+            'git format-patch', 'git fsck', 'git fsck-objects', 'git gc',
+            'git get-tar-commit-id', 'git grep', 'git hash-object', 'git help',
+            'git http-backend', 'git http-fetch', 'git http-push',
+            'git imap-send', 'git index-pack', 'git init', 'git init-db',
+            'git instaweb', 'git log', 'git lost-found', 'git ls-files',
+            'git ls-remote', 'git ls-tree', 'git mailinfo', 'git mailsplit',
+            'git merge', 'git merge-base', 'git merge-file', 'git merge-index',
+            'git merge-octopus', 'git merge-one-file', 'git merge-ours',
+            'git merge-recursive', 'git merge-resolve', 'git merge-subtree',
+            'git mergetool', 'git merge-tree', 'git mktag', 'git mktree',
+            'git mv', 'git name-rev', 'git notes', 'git pack-objects',
+            'git pack-redundant', 'git pack-refs', 'git patch-id',
+            'git peek-remote', 'git prune', 'git prune-packed', 'git pull',
+            'git push', 'git quiltimport', 'git read-tree', 'git rebase',
+            'git rebase--interactive', 'git receive-pack', 'git reflog',
+            'git relink', 'git remote', 'git remote-ftp', 'git remote-ftps',
+            'git remote-http', 'git remote-https', 'git remote-testgit',
+            'git repack', 'git replace', 'git repo-config', 'git request-pull',
+            'git rerere', 'git reset', 'git revert', 'git rev-list',
+            'git rev-parse', 'git rm', 'git send-pack', 'git shell',
+            'git shortlog', 'git show', 'git show-branch', 'git show-index',
+            'git show-ref', 'git stage', 'git stash', 'git status',
+            'git stripspace', 'git submodule', 'git symbolic-ref', 'git tag',
+            'git tar-tree', 'git unpack-file', 'git unpack-objects',
+            'git update-index', 'git update-ref', 'git update-server-info',
+            'git upload-archive', 'git upload-pack', 'git var',
+            'git verify-pack', 'git verify-tag', 'git web--browse',
+            'git whatchanged', 'git write-tree',
+
+            'gitaction', 'git-add', 'git-add--interactive', 'git-am',
+            'git-annotate', 'git-apply', 'git-archive', 'git-bisect',
+            'git-bisect--helper', 'git-blame', 'git-branch', 'git-bundle',
+            'git-cat-file', 'git-check-attr', 'git-checkout',
+            'git-checkout-index', 'git-check-ref-format', 'git-cherry',
+            'git-cherry-pick', 'git-clean', 'git-clone', 'git-commit',
+            'git-commit-tree', 'git-config', 'git-count-objects', 'git-daemon',
+            'git-describe', 'git-diff', 'git-diff-files', 'git-diff-index',
+            'git-difftool', 'git-difftool--helper', 'git-diff-tree',
+            'gitdpkgname', 'git-fast-export', 'git-fast-import', 'git-fetch',
+            'git-fetch-pack', 'git-fetch--tool', 'git-filter-branch', 'gitfm',
+            'git-fmt-merge-msg', 'git-for-each-ref', 'git-format-patch',
+            'git-fsck', 'git-fsck-objects', 'git-gc', 'git-get-tar-commit-id',
+            'git-grep', 'git-hash-object', 'git-help', 'git-http-fetch',
+            'git-http-push', 'git-imap-send', 'git-index-pack', 'git-init',
+            'git-init-db', 'git-instaweb', 'gitkeys', 'git-log',
+            'git-lost-found', 'git-ls-files', 'git-ls-remote', 'git-ls-tree',
+            'git-mailinfo', 'git-mailsplit', 'git-merge', 'git-merge-base',
+            'git-merge-file', 'git-merge-index', 'git-merge-octopus',
+            'git-merge-one-file', 'git-merge-ours', 'git-merge-recursive',
+            'git-merge-resolve', 'git-merge-subtree', 'git-mergetool',
+            'git-mergetool--lib', 'git-merge-tree', 'gitmkdirs', 'git-mktag',
+            'git-mktree', 'gitmount', 'git-mv', 'git-name-rev',
+            'git-pack-objects', 'git-pack-redundant', 'git-pack-refs',
+            'git-parse-remote', 'git-patch-id', 'git-peek-remote', 'git-prune',
+            'git-prune-packed', 'gitps', 'git-pull', 'git-push',
+            'git-quiltimport', 'git-read-tree', 'git-rebase',
+            'git-rebase--interactive', 'git-receive-pack', 'git-reflog',
+            'gitregrep', 'git-relink', 'git-remote', 'git-repack',
+            'git-repo-config', 'git-request-pull', 'git-rerere', 'git-reset',
+            'git-revert', 'git-rev-list', 'git-rev-parse', 'gitrfgrep',
+            'gitrgrep', 'git-rm', 'git-send-pack', 'git-shell', 'git-shortlog',
+            'git-show', 'git-show-branch', 'git-show-index', 'git-show-ref',
+            'git-sh-setup', 'git-stage', 'git-stash', 'git-status',
+            'git-stripspace', 'git-submodule', 'git-svn', 'git-symbolic-ref',
+            'git-tag', 'git-tar-tree', 'gitunpack', 'git-unpack-file',
+            'git-unpack-objects', 'git-update-index', 'git-update-ref',
+            'git-update-server-info', 'git-upload-archive', 'git-upload-pack',
+            'git-var', 'git-verify-pack', 'git-verify-tag', 'gitview',
+            'git-web--browse', 'git-whatchanged', 'gitwhich', 'gitwipe',
+            'git-write-tree', 'gitxgrep',
+
+            'head', 'hexdump', 'hostname',
+
+            'id', 'ifconfig', 'ifdown', 'ifup', 'igawk', 'install',
+
+            'ip', 'ip addr', 'ip addrlabel', 'ip link', 'ip maddr', 'ip mroute',
+            'ip neigh', 'ip route', 'ip rule', 'ip tunnel', 'ip xfrm',
+
+            'join',
+
+            'kbd_mode','kbdrate', 'kdialog', 'kfile', 'kill', 'killall',
+
+            'lame', 'last', 'lastb', 'ld', 'ld86', 'ldd', 'less', 'lex', 'link',
+            'ln', 'loadkeys', 'loadunimap', 'locate', 'lockfile', 'login',
+            'logname', 'lp', 'lpr', 'ls', 'lsattr', 'lsmod', 'lsmod.old',
+            'lspci', 'ltrace', 'lynx',
+
+            'm4', 'make', 'man', 'mapscrn', 'mesg', 'mkdir', 'mkfifo',
+            'mknod', 'mktemp', 'more', 'mount', 'mplayer', 'msgfmt', 'mv',
+
+            'namei', 'nano', 'nasm', 'nawk', 'netstat', 'nice',
+            'nisdomainname', 'nl', 'nm', 'nm86', 'nmap', 'nohup', 'nop',
+
+            'od', 'openvt',
+
+            'passwd', 'patch', 'pcregrep', 'pcretest', 'perl', 'perror',
+            'pgawk', 'pidof', 'ping', 'pr', 'procmail', 'prune', 'ps', 'pstree',
+            'ps2ascii', 'ps2epsi', 'ps2frag', 'ps2pdf', 'ps2ps', 'psbook',
+            'psmerge', 'psnup', 'psresize', 'psselect', 'pstops',
+
+            'rbash', 'rcs', 'rcs2log', 'read', 'readlink', 'red', 'resizecons',
+            'rev', 'rm', 'rmdir', 'rsh', 'run-parts',
+
+            'sash', 'scp', 'screen', 'sed', 'seq', 'sendmail', 'setfont',
+            'setkeycodes', 'setleds', 'setmetamode', 'setserial', 'setterm',
+            'sh', 'showkey', 'shred', 'size', 'size86', 'skill', 'sleep',
+            'slogin', 'snice', 'sort', 'sox', 'split', 'ssed', 'ssh', 'ssh-add',
+            'ssh-agent', 'ssh-keygen', 'ssh-keyscan', 'stat', 'strace',
+            'strings', 'strip', 'stty', 'su', 'sudo', 'suidperl', 'sum', 'svn',
+            'svnadmin', 'svndumpfilter', 'svnlook', 'svnmerge', 'svnmucc',
+            'svnserve', 'svnshell', 'svnsync', 'svnversion', 'svnwrap', 'sync',
+
+            'svn add', 'svn ann', 'svn annotate', 'svn blame', 'svn cat',
+            'svn changelist', 'svn checkout', 'svn ci', 'svn cl', 'svn cleanup',
+            'svn co', 'svn commit', 'svn copy', 'svn cp', 'svn del',
+            'svn delete', 'svn di', 'svn diff', 'svn export', 'svn h',
+            'svn help', 'svn import', 'svn info', 'svn list', 'svn lock',
+            'svn log', 'svn ls', 'svn merge', 'svn mergeinfo', 'svn mkdir',
+            'svn move', 'svn mv', 'svn pd', 'svn pdel', 'svn pe', 'svn pedit',
+            'svn pg', 'svn pget', 'svn pl', 'svn plist', 'svn praise',
+            'svn propdel', 'svn propedit', 'svn propget', 'svn proplist',
+            'svn propset', 'svn ps', 'svn pset', 'svn remove', 'svn ren',
+            'svn rename', 'svn resolve', 'svn resolved', 'svn revert', 'svn rm',
+            'svn st', 'svn stat', 'svn status', 'svn sw', 'svn switch',
+            'svn unlock', 'svn up', 'svn update',
+
+            'tac', 'tail', 'tar', 'tee', 'tempfile', 'touch', 'tr', 'tree',
+            'true',
+
+            'umount', 'uname', 'unicode_start', 'unicode_stop', 'uniq',
+            'unlink', 'unzip', 'updatedb', 'updmap', 'uptime', 'users',
+            'utmpdump', 'uuidgen',
+
+            'valgrind', 'vdir', 'vi', 'vim', 'vmstat',
+
+            'w', 'wall', 'watch', 'wc', 'wget', 'whatis', 'whereis',
+            'which', 'whiptail', 'who', 'whoami', 'whois', 'wine', 'wineboot',
+            'winebuild', 'winecfg', 'wineconsole', 'winedbg', 'winedump',
+            'winefile', 'wodim', 'write',
+
+            'xargs', 'xhost', 'xmodmap', 'xset',
+
+            'yacc', 'yes', 'ypdomainname', 'yum',
+
+            'yum check-update', 'yum clean', 'yum deplist', 'yum erase',
+            'yum groupinfo', 'yum groupinstall', 'yum grouplist',
+            'yum groupremove', 'yum groupupdate', 'yum info', 'yum install',
+            'yum list', 'yum localinstall', 'yum localupdate', 'yum makecache',
+            'yum provides', 'yum remove', 'yum resolvedep', 'yum search',
+            'yum shell', 'yum update', 'yum upgrade', 'yum whatprovides',
+
+            'zcat', 'zcmp', 'zdiff', 'zdump', 'zegrep', 'zfgrep', 'zforce',
+            'zgrep', 'zip', 'zipgrep', 'zipinfo', 'zless', 'zmore', 'znew',
+            'zsh', 'zsoelim'
+            ),
+        3 => array(
+            'alias', 'bg', 'bind', 'break', 'builtin', 'cd', 'command',
+            'compgen', 'complete', 'continue', 'declare', 'dirs', 'disown',
+            'echo', 'enable', 'eval', 'exec', 'exit', 'export', 'fc',
+            'fg', 'getopts', 'hash', 'help', 'history', 'jobs', 'let',
+            'local', 'logout', 'popd', 'printf', 'pushd', 'pwd', 'readonly',
+            'return', 'shift', 'shopt', 'source', 'suspend', 'test', 'times',
+            'trap', 'type', 'typeset', 'ulimit', 'umask', 'unalias', 'unset',
+            'wait'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #c20cb9; font-weight: bold;',
+            3 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;',
+            1 => 'color: #800000;',
+            2 => 'color: #cc0000; font-style: italic;',
+            3 => 'color: #000000; font-weight: bold;',
+            4 => 'color: #666666;'
+            ),
+        'ESCAPE_CHAR' => array(
+            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;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007800;',
+            1 => 'color: #007800;',
+            2 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #660033;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables (will be handled by comment_regexps)
+        0 => "\\$\\{[a-zA-Z_][a-zA-Z0-9_]*?\\}",
+        //Variables without braces
+        1 => "\\$[a-zA-Z_][a-zA-Z0-9_]*",
+        //Variable assignment
+        2 => "(? "\\$[*#\$\\-\\?!\d]",
+        //Parameters of commands
+        5 => "(?<=\s)--?[0-9a-zA-Z\-]+(?=[\s=]|<(?:SEMI|PIPE)>|$)"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?  "(?![\.\-a-zA-Z0-9_%=\\/:])",
+            2 => array(
+                'SPACE_AS_WHITESPACE' => false
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/basic4gl.php b/sources/inc/geshi/basic4gl.php
new file mode 100644
index 0000000..35c9274
--- /dev/null
+++ b/sources/inc/geshi/basic4gl.php
@@ -0,0 +1,341 @@
+ 'Basic4GL',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+
+            // Navy Blue Bold Keywords
+
+            'true','rnd_max','m_pi','m_e','false','VK_ZOOM','VK_UP','VK_TAB','VK_SUBTRACT','VK_SPACE','VK_SNAPSHOT',
+            'VK_SHIFT','VK_SEPARATOR','VK_SELECT','VK_SCROLL','VK_RWIN','VK_RSHIFT','VK_RMENU','VK_RIGHT','VK_RETURN',
+            'VK_RCONTROL','VK_RBUTTON','VK_PROCESSKEY','VK_PRIOR','VK_PRINT','VK_PLAY','VK_PAUSE','VK_NUMPAD9','VK_NUMPAD8',
+            'VK_NUMPAD7','VK_NUMPAD6','VK_NUMPAD5','VK_NUMPAD4','VK_NUMPAD3','VK_NUMPAD2','VK_NUMPAD1','VK_NUMPAD0',
+            'VK_NUMLOCK','VK_NONCONVERT','VK_NEXT','VK_MULTIPLY','VK_MODECHANGE','VK_MENU','VK_MBUTTON','VK_LWIN',
+            'VK_LSHIFT','VK_LMENU','VK_LEFT','VK_LCONTROL','VK_LBUTTON','VK_KANJI','VK_KANA','VK_JUNJA','VK_INSERT',
+            'VK_HOME','VK_HELP','VK_HANJA','VK_HANGUL','VK_HANGEUL','VK_FINAL','VK_F9','VK_F8','VK_F7','VK_F6','VK_F5',
+            'VK_F4','VK_F3','VK_F24','VK_F23','VK_F22','VK_F21','VK_F20','VK_F2','VK_F19','VK_F18','VK_F17','VK_F16',
+            'VK_F15','VK_F14','VK_F13','VK_F12','VK_F11','VK_F10','VK_F1','VK_EXSEL','VK_EXECUTE','VK_ESCAPE','VK_EREOF',
+            'VK_END','VK_DOWN','VK_DIVIDE','VK_DELETE','VK_DECIMAL','VK_CRSEL','VK_CONVERT','VK_CONTROL','VK_CLEAR',
+            'VK_CAPITAL','VK_CANCEL','VK_BACK','VK_ATTN','VK_APPS','VK_ADD','VK_ACCEPT','TEXT_SIMPLE','TEXT_OVERLAID',
+            'TEXT_BUFFERED','SPR_TILEMAP','SPR_SPRITE','SPR_INVALID','MOUSE_RBUTTON','MOUSE_MBUTTON','MOUSE_LBUTTON',
+            'GL_ZOOM_Y','GL_ZOOM_X','GL_ZERO','GL_XOR','GL_WIN_swap_hint','GL_WIN_draw_range_elements','GL_VIEWPORT_BIT',
+            'GL_VIEWPORT','GL_VERTEX_ARRAY_TYPE_EXT','GL_VERTEX_ARRAY_TYPE','GL_VERTEX_ARRAY_STRIDE_EXT','GL_VERTEX_ARRAY_STRIDE',
+            'GL_VERTEX_ARRAY_SIZE_EXT','GL_VERTEX_ARRAY_SIZE','GL_VERTEX_ARRAY_POINTER_EXT','GL_VERTEX_ARRAY_POINTER',
+            'GL_VERTEX_ARRAY_EXT','GL_VERTEX_ARRAY_COUNT_EXT','GL_VERTEX_ARRAY','GL_VERSION_1_1','GL_VERSION','GL_VENDOR',
+            'GL_V3F','GL_V2F','GL_UNSIGNED_SHORT','GL_UNSIGNED_INT','GL_UNSIGNED_BYTE','GL_UNPACK_SWAP_BYTES','GL_UNPACK_SKIP_ROWS',
+            'GL_UNPACK_SKIP_PIXELS','GL_UNPACK_ROW_LENGTH','GL_UNPACK_LSB_FIRST','GL_UNPACK_ALIGNMENT','GL_TRUE','GL_TRIANGLE_STRIP',
+            'GL_TRIANGLE_FAN','GL_TRIANGLES','GL_TRANSFORM_BIT','GL_TEXTURE_WRAP_T','GL_TEXTURE_WRAP_S','GL_TEXTURE_WIDTH',
+            'GL_TEXTURE_STACK_DEPTH','GL_TEXTURE_RESIDENT','GL_TEXTURE_RED_SIZE','GL_TEXTURE_PRIORITY','GL_TEXTURE_MIN_FILTER',
+            'GL_TEXTURE_MATRIX','GL_TEXTURE_MAG_FILTER','GL_TEXTURE_LUMINANCE_SIZE','GL_TEXTURE_INTERNAL_FORMAT','GL_TEXTURE_INTENSITY_SIZE',
+            'GL_TEXTURE_HEIGHT','GL_TEXTURE_GREEN_SIZE','GL_TEXTURE_GEN_T','GL_TEXTURE_GEN_S','GL_TEXTURE_GEN_R','GL_TEXTURE_GEN_Q',
+            'GL_TEXTURE_GEN_MODE','GL_TEXTURE_ENV_MODE','GL_TEXTURE_ENV_COLOR','GL_TEXTURE_ENV','GL_TEXTURE_COORD_ARRAY_TYPE_EXT',
+            'GL_TEXTURE_COORD_ARRAY_TYPE','GL_TEXTURE_COORD_ARRAY_STRIDE_EXT','GL_TEXTURE_COORD_ARRAY_STRIDE','GL_TEXTURE_COORD_ARRAY_SIZE_EXT',
+            'GL_TEXTURE_COORD_ARRAY_SIZE','GL_TEXTURE_COORD_ARRAY_POINTER_EXT','GL_TEXTURE_COORD_ARRAY_POINTER','GL_TEXTURE_COORD_ARRAY_EXT',
+            'GL_TEXTURE_COORD_ARRAY_COUNT_EXT','GL_TEXTURE_COORD_ARRAY','GL_TEXTURE_COMPONENTS','GL_TEXTURE_BORDER_COLOR','GL_TEXTURE_BORDER',
+            'GL_TEXTURE_BLUE_SIZE','GL_TEXTURE_BIT','GL_TEXTURE_BINDING_2D','GL_TEXTURE_BINDING_1D','GL_TEXTURE_ALPHA_SIZE',
+            'GL_TEXTURE_2D','GL_TEXTURE_1D','GL_TEXTURE9_ARB','GL_TEXTURE9','GL_TEXTURE8_ARB','GL_TEXTURE8','GL_TEXTURE7_ARB',
+            'GL_TEXTURE7','GL_TEXTURE6_ARB','GL_TEXTURE6','GL_TEXTURE5_ARB','GL_TEXTURE5','GL_TEXTURE4_ARB','GL_TEXTURE4',
+            'GL_TEXTURE3_ARB','GL_TEXTURE31_ARB','GL_TEXTURE31','GL_TEXTURE30_ARB','GL_TEXTURE30','GL_TEXTURE3','GL_TEXTURE2_ARB',
+            'GL_TEXTURE29_ARB','GL_TEXTURE29','GL_TEXTURE28_ARB','GL_TEXTURE28','GL_TEXTURE27_ARB','GL_TEXTURE27','GL_TEXTURE26_ARB',
+            'GL_TEXTURE26','GL_TEXTURE25_ARB','GL_TEXTURE25','GL_TEXTURE24_ARB','GL_TEXTURE24','GL_TEXTURE23_ARB','GL_TEXTURE23',
+            'GL_TEXTURE22_ARB','GL_TEXTURE22','GL_TEXTURE21_ARB','GL_TEXTURE21','GL_TEXTURE20_ARB','GL_TEXTURE20','GL_TEXTURE2',
+            'GL_TEXTURE1_ARB','GL_TEXTURE19_ARB','GL_TEXTURE19','GL_TEXTURE18_ARB','GL_TEXTURE18','GL_TEXTURE17_ARB',
+            'GL_TEXTURE17','GL_TEXTURE16_ARB','GL_TEXTURE16','GL_TEXTURE15_ARB','GL_TEXTURE15','GL_TEXTURE14_ARB','GL_TEXTURE14',
+            'GL_TEXTURE13_ARB','GL_TEXTURE13','GL_TEXTURE12_ARB','GL_TEXTURE12','GL_TEXTURE11_ARB','GL_TEXTURE11','GL_TEXTURE10_ARB',
+            'GL_TEXTURE10','GL_TEXTURE1','GL_TEXTURE0_ARB','GL_TEXTURE0','GL_TEXTURE','GL_T4F_V4F','GL_T4F_C4F_N3F_V4F','GL_T2F_V3F',
+            'GL_T2F_N3F_V3F','GL_T2F_C4UB_V3F','GL_T2F_C4F_N3F_V3F','GL_T2F_C3F_V3F','GL_T','GL_SUBPIXEL_BITS','GL_STEREO',
+            'GL_STENCIL_WRITEMASK','GL_STENCIL_VALUE_MASK','GL_STENCIL_TEST','GL_STENCIL_REF','GL_STENCIL_PASS_DEPTH_PASS',
+            'GL_STENCIL_PASS_DEPTH_FAIL','GL_STENCIL_INDEX','GL_STENCIL_FUNC','GL_STENCIL_FAIL','GL_STENCIL_CLEAR_VALUE',
+            'GL_STENCIL_BUFFER_BIT','GL_STENCIL_BITS','GL_STENCIL','GL_STACK_UNDERFLOW','GL_STACK_OVERFLOW','GL_SRC_COLOR',
+            'GL_SRC_ALPHA_SATURATE','GL_SRC_ALPHA','GL_SPOT_EXPONENT','GL_SPOT_DIRECTION','GL_SPOT_CUTOFF','GL_SPHERE_MAP',
+            'GL_SPECULAR','GL_SOURCE2_RGB_EXT','GL_SOURCE2_RGB','GL_SOURCE2_ALPHA_EXT','GL_SOURCE2_ALPHA','GL_SOURCE1_RGB_EXT',
+            'GL_SOURCE1_RGB','GL_SOURCE1_ALPHA_EXT','GL_SOURCE1_ALPHA','GL_SOURCE0_RGB_EXT','GL_SOURCE0_RGB','GL_SOURCE0_ALPHA_EXT',
+            'GL_SOURCE0_ALPHA','GL_SMOOTH','GL_SHORT','GL_SHININESS','GL_SHADE_MODEL','GL_SET','GL_SELECTION_BUFFER_SIZE',
+            'GL_SELECTION_BUFFER_POINTER','GL_SELECT','GL_SCISSOR_TEST','GL_SCISSOR_BOX','GL_SCISSOR_BIT','GL_S','GL_RIGHT',
+            'GL_RGB_SCALE_EXT','GL_RGB_SCALE','GL_RGBA_MODE','GL_RGBA8','GL_RGBA4','GL_RGBA2','GL_RGBA16','GL_RGBA12','GL_RGBA',
+            'GL_RGB8','GL_RGB5_A1','GL_RGB5','GL_RGB4','GL_RGB16','GL_RGB12','GL_RGB10_A2','GL_RGB10','GL_RGB','GL_RETURN',
+            'GL_REPLACE','GL_REPEAT','GL_RENDER_MODE','GL_RENDERER','GL_RENDER','GL_RED_SCALE','GL_RED_BITS','GL_RED_BIAS',
+            'GL_RED','GL_READ_BUFFER','GL_R3_G3_B2','GL_R','GL_QUAD_STRIP','GL_QUADS','GL_QUADRATIC_ATTENUATION','GL_Q',
+            'GL_PROXY_TEXTURE_2D','GL_PROXY_TEXTURE_1D','GL_PROJECTION_STACK_DEPTH','GL_PROJECTION_MATRIX','GL_PROJECTION',
+            'GL_PRIMARY_COLOR_EXT','GL_PRIMARY_COLOR','GL_PREVIOUS_EXT','GL_PREVIOUS','GL_POSITION','GL_POLYGON_TOKEN',
+            'GL_POLYGON_STIPPLE_BIT','GL_POLYGON_STIPPLE','GL_POLYGON_SMOOTH_HINT','GL_POLYGON_SMOOTH','GL_POLYGON_OFFSET_UNITS',
+            'GL_POLYGON_OFFSET_POINT','GL_POLYGON_OFFSET_LINE','GL_POLYGON_OFFSET_FILL','GL_POLYGON_OFFSET_FACTOR','GL_POLYGON_MODE',
+            'GL_POLYGON_BIT','GL_POLYGON','GL_POINT_TOKEN','GL_POINT_SMOOTH_HINT','GL_POINT_SMOOTH','GL_POINT_SIZE_RANGE',
+            'GL_POINT_SIZE_GRANULARITY','GL_POINT_SIZE','GL_POINT_BIT','GL_POINTS','GL_POINT','GL_PIXEL_MODE_BIT',
+            'GL_PIXEL_MAP_S_TO_S_SIZE','GL_PIXEL_MAP_S_TO_S','GL_PIXEL_MAP_R_TO_R_SIZE','GL_PIXEL_MAP_R_TO_R','GL_PIXEL_MAP_I_TO_R_SIZE',
+            'GL_PIXEL_MAP_I_TO_R','GL_PIXEL_MAP_I_TO_I_SIZE','GL_PIXEL_MAP_I_TO_I','GL_PIXEL_MAP_I_TO_G_SIZE','GL_PIXEL_MAP_I_TO_G',
+            'GL_PIXEL_MAP_I_TO_B_SIZE','GL_PIXEL_MAP_I_TO_B','GL_PIXEL_MAP_I_TO_A_SIZE','GL_PIXEL_MAP_I_TO_A','GL_PIXEL_MAP_G_TO_G_SIZE',
+            'GL_PIXEL_MAP_G_TO_G','GL_PIXEL_MAP_B_TO_B_SIZE','GL_PIXEL_MAP_B_TO_B','GL_PIXEL_MAP_A_TO_A_SIZE','GL_PIXEL_MAP_A_TO_A',
+            'GL_PHONG_WIN','GL_PHONG_HINT_WIN','GL_PERSPECTIVE_CORRECTION_HINT','GL_PASS_THROUGH_TOKEN','GL_PACK_SWAP_BYTES',
+            'GL_PACK_SKIP_ROWS','GL_PACK_SKIP_PIXELS','GL_PACK_ROW_LENGTH','GL_PACK_LSB_FIRST','GL_PACK_ALIGNMENT','GL_OUT_OF_MEMORY',
+            'GL_OR_REVERSE','GL_OR_INVERTED','GL_ORDER','GL_OR','GL_OPERAND2_RGB_EXT','GL_OPERAND2_RGB','GL_OPERAND2_ALPHA_EXT',
+            'GL_OPERAND2_ALPHA','GL_OPERAND1_RGB_EXT','GL_OPERAND1_RGB','GL_OPERAND1_ALPHA_EXT','GL_OPERAND1_ALPHA','GL_OPERAND0_RGB_EXT',
+            'GL_OPERAND0_RGB','GL_OPERAND0_ALPHA_EXT','GL_OPERAND0_ALPHA','GL_ONE_MINUS_SRC_COLOR','GL_ONE_MINUS_SRC_ALPHA',
+            'GL_ONE_MINUS_DST_COLOR','GL_ONE_MINUS_DST_ALPHA','GL_ONE','GL_OBJECT_PLANE','GL_OBJECT_LINEAR','GL_NO_ERROR',
+            'GL_NOTEQUAL','GL_NORMAL_ARRAY_TYPE_EXT','GL_NORMAL_ARRAY_TYPE','GL_NORMAL_ARRAY_STRIDE_EXT','GL_NORMAL_ARRAY_STRIDE',
+            'GL_NORMAL_ARRAY_POINTER_EXT','GL_NORMAL_ARRAY_POINTER','GL_NORMAL_ARRAY_EXT','GL_NORMAL_ARRAY_COUNT_EXT',
+            'GL_NORMAL_ARRAY','GL_NORMALIZE','GL_NOR','GL_NOOP','GL_NONE','GL_NICEST','GL_NEVER','GL_NEAREST_MIPMAP_NEAREST','GL_NEAREST_MIPMAP_LINEAR',
+            'GL_NEAREST','GL_NAND','GL_NAME_STACK_DEPTH','GL_N3F_V3F','GL_MULT','GL_MODULATE','GL_MODELVIEW_STACK_DEPTH','GL_MODELVIEW_MATRIX',
+            'GL_MODELVIEW','GL_MAX_VIEWPORT_DIMS','GL_MAX_TEXTURE_UNITS_ARB','GL_MAX_TEXTURE_UNITS','GL_MAX_TEXTURE_STACK_DEPTH',
+            'GL_MAX_TEXTURE_SIZE','GL_MAX_PROJECTION_STACK_DEPTH','GL_MAX_PIXEL_MAP_TABLE','GL_MAX_NAME_STACK_DEPTH','GL_MAX_MODELVIEW_STACK_DEPTH',
+            'GL_MAX_LIST_NESTING','GL_MAX_LIGHTS','GL_MAX_EVAL_ORDER','GL_MAX_ELEMENTS_VERTICES_WIN','GL_MAX_ELEMENTS_INDICES_WIN',
+            'GL_MAX_CLIP_PLANES','GL_MAX_CLIENT_ATTRIB_STACK_DEPTH','GL_MAX_ATTRIB_STACK_DEPTH','GL_MATRIX_MODE','GL_MAP_STENCIL',
+            'GL_MAP_COLOR','GL_MAP2_VERTEX_4','GL_MAP2_VERTEX_3','GL_MAP2_TEXTURE_COORD_4','GL_MAP2_TEXTURE_COORD_3','GL_MAP2_TEXTURE_COORD_2',
+            'GL_MAP2_TEXTURE_COORD_1','GL_MAP2_NORMAL','GL_MAP2_INDEX','GL_MAP2_GRID_SEGMENTS','GL_MAP2_GRID_DOMAIN','GL_MAP2_COLOR_4',
+            'GL_MAP1_VERTEX_4','GL_MAP1_VERTEX_3','GL_MAP1_TEXTURE_COORD_4','GL_MAP1_TEXTURE_COORD_3','GL_MAP1_TEXTURE_COORD_2',
+            'GL_MAP1_TEXTURE_COORD_1','GL_MAP1_NORMAL','GL_MAP1_INDEX','GL_MAP1_GRID_SEGMENTS','GL_MAP1_GRID_DOMAIN',
+            'GL_MAP1_COLOR_4','GL_LUMINANCE_ALPHA','GL_LUMINANCE8_ALPHA8','GL_LUMINANCE8','GL_LUMINANCE6_ALPHA2','GL_LUMINANCE4_ALPHA4',
+            'GL_LUMINANCE4','GL_LUMINANCE16_ALPHA16','GL_LUMINANCE16','GL_LUMINANCE12_ALPHA4','GL_LUMINANCE12_ALPHA12','GL_LUMINANCE12',
+            'GL_LUMINANCE','GL_LOGIC_OP_MODE','GL_LOGIC_OP','GL_LOAD','GL_LIST_MODE','GL_LIST_INDEX','GL_LIST_BIT',
+            'GL_LIST_BASE','GL_LINE_WIDTH_RANGE','GL_LINE_WIDTH_GRANULARITY','GL_LINE_WIDTH','GL_LINE_TOKEN','GL_LINE_STRIP','GL_LINE_STIPPLE_REPEAT',
+            'GL_LINE_STIPPLE_PATTERN','GL_LINE_STIPPLE','GL_LINE_SMOOTH_HINT','GL_LINE_SMOOTH','GL_LINE_RESET_TOKEN','GL_LINE_LOOP',
+            'GL_LINE_BIT','GL_LINES','GL_LINEAR_MIPMAP_NEAREST','GL_LINEAR_MIPMAP_LINEAR','GL_LINEAR_ATTENUATION','GL_LINEAR',
+            'GL_LINE','GL_LIGHT_MODEL_TWO_SIDE','GL_LIGHT_MODEL_LOCAL_VIEWER','GL_LIGHT_MODEL_AMBIENT','GL_LIGHTING_BIT',
+            'GL_LIGHTING','GL_LIGHT7','GL_LIGHT6','GL_LIGHT5','GL_LIGHT4','GL_LIGHT3','GL_LIGHT2','GL_LIGHT1','GL_LIGHT0',
+            'GL_LESS','GL_LEQUAL','GL_LEFT','GL_KEEP','GL_INVERT','GL_INVALID_VALUE','GL_INVALID_OPERATION','GL_INVALID_ENUM','GL_INTERPOLATE_EXT',
+            'GL_INTERPOLATE','GL_INTENSITY8','GL_INTENSITY4','GL_INTENSITY16','GL_INTENSITY12','GL_INTENSITY','GL_INT',
+            'GL_INDEX_WRITEMASK','GL_INDEX_SHIFT','GL_INDEX_OFFSET','GL_INDEX_MODE','GL_INDEX_LOGIC_OP','GL_INDEX_CLEAR_VALUE','GL_INDEX_BITS',
+            'GL_INDEX_ARRAY_TYPE_EXT','GL_INDEX_ARRAY_TYPE','GL_INDEX_ARRAY_STRIDE_EXT','GL_INDEX_ARRAY_STRIDE','GL_INDEX_ARRAY_POINTER_EXT',
+            'GL_INDEX_ARRAY_POINTER','GL_INDEX_ARRAY_EXT','GL_INDEX_ARRAY_COUNT_EXT','GL_INDEX_ARRAY','GL_INCR','GL_HINT_BIT',
+            'GL_GREEN_SCALE','GL_GREEN_BITS','GL_GREEN_BIAS','GL_GREEN','GL_GREATER','GL_GEQUAL','GL_FRONT_RIGHT','GL_FRONT_LEFT',
+            'GL_FRONT_FACE','GL_FRONT_AND_BACK','GL_FRONT','GL_FOG_START','GL_FOG_SPECULAR_TEXTURE_WIN','GL_FOG_MODE','GL_FOG_INDEX',
+            'GL_FOG_HINT','GL_FOG_END','GL_FOG_DENSITY','GL_FOG_COLOR','GL_FOG_BIT','GL_FOG','GL_FLOAT','GL_FLAT','GL_FILL',
+            'GL_FEEDBACK_BUFFER_TYPE','GL_FEEDBACK_BUFFER_SIZE','GL_FEEDBACK_BUFFER_POINTER','GL_FEEDBACK','GL_FASTEST','GL_FALSE',
+            'GL_EYE_PLANE','GL_EYE_LINEAR','GL_EXT_vertex_array','GL_EXT_paletted_texture','GL_EXT_bgra','GL_EXTENSIONS','GL_EXP2',
+            'GL_EXP','GL_EVAL_BIT','GL_EQUIV','GL_EQUAL','GL_ENABLE_BIT','GL_EMISSION','GL_EDGE_FLAG_ARRAY_STRIDE_EXT','GL_EDGE_FLAG_ARRAY_STRIDE',
+            'GL_EDGE_FLAG_ARRAY_POINTER_EXT','GL_EDGE_FLAG_ARRAY_POINTER','GL_EDGE_FLAG_ARRAY_EXT','GL_EDGE_FLAG_ARRAY_COUNT_EXT','GL_EDGE_FLAG_ARRAY',
+            'GL_EDGE_FLAG','GL_DST_COLOR','GL_DST_ALPHA','GL_DRAW_PIXEL_TOKEN','GL_DRAW_BUFFER','GL_DOUBLE_EXT','GL_DOUBLEBUFFER',
+            'GL_DOUBLE','GL_DONT_CARE','GL_DOMAIN','GL_DITHER','GL_DIFFUSE','GL_DEPTH_WRITEMASK','GL_DEPTH_TEST','GL_DEPTH_SCALE',
+            'GL_DEPTH_RANGE','GL_DEPTH_FUNC','GL_DEPTH_COMPONENT','GL_DEPTH_CLEAR_VALUE','GL_DEPTH_BUFFER_BIT','GL_DEPTH_BITS',
+            'GL_DEPTH_BIAS','GL_DEPTH','GL_DECR','GL_DECAL','GL_CW','GL_CURRENT_TEXTURE_COORDS','GL_CURRENT_RASTER_TEXTURE_COORDS','GL_CURRENT_RASTER_POSITION_VALID',
+            'GL_CURRENT_RASTER_POSITION','GL_CURRENT_RASTER_INDEX','GL_CURRENT_RASTER_DISTANCE','GL_CURRENT_RASTER_COLOR','GL_CURRENT_NORMAL',
+            'GL_CURRENT_INDEX','GL_CURRENT_COLOR','GL_CURRENT_BIT','GL_CULL_FACE_MODE','GL_CULL_FACE','GL_COPY_PIXEL_TOKEN',
+            'GL_COPY_INVERTED','GL_COPY','GL_CONSTANT_EXT','GL_CONSTANT_ATTENUATION','GL_CONSTANT','GL_COMPILE_AND_EXECUTE','GL_COMPILE','GL_COMBINE_RGB_EXT',
+            'GL_COMBINE_RGB','GL_COMBINE_EXT','GL_COMBINE_ALPHA_EXT','GL_COMBINE_ALPHA','GL_COMBINE','GL_COLOR_WRITEMASK',
+            'GL_COLOR_TABLE_WIDTH_EXT','GL_COLOR_TABLE_RED_SIZE_EXT','GL_COLOR_TABLE_LUMINANCE_SIZE_EXT','GL_COLOR_TABLE_INTENSITY_SIZE_EXT',
+            'GL_COLOR_TABLE_GREEN_SIZE_EXT','GL_COLOR_TABLE_FORMAT_EXT','GL_COLOR_TABLE_BLUE_SIZE_EXT','GL_COLOR_TABLE_ALPHA_SIZE_EXT',
+            'GL_COLOR_MATERIAL_PARAMETER','GL_COLOR_MATERIAL_FACE','GL_COLOR_MATERIAL','GL_COLOR_LOGIC_OP','GL_COLOR_INDEXES',
+            'GL_COLOR_INDEX8_EXT','GL_COLOR_INDEX4_EXT','GL_COLOR_INDEX2_EXT','GL_COLOR_INDEX1_EXT','GL_COLOR_INDEX16_EXT',
+            'GL_COLOR_INDEX12_EXT','GL_COLOR_INDEX','GL_COLOR_CLEAR_VALUE','GL_COLOR_BUFFER_BIT','GL_COLOR_ARRAY_TYPE_EXT',
+            'GL_COLOR_ARRAY_TYPE','GL_COLOR_ARRAY_STRIDE_EXT','GL_COLOR_ARRAY_STRIDE','GL_COLOR_ARRAY_SIZE_EXT','GL_COLOR_ARRAY_SIZE',
+            'GL_COLOR_ARRAY_POINTER_EXT','GL_COLOR_ARRAY_POINTER','GL_COLOR_ARRAY_EXT','GL_COLOR_ARRAY_COUNT_EXT','GL_COLOR_ARRAY',
+            'GL_COLOR','GL_COEFF','GL_CLIP_PLANE5','GL_CLIP_PLANE4','GL_CLIP_PLANE3','GL_CLIP_PLANE2','GL_CLIP_PLANE1','GL_CLIP_PLANE0',
+            'GL_CLIENT_VERTEX_ARRAY_BIT','GL_CLIENT_PIXEL_STORE_BIT','GL_CLIENT_ATTRIB_STACK_DEPTH','GL_CLIENT_ALL_ATTRIB_BITS',
+            'GL_CLIENT_ACTIVE_TEXTURE_ARB','GL_CLIENT_ACTIVE_TEXTURE','GL_CLEAR','GL_CLAMP','GL_CCW','GL_C4UB_V3F','GL_C4UB_V2F',
+            'GL_C4F_N3F_V3F','GL_C3F_V3F','GL_BYTE','GL_BLUE_SCALE','GL_BLUE_BITS','GL_BLUE_BIAS','GL_BLUE','GL_BLEND_SRC','GL_BLEND_DST',
+            'GL_BLEND','GL_BITMAP_TOKEN','GL_BITMAP','GL_BGR_EXT','GL_BGRA_EXT','GL_BACK_RIGHT','GL_BACK_LEFT','GL_BACK',
+            'GL_AUX_BUFFERS','GL_AUX3','GL_AUX2','GL_AUX1','GL_AUX0','GL_AUTO_NORMAL','GL_ATTRIB_STACK_DEPTH','GL_AND_REVERSE',
+            'GL_AND_INVERTED','GL_AND','GL_AMBIENT_AND_DIFFUSE','GL_AMBIENT','GL_ALWAYS','GL_ALPHA_TEST_REF','GL_ALPHA_TEST_FUNC',
+            'GL_ALPHA_TEST','GL_ALPHA_SCALE','GL_ALPHA_BITS','GL_ALPHA_BIAS','GL_ALPHA8','GL_ALPHA4','GL_ALPHA16','GL_ALPHA12',
+            'GL_ALPHA','GL_ALL_ATTRIB_BITS','GL_ADD_SIGNED_EXT','GL_ADD_SIGNED','GL_ADD','GL_ACTIVE_TEXTURE_ARB','GL_ACTIVE_TEXTURE',
+            'GL_ACCUM_RED_BITS','GL_ACCUM_GREEN_BITS','GL_ACCUM_CLEAR_VALUE','GL_ACCUM_BUFFER_BIT','GL_ACCUM_BLUE_BITS','GL_ACCUM_ALPHA_BITS',
+            'GL_ACCUM','GL_4_BYTES','GL_4D_COLOR_TEXTURE','GL_3_BYTES','GL_3D_COLOR_TEXTURE','GL_3D_COLOR','GL_3D','GL_2_BYTES',
+            'GL_2D','GLU_V_STEP','GLU_VERTEX','GLU_VERSION_1_2','GLU_VERSION_1_1','GLU_VERSION','GLU_U_STEP','GLU_UNKNOWN','GLU_TRUE',
+            'GLU_TESS_WINDING_RULE','GLU_TESS_WINDING_POSITIVE','GLU_TESS_WINDING_ODD','GLU_TESS_WINDING_NONZERO','GLU_TESS_WINDING_NEGATIVE',
+            'GLU_TESS_WINDING_ABS_GEQ_TWO','GLU_TESS_VERTEX_DATA','GLU_TESS_VERTEX','GLU_TESS_TOLERANCE','GLU_TESS_NEED_COMBINE_CALLBACK','GLU_TESS_MISSING_END_POLYGON',
+            'GLU_TESS_MISSING_END_CONTOUR','GLU_TESS_MISSING_BEGIN_POLYGON','GLU_TESS_MISSING_BEGIN_CONTOUR','GLU_TESS_ERROR_DATA',
+            'GLU_TESS_ERROR8','GLU_TESS_ERROR7','GLU_TESS_ERROR6','GLU_TESS_ERROR5','GLU_TESS_ERROR4','GLU_TESS_ERROR3','GLU_TESS_ERROR2',
+            'GLU_TESS_ERROR1','GLU_TESS_ERROR','GLU_TESS_END_DATA','GLU_TESS_END','GLU_TESS_EDGE_FLAG_DATA','GLU_TESS_EDGE_FLAG',
+            'GLU_TESS_COORD_TOO_LARGE','GLU_TESS_COMBINE_DATA','GLU_TESS_COMBINE','GLU_TESS_BOUNDARY_ONLY','GLU_TESS_BEGIN_DATA',
+            'GLU_TESS_BEGIN','GLU_SMOOTH','GLU_SILHOUETTE','GLU_SAMPLING_TOLERANCE','GLU_SAMPLING_METHOD','GLU_POINT','GLU_PATH_LENGTH',
+            'GLU_PARAMETRIC_TOLERANCE','GLU_PARAMETRIC_ERROR','GLU_OUT_OF_MEMORY','GLU_OUTSIDE','GLU_OUTLINE_POLYGON','GLU_OUTLINE_PATCH',
+            'GLU_NURBS_ERROR9','GLU_NURBS_ERROR8','GLU_NURBS_ERROR7','GLU_NURBS_ERROR6','GLU_NURBS_ERROR5','GLU_NURBS_ERROR4',
+            'GLU_NURBS_ERROR37','GLU_NURBS_ERROR36','GLU_NURBS_ERROR35','GLU_NURBS_ERROR34','GLU_NURBS_ERROR33','GLU_NURBS_ERROR32',
+            'GLU_NURBS_ERROR31','GLU_NURBS_ERROR30','GLU_NURBS_ERROR3','GLU_NURBS_ERROR29','GLU_NURBS_ERROR28','GLU_NURBS_ERROR27','GLU_NURBS_ERROR26',
+            'GLU_NURBS_ERROR25','GLU_NURBS_ERROR24','GLU_NURBS_ERROR23','GLU_NURBS_ERROR22','GLU_NURBS_ERROR21','GLU_NURBS_ERROR20',
+            'GLU_NURBS_ERROR2','GLU_NURBS_ERROR19','GLU_NURBS_ERROR18','GLU_NURBS_ERROR17','GLU_NURBS_ERROR16','GLU_NURBS_ERROR15','GLU_NURBS_ERROR14',
+            'GLU_NURBS_ERROR13','GLU_NURBS_ERROR12','GLU_NURBS_ERROR11','GLU_NURBS_ERROR10','GLU_NURBS_ERROR1','GLU_NONE',
+            'GLU_MAP1_TRIM_3','GLU_MAP1_TRIM_2','GLU_LINE','GLU_INVALID_VALUE','GLU_INVALID_ENUM','GLU_INTERIOR','GLU_INSIDE','GLU_INCOMPATIBLE_GL_VERSION',
+            'GLU_FLAT','GLU_FILL','GLU_FALSE','GLU_EXTERIOR','GLU_EXTENSIONS','GLU_ERROR','GLU_END','GLU_EDGE_FLAG','GLU_DOMAIN_DISTANCE',
+            'GLU_DISPLAY_MODE','GLU_CW','GLU_CULLING','GLU_CCW','GLU_BEGIN','GLU_AUTO_LOAD_MATRIX','CHANNEL_UNORDERED','CHANNEL_ORDERED',
+            'CHANNEL_MAX'
+            ),
+        2 => array(
+
+            // Red Lowercase Keywords
+
+            'WriteWord','WriteString','WriteReal','WriteLine','WriteInt','WriteFloat','WriteDouble','WriteChar','WriteByte',
+            'windowwidth','windowheight','waittimer','Vec4','Vec3','Vec2','val','UpdateJoystick','ucase$','Transpose','tickcount',
+            'textscroll','textrows','textmode','textcols','tanh','tand','tan','synctimercatchup','synctimer','swapbuffers',
+            'str$','stopsoundvoice','stopsounds','stopmusic','sqrt','sqr','sprzorder','spryvel','sprytiles','sprysize','spryrepeat',
+            'spryflip','sprycentre','spry','sprxvel','sprxtiles','sprxsize','sprxrepeat','sprxflip','sprxcentre','sprx',
+            'sprvisible','sprvel','sprtype','sprtop','sprspin','sprsolid','sprsetzorder','sprsetyvel','sprsetysize','sprsetyrepeat',
+            'sprsetyflip','sprsetycentre','sprsety','sprsetxvel','sprsetxsize','sprsetxrepeat','sprsetxflip','sprsetxcentre',
+            'sprsetx','sprsetvisible','sprsetvel','sprsettiles','sprsettextures','sprsettexture','sprsetspin','sprsetsolid',
+            'sprsetsize','sprsetscale','sprsetpos','sprsetparallax','sprsetframe','sprsetcolor','sprsetanimspeed','sprsetanimloop',
+            'sprsetangle','sprsetalpha','sprscale','sprright','sprpos','sprparallax','sprleft','spriteareawidth','spriteareaheight',
+            'sprframe','sprcolor','sprcameraz','sprcameray','sprcamerax','sprcamerasetz','sprcamerasety','sprcamerasetx',
+            'sprcamerasetpos','sprcamerasetfov','sprcamerasetangle','sprcamerapos','sprcamerafov','sprcameraangle',
+            'sprbottom','spranimspeed','spranimloop','spranimdone','sprangle','spralpha','spraddtextures','spraddtexture',
+            'sounderror','sleep','sind','sin','showcursor','sgn','settextscroll','setmusicvolume','SendMessage','Seek',
+            'scankeydown','RTInvert','rnd','right$','resizetext','resizespritearea','RejectConnection','ReceiveMessage','ReadWord',
+            'ReadText','ReadReal','ReadLine','ReadInt','ReadFloat','ReadDouble','ReadChar','ReadByte','randomize','printr',
+            'print','pow','playsound','playmusic','performancecounter','Orthonormalize','OpenFileWrite','OpenFileRead','Normalize',
+            'newtilemap','newsprite','NewServer','NewConnection','musicplaying','mouse_yd','mouse_y','mouse_xd','mouse_x',
+            'mouse_wheel','mouse_button','mid$','MessageSmoothed','MessageReliable','MessagePending','MessageChannel','maxtextureunits',
+            'MatrixZero','MatrixTranslate','MatrixScale','MatrixRotateZ','MatrixRotateY','MatrixRotateX','MatrixRotate','MatrixIdentity',
+            'MatrixCrossProduct','MatrixBasis','log','locate','loadtexture','loadsound','loadmipmaptexture','loadmipmapimagestrip',
+            'loadimagestrip','loadimage','Length','len','left$','lcase$','keydown','Joy_Y','Joy_X','Joy_Up','Joy_Right','Joy_Left',
+            'Joy_Keys','Joy_Down','Joy_Button','Joy_3','Joy_2','Joy_1','Joy_0','int','inscankey','input$','inkey$','inittimer',
+            'imagewidth','imagestripframes','imageheight','imageformat','imagedatatype','hidecursor','glViewport','glVertex4sv',
+            'glVertex4s','glVertex4iv','glVertex4i','glVertex4fv','glVertex4f','glVertex4dv','glVertex4d','glVertex3sv','glVertex3s',
+            'glVertex3iv','glVertex3i','glVertex3fv','glVertex3f','glVertex3dv','glVertex3d','glVertex2sv','glVertex2s','glVertex2iv',
+            'glVertex2i','glVertex2fv','glVertex2f','glVertex2dv','glVertex2d','gluPerspective','gluOrtho2D','gluLookAt',
+            'glubuild2dmipmaps','glTranslatef','glTranslated','gltexsubimage2d','glTexParameteriv','glTexParameteri',
+            'glTexParameterfv','glTexParameterf','glteximage2d','glTexGeniv','glTexGeni','glTexGenfv','glTexGenf','glTexGendv',
+            'glTexGend','glTexEnviv','glTexEnvi','glTexEnvfv','glTexEnvf','glTexCoord4sv','glTexCoord4s','glTexCoord4iv','glTexCoord4i',
+            'glTexCoord4fv','glTexCoord4f','glTexCoord4dv','glTexCoord4d','glTexCoord3sv','glTexCoord3s','glTexCoord3iv','glTexCoord3i',
+            'glTexCoord3fv','glTexCoord3f','glTexCoord3dv','glTexCoord3d','glTexCoord2sv','glTexCoord2s','glTexCoord2iv','glTexCoord2i',
+            'glTexCoord2fv','glTexCoord2f','glTexCoord2dv','glTexCoord2d','glTexCoord1sv','glTexCoord1s','glTexCoord1iv','glTexCoord1i','glTexCoord1fv',
+            'glTexCoord1f','glTexCoord1dv','glTexCoord1d','glStencilOp','glStencilMask','glStencilFunc','glShadeModel','glSelectBuffer',
+            'glScissor','glScalef','glScaled','glRotatef','glRotated','glRenderMode','glRectsv','glRects','glRectiv','glRecti',
+            'glRectfv','glRectf','glRectdv','glRectd','glReadBuffer','glRasterPos4sv','glRasterPos4s','glRasterPos4iv',
+            'glRasterPos4i','glRasterPos4fv','glRasterPos4f','glRasterPos4dv','glRasterPos4d','glRasterPos3sv','glRasterPos3s',
+            'glRasterPos3iv','glRasterPos3i','glRasterPos3fv','glRasterPos3f','glRasterPos3dv','glRasterPos3d','glRasterPos2sv',
+            'glRasterPos2s','glRasterPos2iv','glRasterPos2i','glRasterPos2fv','glRasterPos2f','glRasterPos2dv','glRasterPos2d',
+            'glPushName','glPushMatrix','glPushClientAttrib','glPushAttrib','glPrioritizeTextures','glPopName','glPopMatrix',
+            'glPopClientAttrib','glPopAttrib','glpolygonstipple','glPolygonOffset','glPolygonMode','glPointSize','glPixelZoom',
+            'glPixelTransferi','glPixelTransferf','glPixelStorei','glPixelStoref','glPassThrough','glOrtho','glNormal3sv','glNormal3s',
+            'glNormal3iv','glNormal3i','glNormal3fv','glNormal3f','glNormal3dv','glNormal3d','glNormal3bv','glNormal3b','glNewList',
+            'glMultMatrixf','glMultMatrixd','glmultitexcoord2f','glmultitexcoord2d','glMatrixMode','glMaterialiv','glMateriali',
+            'glMaterialfv','glMaterialf','glMapGrid2f','glMapGrid2d','glMapGrid1f','glMapGrid1d','glLogicOp','glLoadName','glLoadMatrixf',
+            'glLoadMatrixd','glLoadIdentity','glListBase','glLineWidth','glLineStipple','glLightModeliv','glLightModeli','glLightModelfv',
+            'glLightModelf','glLightiv','glLighti','glLightfv','glLightf','glIsTexture','glIsList','glIsEnabled','glInitNames',
+            'glIndexubv','glIndexub','glIndexsv','glIndexs','glIndexMask','glIndexiv','glIndexi','glIndexfv','glIndexf','glIndexdv',
+            'glIndexd','glHint','glGetTexParameteriv','glGetTexParameterfv','glGetTexLevelParameteriv','glGetTexLevelParameterfv',
+            'glGetTexGeniv','glGetTexGenfv','glGetTexGendv','glGetTexEnviv','glGetTexEnvfv','glgetstring','glgetpolygonstipple','glGetPixelMapuiv',
+            'glGetMaterialiv','glGetMaterialfv','glGetLightiv','glGetLightfv','glGetIntegerv','glGetFloatv',
+            'glGetError','glGetDoublev','glGetClipPlane','glGetBooleanv','glgentextures','glgentexture',
+            'glgenlists','glFrustum','glFrontFace','glFogiv','glFogi','glFogfv','glFogf','glFlush','glFinish','glFeedbackBuffer',
+            'glEvalPoint2','glEvalPoint1','glEvalMesh2','glEvalMesh1','glEvalCoord2fv','glEvalCoord2f','glEvalCoord2dv','glEvalCoord2d',
+            'glEvalCoord1fv','glEvalCoord1f','glEvalCoord1dv','glEvalCoord1d','glEndList','glEnd','glEnableClientState','glEnable',
+            'glEdgeFlagv','glEdgeFlag','glDrawBuffer','glDrawArrays','glDisableClientState','glDisable','glDepthRange','glDepthMask',
+            'glDepthFunc','gldeletetextures','gldeletetexture','gldeletelists','glCullFace','glCopyTexSubImage2D','glCopyTexSubImage1D',
+            'glCopyTexImage2D','glCopyTexImage1D','glColorMaterial','glColorMask','glColor4usv','glColor4us','glColor4uiv','glColor4ui',
+            'glColor4ubv','glColor4ub','glColor4sv','glColor4s','glColor4iv','glColor4i','glColor4fv','glColor4f','glColor4dv',
+            'glColor4d','glColor4bv','glColor4b','glColor3usv','glColor3us','glColor3uiv','glColor3ui','glColor3ubv','glColor3ub',
+            'glColor3sv','glColor3s','glColor3iv','glColor3i','glColor3fv','glColor3f','glColor3dv','glColor3d','glColor3bv',
+            'glColor3b','glClipPlane','glClearStencil','glClearIndex','glClearDepth','glClearColor','glClearAccum','glClear',
+            'glcalllists','glCallList','glBlendFunc','glBindTexture','glBegin','glArrayElement','glAreTexturesResident',
+            'glAlphaFunc','glactivetexture','glAccum','font','FindNextFile','FindFirstFile','FindClose','FileError',
+            'extensionsupported','exp','execute','EndOfFile','drawtext','divbyzero','Determinant','deletesprite','deletesound',
+            'DeleteServer','deleteimage','DeleteConnection','defaultfont','CrossProduct','cosd','cos','copysprite','ConnectionPending',
+            'ConnectionHandShaking','ConnectionConnected','ConnectionAddress','compilererrorline','compilererrorcol','compilererror',
+            'compilefile','compile','color','cls','CloseFile','clearregion','clearline','clearkeys','chr$','charat$','bindsprite',
+            'beep','atnd','atn2d','atn2','atn','atand','asc','argcount','arg','animatesprites','AcceptConnection','abs'
+            ),
+        3 => array(
+
+            // Blue Lowercase Keywords
+
+            'xor','while','wend','until','type','traditional_print','traditional','to','then','struc','string','step','single',
+            'run','return','reset','read','or','null','not','next','lor','loop','language','land','integer','input','if',
+            'goto','gosub','for','endstruc','endif','end','elseif','else','double','do','dim','data','const','basic4gl','as',
+            'and','alloc'
+            )
+
+        ),
+    'SYMBOLS' => array(
+        '=', '<', '>', '>=', '<=', '+', '-', '*', '/', '%', '(', ')', '{', '}', '[', ']', '&', ';', ':', '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #FF0000;',
+            3 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #657CC4; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000080; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => 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
+);
+
+?>
diff --git a/sources/inc/geshi/bf.php b/sources/inc/geshi/bf.php
new file mode 100644
index 0000000..c06ca5b
--- /dev/null
+++ b/sources/inc/geshi/bf.php
@@ -0,0 +1,115 @@
+ '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: #660000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600;',
+            1 => 'color: #660000;',
+            2 => 'color: #000066;',
+            3 => 'color: #666600;',
+            4 => 'color: #660066;'
+            ),
+        '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,
+            'BRACKETS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            'DISALLOW_BEFORE' => '',
+            'DISALLOW_AFTER' => ''
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/bibtex.php b/sources/inc/geshi/bibtex.php
new file mode 100644
index 0000000..51cb4ce
--- /dev/null
+++ b/sources/inc/geshi/bibtex.php
@@ -0,0 +1,183 @@
+ 'BibTeX',
+    'OOLANG' => false,
+    'COMMENT_SINGLE' => array(
+        1 => '%%'
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        0 => array(
+            '@comment','@preamble','@string'
+            ),
+        // Standard entry types
+        1 => array(
+            '@article','@book','@booklet','@conference','@inbook',
+            '@incollection','@inproceedings','@manual','@mastersthesis',
+            '@misc','@phdthesis','@proceedings','@techreport','@unpublished'
+            ),
+        // Custom entry types
+        2 => array(
+            '@collection','@patent','@webpage'
+            ),
+        // Standard entry field names
+        3 => array(
+            'address','annote','author','booktitle','chapter','crossref',
+            'edition','editor','howpublished','institution','journal','key',
+            'month','note','number','organization','pages','publisher','school',
+            'series','title','type','volume','year'
+            ),
+        // Custom entry field names
+        4 => array(
+            'abstract','affiliation','chaptername','cited-by','cites',
+            'contents','copyright','date-added','date-modified','doi','eprint',
+            'isbn','issn','keywords','language','lccn','lib-congress',
+            'location','price','rating','read','size','source','url'
+            )
+        ),
+    'URLS' => array(
+        0 => '',
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'SYMBOLS' => array(
+        '{', '}', '#', '=', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        GESHI_COMMENTS => false,
+        ),
+    // Define the colors for the groups listed above
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #C02020;', // Standard entry types
+            2 => 'color: #C02020;', // Custom entry types
+            3 => 'color: #C08020;', // Standard entry field names
+            4 => 'color: #C08020;'  // Custom entry field names
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #2C922C; font-style: italic;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #2020C0;'
+            ),
+        'SYMBOLS' => array(
+            0 =>  'color: #E02020;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #2020C0;', // {...}
+            2 => 'color: #C08020;',  // BibDesk fields
+            3 => 'color: #800000;'   // LaTeX commands
+            ),
+        'ESCAPE_CHAR' => array(
+            0 =>  'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 =>  'color: #E02020;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'REGEXPS' => array(
+        // {parameters}
+        1 => array(
+            GESHI_SEARCH => "(?<=\\{)(?:\\{(?R)\\}|[^\\{\\}])*(?=\\})",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => "\bBdsk-(File|Url)-\d+",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => "\\\\[A-Za-z0-9]*+",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)'
+                ),
+            4 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)'
+                ),
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/blitzbasic.php b/sources/inc/geshi/blitzbasic.php
new file mode 100644
index 0000000..1d3c08d
--- /dev/null
+++ b/sources/inc/geshi/blitzbasic.php
@@ -0,0 +1,185 @@
+ 'BlitzBasic',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'If','EndIf','ElseIf','Else','While','Wend','Return','Next','Include','End Type','End Select','End If','End Function','End','Select',
+            'Type','Forever','For','Or','And','AppTitle','Case','Goto','Gosub','Step','Stop','Int','Last','False','Then','To','True','Until','Float',
+            'String','Before','Not'
+            ),
+        2 => array(
+            // All Functions - 2D BB and 3D BB
+            'Xor','WriteString','WriteShort','WritePixelFast','WritePixel','WriteLine','WriteInt','WriteFloat','WriteFile','WriteBytes',
+            'WriteByte','Write','WaitTimer','WaitMouse','WaitKey','WaitJoy','VWait','Viewport',
+            'Upper','UpdateGamma','UnlockBuffer','UDPTimeouts','UDPStreamPort','UDPStreamIP','UDPMsgPort','UDPMsgIP',
+            'Trim','TotalVidMem','TileImage','TileBlock','TFormImage','TFormFilter','Text',
+            'TCPTimeouts','TCPStreamPort','TCPStreamIP','Tan','SystemProperty','StringWidth','StringHeight','Str','StopNetGame',
+            'StopChannel','StartNetGame','Sqr','SoundVolume','SoundPitch','SoundPan','Sin','Shr',
+            'ShowPointer','Shl','Sgn','SetGfxDriver','SetGamma','SetFont','SetEnv','SetBuffer','SendUDPMsg','SendNetMsg',
+            'SeekFile','SeedRnd','ScanLine','ScaleImage','SaveImage','SaveBuffer','Sar','RuntimeError','RSet',
+            'RotateImage','RndSeed','Rnd','Right','ResumeChannel','Restore','ResizeImage','ResizeBank','Replace',
+            'Repeat','RecvUDPMsg','RecvNetMsg','RectsOverlap','Rect','ReadString','ReadShort','ReadPixelFast','ReadPixel','ReadLine',
+            'ReadInt','ReadFloat','ReadFile','ReadDir','ReadBytes','ReadByte','ReadAvail','Read','Rand','Print',
+            'PokeShort','PokeInt','PokeFloat','PokeByte','Plot','PlaySound','PlayMusic','PlayCDTrack','Pi','PeekShort',
+            'PeekInt','PeekFloat','PeekByte','PauseChannel','Oval','Origin','OpenTCPStream','OpenMovie','OpenFile',
+            'Null','NextFile','New','NetPlayerName','NetPlayerLocal','NetMsgType','NetMsgTo','NetMsgFrom',
+            'NetMsgData','MovieWidth','MoviePlaying','MovieHeight','MoveMouse','MouseZSpeed','MouseZ','MouseYSpeed','MouseY','MouseXSpeed',
+            'MouseX','MouseHit','MouseDown','Mod','Millisecs','MidHandle','Mid','MaskImage','LSet','Lower',
+            'LoopSound','Log10','Log','LockBuffer','Locate','Local','LoadSound','LoadImage','LoadFont','LoadBuffer',
+            'LoadAnimImage','Line','Len','Left','KeyHit','KeyDown','JoyZDir','JoyZ','JoyYDir',
+            'JoyYaw','JoyY','JoyXDir','JoyX','JoyVDir','JoyV','JoyUDir','JoyU','JoyType','JoyRoll',
+            'JoyPitch','JoyHit','JoyHat','JoyDown','JoinNetGame','Instr','Insert','Input',
+            'ImageYHandle','ImageXHandle','ImageWidth','ImagesOverlap','ImagesCollide','ImageRectOverlap','ImageRectCollide','ImageHeight','ImageBuffer',
+            'HostNetGame','HostIP','HidePointer','Hex','HandleImage','GraphicsWidth','GraphicsHeight','GraphicsDepth','GraphicsBuffer','Graphics',
+            'GrabImage','Global','GFXModeWidth','GFXModeHeight','GfxModeExists','GFXModeDepth','GfxDriverName','GetMouse',
+            'GetKey','GetJoy','GetEnv','GetColor','GammaRed','GammaGreen','GammaBlue','Function','FrontBuffer','FreeTimer',
+            'FreeSound','FreeImage','FreeFont','FreeBank','FontWidth','FontHeight','FlushMouse','FlushKeys',
+            'FlushJoy','Floor','Flip','First','FileType','FileSize','FilePos','Field',
+            'Exp','Exit','ExecFile','Eof','EndGraphics','Each','DrawMovie','DrawImageRect','DrawImage','DrawBlockRect','DrawBlock',
+            'DottedIP','Dim','DeleteNetPlayer','DeleteFile','DeleteDir','Delete','Delay','Default','DebugLog','Data',
+            'CurrentTime','CurrentDir','CurrentDate','CreateUDPStream','CreateTimer','CreateTCPServer','CreateNetPlayer','CreateImage','CreateDir','CreateBank',
+            'CountHostIPs','CountGFXModes','CountGfxDrivers','Cos','CopyStream','CopyRect','CopyPixelFast','CopyPixel','CopyImage','CopyFile',
+            'CopyBank','Const','CommandLine','ColorRed','ColorGreen','ColorBlue','Color','ClsColor','Cls','CloseUDPStream',
+            'CloseTCPStream','CloseTCPServer','CloseMovie','CloseFile','CloseDir','Chr','ChannelVolume','ChannelPlaying','ChannelPitch','ChannelPan',
+            'ChangeDir','Ceil','CallDLL','Bin','BankSize','BackBuffer','AvailVidMem','AutoMidHandle',
+            'ATan2','ATan','ASin','Asc','After','ACos','AcceptTCPStream','Abs',
+            // 3D Commands
+            'Wireframe','Windowed3D','WBuffer','VertexZ','VertexY',
+            'VertexX','VertexW','VertexV','VertexU','VertexTexCoords','VertexRed','VertexNZ','VertexNY','VertexNX','VertexNormal',
+            'VertexGreen','VertexCoords','VertexColor','VertexBlue','VertexAlpha','VectorYaw','VectorPitch','UpdateWorld','UpdateNormals','TurnEntity',
+            'TrisRendered','TriangleVertex','TranslateEntity','TFormVector','TFormPoint','TFormNormal','TFormedZ','TFormedY','TFormedX','TextureWidth',
+            'TextureName','TextureHeight','TextureFilter','TextureCoords','TextureBuffer','TextureBlend','TerrainZ','TerrainY','TerrainX','TerrainSize',
+            'TerrainShading','TerrainHeight','TerrainDetail','SpriteViewMode','ShowEntity','SetCubeFace','SetAnimTime','SetAnimKey','ScaleTexture','ScaleSprite',
+            'ScaleMesh','ScaleEntity','RotateTexture','RotateSprite','RotateMesh','RotateEntity','ResetEntity','RenderWorld','ProjectedZ','ProjectedY',
+            'ProjectedX','PositionTexture','PositionMesh','PositionEntity','PointEntity','PickedZ','PickedY','PickedX','PickedTriangle','PickedTime',
+            'PickedSurface','PickedNZ','PickedNY','PickedNX','PickedEntity','PaintSurface','PaintMesh','PaintEntity','NameEntity','MoveEntity',
+            'ModifyTerrain','MeshWidth','MeshHeight','MeshesIntersect','MeshDepth','MD2AnimTime','MD2AnimLength','MD2Animating','LoadTexture','LoadTerrain',
+            'LoadSprite','LoadMesh','LoadMD2','LoaderMatrix','LoadBSP','LoadBrush','LoadAnimTexture','LoadAnimSeq','LoadAnimMesh','Load3DSound',
+            'LinePick','LightRange','LightMesh','LightConeAngles','LightColor','HWMultiTex','HideEntity','HandleSprite','Graphics3D','GfxMode3DExists',
+            'GfxMode3D','GfxDriverCaps3D','GfxDriver3D','GetSurfaceBrush','GetSurface','GetParent','GetMatElement','GetEntityType','GetEntityBrush','GetChild',
+            'GetBrushTexture','FreeTexture','FreeEntity','FreeBrush','FlipMesh','FitMesh','FindSurface','FindChild','ExtractAnimSeq','EntityZ',
+            'EntityYaw','EntityY','EntityX','EntityVisible','EntityType','EntityTexture','EntityShininess','EntityRoll','EntityRadius','EntityPitch',
+            'EntityPickMode','EntityPick','EntityParent','EntityOrder','EntityName','EntityInView','EntityFX','EntityDistance','EntityColor','EntityCollided',
+            'EntityBox','EntityBlend','EntityAutoFade','EntityAlpha','EmitSound','Dither','DeltaYaw','DeltaPitch','CreateTexture','CreateTerrain',
+            'CreateSurface','CreateSprite','CreateSphere','CreatePlane','CreatePivot','CreateMirror','CreateMesh','CreateListener','CreateLight','CreateCylinder',
+            'CreateCube','CreateCone','CreateCamera','CreateBrush','CountVertices','CountTriangles','CountSurfaces','CountGfxModes3D','CountCollisions','CountChildren',
+            'CopyMesh','CopyEntity','CollisionZ','CollisionY','CollisionX','CollisionTriangle','CollisionTime','CollisionSurface','Collisions','CollisionNZ',
+            'CollisionNY','CollisionNX','CollisionEntity','ClearWorld','ClearTextureFilters','ClearSurface','ClearCollisions','CaptureWorld','CameraZoom','CameraViewport',
+            'CameraRange','CameraProjMode','CameraProject','CameraPick','CameraFogRange','CameraFogMode','CameraFogColor','CameraClsMode','CameraClsColor','BSPLighting',
+            'BSPAmbientLight','BrushTexture','BrushShininess','BrushFX','BrushColor','BrushBlend','BrushAlpha','AntiAlias','AnimTime','AnimSeq',
+            'AnimLength','Animating','AnimateMD2','Animate','AmbientLight','AlignToVector','AddVertex','AddTriangle','AddMesh','AddAnimSeq',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(',')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #D9D100; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '\\'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/bnf.php b/sources/inc/geshi/bnf.php
new file mode 100644
index 0000000..ca15cf9
--- /dev/null
+++ b/sources/inc/geshi/bnf.php
@@ -0,0 +1,119 @@
+ 'bnf',
+    'COMMENT_SINGLE' => array(';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(),
+    'SYMBOLS' => array(
+        0 => array('(', ')'),
+        1 => array('<', '>'),
+        2 => array('[', ']'),
+        3 => array('{', '}'),
+        4 => array('=', '*', '/', '|', ':'),
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;', // Single Line comments
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a00;',
+            1 => 'color: #a00;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight: bold;', // Round brackets
+            1 => 'color: #000066; font-weight: bold;', // Angel Brackets
+            2 => 'color: #000066; font-weight: bold;', // Square Brackets
+            3 => 'color: #000066; font-weight: bold;', // BRaces
+            4 => 'color: #006600; font-weight: bold;', // Other operator symbols
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #007;',
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        //terminal symbols
+        0 => array(
+            GESHI_SEARCH => '(<)([^&]+?)(>)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/boo.php b/sources/inc/geshi/boo.php
new file mode 100644
index 0000000..b68d442
--- /dev/null
+++ b/sources/inc/geshi/boo.php
@@ -0,0 +1,217 @@
+ 'Boo',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'''", "'", '"""', '"'),
+    'HARDQUOTE' => array('"""', '"""'),
+    'HARDESCAPE' => array('\"""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//Namespace
+            'namespace', 'import', 'from'
+            ),
+        2 => array(//Jump
+            'yield', 'return', 'goto', 'continue', 'break'
+            ),
+        3 => array(//Conditional
+            'while', 'unless', 'then', 'in', 'if', 'for', 'else', 'elif'
+            ),
+        4 => array(//Property
+            'set', 'get'
+            ),
+        5 => array(//Exception
+            'try', 'raise', 'failure', 'except', 'ensure'
+            ),
+        6 => array(//Visibility
+            'public', 'private', 'protected', 'internal'
+            ),
+        7 => array(//Define
+            'struct', 'ref', 'of', 'interface', 'event', 'enum', 'do', 'destructor', 'def', 'constructor', 'class'
+            ),
+        8 => array(//Cast
+            'typeof', 'cast', 'as'
+            ),
+        9 => array(//BiMacro
+            'yieldAll', 'using', 'unchecked', 'rawArayIndexing', 'print', 'normalArrayIndexing', 'lock',
+            'debug', 'checked', 'assert'
+            ),
+        10 => array(//BiAttr
+            'required', 'property', 'meta', 'getter', 'default'
+            ),
+        11 => array(//BiFunc
+            'zip', 'shellp', 'shellm', 'shell', 'reversed', 'range', 'prompt',
+            'matrix', 'map', 'len', 'join', 'iterator', 'gets', 'enumerate', 'cat', 'array'
+            ),
+        12 => array(//HiFunc
+            '__switch__', '__initobj__', '__eval__', '__addressof__', 'quack'
+            ),
+        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'
+            ),
+        14 => array(//Operator
+            'not', 'or', 'and', 'is', 'isa',
+            ),
+        15 => array(//Modifier
+            'virtual', 'transient', 'static', 'partial', 'override', 'final', 'abstract'
+            ),
+        16 => array(//Access
+            'super', 'self'
+            ),
+        17 => array(//Pass
+            'pass'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[|', '|]', '${', '(', ')', '[', ']', '{', '}', '!', '@', '%', '&', '*', '|', '/', '<', '>', '+', '-', ';'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        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(
+            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;',
+            2 => 'color: #999999; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #0000FF; font-weight: bold;',
+            'HARD' => 'color: #0000FF; font-weight: bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;',
+            'HARD' => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            0 => 'color: 000000;',
+            1 => 'color: 000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006400;'
+            ),
+        'REGEXPS' => array(
+            #0 => 'color: #0066ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => '',
+        17 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        0 => '.',
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        #0 => '%(@)?\/(?:(?(1)[^\/\\\\\r\n]+|[^\/\\\\\r\n \t]+)|\\\\[\/\\\\\w+()|.*?$^[\]{}\d])+\/%'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/c.php b/sources/inc/geshi/c.php
new file mode 100644
index 0000000..35d5b01
--- /dev/null
+++ b/sources/inc/geshi/c.php
@@ -0,0 +1,281 @@
+ 'C',
+    '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' => '',
+    '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',
+            'do', 'else', 'for', 'switch', 'goto'
+            ),
+        2 => array(
+            'null', 'false', 'break', 'true', 'function', 'enum', 'extern', 'inline'
+            ),
+        3 => array(
+            // assert.h
+            'assert',
+
+            //complex.h
+            'cabs', 'cacos', 'cacosh', 'carg', 'casin', 'casinh', 'catan',
+            'catanh', 'ccos', 'ccosh', 'cexp', 'cimag', 'cis', 'clog', 'conj',
+            'cpow', 'cproj', 'creal', 'csin', 'csinh', 'csqrt', 'ctan', 'ctanh',
+
+            //ctype.h
+            'digittoint', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl',
+            'isdigit', 'isgraph', 'islower', 'isprint', 'ispunct', 'isspace',
+            'isupper', 'isxdigit', 'toascii', 'tolower', 'toupper',
+
+            //inttypes.h
+            'imaxabs', 'imaxdiv', 'strtoimax', 'strtoumax', 'wcstoimax',
+            'wcstoumax',
+
+            //locale.h
+            'localeconv', 'setlocale',
+
+            //math.h
+            'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
+            'fabs', 'floor', 'frexp', 'ldexp', 'log', 'log10', 'modf', 'pow',
+            'sin', 'sinh', 'sqrt', 'tan', 'tanh',
+
+            //setjmp.h
+            'longjmp', 'setjmp',
+
+            //signal.h
+            'raise',
+
+            //stdarg.h
+            'va_arg', 'va_copy', 'va_end', 'va_start',
+
+            //stddef.h
+            'offsetof',
+
+            //stdio.h
+            'clearerr', 'fclose', 'fdopen', 'feof', 'ferror', 'fflush', 'fgetc',
+            'fgetpos', 'fgets', 'fopen', 'fprintf', 'fputc', 'fputchar',
+            'fputs', 'fread', 'freopen', 'fscanf', 'fseek', 'fsetpos', 'ftell',
+            'fwrite', 'getc', 'getch', 'getchar', 'gets', 'perror', 'printf',
+            'putc', 'putchar', 'puts', 'remove', 'rename', 'rewind', 'scanf',
+            'setbuf', 'setvbuf', 'snprintf', 'sprintf', 'sscanf', 'tmpfile',
+            'tmpnam', 'ungetc', 'vfprintf', 'vfscanf', 'vprintf', 'vscanf',
+            'vsprintf', 'vsscanf',
+
+            //stdlib.h
+            'abort', 'abs', 'atexit', 'atof', 'atoi', 'atol', 'bsearch',
+            'calloc', 'div', 'exit', 'free', 'getenv', 'itoa', 'labs', 'ldiv',
+            'ltoa', 'malloc', 'qsort', 'rand', 'realloc', 'srand', 'strtod',
+            'strtol', 'strtoul', 'system',
+
+            //string.h
+            'memchr', 'memcmp', 'memcpy', 'memmove', 'memset', 'strcat',
+            'strchr', 'strcmp', 'strcoll', 'strcpy', 'strcspn', 'strerror',
+            'strlen', 'strncat', 'strncmp', 'strncpy', 'strpbrk', 'strrchr',
+            'strspn', 'strstr', 'strtok', 'strxfrm',
+
+            //time.h
+            'asctime', 'clock', 'ctime', 'difftime', 'gmtime', 'localtime',
+            'mktime', 'strftime', 'time',
+
+            //wchar.h
+            'btowc', 'fgetwc', 'fgetws', 'fputwc', 'fputws', 'fwide',
+            'fwprintf', 'fwscanf', 'getwc', 'getwchar', 'mbrlen', 'mbrtowc',
+            'mbsinit', 'mbsrtowcs', 'putwc', 'putwchar', 'swprintf', 'swscanf',
+            'ungetwc', 'vfwprintf', 'vswprintf', 'vwprintf', 'wcrtomb',
+            'wcscat', 'wcschr', 'wcscmp', 'wcscoll', 'wcscpy', 'wcscspn',
+            'wcsftime', 'wcslen', 'wcsncat', 'wcsncmp', 'wcsncpy', 'wcspbrk',
+            'wcsrchr', 'wcsrtombs', 'wcsspn', 'wcsstr', 'wcstod', 'wcstok',
+            'wcstol', 'wcstoul', 'wcsxfrm', 'wctob', 'wmemchr', 'wmemcmp',
+            'wmemcpy', 'wmemmove', 'wmemset', 'wprintf', 'wscanf',
+
+            //wctype.h
+            'iswalnum', 'iswalpha', 'iswcntrl', 'iswctype', 'iswdigit',
+            'iswgraph', 'iswlower', 'iswprint', 'iswpunct', 'iswspace',
+            'iswupper', 'iswxdigit', 'towctrans', 'towlower', 'towupper',
+            'wctrans', 'wctype'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
+            'size_t', 'off_t'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>',
+        '!', '^', '&', '|',
+        '?', ':',
+        ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; 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: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/c_loadrunner.php b/sources/inc/geshi/c_loadrunner.php
new file mode 100644
index 0000000..42b3d77
--- /dev/null
+++ b/sources/inc/geshi/c_loadrunner.php
@@ -0,0 +1,323 @@
+ 'C (LoadRunner)',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    // Escape characters within strings (like \\) are not highlighted differently in LoadRunner, so
+    // I am using GeSHi escape characters (or regular expressions) to highlight LoadRunner {parameters}.
+    // LoadRunner {parameters} must begin with a letter and contain only alphanumeric characters and '_'
+    'ESCAPE_REGEXP' => array(
+        0 => "#\{[a-zA-Z]{1}[a-zA-Z_]{0,}\}#",
+    ),
+
+    // Keywords
+    'KEYWORDS' => array(
+        // Keywords from http://en.wikipedia.org/wiki/C_syntax
+        1 => array(
+            'auto', 'break', 'case', 'char', 'const', 'continue', 'default',
+            'do', 'double', 'else', 'enum', 'extern', 'float', 'for', 'goto',
+            'if', 'inline', 'int', 'long', 'register', 'restrict', 'return',
+            'short', 'signed', 'sizeof', 'static', 'struct', 'switch',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'while',
+            '_Bool', '_Complex', '_Imaginary'
+            ),
+        // C preprocessor directives from http://en.wikipedia.org/wiki/C_preprocessor
+        2 => array(
+            '#define', '#if', '#ifdef', '#ifndef', '#include', '#else', '#elif', '#endif', '#pragma', '#undef'
+            ),
+        // Functions from lrun.h
+        3 => array(
+            'lr_start_transaction', 'lr_start_sub_transaction', 'lr_start_transaction_instance', 'lr_end_transaction',
+            'lr_end_sub_transaction', 'lr_end_transaction_instance', 'lr_stop_transaction', 'lr_stop_transaction_instance',
+            'lr_resume_transaction', 'lr_resume_transaction_instance', 'lr_wasted_time', 'lr_set_transaction', 'lr_user_data_point',
+            'lr_user_data_point_instance', 'lr_user_data_point_ex', 'lr_user_data_point_instance_ex', 'lr_get_transaction_duration',
+            'lr_get_trans_instance_duration', 'lr_get_transaction_think_time', 'lr_get_trans_instance_think_time',
+            'lr_get_transaction_wasted_time', 'lr_get_trans_instance_wasted_time', 'lr_get_transaction_status',
+            'lr_get_trans_instance_status', 'lr_set_transaction_status', 'lr_set_transaction_status_by_name',
+            'lr_set_transaction_instance_status', 'lr_start_timer', 'lr_end_timer', 'lr_rendezvous', 'lr_rendezvous_ex',
+            'lr_get_vuser_ip', 'lr_whoami', 'lr_get_host_name', 'lr_get_master_host_name', 'lr_get_attrib_long',
+            'lr_get_attrib_string', 'lr_get_attrib_double', 'lr_paramarr_idx', 'lr_paramarr_random', 'lr_paramarr_len',
+            'lr_param_unique', 'lr_param_sprintf', 'lr_load_dll', 'lr_continue_on_error', 'lr_decrypt', 'lr_abort', 'lr_exit',
+            'lr_peek_events', 'lr_think_time', 'lr_debug_message', 'lr_log_message', 'lr_message', 'lr_error_message',
+            'lr_output_message', 'lr_vuser_status_message', 'lr_fail_trans_with_error', 'lr_next_row', 'lr_advance_param',
+            'lr_eval_string', 'lr_eval_string_ext', 'lr_eval_string_ext_free', 'lr_param_increment', 'lr_save_var',
+            'lr_save_string', 'lr_save_int', 'lr_save_datetime', 'lr_save_searched_string', 'lr_set_debug_message',
+            'lr_get_debug_message', 'lr_enable_ip_spoofing', 'lr_disable_ip_spoofing', 'lr_convert_string_encoding'
+            ),
+        // Constants from lrun.h
+        4 => array(
+            'DP_FLAGS_NO_LOG', 'DP_FLAGS_STANDARD_LOG', 'DP_FLAGS_EXTENDED_LOG', 'merc_timer_handle_t', 'LR_EXIT_VUSER',
+            'LR_EXIT_ACTION_AND_CONTINUE', 'LR_EXIT_ITERATION_AND_CONTINUE', 'LR_EXIT_VUSER_AFTER_ITERATION',
+            'LR_EXIT_VUSER_AFTER_ACTION', 'LR_EXIT_MAIN_ITERATION_AND_CONTINUE', 'LR_MSG_CLASS_DISABLE_LOG',
+            'LR_MSG_CLASS_STANDARD_LOG', 'LR_MSG_CLASS_RETURNED_DATA', 'LR_MSG_CLASS_PARAMETERS', 'LR_MSG_CLASS_ADVANCED_TRACE',
+            'LR_MSG_CLASS_EXTENDED_LOG', 'LR_MSG_CLASS_SENT_DATA', 'LR_MSG_CLASS_JIT_LOG_ON_ERROR', 'LR_SWITCH_OFF', 'LR_SWITCH_ON',
+            'LR_SWITCH_DEFAULT', 'ONE_DAY', 'ONE_HOUR', 'ONE_MIN', 'DATE_NOW', 'TIME_NOW', 'LR_MSG_CLASS_BRIEF_LOG',
+            'LR_MSG_CLASS_RESULT_DATA', 'LR_MSG_CLASS_FULL_TRACE', 'LR_MSG_CLASS_AUTO_LOG', 'LR_MSG_OFF', 'LR_MSG_ON',
+            'LR_MSG_DEFAULT'
+            ),
+        // Functions from web_api.h
+        5 => array(
+            'web_reg_add_cookie', 'web_report_data_point', 'web_text_link', 'web_element', 'web_image_link', 'web_static_image',
+            'web_image_submit', 'web_button', 'web_edit_field', 'web_radio_group', 'web_check_box', 'web_list', 'web_text_area',
+            'web_map_area', 'web_eval_java_script', 'web_reg_dialog', 'web_reg_cross_step_download', 'web_browser',
+            'web_set_rts_key', 'web_save_param_length', 'web_save_timestamp_param', 'web_load_cache', 'web_dump_cache',
+            'web_add_cookie_ex'
+            ),
+        // Constants from web_api.h
+        6 => array(
+            'DESCRIPTION', 'ACTION', 'VERIFICATION', 'LR_NOT_FOUND', 'HTTP_INFO_TOTAL_REQUEST_STAT',
+            'HTTP_INFO_TOTAL_RESPONSE_STAT', 'LRW_OPT_STOP_VUSER_ON_ERROR', 'LRW_OPT_DISPLAY_IMAGE_BODY'
+            ),
+        // Functions from as_web.h
+        7 => array(
+            'web_add_filter', 'web_add_auto_filter', 'web_add_auto_header', 'web_add_header', 'web_add_cookie',
+            'web_cleanup_auto_headers', 'web_cleanup_cookies', 'web_concurrent_end', 'web_concurrent_start', 'web_create_html_param',
+            'web_create_html_param_ex', 'web_custom_request', 'web_disable_keep_alive', 'web_enable_keep_alive', 'web_find',
+            'web_get_int_property', 'web_image', 'web_image_check', 'web_link', 'web_global_verification', 'web_reg_find',
+            'web_reg_save_param', 'web_convert_param', 'web_remove_auto_filter', 'web_remove_auto_header', 'web_revert_auto_header',
+            'web_remove_cookie', 'web_save_header', 'web_set_certificate', 'web_set_certificate_ex', 'web_set_connections_limit',
+            'web_set_max_html_param_len', 'web_set_max_retries', 'web_set_proxy', 'web_set_proxy_bypass', 'web_set_secure_proxy',
+            'web_set_sockets_option', 'web_set_option', 'web_set_timeout', 'web_set_user', 'web_sjis_to_euc_param',
+            'web_submit_data', 'web_submit_form', 'web_url', 'web_set_proxy_bypass_local', 'web_cache_cleanup',
+            'web_create_html_query', 'web_create_radio_button_param', 'web_switch_net_layer'
+            ),
+        // Constants from as_web.h
+        8 => array(
+            'ENDFORM', 'LAST', 'ENDITEM', 'EXTRARES', 'ITEMDATA', 'STARTHIDDENS', 'ENDHIDDENS', 'CONNECT', 'RECEIVE', 'RESOLVE',
+            'STEP', 'REQUEST', 'RESPONSE', 'STARTQUERY', 'ENDQUERY', 'INPROPS', 'OUTPROPS', 'ENDPROPS', 'RAW_BODY_START',
+            'RAW_BODY_END', 'HTTP_INFO_RETURN_CODE', 'HTTP_INFO_DOWNLOAD_SIZE', 'HTTP_INFO_DOWNLOAD_TIME',
+            'LRW_NET_SOCKET_OPT_LOAD_VERIFY_FILE', 'LRW_NET_SOCKET_OPT_DEFAULT_VERIFY_PATH', 'LRW_NET_SOCKET_OPT_SSL_VERSION',
+            'LRW_NET_SOCKET_OPT_SSL_CIPHER_LIST', 'LRW_NET_SOCKET_OPT_SO_REUSE_ADDRESS', 'LRW_NET_SOCKET_OPT_USER_IP_ADDRESS',
+            'LRW_NET_SOCKET_OPT_IP_ADDRESS_BY_INDEX', 'LRW_NET_SOCKET_OPT_HELP', 'LRW_NET_SOCKET_OPT_PRINT_USER_IP_ADDRESS_LIST',
+            'LRW_OPT_HTML_CHAR_REF_BACKWARD_COMPATIBILITY', 'LRW_OPT_VALUE_YES', 'LRW_OPT_VALUE_NO'
+            ),
+        // Functions from as_sapgui.h
+        9 => array(
+            'sapgui_open_connection', 'sapgui_open_connection_ex', 'sapgui_logon', 'sapgui_create_session',
+            'sapgui_create_new_session', 'sapgui_call_method', 'sapgui_call_method_ex', 'sapgui_set_property',
+            'sapgui_get_property', 'sapgui_set_collection_property', 'sapgui_active_object_from_parent_method',
+            'sapgui_active_object_from_parent_property', 'sapgui_call_method_of_active_object',
+            'sapgui_call_method_of_active_object_ex', 'sapgui_set_property_of_active_object', 'sapgui_get_property_of_active_object',
+            'sapgui_select_active_connection', 'sapgui_select_active_session', 'sapgui_select_active_window ',
+            'sapgui_status_bar_get_text', 'sapgui_status_bar_get_param', 'sapgui_status_bar_get_type', 'sapgui_get_status_bar_text',
+            'sapgui_get_active_window_title', 'sapgui_is_object_available', 'sapgui_is_tab_selected', 'sapgui_is_object_changeable',
+            'sapgui_set_ok_code', 'sapgui_send_vkey', 'sapgui_resize_window', 'sapgui_window_resize', 'sapgui_window_maximize',
+            'sapgui_window_close', 'sapgui_window_restore', 'sapgui_window_scroll_to_row', 'sapgui_press_button',
+            'sapgui_select_radio_button', 'sapgui_set_password', 'sapgui_set_text', 'sapgui_select_menu', 'sapgui_select_tab',
+            'sapgui_set_checkbox', 'sapgui_set_focus', 'sapgui_select_combobox_entry', 'sapgui_get_ok_code',
+            'sapgui_is_radio_button_selected', 'sapgui_get_text', 'sapgui_is_checkbox_selected', 'sapgui_table_set_focus',
+            'sapgui_table_press_button', 'sapgui_table_select_radio_button', 'sapgui_table_set_password', 'sapgui_table_set_text',
+            'sapgui_table_set_checkbox', 'sapgui_table_select_combobox_entry', 'sapgui_table_set_row_selected',
+            'sapgui_table_set_column_selected', 'sapgui_table_set_column_width', 'sapgui_table_reorder', 'sapgui_table_fill_data',
+            'sapgui_table_get_text', 'sapgui_table_is_radio_button_selected', 'sapgui_table_is_checkbox_selected',
+            'sapgui_table_is_row_selected', 'sapgui_table_is_column_selected', 'sapgui_table_get_column_width',
+            'sapgui_grid_clear_selection', 'sapgui_grid_select_all', 'sapgui_grid_selection_changed',
+            'sapgui_grid_press_column_header', 'sapgui_grid_select_cell', 'sapgui_grid_select_rows', 'sapgui_grid_select_column',
+            'sapgui_grid_deselect_column', 'sapgui_grid_select_columns', 'sapgui_grid_select_cells', 'sapgui_grid_select_cell_row',
+            'sapgui_grid_select_cell_column', 'sapgui_grid_set_column_order', 'sapgui_grid_set_column_width',
+            'sapgui_grid_scroll_to_row', 'sapgui_grid_double_click', 'sapgui_grid_click', 'sapgui_grid_press_button',
+            'sapgui_grid_press_total_row', 'sapgui_grid_set_cell_data', 'sapgui_grid_set_checkbox',
+            'sapgui_grid_double_click_current_cell', 'sapgui_grid_click_current_cell', 'sapgui_grid_press_button_current_cell',
+            'sapgui_grid_press_total_row_current_cell', 'sapgui_grid_press_F1', 'sapgui_grid_press_F4', 'sapgui_grid_press_ENTER',
+            'sapgui_grid_press_toolbar_button', 'sapgui_grid_press_toolbar_context_button', 'sapgui_grid_open_context_menu',
+            'sapgui_grid_select_context_menu', 'sapgui_grid_select_toolbar_menu', 'sapgui_grid_fill_data',
+            'sapgui_grid_get_current_cell_row', 'sapgui_grid_get_current_cell_column', 'sapgui_grid_get_rows_count',
+            'sapgui_grid_get_columns_count', 'sapgui_grid_get_cell_data', 'sapgui_grid_is_checkbox_selected',
+            'sapgui_tree_scroll_to_node', 'sapgui_tree_set_hierarchy_header_width', 'sapgui_tree_set_selected_node',
+            'sapgui_tree_double_click_node', 'sapgui_tree_press_key', 'sapgui_tree_press_button', 'sapgui_tree_set_checkbox',
+            'sapgui_tree_double_click_item', 'sapgui_tree_click_link', 'sapgui_tree_open_default_context_menu',
+            'sapgui_tree_open_node_context_menu', 'sapgui_tree_open_header_context_menu', 'sapgui_tree_open_item_context_menu',
+            'sapgui_tree_select_context_menu', 'sapgui_tree_select_item', 'sapgui_tree_select_node', 'sapgui_tree_unselect_node',
+            'sapgui_tree_unselect_all', 'sapgui_tree_select_column', 'sapgui_tree_unselect_column', 'sapgui_tree_set_column_order',
+            'sapgui_tree_collapse_node', 'sapgui_tree_expand_node', 'sapgui_tree_scroll_to_item', 'sapgui_tree_set_column_width',
+            'sapgui_tree_press_header', 'sapgui_tree_is_checkbox_selected', 'sapgui_tree_get_node_text', 'sapgui_tree_get_item_text',
+            'sapgui_calendar_scroll_to_date', 'sapgui_calendar_focus_date', 'sapgui_calendar_select_interval',
+            'sapgui_apogrid_select_all', 'sapgui_apogrid_clear_selection', 'sapgui_apogrid_select_cell',
+            'sapgui_apogrid_deselect_cell', 'sapgui_apogrid_select_row', 'sapgui_apogrid_deselect_row',
+            'sapgui_apogrid_select_column', 'sapgui_apogrid_deselect_column', 'sapgui_apogrid_scroll_to_row',
+            'sapgui_apogrid_scroll_to_column', 'sapgui_apogrid_double_click', 'sapgui_apogrid_set_cell_data',
+            'sapgui_apogrid_get_cell_data', 'sapgui_apogrid_is_cell_changeable', 'sapgui_apogrid_get_cell_format',
+            'sapgui_apogrid_get_cell_tooltip', 'sapgui_apogrid_press_ENTER', 'sapgui_apogrid_open_cell_context_menu',
+            'sapgui_apogrid_select_context_menu_item', 'sapgui_text_edit_scroll_to_line', 'sapgui_text_edit_set_selection_indexes',
+            'sapgui_text_edit_set_unprotected_text_part', 'sapgui_text_edit_get_first_visible_line',
+            'sapgui_text_edit_get_selection_index_start', 'sapgui_text_edit_get_selection_index_end',
+            'sapgui_text_edit_get_number_of_unprotected_text_parts', 'sapgui_text_edit_double_click',
+            'sapgui_text_edit_single_file_dropped', 'sapgui_text_edit_multiple_files_dropped', 'sapgui_text_edit_press_F1',
+            'sapgui_text_edit_press_F4', 'sapgui_text_edit_open_context_menu', 'sapgui_text_edit_select_context_menu',
+            'sapgui_text_edit_modified_status_changed', 'sapgui_htmlviewer_send_event', 'sapgui_htmlviewer_dom_get_property',
+            'sapgui_toolbar_press_button', 'sapgui_toolbar_press_context_button', 'sapgui_toolbar_select_menu_item',
+            'sapgui_toolbar_select_menu_item_by_text', 'sapgui_toolbar_select_context_menu_item',
+            'sapgui_toolbar_select_context_menu_item_by_text'
+            ),
+        // Constants from as_sapgui.h
+        10 => array(
+            'BEGIN_OPTIONAL', 'END_OPTIONAL', 'al-keys', 'ENTER', 'HELP', 'F2', 'BACK', 'F4', 'F5', 'F6', 'F7', 'F8', 'F9',
+            'F10', 'F11', 'ESC', 'SHIFT_F1', 'SHIFT_F2', 'SHIFT_F3', 'SHIFT_F4', 'SHIFT_F5', 'SHIFT_F6', 'SHIFT_F7', 'SHIFT_F8',
+            'SHIFT_F9', 'SHIFT_F10', 'SHIFT_F11', 'SHIFT_F12', 'CTRL_F1', 'CTRL_F2', 'CTRL_F3', 'CTRL_F4', 'CTRL_F5', 'CTRL_F6',
+            'CTRL_F7', 'CTRL_F8', 'CTRL_F9', 'CTRL_F10', 'CTRL_F11', 'CTRL_F12', 'CTRL_SHIFT_F1', 'CTRL_SHIFT_F2', 'CTRL_SHIFT_F3',
+            'CTRL_SHIFT_F4', 'CTRL_SHIFT_F5', 'CTRL_SHIFT_F6', 'CTRL_SHIFT_F7', 'CTRL_SHIFT_F8', 'CTRL_SHIFT_F9', 'CTRL_SHIFT_F10',
+            'CTRL_SHIFT_F11', 'CTRL_SHIFT_F12', 'CANCEL', 'CTRL_F', 'CTRL_PAGE_UP', 'PAGE_UP', 'PAGE_DOWN', 'CTRL_PAGE_DOWN',
+            'CTRL_G', 'CTRL_P'
+            ),
+        ),
+
+    // Symbols and Case Sensitivity
+    // Symbols from: http://en.wikipedia.org/wiki/C_syntax
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true, // Standard C reserved keywords
+        2 => true, // C preprocessor directives
+        3 => true, // Functions from lrun.h
+        4 => true, // Constants from lrun.h
+        5 => true, // Functions from web_api.h
+        6 => true, // Constants from web_api.h
+        7 => true, // Functions from as_web.h
+        8 => true, // Constants from as_web.h
+        9 => true, // Functions from as_sapgui.h
+        10 => true, // Constants from as_sapgui.h
+        ),
+
+    // Styles
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            // Functions are brown, constants and reserved words are blue
+            1 => 'color: #0000ff;', // Standard C reserved keywords
+            2 => 'color: #0000ff;', // C preprocessor directives
+            3 => 'color: #8a0000;', // Functions from lrun.h
+            4 => 'color: #0000ff;', // Constants from lrun.h
+            5 => 'color: #8a0000;', // Functions from web_api.h
+            6 => 'color: #0000ff;', // Constants from web_api.h
+            7 => 'color: #8a0000;', // Functions from as_web.h
+            8 => 'color: #0000ff;', // Constants from as_web.h
+            9 => 'color: #8a0000;', // Functions from as_sapgui.h
+            10 => 'color: #0000ff;', // Constants from as_sapgui.h
+            ),
+        'COMMENTS' => array(
+            // Comments are grey
+            1 => 'color: #9b9b9b;',
+            'MULTI' => 'color: #9b9b9b;'
+            ),
+        'ESCAPE_CHAR' => array(
+            // GeSHi cannot define a separate style for ESCAPE_REGEXP. The style for ESCAPE_CHAR also applies to ESCAPE_REGEXP.
+            // This is used for LoadRunner {parameters}
+            // {parameters} are pink
+            0 => 'color: #c000c0;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            // Strings are green
+            0 => 'color: #008080;'
+            ),
+        'NUMBERS' => array(
+            // Numbers are green
+            0 => 'color: #008080;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #008080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #008080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #008080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#008080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#008080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#008080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#008080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+
+    // URLs for Functions
+    'URLS' => array(
+        1 => '', // Standard C reserved keywords
+        2 => '', // C preprocessor directives
+        3 => '', // Functions from lrun.h
+        4 => '', // Constants from lrun.h
+        5 => '', // Functions from web_api.h
+        6 => '', // Constants from web_api.h
+        7 => '', // Functions from as_web.h
+        8 => '', // Constants from as_web.h
+        9 => '', // Functions from as_sapgui.h
+        10 => '', // Constants from as_sapgui.h
+        ),
+
+    // Object Orientation
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+
+    // Regular Expressions
+    // Note that REGEXPS are not applied within strings.
+    'REGEXPS' => array(
+        ),
+
+    // Contextual Highlighting and Strict Mode
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+
+    // Tabs
+    // Note that if you are using 
         tags for your code, then the browser chooses how many spaces your tabs will translate to.
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/c_mac.php b/sources/inc/geshi/c_mac.php
new file mode 100644
index 0000000..41c21ce
--- /dev/null
+++ b/sources/inc/geshi/c_mac.php
@@ -0,0 +1,227 @@
+ 'C (Mac)',
+    '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' => '',
+    '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',
+            'do', 'else', 'for', 'switch', 'goto'
+            ),
+        2 => array(
+            'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            // Mac-specific constants:
+            'kCFAllocatorDefault'
+            ),
+        3 => array(
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
+
+            // Mac-specific types:
+            'CFArrayRef', 'CFDictionaryRef', 'CFMutableDictionaryRef', 'CFBundleRef', 'CFSetRef', 'CFStringRef',
+            'CFURLRef', 'CFLocaleRef', 'CFDateFormatterRef', 'CFNumberFormatterRef', 'CFPropertyListRef',
+            'CFTreeRef', 'CFWriteStreamRef', 'CFCharacterSetRef', 'CFMutableStringRef', 'CFNotificationRef',
+            'CFReadStreamRef', 'CFNull', 'CFAllocatorRef', 'CFBagRef', 'CFBinaryHeapRef',
+            'CFBitVectorRef', 'CFBooleanRef', 'CFDataRef', 'CFDateRef', 'CFMachPortRef', 'CFMessagePortRef',
+            'CFMutableArrayRef', 'CFMutableBagRef', 'CFMutableBitVectorRef', 'CFMutableCharacterSetRef',
+            'CFMutableDataRef', 'CFMutableSetRef', 'CFNumberRef', 'CFPlugInRef', 'CFPlugInInstanceRef',
+            'CFRunLoopRef', 'CFRunLoopObserverRef', 'CFRunLoopSourceRef', 'CFRunLoopTimerRef', 'CFSocketRef',
+            'CFTimeZoneRef', 'CFTypeRef', 'CFUserNotificationRef', 'CFUUIDRef', 'CFXMLNodeRef', 'CFXMLParserRef',
+            'CFXMLTreeRef'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff0000;',
+            2 => 'color: #339900;',
+            'MULTI' => 'color: #ff0000; 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: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #00eeff;',
+            2 => 'color: #00eeff;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/caddcl.php b/sources/inc/geshi/caddcl.php
new file mode 100644
index 0000000..8b8b2f2
--- /dev/null
+++ b/sources/inc/geshi/caddcl.php
@@ -0,0 +1,126 @@
+ 'CAD DCL',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'boxed_column','boxed_radio_column','boxed_radio_row','boxed_row',
+            'column','concatenation','button','dialog','edit_box','image','image_button',
+            'errtile','list_box','ok_cancel','ok_cancel_help','ok_cancel_help_errtile',
+            'ok_cancel_help_info','ok_only','paragraph','popup_list','radio_button',
+            'radio_column','radio_row','row','slider','spacer','spacer_0','spacer_1','text',
+            'text_part','toggle',
+            'action','alignment','allow_accept','aspect_ratio','big_increment',
+            'children_alignment','children_fixed_height',
+            'children_fixed_width','color',
+            'edit_limit','edit_width','fixed_height','fixed_width',
+            'height','initial_focus','is_cancel','is_default',
+            'is_enabled','is_tab_stop','is-bold','key','label','layout','list',
+            'max_value','min_value','mnemonic','multiple_select','password_char',
+            'small_increment','tabs','tab_truncate','value','width',
+            'false','true','left','right','centered','top','bottom',
+            'dialog_line','dialog_foreground','dialog_background',
+            'graphics_background','black','red','yellow','green','cyan',
+            'blue','magenta','whitegraphics_foreground',
+            'horizontal','vertical'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => '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(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/cadlisp.php b/sources/inc/geshi/cadlisp.php
new file mode 100644
index 0000000..3fa7ead
--- /dev/null
+++ b/sources/inc/geshi/cadlisp.php
@@ -0,0 +1,186 @@
+ 'CAD Lisp',
+    'COMMENT_SINGLE' => array(1 => ";"),
+    'COMMENT_MULTI' => array(";|" => "|;"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abs','acad_colordlg','acad_helpdlg','acad_strlsort','action_tile',
+            'add_list','alert','alloc','and','angle','angtof','angtos','append','apply',
+            'arx','arxload','arxunload','ascii','assoc','atan','atof','atoi','atom',
+            'atoms-family','autoarxload','autoload','Boole','boundp','caddr',
+            'cadr','car','cdr','chr','client_data_tile','close','command','cond',
+            'cons','cos','cvunit','defun','defun-q','defun-q-list-ref',
+            'defun-q-list-set','dictadd','dictnext','dictremove','dictrename',
+            'dictsearch','dimx_tile','dimy_tile','distance','distof','done_dialog',
+            'end_image','end_list','entdel','entget','entlast','entmake',
+            'entmakex','entmod','entnext','entsel','entupd','eq','equal','eval','exit',
+            'exp','expand','expt','fill_image','findfile','fix','float','foreach','function',
+            'gc','gcd','get_attr','get_tile','getangle','getcfg','getcname','getcorner',
+            'getdist','getenv','getfiled','getint','getkword','getorient','getpoint',
+            'getreal','getstring','getvar','graphscr','grclear','grdraw','grread','grtext',
+            'grvecs','handent','help','if','initdia','initget','inters','itoa','lambda','last',
+            'layoutlist','length','list','listp','load','load_dialog','log','logand','logior',
+            'lsh','mapcar','max','mem','member','menucmd','menugroup','min','minusp','mode_tile',
+            'namedobjdict','nentsel','nentselp','new_dialog','nil','not','nth','null',
+            'numberp','open','or','osnap','polar','prin1','princ','print','progn','prompt',
+            'quit','quote','read','read-char','read-line','redraw','regapp','rem','repeat',
+            'reverse','rtos','set','set_tile','setcfg','setenv','setfunhelp','setq','setvar',
+            'setview','sin','slide_image','snvalid','sqrt','ssadd','ssdel','ssget','ssgetfirst',
+            'sslength','ssmemb','ssname','ssnamex','sssetfirst','start_dialog','start_image',
+            'start_list','startapp','strcase','strcat','strlen','subst','substr','t','tablet',
+            'tblnext','tblobjname','tblsearch','term_dialog','terpri','textbox','textpage',
+            'textscr','trace','trans','type','unload_dialog','untrace','vector_image','ver',
+            'vports','wcmatch','while','write-char','write-line','xdroom','xdsize','zerop',
+            'vl-acad-defun','vl-acad-undefun','vl-arx-import','vlax-3D-point',
+            'vlax-add-cmd','vlax-create-object','vlax-curve-getArea',
+            'vlax-curve-getClosestPointTo','vlax-curve-getClosestPointToProjection',
+            'vlax-curve-getDistAtParam','vlax-curve-getDistAtPoint',
+            'vlax-curve-getEndParam','vlax-curve-getEndPoint',
+            'vlax-curve-getFirstDeriv','vlax-curve-getParamAtDist',
+            'vlax-curve-getParamAtPoint','vlax-curve-getPointAtDist',
+            'vlax-curve-getPointAtParam','vlax-curve-getSecondDeriv',
+            'vlax-curve-getStartParam','vlax-curve-getStartPoint',
+            'vlax-curve-isClosed','vlax-curve-isPeriodic','vlax-curve-isPlanar',
+            'vlax-dump-object','vlax-erased-p','vlax-for','vlax-get-acad-object',
+            'vlax-get-object','vlax-get-or-create-object','vlax-get-property',
+            'vlax-import-type-library','vlax-invoke-method','vlax-ldata-delete',
+            'vlax-ldata-get','vlax-ldata-list','vlax-ldata-put','vlax-ldata-test',
+            'vlax-make-safearray','vlax-make-variant','vlax-map-collection',
+            'vlax-method-applicable-p','vlax-object-released-p','vlax-product-key',
+            'vlax-property-available-p','vlax-put-property','vlax-read-enabled-p',
+            'vlax-release-object','vlax-remove-cmd','vlax-safearray-fill',
+            'vlax-safearray-get-dim','vlax-safearray-get-element',
+            'vlax-safearray-get-l-bound','vlax-safearray-get-u-bound',
+            'vlax-safearray-put-element','vlax-safearray-type','vlax-tmatrix',
+            'vlax-typeinfo-available-p','vlax-variant-change-type',
+            'vlax-variant-type','vlax-variant-value','vlax-write-enabled-p',
+            'vl-bb-ref','vl-bb-set','vl-catch-all-apply','vl-catch-all-error-message',
+            'vl-catch-all-error-p','vl-cmdf','vl-consp','vl-directory-files','vl-doc-export',
+            'vl-doc-import','vl-doc-ref','vl-doc-set','vl-every','vl-exit-with-error',
+            'vl-exit-with-value','vl-file-copy','vl-file-delete','vl-file-directory-p',
+            'vl-filename-base','vl-filename-directory','vl-filename-extension',
+            'vl-filename-mktemp','vl-file-rename','vl-file-size','vl-file-systime',
+            'vl-get-resource','vlisp-compile','vl-list-exported-functions',
+            'vl-list-length','vl-list-loaded-vlx','vl-load-all','vl-load-com',
+            'vl-load-reactors','vl-member-if','vl-member-if-not','vl-position',
+            'vl-prin1-to-string','vl-princ-to-string','vl-propagate','vlr-acdb-reactor',
+            'vlr-add','vlr-added-p','vlr-beep-reaction','vlr-command-reactor',
+            'vlr-current-reaction-name','vlr-data','vlr-data-set',
+            'vlr-deepclone-reactor','vlr-docmanager-reactor','vlr-dwg-reactor',
+            'vlr-dxf-reactor','vlr-editor-reactor','vl-registry-delete',
+            'vl-registry-descendents','vl-registry-read','vl-registry-write',
+            'vl-remove','vl-remove-if','vl-remove-if-not','vlr-insert-reactor',
+            'vlr-linker-reactor','vlr-lisp-reactor','vlr-miscellaneous-reactor',
+            'vlr-mouse-reactor','vlr-notification','vlr-object-reactor',
+            'vlr-owner-add','vlr-owner-remove','vlr-owners','vlr-pers','vlr-pers-list',
+            'vlr-pers-p','vlr-pers-release','vlr-reaction-names','vlr-reactions',
+            'vlr-reaction-set','vlr-reactors','vlr-remove','vlr-remove-all',
+            'vlr-set-notification','vlr-sysvar-reactor','vlr-toolbar-reactor',
+            'vlr-trace-reaction','vlr-type','vlr-types','vlr-undo-reactor',
+            'vlr-wblock-reactor','vlr-window-reactor','vlr-xref-reactor',
+            'vl-some','vl-sort','vl-sort-i','vl-string-elt','vl-string-left-trim',
+            'vl-string-mismatch','vl-string-position','vl-string-right-trim',
+            'vl-string-search','vl-string-subst','vl-string-translate','vl-string-trim',
+            'vl-symbol-name','vl-symbolp','vl-symbol-value','vl-unload-vlx','vl-vbaload',
+            'vl-vbarun','vl-vlx-loaded-p'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => '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(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/cfdg.php b/sources/inc/geshi/cfdg.php
new file mode 100644
index 0000000..e40963f
--- /dev/null
+++ b/sources/inc/geshi/cfdg.php
@@ -0,0 +1,124 @@
+
+ * Copyright: (c) 2006 John Horigan http://www.ozonehouse.com/john/
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/03/11
+ *
+ * CFDG language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2006/03/11 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2006/03/11)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     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' => 'CFDG',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'include', 'startshape', 'rule', 'background'
+            ),
+        2 => array(
+            'SQUARE', 'CIRCLE', 'TRIANGLE',
+            ),
+        3 => array(
+            'b','brightness','h','hue','sat','saturation',
+            'a','alpha','x','y','z','s','size',
+            'r','rotate','f','flip','skew','xml_set_object'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '{', '}', '*', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #717100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #006666;'
+            ),
+        '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(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/cfm.php b/sources/inc/geshi/cfm.php
new file mode 100644
index 0000000..2d165bd
--- /dev/null
+++ b/sources/inc/geshi/cfm.php
@@ -0,0 +1,299 @@
+ 'ColdFusion',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /* CFM Tags */
+        1 => array(
+            'cfabort', 'cfapplet', 'cfapplication', 'cfargument', 'cfassociate',
+            'cfbreak', 'cfcache', 'cfcase', 'cfcatch', 'cfchart', 'cfchartdata',
+            'cfchartseries', 'cfcol', 'cfcollection', 'cfcomponent',
+            'cfcontent', 'cfcookie', 'cfdefaultcase', 'cfdirectory',
+            'cfdocument', 'cfdocumentitem', 'cfdocumentsection', 'cfdump',
+            'cfelse', 'cfelseif', 'cferror', 'cfexecute', 'cfexit', 'cffile',
+            'cfflush', 'cfform', 'cfformgroup', 'cfformitem', 'cfftp',
+            'cffunction', 'cfgrid', 'cfgridcolumn', 'cfgridrow', 'cfgridupdate',
+            'cfheader', 'cfhtmlhead', 'cfhttp', 'cfhttpparam', 'cfif',
+            'cfimport', 'cfinclude', 'cfindex', 'cfinput', 'cfinsert',
+            'cfinvoke', 'cfinvokeargument', 'cfldap', 'cflocation', 'cflock',
+            'cflog', 'cflogin', 'cfloginuser', 'cflogout', 'cfloop', 'cfmail',
+            'cfmailparam', 'cfmailpart', 'cfmodule', 'cfNTauthenticate',
+            'cfobject', 'cfobjectcache', 'cfoutput', 'cfparam', 'cfpop',
+            'cfprocessingdirective', 'cfprocparam',
+            'cfprocresult', 'cfproperty', 'cfquery', 'cfqueryparam',
+            'cfregistry', 'cfreport', 'cfreportparam', 'cfrethrow', 'cfreturn',
+            'cfsavecontent', 'cfschedule', 'cfscript', 'cfsearch', 'cfselect',
+            'cfset', 'cfsetting', 'cfsilent', 'cfstoredproc',
+            'cfswitch', 'cftable', 'cftextarea', 'cfthrow', 'cftimer',
+            'cftrace', 'cftransaction', 'cftree', 'cftreeitem', 'cftry',
+            'cfupdate', 'cfwddx'
+            ),
+        /* HTML Tags */
+        2 => array(
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        /* HTML attributes */
+        3 => array(
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            ),
+        /* CFM Script delimeters */
+        4 => array(
+            'var', 'function', 'while', 'if','else'
+            ),
+        /* CFM Functions */
+        5 => array(
+            'Abs', 'GetFunctionList', 'LSTimeFormat','ACos','GetGatewayHelper','LTrim','AddSOAPRequestHeader','GetHttpRequestData',
+            'Max','AddSOAPResponseHeader','GetHttpTimeString','Mid','ArrayAppend','GetLocale','Min','ArrayAvg','GetLocaleDisplayName',
+            'Minute','ArrayClear','GetMetaData','Month','ArrayDeleteAt','GetMetricData','MonthAsString','ArrayInsertAt','GetPageContext',
+            'Now','ArrayIsEmpty','GetProfileSections','NumberFormat','ArrayLen','GetProfileString','ParagraphFormat','ArrayMax',
+            'GetLocalHostIP','ParseDateTime','ArrayMin','GetSOAPRequest','Pi','ArrayNew','GetSOAPRequestHeader','PreserveSingleQuotes',
+            'ArrayPrepend','GetSOAPResponse','Quarter','ArrayResize','GetSOAPResponseHeader','QueryAddColumn','ArraySet',
+            'GetTempDirectory','QueryAddRow','ArraySort','QueryNew','ArraySum','GetTempFile','QuerySetCell',
+            'ArraySwap','GetTickCount','QuotedValueList','ArrayToList','GetTimeZoneInfo','Rand','Asc','GetToken','Randomize',
+            'ASin','Hash','RandRange','Atn','Hour','REFind','BinaryDecode','HTMLCodeFormat','REFindNoCase','BinaryEncode',
+            'HTMLEditFormat','ReleaseComObject','BitAnd','IIf','RemoveChars','BitMaskClear','IncrementValue','RepeatString',
+            'BitMaskRead','InputBaseN','Replace','BitMaskSet','Insert','ReplaceList','BitNot','Int','ReplaceNoCase','BitOr',
+            'IsArray','REReplace','BitSHLN','IsBinary','REReplaceNoCase','BitSHRN','IsBoolean','Reverse','BitXor','IsCustomFunction',
+            'Right','Ceiling','IsDate','RJustify','CharsetDecode','IsDebugMode','Round','CharsetEncode','IsDefined','RTrim',
+            'Chr','IsLeapYear','Second','CJustify','IsLocalHost','SendGatewayMessage','Compare','IsNumeric','SetEncoding',
+            'CompareNoCase','IsNumericDate','SetLocale','Cos','IsObject','SetProfileString','CreateDate','IsQuery','SetVariable',
+            'CreateDateTime','IsSimpleValue','Sgn','CreateObject','IsSOAPRequest','Sin','CreateODBCDate','IsStruct','SpanExcluding',
+            'CreateODBCDateTime','IsUserInRole','SpanIncluding','CreateODBCTime','IsValid','Sqr','CreateTime','IsWDDX','StripCR',
+            'CreateTimeSpan','IsXML','StructAppend','CreateUUID','IsXmlAttribute','StructClear','DateAdd','IsXmlDoc','StructCopy',
+            'DateCompare','IsXmlElem','StructCount','DateConvert','IsXmlNode','StructDelete','DateDiff','IsXmlRoot','StructFind',
+            'DateFormat','JavaCast','StructFindKey','DatePart','JSStringFormat','StructFindValue','Day','LCase','StructGet',
+            'DayOfWeek','Left','StructInsert','DayOfWeekAsString','Len','StructIsEmpty','DayOfYear','ListAppend','StructKeyArray',
+            'DaysInMonth','ListChangeDelims','StructKeyExists','DaysInYear','ListContains','StructKeyList','DE','ListContainsNoCase',
+            'StructNew','DecimalFormat','ListDeleteAt','StructSort','DecrementValue','ListFind','StructUpdate','Decrypt','ListFindNoCase',
+            'Tan','DecryptBinary','ListFirst','TimeFormat','DeleteClientVariable','ListGetAt','ToBase64','DirectoryExists',
+            'ListInsertAt','ToBinary','DollarFormat','ListLast','ToScript','Duplicate','ListLen','ToString','Encrypt','ListPrepend',
+            'Trim','EncryptBinary','ListQualify','UCase','Evaluate','ListRest','URLDecode','Exp','ListSetAt','URLEncodedFormat',
+            'ExpandPath','ListSort','URLSessionFormat','FileExists','ListToArray','Val','Find','ListValueCount','ValueList',
+            'FindNoCase','ListValueCountNoCase','Week','FindOneOf','LJustify','Wrap','FirstDayOfMonth','Log','WriteOutput',
+            'Fix','Log10','XmlChildPos','FormatBaseN','LSCurrencyFormat','XmlElemNew','GetAuthUser','LSDateFormat','XmlFormat',
+            'GetBaseTagData','LSEuroCurrencyFormat','XmlGetNodeType','GetBaseTagList','LSIsCurrency','XmlNew','GetBaseTemplatePath',
+            'LSIsDate','XmlParse','GetClientVariablesList','LSIsNumeric','XmlSearch','GetCurrentTemplatePath','LSNumberFormat',
+            'XmlTransform','GetDirectoryFromPath','LSParseCurrency','XmlValidate','GetEncoding','LSParseDateTime','Year',
+            'GetException','LSParseEuroCurrency','YesNoFormat','GetFileFromPath','LSParseNumber'
+            ),
+        /* CFM Attributes */
+        6 => array(
+            'dbtype','connectstring','datasource','username','password','query','delimeter','description','required','hint','default','access','from','to','list','index'
+            ),
+        7 => array(
+            'EQ', 'GT', 'LT', 'GTE', 'LTE', 'IS', 'LIKE', 'NEQ'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '=', '{', '}', '(', ')', '[', ']', '<', '>', '&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #000000; font-weight: bold;',
+            5 => 'color: #0000FF;',
+            6 => 'color: #0000FF;',
+            7 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #808080; font-style: italic;',
+            1 => 'color: #00bbdd;',
+            2 => 'color: #0000FF;',
+            3 => 'color: #000099;',
+            4 => 'color: #333333;',
+            5 => 'color: #333333;'
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            ''
+            ),
+        1 => array(
+            ' '>'
+            ),
+        2 => "/(?!<#)(?:(?:##)*)(#)[a-zA-Z0-9_\.\(\)]+(#)/",
+        3 => array(
+            '' => ''
+            ),
+        4 => array(
+            '<' => '>'
+            ),
+        5 => '/((?!])+?(>)/si'
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=<|<\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+                ),
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=<|<\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+                ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?|^])', // allow ; before keywords
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-])', // allow & after keywords
+                ),
+            7 => array(
+                'DISALLOWED_BEFORE' => '(?&|^])', // allow ; before keywords
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-])', // allow & after keywords
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/chaiscript.php b/sources/inc/geshi/chaiscript.php
new file mode 100644
index 0000000..f9d0a86
--- /dev/null
+++ b/sources/inc/geshi/chaiscript.php
@@ -0,0 +1,140 @@
+ 'ChaiScript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    //Regular Expressions
+    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'else', 'elseif', 'eval', 'for', 'if', 'return', 'while', 'try', 'catch', 'finally',
+            ),
+        2 => array(
+            'def', 'false', 'fun', 'true', 'var', 'attr',
+            ),
+        3 => array(
+            // built in functions
+            'throw',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '@', '&', '|', '^',
+        '<', '>', '=',
+        ',', ';', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #003366; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3366CC;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            ),
+        1 => array(
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/cil.php b/sources/inc/geshi/cil.php
new file mode 100644
index 0000000..9872e75
--- /dev/null
+++ b/sources/inc/geshi/cil.php
@@ -0,0 +1,196 @@
+ 'CIL',
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'COMMENT_SINGLE' => array('//'),
+    'COMMENT_MULTI' => array(),
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => 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',
+            '.localized', '.locale', '.line', '.language', '.import', '.imagebase', '.hash', '.get', '.fire', '.file', '.field',
+            '.export', '.event', '.entrypoint', '.emitbyte', '.data', '.custom', '.culture', '.ctor', '.corflags', '.class',
+            '.cctor', '.assembly', '.addon'
+            ),
+        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',
+            'reqsecobj', 'reqrefuse', 'reqopt', 'reqmin', 'record', 'public', 'privatescope', 'private', 'preservesig',
+            'prejitgrant', 'prejitdeny', 'platformapi', 'pinvokeimpl', 'pinned', 'permitonly', 'out', 'optil', 'opt',
+            'notserialized', 'notremotable', 'not_in_gc_heap', 'noprocess', 'noncaslinkdemand', 'noncasinheritance',
+            'noncasdemand', 'nometadata', 'nomangle', 'nomachine', 'noinlining', 'noappdomain', 'newslot', 'nested', 'native',
+            'modreq', 'modopt', 'marshal', 'managed', 'literal', 'linkcheck', 'lcid', 'lasterr', 'internalcall', 'interface',
+            'instance', 'initonly', 'init', 'inheritcheck', 'in', 'import', 'implicitres', 'implicitcom', 'implements',
+            'illegal', 'il', 'hidebysig', 'handler', 'fromunmanaged', 'forwardref', 'fixed', 'finally', 'final', 'filter',
+            'filetime', 'field', 'fault', 'fastcall', 'famorassem', 'family', 'famandassem', 'extern', 'extends', 'explicit',
+            'error', 'enum', 'endmac', 'deny', 'demand', 'default', 'custom', 'compilercontrolled', 'clsid', 'class', 'cil',
+            'cf', 'cdecl', 'catch', 'beforefieldinit', 'autochar', 'auto', 'at', 'assert', 'assembly', 'as', 'any', 'ansi',
+            'alignment', 'algorithm', 'abstract'
+            ),
+        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', 'char', 'carray', 'byvalstr',
+            'bytearray', 'boxed', 'bool', 'blob_object', 'blob', 'array'
+            ),
+        4 => array(//Prefix
+            'volatile', 'unaligned', 'tail', 'readonly', 'no', 'constrained'
+            ),
+        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'
+            ),
+        6 => array(//Base
+            'xor', 'switch', 'sub', 'stloc',
+            'stind', 'starg',
+            'shr', 'shl', 'ret', 'rem', 'pop', 'or', 'not', 'nop', 'neg', 'mul',
+            'localloc', 'leave', 'ldnull', 'ldloca',
+            'ldloc', 'ldind', 'ldftn', 'ldc', 'ldarga',
+            'ldarg', 'jmp', 'initblk', 'endfinally', 'endfilter',
+            'endfault', 'dup', 'div', 'cpblk', 'conv', 'clt', 'ckfinite', 'cgt', 'ceq', 'calli',
+            'call', 'brzero', 'brtrue', 'brnull', 'brinst',
+            'brfalse', 'break', 'br', 'bne', 'blt', 'ble', 'bgt', 'bge', 'beq', 'arglist',
+            'and', 'add'
+            ),
+        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'
+            ),
+        8 => array(//Other
+            'prefixref', 'prefix7', 'prefix6', 'prefix5', 'prefix4', 'prefix3', 'prefix2', 'prefix1', 'prefix0'
+            ),
+        9 => array(//Literal
+            'true', 'null', 'false'
+            ),
+        10 => array(//Comment-like
+            '#line', '^THE_END^'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            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;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006400;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #00008B;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000033;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006400;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:blue;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        0 => '(?<=ldc\\.i4\\.)[0-8]|(?<=(?:ldarg|ldloc|stloc)\\.)[0-3]' # Pickup the opcodes that end with integers
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/clojure.php b/sources/inc/geshi/clojure.php
new file mode 100644
index 0000000..0ad4e4a
--- /dev/null
+++ b/sources/inc/geshi/clojure.php
@@ -0,0 +1,134 @@
+ 'Clojure',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(';|' => '|;'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'defn', 'defn-', 'defmulti', 'defmethod', 'defmacro', 'deftest',
+            'defstruct', 'def', 'defonce', 'let', 'letfn', 'do', 'cond', 'condp',
+            'for', 'loop', 'recur', 'when', 'when-not', 'when-let', 'when-first',
+            'if', 'if-let', 'if-not', 'doto', 'and', 'or','not','aget','aset',
+            'dosync', 'doseq', 'dotimes', 'dorun', 'doall',
+            'load', 'import', 'unimport', 'ns', 'in-ns', 'refer', 'print',
+            'try', 'catch', 'finally', 'throw', 'fn', 'update-in',
+            'with-open', 'with-local-vars', 'binding',
+            'gen-class', 'gen-and-load-class', 'gen-and-save-class',
+            'implement', 'proxy', 'lazy-cons', 'with-meta',
+            'struct', 'struct-map', 'delay', 'locking', 'sync', 'time', 'apply',
+            'remove', 'merge', 'interleave', 'interpose', 'distinct',
+            'cons', 'concat', 'lazy-cat', 'cycle', 'rest', 'frest', 'drop',
+            'drop-while', 'nthrest', 'take', 'take-while', 'take-nth', 'butlast',
+            'reverse', 'sort', 'sort-by', 'split-at', 'partition', 'split-with',
+            'first', 'ffirst', 'rfirst', 'zipmap', 'into', 'set', 'vec',
+            'to-array-2d', 'not-empty', 'seq?', 'not-every?', 'every?', 'not-any?',
+            'map', 'mapcat', 'vector?', 'list?', 'hash-map', 'reduce', 'filter',
+            'vals', 'keys', 'rseq', 'subseq', 'rsubseq', 'count', 'empty?',
+            'fnseq', 'repeatedly', 'iterate', 'drop-last',
+            'repeat', 'replicate', 'range',  'into-array',
+            'line-seq', 'resultset-seq', 're-seq', 're-find', 'tree-seq', 'file-seq',
+            'iterator-seq', 'enumeration-seq', 'declare',  'xml-seq',
+            'symbol?', 'string?', 'vector', 'conj', 'str',
+            'pos?', 'neg?', 'zero?', 'nil?', 'inc', 'dec', 'format',
+            'alter', 'commute', 'ref-set', 'floor', 'assoc', 'send', 'send-off'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|', '.', '..', '->',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => '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(
+            0 => 'color: #555;',
+            1 => 'color: #555;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+            '::', ':'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/cmake.php b/sources/inc/geshi/cmake.php
new file mode 100644
index 0000000..67277aa
--- /dev/null
+++ b/sources/inc/geshi/cmake.php
@@ -0,0 +1,181 @@
+ ()
+ *  -  First Release
+ *
+ * TODO (updated )
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     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' => 'CMake',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'ESCAPE_REGEXP' => array(
+        // Quoted variables ${...}
+        1 => "/\\$(ENV)?\\{[^\\n\\}]*?\\}/i",
+        // Quoted registry keys [...]
+        2 => "/\\[HKEY[^\n\\]]*?]/i"
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'add_custom_command', 'add_custom_target', 'add_definitions',
+            'add_dependencies', 'add_executable', 'add_library',
+            'add_subdirectory', 'add_test', 'aux_source_directory', 'break',
+            'build_command', 'cmake_minimum_required', 'cmake_policy',
+            'configure_file', 'create_test_sourcelist', 'define_property',
+            'else', 'elseif', 'enable_language', 'enable_testing',
+            'endforeach', 'endfunction', 'endif', 'endmacro',
+            'endwhile', 'execute_process', 'export', 'file', 'find_file',
+            'find_library', 'find_package', 'find_path', 'find_program',
+            'fltk_wrap_ui', 'foreach', 'function', 'get_cmake_property',
+            'get_directory_property', 'get_filename_component', 'get_property',
+            'get_source_file_property', 'get_target_property',
+            'get_test_property', 'if', 'include', 'include_directories',
+            'include_external_msproject', 'include_regular_expression',
+            'install', 'link_directories', 'list', 'load_cache',
+            'load_command', 'macro', 'mark_as_advanced', 'math', 'message',
+            'option', 'output_required_files', 'project', 'qt_wrap_cpp',
+            'qt_wrap_ui', 'remove_definitions', 'return', 'separate_arguments',
+            'set', 'set_directory_properties', 'set_property',
+            'set_source_files_properties', 'set_target_properties',
+            'set_tests_properties', 'site_name', 'source_group', 'string',
+            'target_link_libraries', 'try_compile', 'try_run', 'unset',
+            'variable_watch', 'while'
+            ),
+        2 => array(
+            // Deprecated commands
+            'build_name', 'exec_program', 'export_library_dependencies',
+            'install_files', 'install_programs', 'install_targets',
+            'link_libraries', 'make_directory', 'remove', 'subdir_depends',
+            'subdirs', 'use_mangled_mesa', 'utility_source',
+            'variable_requires', 'write_file'
+            ),
+        3 => array(
+            // Special command arguments, this list is not comprehesive.
+            'AND', 'APPEND', 'ASCII', 'BOOL', 'CACHE', 'COMMAND', 'COMMENT',
+            'COMPARE', 'CONFIGURE', 'DEFINED', 'DEPENDS', 'DIRECTORY',
+            'EQUAL', 'EXCLUDE_FROM_ALL', 'EXISTS', 'FALSE', 'FATAL_ERROR',
+            'FILEPATH', 'FIND', 'FORCE', 'GET', 'GLOBAL', 'GREATER',
+            'IMPLICIT_DEPENDS', 'INSERT', 'INTERNAL', 'IS_ABSOLUTE',
+            'IS_DIRECTORY', 'IS_NEWER_THAN', 'LENGTH', 'LESS',
+            'MAIN_DEPENDENCY', 'MATCH', 'MATCHALL', 'MATCHES', 'MODULE', 'NOT',
+            'NOTFOUND', 'OFF', 'ON', 'OR', 'OUTPUT', 'PARENT_SCOPE', 'PATH',
+            'POLICY', 'POST_BUILD', 'PRE_BUILD', 'PRE_LINK', 'PROPERTY',
+            'RANDOM', 'REGEX', 'REMOVE_AT', 'REMOVE_DUPLICATES', 'REMOVE_ITEM',
+            'REPLACE', 'REVERSE', 'SEND_ERROR', 'SHARED', 'SORT', 'SOURCE',
+            'STATIC', 'STATUS', 'STREQUAL', 'STRGREATER', 'STRING', 'STRIP',
+            'STRLESS', 'SUBSTRING', 'TARGET', 'TEST', 'TOLOWER', 'TOUPPER',
+            'TRUE', 'VERBATIM', 'VERSION', 'VERSION_EQUAL', 'VERSION_GREATOR',
+            'VERSION_LESS', 'WORKING_DIRECTORY',
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')')
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #1f3f81; font-style: bold;',
+            2 => 'color: #1f3f81;',
+            3 => 'color: #077807; font-sytle: italic;'
+            ),
+        'BRACKETS' => array(),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #b08000;',
+            2 => 'color: #0000cd;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #912f11;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #197d8b;'
+            ),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'REGEXPS' => array(
+            0 => 'color: #b08000;',
+            1 => 'color: #0000cd;'
+            ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => 'http://www.cmake.org/cmake/help/cmake2.6docs.html#command:{FNAMEL}',
+        2 => 'http://www.cmake.org/cmake/help/cmake2.6docs.html#command:{FNAMEL}',
+        3 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        // Unquoted variables
+        0 => "\\$(ENV)?\\{[^\\n}]*?\\}",
+        // Unquoted registry keys
+        1 => "\\[HKEY[^\n\\]]*?]"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            // These keywords cannot come after a open paren
+            1 => array(
+                'DISALLOWED_AFTER' =>  '(?= *\()'
+                ),
+            2 => array(
+                'DISALLOWED_AFTER' =>  '(?= *\()'
+                )
+            ),
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'METHODS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/cobol.php b/sources/inc/geshi/cobol.php
new file mode 100644
index 0000000..b07be48
--- /dev/null
+++ b/sources/inc/geshi/cobol.php
@@ -0,0 +1,244 @@
+ 'COBOL',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => '/^\*.*?$/m'),
+    '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'
+            ),
+        2 => array( //Statement Keywords
+            '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', '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'
+            ),
+        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'
+            )
+        ),
+    'SYMBOLS' => array(
+        //Avoid having - in identifiers marked as symbols
+        ' + ', ' - ', ' * ', ' / ', ' ** ',
+        '.', ',',
+        '=',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #008000; font-weight: bold;',
+            4 => 'color: #000080;',
+            5 => 'color: #008000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #a0a0a0; font-style: italic;',
+            'MULTI' => 'color: #a0a0a0; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #339933;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #993399;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+    );
+
+?>
diff --git a/sources/inc/geshi/coffeescript.php b/sources/inc/geshi/coffeescript.php
new file mode 100644
index 0000000..194aecd
--- /dev/null
+++ b/sources/inc/geshi/coffeescript.php
@@ -0,0 +1,146 @@
+ 'CoffeeScript',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('###' => '###'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    //Longest quotemarks ALWAYS first
+    'QUOTEMARKS' => array('"""', "'''", '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+
+        /*
+        ** Set 1: control keywords
+        */
+        1 => array(
+            'break', 'by', 'catch', 'continue', 'else', 'finally', 'for', 'in', 'of', 'if',
+            'return', 'switch', 'then', 'throw', 'try', 'unless', 'when', 'while', 'until'
+            ),
+
+        /*
+        ** Set 2: logic keywords
+        */
+        2 => array(
+            'and', 'or', 'is', 'isnt', 'not'
+            ),
+
+        /*
+        ** Set 3: other keywords
+        */
+        3 => array(
+            'instanceof', 'new', 'delete', 'typeof',
+            'class', 'super', 'this', 'extends'
+            ),
+
+        /*
+        ** Set 4: constants
+        */
+        4 => array(
+            'true', 'false', 'on', 'off', 'yes', 'no',
+            'Infinity', 'NaN', 'undefined', 'null'
+            )
+        ),
+    'SYMBOLS' => array(
+            '(', ')', '[', ']', '{', '}', '*', '&', '|', '%', '!', ',', ';', '<', '>', '?', '`',
+            '+', '-', '*', '/', '->', '=>', '<<', '>>', '@', ':', '^'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',
+            2 => 'color: #008000;',
+            3 => 'color: #dc143c;',
+            4 => 'color: #0000cd;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            ''
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/cpp-qt.php b/sources/inc/geshi/cpp-qt.php
new file mode 100644
index 0000000..36626c9
--- /dev/null
+++ b/sources/inc/geshi/cpp-qt.php
@@ -0,0 +1,564 @@
+ 'C++ (Qt)',
+    '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' => '',
+    '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', 'delete', 'new', 'this'
+            ),
+        2 => array(
+            'NULL', 'false', 'break', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class' ,
+            'foreach','connect', 'Q_OBJECT' , 'slots' , 'signals', 'Q_SIGNALS', 'Q_SLOTS',
+            'Q_FOREACH', 'QCOMPARE', 'QVERIFY', 'qDebug', 'kDebug', 'QBENCHMARK'
+            ),
+        3 => array(
+            'cin', 'cerr', 'clog', 'cout',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t'
+            ),
+        5 => array(
+            "Q_UINT16", "Q_UINT32", "Q_UINT64", "Q_UINT8", "Q_ULLONG",
+            "Q_ULONG", "Q3Accel", "Q3Action", "Q3ActionGroup", "Q3AsciiBucket",
+            "Q3AsciiCache", "Q3AsciiCacheIterator", "Q3AsciiDict",
+            "Q3AsciiDictIterator", "Q3BaseBucket", "Q3BoxLayout", "Q3Button",
+            "Q3ButtonGroup", "Q3Cache", "Q3CacheIterator", "Q3Canvas",
+            "Q3CanvasEllipse", "Q3CanvasItem", "Q3CanvasItemList",
+            "Q3CanvasLine", "Q3CanvasPixmap", "Q3CanvasPixmapArray",
+            "Q3CanvasPolygon", "Q3CanvasPolygonalItem", "Q3CanvasRectangle",
+            "Q3CanvasSpline", "Q3CanvasSprite", "Q3CanvasText", "Q3CanvasView",
+            "Q3CheckListItem", "Q3CheckTableItem", "Q3CleanupHandler",
+            "Q3ColorDrag", "Q3ComboBox", "Q3ComboTableItem", "Q3CString",
+            "Q3DataBrowser", "Q3DataTable", "Q3DataView", "Q3DateEdit",
+            "Q3DateTimeEdit", "Q3DateTimeEditBase", "Q3DeepCopy", "Q3Dict",
+            "Q3DictIterator", "Q3Dns", "Q3DnsSocket", "Q3DockArea",
+            "Q3DockAreaLayout", "Q3DockWindow", "Q3DragObject", "Q3DropSite",
+            "Q3EditorFactory", "Q3FileDialog", "Q3FileIconProvider",
+            "Q3FilePreview", "Q3Frame", "Q3Ftp", "Q3GArray", "Q3GCache",
+            "Q3GCacheIterator", "Q3GDict", "Q3GDictIterator", "Q3GList",
+            "Q3GListIterator", "Q3GListStdIterator", "Q3Grid", "Q3GridLayout",
+            "Q3GridView", "Q3GroupBox", "Q3GVector", "Q3HBox", "Q3HBoxLayout",
+            "Q3HButtonGroup", "Q3Header", "Q3HGroupBox", "Q3Http",
+            "Q3HttpHeader", "Q3HttpRequestHeader", "Q3HttpResponseHeader",
+            "Q3IconDrag", "Q3IconDragItem", "Q3IconView", "Q3IconViewItem",
+            "Q3ImageDrag", "Q3IntBucket", "Q3IntCache", "Q3IntCacheIterator",
+            "Q3IntDict", "Q3IntDictIterator", "Q3ListBox", "Q3ListBoxItem",
+            "Q3ListBoxPixmap", "Q3ListBoxText", "Q3ListView", "Q3ListViewItem",
+            "Q3ListViewItemIterator", "Q3LNode", "Q3LocalFs", "Q3MainWindow",
+            "Q3MemArray", "Q3MimeSourceFactory", "Q3MultiLineEdit",
+            "Q3NetworkOperation", "Q3NetworkProtocol", "Q3NetworkProtocolDict",
+            "Q3NetworkProtocolFactory", "Q3NetworkProtocolFactoryBase",
+            "Q3ObjectDictionary", "Q3PaintDeviceMetrics", "Q3Painter",
+            "Q3Picture", "Q3PointArray", "Q3PolygonScanner", "Q3PopupMenu",
+            "Q3Process", "Q3ProgressBar", "Q3ProgressDialog", "Q3PtrBucket",
+            "Q3PtrCollection", "Q3PtrDict", "Q3PtrDictIterator", "Q3PtrList",
+            "Q3PtrListIterator", "Q3PtrListStdIterator", "Q3PtrQueue",
+            "Q3PtrStack", "Q3PtrVector", "Q3RangeControl", "Q3ScrollView",
+            "Q3Semaphore", "Q3ServerSocket", "Q3Shared", "Q3Signal",
+            "Q3SimpleRichText", "Q3SingleCleanupHandler", "Q3Socket",
+            "Q3SocketDevice", "Q3SortedList", "Q3SpinWidget", "Q3SqlCursor",
+            "Q3SqlEditorFactory", "Q3SqlFieldInfo", "Q3SqlFieldInfoList",
+            "Q3SqlForm", "Q3SqlPropertyMap", "Q3SqlRecordInfo",
+            "Q3SqlSelectCursor", "Q3StoredDrag", "Q3StrIList", "Q3StringBucket",
+            "Q3StrIVec", "Q3StrList", "Q3StrListIterator", "Q3StrVec",
+            "Q3StyleSheet", "Q3StyleSheetItem", "Q3SyntaxHighlighter",
+            "Q3TabDialog", "Q3Table", "Q3TableItem", "Q3TableSelection",
+            "Q3TextBrowser", "Q3TextDrag", "Q3TextEdit",
+            "Q3TextEditOptimPrivate", "Q3TextStream", "Q3TextView",
+            "Q3TimeEdit", "Q3ToolBar", "Q3TSFUNC", "Q3UriDrag", "Q3Url",
+            "Q3UrlOperator", "Q3ValueList", "Q3ValueListConstIterator",
+            "Q3ValueListIterator", "Q3ValueStack", "Q3ValueVector", "Q3VBox",
+            "Q3VBoxLayout", "Q3VButtonGroup", "Q3VGroupBox", "Q3WhatsThis",
+            "Q3WidgetStack", "Q3Wizard", "QAbstractButton",
+            "QAbstractEventDispatcher", "QAbstractExtensionFactory",
+            "QAbstractExtensionManager", "QAbstractFileEngine",
+            "QAbstractFileEngineHandler", "QAbstractFileEngineIterator",
+            "QAbstractFormBuilder", "QAbstractGraphicsShapeItem",
+            "QAbstractItemDelegate", "QAbstractItemModel", "QAbstractItemView",
+            "QAbstractListModel", "QAbstractMessageHandler",
+            "QAbstractNetworkCache", "QAbstractPageSetupDialog",
+            "QAbstractPrintDialog", "QAbstractProxyModel",
+            "QAbstractScrollArea", "QAbstractSlider", "QAbstractSocket",
+            "QAbstractSpinBox", "QAbstractTableModel",
+            "QAbstractTextDocumentLayout", "QAbstractUndoItem",
+            "QAbstractUriResolver", "QAbstractXmlNodeModel",
+            "QAbstractXmlReceiver", "QAccessible", "QAccessible2Interface",
+            "QAccessibleApplication", "QAccessibleBridge",
+            "QAccessibleBridgeFactoryInterface", "QAccessibleBridgePlugin",
+            "QAccessibleEditableTextInterface", "QAccessibleEvent",
+            "QAccessibleFactoryInterface", "QAccessibleInterface",
+            "QAccessibleInterfaceEx", "QAccessibleObject",
+            "QAccessibleObjectEx", "QAccessiblePlugin",
+            "QAccessibleSimpleEditableTextInterface",
+            "QAccessibleTableInterface", "QAccessibleTextInterface",
+            "QAccessibleValueInterface", "QAccessibleWidget",
+            "QAccessibleWidgetEx", "QAction", "QActionEvent", "QActionGroup",
+            "QApplication", "QArgument", "QAssistantClient", "QAtomicInt",
+            "QAtomicPointer", "QAuthenticator", "QBasicAtomicInt",
+            "QBasicAtomicPointer", "QBasicTimer", "QBitArray", "QBitmap",
+            "QBitRef", "QBool", "QBoxLayout", "QBrush", "QBrushData", "QBuffer",
+            "QButtonGroup", "QByteArray", "QByteArrayMatcher", "QByteRef",
+            "QCache", "QCalendarWidget", "QCDEStyle", "QChar", "QCharRef",
+            "QCheckBox", "QChildEvent", "QCleanlooksStyle", "QClipboard",
+            "QClipboardEvent", "QCloseEvent", "QColor", "QColorDialog",
+            "QColorGroup", "QColormap", "QColumnView", "QComboBox",
+            "QCommandLinkButton", "QCommonStyle", "QCompleter",
+            "QConicalGradient", "QConstString", "QContextMenuEvent", "QCOORD",
+            "QCoreApplication", "QCryptographicHash", "QCursor", "QCursorShape",
+            "QCustomEvent", "QDataStream", "QDataWidgetMapper", "QDate",
+            "QDateEdit", "QDateTime", "QDateTimeEdit", "QDB2Driver",
+            "QDB2Result", "QDBusAbstractAdaptor", "QDBusAbstractInterface",
+            "QDBusArgument", "QDBusConnection", "QDBusConnectionInterface",
+            "QDBusContext", "QDBusError", "QDBusInterface", "QDBusMessage",
+            "QDBusMetaType", "QDBusObjectPath", "QDBusPendingCall",
+            "QDBusPendingCallWatcher", "QDBusPendingReply",
+            "QDBusPendingReplyData", "QDBusReply", "QDBusServer",
+            "QDBusSignature", "QDBusVariant", "QDebug",
+            "QDesignerActionEditorInterface", "QDesignerBrushManagerInterface",
+            "QDesignerComponents", "QDesignerContainerExtension",
+            "QDesignerCustomWidgetCollectionInterface",
+            "QDesignerCustomWidgetInterface", "QDesignerDnDItemInterface",
+            "QDesignerDynamicPropertySheetExtension", "QDesignerExportWidget",
+            "QDesignerExtraInfoExtension", "QDesignerFormEditorInterface",
+            "QDesignerFormEditorPluginInterface", "QDesignerFormWindowCursorInterface",
+            "QDesignerFormWindowInterface", "QDesignerFormWindowManagerInterface",
+            "QDesignerFormWindowToolInterface",
+            "QDesignerIconCacheInterface", "QDesignerIntegrationInterface",
+            "QDesignerLanguageExtension", "QDesignerLayoutDecorationExtension",
+            "QDesignerMemberSheetExtension", "QDesignerMetaDataBaseInterface",
+            "QDesignerMetaDataBaseItemInterface",
+            "QDesignerObjectInspectorInterface", "QDesignerPromotionInterface",
+            "QDesignerPropertyEditorInterface",
+            "QDesignerPropertySheetExtension", "QDesignerResourceBrowserInterface",
+            "QDesignerTaskMenuExtension", "QDesignerWidgetBoxInterface",
+            "QDesignerWidgetDataBaseInterface", "QDesignerWidgetDataBaseItemInterface",
+            "QDesignerWidgetFactoryInterface", "QDesktopServices",
+            "QDesktopWidget", "QDial", "QDialog", "QDialogButtonBox", "QDir",
+            "QDirIterator", "QDirModel", "QDockWidget", "QDomAttr",
+            "QDomCDATASection", "QDomCharacterData", "QDomComment",
+            "QDomDocument", "QDomDocumentFragment", "QDomDocumentType",
+            "QDomElement", "QDomEntity", "QDomEntityReference",
+            "QDomImplementation", "QDomNamedNodeMap", "QDomNode",
+            "QDomNodeList", "QDomNotation", "QDomProcessingInstruction",
+            "QDomText", "QDoubleSpinBox", "QDoubleValidator", "QDrag",
+            "QDragEnterEvent", "QDragLeaveEvent", "QDragMoveEvent",
+            "QDragResponseEvent", "QDropEvent", "QDynamicPropertyChangeEvent",
+            "QErrorMessage", "QEvent", "QEventLoop", "QEventSizeOfChecker",
+            "QExplicitlySharedDataPointer", "QExtensionFactory",
+            "QExtensionManager", "QFactoryInterface", "QFile", "QFileDialog",
+            "QFileIconProvider", "QFileInfo", "QFileInfoList",
+            "QFileInfoListIterator", "QFileOpenEvent", "QFileSystemModel",
+            "QFileSystemWatcher", "QFlag", "QFlags", "QFocusEvent",
+            "QFocusFrame", "QFont", "QFontComboBox", "QFontDatabase",
+            "QFontDialog", "QFontInfo", "QFontMetrics", "QFontMetricsF",
+            "QForeachContainer", "QForeachContainerBase", "QFormBuilder",
+            "QFormLayout", "QFrame", "QFSFileEngine", "QFtp", "QFuture",
+            "QFutureInterface", "QFutureInterfaceBase", "QFutureIterator",
+            "QFutureSynchronizer", "QFutureWatcher", "QFutureWatcherBase",
+            "QGenericArgument", "QGenericReturnArgument", "QGLColormap",
+            "QGLContext", "QGLFormat", "QGLFramebufferObject", "QGlobalStatic",
+            "QGlobalStaticDeleter", "QGLPixelBuffer", "QGLWidget", "QGradient",
+            "QGradientStop", "QGradientStops", "QGraphicsEllipseItem",
+            "QGraphicsGridLayout", "QGraphicsItem", "QGraphicsItemAnimation",
+            "QGraphicsItemGroup", "QGraphicsLayout", "QGraphicsLayoutItem",
+            "QGraphicsLinearLayout", "QGraphicsLineItem", "QGraphicsPathItem",
+            "QGraphicsPixmapItem", "QGraphicsPolygonItem",
+            "QGraphicsProxyWidget", "QGraphicsRectItem", "QGraphicsScene",
+            "QGraphicsSceneContextMenuEvent", "QGraphicsSceneDragDropEvent",
+            "QGraphicsSceneEvent", "QGraphicsSceneHelpEvent",
+            "QGraphicsSceneHoverEvent", "QGraphicsSceneMouseEvent",
+            "QGraphicsSceneMoveEvent", "QGraphicsSceneResizeEvent",
+            "QGraphicsSceneWheelEvent", "QGraphicsSimpleTextItem",
+            "QGraphicsSvgItem", "QGraphicsTextItem", "QGraphicsView",
+            "QGraphicsWidget", "QGridLayout", "QGroupBox", "QGtkStyle", "QHash",
+            "QHashData", "QHashDummyNode", "QHashDummyValue", "QHashIterator",
+            "QHashNode", "QHBoxLayout", "QHeaderView", "QHelpContentItem",
+            "QHelpContentModel", "QHelpContentWidget", "QHelpEngine",
+            "QHelpEngineCore", "QHelpEvent", "QHelpGlobal", "QHelpIndexModel",
+            "QHelpIndexWidget", "QHelpSearchEngine", "QHelpSearchQuery",
+            "QHelpSearchQueryWidget", "QHelpSearchResultWidget", "QHideEvent",
+            "QHostAddress", "QHostInfo", "QHoverEvent", "QHttp", "QHttpHeader",
+            "QHttpRequestHeader", "QHttpResponseHeader", "QIBaseDriver",
+            "QIBaseResult", "QIcon", "QIconDragEvent", "QIconEngine",
+            "QIconEngineFactoryInterface", "QIconEngineFactoryInterfaceV2",
+            "QIconEnginePlugin", "QIconEnginePluginV2", "QIconEngineV2",
+            "QIconSet", "QImage", "QImageIOHandler",
+            "QImageIOHandlerFactoryInterface", "QImageIOPlugin", "QImageReader",
+            "QImageTextKeyLang", "QImageWriter", "QIncompatibleFlag",
+            "QInputContext", "QInputContextFactory",
+            "QInputContextFactoryInterface", "QInputContextPlugin",
+            "QInputDialog", "QInputEvent", "QInputMethodEvent", "Q_INT16",
+            "Q_INT32", "Q_INT64", "Q_INT8", "QInternal", "QIntForSize",
+            "QIntForType", "QIntValidator", "QIODevice", "Q_IPV6ADDR",
+            "QIPv6Address", "QItemDelegate", "QItemEditorCreator",
+            "QItemEditorCreatorBase", "QItemEditorFactory", "QItemSelection",
+            "QItemSelectionModel", "QItemSelectionRange", "QKeyEvent",
+            "QKeySequence", "QLabel", "QLatin1Char", "QLatin1String", "QLayout",
+            "QLayoutItem", "QLayoutIterator", "QLCDNumber", "QLibrary",
+            "QLibraryInfo", "QLine", "QLinearGradient", "QLineEdit", "QLineF",
+            "QLinkedList", "QLinkedListData", "QLinkedListIterator",
+            "QLinkedListNode", "QList", "QListData", "QListIterator",
+            "QListView", "QListWidget", "QListWidgetItem", "Q_LLONG", "QLocale",
+            "QLocalServer", "QLocalSocket", "Q_LONG", "QMacCompatGLenum",
+            "QMacCompatGLint", "QMacCompatGLuint", "QMacGLCompatTypes",
+            "QMacMime", "QMacPasteboardMime", "QMainWindow", "QMap", "QMapData",
+            "QMapIterator", "QMapNode", "QMapPayloadNode", "QMatrix",
+            "QMdiArea", "QMdiSubWindow", "QMenu", "QMenuBar",
+            "QMenubarUpdatedEvent", "QMenuItem", "QMessageBox",
+            "QMetaClassInfo", "QMetaEnum", "QMetaMethod", "QMetaObject",
+            "QMetaObjectExtraData", "QMetaProperty", "QMetaType", "QMetaTypeId",
+            "QMetaTypeId2", "QMimeData", "QMimeSource", "QModelIndex",
+            "QModelIndexList", "QMotifStyle", "QMouseEvent", "QMoveEvent",
+            "QMovie", "QMultiHash", "QMultiMap", "QMutableFutureIterator",
+            "QMutableHashIterator", "QMutableLinkedListIterator",
+            "QMutableListIterator", "QMutableMapIterator",
+            "QMutableSetIterator", "QMutableStringListIterator",
+            "QMutableVectorIterator", "QMutex", "QMutexLocker", "QMYSQLDriver",
+            "QMYSQLResult", "QNetworkAccessManager", "QNetworkAddressEntry",
+            "QNetworkCacheMetaData", "QNetworkCookie", "QNetworkCookieJar",
+            "QNetworkDiskCache", "QNetworkInterface", "QNetworkProxy",
+            "QNetworkProxyFactory", "QNetworkProxyQuery", "QNetworkReply",
+            "QNetworkRequest", "QNoDebug", "QNoImplicitBoolCast", "QObject",
+            "QObjectCleanupHandler", "QObjectData", "QObjectList",
+            "QObjectUserData", "QOCIDriver", "QOCIResult", "QODBCDriver",
+            "QODBCResult", "QPageSetupDialog", "QPaintDevice", "QPaintEngine",
+            "QPaintEngineState", "QPainter", "QPainterPath",
+            "QPainterPathPrivate", "QPainterPathStroker", "QPaintEvent",
+            "QPair", "QPalette", "QPen", "QPersistentModelIndex", "QPicture",
+            "QPictureFormatInterface", "QPictureFormatPlugin", "QPictureIO",
+            "Q_PID", "QPixmap", "QPixmapCache", "QPlainTextDocumentLayout",
+            "QPlainTextEdit", "QPlastiqueStyle", "QPluginLoader", "QPoint",
+            "QPointer", "QPointF", "QPolygon", "QPolygonF", "QPrintDialog",
+            "QPrintEngine", "QPrinter", "QPrinterInfo", "QPrintPreviewDialog",
+            "QPrintPreviewWidget", "QProcess", "QProgressBar",
+            "QProgressDialog", "QProxyModel", "QPSQLDriver", "QPSQLResult",
+            "QPushButton", "QQueue", "QRadialGradient", "QRadioButton",
+            "QReadLocker", "QReadWriteLock", "QRect", "QRectF", "QRegExp",
+            "QRegExpValidator", "QRegion", "QResizeEvent", "QResource",
+            "QReturnArgument", "QRgb", "QRubberBand", "QRunnable",
+            "QScriptable", "QScriptClass", "QScriptClassPropertyIterator",
+            "QScriptContext", "QScriptContextInfo", "QScriptContextInfoList",
+            "QScriptEngine", "QScriptEngineAgent", "QScriptEngineDebugger",
+            "QScriptExtensionInterface", "QScriptExtensionPlugin",
+            "QScriptString", "QScriptSyntaxCheckResult", "QScriptValue",
+            "QScriptValueIterator", "QScriptValueList", "QScrollArea",
+            "QScrollBar", "QSemaphore", "QSessionManager", "QSet",
+            "QSetIterator", "QSettings", "QSharedData", "QSharedDataPointer",
+            "QSharedMemory", "QSharedPointer", "QShortcut", "QShortcutEvent",
+            "QShowEvent", "QSignalMapper", "QSignalSpy", "QSimpleXmlNodeModel",
+            "QSize", "QSizeF", "QSizeGrip", "QSizePolicy", "QSlider",
+            "QSocketNotifier", "QSortFilterProxyModel", "QSound",
+            "QSourceLocation", "QSpacerItem", "QSpinBox", "QSplashScreen",
+            "QSplitter", "QSplitterHandle", "QSpontaneKeyEvent", "QSqlDatabase",
+            "QSqlDriver", "QSqlDriverCreator", "QSqlDriverCreatorBase",
+            "QSqlDriverFactoryInterface", "QSqlDriverPlugin", "QSqlError",
+            "QSqlField", "QSqlIndex", "QSQLite2Driver", "QSQLite2Result",
+            "QSQLiteDriver", "QSQLiteResult", "QSqlQuery", "QSqlQueryModel",
+            "QSqlRecord", "QSqlRelation", "QSqlRelationalDelegate",
+            "QSqlRelationalTableModel", "QSqlResult", "QSqlTableModel", "QSsl",
+            "QSslCertificate", "QSslCipher", "QSslConfiguration", "QSslError",
+            "QSslKey", "QSslSocket", "QStack", "QStackedLayout",
+            "QStackedWidget", "QStandardItem", "QStandardItemEditorCreator",
+            "QStandardItemModel", "QStatusBar", "QStatusTipEvent",
+            "QStdWString", "QString", "QStringList", "QStringListIterator",
+            "QStringListModel", "QStringMatcher", "QStringRef", "QStyle",
+            "QStyledItemDelegate", "QStyleFactory", "QStyleFactoryInterface",
+            "QStyleHintReturn", "QStyleHintReturnMask",
+            "QStyleHintReturnVariant", "QStyleOption", "QStyleOptionButton",
+            "QStyleOptionComboBox", "QStyleOptionComplex",
+            "QStyleOptionDockWidget", "QStyleOptionDockWidgetV2",
+            "QStyleOptionFocusRect", "QStyleOptionFrame", "QStyleOptionFrameV2",
+            "QStyleOptionFrameV3", "QStyleOptionGraphicsItem",
+            "QStyleOptionGroupBox", "QStyleOptionHeader",
+            "QStyleOptionMenuItem", "QStyleOptionProgressBar",
+            "QStyleOptionProgressBarV2", "QStyleOptionQ3DockWindow",
+            "QStyleOptionQ3ListView", "QStyleOptionQ3ListViewItem",
+            "QStyleOptionRubberBand", "QStyleOptionSizeGrip",
+            "QStyleOptionSlider", "QStyleOptionSpinBox", "QStyleOptionTab",
+            "QStyleOptionTabBarBase", "QStyleOptionTabBarBaseV2",
+            "QStyleOptionTabV2", "QStyleOptionTabV3",
+            "QStyleOptionTabWidgetFrame", "QStyleOptionTitleBar",
+            "QStyleOptionToolBar", "QStyleOptionToolBox",
+            "QStyleOptionToolBoxV2", "QStyleOptionToolButton",
+            "QStyleOptionViewItem", "QStyleOptionViewItemV2",
+            "QStyleOptionViewItemV3", "QStyleOptionViewItemV4", "QStylePainter",
+            "QStylePlugin", "QSvgGenerator", "QSvgRenderer", "QSvgWidget",
+            "QSyntaxHighlighter", "QSysInfo", "QSystemLocale",
+            "QSystemSemaphore", "QSystemTrayIcon", "Qt", "Qt3Support",
+            "QTabBar", "QTabletEvent", "QTableView", "QTableWidget",
+            "QTableWidgetItem", "QTableWidgetSelectionRange", "QTabWidget",
+            "QtAlgorithms", "QtAssistant", "QtCleanUpFunction",
+            "QtConcurrentFilter", "QtConcurrentMap", "QtConcurrentRun",
+            "QtContainerFwd", "QtCore", "QTcpServer", "QTcpSocket", "QtDBus",
+            "QtDebug", "QtDesigner", "QTDSDriver", "QTDSResult",
+            "QTemporaryFile", "QtEndian", "QTest", "QTestAccessibility",
+            "QTestAccessibilityEvent", "QTestData", "QTestDelayEvent",
+            "QTestEvent", "QTestEventList", "QTestEventLoop",
+            "QTestKeyClicksEvent", "QTestKeyEvent", "QTestMouseEvent",
+            "QtEvents", "QTextBlock", "QTextBlockFormat", "QTextBlockGroup",
+            "QTextBlockUserData", "QTextBoundaryFinder", "QTextBrowser",
+            "QTextCharFormat", "QTextCodec", "QTextCodecFactoryInterface",
+            "QTextCodecPlugin", "QTextCursor", "QTextDecoder", "QTextDocument",
+            "QTextDocumentFragment", "QTextDocumentWriter", "QTextEdit",
+            "QTextEncoder", "QTextFormat", "QTextFragment", "QTextFrame",
+            "QTextFrameFormat", "QTextFrameLayoutData", "QTextImageFormat",
+            "QTextInlineObject", "QTextIStream", "QTextItem", "QTextLayout",
+            "QTextLength", "QTextLine", "QTextList", "QTextListFormat",
+            "QTextObject", "QTextObjectInterface", "QTextOption",
+            "QTextOStream", "QTextStream", "QTextStreamFunction",
+            "QTextStreamManipulator", "QTextTable", "QTextTableCell",
+            "QTextTableCellFormat", "QTextTableFormat", "QtGlobal", "QtGui",
+            "QtHelp", "QThread", "QThreadPool", "QThreadStorage",
+            "QThreadStorageData", "QTime", "QTimeEdit", "QTimeLine", "QTimer",
+            "QTimerEvent", "QtMsgHandler", "QtNetwork", "QToolBar",
+            "QToolBarChangeEvent", "QToolBox", "QToolButton", "QToolTip",
+            "QtOpenGL", "QtPlugin", "QtPluginInstanceFunction", "QTransform",
+            "QTranslator", "QTreeView", "QTreeWidget", "QTreeWidgetItem",
+            "QTreeWidgetItemIterator", "QTS", "QtScript", "QtScriptTools",
+            "QtSql", "QtSvg", "QtTest", "QtUiTools", "QtWebKit", "QtXml",
+            "QtXmlPatterns", "QTypeInfo", "QUdpSocket", "QUiLoader",
+            "QUintForSize", "QUintForType", "QUndoCommand", "QUndoGroup",
+            "QUndoStack", "QUndoView", "QUnixPrintWidget", "QUpdateLaterEvent",
+            "QUrl", "QUrlInfo", "QUuid", "QValidator", "QVariant",
+            "QVariantComparisonHelper", "QVariantHash", "QVariantList",
+            "QVariantMap", "QVarLengthArray", "QVBoxLayout", "QVector",
+            "QVectorData", "QVectorIterator", "QVectorTypedData",
+            "QWaitCondition", "QWeakPointer", "QWebDatabase", "QWebFrame",
+            "QWebHistory", "QWebHistoryInterface", "QWebHistoryItem",
+            "QWebHitTestResult", "QWebPage", "QWebPluginFactory",
+            "QWebSecurityOrigin", "QWebSettings", "QWebView", "QWhatsThis",
+            "QWhatsThisClickedEvent", "QWheelEvent", "QWidget", "QWidgetAction",
+            "QWidgetData", "QWidgetItem", "QWidgetItemV2", "QWidgetList",
+            "QWidgetMapper", "QWidgetSet", "QWindowsCEStyle", "QWindowsMime",
+            "QWindowsMobileStyle", "QWindowsStyle", "QWindowStateChangeEvent",
+            "QWindowsVistaStyle", "QWindowsXPStyle", "QWizard", "QWizardPage",
+            "QWMatrix", "QWorkspace", "QWriteLocker", "QX11EmbedContainer",
+            "QX11EmbedWidget", "QX11Info", "QXmlAttributes",
+            "QXmlContentHandler", "QXmlDeclHandler", "QXmlDefaultHandler",
+            "QXmlDTDHandler", "QXmlEntityResolver", "QXmlErrorHandler",
+            "QXmlFormatter", "QXmlInputSource", "QXmlItem",
+            "QXmlLexicalHandler", "QXmlLocator", "QXmlName", "QXmlNamePool",
+            "QXmlNamespaceSupport", "QXmlNodeModelIndex", "QXmlParseException",
+            "QXmlQuery", "QXmlReader", "QXmlResultItems", "QXmlSerializer",
+            "QXmlSimpleReader", "QXmlStreamAttribute", "QXmlStreamAttributes",
+            "QXmlStreamEntityDeclaration", "QXmlStreamEntityDeclarations",
+            "QXmlStreamEntityResolver", "QXmlStreamNamespaceDeclaration",
+            "QXmlStreamNamespaceDeclarations", "QXmlStreamNotationDeclaration",
+            "QXmlStreamNotationDeclarations", "QXmlStreamReader",
+            "QXmlStreamStringRef", "QXmlStreamWriter"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ',', ';', '|', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight:bold;',
+            2 => 'color: #0057AE;',
+            3 => 'color: #2B74C7;',
+            4 => 'color: #0057AE;',
+            5 => 'color: #22aadd;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #888888;',
+            2 => 'color: #006E28;',
+            'MULTI' => 'color: #888888; 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: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #006E28;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #BF0303;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #B08000;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #2B74C7;',
+            2 => 'color: #2B74C7;',
+            3 => 'color: #2B74C7;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006E28;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://doc.trolltech.com/latest/{FNAMEL}.html'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::',
+        3 => '->',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        ),
+        'OOLANG' => array(
+            'MATCH_AFTER' => '~?[a-zA-Z][a-zA-Z0-9_]*',
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/cpp.php b/sources/inc/geshi/cpp.php
new file mode 100644
index 0000000..42ab311
--- /dev/null
+++ b/sources/inc/geshi/cpp.php
@@ -0,0 +1,240 @@
+ 'C++',
+    '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' => '',
+    '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',
+            'switch', 'throw', 'while'
+            ),
+        2 => array(
+            'NULL', 'false', 'true', 'enum', 'errno', 'EDOM',
+            'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX', 'stdin', 'stdout', 'stderr',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'inline', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class'
+            ),
+        3 => array(
+            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'extern', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '{', '}', '[', ']'),
+        1 => array('<', '>','='),
+        2 => array('+', '-', '*', '/', '%'),
+        3 => array('!', '^', '&', '|'),
+        4 => array('?', ':', ';')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            'MULTI' => 'color: #ff0000; 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: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #007788;',
+            2 => 'color: #007788;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #000080;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040;',
+            4 => 'color: #008080;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(? "(?![a-zA-Z0-9_\|%\\-])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/csharp.php b/sources/inc/geshi/csharp.php
new file mode 100644
index 0000000..26024e9
--- /dev/null
+++ b/sources/inc/geshi/csharp.php
@@ -0,0 +1,256 @@
+ 'C#',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Using and Namespace directives (basic support)
+        //Please note that the alias syntax for using is not supported
+        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('"'),
+    'HARDCHAR' => '"',
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abstract', 'add', 'as', 'base', 'break', 'by', 'case', 'catch', 'const', 'continue',
+            'default', 'do', 'else', 'event', 'explicit', 'extern', 'false',
+            'finally', 'fixed', 'for', 'foreach', 'from', 'get', 'goto', 'group', 'if',
+            'implicit', 'in', 'into', 'internal', 'join', 'lock', 'namespace', 'null',
+            'operator', 'out', 'override', 'params', 'partial', 'private',
+            'protected', 'public', 'readonly', 'remove', 'ref', 'return', 'sealed',
+            'select', 'set', 'stackalloc', 'static', 'switch', 'this', 'throw', 'true',
+            'try', 'unsafe', 'using', 'var', 'value', 'virtual', 'volatile', 'where',
+            'while', 'yield'
+            ),
+        2 => array(
+            '#elif', '#endif', '#endregion', '#else', '#error', '#define', '#if',
+            '#line', '#region', '#undef', '#warning'
+            ),
+        3 => array(
+            'checked', 'is', 'new', 'sizeof', 'typeof', 'unchecked'
+            ),
+        4 => array(
+            'bool', 'byte', 'char', 'class', 'decimal', 'delegate', 'double',
+            'dynamic', 'enum', 'float', 'int', 'interface', 'long', 'object', 'sbyte',
+            'short', 'string', 'struct', 'uint', 'ulong', 'ushort', 'void'
+            ),
+        5 => array(
+            'Microsoft.Win32',
+            'System',
+            'System.CodeDOM',
+            'System.CodeDOM.Compiler',
+            'System.Collections',
+            'System.Collections.Bases',
+            'System.ComponentModel',
+            'System.ComponentModel.Design',
+            'System.ComponentModel.Design.CodeModel',
+            'System.Configuration',
+            'System.Configuration.Assemblies',
+            'System.Configuration.Core',
+            'System.Configuration.Install',
+            'System.Configuration.Interceptors',
+            'System.Configuration.Schema',
+            'System.Configuration.Web',
+            'System.Core',
+            'System.Data',
+            'System.Data.ADO',
+            'System.Data.Design',
+            'System.Data.Internal',
+            'System.Data.SQL',
+            'System.Data.SQLTypes',
+            'System.Data.XML',
+            'System.Data.XML.DOM',
+            'System.Data.XML.XPath',
+            'System.Data.XML.XSLT',
+            'System.Diagnostics',
+            'System.Diagnostics.SymbolStore',
+            'System.DirectoryServices',
+            'System.Drawing',
+            'System.Drawing.Design',
+            'System.Drawing.Drawing2D',
+            'System.Drawing.Imaging',
+            'System.Drawing.Printing',
+            'System.Drawing.Text',
+            'System.Globalization',
+            'System.IO',
+            'System.IO.IsolatedStorage',
+            'System.Messaging',
+            'System.Net',
+            'System.Net.Sockets',
+            'System.NewXml',
+            'System.NewXml.XPath',
+            'System.NewXml.Xsl',
+            'System.Reflection',
+            'System.Reflection.Emit',
+            'System.Resources',
+            'System.Runtime.InteropServices',
+            'System.Runtime.InteropServices.Expando',
+            'System.Runtime.Remoting',
+            'System.Runtime.Serialization',
+            'System.Runtime.Serialization.Formatters',
+            'System.Runtime.Serialization.Formatters.Binary',
+            'System.Security',
+            'System.Security.Cryptography',
+            'System.Security.Cryptography.X509Certificates',
+            'System.Security.Permissions',
+            'System.Security.Policy',
+            'System.Security.Principal',
+            'System.ServiceProcess',
+            'System.Text',
+            'System.Text.RegularExpressions',
+            'System.Threading',
+            'System.Timers',
+            'System.Web',
+            'System.Web.Caching',
+            'System.Web.Configuration',
+            'System.Web.Security',
+            'System.Web.Services',
+            'System.Web.Services.Description',
+            'System.Web.Services.Discovery',
+            'System.Web.Services.Protocols',
+            'System.Web.UI',
+            'System.Web.UI.Design',
+            'System.Web.UI.Design.WebControls',
+            'System.Web.UI.Design.WebControls.ListControls',
+            'System.Web.UI.HtmlControls',
+            'System.Web.UI.WebControls',
+            'System.WinForms',
+            'System.WinForms.ComponentModel',
+            'System.WinForms.Design',
+            'System.Xml',
+            'System.Xml.Serialization',
+            'System.Xml.Serialization.Code',
+            'System.Xml.Serialization.Schema'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
+        '(', ')', '{', '}', '[', ']', '|', '.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF; font-weight: bold;',
+            2 => 'color: #FF8000; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #6666cc; font-weight: bold;',
+            5 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            3 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;',
+            'HARD' => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;',
+            'HARD' => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?q={FNAMEL}+msdn.microsoft.com',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_%\\-])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/css.php b/sources/inc/geshi/css.php
new file mode 100644
index 0000000..d09bea7
--- /dev/null
+++ b/sources/inc/geshi/css.php
@@ -0,0 +1,226 @@
+ 'CSS',
+    'COMMENT_SINGLE' => array(1 => '@'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        2 => "/(?<=\\()\\s*(?:(?:[a-z0-9]+?:\\/\\/)?[a-z0-9_\\-\\.\\/:]+?)?[a-z]+?\\.[a-z]+?(\\?[^\)]+?)?\\s*?(?=\\))/i"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        //1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\[\da-fA-F]{1,6}\s?#i",
+        //Unicode Char Specs
+        //3 => "#\\\\u[\da-fA-F]{1,8}#i",
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'aqua', 'azimuth', 'background-attachment', 'background-color',
+            'background-image', 'background-position', 'background-repeat',
+            'background', 'black', 'blue', 'border-bottom-color',
+            'border-radius', 'border-top-left-radius', 'border-top-right-radius',
+            'border-bottom-right-radius', 'border-bottom-left-radius',
+            'border-bottom-style', 'border-bottom-width', 'border-left-color',
+            'border-left-style', 'border-left-width', 'border-right',
+            'border-right-color', 'border-right-style', 'border-right-width',
+            'border-top-color', 'border-top-style',
+            'border-top-width','border-bottom', 'border-collapse',
+            'border-left', 'border-width', 'border-color', 'border-spacing',
+            'border-style', 'border-top', 'border', 'caption-side', 'clear',
+            'clip', 'color', 'content', 'counter-increment', 'counter-reset',
+            'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
+            'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
+            'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
+            'font-weight', 'font', 'line-height', 'letter-spacing',
+            'list-style', 'list-style-image', 'list-style-position',
+            'list-style-type', 'margin-bottom', 'margin-left', 'margin-right',
+            'margin-top', 'margin', 'marker-offset', 'marks', 'max-height',
+            'max-width', 'min-height', 'min-width', 'orphans', 'outline',
+            'outline-color', 'outline-style', 'outline-width', 'overflow',
+            'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
+            'padding', 'page', 'page-break-after', 'page-break-before',
+            'page-break-inside', 'pause-after', 'pause-before', 'pause',
+            'pitch', 'pitch-range', 'play-during', 'position', 'quotes',
+            'richness', 'right', 'size', 'speak-header', 'speak-numeral',
+            'speak-punctuation', 'speak', 'speech-rate', 'stress',
+            'table-layout', 'text-align', 'text-decoration', 'text-indent',
+            'text-shadow', 'text-transform', 'top', 'unicode-bidi',
+            'vertical-align', 'visibility', 'voice-family', 'volume',
+            'white-space', 'widows', 'width', 'word-spacing', 'z-index',
+            'bottom', 'left', 'height'
+            ),
+        2 => array(
+            'above', 'absolute', 'always', 'armenian', 'aural', 'auto',
+            'avoid', 'baseline', 'behind', 'below', 'bidi-override', 'blink',
+            'block', 'bold', 'bolder', 'both', 'capitalize', 'center-left',
+            'center-right', 'center', 'circle', 'cjk-ideographic',
+            'close-quote', 'collapse', 'condensed', 'continuous', 'crop',
+            'crosshair', 'cross', 'cursive', 'dashed', 'decimal-leading-zero',
+            'decimal', 'default', 'digits', 'disc', 'dotted', 'double',
+            'e-resize', 'embed', 'extra-condensed', 'extra-expanded',
+            'expanded', 'fantasy', 'far-left', 'far-right', 'faster', 'fast',
+            'fixed', 'fuchsia', 'georgian', 'gray', 'green', 'groove',
+            'hebrew', 'help', 'hidden', 'hide', 'higher', 'high',
+            'hiragana-iroha', 'hiragana', 'icon', 'inherit', 'inline-table',
+            'inline', 'inset', 'inside', 'invert', 'italic', 'justify',
+            'katakana-iroha', 'katakana', 'landscape', 'larger', 'large',
+            'left-side', 'leftwards', 'level', 'lighter', 'lime',
+            'line-through', 'list-item', 'loud', 'lower-alpha', 'lower-greek',
+            'lower-roman', 'lowercase', 'ltr', 'lower', 'low', 'maroon',
+            'medium', 'message-box', 'middle', 'mix', 'monospace', 'n-resize',
+            'narrower', 'navy', 'ne-resize', 'no-close-quote',
+            'no-open-quote', 'no-repeat', 'none', 'normal', 'nowrap',
+            'nw-resize', 'oblique', 'olive', 'once', 'open-quote', 'outset',
+            'outside', 'overline', 'pointer', 'portrait', 'purple', 'px',
+            'red', 'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb',
+            'ridge', 'right-side', 'rightwards', 's-resize', 'sans-serif',
+            'scroll', 'se-resize', 'semi-condensed', 'semi-expanded',
+            'separate', 'serif', 'show', 'silent', 'silver', 'slow', 'slower',
+            'small-caps', 'small-caption', 'smaller', 'soft', 'solid',
+            'spell-out', 'square', 'static', 'status-bar', 'super',
+            'sw-resize', 'table-caption', 'table-cell', 'table-column',
+            'table-column-group', 'table-footer-group', 'table-header-group',
+            'table-row', 'table-row-group', 'teal', 'text', 'text-bottom',
+            'text-top', 'thick', 'thin', 'transparent', 'ultra-condensed',
+            'ultra-expanded', 'underline', 'upper-alpha', 'upper-latin',
+            'upper-roman', 'uppercase', 'url', 'visible', 'w-resize', 'wait',
+            'white', 'wider', 'x-fast', 'x-high', 'x-large', 'x-loud',
+            'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small', 'yellow',
+            'yes'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', ':', ';',
+        '>', '+', '*', ',', '^', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #a1a100;',
+            2 => 'color: #ff0000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            //1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #000099; font-weight: bold;'
+            //3 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00AA00;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00AA00;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #cc00cc;',
+            1 => 'color: #6666ff;',
+            2 => 'color: #3333ff;',
+            3 => 'color: #933;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //DOM Node ID
+        0 => '\#[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*',
+        //CSS classname
+        1 => '\.(?!\d)[a-zA-Z0-9\-_]+(?:\\\\:[a-zA-Z0-9\-_]+)*\b(?=[\{\.#\s,:].|<\|)',
+        //CSS Pseudo classes
+        //note: & is needed for > (i.e. > )
+        2 => '(? '[+\-]?(\d+|(\d*\.\d+))(em|ex|pt|px|cm|in|%)',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_AFTER' => '(?![\-a-zA-Z0-9_\|%\\-&\.])',
+            'DISALLOWED_BEFORE' => '(?
\ No newline at end of file
diff --git a/sources/inc/geshi/cuesheet.php b/sources/inc/geshi/cuesheet.php
new file mode 100644
index 0000000..ebaca95
--- /dev/null
+++ b/sources/inc/geshi/cuesheet.php
@@ -0,0 +1,138 @@
+ 'Cuesheet',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Single-Line Comments using REM command
+        1 => "/(?<=\bREM\b).*?$/im",
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'CATALOG','CDTEXTFILE','FILE','FLAGS','INDEX','ISRC','PERFORMER',
+            'POSTGAP','PREGAP','REM','SONGWRITER','TITLE','TRACK'
+            ),
+        2 => array(
+            'AIFF', 'BINARY', 'MOTOROLA', 'MP3', 'WAVE'
+            ),
+        3 => array(
+            '4CH', 'DCP', 'PRE', 'SCMS'
+            ),
+        4 => array(
+            'AUDIO', 'CDG', 'MODE1/2048', 'MODE1/2336', 'MODE2/2336',
+            'MODE2/2352', 'CDI/2336', 'CDI/2352'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000066; font-weight: bold;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #006600;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #000099;',
+            2 => 'color: #009900;',
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://digitalx.org/cuesheetsyntax.php#{FNAMEL}',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        2 => '\b[A-Za-z0-9]{5}\d{7}\b',
+        1 => '(?<=[\s:]|^)\d+(?=[\s:]|$)',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(? '(?![\w\.])',
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/d.php b/sources/inc/geshi/d.php
new file mode 100644
index 0000000..7f3e985
--- /dev/null
+++ b/sources/inc/geshi/d.php
@@ -0,0 +1,252 @@
+ 'D',
+    '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' => '',
+    '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',
+                'for', 'foreach', 'goto', 'if', 'return',
+                'switch', 'while', 'foreach_reverse'
+            ),
+        2 => array(
+                'alias', 'asm', 'assert', 'body', 'cast',
+                'catch', 'default', 'delegate', 'delete',
+                'extern', 'false', 'finally', 'function',
+                'import', 'in', 'inout',
+                'invariant', 'is', 'lazy', 'mixin', 'module', 'new',
+                'null', 'out', 'pragma', 'ref', 'super', 'this',
+                'throw', 'true', 'try', 'typeid',
+                'typeof', 'union', 'with', 'scope'
+            ),
+        3 => array(
+                'ClassInfo', 'Error', 'Exception',
+                'Interface', 'Object', 'IMonitor',
+                'OffsetTypeInfo', 'Throwable',
+                'TypeInfo_Class', 'TypeInfo', '__traits',
+                '__EOF__', '__FILE__', '__LINE__',
+            ),
+        4 => array(
+                'abstract', 'align', 'auto', 'bit', 'bool',
+                'byte', 'cdouble', 'cfloat', 'char',
+                'class', 'const', 'creal', 'dchar', 'dstring', 'debug',
+                'deprecated', 'double', 'enum', 'export',
+                'final', 'float', 'idouble', 'ifloat', 'immutable', 'int',
+                'interface', 'ireal', 'long', 'nothrow', 'override',
+                'package', 'private', 'protected', 'ptrdiff_t',
+                'public', 'real', 'short', 'shared', 'size_t',
+                'static', 'string', 'struct', 'synchronized',
+                'template', 'ubyte', 'ucent', 'uint',
+                'ulong', 'unittest', 'ushort', 'version',
+                'void', 'volatile', 'wchar', 'wstring',
+                '__gshared', '@disable', '@property', 'pure', 'safe'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '?', '!', ';', ':', ',', '...', '..',
+        '+', '-', '*', '/', '%', '&', '|', '^', '<', '>', '=', '~',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #aaaadd; font-weight: bold;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            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;',
+            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;',
+            'HARD' => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => 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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/dcl.php b/sources/inc/geshi/dcl.php
new file mode 100644
index 0000000..db12a4c
--- /dev/null
+++ b/sources/inc/geshi/dcl.php
@@ -0,0 +1,192 @@
+ 'DCL',
+    'COMMENT_SINGLE' => array('$!', '!'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        2 => '/(?<=\$)\s*sql\s+.*?(?:quit|exit);?\s*?$/sim' // do not highlight inline sql
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDESCAPE' => array(),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => "/''[a-zA-Z\\-_]+'/"
+        ),
+    'KEYWORDS' => array(
+        1 => array( // commands
+            'ACCOUNTING', 'ALLOCATE', 'ANALYZE', 'APPEND', 'ASSIGN', 'ATTACH', 'BACKUP',
+            'CALL', 'CANCEL', 'CHECKSUM', 'CLOSE', 'CONNECT', 'CONTINUE', 'CONVERT',
+            'COPY', 'CREATE', 'DEALLOCATE', 'DEASSIGN', 'DEBUG', 'DECK',
+            'DECRYPT', 'DEFINE', 'DELETE', 'DEPOSIT', 'DIFFERENCES', 'DIRECTORY',
+            'DISABLE',  'AUTOSTART', 'DISCONNECT', 'DISMOUNT', 'DUMP', 'EDIT', 'ENABLE',
+            'ENCRYPT', 'ENDSUBROUTINE', 'EOD', 'EOJ', 'EXAMINE', 'EXCHANGE',
+            'EXIT', 'FONT', 'GOSUB', 'GOTO', 'HELP', 'IF', 'THEN', 'ELSE', 'ENDIF', 'INITIALIZE', 'INQUIRE',
+            'INSTALL', 'JAVA', 'JOB', 'LIBRARY', 'LICENSE', 'LINK', 'LOGIN', 'LOGOUT',
+            'MACRO', 'MAIL', 'MERGE', 'MESSAGE', 'MONITOR', 'MOUNT', 'NCS', 'ON', 'OPEN',
+            'PASSWORD', 'PATCH', 'PHONE', 'PIPE', 'PPPD', 'PRINT', 'PRODUCT', 'PURGE',
+            'READ', 'RECALL', 'RENAME', 'REPLY', 'REQUEST', 'RETURN', 'RMU', 'RUN', 'RUNOFF',
+            'SEARCH', 'SET', 'SET AUDIT', 'SET BOOTBLOCK', 'SET BROADCAST',
+            'SET CACHE', 'SET CARD_READER', 'SET CLUSTER', 'SET COMMAND', 'SET CONTROL',
+            'SET CPU', 'SET DAY', 'SET DEFAULT', 'SET DEVICE', 'SET DIRECTORY',
+            'SET DISPLAY', 'SET ENTRY', 'SET FILE', 'SET HOST', 'SET IMAGE', 'SET KEY',
+            'SET LOGINS', 'SET MAGTAPE', 'SET MESSAGE', 'SET NETWORK', 'SET ON', 'SET OUTPUT_RATE',
+            'SET PASSWORD', 'SET PREFERRED_PATH', 'SET PREFIX', 'SET PRINTER', 'SET PROCESS',
+            'SET PROMPT', 'SET PROTECTION', 'SET QUEUE', 'SET RESTART_VALUE',
+            'SET RIGHTS_LIST', 'SET RMS_DEFAULT', 'SET ROOT', 'SET SECURITY',
+            'SET SERVER ACME_SERVER', 'SET SERVER REGISTRY_SERVER', 'SET SERVER SECURITY_SERVER',
+            'SET SHADOW', 'SET SYMBOL', 'SET TERMINAL', 'SET TIME', 'SET VERIFY',
+            'SET VOLUME', 'SET WORKING_SET', 'SHOW', 'SHOW AUDIT',
+            'SHOW BROADCAST', 'SHOW CLUSTER', 'SHOW CPU', 'SHOW DEFAULT', 'SHOW DEVICES',
+            'SHOW DISPLAY', 'SHOW ENTRY', 'SHOW ERROR', 'SHOW FASTPATH', 'SHOW IMAGE',
+            'SHOW INTRUSION', 'SHOW KEY', 'SHOW LICENSE', 'SHOW LOGICAL', 'SHOW MEMORY',
+            'SHOW NETWORK', 'SHOW PRINTER', 'SHOW PROCESS', 'SHOW PROTECTION', 'SHOW QUEUE',
+            'SHOW QUOTA', 'SHOW RMS_DEFAULT', 'SHOW ROOT', 'SHOW SECURITY',
+            'SHOW SERVER ACME_SERVER', 'SHOW SERVER REGISTRY_SERVER', 'SHOW SHADOW',
+            'SHOW STATUS', 'SHOW SYMBOL', 'SHOW SYSTEM', 'SHOW TERMINAL', 'SHOW TIME',
+            'SHOW TRANSLATION', 'SHOW USERS', 'SHOW WORKING_SET', 'SHOW ZONE', 'SORT',
+            'SPAWN', 'START', 'STOP', 'SUBMIT', 'SUBROUTINE', 'SYNCHRONIZE', 'TYPE',
+            'UNLOCK', 'VIEW', 'WAIT', 'WRITE', 'XAUTH'
+            ),
+        2 => array( // lexical functions
+            'F$CONTEXT', 'F$CSID', 'F$CUNITS', 'F$CVSI', 'F$CVTIME', 'F$CVUI',
+            'F$DELTA_TIME', 'F$DEVICE', 'F$DIRECTORY', 'F$EDIT', 'F$ELEMENT',
+            'F$ENVIRONMENT', 'F$EXTRACT', 'F$FAO', 'F$FID_TO_NAME', 'F$FILE_ATTRIBUTES',
+            'F$GETDVI', 'F$GETENV', 'F$GETJPI', 'F$GETQUI', 'F$GETSYI', 'F$IDENTIFIER',
+            'F$INTEGER', 'F$LENGTH', 'F$LICENSE', 'F$LOCATE', 'F$MATCH_WILD', 'F$MESSAGE',
+            'F$MODE', 'F$MULTIPATH', 'F$PARSE', 'F$PID', 'F$PRIVILEGE', 'F$PROCESS',
+            'F$SEARCH', 'F$SETPRV', 'F$STRING', 'F$TIME', 'F$TRNLNM', 'F$TYPE', 'F$UNIQUE',
+            'F$USER', 'F$VERIFY'
+            ),
+        3 => array( // special variables etc
+            'sql$database', 'P1', 'P2', 'P3', 'P4', 'P5', 'P6', 'P7', 'P8', 'P9',
+            '$status', '$severity', 'sys$login', 'sys$system',
+            'sys$input', 'sys$output', 'sys$pipe'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '@', '&', '|', '<', '>', '-',
+        '.eqs.', '.eq.', '.lt.', '.lts.', '.gt.', '.gts.', '.ne.', '.nes.',
+        '.le.', '.ge.', '.ges.', '.les.',
+        '.EQS.', '.EQ.', '.LT.', '.LTS.', '.GT.', '.GTS.', '.NE.', '.NES.',
+        '.LE.', '.GE.', '.GES.', '.LES.',
+        '.and.', '.or.', '.not.',
+        '.AND.', '.OR.', '.NOT.',
+        '==', ':==', '=', ':='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #0066FF;',
+            3 => 'color: #993300;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;',
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #9999FF; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #006666;',
+            1 => 'color: #0099FF;',
+            2 => 'color: red;',
+            3 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #780078;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0099FF;',                     // variables
+            1 => 'color: #0000FF;',                     // qualifiers
+            2 => 'color: #FF6600; font-weight: bold;'   // labels
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // variables
+        0 => "'[a-zA-Z_\\-$]+'",
+        // qualifiers and parameters
+        1 => "(?:\/[a-zA-Z_\/]+)[\s=]",
+        // labels
+        2 => '(?<=\$)\s*[a-zA-Z\-_]+:'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+        ),
+        'KEYWORDS' => array(
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/dcpu16.php b/sources/inc/geshi/dcpu16.php
new file mode 100644
index 0000000..5fcb25e
--- /dev/null
+++ b/sources/inc/geshi/dcpu16.php
@@ -0,0 +1,131 @@
+ 'DCPU-16 Assembly',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_HEX_PREFIX,
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'set','add','sub','mul','div','mod','shl','shr','and','bor','xor',
+            'ife','ifn','ifg','ifb',
+            'jsr'
+            ),
+        /*registers*/
+        2 => array(
+            'a','b','c','x','y','z','i','j',
+            'pc','sp','o',
+            'pop','peek','push' //Special cases with DCPU-16
+            ),
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '+', '-', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000088; font-weight:bold;',
+            2 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000088;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #880000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            2 => 'color: #993333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://0x10c.com/doc/dcpu-16.txt',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        //0 => '0[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        //1 => '\%[01]{1,64}|[01]{1,64}[bB]?(?![^<]*>)',
+        //Labels
+        2 => '^:[_a-zA-Z][_a-zA-Z0-9]?(?=\s|$)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(? "(?![a-zA-Z0-9_\|%\\-])"
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/dcs.php b/sources/inc/geshi/dcs.php
new file mode 100644
index 0000000..d32cfc5
--- /dev/null
+++ b/sources/inc/geshi/dcs.php
@@ -0,0 +1,182 @@
+ 'DCS',
+    'COMMENT_SINGLE' => array(
+        1 => ';'
+        ),
+    'COMMENT_MULTI' => array(
+        ),
+    '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
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/delphi.php b/sources/inc/geshi/delphi.php
new file mode 100644
index 0000000..d5596e0
--- /dev/null
+++ b/sources/inc/geshi/delphi.php
@@ -0,0 +1,301 @@
+ 'Delphi',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
+    //Compiler directives
+    'COMMENT_REGEXP' => array(2 => '/\\{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+
+    'KEYWORDS' => array(
+        1 => array(
+            'Abstract', 'And', 'Array', 'As', 'Asm', 'At', 'Begin', 'Case',
+            'Class', 'Const', 'Constructor', 'Contains', 'Default', 'delayed', 'Destructor',
+            'DispInterface', 'Div', 'Do', 'DownTo', 'Else', 'End', 'Except',
+            'Export', 'Exports', 'External', 'File', 'Finalization', 'Finally', 'For',
+            'Function', 'Generic', 'Goto', 'If', 'Implementation', 'In', 'Inherited',
+            'Initialization', 'Inline', 'Interface', 'Is', 'Label', 'Library', 'Message',
+            'Mod', 'Nil', 'Not', 'Object', 'Of', 'On', 'Or', 'Overload', 'Override',
+            'Package', 'Packed', 'Private', 'Procedure', 'Program', 'Property',
+            'Protected', 'Public', 'Published', 'Read', 'Raise', 'Record', 'Register',
+            'Repeat', 'Requires', 'Resourcestring', 'Set', 'Shl', 'Shr', 'Specialize', 'Stored',
+            'Then', 'ThreadVar', 'To', 'Try', 'Type', 'Unit', 'Until', 'Uses', 'Var',
+            'Virtual', 'While', 'With', 'Write', 'Xor', 'assembler', 'far',
+            'near', 'pascal', 'cdecl', 'safecall', 'stdcall', 'varargs'
+            ),
+        2 => array(
+            'false', 'self', 'true',
+            ),
+        3 => array(
+            'Abs', 'AcquireExceptionObject', 'Addr', 'AnsiToUtf8', 'Append', 'ArcTan',
+            'Assert', 'AssignFile', 'Assigned', 'BeginThread', 'BlockRead',
+            'BlockWrite', 'Break', 'ChDir', 'Chr', 'Close', 'CloseFile',
+            'CompToCurrency', 'CompToDouble', 'Concat', 'Continue', 'Copy', 'Cos',
+            'Dec', 'Delete', 'Dispose', 'DoubleToComp', 'EndThread', 'EnumModules',
+            'EnumResourceModules', 'Eof', 'Eoln', 'Erase', 'ExceptAddr',
+            'ExceptObject', 'Exclude', 'Exit', 'Exp', 'FilePos', 'FileSize',
+            'FillChar', 'Finalize', 'FindClassHInstance', 'FindHInstance',
+            'FindResourceHInstance', 'Flush', 'Frac', 'FreeMem', 'Get8087CW',
+            'GetDir', 'GetLastError', 'GetMem', 'GetMemoryManager',
+            'GetModuleFileName', 'GetVariantManager', 'Halt', 'Hi', 'High',
+            'IOResult', 'Inc', 'Include', 'Initialize', 'Insert', 'Int',
+            'IsMemoryManagerSet', 'IsVariantManagerSet', 'Length', 'Ln', 'Lo', 'Low',
+            'MkDir', 'Move', 'New', 'Odd', 'OleStrToStrVar', 'OleStrToString', 'Ord',
+            'PUCS4Chars', 'ParamCount', 'ParamStr', 'Pi', 'Pos', 'Pred', 'Ptr',
+            'Random', 'Randomize', 'Read', 'ReadLn', 'ReallocMem',
+            'ReleaseExceptionObject', 'Rename', 'Reset', 'Rewrite', 'RmDir', 'Round',
+            'RunError', 'Seek', 'SeekEof', 'SeekEoln', 'Set8087CW', 'SetLength',
+            'SetLineBreakStyle', 'SetMemoryManager', 'SetString', 'SetTextBuf',
+            'SetVariantManager', 'Sin', 'SizeOf', 'Slice', 'Sqr', 'Sqrt', 'Str',
+            'StringOfChar', 'StringToOleStr', 'StringToWideChar', 'Succ', 'Swap',
+            'Trunc', 'Truncate', 'TypeInfo', 'UCS4StringToWideString', 'UTF8Decode',
+            'UTF8Encode', 'UnicodeToUtf8', 'UniqueString', 'UpCase', 'Utf8ToAnsi',
+            'Utf8ToUnicode', 'Val', 'VarArrayRedim', 'VarClear',
+            'WideCharLenToStrVar', 'WideCharLenToString', 'WideCharToStrVar',
+            'WideCharToString', 'WideStringToUCS4String', 'Write', 'WriteLn',
+
+            'Abort', 'AddExitProc', 'AddTerminateProc', 'AdjustLineBreaks', 'AllocMem',
+            'AnsiCompareFileName', 'AnsiCompareStr', 'AnsiCompareText',
+            'AnsiDequotedStr', 'AnsiExtractQuotedStr', 'AnsiLastChar',
+            'AnsiLowerCase', 'AnsiLowerCaseFileName', 'AnsiPos', 'AnsiQuotedStr',
+            'AnsiSameStr', 'AnsiSameText', 'AnsiStrComp', 'AnsiStrIComp',
+            'AnsiStrLComp', 'AnsiStrLIComp', 'AnsiStrLastChar', 'AnsiStrLower',
+            'AnsiStrPos', 'AnsiStrRScan', 'AnsiStrScan', 'AnsiStrUpper',
+            'AnsiUpperCase', 'AnsiUpperCaseFileName', 'AppendStr', 'AssignStr',
+            'Beep', 'BoolToStr', 'ByteToCharIndex', 'ByteToCharLen', 'ByteType',
+            'CallTerminateProcs', 'ChangeFileExt', 'CharLength', 'CharToByteIndex',
+            'CharToByteLen', 'CompareMem', 'CompareStr', 'CompareText', 'CreateDir',
+            'CreateGUID', 'CurrToStr', 'CurrToStrF', 'CurrentYear', 'Date',
+            'DateTimeToFileDate', 'DateTimeToStr', 'DateTimeToString',
+            'DateTimeToSystemTime', 'DateTimeToTimeStamp', 'DateToStr', 'DayOfWeek',
+            'DecodeDate', 'DecodeDateFully', 'DecodeTime', 'DeleteFile',
+            'DirectoryExists', 'DiskFree', 'DiskSize', 'DisposeStr', 'EncodeDate',
+            'EncodeTime', 'ExceptionErrorMessage', 'ExcludeTrailingBackslash',
+            'ExcludeTrailingPathDelimiter', 'ExpandFileName', 'ExpandFileNameCase',
+            'ExpandUNCFileName', 'ExtractFileDir', 'ExtractFileDrive',
+            'ExtractFileExt', 'ExtractFileName', 'ExtractFilePath',
+            'ExtractRelativePath', 'ExtractShortPathName', 'FileAge', 'FileClose',
+            'FileCreate', 'FileDateToDateTime', 'FileExists', 'FileGetAttr',
+            'FileGetDate', 'FileIsReadOnly', 'FileOpen', 'FileRead', 'FileSearch',
+            'FileSeek', 'FileSetAttr', 'FileSetDate', 'FileSetReadOnly', 'FileWrite',
+            'FinalizePackage', 'FindClose', 'FindCmdLineSwitch', 'FindFirst',
+            'FindNext', 'FloatToCurr', 'FloatToDateTime', 'FloatToDecimal',
+            'FloatToStr', 'FloatToStrF', 'FloatToText', 'FloatToTextFmt',
+            'FmtLoadStr', 'FmtStr', 'ForceDirectories', 'Format', 'FormatBuf',
+            'FormatCurr', 'FormatDateTime', 'FormatFloat', 'FreeAndNil',
+            'GUIDToString', 'GetCurrentDir', 'GetEnvironmentVariable',
+            'GetFileVersion', 'GetFormatSettings', 'GetLocaleFormatSettings',
+            'GetModuleName', 'GetPackageDescription', 'GetPackageInfo', 'GetTime',
+            'IncAMonth', 'IncMonth', 'IncludeTrailingBackslash',
+            'IncludeTrailingPathDelimiter', 'InitializePackage', 'IntToHex',
+            'IntToStr', 'InterlockedDecrement', 'InterlockedExchange',
+            'InterlockedExchangeAdd', 'InterlockedIncrement', 'IsDelimiter',
+            'IsEqualGUID', 'IsLeapYear', 'IsPathDelimiter', 'IsValidIdent',
+            'Languages', 'LastDelimiter', 'LoadPackage', 'LoadStr', 'LowerCase',
+            'MSecsToTimeStamp', 'NewStr', 'NextCharIndex', 'Now', 'OutOfMemoryError',
+            'QuotedStr', 'RaiseLastOSError', 'RaiseLastWin32Error', 'RemoveDir',
+            'RenameFile', 'ReplaceDate', 'ReplaceTime', 'SafeLoadLibrary',
+            'SameFileName', 'SameText', 'SetCurrentDir', 'ShowException', 'Sleep',
+            'StrAlloc', 'StrBufSize', 'StrByteType', 'StrCat', 'StrCharLength',
+            'StrComp', 'StrCopy', 'StrDispose', 'StrECopy', 'StrEnd', 'StrFmt',
+            'StrIComp', 'StrLCat', 'StrLComp', 'StrLCopy', 'StrLFmt', 'StrLIComp',
+            'StrLen', 'StrLower', 'StrMove', 'StrNew', 'StrNextChar', 'StrPCopy',
+            'StrPLCopy', 'StrPas', 'StrPos', 'StrRScan', 'StrScan', 'StrToBool',
+            'StrToBoolDef', 'StrToCurr', 'StrToCurrDef', 'StrToDate', 'StrToDateDef',
+            'StrToDateTime', 'StrToDateTimeDef', 'StrToFloat', 'StrToFloatDef',
+            'StrToInt', 'StrToInt64', 'StrToInt64Def', 'StrToIntDef', 'StrToTime',
+            'StrToTimeDef', 'StrUpper', 'StringReplace', 'StringToGUID', 'Supports',
+            'SysErrorMessage', 'SystemTimeToDateTime', 'TextToFloat', 'Time',
+            'TimeStampToDateTime', 'TimeStampToMSecs', 'TimeToStr', 'Trim',
+            'TrimLeft', 'TrimRight', 'TryEncodeDate', 'TryEncodeTime',
+            'TryFloatToCurr', 'TryFloatToDateTime', 'TryStrToBool', 'TryStrToCurr',
+            'TryStrToDate', 'TryStrToDateTime', 'TryStrToFloat', 'TryStrToInt',
+            'TryStrToInt64', 'TryStrToTime', 'UnloadPackage', 'UpperCase',
+            'WideCompareStr', 'WideCompareText', 'WideFmtStr', 'WideFormat',
+            'WideFormatBuf', 'WideLowerCase', 'WideSameStr', 'WideSameText',
+            'WideUpperCase', 'Win32Check', 'WrapText',
+
+            'ActivateClassGroup', 'AllocateHwnd', 'BinToHex', 'CheckSynchronize',
+            'CollectionsEqual', 'CountGenerations', 'DeallocateHwnd', 'EqualRect',
+            'ExtractStrings', 'FindClass', 'FindGlobalComponent', 'GetClass',
+            'GroupDescendantsWith', 'HexToBin', 'IdentToInt',
+            'InitInheritedComponent', 'IntToIdent', 'InvalidPoint',
+            'IsUniqueGlobalComponentName', 'LineStart', 'ObjectBinaryToText',
+            'ObjectResourceToText', 'ObjectTextToBinary', 'ObjectTextToResource',
+            'PointsEqual', 'ReadComponentRes', 'ReadComponentResEx',
+            'ReadComponentResFile', 'Rect', 'RegisterClass', 'RegisterClassAlias',
+            'RegisterClasses', 'RegisterComponents', 'RegisterIntegerConsts',
+            'RegisterNoIcon', 'RegisterNonActiveX', 'SmallPoint', 'StartClassGroup',
+            'TestStreamFormat', 'UnregisterClass', 'UnregisterClasses',
+            'UnregisterIntegerConsts', 'UnregisterModuleClasses',
+            'WriteComponentResFile',
+
+            'ArcCos', 'ArcCosh', 'ArcCot', 'ArcCotH', 'ArcCsc', 'ArcCscH', 'ArcSec',
+            'ArcSecH', 'ArcSin', 'ArcSinh', 'ArcTan2', 'ArcTanh', 'Ceil',
+            'CompareValue', 'Cosecant', 'Cosh', 'Cot', 'CotH', 'Cotan', 'Csc', 'CscH',
+            'CycleToDeg', 'CycleToGrad', 'CycleToRad', 'DegToCycle', 'DegToGrad',
+            'DegToRad', 'DivMod', 'DoubleDecliningBalance', 'EnsureRange', 'Floor',
+            'Frexp', 'FutureValue', 'GetExceptionMask', 'GetPrecisionMode',
+            'GetRoundMode', 'GradToCycle', 'GradToDeg', 'GradToRad', 'Hypot',
+            'InRange', 'IntPower', 'InterestPayment', 'InterestRate',
+            'InternalRateOfReturn', 'IsInfinite', 'IsNan', 'IsZero', 'Ldexp', 'LnXP1',
+            'Log10', 'Log2', 'LogN', 'Max', 'MaxIntValue', 'MaxValue', 'Mean',
+            'MeanAndStdDev', 'Min', 'MinIntValue', 'MinValue', 'MomentSkewKurtosis',
+            'NetPresentValue', 'Norm', 'NumberOfPeriods', 'Payment', 'PeriodPayment',
+            'Poly', 'PopnStdDev', 'PopnVariance', 'Power', 'PresentValue',
+            'RadToCycle', 'RadToDeg', 'RadToGrad', 'RandG', 'RandomRange', 'RoundTo',
+            'SLNDepreciation', 'SYDDepreciation', 'SameValue', 'Sec', 'SecH',
+            'Secant', 'SetExceptionMask', 'SetPrecisionMode', 'SetRoundMode', 'Sign',
+            'SimpleRoundTo', 'SinCos', 'Sinh', 'StdDev', 'Sum', 'SumInt',
+            'SumOfSquares', 'SumsAndSquares', 'Tan', 'Tanh', 'TotalVariance',
+            'Variance'
+            ),
+        4 => array(
+            'AnsiChar', 'AnsiString', 'Bool', 'Boolean', 'Byte', 'ByteBool', 'Cardinal', 'Char',
+            'Comp', 'Currency', 'DWORD', 'Double', 'Extended', 'Int64', 'Integer', 'IUnknown',
+            'LongBool', 'LongInt', 'LongWord', 'PAnsiChar', 'PAnsiString', 'PBool', 'PBoolean', 'PByte',
+            'PByteArray', 'PCardinal', 'PChar', 'PComp', 'PCurrency', 'PDWORD', 'PDate', 'PDateTime',
+            'PDouble', 'PExtended', 'PInt64', 'PInteger', 'PLongInt', 'PLongWord', 'Pointer', 'PPointer',
+            'PShortInt', 'PShortString', 'PSingle', 'PSmallInt', 'PString', 'PHandle', 'PVariant', 'PWord',
+            'PWordArray', 'PWordBool', 'PWideChar', 'PWideString', 'Real', 'Real48', 'ShortInt', 'ShortString',
+            'Single', 'SmallInt', 'String', 'TClass', 'TDate', 'TDateTime', 'TextFile', 'THandle',
+            'TObject', 'TTime', 'Variant', 'WideChar', 'WideString', 'Word', 'WordBool'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('.', ',', ':', ';'),
+        2 => array('@', '^'),
+        3 => array('=', '+', '-', '*', '/')
+        ),
+    '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(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000cc;',
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000066;',
+            2 => 'color: #000066;',
+            3 => 'color: #000066;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '(? '\#(?:\$[0-9a-fA-F]{1,4}|\d{1,5})'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_AFTER' => '(?=\s*[(;])'
+                )
+            )
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/diff.php b/sources/inc/geshi/diff.php
new file mode 100644
index 0000000..5b68171
--- /dev/null
+++ b/sources/inc/geshi/diff.php
@@ -0,0 +1,196 @@
+ 'Diff',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => ' ',
+    'KEYWORDS' => array(
+            1 => array(
+                '\ No newline at end of file'
+            ),
+//            2 => array(
+//                '***************' /* This only seems to works in some cases? */
+//            ),
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => false,
+//        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #aaaaaa; font-style: italic;',
+//            2 => 'color: #dd6611;',
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => ''
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => ''
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #440088;',
+            1 => 'color: #991111;',
+            2 => 'color: #00b000;',
+            3 => 'color: #888822;',
+            4 => 'color: #888822;',
+            5 => 'color: #0011dd;',
+            6 => 'color: #440088;',
+            7 => 'color: #991111;',
+            8 => 'color: #00b000;',
+            9 => 'color: #888822;',
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+//        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        0 => "[0-9,]+[acd][0-9,]+",
+        //Removed lines
+        1 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\<.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted lines
+        2 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\>.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Location line
+        3 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))-{3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted line
+        4 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))(\\+){3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Modified line
+        5 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\!.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //File specification
+        6 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))[\\@]{2}.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Removed line
+        7 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\-.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Inserted line
+        8 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))\\+.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //File specification
+        9 => array(
+            GESHI_SEARCH => '(^|(?<=\A\s))(\\*){3}\\s.*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/div.php b/sources/inc/geshi/div.php
new file mode 100644
index 0000000..aa11795
--- /dev/null
+++ b/sources/inc/geshi/div.php
@@ -0,0 +1,126 @@
+ 'DIV',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'while','until','to','switch','step','return','repeat','loop','if','from','frame','for','end','elseif',
+            'else','default','debug','continue','clone','case','break','begin'
+            ),
+        2 => array(
+            'xor','whoami','type','sizeof','pointer','or','offset','not','neg','mod','id','dup','and','_ne','_lt',
+            '_le','_gt','_ge','_eq'
+            ),
+        3 => array(
+            'setup_program','program','process','private','local','import','global','function','const',
+            'compiler_options'
+            ),
+        4 => array(
+            'word','struct','string','int','byte'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(',')','[',']','=','+','-','*','/','!','%','^','&',':',';',',','<','>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0040b1;',
+            2 => 'color: #000000;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #44aa44;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #202020;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #44aa44;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => 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(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/dos.php b/sources/inc/geshi/dos.php
new file mode 100644
index 0000000..36d9983
--- /dev/null
+++ b/sources/inc/geshi/dos.php
@@ -0,0 +1,227 @@
+ 'DOS',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    //DOS comment lines
+    'COMMENT_REGEXP' => array(
+        1 => "/^\s*@?REM\b.*$/mi",
+        2 => "/^\s*::.*$/m",
+        3 => "/\^./"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Flow control keywords */
+        1 => array(
+            'if', 'else', 'goto', 'shift',
+            'for', 'in', 'do',
+            'call', 'exit'
+            ),
+        /* IF statement keywords */
+        2 => array(
+            'not', 'exist', 'errorlevel',
+            'defined',
+            'equ', 'neq', 'lss', 'leq', 'gtr', 'geq'
+            ),
+        /* Internal commands */
+        3 => array(
+            'cd', 'md', 'rd', 'chdir', 'mkdir', 'rmdir', 'dir',
+            'del', 'copy', 'move', 'ren', 'rename',
+            'echo',
+            'setlocal', 'endlocal', 'set',
+            'pause',
+            'pushd', 'popd', 'title', 'verify'
+            ),
+        /* Special files */
+        4 => array(
+            'prn', 'nul', 'lpt3', 'lpt2', 'lpt1', 'con',
+            'com4', 'com3', 'com2', 'com1', 'aux'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '@', '%', '!', '|', '<', '>', '&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00b100; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #b1b100; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #b100b1; font-style: italic;',
+            3 => 'color: #33cc33;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #33cc33;',
+            1 => 'color: #33cc33;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #b100b1; font-weight: bold;',
+            1 => 'color: #448844;',
+            2 => 'color: #448888;',
+            3 => 'color: #448888;'
+            )
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'URLS' => array(
+        1 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        2 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        3 => 'http://www.ss64.com/nt/{FNAMEL}.html',
+        4 => 'http://www.ss64.com/nt/{FNAMEL}.html'
+        ),
+    'REGEXPS' => array(
+        /* Label */
+        0 => array(
+/*            GESHI_SEARCH => '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((? '((?si:[@\s]+GOTO\s+|\s+:)[\s]*)((? '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+        ),
+        /* Variable assignement */
+        1 => array(
+/*            GESHI_SEARCH => '(SET[\s]+(?si:\/A[\s]+|\/P[\s]+|))([^=\s\n]+)([\s]*=)',*/
+            GESHI_SEARCH => '(SET\s+(?si:\\/A\s+|\\/P\s+)?)([^=\n]+)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        /* Arguments or variable evaluation */
+        2 => array(
+/*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((? '(!(?:!(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^!>\n]*(?=!))((?)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        /* Arguments or variable evaluation */
+        3 => array(
+/*            GESHI_SEARCH => '(%)([\d*]|[^%\s]*(?=%))((? '(%(?:%(?=[a-z0-9]))?)([\d*]|(?:~[adfnpstxz]*(?:$\w+:)?)?[a-z0-9](?!\w)|[^%\n]*(?=%))((? '\\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(? array(
+                'DISALLOWED_BEFORE' => '(? array(
+                'DISALLOWED_BEFORE' => '(? array(
+                'DISALLOWED_BEFORE' => '(?
\ No newline at end of file
diff --git a/sources/inc/geshi/dot.php b/sources/inc/geshi/dot.php
new file mode 100644
index 0000000..bdf240a
--- /dev/null
+++ b/sources/inc/geshi/dot.php
@@ -0,0 +1,164 @@
+ 'dot',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'URL', 'arrowhead', 'arrowsize', 'arrowtail', 'bb', 'bgcolor', 'bottomlabel',
+            'center', 'clusterrank', 'color', 'comment', 'constraint', 'decorate',
+            'dir', 'distortion', 'fillcolor', 'fixedsize', 'fontcolor',
+            'fontname', 'fontsize', 'group', 'headclip', 'headlabel', 'headport',
+            'height', 'id', 'label', 'labelangle', 'labeldistance', 'labelfontcolor',
+            'labelfontname', 'labelfontsize', 'layer', 'layers', 'margin', 'mclimit',
+            'minlen', 'nodesep', 'nslimit', 'ordering', 'orientation', 'page',
+            'pagedir', 'peripheries', 'port_label_distance', 'quantum', 'rank', 'rankdir',
+            'ranksep', 'ratio', 'regular', 'rotate', 'samehead', 'sametail', 'searchsize',
+            'shape', 'shapefile', 'showboxes', 'sides', 'size', 'skew', 'style',
+            'tailclip', 'taillabel', 'tailport', 'toplabel', 'weight', 'width'
+            ),
+        2 => array(
+            'node', 'graph', 'digraph', 'strict', 'edge', 'subgraph'
+            ),
+        3 => array(
+            'Mcircle', 'Mdiamond', 'Mrecord', 'Msquare', 'auto', 'back', 'bold',
+            'both', 'box', 'circle', 'compress', 'dashed', 'diamond', 'dot',
+            'dotted', 'doublecircle', 'doubleoctagon', 'egg', 'ellipse', 'epsf',
+            'false', 'fill', 'filled', 'forward', 'global', 'hexagon', 'house',
+            'inv', 'invdot', 'invhouse', 'invis', 'invodot', 'invtrapezium',
+            'invtriangle', 'local', 'max', 'min', 'none', 'normal', 'octagon',
+            'odot', 'out', 'parallelogram', 'plaintext', 'polygon', 'record',
+            'same', 'solid', 'trapezium', 'triangle', 'tripleoctagon', 'true'
+            ),
+        4 => array(
+            'aliceblue', 'antiquewhite', 'aquamarine', 'azure', 'beige', 'bisque', 'black',
+            'blanchedalmond', 'blue', 'blueviolet', 'brown', 'burlywood', 'cadetblue',
+            'chartreuse', 'chocolate', 'coral', 'cornflowerblue', 'cornsilk', 'crimson',
+            'cyan', 'darkgoldenrod', 'darkgreen', 'darkkhaki', 'darkolivegreen',
+            'darkorange', 'darkorchid', 'darksalmon', 'darkseagreen', 'darkslateblue',
+            'darkslategray', 'darkturquoise', 'darkviolet', 'deeppink', 'deepskyblue',
+            'dimgray', 'dodgerblue', 'firebrick', 'forestgreen', 'gainsboro', 'ghostwhite',
+            'gold', 'goldenrod', 'gray', 'green', 'greenyellow', 'honeydew', 'hotpink',
+            'indianred', 'indigo', 'ivory', 'khaki', 'lavender', 'lavenderblush',
+            'lawngreen', 'lemonchiffon', 'lightblue', 'lightcyan', 'lightgoldenrod',
+            'lightgoldenrodyellow', 'lightgray', 'lightpink', 'lightsalmon',
+            'lightseagreen', 'lightskyblue', 'lightslateblue', 'lightslategray',
+            'lightyellow', 'limegreen', 'linen', 'magenta', 'maroon', 'mediumaquamarine',
+            'mediumblue', 'mediumorchid', 'mediumpurple', 'mediumseagreen',
+            'mediumslateblue', 'mediumspringgreen', 'mediumturquoise', 'mediumvioletred',
+            'midnightblue', 'mintcream', 'mistyrose', 'moccasin', 'navajowhite', 'navy',
+            'navyblue', 'oldlace', 'olivedrab', 'oralwhite', 'orange', 'orangered',
+            'orchid', 'palegoldenrod', 'palegreen', 'paleturquoise', 'palevioletred',
+            'papayawhip', 'peachpuff', 'peru', 'pink', 'plum', 'powderblue', 'purple',
+            'red', 'rosybrown', 'royalblue', 'saddlebrown', 'salmon', 'salmon2', 'sandybrown',
+            'seagreen', 'seashell', 'sienna', 'skyblue', 'slateblue', 'slategray', 'snow',
+            'springgreen', 'steelblue', 'tan', 'thistle', 'tomato', 'turquoise', 'violet',
+            'violetred', 'wheat', 'white', 'whitesmoke', 'yellow', 'yellowgreen'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '{', '}', '-', '+', '*', '/', '<', '>', '!', '~', '%', '&', '|', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #993333;',
+            4 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #af624d; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'METHODS' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/e.php b/sources/inc/geshi/e.php
new file mode 100644
index 0000000..319bee0
--- /dev/null
+++ b/sources/inc/geshi/e.php
@@ -0,0 +1,208 @@
+ 'E',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('/**' => '*/'), // Note: This is method doc, not a general comment syntax.
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+
+    // FIXME: The escaping inside ` is actually doubling of any interior `, $, or @ -- backslash is NOT special
+    'QUOTEMARKS' => array('\'', '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+
+    'KEYWORDS' => array(
+        // builtin control structures
+        1 => array(
+            'accum', 'break', 'try', 'continue', 'if', 'while', 'for', 'switch'
+            ),
+
+        // control structures subsidiary keywords
+        2 => array(
+            'catch', 'else', 'finally', 'in', 'exit'
+            ),
+
+        // named operators
+        3 => array(
+            'fn', 'via'
+            ),
+
+        // variable/function/object definers
+        4 => array(
+            'def', 'bind', 'var'
+            ),
+
+        // object definition subsidiary keywords
+        5 => array(
+            'extends', 'as', 'implements', 'guards', 'match', 'to', 'method'
+            ),
+
+        // builtin nouns in safeEnv
+        6 => array(
+            'null', 'false', 'true', 'throw', '__loop', '__makeList',
+            '__makeMap', '__makeProtocolDesc', '__makeMessageDesc',
+            '__makeParamDesc', 'any', 'void', 'boolean', '__makeOrderedSpace',
+            'ValueGuard', '__MatchContext', 'require', '__makeVerbFacet', 'NaN',
+            'Infinity', '__identityFunc', '__makeInt', '__makeFinalSlot',
+            '__makeVarSlot', '__makeGuardedSlot', '__makeGuard', '__makeTwine',
+            '__makeSourceSpan', '__auditedBy', 'Guard', 'near', 'pbc',
+            'PassByCopy', 'DeepPassByCopy', 'Data', 'Persistent', 'DeepFrozen',
+            'int', 'float64', 'char', 'String', 'Twine', 'TextWriter', 'List',
+            'Map', 'nullOk', 'Tuple', '__Portrayal', 'notNull', 'vow', 'rcvr',
+            'SturdyRef', 'simple__quasiParser', 'twine__quasiParser',
+            'rx__quasiParser', 'e__quasiParser', 'epatt__quasiParser',
+            'sml__quasiParser', 'term__quasiParser', 'traceln', '__equalizer',
+            '__comparer', 'Ref', 'E', 'promiseAllFulfilled', 'EIO', 'help',
+            'safeScope', '__eval', 'resource__uriGetter', 'type__uriGetter',
+            'import__uriGetter', 'elib__uriGetter', 'elang__uriGetter',
+            'opaque__uriGetter'
+            ),
+
+        // builtin nouns in privilegedEnv
+        7 => array(
+            'file__uriGetter', 'fileURL__uriGetter', 'jar__uriGetter',
+            'http__uriGetter', 'ftp__uriGetter', 'gopher__uriGetter',
+            'news__uriGetter', 'cap__uriGetter', 'makeCommand', 'stdout',
+            'stderr', 'stdin', 'print', 'println', 'interp', 'entropy', 'timer',
+            'introducer', 'identityMgr', 'makeSturdyRef', 'timeMachine',
+            'unsafe__uriGetter', 'currentVat', 'rune', 'awt__uriGetter',
+            'swing__uriGetter', 'JPanel__quasiParser', 'swt__uriGetter',
+            'currentDisplay', 'swtGrid__quasiParser', 'swtGrid`',
+            'privilegedScope'
+            ),
+
+        // reserved keywords
+        8 => array(
+            'abstract', 'an', 'assert', 'attribute', 'be', 'begin', 'behalf',
+            'belief', 'believe', 'believes', 'case', 'class', 'const',
+            'constructor', 'declare', 'default', 'define', 'defmacro',
+            'delicate', 'deprecated', 'dispatch', 'do', 'encapsulate',
+            'encapsulated', 'encapsulates', 'end', 'ensure', 'enum', 'eventual',
+            'eventually', 'export', 'facet', 'forall', 'function', 'given',
+            'hidden', 'hides', 'inline', 'is', 'know', 'knows', 'lambda', 'let',
+            'methods', 'module', 'namespace', 'native', 'obeys', 'octet',
+            'oneway', 'operator', 'package', 'private', 'protected', 'public',
+            'raises', 'reliance', 'reliant', 'relies', 'rely', 'reveal', 'sake',
+            'signed', 'static', 'struct', 'suchthat', 'supports', 'suspect',
+            'suspects', 'synchronized', 'this', 'transient', 'truncatable',
+            'typedef', 'unsigned', 'unum', 'uses', 'using', 'utf8', 'utf16',
+            'virtual', 'volatile', 'wstring'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b1b100;',
+            4 => 'color: #b1b100;',
+            5 => 'color: #b1b100;',
+            6 => 'color: #b1b100;',
+            7 => 'color: #b1b100;',
+            8 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => 'http://wiki.erights.org/wiki/{FNAME}',
+        2 => 'http://wiki.erights.org/wiki/{FNAME}',
+        3 => 'http://wiki.erights.org/wiki/{FNAME}',
+        4 => 'http://wiki.erights.org/wiki/{FNAME}',
+        5 => 'http://wiki.erights.org/wiki/{FNAME}',
+        6 => 'http://wiki.erights.org/wiki/{FNAME}',
+        7 => 'http://wiki.erights.org/wiki/{FNAME}',
+        8 => 'http://wiki.erights.org/wiki/{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '<-',
+        3 => '::'
+        ),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/ecmascript.php b/sources/inc/geshi/ecmascript.php
new file mode 100644
index 0000000..69a55c9
--- /dev/null
+++ b/sources/inc/geshi/ecmascript.php
@@ -0,0 +1,210 @@
+ 'ECMAScript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    // Regular Expression Literals
+    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\*\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    '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}#"
+        ),
+    '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( // Reserved literals
+            'false', 'true',
+            'null'
+            ),
+        2 => array( // Main keywords
+            'break', 'case', 'catch', 'continue', 'default', 'delete', 'do', 'else',
+            'finally', 'for', 'function', 'if', 'in', 'instanceof', 'new', 'return',
+            'switch', 'this', 'throw', 'try', 'typeof', 'var', 'void', 'while',
+            'with'
+            ),
+        3 => array( // Extra keywords or keywords reserved for future use
+            'abstract', 'as', 'boolean', 'byte', 'char', 'class', 'const', 'debugger',
+            'double', 'enum', 'export', 'extends', 'final', 'float', 'goto', 'implements',
+            'import', 'int', 'interface', 'is', 'long', 'native', 'namespace', 'package',
+            'private', 'protected', 'public', 'short', 'static', 'super', 'synchronized', 'throws',
+            'transient', 'use', 'volatile'
+            ),
+        4 => array( // Operators
+            'get', 'set'
+            ),
+        5 => array( // Built-in object classes
+            'Array', 'Boolean', 'Date', 'EvalError', 'Error', 'Function', 'Math', 'Number',
+            'Object', 'RangeError', 'ReferenceError', 'RegExp', 'String', 'SyntaxError', 'TypeError', 'URIError'
+            ),
+        6 => array( // Global properties
+            'Infinity', 'NaN', 'undefined'
+            ),
+        7 => array( // Global methods
+            'decodeURI', 'decodeURIComponent', 'encodeURI', 'encodeURIComponent',
+            'eval', 'isFinite', 'isNaN', 'parseFloat', 'parseInt',
+            // The escape and unescape functions do not work properly for non-ASCII characters and have been deprecated.
+            // In JavaScript 1.5 and later, use encodeURI, decodeURI, encodeURIComponent, and decodeURIComponent.
+            'escape', 'unescape'
+            ),
+        8 => array( // Function's arguments
+            'arguments'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '.', '&', '|', '^',
+        '<', '>', '=', '~',
+        ',', ';', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #009999;',
+            2 => 'color: #1500C8;',
+            3 => 'color: #1500C8;',
+            4 => 'color: #1500C8;',
+            5 => 'color: #1500C8;',
+            6 => 'color: #1500C8;',
+            7 => 'color: #1500C8;',
+            8 => 'color: #1500C8;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #CC0000;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #3366CC;',
+            1 => 'color: #3366CC;',
+            2 => 'color: #3366CC;',
+            3 => 'color: #3366CC;',
+            4 => 'color: #3366CC;',
+            5 => 'color: #3366CC;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #008800;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #9900FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF00FF;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #FF00FF;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #FF00FF;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #FF00FF;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color: #FF00FF;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color: #FF00FF;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color: #FF00FF;',
+            GESHI_NUMBER_FLT_NONSCI => 'color: #FF00FF;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/eiffel.php b/sources/inc/geshi/eiffel.php
new file mode 100644
index 0000000..baa13c3
--- /dev/null
+++ b/sources/inc/geshi/eiffel.php
@@ -0,0 +1,395 @@
+ 'Eiffel',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '%',
+    'KEYWORDS' => array(
+        1 => array(
+            'separate',
+            'invariant',
+            'inherit',
+            'indexing',
+            'feature',
+            'expanded',
+            'deferred',
+            'class'
+            ),
+        2 => array(
+            'xor',
+            'when',
+            'variant',
+            'until',
+            'unique',
+            'undefine',
+            'then',
+            'strip',
+            'select',
+            'retry',
+            'rescue',
+            'require',
+            'rename',
+            'reference',
+            'redefine',
+            'prefix',
+            'or',
+            'once',
+            'old',
+            'obsolete',
+            'not',
+            'loop',
+            'local',
+            'like',
+            'is',
+            'inspect',
+            'infix',
+            'include',
+            'implies',
+            'if',
+            'frozen',
+            'from',
+            'external',
+            'export',
+            'ensure',
+            'end',
+            'elseif',
+            'else',
+            'do',
+            'creation',
+            'create',
+            'check',
+            'as',
+            'and',
+            'alias',
+            'agent'
+            ),
+        3 => array(
+            'Void',
+            'True',
+            'Result',
+            'Precursor',
+            'False',
+            'Current'
+            ),
+        4 => array(
+            'UNIX_SIGNALS',
+            'UNIX_FILE_INFO',
+            'UNBOUNDED',
+            'TWO_WAY_TREE_CURSOR',
+            'TWO_WAY_TREE',
+            'TWO_WAY_SORTED_SET',
+            'TWO_WAY_LIST',
+            'TWO_WAY_CURSOR_TREE',
+            'TWO_WAY_CIRCULAR',
+            'TWO_WAY_CHAIN_ITERATOR',
+            'TUPLE',
+            'TREE',
+            'TRAVERSABLE',
+            'TO_SPECIAL',
+            'THREAD_CONTROL',
+            'THREAD_ATTRIBUTES',
+            'THREAD',
+            'TABLE',
+            'SUBSET',
+            'STRING_HANDLER',
+            'STRING',
+            'STREAM',
+            'STORABLE',
+            'STD_FILES',
+            'STACK',
+            'SPECIAL',
+            'SORTED_TWO_WAY_LIST',
+            'SORTED_STRUCT',
+            'SORTED_LIST',
+            'SINGLE_MATH',
+            'SET',
+            'SEQUENCE',
+            'SEQ_STRING',
+            'SEMAPHORE',
+            'ROUTINE',
+            'RESIZABLE',
+            'RECURSIVE_TREE_CURSOR',
+            'RECURSIVE_CURSOR_TREE',
+            'REAL_REF',
+            'REAL',
+            'RAW_FILE',
+            'RANDOM',
+            'QUEUE',
+            'PROXY',
+            'PROFILING_SETTING',
+            'PROCEDURE',
+            'PRIORITY_QUEUE',
+            'PRIMES',
+            'PRECOMP',
+            'POINTER_REF',
+            'POINTER',
+            'PLATFORM',
+            'PLAIN_TEXT_FILE',
+            'PATH_NAME',
+            'PART_SORTED_TWO_WAY_LIST',
+            'PART_SORTED_SET',
+            'PART_SORTED_LIST',
+            'PART_COMPARABLE',
+            'OPERATING_ENVIRONMENT',
+            'ONCE_CONTROL',
+            'OBJECT_OWNER',
+            'OBJECT_CONTROL',
+            'NUMERIC',
+            'NONE',
+            'MUTEX',
+            'MULTI_ARRAY_LIST',
+            'MULTAR_LIST_CURSOR',
+            'MEMORY',
+            'MEM_INFO',
+            'MEM_CONST',
+            'MATH_CONST',
+            'LIST',
+            'LINKED_TREE_CURSOR',
+            'LINKED_TREE',
+            'LINKED_STACK',
+            'LINKED_SET',
+            'LINKED_QUEUE',
+            'LINKED_PRIORITY_QUEUE',
+            'LINKED_LIST_CURSOR',
+            'LINKED_LIST',
+            'LINKED_CURSOR_TREE',
+            'LINKED_CIRCULAR',
+            'LINKABLE',
+            'LINEAR_ITERATOR',
+            'LINEAR',
+            'ITERATOR',
+            'IO_MEDIUM',
+            'INTERNAL',
+            'INTEGER_REF',
+            'INTEGER_INTERVAL',
+            'INTEGER',
+            'INFINITE',
+            'INDEXABLE',
+            'IDENTIFIED_CONTROLLER',
+            'IDENTIFIED',
+            'HIERARCHICAL',
+            'HEAP_PRIORITY_QUEUE',
+            'HASHABLE',
+            'HASH_TABLE_CURSOR',
+            'HASH_TABLE',
+            'GENERAL',
+            'GC_INFO',
+            'FUNCTION',
+            'FORMAT_INTEGER',
+            'FORMAT_DOUBLE',
+            'FIXED_TREE',
+            'FIXED_LIST',
+            'FIXED',
+            'FINITE',
+            'FILE_NAME',
+            'FILE',
+            'FIBONACCI',
+            'EXECUTION_ENVIRONMENT',
+            'EXCEPTIONS',
+            'EXCEP_CONST',
+            'DYNAMIC_TREE',
+            'DYNAMIC_LIST',
+            'DYNAMIC_CIRCULAR',
+            'DYNAMIC_CHAIN',
+            'DOUBLE_REF',
+            'DOUBLE_MATH',
+            'DOUBLE',
+            'DISPENSER',
+            'DIRECTORY_NAME',
+            'DIRECTORY',
+            'DECLARATOR',
+            'DEBUG_OUTPUT',
+            'CURSOR_TREE_ITERATOR',
+            'CURSOR_TREE',
+            'CURSOR_STRUCTURE',
+            'CURSOR',
+            'COUNTABLE_SEQUENCE',
+            'COUNTABLE',
+            'CONTAINER',
+            'CONSOLE',
+            'CONDITION_VARIABLE',
+            'COMPARABLE_STRUCT',
+            'COMPARABLE_SET',
+            'COMPARABLE',
+            'COMPACT_TREE_CURSOR',
+            'COMPACT_CURSOR_TREE',
+            'COLLECTION',
+            'CIRCULAR_CURSOR',
+            'CIRCULAR',
+            'CHARACTER_REF',
+            'CHARACTER',
+            'CHAIN',
+            'CELL',
+            'BOX',
+            'BOUNDED_STACK',
+            'BOUNDED_QUEUE',
+            'BOUNDED',
+            'BOOLEAN_REF',
+            'BOOLEAN',
+            'BOOL_STRING',
+            'BIT_REF',
+            'BINARY_TREE',
+            'BINARY_SEARCH_TREE_SET',
+            'BINARY_SEARCH_TREE',
+            'BILINEAR',
+            'BI_LINKABLE',
+            'BASIC_ROUTINES',
+            'BAG',
+            'ASCII',
+            'ARRAYED_TREE',
+            'ARRAYED_STACK',
+            'ARRAYED_QUEUE',
+            'ARRAYED_LIST_CURSOR',
+            'ARRAYED_LIST',
+            'ARRAYED_CIRCULAR',
+            'ARRAY2',
+            'ARRAY',
+            'ARGUMENTS',
+            'ANY',
+            'ACTIVE'
+            ),
+        5 => array(
+            'yes',
+            'visible',
+            'trace',
+            'system',
+            'root',
+            'profile',
+            'override_cluster',
+            'object',
+            'no',
+            'multithreaded',
+            'msil_generation_type',
+            'line_generation',
+            'library',
+            'inlining_size',
+            'inlining',
+            'include_path',
+            'il_verifiable',
+            'exclude',
+            'exception_trace',
+            'dynamic_runtime',
+            'dotnet_naming_convention',
+            'disabled_debug',
+            'default',
+            'debug',
+            'dead_code_removal',
+            'console_application',
+            'cluster',
+            'cls_compliant',
+            'check_vape',
+            'assertion',
+            'array_optimization',
+            'all',
+            'address_expression'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', '|', ':',
+        '(', ')', '{', '}', '[', ']', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF; font-weight: bold;',
+            2 => 'color: #0600FF; font-weight: bold;',
+            3 => 'color: #800080;',
+            4 => 'color: #800000',
+            5 => 'color: #603000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            'MULTI' => ''
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #005070; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0080A0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000060;',
+            2 => 'color: #000050;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #600000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => 'http://www.google.com/search?q=site%3Ahttp%3A%2F%2Fdocs.eiffel.com%2Feiffelstudio%2Flibraries+{FNAMEL}&btnI=I%27m+Feeling+Lucky',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/email.php b/sources/inc/geshi/email.php
new file mode 100644
index 0000000..8a313d4
--- /dev/null
+++ b/sources/inc/geshi/email.php
@@ -0,0 +1,222 @@
+ '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(
+            'Authentication-Results','Comment','Content-Description','Content-Type',
+            'Content-Disposition','Content-Transfer-Encoding','Delivered-To',
+            'Dkim-Signature','Domainkey-Signature','In-Reply-To','Message-Id',
+            'MIME-Version','OpenPGP','Received','Received-SPF','References',
+            'Reply-To', 'Resend-From','Resend-To','Return-Path','User-Agent'
+            ),
+        3 => array(
+            'Date','From','Sender','Subject','To','CC'
+            ),
+        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\.\-]+\k@(?!-)[\w\-]+(? "\\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}(?=<)|".
+
+                "(?<=\s)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=\s)|".
+                "(?<=\[)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=\])|".
+                "(?<==)(?:[a-f\d]{1,4}\:)+(?:[a-f\d]{0,4})?(?:\:[a-f\d]{1,4})+(?=<)|".
+
+                "(?<=\s)\:(?:\:[a-f\d]{1,4})+(?=\s)|".
+                "(?<=\[)\:(?:\:[a-f\d]{1,4})+(?=\])|".
+                "(?<==)\:(?:\:[a-f\d]{1,4})+(?=<)|".
+
+                "(?<=\s)(?:[a-f\d]{1,4}\:)+\:(?=\s)|".
+                "(?<=\[)(?:[a-f\d]{1,4}\:)+\:(?=\])|".
+                "(?<==)(?:[a-f\d]{1,4}\:)+\:(?=<)",
+            GESHI_REPLACE => "\\0",
+            GESHI_MODIFIERS => "i",
+            GESHI_BEFORE => "",
+            GESHI_AFTER => ""
+            ),
+        //Field-Assignments
+        5 => array(
+            GESHI_SEARCH => "(?<=\s)[A-Z0-9\-\.]+(?==(?:$|\s$|[^\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 => "/(?P^)[A-Za-z][a-zA-Z0-9\-]*\s*:\s*(?:.|(?=\n\s)\n)*(?P$)/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
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/epc.php b/sources/inc/geshi/epc.php
new file mode 100644
index 0000000..c575c0c
--- /dev/null
+++ b/sources/inc/geshi/epc.php
@@ -0,0 +1,154 @@
+ 'EPC',
+    'COMMENT_SINGLE' => array('//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //[Sections]
+        //1 => "/^\\[.*\\]/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(
+        0 => '"',
+        1 => '$'
+        ),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'then', 'else', 'endif',
+            'and', 'or', 'xor', 'hysteresis'
+            ),
+        2 => array(
+            'read', 'write', 'event',
+            'gettime', 'settime', 'getdate', 'setdate', 'gettimedate', 'settimedate',
+            'hour', 'minute', 'second', 'changehour', 'changeminute', 'changesecond',
+            'date', 'month', 'day', 'dayofweek', 'sun', 'azimuth', 'elevation',
+            'sunrisehour', 'sunriseminute', 'sunsethour', 'sunsetminute',
+            'wtime', 'htime', 'mtime', 'stime',
+            'cwtime', 'chtime', 'cmtime', 'cstime',
+            'delay', 'after', 'cycle',
+            'readflash', 'writeflash',
+            'abs', 'acos', 'asin', 'atan', 'cos', 'ceil', 'average', 'exp', 'floor',
+            'log', 'max', 'min', 'mod', 'pow', 'sqrt', 'sin', 'tan', 'change', 'convert',
+            'eval', 'systemstart', 'random', 'comobject', 'sleep', 'scene', 'storescene', 'callscene',
+            'find', 'stringcast', 'stringset', 'stringformat', 'split', 'size',
+            'readrs232'. 'sendrs232', 'address', 'readknx',
+            'readudp', 'sendudp', 'connecttcp', 'closetcp', 'readtcp', 'sendtcp',
+            'resolve', 'sendmail',
+            'button', 'webbutton', 'chart', 'webchart', 'webdisplay', 'getslider', 'pshifter', 'mpshifter',
+            'getpslider', 'mbutton', 'mbbutton', 'mchart', 'mpchart', 'mpbutton', 'pdisplay', 'pchart',
+            'pbutton', 'setslider', 'setpslider', 'slider', 'pslider', 'page', 'line', 'header',
+            'footer', 'none', 'plink', 'link', 'frame', 'dframe'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '%', 'b01',
+            ),
+        1 => array(
+            '+', '-', '==', '>=', '=<',
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #e63ec3;',
+            2 => 'color: #e63ec3;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #0000ff;'
+            //1 => 'color: #ffa500;'
+            ),
+        'ESCAPE_CHAR' => array(
+            1 => 'color: #000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #8a0808;',
+            1 => 'color: #6e6e6e;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0b610b;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0b610b;',
+            1 => 'color: #e63ec3;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #0b610b;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Numbers, e.g. 255u08
+        1 => "[0-9]*[subf][0136][12468]"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?  "(?![\.\-a-zA-Z0-9_%=\\/])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/erlang.php b/sources/inc/geshi/erlang.php
new file mode 100644
index 0000000..4b8d406
--- /dev/null
+++ b/sources/inc/geshi/erlang.php
@@ -0,0 +1,441 @@
+'
+ *
+ *************************************************************************************
+ *
+ *     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' => 'Erlang',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("'", "\\"),
+    'HARDCHAR' => "\\",
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' => GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        //Control flow keywrods
+        1 => array(
+            'after', 'andalso', 'begin', 'case', 'catch', 'end', 'fun', 'if',
+            'of', 'orelse', 'receive', 'try', 'when', 'query'
+            ),
+        //Binary operators
+        2 => array(
+            'and', 'band', 'bnot', 'bor', 'bsl', 'bsr', 'bxor', 'div', 'not',
+            'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abs', 'alive', 'apply', 'atom_to_list', 'binary_to_list',
+            'binary_to_term', 'concat_binary', 'date', 'disconnect_node',
+            'element', 'erase', 'exit', 'float', 'float_to_list', 'get',
+            'get_keys', 'group_leader', 'halt', 'hd', 'integer_to_list',
+            'is_alive', 'length', 'link', 'list_to_atom', 'list_to_binary',
+            'list_to_float', 'list_to_integer', 'list_to_pid', 'list_to_tuple',
+            'load_module', 'make_ref', 'monitor_node', 'node', 'nodes', 'now',
+            'open_port', 'pid_to_list', 'process_flag', 'process_info',
+            'process', 'put', 'register', 'registered', 'round', 'self',
+            'setelement', 'size', 'spawn', 'spawn_link', 'split_binary',
+            'statistics', 'term_to_binary', 'throw', 'time', 'tl', 'trunc',
+            'tuple_to_list', 'unlink', 'unregister', 'whereis'
+            ),
+        // Built-In Functions
+        4 => array(
+            'atom', 'binary', 'constant', 'function', 'integer', 'is_atom',
+            'is_binary', 'is_constant', 'is_function', 'is_integer', 'is_list',
+            'is_number', 'is_pid', 'is_reference', 'is_record', 'list',
+            'number', 'pid', 'ports', 'port_close', 'port_info', 'reference'
+            ),
+        // Erlang/OTP internal modules (scary one)
+        5 => array(
+            'alarm_handler', 'any', 'app', 'application', 'appmon', 'appup',
+            'array', 'asn1ct', 'asn1rt', 'auth', 'base64', 'beam_lib', 'c',
+            'calendar', 'code', 'common_test_app', 'compile', 'config',
+            'corba', 'corba_object', 'cosEventApp', 'CosEventChannelAdmin',
+            'CosEventChannelAdmin_ConsumerAdmin',
+            'CosEventChannelAdmin_EventChannel',
+            'CosEventChannelAdmin_ProxyPullConsumer',
+            'CosEventChannelAdmin_ProxyPullSupplier',
+            'CosEventChannelAdmin_ProxyPushConsumer',
+            'CosEventChannelAdmin_ProxyPushSupplier',
+            'CosEventChannelAdmin_SupplierAdmin', 'CosEventDomainAdmin',
+            'CosEventDomainAdmin_EventDomain',
+            'CosEventDomainAdmin_EventDomainFactory',
+            'cosEventDomainApp', 'CosFileTransfer_Directory',
+            'CosFileTransfer_File', 'CosFileTransfer_FileIterator',
+            'CosFileTransfer_FileTransferSession',
+            'CosFileTransfer_VirtualFileSystem',
+            'cosFileTransferApp', 'CosNaming', 'CosNaming_BindingIterator',
+            'CosNaming_NamingContext', 'CosNaming_NamingContextExt',
+            'CosNotification', 'CosNotification_AdminPropertiesAdmin',
+            'CosNotification_QoSAdmin', 'cosNotificationApp',
+            'CosNotifyChannelAdmin_ConsumerAdmin',
+            'CosNotifyChannelAdmin_EventChannel',
+            'CosNotifyChannelAdmin_EventChannelFactory',
+            'CosNotifyChannelAdmin_ProxyConsumer',
+            'CosNotifyChannelAdmin_ProxyPullConsumer',
+            'CosNotifyChannelAdmin_ProxyPullSupplier',
+            'CosNotifyChannelAdmin_ProxyPushConsumer',
+            'CosNotifyChannelAdmin_ProxyPushSupplier',
+            'CosNotifyChannelAdmin_ProxySupplier',
+            'CosNotifyChannelAdmin_SequenceProxyPullConsumer',
+            'CosNotifyChannelAdmin_SequenceProxyPullSupplier',
+            'CosNotifyChannelAdmin_SequenceProxyPushConsumer',
+            'CosNotifyChannelAdmin_SequenceProxyPushSupplier',
+            'CosNotifyChannelAdmin_StructuredProxyPullConsumer',
+            'CosNotifyChannelAdmin_StructuredProxyPullSupplier',
+            'CosNotifyChannelAdmin_StructuredProxyPushConsumer',
+            'CosNotifyChannelAdmin_StructuredProxyPushSupplier',
+            'CosNotifyChannelAdmin_SupplierAdmin',
+            'CosNotifyComm_NotifyPublish', 'CosNotifyComm_NotifySubscribe',
+            'CosNotifyFilter_Filter', 'CosNotifyFilter_FilterAdmin',
+            'CosNotifyFilter_FilterFactory', 'CosNotifyFilter_MappingFilter',
+            'cosProperty', 'CosPropertyService_PropertiesIterator',
+            'CosPropertyService_PropertyNamesIterator',
+            'CosPropertyService_PropertySet',
+            'CosPropertyService_PropertySetDef',
+            'CosPropertyService_PropertySetDefFactory',
+            'CosPropertyService_PropertySetFactory', 'cosTime',
+            'CosTime_TimeService', 'CosTime_TIO', 'CosTime_UTO',
+            'CosTimerEvent_TimerEventHandler',
+            'CosTimerEvent_TimerEventService', 'cosTransactions',
+            'CosTransactions_Control', 'CosTransactions_Coordinator',
+            'CosTransactions_RecoveryCoordinator', 'CosTransactions_Resource',
+            'CosTransactions_SubtransactionAwareResource',
+            'CosTransactions_Terminator', 'CosTransactions_TransactionFactory',
+            'cover', 'cprof', 'cpu_sup', 'crashdump', 'crypto', 'crypto_app',
+            'ct', 'ct_cover', 'ct_ftp', 'ct_master', 'ct_rpc', 'ct_snmp',
+            'ct_ssh', 'ct_telnet', 'dbg', 'debugger', 'dets', 'dialyzer',
+            'dict', 'digraph', 'digraph_utils', 'disk_log', 'disksup',
+            'docb_gen', 'docb_transform', 'docb_xml_check', 'docbuilder_app',
+            'driver_entry', 'edoc', 'edoc_doclet', 'edoc_extract',
+            'edoc_layout', 'edoc_lib', 'edoc_run', 'egd', 'ei', 'ei_connect',
+            'epmd', 'epp', 'epp_dodger', 'eprof', 'erl', 'erl_boot_server',
+            'erl_call', 'erl_comment_scan', 'erl_connect', 'erl_ddll',
+            'erl_driver', 'erl_error', 'erl_eterm', 'erl_eval',
+            'erl_expand_records', 'erl_format', 'erl_global', 'erl_id_trans',
+            'erl_internal', 'erl_lint', 'erl_malloc', 'erl_marshal',
+            'erl_parse', 'erl_pp', 'erl_prettypr', 'erl_prim_loader',
+            'erl_prim_loader_stub', 'erl_recomment', 'erl_scan',
+            'erl_set_memory_block', 'erl_syntax', 'erl_syntax_lib', 'erl_tar',
+            'erl_tidy', 'erlang', 'erlang_mode', 'erlang_stub', 'erlc',
+            'erlsrv', 'error_handler', 'error_logger', 'erts_alloc',
+            'erts_alloc_config', 'escript', 'et', 'et_collector',
+            'et_selector', 'et_viewer', 'etop', 'ets', 'eunit', 'file',
+            'file_sorter', 'filelib', 'filename', 'fixed', 'fprof', 'ftp',
+            'gb_sets', 'gb_trees', 'gen_event', 'gen_fsm', 'gen_sctp',
+            'gen_server', 'gen_tcp', 'gen_udp', 'gl', 'global', 'global_group',
+            'glu', 'gs', 'heart', 'http', 'httpd', 'httpd_conf',
+            'httpd_socket', 'httpd_util', 'i', 'ic', 'ic_c_protocol',
+            'ic_clib', 'igor', 'inet', 'inets', 'init', 'init_stub',
+            'instrument', 'int', 'interceptors', 'inviso', 'inviso_as_lib',
+            'inviso_lfm', 'inviso_lfm_tpfreader', 'inviso_rt',
+            'inviso_rt_meta', 'io', 'io_lib', 'kernel_app', 'lib', 'lists',
+            'lname', 'lname_component', 'log_mf_h', 'make', 'math', 'megaco',
+            'megaco_codec_meas', 'megaco_codec_transform',
+            'megaco_edist_compress', 'megaco_encoder', 'megaco_flex_scanner',
+            'megaco_tcp', 'megaco_transport', 'megaco_udp', 'megaco_user',
+            'memsup', 'mnesia', 'mnesia_frag_hash', 'mnesia_registry',
+            'mod_alias', 'mod_auth', 'mod_esi', 'mod_security',
+            'Module_Interface', 'ms_transform', 'net_adm', 'net_kernel',
+            'new_ssl', 'nteventlog', 'observer_app', 'odbc', 'orber',
+            'orber_acl', 'orber_diagnostics', 'orber_ifr', 'orber_tc',
+            'orddict', 'ordsets', 'os', 'os_mon', 'os_mon_mib', 'os_sup',
+            'otp_mib', 'overload', 'packages', 'percept', 'percept_profile',
+            'pg', 'pg2', 'pman', 'pool', 'prettypr', 'proc_lib', 'proplists',
+            'public_key', 'qlc', 'queue', 'random', 'rb', 're', 'regexp',
+            'registry', 'rel', 'release_handler', 'reltool', 'relup', 'rpc',
+            'run_erl', 'run_test', 'runtime_tools_app', 'sasl_app', 'script',
+            'seq_trace', 'sets', 'shell', 'shell_default', 'slave', 'snmp',
+            'snmp_app', 'snmp_community_mib', 'snmp_framework_mib',
+            'snmp_generic', 'snmp_index', 'snmp_notification_mib', 'snmp_pdus',
+            'snmp_standard_mib', 'snmp_target_mib', 'snmp_user_based_sm_mib',
+            'snmp_view_based_acm_mib', 'snmpa', 'snmpa_conf', 'snmpa_error',
+            'snmpa_error_io', 'snmpa_error_logger', 'snmpa_error_report',
+            'snmpa_local_db', 'snmpa_mpd', 'snmpa_network_interface',
+            'snmpa_network_interface_filter',
+            'snmpa_notification_delivery_info_receiver',
+            'snmpa_notification_filter', 'snmpa_supervisor', 'snmpc', 'snmpm',
+            'snmpm_conf', 'snmpm_mpd', 'snmpm_network_interface', 'snmpm_user',
+            'sofs', 'ssh', 'ssh_channel', 'ssh_connection', 'ssh_sftp',
+            'ssh_sftpd', 'ssl', 'ssl_app', 'ssl_pkix', 'start', 'start_erl',
+            'start_webtool', 'stdlib_app', 'string', 'supervisor',
+            'supervisor_bridge', 'sys', 'systools', 'tags', 'test_server',
+            'test_server_app', 'test_server_ctrl', 'tftp', 'timer', 'toolbar',
+            'ttb', 'tv', 'unicode', 'unix_telnet', 'user', 'webtool', 'werl',
+            'win32reg', 'wrap_log_reader', 'wx', 'wx_misc', 'wx_object',
+            'wxAcceleratorEntry', 'wxAcceleratorTable', 'wxArtProvider',
+            'wxAuiDockArt', 'wxAuiManager', 'wxAuiNotebook', 'wxAuiPaneInfo',
+            'wxAuiTabArt', 'wxBitmap', 'wxBitmapButton', 'wxBitmapDataObject',
+            'wxBoxSizer', 'wxBrush', 'wxBufferedDC', 'wxBufferedPaintDC',
+            'wxButton', 'wxCalendarCtrl', 'wxCalendarDateAttr',
+            'wxCalendarEvent', 'wxCaret', 'wxCheckBox', 'wxCheckListBox',
+            'wxChildFocusEvent', 'wxChoice', 'wxClientDC', 'wxClipboard',
+            'wxCloseEvent', 'wxColourData', 'wxColourDialog',
+            'wxColourPickerCtrl', 'wxColourPickerEvent', 'wxComboBox',
+            'wxCommandEvent', 'wxContextMenuEvent', 'wxControl',
+            'wxControlWithItems', 'wxCursor', 'wxDataObject', 'wxDateEvent',
+            'wxDatePickerCtrl', 'wxDC', 'wxDialog', 'wxDirDialog',
+            'wxDirPickerCtrl', 'wxDisplayChangedEvent', 'wxEraseEvent',
+            'wxEvent', 'wxEvtHandler', 'wxFileDataObject', 'wxFileDialog',
+            'wxFileDirPickerEvent', 'wxFilePickerCtrl', 'wxFindReplaceData',
+            'wxFindReplaceDialog', 'wxFlexGridSizer', 'wxFocusEvent', 'wxFont',
+            'wxFontData', 'wxFontDialog', 'wxFontPickerCtrl',
+            'wxFontPickerEvent', 'wxFrame', 'wxGauge', 'wxGBSizerItem',
+            'wxGenericDirCtrl', 'wxGLCanvas', 'wxGraphicsBrush',
+            'wxGraphicsContext', 'wxGraphicsFont', 'wxGraphicsMatrix',
+            'wxGraphicsObject', 'wxGraphicsPath', 'wxGraphicsPen',
+            'wxGraphicsRenderer', 'wxGrid', 'wxGridBagSizer', 'wxGridCellAttr',
+            'wxGridCellEditor', 'wxGridCellRenderer', 'wxGridEvent',
+            'wxGridSizer', 'wxHelpEvent', 'wxHtmlEasyPrinting', 'wxIcon',
+            'wxIconBundle', 'wxIconizeEvent', 'wxIdleEvent', 'wxImage',
+            'wxImageList', 'wxJoystickEvent', 'wxKeyEvent',
+            'wxLayoutAlgorithm', 'wxListBox', 'wxListCtrl', 'wxListEvent',
+            'wxListItem', 'wxListView', 'wxMask', 'wxMaximizeEvent',
+            'wxMDIChildFrame', 'wxMDIClientWindow', 'wxMDIParentFrame',
+            'wxMemoryDC', 'wxMenu', 'wxMenuBar', 'wxMenuEvent', 'wxMenuItem',
+            'wxMessageDialog', 'wxMiniFrame', 'wxMirrorDC',
+            'wxMouseCaptureChangedEvent', 'wxMouseEvent', 'wxMoveEvent',
+            'wxMultiChoiceDialog', 'wxNavigationKeyEvent', 'wxNcPaintEvent',
+            'wxNotebook', 'wxNotebookEvent', 'wxNotifyEvent',
+            'wxPageSetupDialog', 'wxPageSetupDialogData', 'wxPaintDC',
+            'wxPaintEvent', 'wxPalette', 'wxPaletteChangedEvent', 'wxPanel',
+            'wxPasswordEntryDialog', 'wxPen', 'wxPickerBase', 'wxPostScriptDC',
+            'wxPreviewCanvas', 'wxPreviewControlBar', 'wxPreviewFrame',
+            'wxPrintData', 'wxPrintDialog', 'wxPrintDialogData', 'wxPrinter',
+            'wxPrintout', 'wxPrintPreview', 'wxProgressDialog',
+            'wxQueryNewPaletteEvent', 'wxRadioBox', 'wxRadioButton',
+            'wxRegion', 'wxSashEvent', 'wxSashLayoutWindow', 'wxSashWindow',
+            'wxScreenDC', 'wxScrollBar', 'wxScrolledWindow', 'wxScrollEvent',
+            'wxScrollWinEvent', 'wxSetCursorEvent', 'wxShowEvent',
+            'wxSingleChoiceDialog', 'wxSizeEvent', 'wxSizer', 'wxSizerFlags',
+            'wxSizerItem', 'wxSlider', 'wxSpinButton', 'wxSpinCtrl',
+            'wxSpinEvent', 'wxSplashScreen', 'wxSplitterEvent',
+            'wxSplitterWindow', 'wxStaticBitmap', 'wxStaticBox',
+            'wxStaticBoxSizer', 'wxStaticLine', 'wxStaticText', 'wxStatusBar',
+            'wxStdDialogButtonSizer', 'wxStyledTextCtrl', 'wxStyledTextEvent',
+            'wxSysColourChangedEvent', 'wxTextAttr', 'wxTextCtrl',
+            'wxTextDataObject', 'wxTextEntryDialog', 'wxToggleButton',
+            'wxToolBar', 'wxToolTip', 'wxTopLevelWindow', 'wxTreeCtrl',
+            'wxTreeEvent', 'wxUpdateUIEvent', 'wxWindow', 'wxWindowCreateEvent',
+            'wxWindowDC', 'wxWindowDestroyEvent', 'wxXmlResource', 'xmerl',
+            'xmerl_eventp', 'xmerl_scan', 'xmerl_xpath', 'xmerl_xs',
+            'xmerl_xsd', 'xref', 'yecc', 'zip', 'zlib', 'zlib_stub'
+            ),
+        // Binary modifiers
+        6 => array(
+            'big', 'binary', 'float', 'integer', 'little', 'signed', 'unit', 'unsigned'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']', '{', '}'),
+        1 => array('->', ',', ';', '.'),
+        2 => array('<<', '>>'),
+        3 => array('=', '||', '-', '+', '*', '/', '++', '--', '!', '<', '>', '>=',
+                    '=<', '==', '/=', '=:=', '=/=')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #186895;',
+            2 => 'color: #014ea4;',
+            3 => 'color: #fa6fff;',
+            4 => 'color: #fa6fff;',
+            5 => 'color: #ff4e18;',
+            6 => 'color: #9d4f37;'
+            ),
+        '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: #109ab8;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff7800;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff9600;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #004866;',
+            1 => 'color: #6bb810;',
+            2 => 'color: #ee3800;',
+            3 => 'color: #014ea4;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #6941fd;',
+            1 => 'color: #d400ed;',
+            2 => 'color: #5400b3;',
+            3 => 'color: #ff3c00;',
+            4 => 'color: #6941fd;',
+            5 => 'color: #45b3e6;',
+            6 => 'color: #ff9600;',
+            7 => 'color: #d400ed;',
+            8 => 'color: #ff9600;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://erlang.org/doc/man/{FNAME}.html',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '->',
+        2 => ':'
+        ),
+    'REGEXPS' => array(
+        //�Macro definitions
+        0 => array(
+            GESHI_SEARCH => '(-define\s*\()([a-zA-Z0-9_]+)(\(|,)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Record definitions
+        1 => array(
+            GESHI_SEARCH => '(-record\s*\()([a-zA-Z0-9_]+)(,)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Precompiler directives
+        2 => array(
+            GESHI_SEARCH => '(-)([a-z][a-zA-Z0-9_]*)(\()',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Functions
+        3 => array(
+            GESHI_SEARCH => '([a-z]\w*|\'\w*\')(\s*\()',
+            GESHI_REPLACE => '\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\2'
+            ),
+        // Macros
+        4 => array(
+            GESHI_SEARCH => '(\?)([a-zA-Z0-9_]+)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => ''
+            ),
+        // Variables - With hack to avoid interfering wish GeSHi internals
+        5 => array(
+            GESHI_SEARCH => '([([{,<+*-\/=\s!]|<)(?!(?:PIPE|SEMI|DOT|NUM|REG3XP\d*)\W)([A-Z_]\w*)(?!\w)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => ''
+            ),
+        // ASCII�codes
+        6 => '(\$[a-zA-Z0-9_])',
+        // Records
+        7 => array(
+            GESHI_SEARCH => '(#)([a-z][a-zA-Z0-9_]*)(\.|\{)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Numbers with a different radix
+        8 => '(?<=>)(#[a-zA-Z0-9]*)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(? ''//'(?=\s*\()'
+            ),
+            5 => array(
+                'DISALLOWED_BEFORE' => '(?<=\'|)',
+                'DISALLOWED_AFTER' => '(?=(\'|):)'
+            ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=\/|-)',
+                'DISALLOWED_AFTER' => ''
+            )
+        )
+    ),
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/euphoria.php b/sources/inc/geshi/euphoria.php
new file mode 100644
index 0000000..7bbf884
--- /dev/null
+++ b/sources/inc/geshi/euphoria.php
@@ -0,0 +1,140 @@
+ (1.0.8.9)
+ *  -  First Release
+ *
+ * TODO (updated )
+ * -------------------------
+ * seperate the funtions from the procedures, and have a slight color change for each.
+ *
+ *************************************************************************************
+ *
+ *     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' => 'Euphoria',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array(), //Euphoria doesn't support multi-line comments
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // keywords
+            'and', 'by', 'constant', 'do', 'else', 'elsif', 'end', 'exit',
+            'for', 'function', 'global', 'if', 'include', 'not', 'or',
+            'procedure', 'return', 'then', 'to', 'type', 'while', 'with',
+            'without', 'xor'
+            ),
+        2 => array( // built-ins
+            'abort', 'and_bits', 'append', 'arctan', 'atom', 'c_func', 'call',
+            'c_proc', 'call_func', 'call_proc', 'clear_screen', 'close', 'compare',
+            'command_line', 'cos', 'date', 'equal', 'find', 'find_from', 'floor',
+            'getc', 'getenv', 'gets', 'get_key', 'get_pixel', 'integer', 'length',
+            'log', 'machine_func', 'machine_proc', 'match', 'match_from',
+            'mem_copy', 'mem_set', 'not_bits', 'object', 'open', 'or_bits', 'peek',
+            'peek4s', 'peek4u', 'pixel', 'platform', 'poke', 'poke4', 'position',
+            'power', 'prepend', 'print', 'printf', 'profile', 'puts', 'rand',
+            'remainder', 'repeat', 'routine_id', 'sequence', 'sin', 'sprintf',
+            'sqrt', 'system', 'system_exec', 'tan', 'task_clock_stop',
+            'task_clock_start', 'task_create', 'task_list', 'task_schedule',
+            'task_self', 'task_status', 'task_suspend', 'task_yield', 'time',
+            'trace', 'xor_bits'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '{', '}', '[', ']'
+            ),
+        1 => array(
+            '+', '-', '*', '/', '=', '&', '^'
+            ),
+        2 => array(
+            '&', '?', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;', // keywords
+            2 => 'color: #cc33ff; font-weight: bold;', // builtins
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff0000; font-style: italic;',
+            'MULTI' => '' // doesn't exist
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #999900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #00cc00;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc33cc; font-style: italic'
+            ),
+        'METHODS' => array( // Doesn't exist in Euphoria.  Everything is a function =)
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #999900;', // brackets
+            1 => 'color: #333333;', // operators
+            2 => 'color: #333333; font-style: bold' // print+concat
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array( // Never included in scripts.
+            )
+        ),
+    'REGEXPS' => array(
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/f1.php b/sources/inc/geshi/f1.php
new file mode 100644
index 0000000..7d76760
--- /dev/null
+++ b/sources/inc/geshi/f1.php
@@ -0,0 +1,151 @@
+ 'Formula One',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'COMMENT_REGEXP' => array(
+        //Nested Comments
+        2 =>  "/(\{(?:\{.*\}|[^\{])*\})/m"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'",'"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\nrt\'\"?\n]#i",
+        //Hexadecimal Char Specs (Utf16 codes, Unicode versions only)
+        2 => "#\\\\u[\da-fA-F]{4}#",
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE |
+        GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX_0O |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'pred','proc','subr','else','elsif','iff','if','then','false','true',
+            'case','of','use','local','mod','end','list','file','all','one','max','min','rel',
+            'external','Nil','_stdcall','_cdecl','_addressof','_pred','_file','_line'
+            ),
+        2 => array(
+            'Ascii','Bin','I','L','P','R','S','U'
+            ),
+        3 => array(
+            'Append','in','Dupl','Len','Print','_AllDifferent','_AllAscending',
+            '_AllDescending','_Ascending','_Descending'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('<', '>','='),
+        2 => array('+', '-', '*', '/'),
+        3 => array('&', '|'),
+        4 => array(':', ';')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #000080;',
+            3 => 'color: #000080;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #009999; font-weight: bold;',
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #000000;',
+            2 => 'color: #000000;',
+            3 => 'color: #000000;',
+            4 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.f1compiler.com/f1helponline/f1_runtime_library.html#{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/falcon.php b/sources/inc/geshi/falcon.php
new file mode 100644
index 0000000..2111d9e
--- /dev/null
+++ b/sources/inc/geshi/falcon.php
@@ -0,0 +1,218 @@
+ (1.0.8.10)
+ *  -  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' => 'Falcon',
+    'COMMENT_SINGLE' => array( 1 => '//' ),
+    'COMMENT_MULTI' => array( '/*' => '*/' ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array( "'", '"' ),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'break','case','catch','class','const','continue','def','default',
+            'dropping','elif','else','end','enum','for','forfirst','forlast',
+            'formiddle','from','function','global','if','init','innerfunc',
+            'launch','loop','object','raise','return','select','state','static',
+            'switch','try','while'
+        ),
+        2 => array(
+            'false','nil','true',
+        ),
+        3 => array(
+            'and','as','eq','fself','in','not','notin','or','provides','self','to'
+        ),
+        4 => array(
+            'directive','export','import','load','macro'
+        ),
+        5 => array(
+            'ArrayType','BooleanType','ClassMethodType','ClassType','DictionaryType',
+            'FunctionType','MemBufType','MethodType','NilType','NumericType','ObjectType',
+            'RangeType','StringType','LBindType'
+        ),
+        6 => array(
+            "CurrentTime","IOStream","InputStream","MemBufFromPtr","OutputStream",
+            "PageDict","ParseRFC2822","abs","acos","all",
+            "allp","any","anyp","argd","argv",
+            "arrayAdd","arrayBuffer","arrayCompact","arrayDel","arrayDelAll",
+            "arrayFill","arrayFind","arrayHead","arrayIns","arrayMerge",
+            "arrayNM","arrayRemove","arrayResize","arrayScan","arraySort",
+            "arrayTail","asin","assert","atan","atan2",
+            "attributes","baseClass","beginCritical","bless","brigade",
+            "broadcast","cascade","ceil","choice","chr",
+            "className","clone","combinations","compare","consume",
+            "cos","deg2rad","deoob","derivedFrom","describe",
+            "deserialize","dictBack","dictBest","dictClear","dictFill",
+            "dictFind","dictFront","dictGet","dictKeys","dictMerge",
+            "dictRemove","dictSet","dictValues","dirChange","dirCurrent",
+            "dirMake","dirMakeLink","dirReadLink","dirRemove","dolist",
+            "endCritical","epoch","eval","exit","exp",
+            "factorial","fileChgroup","fileChmod","fileChown","fileCopy",
+            "fileExt","fileMove","fileName","fileNameMerge","filePath",
+            "fileRemove","fileType","fileUnit","filter","fint",
+            "firstOf","floop","floor","fract","getAssert",
+            "getEnviron","getProperty","getSlot","getSystemEncoding","getenv",
+            "iff","include","input","inspect","int",
+            "isBound","isCallable","isoob","lbind","len",
+            "let","lit","log","map","max",
+            "metaclass","min","numeric","oob","ord",
+            "paramCount","paramIsRef","paramSet","parameter","passvp",
+            "permutations","pow","print","printl","properties",
+            "rad2deg","random","randomChoice","randomDice","randomGrab",
+            "randomPick","randomSeed","randomWalk","readURI","reduce",
+            "retract","round","seconds","serialize","set",
+            "setProperty","setenv","sin","sleep","stdErr",
+            "stdErrRaw","stdIn","stdInRaw","stdOut","stdOutRaw",
+            "strBack","strBackFind","strBackTrim","strBuffer","strCmpIgnoreCase",
+            "strEndsWith","strEscape","strEsq","strFill","strFind",
+            "strFromMemBuf","strFront","strFrontTrim","strLower","strMerge",
+            "strReplace","strReplicate","strSplit","strSplitTrimmed","strStartsWith",
+            "strToMemBuf","strTrim","strUnescape","strUnesq","strUpper",
+            "strWildcardMatch","subscribe","systemErrorDescription","tan","times",
+            "toString","transcodeFrom","transcodeTo","typeOf","unsetenv",
+            "unsubscribe","valof","vmFalconPath","vmIsMain","vmModuleName",
+            "vmModuleVersionInfo","vmSearchPath","vmSystemType","vmVersionInfo","vmVersionName",
+            "writeURI","xmap","yield","yieldOut"
+        ),
+        7 => array(
+            "AccessError","Array","BOM","Base64","Class",
+            "ClassMethod","CloneError","CmdlineParser","CodeError","Continuation",
+            "Dictionary","Directory","Error","FileStat","Format",
+            "Function","GarbagePointer","GenericError","Integer","InterruptedError",
+            "IoError","Iterator","LateBinding","List","MathError",
+            "MemoryBuffer","MessageError","Method","Numeric","Object",
+            "ParamError","ParseError","Path","Range","Semaphore",
+            "Sequence","Set","Stream","String","StringStream",
+            "SyntaxError","Table","TableError","TimeStamp","TimeZone",
+            "Tokenizer","TypeError","URI","VMSlot"
+        ),
+        8 => array(
+            "args","scriptName","scriptPath"
+        ),
+        9 => array(
+            "GC"
+        ),
+    ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://falconpl.org/project_docs/core/functions.html#typeOf',
+        6 => 'http://falconpl.org/project_docs/core/functions.html#{FNAME}',
+        7 => 'http://falconpl.org/project_docs/core/class_{FNAME}.html',
+        8 => 'http://falconpl.org/project_docs/core/globals.html#{FNAME}',
+        9 => 'http://falconpl.org/project_docs/core/object_{FNAME}.html)'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+    ),
+    'SYMBOLS' => array(
+        '(',')','$','%','&','/','{','[',']','=','}','?','+','-','#','*','@',
+        '<','>','|',',',':',';','\\','^'
+    ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '(\[)([a-zA-Z_]|\c{C})(?:[a-zA-Z0-9_]|\p{C})*(\])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+
+        ),
+    ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array( ' '?>' )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080;font-weight:bold;',
+            2 => 'color: #800000;font-weight:bold;',
+            3 => 'color: #800000;font-weight:bold;',
+            4 => 'color: #000080;font-weight:bold;',
+            5 => 'color: #000000;font-weight:bold;',
+            6 => 'font-weight:bold;',
+            7 => 'font-weight:bold;',
+            8 => 'font-weight:bold;'
+        ),
+        'COMMENTS' => array(
+            1 => 'color: #29B900;',
+            'MULTI' => 'color: #008080'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #800000'
+        ),
+        'BRACKETS' => array(
+            0 => 'color: #000000'
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000'
+        ),
+        'NUMBERS' => array(
+            0 => 'color: #000000'
+        ),
+        'METHODS' => array(
+            0 => 'color: #000000'
+        ),
+        'SYMBOLS' => array(
+            0 => 'color: #8B0513'
+        ),
+        'SCRIPT' => array(
+            0 => ''
+        ),
+        'REGEXPS' => array(
+            0 => 'color: #FF00FF'
+        )
+    ),
+
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        '.'
+    )
+);
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/fo.php b/sources/inc/geshi/fo.php
new file mode 100644
index 0000000..ba4a592
--- /dev/null
+++ b/sources/inc/geshi/fo.php
@@ -0,0 +1,327 @@
+ 'FO (abas-ERP)',
+    'COMMENT_SINGLE' => array(1 => '..'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        //Control Flow
+        1 => array(
+            /* see http://www.abas.de/sub_de/kunden/help/hd/html/9.html */
+
+            /* fo keywords, part 1: control flow */
+            '.weiter', '.continue'
+
+            /* this language works with goto's only*/
+            ),
+
+        //FO Keywords
+        2 => array(
+            /* fo keywords, part 2 */
+            '.fo', '.formel', '.formula',
+            '.zuweisen', '.assign',
+            '.fehler', '.error',
+            '.ende', '.end'
+            ),
+
+        //Java Keywords
+        3 => array(
+            /* Java keywords, part 3: primitive data types */
+            '.art', '.type',
+            'integer', 'real', 'bool', 'text', 'datum', 'woche', 'termin', 'zeit',
+            'mehr', 'MEHR'
+            ),
+
+        //Reserved words in fo literals
+        4 => array(
+            /* other reserved words in fo literals */
+            /* should be styled to look similar to numbers and Strings */
+            'false', 'null', 'true',
+            'OBJEKT',
+            'VORGANG', 'PROCESS',
+            'OFFEN', 'OPEN',
+            'ABORT',
+            'AN', 'ADDEDTO',
+            'AUF', 'NEW',
+            'BILDSCHIRM', 'TERMINAL',
+            'PC',
+            'MASKE', 'SCREEN',
+            'ZEILE', 'LINE'
+            ),
+
+        // interpreter settings
+        5 => array (
+            '..!INTERPRETER', 'DEBUG'
+            ),
+
+        // database commands
+        6 => array (
+            '.hole', '.hol', '.select',
+            '.lade', '.load',
+            '.aktion', '.action',
+            '.belegen', '.occupy',
+            '.bringe', '.rewrite',
+            '.dazu', '.add',
+            '.löschen', '.delete',
+            '.mache', '.make',
+            '.merke', '.reserve',
+            '.setze', '.set',
+            'SPERREN', 'LOCK',
+            'TEIL', 'PART',
+            'KEINESPERRE',
+            'AMASKE', 'ASCREEN',
+            'BETRIEB', 'WORK-ORDER',
+            'NUMERISCH', 'NUMERICAL',
+            'VORSCHLAG', 'SUGGESTION',
+            'OBLIGO', 'OUTSTANDING',
+            'LISTE', 'LIST',
+            'DRUCK', 'PRINT',
+            'ÜBERNAHME', 'TAGEOVER',
+            'ABLAGE', 'FILINGSYSTEM',
+            'BDE', 'PDC',
+            'BINDUNG', 'ALLOCATION',
+            'BUCHUNG', 'ENTRY',
+            'COLLI', 'SERIAL',
+            'DATEI', 'FILE',
+            'VERKAUF', 'SALES',
+            'EINKAUF', 'PURCHASING',
+            'EXEMPLAR', 'EXAMPLE',
+            'FERTIGUNG', 'PRODUCTION',
+            'FIFO',
+            'GRUPPE', 'GROUP',
+            'JAHR', 'YEAR',
+            'JOURNAL',
+            'KOPF', 'HEADER',
+            'KOSTEN',
+            'LIFO',
+            'LMENGE', 'SQUANTITY',
+            'LOHNFERTIGUNG', 'SUBCONTRACTING',
+            'LPLATZ', 'LOCATION',
+            'MBELEGUNG', 'MACHLOADING',
+            'MONAT', 'MONTH', 'MZ',
+            'NACHRICHT', 'MESSAGE',
+            'PLAN', 'TARGET',
+            'REGIONEN', 'REGIONS',
+            'SERVICEANFRAGE', 'SERVICEREQUEST',
+            'VERWENDUNG', 'APPLICATION',
+            'WEITER', 'CONTINUE',
+            'ABBRUCH', 'CANCEL',
+            'ABLAGEKENNZEICHEN', 'FILLINGCODE',
+            'ALLEIN', 'SINGLEUSER',
+            'AUFZAEHLTYP', 'ENUMERATION-TYPE',
+            'AUSGABE', 'OUTPUT',
+            'DEZPUNKT', 'DECPOINT'
+            ),
+
+        // output settings
+        7 => array (
+            '.absatz', '.para',
+            '.blocksatz', '.justified',
+            '.flattersatz', '.unjustified',
+            '.format',
+            '.box',
+            '.drucken', '.print',
+            '.gedruckt', '.printed',
+            '.länge', '.length',
+            '.links', '.left',
+            '.rechts', '.right',
+            '.oben', '.up',
+            '.unten', '.down',
+            '.seite', '.page',
+            '.tabellensatz', '.tablerecord',
+            '.trenner', '.separator',
+            'ARCHIV'
+            ),
+
+        // text commands
+        8 => array (
+            '.text',
+            '.atext',
+            '.println',
+            '.uebersetzen', '.translate'
+            ),
+
+        // I/O commands
+        9 => array (
+            '.aus', '.ausgabe', '.output',
+            '.ein', '.eingabe', '.input',
+            '.datei', '.file',
+            '.lesen', '.read',
+            '.sortiere', '.sort',
+            '-ÖFFNEN', '-OPEN',
+            '-TEST',
+            '-LESEN', '-READ',
+            'VON', 'FROM'
+            ),
+
+        //system
+        10 => array (
+            '.browser',
+            '.kommando', '.command',
+            '.system', '.dde',
+            '.editiere', '.edit',
+            '.hilfe', '.help',
+            '.kopieren', '.copy',
+            '.pc.clip',
+            '.pc.copy',
+            '.pc.dll',
+            '.pc.exec',
+            '.pc.open',
+            'DIAGNOSE', 'ERRORREPORT',
+            'DOPPELPUNKT', 'COLON',
+            'ERSETZUNG', 'REPLACEMENT',
+            'WARTEN', 'PARALLEL'
+            ),
+
+        //fibu/accounting specific commands
+        11 => array (
+            '.budget',
+            '.chart',
+            'VKZ',
+            'KONTO', 'ACCOUNT',
+            'AUSZUG', 'STATEMENT',
+            'WAEHRUNG', 'CURRENCY',
+            'WAEHRUNGSKURS', 'EXCHANGERATE',
+            'AUSWAEHR', 'FORCURR',
+            'BUCHUNGSKREIS', 'SET OF BOOKS'
+            ),
+
+        // efop - extended flexible surface
+        12 => array (
+            '.cursor',
+            '.farbe', '.colour',
+            '.fenster', '.window',
+            '.hinweis', '.note',
+            '.menue', '.menu',
+            '.schutz', '.protection',
+            '.zeigen', '.view',
+            '.zeile', '.line',
+            'VORDERGRUND', 'FOREGROUND',
+            'HINTERGRUND', 'BACKGROUND',
+            'SOFORT', 'IMMEDIATELY',
+            'AKTUALISIEREN', 'UPDATE',
+            'FENSTERSCHLIESSEN', 'CLOSEWINDOWS'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']', '{', '}', '*', '&', '%', ';', '<', '>'),
+        1 => array('?', '!')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        /* all fo keywords are case sensitive, don't have to but I like this type of coding */
+        1 => true, 2 => true, 3 => true, 4 => true,
+        5 => true, 6 => true, 7 => true, 8 => true, 9 => true,
+        10 => true, 11 => true, 12 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #006600; font-weight: bold;',
+            4 => 'color: #006600; font-weight: bold;',
+            5 => 'color: #003399; font-weight: bold;',
+            6 => 'color: #003399; font-weight: bold;',
+            7 => 'color: #003399; font-weight: bold;',
+            8 => 'color: #003399; font-weight: bold;',
+            9 => 'color: #003399; font-weight: bold;',
+            10 => 'color: #003399; font-weight: bold;',
+            11 => 'color: #003399; font-weight: bold;',
+            12 => 'color: #003399; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            //2 => 'color: #006699;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/fortran.php b/sources/inc/geshi/fortran.php
new file mode 100644
index 0000000..c21ccd1
--- /dev/null
+++ b/sources/inc/geshi/fortran.php
@@ -0,0 +1,160 @@
+'Fortran',
+    'COMMENT_SINGLE'=> array(1 =>'!',2=>'Cf2py'),
+    'COMMENT_MULTI'=> array(),
+    //Fortran Comments
+    'COMMENT_REGEXP' => array(1 => '/^C.*?$/mi'),
+    'CASE_KEYWORDS'=> GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS'=> array("'",'"'),
+    'ESCAPE_CHAR'=>'\\',
+    'KEYWORDS'=> array(
+        1 => array(
+            'allocate','block','call','case','contains','continue','cycle','deallocate',
+            'default','do','else','elseif','elsewhere','end','enddo','endif','endwhere',
+            'entry','exit','function','go','goto','if','interface','module','nullify','only',
+            'operator','procedure','program','recursive','return','select','stop',
+            'subroutine','then','to','where','while',
+            'access','action','advance','blank','blocksize','carriagecontrol',
+            'delim','direct','eor','err','exist','file','flen','fmt','form','formatted',
+            'iostat','name','named','nextrec','nml','number','opened','pad','position',
+            'readwrite','recl','sequential','status','unformatted','unit'
+            ),
+        2 => array(
+            '.AND.','.EQ.','.EQV.','.GE.','.GT.','.LE.','.LT.','.NE.','.NEQV.','.NOT.',
+            '.OR.','.TRUE.','.FALSE.'
+            ),
+        3 => array(
+            'allocatable','character','common','complex','data','dimension','double',
+            'equivalence','external','implicit','in','inout','integer','intent','intrinsic',
+            'kind','logical','namelist','none','optional','out','parameter','pointer',
+            'private','public','real','result','save','sequence','target','type','use'
+            ),
+        4 => array(
+            'abs','achar','acos','adjustl','adjustr','aimag','aint','all','allocated',
+            'anint','any','asin','atan','atan2','bit_size','break','btest','carg',
+            'ceiling','char','cmplx','conjg','cos','cosh','cpu_time','count','cshift',
+            'date_and_time','dble','digits','dim','dot_product','dprod dvchk',
+            'eoshift','epsilon','error','exp','exponent','floor','flush','fraction',
+            'getcl','huge','iachar','iand','ibclr','ibits','ibset','ichar','ieor','index',
+            'int','intrup','invalop','ior','iostat_msg','ishft','ishftc','lbound',
+            'len','len_trim','lge','lgt','lle','llt','log','log10','matmul','max','maxexponent',
+            'maxloc','maxval','merge','min','minexponent','minloc','minval','mod','modulo',
+            'mvbits','nbreak','ndperr','ndpexc','nearest','nint','not','offset','ovefl',
+            'pack','precfill','precision','present','product','prompt','radix',
+            'random_number','random_seed','range','repeat','reshape','rrspacing',
+            'scale','scan','segment','selected_int_kind','selected_real_kind',
+            'set_exponent','shape','sign','sin','sinh','size','spacing','spread','sqrt',
+            'sum system','system_clock','tan','tanh','timer','tiny','transfer','transpose',
+            'trim','ubound','undfl','unpack','val','verify'
+            ),
+        ),
+    'SYMBOLS'=> array(
+        '(',')','{','}','[',']','=','+','-','*','/','!','%','^','&',':'
+        ),
+    'CASE_SENSITIVE'=> array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES'=> array(
+        'KEYWORDS'=> array(
+            1 =>'color: #b1b100;',
+            2 =>'color: #000000; font-weight: bold;',
+            3 =>'color: #000066;',
+            4 =>'color: #993333;'
+            ),
+        'COMMENTS'=> array(
+            1 =>'color: #666666; font-style: italic;',
+            2 =>'color: #339933;',
+            'MULTI'=>'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR'=> array(
+            0 =>'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS'=> array(
+            0 =>'color: #009900;'
+            ),
+        'STRINGS'=> array(
+            0 =>'color: #ff0000;'
+            ),
+        'NUMBERS'=> array(
+            0 =>'color: #cc66cc;'
+            ),
+        'METHODS'=> array(
+            1 =>'color: #202020;',
+            2 =>'color: #202020;'
+            ),
+        'SYMBOLS'=> array(
+            0 =>'color: #339933;'
+            ),
+        'REGEXPS'=> array(
+            ),
+        'SCRIPT'=> array(
+            )
+        ),
+    'URLS'=> array(
+        1 =>'',
+        2 =>'',
+        3 =>'',
+        4 =>''
+        ),
+    'OOLANG'=> true,
+    'OBJECT_SPLITTERS'=> array(
+        1 =>'.',
+        2 =>'::'
+        ),
+    'REGEXPS'=> array(
+        ),
+    'STRICT_MODE_APPLIES'=> GESHI_NEVER,
+    'SCRIPT_DELIMITERS'=> array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK'=> array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/freebasic.php b/sources/inc/geshi/freebasic.php
new file mode 100644
index 0000000..b23f39b
--- /dev/null
+++ b/sources/inc/geshi/freebasic.php
@@ -0,0 +1,141 @@
+ 'FreeBasic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "append", "as", "asc", "asin", "asm", "atan2", "atn", "beep", "bin", "binary", "bit",
+            "bitreset", "bitset", "bload", "bsave", "byref", "byte", "byval", "call",
+            "callocate", "case", "cbyte", "cdbl", "cdecl", "chain", "chdir", "chr", "cint",
+            "circle", "clear", "clng", "clngint", "close", "cls", "color", "command",
+            "common", "cons", "const", "continue", "cos", "cshort", "csign", "csng",
+            "csrlin", "cubyte", "cuint", "culngint", "cunsg", "curdir", "cushort", "custom",
+            "cvd", "cvi", "cvl", "cvlongint", "cvs", "cvshort", "data", "date",
+            "deallocate", "declare", "defbyte", "defdbl", "defined", "defint", "deflng",
+            "deflngint", "defshort", "defsng", "defstr", "defubyte", "defuint",
+            "defulngint", "defushort", "dim", "dir", "do", "double", "draw", "dylibload",
+            "dylibsymbol", "else", "elseif", "end", "enum", "environ", 'environ$', "eof",
+            "eqv", "erase", "err", "error", "exec", "exepath", "exit", "exp", "export",
+            "extern", "field", "fix", "flip", "for", "fre", "freefile", "function", "get",
+            "getjoystick", "getkey", "getmouse", "gosub", "goto", "hex", "hibyte", "hiword",
+            "if", "iif", "imagecreate", "imagedestroy", "imp", "inkey", "inp", "input",
+            "instr", "int", "integer", "is", "kill", "lbound", "lcase", "left", "len",
+            "let", "lib", "line", "lobyte", "loc", "local", "locate", "lock", "lof", "log",
+            "long", "longint", "loop", "loword", "lset", "ltrim", "mid", "mkd", "mkdir",
+            "mki", "mkl", "mklongint", "mks", "mkshort", "mod", "multikey", "mutexcreate",
+            "mutexdestroy", "mutexlock", "mutexunlock", "name", "next", "not", "oct", "on",
+            "once", "open", "option", "or", "out", "output", "overload", "paint", "palette",
+            "pascal", "pcopy", "peek", "peeki", "peeks", "pipe", "pmap", "point", "pointer",
+            "poke", "pokei", "pokes", "pos", "preserve", "preset", "print", "private",
+            "procptr", "pset", "ptr", "public", "put", "random", "randomize", "read",
+            "reallocate", "redim", "rem", "reset", "restore", "resume",
+            "return", "rgb", "rgba", "right", "rmdir", "rnd", "rset", "rtrim", "run",
+            "sadd", "screen", "screencopy", "screeninfo", "screenlock", "screenptr",
+            "screenres", "screenset", "screensync", "screenunlock", "seek", "statement",
+            "selectcase", "setdate", "setenviron", "setmouse",
+            "settime", "sgn", "shared", "shell", "shl", "short", "shr", "sin", "single",
+            "sizeof", "sleep", "space", "spc", "sqr", "static", "stdcall", "step", "stop",
+            "str", "string", "strptr", "sub", "swap", "system", "tab", "tan",
+            "then", "threadcreate", "threadwait", "time", "timer", "to", "trans",
+            "trim", "type", "ubound", "ubyte", "ucase", "uinteger", "ulongint", "union",
+            "unlock", "unsigned", "until", "ushort", "using", "va_arg", "va_first",
+            "va_next", "val", "val64", "valint", "varptr", "view", "viewprint", "wait",
+            "wend", "while", "width", "window", "windowtitle", "with", "write", "xor",
+            "zstring", "explicit", "escape", "true", "false"
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #339933;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/freeswitch.php b/sources/inc/geshi/freeswitch.php
new file mode 100644
index 0000000..c6fff27
--- /dev/null
+++ b/sources/inc/geshi/freeswitch.php
@@ -0,0 +1,168 @@
+ 'FreeSWITCH',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => "/^Comment:.*?$/m"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+//        1 => array(
+//            'Disallow', 'Request-rate', 'Robot-version',
+//            'Sitemap', 'User-agent', 'Visit-time'
+//            )
+        ),
+    'SYMBOLS' => array(
+//        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+
+//order is important. regexes will overwrite most things....
+    'STYLES' => array(
+        'KEYWORDS' => array(
+//            1 => 'color: #FF0000; font-weight: bold;',//red
+            ),
+        '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(
+            ),
+        'SYMBOLS' => array(
+//            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: firebrick; font-weight: bold;',
+            1 => 'color: cornflowerblue; font-weight: bold;',
+            2 => 'color: goldenrod; font-weight: bold;',
+            3 => 'color: green; font-weight: bold;',
+            4 => 'color: dimgrey; font-style: italic;',
+            5 => 'color: green; font-weight: bold;',
+            6 => 'color: firebrick; font-weight: bold;',
+            7 => 'color: indigo; font-weight: italic;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+//        1 => 'http://www.robotstxt.org/wc/norobots.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '(^.*ERROR.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => '(^.*NOTICE.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => '(^.*DEBUG.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '(^.*INFO.*|.*info\(.*|^Channel.*|^Caller.*|^variable.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => '(^Dialplan.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        5 => array(
+            GESHI_SEARCH => '(Regex\ \(PASS\))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        6 => array(
+            GESHI_SEARCH => '(Regex\ \(FAIL\))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        7 => array(
+            GESHI_SEARCH => '(\d{7,15})',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/fsharp.php b/sources/inc/geshi/fsharp.php
new file mode 100644
index 0000000..d85a7c7
--- /dev/null
+++ b/sources/inc/geshi/fsharp.php
@@ -0,0 +1,213 @@
+ 'F#',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(3 => '/\(\*(?!\)).*?\*\)/s'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('"'),
+    'HARDCHAR' => '"',
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /* main F# keywords */
+        /* section 3.4 */
+        1 => array(
+            'abstract', 'and', 'as', 'assert', 'base', 'begin', 'class', 'default', 'delegate', 'do', 'done',
+            'downcast', 'downto', 'elif', 'else', 'end', 'exception', 'extern', 'false', 'finally', 'for',
+            'fun', 'function', 'if', 'in', 'inherit', 'inline', 'interface', 'internal', 'lazy', 'let',
+            'match', 'member', 'module', 'mutable', 'namespace', 'new', 'not', 'null', 'of', 'open', 'or',
+            'override', 'private', 'public', 'rec', 'return', 'sig', 'static', 'struct', 'then', 'to',
+            'true', 'try', 'type', 'upcast', 'use', 'val', 'void', 'when', 'while', 'with', 'yield',
+            'asr', 'land', 'lor', 'lsl', 'lsr', 'lxor', 'mod',
+            /* identifiers are reserved for future use by F# */
+            'atomic', 'break', 'checked', 'component', 'const', 'constraint', 'constructor',
+            'continue', 'eager', 'fixed', 'fori', 'functor', 'global', 'include', 'method', 'mixin',
+            'object', 'parallel', 'params', 'process', 'protected', 'pure', 'sealed', 'tailcall',
+            'trait', 'virtual', 'volatile',
+            /* take monads into account */
+            'let!', 'yield!'
+            ),
+        /* define names of main libraries in F# Core, so we can link to it
+         * http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/namespaces.html
+         */
+        2 => array(
+            'Array', 'Array2D', 'Array3D', 'Array4D', 'ComparisonIdentity', 'HashIdentity', 'List',
+            'Map', 'Seq', 'SequenceExpressionHelpers', 'Set', 'CommonExtensions', 'Event',
+            'ExtraTopLevelOperators', 'LanguagePrimitives', 'NumericLiterals', 'Operators',
+            'OptimizedClosures', 'Option', 'String', 'NativePtr', 'Printf'
+            ),
+        /* 17.2 & 17.3 */
+        3 => array(
+            'abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
+            'floor', 'log', 'log10', 'pown', 'round', 'sign', 'sin', 'sinh', 'sqrt',
+            'tan', 'tanh',
+            'ignore',
+            'fst', 'snd',
+            'stdin', 'stdout', 'stderr',
+            'KeyValue',
+            'max', 'min'
+            ),
+        /* Pervasives Types & Overloaded Conversion Functions */
+        4 => array(
+            'bool', 'byref', 'byte', 'char', 'decimal', 'double', 'exn', 'float', 'float32',
+            'FuncConvert', 'ilsigptr', 'int', 'int16', 'int32', 'int64', 'int8',
+            'nativeint', 'nativeptr', 'obj', 'option', 'ref', 'sbyte', 'single', 'string', 'uint16',
+            'uint32', 'uint64', 'uint8', 'unativeint', 'unit',
+            'enum',
+            'async', 'seq', 'dict'
+            ),
+        /* 17.2 Exceptions */
+        5 => array (
+            'failwith', 'invalidArg', 'raise', 'rethrow'
+            ),
+        /* 3.3 Conditional compilation & 13.3 Compiler Directives + light / light off */
+        6 => array(
+            '(*IF-FSHARP', 'ENDIF-FSHARP*)', '(*F#', 'F#*)', '(*IF-OCAML', 'ENDIF-OCAML*)',
+            '#light',
+            '#if', '#else', '#endif', '#indent', '#nowarn', '#r', '#reference',
+            '#I', '#Include', '#load', '#time', '#help', '#q', '#quit',
+            ),
+        /* 3.11 Pre-processor Declarations / Identifier Replacements */
+        7 => array(
+            '__SOURCE_DIRECTORY__', '__SOURCE_FILE__', '__LINE__'
+            ),
+        /* 17.2 Object Transformation Operators */
+        8 => array(
+            'box', 'hash', 'sizeof', 'typeof', 'typedefof', 'unbox'
+            )
+        ),
+    /* 17.2 basic operators + the yield and yield! arrows */
+    'SYMBOLS' => array(
+        1 => array('+', '-', '/', '*', '**', '%', '~-'),
+        2 => array('<', '<=', '>', '<=', '=', '<>'),
+        3 => array('<<<', '>>>', '^^^', '&&&', '|||', '~~~'),
+        4 => array('|>', '>>', '<|', '<<'),
+        5 => array('!', '->', '->>'),
+        6 => array('[',']','(',')','{','}', '[|', '|]', '(|', '|)'),
+        7 => array(':=', ';', ';;')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true, /* keywords */
+        2 => true, /* modules */
+        3 => true, /* pervasives functions */
+        4 => true, /* types and overloaded conversion operators */
+        5 => true, /* exceptions */
+        6 => true, /* conditional compilation & compiler Directives */
+        7 => true, /* pre-processor declarations / identifier replacements */
+        8 => true  /* object transformation operators */
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;', /* nice blue */
+            2 => 'color: #06c; font-weight: bold;', /* nice blue */
+            3 => 'color: #06c; font-weight: bold;', /* nice blue */
+            4 => 'color: #06c; font-weight: bold;', /* nice blue */
+            5 => 'color: #06c; font-weight: bold;', /* nice blue */
+            6 => 'color: #06c; font-weight: bold;', /* nice blue */
+            7 => 'color: #06c; font-weight: bold;', /* nice blue */
+            8 => 'color: #06c; font-weight: bold;' /* nice blue */
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #5d478b; font-style: italic;', /* light purple */
+            1 => 'color: #5d478b; font-style: italic;',
+            2 => 'color: #5d478b; font-style: italic;', /* light purple */
+            3 => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #6c6;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #c6c;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a52a2a;' /* maroon */
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        /* some of keywords are Pervasives functions (land, lxor, asr, ...) */
+        1 => '',
+        2 => 'http://research.microsoft.com/en-us/um/cambridge/projects/fsharp/manual/namespaces.html',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/gambas.php b/sources/inc/geshi/gambas.php
new file mode 100644
index 0000000..352830e
--- /dev/null
+++ b/sources/inc/geshi/gambas.php
@@ -0,0 +1,214 @@
+ 'GAMBAS',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    '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_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        //keywords
+        1 => array(
+            'APPEND', 'AS', 'BREAK', 'BYREF', 'CASE', 'CATCH', 'CLASS', 'CLOSE', 'CONST', 'CONTINUE', 'COPY',
+            'CREATE', 'DEBUG', 'DEC', 'DEFAULT', 'DIM', 'DO', 'EACH', 'ELSE', 'END', 'ENDIF', 'ERROR', 'EVENT', 'EXEC',
+            'EXPORT', 'EXTERN', 'FALSE', 'FINALLY', 'FLUSH', 'FOR', 'FUNCTION', 'GOTO', 'IF', 'IN', 'INC', 'INHERITS',
+            'INPUT', 'FROM', 'IS', 'KILL', 'LAST', 'LIBRARY', 'LIKE', 'LINE INPUT', 'LINK', 'LOCK', 'LOOP', 'ME',
+            'MKDIR', 'MOVE', 'NEW', 'NEXT', 'NULL', 'OPEN', 'OPTIONAL', 'OUTPUT', 'PIPE', 'PRINT', 'PRIVATE',
+            'PROCEDURE', 'PROPERTY', 'PUBLIC', 'QUIT', 'RAISE', 'RANDOMIZE', 'READ', 'REPEAT', 'RETURN', 'RMDIR',
+            'SEEK', 'SELECT', 'SHELL', 'SLEEP', 'STATIC', 'STEP', 'STOP', 'SUB', 'SUPER', 'SWAP', 'THEN', 'TO',
+            'TRUE', 'TRY', 'UNLOCK', 'UNTIL', 'WAIT', 'WATCH', 'WEND', 'WHILE', 'WITH', 'WRITE'
+            ),
+        //functions
+        2 => array(
+            'Abs', 'Access', 'Acos', 'Acosh', 'Alloc', 'Ang', 'Asc', 'ASin', 'ASinh', 'Asl', 'Asr', 'Assign', 'Atan',
+            'ATan2', 'ATanh',
+            'BChg', 'BClr', 'Bin', 'BSet', 'BTst',
+            'CBool', 'Cbr', 'CByte', 'CDate', 'CFloat', 'Choose', 'Chr', 'CInt', 'CLong', 'Comp', 'Conv', 'Cos',
+            'Cosh', 'CShort', 'CSng', 'CStr',
+            'DateAdd', 'DateDiff', 'Day', 'DConv', 'Deg', 'DFree', 'Dir',
+            'Eof', 'Eval', 'Exist', 'Exp', 'Exp10', 'Exp2', 'Expm',
+            'Fix', 'Format', 'Frac', 'Free',
+            'Hex', 'Hour', 'Hyp',
+            'Iif', 'InStr', 'Int', 'IsAscii', 'IsBlank', 'IsBoolean', 'IsByte', 'IsDate', 'IsDigit', 'IsDir',
+            'IsFloat', 'IsHexa', 'IsInteger', 'IsLCase', 'IsLetter', 'IsLong', 'IsNull', 'IsNumber', 'IsObject',
+            'IsPunct', 'IsShort', 'IsSingle', 'IsSpace', 'IsString', 'IsUCase', 'IsVariant',
+            'LCase', 'Left', 'Len', 'Lof', 'Log', 'Log10', 'Log2', 'Logp', 'Lsl', 'Lsr', 'LTrim',
+            'Mag', 'Max', 'Mid', 'Min', 'Minute', 'Month', 'Now', 'Quote',
+            'Rad', 'RDir', 'Realloc', 'Replace', 'Right', 'RInStr', 'Rnd', 'Rol', 'Ror', 'Round', 'RTrim',
+            'Scan', 'SConv', 'Second', 'Seek', 'Sgn', 'Shl', 'Shr', 'Sin', 'Sinh', 'Space', 'Split', 'Sqr',
+            'Stat', 'Str', 'StrPtr', 'Subst',
+            'Tan', 'Tanh', 'Temp$', 'Time', 'Timer', 'Tr', 'Trim', 'TypeOf',
+            'UCase', 'Unquote', 'Val', 'VarPtr', 'Week', 'WeekDay', 'Year'
+            ),
+        //string functions
+        3 => array(
+            'Bin$', 'Chr$', 'Conv$', 'DConv$', 'Format$', 'Hex$', 'LCase$', 'Left$', 'LTrim$', 'Mid$', 'Quote$',
+            'Replace$', 'Right$', 'SConv$', 'Space$', 'Str$', 'String$', 'Subst$', 'Tr$', 'Trim$', 'UCase$',
+            'Unquote$'
+            ),
+        //datatypes
+        4 => array(
+            'Boolean', 'Byte', 'Short', 'Integer', 'Long', 'Single', 'Float', 'Date', 'String', 'Variant', 'Object',
+            'Pointer', 'File'
+            ),
+        //operators
+        5 => array(
+            'AND', 'DIV', 'MOD', 'NOT', 'OR', 'XOR'
+            ),
+        //objects/classes
+        6 => array(
+            'Application', 'Array', 'Byte[]', 'Collection', 'Component', 'Enum', 'Observer', 'Param', 'Process',
+            'Stream', 'System', 'User', 'Chart', 'Compress', 'Crypt', 'Blob', 'Connection', 'DB', 'Database',
+            'DatabaseUser', 'Field', 'Index', 'Result', 'ResultField', 'Table', 'DataBrowser', 'DataCombo',
+            'DataControl', 'DataSource', 'DataView', 'Desktop', 'DesktopFile', 'Balloon', 'ColorButton',
+            'ColorChooser', 'DateChooser', 'DirChooser', 'DirView', 'Expander', 'FileChooser', 'FileView',
+            'FontChooser', 'InputBox', 'ListContainer', 'SidePanel', 'Stock', 'TableView', 'ToolPanel', 'ValueBox',
+            'Wizard', 'Dialog', 'ToolBar', 'WorkSpace', 'DnsClient', 'SerialPort', 'ServerSocket', 'Socket',
+            'UdpSocket', 'FtpClient', 'HttpClient', 'SmtpClient', 'Regexp', 'Action', 'Button', 'CheckBox',
+            'ColumnView', 'ComboBox', 'Draw', 'Container', 'Control', 'Cursor', 'DrawingArea', 'Embedder',
+            'Font', 'Form', 'Frame', 'GridView', 'HBox', 'HPanel', 'HSplit', 'IconView', 'Image', 'Key', 'Label',
+            'Line', 'ListBox', 'ListView', 'Menu', 'Message', 'Mouse', 'MovieBox', 'Panel', 'Picture', 'PictureBox',
+            'ProgressBar', 'RadioButton', 'ScrollBar', 'ScrollView', 'Separator', 'Slider', 'SpinBox', 'TabStrip',
+            'TextArea', 'TextBox', 'TextLabel', 'ToggleButton', 'TrayIcon', 'TreeView', 'VBox', 'VPanel', 'VSplit',
+            'Watcher', 'Window', 'Dial', 'Editor', 'LCDNumber', 'Printer', 'TextEdit', 'WebBrowser', 'GLarea',
+            'Report', 'ReportCloner', 'ReportContainer', 'ReportControl', 'ReportDrawing', 'ReportField', 'ReportHBox',
+            'ReportImage', 'ReportLabel', 'ReportSection', 'ReportSpecialField', 'ReportTextLabel', 'ReportVBox',
+            'CDRom', 'Channel', 'Music', 'Sound', 'Settings', 'VideoDevice', 'Vb', 'CGI', 'HTML', 'Request', 'Response',
+            'Session', 'XmlDocument', 'XmlNode', 'XmlReader', 'XmlReaderNodeType', 'XmlWriter', 'RpcArray', 'RpcClient',
+            'RpcFunction', 'RpcServer', 'RpcStruct', 'RpcType', 'XmlRpc', 'Xslt'
+            ),
+        //constants
+        7 => array(
+            'Pi'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '&', '&=', '&/', '*', '*=', '+', '+=', '-', '-=', '//', '/', '/=', '=', '==', '\\', '\\=',
+        '^', '^=', '[', ']', '{', '}', '<', '>', '<>', '<=', '>='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF; font-weight: bold;',          // Keywords
+            2 => 'color: #8B1433;',                             // Functions
+            3 => 'color: #8B1433;',                             // String Functions
+            4 => 'color: #0600FF;',                             // Data Types
+            5 => 'color: #1E90FF;',                             // Operators
+            6 => 'color: #0600FF;',                             // Objects/Components
+            7 => 'color: #0600FF;'                              // Constants
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #1A5B1A; font-style: italic;',
+            'MULTI' => 'color: #1A5B1A; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #612188;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7E4B05;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;',
+            GESHI_NUMBER_INT_BASIC => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #6132B2;'
+            ),
+        'REGEXPS' => array(
+            //3 => 'color: #8B1433;'  //fakes '$' colour matched by REGEXP
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
+        2 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
+        3 => 'http://www.google.com/search?hl=en&q={FNAMEL}+site:http://gambasdoc.org/help/lang/&btnI=I%27m%20Feeling%20Lucky',
+        4 => 'http://gambasdoc.org/help/lang/type/{FNAMEL}',
+        5 => 'http://gambasdoc.org/help/lang/{FNAMEL}',
+        6 => 'http://www.google.com/search?hl=en&q={FNAMEL}+site:http://gambasdoc.org/&btnI=I%27m%20Feeling%20Lucky',
+        7 => 'http://gambasdoc.org/help/lang/{FNAMEL}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 =>'.'
+        ),
+    'REGEXPS' => array(
+        //3 => "\\$(?!\\w)"   //matches '$' at the end of Keyword
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_\|%\\-&;\$])"
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/gdb.php b/sources/inc/geshi/gdb.php
new file mode 100644
index 0000000..0a5e32c
--- /dev/null
+++ b/sources/inc/geshi/gdb.php
@@ -0,0 +1,198 @@
+ 'GDB',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        0 => array(
+            'Application',
+            'signal',
+            ),
+        1 => array(
+            'Segmentation fault',
+            '[KCrash Handler]',
+            ),
+        ),
+    'NUMBERS' => false,
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        0 => true,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            0 => 'font-weight:bold;',
+            1 => 'font-weight:bold; color: #ff0000;'
+            ),
+        'COMMENTS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066; font-weight:bold;',
+            1 => 'color: #006600;',
+            2 => 'color: #B07E00;',
+            3 => 'color: #0057AE; text-style:italic;',
+            4 => 'color: #0057AE; text-style:italic;',
+            5 => 'color: #442886;',
+            6 => 'color: #442886; font-weight:bold;',
+            7 => 'color: #FF0000; font-weight:bold;',
+            8 => 'color: #006E26;',
+            9 => 'color: #555;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        0 => '',
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //[Current Thread...], [KCrash Handler] etc.
+        0 => array(
+            GESHI_SEARCH => '^\[.+\]',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //stack number
+        1 => array(
+            GESHI_SEARCH => '^#\d+',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Thread X (Thread...)
+        2 => array(
+            GESHI_SEARCH => '^Thread \d.+$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Files with linenumbers
+        3 => array(
+            GESHI_SEARCH => '(at\s+)(.+)(:\d+\s*)$',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Libs without linenumbers
+        4 => array(
+            GESHI_SEARCH => '(from\s+)(.+)(\s*)$',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Line numbers
+        5 => array(
+            GESHI_SEARCH => '(:)(\d+)(\s*)$',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Location
+        6 => array(
+            GESHI_SEARCH => '(\s+)(in\s+)?([^ 0-9][^ ]*)([ \n]+\()',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1\\2',
+            GESHI_AFTER => '\\4'
+            ),
+        // interesting parts: abort, qFatal, assertions, null ptrs, ...
+        7 => array(
+            GESHI_SEARCH => '\b((?:\*__GI_)?(?:__assert_fail|abort)|qFatal|0x0)\b([^\.]|$)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+        // Namespace / Classes
+        8 => array(
+            GESHI_SEARCH => '\b(\w+)(::)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'U',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+        // make ptr adresses and  uninteresting
+        9 => '\b(?:0x[a-f0-9]{2,}|value\s+optimized\s+out)\b'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => false
+            ),
+        )
+);
+
+// kate: replace-tabs on; indent-width 4;
+
+?>
diff --git a/sources/inc/geshi/genero.php b/sources/inc/geshi/genero.php
new file mode 100644
index 0000000..e1b20b3
--- /dev/null
+++ b/sources/inc/geshi/genero.php
@@ -0,0 +1,463 @@
+ 'genero',
+    'COMMENT_SINGLE' => array(1 => '--', 2 => '#'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "ABSOLUTE",
+            "ACCEPT",
+            "ACTION",
+            "ADD",
+            "AFTER",
+            "ALL",
+            "ALTER",
+            "AND",
+            "ANY",
+            "APPEND",
+            "APPLICATION",
+            "AS",
+            "AT",
+            "ATTRIBUTE",
+            "ATTRIBUTES",
+            "AUDIT",
+            "AVG",
+            "BEFORE",
+            "BEGIN",
+            "BETWEEN",
+            "BORDER",
+            "BOTTOM",
+            "BREAKPOINT",
+            "BUFFER",
+            "BUFFERED",
+            "BY",
+            "CALL",
+            "CANCEL",
+            "CASE",
+            "CENTURY",
+            "CHANGE",
+            "CHECK",
+            "CLEAR",
+            "CLIPPED",
+            "CLOSE",
+            "CLUSTER",
+            "COLUMN",
+            "COLUMNS",
+            "COMMAND",
+            "COMMENT",
+            "COMMIT",
+            "COMMITTED",
+            "CONCURRENT ",
+            "CONNECT",
+            "CONNECTION",
+            "CONSTANT",
+            "CONSTRAINED",
+            "CONSTRAINT",
+            "CONSTRUCT",
+            "CONTINUE",
+            "CONTROL",
+            "COUNT",
+            "CREATE",
+            "CROSS",
+            "CURRENT",
+            "DATABASE",
+            "DBA",
+            "DEC",
+            "DECLARE",
+            "DEFAULT",
+            "DEFAULTS",
+            "DEFER",
+            "DEFINE",
+            "DELETE",
+            "DELIMITER",
+            "DESCRIBE",
+            "DESTINATION",
+            "DIM",
+            "DIALOG",
+            "DIMENSION",
+            "DIRTY",
+            "DISCONNECT",
+            "DISPLAY",
+            "DISTINCT",
+            "DORMANT",
+            "DOWN",
+            "DROP",
+            "DYNAMIC",
+            "ELSE",
+            "END",
+            "ERROR",
+            "ESCAPE",
+            "EVERY",
+            "EXCLUSIVE",
+            "EXECUTE",
+            "EXISTS",
+            "EXIT",
+            "EXPLAIN",
+            "EXTEND",
+            "EXTENT",
+            "EXTERNAL",
+            "FETCH",
+            "FGL_DRAWBOX",
+            "FIELD",
+            "FIELD_TOUCHED",
+            "FILE",
+            "FILL",
+            "FINISH",
+            "FIRST",
+            "FLOAT",
+            "FLUSH",
+            "FOR",
+            "FOREACH",
+            "FORM",
+            "FORMAT",
+            "FOUND",
+            "FRACTION",
+            "FREE",
+            "FROM",
+            "FULL",
+            "FUNCTION",
+            "GET_FLDBUF",
+            "GLOBALS",
+            "GO",
+            "GOTO",
+            "GRANT",
+            "GROUP",
+            "HAVING",
+            "HEADER",
+            "HELP",
+            "HIDE",
+            "HOLD",
+            "HOUR",
+            "IDLE",
+            "IF",
+            "IMAGE",
+            "IMMEDIATE",
+            "IN",
+            "INDEX",
+            "INFIELD",
+            "INITIALIZE",
+            "INNER",
+            "INPUT",
+            "INSERT",
+            "INTERRUPT",
+            "INTERVAL",
+            "INTO",
+            "INVISIBLE",
+            "IS",
+            "ISOLATION",
+            "JOIN",
+            "KEEP",
+            "KEY",
+            "LABEL",
+            "LAST",
+            "LEFT",
+            "LENGTH",
+            "LET",
+            "LIKE",
+            "LINE",
+            "LINENO",
+            "LINES",
+            "LOAD",
+            "LOCATE",
+            "LOCK",
+            "LOG",
+            "LSTR",
+            "MAIN",
+            "MARGIN",
+            "MATCHES",
+            "MAX",
+            "MAXCOUNT",
+            "MDY",
+            "MEMORY",
+            "MENU",
+            "MESSAGE",
+            "MIN",
+            "MINUTE",
+            "MOD",
+            "MODE",
+            "MODIFY",
+            "MONEY",
+            "NAME",
+            "NEED",
+            "NEXT",
+            "NO",
+            "NORMAL",
+            "NOT",
+            "NOTFOUND",
+            "NULL",
+            "NUMERIC",
+            "OF",
+            "ON",
+            "OPEN",
+            "OPTION",
+            "OPTIONS",
+            "OR",
+            "ORDER",
+            "OTHERWISE",
+            "OUTER",
+            "OUTPUT",
+            "PAGE",
+            "PAGENO",
+            "PAUSE",
+            "PERCENT",
+            "PICTURE",
+            "PIPE",
+            "PRECISION",
+            "PREPARE",
+            "PREVIOUS",
+            "PRINT",
+            "PRINTER",
+            "PRINTX",
+            "PRIOR",
+            "PRIVILEGES",
+            "PROCEDURE",
+            "PROGRAM",
+            "PROMPT",
+            "PUBLIC",
+            "PUT",
+            "QUIT",
+            "READ",
+            "REAL",
+            "RECORD",
+            "RECOVER",
+            "RED ",
+            "RELATIVE",
+            "RENAME",
+            "REOPTIMIZATION",
+            "REPEATABLE",
+            "REPORT",
+            "RESOURCE",
+            "RETURN",
+            "RETURNING",
+            "REVERSE",
+            "REVOKE",
+            "RIGHT",
+            "ROLLBACK",
+            "ROLLFORWARD",
+            "ROW",
+            "ROWS",
+            "RUN",
+            "SCHEMA",
+            "SCREEN",
+            "SCROLL",
+            "SECOND",
+            "SELECT",
+            "SERIAL",
+            "SET",
+            "SFMT",
+            "SHARE",
+            "SHIFT",
+            "SHOW",
+            "SIGNAL ",
+            "SIZE",
+            "SKIP",
+            "SLEEP",
+            "SOME",
+            "SPACE",
+            "SPACES",
+            "SQL",
+            "SQLERRMESSAGE",
+            "SQLERROR",
+            "SQLSTATE",
+            "STABILITY",
+            "START",
+            "STATISTICS",
+            "STEP",
+            "STOP",
+            "STYLE",
+            "SUM",
+            "SYNONYM",
+            "TABLE",
+            "TEMP",
+            "TERMINATE",
+            "TEXT",
+            "THEN",
+            "THROUGH",
+            "THRU",
+            "TO",
+            "TODAY",
+            "TOP",
+            "TRAILER",
+            "TRANSACTION ",
+            "UNBUFFERED",
+            "UNCONSTRAINED",
+            "UNDERLINE",
+            "UNION",
+            "UNIQUE",
+            "UNITS",
+            "UNLOAD",
+            "UNLOCK",
+            "UP",
+            "UPDATE",
+            "USE",
+            "USER",
+            "USING",
+            "VALIDATE",
+            "VALUE",
+            "VALUES",
+            "VARCHAR",
+            "VIEW",
+            "WAIT",
+            "WAITING",
+            "WARNING",
+            "WHEN",
+            "WHENEVER",
+            "WHERE",
+            "WHILE",
+            "WINDOW",
+            "WITH",
+            "WITHOUT",
+            "WORDWRAP",
+            "WORK",
+            "WRAP"
+            ),
+        2 => array(
+            '&IFDEF', '&ENDIF'
+            ),
+        3 => array(
+            "ARRAY",
+            "BYTE",
+            "CHAR",
+            "CHARACTER",
+            "CURSOR",
+            "DATE",
+            "DATETIME",
+            "DECIMAL",
+            "DOUBLE",
+            "FALSE",
+            "INT",
+            "INTEGER",
+            "SMALLFLOAT",
+            "SMALLINT",
+            "STRING",
+            "TIME",
+            "TRUE"
+            ),
+        4 => array(
+            "BLACK",
+            "BLINK",
+            "BLUE",
+            "BOLD",
+            "ANSI",
+            "ASC",
+            "ASCENDING",
+            "ASCII",
+            "CYAN",
+            "DESC",
+            "DESCENDING",
+            "GREEN",
+            "MAGENTA",
+            "OFF",
+            "WHITE",
+            "YELLOW",
+            "YEAR",
+            "DAY",
+            "MONTH",
+            "WEEKDAY"
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '>', '<', '^', '!', '|', ':',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #0000FF; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #FF0000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #808080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        '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(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/genie.php b/sources/inc/geshi/genie.php
new file mode 100644
index 0000000..db05ec0
--- /dev/null
+++ b/sources/inc/geshi/genie.php
@@ -0,0 +1,157 @@
+ 'Genie',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Using and Namespace directives (basic support)
+        //Please note that the alias syntax for using is not supported
+        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('@"', '"'),
+    'HARDESCAPE' => array('""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'and', 'as', 'abstract', 'break', 'case', 'cast', 'catch', 'const',
+            'construct', 'continue', 'default', 'def', 'delete', 'div',
+            'dynamic', 'do', 'downto', 'else', 'ensures', 'except', 'extern',
+            'false', 'final', 'finally', 'for', 'foreach', 'get', 'if', 'in',
+            'init', 'inline', 'internal', 'implements', 'lock', 'not', 'null',
+            'of', 'or', 'otherwise', 'out', 'override', 'pass', 'raise',
+            'raises', 'readonly', 'ref', 'requires', 'self', 'set', 'static',
+            'super', 'switch', 'to', 'true', 'try', 'unless', 'uses', 'var', 'virtual',
+            'volatile', 'void', 'when', 'while'
+            ),
+//        2 => array(
+//            ),
+        3 => array(
+            'is', 'isa', 'new', 'owned', 'sizeof', 'typeof', 'unchecked',
+            'unowned', 'weak'
+            ),
+        4 => array(
+            'bool', 'byte', 'class', 'char', 'date', 'datetime', 'decimal', 'delegate',
+            'double', 'enum', 'event', 'exception', 'float', 'int', 'interface',
+            'long', 'object', 'prop', 'sbyte', 'short', 'single', 'string',
+            'struct', 'ulong', 'ushort'
+            ),
+//        5 => array(
+//            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
+        '(', ')', '{', '}', '[', ']', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+//        2 => false,
+        3 => false,
+        4 => false,
+//        5 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+//            2 => 'color: #FF8000; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #FF0000;',
+//            5 => 'color: #000000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+//            2 => 'color: #008080;',
+            3 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;',
+            'HARD' => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;',
+            'HARD' => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+//        2 => '',
+        3 => '',
+        4 => '',
+//        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        )
+    )
+);
+
+?>
diff --git a/sources/inc/geshi/gettext.php b/sources/inc/geshi/gettext.php
new file mode 100644
index 0000000..80b531c
--- /dev/null
+++ b/sources/inc/geshi/gettext.php
@@ -0,0 +1,97 @@
+ 'GNU Gettext',
+    'COMMENT_SINGLE' => array('#:', '#.', '#,', '#|', '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array('msgctxt', 'msgid_plural', 'msgid', 'msgstr'),
+    ),
+    'SYMBOLS' => array(),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;'
+        ),
+        'COMMENTS' => array(
+            0 => 'color: #000099;',
+            1 => 'color: #000099;',
+            2 => 'color: #000099;',
+            3 => 'color: #006666;',
+            4 => 'color: #666666; font-style: italic;',
+        ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+        ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+        ),
+        'REGEXPS' => array(),
+        'SYMBOLS' => array(),
+        'NUMBERS' => array(
+            0 => 'color: #000099;'
+        ),
+        'METHODS' => array(),
+        'SCRIPT' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #000099;'
+        ),
+    ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+);
+
+?>
diff --git a/sources/inc/geshi/glsl.php b/sources/inc/geshi/glsl.php
new file mode 100644
index 0000000..3615cfe
--- /dev/null
+++ b/sources/inc/geshi/glsl.php
@@ -0,0 +1,205 @@
+ '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' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'if', 'else', 'for', 'while', 'do', 'break', 'continue', 'asm',
+            'switch', 'case', 'default', 'return', 'discard',
+            'namespace', 'using', 'sizeof', 'cast'
+            ),
+        2 => array(
+            'const', 'uniform', 'attribute', 'centroid', 'varying', 'invariant',
+            'in', 'out', 'inout', 'input', 'output', 'typedef', 'volatile',
+            'public', 'static', 'extern', 'external', 'packed',
+            'inline', 'noinline', 'noperspective', 'flat'
+            ),
+        3 => array(
+            'void', 'bool', 'int', 'long', 'short', 'float', 'half', 'fixed',
+            'unsigned', 'lowp', 'mediump', 'highp', 'precision',
+            'vec2', 'vec3', 'vec4', 'bvec2', 'bvec3', 'bvec4',
+            'dvec2', 'dvec3', 'dvec4', 'fvec2', 'fvec3', 'fvec4',
+            'hvec2', 'hvec3', 'hvec4', 'ivec2', 'ivec3', 'ivec4',
+            'mat2', 'mat3', 'mat4', 'mat2x2', 'mat3x2', 'mat4x2',
+            'mat2x3', 'mat3x3', 'mat4x3', 'mat2x4', 'mat3x4', 'mat4x4',
+            'sampler1D', 'sampler2D', 'sampler3D', 'samplerCube',
+            'sampler1DShadow', 'sampler2DShadow',
+            'struct', 'class', 'union', 'enum', 'interface', 'template'
+            ),
+        4 => array(
+            'this', 'false', 'true'
+            ),
+        5 => array(
+            'radians', 'degrees', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan',
+            'pow', 'exp2', 'log2', 'sqrt', 'inversesqrt', 'abs', 'sign', 'ceil',
+            'floor', 'fract', 'mod', 'min', 'max', 'clamp', 'mix', 'step',
+            'smoothstep', 'length', 'distance', 'dot', 'cross', 'normalize',
+            'ftransform', 'faceforward', 'reflect', 'matrixCompMult', 'equal',
+            'lessThan', 'lessThanEqual', 'greaterThan', 'greaterThanEqual',
+            'notEqual', 'any', 'all', 'not', 'texture1D', 'texture1DProj',
+            'texture1DLod', 'texture1DProjLod', 'texture2D', 'texture2DProj',
+            'texture2DLod', 'texture2DProjLod', 'texture3D', 'texture3DProj',
+            'texture3DLod', 'texture3DProjLod', 'textureCube', 'textureCubeLod',
+            'shadow1D', 'shadow1DProj', 'shadow1DLod', 'shadow1DProjLod',
+            'shadow2D', 'shadow2DProj', 'shadow2DLod', 'shadow2DProjLod',
+            'noise1', 'noise2', 'noise3', 'noise4'
+            ),
+        6 => array(
+            'gl_Position', 'gl_PointSize', 'gl_ClipVertex', 'gl_FragColor',
+            'gl_FragData', 'gl_FragDepth', 'gl_FragCoord', 'gl_FrontFacing',
+            'gl_Color', 'gl_SecondaryColor', 'gl_Normal', 'gl_Vertex',
+            'gl_MultiTexCoord0', 'gl_MultiTexCoord1', 'gl_MultiTexCoord2',
+            'gl_MultiTexCoord3', 'gl_MultiTexCoord4', 'gl_MultiTexCoord5',
+            'gl_MultiTexCoord6', 'gl_MultiTexCoord7', 'gl_FogCoord',
+            'gl_MaxLights', 'gl_MaxClipPlanes', 'gl_MaxTextureUnits',
+            'gl_MaxTextureCoords', 'gl_MaxVertexAttribs', 'gl_MaxVaryingFloats',
+            'gl_MaxVertexUniformComponents', 'gl_MaxVertexTextureImageUnits',
+            'gl_MaxCombinedTextureImageUnits', 'gl_MaxTextureImageUnits',
+            'gl_MaxFragmentUniformComponents', 'gl_MaxDrawBuffers', 'gl_Point',
+            'gl_ModelViewMatrix', 'gl_ProjectionMatrix', 'gl_FrontMaterial',
+            'gl_ModelViewProjectionMatrix', 'gl_TextureMatrix', 'gl_ClipPlane',
+            'gl_NormalMatrix', 'gl_ModelViewMatrixInverse', 'gl_BackMaterial',
+            'gl_ProjectionMatrixInverse', 'gl_ModelViewProjectionMatrixInverse',
+            'gl_TextureMatrixInverse', 'gl_ModelViewMatrixTranspose', 'gl_Fog',
+            'gl_ProjectionMatrixTranspose', 'gl_NormalScale', 'gl_DepthRange',
+            'gl_odelViewProjectionMatrixTranspose', 'gl_TextureMatrixTranspose',
+            'gl_ModelViewMatrixInverseTranspose', 'gl_LightSource',
+            'gl_ProjectionMatrixInverseTranspose', 'gl_LightModel',
+            'gl_ModelViewProjectionMatrixInverseTranspose', 'gl_TexCoord',
+            'gl_TextureMatrixInverseTranspose', 'gl_TextureEnvColor',
+            'gl_FrontLightModelProduct', 'gl_BackLightModelProduct',
+            'gl_FrontLightProduct', 'gl_BackLightProduct', 'gl_ObjectPlaneS',
+            'gl_ObjectPlaneT', 'gl_ObjectPlaneR', 'gl_ObjectPlaneQ',
+            'gl_EyePlaneS', 'gl_EyePlaneT', 'gl_EyePlaneR', 'gl_EyePlaneQ',
+            'gl_FrontColor', 'gl_BackColor', 'gl_FrontSecondaryColor',
+            'gl_BackSecondaryColor', 'gl_FogFragCoord', 'gl_PointCoord'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^',
+        '&', '?', ':', '.', '|', ';', ',', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #333399; font-weight: bold;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #333399; font-weight: bold;',
+            5 => 'color: #993333; font-weight: bold;',
+            6 => 'color: #551111;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #009900;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'OOLANG' => array(
+            'MATCH_BEFORE' => '',
+            'MATCH_AFTER' => '[a-zA-Z_][a-zA-Z0-9_]*',
+            'MATCH_SPACES' => '[\s]*'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/gml.php b/sources/inc/geshi/gml.php
new file mode 100644
index 0000000..999251b
--- /dev/null
+++ b/sources/inc/geshi/gml.php
@@ -0,0 +1,506 @@
+5 and KEYWORDS=>6 sections (actually, they were empty).
+ *     I was planning of using those for the GML functions available only in the
+ *     registered version of the program, but not anymore.
+ *
+ * 2005/06/26 (1.0.3)
+ *  -  First Release.
+ *
+ * TODO (updated 2005/11/11)
+ * -------------------------
+ *  -  Test it for a while and make the appropiate corrections.
+ *
+ *************************************************************************************
+ *
+ *     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' => 'GML',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // language keywords
+        1 => array(
+            'break', 'continue', 'do', 'until', 'if', 'else',
+            'exit', 'for', 'repeat', 'return', 'switch',
+            'case', 'default', 'var', 'while', 'with', 'div', 'mod',
+            // GML Language overview
+            'self', 'other', 'all', 'noone', 'global',
+            ),
+        // modifiers and built-in variables
+        2 => array(
+            // Game play
+            'x','y','xprevious','yprevious','xstart','ystart','hspeed','vspeed','direction','speed',
+            'friction','gravity','gravity_direction',
+            'path_index','path_position','path_positionprevious','path_speed','path_orientation',
+            'path_endaction',
+            'object_index','id','mask_index','solid','persistent','instance_count','instance_id',
+            'room_speed','fps','current_time','current_year','current_month','current_day','current_weekday',
+            'current_hour','current_minute','current_second','alarm','timeline_index','timeline_position',
+            'timeline_speed',
+            'room','room_first','room_last','room_width','room_height','room_caption','room_persistent',
+            'score','lives','health','show_score','show_lives','show_health','caption_score','caption_lives',
+            'caption_health',
+            'event_type','event_number','event_object','event_action',
+            'error_occurred','error_last',
+            // User interaction
+            'keyboard_lastkey','keyboard_key','keyboard_lastchar','keyboard_string',
+            'mouse_x','mouse_y','mouse_button','mouse_lastbutton',
+            // Game Graphics
+            'sprite_index','sprite_width','sprite_height','sprite_xoffset','sprite_yoffset',
+            'image_number','image_index','image_speed','image_xscale','image_yscale','image_angle',
+            'image_alpha','image_blend','bbox_left','bbox_right','bbox_top','bbox_bottom',
+            'background_color','background_showcolor','background_visible','background_foreground',
+            'background_index','background_x','background_y','background_width','background_height',
+            'background_htiled','background_vtiled','background_xscale','background_yscale',
+            'background_hspeed','background_vspeed','background_blend','background_alpha',
+            'background','left, top, width, height','depth','visible','xscale','yscale','blend','alpha',
+            'view_enabled','view_current','view_visible','view_yview','view_wview','view_hview','view_xport',
+            'view_yport','view_wport','view_hport','view_angle','view_hborder','view_vborder','view_hspeed',
+            'view_vspeed','view_object',
+            'transition_kind',
+            // Files, registry and executing programs
+            'game_id','working_directory','temp_directory',
+            'secure_mode',
+            // Creating particles
+            'xmin', 'xmax', 'ymin', 'ymax','shape','distribution','particle type','number',
+            'force','dist','kind','additive', 'parttype1', 'parttype2'
+            ),
+        // functions
+        3 => array(
+            // Computing things
+            'random','choose','abs','sign','round','floor','ceil','frac','sqrt','sqr','power','exp','ln',
+            'log2','log10','logn','sin','cos','tan','arcsin','arccos','arctan','arctan2','degtorad',
+            'radtodeg','min','max','mean','median','point_distance','point_direction','lengthdir_x',
+            'lengthdir_y','is_real','is_string',
+            'chr','ord','real','string','string_format','string_length','string_pos','string_copy',
+            'string_char_at','string_delete','string_insert','string_replace','string_replace_all',
+            'string_count','string_lower','string_upper','string_repeat','string_letters','string_digits',
+            'string_lettersdigits','clipboard_has_text','clipboard_get_text','clipboard_set_text',
+            'date_current_datetime','date_current_date','date_current_time','date_create_datetime',
+            'date_create_date','date_create_time','date_valid_datetime','date_valid_date','date_valid_time',
+            'date_inc_year','date_inc_month','date_inc_week','date_inc_day','date_inc_hour',
+            'date_inc_minute','date_inc_second','date_get_year','date_get_month','date_get_week',
+            'date_get_day','date_get_hour', 'date_get_minute','date_get_second','date_get_weekday',
+            'date_get_day_of_year','date_get_hour_of_year','date_get_minute_of_year',
+            'date_get_second_of_year','date_year_span','date_month_span','date_week_span','date_day_span',
+            'date_hour_span','date_minute_span','date_second_span','date_compare_datetime',
+            'date_compare_date','date_compare_time','date_date_of','date_time_of','date_datetime_string',
+            'date_date_string','date_time_string','date_days_in_month','date_days_in_year','date_leap_year',
+            'date_is_today',
+            // Game play
+            'motion_set','motion_add','place_free','place_empty','place_meeting','place_snapped',
+            'move_random','move_snap','move_wrap','move_towards_point','move_bounce_solid','move_bounce_all',
+            'move_contact_solid','move_contact_all','move_outside_solid','move_outside_all',
+            'distance_to_point','distance_to_object','position_empty','position_meeting',
+            'path_start','path_end',
+            'mp_linear_step','mp_linear_step_object','mp_potential_step','mp_potential_step_object',
+            'mp_potential_settings','mp_linear_path','mp_linear_path_object', 'mp_potential_path',
+            'mp_potential_path_object','mp_grid_create','mp_grid_destroy','mp_grid_clear_all',
+            'mp_grid_clear_cell','mp_grid_clear_rectangle','mp_grid_add_cell','mp_grid_add_rectangle',
+            'mp_grid_add_instances','mp_grid_path','mp_grid_draw',
+            'collision_point','collision_rectangle','collision_circle','collision_ellipse','collision_line',
+            'instance_find','instance_exists','instance_number','instance_position','instance_nearest',
+            'instance_furthest','instance_place','instance_create','instance_copy','instance_destroy',
+            'instance_change','position_destroy','position_change',
+            'instance_deactivate_all','instance_deactivate_object','instance_deactivate_region',
+            'instance_activate_all','instance_activate_object','instance_activate_region',
+            'sleep',
+            'room_goto','room_goto_previous','room_goto_next','room_restart','room_previous','room_next',
+            'game_end','game_restart','game_save','game_load',
+            'event_perform', 'event_perform_object','event_user','event_inherited',
+            'show_debug_message','variable_global_exists','variable_local_exists','variable_global_get',
+            'variable_global_array_get','variable_global_array2_get','variable_local_get',
+            'variable_local_array_get','variable_local_array2_get','variable_global_set',
+            'variable_global_array_set','variable_global_array2_set','variable_local_set',
+            'variable_local_array_set','variable_local_array2_set','set_program_priority',
+            // User interaction
+            'keyboard_set_map','keyboard_get_map','keyboard_unset_map','keyboard_check',
+            'keyboard_check_pressed','keyboard_check_released','keyboard_check_direct',
+            'keyboard_get_numlock','keyboard_set_numlock','keyboard_key_press','keyboard_key_release',
+            'keyboard_clear','io_clear','io_handle','keyboard_wait',
+            'mouse_check_button','mouse_check_button_pressed','mouse_check_button_released','mouse_clear',
+            'mouse_wait',
+            'joystick_exists','joystick_name','joystick_axes','joystick_buttons','joystick_has_pov',
+            'joystick_direction','joystick_check_button','joystick_xpos','joystick_ypos','joystick_zpos',
+            'joystick_rpos','joystick_upos','joystick_vpos','joystick_pov',
+            // Game Graphics
+            'draw_sprite','draw_sprite_stretched','draw_sprite_tiled','draw_sprite_part','draw_background',
+            'draw_background_stretched','draw_background_tiled','draw_background_part','draw_sprite_ext',
+            'draw_sprite_stretched_ext','draw_sprite_tiled_ext','draw_sprite_part_ext','draw_sprite_general',
+            'draw_background_ext','draw_background_stretched_ext','draw_background_tiled_ext',
+            'draw_background_part_ext','draw_background_general',
+            'draw_clear','draw_clear_alpha','draw_point','draw_line','draw_rectangle','draw_roundrect',
+            'draw_triangle','draw_circle','draw_ellipse','draw_arrow','draw_button','draw_path',
+            'draw_healthbar','draw_set_color','draw_set_alpha','draw_get_color','draw_get_alpha',
+            'make_color_rgb','make_color_hsv','color_get_red','color_get_green','color_get_blue',
+            'color_get_hue','color_get_saturation','color_get_value','merge_color','draw_getpixel',
+            'screen_save','screen_save_part',
+            'draw_set_font','draw_set_halign','draw_set_valign','draw_text','draw_text_ext','string_width',
+            'string_height','string_width_ext','string_height_ext','draw_text_transformed',
+            'draw_text_ext_transformed','draw_text_color','draw_text_ext_color',
+            'draw_text_transformed_color','draw_text_ext_transformed_color',
+            'draw_point_color','draw_line_color','draw_rectangle_color','draw_roundrect_color',
+            'draw_triangle_color','draw_circle_color','draw_ellipse_color','draw_primitive_begin',
+            'draw_vertex','draw_vertex_color','draw_primitive_end','sprite_get_texture',
+            'background_get_texture','texture_preload','texture_set_priority',
+            'texture_get_width','texture_get_height','draw_primitive_begin_texture','draw_vertex_texture',
+            'draw_vertex_texture_color','texture_set_interpolation',
+            'texture_set_blending','texture_set_repeat','draw_set_blend_mode','draw_set_blend_mode_ext',
+            'surface_create','surface_free','surface_exists','surface_get_width','surface_get_height',
+            'surface_get_texture','surface_set_target','surface_reset_target','surface_getpixel',
+            'surface_save','surface_save_part','draw_surface','draw_surface_stretched','draw_surface_tiled',
+            'draw_surface_part','draw_surface_ext','draw_surface_stretched_ext','draw_surface_tiled_ext',
+            'draw_surface_part_ext','draw_surface_general','surface_copy','surface_copy_part',
+            'tile_add','tile_delete','tile_exists','tile_get_x','tile_get_y','tile_get_left','tile_get_top',
+            'tile_get_width','tile_get_height','tile_get_depth','tile_get_visible','tile_get_xscale',
+            'tile_get_yscale','tile_get_background','tile_get_blend','tile_get_alpha','tile_set_position',
+            'tile_set_region','tile_set_background','tile_set_visible','tile_set_depth','tile_set_scale',
+            'tile_set_blend','tile_set_alpha','tile_layer_hide','tile_layer_show','tile_layer_delete',
+            'tile_layer_shift','tile_layer_find','tile_layer_delete_at','tile_layer_depth',
+            'display_get_width','display_get_height','display_get_colordepth','display_get_frequency',
+            'display_set_size','display_set_colordepth','display_set_frequency','display_set_all',
+            'display_test_all','display_reset','display_mouse_get_x','display_mouse_get_y','display_mouse_set',
+            'window_set_visible','window_get_visible','window_set_fullscreen','window_get_fullscreen',
+            'window_set_showborder','window_get_showborder','window_set_showicons','window_get_showicons',
+            'window_set_stayontop','window_get_stayontop','window_set_sizeable','window_get_sizeable',
+            'window_set_caption','window_get_caption','window_set_cursor', 'window_get_cursor',
+            'window_set_color','window_get_color','window_set_region_scale','window_get_region_scale',
+            'window_set_position','window_set_size','window_set_rectangle','window_center','window_default',
+            'window_get_x','window_get_y','window_get_width','window_get_height','window_mouse_get_x',
+            'window_mouse_get_y','window_mouse_set',
+            'window_set_region_size','window_get_region_width','window_get_region_height',
+            'window_view_mouse_get_x','window_view_mouse_get_y','window_view_mouse_set',
+            'window_views_mouse_get_x','window_views_mouse_get_y','window_views_mouse_set',
+            'screen_redraw','screen_refresh','set_automatic_draw','set_synchronization','screen_wait_vsync',
+            // Sound and music)
+            'sound_play','sound_loop','sound_stop','sound_stop_all','sound_isplaying','sound_volume',
+            'sound_global_volume','sound_fade','sound_pan','sound_background_tempo','sound_set_search_directory',
+            'sound_effect_set','sound_effect_chorus','sound_effect_echo',    'sound_effect_flanger',
+            'sound_effect_gargle','sound_effect_reverb','sound_effect_compressor','sound_effect_equalizer',
+            'sound_3d_set_sound_position','sound_3d_set_sound_velocity','sound_3d_set_sound_distance',
+            'sound_3d_set_sound_cone',
+            'cd_init','cd_present','cd_number','cd_playing','cd_paused','cd_track','cd_length',
+            'cd_track_length','cd_position','cd_track_position','cd_play','cd_stop','cd_pause','cd_resume',
+            'cd_set_position','cd_set_track_position','cd_open_door','cd_close_door','MCI_command',
+            // Splash screens, highscores, and other pop-ups
+            'show_text','show_image','show_video','show_info','load_info',
+            'show_message','show_message_ext','show_question','get_integer','get_string',
+            'message_background','message_alpha','message_button','message_text_font','message_button_font',
+            'message_input_font','message_mouse_color','message_input_color','message_caption',
+            'message_position','message_size','show_menu','show_menu_pos','get_color','get_open_filename',
+            'get_save_filename','get_directory','get_directory_alt','show_error',
+            'highscore_show','highscore_set_background','highscore_set_border','highscore_set_font',
+            'highscore_set_colors','highscore_set_strings','highscore_show_ext','highscore_clear',
+            'highscore_add','highscore_add_current','highscore_value','highscore_name','draw_highscore',
+            // Resources
+            'sprite_exists','sprite_get_name','sprite_get_number','sprite_get_width','sprite_get_height',
+            'sprite_get_transparent','sprite_get_smooth','sprite_get_preload','sprite_get_xoffset',
+            'sprite_get_yoffset','sprite_get_bbox_left','sprite_get_bbox_right','sprite_get_bbox_top',
+            'sprite_get_bbox_bottom','sprite_get_bbox_mode','sprite_get_precise',
+            'sound_exists','sound_get_name','sound_get_kind','sound_get_preload','sound_discard',
+            'sound_restore',
+            'background_exists','background_get_name','background_get_width','background_get_height',
+            'background_get_transparent','background_get_smooth','background_get_preload',
+            'font_exists','font_get_name','font_get_fontname','font_get_bold','font_get_italic',
+            'font_get_first','font_get_last',
+            'path_exists','path_get_name','path_get_length','path_get_kind','path_get_closed',
+            'path_get_precision','path_get_number','path_get_point_x','path_get_point_y',
+            'path_get_point_speed','path_get_x','path_get_y','path_get_speed',
+            'script_exists','script_get_name','script_get_text',
+            'timeline_exists','timeline_get_name',
+            'object_exists','object_get_name','object_get_sprite','object_get_solid','object_get_visible',
+            'object_get_depth','object_get_persistent','object_get_mask','object_get_parent',
+            'object_is_ancestor',
+            'room_exists','room_get_name',
+            // Changing resources
+            'sprite_set_offset','sprite_set_bbox_mode','sprite_set_bbox','sprite_set_precise',
+            'sprite_duplicate','sprite_assign','sprite_merge','sprite_add','sprite_replace',
+            'sprite_create_from_screen','sprite_add_from_screen','sprite_create_from_surface',
+            'sprite_add_from_surface','sprite_delete','sprite_set_alpha_from_sprite',
+            'sound_add','sound_replace','sound_delete',
+            'background_duplicate','background_assign','background_add','background_replace',
+            'background_create_color','background_create_gradient','background_create_from_screen',
+            'background_create_from_surface','background_delete','background_set_alpha_from_background',
+            'font_add','font_add_sprite','font_replace_sprite','font_delete',
+            'path_set_kind','path_set_closed','path_set_precision','path_add','path_delete','path_duplicate',
+            'path_assign','path_append','path_add_point','path_insert_point','path_change_point',
+            'path_delete_point','path_clear_points','path_reverse','path_mirror','path_flip','path_rotate',
+            'path_scale','path_shift',
+            'execute_string','execute_file','script_execute',
+            'timeline_add','timeline_delete','timeline_moment_add','timeline_moment_clear',
+            'object_set_sprite','object_set_solid','object_set_visible','object_set_depth',
+            'object_set_persistent','object_set_mask','object_set_parent','object_add','object_delete',
+            'object_event_add','object_event_clear',
+            'room_set_width','room_set_height','room_set_caption','room_set_persistent','room_set_code',
+            'room_set_background_color','room_set_background','room_set_view','room_set_view_enabled',
+            'room_add','room_duplicate','room_assign','room_instance_add','room_instance_clear',
+            'room_tile_add','room_tile_add_ext','room_tile_clear',
+            // Files, registry and executing programs
+            'file_text_open_read','file_text_open_write','file_text_open_append','file_text_close',
+            'file_text_write_string','file_text_write_real','file_text_writeln','file_text_read_string',
+            'file_text_read_real','file_text_readln','file_text_eof','file_exists','file_delete',
+            'file_rename','file_copy','directory_exists','directory_create','file_find_first',
+            'file_find_next','file_find_close','file_attributes', 'filename_name','filename_path',
+            'filename_dir','filename_drive','filename_ext','filename_change_ext','file_bin_open',
+            'file_bin_rewrite','file_bin_close','file_bin_size','file_bin_position','file_bin_seek',
+            'file_bin_write_byte','file_bin_read_byte','parameter_count','parameter_string',
+            'environment_get_variable',
+            'registry_write_string','registry_write_real','registry_read_string','registry_read_real',
+            'registry_exists','registry_write_string_ext','registry_write_real_ext',
+            'registry_read_string_ext','registry_read_real_ext','registry_exists_ext','registry_set_root',
+            'ini_open','ini_close','ini_read_string','ini_read_real','ini_write_string','ini_write_real',
+            'ini_key_exists','ini_section_exists','ini_key_delete','ini_section_delete',
+            'execute_program','execute_shell',
+            // Data structures
+            'ds_stack_create','ds_stack_destroy','ds_stack_clear','ds_stack_size','ds_stack_empty',
+            'ds_stack_push','ds_stack_pop','ds_stack_top',
+            'ds_queue_create','ds_queue_destroy','ds_queue_clear','ds_queue_size','ds_queue_empty',
+            'ds_queue_enqueue','ds_queue_dequeue','ds_queue_head','ds_queue_tail',
+            'ds_list_create','ds_list_destroy','ds_list_clear','ds_list_size','ds_list_empty','ds_list_add',
+            'ds_list_insert','ds_list_replace','ds_list_delete','ds_list_find_index','ds_list_find_value',
+            'ds_list_sort',
+            'ds_map_create','ds_map_destroy','ds_map_clear','ds_map_size','ds_map_empty','ds_map_add',
+            'ds_map_replace','ds_map_delete','ds_map_exists','ds_map_find_value','ds_map_find_previous',
+            'ds_map_find_next','ds_map_find_first','ds_map_find_last',
+            'ds_priority_create','ds_priority_destroy','ds_priority_clear','ds_priority_size',
+            'ds_priority_empty','ds_priority_add','ds_priority_change_priority','ds_priority_find_priority',
+            'ds_priority_delete_value','ds_priority_delete_min','ds_priority_find_min',
+            'ds_priority_delete_max','ds_priority_find_max',
+            'ds_grid_create','ds_grid_destroy','ds_grid_resize','ds_grid_width','ds_grid_height',
+            'ds_grid_clear','ds_grid_set','ds_grid_add','ds_grid_multiply','ds_grid_set_region',
+            'ds_grid_add_region','ds_grid_multiply_region','ds_grid_set_disk','ds_grid_add_disk',
+            'ds_grid_multiply_disk','ds_grid_get','ds_grid_get_sum','ds_grid_get_max','ds_grid_get_min',
+            'ds_grid_get_mean','ds_grid_get_disk_sum','ds_grid_get_disk_min','ds_grid_get_disk_max',
+            'ds_grid_get_disk_mean','ds_grid_value_exists','ds_grid_value_x','ds_grid_value_y',
+            'ds_grid_value_disk_exists','ds_grid_value_disk_x','ds_grid_value_disk_y',
+            // Creating particles
+            'effect_create_below','effect_create_above','effect_clear',
+            'part_type_create','part_type_destroy','part_type_exists','part_type_clear','part_type_shape',
+            'part_type_sprite','part_type_size','part_type_scale',
+            'part_type_orientation','part_type_color1','part_type_color2','part_type_color3',
+            'part_type_color_mix','part_type_color_rgb','part_type_color_hsv',
+            'part_type_alpha1','part_type_alpha2','part_type_alpha3','part_type_blend','part_type_life',
+            'part_type_step','part_type_death','part_type_speed','part_type_direction','part_type_gravity',
+            'part_system_create','part_system_destroy','part_system_exists','part_system_clear',
+            'part_system_draw_order','part_system_depth','part_system_position',
+            'part_system_automatic_update','part_system_automatic_draw','part_system_update',
+            'part_system_drawit','part_particles_create','part_particles_create_color',
+            'part_particles_clear','part_particles_count',
+            'part_emitter_create','part_emitter_destroy','part_emitter_destroy_all','part_emitter_exists',
+            'part_emitter_clear','part_emitter_region','part_emitter_burst','part_emitter_stream',
+            'part_attractor_create','part_attractor_destroy','part_attractor_destroy_all',
+            'part_attractor_exists','part_attractor_clear','part_attractor_position','part_attractor_force',
+            'part_destroyer_create','part_destroyer_destroy','part_destroyer_destroy_all',
+            'part_destroyer_exists','part_destroyer_clear','part_destroyer_region',
+            'part_deflector_create','part_deflector_destroy','part_deflector_destroy_all',
+            'part_deflector_exists','part_deflector_clear','part_deflector_region','part_deflector_kind',
+            'part_deflector_friction',
+            'part_changer_create','part_changer_destroy','part_changer_destroy_all','part_changer_exists',
+            'part_changer_clear','part_changer_region','part_changer_types','part_changer_kind',
+            // Multiplayer games
+            'mplay_init_ipx','mplay_init_tcpip','mplay_init_modem','mplay_init_serial',
+            'mplay_connect_status','mplay_end','mplay_ipaddress',
+            'mplay_session_create','mplay_session_find','mplay_session_name','mplay_session_join',
+            'mplay_session_mode','mplay_session_status','mplay_session_end',
+            'mplay_player_find','mplay_player_name','mplay_player_id',
+            'mplay_data_write','mplay_data_read','mplay_data_mode',
+            'mplay_message_send','mplay_message_send_guaranteed','mplay_message_receive','mplay_message_id',
+            'mplay_message_value','mplay_message_player','mplay_message_name','mplay_message_count',
+            'mplay_message_clear',
+            // Using DLL's
+            'external_define','external_call','external_free','window_handle',
+            // 3D Graphics
+            'd3d_start','d3d_end','d3d_set_hidden','d3d_set_perspective',
+            'd3d_set_depth',
+            'd3d_primitive_begin','d3d_vertex','d3d_vertex_color','d3d_primitive_end',
+            'd3d_primitive_begin_texture','d3d_vertex_texture','d3d_vertex_texture_color','d3d_set_culling',
+            'd3d_draw_block','d3d_draw_cylinder','d3d_draw_cone','d3d_draw_ellipsoid','d3d_draw_wall',
+            'd3d_draw_floor',
+            'd3d_set_projection','d3d_set_projection_ext','d3d_set_projection_ortho',
+            'd3d_set_projection_perspective',
+            'd3d_transform_set_identity','d3d_transform_set_translation','d3d_transform_set_scaling',
+            'd3d_transform_set_rotation_x','d3d_transform_set_rotation_y','d3d_transform_set_rotation_z',
+            'd3d_transform_set_rotation_axis','d3d_transform_add_translation','d3d_transform_add_scaling',
+            'd3d_transform_add_rotation_x','d3d_transform_add_rotation_y','d3d_transform_add_rotation_z',
+            'd3d_transform_add_rotation_axis','d3d_transform_stack_clear','d3d_transform_stack_empty',
+            'd3d_transform_stack_push','d3d_transform_stack_pop','d3d_transform_stack_top',
+            'd3d_transform_stack_discard',
+            'd3d_set_fog',
+            'd3d_set_lighting','d3d_set_shading','d3d_light_define_direction','d3d_light_define_point',
+            'd3d_light_enable','d3d_vertex_normal','d3d_vertex_normal_color','d3d_vertex_normal_texture',
+            'd3d_vertex_normal_texture_color',
+            'd3d_model_create','d3d_model_destroy','d3d_model_clear','d3d_model_save','d3d_model_load',
+            'd3d_model_draw','d3d_model_primitive_begin','d3d_model_vertex','d3d_model_vertex_color',
+            'd3d_model_vertex_texture','d3d_model_vertex_texture_color','d3d_model_vertex_normal',
+            'd3d_model_vertex_normal_color','d3d_model_vertex_normal_texture',
+            'd3d_model_vertex_normal_texture_color','d3d_model_primitive_end','d3d_model_block',
+            'd3d_model_cylinder','d3d_model_cone','d3d_model_ellipsoid','d3d_model_wall','d3d_model_floor'
+            ),
+        // constants
+        4 => array(
+            'true', 'false', 'pi',
+            'ev_destroy','ev_step','ev_alarm','ev_keyboard','ev_mouse','ev_collision','ev_other','ev_draw',
+            'ev_keypress','ev_keyrelease','ev_left_button','ev_right_button','ev_middle_button',
+            'ev_no_button','ev_left_press','ev_right_press','ev_middle_press','ev_left_release',
+            'ev_right_release','ev_middle_release','ev_mouse_enter','ev_mouse_leave','ev_mouse_wheel_up',
+            'ev_mouse_wheel_down','ev_global_left_button','ev_global_right_button','ev_global_middle_button',
+            'ev_global_left_press','ev_global_right_press','ev_global_middle_press','ev_global_left_release',
+            'ev_global_right_release','ev_global_middle_release','ev_joystick1_left','ev_joystick1_right',
+            'ev_joystick1_up','ev_joystick1_down','ev_joystick1_button1','ev_joystick1_button2',
+            'ev_joystick1_button3','ev_joystick1_button4','ev_joystick1_button5','ev_joystick1_button6',
+            'ev_joystick1_button7','ev_joystick1_button8','ev_joystick2_left','ev_joystick2_right',
+            'ev_joystick2_up','ev_joystick2_down','ev_joystick2_button1','ev_joystick2_button2',
+            'ev_joystick2_button3','ev_joystick2_button4','ev_joystick2_button5','ev_joystick2_button6',
+            'ev_joystick2_button7','ev_joystick2_button8',
+            'ev_outside','ev_boundary','ev_game_start','ev_game_end','ev_room_start','ev_room_end',
+            'ev_no_more_lives','ev_no_more_health','ev_animation_end','ev_end_of_path','ev_user0','ev_user1',
+            'ev_user2','ev_user3','ev_user4','ev_user5','ev_user6','ev_user7','ev_user8','ev_user9',
+            'ev_user10','ev_user11','ev_user12','ev_user13','ev_user14','ev_user15','ev_step_normal',
+            'ev_step_begin','ev_step_end',
+            'vk_nokey','vk_anykey','vk_left','vk_right','vk_up','vk_down','vk_enter','vk_escape','vk_space',
+            'vk_shift','vk_control','vk_alt','vk_backspace','vk_tab','vk_home','vk_end','vk_delete',
+            'vk_insert','vk_pageup','vk_pagedown','vk_pause','vk_printscreen',
+            'vk_f1','vk_f2','vk_f3','vk_f4','vk_f5','vk_f6','vk_f7','vk_f8','vk_f9','vk_f10','vk_f11','vk_f12',
+            'vk_numpad0','vk_numpad1','vk_numpad2','vk_numpad3','vk_numpad4','vk_numpad5','vk_numpad6',
+            'vk_numpad7','vk_numpad8','vk_numpad9', 'vk_multiply','vk_divide','vk_add','vk_subtract',
+            'vk_decimal','vk_lshift','vk_lcontrol','vk_lalt','vk_rshift','vk_rcontrol','vk_ralt',
+            'c_aqua','c_black','c_blue','c_dkgray','c_fuchsia','c_gray','c_green','c_lime','c_ltgray',
+            'c_maroon','c_navy','c_olive','c_purple','c_red','c_silver','c_teal','c_white','c_yellow',
+            'fa_left', 'fa_center','fa_right','fa_top','fa_middle','fa_bottom',
+            'pr_pointlist','pr_linelist','pr_linestrip','pr_trianglelist','pr_trianglestrip',
+            'pr_trianglefan',
+            'cr_none','cr_arrow','cr_cross','cr_beam','cr_size_nesw','cr_size_ns','cr_size_nwse',
+            'cr_size_we','cr_uparrow','cr_hourglass','cr_drag','cr_nodrop','cr_hsplit','cr_vsplit',
+            'cr_multidrag','cr_sqlwait','cr_no','cr_appstart','cr_help','cr_handpoint','cr_size_all',
+            'se_chorus','se_echo','se_flanger','se_gargle','se_reverb','se_compressor','se_equalizer',
+            'fa_readonly','fa_hidden','fa_sysfile','fa_volumeid','fa_directory','fa_archive',
+            'pt_shape_pixel','pt_shape_disk','pt_shape_square','pt_shape_line','pt_shape_star',
+            'pt_shape_circle','pt_shape_ring','pt_shape_sphere','pt_shape_flare','pt_shape_spark',
+            'pt_shape_explosion','pt_shape_cloud','pt_shape_smoke','pt_shape_snow',
+            'ps_shape_rectangle','ps_shape_ellipse ','ps_shape_diamond','ps_shape_line',
+            'ps_distr_linear','ps_distr_gaussian','ps_force_constant','ps_force_linear','ps_force_quadratic',
+            'ps_deflect_horizontal', 'ps_deflect_vertical',
+            'ps_change_motion','ps_change_shape','ps_change_all'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '&&', '||', '^^', '&', '|', '^',
+        '<', '<=', '==', '!=', '>', '>=', '=',
+        '<<', '>>',
+        '+=', '-=', '*=', '/=',
+        '+', '-', '*', '/',
+        '!', '~', ',', ';'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight: bold; color: #000000;',
+            2 => 'font-weight: bold; color: #000000;',
+            3 => 'color: navy;',
+            4 => 'color: #663300;',
+            ),
+        'COMMENTS' => array(
+            1 => 'font-style: italic; color: green;',
+            'MULTI' => 'font-style: italic; color: green;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;' //'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66; font-weight: bold;'
+            ),
+        '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(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/gnuplot.php b/sources/inc/geshi/gnuplot.php
new file mode 100644
index 0000000..d8445ea
--- /dev/null
+++ b/sources/inc/geshi/gnuplot.php
@@ -0,0 +1,296 @@
+ 'Gnuplot',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    '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
+
+        // commands as found in `help commands`
+        1 => array(
+            'bind', 'call', 'cd', 'clear',
+            'exit', 'fit', 'help', 'history',
+            'if', 'load', 'lower', 'pause',
+            'plot', 'print', 'pwd', 'quit',
+            'raise', 'replot', 'reread', 'reset',
+            'save', 'set', 'shell', 'show',
+            'splot', 'system', 'test', 'unset',
+            'update'
+            ),
+        2 => array(
+            // set commands as returned by `help set`
+            'angles', 'arrow', 'autoscale', 'bars',
+            'bmargin', 'border', 'boxwidth', 'cbdata',
+            'cbdtics', 'cblabel', 'cbmtics', 'cbrange',
+            'cbtics', 'clabel', 'clip', 'cntrparam',
+            'colorbox', 'contour', 'datafile', 'date_specifiers',
+            'decimalsign', 'dgrid3d', 'dummy', 'encoding',
+            'fontpath', 'format', 'grid',
+            'hidden3d', 'historysize', 'isosamples', 'key',
+            'label', 'lmargin', 'loadpath', 'locale',
+            'log', 'logscale', 'macros', 'mapping',
+            'margin', 'missing', 'mouse', 'multiplot',
+            'mx2tics', 'mxtics', 'my2tics', 'mytics',
+            'mztics', 'object', 'offsets', 'origin',
+            'output', 'palette', 'parametric', 'pm3d',
+            'pointsize', 'polar', 'rmargin',
+            'rrange', 'samples', 'size', 'style',
+            'surface', 'table', 'term', 'terminal',
+            'termoption', 'tics', 'ticscale', 'ticslevel',
+            'time_specifiers', 'timefmt', 'timestamp', 'title',
+            'trange', 'urange', 'view',
+            'vrange', 'x2data', 'x2dtics', 'x2label',
+            'x2mtics', 'x2range', 'x2tics', 'x2zeroaxis',
+            'xdata', 'xdtics', 'xlabel', 'xmtics',
+            'xrange', 'xtics', 'xyplane', 'xzeroaxis',
+            'y2data', 'y2dtics', 'y2label', 'y2mtics',
+            'y2range', 'y2tics', 'y2zeroaxis', 'ydata',
+            'ydtics', 'ylabel', 'ymtics', 'yrange',
+            'ytics', 'yzeroaxis', 'zdata', 'zdtics',
+            'zero', 'zeroaxis', 'zlabel', 'zmtics',
+            'zrange', 'ztics', 'zzeroaxis',
+            // same but with leading no
+            'noangles', 'noarrow', 'noautoscale', 'nobars',
+            'nobmargin', 'noborder', 'noboxwidth', 'nocbdata',
+            'nocbdtics', 'nocblabel', 'nocbmtics', 'nocbrange',
+            'nocbtics', 'noclabel', 'noclip', 'nocntrparam',
+            'nocolorbox', 'nocontour', 'nodatafile', 'nodate_specifiers',
+            'nodecimalsign', 'nodgrid3d', 'nodummy', 'noencoding',
+            'nofit', 'nofontpath', 'noformat', 'nogrid',
+            'nohidden3d', 'nohistorysize', 'noisosamples', 'nokey',
+            'nolabel', 'nolmargin', 'noloadpath', 'nolocale',
+            'nolog', 'nologscale', 'nomacros', 'nomapping',
+            'nomargin', 'nomissing', 'nomouse', 'nomultiplot',
+            'nomx2tics', 'nomxtics', 'nomy2tics', 'nomytics',
+            'nomztics', 'noobject', 'nooffsets', 'noorigin',
+            'nooutput', 'nopalette', 'noparametric', 'nopm3d',
+            'nopointsize', 'nopolar', 'noprint', 'normargin',
+            'norrange', 'nosamples', 'nosize', 'nostyle',
+            'nosurface', 'notable', 'noterm', 'noterminal',
+            'notermoption', 'notics', 'noticscale', 'noticslevel',
+            'notime_specifiers', 'notimefmt', 'notimestamp', 'notitle',
+            'notmargin', 'notrange', 'nourange', 'noview',
+            'novrange', 'nox2data', 'nox2dtics', 'nox2label',
+            'nox2mtics', 'nox2range', 'nox2tics', 'nox2zeroaxis',
+            'noxdata', 'noxdtics', 'noxlabel', 'noxmtics',
+            'noxrange', 'noxtics', 'noxyplane', 'noxzeroaxis',
+            'noy2data', 'noy2dtics', 'noy2label', 'noy2mtics',
+            'noy2range', 'noy2tics', 'noy2zeroaxis', 'noydata',
+            'noydtics', 'noylabel', 'noymtics', 'noyrange',
+            'noytics', 'noyzeroaxis', 'nozdata', 'nozdtics',
+            'nozero', 'nozeroaxis', 'nozlabel', 'nozmtics',
+            'nozrange', 'noztics', 'nozzeroaxis',
+            ),
+        3 => array(
+            // predefined variables
+            'pi', 'NaN', 'GNUTERM',
+            'GPVAL_X_MIN', 'GPVAL_X_MAX', 'GPVAL_Y_MIN', 'GPVAL_Y_MAX',
+            'GPVAL_TERM', 'GPVAL_TERMOPTIONS', 'GPVAL_OUTPUT',
+            'GPVAL_VERSION', 'GPVAL_PATcHLEVEL', 'GPVAL_COMPILE_OPTIONS',
+            'MOUSE_KEY', 'MOUSE_X', 'MOUSE_X2', 'MOUSE_Y', 'MOUSE_Y2',
+            'MOUSE_BUTTON', 'MOUSE_SHIFT', 'MOUSE_ALT', 'MOUSE_CTRL'
+            ),
+        4 => array(
+            // predefined functions `help functions`
+            'abs', 'acos', 'acosh', 'arg',
+            'asin', 'asinh', 'atan', 'atan2',
+            'atanh', 'besj0', 'besj1', 'besy0',
+            'besy1', 'ceil', 'column', 'cos',
+            'cosh', 'defined', 'erf', 'erfc',
+            'exists', 'exp', 'floor', 'gamma',
+            'gprintf', 'ibeta', 'igamma', 'imag',
+            'int', 'inverf', 'invnorm', 'lambertw',
+            'lgamma', 'log10', 'norm',
+            'rand', 'random', 'real', 'sgn',
+            'sin', 'sinh', 'sprintf', 'sqrt',
+            'stringcolumn', 'strlen', 'strstrt', 'substr',
+            'tan', 'tanh', 'timecolumn',
+            'tm_hour', 'tm_mday', 'tm_min', 'tm_mon',
+            'tm_sec', 'tm_wday', 'tm_yday', 'tm_year',
+            'valid', 'word', 'words',
+            ),
+        5 => array(
+            // mixed arguments
+            // there is no sane way to get these ones easily...
+            'autofreq', 'x', 'y', 'z',
+            'lt', 'linetype', 'lw', 'linewidth', 'ls', 'linestyle',
+            'out', 'rotate by', 'screen',
+            'enhanced', 'via',
+            // `help set key`
+            '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',
+
+            // help set terminal postscript
+            'landscape', 'portrait', 'eps', 'defaultplex', 'simplex', 'duplex',
+            'fontfile', 'add', 'delete', 'nofontfiles', 'level1', 'leveldefault',
+            'color', 'colour', 'monochrome', 'solid', 'dashed', 'dashlength', 'dl',
+            'rounded', 'butt', 'palfuncparam', 'blacktext', 'colortext', 'colourtext',
+            'font',
+
+            // help set terminal png
+            'notransparent', 'transparent', 'nointerlace', 'interlace',
+            'notruecolor', 'truecolor', 'tiny', 'small', 'medium', 'large', 'giant',
+            'nocrop', 'crop',
+
+            // `help plot`
+            'acsplines', 'bezier', 'binary', 'csplines',
+            'every',
+            'example', 'frequency', 'index', 'matrix',
+            'ranges', 'sbezier', 'smooth',
+            'special-filenames', 'thru',
+            'unique', 'using', 'with',
+
+            // `help plotting styles`
+            'boxerrorbars', 'boxes', 'boxxyerrorbars', 'candlesticks',
+            'dots', 'errorbars', 'errorlines', 'filledcurves',
+            'financebars', 'fsteps', 'histeps', 'histograms',
+            'image', 'impulses', 'labels', 'lines',
+            'linespoints', 'points', 'rgbimage', 'steps',
+            'vectors', 'xerrorbars', 'xerrorlines', 'xyerrorbars',
+            'xyerrorlines', 'yerrorbars', 'yerrorlines',
+
+
+            // terminals `help terminals`
+            'aed512', 'aed767', 'aifm', 'bitgraph',
+            'cgm', 'corel', 'dumb', 'dxf',
+            'eepic', 'emf', 'emtex', 'epslatex',
+            'epson-180dpi', 'epson-60dpi', 'epson-lx800', 'fig',
+            'gif', 'gpic', 'hp2623a', 'hp2648',
+            'hp500c', 'hpdj', 'hpgl', 'hpljii',
+            'hppj', 'imagen', 'jpeg', 'kc-tek40xx',
+            'km-tek40xx', 'latex', 'mf', 'mif',
+            'mp', 'nec-cp6', 'okidata', 'pbm',
+            'pcl5', 'png', 'pop', 'postscript',
+            'pslatex', 'pstex', 'pstricks', 'push',
+            'qms', 'regis', 'selanar', 'starc',
+            'svg', 'tandy-60dpi', 'tek40xx', 'tek410x',
+            'texdraw', 'tgif', 'tkcanvas', 'tpic',
+            'vttek', 'x11', 'xlib',
+            )
+        ),
+    'REGEXPS' => array(
+        //Variable assignment
+        0 => "(?\w])([a-zA-Z_][a-zA-Z0-9_]*)\s*=",
+        //Numbers with unit
+        1 => "(?<=^|\s)([0-9]*\.?[0-9]+\s*cm)"
+        ),
+    'SYMBOLS' => array(
+        '-', '+', '~', '!', '$',
+        '*', '/', '%', '=', '<', '>', '&',
+        '^', '|', '.', 'eq', 'ne', '?:', ':', '`', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #990000;',
+            3 => 'color: #550000;',
+            4 => 'color: #7a0874;',
+            5 => 'color: #448888;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight:bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000099; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007800;',
+            1 => 'color: #cc66cc;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://www.google.com/search?q=%22set+{FNAME}%22+site%3Ahttp%3A%2F%2Fwww.gnuplot.info%2Fdocs%2F&btnI=lucky',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            4 => array(
+                'DISALLOWED_AFTER' =>  "(?![\.\-a-zA-Z0-9_%])"
+            )
+        )
+    ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/go.php b/sources/inc/geshi/go.php
new file mode 100644
index 0000000..5b7a47d
--- /dev/null
+++ b/sources/inc/geshi/go.php
@@ -0,0 +1,375 @@
+ 'Go',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        # Raw strings (escapes and linebreaks ignored)
+        2 => "#`[^`]*`#"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => "#\\\\[abfnrtv\\\\\'\"]#",
+        2 => "#\\\\[0-7]{3}#",
+        3 => "#\\\\x[0-9a-fA-F]{2}#",
+        4 => "#\\\\u[0-9a-fA-F]{4}#",
+        5 => "#\\\\U[0-9a-fA-F]{8}#"
+        ),
+    'NUMBERS' => array(
+        # integer literals (possibly imaginary)
+        0 => '\b([1-9][0-9]*i?|0[0-7]*|0[xX][0-9a-f]+|0[0-9]*i)\b',
+        # real floating point literals
+        1 => '\b((?:\d+\.\d*(?:[Ee][+-]?\d+\b)?|\.\d+(?:[Ee][+-]?\d+)?|\d+[Ee][+-]?\d+)?)\b',
+        # imaginary floating point literals
+        2 => '\b((?:\d+\.\d*(?:[Ee][+-]?\d+)?|\.\d+(?:[Ee][+-]?\d+)?|\d+[Ee][+-]?\d+)?i)\b'
+        ),
+    'KEYWORDS' => array(
+        # statements
+        1 => array(
+            'break', 'case', 'const', 'continue', 'default', 'defer', 'else',
+            'fallthrough', 'for', 'go', 'goto', 'if', 'import', 'package',
+            'range', 'return', 'select', 'switch', 'type', 'var'
+            ),
+        # literals
+        2 => array(
+            'nil', 'true', 'false'
+            ),
+        # built-in functions
+        3 => array(
+            'close', 'closed', 'len', 'cap', 'new', 'make', 'copy', 'cmplx',
+            'real', 'imag', 'panic', 'recover', 'print', 'println'
+            ),
+        # built-in types
+        4 => array(
+            'chan', 'func', 'interface', 'map', 'struct', 'bool', 'uint8',
+            'uint16', 'uint32', 'uint64', 'int8', 'int16', 'int32', 'int64',
+            'float32', 'float64', 'complex64', 'complex128', 'byte', 'uint',
+            'int', 'float', 'complex', 'uintptr', 'string'
+            ),
+        # library types
+        5 => array(
+            'aes.Cipher', 'aes.KeySizeError', 'ascii85.CorruptInputError', 'asn1.BitString',
+            'asn1.RawValue', 'asn1.StructuralError', 'asn1.SyntaxError', 'ast.ChanDir',
+            'ast.Comment', 'ast.CommentGroup', 'ast.Decl', 'ast.Expr', 'ast.Field',
+            'ast.FieldList', 'ast.File', 'ast.Filter', 'ast.MergeMode', 'ast.Node',
+            'ast.ObjKind', 'ast.Object', 'ast.Package', 'ast.Scope', 'ast.Stmt',
+            'ast.Visitor', 'av.Color', 'av.Image', 'av.Window', 'base64.CorruptInputError',
+            'base64.Encoding', 'big.Int', 'big.Word', 'bignum.Integer', 'bignum.Rational',
+            'binary.ByteOrder', 'block.Cipher', 'block.EAXTagError', 'blowfish.Cipher',
+            'blowfish.KeySizeError', 'bufio.BufSizeError', 'bufio.Error', 'bufio.ReadWriter',
+            'bufio.Reader', 'bufio.Writer', 'bytes.Buffer', 'datafmt.Environment',
+            'datafmt.Format', 'datafmt.Formatter', 'datafmt.FormatterMap', 'datafmt.State',
+            'doc.Filter', 'doc.FuncDoc', 'doc.PackageDoc', 'doc.TypeDoc', 'doc.ValueDoc',
+            'draw.Color', 'draw.Context', 'draw.Image', 'draw.Mouse', 'draw.Op',
+            'draw.Point', 'draw.Rectangle', 'dwarf.AddrType', 'dwarf.ArrayType',
+            'dwarf.Attr', 'dwarf.BasicType', 'dwarf.BoolType', 'dwarf.CharType',
+            'dwarf.CommonType', 'dwarf.ComplexType', 'dwarf.Data', 'dwarf.DecodeError',
+            'dwarf.DotDotDotType', 'dwarf.Entry', 'dwarf.EnumType', 'dwarf.EnumValue',
+            'dwarf.Field', 'dwarf.FloatType', 'dwarf.FuncType', 'dwarf.IntType',
+            'dwarf.Offset', 'dwarf.PtrType', 'dwarf.QualType', 'dwarf.Reader',
+            'dwarf.StructField', 'dwarf.StructType', 'dwarf.Tag', 'dwarf.Type',
+            'dwarf.TypedefType', 'dwarf.UcharType', 'dwarf.UintType', 'dwarf.VoidType',
+            'elf.Class', 'elf.Data', 'elf.Dyn32', 'elf.Dyn64', 'elf.DynFlag', 'elf.DynTag',
+            'elf.File', 'elf.FileHeader', 'elf.FormatError', 'elf.Header32', 'elf.Header64',
+            'elf.Machine', 'elf.NType', 'elf.OSABI', 'elf.Prog', 'elf.Prog32', 'elf.Prog64',
+            'elf.ProgFlag', 'elf.ProgHeader', 'elf.ProgType', 'elf.R_386', 'elf.R_ALPHA',
+            'elf.R_ARM', 'elf.R_PPC', 'elf.R_SPARC', 'elf.R_X86_64', 'elf.Rel32',
+            'elf.Rel64', 'elf.Rela32', 'elf.Rela64', 'elf.Section', 'elf.Section32',
+            'elf.Section64', 'elf.SectionFlag', 'elf.SectionHeader', 'elf.SectionIndex',
+            'elf.SectionType', 'elf.Sym32', 'elf.Sym64', 'elf.SymBind', 'elf.SymType',
+            'elf.SymVis', 'elf.Symbol', 'elf.Type', 'elf.Version', 'eval.ArrayType',
+            'eval.ArrayValue', 'eval.BoolValue', 'eval.BoundedType', 'eval.ChanType',
+            'eval.Code', 'eval.Constant', 'eval.Def', 'eval.DivByZeroError',
+            'eval.FloatValue', 'eval.Frame', 'eval.Func', 'eval.FuncDecl', 'eval.FuncType',
+            'eval.FuncValue', 'eval.IMethod', 'eval.IdealFloatValue', 'eval.IdealIntValue',
+            'eval.IndexError', 'eval.IntValue', 'eval.Interface', 'eval.InterfaceType',
+            'eval.InterfaceValue', 'eval.KeyError', 'eval.Map', 'eval.MapType',
+            'eval.MapValue', 'eval.Method', 'eval.MultiType', 'eval.NamedType',
+            'eval.NegativeCapacityError', 'eval.NegativeLengthError', 'eval.NilPointerError',
+            'eval.PtrType', 'eval.PtrValue', 'eval.RedefinitionError', 'eval.Scope',
+            'eval.Slice', 'eval.SliceError', 'eval.SliceType', 'eval.SliceValue',
+            'eval.StringValue', 'eval.StructField', 'eval.StructType', 'eval.StructValue',
+            'eval.Thread', 'eval.Type', 'eval.UintValue', 'eval.Value', 'eval.Variable',
+            'eval.World', 'exec.Cmd', 'expvar.Int', 'expvar.IntFunc', 'expvar.KeyValue',
+            'expvar.Map', 'expvar.String', 'expvar.StringFunc', 'expvar.Var', 'flag.Flag',
+            'flag.Value', 'flate.CorruptInputError', 'flate.InternalError',
+            'flate.ReadError', 'flate.Reader', 'flate.WriteError', 'flate.WrongValueError',
+            'fmt.Formatter', 'fmt.GoStringer', 'fmt.State', 'fmt.Stringer',
+            'git85.CorruptInputError', 'gob.Decoder', 'gob.Encoder', 'gosym.DecodingError',
+            'gosym.Func', 'gosym.LineTable', 'gosym.Obj', 'gosym.Sym', 'gosym.Table',
+            'gosym.UnknownFileError', 'gosym.UnknownLineError', 'gzip.Deflater',
+            'gzip.Header', 'gzip.Inflater', 'hash.Hash', 'hash.Hash32', 'hash.Hash64',
+            'heap.Interface', 'hex.InvalidHexCharError', 'hex.OddLengthInputError',
+            'http.ClientConn', 'http.Conn', 'http.Handler', 'http.HandlerFunc',
+            'http.ProtocolError', 'http.Request', 'http.Response', 'http.ServeMux',
+            'http.ServerConn', 'http.URL', 'http.URLError', 'http.URLEscapeError',
+            'image.Alpha', 'image.AlphaColor', 'image.Color', 'image.ColorImage',
+            'image.ColorModel', 'image.ColorModelFunc', 'image.Image', 'image.NRGBA',
+            'image.NRGBA64', 'image.NRGBA64Color', 'image.NRGBAColor', 'image.Paletted',
+            'image.RGBA', 'image.RGBA64', 'image.RGBA64Color', 'image.RGBAColor',
+            'io.Closer', 'io.Error', 'io.PipeReader', 'io.PipeWriter', 'io.ReadByter',
+            'io.ReadCloser', 'io.ReadSeeker', 'io.ReadWriteCloser', 'io.ReadWriteSeeker',
+            'io.ReadWriter', 'io.Reader', 'io.ReaderAt', 'io.ReaderFrom', 'io.SectionReader',
+            'io.Seeker', 'io.WriteCloser', 'io.WriteSeeker', 'io.Writer', 'io.WriterAt',
+            'io.WriterTo', 'iterable.Func', 'iterable.Group', 'iterable.Grouper',
+            'iterable.Injector', 'iterable.Iterable', 'jpeg.FormatError', 'jpeg.Reader',
+            'jpeg.UnsupportedError', 'json.Decoder', 'json.Encoder',
+            'json.InvalidUnmarshalError', 'json.Marshaler', 'json.MarshalerError',
+            'json.SyntaxError', 'json.UnmarshalTypeError', 'json.Unmarshaler',
+            'json.UnsupportedTypeError', 'list.Element', 'list.List', 'log.Logger',
+            'macho.Cpu', 'macho.File', 'macho.FileHeader', 'macho.FormatError', 'macho.Load',
+            'macho.LoadCmd', 'macho.Regs386', 'macho.RegsAMD64', 'macho.Section',
+            'macho.Section32', 'macho.Section64', 'macho.SectionHeader', 'macho.Segment',
+            'macho.Segment32', 'macho.Segment64', 'macho.SegmentHeader', 'macho.Thread',
+            'macho.Type', 'net.Addr', 'net.AddrError', 'net.Conn', 'net.DNSConfigError',
+            'net.DNSError', 'net.Error', 'net.InvalidAddrError', 'net.InvalidConnError',
+            'net.Listener', 'net.OpError', 'net.PacketConn', 'net.TCPAddr', 'net.TCPConn',
+            'net.TCPListener', 'net.UDPAddr', 'net.UDPConn', 'net.UnixAddr', 'net.UnixConn',
+            'net.UnixListener', 'net.UnknownNetworkError', 'net.UnknownSocketError',
+            'netchan.Dir', 'netchan.Exporter', 'netchan.Importer', 'nntp.Article',
+            'nntp.Conn', 'nntp.Error', 'nntp.Group', 'nntp.ProtocolError', 'ogle.Arch',
+            'ogle.ArchAlignedMultiple', 'ogle.ArchLSB', 'ogle.Breakpoint', 'ogle.Event',
+            'ogle.EventAction', 'ogle.EventHandler', 'ogle.EventHook', 'ogle.FormatError',
+            'ogle.Frame', 'ogle.Goroutine', 'ogle.GoroutineCreate', 'ogle.GoroutineExit',
+            'ogle.NoCurrentGoroutine', 'ogle.NotOnStack', 'ogle.Process',
+            'ogle.ProcessNotStopped', 'ogle.ReadOnlyError', 'ogle.RemoteMismatchError',
+            'ogle.UnknownArchitecture', 'ogle.UnknownGoroutine', 'ogle.UsageError',
+            'os.Errno', 'os.Error', 'os.ErrorString', 'os.File', 'os.FileInfo',
+            'os.LinkError', 'os.PathError', 'os.SyscallError', 'os.Waitmsg', 'patch.Diff',
+            'patch.File', 'patch.GitBinaryLiteral', 'patch.Op', 'patch.Set',
+            'patch.SyntaxError', 'patch.TextChunk', 'patch.Verb', 'path.Visitor',
+            'pdp1.HaltError', 'pdp1.LoopError', 'pdp1.Trapper', 'pdp1.UnknownInstrError',
+            'pdp1.Word', 'pem.Block', 'png.FormatError', 'png.IDATDecodingError',
+            'png.UnsupportedError', 'printer.Config', 'printer.HTMLTag', 'printer.Styler',
+            'proc.Breakpoint', 'proc.Cause', 'proc.Process', 'proc.ProcessExited',
+            'proc.Regs', 'proc.Signal', 'proc.Stopped', 'proc.Thread', 'proc.ThreadCreate',
+            'proc.ThreadExit', 'proc.Word', 'quick.CheckEqualError', 'quick.CheckError',
+            'quick.Config', 'quick.Generator', 'quick.SetupError', 'rand.Rand',
+            'rand.Source', 'rand.Zipf', 'rc4.Cipher', 'rc4.KeySizeError',
+            'reflect.ArrayOrSliceType', 'reflect.ArrayOrSliceValue', 'reflect.ArrayType',
+            'reflect.ArrayValue', 'reflect.BoolType', 'reflect.BoolValue', 'reflect.ChanDir',
+            'reflect.ChanType', 'reflect.ChanValue', 'reflect.Complex128Type',
+            'reflect.Complex128Value', 'reflect.Complex64Type', 'reflect.Complex64Value',
+            'reflect.ComplexType', 'reflect.ComplexValue', 'reflect.Float32Type',
+            'reflect.Float32Value', 'reflect.Float64Type', 'reflect.Float64Value',
+            'reflect.FloatType', 'reflect.FloatValue', 'reflect.FuncType',
+            'reflect.FuncValue', 'reflect.Int16Type', 'reflect.Int16Value',
+            'reflect.Int32Type', 'reflect.Int32Value', 'reflect.Int64Type',
+            'reflect.Int64Value', 'reflect.Int8Type', 'reflect.Int8Value', 'reflect.IntType',
+            'reflect.IntValue', 'reflect.InterfaceType', 'reflect.InterfaceValue',
+            'reflect.MapType', 'reflect.MapValue', 'reflect.Method', 'reflect.PtrType',
+            'reflect.PtrValue', 'reflect.SliceHeader', 'reflect.SliceType',
+            'reflect.SliceValue', 'reflect.StringHeader', 'reflect.StringType',
+            'reflect.StringValue', 'reflect.StructField', 'reflect.StructType',
+            'reflect.StructValue', 'reflect.Type', 'reflect.Uint16Type',
+            'reflect.Uint16Value', 'reflect.Uint32Type', 'reflect.Uint32Value',
+            'reflect.Uint64Type', 'reflect.Uint64Value', 'reflect.Uint8Type',
+            'reflect.Uint8Value', 'reflect.UintType', 'reflect.UintValue',
+            'reflect.UintptrType', 'reflect.UintptrValue', 'reflect.UnsafePointerType',
+            'reflect.UnsafePointerValue', 'reflect.Value', 'regexp.Error', 'regexp.Regexp',
+            'ring.Ring', 'rpc.Call', 'rpc.Client', 'rpc.ClientCodec', 'rpc.InvalidRequest',
+            'rpc.Request', 'rpc.Response', 'rpc.ServerCodec', 'rsa.DecryptionError',
+            'rsa.MessageTooLongError', 'rsa.PKCS1v15Hash', 'rsa.PrivateKey', 'rsa.PublicKey',
+            'rsa.VerificationError', 'runtime.ArrayType', 'runtime.BoolType',
+            'runtime.ChanDir', 'runtime.ChanType', 'runtime.Complex128Type',
+            'runtime.Complex64Type', 'runtime.ComplexType', 'runtime.Error',
+            'runtime.Float32Type', 'runtime.Float64Type', 'runtime.FloatType',
+            'runtime.Func', 'runtime.FuncType', 'runtime.Int16Type', 'runtime.Int32Type',
+            'runtime.Int64Type', 'runtime.Int8Type', 'runtime.IntType',
+            'runtime.InterfaceType', 'runtime.Itable', 'runtime.MapType',
+            'runtime.MemProfileRecord', 'runtime.MemStatsType', 'runtime.PtrType',
+            'runtime.SliceType', 'runtime.StringType', 'runtime.StructType', 'runtime.Type',
+            'runtime.TypeAssertionError', 'runtime.Uint16Type', 'runtime.Uint32Type',
+            'runtime.Uint64Type', 'runtime.Uint8Type', 'runtime.UintType',
+            'runtime.UintptrType', 'runtime.UnsafePointerType', 'scanner.Error',
+            'scanner.ErrorHandler', 'scanner.ErrorVector', 'scanner.Position',
+            'scanner.Scanner', 'script.Close', 'script.Closed', 'script.Event',
+            'script.ReceivedUnexpected', 'script.Recv', 'script.RecvMatch', 'script.Send',
+            'script.SetupError', 'signal.Signal', 'signal.UnixSignal', 'sort.Interface',
+            'srpc.Client', 'srpc.Errno', 'srpc.Handler', 'srpc.RPC', 'strconv.NumError',
+            'strings.Reader', 'sync.Mutex', 'sync.RWMutex',
+            'syscall.ByHandleFileInformation', 'syscall.Cmsghdr', 'syscall.Dirent',
+            'syscall.EpollEvent', 'syscall.Fbootstraptransfer_t', 'syscall.FdSet',
+            'syscall.Filetime', 'syscall.Flock_t', 'syscall.Fstore_t', 'syscall.Iovec',
+            'syscall.Kevent_t', 'syscall.Linger', 'syscall.Log2phys_t', 'syscall.Msghdr',
+            'syscall.Overlapped', 'syscall.PtraceRegs', 'syscall.Radvisory_t',
+            'syscall.RawSockaddr', 'syscall.RawSockaddrAny', 'syscall.RawSockaddrInet4',
+            'syscall.RawSockaddrInet6', 'syscall.RawSockaddrUnix', 'syscall.Rlimit',
+            'syscall.Rusage', 'syscall.Sockaddr', 'syscall.SockaddrInet4',
+            'syscall.SockaddrInet6', 'syscall.SockaddrUnix', 'syscall.Stat_t',
+            'syscall.Statfs_t', 'syscall.Sysinfo_t', 'syscall.Time_t', 'syscall.Timespec',
+            'syscall.Timeval', 'syscall.Timex', 'syscall.Tms', 'syscall.Ustat_t',
+            'syscall.Utimbuf', 'syscall.Utsname', 'syscall.WaitStatus',
+            'syscall.Win32finddata', 'syslog.Priority', 'syslog.Writer', 'tabwriter.Writer',
+            'tar.Header', 'tar.Reader', 'tar.Writer', 'template.Error',
+            'template.FormatterMap', 'template.Template', 'testing.Benchmark',
+            'testing.Regexp', 'testing.Test', 'time.ParseError', 'time.Ticker', 'time.Time',
+            'tls.CASet', 'tls.Certificate', 'tls.Config', 'tls.Conn', 'tls.ConnectionState',
+            'tls.Listener', 'token.Position', 'token.Token', 'unicode.CaseRange',
+            'unicode.Range', 'unsafe.ArbitraryType', 'vector.LessInterface',
+            'websocket.Conn', 'websocket.Draft75Handler', 'websocket.Handler',
+            'websocket.ProtocolError', 'websocket.WebSocketAddr', 'x509.Certificate',
+            'x509.ConstraintViolationError', 'x509.KeyUsage', 'x509.Name',
+            'x509.PublicKeyAlgorithm', 'x509.SignatureAlgorithm',
+            'x509.UnhandledCriticalExtension', 'x509.UnsupportedAlgorithmError', 'xml.Attr',
+            'xml.EndElement', 'xml.Name', 'xml.Parser', 'xml.ProcInst', 'xml.StartElement',
+            'xml.SyntaxError', 'xml.Token', 'xml.UnmarshalError', 'xtea.Cipher',
+            'xtea.KeySizeError'
+            )
+        ),
+    'SYMBOLS' => array(
+        # delimiters
+        1 => array(
+            '(', ')', '{', '}', '[', ']', ',', ':', ';'
+            ),
+        # assignments
+        2 => array(
+            '<<=', '!=', '%=', '&=', '&^=', '*=', '+=', '-=', '/=', ':=', '>>=',
+            '^=', '|=', '=', '++', '--'
+            ),
+        # operators
+        3 => array(
+            '<=', '<', '==', '>', '>=', '&&', '!', '||', '&', '&^', '|', '^',
+            '>>', '<<', '*', '%', '+', '-', '.', '/', '<-'),
+        # vararg
+        4 => array(
+            '...'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            # statements
+            1 => 'color: #b1b100; font-weight: bold;',
+            # literals
+            2 => 'color: #000000; font-weight: bold;',
+            # built-in functions
+            3 => 'color: #000066;',
+            # built-in types
+            4 => 'color: #993333;',
+            # library types
+            5 => 'color: #003399;'
+            ),
+        'COMMENTS' => array(
+            # single-line comments
+            1 => 'color: #666666; font-style: italic;',
+            # raw strings
+            2 => 'color: #0000ff;',
+            # multi-line comments
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            # simple escape
+            1 => 'color: #000099; font-weight: bold;',
+            # octal escape
+            2 => 'color: #000099;',
+            # hex escape
+            3 => 'color: #000099;',
+            # unicode escape
+            4 => 'color: #000099;',
+            # long unicode escape
+            5 => 'color: #000099;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            0 => 'color: #cc66cc;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            # delimiters
+            1 => 'color: #339933;',
+            # assignments
+            2 => 'color: #339933;',
+            # operators
+            3 => 'color: #339933;',
+            # vararg (highlighted as a keyword)
+            4 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            # If CSS classes are enabled, these would be highlighted as numbers (nu0)
+            # integer literals (possibly imaginary)
+            //0 => 'color: #cc66cc;',
+            # real floating point literals
+            //1 => 'color: #cc66cc;',
+            # imaginary floating point literals
+            //2 => 'color: #cc66cc;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://golang.org/search?q={FNAME}'
+        ),
+    'REGEXPS' => array(
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER, # handled by symbols
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/groovy.php b/sources/inc/geshi/groovy.php
new file mode 100644
index 0000000..45290d2
--- /dev/null
+++ b/sources/inc/geshi/groovy.php
@@ -0,0 +1,1011 @@
+ 'Groovy',
+    'COMMENT_SINGLE' => array(1 => '//', 3 => '#'),
+    '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',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'''", '"""', "'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'do', 'else', 'for', 'foreach', 'if', 'in', 'switch',
+            'while',
+            ),
+        2 => array(
+            'abstract', 'as', 'assert', 'break', 'catch', 'class', 'const',
+            'continue', 'def', 'default', 'enum', 'extends',
+            'false', 'final', 'finally', 'goto', 'implements', 'import',
+            'instanceof', 'interface', 'native', 'new', 'null',
+            'package', 'private', 'property', 'protected',
+            'public', 'return', 'static', 'strictfp', 'super',
+            'synchronized', 'this', 'throw', 'throws',
+            'transient', 'true', 'try', 'volatile'
+            ),
+        3 => array(
+            'AbstractAction', 'AbstractBorder', 'AbstractButton',
+            'AbstractCellEditor', 'AbstractCollection',
+            'AbstractColorChooserPanel', 'AbstractDocument',
+            'AbstractDocument.AttributeContext',
+            'AbstractDocument.Content',
+            'AbstractDocument.ElementEdit',
+            'AbstractLayoutCache',
+            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
+            'AbstractListModel', 'AbstractMap',
+            'AbstractMethodError', 'AbstractSequentialList',
+            'AbstractSet', 'AbstractTableModel',
+            'AbstractUndoableEdit', 'AbstractWriter',
+            'AccessControlContext', 'AccessControlException',
+            'AccessController', 'AccessException', 'Accessible',
+            'AccessibleAction', 'AccessibleBundle',
+            'AccessibleComponent', 'AccessibleContext',
+            'AccessibleHyperlink', 'AccessibleHypertext',
+            'AccessibleIcon', 'AccessibleObject',
+            'AccessibleRelation', 'AccessibleRelationSet',
+            'AccessibleResourceBundle', 'AccessibleRole',
+            'AccessibleSelection', 'AccessibleState',
+            'AccessibleStateSet', 'AccessibleTable',
+            'AccessibleTableModelChange', 'AccessibleText',
+            'AccessibleValue', 'Acl', 'AclEntry',
+            'AclNotFoundException', 'Action', 'ActionEvent',
+            'ActionListener', 'ActionMap', 'ActionMapUIResource',
+            'Activatable', 'ActivateFailedException',
+            'ActivationDesc', 'ActivationException',
+            'ActivationGroup', 'ActivationGroupDesc',
+            'ActivationGroupDesc.CommandEnvironment',
+            'ActivationGroupID', 'ActivationID',
+            'ActivationInstantiator', 'ActivationMonitor',
+            'ActivationSystem', 'Activator', 'ActiveEvent',
+            'Adjustable', 'AdjustmentEvent',
+            'AdjustmentListener', 'Adler32', 'AffineTransform',
+            'AffineTransformOp', 'AlgorithmParameterGenerator',
+            'AlgorithmParameterGeneratorSpi',
+            'AlgorithmParameters', 'AlgorithmParameterSpec',
+            'AlgorithmParametersSpi', 'AllPermission',
+            'AlphaComposite', 'AlreadyBound',
+            'AlreadyBoundException', 'AlreadyBoundHelper',
+            'AlreadyBoundHolder', 'AncestorEvent',
+            'AncestorListener', 'Annotation', 'Any', 'AnyHolder',
+            'AnySeqHelper', 'AnySeqHolder', 'Applet',
+            'AppletContext', 'AppletInitializer', 'AppletStub',
+            'ApplicationException', 'Arc2D', 'Arc2D.Double',
+            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
+            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
+            'ArithmeticException', 'Array',
+            'ArrayIndexOutOfBoundsException', 'ArrayList',
+            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
+            'Attribute', 'AttributedCharacterIterator',
+            'AttributedCharacterIterator.Attribute',
+            'AttributedString', 'AttributeInUseException',
+            'AttributeList', 'AttributeModificationException',
+            'Attributes', 'Attributes.Name', 'AttributeSet',
+            'AttributeSet.CharacterAttribute',
+            'AttributeSet.ColorAttribute',
+            'AttributeSet.FontAttribute',
+            'AttributeSet.ParagraphAttribute', 'AudioClip',
+            'AudioFileFormat', 'AudioFileFormat.Type',
+            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
+            'AudioFormat.Encoding', 'AudioInputStream',
+            'AudioPermission', 'AudioSystem',
+            'AuthenticationException',
+            'AuthenticationNotSupportedException',
+            'Authenticator', 'Autoscroll', 'AWTError',
+            'AWTEvent', 'AWTEventListener',
+            'AWTEventMulticaster', 'AWTException',
+            'AWTPermission', 'BadKind', 'BadLocationException',
+            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
+            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
+            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
+            'BandedSampleModel', 'BasicArrowButton',
+            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
+            'BasicBorders.ButtonBorder',
+            'BasicBorders.FieldBorder',
+            'BasicBorders.MarginBorder',
+            'BasicBorders.MenuBarBorder',
+            'BasicBorders.RadioButtonBorder',
+            'BasicBorders.SplitPaneBorder',
+            'BasicBorders.ToggleButtonBorder',
+            'BasicButtonListener', 'BasicButtonUI',
+            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
+            'BasicColorChooserUI', 'BasicComboBoxEditor',
+            'BasicComboBoxEditor.UIResource',
+            'BasicComboBoxRenderer',
+            'BasicComboBoxRenderer.UIResource',
+            'BasicComboBoxUI', 'BasicComboPopup',
+            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
+            'BasicDirectoryModel', 'BasicEditorPaneUI',
+            'BasicFileChooserUI', 'BasicGraphicsUtils',
+            'BasicHTML', 'BasicIconFactory',
+            'BasicInternalFrameTitlePane',
+            'BasicInternalFrameUI', 'BasicLabelUI',
+            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
+            'BasicMenuItemUI', 'BasicMenuUI',
+            'BasicOptionPaneUI',
+            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
+            'BasicPasswordFieldUI', 'BasicPermission',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
+            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
+            'BasicRadioButtonUI', 'BasicRootPaneUI',
+            'BasicScrollBarUI', 'BasicScrollPaneUI',
+            'BasicSeparatorUI', 'BasicSliderUI',
+            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
+            'BasicStroke', 'BasicTabbedPaneUI',
+            'BasicTableHeaderUI', 'BasicTableUI',
+            'BasicTextAreaUI', 'BasicTextFieldUI',
+            'BasicTextPaneUI', 'BasicTextUI',
+            'BasicTextUI.BasicCaret',
+            'BasicTextUI.BasicHighlighter',
+            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
+            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
+            'BasicViewportUI', 'BatchUpdateException',
+            'BeanContext', 'BeanContextChild',
+            'BeanContextChildComponentProxy',
+            'BeanContextChildSupport',
+            'BeanContextContainerProxy', 'BeanContextEvent',
+            'BeanContextMembershipEvent',
+            'BeanContextMembershipListener', 'BeanContextProxy',
+            'BeanContextServiceAvailableEvent',
+            'BeanContextServiceProvider',
+            'BeanContextServiceProviderBeanInfo',
+            'BeanContextServiceRevokedEvent',
+            'BeanContextServiceRevokedListener',
+            'BeanContextServices', 'BeanContextServicesListener',
+            'BeanContextServicesSupport',
+            'BeanContextServicesSupport.BCSSServiceProvider',
+            'BeanContextSupport',
+            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
+            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
+            'BigInteger', 'BinaryRefAddr', 'BindException',
+            'Binding', 'BindingHelper', 'BindingHolder',
+            'BindingIterator', 'BindingIteratorHelper',
+            'BindingIteratorHolder', 'BindingIteratorOperations',
+            'BindingListHelper', 'BindingListHolder',
+            'BindingType', 'BindingTypeHelper',
+            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
+            'Book', 'Boolean', 'BooleanControl',
+            'BooleanControl.Type', 'BooleanHolder',
+            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
+            'BorderFactory', 'BorderLayout', 'BorderUIResource',
+            'BorderUIResource.BevelBorderUIResource',
+            'BorderUIResource.CompoundBorderUIResource',
+            'BorderUIResource.EmptyBorderUIResource',
+            'BorderUIResource.EtchedBorderUIResource',
+            'BorderUIResource.LineBorderUIResource',
+            'BorderUIResource.MatteBorderUIResource',
+            'BorderUIResource.TitledBorderUIResource',
+            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
+            'BoxedValueHelper', 'BoxLayout', 'BoxView',
+            'BreakIterator', 'BufferedImage',
+            'BufferedImageFilter', 'BufferedImageOp',
+            'BufferedInputStream', 'BufferedOutputStream',
+            'BufferedReader', 'BufferedWriter', 'Button',
+            'ButtonGroup', 'ButtonModel', 'ButtonUI', 'Byte',
+            'ByteArrayInputStream', 'ByteArrayOutputStream',
+            'ByteHolder', 'ByteLookupTable', 'Calendar',
+            'CallableStatement', 'CannotProceed',
+            'CannotProceedException', 'CannotProceedHelper',
+            'CannotProceedHolder', 'CannotRedoException',
+            'CannotUndoException', 'Canvas', 'CardLayout',
+            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
+            'CellEditorListener', 'CellRendererPane',
+            'Certificate', 'Certificate.CertificateRep',
+            'CertificateEncodingException',
+            'CertificateException',
+            'CertificateExpiredException', 'CertificateFactory',
+            'CertificateFactorySpi',
+            'CertificateNotYetValidException',
+            'CertificateParsingException',
+            'ChangedCharSetException', 'ChangeEvent',
+            'ChangeListener', 'Character', 'Character.Subset',
+            'Character.UnicodeBlock', 'CharacterIterator',
+            'CharArrayReader', 'CharArrayWriter',
+            'CharConversionException', 'CharHolder',
+            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
+            'CheckboxGroup', 'CheckboxMenuItem',
+            'CheckedInputStream', 'CheckedOutputStream',
+            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
+            'ClassCastException', 'ClassCircularityError',
+            'ClassDesc', 'ClassFormatError', 'ClassLoader',
+            'ClassNotFoundException', 'Clip', 'Clipboard',
+            'ClipboardOwner', 'Clob', 'Cloneable',
+            'CloneNotSupportedException', 'CMMException',
+            'CodeSource', 'CollationElementIterator',
+            'CollationKey', 'Collator', 'Collection',
+            'Collections', 'Color',
+            'ColorChooserComponentFactory', 'ColorChooserUI',
+            'ColorConvertOp', 'ColorModel',
+            'ColorSelectionModel', 'ColorSpace',
+            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
+            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
+            'COMM_FAILURE', 'Comparable', 'Comparator',
+            'Compiler', 'CompletionStatus',
+            'CompletionStatusHelper', 'Component',
+            'ComponentAdapter', 'ComponentColorModel',
+            'ComponentEvent', 'ComponentInputMap',
+            'ComponentInputMapUIResource', 'ComponentListener',
+            'ComponentOrientation', 'ComponentSampleModel',
+            'ComponentUI', 'ComponentView', 'Composite',
+            'CompositeContext', 'CompositeName', 'CompositeView',
+            'CompoundBorder', 'CompoundControl',
+            'CompoundControl.Type', 'CompoundEdit',
+            'CompoundName', 'ConcurrentModificationException',
+            'ConfigurationException', 'ConnectException',
+            'ConnectIOException', 'Connection', 'Constructor',
+            'Container', 'ContainerAdapter', 'ContainerEvent',
+            'ContainerListener', 'ContentHandler',
+            'ContentHandlerFactory', 'ContentModel', 'Context',
+            'ContextList', 'ContextNotEmptyException',
+            'ContextualRenderedImageFactory', 'Control',
+            'Control.Type', 'ControlFactory',
+            'ControllerEventListener', 'ConvolveOp', 'CRC32',
+            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
+            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
+            'CubicCurve2D', 'CubicCurve2D.Double',
+            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
+            'CurrentHolder', 'CurrentOperations', 'Cursor',
+            'Customizer', 'CustomMarshal', 'CustomValue',
+            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
+            'DataBufferInt', 'DataBufferShort',
+            'DataBufferUShort', 'DataFlavor',
+            'DataFormatException', 'DatagramPacket',
+            'DatagramSocket', 'DatagramSocketImpl',
+            'DatagramSocketImplFactory', 'DataInput',
+            'DataInputStream', 'DataLine', 'DataLine.Info',
+            'DataOutput', 'DataOutputStream', 'DataTruncation',
+            'DATA_CONVERSION', 'Date', 'DateFormat',
+            'DateFormatSymbols', 'DebugGraphics',
+            'DecimalFormat', 'DecimalFormatSymbols',
+            'DefaultBoundedRangeModel', 'DefaultButtonModel',
+            'DefaultCaret', 'DefaultCellEditor',
+            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
+            'DefaultDesktopManager', 'DefaultEditorKit',
+            'DefaultEditorKit.BeepAction',
+            'DefaultEditorKit.CopyAction',
+            'DefaultEditorKit.CutAction',
+            'DefaultEditorKit.DefaultKeyTypedAction',
+            'DefaultEditorKit.InsertBreakAction',
+            'DefaultEditorKit.InsertContentAction',
+            'DefaultEditorKit.InsertTabAction',
+            'DefaultEditorKit.PasteAction,',
+            'DefaultFocusManager', 'DefaultHighlighter',
+            'DefaultHighlighter.DefaultHighlightPainter',
+            'DefaultListCellRenderer',
+            'DefaultListCellRenderer.UIResource',
+            'DefaultListModel', 'DefaultListSelectionModel',
+            'DefaultMenuLayout', 'DefaultMetalTheme',
+            'DefaultMutableTreeNode',
+            'DefaultSingleSelectionModel',
+            'DefaultStyledDocument',
+            'DefaultStyledDocument.AttributeUndoableEdit',
+            'DefaultStyledDocument.ElementSpec',
+            'DefaultTableCellRenderer',
+            'DefaultTableCellRenderer.UIResource',
+            'DefaultTableColumnModel', 'DefaultTableModel',
+            'DefaultTextUI', 'DefaultTreeCellEditor',
+            'DefaultTreeCellRenderer', 'DefaultTreeModel',
+            'DefaultTreeSelectionModel', 'DefinitionKind',
+            'DefinitionKindHelper', 'Deflater',
+            'DeflaterOutputStream', 'Delegate', 'DesignMode',
+            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
+            'DGC', 'Dialog', 'Dictionary', 'DigestException',
+            'DigestInputStream', 'DigestOutputStream',
+            'Dimension', 'Dimension2D', 'DimensionUIResource',
+            'DirContext', 'DirectColorModel', 'DirectoryManager',
+            'DirObjectFactory', 'DirStateFactory',
+            'DirStateFactory.Result', 'DnDConstants', 'Document',
+            'DocumentEvent', 'DocumentEvent.ElementChange',
+            'DocumentEvent.EventType', 'DocumentListener',
+            'DocumentParser', 'DomainCombiner', 'DomainManager',
+            'DomainManagerOperations', 'Double', 'DoubleHolder',
+            'DoubleSeqHelper', 'DoubleSeqHolder',
+            'DragGestureEvent', 'DragGestureListener',
+            'DragGestureRecognizer', 'DragSource',
+            'DragSourceContext', 'DragSourceDragEvent',
+            'DragSourceDropEvent', 'DragSourceEvent',
+            'DragSourceListener', 'Driver', 'DriverManager',
+            'DriverPropertyInfo', 'DropTarget',
+            'DropTarget.DropTargetAutoScroller',
+            'DropTargetContext', 'DropTargetDragEvent',
+            'DropTargetDropEvent', 'DropTargetEvent',
+            'DropTargetListener', 'DSAKey',
+            'DSAKeyPairGenerator', 'DSAParameterSpec',
+            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
+            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
+            'DTDConstants', 'DynamicImplementation', 'DynAny',
+            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
+            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
+            'Element', 'ElementIterator', 'Ellipse2D',
+            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
+            'EmptyStackException', 'EncodedKeySpec', 'Entity',
+            'EnumControl', 'EnumControl.Type', 'Enumeration',
+            'Environment', 'EOFException', 'Error',
+            'EtchedBorder', 'Event', 'EventContext',
+            'EventDirContext', 'EventListener',
+            'EventListenerList', 'EventObject', 'EventQueue',
+            'EventSetDescriptor', 'Exception',
+            'ExceptionInInitializerError', 'ExceptionList',
+            'ExpandVetoException', 'ExportException',
+            'ExtendedRequest', 'ExtendedResponse',
+            'Externalizable', 'FeatureDescriptor', 'Field',
+            'FieldNameHelper', 'FieldPosition', 'FieldView',
+            'File', 'FileChooserUI', 'FileDescriptor',
+            'FileDialog', 'FileFilter', 'FileInputStream',
+            'FilenameFilter', 'FileNameMap',
+            'FileNotFoundException', 'FileOutputStream',
+            'FilePermission', 'FileReader', 'FileSystemView',
+            'FileView', 'FileWriter', 'FilteredImageSource',
+            'FilterInputStream', 'FilterOutputStream',
+            'FilterReader', 'FilterWriter',
+            'FixedHeightLayoutCache', 'FixedHolder',
+            'FlatteningPathIterator', 'FlavorMap', 'Float',
+            'FloatControl', 'FloatControl.Type', 'FloatHolder',
+            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
+            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
+            'FocusEvent', 'FocusListener', 'FocusManager',
+            'Font', 'FontFormatException', 'FontMetrics',
+            'FontRenderContext', 'FontUIResource', 'Format',
+            'FormatConversionProvider', 'FormView', 'Frame',
+            'FREE_MEM', 'GapContent', 'GeneralPath',
+            'GeneralSecurityException', 'GlyphJustificationInfo',
+            'GlyphMetrics', 'GlyphVector', 'GlyphView',
+            'GlyphView.GlyphPainter', 'GradientPaint',
+            'GraphicAttribute', 'Graphics', 'Graphics2D',
+            'GraphicsConfigTemplate', 'GraphicsConfiguration',
+            'GraphicsDevice', 'GraphicsEnvironment',
+            'GrayFilter', 'GregorianCalendar',
+            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
+            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
+            'GZIPOutputStream', 'HasControls', 'HashMap',
+            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
+            'HierarchyBoundsListener', 'HierarchyEvent',
+            'HierarchyListener', 'Highlighter',
+            'Highlighter.Highlight',
+            'Highlighter.HighlightPainter', 'HTML',
+            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
+            'HTMLDocument', 'HTMLDocument.Iterator',
+            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
+            'HTMLEditorKit.HTMLTextAction',
+            'HTMLEditorKit.InsertHTMLTextAction',
+            'HTMLEditorKit.LinkController',
+            'HTMLEditorKit.Parser',
+            'HTMLEditorKit.ParserCallback',
+            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
+            'HttpURLConnection', 'HyperlinkEvent',
+            'HyperlinkEvent.EventType', 'HyperlinkListener',
+            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
+            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
+            'IconView', 'IdentifierHelper', 'Identity',
+            'IdentityScope', 'IDLEntity', 'IDLType',
+            'IDLTypeHelper', 'IDLTypeOperations',
+            'IllegalAccessError', 'IllegalAccessException',
+            'IllegalArgumentException',
+            'IllegalComponentStateException',
+            'IllegalMonitorStateException',
+            'IllegalPathStateException', 'IllegalStateException',
+            'IllegalThreadStateException', 'Image',
+            'ImageConsumer', 'ImageFilter',
+            'ImageGraphicAttribute', 'ImageIcon',
+            'ImageObserver', 'ImageProducer',
+            'ImagingOpException', 'IMP_LIMIT',
+            'IncompatibleClassChangeError',
+            'InconsistentTypeCode', 'IndexColorModel',
+            'IndexedPropertyDescriptor',
+            'IndexOutOfBoundsException', 'IndirectionException',
+            'InetAddress', 'Inflater', 'InflaterInputStream',
+            'InheritableThreadLocal', 'InitialContext',
+            'InitialContextFactory',
+            'InitialContextFactoryBuilder', 'InitialDirContext',
+            'INITIALIZE', 'Initializer', 'InitialLdapContext',
+            'InlineView', 'InputContext', 'InputEvent',
+            'InputMap', 'InputMapUIResource', 'InputMethod',
+            'InputMethodContext', 'InputMethodDescriptor',
+            'InputMethodEvent', 'InputMethodHighlight',
+            'InputMethodListener', 'InputMethodRequests',
+            'InputStream', 'InputStreamReader', 'InputSubset',
+            'InputVerifier', 'Insets', 'InsetsUIResource',
+            'InstantiationError', 'InstantiationException',
+            'Instrument', 'InsufficientResourcesException',
+            'Integer', 'INTERNAL', 'InternalError',
+            'InternalFrameAdapter', 'InternalFrameEvent',
+            'InternalFrameListener', 'InternalFrameUI',
+            'InterruptedException', 'InterruptedIOException',
+            'InterruptedNamingException', 'INTF_REPOS',
+            'IntHolder', 'IntrospectionException',
+            'Introspector', 'Invalid',
+            'InvalidAlgorithmParameterException',
+            'InvalidAttributeIdentifierException',
+            'InvalidAttributesException',
+            'InvalidAttributeValueException',
+            'InvalidClassException',
+            'InvalidDnDOperationException',
+            'InvalidKeyException', 'InvalidKeySpecException',
+            'InvalidMidiDataException', 'InvalidName',
+            'InvalidNameException', 'InvalidNameHelper',
+            'InvalidNameHolder', 'InvalidObjectException',
+            'InvalidParameterException',
+            'InvalidParameterSpecException',
+            'InvalidSearchControlsException',
+            'InvalidSearchFilterException', 'InvalidSeq',
+            'InvalidTransactionException', 'InvalidValue',
+            'INVALID_TRANSACTION', 'InvocationEvent',
+            'InvocationHandler', 'InvocationTargetException',
+            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
+            'INV_OBJREF', 'INV_POLICY', 'IOException',
+            'IRObject', 'IRObjectOperations', 'IstringHelper',
+            'ItemEvent', 'ItemListener', 'ItemSelectable',
+            'Iterator', 'JApplet', 'JarEntry', 'JarException',
+            'JarFile', 'JarInputStream', 'JarOutputStream',
+            'JarURLConnection', 'JButton', 'JCheckBox',
+            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
+            'JComboBox.KeySelectionManager', 'JComponent',
+            'JDesktopPane', 'JDialog', 'JEditorPane',
+            'JFileChooser', 'JFrame', 'JInternalFrame',
+            'JInternalFrame.JDesktopIcon', 'JLabel',
+            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
+            'JMenuItem', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType',
+            'JobAttributes.DestinationType',
+            'JobAttributes.DialogType',
+            'JobAttributes.MultipleDocumentHandlingType',
+            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
+            'JPasswordField', 'JPopupMenu',
+            'JPopupMenu.Separator', 'JProgressBar',
+            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
+            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
+            'JSplitPane', 'JTabbedPane', 'JTable',
+            'JTableHeader', 'JTextArea', 'JTextComponent',
+            'JTextComponent.KeyBinding', 'JTextField',
+            'JTextPane', 'JToggleButton',
+            'JToggleButton.ToggleButtonModel', 'JToolBar',
+            'JToolBar.Separator', 'JToolTip', 'JTree',
+            'JTree.DynamicUtilTreeNode',
+            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
+            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
+            'KeyException', 'KeyFactory', 'KeyFactorySpi',
+            'KeyListener', 'KeyManagementException', 'Keymap',
+            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
+            'KeySpec', 'KeyStore', 'KeyStoreException',
+            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
+            'LabelView', 'LastOwnerException',
+            'LayeredHighlighter',
+            'LayeredHighlighter.LayerPainter', 'LayoutManager',
+            'LayoutManager2', 'LayoutQueue', 'LdapContext',
+            'LdapReferralException', 'Lease',
+            'LimitExceededException', 'Line', 'Line.Info',
+            'Line2D', 'Line2D.Double', 'Line2D.Float',
+            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
+            'LineEvent.Type', 'LineListener', 'LineMetrics',
+            'LineNumberInputStream', 'LineNumberReader',
+            'LineUnavailableException', 'LinkageError',
+            'LinkedList', 'LinkException', 'LinkLoopException',
+            'LinkRef', 'List', 'ListCellRenderer',
+            'ListDataEvent', 'ListDataListener', 'ListIterator',
+            'ListModel', 'ListResourceBundle',
+            'ListSelectionEvent', 'ListSelectionListener',
+            'ListSelectionModel', 'ListUI', 'ListView',
+            'LoaderHandler', 'Locale', 'LocateRegistry',
+            'LogStream', 'Long', 'LongHolder',
+            'LongLongSeqHelper', 'LongLongSeqHolder',
+            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
+            'LookupOp', 'LookupTable', 'MalformedLinkException',
+            'MalformedURLException', 'Manifest', 'Map',
+            'Map.Entry', 'MARSHAL', 'MarshalException',
+            'MarshalledObject', 'Math', 'MatteBorder',
+            'MediaTracker', 'Member', 'MemoryImageSource',
+            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
+            'MenuContainer', 'MenuDragMouseEvent',
+            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
+            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
+            'MenuKeyListener', 'MenuListener',
+            'MenuSelectionManager', 'MenuShortcut',
+            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
+            'MetaEventListener', 'MetalBorders',
+            'MetalBorders.ButtonBorder',
+            'MetalBorders.Flush3DBorder',
+            'MetalBorders.InternalFrameBorder',
+            'MetalBorders.MenuBarBorder',
+            'MetalBorders.MenuItemBorder',
+            'MetalBorders.OptionDialogBorder',
+            'MetalBorders.PaletteBorder',
+            'MetalBorders.PopupMenuBorder',
+            'MetalBorders.RolloverButtonBorder',
+            'MetalBorders.ScrollPaneBorder',
+            'MetalBorders.TableHeaderBorder',
+            'MetalBorders.TextFieldBorder',
+            'MetalBorders.ToggleButtonBorder',
+            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
+            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
+            'MetalComboBoxButton', 'MetalComboBoxEditor',
+            'MetalComboBoxEditor.UIResource',
+            'MetalComboBoxIcon', 'MetalComboBoxUI',
+            'MetalDesktopIconUI', 'MetalFileChooserUI',
+            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
+            'MetalIconFactory.FolderIcon16',
+            'MetalIconFactory.PaletteCloseIcon',
+            'MetalIconFactory.TreeControlIcon',
+            'MetalIconFactory.TreeFolderIcon',
+            'MetalIconFactory.TreeLeafIcon',
+            'MetalInternalFrameTitlePane',
+            'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
+            'MetalProgressBarUI', 'MetalRadioButtonUI',
+            'MetalScrollBarUI', 'MetalScrollButton',
+            'MetalScrollPaneUI', 'MetalSeparatorUI',
+            'MetalSliderUI', 'MetalSplitPaneUI',
+            'MetalTabbedPaneUI', 'MetalTextFieldUI',
+            'MetalTheme', 'MetalToggleButtonUI',
+            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
+            'MetaMessage', 'Method', 'MethodDescriptor',
+            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
+            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
+            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
+            'MidiSystem', 'MidiUnavailableException',
+            'MimeTypeParseException', 'MinimalHTMLWriter',
+            'MissingResourceException', 'Mixer', 'Mixer.Info',
+            'MixerProvider', 'ModificationItem', 'Modifier',
+            'MouseAdapter', 'MouseDragGestureRecognizer',
+            'MouseEvent', 'MouseInputAdapter',
+            'MouseInputListener', 'MouseListener',
+            'MouseMotionAdapter', 'MouseMotionListener',
+            'MultiButtonUI', 'MulticastSocket',
+            'MultiColorChooserUI', 'MultiComboBoxUI',
+            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
+            'MultiFileChooserUI', 'MultiInternalFrameUI',
+            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
+            'MultiMenuBarUI', 'MultiMenuItemUI',
+            'MultiOptionPaneUI', 'MultiPanelUI',
+            'MultiPixelPackedSampleModel', 'MultipleMaster',
+            'MultiPopupMenuUI', 'MultiProgressBarUI',
+            'MultiScrollBarUI', 'MultiScrollPaneUI',
+            'MultiSeparatorUI', 'MultiSliderUI',
+            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
+            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
+            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
+            'MultiViewportUI', 'MutableAttributeSet',
+            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
+            'NameAlreadyBoundException', 'NameClassPair',
+            'NameComponent', 'NameComponentHelper',
+            'NameComponentHolder', 'NamedValue', 'NameHelper',
+            'NameHolder', 'NameNotFoundException', 'NameParser',
+            'NamespaceChangeListener', 'NameValuePair',
+            'NameValuePairHelper', 'Naming', 'NamingContext',
+            'NamingContextHelper', 'NamingContextHolder',
+            'NamingContextOperations', 'NamingEnumeration',
+            'NamingEvent', 'NamingException',
+            'NamingExceptionEvent', 'NamingListener',
+            'NamingManager', 'NamingSecurityException',
+            'NegativeArraySizeException', 'NetPermission',
+            'NoClassDefFoundError', 'NoInitialContextException',
+            'NoninvertibleTransformException',
+            'NoPermissionException', 'NoRouteToHostException',
+            'NoSuchAlgorithmException',
+            'NoSuchAttributeException', 'NoSuchElementException',
+            'NoSuchFieldError', 'NoSuchFieldException',
+            'NoSuchMethodError', 'NoSuchMethodException',
+            'NoSuchObjectException', 'NoSuchProviderException',
+            'NotActiveException', 'NotBoundException',
+            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
+            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
+            'NotFoundHolder', 'NotFoundReason',
+            'NotFoundReasonHelper', 'NotFoundReasonHolder',
+            'NotOwnerException', 'NotSerializableException',
+            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
+            'NO_RESOURCES', 'NO_RESPONSE',
+            'NullPointerException', 'Number', 'NumberFormat',
+            'NumberFormatException', 'NVList', 'Object',
+            'ObjectChangeListener', 'ObjectFactory',
+            'ObjectFactoryBuilder', 'ObjectHelper',
+            'ObjectHolder', 'ObjectImpl', 'ObjectInput',
+            'ObjectInputStream', 'ObjectInputStream.GetField',
+            'ObjectInputValidation', 'ObjectOutput',
+            'ObjectOutputStream', 'ObjectOutputStream.PutField',
+            'ObjectStreamClass', 'ObjectStreamConstants',
+            'ObjectStreamException', 'ObjectStreamField',
+            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
+            'OBJ_ADAPTER', 'Observable', 'Observer',
+            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
+            'OpenType', 'Operation',
+            'OperationNotSupportedException', 'Option',
+            'OptionalDataException', 'OptionPaneUI', 'ORB',
+            'OutOfMemoryError', 'OutputStream',
+            'OutputStreamWriter', 'OverlayLayout', 'Owner',
+            'Package', 'PackedColorModel', 'Pageable',
+            'PageAttributes', 'PageAttributes.ColorType',
+            'PageAttributes.MediaType',
+            'PageAttributes.OrientationRequestedType',
+            'PageAttributes.OriginType',
+            'PageAttributes.PrintQualityType', 'PageFormat',
+            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
+            'PanelUI', 'Paper', 'ParagraphView',
+            'ParameterBlock', 'ParameterDescriptor',
+            'ParseException', 'ParsePosition', 'Parser',
+            'ParserDelegator', 'PartialResultException',
+            'PasswordAuthentication', 'PasswordView', 'Patch',
+            'PathIterator', 'Permission', 'PermissionCollection',
+            'Permissions', 'PERSIST_STORE', 'PhantomReference',
+            'PipedInputStream', 'PipedOutputStream',
+            'PipedReader', 'PipedWriter', 'PixelGrabber',
+            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
+            'PlainDocument', 'PlainView', 'Point', 'Point2D',
+            'Point2D.Double', 'Point2D.Float', 'Policy',
+            'PolicyError', 'PolicyHelper', 'PolicyHolder',
+            'PolicyListHelper', 'PolicyListHolder',
+            'PolicyOperations', 'PolicyTypeHelper', 'Polygon',
+            'PopupMenu', 'PopupMenuEvent', 'PopupMenuListener',
+            'PopupMenuUI', 'Port', 'Port.Info',
+            'PortableRemoteObject',
+            'PortableRemoteObjectDelegate', 'Position',
+            'Position.Bias', 'PreparedStatement', 'Principal',
+            'PrincipalHolder', 'Printable',
+            'PrinterAbortException', 'PrinterException',
+            'PrinterGraphics', 'PrinterIOException',
+            'PrinterJob', 'PrintGraphics', 'PrintJob',
+            'PrintStream', 'PrintWriter', 'PrivateKey',
+            'PRIVATE_MEMBER', 'PrivilegedAction',
+            'PrivilegedActionException',
+            'PrivilegedExceptionAction', 'Process',
+            'ProfileDataException', 'ProgressBarUI',
+            'ProgressMonitor', 'ProgressMonitorInputStream',
+            'Properties', 'PropertyChangeEvent',
+            'PropertyChangeListener', 'PropertyChangeSupport',
+            'PropertyDescriptor', 'PropertyEditor',
+            'PropertyEditorManager', 'PropertyEditorSupport',
+            'PropertyPermission', 'PropertyResourceBundle',
+            'PropertyVetoException', 'ProtectionDomain',
+            'ProtocolException', 'Provider', 'ProviderException',
+            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
+            'PushbackInputStream', 'PushbackReader',
+            'QuadCurve2D', 'QuadCurve2D.Double',
+            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
+            'Raster', 'RasterFormatException', 'RasterOp',
+            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
+            'Rectangle2D.Double', 'Rectangle2D.Float',
+            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
+            'Referenceable', 'ReferenceQueue',
+            'ReferralException', 'ReflectPermission', 'Registry',
+            'RegistryHandler', 'RemarshalException', 'Remote',
+            'RemoteCall', 'RemoteException', 'RemoteObject',
+            'RemoteRef', 'RemoteServer', 'RemoteStub',
+            'RenderableImage', 'RenderableImageOp',
+            'RenderableImageProducer', 'RenderContext',
+            'RenderedImage', 'RenderedImageFactory', 'Renderer',
+            'RenderingHints', 'RenderingHints.Key',
+            'RepaintManager', 'ReplicateScaleFilter',
+            'Repository', 'RepositoryIdHelper', 'Request',
+            'RescaleOp', 'Resolver', 'ResolveResult',
+            'ResourceBundle', 'ResponseHandler', 'ResultSet',
+            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
+            'RMIClassLoader', 'RMIClientSocketFactory',
+            'RMIFailureHandler', 'RMISecurityException',
+            'RMISecurityManager', 'RMIServerSocketFactory',
+            'RMISocketFactory', 'Robot', 'RootPaneContainer',
+            'RootPaneUI', 'RoundRectangle2D',
+            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
+            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
+            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
+            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
+            'RSAPublicKeySpec', 'RTFEditorKit',
+            'RuleBasedCollator', 'Runnable', 'Runtime',
+            'RunTime', 'RuntimeException', 'RunTimeOperations',
+            'RuntimePermission', 'SampleModel',
+            'SchemaViolationException', 'Scrollable',
+            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
+            'ScrollPaneConstants', 'ScrollPaneLayout',
+            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
+            'SearchControls', 'SearchResult',
+            'SecureClassLoader', 'SecureRandom',
+            'SecureRandomSpi', 'Security', 'SecurityException',
+            'SecurityManager', 'SecurityPermission', 'Segment',
+            'SeparatorUI', 'Sequence', 'SequenceInputStream',
+            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
+            'SerializablePermission', 'ServantObject',
+            'ServerCloneException', 'ServerError',
+            'ServerException', 'ServerNotActiveException',
+            'ServerRef', 'ServerRequest',
+            'ServerRuntimeException', 'ServerSocket',
+            'ServiceDetail', 'ServiceDetailHelper',
+            'ServiceInformation', 'ServiceInformationHelper',
+            'ServiceInformationHolder',
+            'ServiceUnavailableException', 'Set',
+            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
+            'ShapeGraphicAttribute', 'Short', 'ShortHolder',
+            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
+            'ShortSeqHolder', 'Signature', 'SignatureException',
+            'SignatureSpi', 'SignedObject', 'Signer',
+            'SimpleAttributeSet', 'SimpleBeanInfo',
+            'SimpleDateFormat', 'SimpleTimeZone',
+            'SinglePixelPackedSampleModel',
+            'SingleSelectionModel', 'SizeLimitExceededException',
+            'SizeRequirements', 'SizeSequence', 'Skeleton',
+            'SkeletonMismatchException',
+            'SkeletonNotFoundException', 'SliderUI', 'Socket',
+            'SocketException', 'SocketImpl', 'SocketImplFactory',
+            'SocketOptions', 'SocketPermission',
+            'SocketSecurityException', 'SoftBevelBorder',
+            'SoftReference', 'SortedMap', 'SortedSet',
+            'Soundbank', 'SoundbankReader', 'SoundbankResource',
+            'SourceDataLine', 'SplitPaneUI', 'SQLData',
+            'SQLException', 'SQLInput', 'SQLOutput',
+            'SQLPermission', 'SQLWarning', 'Stack',
+            'StackOverflowError', 'StateEdit', 'StateEditable',
+            'StateFactory', 'Statement', 'Streamable',
+            'StreamableValue', 'StreamCorruptedException',
+            'StreamTokenizer', 'StrictMath', 'String',
+            'StringBuffer', 'StringBufferInputStream',
+            'StringCharacterIterator', 'StringContent',
+            'StringHolder', 'StringIndexOutOfBoundsException',
+            'StringReader', 'StringRefAddr', 'StringSelection',
+            'StringTokenizer', 'StringValueHelper',
+            'StringWriter', 'Stroke', 'Struct', 'StructMember',
+            'StructMemberHelper', 'Stub', 'StubDelegate',
+            'StubNotFoundException', 'Style', 'StyleConstants',
+            'StyleConstants.CharacterConstants',
+            'StyleConstants.ColorConstants',
+            'StyleConstants.FontConstants',
+            'StyleConstants.ParagraphConstants', 'StyleContext',
+            'StyledDocument', 'StyledEditorKit',
+            'StyledEditorKit.AlignmentAction',
+            'StyledEditorKit.BoldAction',
+            'StyledEditorKit.FontFamilyAction',
+            'StyledEditorKit.FontSizeAction',
+            'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction',
+            'StyledEditorKit.StyledTextAction',
+            'StyledEditorKit.UnderlineAction', 'StyleSheet',
+            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
+            'SwingConstants', 'SwingPropertyChangeSupport',
+            'SwingUtilities', 'SyncFailedException',
+            'Synthesizer', 'SysexMessage', 'System',
+            'SystemColor', 'SystemException', 'SystemFlavorMap',
+            'TabableView', 'TabbedPaneUI', 'TabExpander',
+            'TableCellEditor', 'TableCellRenderer',
+            'TableColumn', 'TableColumnModel',
+            'TableColumnModelEvent', 'TableColumnModelListener',
+            'TableHeaderUI', 'TableModel', 'TableModelEvent',
+            'TableModelListener', 'TableUI', 'TableView',
+            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
+            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
+            'TextComponent', 'TextEvent', 'TextField',
+            'TextHitInfo', 'TextLayout',
+            'TextLayout.CaretPolicy', 'TextListener',
+            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
+            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
+            'Throwable', 'Tie', 'TileObserver', 'Time',
+            'TimeLimitExceededException', 'Timer', 'TimerTask',
+            'Timestamp', 'TimeZone', 'TitledBorder', 'ToolBarUI',
+            'Toolkit', 'ToolTipManager', 'ToolTipUI',
+            'TooManyListenersException', 'Track',
+            'TransactionRequiredException',
+            'TransactionRolledbackException',
+            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
+            'Transferable', 'TransformAttribute', 'TRANSIENT',
+            'Transmitter', 'Transparency', 'TreeCellEditor',
+            'TreeCellRenderer', 'TreeExpansionEvent',
+            'TreeExpansionListener', 'TreeMap', 'TreeModel',
+            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
+            'TreePath', 'TreeSelectionEvent',
+            'TreeSelectionListener', 'TreeSelectionModel',
+            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
+            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
+            'Types', 'UID', 'UIDefaults',
+            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
+            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
+            'UIManager', 'UIManager.LookAndFeelInfo',
+            'UIResource', 'ULongLongSeqHelper',
+            'ULongLongSeqHolder', 'ULongSeqHelper',
+            'ULongSeqHolder', 'UndeclaredThrowableException',
+            'UndoableEdit', 'UndoableEditEvent',
+            'UndoableEditListener', 'UndoableEditSupport',
+            'UndoManager', 'UnexpectedException',
+            'UnicastRemoteObject', 'UnionMember',
+            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
+            'UnknownException', 'UnknownGroupException',
+            'UnknownHostException', 'UnknownObjectException',
+            'UnknownServiceException', 'UnknownUserException',
+            'UnmarshalException', 'UnrecoverableKeyException',
+            'Unreferenced', 'UnresolvedPermission',
+            'UnsatisfiedLinkError', 'UnsolicitedNotification',
+            'UnsolicitedNotificationEvent',
+            'UnsolicitedNotificationListener',
+            'UnsupportedAudioFileException',
+            'UnsupportedClassVersionError',
+            'UnsupportedEncodingException',
+            'UnsupportedFlavorException',
+            'UnsupportedLookAndFeelException',
+            'UnsupportedOperationException',
+            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
+            'URL', 'URLClassLoader', 'URLConnection',
+            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
+            'URLStreamHandlerFactory', 'UserException',
+            'UShortSeqHelper', 'UShortSeqHolder',
+            'UTFDataFormatException', 'Util', 'UtilDelegate',
+            'Utilities', 'ValueBase', 'ValueBaseHelper',
+            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
+            'ValueMember', 'ValueMemberHelper',
+            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
+            'VersionSpecHelper', 'VetoableChangeListener',
+            'VetoableChangeSupport', 'View', 'ViewFactory',
+            'ViewportLayout', 'ViewportUI',
+            'VirtualMachineError', 'Visibility',
+            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
+            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
+            'VoiceStatus', 'Void', 'WCharSeqHelper',
+            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
+            'Window', 'WindowAdapter', 'WindowConstants',
+            'WindowEvent', 'WindowListener', 'WrappedPlainView',
+            'WritableRaster', 'WritableRenderedImage',
+            'WriteAbortedException', 'Writer',
+            'WrongTransaction', 'WStringValueHelper',
+            'X509Certificate', 'X509CRL', 'X509CRLEntry',
+            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
+            'ZipException', 'ZipFile', 'ZipInputStream',
+            'ZipOutputStream', 'ZoneView',
+            '_BindingIteratorImplBase', '_BindingIteratorStub',
+            '_IDLTypeStub', '_NamingContextImplBase',
+            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
+            ),
+        4 => array(
+            'boolean', 'byte', 'char', 'double', 'float', 'int', 'long',
+            'short', 'void'
+            ),
+        5 => array(
+            'allProperties', 'asImmutable', 'asSynchronized', 'collect',
+            'count', 'each', 'eachProperty', 'eachPropertyName',
+            'eachWithIndex', 'find', 'findAll', 'findIndexOf',
+            'flatten', 'get', 'grep', 'inject', 'intersect',
+            'join', 'max', 'min', 'pop', 'reverse',
+            'reverseEach', 'size', 'sort', 'subMap', 'toList'
+            ),
+        6 => array(
+            'center', 'contains', 'eachMatch', 'padLeft', 'padRight',
+            'toCharacter', 'tokenize', 'toLong', 'toURL'
+            ),
+        7 => array(
+            'append', 'eachByte', 'eachFile', 'eachFileRecurse', 'eachLine',
+            'eachLines', 'encodeBase64', 'filterLine', 'getText',
+            'splitEachLine', 'transformChar', 'transformLine',
+            'withOutputStream', 'withPrintWriter', 'withReader',
+            'withStream', 'withStreams', 'withWriter',
+            'withWriterAppend', 'write', 'writeLine'
+            ),
+        8 => array(
+            'dump', 'getLastMatcher', 'inspect', 'invokeMethod', 'print',
+            'println', 'start', 'startDaemon', 'step', 'times',
+            'upto', 'use'
+            ),
+        9 => array(
+            'call', 'close', 'eachRow', 'execute', 'executeUpdate', 'Sql'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?', '|', '=',
+        '=>', '||', '-', '+', '<<', '<<<', '&&'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #aaaadd; font-weight: bold;',
+            4 => 'color: #993333;',
+            5 => 'color: #663399;',
+            6 => 'color: #CC0099;',
+            7 => 'color: #FFCC33;',
+            8 => 'color: #993399;',
+            9 => 'color: #993399; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1=> 'color: #808080; font-style: italic;',
+            2=> 'color: #a1a100;',
+            3=> '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;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAMEL}',
+        2 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAMEL}',
+        3 => 'http://www.google.de/search?as_q={FNAME}&num=100&hl=en&as_occt=url&as_sitesearch=java.sun.com%2Fj2se%2F1%2E5%2E0%2Fdocs%2Fapi%2F',
+        4 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        5 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        6 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        7 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        8 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}',
+        9 => 'http://www.google.de/search?q=site%3Agroovy.codehaus.org/%20{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '\\$\\{[a-zA-Z_][a-zA-Z0-9_]*\\}'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/gwbasic.php b/sources/inc/geshi/gwbasic.php
new file mode 100644
index 0000000..ecc1634
--- /dev/null
+++ b/sources/inc/geshi/gwbasic.php
@@ -0,0 +1,153 @@
+ 'GwBasic',
+    'COMMENT_SINGLE' => array(1 => "'", 2=> "REM"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+    /* Statements */
+        1 => array('END','FOR','NEXT','DATA','INPUT','DIM','READ','LET',
+            'GOTO','RUN','IF','RESTORE','GOSUB','RETURN','REM',
+            'STOP','PRINT','CLEAR','LIST','NEW','ON','WAIT','DEF',
+            'POKE','CONT','OUT','LPRINT','LLIST','WIDTH','ELSE',
+            'TRON','TROFF','SWAP','ERASE','EDIT','ERROR','RESUME',
+            'DELETE','AUTO','RENUM','DEFSTR','DEFINT','DEFSNG',
+            'DEFDBL','LINE','WHILE','WEND','CALL','WRITE','OPTION',
+            'RANDOMIZE','OPEN','CLOSE','LOAD','MERGE','SAVE',
+            'COLOR','CLS','MOTOR','BSAVE','BLOAD','SOUND','BEEP',
+            'PSET','PRESET','SCREEN','KEY','LOCATE','TO','THEN',
+            'STEP','USR','FN','SPC','NOT','ERL','ERR','STRING',
+            'USING','INSTR','VARPTR','CSRLIN','POINT','OFF',
+            'FILES','FIELD','SYSTEM','NAME','LSET','RSET','KILL',
+            'PUT','GET','RESET','COMMON','CHAIN','PAINT','COM',
+            'CIRCLE','DRAW','PLAY','TIMER','IOCTL','CHDIR','MKDIR',
+            'RMDIR','SHELL','VIEW','WINDOW','PMAP','PALETTE','LCOPY',
+            'CALLS','PCOPY','LOCK','UNLOCK','RANDOM','APPEND',
+            ),
+        2 => array(
+            /* Functions */
+            'CVI','CVS','CVD','MKI','MKS','MKD','ENVIRON',
+            'LEFT','RIGHT','MID','SGN','INT','ABS',
+            'SQR','SIN','LOG','EXP','COS','TAN','ATN',
+            'FRE','INP','POS','LEN','STR','VAL','ASC',
+            'CHR','PEEK','SPACE','OCT','HEX','LPOS',
+            'CINT','CSNG','CDBL','FIX','PEN','STICK',
+            'STRIG','EOF','LOC','LOF'
+            ),
+        3 => array(
+            /* alpha Operators */
+            'AND','OR','XOR','EQV','IMP','MOD'
+            ),
+        4 => array(
+            /* parameterless functions */
+            'INKEY','DATE','TIME','ERDEV','RND'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '>','=','<','+','-','*','/','^','\\'
+            ),
+        1 => array(
+            '?'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+            GESHI_COMMENTS => false,
+            1 => false,
+            2 => false,
+            3 => false,
+            4 => false
+            ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00a1a1;font-weight: bold',
+            2 => 'color: #000066;font-weight: bold',
+            3 => 'color: #00a166;font-weight: bold',
+            4 => 'color: #0066a1;font-weight: bold'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+        /* Same as KEYWORDS[3] (and, or, not...) */
+            0 => 'color: #00a166;font-weight: bold',
+            1 => 'color: #00a1a1;font-weight: bold',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #708090'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        1 => '^[0-9]+ '
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/haskell.php b/sources/inc/geshi/haskell.php
new file mode 100644
index 0000000..adae111
--- /dev/null
+++ b/sources/inc/geshi/haskell.php
@@ -0,0 +1,202 @@
+ 'Haskell',
+    'COMMENT_SINGLE' => array( 1 => '--'),
+    'COMMENT_MULTI' => array('{-' => '-}'),
+    'COMMENT_REGEXP' => array(
+        2 => "/-->/",
+        3 => "/{-(?:(?R)|.)-}/s", //Nested Comments
+        ),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"',"'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /* main haskell keywords */
+        1 => array(
+            'as',
+            'case', 'of', 'class', 'data', 'default',
+            'deriving', 'do', 'forall', 'hiding', 'if', 'then',
+            'else', 'import', 'infix', 'infixl', 'infixr',
+            'instance', 'let', 'in', 'module', 'newtype',
+            'qualified', 'type', 'where'
+            ),
+        /* define names of main librarys, so we can link to it */
+        2 => array(
+            'Foreign', 'Numeric', 'Prelude'
+            ),
+        /* just link to Prelude functions, cause it's the default opened library when starting Haskell */
+        3 => array(
+            'not', 'otherwise', 'maybe',
+            'either', 'fst', 'snd', 'curry', 'uncurry',
+            'compare',
+            'max', 'min', 'succ', 'pred', 'toEnum', 'fromEnum',
+            'enumFrom', 'enumFromThen', 'enumFromTo',
+            'enumFromThenTo', 'minBound', 'maxBound',
+            'negate', 'abs', 'signum',
+            'fromInteger', 'toRational', 'quot', 'rem',
+            'div', 'mod', 'quotRem', 'divMod', 'toInteger',
+            'recip', 'fromRational', 'pi', 'exp',
+            'log', 'sqrt', 'logBase', 'sin', 'cos',
+            'tan', 'asin', 'acos', 'atan', 'sinh', 'cosh',
+            'tanh', 'asinh', 'acosh', 'atanh',
+            'properFraction', 'truncate', 'round', 'ceiling',
+            'floor', 'floatRadix', 'floatDigits', 'floatRange',
+            'decodeFloat', 'encodeFloat', 'exponent',
+            'significand', 'scaleFloat', 'isNaN', 'isInfinite',
+            'isDenomalized', 'isNegativeZero', 'isIEEE',
+            'atan2', 'subtract', 'even', 'odd', 'gcd',
+            'lcm', 'fromIntegral', 'realToFrac',
+            'return', 'fail', 'fmap',
+            'mapM', 'mapM_', 'sequence', 'sequence_',
+            'id', 'const','flip',
+            'until', 'asTypeOf', 'error', 'undefined',
+            'seq','map','filter', 'head',
+            'last', 'tail', 'init', 'null', 'length',
+            'reverse', 'foldl', 'foldl1', 'foldr',
+            'foldr1', 'and', 'or', 'any', 'all', 'sum',
+            'product', 'concat', 'concatMap', 'maximum',
+            'minimum', 'scanl', 'scanl1', 'scanr', 'scanr1',
+            'iterate', 'repeat', 'cycle', 'take', 'drop',
+            'splitAt', 'takeWhile', 'dropWhile', 'span',
+            'break', 'elem', 'notElem', 'lookup', 'zip',
+            'zip3', 'zipWith', 'zipWith3', 'unzip', 'unzip3',
+            'lines', 'words', 'unlines',
+            'unwords', 'showPrec', 'show', 'showList',
+            'shows', 'showChar', 'showString', 'showParen',
+            'readsPrec', 'readList', 'reads', 'readParen',
+            'read', 'lex', 'putChar', 'putStr', 'putStrLn',
+            'print', 'getChar', 'getLine', 'getContents',
+            'interact', 'readFile', 'writeFile', 'appendFile',
+            'readIO', 'readLn', 'ioError', 'userError', 'catch'
+            ),
+        /* here Prelude Types */
+        4 => array (
+            'Bool', 'Maybe', 'Either', 'Ord', 'Ordering',
+            'Char', 'String', 'Eq', 'Enum', 'Bounded',
+            'Int', 'Integer', 'Float', 'Double', 'Rational',
+            'Num', 'Real', 'Integral', 'Fractional',
+            'Floating', 'RealFrac', 'RealFloat', 'Monad',
+            'Functor', 'Show', 'ShowS', 'Read', 'ReadS',
+            'IO'
+            ),
+        /* finally Prelude Exceptions */
+        5 => array (
+            'IOError', 'IOException'
+            )
+        ),
+    /* highlighting symbols is really important in Haskell */
+    'SYMBOLS' => array(
+        '|', '->', '<-', '@', '!', '::', '_', '~', '=', '?',
+        '&&', '||', '==', '/=', '<', '<=', '>',
+        '>=','+', '-', '*','/', '%', '**', '^', '^^',
+        '>>=', '>>', '=<<',  '$', '.', ',', '$!',
+        '++', '!!'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true, /* functions name are case seinsitive */
+        3 => true, /* types name too */
+        4 => true, /* finally exceptions too */
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;', /* nice blue */
+            2 => 'color: #06c; font-weight: bold;', /* blue as well */
+            3 => 'font-weight: bold;', /* make the preduled functions bold */
+            4 => 'color: #cccc00; font-weight: bold;', /* give types a different bg */
+            5 => 'color: maroon;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #5d478b; font-style: italic;',
+            2 => 'color: #339933; font-weight: bold;',
+            3 => 'color: #5d478b; font-style: italic;', /* light purple */
+            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'background-color: #3cb371; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: green;'
+            ),
+        'STRINGS' => array(
+            0 => 'background-color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: red;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        /* some of keywords are Prelude functions */
+        1 => '',
+        /* link to the wanted library */
+        2 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/{FNAME}.html',
+        /* link to Prelude functions */
+        3 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#v:{FNAME}',
+        /* link to Prelude types */
+        4 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#t:{FNAME}',
+        /* link to Prelude exceptions */
+        5 => 'http://haskell.org/ghc/docs/latest/html/libraries/base/Prelude.html#t:{FNAME}',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/haxe.php b/sources/inc/geshi/haxe.php
new file mode 100644
index 0000000..778637e
--- /dev/null
+++ b/sources/inc/geshi/haxe.php
@@ -0,0 +1,161 @@
+ 'Haxe',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s])|(?<=using[\\n\\s])|(?<=package[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*([a-zA-Z0-9_]+|\*)(?=[\n\s;])/i',
+        // Haxe comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            //http://haxe.org/ref/keywords
+            'break', 'callback', 'case', 'cast', 'catch', 'class', 'continue', 'default', 'do', 'dynamic',
+            'else', 'enum', 'extends', 'extern', /*'false',*/ 'for', 'function', 'here', 'if',
+            'implements', 'import', 'in', 'inline', 'interface', 'never', 'new', /*'null',*/ 'override',
+            'package', 'private', 'public', 'return', 'static', 'super', 'switch', 'this', 'throw',
+            'trace', /*'true',*/ 'try', 'typedef', 'untyped', 'using', 'var', 'while',
+            'macro', '$type',
+            ),
+        2 => array(
+            //primitive values
+            'null', 'false', 'true',
+            ),
+        3 => array(
+            //global types
+            'Array', 'ArrayAccess', /*'Bool',*/ 'Class', 'Date', 'DateTools', 'Dynamic',
+            'EReg', 'Enum', 'EnumValue', /*'Float',*/ 'Hash', /*'Int',*/ 'IntHash', 'IntIter',
+            'Iterable', 'Iterator', 'Lambda', 'List', 'Math', 'Null', 'Reflect', 'Std',
+            /*'String',*/ 'StringBuf', 'StringTools', 'Sys', 'Type', /*'UInt',*/ 'ValueType',
+            /*'Void',*/ 'Xml', 'XmlType',
+            ),
+        4 => array(
+            //primitive types
+            'Void', 'Bool', 'Int', 'Float', 'UInt', 'String',
+            ),
+        5 => array(
+            //compiler switches
+            "#if", "#elseif", "#else", "#end", "#error",
+            ),
+        ),
+    'SYMBOLS' => array(
+        //http://haxe.org/manual/operators
+        '++', '--',
+        '%',
+        '*', '/',
+        '+', '-',
+        '<<', '>>', '>>>',
+        '|', '&', '^',
+        '==', '!=', '>', '>=', '<', '<=',
+        '...',
+        '&&',
+        '||',
+        '?', ':',
+        '=', '+=', '-=', '/=', '*=', '<<=', '>>=', '>>>=', '|=', '&=', '^=',
+        '(', ')', '[', ']', '{', '}', ';',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #6699cc; font-weight: bold;',
+            2 => 'color: #000066; font-weight: bold;',
+            3 => 'color: #03F; ',
+            4 => 'color: #000033; font-weight: bold;',
+            5 => 'color: #330000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            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;',
+            'MULTI' => 'color: #666666; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;',
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/hicest.php b/sources/inc/geshi/hicest.php
new file mode 100644
index 0000000..78a2bc2
--- /dev/null
+++ b/sources/inc/geshi/hicest.php
@@ -0,0 +1,108 @@
+ 'HicEst',
+    'COMMENT_SINGLE' => array(1 => '!'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '$cmd_line', 'abs', 'acos', 'alarm', 'alias', 'allocate', 'appendix', 'asin', 'atan', 'axis', 'beep',
+            'call', 'ceiling', 'char', 'character', 'com', 'continue', 'cos', 'cosh', 'data', 'diffeq', 'dimension', 'dlg', 'dll',
+            'do', 'edit', 'else', 'elseif', 'end', 'enddo', 'endif', 'exp', 'floor', 'function', 'fuz', 'goto', 'iand', 'ichar',
+            'ieor', 'if', 'index', 'init', 'int', 'intpol', 'ior', 'key', 'len', 'len_trim', 'line', 'lock', 'log', 'max', 'maxloc',
+            'min', 'minloc', 'mod', 'nint', 'not', 'open', 'pop', 'ran', 'read', 'real', 'return', 'rgb', 'roots', 'sign', 'sin',
+            'sinh', 'solve', 'sort', 'subroutine', 'sum', 'system', 'tan', 'tanh', 'then', 'time', 'use', 'window', 'write', 'xeq'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '+', '-', '*', '/', '=', '<', '>', '!', '^', ':', ','
+            ),
+        2 => array(
+            '$', '$$'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;',
+            2 => 'color: #ff0000;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/hq9plus.php b/sources/inc/geshi/hq9plus.php
new file mode 100644
index 0000000..7ba1a73
--- /dev/null
+++ b/sources/inc/geshi/hq9plus.php
@@ -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 --git a/sources/inc/geshi/html4strict.php b/sources/inc/geshi/html4strict.php
new file mode 100644
index 0000000..97392fa
--- /dev/null
+++ b/sources/inc/geshi/html4strict.php
@@ -0,0 +1,190 @@
+ 'HTML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        2 => array(
+            'a', 'abbr', 'acronym', 'address', 'applet', 'area',
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+            'em',
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+            'kbd',
+            'label', 'legend', 'link', 'li',
+            'map', 'meta',
+            'noframes', 'noscript',
+            'object', 'ol', 'optgroup', 'option',
+            'param', 'pre', 'p',
+            'q',
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+            'ul', 'u',
+            'var',
+            ),
+        3 => array(
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        '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(
+            -2 => 'color: #404040;', // CDATA
+            -1 => 'color: #808080; font-style: italic;', // comments
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #009900;'
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        -2 => array(
+            ' ']]>'
+            ),
+        -1 => array(
+            ''
+            ),
+        0 => array(
+            ' '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        -2 => false,
+        -1 => false,
+        0 => false,
+        1 => false,
+        2 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=<|<\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/html5.php b/sources/inc/geshi/html5.php
new file mode 100644
index 0000000..0d97559
--- /dev/null
+++ b/sources/inc/geshi/html5.php
@@ -0,0 +1,212 @@
+ 'HTML5',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        2 => array(
+            'a', 'abbr', 'address', 'article', 'area', 'aside', 'audio',
+
+            'base', 'bdo', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'cite', 'code', 'colgroup', 'col', 'canvas', 'command', 'datalist', 'details',
+
+            'dd', 'del', 'dfn', 'div', 'dl', 'dt',
+
+            'em', 'embed',
+
+            'fieldset', 'form', 'figcaption', 'figure', 'footer',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html', 'header', 'hgroup',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd', 'keygen',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta', 'mark', 'meter',
+
+            'noscript', 'nav',
+
+            'object', 'ol', 'optgroup', 'option', 'output',
+
+            'param', 'pre', 'p', 'progress',
+
+            'q',
+
+            'rp', 'rt', 'ruby',
+
+            'samp', 'script', 'select', 'small', 'span', 'strong', 'style', 'sub', 'sup', 's', 'section', 'source', 'summary',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'time',
+
+            'ul',
+
+            'var', 'video',
+
+            'wbr',
+            ),
+        3 => array(
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis', 'autocomplete', 'autofocus',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords', 'contenteditable', 'contextmenu',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled', 'draggable', 'dropzone',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder', 'form', 'formaction', 'formenctype', 'formmethod', 'formnovalidate', 'formtarget',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv', 'hidden',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple', 'min', 'max',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap', 'novalidate',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onselect', 'onsubmit', 'onunload', 'onafterprint', 'onbeforeprint', 'onbeforeonload', 'onerror', 'onhaschange', 'onmessage', 'onoffline', 'ononline', 'onpagehide', 'onpageshow', 'onpopstate', 'onredo', 'onresize', 'onstorage', 'onundo', 'oncontextmenu', 'onformchange', 'onforminput', 'oninput', 'oninvalid', 'ondrag', 'ondragend', 'ondragenter', 'ondragleave', 'ondragover', 'ondragstart', 'ondrop', 'onmousewheel', 'onscroll', 'oncanplay', 'oncanplaythrough', 'ondurationchange', 'onemptied', 'onended', 'onloadeddata', 'onloadedmetadata', 'onloadstart', 'onpause', 'onplay', 'onplaying', 'onprogress', 'onratechange', 'onreadystatechange', 'onseeked', 'onseeking', 'onstalled', 'onsuspend', 'ontimeupdate', 'onvolumechange', 'onwaiting',
+            'profile', 'prompt', 'pattern', 'placeholder',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules', 'required',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary', 'spellcheck', 'step',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;'
+            ),
+        '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(
+            -2 => 'color: #404040;', // CDATA
+            -1 => 'color: #808080; font-style: italic;', // comments
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #009900;'
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        2 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        -2 => array(
+            ' ']]>'
+            ),
+        -1 => array(
+            ''
+            ),
+        0 => array(
+            ' '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        -2 => false,
+        -1 => false,
+        0 => false,
+        1 => false,
+        2 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=<|<\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/icon.php b/sources/inc/geshi/icon.php
new file mode 100644
index 0000000..06383ea
--- /dev/null
+++ b/sources/inc/geshi/icon.php
@@ -0,0 +1,212 @@
+ 'Icon',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'continue', 'create', 'default', 'do', 'else',
+            'end', 'every', 'fail', 'for', 'if', 'import', 'initial',
+            'initially', 'invocable', 'link', 'next', 'not', 'of', 'package',
+            'procedure', 'record', 'repeat', 'return', 'switch', 'suspend',
+            'then', 'to', 'until', 'while'
+            ),
+        2 => array(
+            'global', 'local', 'static'
+            ),
+        3 => array(
+            'allocated', 'ascii', 'clock', 'collections',
+            'column', 'cset', 'current', 'date', 'dateline', 'digits',
+            'dump', 'e', 'error', 'errornumber', 'errortext',
+            'errorvalue', 'errout', 'eventcode', 'eventsource', 'eventvalue',
+            'fail', 'features', 'file', 'host', 'input', 'lcase',
+            'letters', 'level', 'line', 'main', 'now', 'null',
+            'output', 'phi', 'pi', 'pos', 'progname', 'random',
+            'regions', 'source', 'storage', 'subject', 'syserr', 'time',
+            'trace', 'ucase', 'version', 'col', 'control', 'interval',
+            'ldrag', 'lpress', 'lrelease', 'mdrag', 'meta', 'mpress',
+            'mrelease', 'rdrag', 'resize', 'row', 'rpress', 'rrelease',
+            'shift', 'window', 'x', 'y'
+            ),
+        4 => array(
+            'abs', 'acos', 'any', 'args', 'asin', 'atan', 'bal', 'center', 'char',
+            'chmod', 'close', 'cofail', 'collect', 'copy', 'cos', 'cset', 'ctime', 'delay', 'delete',
+            'detab', 'display', 'dtor', 'entab', 'errorclear', 'event', 'eventmask', 'EvGet', 'exit',
+            'exp', 'fetch', 'fieldnames', 'find', 'flock', 'flush', 'function', 'get', 'getch',
+            'getche', 'getenv', 'gettimeofday', 'globalnames', 'gtime', 'iand', 'icom', 'image',
+            'insert', 'integer', 'ior', 'ishift', 'ixor', 'key', 'left', 'list', 'load', 'loadfunc',
+            'localnames', 'log', 'many', 'map', 'match', 'member', 'mkdir', 'move', 'name', 'numeric',
+            'open', 'opmask', 'ord', 'paramnames', 'parent', 'pipe', 'pop', 'pos', 'proc', 'pull',
+            'push', 'put', 'read', 'reads', 'real', 'receive', 'remove', 'rename', 'repl', 'reverse',
+            'right', 'rmdir', 'rtod', 'runerr', 'seek', 'select', 'send', 'seq', 'serial', 'set',
+            'setenv', 'sort', 'sortf', 'sql', 'sqrt', 'stat', 'stop', 'string', 'system', 'tab',
+            'table', 'tan', 'trap', 'trim', 'truncate', 'type', 'upto', 'utime', 'variable', 'where',
+            'write', 'writes'
+            ),
+        5 => array(
+            'Active', 'Alert', 'Bg', 'Clip', 'Clone', 'Color', 'ColorValue',
+            'CopyArea', 'Couple', 'DrawArc', 'DrawCircle', 'DrawCurve', 'DrawCylinder', 'DrawDisk',
+            'DrawImage', 'DrawLine', 'DrawPoint', 'DrawPolygon', 'DrawRectangle', 'DrawSegment',
+            'DrawSphere', 'DrawString', 'DrawTorus', 'EraseArea', 'Event', 'Fg', 'FillArc',
+            'FillCircle', 'FillPolygon', 'FillRectangle', 'Font', 'FreeColor', 'GotoRC', 'GotoXY',
+            'IdentifyMatrix', 'Lower', 'MatrixMode', 'NewColor', 'PaletteChars', 'PaletteColor',
+            'PaletteKey', 'Pattern', 'Pending', 'Pixel', 'PopMatrix', 'PushMatrix', 'PushRotate',
+            'PushScale', 'PushTranslate', 'QueryPointer', 'Raise', 'ReadImage', 'Refresh', 'Rotate',
+            'Scale', 'Texcoord', 'TextWidth', 'Texture', 'Translate', 'Uncouple', 'WAttrib',
+            'WDefault', 'WFlush', 'WindowContents', 'WriteImage', 'WSync'
+            ),
+        6 => array(
+            'define', 'include', 'ifdef', 'ifndef', 'else', 'endif', 'error',
+            'line', 'undef'
+            ),
+        7 => array(
+            '_V9', '_AMIGA', '_ACORN', '_CMS', '_MACINTOSH', '_MSDOS_386',
+            '_MS_WINDOWS_NT', '_MSDOS', '_MVS', '_OS2', '_POR', 'T', '_UNIX', '_POSIX', '_DBM',
+            '_VMS', '_ASCII', '_EBCDIC', '_CO_EXPRESSIONS', '_CONSOLE_WINDOW', '_DYNAMIC_LOADING',
+            '_EVENT_MONITOR', '_EXTERNAL_FUNCTIONS', '_KEYBOARD_FUNCTIONS', '_LARGE_INTEGERS',
+            '_MULTITASKING', '_PIPES', '_RECORD_IO', '_SYSTEM_FUNCTION', '_MESSAGING', '_GRAPHICS',
+            '_X_WINDOW_SYSTEM', '_MS_WINDOWS', '_WIN32', '_PRESENTATION_MGR', '_ARM_FUNCTIONS',
+            '_DOS_FUNCTIONS'
+            ),
+        8 => array(
+            'line'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '\\', '%', '=', '<', '>', '!', '^',
+            '&', '|', '?', ':', ';', ',', '.', '~', '@'
+            ),
+        2 => array(
+            '$(', '$)', '$<', '$>', '$'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b1b100;',
+            4 => 'color: #b1b100;',
+            5 => 'color: #b1b100;',
+            6 => 'color: #b1b100;',
+            7 => 'color: #b1b100;',
+            8 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;',
+            2 => 'color: #b1b100;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=&)'
+                ),
+            4 => array(
+                'DISALLOWED_BEFORE' => "(? "(?![a-zA-Z0-9_\"\'])"
+                ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=\$)'
+                ),
+            8 => array(
+                'DISALLOWED_BEFORE' => '(?<=#)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/idl.php b/sources/inc/geshi/idl.php
new file mode 100644
index 0000000..69bd14f
--- /dev/null
+++ b/sources/inc/geshi/idl.php
@@ -0,0 +1,123 @@
+ 'Uno Idl',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'published', 'get', 'set', 'service', 'singleton', 'type', 'module', 'interface', 'struct',
+            'const', 'constants', 'exception', 'enum', 'raises', 'typedef'
+            ),
+        2 => array(
+            'bound', 'maybeambiguous', 'maybedefault', 'maybevoid', 'oneway', 'optional',
+            'readonly', 'in', 'out', 'inout', 'attribute', 'transient', 'removable'
+            ),
+        3 => array(
+            'True', 'False', 'TRUE', 'FALSE'
+            ),
+        4 => array(
+            'string', 'long', 'byte', 'hyper', 'boolean', 'any', 'char', 'double',
+            'void', 'sequence', 'unsigned'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':', ';', '...'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #990078; font-weight: bold',
+            2 => 'color: #36dd1c;',
+            3 => 'color: #990078; font-weight: bold',
+            4 => 'color: #0000ec;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #3f7f5f;',
+            2 => 'color: #808080;',
+            'MULTI' => 'color: #4080ff; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #666666; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/ini.php b/sources/inc/geshi/ini.php
new file mode 100644
index 0000000..8e6ca76
--- /dev/null
+++ b/sources/inc/geshi/ini.php
@@ -0,0 +1,128 @@
+ 'INI',
+    'COMMENT_SINGLE' => array(0 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066; font-weight:bold;',
+            1 => 'color: #000099;',
+            2 => 'color: #660066;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Section names
+        0 => '\[.+\]',
+        //Entry names
+        1 => array(
+            GESHI_SEARCH => '^(\s*)([a-zA-Z0-9_\-]+)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Entry values
+        2 => array(
+            // Evil hackery to get around GeSHi bug: <>" and ; are added so s can be matched
+            // Explicit match on variable names because if a comment is before the first < of the span
+            // gets chewed up...
+            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+\s*)=(.*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1=',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/inno.php b/sources/inc/geshi/inno.php
new file mode 100644
index 0000000..1e2ee8b
--- /dev/null
+++ b/sources/inc/geshi/inno.php
@@ -0,0 +1,212 @@
+ 'Inno',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Setup','Types','Components','Tasks','Dirs','Files','Icons','INI',
+            'InstallDelete','Languages','Messages','CustomMessage',
+            'LangOptions','Registry','RUN','UninstallDelete','UninstallRun',
+            'app','win','sys','syswow64','src','sd','pf','pf32','pf64','cf',
+            'cf32','cf64','tmp','fonts','dao','group','localappdata','sendto',
+            'userappdata','commonappdata','userdesktop','commondesktop',
+            'userdocs','commondocs','userfavorites','commonfavorites',
+            'userprograms','commonprograms','userstartmenu','commonstartmenu',
+            'userstartup','commonstartup','usertemplates','commontemplates'
+            ),
+        2 => array(
+            'nil', 'false', 'true', 'var', 'type', 'const','And', 'Array', 'As', 'Begin', 'Case', 'Class', 'Constructor', 'Destructor', 'Div', 'Do', 'DownTo', 'Else',
+            'End', 'Except', 'File', 'Finally', 'For', 'Function', 'Goto', 'If', 'Implementation', 'In', 'Inherited', 'Interface',
+            'Is', 'Mod', 'Not', 'Object', 'Of', 'On', 'Or', 'Packed', 'Procedure', 'Property', 'Raise', 'Record',
+            'Repeat', 'Set', 'Shl', 'Shr', 'Then', 'ThreadVar', 'To', 'Try', 'Unit', 'Until', 'Uses', 'While', 'With', 'Xor',
+
+            'HKCC','HKCR','HKCU','HKLM','HKU','alwaysoverwrite','alwaysskipifsameorolder','append',
+            'binary','classic','closeonexit','comparetimestamp','confirmoverwrite',
+            'createkeyifdoesntexist','createonlyiffileexists','createvalueifdoesntexist',
+            'deleteafterinstall','deletekey','deletevalue','dirifempty','dontcloseonexit',
+            'dontcopy','dontcreatekey','disablenouninstallwarning','dword','exclusive','expandsz',
+            'external','files','filesandordirs','fixed','fontisnttruetype','ignoreversion','iscustom','isreadme',
+            'modern','multisz','new','noerror','none','normal','nowait','onlyifdestfileexists',
+            'onlyifdoesntexist','onlyifnewer','overwrite','overwritereadonly','postinstall',
+            'preservestringtype','promptifolder','regserver','regtypelib','restart','restartreplace',
+            'runhidden','runmaximized','runminimized','sharedfile','shellexec','showcheckbox',
+            'skipifnotsilent','skipifsilent','silent','skipifdoesntexist',
+            'skipifsourcedoesntexist','sortfilesbyextension','unchecked','uninsalwaysuninstall',
+            'uninsclearvalue','uninsdeleteentry','uninsdeletekey','uninsdeletekeyifempty',
+            'uninsdeletesection','uninsdeletesectionifempty','uninsdeletevalue',
+            'uninsneveruninstall','useapppaths','verysilent','waituntilidle'
+            ),
+        3 => array(
+            'Abs', 'Addr', 'AnsiCompareStr', 'AnsiCompareText', 'AnsiContainsStr', 'AnsiEndsStr', 'AnsiIndexStr', 'AnsiLeftStr',
+            'AnsiLowerCase', 'AnsiMatchStr', 'AnsiMidStr', 'AnsiPos', 'AnsiReplaceStr', 'AnsiReverseString', 'AnsiRightStr',
+            'AnsiStartsStr', 'AnsiUpperCase', 'ArcCos', 'ArcSin', 'ArcTan', 'Assigned', 'BeginThread', 'Bounds', 'CelsiusToFahrenheit',
+            'ChangeFileExt', 'Chr', 'CompareStr', 'CompareText', 'Concat', 'Convert', 'Copy', 'Cos', 'CreateDir', 'CurrToStr',
+            'CurrToStrF', 'Date', 'DateTimeToFileDate', 'DateTimeToStr', 'DateToStr', 'DayOfTheMonth', 'DayOfTheWeek', 'DayOfTheYear',
+            'DayOfWeek', 'DaysBetween', 'DaysInAMonth', 'DaysInAYear', 'DaySpan', 'DegToRad', 'DeleteFile', 'DiskFree', 'DiskSize',
+            'DupeString', 'EncodeDate', 'EncodeDateTime', 'EncodeTime', 'EndOfADay', 'EndOfAMonth', 'Eof', 'Eoln', 'Exp', 'ExtractFileDir',
+            'ExtractFileDrive', 'ExtractFileExt', 'ExtractFileName', 'ExtractFilePath', 'FahrenheitToCelsius', 'FileAge',
+            'FileDateToDateTime', 'FileExists', 'FilePos', 'FileSearch', 'FileSetDate', 'FileSize', 'FindClose', 'FindCmdLineSwitch',
+            'FindFirst', 'FindNext', 'FloatToStr', 'FloatToStrF', 'Format', 'FormatCurr', 'FormatDateTime', 'FormatFloat', 'Frac',
+            'GetCurrentDir', 'GetLastError', 'GetMem', 'High', 'IncDay', 'IncMinute', 'IncMonth', 'IncYear', 'InputBox',
+            'InputQuery', 'Int', 'IntToHex', 'IntToStr', 'IOResult', 'IsInfinite', 'IsLeapYear', 'IsMultiThread', 'IsNaN',
+            'LastDelimiter', 'Length', 'Ln', 'Lo', 'Log10', 'Low', 'LowerCase', 'Max', 'Mean', 'MessageDlg', 'MessageDlgPos',
+            'MonthOfTheYear', 'Now', 'Odd', 'Ord', 'ParamCount', 'ParamStr', 'Pi', 'Point', 'PointsEqual', 'Pos', 'Pred',
+            'Printer', 'PromptForFileName', 'PtInRect', 'RadToDeg', 'Random', 'RandomRange', 'RecodeDate', 'RecodeTime', 'Rect',
+            'RemoveDir', 'RenameFile', 'Round', 'SeekEof', 'SeekEoln', 'SelectDirectory', 'SetCurrentDir', 'Sin', 'SizeOf',
+            'Slice', 'Sqr', 'Sqrt', 'StringOfChar', 'StringReplace', 'StringToWideChar', 'StrToCurr', 'StrToDate', 'StrToDateTime',
+            'StrToFloat', 'StrToInt', 'StrToInt64', 'StrToInt64Def', 'StrToIntDef', 'StrToTime', 'StuffString', 'Succ', 'Sum', 'Tan',
+            'Time', 'TimeToStr', 'Tomorrow', 'Trunc', 'UpCase', 'UpperCase', 'VarType', 'WideCharToString', 'WrapText', 'Yesterday',
+            'Append', 'AppendStr', 'Assign', 'AssignFile', 'AssignPrn', 'Beep', 'BlockRead', 'BlockWrite', 'Break',
+            'ChDir', 'Close', 'CloseFile', 'Continue', 'DateTimeToString', 'Dec', 'DecodeDate', 'DecodeDateTime',
+            'DecodeTime', 'Delete', 'Dispose', 'EndThread', 'Erase', 'Exclude', 'Exit', 'FillChar', 'Flush', 'FreeAndNil',
+            'FreeMem', 'GetDir', 'GetLocaleFormatSettings', 'Halt', 'Inc', 'Include', 'Insert', 'MkDir', 'Move', 'New',
+            'ProcessPath', 'Randomize', 'Read', 'ReadLn', 'ReallocMem', 'Rename', 'ReplaceDate', 'ReplaceTime',
+            'Reset', 'ReWrite', 'RmDir', 'RunError', 'Seek', 'SetLength', 'SetString', 'ShowMessage', 'ShowMessageFmt',
+            'ShowMessagePos', 'Str', 'Truncate', 'Val', 'Write', 'WriteLn',
+
+            'AdminPrivilegesRequired','AfterInstall','AllowCancelDuringInstall','AllowNoIcons','AllowRootDirectory','AllowUNCPath','AlwaysRestart','AlwaysShowComponentsList','AlwaysShowDirOnReadyPage','AlwaysShowGroupOnReadyPage ','AlwaysUsePersonalGroup','AppComments','AppContact','AppCopyright','AppendDefaultDirName',
+            'AppendDefaultGroupName','AppId','AppModifyPath','AppMutex','AppName','AppPublisher',
+            'AppPublisherURL','AppReadmeFile','AppSupportURL','AppUpdatesURL','AppVerName','AppVersion',
+            'Attribs','BackColor','BackColor2','BackColorDirection','BackSolid','BeforeInstall',
+            'ChangesAssociations','ChangesEnvironment','Check','CodeFile','Comment','Compression','CopyMode',
+            'CreateAppDir','CreateUninstallRegKey','DefaultDirName','DefaultGroupName',
+            'DefaultUserInfoName','DefaultUserInfoOrg','DefaultUserInfoSerial',
+            'Description','DestDir','DestName','DirExistsWarning',
+            'DisableDirPage','DisableFinishedPage',
+            'DisableProgramGroupPage','DisableReadyMemo','DisableReadyPage',
+            'DisableStartupPrompt','DiskClusterSize','DiskSliceSize','DiskSpaceMBLabel',
+            'DiskSpanning','DontMergeDuplicateFiles','EnableDirDoesntExistWarning','Encryption',
+            'Excludes','ExtraDiskSpaceRequired','Filename','Flags','FlatComponentsList','FontInstall',
+            'GroupDescription','HotKey','IconFilename','IconIndex','InfoAfterFile','InfoBeforeFile',
+            'InternalCompressLevel','Key','LanguageDetectionMethod',
+            'LicenseFile','MergeDuplicateFiles','MessagesFile','MinVersion','Name',
+            'OnlyBelowVersion','OutputBaseFilename','OutputManifestFile','OutputDir',
+            'Parameters','Password','Permissions','PrivilegesRequired','ReserveBytes',
+            'RestartIfNeededByRun','Root','RunOnceId','Section','SetupIconFile',
+            'ShowComponentSizes','ShowLanguageDialog','ShowTasksTreeLines','SlicesPerDisk',
+            'SolidCompression','Source','SourceDir','StatusMsg','Subkey',
+            'TimeStampRounding','TimeStampsInUTC','TouchDate','TouchTime','Type',
+            'UninstallDisplayIcon','UninstallDisplayName','UninstallFilesDir','UninstallIconFile',
+            'UninstallLogMode','UninstallRestartComputer','UninstallStyle','Uninstallable',
+            'UpdateUninstallLogAppName','UsePreviousAppDir','UsePreviousGroup',
+            'UsePreviousTasks','UsePreviousSetupType','UsePreviousUserInfo',
+            'UserInfoPage','UseSetupLdr','ValueData','ValueName','ValueType',
+            'VersionInfoVersion','VersionInfoCompany','VersionInfoDescription','VersionInfoTextVersion',
+            'WindowResizable','WindowShowCaption','WindowStartMaximized',
+            'WindowVisible','WizardImageBackColor','WizardImageFile','WizardImageStretch','WizardSmallImageBackColor','WizardSmallImageFile','WizardStyle','WorkingDir'
+            ),
+        4 => array(
+            'AnsiChar', 'AnsiString', 'Boolean', 'Byte', 'Cardinal', 'Char', 'Comp', 'Currency', 'Double', 'Extended',
+            'Int64', 'Integer', 'LongInt', 'LongWord', 'PAnsiChar', 'PAnsiString', 'PChar', 'PCurrency', 'PDateTime',
+            'PExtended', 'PInt64', 'Pointer', 'PShortString', 'PString', 'PVariant', 'PWideChar', 'PWideString',
+            'Real', 'Real48', 'ShortInt', 'ShortString', 'Single', 'SmallInt', 'String', 'TBits', 'TConvType', 'TDateTime',
+            'Text', 'TextFile', 'TFloatFormat', 'TFormatSettings', 'TList', 'TObject', 'TOpenDialog', 'TPoint',
+            'TPrintDialog', 'TRect', 'TReplaceFlags', 'TSaveDialog', 'TSearchRec', 'TStringList', 'TSysCharSet',
+            'TThreadFunc', 'Variant', 'WideChar', 'WideString', 'Word'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '@', '%', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',/*bold Black*/
+            2 => 'color: #000000;font-style: italic;',/*Black*/
+            3 => 'color: #0000FF;',/*blue*/
+            4 => 'color: #CC0000;'/*red*/
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #33FF00; font-style: italic;',
+            'MULTI' => 'color: #33FF00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;',
+            ),
+        '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(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/intercal.php b/sources/inc/geshi/intercal.php
new file mode 100644
index 0000000..3c81b81
--- /dev/null
+++ b/sources/inc/geshi/intercal.php
@@ -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
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/io.php b/sources/inc/geshi/io.php
new file mode 100644
index 0000000..51fad43
--- /dev/null
+++ b/sources/inc/geshi/io.php
@@ -0,0 +1,138 @@
+ 'Io',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'and', 'break', 'else', 'elseif', 'exit', 'for', 'foreach', 'if', 'ifFalse', 'ifNil',
+            'ifTrue', 'or', 'pass', 'raise', 'return', 'then', 'try', 'wait', 'while', 'yield'
+            ),
+        2 => array(
+            'activate', 'activeCoroCount', 'asString', 'block', 'catch', 'clone', 'collectGarbage',
+            'compileString', 'continue', 'do', 'doFile', 'doMessage', 'doString', 'forward',
+            'getSlot', 'getenv', 'hasSlot', 'isActive', 'isNil', 'isResumable', 'list', 'message',
+            'method', 'parent', 'pause', 'perform', 'performWithArgList', 'print', 'proto',
+            'raiseResumable', 'removeSlot', 'resend', 'resume', 'schedulerSleepSeconds', 'self',
+            'sender', 'setSchedulerSleepSeconds', 'setSlot', 'shallowCopy', 'slotNames', 'super',
+            'system', 'thisBlock', 'thisContext', 'thisMessage', 'type', 'uniqueId', 'updateSlot',
+            'write'
+            ),
+        3 => array(
+            'Array', 'AudioDevice', 'AudioMixer', 'Block', 'Box', 'Buffer', 'CFunction', 'CGI',
+            'Color', 'Curses', 'DBM', 'DNSResolver', 'DOConnection', 'DOProxy', 'DOServer',
+            'Date', 'Directory', 'Duration', 'DynLib', 'Error', 'Exception', 'FFT', 'File',
+            'Fnmatch', 'Font', 'Future', 'GL', 'GLE', 'GLScissor', 'GLU', 'GLUCylinder',
+            'GLUQuadric', 'GLUSphere', 'GLUT', 'Host', 'Image', 'Importer', 'LinkList', 'List',
+            'Lobby', 'Locals', 'MD5', 'MP3Decoder', 'MP3Encoder', 'Map', 'Message', 'Movie',
+            'NULL', 'Nil', 'Nop', 'Notifiction', 'Number', 'Object', 'OpenGL', 'Point', 'Protos',
+            'Regex', 'SGMLTag', 'SQLite', 'Server', 'ShowMessage', 'SleepyCat', 'SleepyCatCursor',
+            'Socket', 'SocketManager', 'Sound', 'Soup', 'Store', 'String', 'Tree', 'UDPSender',
+            'UDPReceiver', 'URL', 'User', 'Warning', 'WeakLink'
+            )
+        ),
+    '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(
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/j.php b/sources/inc/geshi/j.php
new file mode 100644
index 0000000..5565bb4
--- /dev/null
+++ b/sources/inc/geshi/j.php
@@ -0,0 +1,190 @@
+ 'J',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => '/(? '/(?<=\bNote\b).*?$\s+\)(?:(?!\n)\s)*$/sm',   //multiline comments in Note
+        3 => "/'[^']*?$/m"                        //incomplete strings/open quotes
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("'"),
+    'HARDCHAR' => "'",
+    'NUMBERS' => array(
+        0 => '\b(?:_?\d+(?:\.\d+)?(?:x|[bejprx]_?[\da-z]+(?:\.[\da-z]+)?)?|__?)(?![\w\.\:])',
+        ),
+    'KEYWORDS' => array(
+        //Control words
+        1 => array(
+            'assert.', 'break.', 'case.', 'catch.', 'catcht.', 'continue.', 'do.',
+            'else.', 'elseif.', 'end.', 'fcase.', 'for.', 'goto.', 'if.', 'label.',
+            'return.', 'select.', 'throw.', 'trap.', 'try.', 'while.', 'whilst.'
+            ),
+        //Arguments
+        2 => array(
+            'm', 'n', 'u', 'v', 'x', 'y'
+            ),
+        ),
+    'SYMBOLS' => array(
+        //Punctuation
+        0 => array(
+            '(', ')'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        //6 => true,
+        //7 => true,
+        //8 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #0000cc; font-weight: bold;',
+            //6 => 'color: #000000; font-weight: bold;',
+            //7 => 'color: #000000; font-weight: bold;',
+            //8 => 'color: #000000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic; font-weight: bold;',
+            3 => 'color: #ff00ff; ',                      //open quote
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            'HARD' => 'font-weight: bold;',
+            0 => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            'HARD' => 'color: #ff0000;',
+            0 => 'color: #ff0000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #009999; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;',   //for_xyz. - same as kw1
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '', //'http://www.jsoftware.com/help/dictionary/ctrl.htm',
+        2 => '',
+        //6 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
+        //7 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
+        //8 => '', //'http://www.jsoftware.com/jwiki/Vocabulary',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => '\b(for|goto|label)_[a-zA-Z]\w*\.',   //for_xyz. - should be kw1
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            ),
+        'NUMBERS' => array(
+            'PRECHECK_RX' => '#[\d_]#',            // underscore is valid number
+            ),
+        'KEYWORDS' => array(
+            //Control words
+            2 => array(
+                'DISALLOWED_BEFORE' => '(? '(?![\w\.\:])',
+                ),
+            //Primtives starting with a symbol (except . or :)
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?!K)',    // effect should be to allow anything
+                'DISALLOWED_AFTER' => '(?=.*)',
+                ),
+            //Primtives starting with a letter
+            7 => array(
+                'DISALLOWED_BEFORE' => '(? '(?=.*)',
+                ),
+            //Primtives starting with symbol . or :
+            8 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)',
+                'DISALLOWED_AFTER' => '(?=.*)',
+                ),
+            )
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/java.php b/sources/inc/geshi/java.php
new file mode 100644
index 0000000..652b8dd
--- /dev/null
+++ b/sources/inc/geshi/java.php
@@ -0,0 +1,983 @@
+ 'Java',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    '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',
+        // javadoc comments
+        3 => '#/\*\*(?![\*\/]).*\*/#sU'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'for', 'foreach', 'if', 'else', 'while', 'do',
+            'switch', 'case',  'return', 'public',
+            'private', 'protected', 'extends', 'break', 'class',
+            'new', 'try', 'catch', 'throws', 'finally', 'implements',
+            'interface', 'throw', 'final', 'native', 'synchronized', 'this',
+            'abstract', 'transient', 'instanceof', 'assert', 'continue',
+            'default', 'enum', 'package', 'static', 'strictfp', 'super',
+            'volatile', 'const', 'goto', 'import'
+            ),
+        2 => array(
+            'null', 'false', 'true'
+            ),
+        3 => array(
+            'AbstractAction', 'AbstractBorder', 'AbstractButton',
+            'AbstractCellEditor', 'AbstractCollection',
+            'AbstractColorChooserPanel', 'AbstractDocument',
+            'AbstractDocument.AttributeContext',
+            'AbstractDocument.Content',
+            'AbstractDocument.ElementEdit',
+            'AbstractLayoutCache',
+            'AbstractLayoutCache.NodeDimensions', 'AbstractList',
+            'AbstractListModel', 'AbstractMap',
+            'AbstractMethodError', 'AbstractSequentialList',
+            'AbstractSet', 'AbstractTableModel',
+            'AbstractUndoableEdit', 'AbstractWriter',
+            'AccessControlContext', 'AccessControlException',
+            'AccessController', 'AccessException', 'Accessible',
+            'AccessibleAction', 'AccessibleBundle',
+            'AccessibleComponent', 'AccessibleContext',
+            'AccessibleHyperlink', 'AccessibleHypertext',
+            'AccessibleIcon', 'AccessibleObject',
+            'AccessibleRelation', 'AccessibleRelationSet',
+            'AccessibleResourceBundle', 'AccessibleRole',
+            'AccessibleSelection', 'AccessibleState',
+            'AccessibleStateSet', 'AccessibleTable',
+            'AccessibleTableModelChange', 'AccessibleText',
+            'AccessibleValue', 'Acl', 'AclEntry',
+            'AclNotFoundException', 'Action', 'ActionEvent',
+            'ActionListener', 'ActionMap', 'ActionMapUIResource',
+            'Activatable', 'ActivateFailedException',
+            'ActivationDesc', 'ActivationException',
+            'ActivationGroup', 'ActivationGroupDesc',
+            'ActivationGroupDesc.CommandEnvironment',
+            'ActivationGroupID', 'ActivationID',
+            'ActivationInstantiator', 'ActivationMonitor',
+            'ActivationSystem', 'Activator', 'ActiveEvent',
+            'Adjustable', 'AdjustmentEvent',
+            'AdjustmentListener', 'Adler32', 'AffineTransform',
+            'AffineTransformOp', 'AlgorithmParameterGenerator',
+            'AlgorithmParameterGeneratorSpi',
+            'AlgorithmParameters', 'AlgorithmParameterSpec',
+            'AlgorithmParametersSpi', 'AllPermission',
+            'AlphaComposite', 'AlreadyBound',
+            'AlreadyBoundException', 'AlreadyBoundHelper',
+            'AlreadyBoundHolder', 'AncestorEvent',
+            'AncestorListener', 'Annotation', 'Any', 'AnyHolder',
+            'AnySeqHelper', 'AnySeqHolder', 'Applet',
+            'AppletContext', 'AppletInitializer', 'AppletStub',
+            'ApplicationException', 'Arc2D', 'Arc2D.Double',
+            'Arc2D.Float', 'Area', 'AreaAveragingScaleFilter',
+            'ARG_IN', 'ARG_INOUT', 'ARG_OUT',
+            'ArithmeticException', 'Array',
+            'ArrayIndexOutOfBoundsException', 'ArrayList',
+            'Arrays', 'ArrayStoreException', 'AsyncBoxView',
+            'Attribute', 'AttributedCharacterIterator',
+            'AttributedCharacterIterator.Attribute',
+            'AttributedString', 'AttributeInUseException',
+            'AttributeList', 'AttributeModificationException',
+            'Attributes', 'Attributes.Name', 'AttributeSet',
+            'AttributeSet.CharacterAttribute',
+            'AttributeSet.ColorAttribute',
+            'AttributeSet.FontAttribute',
+            'AttributeSet.ParagraphAttribute', 'AudioClip',
+            'AudioFileFormat', 'AudioFileFormat.Type',
+            'AudioFileReader', 'AudioFileWriter', 'AudioFormat',
+            'AudioFormat.Encoding', 'AudioInputStream',
+            'AudioPermission', 'AudioSystem',
+            'AuthenticationException',
+            'AuthenticationNotSupportedException',
+            'Authenticator', 'Autoscroll', 'AWTError',
+            'AWTEvent', 'AWTEventListener',
+            'AWTEventMulticaster', 'AWTException',
+            'AWTPermission', 'BadKind', 'BadLocationException',
+            'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION',
+            'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE',
+            'BAD_POLICY_VALUE', 'BAD_TYPECODE', 'BandCombineOp',
+            'BandedSampleModel', 'BasicArrowButton',
+            'BasicAttribute', 'BasicAttributes', 'BasicBorders',
+            'BasicBorders.ButtonBorder',
+            'BasicBorders.FieldBorder',
+            'BasicBorders.MarginBorder',
+            'BasicBorders.MenuBarBorder',
+            'BasicBorders.RadioButtonBorder',
+            'BasicBorders.SplitPaneBorder',
+            'BasicBorders.ToggleButtonBorder',
+            'BasicButtonListener', 'BasicButtonUI',
+            'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI',
+            'BasicColorChooserUI', 'BasicComboBoxEditor',
+            'BasicComboBoxEditor.UIResource',
+            'BasicComboBoxRenderer',
+            'BasicComboBoxRenderer.UIResource',
+            'BasicComboBoxUI', 'BasicComboPopup',
+            'BasicDesktopIconUI', 'BasicDesktopPaneUI',
+            'BasicDirectoryModel', 'BasicEditorPaneUI',
+            'BasicFileChooserUI', 'BasicGraphicsUtils',
+            'BasicHTML', 'BasicIconFactory',
+            'BasicInternalFrameTitlePane',
+            'BasicInternalFrameUI', 'BasicLabelUI',
+            'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI',
+            'BasicMenuItemUI', 'BasicMenuUI',
+            'BasicOptionPaneUI',
+            'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI',
+            'BasicPasswordFieldUI', 'BasicPermission',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI',
+            'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI',
+            'BasicRadioButtonUI', 'BasicRootPaneUI',
+            'BasicScrollBarUI', 'BasicScrollPaneUI',
+            'BasicSeparatorUI', 'BasicSliderUI',
+            'BasicSplitPaneDivider', 'BasicSplitPaneUI',
+            'BasicStroke', 'BasicTabbedPaneUI',
+            'BasicTableHeaderUI', 'BasicTableUI',
+            'BasicTextAreaUI', 'BasicTextFieldUI',
+            'BasicTextPaneUI', 'BasicTextUI',
+            'BasicTextUI.BasicCaret',
+            'BasicTextUI.BasicHighlighter',
+            'BasicToggleButtonUI', 'BasicToolBarSeparatorUI',
+            'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI',
+            'BasicViewportUI', 'BatchUpdateException',
+            'BeanContext', 'BeanContextChild',
+            'BeanContextChildComponentProxy',
+            'BeanContextChildSupport',
+            'BeanContextContainerProxy', 'BeanContextEvent',
+            'BeanContextMembershipEvent',
+            'BeanContextMembershipListener', 'BeanContextProxy',
+            'BeanContextServiceAvailableEvent',
+            'BeanContextServiceProvider',
+            'BeanContextServiceProviderBeanInfo',
+            'BeanContextServiceRevokedEvent',
+            'BeanContextServiceRevokedListener',
+            'BeanContextServices', 'BeanContextServicesListener',
+            'BeanContextServicesSupport',
+            'BeanContextServicesSupport.BCSSServiceProvider',
+            'BeanContextSupport',
+            'BeanContextSupport.BCSIterator', 'BeanDescriptor',
+            'BeanInfo', 'Beans', 'BevelBorder', 'BigDecimal',
+            'BigInteger', 'BinaryRefAddr', 'BindException',
+            'Binding', 'BindingHelper', 'BindingHolder',
+            'BindingIterator', 'BindingIteratorHelper',
+            'BindingIteratorHolder', 'BindingIteratorOperations',
+            'BindingListHelper', 'BindingListHolder',
+            'BindingType', 'BindingTypeHelper',
+            'BindingTypeHolder', 'BitSet', 'Blob', 'BlockView',
+            'Book', 'Boolean', 'BooleanControl',
+            'BooleanControl.Type', 'BooleanHolder',
+            'BooleanSeqHelper', 'BooleanSeqHolder', 'Border',
+            'BorderFactory', 'BorderLayout', 'BorderUIResource',
+            'BorderUIResource.BevelBorderUIResource',
+            'BorderUIResource.CompoundBorderUIResource',
+            'BorderUIResource.EmptyBorderUIResource',
+            'BorderUIResource.EtchedBorderUIResource',
+            'BorderUIResource.LineBorderUIResource',
+            'BorderUIResource.MatteBorderUIResource',
+            'BorderUIResource.TitledBorderUIResource',
+            'BoundedRangeModel', 'Bounds', 'Box', 'Box.Filler',
+            'BoxedValueHelper', 'BoxLayout', 'BoxView',
+            'BreakIterator', 'BufferedImage',
+            'BufferedImageFilter', 'BufferedImageOp',
+            'BufferedInputStream', 'BufferedOutputStream',
+            'BufferedReader', 'BufferedWriter', 'Button',
+            'ButtonGroup', 'ButtonModel', 'ButtonUI', 'Byte',
+            'ByteArrayInputStream', 'ByteArrayOutputStream',
+            'ByteHolder', 'ByteLookupTable', 'Calendar',
+            'CallableStatement', 'CannotProceed',
+            'CannotProceedException', 'CannotProceedHelper',
+            'CannotProceedHolder', 'CannotRedoException',
+            'CannotUndoException', 'Canvas', 'CardLayout',
+            'Caret', 'CaretEvent', 'CaretListener', 'CellEditor',
+            'CellEditorListener', 'CellRendererPane',
+            'Certificate', 'Certificate.CertificateRep',
+            'CertificateEncodingException',
+            'CertificateException',
+            'CertificateExpiredException', 'CertificateFactory',
+            'CertificateFactorySpi',
+            'CertificateNotYetValidException',
+            'CertificateParsingException',
+            'ChangedCharSetException', 'ChangeEvent',
+            'ChangeListener', 'Character', 'Character.Subset',
+            'Character.UnicodeBlock', 'CharacterIterator',
+            'CharArrayReader', 'CharArrayWriter',
+            'CharConversionException', 'CharHolder',
+            'CharSeqHelper', 'CharSeqHolder', 'Checkbox',
+            'CheckboxGroup', 'CheckboxMenuItem',
+            'CheckedInputStream', 'CheckedOutputStream',
+            'Checksum', 'Choice', 'ChoiceFormat', 'Class',
+            'ClassCastException', 'ClassCircularityError',
+            'ClassDesc', 'ClassFormatError', 'ClassLoader',
+            'ClassNotFoundException', 'Clip', 'Clipboard',
+            'ClipboardOwner', 'Clob', 'Cloneable',
+            'CloneNotSupportedException', 'CMMException',
+            'CodeSource', 'CollationElementIterator',
+            'CollationKey', 'Collator', 'Collection',
+            'Collections', 'Color',
+            'ColorChooserComponentFactory', 'ColorChooserUI',
+            'ColorConvertOp', 'ColorModel',
+            'ColorSelectionModel', 'ColorSpace',
+            'ColorUIResource', 'ComboBoxEditor', 'ComboBoxModel',
+            'ComboBoxUI', 'ComboPopup', 'CommunicationException',
+            'COMM_FAILURE', 'Comparable', 'Comparator',
+            'Compiler', 'CompletionStatus',
+            'CompletionStatusHelper', 'Component',
+            'ComponentAdapter', 'ComponentColorModel',
+            'ComponentEvent', 'ComponentInputMap',
+            'ComponentInputMapUIResource', 'ComponentListener',
+            'ComponentOrientation', 'ComponentSampleModel',
+            'ComponentUI', 'ComponentView', 'Composite',
+            'CompositeContext', 'CompositeName', 'CompositeView',
+            'CompoundBorder', 'CompoundControl',
+            'CompoundControl.Type', 'CompoundEdit',
+            'CompoundName', 'ConcurrentModificationException',
+            'ConfigurationException', 'ConnectException',
+            'ConnectIOException', 'Connection', 'Constructor', 'Container',
+            'ContainerAdapter', 'ContainerEvent',
+            'ContainerListener', 'ContentHandler',
+            'ContentHandlerFactory', 'ContentModel', 'Context',
+            'ContextList', 'ContextNotEmptyException',
+            'ContextualRenderedImageFactory', 'Control',
+            'Control.Type', 'ControlFactory',
+            'ControllerEventListener', 'ConvolveOp', 'CRC32',
+            'CRL', 'CRLException', 'CropImageFilter', 'CSS',
+            'CSS.Attribute', 'CTX_RESTRICT_SCOPE',
+            'CubicCurve2D', 'CubicCurve2D.Double',
+            'CubicCurve2D.Float', 'Current', 'CurrentHelper',
+            'CurrentHolder', 'CurrentOperations', 'Cursor',
+            'Customizer', 'CustomMarshal', 'CustomValue',
+            'DatabaseMetaData', 'DataBuffer', 'DataBufferByte',
+            'DataBufferInt', 'DataBufferShort',
+            'DataBufferUShort', 'DataFlavor',
+            'DataFormatException', 'DatagramPacket',
+            'DatagramSocket', 'DatagramSocketImpl',
+            'DatagramSocketImplFactory', 'DataInput',
+            'DataInputStream', 'DataLine', 'DataLine.Info',
+            'DataOutput', 'DataOutputStream',
+            'DataTruncation', 'DATA_CONVERSION', 'Date',
+            'DateFormat', 'DateFormatSymbols', 'DebugGraphics',
+            'DecimalFormat', 'DecimalFormatSymbols',
+            'DefaultBoundedRangeModel', 'DefaultButtonModel',
+            'DefaultCaret', 'DefaultCellEditor',
+            'DefaultColorSelectionModel', 'DefaultComboBoxModel',
+            'DefaultDesktopManager', 'DefaultEditorKit',
+            'DefaultEditorKit.BeepAction',
+            'DefaultEditorKit.CopyAction',
+            'DefaultEditorKit.CutAction',
+            'DefaultEditorKit.DefaultKeyTypedAction',
+            'DefaultEditorKit.InsertBreakAction',
+            'DefaultEditorKit.InsertContentAction',
+            'DefaultEditorKit.InsertTabAction',
+            'DefaultEditorKit.PasteAction,',
+            'DefaultFocusManager', 'DefaultHighlighter',
+            'DefaultHighlighter.DefaultHighlightPainter',
+            'DefaultListCellRenderer',
+            'DefaultListCellRenderer.UIResource',
+            'DefaultListModel', 'DefaultListSelectionModel',
+            'DefaultMenuLayout', 'DefaultMetalTheme',
+            'DefaultMutableTreeNode',
+            'DefaultSingleSelectionModel',
+            'DefaultStyledDocument',
+            'DefaultStyledDocument.AttributeUndoableEdit',
+            'DefaultStyledDocument.ElementSpec',
+            'DefaultTableCellRenderer',
+            'DefaultTableCellRenderer.UIResource',
+            'DefaultTableColumnModel', 'DefaultTableModel',
+            'DefaultTextUI', 'DefaultTreeCellEditor',
+            'DefaultTreeCellRenderer', 'DefaultTreeModel',
+            'DefaultTreeSelectionModel', 'DefinitionKind',
+            'DefinitionKindHelper', 'Deflater',
+            'DeflaterOutputStream', 'Delegate', 'DesignMode',
+            'DesktopIconUI', 'DesktopManager', 'DesktopPaneUI',
+            'DGC', 'Dialog', 'Dictionary', 'DigestException',
+            'DigestInputStream', 'DigestOutputStream',
+            'Dimension', 'Dimension2D', 'DimensionUIResource',
+            'DirContext', 'DirectColorModel', 'DirectoryManager',
+            'DirObjectFactory', 'DirStateFactory',
+            'DirStateFactory.Result', 'DnDConstants', 'Document',
+            'DocumentEvent', 'DocumentEvent.ElementChange',
+            'DocumentEvent.EventType', 'DocumentListener',
+            'DocumentParser', 'DomainCombiner', 'DomainManager',
+            'DomainManagerOperations', 'Double', 'DoubleHolder',
+            'DoubleSeqHelper', 'DoubleSeqHolder',
+            'DragGestureEvent', 'DragGestureListener',
+            'DragGestureRecognizer', 'DragSource',
+            'DragSourceContext', 'DragSourceDragEvent',
+            'DragSourceDropEvent', 'DragSourceEvent',
+            'DragSourceListener', 'Driver', 'DriverManager',
+            'DriverPropertyInfo', 'DropTarget',
+            'DropTarget.DropTargetAutoScroller',
+            'DropTargetContext', 'DropTargetDragEvent',
+            'DropTargetDropEvent', 'DropTargetEvent',
+            'DropTargetListener', 'DSAKey',
+            'DSAKeyPairGenerator', 'DSAParameterSpec',
+            'DSAParams', 'DSAPrivateKey', 'DSAPrivateKeySpec',
+            'DSAPublicKey', 'DSAPublicKeySpec', 'DTD',
+            'DTDConstants', 'DynamicImplementation', 'DynAny',
+            'DynArray', 'DynEnum', 'DynFixed', 'DynSequence',
+            'DynStruct', 'DynUnion', 'DynValue', 'EditorKit',
+            'Element', 'ElementIterator', 'Ellipse2D',
+            'Ellipse2D.Double', 'Ellipse2D.Float', 'EmptyBorder',
+            'EmptyStackException', 'EncodedKeySpec', 'Entity',
+            'EnumControl', 'EnumControl.Type', 'Enumeration',
+            'Environment', 'EOFException', 'Error',
+            'EtchedBorder', 'Event', 'EventContext',
+            'EventDirContext', 'EventListener',
+            'EventListenerList', 'EventObject', 'EventQueue',
+            'EventSetDescriptor', 'Exception',
+            'ExceptionInInitializerError', 'ExceptionList',
+            'ExpandVetoException', 'ExportException',
+            'ExtendedRequest', 'ExtendedResponse',
+            'Externalizable', 'FeatureDescriptor', 'Field',
+            'FieldNameHelper', 'FieldPosition', 'FieldView',
+            'File', 'FileChooserUI', 'FileDescriptor',
+            'FileDialog', 'FileFilter',
+            'FileInputStream', 'FilenameFilter', 'FileNameMap',
+            'FileNotFoundException', 'FileOutputStream',
+            'FilePermission', 'FileReader', 'FileSystemView',
+            'FileView', 'FileWriter', 'FilteredImageSource',
+            'FilterInputStream', 'FilterOutputStream',
+            'FilterReader', 'FilterWriter',
+            'FixedHeightLayoutCache', 'FixedHolder',
+            'FlatteningPathIterator', 'FlavorMap', 'Float',
+            'FloatControl', 'FloatControl.Type', 'FloatHolder',
+            'FloatSeqHelper', 'FloatSeqHolder', 'FlowLayout',
+            'FlowView', 'FlowView.FlowStrategy', 'FocusAdapter',
+            'FocusEvent', 'FocusListener', 'FocusManager',
+            'Font', 'FontFormatException', 'FontMetrics',
+            'FontRenderContext', 'FontUIResource', 'Format',
+            'FormatConversionProvider', 'FormView', 'Frame',
+            'FREE_MEM', 'GapContent', 'GeneralPath',
+            'GeneralSecurityException', 'GlyphJustificationInfo',
+            'GlyphMetrics', 'GlyphVector', 'GlyphView',
+            'GlyphView.GlyphPainter', 'GradientPaint',
+            'GraphicAttribute', 'Graphics', 'Graphics2D',
+            'GraphicsConfigTemplate', 'GraphicsConfiguration',
+            'GraphicsDevice', 'GraphicsEnvironment',
+            'GrayFilter', 'GregorianCalendar',
+            'GridBagConstraints', 'GridBagLayout', 'GridLayout',
+            'Group', 'Guard', 'GuardedObject', 'GZIPInputStream',
+            'GZIPOutputStream', 'HasControls', 'HashMap',
+            'HashSet', 'Hashtable', 'HierarchyBoundsAdapter',
+            'HierarchyBoundsListener', 'HierarchyEvent',
+            'HierarchyListener', 'Highlighter',
+            'Highlighter.Highlight',
+            'Highlighter.HighlightPainter', 'HTML',
+            'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag',
+            'HTMLDocument', 'HTMLDocument.Iterator',
+            'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory',
+            'HTMLEditorKit.HTMLTextAction',
+            'HTMLEditorKit.InsertHTMLTextAction',
+            'HTMLEditorKit.LinkController',
+            'HTMLEditorKit.Parser',
+            'HTMLEditorKit.ParserCallback',
+            'HTMLFrameHyperlinkEvent', 'HTMLWriter',
+            'HttpURLConnection', 'HyperlinkEvent',
+            'HyperlinkEvent.EventType', 'HyperlinkListener',
+            'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray',
+            'ICC_ProfileRGB', 'Icon', 'IconUIResource',
+            'IconView', 'IdentifierHelper', 'Identity',
+            'IdentityScope', 'IDLEntity', 'IDLType',
+            'IDLTypeHelper', 'IDLTypeOperations',
+            'IllegalAccessError', 'IllegalAccessException',
+            'IllegalArgumentException',
+            'IllegalComponentStateException',
+            'IllegalMonitorStateException',
+            'IllegalPathStateException', 'IllegalStateException',
+            'IllegalThreadStateException', 'Image',
+            'ImageConsumer', 'ImageFilter',
+            'ImageGraphicAttribute', 'ImageIcon',
+            'ImageObserver', 'ImageProducer',
+            'ImagingOpException', 'IMP_LIMIT',
+            'IncompatibleClassChangeError',
+            'InconsistentTypeCode', 'IndexColorModel',
+            'IndexedPropertyDescriptor',
+            'IndexOutOfBoundsException', 'IndirectionException',
+            'InetAddress', 'Inflater', 'InflaterInputStream',
+            'InheritableThreadLocal', 'InitialContext',
+            'InitialContextFactory',
+            'InitialContextFactoryBuilder', 'InitialDirContext',
+            'INITIALIZE', 'Initializer', 'InitialLdapContext',
+            'InlineView', 'InputContext', 'InputEvent',
+            'InputMap', 'InputMapUIResource', 'InputMethod',
+            'InputMethodContext', 'InputMethodDescriptor',
+            'InputMethodEvent', 'InputMethodHighlight',
+            'InputMethodListener', 'InputMethodRequests',
+            'InputStream',
+            'InputStreamReader', 'InputSubset', 'InputVerifier',
+            'Insets', 'InsetsUIResource', 'InstantiationError',
+            'InstantiationException', 'Instrument',
+            'InsufficientResourcesException', 'Integer',
+            'INTERNAL', 'InternalError', 'InternalFrameAdapter',
+            'InternalFrameEvent', 'InternalFrameListener',
+            'InternalFrameUI', 'InterruptedException',
+            'InterruptedIOException',
+            'InterruptedNamingException', 'INTF_REPOS',
+            'IntHolder', 'IntrospectionException',
+            'Introspector', 'Invalid',
+            'InvalidAlgorithmParameterException',
+            'InvalidAttributeIdentifierException',
+            'InvalidAttributesException',
+            'InvalidAttributeValueException',
+            'InvalidClassException',
+            'InvalidDnDOperationException',
+            'InvalidKeyException', 'InvalidKeySpecException',
+            'InvalidMidiDataException', 'InvalidName',
+            'InvalidNameException',
+            'InvalidNameHelper', 'InvalidNameHolder',
+            'InvalidObjectException',
+            'InvalidParameterException',
+            'InvalidParameterSpecException',
+            'InvalidSearchControlsException',
+            'InvalidSearchFilterException', 'InvalidSeq',
+            'InvalidTransactionException', 'InvalidValue',
+            'INVALID_TRANSACTION', 'InvocationEvent',
+            'InvocationHandler', 'InvocationTargetException',
+            'InvokeHandler', 'INV_FLAG', 'INV_IDENT',
+            'INV_OBJREF', 'INV_POLICY', 'IOException',
+            'IRObject', 'IRObjectOperations', 'IstringHelper',
+            'ItemEvent', 'ItemListener', 'ItemSelectable',
+            'Iterator', 'JApplet', 'JarEntry', 'JarException',
+            'JarFile', 'JarInputStream', 'JarOutputStream',
+            'JarURLConnection', 'JButton', 'JCheckBox',
+            'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox',
+            'JComboBox.KeySelectionManager', 'JComponent',
+            'JDesktopPane', 'JDialog', 'JEditorPane',
+            'JFileChooser', 'JFrame', 'JInternalFrame',
+            'JInternalFrame.JDesktopIcon', 'JLabel',
+            'JLayeredPane', 'JList', 'JMenu', 'JMenuBar',
+            'JMenuItem', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType',
+            'JobAttributes.DestinationType',
+            'JobAttributes.DialogType',
+            'JobAttributes.MultipleDocumentHandlingType',
+            'JobAttributes.SidesType', 'JOptionPane', 'JPanel',
+            'JPasswordField', 'JPopupMenu',
+            'JPopupMenu.Separator', 'JProgressBar',
+            'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane',
+            'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider',
+            'JSplitPane', 'JTabbedPane', 'JTable',
+            'JTableHeader', 'JTextArea', 'JTextComponent',
+            'JTextComponent.KeyBinding', 'JTextField',
+            'JTextPane', 'JToggleButton',
+            'JToggleButton.ToggleButtonModel', 'JToolBar',
+            'JToolBar.Separator', 'JToolTip', 'JTree',
+            'JTree.DynamicUtilTreeNode',
+            'JTree.EmptySelectionModel', 'JViewport', 'JWindow',
+            'Kernel', 'Key', 'KeyAdapter', 'KeyEvent',
+            'KeyException', 'KeyFactory', 'KeyFactorySpi',
+            'KeyListener', 'KeyManagementException', 'Keymap',
+            'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi',
+            'KeySpec', 'KeyStore', 'KeyStoreException',
+            'KeyStoreSpi', 'KeyStroke', 'Label', 'LabelUI',
+            'LabelView', 'LastOwnerException',
+            'LayeredHighlighter',
+            'LayeredHighlighter.LayerPainter', 'LayoutManager',
+            'LayoutManager2', 'LayoutQueue', 'LdapContext',
+            'LdapReferralException', 'Lease',
+            'LimitExceededException', 'Line', 'Line.Info',
+            'Line2D', 'Line2D.Double', 'Line2D.Float',
+            'LineBorder', 'LineBreakMeasurer', 'LineEvent',
+            'LineEvent.Type', 'LineListener', 'LineMetrics',
+            'LineNumberInputStream', 'LineNumberReader',
+            'LineUnavailableException', 'LinkageError',
+            'LinkedList', 'LinkException', 'LinkLoopException',
+            'LinkRef', 'List', 'ListCellRenderer',
+            'ListDataEvent', 'ListDataListener', 'ListIterator',
+            'ListModel', 'ListResourceBundle',
+            'ListSelectionEvent', 'ListSelectionListener',
+            'ListSelectionModel', 'ListUI', 'ListView',
+            'LoaderHandler', 'Locale', 'LocateRegistry',
+            'LogStream', 'Long', 'LongHolder',
+            'LongLongSeqHelper', 'LongLongSeqHolder',
+            'LongSeqHelper', 'LongSeqHolder', 'LookAndFeel',
+            'LookupOp', 'LookupTable', 'MalformedLinkException',
+            'MalformedURLException', 'Manifest', 'Map',
+            'Map.Entry', 'MARSHAL', 'MarshalException',
+            'MarshalledObject', 'Math', 'MatteBorder',
+            'MediaTracker', 'Member', 'MemoryImageSource',
+            'Menu', 'MenuBar', 'MenuBarUI', 'MenuComponent',
+            'MenuContainer', 'MenuDragMouseEvent',
+            'MenuDragMouseListener', 'MenuElement', 'MenuEvent',
+            'MenuItem', 'MenuItemUI', 'MenuKeyEvent',
+            'MenuKeyListener', 'MenuListener',
+            'MenuSelectionManager', 'MenuShortcut',
+            'MessageDigest', 'MessageDigestSpi', 'MessageFormat',
+            'MetaEventListener', 'MetalBorders',
+            'MetalBorders.ButtonBorder',
+            'MetalBorders.Flush3DBorder',
+            'MetalBorders.InternalFrameBorder',
+            'MetalBorders.MenuBarBorder',
+            'MetalBorders.MenuItemBorder',
+            'MetalBorders.OptionDialogBorder',
+            'MetalBorders.PaletteBorder',
+            'MetalBorders.PopupMenuBorder',
+            'MetalBorders.RolloverButtonBorder',
+            'MetalBorders.ScrollPaneBorder',
+            'MetalBorders.TableHeaderBorder',
+            'MetalBorders.TextFieldBorder',
+            'MetalBorders.ToggleButtonBorder',
+            'MetalBorders.ToolBarBorder', 'MetalButtonUI',
+            'MetalCheckBoxIcon', 'MetalCheckBoxUI',
+            'MetalComboBoxButton', 'MetalComboBoxEditor',
+            'MetalComboBoxEditor.UIResource',
+            'MetalComboBoxIcon', 'MetalComboBoxUI',
+            'MetalDesktopIconUI', 'MetalFileChooserUI',
+            'MetalIconFactory', 'MetalIconFactory.FileIcon16',
+            'MetalIconFactory.FolderIcon16',
+            'MetalIconFactory.PaletteCloseIcon',
+            'MetalIconFactory.TreeControlIcon',
+            'MetalIconFactory.TreeFolderIcon',
+            'MetalIconFactory.TreeLeafIcon',
+            'MetalInternalFrameTitlePane',
+            'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalPopupMenuSeparatorUI',
+            'MetalProgressBarUI', 'MetalRadioButtonUI',
+            'MetalScrollBarUI', 'MetalScrollButton',
+            'MetalScrollPaneUI', 'MetalSeparatorUI',
+            'MetalSliderUI', 'MetalSplitPaneUI',
+            'MetalTabbedPaneUI', 'MetalTextFieldUI',
+            'MetalTheme', 'MetalToggleButtonUI',
+            'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI',
+            'MetaMessage', 'Method', 'MethodDescriptor',
+            'MidiChannel', 'MidiDevice', 'MidiDevice.Info',
+            'MidiDeviceProvider', 'MidiEvent', 'MidiFileFormat',
+            'MidiFileReader', 'MidiFileWriter', 'MidiMessage',
+            'MidiSystem', 'MidiUnavailableException',
+            'MimeTypeParseException', 'MinimalHTMLWriter',
+            'MissingResourceException', 'Mixer', 'Mixer.Info',
+            'MixerProvider', 'ModificationItem', 'Modifier',
+            'MouseAdapter', 'MouseDragGestureRecognizer',
+            'MouseEvent', 'MouseInputAdapter',
+            'MouseInputListener', 'MouseListener',
+            'MouseMotionAdapter', 'MouseMotionListener',
+            'MultiButtonUI', 'MulticastSocket',
+            'MultiColorChooserUI', 'MultiComboBoxUI',
+            'MultiDesktopIconUI', 'MultiDesktopPaneUI',
+            'MultiFileChooserUI', 'MultiInternalFrameUI',
+            'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel',
+            'MultiMenuBarUI', 'MultiMenuItemUI',
+            'MultiOptionPaneUI', 'MultiPanelUI',
+            'MultiPixelPackedSampleModel', 'MultipleMaster',
+            'MultiPopupMenuUI', 'MultiProgressBarUI',
+            'MultiScrollBarUI', 'MultiScrollPaneUI',
+            'MultiSeparatorUI', 'MultiSliderUI',
+            'MultiSplitPaneUI', 'MultiTabbedPaneUI',
+            'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI',
+            'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI',
+            'MultiViewportUI', 'MutableAttributeSet',
+            'MutableComboBoxModel', 'MutableTreeNode', 'Name',
+            'NameAlreadyBoundException', 'NameClassPair',
+            'NameComponent', 'NameComponentHelper',
+            'NameComponentHolder', 'NamedValue', 'NameHelper',
+            'NameHolder', 'NameNotFoundException', 'NameParser',
+            'NamespaceChangeListener', 'NameValuePair',
+            'NameValuePairHelper', 'Naming', 'NamingContext',
+            'NamingContextHelper', 'NamingContextHolder',
+            'NamingContextOperations', 'NamingEnumeration',
+            'NamingEvent', 'NamingException',
+            'NamingExceptionEvent', 'NamingListener',
+            'NamingManager', 'NamingSecurityException',
+            'NegativeArraySizeException', 'NetPermission',
+            'NoClassDefFoundError', 'NoInitialContextException',
+            'NoninvertibleTransformException',
+            'NoPermissionException', 'NoRouteToHostException',
+            'NoSuchAlgorithmException',
+            'NoSuchAttributeException', 'NoSuchElementException',
+            'NoSuchFieldError', 'NoSuchFieldException',
+            'NoSuchMethodError', 'NoSuchMethodException',
+            'NoSuchObjectException', 'NoSuchProviderException',
+            'NotActiveException', 'NotBoundException',
+            'NotContextException', 'NotEmpty', 'NotEmptyHelper',
+            'NotEmptyHolder', 'NotFound', 'NotFoundHelper',
+            'NotFoundHolder', 'NotFoundReason',
+            'NotFoundReasonHelper', 'NotFoundReasonHolder',
+            'NotOwnerException', 'NotSerializableException',
+            'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION',
+            'NO_RESOURCES', 'NO_RESPONSE',
+            'NullPointerException', 'Number', 'NumberFormat',
+            'NumberFormatException', 'NVList', 'Object',
+            'ObjectChangeListener', 'ObjectFactory',
+            'ObjectFactoryBuilder', 'ObjectHelper',
+            'ObjectHolder', 'ObjectImpl',
+            'ObjectInput', 'ObjectInputStream',
+            'ObjectInputStream.GetField',
+            'ObjectInputValidation', 'ObjectOutput',
+            'ObjectOutputStream', 'ObjectOutputStream.PutField',
+            'ObjectStreamClass', 'ObjectStreamConstants',
+            'ObjectStreamException', 'ObjectStreamField',
+            'ObjectView', 'OBJECT_NOT_EXIST', 'ObjID',
+            'OBJ_ADAPTER', 'Observable', 'Observer',
+            'OctetSeqHelper', 'OctetSeqHolder', 'OMGVMCID',
+            'OpenType', 'Operation',
+            'OperationNotSupportedException', 'Option',
+            'OptionalDataException', 'OptionPaneUI', 'ORB',
+            'OutOfMemoryError', 'OutputStream',
+            'OutputStreamWriter', 'OverlayLayout', 'Owner',
+            'Package', 'PackedColorModel', 'Pageable',
+            'PageAttributes', 'PageAttributes.ColorType',
+            'PageAttributes.MediaType',
+            'PageAttributes.OrientationRequestedType',
+            'PageAttributes.OriginType',
+            'PageAttributes.PrintQualityType', 'PageFormat',
+            'Paint', 'PaintContext', 'PaintEvent', 'Panel',
+            'PanelUI', 'Paper', 'ParagraphView',
+            'ParameterBlock', 'ParameterDescriptor',
+            'ParseException', 'ParsePosition', 'Parser',
+            'ParserDelegator', 'PartialResultException',
+            'PasswordAuthentication', 'PasswordView', 'Patch',
+            'PathIterator', 'Permission',
+            'PermissionCollection', 'Permissions',
+            'PERSIST_STORE', 'PhantomReference',
+            'PipedInputStream', 'PipedOutputStream',
+            'PipedReader', 'PipedWriter', 'PixelGrabber',
+            'PixelInterleavedSampleModel', 'PKCS8EncodedKeySpec',
+            'PlainDocument', 'PlainView', 'Point', 'Point2D',
+            'Point2D.Double', 'Point2D.Float', 'Policy',
+            'PolicyError', 'PolicyHelper',
+            'PolicyHolder', 'PolicyListHelper',
+            'PolicyListHolder', 'PolicyOperations',
+            'PolicyTypeHelper', 'Polygon', 'PopupMenu',
+            'PopupMenuEvent', 'PopupMenuListener', 'PopupMenuUI',
+            'Port', 'Port.Info', 'PortableRemoteObject',
+            'PortableRemoteObjectDelegate', 'Position',
+            'Position.Bias', 'PreparedStatement', 'Principal',
+            'PrincipalHolder', 'Printable',
+            'PrinterAbortException', 'PrinterException',
+            'PrinterGraphics', 'PrinterIOException',
+            'PrinterJob', 'PrintGraphics', 'PrintJob',
+            'PrintStream', 'PrintWriter', 'PrivateKey',
+            'PRIVATE_MEMBER', 'PrivilegedAction',
+            'PrivilegedActionException',
+            'PrivilegedExceptionAction', 'Process',
+            'ProfileDataException', 'ProgressBarUI',
+            'ProgressMonitor', 'ProgressMonitorInputStream',
+            'Properties', 'PropertyChangeEvent',
+            'PropertyChangeListener', 'PropertyChangeSupport',
+            'PropertyDescriptor', 'PropertyEditor',
+            'PropertyEditorManager', 'PropertyEditorSupport',
+            'PropertyPermission', 'PropertyResourceBundle',
+            'PropertyVetoException', 'ProtectionDomain',
+            'ProtocolException', 'Provider', 'ProviderException',
+            'Proxy', 'PublicKey', 'PUBLIC_MEMBER',
+            'PushbackInputStream', 'PushbackReader',
+            'QuadCurve2D', 'QuadCurve2D.Double',
+            'QuadCurve2D.Float', 'Random', 'RandomAccessFile',
+            'Raster', 'RasterFormatException', 'RasterOp',
+            'Reader', 'Receiver', 'Rectangle', 'Rectangle2D',
+            'Rectangle2D.Double', 'Rectangle2D.Float',
+            'RectangularShape', 'Ref', 'RefAddr', 'Reference',
+            'Referenceable', 'ReferenceQueue',
+            'ReferralException', 'ReflectPermission', 'Registry',
+            'RegistryHandler', 'RemarshalException', 'Remote',
+            'RemoteCall', 'RemoteException', 'RemoteObject',
+            'RemoteRef', 'RemoteServer', 'RemoteStub',
+            'RenderableImage', 'RenderableImageOp',
+            'RenderableImageProducer', 'RenderContext',
+            'RenderedImage', 'RenderedImageFactory', 'Renderer',
+            'RenderingHints', 'RenderingHints.Key',
+            'RepaintManager', 'ReplicateScaleFilter',
+            'Repository', 'RepositoryIdHelper', 'Request',
+            'RescaleOp', 'Resolver', 'ResolveResult',
+            'ResourceBundle', 'ResponseHandler', 'ResultSet',
+            'ResultSetMetaData', 'ReverbType', 'RGBImageFilter',
+            'RMIClassLoader', 'RMIClientSocketFactory',
+            'RMIFailureHandler', 'RMISecurityException',
+            'RMISecurityManager', 'RMIServerSocketFactory',
+            'RMISocketFactory', 'Robot', 'RootPaneContainer',
+            'RootPaneUI', 'RoundRectangle2D',
+            'RoundRectangle2D.Double', 'RoundRectangle2D.Float',
+            'RowMapper', 'RSAKey', 'RSAKeyGenParameterSpec',
+            'RSAPrivateCrtKey', 'RSAPrivateCrtKeySpec',
+            'RSAPrivateKey', 'RSAPrivateKeySpec', 'RSAPublicKey',
+            'RSAPublicKeySpec', 'RTFEditorKit',
+            'RuleBasedCollator', 'Runnable', 'RunTime',
+            'Runtime', 'RuntimeException', 'RunTimeOperations',
+            'RuntimePermission', 'SampleModel',
+            'SchemaViolationException', 'Scrollable',
+            'Scrollbar', 'ScrollBarUI', 'ScrollPane',
+            'ScrollPaneConstants', 'ScrollPaneLayout',
+            'ScrollPaneLayout.UIResource', 'ScrollPaneUI',
+            'SearchControls', 'SearchResult',
+            'SecureClassLoader', 'SecureRandom',
+            'SecureRandomSpi', 'Security', 'SecurityException',
+            'SecurityManager', 'SecurityPermission', 'Segment',
+            'SeparatorUI', 'Sequence', 'SequenceInputStream',
+            'Sequencer', 'Sequencer.SyncMode', 'Serializable',
+            'SerializablePermission', 'ServantObject',
+            'ServerCloneException', 'ServerError',
+            'ServerException', 'ServerNotActiveException',
+            'ServerRef', 'ServerRequest',
+            'ServerRuntimeException', 'ServerSocket',
+            'ServiceDetail', 'ServiceDetailHelper',
+            'ServiceInformation', 'ServiceInformationHelper',
+            'ServiceInformationHolder',
+            'ServiceUnavailableException', 'Set',
+            'SetOverrideType', 'SetOverrideTypeHelper', 'Shape',
+            'ShapeGraphicAttribute', 'Short', 'ShortHolder',
+            'ShortLookupTable', 'ShortMessage', 'ShortSeqHelper',
+            'ShortSeqHolder', 'Signature', 'SignatureException',
+            'SignatureSpi', 'SignedObject', 'Signer',
+            'SimpleAttributeSet', 'SimpleBeanInfo',
+            'SimpleDateFormat', 'SimpleTimeZone',
+            'SinglePixelPackedSampleModel',
+            'SingleSelectionModel', 'SizeLimitExceededException',
+            'SizeRequirements', 'SizeSequence', 'Skeleton',
+            'SkeletonMismatchException',
+            'SkeletonNotFoundException', 'SliderUI', 'Socket',
+            'SocketException', 'SocketImpl', 'SocketImplFactory',
+            'SocketOptions', 'SocketPermission',
+            'SocketSecurityException', 'SoftBevelBorder',
+            'SoftReference', 'SortedMap', 'SortedSet',
+            'Soundbank', 'SoundbankReader', 'SoundbankResource',
+            'SourceDataLine', 'SplitPaneUI', 'SQLData',
+            'SQLException', 'SQLInput', 'SQLOutput',
+            'SQLPermission', 'SQLWarning', 'Stack',
+            'StackOverflowError', 'StateEdit', 'StateEditable',
+            'StateFactory', 'Statement', 'Streamable',
+            'StreamableValue', 'StreamCorruptedException',
+            'StreamTokenizer', 'StrictMath', 'String',
+            'StringBuffer', 'StringBufferInputStream',
+            'StringCharacterIterator', 'StringContent',
+            'StringHolder', 'StringIndexOutOfBoundsException',
+            'StringReader', 'StringRefAddr', 'StringSelection',
+            'StringTokenizer', 'StringValueHelper',
+            'StringWriter', 'Stroke', 'Struct', 'StructMember',
+            'StructMemberHelper', 'Stub', 'StubDelegate',
+            'StubNotFoundException', 'Style', 'StyleConstants',
+            'StyleConstants.CharacterConstants',
+            'StyleConstants.ColorConstants',
+            'StyleConstants.FontConstants',
+            'StyleConstants.ParagraphConstants', 'StyleContext',
+            'StyledDocument', 'StyledEditorKit',
+            'StyledEditorKit.AlignmentAction',
+            'StyledEditorKit.BoldAction',
+            'StyledEditorKit.FontFamilyAction',
+            'StyledEditorKit.FontSizeAction',
+            'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction',
+            'StyledEditorKit.StyledTextAction',
+            'StyledEditorKit.UnderlineAction', 'StyleSheet',
+            'StyleSheet.BoxPainter', 'StyleSheet.ListPainter',
+            'SwingConstants', 'SwingPropertyChangeSupport',
+            'SwingUtilities', 'SyncFailedException',
+            'Synthesizer', 'SysexMessage', 'System',
+            'SystemColor', 'SystemException', 'SystemFlavorMap',
+            'TabableView', 'TabbedPaneUI', 'TabExpander',
+            'TableCellEditor', 'TableCellRenderer',
+            'TableColumn', 'TableColumnModel',
+            'TableColumnModelEvent', 'TableColumnModelListener',
+            'TableHeaderUI', 'TableModel', 'TableModelEvent',
+            'TableModelListener', 'TableUI', 'TableView',
+            'TabSet', 'TabStop', 'TagElement', 'TargetDataLine',
+            'TCKind', 'TextAction', 'TextArea', 'TextAttribute',
+            'TextComponent', 'TextEvent', 'TextField',
+            'TextHitInfo', 'TextLayout',
+            'TextLayout.CaretPolicy', 'TextListener',
+            'TextMeasurer', 'TextUI', 'TexturePaint', 'Thread',
+            'ThreadDeath', 'ThreadGroup', 'ThreadLocal',
+            'Throwable', 'Tie', 'TileObserver', 'Time',
+            'TimeLimitExceededException', 'Timer',
+            'TimerTask', 'Timestamp', 'TimeZone', 'TitledBorder',
+            'ToolBarUI', 'Toolkit', 'ToolTipManager',
+            'ToolTipUI', 'TooManyListenersException', 'Track',
+            'TransactionRequiredException',
+            'TransactionRolledbackException',
+            'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK',
+            'Transferable', 'TransformAttribute', 'TRANSIENT',
+            'Transmitter', 'Transparency', 'TreeCellEditor',
+            'TreeCellRenderer', 'TreeExpansionEvent',
+            'TreeExpansionListener', 'TreeMap', 'TreeModel',
+            'TreeModelEvent', 'TreeModelListener', 'TreeNode',
+            'TreePath', 'TreeSelectionEvent',
+            'TreeSelectionListener', 'TreeSelectionModel',
+            'TreeSet', 'TreeUI', 'TreeWillExpandListener',
+            'TypeCode', 'TypeCodeHolder', 'TypeMismatch',
+            'Types', 'UID', 'UIDefaults',
+            'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap',
+            'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue',
+            'UIManager', 'UIManager.LookAndFeelInfo',
+            'UIResource', 'ULongLongSeqHelper',
+            'ULongLongSeqHolder', 'ULongSeqHelper',
+            'ULongSeqHolder', 'UndeclaredThrowableException',
+            'UndoableEdit', 'UndoableEditEvent',
+            'UndoableEditListener', 'UndoableEditSupport',
+            'UndoManager', 'UnexpectedException',
+            'UnicastRemoteObject', 'UnionMember',
+            'UnionMemberHelper', 'UNKNOWN', 'UnknownError',
+            'UnknownException', 'UnknownGroupException',
+            'UnknownHostException',
+            'UnknownObjectException', 'UnknownServiceException',
+            'UnknownUserException', 'UnmarshalException',
+            'UnrecoverableKeyException', 'Unreferenced',
+            'UnresolvedPermission', 'UnsatisfiedLinkError',
+            'UnsolicitedNotification',
+            'UnsolicitedNotificationEvent',
+            'UnsolicitedNotificationListener',
+            'UnsupportedAudioFileException',
+            'UnsupportedClassVersionError',
+            'UnsupportedEncodingException',
+            'UnsupportedFlavorException',
+            'UnsupportedLookAndFeelException',
+            'UnsupportedOperationException',
+            'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE',
+            'URL', 'URLClassLoader', 'URLConnection',
+            'URLDecoder', 'URLEncoder', 'URLStreamHandler',
+            'URLStreamHandlerFactory', 'UserException',
+            'UShortSeqHelper', 'UShortSeqHolder',
+            'UTFDataFormatException', 'Util', 'UtilDelegate',
+            'Utilities', 'ValueBase', 'ValueBaseHelper',
+            'ValueBaseHolder', 'ValueFactory', 'ValueHandler',
+            'ValueMember', 'ValueMemberHelper',
+            'VariableHeightLayoutCache', 'Vector', 'VerifyError',
+            'VersionSpecHelper', 'VetoableChangeListener',
+            'VetoableChangeSupport', 'View', 'ViewFactory',
+            'ViewportLayout', 'ViewportUI',
+            'VirtualMachineError', 'Visibility',
+            'VisibilityHelper', 'VMID', 'VM_ABSTRACT',
+            'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE',
+            'VoiceStatus', 'Void', 'WCharSeqHelper',
+            'WCharSeqHolder', 'WeakHashMap', 'WeakReference',
+            'Window', 'WindowAdapter', 'WindowConstants',
+            'WindowEvent', 'WindowListener', 'WrappedPlainView',
+            'WritableRaster', 'WritableRenderedImage',
+            'WriteAbortedException', 'Writer',
+            'WrongTransaction', 'WStringValueHelper',
+            'X509Certificate', 'X509CRL', 'X509CRLEntry',
+            'X509EncodedKeySpec', 'X509Extension', 'ZipEntry',
+            'ZipException', 'ZipFile', 'ZipInputStream',
+            'ZipOutputStream', 'ZoneView',
+            '_BindingIteratorImplBase', '_BindingIteratorStub',
+            '_IDLTypeStub', '_NamingContextImplBase',
+            '_NamingContextStub', '_PolicyStub', '_Remote_Stub'
+            ),
+        4 => array(
+            'void', 'double', 'int', 'boolean', 'byte', 'short', 'long', 'char', 'float'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '&', '|', '^',
+        '<', '>', '=',
+        '?', ':', ';',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000066; font-weight: bold;',
+            3 => 'color: #003399;',
+            4 => 'color: #000066; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            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;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?hl=en&q=allinurl%3Adocs.oracle.com+javase+docs+api+{FNAMEL}',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/java5.php b/sources/inc/geshi/java5.php
new file mode 100644
index 0000000..af16bd1
--- /dev/null
+++ b/sources/inc/geshi/java5.php
@@ -0,0 +1,1037 @@
+ 'Java(TM) 2 Platform Standard Edition 5.0',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Import and Package directives (Basic Support only)
+        2 => '/(?:(?<=import[\\n\\s](?!static))|(?<=import[\\n\\s]static[\\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' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            /* see the authoritative list of all 50 Java keywords at */
+            /* http://java.sun.com/docs/books/jls/third_edition/html/lexical.html#229308 */
+
+            /* java keywords, part 1: control flow */
+            'case', 'default', 'do', 'else', 'for',
+            'goto', 'if', 'switch', 'while'
+
+            /* IMO 'break', 'continue', 'return' and 'throw' */
+                        /* should also be added to this group, as they   */
+            /* also manage the control flow,                 */
+            /* arguably 'try'/'catch'/'finally' as well      */
+            ),
+        2 => array(
+            /* java keywords, part 2 */
+
+            'break', 'continue', 'return', 'throw',
+            'try', 'catch', 'finally',
+
+            'abstract', 'assert', 'class', 'const', 'enum', 'extends',
+            'final', 'implements', 'import', 'instanceof', 'interface',
+            'native', 'new', 'package', 'private', 'protected',
+            'public', 'static', 'strictfp', 'super', 'synchronized',
+            'this', 'throws', 'transient', 'volatile'
+            ),
+        3 => array(
+            /* Java keywords, part 3: primitive data types and 'void' */
+            'boolean', 'byte', 'char', 'double',
+            'float', 'int', 'long', 'short', 'void'
+            ),
+        4 => array(
+            /* other reserved words in Java: literals */
+            /* should be styled to look similar to numbers and Strings */
+            'false', 'null', 'true'
+            ),
+        5 => array (
+            'Applet', 'AppletContext', 'AppletStub', 'AudioClip'
+            ),
+        6 => array (
+            'AWTError', 'AWTEvent', 'AWTEventMulticaster', 'AWTException', 'AWTKeyStroke', 'AWTPermission', 'ActiveEvent', 'Adjustable', 'AlphaComposite', 'BasicStroke', 'BorderLayout', 'BufferCapabilities', 'BufferCapabilities.FlipContents', 'Button', 'Canvas', 'CardLayout', 'Checkbox', 'CheckboxGroup', 'CheckboxMenuItem', 'Choice', 'Color', 'Component', 'ComponentOrientation', 'Composite', 'CompositeContext', 'Container', 'ContainerOrderFocusTraversalPolicy', 'Cursor', 'DefaultFocusTraversalPolicy', 'DefaultKeyboardFocusManager', 'Dialog', 'Dimension', 'DisplayMode', 'EventQueue', 'FileDialog', 'FlowLayout', 'FocusTraversalPolicy', 'Font', 'FontFormatException', 'FontMetrics', 'Frame', 'GradientPaint', 'Graphics', 'Graphics2D', 'GraphicsConfigTemplate', 'GraphicsConfiguration', 'GraphicsDevice', 'GraphicsEnvironment', 'GridBagConstraints', 'GridBagLayout', 'GridLayout', 'HeadlessException', 'IllegalComponentStateException', 'Image', 'ImageCapabilities', 'Insets', 'ItemSelectable', 'JobAttributes',
+            'JobAttributes.DefaultSelectionType', 'JobAttributes.DestinationType', 'JobAttributes.DialogType', 'JobAttributes.MultipleDocumentHandlingType', 'JobAttributes.SidesType', 'KeyEventDispatcher', 'KeyEventPostProcessor', 'KeyboardFocusManager', 'Label', 'LayoutManager', 'LayoutManager2', 'MediaTracker', 'Menu', 'MenuBar', 'MenuComponent', 'MenuContainer', 'MenuItem', 'MenuShortcut', 'MouseInfo', 'PageAttributes', 'PageAttributes.ColorType', 'PageAttributes.MediaType', 'PageAttributes.OrientationRequestedType', 'PageAttributes.OriginType', 'PageAttributes.PrintQualityType', 'Paint', 'PaintContext', 'Panel', 'Point', 'PointerInfo', 'Polygon', 'PopupMenu', 'PrintGraphics', 'PrintJob', 'Rectangle', 'RenderingHints', 'RenderingHints.Key', 'Robot', 'ScrollPane', 'ScrollPaneAdjustable', 'Scrollbar', 'Shape', 'Stroke', 'SystemColor', 'TextArea', 'TextComponent', 'TextField', 'TexturePaint', 'Toolkit', 'Transparency', 'Window'
+            ),
+        7 => array (
+            'CMMException', 'ColorSpace', 'ICC_ColorSpace', 'ICC_Profile', 'ICC_ProfileGray', 'ICC_ProfileRGB', 'ProfileDataException'
+            ),
+        8 => array (
+            'Clipboard', 'ClipboardOwner', 'DataFlavor', 'FlavorEvent', 'FlavorListener', 'FlavorMap', 'FlavorTable', 'MimeTypeParseException', 'StringSelection', 'SystemFlavorMap', 'Transferable', 'UnsupportedFlavorException'
+            ),
+        9 => array (
+            'Autoscroll', 'DnDConstants', 'DragGestureEvent', 'DragGestureListener', 'DragGestureRecognizer', 'DragSource', 'DragSourceAdapter', 'DragSourceContext', 'DragSourceDragEvent', 'DragSourceDropEvent', 'DragSourceEvent', 'DragSourceListener', 'DragSourceMotionListener', 'DropTarget', 'DropTarget.DropTargetAutoScroller', 'DropTargetAdapter', 'DropTargetContext', 'DropTargetDragEvent', 'DropTargetDropEvent', 'DropTargetEvent', 'DropTargetListener', 'InvalidDnDOperationException', 'MouseDragGestureRecognizer'
+            ),
+        10 => array (
+            'AWTEventListener', 'AWTEventListenerProxy', 'ActionEvent', 'ActionListener', 'AdjustmentEvent', 'AdjustmentListener', 'ComponentAdapter', 'ComponentEvent', 'ComponentListener', 'ContainerAdapter', 'ContainerEvent', 'ContainerListener', 'FocusAdapter', 'FocusEvent', 'FocusListener', 'HierarchyBoundsAdapter', 'HierarchyBoundsListener', 'HierarchyEvent', 'HierarchyListener', 'InputEvent', 'InputMethodEvent', 'InputMethodListener', 'InvocationEvent', 'ItemEvent', 'ItemListener', 'KeyAdapter', 'KeyEvent', 'KeyListener', 'MouseAdapter', 'MouseListener', 'MouseMotionAdapter', 'MouseMotionListener', 'MouseWheelEvent', 'MouseWheelListener', 'PaintEvent', 'TextEvent', 'TextListener', 'WindowAdapter', 'WindowEvent', 'WindowFocusListener', 'WindowListener', 'WindowStateListener'
+            ),
+        11 => array (
+            'FontRenderContext', 'GlyphJustificationInfo', 'GlyphMetrics', 'GlyphVector', 'GraphicAttribute', 'ImageGraphicAttribute', 'LineBreakMeasurer', 'LineMetrics', 'MultipleMaster', 'NumericShaper', 'ShapeGraphicAttribute', 'TextAttribute', 'TextHitInfo', 'TextLayout', 'TextLayout.CaretPolicy', 'TextMeasurer', 'TransformAttribute'
+            ),
+        12 => array (
+            'AffineTransform', 'Arc2D', 'Arc2D.Double', 'Arc2D.Float', 'Area', 'CubicCurve2D', 'CubicCurve2D.Double', 'CubicCurve2D.Float', 'Dimension2D', 'Ellipse2D', 'Ellipse2D.Double', 'Ellipse2D.Float', 'FlatteningPathIterator', 'GeneralPath', 'IllegalPathStateException', 'Line2D', 'Line2D.Double', 'Line2D.Float', 'NoninvertibleTransformException', 'PathIterator', 'Point2D', 'Point2D.Double', 'Point2D.Float', 'QuadCurve2D', 'QuadCurve2D.Double', 'QuadCurve2D.Float', 'Rectangle2D', 'Rectangle2D.Double', 'Rectangle2D.Float', 'RectangularShape', 'RoundRectangle2D', 'RoundRectangle2D.Double', 'RoundRectangle2D.Float'
+            ),
+        13 => array (
+            'InputContext', 'InputMethodHighlight', 'InputMethodRequests', 'InputSubset'
+            ),
+        14 => array (
+            'InputMethod', 'InputMethodContext', 'InputMethodDescriptor'
+            ),
+        15 => array (
+            'AffineTransformOp', 'AreaAveragingScaleFilter', 'BandCombineOp', 'BandedSampleModel', 'BufferStrategy', 'BufferedImage', 'BufferedImageFilter', 'BufferedImageOp', 'ByteLookupTable', 'ColorConvertOp', 'ColorModel', 'ComponentColorModel', 'ComponentSampleModel', 'ConvolveOp', 'CropImageFilter', 'DataBuffer', 'DataBufferByte', 'DataBufferDouble', 'DataBufferFloat', 'DataBufferInt', 'DataBufferShort', 'DataBufferUShort', 'DirectColorModel', 'FilteredImageSource', 'ImageConsumer', 'ImageFilter', 'ImageObserver', 'ImageProducer', 'ImagingOpException', 'IndexColorModel', 'Kernel', 'LookupOp', 'LookupTable', 'MemoryImageSource', 'MultiPixelPackedSampleModel', 'PackedColorModel', 'PixelGrabber', 'PixelInterleavedSampleModel', 'RGBImageFilter', 'Raster', 'RasterFormatException', 'RasterOp', 'RenderedImage', 'ReplicateScaleFilter', 'RescaleOp', 'SampleModel', 'ShortLookupTable', 'SinglePixelPackedSampleModel', 'TileObserver', 'VolatileImage', 'WritableRaster', 'WritableRenderedImage'
+            ),
+        16 => array (
+            'ContextualRenderedImageFactory', 'ParameterBlock', 'RenderContext', 'RenderableImage', 'RenderableImageOp', 'RenderableImageProducer', 'RenderedImageFactory'
+            ),
+        17 => array (
+            'Book', 'PageFormat', 'Pageable', 'Paper', 'Printable', 'PrinterAbortException', 'PrinterException', 'PrinterGraphics', 'PrinterIOException', 'PrinterJob'
+            ),
+        18 => array (
+            'AppletInitializer', 'BeanDescriptor', 'BeanInfo', 'Beans', 'Customizer', 'DefaultPersistenceDelegate', 'DesignMode', 'Encoder', 'EventHandler', 'EventSetDescriptor', 'ExceptionListener', 'Expression', 'FeatureDescriptor', 'IndexedPropertyChangeEvent', 'IndexedPropertyDescriptor', 'Introspector', 'MethodDescriptor', 'ParameterDescriptor', 'PersistenceDelegate', 'PropertyChangeEvent', 'PropertyChangeListener', 'PropertyChangeListenerProxy', 'PropertyChangeSupport', 'PropertyDescriptor', 'PropertyEditor', 'PropertyEditorManager', 'PropertyEditorSupport', 'PropertyVetoException', 'SimpleBeanInfo', 'VetoableChangeListener', 'VetoableChangeListenerProxy', 'VetoableChangeSupport', 'Visibility', 'XMLDecoder', 'XMLEncoder'
+            ),
+        19 => array (
+            'BeanContext', 'BeanContextChild', 'BeanContextChildComponentProxy', 'BeanContextChildSupport', 'BeanContextContainerProxy', 'BeanContextEvent', 'BeanContextMembershipEvent', 'BeanContextMembershipListener', 'BeanContextProxy', 'BeanContextServiceAvailableEvent', 'BeanContextServiceProvider', 'BeanContextServiceProviderBeanInfo', 'BeanContextServiceRevokedEvent', 'BeanContextServiceRevokedListener', 'BeanContextServices', 'BeanContextServicesListener', 'BeanContextServicesSupport', 'BeanContextServicesSupport.BCSSServiceProvider', 'BeanContextSupport', 'BeanContextSupport.BCSIterator'
+            ),
+        20 => array (
+            'BufferedInputStream', 'BufferedOutputStream', 'BufferedReader', 'BufferedWriter', 'ByteArrayInputStream', 'ByteArrayOutputStream', 'CharArrayReader', 'CharArrayWriter', 'CharConversionException', 'Closeable', 'DataInput', 'DataOutput', 'EOFException', 'Externalizable', 'File', 'FileDescriptor', 'FileInputStream', 'FileNotFoundException', 'FileOutputStream', 'FilePermission', 'FileReader', 'FileWriter', 'FilenameFilter', 'FilterInputStream', 'FilterOutputStream', 'FilterReader', 'FilterWriter', 'Flushable', 'IOException', 'InputStreamReader', 'InterruptedIOException', 'InvalidClassException', 'InvalidObjectException', 'LineNumberInputStream', 'LineNumberReader', 'NotActiveException', 'NotSerializableException', 'ObjectInput', 'ObjectInputStream', 'ObjectInputStream.GetField', 'ObjectInputValidation', 'ObjectOutput', 'ObjectOutputStream', 'ObjectOutputStream.PutField', 'ObjectStreamClass', 'ObjectStreamConstants', 'ObjectStreamException', 'ObjectStreamField', 'OptionalDataException', 'OutputStreamWriter',
+            'PipedInputStream', 'PipedOutputStream', 'PipedReader', 'PipedWriter', 'PrintStream', 'PrintWriter', 'PushbackInputStream', 'PushbackReader', 'RandomAccessFile', 'Reader', 'SequenceInputStream', 'Serializable', 'SerializablePermission', 'StreamCorruptedException', 'StreamTokenizer', 'StringBufferInputStream', 'StringReader', 'StringWriter', 'SyncFailedException', 'UTFDataFormatException', 'UnsupportedEncodingException', 'WriteAbortedException', 'Writer'
+            ),
+        21 => array (
+            'AbstractMethodError', 'Appendable', 'ArithmeticException', 'ArrayIndexOutOfBoundsException', 'ArrayStoreException', 'AssertionError', 'Boolean', 'Byte', 'CharSequence', 'Character', 'Character.Subset', 'Character.UnicodeBlock', 'Class', 'ClassCastException', 'ClassCircularityError', 'ClassFormatError', 'ClassLoader', 'ClassNotFoundException', 'CloneNotSupportedException', 'Cloneable', 'Comparable', 'Compiler', 'Deprecated', 'Double', 'Enum', 'EnumConstantNotPresentException', 'Error', 'Exception', 'ExceptionInInitializerError', 'Float', 'IllegalAccessError', 'IllegalAccessException', 'IllegalArgumentException', 'IllegalMonitorStateException', 'IllegalStateException', 'IllegalThreadStateException', 'IncompatibleClassChangeError', 'IndexOutOfBoundsException', 'InheritableThreadLocal', 'InstantiationError', 'InstantiationException', 'Integer', 'InternalError', 'InterruptedException', 'Iterable', 'LinkageError', 'Long', 'Math', 'NegativeArraySizeException', 'NoClassDefFoundError', 'NoSuchFieldError',
+            'NoSuchFieldException', 'NoSuchMethodError', 'NoSuchMethodException', 'NullPointerException', 'Number', 'NumberFormatException', 'OutOfMemoryError', 'Override', 'Package', 'Process', 'ProcessBuilder', 'Readable', 'Runnable', 'Runtime', 'RuntimeException', 'RuntimePermission', 'SecurityException', 'SecurityManager', 'Short', 'StackOverflowError', 'StackTraceElement', 'StrictMath', 'String', 'StringBuffer', 'StringBuilder', 'StringIndexOutOfBoundsException', 'SuppressWarnings', 'System', 'Thread', 'Thread.State', 'Thread.UncaughtExceptionHandler', 'ThreadDeath', 'ThreadGroup', 'ThreadLocal', 'Throwable', 'TypeNotPresentException', 'UnknownError', 'UnsatisfiedLinkError', 'UnsupportedClassVersionError', 'UnsupportedOperationException', 'VerifyError', 'VirtualMachineError', 'Void'
+            ),
+        22 => array (
+            'AnnotationFormatError', 'AnnotationTypeMismatchException', 'Documented', 'ElementType', 'IncompleteAnnotationException', 'Inherited', 'Retention', 'RetentionPolicy', 'Target'
+            ),
+        23 => array (
+            'ClassDefinition', 'ClassFileTransformer', 'IllegalClassFormatException', 'Instrumentation', 'UnmodifiableClassException'
+            ),
+        24 => array (
+            'ClassLoadingMXBean', 'CompilationMXBean', 'GarbageCollectorMXBean', 'ManagementFactory', 'ManagementPermission', 'MemoryMXBean', 'MemoryManagerMXBean', 'MemoryNotificationInfo', 'MemoryPoolMXBean', 'MemoryType', 'MemoryUsage', 'OperatingSystemMXBean', 'RuntimeMXBean', 'ThreadInfo', 'ThreadMXBean'
+            ),
+        25 => array (
+            'PhantomReference', 'ReferenceQueue', 'SoftReference', 'WeakReference'
+            ),
+        26 => array (
+            'AccessibleObject', 'AnnotatedElement', 'Constructor', 'Field', 'GenericArrayType', 'GenericDeclaration', 'GenericSignatureFormatError', 'InvocationHandler', 'InvocationTargetException', 'MalformedParameterizedTypeException', 'Member', 'Method', 'Modifier', 'ParameterizedType', 'ReflectPermission', 'Type', 'TypeVariable', 'UndeclaredThrowableException', 'WildcardType'
+            ),
+        27 => array (
+            'BigDecimal', 'BigInteger', 'MathContext', 'RoundingMode'
+            ),
+        28 => array (
+            'Authenticator', 'Authenticator.RequestorType', 'BindException', 'CacheRequest', 'CacheResponse', 'ContentHandlerFactory', 'CookieHandler', 'DatagramPacket', 'DatagramSocket', 'DatagramSocketImpl', 'DatagramSocketImplFactory', 'FileNameMap', 'HttpRetryException', 'HttpURLConnection', 'Inet4Address', 'Inet6Address', 'InetAddress', 'InetSocketAddress', 'JarURLConnection', 'MalformedURLException', 'MulticastSocket', 'NetPermission', 'NetworkInterface', 'NoRouteToHostException', 'PasswordAuthentication', 'PortUnreachableException', 'ProtocolException', 'Proxy.Type', 'ProxySelector', 'ResponseCache', 'SecureCacheResponse', 'ServerSocket', 'Socket', 'SocketAddress', 'SocketException', 'SocketImpl', 'SocketImplFactory', 'SocketOptions', 'SocketPermission', 'SocketTimeoutException', 'URI', 'URISyntaxException', 'URL', 'URLClassLoader', 'URLConnection', 'URLDecoder', 'URLEncoder', 'URLStreamHandler', 'URLStreamHandlerFactory', 'UnknownServiceException'
+            ),
+        29 => array (
+            'Buffer', 'BufferOverflowException', 'BufferUnderflowException', 'ByteBuffer', 'ByteOrder', 'CharBuffer', 'DoubleBuffer', 'FloatBuffer', 'IntBuffer', 'InvalidMarkException', 'LongBuffer', 'MappedByteBuffer', 'ReadOnlyBufferException', 'ShortBuffer'
+            ),
+        30 => array (
+            'AlreadyConnectedException', 'AsynchronousCloseException', 'ByteChannel', 'CancelledKeyException', 'Channel', 'Channels', 'ClosedByInterruptException', 'ClosedChannelException', 'ClosedSelectorException', 'ConnectionPendingException', 'DatagramChannel', 'FileChannel', 'FileChannel.MapMode', 'FileLock', 'FileLockInterruptionException', 'GatheringByteChannel', 'IllegalBlockingModeException', 'IllegalSelectorException', 'InterruptibleChannel', 'NoConnectionPendingException', 'NonReadableChannelException', 'NonWritableChannelException', 'NotYetBoundException', 'NotYetConnectedException', 'OverlappingFileLockException', 'Pipe', 'Pipe.SinkChannel', 'Pipe.SourceChannel', 'ReadableByteChannel', 'ScatteringByteChannel', 'SelectableChannel', 'SelectionKey', 'Selector', 'ServerSocketChannel', 'SocketChannel', 'UnresolvedAddressException', 'UnsupportedAddressTypeException', 'WritableByteChannel'
+            ),
+        31 => array (
+            'AbstractInterruptibleChannel', 'AbstractSelectableChannel', 'AbstractSelectionKey', 'AbstractSelector', 'SelectorProvider'
+            ),
+        32 => array (
+            'CharacterCodingException', 'Charset', 'CharsetDecoder', 'CharsetEncoder', 'CoderMalfunctionError', 'CoderResult', 'CodingErrorAction', 'IllegalCharsetNameException', 'MalformedInputException', 'UnmappableCharacterException', 'UnsupportedCharsetException'
+            ),
+        33 => array (
+            'CharsetProvider'
+            ),
+        34 => array (
+            'AccessException', 'AlreadyBoundException', 'ConnectIOException', 'MarshalException', 'MarshalledObject', 'Naming', 'NoSuchObjectException', 'NotBoundException', 'RMISecurityException', 'RMISecurityManager', 'Remote', 'RemoteException', 'ServerError', 'ServerException', 'ServerRuntimeException', 'StubNotFoundException', 'UnexpectedException', 'UnmarshalException'
+            ),
+        35 => array (
+            'Activatable', 'ActivateFailedException', 'ActivationDesc', 'ActivationException', 'ActivationGroup', 'ActivationGroupDesc', 'ActivationGroupDesc.CommandEnvironment', 'ActivationGroupID', 'ActivationGroup_Stub', 'ActivationID', 'ActivationInstantiator', 'ActivationMonitor', 'ActivationSystem', 'Activator', 'UnknownGroupException', 'UnknownObjectException'
+            ),
+        36 => array (
+            'DGC', 'Lease', 'VMID'
+            ),
+        37 => array (
+            'LocateRegistry', 'Registry', 'RegistryHandler'
+            ),
+        38 => array (
+            'ExportException', 'LoaderHandler', 'LogStream', 'ObjID', 'Operation', 'RMIClassLoader', 'RMIClassLoaderSpi', 'RMIClientSocketFactory', 'RMIFailureHandler', 'RMIServerSocketFactory', 'RMISocketFactory', 'RemoteCall', 'RemoteObject', 'RemoteObjectInvocationHandler', 'RemoteRef', 'RemoteServer', 'RemoteStub', 'ServerCloneException', 'ServerNotActiveException', 'ServerRef', 'Skeleton', 'SkeletonMismatchException', 'SkeletonNotFoundException', 'SocketSecurityException', 'UID', 'UnicastRemoteObject', 'Unreferenced'
+            ),
+        39 => array (
+            'AccessControlContext', 'AccessControlException', 'AccessController', 'AlgorithmParameterGenerator', 'AlgorithmParameterGeneratorSpi', 'AlgorithmParameters', 'AlgorithmParametersSpi', 'AllPermission', 'AuthProvider', 'BasicPermission', 'CodeSigner', 'CodeSource', 'DigestException', 'DigestInputStream', 'DigestOutputStream', 'DomainCombiner', 'GeneralSecurityException', 'Guard', 'GuardedObject', 'Identity', 'IdentityScope', 'InvalidAlgorithmParameterException', 'InvalidParameterException', 'Key', 'KeyException', 'KeyFactory', 'KeyFactorySpi', 'KeyManagementException', 'KeyPair', 'KeyPairGenerator', 'KeyPairGeneratorSpi', 'KeyRep', 'KeyRep.Type', 'KeyStore', 'KeyStore.Builder', 'KeyStore.CallbackHandlerProtection', 'KeyStore.Entry', 'KeyStore.LoadStoreParameter', 'KeyStore.PasswordProtection', 'KeyStore.PrivateKeyEntry', 'KeyStore.ProtectionParameter', 'KeyStore.SecretKeyEntry', 'KeyStore.TrustedCertificateEntry', 'KeyStoreException', 'KeyStoreSpi', 'MessageDigest', 'MessageDigestSpi',
+            'NoSuchAlgorithmException', 'NoSuchProviderException', 'PermissionCollection', 'Permissions', 'PrivateKey', 'PrivilegedAction', 'PrivilegedActionException', 'PrivilegedExceptionAction', 'ProtectionDomain', 'Provider', 'Provider.Service', 'ProviderException', 'PublicKey', 'SecureClassLoader', 'SecureRandom', 'SecureRandomSpi', 'Security', 'SecurityPermission', 'Signature', 'SignatureException', 'SignatureSpi', 'SignedObject', 'Signer', 'UnrecoverableEntryException', 'UnrecoverableKeyException', 'UnresolvedPermission'
+            ),
+        40 => array (
+            'Acl', 'AclEntry', 'AclNotFoundException', 'Group', 'LastOwnerException', 'NotOwnerException', 'Owner'
+            ),
+        41 => array (
+            'CRL', 'CRLException', 'CRLSelector', 'CertPath', 'CertPath.CertPathRep', 'CertPathBuilder', 'CertPathBuilderException', 'CertPathBuilderResult', 'CertPathBuilderSpi', 'CertPathParameters', 'CertPathValidator', 'CertPathValidatorException', 'CertPathValidatorResult', 'CertPathValidatorSpi', 'CertSelector', 'CertStore', 'CertStoreException', 'CertStoreParameters', 'CertStoreSpi', 'Certificate.CertificateRep', 'CertificateFactory', 'CertificateFactorySpi', 'CollectionCertStoreParameters', 'LDAPCertStoreParameters', 'PKIXBuilderParameters', 'PKIXCertPathBuilderResult', 'PKIXCertPathChecker', 'PKIXCertPathValidatorResult', 'PKIXParameters', 'PolicyNode', 'PolicyQualifierInfo', 'TrustAnchor', 'X509CRL', 'X509CRLEntry', 'X509CRLSelector', 'X509CertSelector', 'X509Extension'
+            ),
+        42 => array (
+            'DSAKey', 'DSAKeyPairGenerator', 'DSAParams', 'DSAPrivateKey', 'DSAPublicKey', 'ECKey', 'ECPrivateKey', 'ECPublicKey', 'RSAKey', 'RSAMultiPrimePrivateCrtKey', 'RSAPrivateCrtKey', 'RSAPrivateKey', 'RSAPublicKey'
+            ),
+        43 => array (
+            'AlgorithmParameterSpec', 'DSAParameterSpec', 'DSAPrivateKeySpec', 'DSAPublicKeySpec', 'ECField', 'ECFieldF2m', 'ECFieldFp', 'ECGenParameterSpec', 'ECParameterSpec', 'ECPoint', 'ECPrivateKeySpec', 'ECPublicKeySpec', 'EllipticCurve', 'EncodedKeySpec', 'InvalidKeySpecException', 'InvalidParameterSpecException', 'KeySpec', 'MGF1ParameterSpec', 'PKCS8EncodedKeySpec', 'PSSParameterSpec', 'RSAKeyGenParameterSpec', 'RSAMultiPrimePrivateCrtKeySpec', 'RSAOtherPrimeInfo', 'RSAPrivateCrtKeySpec', 'RSAPrivateKeySpec', 'RSAPublicKeySpec', 'X509EncodedKeySpec'
+            ),
+        44 => array (
+            'BatchUpdateException', 'Blob', 'CallableStatement', 'Clob', 'Connection', 'DataTruncation', 'DatabaseMetaData', 'Driver', 'DriverManager', 'DriverPropertyInfo', 'ParameterMetaData', 'PreparedStatement', 'Ref', 'ResultSet', 'ResultSetMetaData', 'SQLData', 'SQLException', 'SQLInput', 'SQLOutput', 'SQLPermission', 'SQLWarning', 'Savepoint', 'Struct', 'Time', 'Types'
+            ),
+        45 => array (
+            'AttributedCharacterIterator', 'AttributedCharacterIterator.Attribute', 'AttributedString', 'Bidi', 'BreakIterator', 'CharacterIterator', 'ChoiceFormat', 'CollationElementIterator', 'CollationKey', 'Collator', 'DateFormat', 'DateFormat.Field', 'DateFormatSymbols', 'DecimalFormat', 'DecimalFormatSymbols', 'FieldPosition', 'Format', 'Format.Field', 'MessageFormat', 'MessageFormat.Field', 'NumberFormat', 'NumberFormat.Field', 'ParseException', 'ParsePosition', 'RuleBasedCollator', 'SimpleDateFormat', 'StringCharacterIterator'
+            ),
+        46 => array (
+            'AbstractCollection', 'AbstractList', 'AbstractMap', 'AbstractQueue', 'AbstractSequentialList', 'AbstractSet', 'ArrayList', 'Arrays', 'BitSet', 'Calendar', 'Collection', 'Collections', 'Comparator', 'ConcurrentModificationException', 'Currency', 'Dictionary', 'DuplicateFormatFlagsException', 'EmptyStackException', 'EnumMap', 'EnumSet', 'Enumeration', 'EventListenerProxy', 'EventObject', 'FormatFlagsConversionMismatchException', 'Formattable', 'FormattableFlags', 'Formatter.BigDecimalLayoutForm', 'FormatterClosedException', 'GregorianCalendar', 'HashMap', 'HashSet', 'Hashtable', 'IdentityHashMap', 'IllegalFormatCodePointException', 'IllegalFormatConversionException', 'IllegalFormatException', 'IllegalFormatFlagsException', 'IllegalFormatPrecisionException', 'IllegalFormatWidthException', 'InputMismatchException', 'InvalidPropertiesFormatException', 'Iterator', 'LinkedHashMap', 'LinkedHashSet', 'LinkedList', 'ListIterator', 'ListResourceBundle', 'Locale', 'Map', 'Map.Entry', 'MissingFormatArgumentException',
+            'MissingFormatWidthException', 'MissingResourceException', 'NoSuchElementException', 'Observable', 'Observer', 'PriorityQueue', 'Properties', 'PropertyPermission', 'PropertyResourceBundle', 'Queue', 'Random', 'RandomAccess', 'ResourceBundle', 'Scanner', 'Set', 'SimpleTimeZone', 'SortedMap', 'SortedSet', 'Stack', 'StringTokenizer', 'TimeZone', 'TimerTask', 'TooManyListenersException', 'TreeMap', 'TreeSet', 'UUID', 'UnknownFormatConversionException', 'UnknownFormatFlagsException', 'Vector', 'WeakHashMap'
+            ),
+        47 => array (
+            'AbstractExecutorService', 'ArrayBlockingQueue', 'BlockingQueue', 'BrokenBarrierException', 'Callable', 'CancellationException', 'CompletionService', 'ConcurrentHashMap', 'ConcurrentLinkedQueue', 'ConcurrentMap', 'CopyOnWriteArrayList', 'CopyOnWriteArraySet', 'CountDownLatch', 'CyclicBarrier', 'DelayQueue', 'Delayed', 'Exchanger', 'ExecutionException', 'Executor', 'ExecutorCompletionService', 'ExecutorService', 'Executors', 'Future', 'FutureTask', 'LinkedBlockingQueue', 'PriorityBlockingQueue', 'RejectedExecutionException', 'RejectedExecutionHandler', 'ScheduledExecutorService', 'ScheduledFuture', 'ScheduledThreadPoolExecutor', 'Semaphore', 'SynchronousQueue', 'ThreadFactory', 'ThreadPoolExecutor', 'ThreadPoolExecutor.AbortPolicy', 'ThreadPoolExecutor.CallerRunsPolicy', 'ThreadPoolExecutor.DiscardOldestPolicy', 'ThreadPoolExecutor.DiscardPolicy', 'TimeUnit', 'TimeoutException'
+            ),
+        48 => array (
+            'AtomicBoolean', 'AtomicInteger', 'AtomicIntegerArray', 'AtomicIntegerFieldUpdater', 'AtomicLong', 'AtomicLongArray', 'AtomicLongFieldUpdater', 'AtomicMarkableReference', 'AtomicReference', 'AtomicReferenceArray', 'AtomicReferenceFieldUpdater', 'AtomicStampedReference'
+            ),
+        49 => array (
+            'AbstractQueuedSynchronizer', 'Condition', 'Lock', 'LockSupport', 'ReadWriteLock', 'ReentrantLock', 'ReentrantReadWriteLock', 'ReentrantReadWriteLock.ReadLock', 'ReentrantReadWriteLock.WriteLock'
+            ),
+        50 => array (
+            'Attributes.Name', 'JarEntry', 'JarException', 'JarFile', 'JarInputStream', 'JarOutputStream', 'Manifest', 'Pack200', 'Pack200.Packer', 'Pack200.Unpacker'
+            ),
+        51 => array (
+            'ConsoleHandler', 'ErrorManager', 'FileHandler', 'Filter', 'Handler', 'Level', 'LogManager', 'LogRecord', 'Logger', 'LoggingMXBean', 'LoggingPermission', 'MemoryHandler', 'SimpleFormatter', 'SocketHandler', 'StreamHandler', 'XMLFormatter'
+            ),
+        52 => array (
+            'AbstractPreferences', 'BackingStoreException', 'InvalidPreferencesFormatException', 'NodeChangeEvent', 'NodeChangeListener', 'PreferenceChangeEvent', 'PreferenceChangeListener', 'Preferences', 'PreferencesFactory'
+            ),
+        53 => array (
+            'MatchResult', 'Matcher', 'Pattern', 'PatternSyntaxException'
+            ),
+        54 => array (
+            'Adler32', 'CRC32', 'CheckedInputStream', 'CheckedOutputStream', 'Checksum', 'DataFormatException', 'Deflater', 'DeflaterOutputStream', 'GZIPInputStream', 'GZIPOutputStream', 'Inflater', 'InflaterInputStream', 'ZipEntry', 'ZipException', 'ZipFile', 'ZipInputStream', 'ZipOutputStream'
+            ),
+        55 => array (
+            'Accessible', 'AccessibleAction', 'AccessibleAttributeSequence', 'AccessibleBundle', 'AccessibleComponent', 'AccessibleContext', 'AccessibleEditableText', 'AccessibleExtendedComponent', 'AccessibleExtendedTable', 'AccessibleExtendedText', 'AccessibleHyperlink', 'AccessibleHypertext', 'AccessibleIcon', 'AccessibleKeyBinding', 'AccessibleRelation', 'AccessibleRelationSet', 'AccessibleResourceBundle', 'AccessibleRole', 'AccessibleSelection', 'AccessibleState', 'AccessibleStateSet', 'AccessibleStreamable', 'AccessibleTable', 'AccessibleTableModelChange', 'AccessibleText', 'AccessibleTextSequence', 'AccessibleValue'
+            ),
+        56 => array (
+            'ActivityCompletedException', 'ActivityRequiredException', 'InvalidActivityException'
+            ),
+        57 => array (
+            'BadPaddingException', 'Cipher', 'CipherInputStream', 'CipherOutputStream', 'CipherSpi', 'EncryptedPrivateKeyInfo', 'ExemptionMechanism', 'ExemptionMechanismException', 'ExemptionMechanismSpi', 'IllegalBlockSizeException', 'KeyAgreement', 'KeyAgreementSpi', 'KeyGenerator', 'KeyGeneratorSpi', 'Mac', 'MacSpi', 'NoSuchPaddingException', 'NullCipher', 'SealedObject', 'SecretKey', 'SecretKeyFactory', 'SecretKeyFactorySpi', 'ShortBufferException'
+            ),
+        58 => array (
+            'DHKey', 'DHPrivateKey', 'DHPublicKey', 'PBEKey'
+            ),
+        59 => array (
+            'DESKeySpec', 'DESedeKeySpec', 'DHGenParameterSpec', 'DHParameterSpec', 'DHPrivateKeySpec', 'DHPublicKeySpec', 'IvParameterSpec', 'OAEPParameterSpec', 'PBEKeySpec', 'PBEParameterSpec', 'PSource', 'PSource.PSpecified', 'RC2ParameterSpec', 'RC5ParameterSpec', 'SecretKeySpec'
+            ),
+        60 => array (
+            'IIOException', 'IIOImage', 'IIOParam', 'IIOParamController', 'ImageIO', 'ImageReadParam', 'ImageReader', 'ImageTranscoder', 'ImageTypeSpecifier', 'ImageWriteParam', 'ImageWriter'
+            ),
+        61 => array (
+            'IIOReadProgressListener', 'IIOReadUpdateListener', 'IIOReadWarningListener', 'IIOWriteProgressListener', 'IIOWriteWarningListener'
+            ),
+        62 => array (
+            'IIOInvalidTreeException', 'IIOMetadata', 'IIOMetadataController', 'IIOMetadataFormat', 'IIOMetadataFormatImpl', 'IIOMetadataNode'
+            ),
+        63 => array (
+            'BMPImageWriteParam'
+            ),
+        64 => array (
+            'JPEGHuffmanTable', 'JPEGImageReadParam', 'JPEGImageWriteParam', 'JPEGQTable'
+            ),
+        65 => array (
+            'IIORegistry', 'IIOServiceProvider', 'ImageInputStreamSpi', 'ImageOutputStreamSpi', 'ImageReaderSpi', 'ImageReaderWriterSpi', 'ImageTranscoderSpi', 'ImageWriterSpi', 'RegisterableService', 'ServiceRegistry', 'ServiceRegistry.Filter'
+            ),
+        66 => array (
+            'FileCacheImageInputStream', 'FileCacheImageOutputStream', 'FileImageInputStream', 'FileImageOutputStream', 'IIOByteBuffer', 'ImageInputStream', 'ImageInputStreamImpl', 'ImageOutputStream', 'ImageOutputStreamImpl', 'MemoryCacheImageInputStream', 'MemoryCacheImageOutputStream'
+            ),
+        67 => array (
+            'AttributeChangeNotification', 'AttributeChangeNotificationFilter', 'AttributeNotFoundException', 'AttributeValueExp', 'BadAttributeValueExpException', 'BadBinaryOpValueExpException', 'BadStringOperationException', 'Descriptor', 'DescriptorAccess', 'DynamicMBean', 'InstanceAlreadyExistsException', 'InstanceNotFoundException', 'InvalidApplicationException', 'JMException', 'JMRuntimeException', 'ListenerNotFoundException', 'MBeanAttributeInfo', 'MBeanConstructorInfo', 'MBeanException', 'MBeanFeatureInfo', 'MBeanInfo', 'MBeanNotificationInfo', 'MBeanOperationInfo', 'MBeanParameterInfo', 'MBeanPermission', 'MBeanRegistration', 'MBeanRegistrationException', 'MBeanServer', 'MBeanServerBuilder', 'MBeanServerConnection', 'MBeanServerDelegate', 'MBeanServerDelegateMBean', 'MBeanServerFactory', 'MBeanServerInvocationHandler', 'MBeanServerNotification', 'MBeanServerPermission', 'MBeanTrustPermission', 'MalformedObjectNameException', 'NotCompliantMBeanException', 'Notification', 'NotificationBroadcaster',
+            'NotificationBroadcasterSupport', 'NotificationEmitter', 'NotificationFilter', 'NotificationFilterSupport', 'NotificationListener', 'ObjectInstance', 'ObjectName', 'OperationsException', 'PersistentMBean', 'Query', 'QueryEval', 'QueryExp', 'ReflectionException', 'RuntimeErrorException', 'RuntimeMBeanException', 'RuntimeOperationsException', 'ServiceNotFoundException', 'StandardMBean', 'StringValueExp', 'ValueExp'
+            ),
+        68 => array (
+            'ClassLoaderRepository', 'MLet', 'MLetMBean', 'PrivateClassLoader', 'PrivateMLet'
+            ),
+        69 => array (
+            'DescriptorSupport', 'InvalidTargetObjectTypeException', 'ModelMBean', 'ModelMBeanAttributeInfo', 'ModelMBeanConstructorInfo', 'ModelMBeanInfo', 'ModelMBeanInfoSupport', 'ModelMBeanNotificationBroadcaster', 'ModelMBeanNotificationInfo', 'ModelMBeanOperationInfo', 'RequiredModelMBean', 'XMLParseException'
+            ),
+        70 => array (
+            'CounterMonitor', 'CounterMonitorMBean', 'GaugeMonitor', 'GaugeMonitorMBean', 'Monitor', 'MonitorMBean', 'MonitorNotification', 'MonitorSettingException', 'StringMonitor', 'StringMonitorMBean'
+            ),
+        71 => array (
+            'ArrayType', 'CompositeData', 'CompositeDataSupport', 'CompositeType', 'InvalidOpenTypeException', 'KeyAlreadyExistsException', 'OpenDataException', 'OpenMBeanAttributeInfo', 'OpenMBeanAttributeInfoSupport', 'OpenMBeanConstructorInfo', 'OpenMBeanConstructorInfoSupport', 'OpenMBeanInfo', 'OpenMBeanInfoSupport', 'OpenMBeanOperationInfo', 'OpenMBeanOperationInfoSupport', 'OpenMBeanParameterInfo', 'OpenMBeanParameterInfoSupport', 'SimpleType', 'TabularData', 'TabularDataSupport', 'TabularType'
+            ),
+        72 => array (
+            'InvalidRelationIdException', 'InvalidRelationServiceException', 'InvalidRelationTypeException', 'InvalidRoleInfoException', 'InvalidRoleValueException', 'MBeanServerNotificationFilter', 'Relation', 'RelationException', 'RelationNotFoundException', 'RelationNotification', 'RelationService', 'RelationServiceMBean', 'RelationServiceNotRegisteredException', 'RelationSupport', 'RelationSupportMBean', 'RelationType', 'RelationTypeNotFoundException', 'RelationTypeSupport', 'Role', 'RoleInfo', 'RoleInfoNotFoundException', 'RoleList', 'RoleNotFoundException', 'RoleResult', 'RoleStatus', 'RoleUnresolved', 'RoleUnresolvedList'
+            ),
+        73 => array (
+            'JMXAuthenticator', 'JMXConnectionNotification', 'JMXConnector', 'JMXConnectorFactory', 'JMXConnectorProvider', 'JMXConnectorServer', 'JMXConnectorServerFactory', 'JMXConnectorServerMBean', 'JMXConnectorServerProvider', 'JMXPrincipal', 'JMXProviderException', 'JMXServerErrorException', 'JMXServiceURL', 'MBeanServerForwarder', 'NotificationResult', 'SubjectDelegationPermission', 'TargetedNotification'
+            ),
+        74 => array (
+            'RMIConnection', 'RMIConnectionImpl', 'RMIConnectionImpl_Stub', 'RMIConnector', 'RMIConnectorServer', 'RMIIIOPServerImpl', 'RMIJRMPServerImpl', 'RMIServer', 'RMIServerImpl', 'RMIServerImpl_Stub'
+            ),
+        75 => array (
+            'TimerAlarmClockNotification', 'TimerMBean', 'TimerNotification'
+            ),
+        76 => array (
+            'AuthenticationNotSupportedException', 'BinaryRefAddr', 'CannotProceedException', 'CommunicationException', 'CompositeName', 'CompoundName', 'ConfigurationException', 'ContextNotEmptyException', 'InitialContext', 'InsufficientResourcesException', 'InterruptedNamingException', 'InvalidNameException', 'LimitExceededException', 'LinkException', 'LinkLoopException', 'LinkRef', 'MalformedLinkException', 'Name', 'NameAlreadyBoundException', 'NameClassPair', 'NameNotFoundException', 'NameParser', 'NamingEnumeration', 'NamingException', 'NamingSecurityException', 'NoInitialContextException', 'NoPermissionException', 'NotContextException', 'OperationNotSupportedException', 'PartialResultException', 'RefAddr', 'Referenceable', 'ReferralException', 'ServiceUnavailableException', 'SizeLimitExceededException', 'StringRefAddr', 'TimeLimitExceededException'
+            ),
+        77 => array (
+            'AttributeInUseException', 'AttributeModificationException', 'BasicAttribute', 'BasicAttributes', 'DirContext', 'InitialDirContext', 'InvalidAttributeIdentifierException', 'InvalidAttributesException', 'InvalidSearchControlsException', 'InvalidSearchFilterException', 'ModificationItem', 'NoSuchAttributeException', 'SchemaViolationException', 'SearchControls', 'SearchResult'
+            ),
+        78 => array (
+            'EventContext', 'EventDirContext', 'NamespaceChangeListener', 'NamingEvent', 'NamingExceptionEvent', 'NamingListener', 'ObjectChangeListener'
+            ),
+        79 => array (
+            'BasicControl', 'ControlFactory', 'ExtendedRequest', 'ExtendedResponse', 'HasControls', 'InitialLdapContext', 'LdapContext', 'LdapName', 'LdapReferralException', 'ManageReferralControl', 'PagedResultsControl', 'PagedResultsResponseControl', 'Rdn', 'SortControl', 'SortKey', 'SortResponseControl', 'StartTlsRequest', 'StartTlsResponse', 'UnsolicitedNotification', 'UnsolicitedNotificationEvent', 'UnsolicitedNotificationListener'
+            ),
+        80 => array (
+            'DirObjectFactory', 'DirStateFactory', 'DirStateFactory.Result', 'DirectoryManager', 'InitialContextFactory', 'InitialContextFactoryBuilder', 'NamingManager', 'ObjectFactory', 'ObjectFactoryBuilder', 'ResolveResult', 'Resolver', 'StateFactory'
+            ),
+        81 => array (
+            'ServerSocketFactory', 'SocketFactory'
+            ),
+        82 => array (
+            'CertPathTrustManagerParameters', 'HandshakeCompletedEvent', 'HandshakeCompletedListener', 'HostnameVerifier', 'HttpsURLConnection', 'KeyManager', 'KeyManagerFactory', 'KeyManagerFactorySpi', 'KeyStoreBuilderParameters', 'ManagerFactoryParameters', 'SSLContext', 'SSLContextSpi', 'SSLEngine', 'SSLEngineResult', 'SSLEngineResult.HandshakeStatus', 'SSLEngineResult.Status', 'SSLException', 'SSLHandshakeException', 'SSLKeyException', 'SSLPeerUnverifiedException', 'SSLPermission', 'SSLProtocolException', 'SSLServerSocket', 'SSLServerSocketFactory', 'SSLSession', 'SSLSessionBindingEvent', 'SSLSessionBindingListener', 'SSLSessionContext', 'SSLSocket', 'SSLSocketFactory', 'TrustManager', 'TrustManagerFactory', 'TrustManagerFactorySpi', 'X509ExtendedKeyManager', 'X509KeyManager', 'X509TrustManager'
+            ),
+        83 => array (
+            'AttributeException', 'CancelablePrintJob', 'Doc', 'DocFlavor', 'DocFlavor.BYTE_ARRAY', 'DocFlavor.CHAR_ARRAY', 'DocFlavor.INPUT_STREAM', 'DocFlavor.READER', 'DocFlavor.SERVICE_FORMATTED', 'DocFlavor.STRING', 'DocFlavor.URL', 'DocPrintJob', 'FlavorException', 'MultiDoc', 'MultiDocPrintJob', 'MultiDocPrintService', 'PrintException', 'PrintService', 'PrintServiceLookup', 'ServiceUI', 'ServiceUIFactory', 'SimpleDoc', 'StreamPrintService', 'StreamPrintServiceFactory', 'URIException'
+            ),
+        84 => array (
+            'AttributeSetUtilities', 'DateTimeSyntax', 'DocAttribute', 'DocAttributeSet', 'EnumSyntax', 'HashAttributeSet', 'HashDocAttributeSet', 'HashPrintJobAttributeSet', 'HashPrintRequestAttributeSet', 'HashPrintServiceAttributeSet', 'IntegerSyntax', 'PrintJobAttribute', 'PrintJobAttributeSet', 'PrintRequestAttribute', 'PrintRequestAttributeSet', 'PrintServiceAttribute', 'PrintServiceAttributeSet', 'ResolutionSyntax', 'SetOfIntegerSyntax', 'Size2DSyntax', 'SupportedValuesAttribute', 'TextSyntax', 'URISyntax', 'UnmodifiableSetException'
+            ),
+        85 => array (
+            'Chromaticity', 'ColorSupported', 'Compression', 'Copies', 'CopiesSupported', 'DateTimeAtCompleted', 'DateTimeAtCreation', 'DateTimeAtProcessing', 'Destination', 'DocumentName', 'Fidelity', 'Finishings', 'JobHoldUntil', 'JobImpressions', 'JobImpressionsCompleted', 'JobImpressionsSupported', 'JobKOctets', 'JobKOctetsProcessed', 'JobKOctetsSupported', 'JobMediaSheets', 'JobMediaSheetsCompleted', 'JobMediaSheetsSupported', 'JobMessageFromOperator', 'JobName', 'JobOriginatingUserName', 'JobPriority', 'JobPrioritySupported', 'JobSheets', 'JobState', 'JobStateReason', 'JobStateReasons', 'Media', 'MediaName', 'MediaPrintableArea', 'MediaSize', 'MediaSize.Engineering', 'MediaSize.ISO', 'MediaSize.JIS', 'MediaSize.NA', 'MediaSize.Other', 'MediaSizeName', 'MediaTray', 'MultipleDocumentHandling', 'NumberOfDocuments', 'NumberOfInterveningJobs', 'NumberUp', 'NumberUpSupported', 'OrientationRequested', 'OutputDeviceAssigned', 'PDLOverrideSupported', 'PageRanges', 'PagesPerMinute', 'PagesPerMinuteColor',
+            'PresentationDirection', 'PrintQuality', 'PrinterInfo', 'PrinterIsAcceptingJobs', 'PrinterLocation', 'PrinterMakeAndModel', 'PrinterMessageFromOperator', 'PrinterMoreInfo', 'PrinterMoreInfoManufacturer', 'PrinterName', 'PrinterResolution', 'PrinterState', 'PrinterStateReason', 'PrinterStateReasons', 'PrinterURI', 'QueuedJobCount', 'ReferenceUriSchemesSupported', 'RequestingUserName', 'Severity', 'SheetCollate', 'Sides'
+            ),
+        86 => array (
+            'PrintEvent', 'PrintJobAdapter', 'PrintJobAttributeEvent', 'PrintJobAttributeListener', 'PrintJobEvent', 'PrintJobListener', 'PrintServiceAttributeEvent', 'PrintServiceAttributeListener'
+            ),
+        87 => array (
+            'PortableRemoteObject'
+            ),
+        88 => array (
+            'ClassDesc', 'PortableRemoteObjectDelegate', 'Stub', 'StubDelegate', 'Tie', 'Util', 'UtilDelegate', 'ValueHandler', 'ValueHandlerMultiFormat'
+            ),
+        89 => array (
+            'SslRMIClientSocketFactory', 'SslRMIServerSocketFactory'
+            ),
+        90 => array (
+            'AuthPermission', 'DestroyFailedException', 'Destroyable', 'PrivateCredentialPermission', 'RefreshFailedException', 'Refreshable', 'Subject', 'SubjectDomainCombiner'
+            ),
+        91 => array (
+            'Callback', 'CallbackHandler', 'ChoiceCallback', 'ConfirmationCallback', 'LanguageCallback', 'NameCallback', 'PasswordCallback', 'TextInputCallback', 'TextOutputCallback', 'UnsupportedCallbackException'
+            ),
+        92 => array (
+            'DelegationPermission', 'KerberosKey', 'KerberosPrincipal', 'KerberosTicket', 'ServicePermission'
+            ),
+        93 => array (
+            'AccountException', 'AccountExpiredException', 'AccountLockedException', 'AccountNotFoundException', 'AppConfigurationEntry', 'AppConfigurationEntry.LoginModuleControlFlag', 'Configuration', 'CredentialException', 'CredentialExpiredException', 'CredentialNotFoundException', 'FailedLoginException', 'LoginContext', 'LoginException'
+            ),
+        94 => array (
+            'LoginModule'
+            ),
+        95 => array (
+            'X500Principal', 'X500PrivateCredential'
+            ),
+        96 => array (
+            'AuthorizeCallback', 'RealmCallback', 'RealmChoiceCallback', 'Sasl', 'SaslClient', 'SaslClientFactory', 'SaslException', 'SaslServer', 'SaslServerFactory'
+            ),
+        97 => array (
+            'ControllerEventListener', 'Instrument', 'InvalidMidiDataException', 'MetaEventListener', 'MetaMessage', 'MidiChannel', 'MidiDevice', 'MidiDevice.Info', 'MidiEvent', 'MidiFileFormat', 'MidiMessage', 'MidiSystem', 'MidiUnavailableException', 'Patch', 'Receiver', 'Sequence', 'Sequencer', 'Sequencer.SyncMode', 'ShortMessage', 'Soundbank', 'SoundbankResource', 'Synthesizer', 'SysexMessage', 'Track', 'Transmitter', 'VoiceStatus'
+            ),
+        98 => array (
+            'MidiDeviceProvider', 'MidiFileReader', 'MidiFileWriter', 'SoundbankReader'
+            ),
+        99 => array (
+            'AudioFileFormat', 'AudioFileFormat.Type', 'AudioFormat', 'AudioFormat.Encoding', 'AudioInputStream', 'AudioPermission', 'AudioSystem', 'BooleanControl', 'BooleanControl.Type', 'Clip', 'CompoundControl', 'CompoundControl.Type', 'Control.Type', 'DataLine', 'DataLine.Info', 'EnumControl', 'EnumControl.Type', 'FloatControl', 'FloatControl.Type', 'Line', 'Line.Info', 'LineEvent', 'LineEvent.Type', 'LineListener', 'LineUnavailableException', 'Mixer', 'Mixer.Info', 'Port', 'Port.Info', 'ReverbType', 'SourceDataLine', 'TargetDataLine', 'UnsupportedAudioFileException'
+            ),
+        100 => array (
+            'AudioFileReader', 'AudioFileWriter', 'FormatConversionProvider', 'MixerProvider'
+            ),
+        101 => array (
+            'ConnectionEvent', 'ConnectionEventListener', 'ConnectionPoolDataSource', 'DataSource', 'PooledConnection', 'RowSet', 'RowSetEvent', 'RowSetInternal', 'RowSetListener', 'RowSetMetaData', 'RowSetReader', 'RowSetWriter', 'XAConnection', 'XADataSource'
+            ),
+        102 => array (
+            'BaseRowSet', 'CachedRowSet', 'FilteredRowSet', 'JdbcRowSet', 'JoinRowSet', 'Joinable', 'Predicate', 'RowSetMetaDataImpl', 'RowSetWarning', 'WebRowSet'
+            ),
+        103 => array (
+            'SQLInputImpl', 'SQLOutputImpl', 'SerialArray', 'SerialBlob', 'SerialClob', 'SerialDatalink', 'SerialException', 'SerialJavaObject', 'SerialRef', 'SerialStruct'
+            ),
+        104 => array (
+            'SyncFactory', 'SyncFactoryException', 'SyncProvider', 'SyncProviderException', 'SyncResolver', 'TransactionalWriter', 'XmlReader', 'XmlWriter'
+            ),
+        105 => array (
+            'AbstractAction', 'AbstractButton', 'AbstractCellEditor', 'AbstractListModel', 'AbstractSpinnerModel', 'Action', 'ActionMap', 'BorderFactory', 'BoundedRangeModel', 'Box', 'Box.Filler', 'BoxLayout', 'ButtonGroup', 'ButtonModel', 'CellEditor', 'CellRendererPane', 'ComboBoxEditor', 'ComboBoxModel', 'ComponentInputMap', 'DebugGraphics', 'DefaultBoundedRangeModel', 'DefaultButtonModel', 'DefaultCellEditor', 'DefaultComboBoxModel', 'DefaultDesktopManager', 'DefaultFocusManager', 'DefaultListCellRenderer', 'DefaultListCellRenderer.UIResource', 'DefaultListModel', 'DefaultListSelectionModel', 'DefaultSingleSelectionModel', 'DesktopManager', 'FocusManager', 'GrayFilter', 'Icon', 'ImageIcon', 'InputMap', 'InputVerifier', 'InternalFrameFocusTraversalPolicy', 'JApplet', 'JButton', 'JCheckBox', 'JCheckBoxMenuItem', 'JColorChooser', 'JComboBox', 'JComboBox.KeySelectionManager', 'JComponent', 'JDesktopPane', 'JDialog', 'JEditorPane', 'JFileChooser', 'JFormattedTextField', 'JFormattedTextField.AbstractFormatter',
+            'JFormattedTextField.AbstractFormatterFactory', 'JFrame', 'JInternalFrame', 'JInternalFrame.JDesktopIcon', 'JLabel', 'JLayeredPane', 'JList', 'JMenu', 'JMenuBar', 'JMenuItem', 'JOptionPane', 'JPanel', 'JPasswordField', 'JPopupMenu', 'JPopupMenu.Separator', 'JProgressBar', 'JRadioButton', 'JRadioButtonMenuItem', 'JRootPane', 'JScrollBar', 'JScrollPane', 'JSeparator', 'JSlider', 'JSpinner', 'JSpinner.DateEditor', 'JSpinner.DefaultEditor', 'JSpinner.ListEditor', 'JSpinner.NumberEditor', 'JSplitPane', 'JTabbedPane', 'JTable', 'JTable.PrintMode', 'JTextArea', 'JTextField', 'JTextPane', 'JToggleButton', 'JToggleButton.ToggleButtonModel', 'JToolBar', 'JToolBar.Separator', 'JToolTip', 'JTree', 'JTree.DynamicUtilTreeNode', 'JTree.EmptySelectionModel', 'JViewport', 'JWindow', 'KeyStroke', 'LayoutFocusTraversalPolicy', 'ListCellRenderer', 'ListModel', 'ListSelectionModel', 'LookAndFeel', 'MenuElement', 'MenuSelectionManager', 'MutableComboBoxModel', 'OverlayLayout', 'Popup', 'PopupFactory', 'ProgressMonitor',
+            'ProgressMonitorInputStream', 'Renderer', 'RepaintManager', 'RootPaneContainer', 'ScrollPaneConstants', 'ScrollPaneLayout', 'ScrollPaneLayout.UIResource', 'Scrollable', 'SingleSelectionModel', 'SizeRequirements', 'SizeSequence', 'SortingFocusTraversalPolicy', 'SpinnerDateModel', 'SpinnerListModel', 'SpinnerModel', 'SpinnerNumberModel', 'Spring', 'SpringLayout', 'SpringLayout.Constraints', 'SwingConstants', 'SwingUtilities', 'ToolTipManager', 'TransferHandler', 'UIDefaults', 'UIDefaults.ActiveValue', 'UIDefaults.LazyInputMap', 'UIDefaults.LazyValue', 'UIDefaults.ProxyLazyValue', 'UIManager', 'UIManager.LookAndFeelInfo', 'UnsupportedLookAndFeelException', 'ViewportLayout', 'WindowConstants'
+            ),
+        106 => array (
+            'AbstractBorder', 'BevelBorder', 'Border', 'CompoundBorder', 'EmptyBorder', 'EtchedBorder', 'LineBorder', 'MatteBorder', 'SoftBevelBorder', 'TitledBorder'
+            ),
+        107 => array (
+            'AbstractColorChooserPanel', 'ColorChooserComponentFactory', 'ColorSelectionModel', 'DefaultColorSelectionModel'
+            ),
+        108 => array (
+            'AncestorEvent', 'AncestorListener', 'CaretEvent', 'CaretListener', 'CellEditorListener', 'ChangeEvent', 'ChangeListener', 'DocumentEvent.ElementChange', 'DocumentEvent.EventType', 'DocumentListener', 'EventListenerList', 'HyperlinkEvent', 'HyperlinkEvent.EventType', 'HyperlinkListener', 'InternalFrameAdapter', 'InternalFrameEvent', 'InternalFrameListener', 'ListDataEvent', 'ListDataListener', 'ListSelectionEvent', 'ListSelectionListener', 'MenuDragMouseEvent', 'MenuDragMouseListener', 'MenuEvent', 'MenuKeyEvent', 'MenuKeyListener', 'MenuListener', 'MouseInputAdapter', 'MouseInputListener', 'PopupMenuEvent', 'PopupMenuListener', 'SwingPropertyChangeSupport', 'TableColumnModelEvent', 'TableColumnModelListener', 'TableModelEvent', 'TableModelListener', 'TreeExpansionEvent', 'TreeExpansionListener', 'TreeModelEvent', 'TreeModelListener', 'TreeSelectionEvent', 'TreeSelectionListener', 'TreeWillExpandListener', 'UndoableEditEvent', 'UndoableEditListener'
+            ),
+        109 => array (
+            'FileSystemView', 'FileView'
+            ),
+        110 => array (
+            'ActionMapUIResource', 'BorderUIResource', 'BorderUIResource.BevelBorderUIResource', 'BorderUIResource.CompoundBorderUIResource', 'BorderUIResource.EmptyBorderUIResource', 'BorderUIResource.EtchedBorderUIResource', 'BorderUIResource.LineBorderUIResource', 'BorderUIResource.MatteBorderUIResource', 'BorderUIResource.TitledBorderUIResource', 'ButtonUI', 'ColorChooserUI', 'ColorUIResource', 'ComboBoxUI', 'ComponentInputMapUIResource', 'ComponentUI', 'DesktopIconUI', 'DesktopPaneUI', 'DimensionUIResource', 'FileChooserUI', 'FontUIResource', 'IconUIResource', 'InputMapUIResource', 'InsetsUIResource', 'InternalFrameUI', 'LabelUI', 'ListUI', 'MenuBarUI', 'MenuItemUI', 'OptionPaneUI', 'PanelUI', 'PopupMenuUI', 'ProgressBarUI', 'RootPaneUI', 'ScrollBarUI', 'ScrollPaneUI', 'SeparatorUI', 'SliderUI', 'SpinnerUI', 'SplitPaneUI', 'TabbedPaneUI', 'TableHeaderUI', 'TableUI', 'TextUI', 'ToolBarUI', 'ToolTipUI', 'TreeUI', 'UIResource', 'ViewportUI'
+            ),
+        111 => array (
+            'BasicArrowButton', 'BasicBorders', 'BasicBorders.ButtonBorder', 'BasicBorders.FieldBorder', 'BasicBorders.MarginBorder', 'BasicBorders.MenuBarBorder', 'BasicBorders.RadioButtonBorder', 'BasicBorders.RolloverButtonBorder', 'BasicBorders.SplitPaneBorder', 'BasicBorders.ToggleButtonBorder', 'BasicButtonListener', 'BasicButtonUI', 'BasicCheckBoxMenuItemUI', 'BasicCheckBoxUI', 'BasicColorChooserUI', 'BasicComboBoxEditor', 'BasicComboBoxEditor.UIResource', 'BasicComboBoxRenderer', 'BasicComboBoxRenderer.UIResource', 'BasicComboBoxUI', 'BasicComboPopup', 'BasicDesktopIconUI', 'BasicDesktopPaneUI', 'BasicDirectoryModel', 'BasicEditorPaneUI', 'BasicFileChooserUI', 'BasicFormattedTextFieldUI', 'BasicGraphicsUtils', 'BasicHTML', 'BasicIconFactory', 'BasicInternalFrameTitlePane', 'BasicInternalFrameUI', 'BasicLabelUI', 'BasicListUI', 'BasicLookAndFeel', 'BasicMenuBarUI', 'BasicMenuItemUI', 'BasicMenuUI', 'BasicOptionPaneUI', 'BasicOptionPaneUI.ButtonAreaLayout', 'BasicPanelUI', 'BasicPasswordFieldUI',
+            'BasicPopupMenuSeparatorUI', 'BasicPopupMenuUI', 'BasicProgressBarUI', 'BasicRadioButtonMenuItemUI', 'BasicRadioButtonUI', 'BasicRootPaneUI', 'BasicScrollBarUI', 'BasicScrollPaneUI', 'BasicSeparatorUI', 'BasicSliderUI', 'BasicSpinnerUI', 'BasicSplitPaneDivider', 'BasicSplitPaneUI', 'BasicTabbedPaneUI', 'BasicTableHeaderUI', 'BasicTableUI', 'BasicTextAreaUI', 'BasicTextFieldUI', 'BasicTextPaneUI', 'BasicTextUI', 'BasicTextUI.BasicCaret', 'BasicTextUI.BasicHighlighter', 'BasicToggleButtonUI', 'BasicToolBarSeparatorUI', 'BasicToolBarUI', 'BasicToolTipUI', 'BasicTreeUI', 'BasicViewportUI', 'ComboPopup', 'DefaultMenuLayout'
+            ),
+        112 => array (
+            'DefaultMetalTheme', 'MetalBorders', 'MetalBorders.ButtonBorder', 'MetalBorders.Flush3DBorder', 'MetalBorders.InternalFrameBorder', 'MetalBorders.MenuBarBorder', 'MetalBorders.MenuItemBorder', 'MetalBorders.OptionDialogBorder', 'MetalBorders.PaletteBorder', 'MetalBorders.PopupMenuBorder', 'MetalBorders.RolloverButtonBorder', 'MetalBorders.ScrollPaneBorder', 'MetalBorders.TableHeaderBorder', 'MetalBorders.TextFieldBorder', 'MetalBorders.ToggleButtonBorder', 'MetalBorders.ToolBarBorder', 'MetalButtonUI', 'MetalCheckBoxIcon', 'MetalCheckBoxUI', 'MetalComboBoxButton', 'MetalComboBoxEditor', 'MetalComboBoxEditor.UIResource', 'MetalComboBoxIcon', 'MetalComboBoxUI', 'MetalDesktopIconUI', 'MetalFileChooserUI', 'MetalIconFactory', 'MetalIconFactory.FileIcon16', 'MetalIconFactory.FolderIcon16', 'MetalIconFactory.PaletteCloseIcon', 'MetalIconFactory.TreeControlIcon', 'MetalIconFactory.TreeFolderIcon', 'MetalIconFactory.TreeLeafIcon', 'MetalInternalFrameTitlePane', 'MetalInternalFrameUI', 'MetalLabelUI',
+            'MetalLookAndFeel', 'MetalMenuBarUI', 'MetalPopupMenuSeparatorUI', 'MetalProgressBarUI', 'MetalRadioButtonUI', 'MetalRootPaneUI', 'MetalScrollBarUI', 'MetalScrollButton', 'MetalScrollPaneUI', 'MetalSeparatorUI', 'MetalSliderUI', 'MetalSplitPaneUI', 'MetalTabbedPaneUI', 'MetalTextFieldUI', 'MetalTheme', 'MetalToggleButtonUI', 'MetalToolBarUI', 'MetalToolTipUI', 'MetalTreeUI', 'OceanTheme'
+            ),
+        113 => array (
+            'MultiButtonUI', 'MultiColorChooserUI', 'MultiComboBoxUI', 'MultiDesktopIconUI', 'MultiDesktopPaneUI', 'MultiFileChooserUI', 'MultiInternalFrameUI', 'MultiLabelUI', 'MultiListUI', 'MultiLookAndFeel', 'MultiMenuBarUI', 'MultiMenuItemUI', 'MultiOptionPaneUI', 'MultiPanelUI', 'MultiPopupMenuUI', 'MultiProgressBarUI', 'MultiRootPaneUI', 'MultiScrollBarUI', 'MultiScrollPaneUI', 'MultiSeparatorUI', 'MultiSliderUI', 'MultiSpinnerUI', 'MultiSplitPaneUI', 'MultiTabbedPaneUI', 'MultiTableHeaderUI', 'MultiTableUI', 'MultiTextUI', 'MultiToolBarUI', 'MultiToolTipUI', 'MultiTreeUI', 'MultiViewportUI'
+            ),
+        114 => array (
+            'ColorType', 'Region', 'SynthConstants', 'SynthContext', 'SynthGraphicsUtils', 'SynthLookAndFeel', 'SynthPainter', 'SynthStyle', 'SynthStyleFactory'
+            ),
+        115 => array (
+            'AbstractTableModel', 'DefaultTableCellRenderer', 'DefaultTableCellRenderer.UIResource', 'DefaultTableColumnModel', 'DefaultTableModel', 'JTableHeader', 'TableCellEditor', 'TableCellRenderer', 'TableColumn', 'TableColumnModel', 'TableModel'
+            ),
+        116 => array (
+            'AbstractDocument', 'AbstractDocument.AttributeContext', 'AbstractDocument.Content', 'AbstractDocument.ElementEdit', 'AbstractWriter', 'AsyncBoxView', 'AttributeSet.CharacterAttribute', 'AttributeSet.ColorAttribute', 'AttributeSet.FontAttribute', 'AttributeSet.ParagraphAttribute', 'BadLocationException', 'BoxView', 'Caret', 'ChangedCharSetException', 'ComponentView', 'CompositeView', 'DateFormatter', 'DefaultCaret', 'DefaultEditorKit', 'DefaultEditorKit.BeepAction', 'DefaultEditorKit.CopyAction', 'DefaultEditorKit.CutAction', 'DefaultEditorKit.DefaultKeyTypedAction', 'DefaultEditorKit.InsertBreakAction', 'DefaultEditorKit.InsertContentAction', 'DefaultEditorKit.InsertTabAction', 'DefaultEditorKit.PasteAction', 'DefaultFormatter', 'DefaultFormatterFactory', 'DefaultHighlighter', 'DefaultHighlighter.DefaultHighlightPainter', 'DefaultStyledDocument', 'DefaultStyledDocument.AttributeUndoableEdit', 'DefaultStyledDocument.ElementSpec', 'DefaultTextUI', 'DocumentFilter', 'DocumentFilter.FilterBypass',
+            'EditorKit', 'ElementIterator', 'FieldView', 'FlowView', 'FlowView.FlowStrategy', 'GapContent', 'GlyphView', 'GlyphView.GlyphPainter', 'Highlighter', 'Highlighter.Highlight', 'Highlighter.HighlightPainter', 'IconView', 'InternationalFormatter', 'JTextComponent', 'JTextComponent.KeyBinding', 'Keymap', 'LabelView', 'LayeredHighlighter', 'LayeredHighlighter.LayerPainter', 'LayoutQueue', 'MaskFormatter', 'MutableAttributeSet', 'NavigationFilter', 'NavigationFilter.FilterBypass', 'NumberFormatter', 'PasswordView', 'PlainDocument', 'PlainView', 'Position', 'Position.Bias', 'Segment', 'SimpleAttributeSet', 'StringContent', 'Style', 'StyleConstants', 'StyleConstants.CharacterConstants', 'StyleConstants.ColorConstants', 'StyleConstants.FontConstants', 'StyleConstants.ParagraphConstants', 'StyleContext', 'StyledDocument', 'StyledEditorKit', 'StyledEditorKit.AlignmentAction', 'StyledEditorKit.BoldAction', 'StyledEditorKit.FontFamilyAction', 'StyledEditorKit.FontSizeAction', 'StyledEditorKit.ForegroundAction',
+            'StyledEditorKit.ItalicAction', 'StyledEditorKit.StyledTextAction', 'StyledEditorKit.UnderlineAction', 'TabExpander', 'TabSet', 'TabStop', 'TabableView', 'TableView', 'TextAction', 'Utilities', 'View', 'ViewFactory', 'WrappedPlainView', 'ZoneView'
+            ),
+        117 => array (
+            'BlockView', 'CSS', 'CSS.Attribute', 'FormSubmitEvent', 'FormSubmitEvent.MethodType', 'FormView', 'HTML', 'HTML.Attribute', 'HTML.Tag', 'HTML.UnknownTag', 'HTMLDocument', 'HTMLDocument.Iterator', 'HTMLEditorKit', 'HTMLEditorKit.HTMLFactory', 'HTMLEditorKit.HTMLTextAction', 'HTMLEditorKit.InsertHTMLTextAction', 'HTMLEditorKit.LinkController', 'HTMLEditorKit.Parser', 'HTMLEditorKit.ParserCallback', 'HTMLFrameHyperlinkEvent', 'HTMLWriter', 'ImageView', 'InlineView', 'ListView', 'MinimalHTMLWriter', 'ObjectView', 'Option', 'StyleSheet', 'StyleSheet.BoxPainter', 'StyleSheet.ListPainter'
+            ),
+        118 => array (
+            'ContentModel', 'DTD', 'DTDConstants', 'DocumentParser', 'ParserDelegator', 'TagElement'
+            ),
+        119 => array (
+            'RTFEditorKit'
+            ),
+        120 => array (
+            'AbstractLayoutCache', 'AbstractLayoutCache.NodeDimensions', 'DefaultMutableTreeNode', 'DefaultTreeCellEditor', 'DefaultTreeCellRenderer', 'DefaultTreeModel', 'DefaultTreeSelectionModel', 'ExpandVetoException', 'FixedHeightLayoutCache', 'MutableTreeNode', 'RowMapper', 'TreeCellEditor', 'TreeCellRenderer', 'TreeModel', 'TreeNode', 'TreePath', 'TreeSelectionModel', 'VariableHeightLayoutCache'
+            ),
+        121 => array (
+            'AbstractUndoableEdit', 'CannotRedoException', 'CannotUndoException', 'CompoundEdit', 'StateEdit', 'StateEditable', 'UndoManager', 'UndoableEdit', 'UndoableEditSupport'
+            ),
+        122 => array (
+            'InvalidTransactionException', 'TransactionRequiredException', 'TransactionRolledbackException'
+            ),
+        123 => array (
+            'XAException', 'XAResource', 'Xid'
+            ),
+        124 => array (
+            'XMLConstants'
+            ),
+        125 => array (
+            'DatatypeConfigurationException', 'DatatypeConstants', 'DatatypeConstants.Field', 'DatatypeFactory', 'Duration', 'XMLGregorianCalendar'
+            ),
+        126 => array (
+            'NamespaceContext', 'QName'
+            ),
+        127 => array (
+            'DocumentBuilder', 'DocumentBuilderFactory', 'FactoryConfigurationError', 'ParserConfigurationException', 'SAXParser', 'SAXParserFactory'
+            ),
+        128 => array (
+            'ErrorListener', 'OutputKeys', 'Result', 'Source', 'SourceLocator', 'Templates', 'Transformer', 'TransformerConfigurationException', 'TransformerException', 'TransformerFactory', 'TransformerFactoryConfigurationError', 'URIResolver'
+            ),
+        129 => array (
+            'DOMResult', 'DOMSource'
+            ),
+        130 => array (
+            'SAXResult', 'SAXSource', 'SAXTransformerFactory', 'TemplatesHandler', 'TransformerHandler'
+            ),
+        131 => array (
+            'StreamResult', 'StreamSource'
+            ),
+        132 => array (
+            'Schema', 'SchemaFactory', 'SchemaFactoryLoader', 'TypeInfoProvider', 'Validator', 'ValidatorHandler'
+            ),
+        133 => array (
+            'XPath', 'XPathConstants', 'XPathException', 'XPathExpression', 'XPathExpressionException', 'XPathFactory', 'XPathFactoryConfigurationException', 'XPathFunction', 'XPathFunctionException', 'XPathFunctionResolver', 'XPathVariableResolver'
+            ),
+        134 => array (
+            'ChannelBinding', 'GSSContext', 'GSSCredential', 'GSSException', 'GSSManager', 'GSSName', 'MessageProp', 'Oid'
+            ),
+        135 => array (
+            'ACTIVITY_COMPLETED', 'ACTIVITY_REQUIRED', 'ARG_IN', 'ARG_INOUT', 'ARG_OUT', 'Any', 'AnyHolder', 'AnySeqHolder', 'BAD_CONTEXT', 'BAD_INV_ORDER', 'BAD_OPERATION', 'BAD_PARAM', 'BAD_POLICY', 'BAD_POLICY_TYPE', 'BAD_POLICY_VALUE', 'BAD_QOS', 'BAD_TYPECODE', 'BooleanHolder', 'BooleanSeqHelper', 'BooleanSeqHolder', 'ByteHolder', 'CODESET_INCOMPATIBLE', 'COMM_FAILURE', 'CTX_RESTRICT_SCOPE', 'CharHolder', 'CharSeqHelper', 'CharSeqHolder', 'CompletionStatus', 'CompletionStatusHelper', 'ContextList', 'CurrentHolder', 'CustomMarshal', 'DATA_CONVERSION', 'DefinitionKind', 'DefinitionKindHelper', 'DomainManager', 'DomainManagerOperations', 'DoubleHolder', 'DoubleSeqHelper', 'DoubleSeqHolder', 'Environment', 'ExceptionList', 'FREE_MEM', 'FixedHolder', 'FloatHolder', 'FloatSeqHelper', 'FloatSeqHolder', 'IDLType', 'IDLTypeHelper', 'IDLTypeOperations', 'IMP_LIMIT', 'INITIALIZE', 'INTERNAL', 'INTF_REPOS', 'INVALID_ACTIVITY', 'INVALID_TRANSACTION', 'INV_FLAG', 'INV_IDENT', 'INV_OBJREF', 'INV_POLICY', 'IRObject',
+            'IRObjectOperations', 'IdentifierHelper', 'IntHolder', 'LocalObject', 'LongHolder', 'LongLongSeqHelper', 'LongLongSeqHolder', 'LongSeqHelper', 'LongSeqHolder', 'MARSHAL', 'NO_IMPLEMENT', 'NO_MEMORY', 'NO_PERMISSION', 'NO_RESOURCES', 'NO_RESPONSE', 'NVList', 'NamedValue', 'OBJECT_NOT_EXIST', 'OBJ_ADAPTER', 'OMGVMCID', 'ObjectHelper', 'ObjectHolder', 'OctetSeqHelper', 'OctetSeqHolder', 'PERSIST_STORE', 'PRIVATE_MEMBER', 'PUBLIC_MEMBER', 'ParameterMode', 'ParameterModeHelper', 'ParameterModeHolder', 'PolicyError', 'PolicyErrorCodeHelper', 'PolicyErrorHelper', 'PolicyErrorHolder', 'PolicyHelper', 'PolicyHolder', 'PolicyListHelper', 'PolicyListHolder', 'PolicyOperations', 'PolicyTypeHelper', 'PrincipalHolder', 'REBIND', 'RepositoryIdHelper', 'Request', 'ServerRequest', 'ServiceDetail', 'ServiceDetailHelper', 'ServiceInformation', 'ServiceInformationHelper', 'ServiceInformationHolder', 'SetOverrideType', 'SetOverrideTypeHelper', 'ShortHolder', 'ShortSeqHelper', 'ShortSeqHolder', 'StringHolder',
+            'StringSeqHelper', 'StringSeqHolder', 'StringValueHelper', 'StructMember', 'StructMemberHelper', 'SystemException', 'TCKind', 'TIMEOUT', 'TRANSACTION_MODE', 'TRANSACTION_REQUIRED', 'TRANSACTION_ROLLEDBACK', 'TRANSACTION_UNAVAILABLE', 'TRANSIENT', 'TypeCode', 'TypeCodeHolder', 'ULongLongSeqHelper', 'ULongLongSeqHolder', 'ULongSeqHelper', 'ULongSeqHolder', 'UNSUPPORTED_POLICY', 'UNSUPPORTED_POLICY_VALUE', 'UShortSeqHelper', 'UShortSeqHolder', 'UnionMember', 'UnionMemberHelper', 'UnknownUserException', 'UnknownUserExceptionHelper', 'UnknownUserExceptionHolder', 'UserException', 'VM_ABSTRACT', 'VM_CUSTOM', 'VM_NONE', 'VM_TRUNCATABLE', 'ValueBaseHelper', 'ValueBaseHolder', 'ValueMember', 'ValueMemberHelper', 'VersionSpecHelper', 'VisibilityHelper', 'WCharSeqHelper', 'WCharSeqHolder', 'WStringSeqHelper', 'WStringSeqHolder', 'WStringValueHelper', 'WrongTransaction', 'WrongTransactionHelper', 'WrongTransactionHolder', '_IDLTypeStub', '_PolicyStub'
+            ),
+        136 => array (
+            'Invalid', 'InvalidSeq'
+            ),
+        137 => array (
+            'BadKind'
+            ),
+        138 => array (
+            'ApplicationException', 'BoxedValueHelper', 'CustomValue', 'IDLEntity', 'IndirectionException', 'InvokeHandler', 'RemarshalException', 'ResponseHandler', 'ServantObject', 'Streamable', 'StreamableValue', 'UnknownException', 'ValueBase', 'ValueFactory', 'ValueInputStream', 'ValueOutputStream'
+            ),
+        139 => array (
+            'BindingHelper', 'BindingHolder', 'BindingIterator', 'BindingIteratorHelper', 'BindingIteratorHolder', 'BindingIteratorOperations', 'BindingIteratorPOA', 'BindingListHelper', 'BindingListHolder', 'BindingType', 'BindingTypeHelper', 'BindingTypeHolder', 'IstringHelper', 'NameComponent', 'NameComponentHelper', 'NameComponentHolder', 'NameHelper', 'NameHolder', 'NamingContext', 'NamingContextExt', 'NamingContextExtHelper', 'NamingContextExtHolder', 'NamingContextExtOperations', 'NamingContextExtPOA', 'NamingContextHelper', 'NamingContextHolder', 'NamingContextOperations', 'NamingContextPOA', '_BindingIteratorImplBase', '_BindingIteratorStub', '_NamingContextExtStub', '_NamingContextImplBase', '_NamingContextStub'
+            ),
+        140 => array (
+            'AddressHelper', 'InvalidAddress', 'InvalidAddressHelper', 'InvalidAddressHolder', 'StringNameHelper', 'URLStringHelper'
+            ),
+        141 => array (
+            'AlreadyBound', 'AlreadyBoundHelper', 'AlreadyBoundHolder', 'CannotProceed', 'CannotProceedHelper', 'CannotProceedHolder', 'InvalidNameHolder', 'NotEmpty', 'NotEmptyHelper', 'NotEmptyHolder', 'NotFound', 'NotFoundHelper', 'NotFoundHolder', 'NotFoundReason', 'NotFoundReasonHelper', 'NotFoundReasonHolder'
+            ),
+        142 => array (
+            'Parameter'
+            ),
+        143 => array (
+            'DynAnyFactory', 'DynAnyFactoryHelper', 'DynAnyFactoryOperations', 'DynAnyHelper', 'DynAnyOperations', 'DynAnySeqHelper', 'DynArrayHelper', 'DynArrayOperations', 'DynEnumHelper', 'DynEnumOperations', 'DynFixedHelper', 'DynFixedOperations', 'DynSequenceHelper', 'DynSequenceOperations', 'DynStructHelper', 'DynStructOperations', 'DynUnionHelper', 'DynUnionOperations', 'DynValueBox', 'DynValueBoxOperations', 'DynValueCommon', 'DynValueCommonOperations', 'DynValueHelper', 'DynValueOperations', 'NameDynAnyPair', 'NameDynAnyPairHelper', 'NameDynAnyPairSeqHelper', 'NameValuePairSeqHelper', '_DynAnyFactoryStub', '_DynAnyStub', '_DynArrayStub', '_DynEnumStub', '_DynFixedStub', '_DynSequenceStub', '_DynStructStub', '_DynUnionStub', '_DynValueStub'
+            ),
+        144 => array (
+            'InconsistentTypeCodeHelper'
+            ),
+        145 => array (
+            'InvalidValueHelper'
+            ),
+        146 => array (
+            'CodeSets', 'Codec', 'CodecFactory', 'CodecFactoryHelper', 'CodecFactoryOperations', 'CodecOperations', 'ComponentIdHelper', 'ENCODING_CDR_ENCAPS', 'Encoding', 'ExceptionDetailMessage', 'IOR', 'IORHelper', 'IORHolder', 'MultipleComponentProfileHelper', 'MultipleComponentProfileHolder', 'ProfileIdHelper', 'RMICustomMaxStreamFormat', 'ServiceContext', 'ServiceContextHelper', 'ServiceContextHolder', 'ServiceContextListHelper', 'ServiceContextListHolder', 'ServiceIdHelper', 'TAG_ALTERNATE_IIOP_ADDRESS', 'TAG_CODE_SETS', 'TAG_INTERNET_IOP', 'TAG_JAVA_CODEBASE', 'TAG_MULTIPLE_COMPONENTS', 'TAG_ORB_TYPE', 'TAG_POLICIES', 'TAG_RMI_CUSTOM_MAX_STREAM_FORMAT', 'TaggedComponent', 'TaggedComponentHelper', 'TaggedComponentHolder', 'TaggedProfile', 'TaggedProfileHelper', 'TaggedProfileHolder', 'TransactionService'
+            ),
+        147 => array (
+            'UnknownEncoding', 'UnknownEncodingHelper'
+            ),
+        148 => array (
+            'FormatMismatch', 'FormatMismatchHelper', 'InvalidTypeForEncoding', 'InvalidTypeForEncodingHelper'
+            ),
+        149 => array (
+            'SYNC_WITH_TRANSPORT', 'SyncScopeHelper'
+            ),
+        150 => array (
+            'ACTIVE', 'AdapterManagerIdHelper', 'AdapterNameHelper', 'AdapterStateHelper', 'ClientRequestInfo', 'ClientRequestInfoOperations', 'ClientRequestInterceptor', 'ClientRequestInterceptorOperations', 'DISCARDING', 'HOLDING', 'INACTIVE', 'IORInfo', 'IORInfoOperations', 'IORInterceptor', 'IORInterceptorOperations', 'IORInterceptor_3_0', 'IORInterceptor_3_0Helper', 'IORInterceptor_3_0Holder', 'IORInterceptor_3_0Operations', 'Interceptor', 'InterceptorOperations', 'InvalidSlot', 'InvalidSlotHelper', 'LOCATION_FORWARD', 'NON_EXISTENT', 'ORBIdHelper', 'ORBInitInfo', 'ORBInitInfoOperations', 'ORBInitializer', 'ORBInitializerOperations', 'ObjectReferenceFactory', 'ObjectReferenceFactoryHelper', 'ObjectReferenceFactoryHolder', 'ObjectReferenceTemplate', 'ObjectReferenceTemplateHelper', 'ObjectReferenceTemplateHolder', 'ObjectReferenceTemplateSeqHelper', 'ObjectReferenceTemplateSeqHolder', 'PolicyFactory', 'PolicyFactoryOperations', 'RequestInfo', 'RequestInfoOperations', 'SUCCESSFUL', 'SYSTEM_EXCEPTION',
+            'ServerIdHelper', 'ServerRequestInfo', 'ServerRequestInfoOperations', 'ServerRequestInterceptor', 'ServerRequestInterceptorOperations', 'TRANSPORT_RETRY', 'USER_EXCEPTION'
+            ),
+        151 => array (
+            'DuplicateName', 'DuplicateNameHelper'
+            ),
+        152 => array (
+            'AdapterActivator', 'AdapterActivatorOperations', 'ID_ASSIGNMENT_POLICY_ID', 'ID_UNIQUENESS_POLICY_ID', 'IMPLICIT_ACTIVATION_POLICY_ID', 'IdAssignmentPolicy', 'IdAssignmentPolicyOperations', 'IdAssignmentPolicyValue', 'IdUniquenessPolicy', 'IdUniquenessPolicyOperations', 'IdUniquenessPolicyValue', 'ImplicitActivationPolicy', 'ImplicitActivationPolicyOperations', 'ImplicitActivationPolicyValue', 'LIFESPAN_POLICY_ID', 'LifespanPolicy', 'LifespanPolicyOperations', 'LifespanPolicyValue', 'POA', 'POAHelper', 'POAManager', 'POAManagerOperations', 'POAOperations', 'REQUEST_PROCESSING_POLICY_ID', 'RequestProcessingPolicy', 'RequestProcessingPolicyOperations', 'RequestProcessingPolicyValue', 'SERVANT_RETENTION_POLICY_ID', 'Servant', 'ServantActivator', 'ServantActivatorHelper', 'ServantActivatorOperations', 'ServantActivatorPOA', 'ServantLocator', 'ServantLocatorHelper', 'ServantLocatorOperations', 'ServantLocatorPOA', 'ServantManager', 'ServantManagerOperations', 'ServantRetentionPolicy',
+            'ServantRetentionPolicyOperations', 'ServantRetentionPolicyValue', 'THREAD_POLICY_ID', 'ThreadPolicy', 'ThreadPolicyOperations', 'ThreadPolicyValue', '_ServantActivatorStub', '_ServantLocatorStub'
+            ),
+        153 => array (
+            'NoContext', 'NoContextHelper'
+            ),
+        154 => array (
+            'AdapterInactive', 'AdapterInactiveHelper', 'State'
+            ),
+        155 => array (
+            'AdapterAlreadyExists', 'AdapterAlreadyExistsHelper', 'AdapterNonExistent', 'AdapterNonExistentHelper', 'InvalidPolicy', 'InvalidPolicyHelper', 'NoServant', 'NoServantHelper', 'ObjectAlreadyActive', 'ObjectAlreadyActiveHelper', 'ObjectNotActive', 'ObjectNotActiveHelper', 'ServantAlreadyActive', 'ServantAlreadyActiveHelper', 'ServantNotActive', 'ServantNotActiveHelper', 'WrongAdapter', 'WrongAdapterHelper', 'WrongPolicy', 'WrongPolicyHelper'
+            ),
+        156 => array (
+            'CookieHolder'
+            ),
+        157 => array (
+            'RunTime', 'RunTimeOperations'
+            ),
+        158 => array (
+            '_Remote_Stub'
+            ),
+        159 => array (
+            'Attr', 'CDATASection', 'CharacterData', 'Comment', 'DOMConfiguration', 'DOMError', 'DOMErrorHandler', 'DOMException', 'DOMImplementation', 'DOMImplementationList', 'DOMImplementationSource', 'DOMStringList', 'DocumentFragment', 'DocumentType', 'EntityReference', 'NameList', 'NamedNodeMap', 'Node', 'NodeList', 'Notation', 'ProcessingInstruction', 'Text', 'TypeInfo', 'UserDataHandler'
+            ),
+        160 => array (
+            'DOMImplementationRegistry'
+            ),
+        161 => array (
+            'EventException', 'EventTarget', 'MutationEvent', 'UIEvent'
+            ),
+        162 => array (
+            'DOMImplementationLS', 'LSException', 'LSInput', 'LSLoadEvent', 'LSOutput', 'LSParser', 'LSParserFilter', 'LSProgressEvent', 'LSResourceResolver', 'LSSerializer', 'LSSerializerFilter'
+            ),
+        163 => array (
+            'DTDHandler', 'DocumentHandler', 'EntityResolver', 'ErrorHandler', 'HandlerBase', 'InputSource', 'Locator', 'SAXException', 'SAXNotRecognizedException', 'SAXNotSupportedException', 'SAXParseException', 'XMLFilter', 'XMLReader'
+            ),
+        164 => array (
+            'Attributes2', 'Attributes2Impl', 'DeclHandler', 'DefaultHandler2', 'EntityResolver2', 'LexicalHandler', 'Locator2', 'Locator2Impl'
+            ),
+        165 => array (
+            'AttributeListImpl', 'AttributesImpl', 'DefaultHandler', 'LocatorImpl', 'NamespaceSupport', 'ParserAdapter', 'ParserFactory', 'XMLFilterImpl', 'XMLReaderAdapter', 'XMLReaderFactory'
+            ),
+        /* ambiguous class names (appear in more than one package) */
+        166 => array (
+            'Annotation', 'AnySeqHelper', 'Array', 'Attribute', 'AttributeList', 'AttributeSet', 'Attributes', 'AuthenticationException', 'Binding', 'Bounds', 'Certificate', 'CertificateEncodingException', 'CertificateException', 'CertificateExpiredException', 'CertificateNotYetValidException', 'CertificateParsingException', 'ConnectException', 'ContentHandler', 'Context', 'Control', 'Current', 'CurrentHelper', 'CurrentOperations', 'DOMLocator', 'DataInputStream', 'DataOutputStream', 'Date', 'DefaultLoaderRepository', 'Delegate', 'Document', 'DocumentEvent', 'DynAny', 'DynArray', 'DynEnum', 'DynFixed', 'DynSequence', 'DynStruct', 'DynUnion', 'DynValue', 'DynamicImplementation', 'Element', 'Entity', 'Event', 'EventListener', 'FieldNameHelper', 'FileFilter', 'Formatter', 'ForwardRequest', 'ForwardRequestHelper', 'InconsistentTypeCode', 'InputStream', 'IntrospectionException', 'InvalidAttributeValueException', 'InvalidKeyException', 'InvalidName', 'InvalidNameHelper', 'InvalidValue', 'List', 'MouseEvent',
+            'NameValuePair', 'NameValuePairHelper', 'ORB', 'Object', 'ObjectIdHelper', 'ObjectImpl', 'OpenType', 'OutputStream', 'ParagraphView', 'Parser', 'Permission', 'Policy', 'Principal', 'Proxy', 'Reference', 'Statement', 'Timer', 'Timestamp', 'TypeMismatch', 'TypeMismatchHelper', 'UNKNOWN', 'UnknownHostException', 'X509Certificate'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        /* all Java keywords are case sensitive */
+        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, 18 => true, 19 => true,
+        20 => true, 21 => true, 22 => true, 23 => true, 24 => true,
+        25 => true, 26 => true, 27 => true, 28 => true, 29 => true,
+        30 => true, 31 => true, 32 => true, 33 => true, 34 => true,
+        35 => true, 36 => true, 37 => true, 38 => true, 39 => true,
+        40 => true, 41 => true, 42 => true, 43 => true, 44 => true,
+        45 => true, 46 => true, 47 => true, 48 => true, 49 => true,
+        50 => true, 51 => true, 52 => true, 53 => true, 54 => true,
+        55 => true, 56 => true, 57 => true, 58 => true, 59 => true,
+        60 => true, 61 => true, 62 => true, 63 => true, 64 => true,
+        65 => true, 66 => true, 67 => true, 68 => true, 69 => true,
+        70 => true, 71 => true, 72 => true, 73 => true, 74 => true,
+        75 => true, 76 => true, 77 => true, 78 => true, 79 => true,
+        80 => true, 81 => true, 82 => true, 83 => true, 84 => true,
+        85 => true, 86 => true, 87 => true, 88 => true, 89 => true,
+        90 => true, 91 => true, 92 => true, 93 => true, 94 => true,
+        95 => true, 96 => true, 97 => true, 98 => true, 99 => true,
+        100 => true, 101 => true, 102 => true, 103 => true, 104 => true,
+        105 => true, 106 => true, 107 => true, 108 => true, 109 => true,
+        110 => true, 111 => true, 112 => true, 113 => true, 114 => true,
+        115 => true, 116 => true, 117 => true, 118 => true, 119 => true,
+        120 => true, 121 => true, 122 => true, 123 => true, 124 => true,
+        125 => true, 126 => true, 127 => true, 128 => true, 129 => true,
+        130 => true, 131 => true, 132 => true, 133 => true, 134 => true,
+        135 => true, 136 => true, 137 => true, 138 => true, 139 => true,
+        140 => true, 141 => true, 142 => true, 143 => true, 144 => true,
+        145 => true, 146 => true, 147 => true, 148 => true, 149 => true,
+        150 => true, 151 => true, 152 => true, 153 => true, 154 => true,
+        155 => true, 156 => true, 157 => true, 158 => true, 159 => true,
+        160 => true, 161 => true, 162 => true, 163 => true, 164 => true,
+        165 => true, 166 => true
+    ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000;  font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #006600; font-weight: bold;',
+            4 => 'color: #006600; font-weight: bold;',
+            5 => 'color: #003399; font-weight: bold;',
+            6 => 'color: #003399; font-weight: bold;',
+            7 => 'color: #003399; font-weight: bold;',
+            8 => 'color: #003399; font-weight: bold;',
+            9 => 'color: #003399; font-weight: bold;',
+            10 => 'color: #003399; font-weight: bold;',
+            11 => 'color: #003399; font-weight: bold;',
+            12 => 'color: #003399; font-weight: bold;',
+            13 => 'color: #003399; font-weight: bold;',
+            14 => 'color: #003399; font-weight: bold;',
+            15 => 'color: #003399; font-weight: bold;',
+            16 => 'color: #003399; font-weight: bold;',
+            17 => 'color: #003399; font-weight: bold;',
+            18 => 'color: #003399; font-weight: bold;',
+            19 => 'color: #003399; font-weight: bold;',
+            20 => 'color: #003399; font-weight: bold;',
+            21 => 'color: #003399; font-weight: bold;',
+            22 => 'color: #003399; font-weight: bold;',
+            23 => 'color: #003399; font-weight: bold;',
+            24 => 'color: #003399; font-weight: bold;',
+            25 => 'color: #003399; font-weight: bold;',
+            26 => 'color: #003399; font-weight: bold;',
+            27 => 'color: #003399; font-weight: bold;',
+            28 => 'color: #003399; font-weight: bold;',
+            29 => 'color: #003399; font-weight: bold;',
+            30 => 'color: #003399; font-weight: bold;',
+            31 => 'color: #003399; font-weight: bold;',
+            32 => 'color: #003399; font-weight: bold;',
+            33 => 'color: #003399; font-weight: bold;',
+            34 => 'color: #003399; font-weight: bold;',
+            35 => 'color: #003399; font-weight: bold;',
+            36 => 'color: #003399; font-weight: bold;',
+            37 => 'color: #003399; font-weight: bold;',
+            38 => 'color: #003399; font-weight: bold;',
+            39 => 'color: #003399; font-weight: bold;',
+            40 => 'color: #003399; font-weight: bold;',
+            41 => 'color: #003399; font-weight: bold;',
+            42 => 'color: #003399; font-weight: bold;',
+            43 => 'color: #003399; font-weight: bold;',
+            44 => 'color: #003399; font-weight: bold;',
+            45 => 'color: #003399; font-weight: bold;',
+            46 => 'color: #003399; font-weight: bold;',
+            47 => 'color: #003399; font-weight: bold;',
+            48 => 'color: #003399; font-weight: bold;',
+            49 => 'color: #003399; font-weight: bold;',
+            50 => 'color: #003399; font-weight: bold;',
+            51 => 'color: #003399; font-weight: bold;',
+            52 => 'color: #003399; font-weight: bold;',
+            53 => 'color: #003399; font-weight: bold;',
+            54 => 'color: #003399; font-weight: bold;',
+            55 => 'color: #003399; font-weight: bold;',
+            56 => 'color: #003399; font-weight: bold;',
+            57 => 'color: #003399; font-weight: bold;',
+            58 => 'color: #003399; font-weight: bold;',
+            59 => 'color: #003399; font-weight: bold;',
+            60 => 'color: #003399; font-weight: bold;',
+            61 => 'color: #003399; font-weight: bold;',
+            62 => 'color: #003399; font-weight: bold;',
+            63 => 'color: #003399; font-weight: bold;',
+            64 => 'color: #003399; font-weight: bold;',
+            65 => 'color: #003399; font-weight: bold;',
+            66 => 'color: #003399; font-weight: bold;',
+            67 => 'color: #003399; font-weight: bold;',
+            68 => 'color: #003399; font-weight: bold;',
+            69 => 'color: #003399; font-weight: bold;',
+            70 => 'color: #003399; font-weight: bold;',
+            71 => 'color: #003399; font-weight: bold;',
+            72 => 'color: #003399; font-weight: bold;',
+            73 => 'color: #003399; font-weight: bold;',
+            74 => 'color: #003399; font-weight: bold;',
+            75 => 'color: #003399; font-weight: bold;',
+            76 => 'color: #003399; font-weight: bold;',
+            77 => 'color: #003399; font-weight: bold;',
+            78 => 'color: #003399; font-weight: bold;',
+            79 => 'color: #003399; font-weight: bold;',
+            80 => 'color: #003399; font-weight: bold;',
+            81 => 'color: #003399; font-weight: bold;',
+            82 => 'color: #003399; font-weight: bold;',
+            83 => 'color: #003399; font-weight: bold;',
+            84 => 'color: #003399; font-weight: bold;',
+            85 => 'color: #003399; font-weight: bold;',
+            86 => 'color: #003399; font-weight: bold;',
+            87 => 'color: #003399; font-weight: bold;',
+            88 => 'color: #003399; font-weight: bold;',
+            89 => 'color: #003399; font-weight: bold;',
+            90 => 'color: #003399; font-weight: bold;',
+            91 => 'color: #003399; font-weight: bold;',
+            92 => 'color: #003399; font-weight: bold;',
+            93 => 'color: #003399; font-weight: bold;',
+            94 => 'color: #003399; font-weight: bold;',
+            95 => 'color: #003399; font-weight: bold;',
+            96 => 'color: #003399; font-weight: bold;',
+            97 => 'color: #003399; font-weight: bold;',
+            98 => 'color: #003399; font-weight: bold;',
+            99 => 'color: #003399; font-weight: bold;',
+            100 => 'color: #003399; font-weight: bold;',
+            101 => 'color: #003399; font-weight: bold;',
+            102 => 'color: #003399; font-weight: bold;',
+            103 => 'color: #003399; font-weight: bold;',
+            104 => 'color: #003399; font-weight: bold;',
+            105 => 'color: #003399; font-weight: bold;',
+            106 => 'color: #003399; font-weight: bold;',
+            107 => 'color: #003399; font-weight: bold;',
+            108 => 'color: #003399; font-weight: bold;',
+            109 => 'color: #003399; font-weight: bold;',
+            110 => 'color: #003399; font-weight: bold;',
+            111 => 'color: #003399; font-weight: bold;',
+            112 => 'color: #003399; font-weight: bold;',
+            113 => 'color: #003399; font-weight: bold;',
+            114 => 'color: #003399; font-weight: bold;',
+            115 => 'color: #003399; font-weight: bold;',
+            116 => 'color: #003399; font-weight: bold;',
+            117 => 'color: #003399; font-weight: bold;',
+            118 => 'color: #003399; font-weight: bold;',
+            119 => 'color: #003399; font-weight: bold;',
+            120 => 'color: #003399; font-weight: bold;',
+            121 => 'color: #003399; font-weight: bold;',
+            122 => 'color: #003399; font-weight: bold;',
+            123 => 'color: #003399; font-weight: bold;',
+            124 => 'color: #003399; font-weight: bold;',
+            125 => 'color: #003399; font-weight: bold;',
+            126 => 'color: #003399; font-weight: bold;',
+            127 => 'color: #003399; font-weight: bold;',
+            128 => 'color: #003399; font-weight: bold;',
+            129 => 'color: #003399; font-weight: bold;',
+            130 => 'color: #003399; font-weight: bold;',
+            131 => 'color: #003399; font-weight: bold;',
+            132 => 'color: #003399; font-weight: bold;',
+            133 => 'color: #003399; font-weight: bold;',
+            134 => 'color: #003399; font-weight: bold;',
+            135 => 'color: #003399; font-weight: bold;',
+            136 => 'color: #003399; font-weight: bold;',
+            137 => 'color: #003399; font-weight: bold;',
+            138 => 'color: #003399; font-weight: bold;',
+            139 => 'color: #003399; font-weight: bold;',
+            140 => 'color: #003399; font-weight: bold;',
+            141 => 'color: #003399; font-weight: bold;',
+            142 => 'color: #003399; font-weight: bold;',
+            143 => 'color: #003399; font-weight: bold;',
+            144 => 'color: #003399; font-weight: bold;',
+            145 => 'color: #003399; font-weight: bold;',
+            146 => 'color: #003399; font-weight: bold;',
+            147 => 'color: #003399; font-weight: bold;',
+            148 => 'color: #003399; font-weight: bold;',
+            149 => 'color: #003399; font-weight: bold;',
+            150 => 'color: #003399; font-weight: bold;',
+            151 => 'color: #003399; font-weight: bold;',
+            152 => 'color: #003399; font-weight: bold;',
+            153 => 'color: #003399; font-weight: bold;',
+            154 => 'color: #003399; font-weight: bold;',
+            155 => 'color: #003399; font-weight: bold;',
+            156 => 'color: #003399; font-weight: bold;',
+            157 => 'color: #003399; font-weight: bold;',
+            158 => 'color: #003399; font-weight: bold;',
+            159 => 'color: #003399; font-weight: bold;',
+            160 => 'color: #003399; font-weight: bold;',
+            161 => 'color: #003399; font-weight: bold;',
+            162 => 'color: #003399; font-weight: bold;',
+            163 => 'color: #003399; font-weight: bold;',
+            164 => 'color: #003399; font-weight: bold;',
+            165 => 'color: #003399; font-weight: bold;',
+            166 => 'color: #003399; font-weight: bold;'
+            ),
+        '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(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006633;',
+            2 => 'color: #006633;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://docs.oracle.com/javase/7/docs/api/java/applet/{FNAME}.html',
+        6 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/{FNAME}.html',
+        7 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/color/{FNAME}.html',
+        8 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/datatransfer/{FNAME}.html',
+        9 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/dnd/{FNAME}.html',
+        10 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/event/{FNAME}.html',
+        11 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/font/{FNAME}.html',
+        12 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/geom/{FNAME}.html',
+        13 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/im/{FNAME}.html',
+        14 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/im/spi/{FNAME}.html',
+        15 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/image/{FNAME}.html',
+        16 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/image/renderable/{FNAME}.html',
+        17 => 'http://docs.oracle.com/javase/7/docs/api/java/awt/print/{FNAME}.html',
+        18 => 'http://docs.oracle.com/javase/7/docs/api/java/beans/{FNAME}.html',
+        19 => 'http://docs.oracle.com/javase/7/docs/api/java/beans/beancontext/{FNAME}.html',
+        20 => 'http://docs.oracle.com/javase/7/docs/api/java/io/{FNAME}.html',
+        21 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/{FNAME}.html',
+        22 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/annotation/{FNAME}.html',
+        23 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/instrument/{FNAME}.html',
+        24 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/management/{FNAME}.html',
+        25 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/ref/{FNAME}.html',
+        26 => 'http://docs.oracle.com/javase/7/docs/api/java/lang/reflect/{FNAME}.html',
+        27 => 'http://docs.oracle.com/javase/7/docs/api/java/math/{FNAME}.html',
+        28 => 'http://docs.oracle.com/javase/7/docs/api/java/net/{FNAME}.html',
+        29 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/{FNAME}.html',
+        30 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/channels/{FNAME}.html',
+        31 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/channels/spi/{FNAME}.html',
+        32 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/charset/{FNAME}.html',
+        33 => 'http://docs.oracle.com/javase/7/docs/api/java/nio/charset/spi/{FNAME}.html',
+        34 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/{FNAME}.html',
+        35 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/activation/{FNAME}.html',
+        36 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/dgc/{FNAME}.html',
+        37 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/registry/{FNAME}.html',
+        38 => 'http://docs.oracle.com/javase/7/docs/api/java/rmi/server/{FNAME}.html',
+        39 => 'http://docs.oracle.com/javase/7/docs/api/java/security/{FNAME}.html',
+        40 => 'http://docs.oracle.com/javase/7/docs/api/java/security/acl/{FNAME}.html',
+        41 => 'http://docs.oracle.com/javase/7/docs/api/java/security/cert/{FNAME}.html',
+        42 => 'http://docs.oracle.com/javase/7/docs/api/java/security/interfaces/{FNAME}.html',
+        43 => 'http://docs.oracle.com/javase/7/docs/api/java/security/spec/{FNAME}.html',
+        44 => 'http://docs.oracle.com/javase/7/docs/api/java/sql/{FNAME}.html',
+        45 => 'http://docs.oracle.com/javase/7/docs/api/java/text/{FNAME}.html',
+        46 => 'http://docs.oracle.com/javase/7/docs/api/java/util/{FNAME}.html',
+        47 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/{FNAME}.html',
+        48 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/atomic/{FNAME}.html',
+        49 => 'http://docs.oracle.com/javase/7/docs/api/java/util/concurrent/locks/{FNAME}.html',
+        50 => 'http://docs.oracle.com/javase/7/docs/api/java/util/jar/{FNAME}.html',
+        51 => 'http://docs.oracle.com/javase/7/docs/api/java/util/logging/{FNAME}.html',
+        52 => 'http://docs.oracle.com/javase/7/docs/api/java/util/prefs/{FNAME}.html',
+        53 => 'http://docs.oracle.com/javase/7/docs/api/java/util/regex/{FNAME}.html',
+        54 => 'http://docs.oracle.com/javase/7/docs/api/java/util/zip/{FNAME}.html',
+        55 => 'http://docs.oracle.com/javase/7/docs/api/javax/accessibility/{FNAME}.html',
+        56 => 'http://docs.oracle.com/javase/7/docs/api/javax/activity/{FNAME}.html',
+        57 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/{FNAME}.html',
+        58 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/interfaces/{FNAME}.html',
+        59 => 'http://docs.oracle.com/javase/7/docs/api/javax/crypto/spec/{FNAME}.html',
+        60 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/{FNAME}.html',
+        61 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/event/{FNAME}.html',
+        62 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/metadata/{FNAME}.html',
+        63 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/plugins/bmp/{FNAME}.html',
+        64 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/plugins/jpeg/{FNAME}.html',
+        65 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/spi/{FNAME}.html',
+        66 => 'http://docs.oracle.com/javase/7/docs/api/javax/imageio/stream/{FNAME}.html',
+        67 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/{FNAME}.html',
+        68 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/loading/{FNAME}.html',
+        69 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/modelmbean/{FNAME}.html',
+        70 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/monitor/{FNAME}.html',
+        71 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/openmbean/{FNAME}.html',
+        72 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/relation/{FNAME}.html',
+        73 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/remote/{FNAME}.html',
+        74 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/remote/rmi/{FNAME}.html',
+        75 => 'http://docs.oracle.com/javase/7/docs/api/javax/management/timer/{FNAME}.html',
+        76 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/{FNAME}.html',
+        77 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/directory/{FNAME}.html',
+        78 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/event/{FNAME}.html',
+        79 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/ldap/{FNAME}.html',
+        80 => 'http://docs.oracle.com/javase/7/docs/api/javax/naming/spi/{FNAME}.html',
+        81 => 'http://docs.oracle.com/javase/7/docs/api/javax/net/{FNAME}.html',
+        82 => 'http://docs.oracle.com/javase/7/docs/api/javax/net/ssl/{FNAME}.html',
+        83 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/{FNAME}.html',
+        84 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/attribute/{FNAME}.html',
+        85 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/attribute/standard/{FNAME}.html',
+        86 => 'http://docs.oracle.com/javase/7/docs/api/javax/print/event/{FNAME}.html',
+        87 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/{FNAME}.html',
+        88 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/CORBA/{FNAME}.html',
+        89 => 'http://docs.oracle.com/javase/7/docs/api/javax/rmi/ssl/{FNAME}.html',
+        90 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/{FNAME}.html',
+        91 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/callback/{FNAME}.html',
+        92 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/kerberos/{FNAME}.html',
+        93 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/login/{FNAME}.html',
+        94 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/spi/{FNAME}.html',
+        95 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/auth/x500/{FNAME}.html',
+        96 => 'http://docs.oracle.com/javase/7/docs/api/javax/security/sasl/{FNAME}.html',
+        97 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/midi/{FNAME}.html',
+        98 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/midi/spi/{FNAME}.html',
+        99 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/sampled/{FNAME}.html',
+        100 => 'http://docs.oracle.com/javase/7/docs/api/javax/sound/sampled/spi/{FNAME}.html',
+        101 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/{FNAME}.html',
+        102 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/{FNAME}.html',
+        103 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/serial/{FNAME}.html',
+        104 => 'http://docs.oracle.com/javase/7/docs/api/javax/sql/rowset/spi/{FNAME}.html',
+        105 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/{FNAME}.html',
+        106 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/border/{FNAME}.html',
+        107 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/colorchooser/{FNAME}.html',
+        108 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/event/{FNAME}.html',
+        109 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/filechooser/{FNAME}.html',
+        110 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/{FNAME}.html',
+        111 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/basic/{FNAME}.html',
+        112 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/metal/{FNAME}.html',
+        113 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/multi/{FNAME}.html',
+        114 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/plaf/synth/{FNAME}.html',
+        115 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/table/{FNAME}.html',
+        116 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/{FNAME}.html',
+        117 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/html/{FNAME}.html',
+        118 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/html/parser/{FNAME}.html',
+        119 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/text/rtf/{FNAME}.html',
+        120 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/tree/{FNAME}.html',
+        121 => 'http://docs.oracle.com/javase/7/docs/api/javax/swing/undo/{FNAME}.html',
+        122 => 'http://docs.oracle.com/javase/7/docs/api/javax/transaction/{FNAME}.html',
+        123 => 'http://docs.oracle.com/javase/7/docs/api/javax/transaction/xa/{FNAME}.html',
+        124 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/{FNAME}.html',
+        125 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/datatype/{FNAME}.html',
+        126 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/namespace/{FNAME}.html',
+        127 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/parsers/{FNAME}.html',
+        128 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/{FNAME}.html',
+        129 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/dom/{FNAME}.html',
+        130 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/sax/{FNAME}.html',
+        131 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/transform/stream/{FNAME}.html',
+        132 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/validation/{FNAME}.html',
+        133 => 'http://docs.oracle.com/javase/7/docs/api/javax/xml/xpath/{FNAME}.html',
+        134 => 'http://docs.oracle.com/javase/7/docs/api/org/ietf/jgss/{FNAME}.html',
+        135 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/{FNAME}.html',
+        136 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/DynAnyPackage/{FNAME}.html',
+        137 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/TypeCodePackage/{FNAME}.html',
+        138 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CORBA/portable/{FNAME}.html',
+        139 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/{FNAME}.html',
+        140 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/NamingContextExtPackage/{FNAME}.html',
+        141 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/CosNaming/NamingContextPackage/{FNAME}.html',
+        142 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/Dynamic/{FNAME}.html',
+        143 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/{FNAME}.html',
+        144 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/DynAnyFactoryPackage/{FNAME}.html',
+        145 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/DynamicAny/DynAnyPackage/{FNAME}.html',
+        146 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/{FNAME}.html',
+        147 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/CodecFactoryPackage/{FNAME}.html',
+        148 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/IOP/CodecPackage/{FNAME}.html',
+        149 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/Messaging/{FNAME}.html',
+        150 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableInterceptor/{FNAME}.html',
+        151 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableInterceptor/ORBInitInfoPackage/{FNAME}.html',
+        152 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/{FNAME}.html',
+        153 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/CurrentPackage/{FNAME}.html',
+        154 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/POAManagerPackage/{FNAME}.html',
+        155 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/POAPackage/{FNAME}.html',
+        156 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/PortableServer/ServantLocatorPackage/{FNAME}.html',
+        157 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/SendingContext/{FNAME}.html',
+        158 => 'http://docs.oracle.com/javase/7/docs/api/org/omg/stub/java/rmi/{FNAME}.html',
+        159 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/{FNAME}.html',
+        160 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/bootstrap/{FNAME}.html',
+        161 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/events/{FNAME}.html',
+        162 => 'http://docs.oracle.com/javase/7/docs/api/org/w3c/dom/ls/{FNAME}.html',
+        163 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/{FNAME}.html',
+        164 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/ext/{FNAME}.html',
+        165 => 'http://docs.oracle.com/javase/7/docs/api/org/xml/sax/helpers/{FNAME}.html',
+        /* ambiguous class names (appear in more than one package) */
+        166 => 'http://www.google.com/search?sitesearch=docs.oracle.com&q=allinurl%3Ajavase+docs+api+{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        /* Java does not use '::' */
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?|^&"\'])',
+            'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-;"\'])'
+            )
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/javascript.php b/sources/inc/geshi/javascript.php
new file mode 100644
index 0000000..b96d1b5
--- /dev/null
+++ b/sources/inc/geshi/javascript.php
@@ -0,0 +1,174 @@
+ 'Javascript',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Regular Expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?!\*)(?!\s)(?:\\\\.|(?!\n)[^\\/\\\\])+(? GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            //reserved/keywords; also some non-reserved keywords
+            'break','case','catch','const','continue',
+            'default','delete','do',
+            'else',
+            'finally','for','function',
+            'get','goto',
+            'if','in','instanceof',
+            'new',
+            'prototype',
+            'return',
+            'set','static','switch',
+            'this','throw','try','typeof',
+            'var','void'
+            ),
+        2 => array(
+            //reserved/non-keywords; metaconstants
+            'false','null','true','undefined','NaN','Infinity'
+            ),
+        3 => array(
+            //magic properties/functions
+            '__proto__','__defineGetter__','__defineSetter__','hasOwnProperty','hasProperty'
+            ),
+        4 => array(
+            //type constructors
+            'Object', 'Function', 'Date', 'Math', 'String', 'Number', 'Boolean', 'Array'
+            ),
+        5 => array(
+            //reserved, but invalid in language
+            'abstract','boolean','byte','char','class','debugger','double','enum','export','extends',
+            'final','float','implements','import','int','interface','long','native',
+            'short','super','synchronized','throws','transient','volatile'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '+', '-', '*', '/', '%',
+        '!', '@', '&', '|', '^',
+        '<', '>', '=',
+        ',', ';', '?', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #003366; font-weight: bold;',
+            3 => 'color: #000066;',
+            5 => 'color: #FF0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3366CC;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+    ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            ''
+            ),
+        1 => array(
+            ''
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/jquery.php b/sources/inc/geshi/jquery.php
new file mode 100644
index 0000000..a75320d
--- /dev/null
+++ b/sources/inc/geshi/jquery.php
@@ -0,0 +1,238 @@
+ 'jQuery',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    //Regular Expressions
+    'COMMENT_REGEXP' => array(2 => "/(?<=[\\s^])s\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])m?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[gimsu]*(?=[\\s$\\.\\,\\;\\)])/iU"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'as', 'break', 'case', 'catch', 'continue', 'decodeURI', 'delete', 'do',
+            'else', 'encodeURI', 'eval', 'finally', 'for', 'if', 'in', 'is', 'item',
+            'instanceof', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'void',
+            'while', 'write', 'with'
+            ),
+        2 => array(
+            'class', 'const', 'default', 'debugger', 'export', 'extends', 'false',
+            'function', 'import', 'namespace', 'new', 'null', 'package', 'private',
+            'protected', 'public', 'super', 'true', 'use', 'var'
+            ),
+        3 => array(
+            // common functions for Window object
+            'alert', 'back', 'close', 'confirm', 'forward', 'home',
+            'name', 'navigate', 'onblur', 'onerror', 'onfocus', 'onload', 'onmove',
+            'onresize', 'onunload', 'open', 'print', 'prompt', 'status',
+            //'blur', 'focus', 'scroll', // Duplicate with kw9
+            //'stop', //Duplicate with kw10
+            ),
+        4 => array(
+            // jQuery Core Functions
+            'jQuery', 'each', 'size', 'length', 'selector', 'context', 'eq',
+            'index', 'data', 'removeData', 'queue', 'dequeue', 'noConflict'
+            //'get', //Duplicate with kw11
+            ),
+        5 => array(
+            // jQuery Attribute Functions
+            'attr', 'removeAttr', 'addClass', 'hasClass', 'removeClass', 'toggleClass',
+            'html', 'text', 'val',
+            ),
+        6 => array(
+            // jQuery Traversing Functions
+            'filter', 'not', 'slice', 'add', 'children', 'closest',
+            'contents', 'find', 'next', 'nextAll', 'parent', 'parents',
+            'prev', 'prevAll', 'siblings', 'andSelf', 'end',
+            //'is',  //Dup with kw1
+            //'offsetParent', //Duplicate with kw8
+            //'map', //Duplicate with kw12
+            ),
+        7 => array(
+            // jQuery Manipulation Functions
+            'append', 'appendTo', 'prepend', 'prependTo', 'after', 'before', 'insertAfter',
+            'insertBefore', 'wrap', 'wrapAll', 'wrapInner', 'replaceWith', 'replaceAll',
+            'empty', 'remove', 'clone',
+            ),
+        8 => array(
+            // jQuery CSS Functions
+            'css', 'offset', 'offsetParent', 'position', 'scrollTop', 'scrollLeft',
+            'height', 'width', 'innerHeight', 'innerWidth', 'outerHeight', 'outerWidth',
+            ),
+        9 => array(
+            // jQuery Events Functions
+            'ready', 'bind', 'one', 'trigger', 'triggerHandler', 'unbind', 'live',
+            'die', 'hover', 'blur', 'change', 'click', 'dblclick', 'error',
+            'focus', 'keydown', 'keypress', 'keyup', 'mousedown', 'mouseenter',
+            'mouseleave', 'mousemove', 'mouseout', 'mouseover', 'mouseup', 'resize',
+            'scroll', 'select', 'submit', 'unload',
+            //'toggle', //Duplicate with kw10
+            //'load', //Duplicate with kw11
+            ),
+        10 => array(
+            // jQuery Effects Functions
+            'show', 'hide', 'toggle', 'slideDown', 'slideUp', 'slideToggle', 'fadeIn',
+            'fadeOut', 'fadeTo', 'animate', 'stop',
+            ),
+        11 => array(
+            // jQuery Ajax Functions
+            'ajax', 'load', 'get', 'getJSON', 'getScript', 'post', 'ajaxComplete',
+            'ajaxError', 'ajaxSend', 'ajaxStart', 'ajaxStop', 'ajaxSuccess', 'ajaxSetup',
+            'serialize', 'serializeArray',
+            ),
+        12 => array(
+            // jQuery Utility Functions
+            'support', 'browser', 'version', 'boxModal', 'extend', 'grep', 'makeArray',
+            'map', 'inArray', 'merge', 'unique', 'isArray', 'isFunction', 'trim',
+            'param',
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '+', '-', '*', '/', '%',
+            '!', '@', '&', '|', '^',
+            '<', '>', '=',
+            ',', ';', '?', ':'
+            ),
+        1 => array(
+            '$'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #003366; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #000066;',
+            5 => 'color: #000066;',
+            6 => 'color: #000066;',
+            7 => 'color: #000066;',
+            8 => 'color: #000066;',
+            9 => 'color: #000066;',
+            10 => 'color: #000066;',
+            11 => 'color: #000066;',
+            12 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #006600; font-style: italic;',
+            2 => 'color: #009966; font-style: italic;',
+            'MULTI' => 'color: #006600; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3366CC;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #660066;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => 'http://docs.jquery.com/Core/{FNAME}',
+        5 => 'http://docs.jquery.com/Attributes/{FNAME}',
+        6 => 'http://docs.jquery.com/Traversing/{FNAME}',
+        7 => 'http://docs.jquery.com/Manipulation/{FNAME}',
+        8 => 'http://docs.jquery.com/CSS/{FNAME}',
+        9 => 'http://docs.jquery.com/Events/{FNAME}',
+        10 => 'http://docs.jquery.com/Effects/{FNAME}',
+        11 => 'http://docs.jquery.com/Ajax/{FNAME}',
+        12 => 'http://docs.jquery.com/Utilities/{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            ''
+            ),
+        1 => array(
+            ''
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/kixtart.php b/sources/inc/geshi/kixtart.php
new file mode 100644
index 0000000..5b90919
--- /dev/null
+++ b/sources/inc/geshi/kixtart.php
@@ -0,0 +1,329 @@
+ 'KiXtart',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'While', 'Loop',
+            'Use',
+            'Small',
+            'Sleep',
+            'Shell',
+            'SetTime',
+            'SetM',
+            'SetL',
+            'Set',
+            'Select', 'Case',
+            'Run',
+            'Return',
+            'Redim',
+            'RD',
+            'Quit',
+            'Play',
+            'Move',
+            'MD',
+            'Include',
+            'If', 'Else', 'Endif',
+            'GoTo',
+            'GoSub',
+            'Go',
+            'Global',
+            'GetS',
+            'Get',
+            'Function', 'Endfunction',
+            'For', 'Next',
+            'Each',
+            'FlushKb',
+            'Exit',
+            'Do', 'Until',
+            'Display',
+            'Dim',
+            'Del',
+            'Debug',
+            'Copy',
+            'Cookie1',
+            'Color',
+            'CLS',
+            'CD',
+            'Call',
+            'Break',
+            'Big',
+            'Beep',
+            ),
+        2 => array(
+            '@Address',
+            '@Build',
+            '@Color',
+            '@Comment',
+            '@CPU',
+            '@CRLF',
+            '@CSD',
+            '@CurDir',
+            '@Date',
+            '@Day',
+            '@Domain',
+            '@DOS',
+            '@Error',
+            '@FullName',
+            '@HomeDir',
+            '@HomeDrive',
+            '@HomeShr',
+            '@HostName',
+            '@InWin',
+            '@IPaddressX',
+            '@KiX',
+            '@LanRoot',
+            '@LDomain',
+            '@LDrive',
+            '@LM',
+            '@LogonMode',
+            '@LongHomeDir',
+            '@LServer',
+            '@MaxPWAge',
+            '@MDayNo',
+            '@MHz',
+            '@MonthNo',
+            '@Month',
+            '@MSecs',
+            '@OnWoW64',
+            '@PID',
+            '@PrimaryGroup',
+            '@Priv',
+            '@ProductSuite',
+            '@ProductType',
+            '@PWAge',
+            '@RAS',
+            '@Result',
+            '@RServer',
+            '@ScriptDir',
+            '@ScriptExe',
+            '@ScriptName',
+            '@SError',
+            '@SID',
+            '@Site',
+            '@StartDir',
+            '@SysLang',
+            '@Ticks',
+            '@Time',
+            '@TsSession',
+            '@UserID',
+            '@UserLang',
+            '@WDayNo',
+            '@Wksta',
+            '@WUserID',
+            '@YDayNo',
+            '@Year',
+            ),
+        3 => array(
+            'WriteValue',
+            'WriteProfileString',
+            'WriteLine',
+            'VarTypeName',
+            'VarType',
+            'Val',
+            'UnloadHive',
+            'UCase',
+            'Ubound',
+            'Trim',
+            'Substr',
+            'SRnd',
+            'Split',
+            'SidToName',
+            'ShutDown',
+            'ShowProgramGroup',
+            'SetWallpaper',
+            'SetTitle',
+            'SetSystemState',
+            'SetOption',
+            'SetFocus',
+            'SetFileAttr',
+            'SetDefaultPrinter',
+            'SetConsole',
+            'SetAscii',
+            'SendMessage',
+            'SendKeys',
+            'SaveKey',
+            'RTrim',
+            'Round',
+            'Rnd',
+            'Right',
+            'RedirectOutput',
+            'ReadValue',
+            'ReadType',
+            'ReadProfileString',
+            'ReadLine',
+            'Open',
+            'MessageBox',
+            'MemorySize',
+            'LTrim',
+            'Logoff',
+            'LogEvent',
+            'LoadKey',
+            'LoadHive',
+            'Len',
+            'Left',
+            'LCase',
+            'KeyExist',
+            'KbHit',
+            'Join',
+            'IsDeclared',
+            'Int',
+            'InStrRev',
+            'InStr',
+            'InGroup',
+            'IIF',
+            'GetObject',
+            'GetFileVersion',
+            'GetFileTime',
+            'GetFileSize',
+            'GetFileAttr',
+            'GetDiskSpace',
+            'FreeFileHandle',
+            'FormatNumber',
+            'Fix',
+            'ExpandEnvironmentVars',
+            'Exist',
+            'Execute',
+            'EnumValue',
+            'EnumLocalGroup',
+            'EnumKey',
+            'EnumIpInfo',
+            'EnumGroup',
+            'Dir',
+            'DelValue',
+            'DelTree',
+            'DelProgramItem',
+            'DelProgramGroup',
+            'DelPrinterConnection',
+            'DelKey',
+            'DecToHex',
+            'CStr',
+            'CreateObject',
+            'CompareFileTimes',
+            'Close',
+            'ClearEventLog',
+            'CInt',
+            'Chr',
+            'CDbl',
+            'Box',
+            'BackupEventLog',
+            'At',
+            'AScan',
+            'Asc',
+            'AddProgramItem',
+            'AddProgramGroup',
+            'AddPrinterConnection',
+            'AddKey',
+            'Abs'
+            )
+        ),
+    '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;',
+            '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(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.kixtart.org/manual/Commands/{FNAMEL}.htm',
+        2 => '',
+        3 => 'http://www.kixtart.org/manual/Functions/{FNAMEL}.htm'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/klonec.php b/sources/inc/geshi/klonec.php
new file mode 100644
index 0000000..5f86e78
--- /dev/null
+++ b/sources/inc/geshi/klonec.php
@@ -0,0 +1,282 @@
+ 'KLone C',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),//#pour precede les include de C
+    'COMMENT_MULTI' => array('/*' => '*/', '' ),//comentaires C et KLone suivi de ceux pour HTML
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//mots-cles C
+            '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',
+            ),
+        3 => array(//fonctions C usuelles
+            'printf', 'malloc', 'fopen', 'fclose', 'free', 'fputs', 'fgets', 'feof', 'fwrite',
+            'perror', 'ferror', 'qsort', 'stats', 'sscanf', 'scanf',
+            'strdup', 'strcpy', 'strcmp', 'strncpy', 'strcasecmp', 'cat', 'strcat', 'strstr',
+            'strlen', 'strtof', 'strtod', 'strtok', 'towlower', 'towupper',
+            'cd', 'system', 'exit', 'exec', 'fork', 'vfork', 'kill', 'signal', 'syslog',
+            'usleep', 'utime', 'wait', 'waitpid', 'waitid',
+            'ceil', 'eval', 'round', 'floor',
+            'atoi', 'atol', 'abs', 'cos', 'sin', 'tan', 'acos', 'asin', 'atan', 'exp',
+            'time', 'ctime', 'localtime', 'asctime', 'gmtime', 'difftime', 'date'
+            ),
+        4 => array(//fonctions KLone usuelles
+            'request_get_cookies', 'request_get_cookie', 'request_get_args', 'request_get_arg',
+            'request_io', 'request_get_uri', 'request_get_filename', 'request_get_query_string', 'request_get_path_info',
+            'request_get_if_modified_since', 'request_get_http', 'request_get_client_request',
+            'request_get_content_length', 'request_get_uploads', 'request_get_uploaded_file',
+            'request_get_method', 'request_get_protocol', 'request_get_resolved_filename',
+            'request_get_resolved_path_info', 'request_get_addr', 'request_get_peer_addr',
+            'request_get_header', 'request_get_field', 'request_get_field_value',
+            'response_set_content_encoding', 'response_disable_caching', 'response_enable_caching',
+            'response_set_cookie', 'response_set_method', 'response_get_method',
+            'response_print_header', 'response_set_field', 'response_del_field',
+            'response_set_content_type', 'response_set_date', 'response_set_last_modified',
+            'response_set_content_length', 'response_get_status', 'response_get_header',
+            'response_io', 'response_redirect', 'response_set_status',
+            'session_get_vars', 'session_get', 'session_set', 'session_age', 'session_clean', 'session_del',
+            'io_type', 'io_pipe', 'io_dup', 'io_copy', 'io_seek', 'io_tell', 'io_close',
+            'io_free', 'io_read', 'io_printf', 'io_flush', 'io_write', 'io_putc', 'io_getc',
+            'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail',
+            'io_codecs_remove', 'io_name_set', 'io_name_get'
+            ),
+        5 => array(//types C
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'string', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile',
+            'wchar_t', 'time_t', 'FILE'
+            ),
+        6 => array(//mots-cles HTML
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        7 => array(//autres mots-cles HTML
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%=', '<%!', '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';', '^'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100; font-weight: bold;',//pour les mots-cles C
+            2 => 'color: #000000; font-weight: bold;',//pour les mots-cles KLone
+            3 => 'color: #6600FF;',//pour les fonctions C
+            4 => 'color: #6600FF;',//pour les fonctions Klone
+            5 => 'color: #0099FF; font-weight: bold;',//pour les types C
+            6 => 'color: #990099; font-weight: bold;',//pour les mots-cles HTML
+            7 => 'color: #000066;'//pour les autres mots-cles HTML
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',//commentaire sur une ligne C et KLone
+            2 => 'color: #339933;',//pour les #... en C
+            'MULTI' => 'color: #808080; font-style: italic;'//commentaire sur plusieurs lignes C et KLone
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array(
+            0 => 'background-color:#ffccff; font-weight: bold; color:#000000;',
+            1 => '',
+            2 => '',
+            3 => 'color: #00bbdd; font-weight: bold;',
+            4 => 'color: #ddbb00;',
+            5 => 'color: #009900;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => 'http://www.koanlogic.com/klone/api/html/globals.html',
+        5 => '',
+        6 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        //delimiteurs pour KLone
+        0 => array(
+            '<%=' => '%>'
+            ),
+        1 => array(
+            '<%!' => '%>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        //delimiteur pour HTML
+        3 => array(
+            ' '>'
+            ),
+        4 => array(
+            '&' => ';'
+            ),
+        5 => array(
+            '<' => '>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => true,
+        2 => true,
+        3 => false,
+        4 => false,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=<|<\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+            ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)',
+            )
+        )
+    )
+);
+
+?>
diff --git a/sources/inc/geshi/klonecpp.php b/sources/inc/geshi/klonecpp.php
new file mode 100644
index 0000000..6564c6b
--- /dev/null
+++ b/sources/inc/geshi/klonecpp.php
@@ -0,0 +1,310 @@
+ 'KLone C++',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),//#pour precede les include de C
+    'COMMENT_MULTI' => array('/*' => '*/', '' ),//comentaires C et KLone suivi de ceux pour HTML
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(//mots-cles C++
+            'if', 'return', 'while', 'case', 'continue', 'default',
+            'do', 'else', 'for', 'switch', 'goto',
+            'break', 'true', 'enum', 'extern', 'inline', 'false',
+            'errno', 'stdin', 'stdout', 'stderr',
+            'virtual', 'public', 'private', 'protected', 'template', 'using', 'namespace',
+            'try', 'catch', 'dynamic_cast', 'const_cast', 'reinterpret_cast',
+            'static_cast', 'explicit', 'friend', 'typename', 'typeid', 'class',
+            'EDOM', 'ERANGE', 'FLT_RADIX', 'FLT_ROUNDS', 'FLT_DIG', 'DBL_DIG', 'LDBL_DIG',
+            'FLT_EPSILON', 'DBL_EPSILON', 'LDBL_EPSILON', 'FLT_MANT_DIG', 'DBL_MANT_DIG',
+            'LDBL_MANT_DIG', 'FLT_MAX', 'DBL_MAX', 'LDBL_MAX', 'FLT_MAX_EXP', 'DBL_MAX_EXP',
+            'LDBL_MAX_EXP', 'FLT_MIN', 'DBL_MIN', 'LDBL_MIN', 'FLT_MIN_EXP', 'DBL_MIN_EXP',
+            'LDBL_MIN_EXP', 'CHAR_BIT', 'CHAR_MAX', 'CHAR_MIN', 'SCHAR_MAX', 'SCHAR_MIN',
+            'UCHAR_MAX', 'SHRT_MAX', 'SHRT_MIN', 'USHRT_MAX', 'INT_MAX', 'INT_MIN',
+            'UINT_MAX', 'LONG_MAX', 'LONG_MIN', 'ULONG_MAX', 'HUGE_VAL', 'SIGABRT',
+            'SIGFPE', 'SIGILL', 'SIGINT', 'SIGSEGV', 'SIGTERM', 'SIG_DFL', 'SIG_ERR',
+            'SIG_IGN', 'BUFSIZ', 'EOF', 'FILENAME_MAX', 'FOPEN_MAX', 'L_tmpnam', 'NULL',
+            'SEEK_CUR', 'SEEK_END', 'SEEK_SET', 'TMP_MAX',
+            'EXIT_FAILURE', 'EXIT_SUCCESS', 'RAND_MAX', 'CLOCKS_PER_SEC'
+            ),
+        2 => array(//mots-cles KLone
+            'out', 'request', 'response',
+            ),
+        3 => array(//fonctions C++ usuelles
+            'cin', 'cerr', 'clog', 'cout', 'delete', 'new', 'this',
+            'printf', 'fprintf', 'snprintf', 'sprintf', 'assert',
+            'isalnum', 'isalpha', 'isdigit', 'iscntrl', 'isgraph', 'islower', 'isprint',
+            'ispunct', 'isspace', 'isupper', 'isxdigit', 'tolower', 'toupper',
+            'exp', 'log', 'log10', 'pow', 'sqrt', 'ceil', 'floor', 'fabs', 'ldexp',
+            'frexp', 'modf', 'fmod', 'sin', 'cos', 'tan', 'asin', 'acos', 'atan', 'atan2',
+            'sinh', 'cosh', 'tanh', 'setjmp', 'longjmp',
+            'va_start', 'va_arg', 'va_end', 'offsetof', 'sizeof', 'fopen', 'freopen',
+            'fflush', 'fclose', 'remove', 'rename', 'tmpfile', 'tmpname', 'setvbuf',
+            'setbuf', 'vfprintf', 'vprintf', 'vsprintf', 'fscanf', 'scanf', 'sscanf',
+            'fgetc', 'fgets', 'fputc', 'fputs', 'getc', 'getchar', 'gets', 'putc',
+            'putchar', 'puts', 'ungetc', 'fread', 'fwrite', 'fseek', 'ftell', 'rewind',
+            'fgetpos', 'fsetpos', 'clearerr', 'feof', 'ferror', 'perror', 'abs', 'labs',
+            'div', 'ldiv', 'atof', 'atoi', 'atol', 'strtod', 'strtol', 'strtoul', 'calloc',
+            'malloc', 'realloc', 'free', 'abort', 'exit', 'atexit', 'system', 'getenv',
+            'bsearch', 'qsort', 'rand', 'srand', 'strcpy', 'strncpy', 'strcat', 'strncat',
+            'strcmp', 'strncmp', 'strcoll', 'strchr', 'strrchr', 'strspn', 'strcspn',
+            'strpbrk', 'strstr', 'strlen', 'strerror', 'strtok', 'strxfrm', 'memcpy',
+            'memmove', 'memcmp', 'memchr', 'memset', 'clock', 'time', 'difftime', 'mktime',
+            'asctime', 'ctime', 'gmtime', 'localtime', 'strftime'
+            ),
+        4 => array(//fonctions KLone usuelles
+            'request_get_cookies', 'request_get_cookie', 'request_get_args', 'request_get_arg',
+            'request_io', 'request_get_uri', 'request_get_filename', 'request_get_query_string', 'request_get_path_info',
+            'request_get_if_modified_since', 'request_get_http', 'request_get_client_request',
+            'request_get_content_length', 'request_get_uploads', 'request_get_uploaded_file',
+            'request_get_method', 'request_get_protocol', 'request_get_resolved_filename',
+            'request_get_resolved_path_info', 'request_get_addr', 'request_get_peer_addr',
+            'request_get_header', 'request_get_field', 'request_get_field_value',
+            'response_set_content_encoding', 'response_disable_caching', 'response_enable_caching',
+            'response_set_cookie', 'response_set_method', 'response_get_method',
+            'response_print_header', 'response_set_field', 'response_del_field',
+            'response_set_content_type', 'response_set_date', 'response_set_last_modified',
+            'response_set_content_length', 'response_get_status', 'response_get_header',
+            'response_io', 'response_redirect', 'response_set_status',
+            'session_get_vars', 'session_get', 'session_set', 'session_age', 'session_clean', 'session_del',
+            'io_type', 'io_pipe', 'io_dup', 'io_copy', 'io_seek', 'io_tell', 'io_close',
+            'io_free', 'io_read', 'io_printf', 'io_flush', 'io_write', 'io_putc', 'io_getc',
+            'io_get_until', 'io_gets', 'io_codec_add_head', 'io_codec_add_tail',
+            'io_codecs_remove', 'io_name_set', 'io_name_get'
+            ),
+        5 => array(//types C++
+            'auto', 'bool', 'char', 'const', 'double', 'float', 'int', 'long', 'longint',
+            'register', 'short', 'shortint', 'signed', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'jmp_buf',
+            'signal', 'raise', 'va_list', 'ptrdiff_t', 'size_t', 'FILE', 'fpos_t',
+            'div_t', 'ldiv_t', 'clock_t', 'time_t', 'tm',
+            'string', 'wchar_t'
+            ),
+        6 => array(//mots-cles HTML
+            'a', 'abbr', 'acronym', 'address', 'applet',
+
+            'base', 'basefont', 'bdo', 'big', 'blockquote', 'body', 'br', 'button', 'b',
+
+            'caption', 'center', 'cite', 'code', 'colgroup', 'col',
+
+            'dd', 'del', 'dfn', 'dir', 'div', 'dl', 'dt',
+
+            'em',
+
+            'fieldset', 'font', 'form', 'frame', 'frameset',
+
+            'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'hr', 'html',
+
+            'iframe', 'ilayer', 'img', 'input', 'ins', 'isindex', 'i',
+
+            'kbd',
+
+            'label', 'legend', 'link', 'li',
+
+            'map', 'meta',
+
+            'noframes', 'noscript',
+
+            'object', 'ol', 'optgroup', 'option',
+
+            'param', 'pre', 'p',
+
+            'q',
+
+            'samp', 'script', 'select', 'small', 'span', 'strike', 'strong', 'style', 'sub', 'sup', 's',
+
+            'table', 'tbody', 'td', 'textarea', 'text', 'tfoot', 'thead', 'th', 'title', 'tr', 'tt',
+
+            'ul', 'u',
+
+            'var',
+            ),
+        7 => array(//autres mots-cles HTML
+            'abbr', 'accept-charset', 'accept', 'accesskey', 'action', 'align', 'alink', 'alt', 'archive', 'axis',
+            'background', 'bgcolor', 'border',
+            'cellpadding', 'cellspacing', 'char', 'charoff', 'charset', 'checked', 'cite', 'class', 'classid', 'clear', 'code', 'codebase', 'codetype', 'color', 'cols', 'colspan', 'compact', 'content', 'coords',
+            'data', 'datetime', 'declare', 'defer', 'dir', 'disabled',
+            'enctype',
+            'face', 'for', 'frame', 'frameborder',
+            'headers', 'height', 'href', 'hreflang', 'hspace', 'http-equiv',
+            'id', 'ismap',
+            'label', 'lang', 'language', 'link', 'longdesc',
+            'marginheight', 'marginwidth', 'maxlength', 'media', 'method', 'multiple',
+            'name', 'nohref', 'noresize', 'noshade', 'nowrap',
+            'object', 'onblur', 'onchange', 'onclick', 'ondblclick', 'onfocus', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onmousedown', 'onmousemove', 'onmouseout', 'onmouseover', 'onmouseup', 'onreset', 'onselect', 'onsubmit', 'onunload',
+            'profile', 'prompt',
+            'readonly', 'rel', 'rev', 'rowspan', 'rows', 'rules',
+            'scheme', 'scope', 'scrolling', 'selected', 'shape', 'size', 'span', 'src', 'standby', 'start', 'style', 'summary',
+            'tabindex', 'target', 'text', 'title', 'type',
+            'usemap',
+            'valign', 'value', 'valuetype', 'version', 'vlink', 'vspace',
+            'width'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%=', '<%!', '<%', '%>'
+            ),
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';', '^'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100; font-weight: bold;',//pour les mots-cles C++
+            2 => 'color: #000000; font-weight: bold;',//pour les mots-cles KLone
+            3 => 'color: #6600FF;',//pour les fonctions C++
+            4 => 'color: #6600FF;',//pour les fonctions Klone
+            5 => 'color: #0099FF; font-weight: bold;',//pour les types C++
+            6 => 'color: #990099; font-weight: bold;',//pour les mots-cles HTML
+            7 => 'color: #000066;'//pour les autres mots-cles HTML
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',//commentaire sur une ligne C++ et KLone
+            2 => 'color: #339933;',//pour les #... en C++
+            'MULTI' => 'color: #808080; font-style: italic;'//commentaire sur plusieurs lignes C++ et KLone
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array(
+            0 => 'background-color:#ffccff; font-weight: bold; color:#000000;',
+            1 => '',
+            2 => '',
+            3 => 'color: #00bbdd; font-weight: bold;',
+            4 => 'color: #ddbb00;',
+            5 => 'color: #009900;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => 'http://www.koanlogic.com/klone/api/html/globals.html',
+        5 => '',
+        6 => 'http://december.com/html/4/element/{FNAMEL}.html',
+        7 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        //delimiteurs pour KLone
+        0 => array(
+            '<%=' => '%>'
+            ),
+        1 => array(
+            '<%!' => '%>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        //delimiteur pour HTML
+        3 => array(
+            ' '>'
+            ),
+        4 => array(
+            '&' => ';'
+            ),
+        5 => array(
+            '<' => '>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => true,
+        2 => true,
+        3 => false,
+        4 => false,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=<|<\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+            ),
+            7 => array(
+                'DISALLOWED_AFTER' => '(?=\s*=)',
+            )
+        )
+    )
+);
+
+?>
diff --git a/sources/inc/geshi/latex.php b/sources/inc/geshi/latex.php
new file mode 100644
index 0000000..386a0b9
--- /dev/null
+++ b/sources/inc/geshi/latex.php
@@ -0,0 +1,223 @@
+ 'LaTeX',
+    'COMMENT_SINGLE' => array(
+        1 => '%'
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'addlinespace','and','address','appendix','author','backmatter',
+            'bfseries','bibitem','bigskip','blindtext','caption','captionabove',
+            'captionbelow','cdot','centering','chapter','cite','color',
+            'colorbox','date','dedication','def','definecolor','documentclass',
+            'edef','else','email','emph','eqref','extratitle','fbox','fi',
+            'flushleft','flushright','footnote','frac','frontmatter',
+            'graphicspath','hfil','hfill','hfilll','hline','hspace','huge','ifx','include',
+            'includegraphics','infty','input','int','item','itemsep',
+            'KOMAoption','KOMAoptions','label','LaTeX','left','let','limits',
+            'listfiles','listoffigures','listoftables','lowertitleback',
+            'mainmatter','makeatletter','makeatother','makebox','makeindex',
+            'maketitle','mbox','mediumskip','newcommand','newenvironment',
+            'newpage','nocite','nonumber','pagestyle','par','paragraph',
+            'parbox','parident','parskip','partial','publishers','raggedleft',
+            'raggedright','raisebox','ref','renewcommand','renewenvironment',
+            'right','rule','section','setlength','sffamily','subject',
+            'subparagraph','subsection','subsubsection','subtitle','sum',
+            'table','tableofcontents','textbf','textcolor','textit',
+            'textnormal','textsuperscript','texttt','textwidth','thanks','title',
+            'titlehead','today','ttfamily','uppertitleback','urlstyle',
+            'usepackage','vfil','vfill','vfilll','vspace'
+            )
+        ),
+    'SYMBOLS' => array(
+        "&", "\\", "{", "}", "[", "]"
+        ),
+    'CASE_SENSITIVE' => array(
+        1 => true,
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800000;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #2C922C; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 =>  'color: #000000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 =>  'color: #000000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 =>  'color: #E02020; '
+            ),
+        'REGEXPS' => array(
+            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(
+        ),
+    'REGEXPS' => array(
+        // Math inner
+        1 => array(
+            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 => '\4'
+            ),
+        // [options]
+        2 => array(
+            GESHI_SEARCH => "(?<=\[).*(?=\])",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // Math mode with $ ... $
+        3 => array(
+            GESHI_SEARCH => "\\$.+\\$",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => 'Us',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // Structure: Label
+        4 => "\\\\(?:label|pageref|ref|cite)(?=[^a-zA-Z])",
+        // Structure: sections
+        5 => array(
+            GESHI_SEARCH => "(\\\\(?:part|chapter|(?:sub){0,2}section|(?:sub)?paragraph|addpart|addchap|addsec)\*?\\{)(.*)(?=\\})",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'U',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        // 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 => '\\1',
+            GESHI_AFTER => ''
+            ),
+        // 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]+\*?",
+
+// ---------------------------------------------
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '\\'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?<=\\\\)",
+            'DISALLOWED_AFTER' => "(?![A-Za-z0-9])"
+        ),
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/lb.php b/sources/inc/geshi/lb.php
new file mode 100644
index 0000000..6c28828
--- /dev/null
+++ b/sources/inc/geshi/lb.php
@@ -0,0 +1,162 @@
+ 'Liberty BASIC',
+    'COMMENT_SINGLE' => array(1 => '\''),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'and', 'append', 'as', 'beep', 'bmpbutton', 'bmpsave', 'boolean',
+            'button', 'byref', 'call', 'callback', 'calldll', 'callfn', 'case',
+            'checkbox', 'close', 'cls', 'colordialog', 'combobox', 'confirm',
+            'cursor', 'data', 'dialog', 'dim', 'dll', 'do', 'double', 'dump',
+            'dword', 'else', 'end', 'error', 'exit', 'field', 'filedialog',
+            'files', 'fontdialog', 'for', 'function', 'get', 'gettrim',
+            'global', 'gosub', 'goto', 'graphicbox', 'graphics', 'groupbox',
+            'if', 'input', 'kill', 'let', 'line', 'listbox', 'loadbmp',
+            'locate', 'long', 'loop', 'lprint', 'mainwin', 'maphandle', 'menu',
+            'mod', 'name', 'next', 'nomainwin', 'none', 'notice', 'on',
+            'oncomerror', 'or', 'open', 'out', 'output', 'password', 'playmidi',
+            'playwave', 'popupmenu', 'print', 'printerdialog', 'prompt', 'ptr',
+            'put', 'radiobutton', 'random', 'randomize', 'read', 'readjoystick',
+            'redim', 'rem', 'restore', 'resume', 'return', 'run', 'scan',
+            'seek', 'select', 'short', 'sort', 'statictext', 'stop', 'stopmidi',
+            'struct', 'stylebits', 'sub', 'text', 'textbox', 'texteditor',
+            'then', 'timer', 'titlebar', 'to', 'trace', 'ulong', 'unloadbmp',
+            'until', 'ushort', 'void', 'wait', 'window', 'wend', 'while',
+            'word', 'xor'
+            ),
+        2 => array(
+            'abs', 'acs', 'asc', 'asn', 'atn', 'chr$', 'cos', 'date$',
+            'dechex$', 'eof', 'eval', 'eval$', 'exp', 'hbmp', 'hexdec', 'hwnd',
+            'inp', 'input$', 'inputto$', 'instr', 'int', 'left$', 'len', 'lof',
+            'log', 'lower$', 'max', 'midipos', 'mid$', 'min', 'mkdir', 'not',
+            'right$', 'rmdir', 'rnd', 'sin', 'space$', 'sqr', 'str$', 'tab',
+            'tan', 'time$', 'trim$', 'txcount', 'upper$', 'using', 'val',
+            'winstring', 'word$'
+            ),
+        3 => array(
+            'BackgroundColor$', 'Com', 'ComboboxColor$', 'ComError', 'ComErrorNumber',
+            'CommandLine$', 'ComPortNumber', 'DefaultDir$',
+            'DisplayHeight', 'DisplayWidth', 'Drives$', 'Err', 'Err$',
+            'ForegroundColor$', 'Inkey$', 'Joy1x', 'Joy1y', 'Joy1z',
+            'Joy1button1', 'Joy1button2', 'Joy2x', 'Joy2y', 'Joy2z',
+            'Joy2button1', 'Joy2button2', 'ListboxColor$', 'MouseX', 'MouseY', 'Platform$',
+            'PrintCollate', 'PrintCopies', 'PrinterFont$', 'PrinterName$', 'StartupDir$',
+            'TextboxColor$', 'TexteditorColor$', 'Version$', 'WindowHeight',
+            'WindowWidth', 'UpperLeftX', 'UpperLeftY'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', ':', ',', '#'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #AD0080;',
+            3 => 'color: #008080;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        '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(),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            2 => array(
+                //In LB, the second keyword list is a list of built-in functions,
+                //and their names should not be highlighted unless being used
+                //as a function name.
+                'DISALLOWED_AFTER' => '(?=\s*\()'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/ldif.php b/sources/inc/geshi/ldif.php
new file mode 100644
index 0000000..4248183
--- /dev/null
+++ b/sources/inc/geshi/ldif.php
@@ -0,0 +1,116 @@
+ 'LDIF',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066; font-weight: bold;',
+            1 => 'color: #FF0000;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '([a-zA-Z0-9_]+):(.+)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ':\\2'
+            ),
+        1 => array(
+            // Evil hackery to get around GeSHi bug: <>" and ; are added so s can be matched
+            // Explicit match on variable names because if a comment is before the first < of the span
+            // gets chewed up...
+            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+):(.+)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1:',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/lisp.php b/sources/inc/geshi/lisp.php
new file mode 100644
index 0000000..be823a4
--- /dev/null
+++ b/sources/inc/geshi/lisp.php
@@ -0,0 +1,144 @@
+ 'Lisp',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(';|' => '|;'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'not','defun','princ','when',
+            'eval','apply','funcall','quote','identity','function',
+            'complement','backquote','lambda','set','setq','setf',
+            'defmacro','gensym','make','symbol','intern',
+            'name','value','plist','get',
+            'getf','putprop','remprop','hash','array','aref',
+            'car','cdr','caar','cadr','cdar','cddr','caaar','caadr','cadar',
+            'caddr','cdaar','cdadr','cddar','cdddr','caaaar','caaadr',
+            'caadar','caaddr','cadaar','cadadr','caddar','cadddr',
+            'cdaaar','cdaadr','cdadar','cdaddr','cddaar','cddadr',
+            'cdddar','cddddr','cons','list','append','reverse','last','nth',
+            'nthcdr','member','assoc','subst','sublis','nsubst',
+            'nsublis','remove','length',
+            'mapc','mapcar','mapl','maplist','mapcan','mapcon','rplaca',
+            'rplacd','nconc','delete','atom','symbolp','numberp',
+            'boundp','null','listp','consp','minusp','zerop','plusp',
+            'evenp','oddp','eq','eql','equal','cond','case','and','or',
+            'let','l','if','prog','prog1','prog2','progn','go','return',
+            'do','dolist','dotimes','catch','throw','error','cerror','break',
+            'continue','errset','baktrace','evalhook','truncate','float',
+            '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','parse-integer','make-list','print','write'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '!', '%', '^', '&',
+        ' + ',' - ',' * ',' / ',
+        '=','<','>',
+        '.',':',',',';',
+        '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => '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(
+            0 => 'color: #555;',
+            1 => 'color: #555;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        '::', ':'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'OOLANG' => array(
+            'MATCH_AFTER' => '[a-zA-Z][a-zA-Z0-9_\-]*'
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/llvm.php b/sources/inc/geshi/llvm.php
new file mode 100644
index 0000000..580099b
--- /dev/null
+++ b/sources/inc/geshi/llvm.php
@@ -0,0 +1,385 @@
+ 'LLVM Intermediate Representation',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'HARDQUOTE' => array("\"", "\""),
+    'HARDESCAPE' => array("\"", "\\"),
+    'HARDCHAR' => "\\",
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    '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])#"
+        ),
+    'NUMBERS' =>
+    GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_HEX_PREFIX | GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        0 => array(
+            'to', 'nuw', 'nsw', 'align', 'inbounds', 'entry', 'return'
+            ),
+        //Terminator Instructions
+        1 => array(
+            'ret', 'br', 'switch', 'indirectbr', 'invoke', 'unwind', 'unreachable'
+            ),
+        //Binary Operations
+        2 => array(
+            'add', 'fadd', 'sub', 'fsub', 'mul', 'fmul', 'udiv', 'sdiv', 'fdiv', 'urem', 'frem', 'srem'
+            ),
+        //Bitwise Binary Operations
+        3 => array(
+            'shl', 'lshr', 'ashr', 'and', 'or', 'xor'
+            ),
+        //Vector Operations
+        4 => array(
+            'extractelement', 'insertelement', 'shufflevector'
+            ),
+        //Aggregate Operations
+        5 => array(
+            'extractvalue', 'insertvalue'
+            ),
+        //Memory Access and Addressing Operations
+        6 => array(
+            'alloca', 'load', 'store', 'getelementptr'
+            ),
+        //Conversion Operations
+        7 => array(
+            'trunc', 'zext', 'sext', 'fptrunc', 'fpext', 'fptoui', 'fptosi',
+            'uitofp', 'sitofp', 'ptrtoint', 'inttoptr', 'bitcast'
+            ),
+        //Other Operations
+        8 => array(
+            'icmp', 'fcmp', 'phi', 'select', 'call', 'va_arg'
+            ),
+        //Linkage Types
+        9 => array(
+            'private', 'linker_private', 'linker_private_weak', 'linker_private_weak_def_auto',
+            'internal', 'available_externally', 'linkonce', 'common', 'weak', 'appending',
+            'extern_weak', 'linkonce_odr', 'weak_odr', 'externally visible', 'dllimport', 'dllexport',
+            ),
+        //Calling Conventions
+        10 => array(
+            'ccc', 'fastcc', 'coldcc', 'cc 10'
+            ),
+        //Named Types
+        11 => array(
+            'type'
+            ),
+        //Parameter Attributes
+        12 => array(
+            'zeroext', 'signext', 'inreg', 'byval', 'sret', 'noalias', 'nocapture', 'nest'
+            ),
+        //Function Attributes
+        13 => array(
+            'alignstack', 'alwaysinline', 'inlinehint', 'naked', 'noimplicitfloat', 'noinline', 'noredzone', 'noreturn',
+            'nounwind', 'optsize', 'readnone', 'readonly', 'ssp', 'sspreq',
+            ),
+        //Module-Level Inline Assembly
+        14 => array(
+            'module asm'
+            ),
+        //Data Layout
+        15 => array(
+            'target datalayout'
+            ),
+        //Primitive Types
+        16 => array(
+            'x86mmx',
+            'void',
+            'label',
+            'metadata',
+            'opaque'
+            ),
+        //Floating Point Types
+        17 => array(
+            'float', 'double', 'fp128', 'x86_fp80', 'ppc_fp128',
+            ),
+        //Simple Constants
+        18 => array(
+            'false', 'true', 'null'
+            ),
+        //Global Variable and Function Addresses
+        19 => array(
+            'global', 'addrspace', 'constant', 'section'
+            ),
+        //Functions
+        20 => array(
+            'declare', 'define'
+            ),
+        //Complex Constants
+        21 => array(
+            'zeroinitializer'
+            ),
+        //Undefined Values
+        22 => array(
+            'undef'
+            ),
+        //Addresses of Basic Blocks
+        23 => array(
+            'blockaddress'
+            ),
+        //Visibility Styles
+        24 => array(
+            'default', 'hidden', 'protected'
+            ),
+        25 => array(
+            'volatile'
+            ),
+        26 => array(
+            'tail'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')', '[', ']', '{', '}',
+            '!', '@', '%', '&', '|', '/',
+            '<', '>',
+            '=', '-', '+', '*',
+            '.', ':', ',', ';'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        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,
+        18 => true,
+        19 => true,
+        20 => true,
+        21 => true,
+        22 => true,
+        23 => true,
+        24 => true,
+        25 => true,
+        26 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            0 => 'color: #209090;',
+            1 => 'color: #0000F0;',
+            2 => 'color: #00F000; font-weight: bold;',
+            3 => 'color: #F00000;',
+            4 => 'color: #00F0F0; font-weight: bold;',
+            5 => 'color: #F000F0; font-weight: bold;',
+            6 => 'color: #403020; font-weight: bold;',
+            7 => 'color: #909090; font-weight: bold;',
+            8 => 'color: #009090; font-weight: bold;',
+            9 => 'color: #900090; font-weight: bold;',
+            10 => 'color: #909000; font-weight: bold;',
+            11 => 'color: #000090; font-weight: bold;',
+            12 => 'color: #900000; font-weight: bold;',
+            13 => 'color: #009000; font-weight: bold;',
+            14 => 'color: #F0F090; font-weight: bold;',
+            15 => 'color: #F090F0; font-weight: bold;',
+            16 => 'color: #90F0F0; font-weight: bold;',
+            17 => 'color: #9090F0; font-weight: bold;',
+            18 => 'color: #90F090; font-weight: bold;',
+            19 => 'color: #F09090; font-weight: bold;',
+            20 => 'color: #4040F0; font-weight: bold;',
+            21 => 'color: #40F040; font-weight: bold;',
+            22 => 'color: #F04040; font-weight: bold;',
+            23 => 'color: #F0F040; font-weight: bold;',
+            24 => 'color: #F040F0; font-weight: bold;',
+            25 => 'color: #40F0F0; font-weight: bold;',
+            26 => 'color: #904040; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; 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(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007088;',
+            1 => 'color: #007088;',
+            // 2 => 'color: #000088;',
+            3 => 'color: #700088;',
+            4 => 'color: #010088;',
+            // 5 => 'color: #610088;',
+            // 6 => 'color: #616088;',
+            // 7 => 'color: #616988;',
+            // 8 => 'color: #616908;',
+            9 => 'color: #6109F8;',
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            )
+        ),
+    'URLS' => array(
+        0 => '',
+        1 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        2 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        3 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        4 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        5 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        6 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        7 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        8 => 'http://llvm.org/docs/LangRef.html#i_{FNAME}',
+        9 => 'http://llvm.org/docs/LangRef.html#linkage_{FNAME}',
+        10 => 'http://llvm.org/docs/LangRef.html#callingconv',
+        11 => 'http://llvm.org/docs/LangRef.html#namedtypes',
+        12 => 'http://llvm.org/docs/LangRef.html#paramattrs',
+        13 => 'http://llvm.org/docs/LangRef.html#fnattrs',
+        14 => 'http://llvm.org/docs/LangRef.html#moduleasm',
+        15 => 'http://llvm.org/docs/LangRef.html#datalayout',
+        16 => 'http://llvm.org/docs/LangRef.html#t_{FNAME}',
+        17 => 'http://llvm.org/docs/LangRef.html#t_floating',
+        18 => 'http://llvm.org/docs/LangRef.html#simpleconstants',
+        19 => 'http://llvm.org/docs/LangRef.html#globalvars',
+        20 => 'http://llvm.org/docs/LangRef.html#functionstructure',
+        21 => 'http://llvm.org/docs/LangRef.html#complexconstants',
+        22 => 'http://llvm.org/docs/LangRef.html#undefvalues',
+        23 => 'http://llvm.org/docs/LangRef.html#blockaddress',
+        24 => 'http://llvm.org/docs/LangRef.html#visibility',
+        25 => 'http://llvm.org/docs/LangRef.html#volatile',
+        26 => 'http://llvm.org/docs/LangRef.html#i_call',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => '%[-a-zA-Z$\._][-a-zA-Z$\._0-9]*',
+        //Labels
+        // 1 => '[-a-zA-Z$\._0-9]+:',
+        1 => '(?]*<)',
+        //Strings
+        // 2 => '"[^"]+"',
+        //Unnamed variable slots
+        3 => '%[-]?[0-9]+',
+        //Integer Types
+        4 => array(
+            GESHI_SEARCH => '(? '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        //Comments
+        // 5 => ';.*',
+        //Integer literals
+        // 6 => '\\b[-]?[0-9]+\\b',
+        //Floating point constants
+        // 7 => '\\b[-+]?[0-9]+\.[0-9]*\([eE][-+]?[0-9]+\)?\\b',
+        //Hex constants
+        // 8 => '\\b0x[0-9A-Fa-f]+\\b',
+        //Global variables
+        9 => array(
+            GESHI_SEARCH => '@[-a-zA-Z$\._][-a-zA-Z$\._0-9]*',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'SCRIPT_DELIMITERS' => array(),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/locobasic.php b/sources/inc/geshi/locobasic.php
new file mode 100644
index 0000000..61c8a3c
--- /dev/null
+++ b/sources/inc/geshi/locobasic.php
@@ -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: #000088; font-weight: bold;',
+            2 => 'color: #AA00AA; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008800;'
+            ),
+        '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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/logtalk.php b/sources/inc/geshi/logtalk.php
new file mode 100644
index 0000000..0573466
--- /dev/null
+++ b/sources/inc/geshi/logtalk.php
@@ -0,0 +1,345 @@
+ 'Logtalk',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(2 => "/0'./sim"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'HARDQUOTE' => array('"', '"'),
+    'HARDESCAPE' => array(),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"?\n]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]+\\\\#",
+        //Octal Char Specs
+        3 => "#\\\\[0-7]+\\\\#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX_0O |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        // Directives (with arguments)
+        1 => array(
+            // file directives
+            'encoding', 'ensure_loaded',
+            // flag directives
+            'set_logtalk_flag', 'set_prolog_flag',
+            // entity opening directives
+            'category', 'object', 'protocol',
+            // predicate scope directives
+            'private', 'protected', 'public',
+            // conditional compilation directives
+            'elif', 'if',
+            // entity directives
+            'calls', 'initialization', 'op', 'uses',
+            // predicate directives
+            'alias', 'coinductive', 'discontiguous', 'dynamic', 'mode', 'info', 'meta_predicate', 'multifile', 'synchronized',
+            // module directives
+            'export', 'module', 'reexport', 'use_module'
+            ),
+        // Directives (no arguments)
+        2 => array(
+            // entity directives
+            'dynamic',
+            // multi-threading directives
+            'synchronized', 'threaded',
+            // entity closing directives
+            'end_category', 'end_object', 'end_protocol',
+            // conditional compilation directives
+            'else', 'endif'
+            ),
+        // Entity relations
+        3 => array(
+            'complements', 'extends', 'imports', 'implements','instantiates', 'specializes'
+            ),
+        // Built-in predicates (with arguments)
+        4 => array(
+            // event handlers
+            'after', 'before',
+            // execution-context methods
+            'parameter', 'self', 'sender', 'this',
+            // predicate reflection
+            'current_predicate', 'predicate_property',
+            // DCGs and term expansion
+            'expand_goal', 'expand_term', 'goal_expansion', 'phrase', 'term_expansion',
+            // entity
+            'abolish_category', 'abolish_object', 'abolish_protocol',
+            'create_category', 'create_object', 'create_protocol',
+            'current_category', 'current_object', 'current_protocol',
+            'category_property', 'object_property', 'protocol_property',
+            // entity relations
+            'complements_object', 'conforms_to_protocol',
+            'extends_category', 'extends_object', 'extends_protocol',
+            'implements_protocol', 'imports_category',
+            'instantiates_class', 'specializes_class',
+            // events
+            'abolish_events', 'current_event', 'define_events',
+            // flags
+            'current_logtalk_flag', 'set_logtalk_flag',
+            'current_prolog_flag', 'set_prolog_flag',
+            // compiling, loading, and library path
+            'logtalk_compile', 'logtalk_library_path', 'logtalk_load',
+            // database
+            'abolish', 'asserta', 'assertz', 'clause', 'retract', 'retractall',
+            // control
+            'call', 'catch', 'ignore', 'once', 'throw',
+            // all solutions predicates
+            'bagof', 'findall', 'forall', 'setof',
+            // multi-threading meta-predicates
+            'threaded',
+            'threaded_call', 'threaded_once', 'threaded_ignore', 'threaded_exit', 'threaded_peek',
+            'threaded_wait', 'threaded_notify',
+            // term unification
+            'unify_with_occurs_check',
+            // atomic term processing
+            'atom_chars', 'atom_codes', 'atom_concat', 'atom_length',
+            'number_chars', 'number_codes',
+            'char_code',
+            // term creation and decomposition
+            'arg', 'copy_term', 'functor', 'numbervars',
+            // term testing
+            'atom', 'atomic', 'callable', 'compound', 'float', 'ground', 'integer', 'nonvar', 'number', 'sub_atom', 'var',
+            // term comparison
+            'compare',
+            // stream selection and control
+            'current_input', 'current_output', 'set_input', 'set_output',
+            'open', 'close', 'flush_output', 'stream_property',
+            'at_end_of_stream', 'set_stream_position',
+            // character and byte input/output predicates
+            'get_byte', 'get_char', 'get_code',
+            'peek_byte', 'peek_char', 'peek_code',
+            'put_byte', 'put_char', 'put_code',
+            'nl',
+            // term input/output predicates
+            'current_op', 'op',
+            'write', 'writeq', 'write_canonical', 'write_term',
+            'read', 'read_term',
+            'char_conversion', 'current_char_conversion',
+            // hooks
+            'halt',
+            // sorting
+            'keysort', 'sort'
+            ),
+        // Built-in predicates (no arguments)
+        5 => array(
+            // control
+            'fail', 'repeat', 'true',
+            // character and byte input/output predicates
+            'nl',
+            // implementation defined hooks functions
+            'halt',
+            // arithemtic evaluation
+            'is',
+            // stream selection and control
+            'at_end_of_stream', 'flush_output'
+            ),
+        // Evaluable functors (with arguments)
+        6 => array(
+            'float_integer_part', 'float_fractional_part',
+            'rem', 'mod', 'abs', 'sign', 'floor', 'truncate', 'round', 'ceiling',
+            'cos', 'atan', 'exp', 'log', 'sin', 'sqrt'
+            ),
+        // Evaluable functors (no arguments)
+        7 => array(
+            'e', 'pi', 'mod', 'rem'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            // external call
+            '{', '}'
+            ),
+        1 => array(
+            // arithemtic comparison
+            '=:=', '=\=', '<', '=<', '>=', '>',
+            // term comparison
+            '<<', '>>', '/\\', '\\/', '\\',
+            // bitwise functors
+            '==', '\==', '@<', '@=<', '@>=', '@>',
+            // evaluable functors
+            '+', '-', '*', '/', '**',
+            // logic and control
+            '!', '\\+', ';',
+            // message sending operators
+            '::', '^^', ':',
+            // grammar rule and conditional functors
+            '-->', '->',
+            // mode operators
+            '@', '?',
+            // term to list predicate
+            '=..',
+            // unification
+            '=', '\\='
+            ),
+        2 => array(
+            // clause and directive functors
+            ':-'
+            )
+        ),
+    '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: #2e4dc9;',
+            2 => 'color: #2e4dc9;',
+            3 => 'color: #2e4dc9;',
+            4 => 'color: #9d4f37;',
+            5 => 'color: #9d4f37;',
+            6 => 'color: #9d4f37;',
+            7 => 'color: #9d4f37;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #430000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #60a0b0; font-style: italic;',
+            2 => 'color: #430000;',
+            'MULTI' => 'color: #60a0b0; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #9f0000; font-weight: bold;',
+            1 => 'color: #9f0000; font-weight: bold;',
+            2 => 'color: #9f0000; font-weight: bold;',
+            3 => 'color: #9f0000; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #666666;font-weight: bold;',
+            1 => 'color: #666666;font-weight: bold;',
+            2 => 'color: #000000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #9f0000;',
+            'HARD' => 'color: #9f0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #848484;'
+            ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        // variables
+        0 => '\b(?!(?:PIPE|SEMI|REG3XP\d*)[^a-zA-Z0-9_])[A-Z_][a-zA-Z0-9_]*(?![a-zA-Z0-9_])'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=:-\s)',
+                'DISALLOWED_AFTER' => '(?=\()'
+            ),
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=:-\s)',
+                'DISALLOWED_AFTER' => '(?=\.)'
+            ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?|^&\'"])',
+                'DISALLOWED_AFTER' => '(?=\()'
+            ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?|^&\'"])',
+                'DISALLOWED_AFTER' => '(?=\()'
+            ),
+            5 => array(
+                'DISALLOWED_BEFORE' => '(?|^&\'"])',
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\'"])'
+            ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?|^&\'"])',
+                'DISALLOWED_AFTER' => '(?=\()'
+            ),
+            7 => array(
+                'DISALLOWED_BEFORE' => '(?|^&\'"])',
+                'DISALLOWED_AFTER' => '(?![a-zA-Z0-9_\|%\\-&\'"])'
+            )
+        )
+    ),
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/lolcode.php b/sources/inc/geshi/lolcode.php
new file mode 100644
index 0000000..ab6088b
--- /dev/null
+++ b/sources/inc/geshi/lolcode.php
@@ -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
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/lotusformulas.php b/sources/inc/geshi/lotusformulas.php
new file mode 100644
index 0000000..12257d7
--- /dev/null
+++ b/sources/inc/geshi/lotusformulas.php
@@ -0,0 +1,318 @@
+ 'Lotus Notes @Formulas',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array('REM' => ';'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array (
+            '[ZoomPreview]', '[WorkspaceStackReplicaIcons]',
+            '[WorkspaceProperties]', '[WindowWorkspace]',
+            '[WindowTile]', '[WindowRestore]', '[WindowNext]',
+            '[WindowMinimizeAll]', '[WindowMinimize]', '[WindowMaximizeAll]',
+            '[WindowMaximize]', '[WindowCascade]', '[ViewSwitchForm]',
+            '[ViewShowUnread]', '[ViewShowServerNames]', '[ViewShowSearchBar]',
+            '[ViewShowRuler]', '[ViewShowPageBreaks]', '[ViewShowOnlyUnread]',
+            '[ViewShowOnlySelected]', '[ViewShowOnlySearchResults]',
+            '[ViewShowOnlyCategories]', '[ViewShowObject]',
+            '[ViewShowFieldHelp]', '[ViewRenamePerson]', '[ViewRefreshUnread]',
+            '[ViewRefreshFields]', '[ViewNavigatorsNone]',
+            '[ViewNavigatorsFolders]', '[ViewMoveName]', '[ViewHorizScrollbar]',
+            '[ViewExpandWithChildren]', '[ViewExpandAll]', '[ViewExpand]',
+            '[ViewCollapseAll]', '[ViewCollapse]', '[ViewChange]',
+            '[ViewCertify]', '[ViewBesideFolders]', '[ViewBelowFolders]',
+            '[ViewArrangeIcons]', '[V3EditPrevField]', '[V3EditNextField]',
+            '[UserIDSwitch]', '[UserIDSetPassword]', '[UserIDMergeCopy]',
+            '[UserIDInfo]', '[UserIDEncryptionKeys]', '[UserIDCreateSafeCopy]',
+            '[UserIDClearPassword]', '[UserIDCertificates]',
+            '[ToolsUserLogoff]', '[ToolsSpellCheck]', '[ToolsSmartIcons]',
+            '[ToolsSetupUserSetup]', '[ToolsSetupPorts]', '[ToolsSetupMail]',
+            '[ToolsSetupLocation]', '[ToolsScanUnreadSelected]',
+            '[ToolsScanUnreadPreferred]', '[ToolsScanUnreadChoose]',
+            '[ToolsRunMacro]', '[ToolsRunBackgroundMacros]', '[ToolsReplicate]',
+            '[ToolsRefreshSelectedDocs]', '[ToolsRefreshAllDocs]',
+            '[ToolsMarkSelectedUnread]', '[ToolsMarkSelectedRead]',
+            '[ToolsMarkAllUnread]', '[ToolsMarkAllRead]', '[ToolsHangUp]',
+            '[ToolsCategorize]', '[ToolsCall]', '[TextUnderline]',
+            '[TextSpacingSingle]', '[TextSpacingOneAndaHalf]',
+            '[TextSpacingDouble]', '[TextSetFontSize]', '[TextSetFontFace]',
+            '[TextSetFontColor]', '[TextReduceFont]', '[TextPermanentPen]',
+            '[TextParagraphStyles]', '[TextParagraph]', '[TextOutdent]',
+            '[TextNumbers]', '[TextNormal]', '[TextItalic]', '[TextFont]',
+            '[TextEnlargeFont]', '[TextCycleSpacing]', '[TextBullet]',
+            '[TextBold]', '[TextAlignRight]', '[TextAlignNone]',
+            '[TextAlignLeft]', '[TextAlignFull]', '[TextAlignCenter]',
+            '[SwitchView]', '[SwitchForm]', '[StyleCycleKey]',
+            '[SmartIconsNextSet]', '[SmartIconsFloating]', '[ShowProperties]',
+            '[ShowHidePreviewPane]', '[ShowHideParentPreview]',
+            '[ShowHideLinkPreview]', '[ShowHideIMContactList]',
+            '[SetCurrentLocation]', '[SendInstantMessage]',
+            '[SectionRemoveHeader]', '[SectionProperties]',
+            '[SectionExpandAll]', '[SectionExpand]', '[SectionDefineEditors]',
+            '[SectionCollapseAll]', '[SectionCollapse]', '[RunScheduledAgents]',
+            '[RunAgent]', '[ReplicatorStop]', '[ReplicatorStart]',
+            '[ReplicatorSendReceiveMail]', '[ReplicatorSendMail]',
+            '[ReplicatorReplicateWithServer]', '[ReplicatorReplicateSelected]',
+            '[ReplicatorReplicateNext]', '[ReplicatorReplicateHigh]',
+            '[Replicator]', '[RenameDatabase]', '[RemoveFromFolder]',
+            '[RemoteDebugLotusScript]', '[ReloadWindow]', '[RefreshWindow]',
+            '[RefreshParentNote]', '[RefreshHideFormulas]', '[RefreshFrame]',
+            '[PublishDatabase]', '[PictureProperties]', '[PasteBitmapAsObject]',
+            '[PasteBitmapAsBackground]', '[OpenView]', '[OpenPage]',
+            '[OpenNavigator]', '[OpenInNewWindow]', '[OpenHelpDocument]',
+            '[OpenFrameset]', '[OpenDocument]', '[OpenCalendar]',
+            '[ObjectProperties]', '[ObjectOpen]', '[ObjectDisplayAs]',
+            '[NavPrevUnread]', '[NavPrevSelected]', '[NavPrevMain]',
+            '[NavPrev]', '[NavNextUnread]', '[NavNextSelected]',
+            '[NavNextMain]', '[NavNext]', '[NavigatorTest]',
+            '[NavigatorProperties]', '[NavigateToBacklink]',
+            '[NavigatePrevUnread]', '[NavigatePrevSelected]',
+            '[NavigatePrevMain]', '[NavigatePrevHighlight]', '[NavigatePrev]',
+            '[NavigateNextUnread]', '[NavigateNextSelected]',
+            '[NavigateNextMain]', '[NavigateNextHighlight]', '[NavigateNext]',
+            '[MoveToTrash]', '[MailSendPublicKey]', '[MailSendEncryptionKey]',
+            '[MailSendCertificateRequest]', '[MailSend]', '[MailScanUnread]',
+            '[MailRequestNewPublicKey]', '[MailRequestNewName]',
+            '[MailRequestCrossCert]', '[MailOpen]', '[MailForwardAsAttachment]',
+            '[MailForward]', '[MailComposeMemo]', '[MailAddress]',
+            '[LayoutProperties]', '[LayoutElementSendToBack]',
+            '[LayoutElementProperties]', '[LayoutElementBringToFront]',
+            '[LayoutAddText]', '[LayoutAddGraphic]', '[InsertSubform]',
+            '[HotspotProperties]', '[HotspotClear]', '[HelpUsingDatabase]',
+            '[HelpAboutNotes]', '[HelpAboutDatabase]', '[GoUpLevel]',
+            '[FormTestDocument]', '[FormActions]', '[FolderRename]',
+            '[FolderProperties]', '[FolderMove]', '[FolderExpandWithChildren]',
+            '[FolderExpandAll]', '[FolderExpand]', '[FolderDocuments]',
+            '[FolderCustomize]', '[FolderCollapse]', '[Folder]',
+            '[FindFreeTimeDialog]', '[FileSaveNewVersion]', '[FileSave]',
+            '[FilePrintSetup]', '[FilePrint]', '[FilePageSetup]',
+            '[FileOpenDBRepID]', '[FileOpenDatabase]', '[FileNewReplica]',
+            '[FileNewDatabase]', '[FileImport]', '[FileFullTextUpdate]',
+            '[FileFullTextInfo]', '[FileFullTextDelete]',
+            '[FileFullTextCreate]', '[FileExport]', '[FileExit]',
+            '[FileDatabaseUseServer]', '[FileDatabaseRemove]',
+            '[FileDatabaseInfo]', '[FileDatabaseDelete]', '[FileDatabaseCopy]',
+            '[FileDatabaseCompact]', '[FileDatabaseACL]', '[FileCloseWindow]',
+            '[ExitNotes]', '[Execute]', '[ExchangeUnreadMarks]', '[EmptyTrash]',
+            '[EditUp]', '[EditUntruncate]', '[EditUndo]', '[EditTop]',
+            '[EditTableInsertRowColumn]', '[EditTableFormat]',
+            '[EditTableDeleteRowColumn]', '[EditShowHideHiddenChars]',
+            '[EditSelectByDate]', '[EditSelectAll]', '[EditRight]',
+            '[EditRestoreDocument]', '[EditResizePicture]',
+            '[EditQuoteSelection]', '[EditProfileDocument]', '[EditProfile]',
+            '[EditPrevField]', '[EditPhoneNumbers]', '[EditPasteSpecial]',
+            '[EditPaste]', '[EditOpenLink]', '[EditNextField]',
+            '[EditMakeDocLink]', '[EditLocations]', '[EditLinks]', '[EditLeft]',
+            '[EditInsertText]', '[EditInsertTable]', '[EditInsertPopup]',
+            '[EditInsertPageBreak]', '[EditInsertObject]',
+            '[EditInsertFileAttachment]', '[EditInsertButton]',
+            '[EditIndentFirstLine]', '[EditIndent]', '[EditHorizScrollbar]',
+            '[EditHeaderFooter]', '[EditGotoField]', '[EditFindNext]',
+            '[EditFindInPreview]', '[EditFind]', '[EditEncryptionKeys]',
+            '[EditDown]', '[EditDocument]', '[EditDetach]', '[EditDeselectAll]',
+            '[EditCut]', '[EditCopy]', '[EditClear]', '[EditButton]',
+            '[EditBottom]', '[DiscoverFolders]', '[Directories]',
+            '[DialingRules]', '[DesignViewSelectFormula]', '[DesignViews]',
+            '[DesignViewNewColumn]', '[DesignViewFormFormula]',
+            '[DesignViewEditActions]', '[DesignViewColumnDef]',
+            '[DesignViewAttributes]', '[DesignViewAppendColumn]',
+            '[DesignSynopsis]', '[DesignSharedFields]', '[DesignReplace]',
+            '[DesignRefresh]', '[DesignMacros]', '[DesignIcon]',
+            '[DesignHelpUsingDocument]', '[DesignHelpAboutDocument]',
+            '[DesignFormWindowTitle]', '[DesignFormUseField]',
+            '[DesignFormShareField]', '[DesignForms]', '[DesignFormNewField]',
+            '[DesignFormFieldDef]', '[DesignFormAttributes]',
+            '[DesignDocumentInfo]', '[DebugLotusScript]',
+            '[DatabaseReplSettings]', '[DatabaseDelete]', '[CreateView]',
+            '[CreateTextbox]', '[CreateSubForm]', '[CreateSection]',
+            '[CreateRectangularHotspot]', '[CreateRectangle]',
+            '[CreatePolyline]', '[CreatePolygon]', '[CreateNavigator]',
+            '[CreateLayoutRegion]', '[CreateForm]', '[CreateFolder]',
+            '[CreateEllipse]', '[CreateControlledAccessSection]',
+            '[CreateAgent]', '[CreateAction]', '[CopySelectedAsTable]',
+            '[ComposeWithReference]', '[Compose]', '[CloseWindow]', '[Clear]',
+            '[ChooseFolders]', '[CalendarGoTo]', '[CalendarFormat]',
+            '[AttachmentView]', '[AttachmentProperties]', '[AttachmentLaunch]',
+            '[AttachmentDetachAll]', '[AgentTestRun]', '[AgentSetServerName]',
+            '[AgentRun]', '[AgentLog]', '[AgentEnableDisable]', '[AgentEdit]',
+            '[AdminTraceConnection]', '[AdminStatisticsConfig]',
+            '[AdminSendMailTrace]', '[AdminRemoteConsole]',
+            '[AdminRegisterUser]', '[AdminRegisterServer]',
+            '[AdminRegisterFromFile]', '[AdminOutgoingMail]',
+            '[AdminOpenUsersView]', '[AdminOpenStatistics]',
+            '[AdminOpenServersView]', '[AdminOpenServerLog]',
+            '[AdminOpenGroupsView]', '[AdminOpenCertLog]', '[AdminOpenCatalog]',
+            '[AdminOpenAddressBook]', '[AdminNewOrgUnit]',
+            '[AdminNewOrganization]', '[Administration]',
+            '[AdminIDFileSetPassword]', '[AdminIDFileExamine]',
+            '[AdminIDFileClearPassword]', '[AdminDatabaseQuotas]',
+            '[AdminDatabaseAnalysis]', '[AdminCrossCertifyKey]',
+            '[AdminCrossCertifyIDFile]', '[AdminCreateGroup]', '[AdminCertify]',
+            '[AddToIMContactList]', '[AddDatabaseRepID]', '[AddDatabase]',
+            '[AddBookmark]'
+            ),
+        2 => array(
+            'SELECT', 'FIELD', 'ENVIRONMENT', 'DEFAULT', '@Zone ', '@Yesterday',
+            '@Yes', '@Year', '@Word', '@Wide', '@While', '@Weekday',
+            '@WebDbName', '@ViewTitle', '@ViewShowThisUnread', '@Version',
+            '@VerifyPassword', '@ValidateInternetAddress', '@V4UserAccess',
+            '@V3UserName', '@V2If', '@UserRoles', '@UserPrivileges',
+            '@UserNamesList', '@UserNameLanguage', '@UserName', '@UserAccess',
+            '@UrlQueryString', '@URLOpen', '@URLHistory', '@URLGetHeader',
+            '@URLEncode', '@URLDecode', '@UpperCase', '@UpdateFormulaContext',
+            '@Unique', '@UndeleteDocument', '@Unavailable', '@True', '@Trim',
+            '@Transform', '@ToTime', '@ToNumber', '@Tomorrow', '@Today',
+            '@TimeZoneToText', '@TimeToTextInZone', '@TimeMerge', '@Time',
+            '@ThisValue', '@ThisName', '@TextToTime', '@TextToNumber', '@Text',
+            '@TemplateVersion', '@Tan', '@Sum', '@Success', '@Subset',
+            '@StatusBar', '@Sqrt', '@Soundex', '@Sort', '@Sin', '@Sign',
+            '@SetViewInfo', '@SetTargetFrame', '@SetProfileField',
+            '@SetHTTPHeader', '@SetField', '@SetEnvironment', '@SetDocField',
+            '@Set', '@ServerName', '@ServerAccess', '@Select', '@Second',
+            '@Round', '@RightBack', '@Right', '@Return', '@Responses',
+            '@ReplicaID', '@ReplaceSubstring', '@Replace', '@Repeat',
+            '@RegQueryValue', '@RefreshECL', '@Random', '@ProperCase',
+            '@Prompt', '@Power', '@PostedCommand', '@PolicyIsFieldLocked',
+            '@Platform', '@PickList', '@Pi', '@PasswordQuality', '@Password',
+            '@OrgDir', '@OptimizeMailAddress', '@OpenInNewWindow', '@Now',
+            '@Nothing', '@NoteID', '@No', '@NewLine', '@Narrow', '@NameLookup',
+            '@Name', '@Month', '@Modulo', '@Modified', '@Minute', '@Min',
+            '@MiddleBack', '@Middle', '@Member', '@Max', '@Matches',
+            '@MailSignPreference', '@MailSend', '@MailSavePreference',
+            '@MailEncryptSentPreference', '@MailEncryptSavedPreference',
+            '@MailDbName', '@LowerCase', '@Log', '@Locale', '@Ln', '@Like',
+            '@Length', '@LeftBack', '@Left', '@LDAPServer', '@LaunchApp',
+            '@LanguagePreference', '@Keywords', '@IsVirtualizedDirectory',
+            '@IsValid', '@IsUsingJavaElement', '@IsUnavailable', '@IsTime',
+            '@IsText', '@IsResponseDoc', '@IsNumber', '@IsNull', '@IsNotMember',
+            '@IsNewDoc', '@IsModalHelp', '@IsMember', '@IsExpandable',
+            '@IsError', '@IsEmbeddedInsideWCT', '@IsDocTruncated',
+            '@IsDocBeingSaved', '@IsDocBeingRecalculated', '@IsDocBeingMailed',
+            '@IsDocBeingLoaded', '@IsDocBeingEdited', '@IsDB2', '@IsCategory',
+            '@IsAvailable', '@IsAppInstalled', '@IsAgentEnabled', '@Integer',
+            '@InheritedDocumentUniqueID', '@Implode', '@IfError', '@If',
+            '@Hour', '@HashPassword', '@HardDeleteDocument', '@GetViewInfo',
+            '@GetProfileField', '@GetPortsList', '@GetIMContactListGroupNames',
+            '@GetHTTPHeader', '@GetFocusTable', '@GetField', '@GetDocField',
+            '@GetCurrentTimeZone', '@GetAddressBooks', '@FormLanguage', '@For',
+            '@FontList', '@FloatEq', '@FileDir', '@False', '@Failure',
+            '@Explode', '@Exp', '@Eval', '@Error', '@Environment', '@Ends',
+            '@EnableAlarms', '@Elements', '@EditUserECL', '@EditECL',
+            '@DoWhile', '@Domain', '@DocumentUniqueID', '@DocSiblings',
+            '@DocParentNumber', '@DocOmmittedLength', '@DocNumber', '@DocMark',
+            '@DocLock', '@DocLevel', '@DocLength', '@DocFields',
+            '@DocDescendants', '@DocChildren', '@Do', '@DialogBox',
+            '@DeleteField', '@DeleteDocument', '@DDETerminate', '@DDEPoke',
+            '@DDEInitiate', '@DDEExecute', '@DbTitle', '@DbName', '@DbManager',
+            '@DbLookup', '@DbExists', '@DbCommand', '@DbColumn', '@DB2Schema',
+            '@Day', '@Date', '@Created', '@Count', '@Cos', '@Contains',
+            '@ConfigFile', '@Compare', '@Command', '@ClientType',
+            '@CheckFormulaSyntax', '@CheckAlarms', '@Char', '@Certificate',
+            '@BusinessDays', '@BrowserInfo', '@Begins', '@Author',
+            '@Attachments', '@AttachmentNames', '@AttachmentModifiedTimes',
+            '@AttachmentLengths', '@ATan2', '@ATan', '@ASin', '@Ascii',
+            '@AllDescendants', '@AllChildren', '@All', '@AdminECLIsLocked',
+            '@Adjust', '@AddToFolder', '@ACos', '@Accessed', '@AbstractSimple',
+            '@Abstract', '@Abs'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800000;',
+            2 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000AA;'
+            ),
+        '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(
+        ),
+    'TAB_WIDTH' => 2
+    );
+
+?>
diff --git a/sources/inc/geshi/lotusscript.php b/sources/inc/geshi/lotusscript.php
new file mode 100644
index 0000000..b8b65f2
--- /dev/null
+++ b/sources/inc/geshi/lotusscript.php
@@ -0,0 +1,191 @@
+ 'LotusScript',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array('%REM' => '%END REM'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"' , "|"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array (
+            'Yield', 'Year', 'Xor', 'Write', 'With', 'Width', 'While', 'Wend',
+            'Weekday', 'VarType', 'Variant', 'Val', 'UString', 'UString$',
+            'UseLSX', 'Use', 'Until', 'Unlock', 'Unicode', 'Uni', 'UChr',
+            'UChr$', 'UCase', 'UCase$', 'UBound', 'TypeName', 'Type', 'TRUE',
+            'Trim', 'Trim$', 'Today', 'To', 'TimeValue', 'TimeSerial', 'Timer',
+            'TimeNumber', 'Time', 'Time$', 'Then', 'Text', 'Tan', 'Tab', 'Sub',
+            'StrToken', 'StrToken$', 'StrRightBack', 'StrRightBack$',
+            'StrRight', 'StrRight$', 'StrLeftBack', 'StrLeftBack$', 'StrLeft',
+            'StrLeft$', 'String', 'String$', 'StrConv', 'StrCompare', 'StrComp',
+            'Str', 'Str$', 'Stop', 'Step', 'Static', 'Sqr', 'Split', 'Spc',
+            'Space', 'Space$', 'Sleep', 'Single', 'Sin', 'Shell', 'Shared',
+            'Sgn', 'SetFileAttr', 'SetAttr', 'Set', 'SendKeys', 'Select',
+            'Seek', 'Second', 'RTrim', 'RTrim$', 'RSet', 'Round', 'Rnd',
+            'RmDir', 'RightC', 'RightC$', 'RightBP', 'RightBP$', 'RightB',
+            'RightB$', 'Right', 'Right$', 'Return', 'Resume', 'Reset',
+            'Replace', 'Remove', 'Rem', 'ReDim', 'Read', 'Randomize',
+            'Random', 'Put', 'Public', 'Property', 'Private', 'Print',
+            'Preserve', 'Pitch', 'PI', 'Output', 'Or', 'Option', 'Open', 'On',
+            'Oct', 'Oct$', 'NULL', 'Now', 'NOTHING', 'Not', 'NoPitch', 'NoCase',
+            'Next', 'New', 'Name', 'MsgBox', 'Month', 'Mod', 'MkDir', 'Minute',
+            'MidC', 'MidC$', 'MidBP', 'MidBP$', 'MidB', 'MidB$', 'Mid', 'Mid$',
+            'MessageBox', 'Me', 'LTrim', 'LTrim$', 'LSServer', 'LSI_Info',
+            'LSet', 'Loop', 'Long', 'Log', 'LOF', 'Lock', 'LOC', 'LMBCS',
+            'ListTag', 'List', 'Line', 'Like', 'Lib', 'Let', 'LenC', 'LenBP',
+            'LenB', 'Len', 'LeftC', 'LeftC$', 'LeftBP', 'LeftBP$', 'LeftB',
+            'LeftB$', 'Left', 'Left$', 'LCase', 'LCase$', 'LBound', 'Kill',
+            'Join', 'IsUnknown', 'IsScalar', 'IsObject', 'IsNumeric', 'IsNull',
+            'IsList', 'IsEmpty', 'IsElement', 'IsDate', 'IsArray', 'IsA', 'Is',
+            'Integer', 'Int', 'InStrC', 'InStrBP', 'InStrB', 'InStr', 'InputBP',
+            'InputBP$', 'InputBox', 'InputBox$', 'InputB', 'InputB$', 'Input',
+            'Input$', 'In', 'IMSetMode', 'Implode', 'Implode$', 'Imp',
+            'IMEStatus', 'If', 'Hour', 'Hex', 'Hex$', 'Goto', 'GoSub',
+            'GetThreadInfo', 'GetFileAttr', 'GetAttr', 'Get', 'Function',
+            'FullTrim', 'From', 'FreeFile', 'Fraction', 'Format', 'Format$',
+            'ForAll', 'For', 'Fix', 'FileLen', 'FileDateTime', 'FileCopy',
+            'FileAttr', 'FALSE', 'Explicit', 'Exp', 'Exit', 'Execute', 'Event',
+            'Evaluate', 'Error', 'Error$', 'Err', 'Erl', 'Erase', 'Eqv', 'EOF',
+            'Environ', 'Environ$', 'End', 'ElseIf', 'Else', 'Double', 'DoEvents',
+            'Do', 'Dir', 'Dir$', 'Dim', 'DestroyLock', 'Delete', 'DefVar',
+            'DefStr', 'DefSng', 'DefLng', 'DefInt', 'DefDbl', 'DefCur',
+            'DefByte', 'DefBool', 'Declare', 'Day', 'DateValue', 'DateSerial',
+            'DateNumber', 'Date', 'Date$', 'DataType', 'CVDate', 'CVar',
+            'Currency', 'CurDrive', 'CurDrive$', 'CurDir', 'CurDir$', 'CStr',
+            'CSng', 'CreateLock', 'Cos', 'Const', 'Compare', 'Command',
+            'Command$', 'CodeUnlock', 'CodeLockCheck', 'CodeLock', 'Close',
+            'CLng', 'Class', 'CInt', 'Chr', 'Chr$', 'ChDrive', 'ChDir', 'CDbl',
+            'CDat', 'CCur', 'CByte', 'CBool', 'Case', 'Call', 'ByVal', 'Byte',
+            'Boolean', 'Bind', 'Binary', 'Bin', 'Bin$', 'Beep', 'Base', 'Atn2',
+            'Atn', 'ASin', 'Asc', 'As', 'ArrayUnique', 'ArrayReplace',
+            'ArrayGetIndex', 'ArrayAppend', 'Append', 'AppActivate', 'Any',
+            'And', 'Alias', 'ActivateApp', 'ACos', 'Access', 'Abs', '%Include',
+            '%If', '%END', '%ElseIf', '%Else'
+            ),
+        2 => array (
+            'NotesXSLTransformer', 'NotesXMLProcessor', 'NotesViewNavigator',
+            'NotesViewEntryCollection', 'NotesViewEntry', 'NotesViewColumn',
+            'NotesView', 'NotesUIWorkspace', 'NotesUIView', 'NotesUIScheduler',
+            'NotesUIDocument', 'NotesUIDatabase', 'NotesTimer', 'NotesStream',
+            'NotesSession', 'NotesSAXParser', 'NotesSAXException',
+            'NotesSAXAttributeList', 'NotesRichTextTable', 'NotesRichTextTab',
+            'NotesRichTextStyle', 'NotesRichTextSection', 'NotesRichTextRange',
+            'NotesRichTextParagraphStyle', 'NotesRichTextNavigator',
+            'NotesRichTextItem', 'NotesRichTextDocLink',
+            'NotesReplicationEntry', 'NotesReplication', 'NotesRegistration',
+            'NotesOutlineEntry', 'NotesOutline', 'NotesNoteCollection',
+            'NotesNewsLetter', 'NotesName', 'NotesMIMEHeader',
+            'NotesMIMEEntity', 'NotesLog', 'NotesItem', 'NotesInternational',
+            'NotesForm', 'NotesEmbeddedObject', 'NotesDXLImporter',
+            'NotesDXLExporter', 'NotesDOMXMLDeclNode', 'NotesDOMTextNode',
+            'NotesDOMProcessingInstructionNode', 'NotesDOMParser',
+            'NotesDOMNotationNode', 'NotesDOMNodeList', 'NotesDOMNode',
+            'NotesDOMNamedNodeMap', 'NotesDOMEntityReferenceNode',
+            'NotesDOMEntityNode', 'NotesDOMElementNode',
+            'NotesDOMDocumentTypeNode', 'NotesDOMDocumentNode',
+            'NotesDOMDocumentFragmentNode', 'NotesDOMCommentNode',
+            'NotesDOMCharacterDataNote', 'NotesDOMCDATASectionNode',
+            'NotesDOMAttributeNode', 'NotesDocumentCollection', 'NotesDocument',
+            'NotesDbDirectory', 'NotesDateTime', 'NotesDateRange',
+            'NotesDatabase', 'NotesColorObject', 'NotesAgent',
+            'NotesAdministrationProcess', 'NotesACLEntry', 'NotesACL',
+            'Navigator', 'Field', 'Button'
+            )
+        ) ,
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000EE;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #000000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000AA;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #006600;'
+            ),
+        '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(
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
diff --git a/sources/inc/geshi/lscript.php b/sources/inc/geshi/lscript.php
new file mode 100644
index 0000000..298af61
--- /dev/null
+++ b/sources/inc/geshi/lscript.php
@@ -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' => '(?<=\.)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/lsl2.php b/sources/inc/geshi/lsl2.php
new file mode 100644
index 0000000..f80cf4f
--- /dev/null
+++ b/sources/inc/geshi/lsl2.php
@@ -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(
+        )
+);
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/lua.php b/sources/inc/geshi/lua.php
new file mode 100644
index 0000000..8a09ba2
--- /dev/null
+++ b/sources/inc/geshi/lua.php
@@ -0,0 +1,177 @@
+ 'Lua',
+    'COMMENT_SINGLE' => array(1 => "--"),
+    'COMMENT_MULTI' => array('--[[' => ']]'),
+    'COMMENT_REGEXP' => array(2 => '/\[(=*)\[.*?\]\1\]/s'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[\\\\abfnrtv\'\"]#i",
+        //Octal Char Specs
+        2 => "#\\\\\\d{1,3}#"
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_INT_CSTYLE | 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','do','else','elseif','end','for','function','if',
+            'local','repeat','return','then','until','while'
+            ),
+        2 => array(
+            'and','in','not','or'
+            ),
+        3 => array(
+            '_VERSION','assert','collectgarbage','dofile','error','gcinfo','loadfile','loadstring',
+            'print','tonumber','tostring','type','unpack',
+            '_ALERT','_ERRORMESSAGE','_INPUT','_PROMPT','_OUTPUT',
+            '_STDERR','_STDIN','_STDOUT','call','dostring','foreach','foreachi','getn','globals','newtype',
+            'rawget','rawset','require','sort','tinsert','tremove',
+            'abs','acos','asin','atan','atan2','ceil','cos','deg','exp',
+            'floor','format','frexp','gsub','ldexp','log','log10','max','min','mod','rad','random','randomseed',
+            'sin','sqrt','strbyte','strchar','strfind','strlen','strlower','strrep','strsub','strupper','tan',
+            'openfile','closefile','readfrom','writeto','appendto',
+            'remove','rename','flush','seek','tmpfile','tmpname','read','write',
+            'clock','date','difftime','execute','exit','getenv','setlocale','time',
+            '_G','getfenv','getmetatable','ipairs','loadlib','next','pairs','pcall',
+            'rawegal','setfenv','setmetatable','xpcall',
+            'string.byte','string.char','string.dump','string.find','string.len',
+            'string.lower','string.rep','string.sub','string.upper','string.format','string.gfind','string.gsub',
+            'table.concat','table.foreach','table.foreachi','table.getn','table.sort','table.insert','table.remove','table.setn',
+            'math.abs','math.acos','math.asin','math.atan','math.atan2','math.ceil','math.cos','math.deg','math.exp',
+            'math.floor','math.frexp','math.ldexp','math.log','math.log10','math.max','math.min','math.mod',
+            'math.pi','math.rad','math.random','math.randomseed','math.sin','math.sqrt','math.tan',
+            'coroutine.create','coroutine.resume','coroutine.status',
+            'coroutine.wrap','coroutine.yield',
+            'io.close','io.flush','io.input','io.lines','io.open','io.output','io.read','io.tmpfile','io.type','io.write',
+            'io.stdin','io.stdout','io.stderr',
+            'os.clock','os.date','os.difftime','os.execute','os.exit','os.getenv','os.remove','os.rename',
+            'os.setlocale','os.time','os.tmpname',
+            'string','table','math','coroutine','io','os','debug'
+            ),
+        4 => array(
+            'nil', 'false', 'true'
+            ),
+        5 => array(
+            'Nil', 'Boolean', 'Number', 'String', 'Userdata', 'Thread', 'Table'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '/', '%', '^', '#',
+        '==', '~=', '<=', '>=', '<', '>', '=',
+        '(', ')', '{', '}', '[', ']',
+        ';', ':', ',', '.', '..', '...'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #aa9900; font-weight: bold;',
+            2 => 'color: #aa9900; font-weight: bold;',
+            3 => 'color: #0000aa;',
+            4 => 'color: #aa9900;',
+            5 => 'color: #aa9900;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #ff0000;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff6666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #aa9900;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/m68k.php b/sources/inc/geshi/m68k.php
new file mode 100644
index 0000000..9832157
--- /dev/null
+++ b/sources/inc/geshi/m68k.php
@@ -0,0 +1,143 @@
+ 'Motorola 68000 Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'adc','add','ais','aix','and','asl','asr','bcc','bclr','bcs','beq',
+            'bge','bgt','bhcc','bhcs','bhi','bhs','bih','bil','bit','ble','blo',
+            'bls','blt','bmc','bmi','bms','bne','bpl','bra','brclr','brn',
+            'brset','bset','bsr','cbeq','clc','cli','clr','cmp','com','cphx',
+            'cpx','daa','dbnz','dec','div','eor','inc','jmp','jsr','lda','ldhx',
+            'ldx','lsl','lsr','mov','mul','neg','nop','nsa','ora','psha','pshh',
+            'pshx','pula','pulh','pulx','rol','ror','rsp','rti','rts','sbc',
+            'sec','sei','sta','sthx','stop','stx','sub','swi','tap','tax','tpa',
+            'tst','tsx','txa','txs','wait'
+        ),
+        /*registers*/
+        2 => array(
+            'a','h','x',
+            'hx','sp'
+            ),
+        /*Directive*/
+        3 => array(
+            '#define','#endif','#else','#ifdef','#ifndef','#include','#undef',
+            '.db','.dd','.df','.dq','.dt','.dw','.end','.org','equ'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight:bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #dd22dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #22bbff;',
+            1 => 'color: #22bbff;',
+            2 => 'color: #993333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '#?0[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '\%[01]{1,64}[bB]',
+        //Labels
+        2 => '^[_a-zA-Z][_a-zA-Z0-9]*?\:'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
+
+?>
diff --git a/sources/inc/geshi/magiksf.php b/sources/inc/geshi/magiksf.php
new file mode 100644
index 0000000..612e160
--- /dev/null
+++ b/sources/inc/geshi/magiksf.php
@@ -0,0 +1,193 @@
+ null,
+    'LANG_NAME' => 'MagikSF',
+    'COMMENT_SINGLE' => array(1 => '##', 2 => '#%', 3 => '#'),
+    'COMMENT_MULTI' => array("_pragma(" => ")"),
+    //Multiline-continued single-line comments
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '_block', '_endblock', '_proc', '_endproc', '_loop', '_endloop',
+            '_method', '_endmethod',
+            '_protect', '_endprotect', '_protection', '_locking',
+            '_continue',
+            ),
+        2 => array(
+            '_self', '_thisthread', '_pragma', '_private', '_abstract',
+            '_local', '_global', '_dynamic', '_package', '_constant',
+            '_import', '_iter', '_lock', '_optional', '_recursive', '_super'
+            ),
+        3 => array(
+            '_if', '_endif', '_then', '_else', '_elif', '_orif', '_andif', '_for', '_over',
+            '_try', '_endtry', '_when', '_throw', '_catch', '_endcatch', '_handling',
+            '_finally', '_loopbody', '_return', '_leave', '_with'
+            ),
+        4 => array(
+            '_false', '_true', '_maybe', '_unset', '_no_way'
+            ),
+        5 => array(
+            '_mod', '_div', '_or', '_and', '_cf', '_is', '_isnt', '_not', '_gather', '_scatter',
+            '_allresults', '_clone', '_xor'
+            ),
+        6 => array(
+            'def_slotted_exemplar', 'write_string', 'write', 'condition',
+            'record_transaction', 'gis_program_manager', 'perform', 'define_shared_constant',
+            'property_list', 'rope', 'def_property', 'def_mixin'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '**',
+        '=', '<', '>', '<<', '>>',
+        ',', '$',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #ff3f3f;',
+            3 => 'color: #3f7f3f; font-weight: bold;',
+            4 => 'color: #cc66cc;',
+            5 => 'color: #ff3fff; font-weight: bold;',
+            6 => 'font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #339933; font-weight: bold;',
+            2 => 'color: #993333;',
+            3 => 'color: #339933;',
+            'MULTI' => 'color: #7f7f7f; font-style: italic',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #ff3f3f;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #ff3f3f;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #3f3fff;',
+            2 => 'color: #3f3fff;',
+            3 => 'color: #cc66cc;',
+            4 => 'color: #7f3f7f; font-style: italic;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        1 => array(
+            GESHI_SEARCH => '\b[a-zA-Z0-9_]+:', // package identifiers
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => ':(?:[a-zA-Z0-9!?_]+|(?:[].*?[]))*', //symbols
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '%space|%tab|%newline|%.', //characters
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => '@(?:[a-zA-Z0-9!?_]+|(?:[].*?[]))*', //symbols
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/make.php b/sources/inc/geshi/make.php
new file mode 100644
index 0000000..885fa17
--- /dev/null
+++ b/sources/inc/geshi/make.php
@@ -0,0 +1,151 @@
+
+ * Copyright: (c) 2008 Neil Bird
+ * Release Version: 1.0.8.11
+ * 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 --git a/sources/inc/geshi/mapbasic.php b/sources/inc/geshi/mapbasic.php
new file mode 100644
index 0000000..8859c48
--- /dev/null
+++ b/sources/inc/geshi/mapbasic.php
@@ -0,0 +1,908 @@
+ 'MapBasic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+/*
+        1 - Statements + Clauses + Data Types + Logical Operators, Geographical Operators + SQL
+        2 - Special Procedures
+        3 - Functions
+        4 - Constants
+        5 - Extended keywords (case sensitive)
+*/
+        1 => array(
+            'Add', 'Alias', 'All', 'Alter', 'And', 'Any', 'Application', 'Arc',
+            'Area', 'As', 'AutoLabel', 'Bar', 'Beep', 'Begin', 'Bind',
+            'Browse', 'Brush', 'BrushPicker', 'Button', 'ButtonPad',
+            'ButtonPads', 'BY', 'Call', 'CancelButton', 'Cartographic', 'Case',
+            'CharSet', 'Check', 'CheckBox', 'Clean', 'Close', 'Collection',
+            'Column', 'Combine', 'Command', 'Commit', 'Connection',
+            'ConnectionNumber', 'Contains', 'Continue', 'Control', 'CoordSys',
+            'Create', 'Cutter', 'Date', 'Datum', 'DDEExecute', 'DDEPoke',
+            'DDETerminate', 'DDETerminateAll', 'Declare', 'Default', 'Define',
+            'Delete', 'Dialog', 'Digitizer', 'Dim', 'Disaggregate',
+            'Disconnect', 'Distance', 'Do', 'Document', 'DocumentWindow',
+            'Drag', 'Drop', 'EditText', 'Ellipse', 'Enclose', 'End', 'Entire',
+            'Entirely', 'Erase', 'Error', 'Event', 'Exit', 'Export',
+            'Farthest', 'Fetch', 'File', 'Find', 'Float', 'FME', 'Font',
+            'FontPicker', 'For', 'Format', 'Frame', 'From', 'Function',
+            'Geocode', 'Get', 'Global', 'Goto', 'Graph', 'Grid', 'GROUP',
+            'GroupBox', 'Handler', 'If', 'Import', 'In', 'Include', 'Index',
+            'Info', 'Input', 'Insert', 'Integer', 'Intersect', 'Intersects',
+            'INTO', 'Isogram', 'Item', 'Kill', 'Layout', 'Legend', 'Line',
+            'Link', 'ListBox', 'Logical', 'Loop', 'Map', 'Map3D', 'MapInfo',
+            'MapInfoDialog', 'Menu', 'Merge', 'Metadata', 'Method', 'Mod',
+            'Move', 'MultiListBox', 'MultiPoint', 'MWS', 'Nearest', 'Next',
+            'NOSELECT', 'Not', 'Note', 'Object', 'Objects', 'Offset',
+            'OKButton', 'OnError', 'Open', 'Or', 'ORDER', 'Overlay', 'Pack',
+            'Paper', 'Part', 'Partly', 'Pen', 'PenPicker', 'Pline', 'Point',
+            'PopupMenu', 'Preserve', 'Print', 'PrintWin', 'PrismMap',
+            'Processing', 'Program', 'ProgressBar', 'ProgressBars', 'Put',
+            'RadioGroup', 'Randomize', 'Ranges', 'Rect', 'ReDim',
+            'Redistricter', 'Refresh', 'Region', 'Register', 'Relief',
+            'Reload', 'Remove', 'Rename', 'Report', 'Reproject', 'Resolution',
+            'Resume', 'Rollback', 'RoundRect', 'RowID', 'Run', 'Save', 'Seek',
+            'Select', 'Selection', 'Server', 'Set', 'Shade', 'SmallInt',
+            'Snap', 'Split', 'StaticText', 'StatusBar', 'Stop', 'String',
+            'Style', 'Styles', 'Sub', 'Symbol', 'SymbolPicker', 'Symbols',
+            'Table', 'Target', 'Terminate', 'Text', 'Then', 'Threshold',
+            'Timeout', 'To', 'Transaction', 'Transform', 'Type', 'UnDim',
+            'Units', 'Unlink', 'Update', 'Using', 'VALUES', 'Version',
+            'Versioning', 'Wend', 'WFS', 'WHERE', 'While', 'Window', 'Within',
+            'Workspace', 'Write'
+            ),
+        2 => array(
+            'EndHandler', 'ForegroundTaskSwitchHandler', 'Main',
+            'RemoteMapGenHandler', 'RemoteMsgHandler', 'SelChangedHandler',
+            'ToolHandler', 'WinChangedHandler', 'WinClosedHandler',
+            'WinFocusChangedHandler'
+            ),
+        3 => array(
+            'Abs', 'Acos', 'ApplicationDirectory$', 'AreaOverlap', 'Asc',
+            'Asin', 'Ask', 'Atn', 'Avg', 'Buffer', 'ButtonPadInfo',
+            'CartesianArea', 'CartesianBuffer', 'CartesianConnectObjects',
+            'CartesianDistance', 'CartesianObjectDistance',
+            'CartesianObjectLen', 'CartesianOffset', 'CartesianOffsetXY',
+            'CartesianPerimeter', 'Centroid', 'CentroidX', 'CentroidY',
+            'ChooseProjection$', 'Chr$', 'ColumnInfo', 'CommandInfo',
+            'ConnectObjects', 'ControlPointInfo', 'ConvertToPline',
+            'ConvertToRegion', 'ConvexHull', 'CoordSysName$', 'Cos', 'Count',
+            'CreateCircle', 'CreateLine', 'CreatePoint', 'CreateText',
+            'CurDate', 'CurrentBorderPen', 'CurrentBrush', 'CurrentFont',
+            'CurrentLinePen', 'CurrentPen', 'CurrentSymbol', 'DateWindow',
+            'Day', 'DDEInitiate', 'DDERequest$', 'DeformatNumber$', 'EOF',
+            'EOT', 'EPSGToCoordSysString$', 'Err', 'Error$', 'Exp',
+            'ExtractNodes', 'FileAttr', 'FileExists', 'FileOpenDlg',
+            'FileSaveAsDlg', 'Fix', 'Format$', 'FormatDate$', 'FormatNumber$',
+            'FrontWindow', 'GeocodeInfo', 'GetFolderPath$', 'GetGridCellValue',
+            'GetMetadata$', 'GetSeamlessSheet', 'GridTableInfo',
+            'HomeDirectory$', 'InStr', 'Int', 'IntersectNodes',
+            'IsGridCellNull', 'IsogramInfo', 'IsPenWidthPixels',
+            'LabelFindByID', 'LabelFindFirst', 'LabelFindNext', 'LabelInfo',
+            'LayerInfo', 'LCase$', 'Left$', 'LegendFrameInfo', 'LegendInfo',
+            'LegendStyleInfo', 'Len', 'Like', 'LocateFile$', 'LOF', 'Log',
+            'LTrim$', 'MakeBrush', 'MakeCustomSymbol', 'MakeFont',
+            'MakeFontSymbol', 'MakePen', 'MakeSymbol', 'Map3DInfo',
+            'MapperInfo', 'Max', 'Maximum', 'MBR', 'MenuItemInfoByHandler',
+            'MenuItemInfoByID', 'MGRSToPoint', 'MICloseContent',
+            'MICloseFtpConnection', 'MICloseFtpFileFind',
+            'MICloseHttpConnection', 'MICloseHttpFile', 'MICloseSession',
+            'MICreateSession', 'MICreateSessionFull', 'Mid$', 'MidByte$',
+            'MIErrorDlg', 'MIFindFtpFile', 'MIFindNextFtpFile', 'MIGetContent',
+            'MIGetContentBuffer', 'MIGetContentLen', 'MIGetContentString',
+            'MIGetContentToFile', 'MIGetContentType',
+            'MIGetCurrentFtpDirectory', 'MIGetErrorCode', 'MIGetErrorMessage',
+            'MIGetFileURL', 'MIGetFtpConnection', 'MIGetFtpFile',
+            'MIGetFtpFileFind', 'MIGetFtpFileName', 'MIGetHttpConnection',
+            'MIIsFtpDirectory', 'MIIsFtpDots', 'Min', 'Minimum',
+            'MIOpenRequest', 'MIOpenRequestFull', 'MIParseURL', 'MIPutFtpFile',
+            'MIQueryInfo', 'MIQueryInfoStatusCode', 'MISaveContent',
+            'MISendRequest', 'MISendSimpleRequest', 'MISetCurrentFtpDirectory',
+            'MISetSessionTimeout', 'MIXmlAttributeListDestroy',
+            'MIXmlDocumentCreate', 'MIXmlDocumentDestroy',
+            'MIXmlDocumentGetNamespaces', 'MIXmlDocumentGetRootNode',
+            'MIXmlDocumentLoad', 'MIXmlDocumentLoadXML',
+            'MIXmlDocumentLoadXMLString', 'MIXmlDocumentSetProperty',
+            'MIXmlGetAttributeList', 'MIXmlGetChildList',
+            'MIXmlGetNextAttribute', 'MIXmlGetNextNode', 'MIXmlNodeDestroy',
+            'MIXmlNodeGetAttributeValue', 'MIXmlNodeGetFirstChild',
+            'MIXmlNodeGetName', 'MIXmlNodeGetParent', 'MIXmlNodeGetText',
+            'MIXmlNodeGetValue', 'MIXmlNodeListDestroy', 'MIXmlSCDestroy',
+            'MIXmlSCGetLength', 'MIXmlSCGetNamespace', 'MIXmlSelectNodes',
+            'MIXmlSelectSingleNode', 'Month', 'NumAllWindows', 'NumberToDate',
+            'NumCols', 'NumTables', 'NumWindows', 'ObjectDistance',
+            'ObjectGeography', 'ObjectInfo', 'ObjectLen', 'ObjectNodeHasM',
+            'ObjectNodeHasZ', 'ObjectNodeM', 'ObjectNodeX', 'ObjectNodeY',
+            'ObjectNodeZ', 'OffsetXY', 'Overlap', 'OverlayNodes',
+            'PathToDirectory$', 'PathToFileName$', 'PathToTableName$',
+            'PenWidthToPoints', 'Perimeter', 'PointsToPenWidth',
+            'PointToMGRS$', 'PrismMapInfo', 'ProgramDirectory$', 'Proper$',
+            'ProportionOverlap', 'RasterTableInfo', 'ReadControlValue',
+            'RegionInfo', 'RemoteQueryHandler', 'RGB', 'Right$', 'Rnd',
+            'Rotate', 'RotateAtPoint', 'Round', 'RTrim$', 'SearchInfo',
+            'SearchPoint', 'SearchRect', 'SelectionInfo', 'Server_ColumnInfo',
+            'Server_Connect', 'Server_ConnectInfo', 'Server_DriverInfo',
+            'Server_EOT', 'Server_Execute', 'Server_GetODBCHConn',
+            'Server_GetODBCHStmt', 'Server_NumCols', 'Server_NumDrivers',
+            'SessionInfo', 'Sgn', 'Sin', 'Space$', 'SphericalArea',
+            'SphericalConnectObjects', 'SphericalDistance',
+            'SphericalObjectDistance', 'SphericalObjectLen', 'SphericalOffset',
+            'SphericalOffsetXY', 'SphericalPerimeter', 'Sqr', 'Str$',
+            'String$', 'StringCompare', 'StringCompareIntl', 'StringToDate',
+            'StyleAttr', 'Sum', 'SystemInfo', 'TableInfo', 'Tan',
+            'TempFileName$', 'TextSize', 'Time', 'Timer', 'TriggerControl',
+            'TrueFileName$', 'UBound', 'UCase$', 'UnitAbbr$', 'UnitName$',
+            'Val', 'Weekday', 'WindowID', 'WindowInfo', 'WtAvg', 'Year'
+            ),
+        4 => array(
+            'BLACK', 'BLUE', 'BRUSH_BACKCOLOR', 'BRUSH_FORECOLOR',
+            'BRUSH_PATTERN', 'BTNPAD_INFO_FLOATING', 'BTNPAD_INFO_NBTNS',
+            'BTNPAD_INFO_WIDTH', 'BTNPAD_INFO_WINID', 'BTNPAD_INFO_X',
+            'BTNPAD_INFO_Y', 'CLS', 'CMD_INFO_CTRL', 'CMD_INFO_CUSTOM_OBJ',
+            'CMD_INFO_DLG_DBL', 'CMD_INFO_DLG_OK', 'CMD_INFO_EDIT_ASK',
+            'CMD_INFO_EDIT_DISCARD', 'CMD_INFO_EDIT_SAVE',
+            'CMD_INFO_EDIT_STATUS', 'CMD_INFO_EDIT_TABLE', 'CMD_INFO_FIND_RC',
+            'CMD_INFO_FIND_ROWID', 'CMD_INFO_HL_FILE_NAME',
+            'CMD_INFO_HL_LAYER_ID', 'CMD_INFO_HL_ROWID',
+            'CMD_INFO_HL_TABLE_NAME', 'CMD_INFO_HL_WINDOW_ID',
+            'CMD_INFO_INTERRUPT', 'CMD_INFO_MENUITEM', 'CMD_INFO_MSG',
+            'CMD_INFO_ROWID', 'CMD_INFO_SELTYPE', 'CMD_INFO_SHIFT',
+            'CMD_INFO_STATUS', 'CMD_INFO_TASK_SWITCH', 'CMD_INFO_TOOLBTN',
+            'CMD_INFO_WIN', 'CMD_INFO_X', 'CMD_INFO_X2', 'CMD_INFO_XCMD',
+            'CMD_INFO_Y', 'CMD_INFO_Y2', 'COL_INFO_DECPLACES',
+            'COL_INFO_EDITABLE', 'COL_INFO_INDEXED', 'COL_INFO_NAME',
+            'COL_INFO_NUM', 'COL_INFO_TYPE', 'COL_INFO_WIDTH', 'COL_TYPE_CHAR',
+            'COL_TYPE_DATE', 'COL_TYPE_DATETIME', 'COL_TYPE_DECIMAL',
+            'COL_TYPE_FLOAT', 'COL_TYPE_GRAPHIC', 'COL_TYPE_INTEGER',
+            'COL_TYPE_LOGICAL', 'COL_TYPE_SMALLINT', 'COL_TYPE_TIME', 'CYAN',
+            'DATE_WIN_CURPROG', 'DATE_WIN_SESSION', 'DEG_2_RAD',
+            'DICTIONARY_ADDRESS_ONLY', 'DICTIONARY_ALL',
+            'DICTIONARY_PREFER_ADDRESS', 'DICTIONARY_PREFER_USER',
+            'DICTIONARY_USER_ONLY', 'DM_CUSTOM_CIRCLE', 'DM_CUSTOM_ELLIPSE',
+            'DM_CUSTOM_LINE', 'DM_CUSTOM_POINT', 'DM_CUSTOM_POLYGON',
+            'DM_CUSTOM_POLYLINE', 'DM_CUSTOM_RECT', 'DMPAPER_10X11',
+            'DMPAPER_10X14', 'DMPAPER_11X17', 'DMPAPER_12X11', 'DMPAPER_15X11',
+            'DMPAPER_9X11', 'DMPAPER_A_PLUS', 'DMPAPER_A2', 'DMPAPER_A3',
+            'DMPAPER_A3_EXTRA', 'DMPAPER_A3_EXTRA_TRANSVERSE',
+            'DMPAPER_A3_ROTATED', 'DMPAPER_A3_TRANSVERSE', 'DMPAPER_A4',
+            'DMPAPER_A4_EXTRA', 'DMPAPER_A4_PLUS', 'DMPAPER_A4_ROTATED',
+            'DMPAPER_A4_TRANSVERSE', 'DMPAPER_A4SMALL', 'DMPAPER_A5',
+            'DMPAPER_A5_EXTRA', 'DMPAPER_A5_ROTATED', 'DMPAPER_A5_TRANSVERSE',
+            'DMPAPER_A6', 'DMPAPER_A6_ROTATED', 'DMPAPER_B_PLUS', 'DMPAPER_B4',
+            'DMPAPER_B4_JIS_ROTATED', 'DMPAPER_B5', 'DMPAPER_B5_EXTRA',
+            'DMPAPER_B5_JIS_ROTATED', 'DMPAPER_B5_TRANSVERSE',
+            'DMPAPER_B6_JIS', 'DMPAPER_B6_JIS_ROTATED', 'DMPAPER_CSHEET',
+            'DMPAPER_DBL_JAPANESE_POSTCARD',
+            'DMPAPER_DBL_JAPANESE_POSTCARD_ROTATED', 'DMPAPER_DSHEET',
+            'DMPAPER_ENV_10', 'DMPAPER_ENV_11', 'DMPAPER_ENV_12',
+            'DMPAPER_ENV_14', 'DMPAPER_ENV_9', 'DMPAPER_ENV_B4',
+            'DMPAPER_ENV_B5', 'DMPAPER_ENV_B6', 'DMPAPER_ENV_C3',
+            'DMPAPER_ENV_C4', 'DMPAPER_ENV_C5', 'DMPAPER_ENV_C6',
+            'DMPAPER_ENV_C65', 'DMPAPER_ENV_DL', 'DMPAPER_ENV_INVITE',
+            'DMPAPER_ENV_ITALY', 'DMPAPER_ENV_MONARCH', 'DMPAPER_ENV_PERSONAL',
+            'DMPAPER_ESHEET', 'DMPAPER_EXECUTIVE',
+            'DMPAPER_FANFOLD_LGL_GERMAN', 'DMPAPER_FANFOLD_STD_GERMAN',
+            'DMPAPER_FANFOLD_US', 'DMPAPER_FIRST', 'DMPAPER_FOLIO',
+            'DMPAPER_ISO_B4', 'DMPAPER_JAPANESE_POSTCARD',
+            'DMPAPER_JAPANESE_POSTCARD_ROTATED', 'DMPAPER_JENV_CHOU3',
+            'DMPAPER_JENV_CHOU3_ROTATED', 'DMPAPER_JENV_CHOU4',
+            'DMPAPER_JENV_CHOU4_ROTATED', 'DMPAPER_JENV_KAKU2',
+            'DMPAPER_JENV_KAKU2_ROTATED', 'DMPAPER_JENV_KAKU3',
+            'DMPAPER_JENV_KAKU3_ROTATED', 'DMPAPER_JENV_YOU4',
+            'DMPAPER_JENV_YOU4_ROTATED', 'DMPAPER_LEDGER', 'DMPAPER_LEGAL',
+            'DMPAPER_LEGAL_EXTRA', 'DMPAPER_LETTER', 'DMPAPER_LETTER_EXTRA',
+            'DMPAPER_LETTER_EXTRA_TRANSVERSE', 'DMPAPER_LETTER_PLUS',
+            'DMPAPER_LETTER_ROTATED', 'DMPAPER_LETTER_TRANSVERSE',
+            'DMPAPER_LETTERSMALL', 'DMPAPER_NOTE', 'DMPAPER_P16K',
+            'DMPAPER_P16K_ROTATED', 'DMPAPER_P32K', 'DMPAPER_P32K_ROTATED',
+            'DMPAPER_P32KBIG', 'DMPAPER_P32KBIG_ROTATED', 'DMPAPER_PENV_1',
+            'DMPAPER_PENV_1_ROTATED', 'DMPAPER_PENV_10',
+            'DMPAPER_PENV_10_ROTATED', 'DMPAPER_PENV_2',
+            'DMPAPER_PENV_2_ROTATED', 'DMPAPER_PENV_3',
+            'DMPAPER_PENV_3_ROTATED', 'DMPAPER_PENV_4',
+            'DMPAPER_PENV_4_ROTATED', 'DMPAPER_PENV_5',
+            'DMPAPER_PENV_5_ROTATED', 'DMPAPER_PENV_6',
+            'DMPAPER_PENV_6_ROTATED', 'DMPAPER_PENV_7',
+            'DMPAPER_PENV_7_ROTATED', 'DMPAPER_PENV_8',
+            'DMPAPER_PENV_8_ROTATED', 'DMPAPER_PENV_9',
+            'DMPAPER_PENV_9_ROTATED', 'DMPAPER_QUARTO', 'DMPAPER_RESERVED_48',
+            'DMPAPER_RESERVED_49', 'DMPAPER_STATEMENT', 'DMPAPER_TABLOID',
+            'DMPAPER_TABLOID_EXTRA', 'DMPAPER_USER', 'ERR_BAD_WINDOW',
+            'ERR_BAD_WINDOW_NUM', 'ERR_CANT_ACCESS_FILE',
+            'ERR_CANT_INITIATE_LINK', 'ERR_CMD_NOT_SUPPORTED',
+            'ERR_FCN_ARG_RANGE', 'ERR_FCN_INVALID_FMT',
+            'ERR_FCN_OBJ_FETCH_FAILED', 'ERR_FILEMGR_NOTOPEN',
+            'ERR_FP_MATH_LIB_DOMAIN', 'ERR_FP_MATH_LIB_RANGE',
+            'ERR_INVALID_CHANNEL', 'ERR_INVALID_READ_CONTROL',
+            'ERR_INVALID_TRIG_CONTROL', 'ERR_NO_FIELD',
+            'ERR_NO_RESPONSE_FROM_APP', 'ERR_NULL_SELECTION',
+            'ERR_PROCESS_FAILED_IN_APP', 'ERR_TABLE_NOT_FOUND',
+            'ERR_WANT_MAPPER_WIN', 'FALSE', 'FILE_ATTR_FILESIZE',
+            'FILE_ATTR_MODE', 'FILTER_ALL_DIRECTIONS_1',
+            'FILTER_ALL_DIRECTIONS_2', 'FILTER_DIAGONALLY',
+            'FILTER_HORIZONTALLY', 'FILTER_VERTICALLY',
+            'FILTER_VERTICALLY_AND_HORIZONTALLY', 'FOLDER_APPDATA',
+            'FOLDER_COMMON_APPDATA', 'FOLDER_COMMON_DOCS',
+            'FOLDER_LOCAL_APPDATA', 'FOLDER_MI_APPDATA',
+            'FOLDER_MI_COMMON_APPDATA', 'FOLDER_MI_LOCAL_APPDATA',
+            'FOLDER_MI_PREFERENCE', 'FOLDER_MYDOCS', 'FOLDER_MYPICS',
+            'FONT_BACKCOLOR', 'FONT_FORECOLOR', 'FONT_NAME', 'FONT_POINTSIZE',
+            'FONT_STYLE', 'FRAME_INFO_BORDER_PEN', 'FRAME_INFO_COLUMN',
+            'FRAME_INFO_HEIGHT', 'FRAME_INFO_LABEL', 'FRAME_INFO_MAP_LAYER_ID',
+            'FRAME_INFO_NUM_STYLES', 'FRAME_INFO_POS_X', 'FRAME_INFO_POS_Y',
+            'FRAME_INFO_REFRESHABLE', 'FRAME_INFO_SUBTITLE',
+            'FRAME_INFO_SUBTITLE_FONT', 'FRAME_INFO_TITLE',
+            'FRAME_INFO_TITLE_FONT', 'FRAME_INFO_TYPE', 'FRAME_INFO_VISIBLE',
+            'FRAME_INFO_WIDTH', 'FRAME_TYPE_STYLE', 'FRAME_TYPE_THEME',
+            'GEO_CONTROL_POINT_X', 'GEO_CONTROL_POINT_Y', 'GEOCODE_BATCH_SIZE',
+            'GEOCODE_COUNT_GEOCODED', 'GEOCODE_COUNT_NOTGEOCODED',
+            'GEOCODE_COUNTRY_SUBDIVISION', 'GEOCODE_COUNTRY_SUBDIVISION2',
+            'GEOCODE_DICTIONARY', 'GEOCODE_FALLBACK_GEOGRAPHIC',
+            'GEOCODE_FALLBACK_POSTAL', 'GEOCODE_MAX_BATCH_SIZE',
+            'GEOCODE_MIXED_CASE', 'GEOCODE_MUNICIPALITY',
+            'GEOCODE_MUNICIPALITY2', 'GEOCODE_OFFSET_CENTER',
+            'GEOCODE_OFFSET_CENTER_UNITS', 'GEOCODE_OFFSET_END',
+            'GEOCODE_OFFSET_END_UNITS', 'GEOCODE_PASSTHROUGH',
+            'GEOCODE_POSTAL_CODE', 'GEOCODE_RESULT_MARK_MULTIPLE',
+            'GEOCODE_STREET_NAME', 'GEOCODE_STREET_NUMBER',
+            'GEOCODE_UNABLE_TO_CONVERT_DATA', 'GREEN',
+            'GRID_TAB_INFO_HAS_HILLSHADE', 'GRID_TAB_INFO_MAX_VALUE',
+            'GRID_TAB_INFO_MIN_VALUE', 'HOTLINK_INFO_ENABLED',
+            'HOTLINK_INFO_EXPR', 'HOTLINK_INFO_MODE', 'HOTLINK_INFO_RELATIVE',
+            'HOTLINK_MODE_BOTH', 'HOTLINK_MODE_LABEL', 'HOTLINK_MODE_OBJ',
+            'IMAGE_CLASS_BILEVEL', 'IMAGE_CLASS_GREYSCALE',
+            'IMAGE_CLASS_PALETTE', 'IMAGE_CLASS_RGB', 'IMAGE_TYPE_GRID',
+            'IMAGE_TYPE_RASTER', 'INCL_ALL', 'INCL_COMMON', 'INCL_CROSSINGS',
+            'ISOGRAM_AMBIENT_SPEED_DIST_UNIT',
+            'ISOGRAM_AMBIENT_SPEED_TIME_UNIT', 'ISOGRAM_BANDING',
+            'ISOGRAM_BATCH_SIZE', 'ISOGRAM_DEFAULT_AMBIENT_SPEED',
+            'ISOGRAM_MAJOR_POLYGON_ONLY', 'ISOGRAM_MAJOR_ROADS_ONLY',
+            'ISOGRAM_MAX_BANDS', 'ISOGRAM_MAX_BATCH_SIZE',
+            'ISOGRAM_MAX_DISTANCE', 'ISOGRAM_MAX_DISTANCE_UNITS',
+            'ISOGRAM_MAX_OFFROAD_DIST', 'ISOGRAM_MAX_OFFROAD_DIST_UNITS',
+            'ISOGRAM_MAX_TIME', 'ISOGRAM_MAX_TIME_UNITS',
+            'ISOGRAM_POINTS_ONLY', 'ISOGRAM_PROPAGATION_FACTOR',
+            'ISOGRAM_RECORDS_INSERTED', 'ISOGRAM_RECORDS_NOTINSERTED',
+            'ISOGRAM_RETURN_HOLES', 'ISOGRAM_SIMPLIFICATION_FACTOR',
+            'LABEL_INFO_ANCHORX', 'LABEL_INFO_ANCHORY', 'LABEL_INFO_DRAWN',
+            'LABEL_INFO_EDIT', 'LABEL_INFO_EDIT_ANCHOR',
+            'LABEL_INFO_EDIT_ANGLE', 'LABEL_INFO_EDIT_FONT',
+            'LABEL_INFO_EDIT_OFFSET', 'LABEL_INFO_EDIT_PEN',
+            'LABEL_INFO_EDIT_POSITION', 'LABEL_INFO_EDIT_TEXT',
+            'LABEL_INFO_EDIT_TEXTARROW', 'LABEL_INFO_EDIT_TEXTLINE',
+            'LABEL_INFO_EDIT_VISIBILITY', 'LABEL_INFO_OBJECT',
+            'LABEL_INFO_OFFSET', 'LABEL_INFO_ORIENTATION',
+            'LABEL_INFO_POSITION', 'LABEL_INFO_ROWID', 'LABEL_INFO_SELECT',
+            'LABEL_INFO_TABLE', 'LAYER_INFO_ARROWS', 'LAYER_INFO_CENTROIDS',
+            'LAYER_INFO_COSMETIC', 'LAYER_INFO_DISPLAY',
+            'LAYER_INFO_DISPLAY_GLOBAL', 'LAYER_INFO_DISPLAY_GRAPHIC',
+            'LAYER_INFO_DISPLAY_OFF', 'LAYER_INFO_DISPLAY_VALUE',
+            'LAYER_INFO_EDITABLE', 'LAYER_INFO_HOTLINK_COUNT',
+            'LAYER_INFO_HOTLINK_EXPR', 'LAYER_INFO_HOTLINK_MODE',
+            'LAYER_INFO_HOTLINK_RELATIVE', 'LAYER_INFO_LABEL_ALPHA',
+            'LAYER_INFO_LABEL_ORIENT_CURVED',
+            'LAYER_INFO_LABEL_ORIENT_HORIZONTAL',
+            'LAYER_INFO_LABEL_ORIENT_PARALLEL', 'LAYER_INFO_LAYER_ALPHA',
+            'LAYER_INFO_LAYER_TRANSLUCENCY', 'LAYER_INFO_LBL_AUTODISPLAY',
+            'LAYER_INFO_LBL_CURFONT', 'LAYER_INFO_LBL_DUPLICATES',
+            'LAYER_INFO_LBL_EXPR', 'LAYER_INFO_LBL_FONT', 'LAYER_INFO_LBL_LT',
+            'LAYER_INFO_LBL_LT_ARROW', 'LAYER_INFO_LBL_LT_NONE',
+            'LAYER_INFO_LBL_LT_SIMPLE', 'LAYER_INFO_LBL_MAX',
+            'LAYER_INFO_LBL_OFFSET', 'LAYER_INFO_LBL_ORIENTATION',
+            'LAYER_INFO_LBL_OVERLAP', 'LAYER_INFO_LBL_PARALLEL',
+            'LAYER_INFO_LBL_PARTIALSEGS', 'LAYER_INFO_LBL_POS',
+            'LAYER_INFO_LBL_POS_BC', 'LAYER_INFO_LBL_POS_BL',
+            'LAYER_INFO_LBL_POS_BR', 'LAYER_INFO_LBL_POS_CC',
+            'LAYER_INFO_LBL_POS_CL', 'LAYER_INFO_LBL_POS_CR',
+            'LAYER_INFO_LBL_POS_TC', 'LAYER_INFO_LBL_POS_TL',
+            'LAYER_INFO_LBL_POS_TR', 'LAYER_INFO_LBL_VIS_OFF',
+            'LAYER_INFO_LBL_VIS_ON', 'LAYER_INFO_LBL_VIS_ZOOM',
+            'LAYER_INFO_LBL_VISIBILITY', 'LAYER_INFO_LBL_ZOOM_MAX',
+            'LAYER_INFO_LBL_ZOOM_MIN', 'LAYER_INFO_NAME', 'LAYER_INFO_NODES',
+            'LAYER_INFO_OVR_BRUSH', 'LAYER_INFO_OVR_FONT',
+            'LAYER_INFO_OVR_LINE', 'LAYER_INFO_OVR_PEN',
+            'LAYER_INFO_OVR_SYMBOL', 'LAYER_INFO_PATH',
+            'LAYER_INFO_SELECTABLE', 'LAYER_INFO_TYPE',
+            'LAYER_INFO_TYPE_COSMETIC', 'LAYER_INFO_TYPE_GRID',
+            'LAYER_INFO_TYPE_IMAGE', 'LAYER_INFO_TYPE_NORMAL',
+            'LAYER_INFO_TYPE_THEMATIC', 'LAYER_INFO_TYPE_WMS',
+            'LAYER_INFO_ZOOM_LAYERED', 'LAYER_INFO_ZOOM_MAX',
+            'LAYER_INFO_ZOOM_MIN', 'LEGEND_INFO_MAP_ID',
+            'LEGEND_INFO_NUM_FRAMES', 'LEGEND_INFO_ORIENTATION',
+            'LEGEND_INFO_STYLE_SAMPLE_SIZE', 'LEGEND_STYLE_INFO_FONT',
+            'LEGEND_STYLE_INFO_OBJ', 'LEGEND_STYLE_INFO_TEXT',
+            'LOCATE_ABB_FILE', 'LOCATE_CLR_FILE', 'LOCATE_CUSTSYMB_DIR',
+            'LOCATE_DEF_WOR', 'LOCATE_FNT_FILE', 'LOCATE_GEOCODE_SERVERLIST',
+            'LOCATE_GRAPH_DIR', 'LOCATE_LAYOUT_TEMPLATE_DIR',
+            'LOCATE_MNU_FILE', 'LOCATE_PEN_FILE', 'LOCATE_PREF_FILE',
+            'LOCATE_PRJ_FILE', 'LOCATE_ROUTING_SERVERLIST',
+            'LOCATE_THMTMPLT_DIR', 'LOCATE_WFS_SERVERLIST',
+            'LOCATE_WMS_SERVERLIST', 'M_3DMAP_CLONE_VIEW',
+            'M_3DMAP_PREVIOUS_VIEW', 'M_3DMAP_PROPERTIES',
+            'M_3DMAP_REFRESH_GRID_TEXTURE', 'M_3DMAP_VIEW_ENTIRE_GRID',
+            'M_3DMAP_VIEWPOINT_CONTROL', 'M_3DMAP_WIREFRAME',
+            'M_ANALYZE_CALC_STATISTICS', 'M_ANALYZE_CUSTOMIZE_LEGEND',
+            'M_ANALYZE_FIND', 'M_ANALYZE_FIND_SELECTION',
+            'M_ANALYZE_INVERTSELECT', 'M_ANALYZE_SELECT',
+            'M_ANALYZE_SELECTALL', 'M_ANALYZE_SHADE', 'M_ANALYZE_SQLQUERY',
+            'M_ANALYZE_UNSELECT', 'M_BROWSE_EDIT', 'M_BROWSE_GRID',
+            'M_BROWSE_NEW_RECORD', 'M_BROWSE_OPTIONS', 'M_BROWSE_PICK_FIELDS',
+            'M_DBMS_OPEN_ODBC', 'M_EDIT_CLEAR', 'M_EDIT_CLEAROBJ',
+            'M_EDIT_COPY', 'M_EDIT_CUT', 'M_EDIT_GETINFO', 'M_EDIT_NEW_ROW',
+            'M_EDIT_PASTE', 'M_EDIT_PREFERENCES', 'M_EDIT_PREFERENCES_COUNTRY',
+            'M_EDIT_PREFERENCES_FILE', 'M_EDIT_PREFERENCES_IMAGE_PROC',
+            'M_EDIT_PREFERENCES_LAYOUT', 'M_EDIT_PREFERENCES_LEGEND',
+            'M_EDIT_PREFERENCES_MAP', 'M_EDIT_PREFERENCES_OUTPUT',
+            'M_EDIT_PREFERENCES_PATH', 'M_EDIT_PREFERENCES_PRINTER',
+            'M_EDIT_PREFERENCES_STYLES', 'M_EDIT_PREFERENCES_SYSTEM',
+            'M_EDIT_PREFERENCES_WEBSERVICES', 'M_EDIT_RESHAPE', 'M_EDIT_UNDO',
+            'M_FILE_ABOUT', 'M_FILE_ADD_WORKSPACE', 'M_FILE_CLOSE',
+            'M_FILE_CLOSE_ALL', 'M_FILE_CLOSE_ODBC', 'M_FILE_EXIT',
+            'M_FILE_HELP', 'M_FILE_NEW', 'M_FILE_OPEN', 'M_FILE_OPEN_ODBC',
+            'M_FILE_OPEN_ODBC_CONN', 'M_FILE_OPEN_UNIVERSAL_DATA',
+            'M_FILE_OPEN_WFS', 'M_FILE_OPEN_WMS', 'M_FILE_PAGE_SETUP',
+            'M_FILE_PRINT', 'M_FILE_PRINT_SETUP', 'M_FILE_REVERT',
+            'M_FILE_RUN', 'M_FILE_SAVE', 'M_FILE_SAVE_COPY_AS',
+            'M_FILE_SAVE_QUERY', 'M_FILE_SAVE_WINDOW_AS',
+            'M_FILE_SAVE_WORKSPACE', 'M_FORMAT_CUSTOM_COLORS',
+            'M_FORMAT_PICK_FILL', 'M_FORMAT_PICK_FONT', 'M_FORMAT_PICK_LINE',
+            'M_FORMAT_PICK_SYMBOL', 'M_GRAPH_3D_VIEWING_ANGLE',
+            'M_GRAPH_FORMATING', 'M_GRAPH_GENERAL_OPTIONS',
+            'M_GRAPH_GRID_SCALES', 'M_GRAPH_LABEL_AXIS',
+            'M_GRAPH_SAVE_AS_TEMPLATE', 'M_GRAPH_SERIES',
+            'M_GRAPH_SERIES_OPTIONS', 'M_GRAPH_TITLES', 'M_GRAPH_TYPE',
+            'M_GRAPH_VALUE_AXIS', 'M_HELP_ABOUT', 'M_HELP_CHECK_FOR_UPDATE',
+            'M_HELP_CONNECT_MIFORUM', 'M_HELP_CONTENTS',
+            'M_HELP_CONTEXTSENSITIVE', 'M_HELP_HELPMODE',
+            'M_HELP_MAPINFO_3DGRAPH_HELP', 'M_HELP_MAPINFO_CONNECT_SERVICES',
+            'M_HELP_MAPINFO_WWW', 'M_HELP_MAPINFO_WWW_STORE',
+            'M_HELP_MAPINFO_WWW_TUTORIAL', 'M_HELP_SEARCH',
+            'M_HELP_TECHSUPPORT', 'M_HELP_USE_HELP', 'M_LAYOUT_ACTUAL',
+            'M_LAYOUT_ALIGN', 'M_LAYOUT_AUTOSCROLL_ONOFF',
+            'M_LAYOUT_BRING2FRONT', 'M_LAYOUT_CHANGE_VIEW',
+            'M_LAYOUT_DISPLAYOPTIONS', 'M_LAYOUT_DROPSHADOWS',
+            'M_LAYOUT_ENTIRE', 'M_LAYOUT_LAYOUT_SIZE', 'M_LAYOUT_PREVIOUS',
+            'M_LAYOUT_SEND2BACK', 'M_LEGEND_ADD_FRAMES', 'M_LEGEND_DELETE',
+            'M_LEGEND_PROPERTIES', 'M_LEGEND_REFRESH', 'M_MAP_AUTOLABEL',
+            'M_MAP_AUTOSCROLL_ONOFF', 'M_MAP_CHANGE_VIEW',
+            'M_MAP_CLEAR_COSMETIC', 'M_MAP_CLEAR_CUSTOM_LABELS',
+            'M_MAP_CLIP_REGION_ONOFF', 'M_MAP_CLONE_MAPPER',
+            'M_MAP_CREATE_3DMAP', 'M_MAP_CREATE_LEGEND',
+            'M_MAP_CREATE_PRISMMAP', 'M_MAP_ENTIRE_LAYER',
+            'M_MAP_LAYER_CONTROL', 'M_MAP_MODIFY_THEMATIC', 'M_MAP_OPTIONS',
+            'M_MAP_PREVIOUS', 'M_MAP_PROJECTION', 'M_MAP_SAVE_COSMETIC',
+            'M_MAP_SET_CLIP_REGION', 'M_MAP_SETUNITS', 'M_MAP_SETUPDIGITIZER',
+            'M_MAP_THEMATIC', 'M_MAPBASIC_CLEAR', 'M_MAPBASIC_SAVECONTENTS',
+            'M_OBJECTS_BREAKPOLY', 'M_OBJECTS_BUFFER',
+            'M_OBJECTS_CHECK_REGIONS', 'M_OBJECTS_CLEAN',
+            'M_OBJECTS_CLEAR_TARGET', 'M_OBJECTS_COMBINE',
+            'M_OBJECTS_CONVEX_HULL', 'M_OBJECTS_CVT_PGON',
+            'M_OBJECTS_CVT_PLINE', 'M_OBJECTS_DISAGG',
+            'M_OBJECTS_DRIVE_REGION', 'M_OBJECTS_ENCLOSE', 'M_OBJECTS_ERASE',
+            'M_OBJECTS_ERASE_OUT', 'M_OBJECTS_MERGE', 'M_OBJECTS_OFFSET',
+            'M_OBJECTS_OVERLAY', 'M_OBJECTS_POLYLINE_SPLIT',
+            'M_OBJECTS_POLYLINE_SPLIT_AT_NODE', 'M_OBJECTS_RESHAPE',
+            'M_OBJECTS_ROTATE', 'M_OBJECTS_SET_TARGET', 'M_OBJECTS_SMOOTH',
+            'M_OBJECTS_SNAP', 'M_OBJECTS_SPLIT', 'M_OBJECTS_UNSMOOTH',
+            'M_OBJECTS_VORONOI', 'M_ORACLE_CREATE_WORKSPACE',
+            'M_ORACLE_DELETE_WORKSPACE', 'M_ORACLE_MERGE_PARENT',
+            'M_ORACLE_REFRESH_FROM_PARENT', 'M_ORACLE_VERSION_ENABLE_OFF',
+            'M_ORACLE_VERSION_ENABLE_ON', 'M_QUERY_CALC_STATISTICS',
+            'M_QUERY_FIND', 'M_QUERY_FIND_ADDRESS', 'M_QUERY_FIND_SELECTION',
+            'M_QUERY_FIND_SELECTION_CURRENT_MAP', 'M_QUERY_INVERTSELECT',
+            'M_QUERY_SELECT', 'M_QUERY_SELECTALL', 'M_QUERY_SQLQUERY',
+            'M_QUERY_UNSELECT', 'M_REDISTRICT_ADD', 'M_REDISTRICT_ASSIGN',
+            'M_REDISTRICT_DELETE', 'M_REDISTRICT_OPTIONS',
+            'M_REDISTRICT_TARGET', 'M_SENDMAIL_CURRENTWINDOW',
+            'M_SENDMAIL_WORKSPACE', 'M_TABLE_APPEND', 'M_TABLE_BUFFER',
+            'M_TABLE_CHANGESYMBOL', 'M_TABLE_CREATE_POINTS', 'M_TABLE_DELETE',
+            'M_TABLE_DRIVE_REGION', 'M_TABLE_EXPORT', 'M_TABLE_GEOCODE',
+            'M_TABLE_IMPORT', 'M_TABLE_MAKEMAPPABLE',
+            'M_TABLE_MERGE_USING_COLUMN', 'M_TABLE_MODIFY_STRUCTURE',
+            'M_TABLE_PACK', 'M_TABLE_RASTER_REG', 'M_TABLE_RASTER_STYLE',
+            'M_TABLE_REFRESH', 'M_TABLE_RENAME',
+            'M_TABLE_UNIVERSAL_DATA_REFRESH', 'M_TABLE_UNLINK',
+            'M_TABLE_UPDATE_COLUMN', 'M_TABLE_VORONOI', 'M_TABLE_WEB_GEOCODE',
+            'M_TABLE_WFS_PROPS', 'M_TABLE_WFS_REFRESH', 'M_TABLE_WMS_PROPS',
+            'M_TOOLS_ADD_NODE', 'M_TOOLS_ARC', 'M_TOOLS_CRYSTAL_REPORTS_NEW',
+            'M_TOOLS_CRYSTAL_REPORTS_OPEN', 'M_TOOLS_DRAGWINDOW',
+            'M_TOOLS_ELLIPSE', 'M_TOOLS_EXPAND', 'M_TOOLS_FRAME',
+            'M_TOOLS_HOTLINK', 'M_TOOLS_LABELER', 'M_TOOLS_LINE',
+            'M_TOOLS_MAPBASIC', 'M_TOOLS_PNT_QUERY', 'M_TOOLS_POINT',
+            'M_TOOLS_POLYGON', 'M_TOOLS_POLYLINE', 'M_TOOLS_RASTER_REG',
+            'M_TOOLS_RECENTER', 'M_TOOLS_RECTANGLE', 'M_TOOLS_ROUNDEDRECT',
+            'M_TOOLS_RULER', 'M_TOOLS_RUN', 'M_TOOLS_SEARCH_BOUNDARY',
+            'M_TOOLS_SEARCH_POLYGON', 'M_TOOLS_SEARCH_RADIUS',
+            'M_TOOLS_SEARCH_RECT', 'M_TOOLS_SELECTOR', 'M_TOOLS_SHRINK',
+            'M_TOOLS_TEXT', 'M_TOOLS_TOOL_MANAGER', 'M_WINDOW_ARRANGEICONS',
+            'M_WINDOW_BROWSE', 'M_WINDOW_BUTTONPAD', 'M_WINDOW_CASCADE',
+            'M_WINDOW_EXPORT_WINDOW', 'M_WINDOW_FIRST', 'M_WINDOW_GRAPH',
+            'M_WINDOW_LAYOUT', 'M_WINDOW_LEGEND', 'M_WINDOW_MAP',
+            'M_WINDOW_MAPBASIC', 'M_WINDOW_MORE', 'M_WINDOW_REDISTRICT',
+            'M_WINDOW_REDRAW', 'M_WINDOW_STATISTICS', 'M_WINDOW_STATUSBAR',
+            'M_WINDOW_TILE', 'M_WINDOW_TOOL_PALETTE', 'MAGENTA',
+            'MAP3D_INFO_BACKGROUND', 'MAP3D_INFO_CAMERA_CLIP_FAR',
+            'MAP3D_INFO_CAMERA_CLIP_NEAR', 'MAP3D_INFO_CAMERA_FOCAL_X',
+            'MAP3D_INFO_CAMERA_FOCAL_Y', 'MAP3D_INFO_CAMERA_FOCAL_Z',
+            'MAP3D_INFO_CAMERA_VPN_1', 'MAP3D_INFO_CAMERA_VPN_2',
+            'MAP3D_INFO_CAMERA_VPN_3', 'MAP3D_INFO_CAMERA_VU_1',
+            'MAP3D_INFO_CAMERA_VU_2', 'MAP3D_INFO_CAMERA_VU_3',
+            'MAP3D_INFO_CAMERA_X', 'MAP3D_INFO_CAMERA_Y',
+            'MAP3D_INFO_CAMERA_Z', 'MAP3D_INFO_LIGHT_COLOR',
+            'MAP3D_INFO_LIGHT_X', 'MAP3D_INFO_LIGHT_Y', 'MAP3D_INFO_LIGHT_Z',
+            'MAP3D_INFO_RESOLUTION_X', 'MAP3D_INFO_RESOLUTION_Y',
+            'MAP3D_INFO_SCALE', 'MAP3D_INFO_UNITS', 'MAPPER_INFO_AREAUNITS',
+            'MAPPER_INFO_CENTERX', 'MAPPER_INFO_CENTERY',
+            'MAPPER_INFO_CLIP_DISPLAY_ALL', 'MAPPER_INFO_CLIP_DISPLAY_POLYOBJ',
+            'MAPPER_INFO_CLIP_OVERLAY', 'MAPPER_INFO_CLIP_REGION',
+            'MAPPER_INFO_CLIP_TYPE', 'MAPPER_INFO_COORDSYS_CLAUSE',
+            'MAPPER_INFO_COORDSYS_CLAUSE_WITH_BOUNDS',
+            'MAPPER_INFO_COORDSYS_NAME', 'MAPPER_INFO_DISPLAY',
+            'MAPPER_INFO_DISPLAY_DECIMAL', 'MAPPER_INFO_DISPLAY_DEGMINSEC',
+            'MAPPER_INFO_DISPLAY_DMS', 'MAPPER_INFO_DISPLAY_MGRS',
+            'MAPPER_INFO_DISPLAY_POSITION', 'MAPPER_INFO_DISPLAY_SCALE',
+            'MAPPER_INFO_DISPLAY_ZOOM', 'MAPPER_INFO_DIST_CALC_TYPE',
+            'MAPPER_INFO_DIST_CARTESIAN', 'MAPPER_INFO_DIST_SPHERICAL',
+            'MAPPER_INFO_DISTUNITS', 'MAPPER_INFO_EDIT_LAYER',
+            'MAPPER_INFO_LAYERS', 'MAPPER_INFO_MAXX', 'MAPPER_INFO_MAXY',
+            'MAPPER_INFO_MERGE_MAP', 'MAPPER_INFO_MINX', 'MAPPER_INFO_MINY',
+            'MAPPER_INFO_MOVE_DUPLICATE_NODES', 'MAPPER_INFO_NUM_THEMATIC',
+            'MAPPER_INFO_REPROJECTION', 'MAPPER_INFO_RESAMPLING',
+            'MAPPER_INFO_SCALE', 'MAPPER_INFO_SCROLLBARS',
+            'MAPPER_INFO_XYUNITS', 'MAPPER_INFO_ZOOM', 'MAX_STRING_LENGTH',
+            'MENUITEM_INFO_ACCELERATOR', 'MENUITEM_INFO_CHECKABLE',
+            'MENUITEM_INFO_CHECKED', 'MENUITEM_INFO_ENABLED',
+            'MENUITEM_INFO_HANDLER', 'MENUITEM_INFO_HELPMSG',
+            'MENUITEM_INFO_ID', 'MENUITEM_INFO_SHOWHIDEABLE',
+            'MENUITEM_INFO_TEXT', 'MI_CURSOR_ARROW', 'MI_CURSOR_CHANGE_WIDTH',
+            'MI_CURSOR_CROSSHAIR', 'MI_CURSOR_DRAG_OBJ',
+            'MI_CURSOR_FINGER_LEFT', 'MI_CURSOR_FINGER_UP',
+            'MI_CURSOR_GRABBER', 'MI_CURSOR_IBEAM', 'MI_CURSOR_IBEAM_CROSS',
+            'MI_CURSOR_ZOOM_IN', 'MI_CURSOR_ZOOM_OUT', 'MI_ICON_ADD_NODE',
+            'MI_ICON_ARC', 'MI_ICON_ARROW', 'MI_ICON_ARROW_1',
+            'MI_ICON_ARROW_10', 'MI_ICON_ARROW_11', 'MI_ICON_ARROW_12',
+            'MI_ICON_ARROW_13', 'MI_ICON_ARROW_14', 'MI_ICON_ARROW_15',
+            'MI_ICON_ARROW_16', 'MI_ICON_ARROW_17', 'MI_ICON_ARROW_18',
+            'MI_ICON_ARROW_19', 'MI_ICON_ARROW_2', 'MI_ICON_ARROW_20',
+            'MI_ICON_ARROW_21', 'MI_ICON_ARROW_3', 'MI_ICON_ARROW_4',
+            'MI_ICON_ARROW_5', 'MI_ICON_ARROW_6', 'MI_ICON_ARROW_7',
+            'MI_ICON_ARROW_8', 'MI_ICON_ARROW_9', 'MI_ICON_CLIP_MODE',
+            'MI_ICON_CLIP_REGION', 'MI_ICON_CLOSE_ALL',
+            'MI_ICON_COMMUNICATION_1', 'MI_ICON_COMMUNICATION_10',
+            'MI_ICON_COMMUNICATION_11', 'MI_ICON_COMMUNICATION_12',
+            'MI_ICON_COMMUNICATION_2', 'MI_ICON_COMMUNICATION_3',
+            'MI_ICON_COMMUNICATION_4', 'MI_ICON_COMMUNICATION_5',
+            'MI_ICON_COMMUNICATION_6', 'MI_ICON_COMMUNICATION_7',
+            'MI_ICON_COMMUNICATION_8', 'MI_ICON_COMMUNICATION_9',
+            'MI_ICON_COMPASS_CIRCLE_TA', 'MI_ICON_COMPASS_CONTRACT',
+            'MI_ICON_COMPASS_EXPAND', 'MI_ICON_COMPASS_POLY_TA',
+            'MI_ICON_COMPASS_TAG', 'MI_ICON_COMPASS_UNTAG', 'MI_ICON_COPY',
+            'MI_ICON_CROSSHAIR', 'MI_ICON_CUT', 'MI_ICON_DISTRICT_MANY',
+            'MI_ICON_DISTRICT_SAME', 'MI_ICON_DRAG_HANDLE', 'MI_ICON_ELLIPSE',
+            'MI_ICON_EMERGENCY_1', 'MI_ICON_EMERGENCY_10',
+            'MI_ICON_EMERGENCY_11', 'MI_ICON_EMERGENCY_12',
+            'MI_ICON_EMERGENCY_13', 'MI_ICON_EMERGENCY_14',
+            'MI_ICON_EMERGENCY_15', 'MI_ICON_EMERGENCY_16',
+            'MI_ICON_EMERGENCY_17', 'MI_ICON_EMERGENCY_18',
+            'MI_ICON_EMERGENCY_2', 'MI_ICON_EMERGENCY_3',
+            'MI_ICON_EMERGENCY_4', 'MI_ICON_EMERGENCY_5',
+            'MI_ICON_EMERGENCY_6', 'MI_ICON_EMERGENCY_7',
+            'MI_ICON_EMERGENCY_8', 'MI_ICON_EMERGENCY_9', 'MI_ICON_GRABBER',
+            'MI_ICON_GRAPH_SELECT', 'MI_ICON_HELP', 'MI_ICON_HOT_LINK',
+            'MI_ICON_INFO', 'MI_ICON_INVERTSELECT', 'MI_ICON_LABEL',
+            'MI_ICON_LAYERS', 'MI_ICON_LEGEND', 'MI_ICON_LETTERS_A',
+            'MI_ICON_LETTERS_B', 'MI_ICON_LETTERS_C', 'MI_ICON_LETTERS_D',
+            'MI_ICON_LETTERS_E', 'MI_ICON_LETTERS_F', 'MI_ICON_LETTERS_G',
+            'MI_ICON_LETTERS_H', 'MI_ICON_LETTERS_I', 'MI_ICON_LETTERS_J',
+            'MI_ICON_LETTERS_K', 'MI_ICON_LETTERS_L', 'MI_ICON_LETTERS_M',
+            'MI_ICON_LETTERS_N', 'MI_ICON_LETTERS_O', 'MI_ICON_LETTERS_P',
+            'MI_ICON_LETTERS_Q', 'MI_ICON_LETTERS_R', 'MI_ICON_LETTERS_S',
+            'MI_ICON_LETTERS_T', 'MI_ICON_LETTERS_U', 'MI_ICON_LETTERS_V',
+            'MI_ICON_LETTERS_W', 'MI_ICON_LETTERS_X', 'MI_ICON_LETTERS_Y',
+            'MI_ICON_LETTERS_Z', 'MI_ICON_LINE', 'MI_ICON_LINE_STYLE',
+            'MI_ICON_MAPSYMB_1', 'MI_ICON_MAPSYMB_10', 'MI_ICON_MAPSYMB_11',
+            'MI_ICON_MAPSYMB_12', 'MI_ICON_MAPSYMB_13', 'MI_ICON_MAPSYMB_14',
+            'MI_ICON_MAPSYMB_15', 'MI_ICON_MAPSYMB_16', 'MI_ICON_MAPSYMB_17',
+            'MI_ICON_MAPSYMB_18', 'MI_ICON_MAPSYMB_19', 'MI_ICON_MAPSYMB_2',
+            'MI_ICON_MAPSYMB_20', 'MI_ICON_MAPSYMB_21', 'MI_ICON_MAPSYMB_22',
+            'MI_ICON_MAPSYMB_23', 'MI_ICON_MAPSYMB_24', 'MI_ICON_MAPSYMB_25',
+            'MI_ICON_MAPSYMB_26', 'MI_ICON_MAPSYMB_3', 'MI_ICON_MAPSYMB_4',
+            'MI_ICON_MAPSYMB_5', 'MI_ICON_MAPSYMB_6', 'MI_ICON_MAPSYMB_7',
+            'MI_ICON_MAPSYMB_8', 'MI_ICON_MAPSYMB_9', 'MI_ICON_MARITIME_1',
+            'MI_ICON_MARITIME_10', 'MI_ICON_MARITIME_2', 'MI_ICON_MARITIME_3',
+            'MI_ICON_MARITIME_4', 'MI_ICON_MARITIME_5', 'MI_ICON_MARITIME_6',
+            'MI_ICON_MARITIME_7', 'MI_ICON_MARITIME_8', 'MI_ICON_MARITIME_9',
+            'MI_ICON_MB_1', 'MI_ICON_MB_10', 'MI_ICON_MB_11', 'MI_ICON_MB_12',
+            'MI_ICON_MB_13', 'MI_ICON_MB_14', 'MI_ICON_MB_2', 'MI_ICON_MB_3',
+            'MI_ICON_MB_4', 'MI_ICON_MB_5', 'MI_ICON_MB_6', 'MI_ICON_MB_7',
+            'MI_ICON_MB_8', 'MI_ICON_MB_9', 'MI_ICON_MISC_1',
+            'MI_ICON_MISC_10', 'MI_ICON_MISC_11', 'MI_ICON_MISC_12',
+            'MI_ICON_MISC_13', 'MI_ICON_MISC_14', 'MI_ICON_MISC_15',
+            'MI_ICON_MISC_16', 'MI_ICON_MISC_17', 'MI_ICON_MISC_18',
+            'MI_ICON_MISC_19', 'MI_ICON_MISC_2', 'MI_ICON_MISC_20',
+            'MI_ICON_MISC_21', 'MI_ICON_MISC_22', 'MI_ICON_MISC_23',
+            'MI_ICON_MISC_24', 'MI_ICON_MISC_25', 'MI_ICON_MISC_26',
+            'MI_ICON_MISC_27', 'MI_ICON_MISC_28', 'MI_ICON_MISC_29',
+            'MI_ICON_MISC_3', 'MI_ICON_MISC_30', 'MI_ICON_MISC_31',
+            'MI_ICON_MISC_4', 'MI_ICON_MISC_5', 'MI_ICON_MISC_6',
+            'MI_ICON_MISC_7', 'MI_ICON_MISC_8', 'MI_ICON_MISC_9',
+            'MI_ICON_NEW_DOC', 'MI_ICON_NUMBERS_1', 'MI_ICON_NUMBERS_10',
+            'MI_ICON_NUMBERS_11', 'MI_ICON_NUMBERS_12', 'MI_ICON_NUMBERS_13',
+            'MI_ICON_NUMBERS_14', 'MI_ICON_NUMBERS_15', 'MI_ICON_NUMBERS_16',
+            'MI_ICON_NUMBERS_17', 'MI_ICON_NUMBERS_18', 'MI_ICON_NUMBERS_19',
+            'MI_ICON_NUMBERS_2', 'MI_ICON_NUMBERS_20', 'MI_ICON_NUMBERS_21',
+            'MI_ICON_NUMBERS_22', 'MI_ICON_NUMBERS_23', 'MI_ICON_NUMBERS_24',
+            'MI_ICON_NUMBERS_25', 'MI_ICON_NUMBERS_26', 'MI_ICON_NUMBERS_27',
+            'MI_ICON_NUMBERS_28', 'MI_ICON_NUMBERS_29', 'MI_ICON_NUMBERS_3',
+            'MI_ICON_NUMBERS_30', 'MI_ICON_NUMBERS_31', 'MI_ICON_NUMBERS_32',
+            'MI_ICON_NUMBERS_4', 'MI_ICON_NUMBERS_5', 'MI_ICON_NUMBERS_6',
+            'MI_ICON_NUMBERS_7', 'MI_ICON_NUMBERS_8', 'MI_ICON_NUMBERS_9',
+            'MI_ICON_ODBC_DISCONNECT', 'MI_ICON_ODBC_MAPPABLE',
+            'MI_ICON_ODBC_OPEN', 'MI_ICON_ODBC_REFRESH', 'MI_ICON_ODBC_SYMBOL',
+            'MI_ICON_ODBC_UNLINK', 'MI_ICON_OPEN_FILE', 'MI_ICON_OPEN_WOR',
+            'MI_ICON_OPENWFS', 'MI_ICON_OPENWMS', 'MI_ICON_PASTE',
+            'MI_ICON_POLYGON', 'MI_ICON_POLYLINE', 'MI_ICON_PRINT',
+            'MI_ICON_REALESTATE_1', 'MI_ICON_REALESTATE_10',
+            'MI_ICON_REALESTATE_11', 'MI_ICON_REALESTATE_12',
+            'MI_ICON_REALESTATE_13', 'MI_ICON_REALESTATE_14',
+            'MI_ICON_REALESTATE_15', 'MI_ICON_REALESTATE_16',
+            'MI_ICON_REALESTATE_17', 'MI_ICON_REALESTATE_18',
+            'MI_ICON_REALESTATE_19', 'MI_ICON_REALESTATE_2',
+            'MI_ICON_REALESTATE_20', 'MI_ICON_REALESTATE_21',
+            'MI_ICON_REALESTATE_22', 'MI_ICON_REALESTATE_23',
+            'MI_ICON_REALESTATE_3', 'MI_ICON_REALESTATE_4',
+            'MI_ICON_REALESTATE_5', 'MI_ICON_REALESTATE_6',
+            'MI_ICON_REALESTATE_7', 'MI_ICON_REALESTATE_8',
+            'MI_ICON_REALESTATE_9', 'MI_ICON_RECT', 'MI_ICON_REGION_STYLE',
+            'MI_ICON_RESHAPE', 'MI_ICON_ROUND_RECT', 'MI_ICON_RULER',
+            'MI_ICON_RUN', 'MI_ICON_SAVE_FILE', 'MI_ICON_SAVE_WIN',
+            'MI_ICON_SAVE_WOR', 'MI_ICON_SEARCH_BDY', 'MI_ICON_SEARCH_POLYGON',
+            'MI_ICON_SEARCH_RADIUS', 'MI_ICON_SEARCH_RECT', 'MI_ICON_SIGNS_1',
+            'MI_ICON_SIGNS_10', 'MI_ICON_SIGNS_11', 'MI_ICON_SIGNS_12',
+            'MI_ICON_SIGNS_13', 'MI_ICON_SIGNS_14', 'MI_ICON_SIGNS_15',
+            'MI_ICON_SIGNS_16', 'MI_ICON_SIGNS_17', 'MI_ICON_SIGNS_18',
+            'MI_ICON_SIGNS_19', 'MI_ICON_SIGNS_2', 'MI_ICON_SIGNS_3',
+            'MI_ICON_SIGNS_4', 'MI_ICON_SIGNS_5', 'MI_ICON_SIGNS_6',
+            'MI_ICON_SIGNS_7', 'MI_ICON_SIGNS_8', 'MI_ICON_SIGNS_9',
+            'MI_ICON_STATISTICS', 'MI_ICON_SYMBOL', 'MI_ICON_SYMBOL_STYLE',
+            'MI_ICON_TEXT', 'MI_ICON_TEXT_STYLE', 'MI_ICON_TRANSPORT_1',
+            'MI_ICON_TRANSPORT_10', 'MI_ICON_TRANSPORT_11',
+            'MI_ICON_TRANSPORT_12', 'MI_ICON_TRANSPORT_13',
+            'MI_ICON_TRANSPORT_14', 'MI_ICON_TRANSPORT_15',
+            'MI_ICON_TRANSPORT_16', 'MI_ICON_TRANSPORT_17',
+            'MI_ICON_TRANSPORT_18', 'MI_ICON_TRANSPORT_19',
+            'MI_ICON_TRANSPORT_2', 'MI_ICON_TRANSPORT_20',
+            'MI_ICON_TRANSPORT_21', 'MI_ICON_TRANSPORT_22',
+            'MI_ICON_TRANSPORT_23', 'MI_ICON_TRANSPORT_24',
+            'MI_ICON_TRANSPORT_25', 'MI_ICON_TRANSPORT_26',
+            'MI_ICON_TRANSPORT_27', 'MI_ICON_TRANSPORT_3',
+            'MI_ICON_TRANSPORT_4', 'MI_ICON_TRANSPORT_5',
+            'MI_ICON_TRANSPORT_6', 'MI_ICON_TRANSPORT_7',
+            'MI_ICON_TRANSPORT_8', 'MI_ICON_TRANSPORT_9', 'MI_ICON_UNDO',
+            'MI_ICON_UNSELECT_ALL', 'MI_ICON_WINDOW_FRAME', 'MI_ICON_WRENCH',
+            'MI_ICON_ZOOM_IN', 'MI_ICON_ZOOM_OUT', 'MI_ICON_ZOOM_QUESTION',
+            'MI_ICONS_MAPS_1', 'MI_ICONS_MAPS_10', 'MI_ICONS_MAPS_11',
+            'MI_ICONS_MAPS_12', 'MI_ICONS_MAPS_13', 'MI_ICONS_MAPS_14',
+            'MI_ICONS_MAPS_15', 'MI_ICONS_MAPS_2', 'MI_ICONS_MAPS_3',
+            'MI_ICONS_MAPS_4', 'MI_ICONS_MAPS_5', 'MI_ICONS_MAPS_6',
+            'MI_ICONS_MAPS_7', 'MI_ICONS_MAPS_8', 'MI_ICONS_MAPS_9',
+            'MIPLATFORM_HP', 'MIPLATFORM_MAC68K', 'MIPLATFORM_POWERMAC',
+            'MIPLATFORM_SPECIAL', 'MIPLATFORM_SUN', 'MIPLATFORM_WIN16',
+            'MIPLATFORM_WIN32', 'MODE_APPEND', 'MODE_BINARY', 'MODE_INPUT',
+            'MODE_OUTPUT', 'MODE_RANDOM', 'OBJ_ARC', 'OBJ_ELLIPSE',
+            'OBJ_FRAME', 'OBJ_GEO_ARCBEGANGLE', 'OBJ_GEO_ARCENDANGLE',
+            'OBJ_GEO_CENTROID', 'OBJ_GEO_LINEBEGX', 'OBJ_GEO_LINEBEGY',
+            'OBJ_GEO_LINEENDX', 'OBJ_GEO_LINEENDY', 'OBJ_GEO_MAXX',
+            'OBJ_GEO_MAXY', 'OBJ_GEO_MINX', 'OBJ_GEO_MINY', 'OBJ_GEO_POINTM',
+            'OBJ_GEO_POINTX', 'OBJ_GEO_POINTY', 'OBJ_GEO_POINTZ',
+            'OBJ_GEO_ROUNDRADIUS', 'OBJ_GEO_TEXTANGLE', 'OBJ_GEO_TEXTLINEX',
+            'OBJ_GEO_TEXTLINEY', 'OBJ_INFO_BRUSH', 'OBJ_INFO_FILLFRAME',
+            'OBJ_INFO_FRAMETITLE', 'OBJ_INFO_FRAMEWIN', 'OBJ_INFO_HAS_M',
+            'OBJ_INFO_HAS_Z', 'OBJ_INFO_MPOINT', 'OBJ_INFO_NONEMPTY',
+            'OBJ_INFO_NPNTS', 'OBJ_INFO_NPOLYGONS', 'OBJ_INFO_PEN',
+            'OBJ_INFO_PLINE', 'OBJ_INFO_REGION', 'OBJ_INFO_SMOOTH',
+            'OBJ_INFO_SYMBOL', 'OBJ_INFO_TEXTARROW', 'OBJ_INFO_TEXTFONT',
+            'OBJ_INFO_TEXTJUSTIFY', 'OBJ_INFO_TEXTSPACING',
+            'OBJ_INFO_TEXTSTRING', 'OBJ_INFO_TYPE', 'OBJ_INFO_Z_UNIT',
+            'OBJ_INFO_Z_UNIT_SET', 'OBJ_LINE', 'OBJ_PLINE', 'OBJ_POINT',
+            'OBJ_RECT', 'OBJ_REGION', 'OBJ_ROUNDRECT', 'OBJ_TEXT',
+            'OBJ_TYPE_ARC', 'OBJ_TYPE_COLLECTION', 'OBJ_TYPE_ELLIPSE',
+            'OBJ_TYPE_FRAME', 'OBJ_TYPE_LINE', 'OBJ_TYPE_MPOINT',
+            'OBJ_TYPE_PLINE', 'OBJ_TYPE_POINT', 'OBJ_TYPE_RECT',
+            'OBJ_TYPE_REGION', 'OBJ_TYPE_ROUNDRECT', 'OBJ_TYPE_TEXT',
+            'ORIENTATION_CUSTOM', 'ORIENTATION_LANDSCAPE',
+            'ORIENTATION_PORTRAIT', 'PEN_COLOR', 'PEN_INDEX',
+            'PEN_INTERLEAVED', 'PEN_PATTERN', 'PEN_WIDTH', 'PLATFORM_MAC',
+            'PLATFORM_MOTIF', 'PLATFORM_SPECIAL', 'PLATFORM_WIN',
+            'PLATFORM_X11', 'PLATFORM_XOL', 'PRISMMAP_INFO_BACKGROUND',
+            'PRISMMAP_INFO_CAMERA_CLIP_FAR', 'PRISMMAP_INFO_CAMERA_CLIP_NEAR',
+            'PRISMMAP_INFO_CAMERA_FOCAL_X', 'PRISMMAP_INFO_CAMERA_FOCAL_Y',
+            'PRISMMAP_INFO_CAMERA_FOCAL_Z', 'PRISMMAP_INFO_CAMERA_VPN_1',
+            'PRISMMAP_INFO_CAMERA_VPN_2', 'PRISMMAP_INFO_CAMERA_VPN_3',
+            'PRISMMAP_INFO_CAMERA_VU_1', 'PRISMMAP_INFO_CAMERA_VU_2',
+            'PRISMMAP_INFO_CAMERA_VU_3', 'PRISMMAP_INFO_CAMERA_X',
+            'PRISMMAP_INFO_CAMERA_Y', 'PRISMMAP_INFO_CAMERA_Z',
+            'PRISMMAP_INFO_INFOTIP_EXPR', 'PRISMMAP_INFO_LIGHT_COLOR',
+            'PRISMMAP_INFO_LIGHT_X', 'PRISMMAP_INFO_LIGHT_Y',
+            'PRISMMAP_INFO_LIGHT_Z', 'PRISMMAP_INFO_SCALE', 'RAD_2_DEG',
+            'RASTER_CONTROL_POINT_X', 'RASTER_CONTROL_POINT_Y',
+            'RASTER_TAB_INFO_ALPHA', 'RASTER_TAB_INFO_BITS_PER_PIXEL',
+            'RASTER_TAB_INFO_BRIGHTNESS', 'RASTER_TAB_INFO_CONTRAST',
+            'RASTER_TAB_INFO_DISPLAY_TRANSPARENT', 'RASTER_TAB_INFO_GREYSCALE',
+            'RASTER_TAB_INFO_HEIGHT', 'RASTER_TAB_INFO_IMAGE_CLASS',
+            'RASTER_TAB_INFO_IMAGE_NAME', 'RASTER_TAB_INFO_IMAGE_TYPE',
+            'RASTER_TAB_INFO_NUM_CONTROL_POINTS',
+            'RASTER_TAB_INFO_TRANSPARENT_COLOR', 'RASTER_TAB_INFO_WIDTH',
+            'RED', 'REGION_INFO_IS_CLOCKWISE', 'SEARCH_INFO_ROW',
+            'SEARCH_INFO_TABLE', 'SECONDS_PER_DAY', 'SEL_INFO_NROWS',
+            'SEL_INFO_SELNAME', 'SEL_INFO_TABLENAME',
+            'SESSION_INFO_AREA_UNITS', 'SESSION_INFO_COORDSYS_CLAUSE',
+            'SESSION_INFO_DISTANCE_UNITS', 'SESSION_INFO_PAPER_UNITS',
+            'SRV_COL_INFO_ALIAS', 'SRV_COL_INFO_NAME',
+            'SRV_COL_INFO_PRECISION', 'SRV_COL_INFO_SCALE',
+            'SRV_COL_INFO_STATUS', 'SRV_COL_INFO_TYPE', 'SRV_COL_INFO_VALUE',
+            'SRV_COL_INFO_WIDTH', 'SRV_COL_TYPE_BIN_STRING',
+            'SRV_COL_TYPE_CHAR', 'SRV_COL_TYPE_DATE', 'SRV_COL_TYPE_DECIMAL',
+            'SRV_COL_TYPE_FIXED_LEN_STRING', 'SRV_COL_TYPE_FLOAT',
+            'SRV_COL_TYPE_INTEGER', 'SRV_COL_TYPE_LOGICAL',
+            'SRV_COL_TYPE_NONE', 'SRV_COL_TYPE_SMALLINT',
+            'SRV_CONNECT_INFO_DB_NAME', 'SRV_CONNECT_INFO_DRIVER_NAME',
+            'SRV_CONNECT_INFO_DS_NAME', 'SRV_CONNECT_INFO_QUOTE_CHAR',
+            'SRV_CONNECT_INFO_SQL_USER_ID', 'SRV_DRV_DATA_SOURCE',
+            'SRV_DRV_INFO_NAME', 'SRV_DRV_INFO_NAME_LIST', 'SRV_ERROR',
+            'SRV_FETCH_FIRST', 'SRV_FETCH_LAST', 'SRV_FETCH_NEXT',
+            'SRV_FETCH_PREV', 'SRV_INVALID_HANDLE', 'SRV_NEED_DATA',
+            'SRV_NO_MORE_DATA', 'SRV_NULL_DATA', 'SRV_SUCCESS',
+            'SRV_SUCCESS_WITH_INFO', 'SRV_TRUNCATED_DATA',
+            'SRV_WM_HIST_NO_OVERWRITE', 'SRV_WM_HIST_NONE',
+            'SRV_WM_HIST_OVERWRITE', 'STR_EQ', 'STR_GT', 'STR_LT',
+            'STYLE_SAMPLE_SIZE_LARGE', 'STYLE_SAMPLE_SIZE_SMALL',
+            'SWITCHING_INTO_MAPINFO', 'SWITCHING_OUT_OF_MAPINFO',
+            'SYMBOL_ANGLE', 'SYMBOL_CODE', 'SYMBOL_COLOR',
+            'SYMBOL_CUSTOM_NAME', 'SYMBOL_CUSTOM_STYLE', 'SYMBOL_FONT_NAME',
+            'SYMBOL_FONT_STYLE', 'SYMBOL_KIND', 'SYMBOL_KIND_CUSTOM',
+            'SYMBOL_KIND_FONT', 'SYMBOL_KIND_VECTOR', 'SYMBOL_POINTSIZE',
+            'SYS_INFO_APPIDISPATCH', 'SYS_INFO_APPLICATIONWND',
+            'SYS_INFO_APPVERSION', 'SYS_INFO_CHARSET',
+            'SYS_INFO_COPYPROTECTED', 'SYS_INFO_DATE_FORMAT',
+            'SYS_INFO_DDESTATUS', 'SYS_INFO_DIG_INSTALLED',
+            'SYS_INFO_DIG_MODE', 'SYS_INFO_MAPINFOWND',
+            'SYS_INFO_MDICLIENTWND', 'SYS_INFO_MIBUILD_NUMBER',
+            'SYS_INFO_MIPLATFORM', 'SYS_INFO_MIVERSION',
+            'SYS_INFO_NUMBER_FORMAT', 'SYS_INFO_PLATFORM',
+            'SYS_INFO_PRODUCTLEVEL', 'SYS_INFO_RUNTIME',
+            'TAB_GEO_CONTROL_POINT_X', 'TAB_GEO_CONTROL_POINT_Y',
+            'TAB_INFO_BROWSER_LIST', 'TAB_INFO_COORDSYS_CLAUSE',
+            'TAB_INFO_COORDSYS_CLAUSE_WITHOUT_BOUNDS',
+            'TAB_INFO_COORDSYS_MAXX', 'TAB_INFO_COORDSYS_MAXY',
+            'TAB_INFO_COORDSYS_MINX', 'TAB_INFO_COORDSYS_MINY',
+            'TAB_INFO_COORDSYS_NAME', 'TAB_INFO_EDITED', 'TAB_INFO_FASTEDIT',
+            'TAB_INFO_MAPPABLE', 'TAB_INFO_MAPPABLE_TABLE', 'TAB_INFO_MAXX',
+            'TAB_INFO_MAXY', 'TAB_INFO_MINX', 'TAB_INFO_MINY', 'TAB_INFO_NAME',
+            'TAB_INFO_NCOLS', 'TAB_INFO_NREFS', 'TAB_INFO_NROWS',
+            'TAB_INFO_NUM', 'TAB_INFO_READONLY', 'TAB_INFO_SEAMLESS',
+            'TAB_INFO_SUPPORT_MZ', 'TAB_INFO_TABFILE', 'TAB_INFO_TEMP',
+            'TAB_INFO_THEME_METADATA', 'TAB_INFO_TYPE', 'TAB_INFO_UNDO',
+            'TAB_INFO_USERBROWSE', 'TAB_INFO_USERCLOSE',
+            'TAB_INFO_USERDISPLAYMAP', 'TAB_INFO_USEREDITABLE',
+            'TAB_INFO_USERMAP', 'TAB_INFO_USERREMOVEMAP', 'TAB_INFO_Z_UNIT',
+            'TAB_INFO_Z_UNIT_SET', 'TAB_TYPE_BASE', 'TAB_TYPE_FME',
+            'TAB_TYPE_IMAGE', 'TAB_TYPE_LINKED', 'TAB_TYPE_RESULT',
+            'TAB_TYPE_VIEW', 'TAB_TYPE_WFS', 'TAB_TYPE_WMS', 'TRUE', 'WHITE',
+            'WIN_3DMAP', 'WIN_BROWSER', 'WIN_BUTTONPAD', 'WIN_CART_LEGEND',
+            'WIN_GRAPH', 'WIN_HELP', 'WIN_INFO', 'WIN_INFO_AUTOSCROLL',
+            'WIN_INFO_CLONEWINDOW', 'WIN_INFO_ENHANCED_RENDERING',
+            'WIN_INFO_EXPORT_ANTIALIASING', 'WIN_INFO_EXPORT_BORDER',
+            'WIN_INFO_EXPORT_DITHER', 'WIN_INFO_EXPORT_FILTER',
+            'WIN_INFO_EXPORT_MASKSIZE', 'WIN_INFO_EXPORT_THRESHOLD',
+            'WIN_INFO_EXPORT_TRANSPRASTER', 'WIN_INFO_EXPORT_TRANSPVECTOR',
+            'WIN_INFO_EXPORT_TRUECOLOR', 'WIN_INFO_HEIGHT',
+            'WIN_INFO_LEGENDS_MAP', 'WIN_INFO_NAME', 'WIN_INFO_OPEN',
+            'WIN_INFO_PRINTER_BORDER', 'WIN_INFO_PRINTER_BOTTOMMARGIN',
+            'WIN_INFO_PRINTER_COPIES', 'WIN_INFO_PRINTER_DITHER',
+            'WIN_INFO_PRINTER_LEFTMARGIN', 'WIN_INFO_PRINTER_METHOD',
+            'WIN_INFO_PRINTER_NAME', 'WIN_INFO_PRINTER_ORIENT',
+            'WIN_INFO_PRINTER_PAPERSIZE', 'WIN_INFO_PRINTER_RIGHTMARGIN',
+            'WIN_INFO_PRINTER_SCALE_PATTERNS', 'WIN_INFO_PRINTER_TOPMARGIN',
+            'WIN_INFO_PRINTER_TRANSPRASTER', 'WIN_INFO_PRINTER_TRANSPVECTOR',
+            'WIN_INFO_PRINTER_TRUECOLOR', 'WIN_INFO_SMARTPAN',
+            'WIN_INFO_SMOOTH_IMAGE', 'WIN_INFO_SMOOTH_TEXT',
+            'WIN_INFO_SMOOTH_VECTOR', 'WIN_INFO_SNAPMODE',
+            'WIN_INFO_SNAPTHRESHOLD', 'WIN_INFO_STATE',
+            'WIN_INFO_SYSMENUCLOSE', 'WIN_INFO_TABLE', 'WIN_INFO_TOPMOST',
+            'WIN_INFO_TYPE', 'WIN_INFO_WIDTH', 'WIN_INFO_WINDOWID',
+            'WIN_INFO_WND', 'WIN_INFO_WORKSPACE', 'WIN_INFO_X', 'WIN_INFO_Y',
+            'WIN_LAYOUT', 'WIN_LEGEND', 'WIN_MAPBASIC', 'WIN_MAPINFO',
+            'WIN_MAPPER', 'WIN_MESSAGE', 'WIN_PENPICKER',
+            'WIN_PRINTER_LANDSCAPE', 'WIN_PRINTER_PORTRAIT', 'WIN_RULER',
+            'WIN_STATE_MAXIMIZED', 'WIN_STATE_MINIMIZED', 'WIN_STATE_NORMAL',
+            'WIN_STATISTICS', 'WIN_STYLE_CHILD', 'WIN_STYLE_POPUP',
+            'WIN_STYLE_POPUP_FULLCAPTION', 'WIN_STYLE_STANDARD',
+            'WIN_SYMBOLPICKER', 'WIN_TOOLBAR', 'WIN_TOOLPICKER', 'YELLOW'
+            ),
+        5 => array(
+            'Abbrs', 'Above', 'Access', 'Active', 'Address', 'Advanced',
+            'Affine', 'Align', 'Alpha', 'alpha_value', 'Always', 'Angle',
+            'Animate', 'Antialiasing', 'Append', 'Apply', 'ApplyUpdates',
+            'Arrow', 'Ascending', 'ASCII', 'At', 'AttributeData', 'Auto',
+            'Autoflip', 'Autokey', 'Automatic', 'Autoscroll', 'Axis',
+            'Background', 'Banding', 'Batch', 'Behind', 'Below', 'Bend',
+            'Binary', 'Blocks', 'Border', 'BorderPen', 'Bottom', 'Bounds',
+            'ByteOrder', 'ByVal', 'Calling', 'Camera', 'Candidates',
+            'Cartesian', 'Cell', 'Center', 'Change', 'Char', 'Circle',
+            'Clipping', 'CloseMatchesOnly', 'ClosestAddr', 'Color', 'Columns',
+            'Contents', 'ControlPoints', 'Copies', 'Copyright', 'Counter',
+            'Country', 'CountrySecondarySubdivision', 'CountrySubdivision',
+            'Cross', 'CubicConvolution', 'Cull', 'Cursor', 'Custom', 'Data',
+            'DBF', 'DDE', 'Decimal', 'DecimalPlaces', 'DefaultAmbientSpeed',
+            'DefaultPropagationFactor', 'DeformatNumber', 'Delimiter',
+            'Density', 'DenyWrite', 'Descending', 'Destroy', 'Device',
+            'Dictionary', 'DInfo', 'Disable', 'DiscardUpdates', 'Display',
+            'Dither', 'DrawMode', 'DropKey', 'Droplines', 'Duplicates',
+            'Dynamic', 'Earth', 'East', 'EditLayerPopup', 'Elevation', 'Else',
+            'ElseIf', 'Emf', 'Enable', 'Envinsa', 'ErrorDiffusion', 'Extents',
+            'Fallback', 'FastEdit', 'FillFrame', 'Filter', 'First', 'Fit',
+            'Fixed', 'FocalPoint', 'Footnote', 'Force', 'FromMapCatalog',
+            'Front', 'Gap', 'Geographic', 'Geography', 'Graduated', 'Graphic',
+            'Gutter', 'Half', 'Halftone', 'Handles', 'Height', 'Help',
+            'HelpMsg', 'Hide', 'Hierarchical', 'HIGHLOW', 'History', 'Icon',
+            'ID', 'Ignore', 'Image', 'Inflect', 'Inset', 'Inside',
+            'Interactive', 'Internal', 'Interpolate', 'IntersectingStreet',
+            'Justify', 'Key', 'Label', 'Labels', 'Landscape', 'Large', 'Last',
+            'Layer', 'Left', 'Lib', 'Light', 'LinePen', 'Lines', 'Linestyle',
+            'Longitude', 'LOWHIGH', 'Major', 'MajorPolygonOnly',
+            'MajorRoadsOnly', 'MapBounds', 'MapMarker', 'MapString', 'Margins',
+            'MarkMultiple', 'MaskSize', 'Match', 'MaxOffRoadDistance',
+            'Message', 'MICODE', 'Minor', 'MixedCase', 'Mode', 'ModifierKeys',
+            'Modify', 'Multiple', 'MultiPolygonRgns', 'Municipality',
+            'MunicipalitySubdivision', 'Name', 'NATIVE', 'NearestNeighbor',
+            'NoCollision', 'Node', 'Nodes', 'NoIndex', 'None', 'Nonearth',
+            'NoRefresh', 'Normalized', 'North', 'Number', 'ObjectType', 'ODBC',
+            'Off', 'OK', 'OLE', 'On', 'Options', 'Orientation', 'OtherBdy',
+            'Output', 'Outside', 'Overlapped', 'Overwrite', 'Pagebreaks',
+            'Pan', 'Papersize', 'Parent', 'PassThrough', 'Password',
+            'Patterns', 'Per', 'Percent', 'Percentage', 'Permanent',
+            'PersistentCache', 'Pie', 'Pitch', 'Placename', 'PointsOnly',
+            'PolyObj', 'Portrait', 'Position', 'PostalCode', 'Prefer',
+            'Preferences', 'Prev', 'Printer', 'Projection', 'PushButton',
+            'Quantile', 'Query', 'Random', 'Range', 'Raster', 'Read',
+            'ReadOnly', 'Rec', 'Redraw', 'Refine', 'Regionstyle', 'RemoveData',
+            'Replace', 'Reprojection', 'Resampling', 'Restore', 'ResultCode',
+            'ReturnHoles', 'Right', 'Roll', 'ROP', 'Rotated', 'Row', 'Ruler',
+            'Scale', 'ScrollBars', 'Seamless', 'SecondaryPostalCode',
+            'SelfInt', 'Separator', 'Series', 'Service', 'SetKey',
+            'SetTraverse', 'Shades', 'Show', 'Simple', 'SimplificationFactor',
+            'Size', 'Small', 'Smart', 'Smooth', 'South', 'Spacing',
+            'SPATIALWARE', 'Spherical', 'Square', 'Stacked', 'Step', 'Store',
+            'Street', 'StreetName', 'StreetNumber', 'StyleType', 'Subtitle',
+            'SysMenuClose', 'Thin', 'Tick', 'Title', 'TitleAxisY',
+            'TitleGroup', 'Titles', 'TitleSeries', 'ToggleButton', 'Tolerance',
+            'ToolbarPosition', 'ToolButton', 'Toolkit', 'Top', 'Translucency',
+            'translucency_percent', 'Transparency', 'Transparent', 'Traverse',
+            'TrueColor', 'Uncheck', 'Undo', 'Union', 'Unit', 'Until', 'URL',
+            'Use', 'User', 'UserBrowse', 'UserClose', 'UserDisplayMap',
+            'UserEdit', 'UserMap', 'UserRemoveMap', 'Value', 'Variable',
+            'Vary', 'Vector', 'Versioned', 'View', 'ViewDisplayPopup',
+            'VisibleOnly', 'VMDefault', 'VMGrid', 'VMRaster', 'Voronoi',
+            'Warnings', 'Wedge', 'West', 'Width', 'With', 'XY', 'XYINDEX',
+            'Yaw', 'Zoom'
+            )
+        ),
+    'SYMBOLS' => array(
+            //Numeric/String Operators + Comparison Operators
+            '(', ')', '[', ']', '+', '-', '*', '/', '\\', '^', '&',
+            '=', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',        //Statements + Clauses + Data Types + Logical Operators, Geographical Operators + SQL
+            2 => 'color: #2391af;',        //Special Procedures
+            3 => 'color: #2391af;',        //Functions
+            4 => 'color: #c635cb;',        //Constants
+            5 => 'color: #0000ff;'         //Extended keywords (case sensitive)
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a31515;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #12198b;',            //Table Attributes
+            1 => 'color: #2391af;'             //Data Types
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+            //Table Attribute
+            0 => "[\\.]{1}[a-zA-Z0-9_]+",
+            //Data Type
+            1 => "(?xi) \\s+ as \\s+ (Alias|Brush|Date|Float|Font|Integer|Logical|Object|Pen|SmallInt|String|Symbol)"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/matlab.php b/sources/inc/geshi/matlab.php
new file mode 100644
index 0000000..7cdd50e
--- /dev/null
+++ b/sources/inc/geshi/matlab.php
@@ -0,0 +1,227 @@
+ 'Matlab M',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array(),
+    //Matlab Strings
+    'COMMENT_REGEXP' => array(
+        2 => "/(? GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'catch', 'continue', 'elseif', 'else', 'end', 'for',
+            'function', 'global', 'if', 'otherwise', 'persistent', 'return',
+            'switch', 'try', 'while'
+            ),
+        2 => array(
+            'all','any','exist','is','logical','mislocked',
+
+            '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',
+            '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','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(
+        '...'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        //3 => false,
+        //4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #228B22;',
+            2 => 'color:#A020F0;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #080;'
+            ),
+        'STRINGS' => array(
+            //0 => 'color: #A020F0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #33f;'
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #33f;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://www.mathworks.com/access/helpdesk/help/techdoc/ref/{FNAMEL}.html'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Complex numbers
+        0 => '(?html)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/mirc.php b/sources/inc/geshi/mirc.php
new file mode 100644
index 0000000..fa2f307
--- /dev/null
+++ b/sources/inc/geshi/mirc.php
@@ -0,0 +1,171 @@
+ 'mIRC Scripting',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'alias', 'menu', 'dialog',
+            ),
+        2 => array(
+            'if', 'elseif', 'else', 'while', 'return', 'goto', 'var'
+            ),
+        3 => array(
+            'action','ajinvite','amsg','ame','anick','aop','auser',
+            'avoice','auto','autojoin','away','background','ban','beep',
+            'channel','clear','clearall','clipboard','close','closemsg','color',
+            'copy','creq','ctcp','ctcpreply','ctcps','dcc','dde','ddeserver',
+            'debug','describe','disable','disconnect','dlevel','dll','dns',
+            'dqwindow','ebeeps','echo','editbox','emailaddr','enable','events',
+            'exit','filter','findtext','finger','flash','flood','flush',
+            'flushini','font','fsend','fserve','fullname','ghide','gload',
+            'gmove','gopts','gplay','gpoint','gqreq','groups','gshow','gsize',
+            'gstop','gtalk','gunload','guser','help','hop','ignore','invite',
+            'join','kick','linesep','links','list','load','loadbuf','localinfo',
+            'log','me','mdi','mkdir','mnick','mode','msg','names','nick','noop',
+            'notice','notify','omsg','onotice','part','partall','pdcc',
+            'perform','ping','play','pop','protect','pvoice','qmsg','qme',
+            'query','queryrn','quit','raw','remini','remote','remove','rename',
+            'enwin','resetidle','rlevel','rmdir','run','ruser','save','savebuf',
+            'saveini','say','server','showmirc','sline','sound','speak','splay',
+            'sreq','strip','time',
+            //'timer[N/name]', //Handled as a regular expression below ...
+            'timers','timestamp','titlebar','tnick','tokenize','topic','ulist',
+            'unload','updatenl','url','uwho','window','winhelp','write',
+            'writeini','who','whois','whowas'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '/'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #994444;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #990000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'STRINGS' => array(
+            ),
+        'NUMBERS' => array(
+            0 => '',
+            ),
+        'METHODS' => array(
+            0 => 'color: #008000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #FF0000;',
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000099;',
+            1 => 'color: #990000;',
+            2 => 'color: #000099;',
+            3 => 'color: #888800;',
+            4 => 'color: #888800;',
+            5 => 'color: #000099;',
+            6 => 'color: #990000; font-weight: bold;',
+            7 => 'color: #990000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.mirc.com/{FNAMEL}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
+    'REGEXPS' => array(
+        //Variable names
+        0 => '\$[a-zA-Z0-9]+',
+        //Variable names
+        1 => '(%|&)[\w\x80-\xFE]+',
+        //Client to Client Protocol handling
+        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',
+            GESHI_MODIFIERS => 'i',
+            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_]+',
+        // /...
+        7 => '(?|:|\/|\w)\/[a-zA-Z][a-zA-Z0-9]*(?!>)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?
\ No newline at end of file
diff --git a/sources/inc/geshi/mmix.php b/sources/inc/geshi/mmix.php
new file mode 100644
index 0000000..60b6e28
--- /dev/null
+++ b/sources/inc/geshi/mmix.php
@@ -0,0 +1,193 @@
+ 'MMIX',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '%'),
+    'COMMENT_MULTI' => array(),
+    //Line address prefix suppression
+    'COMMENT_REGEXP' => array(
+        3 => "/^\s*(?!\s)[^\w].*$/m",
+        4 => "/^\s*[0-9a-f]{12,16}+(?:\s+[0-9a-f]+(?:\.{3}[0-9a-f]{2,})?)?:/mi"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' => array(
+        1 => '(? '#[\da-fA-F]+',
+        3 => '\$\d+'
+        ),
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            '16ADDU','2ADDU','4ADDU','8ADDU','ADD','ADDU','AND','ANDN','ANDNH',
+            'ANDNL','ANDNMH','ANDNML','BDIF','BEV','BN','BNN','BNP','BNZ','BOD',
+            'BP','BZ','CMP','CMPU','CSEV','CSN','CSNN','CSNP','CSNZ','CSOD',
+            'CSP','CSWAP','CSZ','DIV','DIVU','FADD','FCMP','FCMPE','FDIV',
+            'FEQL','FEQLE','FINT','FIX','FIXU','FLOT','FLOTU','FMUL','FREM',
+            'FSQRT','FSUB','FUN','FUNE','GET','GETA','GO','INCH','INCL','INCMH',
+            'INCML','JMP','LDA','LDB','LDBU','LDHT','LDO','LDOU','LDSF','LDT',
+            'LDTU','LDUNC','LDVTS','LDW','LDWU','MOR','MUL','MULU','MUX','MXOR',
+            'NAND','NEG','NEGU','NOR','NXOR','ODIF','OR','ORH','ORL','ORMH',
+            'ORML','ORN','PBEV','PBN','PBNN','PBNP','PBNZ','PBOD','PBP','PBZ',
+            'POP','PREGO','PRELD','PREST','PUSHGO','PUSHJ','PUT','RESUME','SADD',
+            'SAVE','SETH','SETL','SETMH','SETML','SFLOT','SFLOTU','SL','SLU',
+            'SR','SRU','STB','STBU','STCO','STHT','STO','STOU','STSF','STT',
+            'STTU','STUNC','STW','STWU','SUB','SUBU','SWYM','SYNC','SYNCD',
+            'SYNCID','TDIF','TRAP','TRIP','UNSAVE','WDIF','XOR','ZSEV','ZSN',
+            'ZSNN','ZSNP','ZSNZ','ZSOD','ZSP','ZSZ'
+            ),
+        2 => array(
+            'BSPEC','BYTE','ESPEC','GREG','IS','LOC','LOCAL','OCTA',
+            'PREFIX','SET','TETRA','WYDE'
+            ),
+        /*registers*/
+        3 => array(
+            'rA','rB','rC','rD','rE','rF','rG','rH','rI','rJ','rK','rL','rM',
+            'rN','rO','rP','rQ','rR','rS','rT','rU','rV','rW','rX','rY','rZ',
+            'rBB','rTT','rWW','rXX','rYY','rZZ'
+            ),
+//        /*Directive*/
+//        4 => array(
+//            ),
+//        /*Operands*/
+//        5 => array(
+//            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')',
+        '+', '-', '*', '/', '%',
+        '.', ',', ';', ':',
+        '<<','>>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => false,
+        3 => true,
+//        4 => false,
+//        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f; font-weight: bold;',
+            2 => 'color: #0000ff; font-weight: bold;',
+            3 => 'color: #00007f;',
+//            4 => 'color: #000000; font-weight: bold;',
+//            5 => 'color: #000000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #666666; font-style: italic;',
+            4 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;',
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #00007f;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+//            0 => 'color: #0000ff;',
+//            1 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+//        4 => '',
+//        5 => ''
+        ),
+/*
+    'NUMBERS' =>
+        GESHI_NUMBER_BIN_PREFIX_PERCENT |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX |
+        GESHI_NUMBER_OCT_SUFFIX |
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+*/
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+//        0 => /*  */ "(?<=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))(?:[0-9][0-9a-fA-F]{0,31}[hH]|0x[0-9a-fA-F]{1,32})(?=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))",
+        //Binary numbers
+//        1 => "(?<=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))[01]{1,64}[bB](?=([\\s\\(\\)\\[\\],;.:+\\-\\/*]))"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/modula2.php b/sources/inc/geshi/modula2.php
new file mode 100644
index 0000000..1850834
--- /dev/null
+++ b/sources/inc/geshi/modula2.php
@@ -0,0 +1,136 @@
+ 'Modula-2',
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'COMMENT_SINGLE' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("''"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( /* reserved words */
+            'AND', 'ARRAY', 'BEGIN', 'BY', 'CASE', 'CONST', 'DEFINITION',
+            'DIV', 'DO', 'ELSE', 'ELSIF', 'END', 'EXIT', 'EXPORT', 'FOR',
+            'FROM', 'IF', 'IMPLEMENTATION', 'IMPORT', 'IN', 'LOOP', 'MOD',
+            'MODULE', 'NOT', 'OF', 'OR', 'POINTER', 'PROCEDURE', 'QUALIFIED',
+            'RECORD', 'REPEAT', 'RETURN', 'SET', 'THEN', 'TO', 'TYPE',
+            'UNTIL', 'VAR', 'WHILE', 'WITH'
+            ),
+        2 => array( /* pervasive constants */
+            'NIL', 'FALSE', 'TRUE',
+            ),
+        3 => array( /* pervasive types */
+            'BITSET', 'CAP', 'CHR', 'DEC', 'DISPOSE', 'EXCL', 'FLOAT',
+            'HALT', 'HIGH', 'INC', 'INCL', 'MAX', 'MIN', 'NEW', 'ODD', 'ORD',
+            'SIZE', 'TRUNC', 'VAL'
+            ),
+        4 => array( /* pervasive functions and macros */
+            'ABS', 'BOOLEAN', 'CARDINAL', 'CHAR', 'INTEGER',
+            'LONGCARD', 'LONGINT', 'LONGREAL', 'PROC', 'REAL'
+            ),
+        ),
+    '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' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/modula3.php b/sources/inc/geshi/modula3.php
new file mode 100644
index 0000000..ae08dcf
--- /dev/null
+++ b/sources/inc/geshi/modula3.php
@@ -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', 'OVERRIDES', '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
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/mpasm.php b/sources/inc/geshi/mpasm.php
new file mode 100644
index 0000000..f724a94
--- /dev/null
+++ b/sources/inc/geshi/mpasm.php
@@ -0,0 +1,164 @@
+ 'Microchip Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*Directive Language*/
+        4 => array(
+            'CONSTANT', '#DEFINE', 'END', 'EQU', 'ERROR', 'ERROR-LEVEL', '#INCLUDE', 'LIST',
+            'MESSG', 'NOLIST', 'ORG', 'PAGE', 'PROCESSOR', 'RADIX', 'SET', 'SPACE', 'SUBTITLE',
+            'TITLE', '#UNDEFINE', 'VARIABLE', 'ELSE', 'ENDIF', 'ENDW', 'IF', 'IFDEF', 'IFNDEF',
+            'WHILE', '__BADRAM', 'CBLOCK', '__CONFIG', 'DA', 'DATA', 'DB', 'DE', 'DT', 'DW',
+            'ENDC', 'FILL', '__IDLOCS', '__MAXRAM', 'RES', 'ENDM', 'EXITM', 'EXPAND', 'LOCAL',
+            'MACRO', 'NOEXPAND', 'BANKISEL', 'BANKSEL', 'CODE', 'EXTERN', 'GLOBAL', 'IDATA',
+            'PAGESEL', 'UDATA', 'UDATA_ACS', 'UDATA_OVR', 'UDATA_SHR'
+            ),
+        /* 12&14-bit Specific Instruction Set*/
+        1 => array(
+            'andlw', 'call', 'clrwdt', 'goto', 'iorlw', 'movlw', 'option', 'retlw', 'sleep',
+            'tris', 'xorlw', 'addwf', 'andwf', 'clrf', 'clrw', 'comf', 'decf', 'decfsz', 'incf',
+            'incfsz', 'iorwf', 'movf', 'nop', 'rlf', 'rrf', 'subwf', 'swapf', 'xorwf',
+            'bcf', 'bsf', 'btfsc', 'btfss',
+            'addlw', 'retfie', 'return', 'sublw', 'addcf', 'adddcf', 'b', 'bc', 'bdc',
+            'bnc', 'bndc', 'bnz', 'bz', 'clrc', 'clrdc', 'clrz', 'lcall', 'lgoto', 'movfw',
+            'negf', 'setc', 'setdc', 'setz', 'skpc', 'skpdc', 'skpnc', 'skpndc', 'skpnz', 'skpz',
+            'subcf', 'subdcf', 'tstf'
+            ),
+        /* 16-bit Specific Instructiob Set */
+        2 => array (
+            'movfp', 'movlb', 'movlp', 'movpf', 'movwf', 'tablrd', 'tablwt', 'tlrd', 'tlwt',
+            'addwfc', 'daw', 'mullw', 'negw', 'rlcf', 'rlncf', 'rrcf', 'rrncf', 'setf', 'subwfb',
+            'btg', 'cpfseq', 'cpfsgt', 'cpfslt', 'dcfsnz', 'infsnz', 'tstfsz', 'lfsr', 'bnn',
+            'bnov', 'bra', 'pop', 'push', 'rcall', 'reset'
+            ),
+        /* Registers */
+        3 => array(
+            'INDF', 'TMR0', 'PCL', 'STATUS', 'FSR', 'PORTA', 'PORTB', 'PORTC', 'PORTD', 'PORTE',
+            'PCLATH', 'INTCON', 'PIR1', 'PIR2', 'TMR1L', 'TMR1H', 'T1CON', 'TMR2', 'T2CON', 'TMR2L',
+            'TMR2H', 'TMR0H', 'TMR0L', 'SSPBUF', 'SSPCON', 'CCPR1L', 'CCPR1H', 'CCP1CON', 'RCSTA',
+            'TXREG', 'RCREG', 'CCPR2L', 'CCPR2H', 'CCP2CON', 'OPTION', 'TRISA', 'TRISB', 'TRISC',
+            'TRISD', 'TRISE', 'PIE2', 'PIE1', 'PR2', 'SSPADD', 'SSPSTAT', 'TXSTA', 'SPBRG'
+            ),
+        /*Operands*/
+        5 => array(
+            'high','low'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #007f00;',
+            4 => 'color: #46aa03; font-weight:bold;',
+            5 => 'color: #7f0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0000;',
+            1 => 'color: #ff0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '[01]{1,64}[bB]'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/mxml.php b/sources/inc/geshi/mxml.php
new file mode 100644
index 0000000..0cc8287
--- /dev/null
+++ b/sources/inc/geshi/mxml.php
@@ -0,0 +1,145 @@
+ 'MXML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(''),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            '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(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #339933;',
+            3 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight: bold; color: black;',
+            1 => 'color: #7400FF;',
+            2 => 'color: #7400FF;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // xml declaration
+        0 => array(
+            GESHI_SEARCH => '(<[\/?|(\?xml)]?[a-z0-9_\-:]*(\?>))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // opening tags
+        1 => array(
+            GESHI_SEARCH => '(<\/?[a-z]+:[a-z]+)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // closing tags
+        2 => array(
+            GESHI_SEARCH => '(\/?>)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            ' '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            //' ']]>'
+            '' => ''
+            ),
+        3 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/mysql.php b/sources/inc/geshi/mysql.php
new file mode 100644
index 0000000..507da2d
--- /dev/null
+++ b/sources/inc/geshi/mysql.php
@@ -0,0 +1,475 @@
+ 'MySQL',
+    //'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' => 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: 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','CHANGE','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','PARTITION','PREV','PRIMARY KEY','PRIVILEGES','PROCEDURE',
+            'PURGE','QUICK','READS SQL DATA','READ','REFERENCES','RELEASE',
+            'RENAME','REORGANIZE','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(
+            // Values (Constants)
+            'FALSE','NULL','TRUE',
+            ),
+        4 => array(
+            // 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(
+        1 => array(
+            /* Operators */
+            '=', ':=',                                      // assignment operators
+            '||', '&&', '!',                                // locical operators
+            '=', '<=>', '>=', '>', '<=', '<', '<>', '!=',   // comparison operators
+            '|', '&', '^', '~', '<<', '>>',                 // bitwise operators
+            '-', '+', '*', '/', '%',                        // numerical operators
+            ),
+        2 => array(
+            /* Other syntactical symbols */
+            '(', ')',
+            ',', ';',
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => 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: #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: #808000; font-style: italic;',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #004000; font-weight: bold;',
+            1 => 'color: #008080; font-weight: bold;'       // search wildcards
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #008000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #008080;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #CC0099;',         // operators
+            2 => 'color: #000033;',         // syntax
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+        2 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+        3 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+        4 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+        5 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+        6 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+        7 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+        8 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+        9 => 'http://search.oracle.com/search/search?group=MySQL&q={FNAME}',
+
+        10 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/non-typed-operators.html',
+        11 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/non-typed-operators.html',
+
+        12 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/control-flow-functions.html',
+        13 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/string-functions.html',
+        14 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/string-functions.html',
+        15 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/numeric-functions.html',
+        16 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/numeric-functions.html',
+        17 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/date-and-time-functions.html',
+        18 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/date-and-time-functions.html',
+        19 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/comparison-operators.html',
+        20 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/comparison-operators.html',
+        21 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/encryption-functions.html',
+        22 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/group-by-functions-and-modifiers.html',
+        23 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/information-functions.html',
+        24 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/information-functions.html',
+        25 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/func-op-summary-ref.html',
+        26 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/func-op-summary-ref.html',
+        27 => 'http://dev.mysql.com/doc/refman/%35%2E%31/en/analysing-spatial-information.html',
+        ),
+    '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(
+            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' => '(?=\()'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/nagios.php b/sources/inc/geshi/nagios.php
new file mode 100644
index 0000000..32cbaef
--- /dev/null
+++ b/sources/inc/geshi/nagios.php
@@ -0,0 +1,225 @@
+
+ * Copyright: (c) 2012 Albéric de Pertat (https://github.com/adepertat/geshi-nagios)
+ * Release Version: 1.0.8.11
+ * Date Started: 2012/01/19
+ *
+ * Nagios language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2012/01/19 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2012/01/19)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     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' => 'Nagios',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'HARDQUOTE' => array("'", "'"),
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\'',
+    'KEYWORDS' => array(
+        1 => array(
+            'define'
+            ),
+        2 => array(
+            'command', 'contact', 'contactgroup', 'host', 'hostdependency',
+            'hostescalation', 'hostextinfo', 'hostgroup', 'service',
+            'servicedependency', 'serviceescalation',
+            'serviceextinfo', 'servicegroup', 'timeperiod'
+            ),
+        3 => array(
+            'active_checks_enabled', 'passive_checks_enabled', 'alias',
+            'display_name', 'host_name', 'address', 'hostgroups', 'parents',
+            'hostgroup_members', 'members', 'service_description',
+            'servicegroups', 'is_volatile', 'servicegroup_name',
+            'servicegroup_members', 'contact_name', 'contactgroups', 'email',
+            'pager', 'can_submit_commands', 'contactgroup_name',
+            'contactgroup_members', 'host_notifications_enabled',
+            'service_notifications_enabled', 'host_notification_period',
+            'service_notification_period', 'host_notification_options',
+            'service_notification_options', 'host_notification_commands',
+            'service_notification_commands', 'check_command',
+            'check_freshness', 'check_interval', 'check_period', 'contacts',
+            'contact_groups', 'event_handler', 'event_handler_enabled',
+            'flap_detection_enabled', 'flap_detection_options',
+            'freshness_threshold', 'initial_state', 'low_flap_threshold',
+            'high_flap_threshold', 'max_check_attempts',
+            'notification_interval', 'first_notification_delay',
+            'notification_period', 'notification_options',
+            'notifications_enabled', 'stalking_options', 'notes', 'notes_url',
+            'action_url', 'icon_image', 'icon_image_alt', 'vrml_image',
+            'statusmap_image', '2d_coords', '3d_coords', 'obsess_over_host',
+            'obsess_over_hostver_service', 'process_perf_data',
+            'retain_status_information', 'retain_nonstatus_information',
+            'retry_interval', 'register', 'use', 'name', 'timeperiod_name',
+            'exclude', 'command_name', 'command_line', 'dependent_host_name',
+            'dependent_hostgroup_name', 'dependent_service_description',
+            'inherits_parent', 'execution_failure_criteria',
+            'notification_failure_criteria', 'dependency_period',
+            'first_notification', 'last_notification', 'escalation_period',
+            'escalation_options'
+            ),
+        4 => array(
+            'monday', 'tuesday', 'wednesday', 'thursday', 'friday', 'saturday',
+            'sunday', 'january', 'february', 'march', 'april', 'may', 'june',
+            'july', 'august', 'september', 'october', 'november', 'december',
+            'day'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '{', '}', ',', '+'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight:bold;color:#FFDCA8;',
+            2 => 'font-weight:bold;color #FFA858;',
+            3 => 'font-weight:bold;color:#00C0C0;',
+            4 => 'font-weight:bold;color:#C0C0FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'font-weight:bold;color:#000000;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #AAAAAA; font-style: italic;',
+            1 => 'color: #AAAAAA; font-style: italic;',
+            2 => 'color: #AAAAAA; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #660066;',
+            'HARD' => 'color: #660066;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'REGEXPS' => array(
+            0 => 'font-weight:bold;color:#808080;',
+            1 => 'font-weight:bold;color:#000080;',
+            2 => 'font-weight:bold;color:red;',
+            3 => 'font-weight:bold;color:#808000;',
+            4 => 'font-weight:bold;color:blue;',
+            5 => 'font-weight:bold;color:#C0FFC0;',
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            )
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '\\'
+        ),
+    'REGEXPS' => array(
+        // Custom macros
+        0 => array(
+            GESHI_SEARCH => '(\$[a-zA-Z_]+\$)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        // Custom macro definitions
+        1 => array(
+            GESHI_SEARCH => '(\A|\s)(_[a-zA-Z_]+)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '',
+            ),
+        // $USERxx$
+        2 => array(
+            GESHI_SEARCH => '(\$USER[0-9]+\$)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        // $ARGxx$
+        3 => array(
+            GESHI_SEARCH => '(\$ARG[1-9]\$)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        // register 0
+        4 => array(
+            GESHI_SEARCH => '(\bregister[\\x20\\t]+[01])',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        // use
+        5 => array(
+            GESHI_SEARCH => '(use[\\x20\\t]+[^\\x20\\t]+)([\\x20\\t]*[$;#])',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '',
+            ),
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/netrexx.php b/sources/inc/geshi/netrexx.php
new file mode 100644
index 0000000..14a2d23
--- /dev/null
+++ b/sources/inc/geshi/netrexx.php
@@ -0,0 +1,163 @@
+ 'NetRexx',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'class', 'do', 'exit', 'if', 'import', 'iterate', 'leave',
+            'loop', 'nop', 'numeric', 'package', 'parse', 'properties',
+            'return', 'say', 'select', 'signal', 'trace'
+            ),
+        2 => array(
+            'abstract', 'adapter', 'all', 'ask', 'binary', 'case',
+            'constant', 'dependent', 'deprecated', 'extends', 'final',
+            'implements', 'inheritable', 'interface', 'label', 'methods',
+            'native', 'off', 'private', 'protect', 'public', 'results',
+            'returns', 'shared', 'signals', 'source', 'static',
+            'transient', 'unused', 'uses', 'version', 'volatile'
+            ),
+        3 => array(
+            'catch', 'else', 'end', 'finally', 'otherwise', 'then', 'when'
+            ),
+        4 => array(
+            'rc', 'result', 'self', 'sigl', 'super'
+            ),
+        5 => array(
+            'placeholderforoorexxdirectives'
+            ),
+        6 => array(
+            'abbrev', 'abs', 'b2x', 'c2d', 'c2x', 'center', 'centre',
+            'changestr', 'compare', 'copies', 'copyindexed', 'countstr',
+            'd2c', 'd2x', 'datatype', 'delstr', 'delword', 'exists',
+            'formword', 'hashcode', 'insert', 'lastpos', 'left', 'lower',
+            'max', 'min', 'noteq', 'noteqs', 'opadd', 'opand', 'opcc',
+            'opccblank', 'opdiv', 'opdivi', 'opeq', 'opeqs', 'opgt',
+            'opgteq', 'opgteqs', 'opgts', 'oplt', 'oplteq', 'oplteqs',
+            'oplts', 'opminus', 'opmult', 'opnot', 'opor', 'opplus',
+            'oppow', 'oprem', 'opsub', 'opxor', 'overlay', 'pos position',
+            'reverse', 'right', 'sequence', 'setdigits', 'setform',
+            'sign', 'space', 'strip', 'substr', 'subword', 'toboolean',
+            'tobyte', 'tochar', 'todouble', 'tofloat', 'toint', 'tolong',
+            'toshort', 'tostring', 'translate', 'trunc', 'upper',
+            'verify', 'word', 'wordindex', 'wordlength', 'wordpos',
+            'words', 'x2b', 'x2c', 'x2d'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '<', '>', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':',
+        '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #ff0000; font-weight: bold;',
+            3 => 'color: #00ff00; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;',
+            5 => 'color: #880088; font-weight: bold;',
+            6 => 'color: #888800; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            'MULTI' => 'color: #808080;'
+            ),
+        '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: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/newlisp.php b/sources/inc/geshi/newlisp.php
new file mode 100644
index 0000000..0dc6c16
--- /dev/null
+++ b/sources/inc/geshi/newlisp.php
@@ -0,0 +1,191 @@
+ 'newlisp',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
+    'COMMENT_MULTI' => array('[text]' => '[/text]', '{' => '}'), // also used for strings
+    '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,
+    'TAB_WIDTH' => 2,
+    'KEYWORDS' => array(
+        1 => array(
+            'NaN?','abort','abs','acos','acosh','add','address','amb','and',
+            'append','append-file','apply','args','array','array-list','array?',
+            'asin','asinh','assoc','atan','atan2','atanh','atom?','base64-dec',
+            'base64-enc','bayes-query','bayes-train','begin','beta','betai',
+            'bind','binomial','bits','callback','case','catch','ceil',
+            'change-dir','char','chop','clean','close','command-event','cond',
+            'cons','constant','context','context?','copy','copy-file','cos',
+            'cosh','count','cpymem','crc32','crit-chi2','crit-z','current-line',
+            'curry','date','date-value','debug','dec','def-new','default',
+            'define','define-macro','delete','delete-file','delete-url',
+            'destroy','det','device','difference','directory','directory?',
+            'div','do-until','do-while','doargs','dolist','dostring','dotimes',
+            'dotree','dump','dup','empty?','encrypt','ends-with','env','erf',
+            'error-event','estack','eval','eval-string','exec','exists','exit',
+            'exp','expand','explode','factor','fft','file-info','file?',
+            'filter','find','find-all','first','flat','float','float?','floor',
+            'flt','for','for-all','fork','format','fv','gammai','gammaln','gcd',
+            'get-char','get-float','get-int','get-long','get-string','get-url',
+            'global','global?','if','if-not','ifft','import','inc','index',
+            'inf?','int','integer','integer?','intersect','invert','irr','join',
+            'lambda','lambda?','last','last-error','legal?','length','let',
+            'letex','letn','list','list?','load','local','log','lookup',
+            'lower-case','macro?','main-args','make-dir','map','mat','match',
+            'max','member','min','mod','mul','multiply','name','net-accept',
+            'net-close','net-connect','net-error','net-eval','net-interface',
+            'net-listen','net-local','net-lookup','net-peek','net-peer',
+            'net-ping','net-receive','net-receive-from','net-receive-udp',
+            'net-select','net-send','net-send-to','net-send-udp','net-service',
+            'net-sessions','new','nil','nil?','normal','not','now','nper','npv',
+            'nth','null?','number?','open','or','pack','parse','parse-date',
+            'peek','pipe','pmt','pop','pop-assoc','post-url','pow',
+            'pretty-print','primitive?','print','println','prob-chi2','prob-z',
+            'process','prompt-event','protected?','push','put-url','pv','quote',
+            'quote?','rand','random','randomize','read-buffer','read-char',
+            'read-expr','read-file','read-key','read-line','read-utf8',
+            'real-path','receive','ref','ref-all','regex','regex-comp',
+            'remove-dir','rename-file','replace','reset','rest','reverse',
+            'rotate','round','save','search','seed','seek','select','semaphore',
+            'send','sequence','series','set','set-locale','set-ref',
+            'set-ref-all','setf','setq','sgn','share','signal','silent','sin',
+            'sinh','sleep','slice','sort','source','spawn','sqrt','starts-with',
+            'string','string?','sub','swap','sym','symbol?','symbols','sync',
+            'sys-error','sys-info','tan','tanh','throw','throw-error','time',
+            'time-of-day','timer','title-case','trace','trace-highlight',
+            'transpose','trim','true','true?','unicode','unify','unique',
+            'unless','unpack','until','upper-case','utf8','utf8len','uuid',
+            'wait-pid','when','while','write-buffer','write-char','write-file',
+            'write-line','xfer-event','xml-error','xml-parse','xml-type-tags',
+            'zero?'
+            )
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '(', ')','\''
+            ),
+        1 => array(
+            '!','!=','$','%','&','*','+','-','/',':',
+            '<','<<','<=','=','>','>=','>>','^','|'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000AA;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #00aa00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #009900;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #777700;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #000099;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #AA0000;',
+            1 => 'color: #0000AA;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #00aa00;',
+            1 => 'color: #00aa00;',
+            2 => 'color: #00aa00;',
+            3 => 'color: #00aa00;',
+            4 => 'color: #00aa00;',
+            5 => 'color: #AA0000;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.newlisp.org/downloads/newlisp_manual.html#{FNAME}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(':'),
+    'REGEXPS' => array(
+        // tags in newlispdoc
+        0 => "\s+@\S*?\s+",
+        // dollar sign symbols
+        1 => "[\\$]\w*",
+        // curly-braced string literals
+        2 => "{[^{}]*?}",
+        // [text] multi-line strings
+        3 => "(?s)\[text\].*\[\/text\](?-s)",
+        // [code] multi-line blocks
+        4 => "(?s)\[code\].*\[\/code\](?-s)",
+        // variable references
+        5 => "'[\w\-]+"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'OOLANG' => array(
+            'MATCH_AFTER' => '[a-zA-Z][a-zA-Z0-9_\-]*'
+            ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => '(?<=[^\w\-])',
+            )
+        ),
+
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/nsis.php b/sources/inc/geshi/nsis.php
new file mode 100644
index 0000000..35df9b4
--- /dev/null
+++ b/sources/inc/geshi/nsis.php
@@ -0,0 +1,351 @@
+ 'NSIS',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'",'"','`'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            '!appendfile', '!addIncludeDir', '!addplugindir', '!cd', '!define', '!delfile', '!echo', '!else',
+            '!endif', '!error', '!execute', '!ifdef', '!ifmacrodef', '!ifmacrondef', '!ifndef', '!include',
+            '!insertmacro', '!macro', '!macroend', '!packhdr', '!tempfile', '!system', '!undef', '!verbose',
+            '!warning'
+            ),
+        2 => array(
+            'AddBrandingImage', 'AllowRootDirInstall', 'AutoCloseWindow', 'BGFont',
+            'BGGradient', 'BrandingText', 'Caption', 'ChangeUI', 'CheckBitmap', 'CompletedText', 'ComponentText',
+            'CRCCheck', 'DetailsButtonText', 'DirShow', 'DirText', 'DirVar', 'DirVerify', 'FileErrorText',
+            'Function', 'FunctionEnd', 'Icon', 'InstallButtonText', 'InstallColors', 'InstallDir',
+            'InstallDirRegKey', 'InstProgressFlags', 'InstType', 'LangString', 'LangStringUP', 'LicenseBkColor',
+            'LicenseData', 'LicenseForceSelection', 'LicenseLangString', 'LicenseText', 'LoadLanguageFile',
+            'MiscButtonText', 'Name', 'OutFile', 'Page', 'PageEx', 'PageExEnd', 'Section',
+            'SectionEnd', 'SectionGroup', 'SectionGroupEnd', 'SetCompressor', 'SetFont', 'ShowInstDetails',
+            'ShowUninstDetails', 'SilentInstall', 'SilentUnInstall', 'SpaceTexts', 'SubCaption', 'SubSection',
+            'SubSectionEnd', 'UninstallButtonText', 'UninstallCaption', 'UninstallIcon', 'UninstallSubCaption',
+            'UninstallText', 'UninstPage', 'Var', 'VIAddVersionKey', 'VIProductVersion', 'WindowIcon', 'XPStyle'
+            ),
+        3 => array(
+            'AddSize', 'AllowSkipFiles', 'FileBufSize', 'GetInstDirError', 'PageCallbacks',
+            'SectionIn', 'SetCompress', 'SetCompressionLevel', 'SetCompressorDictSize',
+            'SetDatablockOptimize', 'SetDateSave', 'SetOverwrite', 'SetPluginUnload'
+            ),
+        4 => array(
+            'Abort', 'BringToFront', 'Call', 'CallInstDLL', 'ClearErrors', 'CopyFiles','CreateDirectory',
+            'CreateFont', 'CreateShortCut', 'Delete', 'DeleteINISec', 'DeleteINIStr', 'DeleteRegKey',
+            'DeleteRegValue', 'DetailPrint', 'EnableWindow', 'EnumRegKey', 'EnumRegValue', 'Exch', 'Exec',
+            'ExecShell', 'ExecWait', 'ExpandEnvStrings', 'File', 'FileClose', 'FileOpen', 'FileRead',
+            'FileReadByte', 'FileSeek', 'FileWrite', 'FileWriteByte', 'FindClose', 'FindFirst', 'FindNext',
+            'FindWindow', 'FlushINI', 'GetCurInstType', 'GetCurrentAddress', 'GetDlgItem', 'GetDLLVersion',
+            'GetDLLVersionLocal', 'GetErrorLevel', 'GetFileTime', 'GetFileTimeLocal', 'GetFullPathName',
+            'GetFunctionAddress', 'GetLabelAddress', 'GetTempFileName', 'GetWindowText', 'Goto', 'HideWindow',
+            'IfAbort', 'IfErrors', 'IfFileExists', 'IfRebootFlag', 'IfSilent', 'InitPluginsDir', 'InstTypeGetText',
+            'InstTypeSetText', 'IntCmp', 'IntCmpU', 'IntFmt', 'IntOp', 'IsWindow', 'LockWindow', 'LogSet', 'LogText',
+            'MessageBox', 'Nop', 'Pop', 'Push', 'Quit', 'ReadEnvStr', 'ReadIniStr', 'ReadRegDWORD', 'ReadRegStr',
+            'Reboot', 'RegDLL', 'Rename', 'ReserveFile', 'Return', 'RMDir', 'SearchPath', 'SectionGetFlags',
+            'SectionGetInstTypes', 'SectionGetSize', 'SectionGetText', 'SectionSetFlags', 'SectionSetInstTypes',
+            'SectionSetSize', 'SectionSetText', 'SendMessage', 'SetAutoClose', 'SetBrandingImage', 'SetCtlColors',
+            'SetCurInstType', 'SetDetailsPrint', 'SetDetailsView', 'SetErrorLevel', 'SetErrors', 'SetFileAttributes',
+            'SetOutPath', 'SetRebootFlag', 'SetShellVarContext', 'SetSilent', 'ShowWindow', 'Sleep', 'StrCmp',
+            'StrCpy', 'StrLen', 'UnRegDLL', 'WriteINIStr', 'WriteRegBin', 'WriteRegDWORD', 'WriteRegExpandStr',
+            'WriteRegStr', 'WriteUninstaller'
+            ),
+        5 => array(
+            'all', 'alwaysoff', 'ARCHIVE', 'auto', 'both', 'bzip2', 'checkbox', 'components', 'current',
+            'custom', 'directory', 'false', 'FILE_ATTRIBUTE_ARCHIVE', 'FILE_ATTRIBUTE_HIDDEN', 'FILE_ATTRIBUTE_NORMAL',
+            'FILE_ATTRIBUTE_OFFLINE', 'FILE_ATTRIBUTE_READONLY', 'FILE_ATTRIBUTE_SYSTEM,TEMPORARY',
+            'FILE_ATTRIBUTE_TEMPORARY', 'force', 'HIDDEN', 'hide', 'HKCC', 'HKCR', 'HKCU', 'HKDD', 'HKEY_CLASSES_ROOT',
+            'HKEY_CURRENT_CONFIG', 'HKEY_CURRENT_USER', 'HKEY_DYN_DATA', 'HKEY_LOCAL_MACHINE', 'HKEY_PERFORMANCE_DATA',
+            'HKEY_USERS', 'HKLM', 'HKPD', 'HKU', 'IDABORT', 'IDCANCEL', 'IDIGNORE', 'IDNO', 'IDOK', 'IDRETRY', 'IDYES',
+            'ifdiff', 'ifnewer', 'instfiles', 'lastused', 'leave', 'license', 'listonly', 'lzma', 'manual',
+            'MB_ABORTRETRYIGNORE', 'MB_DEFBUTTON1', 'MB_DEFBUTTON2', 'MB_DEFBUTTON3', 'MB_DEFBUTTON4',
+            'MB_ICONEXCLAMATION', 'MB_ICONINFORMATION', 'MB_ICONQUESTION', 'MB_ICONSTOP', 'MB_OK', 'MB_OKCANCEL',
+            'MB_RETRYCANCEL', 'MB_RIGHT', 'MB_SETFOREGROUND', 'MB_TOPMOST', 'MB_YESNO', 'MB_YESNOCANCEL', 'nevershow',
+            'none', 'normal', 'off', 'OFFLINE', 'on', 'radiobuttons', 'READONLY', 'RO', 'SHCTX', 'SHELL_CONTEXT', 'show',
+            'silent', 'silentlog', 'SW_HIDE', 'SW_SHOWMAXIMIZED', 'SW_SHOWMINIMIZED', 'SW_SHOWNORMAL', 'SYSTEM',
+            'textonly', 'true', 'try', 'uninstConfirm', 'zlib'
+            ),
+        6 => array(
+            '/a', '/components', '/COMPONENTSONLYONCUSTOM', '/CUSTOMSTRING', '/e', '/FILESONLY', '/FINAL', '/gray', '/GLOBAL',
+            '/ifempty', '/IMGID', '/ITALIC', '/lang', '/NOCUSTOM', '/nonfatal', '/NOUNLOAD', '/oname', '/r', '/REBOOTOK',
+            '/RESIZETOFIT', '/SOLID', '/SD', '/SHORT', '/silent', '/STRIKE', '/TIMEOUT', '/TRIMCENTER', '/TRIMLEFT',
+            '/TRIMRIGHT', '/UNDERLINE', '/windows', '/x'
+            ),
+        7 => array(
+            '.onGUIEnd', '.onGUIInit', '.onInit', '.onInstFailed', '.onInstSuccess', '.onMouseOverSection',
+            '.onRebootFailed', '.onSelChange', '.onUserAbort', '.onVerifyInstDir', 'un.onGUIEnd', 'un.onGUIInit',
+            'un.onInit', 'un.onRebootFailed', 'un.onUninstFailed', 'un.onUninstSuccess', 'un.onUserAbort'
+            ),
+        8 => array(
+            'MUI.nsh', '"${NSISDIR}\Contrib\Modern UI\System.nsh"', 'MUI_SYSVERSION', 'MUI_ICON', 'MUI_UNICON',
+            'MUI_HEADERIMAGE', 'MUI_HEADERIMAGE_BITMAP', 'MUI_HEADERIMAGE_BITMAP_NOSTRETCH', 'MUI_HEADERIMAGE_BITMAP_RTL',
+            'MUI_HEADERIMAGE_BITMAP_RTL_NOSTRETCH', 'MUI_HEADERIMAGE_UNBITMAP', 'MUI_HEADERIMAGE_UNBITMAP_NOSTRETCH',
+            'MUI_HEADERIMAGE_UNBITMAP_RTL', 'MUI_HEADERIMAGE_UNBITMAP_RTL_NOSTRETCH', 'MUI_HEADERIMAGE_RIGHT', 'MUI_BGCOLOR',
+            'MUI_UI', 'MUI_UI_HEADERIMAGE', 'MUI_UI_HEADERIMAGE_RIGHT', 'MUI_UI_COMPONENTSPAGE_SMALLDESC',
+            'MUI_UI_COMPONENTSPAGE_NODESC', 'MUI_WELCOMEFINISHPAGE_BITMAP', 'MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH',
+            'MUI_WELCOMEFINISHPAGE_INI', 'MUI_UNWELCOMEFINISHPAGE_BITMAP', 'MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH',
+            'MUI_UNWELCOMEFINISHPAGE_INI', 'MUI_LICENSEPAGE_BGCOLOR', 'MUI_COMPONENTSPAGE_CHECKBITMAP',
+            'MUI_COMPONENTSPAGE_SMALLDESC', 'MUI_COMPONENTSPAGE_NODESC', 'MUI_INSTFILESPAGE_COLORS',
+            'MUI_INSTFILESPAGE_PROGRESSBAR', 'MUI_FINISHPAGE_NOAUTOCLOSE', 'MUI_UNFINISHPAGE_NOAUTOCLOSE',
+            'MUI_ABORTWARNING', 'MUI_ABORTWARNING_TEXT', 'MUI_UNABORTWARNING', 'MUI_UNABORTWARNING_TEXT',
+            'MUI_PAGE_WELCOME', 'MUI_PAGE_LICENSE', 'MUI_PAGE_COMPONENTS', 'MUI_PAGE_DIRECTORY',
+            'MUI_PAGE_STARTMENU', 'MUI_PAGE_INSTFILES', 'MUI_PAGE_FINISH', 'MUI_UNPAGE_WELCOME',
+            'MUI_UNPAGE_CONFIRM', 'MUI_UNPAGE_LICENSE', 'MUI_UNPAGE_COMPONENTS', 'MUI_UNPAGE_DIRECTORY',
+            'MUI_UNPAGE_INSTFILES', 'MUI_UNPAGE_FINISH', 'MUI_PAGE_HEADER_TEXT', 'MUI_PAGE_HEADER_SUBTEXT',
+            'MUI_WELCOMEPAGE_TITLE', 'MUI_WELCOMEPAGE_TITLE_3LINES', 'MUI_WELCOMEPAGE_TEXT',
+            'MUI_LICENSEPAGE_TEXT_TOP', 'MUI_LICENSEPAGE_TEXT_BOTTOM', 'MUI_LICENSEPAGE_BUTTON',
+            'MUI_LICENSEPAGE_CHECKBOX', 'MUI_LICENSEPAGE_CHECKBOX_TEXT', 'MUI_LICENSEPAGE_RADIOBUTTONS',
+            'MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_ACCEPT', 'MUI_LICENSEPAGE_RADIOBUTTONS_TEXT_DECLINE',
+            'MUI_COMPONENTSPAGE_TEXT_TOP', 'MUI_COMPONENTSPAGE_TEXT_COMPLIST', 'MUI_COMPONENTSPAGE_TEXT_INSTTYPE',
+            'MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_TITLE', 'MUI_COMPONENTSPAGE_TEXT_DESCRIPTION_INFO',
+            'MUI_DIRECTORYPAGE_TEXT_TOP', 'MUI_DIRECTORYPAGE_TEXT_DESTINATION', 'MUI_DIRECTORYPAGE_VARIABLE',
+            'MUI_DIRECTORYPAGE_VERIFYONLEAVE', 'MUI_STARTMENU_WRITE_BEGIN', 'MUI_STARTMENU_WRITE_END',
+            'MUI_STARTMENUPAGE_TEXT_TOP', 'MUI_STARTMENUPAGE_TEXT_CHECKBOX', 'MUI_STARTMENUPAGE_DEFAULTFOLDER',
+            'MUI_STARTMENUPAGE_NODISABLE', 'MUI_STARTMENUPAGE_REGISTRY_ROOT', 'MUI_STARTMENUPAGE_REGISTRY_KEY',
+            'MUI_STARTMENUPAGE_REGISTRY_VALUENAME', 'MUI_INSTFILESPAGE_FINISHHEADER_TEXT',
+            'MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT', 'MUI_INSTFILESPAGE_ABORTHEADER_TEXT',
+            'MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT', 'MUI_FINISHPAGE_TITLE', 'MUI_FINISHPAGE_TITLE_3LINES',
+            'MUI_FINISHPAGE_TEXT', 'MUI_FINISHPAGE_TEXT_LARGE', 'MUI_FINISHPAGE_BUTTON',
+            'MUI_FINISHPAGE_TEXT_REBOOT', 'MUI_FINISHPAGE_TEXT_REBOOTNOW', 'MUI_FINISHPAGE_TEXT_REBOOTLATER',
+            'MUI_FINISHPAGE_RUN', 'MUI_FINISHPAGE_RUN_TEXT', 'MUI_FINISHPAGE_RUN_PARAMETERS',
+            'MUI_FINISHPAGE_RUN_NOTCHECKED', 'MUI_FINISHPAGE_RUN_FUNCTION', 'MUI_FINISHPAGE_SHOWREADME',
+            'MUI_FINISHPAGE_SHOWREADME_TEXT', 'MUI_FINISHPAGE_SHOWREADME_NOTCHECKED',
+            'MUI_FINISHPAGE_SHOWREADME_FUNCTION', 'MUI_FINISHPAGE_LINK', 'MUI_FINISHPAGE_LINK_LOCATION',
+            'MUI_FINISHPAGE_LINK_COLOR', 'MUI_FINISHPAGE_NOREBOOTSUPPORT', 'MUI_UNCONFIRMPAGE_TEXT_TOP',
+            'MUI_UNCONFIRMPAGE_TEXT_LOCATION', 'MUI_LANGUAGE', 'MUI_LANGDLL_DISPLAY',
+            'MUI_LANGDLL_REGISTRY_ROOT', 'MUI_LANGDLL_REGISTRY_KEY', 'MUI_LANGDLL_REGISTRY_VALUENAME',
+            'MUI_LANGDLL_WINDOWTITLE', 'MUI_LANGDLL_INFO', 'MUI_LANGDLL_ALWAYSSHOW',
+            'MUI_RESERVEFILE_INSTALLOPTIONS', 'MUI_RESERVEFILE_LANGDLL', 'MUI_FUNCTION_DESCRIPTION_BEGIN',
+            'MUI_DESCRIPTION_TEXT', 'MUI_FUNCTION_DESCRIPTION_END', 'MUI_INSTALLOPTIONS_EXTRACT',
+            'MUI_INSTALLOPTIONS_EXTRACT_AS', 'MUI_HEADER_TEXT', 'MUI_INSTALLOPTIONS_DISPLAY',
+            'MUI_INSTALLOPTIONS_INITDIALOG', 'MUI_INSTALLOPTIONS_SHOW',
+            'MUI_INSTALLOPTIONS_DISPLAY_RETURN', 'MUI_INSTALLOPTIONS_SHOW_RETURN',
+            'MUI_INSTALLOPTIONS_READ', 'MUI_INSTALLOPTIONS_WRITE',
+            'MUI_CUSTOMFUNCTION_GUIINIT', 'MUI_CUSTOMFUNCTION_UNGUIINIT',
+            'MUI_CUSTOMFUNCTION_ABORT', 'MUI_CUSTOMFUNCTION_UNABORT',
+            'MUI_PAGE_CUSTOMFUNCTION_PRE', 'MUI_PAGE_CUSTOMFUNCTION_SHOW', 'MUI_PAGE_CUSTOMFUNCTION_LEAVE',
+            'MUI_WELCOMEFINISHPAGE_CUSTOMFUNCTION_INIT'
+            ),
+        9 => array(
+            'LogicLib.nsh', '${LOGICLIB}', 'LOGICLIB_STRCMP', 'LOGICLIB_INT64CMP', 'LOGICLIB_SECTIONCMP', '${If}', '${Unless}',
+            '${ElseIf}', '${ElseUnless}', '${Else}', '${EndIf}', '${EndUnless}', '${AndIf}', '${AndUnless}',
+            '${OrIf}', '${OrUnless}', '${IfThen}', '${IfCmd}', '${Select}', '${Case2}', '${Case3}',
+            '${Case4}', '${Case5}', '${CaseElse}', '${Default}', '${EndSelect}', '${Switch}',
+            '${Case}', '${EndSwitch}', '${Do}', '${DoWhile}', '${UntilWhile}', '${Continue}', '${Break}',
+            '${Loop}', '${LoopWhile}', '${LoopUntil}', '${While}', '${ExitWhile}', '${EndWhile}', '${For}',
+            '${ForEach}', '${ExitFor}', '${Next}', '${Abort}', '${Errors}', '${RebootFlag}', '${Silent}',
+            '${FileExists}', '${Cmd}', '${SectionIsSelected}', '${SectionIsSectionGroup}',
+            '${SectionIsSectionGroupEnd}', '${SectionIsBold}', '${SectionIsReadOnly}',
+            '${SectionIsExpanded}', '${SectionIsPartiallySelected}'
+            ),
+        10 => array(
+            'StrFunc.nsh', '${STRFUNC}', '${StrCase}', '${StrClb}', '${StrIOToNSIS}', '${StrLoc}', '${StrNSISToIO}', '${StrRep}',
+            '${StrSort}', '${StrStr}', '${StrStrAdv}', '${StrTok}', '${StrTrimNewLines}'
+            ),
+        11 => array(
+            'UpgradeDLL.nsh', 'UPGRADEDLL_INCLUDED', 'UpgradeDLL'
+            ),
+        12 => array(
+            'Sections.nsh', 'SECTIONS_INCLUDED', '${SF_SELECTED}', '${SF_SECGRP}', '${SF_SUBSEC}', '${SF_SECGRPEND}',
+            '${SF_SUBSECEND}', '${SF_BOLD}', '${SF_RO}', '${SF_EXPAND}', '${SF_PSELECTED}', '${SF_TOGGLED}',
+            '${SF_NAMECHG}', '${SECTION_OFF}', 'SelectSection', 'UnselectSection', 'ReverseSection',
+            'StartRadioButtons', 'RadioButton', 'EndRadioButtons', '${INSTTYPE_0}', '${INSTTYPE_1}', '${INSTTYPE_2}',
+            '${INSTTYPE_3}', '${INSTTYPE_4}', '${INSTTYPE_5}', '${INSTTYPE_6}', '${INSTTYPE_7}', '${INSTTYPE_8}',
+            '${INSTTYPE_9}', '${INSTTYPE_10}', '${INSTTYPE_11}', '${INSTTYPE_12}', '${INSTTYPE_13}', '${INSTTYPE_14}',
+            '${INSTTYPE_15}', '${INSTTYPE_16}', '${INSTTYPE_17}', '${INSTTYPE_18}', '${INSTTYPE_19}', '${INSTTYPE_20}',
+            '${INSTTYPE_21}', '${INSTTYPE_22}', '${INSTTYPE_23}', '${INSTTYPE_24}', '${INSTTYPE_25}', '${INSTTYPE_26}',
+            '${INSTTYPE_27}', '${INSTTYPE_28}', '${INSTTYPE_29}', '${INSTTYPE_30}', '${INSTTYPE_31}', '${INSTTYPE_32}',
+            'SetSectionInInstType', 'ClearSectionInInstType', 'SetSectionFlag', 'ClearSectionFlag', 'SectionFlagIsSet'
+            ),
+        13 => array(
+            'Colors.nsh', 'WHITE', 'BLACK', 'YELLOW', 'RED', 'GREEN', 'BLUE', 'MAGENTA', 'CYAN', 'rgb2hex'
+            ),
+        14 => array(
+            'FileFunc.nsh', '${Locate}', '${GetSize}', '${DriveSpace}', '${GetDrives}', '${GetTime}', '${GetFileAttributes}', '${GetFileVersion}', '${GetExeName}', '${GetExePath}', '${GetParameters}', '${GetOptions}', '${GetRoot}', '${GetParent}', '${GetFileName}', '${GetBaseName}', '${GetFileExt}', '${BannerTrimPath}', '${DirState}', '${RefreshShellIcons}'
+            ),
+        15 => array(
+            'TextFunc.nsh', '${LineFind}', '${LineRead}', '${FileReadFromEnd}', '${LineSum}', '${FileJoin}', '${TextCompare}', '${ConfigRead}', '${ConfigWrite}', '${FileRecode}', '${TrimNewLines}'
+            ),
+        16 => array(
+            'WordFunc.nsh', '${WordFind}', '${WordFind2X}', '${WordFind3X}', '${WordReplace}', '${WordAdd}', '${WordInsert}', '${StrFilter}', '${VersionCompare}', '${VersionConvert}'
+            )
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        11 => false,
+        12 => false,
+        13 => false,
+        14 => false,
+        15 => false,
+        16 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight:bold;',
+            2 => 'color: #000066;',
+            3 => 'color: #003366;',
+            4 => 'color: #000099;',
+            5 => 'color: #ff6600;',
+            6 => 'color: #ff6600;',
+            7 => 'color: #006600;',
+            8 => 'color: #006600;',
+            9 => 'color: #006600;',
+            10 => 'color: #006600;',
+            11 => 'color: #006600;',
+            12 => 'color: #006600;',
+            13 => 'color: #006600;',
+            14 => 'color: #006600;',
+            15 => 'color: #006600;',
+            16 => 'color: #006600;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #660066; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #660066;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #660000;',
+            1 => 'color: #660000;',
+            2 => 'color: #660000;',
+            3 => 'color: #660000;',
+            4 => 'color: #660000;',
+            5 => 'color: #660000;',
+            6 => 'color: #660000;',
+            7 => 'color: #000099;',
+            8 => 'color: #003399;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => '',
+        10 => '',
+        11 => '',
+        12 => '',
+        13 => '',
+        14 => '',
+        15 => '',
+        16 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => '\$\$',
+        1 => '\$\\r',
+        2 => '\$\\n',
+        3 => '\$\\t',
+        4 => '\$[a-zA-Z0-9_]+',
+        5 => '\$\{.{1,256}\}',
+        6 => '\$\\\(.{1,256}\\\)',
+        7 => array(
+            GESHI_SEARCH => '([^:\/\\\*\?\"\<\>(?:)\s]*?)(::)([^:\/\\\*\?\"\<\>(?:)\s]*?)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2\\3'
+            ),
+        8 => array(
+            GESHI_SEARCH => '([^:\/\\\*\?\"\<\>(?:)\s]*?)(::)([^:\/\\\*\?\"\<\>(?:)]*?\s)',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1\\2',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/oberon2.php b/sources/inc/geshi/oberon2.php
new file mode 100644
index 0000000..b43f814
--- /dev/null
+++ b/sources/inc/geshi/oberon2.php
@@ -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
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/objc.php b/sources/inc/geshi/objc.php
new file mode 100644
index 0000000..2f5162d
--- /dev/null
+++ b/sources/inc/geshi/objc.php
@@ -0,0 +1,358 @@
+ 'Objective-C',
+    'COMMENT_SINGLE' => array(
+        //Compiler directives
+        1 => '#',
+        //Single line C-Comments
+        2 => '//'
+        ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline Continuation for single-line comment
+        2 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Pseudo-Highlighting of the @-sign before strings
+        3 => "/@(?=\")/"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+
+    'KEYWORDS' => 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',
+            '@protected', '@property', '@private', '@interface',
+            '@implementation', '@finally', '@end', '@encode', '@defs', '@class',
+            '@catch'
+            ),
+        // 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',
+            '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',
+            'HUGE_VAL', 'FOPEN_MAX', 'FLT_ROUNDS', 'FLT_RADIX', 'FLT_MIN_EXP',
+            'FLT_MIN', 'FLT_MAX_EXP', 'FLT_MAX', 'FLT_MANT_DIG', 'FLT_EPSILON',
+            'FLT_DIG', 'FILENAME_MAX', 'false', 'EXIT_SUCCESS', 'EXIT_FAILURE',
+            'errno', 'ERANGE', 'EOF', 'enum', 'EDOM', 'DBL_MIN_EXP', 'DBL_MIN',
+            'DBL_MAX_EXP', 'DBL_MAX', 'DBL_MANT_DIG', 'DBL_EPSILON', 'DBL_DIG',
+            'CLOCKS_PER_SEC', 'CHAR_MIN', 'CHAR_MAX', 'CHAR_BIT', 'BUFSIZ',
+            'break'
+            ),
+        // 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',
+            'strtod', 'strstr', 'strspn', 'strrchr', 'strpbrk', 'strncpy',
+            'strncmp', 'strncat', 'strlen', 'strftime', 'strerror', 'strcspn',
+            'strcpy', 'strcoll', 'strcmp', 'strchr', 'strcat', 'sscanf',
+            'srand', 'sqrt', 'sprintf', 'snprintf', 'sizeof', 'sinh', 'sin',
+            'setvbuf', 'setjmp', 'setbuf', 'scanf', 'rewind', 'rename',
+            'remove', 'realloc', 'rand', 'qsort', 'puts', 'putchar', 'putc',
+            'printf', 'pow', 'perror', 'offsetof', 'modf', 'mktime', 'memset',
+            'memmove', 'memcpy', 'memcmp', 'memchr', 'malloc', 'longjmp',
+            'log10', 'log', 'localtime', 'ldiv', 'ldexp', 'labs', 'isxdigit',
+            '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',
+            'fputc', 'fprintf', 'fopen', 'fmod', 'floor', 'fgets', 'fgetpos',
+            'fgetc', 'fflush', 'ferror', 'feof', 'fclose', 'fabs', 'exp',
+            'exit', 'div', 'difftime', 'ctime', 'cosh', 'cos', 'clock',
+            'clearerr', 'ceil', 'calloc', 'bsearch', 'atol', 'atoi', 'atof',
+            'atexit', 'atan2', 'atan', 'assert', 'asin', 'asctime', 'acos',
+            'abs', 'abort'
+            ),
+        // Data types (C, Objective-C, Cocoa)
+        4 => array(
+            'volatile', 'void', 'va_list', 'unsigned', 'union', 'typedef', 'tm',
+            '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
+        5 => array(
+            'NSXMLParser', 'NSXMLNode', 'NSXMLElement', 'NSXMLDTDNode',
+            'NSXMLDTD', 'NSXMLDocument', 'NSWhoseSpecifier',
+            'NSValueTransformer', 'NSValue', 'NSUserDefaults', 'NSURLResponse',
+            'NSURLRequest', 'NSURLProtocol', 'NSURLProtectionSpace',
+            'NSURLHandle', 'NSURLDownload', 'NSURLCredentialStorage',
+            'NSURLCredential', 'NSURLConnection', 'NSURLCache',
+            'NSURLAuthenticationChallenge', 'NSURL', 'NSUniqueIDSpecifier',
+            'NSUndoManager', 'NSUnarchiver', 'NSTimeZone', 'NSTimer',
+            'NSThread', 'NSTask', 'NSString', 'NSStream', 'NSSpellServer',
+            'NSSpecifierTest', 'NSSortDescriptor', 'NSSocketPortNameServer',
+            'NSSocketPort', 'NSSetCommand', 'NSSet', 'NSSerializer',
+            'NSScriptWhoseTest', 'NSScriptSuiteRegistry',
+            'NSScriptObjectSpecifier', 'NSScriptExecutionContext',
+            'NSScriptCommandDescription', 'NSScriptCommand',
+            'NSScriptCoercionHandler', 'NSScriptClassDescription', 'NSScanner',
+            'NSRunLoop', 'NSRelativeSpecifier', 'NSRecursiveLock',
+            'NSRangeSpecifier', 'NSRandomSpecifier', 'NSQuitCommand', 'NSProxy',
+            'NSProtocolChecker', 'NSPropertySpecifier',
+            'NSPropertyListSerialization', 'NSProcessInfo', 'NSPredicate',
+            'NSPositionalSpecifier', 'NSPortNameServer', 'NSPortMessage',
+            'NSPortCoder', 'NSPort', 'NSPointerFunctions', 'NSPointerArray',
+            'NSPipe', 'NSOutputStream', 'NSOperationQueue', 'NSOperation',
+            'NSObject', 'NSNumberFormatter', 'NSNumber', 'NSNull',
+            'NSNotificationQueue', 'NSNotificationCenter', 'NSNotification',
+            'NSNetServiceBrowser', 'NSNetService', 'NSNameSpecifier',
+            'NSMutableURLRequest', 'NSMutableString', 'NSMutableSet',
+            'NSMutableIndexSet', 'NSMutableDictionary', 'NSMutableData',
+            'NSMutableCharacterSet', 'NSMutableAttributedString',
+            'NSMutableArray', 'NSMoveCommand', 'NSMiddleSpecifier',
+            'NSMethodSignature', 'NSMetadataQueryResultGroup',
+            'NSMetadataQueryAttributeValueTuple', 'NSMetadataQuery',
+            'NSMetadataItem', 'NSMessagePortNameServer', 'NSMessagePort',
+            'NSMapTable', 'NSMachPort', 'NSMachBootstrapServer',
+            'NSLogicalTest', 'NSLock', 'NSLocale', 'NSKeyedUnarchiver',
+            'NSKeyedArchiver', 'NSInvocationOperation', 'NSInvocation',
+            'NSInputStream', 'NSIndexSpecifier', 'NSIndexSet', 'NSIndexPath',
+            'NSHTTPURLResponse', 'NSHTTPCookieStorage', 'NSHTTPCookie',
+            'NSHost', 'NSHashTable', 'NSGetCommand', 'NSGarbageCollector',
+            'NSFormatter', 'NSFileManager', 'NSFileHandle', 'NSExpression',
+            'NSExistsCommand', 'NSException', 'NSError', 'NSEnumerator',
+            'NSDistributedNotificationCenter', 'NSDistributedLock',
+            'NSDistantObjectRequest', 'NSDistantObject',
+            'NSDirectoryEnumerator', 'NSDictionary', 'NSDeserializer',
+            'NSDeleteCommand', 'NSDecimalNumberHandler', 'NSDecimalNumber',
+            'NSDateFormatter', 'NSDateComponents', 'NSDate', 'NSData',
+            'NSCreateCommand', 'NSCountedSet', 'NSCountCommand', 'NSConnection',
+            'NSConditionLock', 'NSCondition', 'NSCompoundPredicate',
+            'NSComparisonPredicate', 'NSCoder', 'NSCloseCommand',
+            'NSCloneCommand', 'NSClassDescription', 'NSCharacterSet',
+            'NSCalendarDate', 'NSCalendar', 'NSCachedURLResponse', 'NSBundle',
+            'NSAutoreleasePool', 'NSAttributedString', 'NSAssertionHandler',
+            'NSArray', 'NSArchiver', 'NSAppleScript', 'NSAppleEventManager',
+            'NSAppleEventDescriptor', 'NSAffineTransform'
+            ),
+        // Foundation protocols
+        6 => array(
+            'NSURLProtocolClient', 'NSURLHandleClient', 'NSURLClient',
+            'NSURLAuthenticationChallengeSender', 'NSScriptObjectSpecifiers',
+            'NSScriptKeyValueCoding', 'NSScriptingComparisonMethods',
+            'NSObjCTypeSerializationCallBack', 'NSMutableCopying',
+            'NSLocking', 'NSKeyValueObserving', 'NSKeyValueCoding',
+            'NSFastEnumeration', 'NSErrorRecoveryAttempting',
+            'NSDecimalNumberBehaviors', 'NSCopying', 'NSComparisonMethods',
+            'NSCoding'
+            ),
+        // AppKit classes
+        7 => array(
+            'NSWorkspace', 'NSWindowController', 'NSWindow', 'NSViewController',
+            'NSViewAnimation', 'NSView', 'NSUserDefaultsController',
+            'NSTypesetter', 'NSTreeNode', 'NSTreeController', 'NSTrackingArea',
+            'NSToolbarItemGroup', 'NSToolbarItem', 'NSToolbar',
+            'NSTokenFieldCell', 'NSTokenField', 'NSTextView',
+            'NSTextTableBlock', 'NSTextTable', 'NSTextTab', 'NSTextStorage',
+            'NSTextList', 'NSTextFieldCell', 'NSTextField', 'NSTextContainer',
+            'NSTextBlock', 'NSTextAttachmentCell', 'NSTextAttachment', 'NSText',
+            'NSTabViewItem', 'NSTabView', 'NSTableView', 'NSTableHeaderView',
+            'NSTableHeaderCell', 'NSTableColumn', 'NSStepperCell', 'NSStepper',
+            'NSStatusItem', 'NSStatusBar', 'NSSplitView', 'NSSpellChecker',
+            'NSSpeechSynthesizer', 'NSSpeechRecognizer', 'NSSound',
+            'NSSliderCell', 'NSSlider', 'NSSimpleHorizontalTypesetter',
+            'NSShadow', 'NSSegmentedControl', 'NSSegmentedCell',
+            'NSSecureTextFieldCell', 'NSSecureTextField', 'NSSearchFieldCell',
+            'NSSearchField', 'NSScrollView', 'NSScroller', 'NSScreen',
+            'NSSavePanel', 'NSRulerView', 'NSRulerMarker', 'NSRuleEditor',
+            'NSResponder', 'NSQuickDrawView', 'NSProgressIndicator',
+            'NSPrintPanel', 'NSPrintOperation', 'NSPrintInfo', 'NSPrinter',
+            'NSPredicateEditorRowTemplate', 'NSPredicateEditor',
+            'NSPopUpButtonCell', 'NSPopUpButton', 'NSPICTImageRep',
+            'NSPersistentDocument', 'NSPDFImageRep', 'NSPathControl',
+            'NSPathComponentCell', 'NSPathCell', 'NSPasteboard',
+            'NSParagraphStyle', 'NSPanel', 'NSPageLayout', 'NSOutlineView',
+            'NSOpenPanel', 'NSOpenGLView', 'NSOpenGLPixelFormat',
+            'NSOpenGLPixelBuffer', 'NSOpenGLContext', 'NSObjectController',
+            'NSNibOutletConnector', 'NSNibControlConnector', 'NSNibConnector',
+            'NSNib', 'NSMutableParagraphStyle', 'NSMovieView', 'NSMovie',
+            'NSMenuView', 'NSMenuItemCell', 'NSMenuItem', 'NSMenu', 'NSMatrix',
+            'NSLevelIndicatorCell', 'NSLevelIndicator', 'NSLayoutManager',
+            'NSInputServer', 'NSInputManager', 'NSImageView', 'NSImageRep',
+            'NSImageCell', 'NSImage', 'NSHelpManager', 'NSGraphicsContext',
+            'NSGradient', 'NSGlyphInfo', 'NSGlyphGenerator', 'NSFormCell',
+            'NSForm', 'NSFontPanel', 'NSFontManager', 'NSFontDescriptor',
+            'NSFont', 'NSFileWrapper', 'NSEvent', 'NSEPSImageRep', 'NSDrawer',
+            'NSDocumentController', 'NSDocument', 'NSDockTile',
+            'NSDictionaryController', 'NSDatePickerCell', 'NSDatePicker',
+            'NSCustomImageRep', 'NSCursor', 'NSController', 'NSControl',
+            'NSComboBoxCell', 'NSComboBox', 'NSColorWell', 'NSColorSpace',
+            'NSColorPicker', 'NSColorPanel', 'NSColorList', 'NSColor',
+            'NSCollectionViewItem', 'NSCollectionView', 'NSClipView',
+            'NSCIImageRep', 'NSCell', 'NSCachedImageRep', 'NSButtonCell',
+            'NSButton', 'NSBrowserCell', 'NSBrowser', 'NSBox',
+            'NSBitmapImageRep', 'NSBezierPath', 'NSATSTypesetter',
+            'NSArrayController', 'NSApplication', 'NSAnimationContext',
+            'NSAnimation', 'NSAlert', 'NSActionCell'
+            ),
+        // AppKit protocols
+        8 => array(
+            'NSWindowScripting', 'NSValidatedUserInterfaceItem',
+            'NSUserInterfaceValidations', 'NSToolTipOwner',
+            'NSToolbarItemValidation', 'NSTextInput',
+            'NSTableDataSource', 'NSServicesRequests',
+            'NSPrintPanelAccessorizing', 'NSPlaceholders',
+            'NSPathControlDelegate', 'NSPathCellDelegate',
+            'NSOutlineViewDataSource', 'NSNibAwaking', 'NSMenuValidation',
+            'NSKeyValueBindingCreation', 'NSInputServiceProvider',
+            'NSInputServerMouseTracker', 'NSIgnoreMisspelledWords',
+            'NSGlyphStorage', 'NSFontPanelValidation', 'NSEditorRegistration',
+            'NSEditor', 'NSDraggingSource', 'NSDraggingInfo',
+            'NSDraggingDestination', 'NSDictionaryControllerKeyValuePair',
+            'NSComboBoxDataSource', 'NSComboBoxCellDataSource',
+            'NSColorPickingDefault', 'NSColorPickingCustom', 'NSChangeSpelling',
+            'NSAnimatablePropertyContainer', 'NSAccessibility'
+            ),
+        // CoreData classes
+        9 => array(
+            'NSRelationshipDescription', 'NSPropertyMapping',
+            'NSPropertyDescription', 'NSPersistentStoreCoordinator',
+            'NSPersistentStore', 'NSMigrationManager', 'NSMappingModel',
+            'NSManagedObjectModel', 'NSManagedObjectID',
+            'NSManagedObjectContext', 'NSManagedObject',
+            'NSFetchRequestExpression', 'NSFetchRequest',
+            'NSFetchedPropertyDescription', 'NSEntityMigrationPolicy',
+            'NSEntityMapping', 'NSEntityDescription', 'NSAttributeDescription',
+            'NSAtomicStoreCacheNode', 'NSAtomicStore'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        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
+    '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
+            ),
+        '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;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #2400d9;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #002200;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #bf1d1a;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2400d9;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #002200;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        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/'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/objeck.php b/sources/inc/geshi/objeck.php
new file mode 100644
index 0000000..bf9dab5
--- /dev/null
+++ b/sources/inc/geshi/objeck.php
@@ -0,0 +1,116 @@
+ 'Objeck Programming Language',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('#~' => '~#'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'virtual', 'if', 'else', 'do', 'while', 'use', 'bundle', 'native',
+            'static', 'public', 'private', 'class', 'function', 'method',
+            'select', 'other', 'enum', 'for', 'each', 'label', 'return', 'from'
+            ),
+        2 => array(
+            'Byte', 'Int', 'Nil', 'Float', 'Char', 'Bool', 'String'
+            ),
+        3 => array(
+            'true', 'false'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '<', '>', '&', '|', ':', ';', ',', '+=', '-=', '*=', '/=',
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '->'
+        ),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/ocaml-brief.php b/sources/inc/geshi/ocaml-brief.php
new file mode 100644
index 0000000..b518adf
--- /dev/null
+++ b/sources/inc/geshi/ocaml-brief.php
@@ -0,0 +1,112 @@
+ 'OCaml (brief)',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => "",
+    'KEYWORDS' => array(
+        /* 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',
+            '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',
+            'to', 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'
+            )
+        ),
+    /* highlighting symbols is really important in OCaml */
+    'SYMBOLS' => array(
+        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
+        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;' /* nice blue */
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #6c6;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #c6c;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a52a2a;' /* maroon */
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/ocaml.php b/sources/inc/geshi/ocaml.php
new file mode 100644
index 0000000..ac6c29b
--- /dev/null
+++ b/sources/inc/geshi/ocaml.php
@@ -0,0 +1,187 @@
+ 'OCaml',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('(*' => '*)'),
+    'COMMENT_REGEXP' => array(1 => '/\(\*(?:(?R)|.)+?\*\)/s'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => "",
+    'KEYWORDS' => array(
+        /* main OCaml keywords */
+        1 => array(
+            'and', 'as', 'asr', 'begin', 'class', 'closed', 'constraint', 'do', 'done', 'downto', 'else',
+            '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',
+            'to', 'true', 'try', 'type', 'val', 'virtual', 'when', 'while', 'with'
+            ),
+        /* define names of main librarys, so we can link to it */
+        2 => array(
+            'Arg', 'Arith_status', 'Array', //'Array1', 'Array2', 'Array3',
+            'ArrayLabels', 'Big_int', 'Bigarray', 'Buffer', 'Callback',
+            'CamlinternalLazy', 'CamlinternalMod', 'CamlinternalOO', 'Char',
+            'Complex', 'Condition', 'Dbm', 'Digest', 'Dynlink', 'Event',
+            'Filename', 'Format', 'Gc', 'Genlex', 'Graphics', 'GraphicsX11',
+            'Hashtbl', 'Int32', 'Int64', 'Lazy', 'Lexing', 'List', 'ListLabels',
+            'Map', 'Marshal', 'MoreLabels', 'Mutex', 'Nativeint', 'Num', 'Obj',
+            'Oo', 'Parsing', 'Pervasives', 'Printexc', 'Printf', 'Queue',
+            'Random', 'Scanf', 'Set', 'Sort', 'Stack', 'StdLabels', 'Str',
+            'Stream', 'String', 'StringLabels', 'Sys', 'Thread', 'ThreadUnix',
+            'Tk', 'Unix', 'UnixLabels', 'Weak'
+            ),
+        /* just link to the Pervasives functions library, cause it's the default opened library when starting OCaml */
+        3 => array(
+            '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 (
+            'array','bool','char','exn','file_descr','format','fpclass',
+            'in_channel','int','int32','int64','list','nativeint','open_flag',
+            'out_channel','string','Sys_error','unit'
+            ),
+        /* finally Pervasives Exceptions */
+        5 => array (
+            'Exit', 'Invalid_Argument', 'Failure', 'Division_by_zero'
+            )
+        ),
+    /* highlighting symbols is really important in OCaml */
+    'SYMBOLS' => array(
+        '+.', '-.', '*.', '/.', '[<', '>]',
+        ';', '!', ':', '.', '=', '%', '^', '*', '-', '/', '+',
+        '>', '<', '(', ')', '[', ']', '&', '|', '#', "'",
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => true, /* functions name are case sensitive */
+        3 => true, /* types name too */
+        4 => true, /* pervasives types */
+        5 => true  /* pervasives exceptions */
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #06c; font-weight: bold;', /* nice blue */
+            2 => 'color: #06c; font-weight: bold;', /* nice blue */
+            3 => 'color: #06c; font-weight: bold;', /* nice blue */
+            4 => 'color: #06c; font-weight: bold;', /* nice blue */
+            5 => 'color: #06c; font-weight: bold;' /* nice blue */
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #5d478b; font-style: italic;', /* light purple */
+            1 => 'color: #5d478b; font-style: italic;' /* light purple */
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #a52a2a;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #3cb371;' /* nice green */
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #c6c;' /* pink */
+            ),
+        'METHODS' => array(
+            1 => 'color: #060;' /* dark green */
+            ),
+        'REGEXPS' => array(
+            1 => 'font-weight:bold; color:#339933;',
+            2 => 'font-weight:bold; color:#993399;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a52a2a;' /* maroon */
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        /* some of keywords are Pervasives functions (land, lxor, asr, ...) */
+        1 => '',
+        /* link to the wanted library */
+        2 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/{FNAME}.html',
+        /* link to Pervasives functions */
+        3 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#VAL{FNAME}',
+        /* link to Pervasives type */
+        4 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#TYPE{FNAME}',
+        /* link to Pervasives exceptions */
+        5 => 'http://caml.inria.fr/pub/docs/manual-ocaml/libref/Pervasives.html#EXCEPTION{FNAME}'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        1 => '~\w+',
+        2 => '`(?=(?-i:[a-z]))\w*',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/octave.php b/sources/inc/geshi/octave.php
new file mode 100644
index 0000000..ccffcd9
--- /dev/null
+++ b/sources/inc/geshi/octave.php
@@ -0,0 +1,515 @@
+ 'GNU Octave',
+    'COMMENT_SINGLE' => array(1 => '#', 2 => '%'),
+    // we can't use COMMENT_MULTI since start and end of block comments need to
+    // be alone on the line (optionally, with whitespace). See COMMENT_REGEXP
+    'COMMENT_MULTI' => array(),
+    // we can't use QUOTEMARKS, not even HARDQUOTE, see COMMENT_REGEXP
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'COMMENT_REGEXP' => array(
+        // Single quote strings: we can't use QUOTEMARKS here since new
+        // lines will break the string. Plus, single quote strings do not even
+        // allow for continuation markers, only double quote strings allow it.
+        // Also, to do not misdetect the transpose operator ' as the start of a
+        // string we assert to not follow a variable name (letters, digits and
+        // underscores) or a closing bracket (round, square or curly) or a dot
+        // (to form the array transpose operator ".'" ).
+        3 => "/(? '/"(.|(\.\.\.|\\\)(\s)*?\n)*?(? "/^\s*?[%#]{\s*?$.*?^\s*?[%#]}\s*?$/ms",
+        // Packaging system: comes here so that pkg can also be used in the
+        // function form. The list of pkg commands is optional to the match so
+        // that at least pkg is highlighted if new commands are implemented
+        6 => "/\bpkg(?!\s*\()\s+((un)?install|update|(un)?load|list|(global|local)_list|describe|prefix|(re)?build)?\b/",
+        // Function handles
+        7 => "/@([a-z_][a-z1-9_]*)?/i",
+        ),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_OCT_PREFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'KEYWORDS' => array(
+        // Data types
+        1 => array(
+            'cell', 'char', 'double', 'uint8', 'uint16', 'uint32', 'uint64',
+            'int8','int16', 'int32', 'int64', 'logical', 'single', 'struct'
+            ),
+        // Storage type
+        2 => array(
+            'global', 'persistent', 'static'
+            ),
+        // Internal variable
+        3 => array(
+            'ans'
+            ),
+        // Reserved words
+        4 => array(
+            'break', 'case', 'catch', 'continue', 'do', 'else', 'elseif', 'end',
+            'end_try_catch', 'end_unwind_protect', 'endfor', 'endfunction',
+            'endif', 'endparfor', 'endswitch', 'endwhile', 'for', 'function',
+            'if', 'otherwise', 'parfor', 'return',
+            'switch', 'try', 'until', 'unwind_protect',
+            'unwind_protect_cleanup', 'varargin', 'varargout', 'while'
+            ),
+        // Built in
+        5 => array(
+            'P_tmpdir', 'abs', 'acos', 'acosh',
+            'add_input_event_hook', 'addlistener', 'addpath', 'addproperty',
+            'all', 'allow_noninteger_range_as_index', 'and', 'angle', 'any',
+            'arg', 'argnames', 'argv', 'asin', 'asinh', 'assignin', 'atan',
+            'atan2', 'atanh', 'atexit', 'autoload', 'available_graphics_toolkits',
+            'beep_on_error', 'bitand', 'bitmax', 'bitor', 'bitshift', 'bitxor',
+            'builtin', 'canonicalize_file_name', 'cat', 'cbrt', 'cd', 'ceil',
+            'cell2struct', 'cellstr', 'chdir', 'class', 'clc',
+            'clear', 'columns', 'command_line_path', 'completion_append_char',
+            'completion_matches', 'complex', 'confirm_recursive_rmdir', 'conj',
+            'cos', 'cosh', 'cputime', 'crash_dumps_octave_core', 'ctranspose',
+            'cumprod', 'cumsum', 'dbclear', 'dbcont', 'dbdown', 'dbnext',
+            'dbquit', 'dbstack', 'dbstatus', 'dbstep', 'dbstop', 'dbtype', 'dbup',
+            'dbwhere', 'debug_on_error', 'debug_on_interrupt', 'debug_on_warning',
+            'default_save_options', 'dellistener', 'diag', 'diary', 'diff',
+            'disp', 'do_braindead_shortcircuit_evaluation', 'do_string_escapes',
+            'doc_cache_file', 'drawnow', 'dup2', 'echo',
+            'echo_executing_commands', 'edit_history','eq', 'erf', 'erfc',
+            'erfcx', 'erfinv', 'errno', 'errno_list', 'error', 'eval', 'evalin',
+            'exec', 'exist', 'exit', 'exp', 'expm1', 'eye', 'fclear',
+            'fclose', 'fcntl', 'fdisp', 'feof', 'ferror', 'feval', 'fflush',
+            'fgetl', 'fgets', 'fieldnames', 'file_in_loadpath', 'file_in_path',
+            'filemarker', 'filesep', 'find_dir_in_path', 'finite', 'fix',
+            'fixed_point_format', 'floor', 'fmod', 'fnmatch', 'fopen', 'fork',
+            'format', 'formula', 'fprintf', 'fputs', 'fread', 'freport',
+            'frewind', 'fscanf', 'fseek', 'fskipl', 'ftell', 'full', 'func2str',
+            'functions', 'fwrite', 'gamma', 'gammaln', 'ge', 'genpath', 'get',
+            'get_help_text', 'get_help_text_from_file', 'getegid', 'getenv',
+            'geteuid', 'getgid', 'gethostname', 'getpgrp', 'getpid', 'getppid',
+            'getuid', 'glob', 'gt', 'history', 'history_control', 'history_file',
+            'history_size', 'history_timestamp_format_string', 'home', 'horzcat',
+            'hypot', 'ifelse', 'ignore_function_time_stamp', 'imag',
+            'inferiorto', 'info_file', 'info_program', 'inline', 'input',
+            'intmax', 'intmin', 'ipermute',
+            'is_absolute_filename', 'is_dq_string', 'is_function_handle',
+            'is_rooted_relative_filename', 'is_sq_string', 'isalnum', 'isalpha',
+            'isargout', 'isascii', 'isbool', 'iscell', 'iscellstr', 'ischar',
+            'iscntrl', 'iscomplex', 'isdebugmode', 'isdigit', 'isempty',
+            'isfield', 'isfinite', 'isfloat', 'isglobal', 'isgraph', 'ishandle',
+            'isieee', 'isindex', 'isinf', 'isinteger', 'iskeyword', 'islogical',
+            'islower', 'ismatrix', 'ismethod', 'isna', 'isnan', 'isnull',
+            'isnumeric', 'isobject', 'isprint', 'ispunct', 'isreal', 'issorted',
+            'isspace', 'issparse', 'isstruct', 'isupper', 'isvarname', 'isxdigit',
+            'kbhit', 'keyboard', 'kill', 'lasterr', 'lasterror', 'lastwarn',
+            'ldivide', 'le', 'length', 'lgamma', 'link', 'linspace',
+            'list_in_columns', 'load', 'loaded_graphics_toolkits', 'log', 'log10',
+            'log1p', 'log2', 'lower', 'lstat', 'lt',
+            'make_absolute_filename', 'makeinfo_program', 'max_recursion_depth',
+            'merge', 'methods', 'mfilename', 'minus', 'mislocked',
+            'missing_function_hook', 'mkdir', 'mkfifo', 'mkstemp', 'mldivide',
+            'mlock', 'mod', 'more', 'mpower', 'mrdivide', 'mtimes', 'munlock',
+            'nargin', 'nargout', 'native_float_format', 'ndims', 'ne',
+            'nfields', 'nnz', 'norm', 'not', 'nth_element', 'numel', 'nzmax',
+            'octave_config_info', 'octave_core_file_limit',
+            'octave_core_file_name', 'octave_core_file_options',
+            'octave_tmp_file_name', 'onCleanup', 'ones',
+            'optimize_subsasgn_calls', 'or', 'output_max_field_width',
+            'output_precision', 'page_output_immediately', 'page_screen_output',
+            'path', 'pathsep', 'pause', 'pclose', 'permute', 'pipe', 'plus',
+            'popen', 'popen2', 'power', 'print_empty_dimensions',
+            'print_struct_array_contents', 'printf', 'prod',
+            'program_invocation_name', 'program_name', 'putenv', 'puts', 'pwd',
+            'quit', 'rats', 'rdivide', 're_read_readline_init_file',
+            'read_readline_init_file', 'readdir', 'readlink', 'real', 'realmax',
+            'realmin', 'register_graphics_toolkit', 'rehash', 'rem',
+            'remove_input_event_hook', 'rename', 'repelems', 'reset', 'reshape',
+            'resize', 'restoredefaultpath', 'rethrow', 'rmdir', 'rmfield',
+            'rmpath', 'round', 'roundb', 'rows', 'run_history', 'save',
+            'save_header_format_string', 'save_precision', 'saving_history',
+            'scanf', 'set', 'setenv', 'sighup_dumps_octave_core', 'sign',
+            'sigterm_dumps_octave_core', 'silent_functions', 'sin',
+            'sinh', 'size', 'size_equal', 'sizemax', 'sizeof', 'sleep', 'sort',
+            'source', 'spalloc', 'sparse', 'sparse_auto_mutate',
+            'split_long_rows', 'sprintf', 'sqrt', 'squeeze', 'sscanf', 'stat',
+            'stderr', 'stdin', 'stdout', 'str2func', 'strcmp', 'strcmpi',
+            'string_fill_char', 'strncmp', 'strncmpi', 'struct2cell',
+            'struct_levels_to_print', 'strvcat', 'subsasgn', 'subsref', 'sum',
+            'sumsq', 'superiorto', 'suppress_verbose_help_message', 'symlink',
+            'system', 'tan', 'tanh', 'terminal_size', 'tic', 'tilde_expand',
+            'times', 'tmpfile', 'tmpnam', 'toascii', 'toc', 'tolower', 'toupper',
+            'transpose', 'typeinfo',
+            'umask', 'uminus', 'uname', 'undo_string_escapes', 'unlink',
+            'uplus', 'upper', 'usage', 'usleep', 'vec', 'vectorize', 'vertcat',
+            'waitfor', 'waitpid', 'warning', 'warranty', 'who', 'whos',
+            'whos_line_format', 'yes_or_no', 'zeros'
+            ),
+        // Octave functions
+        6 => array(
+            'accumarray', 'accumdim', 'acosd', 'acot', 'acotd', 'acoth', 'acsc',
+            'acscd', 'acsch', 'addpref', 'addtodate', 'allchild', 'amd',
+            'ancestor', 'anova', 'arch_fit', 'arch_rnd', 'arch_test',
+            'area', 'arma_rnd', 'asctime', 'asec', 'asecd', 'asech', 'asind',
+            'assert', 'atand', 'autoreg_matrix', 'autumn',
+            'axes', 'axis', 'balance', 'bar', 'barh', 'bartlett', 'bartlett_test',
+            'base2dec', 'beep', 'bessel', 'besselj', 'beta', 'betacdf',
+            'betainc', 'betainv', 'betaln', 'betapdf', 'betarnd', 'bicg',
+            'bicgstab', 'bicubic', 'bin2dec', 'bincoeff', 'binocdf', 'binoinv',
+            'binopdf', 'binornd', 'bitcmp', 'bitget', 'bitset', 'blackman',
+            'blanks', 'blkdiag', 'bone', 'box', 'brighten', 'bsxfun',
+            'bug_report', 'bunzip2', 'bzip2', 'calendar', 'cart2pol', 'cart2sph',
+            'cast', 'cauchy_cdf', 'cauchy_inv', 'cauchy_pdf', 'cauchy_rnd',
+            'caxis', 'ccolamd', 'cell2mat', 'celldisp', 'cellfun',
+            'center', 'cgs', 'chi2cdf', 'chi2inv', 'chi2pdf', 'chi2rnd',
+            'chisquare_test_homogeneity', 'chisquare_test_independence', 'chol',
+            'chop', 'circshift', 'cla', 'clabel', 'clf', 'clock',
+            'cloglog', 'close', 'closereq', 'colamd', 'colloc', 'colon',
+            'colorbar', 'colormap', 'colperm', 'colstyle', 'comet', 'comet3',
+            'comma', 'common_size', 'commutation_matrix', 'compan',
+            'compare_versions', 'compass', 'computer', 'cond', 'condest',
+            'contour', 'contour3', 'contourc', 'contourf', 'contrast', 'conv',
+            'conv2', 'convhull', 'convhulln', 'cool', 'copper', 'copyfile',
+            'cor_test', 'corr', 'cosd', 'cot', 'cotd', 'coth', 'cov',
+            'cplxpair', 'cross', 'csc', 'cscd', 'csch', 'cstrcat',
+            'csvread', 'csvwrite', 'ctime', 'cumtrapz', 'curl', 'cylinder',
+            'daspect', 'daspk', 'dasrt', 'dassl', 'date', 'datenum', 'datestr',
+            'datetick', 'datevec', 'dblquad', 'deal', 'deblank', 'debug',
+            'dec2base', 'dec2bin', 'dec2hex', 'deconv', 'del2', 'delaunay',
+            'delaunay3', 'delaunayn', 'delete', 'demo', 'det', 'detrend',
+            'diffpara', 'diffuse', 'dir', 'discrete_cdf', 'discrete_inv',
+            'discrete_pdf', 'discrete_rnd', 'display', 'divergence',
+            'dlmread', 'dlmwrite', 'dmperm', 'doc', 'dos', 'dot', 'dsearch',
+            'dsearchn', 'dump_prefs', 'duplication_matrix', 'durbinlevinson',
+            'edit', 'eig', 'eigs', 'ellipsoid', 'empirical_cdf', 'empirical_inv',
+            'empirical_pdf', 'empirical_rnd', 'eomday', 'errorbar',
+            'etime', 'etreeplot', 'example', 'expcdf', 'expinv', 'expm', 'exppdf',
+            'exprnd', 'ezcontour', 'ezcontourf', 'ezmesh', 'ezmeshc', 'ezplot',
+            'ezplot3', 'ezpolar', 'ezsurf', 'ezsurfc', 'f_test_regression',
+            'fact', 'factor', 'factorial', 'fail', 'fcdf', 'feather', 'fft',
+            'fft2', 'fftconv', 'fftfilt', 'fftn', 'fftshift', 'fftw', 'figure',
+            'fileattrib', 'fileparts', 'fileread', 'fill', 'filter', 'filter2',
+            'find', 'findall', 'findobj', 'findstr', 'finv', 'flag', 'flipdim',
+            'fliplr', 'flipud', 'fminbnd', 'fminunc', 'fpdf', 'fplot',
+            'fractdiff', 'freqz', 'freqz_plot', 'frnd', 'fsolve',
+            'fullfile', 'fzero', 'gamcdf', 'gaminv', 'gammainc',
+            'gampdf', 'gamrnd', 'gca', 'gcbf', 'gcbo', 'gcd', 'gcf',
+            'gen_doc_cache', 'genvarname', 'geocdf', 'geoinv', 'geopdf', 'geornd',
+            'get_first_help_sentence', 'getappdata', 'getfield', 'getgrent',
+            'getpref', 'getpwent', 'getrusage', 'ginput', 'givens', 'glpk',
+            'gls', 'gmap40', 'gmres', 'gnuplot_binary', 'gplot',
+            'gradient', 'graphics_toolkit', 'gray', 'gray2ind', 'grid',
+            'griddata', 'griddata3', 'griddatan', 'gtext', 'guidata',
+            'guihandles', 'gunzip', 'gzip', 'hadamard', 'hamming', 'hankel',
+            'hanning', 'help', 'hess', 'hex2dec', 'hex2num', 'hggroup', 'hidden',
+            'hilb', 'hist', 'histc', 'hold', 'hot', 'hotelling_test',
+            'hotelling_test_2', 'housh', 'hsv', 'hsv2rgb', 'hurst', 'hygecdf',
+            'hygeinv', 'hygepdf', 'hygernd', 'idivide', 'ifftshift', 'image',
+            'imagesc', 'imfinfo', 'imread', 'imshow', 'imwrite', 'ind2gray',
+            'ind2rgb', 'index', 'info', 'inpolygon', 'inputname', 'int2str',
+            'interp1', 'interp1q', 'interp2', 'interp3', 'interpft', 'interpn',
+            'intersect', 'inv', 'invhilb', 'iqr',
+            'is_leap_year', 'is_valid_file_id',
+            'isa', 'isappdata', 'iscolumn', 'isdefinite', 'isdeployed', 'isdir',
+            'isequal', 'isequalwithequalnans', 'isfigure', 'ishermitian',
+            'ishghandle', 'ishold', 'isletter', 'ismac', 'ismember', 'isocolors',
+            'isonormals', 'isosurface', 'ispc', 'ispref', 'isprime', 'isprop',
+            'isrow', 'isscalar', 'issquare', 'isstrprop', 'issymmetric',
+            'isunix', 'isvector', 'jet', 'kendall', 'kolmogorov_smirnov_cdf',
+            'kolmogorov_smirnov_test', 'kolmogorov_smirnov_test_2', 'kron',
+            'kruskal_wallis_test', 'krylov', 'kurtosis', 'laplace_cdf',
+            'laplace_inv', 'laplace_pdf', 'laplace_rnd', 'lcm', 'legend',
+            'legendre', 'license', 'lin2mu', 'line', 'linkprop', 'list_primes',
+            'loadaudio', 'loadobj', 'logistic_cdf', 'logistic_inv',
+            'logistic_pdf', 'logistic_regression', 'logistic_rnd', 'logit',
+            'loglog', 'loglogerr', 'logm', 'logncdf', 'logninv', 'lognpdf',
+            'lognrnd', 'logspace', 'lookfor', 'lookup', 'ls', 'ls_command',
+            'lsode', 'lsqnonneg', 'lu', 'luinc', 'magic', 'mahalanobis', 'manova',
+            'mat2str', 'matlabroot', 'matrix_type', 'max', 'mcnemar_test',
+            'md5sum', 'mean', 'meansq', 'median', 'menu', 'mesh', 'meshc',
+            'meshgrid', 'meshz', 'mex', 'mexext', 'mgorth', 'mkoctfile', 'mkpp',
+            'mode', 'moment', 'movefile', 'mpoles', 'mu2lin', 'namelengthmax',
+            'nargchk', 'narginchk', 'nargoutchk', 'nbincdf', 'nbininv', 'nbinpdf',
+            'nbinrnd', 'nchoosek', 'ndgrid', 'newplot', 'news', 'nextpow2',
+            'nonzeros', 'normcdf', 'normest', 'norminv', 'normpdf', 'normrnd',
+            'now', 'nproc', 'nthargout', 'nthroot', 'ntsc2rgb', 'null', 'num2str',
+            'ocean', 'ols', 'onenormest', 'optimget', 'optimset', 'orderfields',
+            'orient', 'orth', 'pack', 'paren', 'pareto', 'parseparams', 'pascal',
+            'patch', 'pathdef', 'pbaspect', 'pcg', 'pchip', 'pcolor', 'pcr',
+            'peaks', 'periodogram', 'perl', 'perms', 'pie', 'pie3',
+            'pink', 'pinv', 'pkg', 'planerot', 'playaudio', 'plot', 'plot3',
+            'plotmatrix', 'plotyy', 'poisscdf', 'poissinv', 'poisspdf',
+            'poissrnd', 'pol2cart', 'polar', 'poly', 'polyaffine', 'polyarea',
+            'polyder', 'polyfit', 'polygcd', 'polyint', 'polyout',
+            'polyreduce', 'polyval', 'polyvalm', 'postpad', 'pow2', 'powerset',
+            'ppder', 'ppint', 'ppjumps', 'ppplot', 'ppval', 'pqpnonneg',
+            'prctile', 'prepad', 'primes', 'print', 'printAllBuiltins',
+            'print_usage', 'prism', 'probit', 'profexplore', 'profile',
+            'profshow', 'prop_test_2', 'python', 'qp', 'qqplot', 'qr', 'quad',
+            'quadcc', 'quadgk', 'quadl', 'quadv', 'quantile', 'quiver', 'quiver3',
+            'qz', 'qzhess', 'rainbow', 'rand', 'randi', 'range', 'rank', 'ranks',
+            'rat', 'rcond', 'reallog', 'realpow', 'realsqrt', 'record',
+            'rectangle', 'rectint', 'recycle', 'refresh', 'refreshdata', 'regexp',
+            'regexptranslate', 'repmat', 'residue', 'rgb2hsv',
+            'rgb2ind', 'rgb2ntsc', 'ribbon', 'rindex', 'rmappdata', 'rmpref',
+            'roots', 'rose', 'rosser', 'rot90', 'rotdim', 'rref', 'run',
+            'run_count', 'run_test', 'rundemos', 'runlength', 'runtests',
+            'saveas', 'saveaudio', 'saveobj', 'savepath', 'scatter',
+            'scatter3', 'schur', 'sec', 'secd', 'sech', 'semicolon', 'semilogx',
+            'semilogxerr', 'semilogy', 'semilogyerr', 'setappdata', 'setaudio',
+            'setdiff', 'setfield', 'setpref', 'setxor', 'shading',
+            'shg', 'shift', 'shiftdim', 'sign_test', 'sinc', 'sind',
+            'sinetone', 'sinewave', 'skewness', 'slice', 'sombrero', 'sortrows',
+            'spaugment', 'spconvert', 'spdiags', 'spearman', 'spectral_adf',
+            'spectral_xdf', 'specular', 'speed', 'spencer', 'speye', 'spfun',
+            'sph2cart', 'sphere', 'spinmap', 'spline', 'spones', 'spparms',
+            'sprand', 'sprandn', 'sprandsym', 'spring', 'spstats', 'spy', 'sqp',
+            'sqrtm', 'stairs', 'statistics', 'std', 'stdnormal_cdf',
+            'stdnormal_inv', 'stdnormal_pdf', 'stdnormal_rnd', 'stem', 'stem3',
+            'stft', 'str2double', 'str2num', 'strcat', 'strchr',
+            'strfind', 'strjust', 'strmatch', 'strread', 'strsplit', 'strtok',
+            'strtrim', 'strtrunc', 'structfun', 'sub2ind',
+            'subplot', 'subsindex', 'subspace', 'substr', 'substruct', 'summer',
+            'surf', 'surface', 'surfc', 'surfl', 'surfnorm', 'svd', 'svds',
+            'swapbytes', 'syl', 'symbfact', 'symrcm',
+            'symvar', 'synthesis', 't_test', 't_test_2', 't_test_regression',
+            'table', 'tand', 'tar', 'tcdf', 'tempdir', 'tempname', 'test', 'text',
+            'textread', 'textscan', 'time', 'tinv', 'title', 'toeplitz', 'tpdf',
+            'trace', 'trapz', 'treelayout', 'treeplot', 'tril', 'trimesh',
+            'triplequad', 'triplot', 'trisurf', 'trnd', 'tsearch', 'tsearchn',
+            'type', 'typecast', 'u_test', 'uicontextmenu', 'uicontrol',
+            'uigetdir', 'uigetfile', 'uimenu', 'uipanel', 'uipushtool',
+            'uiputfile', 'uiresume', 'uitoggletool', 'uitoolbar', 'uiwait',
+            'unidcdf', 'unidinv', 'unidpdf', 'unidrnd', 'unifcdf', 'unifinv',
+            'unifpdf', 'unifrnd', 'unimplemented', 'union', 'unique', 'unix',
+            'unmkpp', 'unpack', 'untabify', 'untar', 'unwrap', 'unzip',
+            'urlwrite', 'usejava', 'validatestring', 'vander', 'var',
+            'var_test', 'vech', 'ver', 'version', 'view', 'voronoi', 'voronoin',
+            'waitbar', 'waitforbuttonpress', 'warning_ids', 'wavread', 'wavwrite',
+            'wblcdf', 'wblinv', 'wblpdf', 'wblrnd', 'weekday',
+            'welch_test', 'what', 'which',
+            'white', 'whitebg', 'wienrnd', 'wilcoxon_test', 'wilkinson', 'winter',
+            'xlabel', 'xlim', 'xor', 'ylabel', 'ylim', 'yulewalker', 'z_test',
+            'z_test_2', 'zip', 'zlabel', 'zlim', 'zscore', 'airy', 'arrayfun',
+            'besselh', 'besseli', 'besselk', 'bessely', 'bitpack', 'bitunpack',
+            'blkmm', 'cellindexmat', 'cellslices', 'chol2inv', 'choldelete',
+            'cholinsert', 'cholinv', 'cholshift', 'cholupdate', 'convn',
+            'csymamd', 'cummax', 'cummin', 'daspk_options', 'dasrt_options',
+            'dassl_options', 'endgrent', 'endpwent', 'etree', 'getgrgid',
+            'getgrnam', 'getpwnam', 'getpwuid', 'gmtime', 'gui_mode', 'ifft',
+            'ifft2', 'ifftn', 'ind2sub', 'inverse', 'localtime', 'lsode_options',
+            'luupdate', 'mat2cell', 'min', 'mktime', 'mouse_wheel_zoom',
+            'num2cell', 'num2hex', 'qrdelete', 'qrinsert', 'qrshift', 'qrupdate',
+            'quad_options', 'rande', 'randg', 'randn', 'randp', 'randperm',
+            'regexpi', 'regexprep', 'rsf2csf', 'setgrent', 'setpwent', 'sprank',
+            'strftime', 'strptime', 'strrep', 'svd_driver', 'symamd', 'triu',
+            'urlread'
+            ),
+        // Private builtin
+        7 => array(
+            '__accumarray_max__', '__accumarray_min__', '__accumarray_sum__',
+            '__accumdim_sum__', '__builtins__', '__calc_dimensions__',
+            '__current_scope__', '__display_tokens__', '__dump_symtab_info__',
+            '__end__', '__get__', '__go_axes__', '__go_axes_init__',
+            '__go_delete__', '__go_execute_callback__', '__go_figure__',
+            '__go_figure_handles__', '__go_handles__', '__go_hggroup__',
+            '__go_image__', '__go_line__', '__go_patch__', '__go_surface__',
+            '__go_text__', '__go_uicontextmenu__', '__go_uicontrol__',
+            '__go_uimenu__', '__go_uipanel__', '__go_uipushtool__',
+            '__go_uitoggletool__', '__go_uitoolbar__', '__gud_mode__',
+            '__image_pixel_size__', '__is_handle_visible__', '__isa_parent__',
+            '__keywords__', '__lexer_debug_flag__', '__list_functions__',
+            '__operators__', '__parent_classes__', '__parser_debug_flag__',
+            '__pathorig__', '__profiler_data__', '__profiler_enable__',
+            '__profiler_reset__', '__request_drawnow__', '__sort_rows_idx__',
+            '__token_count__', '__varval__', '__version_info__', '__which__'
+        ),
+        // Private Octave functions
+        8 => array(
+            '__all_opts__', '__contourc__', '__delaunayn__', '__dispatch__',
+            '__dsearchn__', '__finish__', '__fltk_uigetfile__',
+            '__glpk__', '__gnuplot_drawnow__', '__init_fltk__',
+            '__init_gnuplot__', '__lin_interpn__', '__magick_read__',
+            '__makeinfo__', '__pchip_deriv__', '__plt_get_axis_arg__', '__qp__',
+            '__voronoi__', '__fltk_maxtime__', '__fltk_redraw__', '__ftp__',
+            '__ftp_ascii__', '__ftp_binary__', '__ftp_close__', '__ftp_cwd__',
+            '__ftp_delete__', '__ftp_dir__', '__ftp_mget__', '__ftp_mkdir__',
+            '__ftp_mode__', '__ftp_mput__', '__ftp_pwd__', '__ftp_rename__',
+            '__ftp_rmdir__', '__magick_finfo__', '__magick_format_list__',
+            '__magick_write__'
+            ),
+        // Builtin Global Variables
+        9 => array(
+            'EDITOR', 'EXEC_PATH', 'F_DUPFD', 'F_GETFD', 'F_GETFL', 'F_SETFD',
+            'F_SETFL', 'IMAGE_PATH', 'OCTAVE_HOME',
+            'OCTAVE_VERSION', 'O_APPEND', 'O_ASYNC', 'O_CREAT', 'O_EXCL',
+            'O_NONBLOCK', 'O_RDONLY', 'O_RDWR', 'O_SYNC', 'O_TRUNC', 'O_WRONLY',
+            'PAGER', 'PAGER_FLAGS', 'PS1', 'PS2', 'PS4', 'SEEK_CUR', 'SEEK_END',
+            'SEEK_SET', 'SIG', 'S_ISBLK', 'S_ISCHR', 'S_ISDIR', 'S_ISFIFO',
+            'S_ISLNK', 'S_ISREG', 'S_ISSOCK', 'WCONTINUE', 'WCOREDUMP',
+            'WEXITSTATUS', 'WIFCONTINUED', 'WIFEXITED', 'WIFSIGNALED',
+            'WIFSTOPPED', 'WNOHANG', 'WSTOPSIG', 'WTERMSIG', 'WUNTRACED'
+            ),
+        // Constant functions
+        10 => array (
+            'e', 'eps', 'inf', 'Inf', 'nan', 'NaN', 'NA', 'pi', 'i', 'I', 'j',
+            'J', 'true', 'false'
+            ),
+        ),
+    'SYMBOLS' => array(
+        // Comparison & logical
+        0 => array(
+            '!', '!=', '&', '&&','|', '||', '~', '~=',
+            '<', '<=', '==', '>', '>='
+            ),
+        // Aritmethical
+        1 => array(
+            '*', '**', '+', '++', '-', '--', '/', "\\","'"
+            ),
+        // Elementwise arithmetical
+        2 => array(
+            '.*', '.**','./', '.^', '^',".\\",".'"
+            ),
+        // Arithmetical & assignation
+        3 => array(
+            '*=','+=','-=','/=','\=','**=','^=',
+            '.*=','.+=','.-=','./=','.\=','.**=','.^=','='
+            ),
+        // Indexer
+        4 => array(
+            ':'
+            ),
+        // Delimiters
+        5 => array(
+            ',', '...', ';'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true,
+        10 => true,
+        ),
+    'URLS' => array(
+        1 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        6 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        7 => '',
+        8 => '',
+        9 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        10 => 'http://octave.sourceforge.net/octave/function/{FNAME}.html',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        ),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'STYLES' => array(
+        'COMMENTS' => array(
+            1 => 'color: #0000FF; font-style: italic;', // single quote strings
+            2 => 'color: #0000FF; font-style: italic;', // double quote strings
+            3 => 'color: #FF00FF; font-style: italic;', // single quote strings
+            4 => 'color: #FF00FF; font-style: italic;', // double quote strings
+            5 => 'color: #0000FF; font-style: italic;', // block comments
+            6 => 'color: #996600; font-weight:bold;',   // packaging system
+            7 => 'color: #006600; font-weight:bold;',   // function handles
+            'MULTI' => 'color: #0000FF; font-style: italic;',
+            ),
+        'KEYWORDS' => array(
+            1 => 'color: #2E8B57; font-weight:bold;',   // Data types
+            2 => 'color: #2E8B57;',                     // Storage type
+            3 => 'color: #0000FF; font-weight:bold;',   // Internal variable
+            4 => 'color: #990000; font-weight:bold;',   // Reserved words
+            5 => 'color: #008A8C; font-weight:bold;',   // Built-in
+            6 => 'color: #008A8C;',                     // Octave functions
+            9 => 'color: #000000; font-weight:bold;',   // Builtin Global Variables
+            10 => 'color: #008A8C; font-weight:bold;',  // Constant functions
+            ),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(
+            0 => 'color: #080;',
+            ),
+        'STRINGS' => array(
+            // strings were specified on the COMMENT_REGEXP section
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(),
+        'SYMBOLS' => array(
+            0 => 'color: #FF9696; font-weight:bold;',   // Comparison & logical
+            1 => 'color: #CC0000; font-weight:bold;',   // Aritmethical
+            2 => 'color: #993333; font-weight:bold;',   // Elementwise arithmetical
+            3 => 'color: #FF0000; font-weight:bold;',   // Arithmetical & assignation
+            4 => 'color: #33F;',                        // Indexer
+            5 => 'color: #33F;',                        // Delimiters
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array(),
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/oobas.php b/sources/inc/geshi/oobas.php
new file mode 100644
index 0000000..ff75af6
--- /dev/null
+++ b/sources/inc/geshi/oobas.php
@@ -0,0 +1,135 @@
+ 'OpenOffice.org Basic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    //Single-Line comments using REM keyword
+    'COMMENT_REGEXP' => array(2 => '/\bREM.*?$/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'dim','private','public','global','as','if','redim','true','set','byval',
+            'false','bool','double','integer','long','object','single','variant',
+            'msgbox','print','inputbox','green','blue','red','qbcolor',
+            'rgb','open','close','reset','freefile','get','input','line',
+            'put','write','loc','seek','eof','lof','chdir','chdrive',
+            'curdir','dir','fileattr','filecopy','filedatetime','fileexists',
+            'filelen','getattr','kill','mkdir','name','rmdir','setattr',
+            'dateserial','datevalue','day','month','weekday','year','cdatetoiso',
+            'cdatefromiso','hour','minute','second','timeserial','timevalue',
+            'date','now','time','timer','erl','err','error','on','goto','resume',
+            'and','eqv','imp','not','or','xor','mod','atn','cos','sin','tan','log',
+            'exp','rnd','randomize','sqr','fix','int','abs','sgn','hex','oct',
+            'it','then','else','select','case','iif','do','loop','for','next','to',
+            'while','wend','gosub','return','call','choose','declare',
+            'end','exit','freelibrary','function','rem','stop','sub','switch','with',
+            'cbool','cdate','cdbl','cint','clng','const','csng','cstr','defbool',
+            'defdate','defdbl','defint','deflng','asc','chr','str','val','cbyte',
+            'space','string','format','lcase','left','lset','ltrim','mid','right',
+            'rset','rtrim','trim','ucase','split','join','converttourl','convertfromurl',
+            'instr','len','strcomp','beep','shell','wait','getsystemticks','environ',
+            'getsolarversion','getguitype','twipsperpixelx','twipsperpixely',
+            'createunostruct','createunoservice','getprocessservicemanager',
+            'createunodialog','createunolistener','createunovalue','thiscomponent',
+            'globalscope'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/oorexx.php b/sources/inc/geshi/oorexx.php
new file mode 100644
index 0000000..62c6cc4
--- /dev/null
+++ b/sources/inc/geshi/oorexx.php
@@ -0,0 +1,171 @@
+ 'ooRexx',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'address', 'arg', 'attribute', 'call', 'constant', 'do',
+            'drop', 'exit', 'if',
+            'interpret', 'iterate', 'leave', 'loop', 'nop', 'numeric',
+            'parse', 'procedure', 'pull', 'push', 'queue',
+            'raise', 'reply', 'return', 'say', 'select', 'signal',
+            'use'
+            ),
+        2 => array(
+            'abstract', 'any', 'arguments', 'array', 'by',
+            'continue', 'digits', 'engineering', 'error',
+            'expose', 'external', 'failure', 'for', 'forever',
+            'forward', 'get', 'guard', 'guarded', 'halt',
+            'inherit', 'library', 'lostdigits', 'message',
+            'metaclass', 'mixinclass', 'name', 'nomethod', 'nostring',
+            'notready', 'novalue', 'off', 'on', 'options', 'over',
+            'private', 'protected', 'public', 'scientific', 'set',
+            'source', 'subclass', 'syntax', 'to', 'unguarded',
+            'unprotected', 'until', 'user',
+            'version', 'while', 'with'
+            ),
+        3 => array(
+            'else', 'end', 'otherwise', 'then', 'when'
+            ),
+        4 => array(
+            'rc', 'result', 'self', 'sigl', 'super'
+            ),
+        5 => array(
+            '::attribute', '::class', '::constant', '::method',
+            '::optins', '::requires', '::routine'
+            ),
+        6 => array(
+            'abbrev', 'abs', 'beep', 'bitand', 'bitor',
+            'bitxor', 'b2x', 'center', 'centre', 'changestr', 'charin',
+            'charout', 'chars', 'compare', 'condition', 'copies',
+            'countstr', 'c2d', 'c2x', 'datatype', 'date', 'delstr',
+            'delword', 'directory', 'd2c', 'd2x', 'endlocal',
+            'errortext', 'filespec', 'form', 'format', 'fuzz', 'insert',
+            'lastpos', 'left', 'length', 'linein', 'lineout', 'lines',
+            'lower', 'max', 'min', 'overlay', 'pos', 'qualify', 'queued',
+            'random', 'reverse', 'right', 'rxfuncadd', 'rxfuncdrop',
+            'rxfuncquery', 'rxqueue', 'setlocal', 'sign', 'sourceline',
+            'space', 'stream', 'strip', 'substr', 'subword', 'symbol',
+            'time', 'trace', 'translate', 'trunc', 'upper', 'userid',
+            'value', 'var', 'verify', 'word', 'wordindex', 'wordlength',
+            'wordpos', 'words', 'xrange', 'x2b', 'x2c', 'x2d'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '<', '>', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':',
+        '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #ff0000; font-weight: bold;',
+            3 => 'color: #00ff00; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;',
+            5 => 'color: #880088; font-weight: bold;',
+            6 => 'color: #888800; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            'MULTI' => 'color: #808080;'
+            ),
+        '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: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/oracle11.php b/sources/inc/geshi/oracle11.php
new file mode 100644
index 0000000..16259e6
--- /dev/null
+++ b/sources/inc/geshi/oracle11.php
@@ -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 --git a/sources/inc/geshi/oracle8.php b/sources/inc/geshi/oracle8.php
new file mode 100644
index 0000000..145bda4
--- /dev/null
+++ b/sources/inc/geshi/oracle8.php
@@ -0,0 +1,496 @@
+ 'Oracle 8 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 (8.1.7).  I like mine uppercase.
+        1 => array(
+            'ABS',
+            'ACCESS',
+            'ACOS',
+            'ADD',
+            'ADD_MONTHS',
+            'ALL',
+            'ALTER',
+            'ANALYZE',
+            'AND',
+            'ANY',
+            'ARRAY',
+            'AS',
+            'ASC',
+            'ASCII',
+            'ASIN',
+            'ASSOCIATE',
+            'AT',
+            'ATAN',
+            'ATAN2',
+            'AUDIT',
+            'AUTHID',
+            'AVG',
+            'BEGIN',
+            'BETWEEN',
+            'BFILENAME',
+            'BINARY_INTEGER',
+            'BITAND',
+            'BODY',
+            'BOOLEAN',
+            'BULK',
+            'BY',
+            'CALL',
+            'CASCADE',
+            'CASE',
+            'CEIL',
+            'CHAR',
+            'CHAR_BASE',
+            'CHARTOROWID',
+            'CHECK',
+            'CHR',
+            'CLOSE',
+            'CLUSTER',
+            'COALESCE',
+            'COLLECT',
+            'COLUMN',
+            'COMMENT',
+            'COMMIT',
+            'COMPRESS',
+            'CONCAT',
+            'CONNECT',
+            'CONSTANT',
+            'CONSTRAINT',
+            'CONSTRAINTS',
+            'CONTEXT',
+            'CONTROLFILE',
+            'CONVERT',
+            'CORR',
+            'COS',
+            'COSH',
+            'COST',
+            'COUNT',
+            'COVAR_POP',
+            'COVAR_SAMP',
+            'CREATE',
+            'CUME_DIST',
+            'CURRENT',
+            'CURRVAL',
+            'CURSOR',
+            'DATABASE',
+            'DATE',
+            'DAY',
+            'DECIMAL',
+            'DECLARE',
+            'DECODE',
+            'DEFAULT',
+            'DELETE',
+            'DENSE_RANK',
+            'DEREF',
+            'DESC',
+            'DIMENSION',
+            'DIRECTORY',
+            'DISASSOCIATE',
+            'DISTINCT',
+            'DO',
+            'DROP',
+            'DUMP',
+            'ELSE',
+            'ELSIF',
+            'EMPTY_BLOB',
+            'EMPTY_CLOB',
+            'END',
+            'EXCEPTION',
+            'EXCLUSIVE',
+            'EXEC',
+            'EXECUTE',
+            'EXISTS',
+            'EXIT',
+            'EXP',
+            'EXPLAIN',
+            'EXTENDS',
+            'EXTRACT',
+            'FALSE',
+            'FETCH',
+            'FILE',
+            'FIRST_VALUE',
+            'FLOAT',
+            'FLOOR',
+            'FOR',
+            'FORALL',
+            'FROM',
+            'FUNCTION',
+            'GOTO',
+            'GRANT',
+            'GREATEST',
+            'GROUP',
+            'GROUPING',
+            'HAVING',
+            'HEAP',
+            'HEXTORAW',
+            'HOUR',
+            'IDENTIFIED',
+            'IF',
+            'IMMEDIATE',
+            'IN',
+            'INCREMENT',
+            'INDEX',
+            'INDEXTYPE',
+            'INDICATOR',
+            'INITCAP',
+            'INITIAL',
+            'INSERT',
+            'INSTR',
+            'INSTRB',
+            'INTEGER',
+            'INTERFACE',
+            'INTERSECT',
+            'INTERVAL',
+            'INTO',
+            'IS',
+            'ISOLATION',
+            'JAVA',
+            'KEY',
+            'LAG',
+            'LAST_DAY',
+            'LAST_VALUE',
+            'LEAD',
+            'LEAST',
+            'LENGTH',
+            'LENGTHB',
+            'LEVEL',
+            'LIBRARY',
+            'LIKE',
+            'LIMITED',
+            'LINK',
+            'LN',
+            'LOCK',
+            'LOG',
+            'LONG',
+            'LOOP',
+            'LOWER',
+            'LPAD',
+            'LTRIM',
+            'MAKE_REF',
+            'MATERIALIZED',
+            'MAX',
+            'MAXEXTENTS',
+            'MIN',
+            'MINUS',
+            'MINUTE',
+            'MLSLABEL',
+            'MOD',
+            'MODE',
+            'MODIFY',
+            'MONTH',
+            'MONTHS_BETWEEN',
+            'NATURAL',
+            'NATURALN',
+            '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',
+            'ORDER',
+            'ORGANIZATION',
+            'OTHERS',
+            'OUT',
+            'OUTLINE',
+            'PACKAGE',
+            'PARTITION',
+            'PCTFREE',
+            'PERCENT_RANK',
+            'PLAN',
+            'PLS_INTEGER',
+            'POSITIVE',
+            'POSITIVEN',
+            'POWER',
+            'PRAGMA',
+            'PRIMARY',
+            'PRIOR',
+            'PRIVATE',
+            'PRIVILEGES',
+            'PROCEDURE',
+            'PROFILE',
+            'PUBLIC',
+            'RAISE',
+            'RANGE',
+            'RANK',
+            'RATIO_TO_REPORT',
+            'RAW',
+            'RAWTOHEX',
+            'REAL',
+            'RECORD',
+            'REF',
+            'REFTOHEX',
+            'REGR_AVGX',
+            'REGR_AVGY',
+            'REGR_COUNT',
+            'REGR_INTERCEPT',
+            'REGR_R2',
+            'REGR_SLOPE',
+            'REGR_SXX',
+            'REGR_SXY',
+            'REGR_SYY',
+            'RELEASE',
+            'RENAME',
+            'REPLACE',
+            'RESOURCE',
+            'RETURN',
+            'RETURNING',
+            'REVERSE',
+            'REVOKE',
+            'ROLE',
+            'ROLLBACK',
+            'ROUND',
+            'ROW',
+            'ROW_NUMBER',
+            'ROWID',
+            'ROWIDTOCHAR',
+            'ROWNUM',
+            'ROWS',
+            'ROWTYPE',
+            'RPAD',
+            'RTRIM',
+            'SAVEPOINT',
+            'SCHEMA',
+            'SECOND',
+            'SEGMENT',
+            'SELECT',
+            'SEPERATE',
+            'SEQUENCE',
+            'SESSION',
+            'SET',
+            'SHARE',
+            'SIGN',
+            'SIN',
+            'SINH',
+            'SIZE',
+            'SMALLINT',
+            'SOUNDEX',
+            'SPACE',
+            'SQL',
+            'SQLCODE',
+            'SQLERRM',
+            'SQRT',
+            'START',
+            'STATISTICS',
+            'STDDEV',
+            'STDDEV_POP',
+            'STDDEV_SAMP',
+            'STOP',
+            'SUBSTR',
+            'SUBSTRB',
+            'SUBTYPE',
+            'SUCCESSFUL',
+            'SUM',
+            'SYNONYM',
+            'SYS_CONTEXT',
+            'SYS_GUID',
+            'SYSDATE',
+            'SYSTEM',
+            'TABLE',
+            'TABLESPACE',
+            'TAN',
+            'TANH',
+            'TEMPORARY',
+            'THEN',
+            'TIME',
+            'TIMESTAMP',
+            'TIMEZONE_ABBR',
+            'TIMEZONE_HOUR',
+            'TIMEZONE_MINUTE',
+            'TIMEZONE_REGION',
+            'TIMING',
+            'TO',
+            'TO_CHAR',
+            'TO_DATE',
+            'TO_LOB',
+            'TO_MULTI_BYTE',
+            'TO_NUMBER',
+            'TO_SINGLE_BYTE',
+            'TRANSACTION',
+            'TRANSLATE',
+            'TRIGGER',
+            'TRIM',
+            'TRUE',
+            'TRUNC',
+            'TRUNCATE',
+            'TYPE',
+            'UI',
+            'UID',
+            'UNION',
+            'UNIQUE',
+            'UPDATE',
+            'UPPER',
+            'USE',
+            'USER',
+            'USERENV',
+            'USING',
+            'VALIDATE',
+            'VALUE',
+            'VALUES',
+            'VAR_POP',
+            'VAR_SAMP',
+            'VARCHAR',
+            'VARCHAR2',
+            'VARIANCE',
+            'VIEW',
+            'VSIZE',
+            'WHEN',
+            'WHENEVER',
+            'WHERE',
+            'WHILE',
+            'WITH',
+            'WORK',
+            'WRITE',
+            '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;'
+//Add the styles for groups 3-6 here when used
+            ),
+        '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 --git a/sources/inc/geshi/oxygene.php b/sources/inc/geshi/oxygene.php
new file mode 100644
index 0000000..bc2ee65
--- /dev/null
+++ b/sources/inc/geshi/oxygene.php
@@ -0,0 +1,154 @@
+ 'Oxygene (Delphi Prism)',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
+    //Compiler directives
+    'COMMENT_REGEXP' => array(2 => '/{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
+    'CASE_KEYWORDS' => 0,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'and',   'begin', 'case', 'const',  'div', 'do', 'downto', 'else',
+            'end',  'for',  'function', 'if', 'in', 'mod', 'not', 'of', 'or',
+            'procedure', 'repeat', 'record', 'set', 'shl', 'shr', 'then', 'to',
+            'type', 'until', 'uses', 'var','while', 'with', 'xor', 'exit', 'break',
+            'class', 'constructor', 'inherited', 'private', 'public', 'protected',
+            'property', 'As', 'Is', 'Unit', 'Continue', 'Try', 'Except', 'Forward',
+            'Interface','Implementation', 'nil', 'out', 'loop', 'namespace', 'true',
+            'false', 'new', 'ensure', 'require', 'on', 'event', 'delegate', 'method',
+            'raise', 'assembly', 'module', 'using','locking', 'old', 'invariants', 'operator',
+            'self', 'async', 'finalizer', 'where', 'yield', 'nullable', 'Future',
+            'From',  'Finally', 'dynamic'
+            ),
+        2 => array(
+            'override', 'virtual', 'External', 'read', 'add', 'remove','final', 'abstract',
+            'empty', 'global', 'locked', 'sealed', 'reintroduce', 'implements', 'each',
+            'default', 'partial', 'finalize', 'enum', 'flags', 'result', 'readonly', 'unsafe',
+            'pinned', 'matching', 'static', 'has', 'step', 'iterator', 'inline', 'nested',
+            'Implies', 'Select', 'Order', 'By', 'Desc', 'Asc', 'Group', 'Join', 'Take',
+            'Skip', 'Concat', 'Union', 'Reverse', 'Distinct', 'Into', 'Equals', 'params',
+            'sequence', 'index', 'notify', 'Parallel', 'create', 'array', 'Queryable', 'Aspect',
+            'volatile', 'write'
+            ),
+        3 => array(
+            'chr', 'ord', 'inc', 'dec', 'assert', 'iff', 'assigned','futureAssigned', 'length', 'low', 'high', 'typeOf', 'sizeOf', 'disposeAndNil', 'Coalesce', 'unquote'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+//        4 => false,
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('.', ',', ':', ';'),
+        2 => array('@', '^'),
+        3 => array('=', '+', '-', '*', '/')
+        ),
+    '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(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #9ac;',
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000066;',
+            2 => 'color: #000066;',
+            3 => 'color: #000066;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+//        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '\$[0-9a-fA-F]+',
+        //Characters
+        1 => '\#\$?[0-9]{1,3}'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/oz.php b/sources/inc/geshi/oz.php
new file mode 100644
index 0000000..d24561b
--- /dev/null
+++ b/sources/inc/geshi/oz.php
@@ -0,0 +1,144 @@
+ 'OZ',
+    'COMMENT_SINGLE' => array(1 => '%'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"','\''),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' => array(),
+    'KEYWORDS' => array(
+        1 => array(
+            'declare','local','in','end','proc','fun','functor','require','prepare',
+            'import','export','define','at','case','then','else','of','elseof',
+            'elsecase','if','elseif','class','from','prop','attr','feat','meth',
+            'self','true','false','unit','div','mod','andthen','orelse','cond','or',
+            'dis','choice','not','thread','try','catch','finally','raise','lock',
+            'skip','fail','for','do'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'SYMBOLS' => array(
+        '@', '!', '|', '<-', ':=', '<', '>', '=<', '>=', '<=', '#', '~', '.',
+        '*', '-', '+', '/', '<:', '>:', '=:', '=<:', '>=:', '\\=', '\\=:', ',',
+        '!!', '...', '==', '::', ':::'
+        ),
+    'STYLES' => array(
+        'REGEXPS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #00a030;',
+            3 => 'color: #bc8f8f;',
+            4 => 'color: #0000ff;',
+            5 => 'color: #a020f0;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #bc8f8f;'
+            ),
+        'KEYWORDS' => array(
+            1 => 'color: #a020f0;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #B22222;',
+            'MULTI' => 'color: #B22222;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #bc8f8f;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #a020f0;'
+            ),
+        'BRACKETS' => array(),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'SCRIPT' => array()
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'URLS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        // function and procedure definition
+        1 => array(
+            GESHI_SEARCH => "(proc|fun)([^{}\n\)]*)(\\{)([\$A-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9_.]*)",
+            GESHI_REPLACE => '\4',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1\2\3',
+            GESHI_AFTER => ''
+            ),
+        // class definition
+        2 => array(
+            GESHI_SEARCH => "(class)([^A-Z\$]*)([\$A-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9_.]*)",
+            GESHI_REPLACE => '\3\4',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1\2',
+            GESHI_AFTER => ''
+            ),
+        // single character
+        3 => array(
+            GESHI_SEARCH => "&.",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        // method definition
+        4 => array(
+            GESHI_SEARCH => "(meth)([^a-zA-Z]+)([a-zA-Z\300-\326\330-\336][A-Z\300-\326\330-\336a-z\337-\366\370-\3770-9]*)",
+            GESHI_REPLACE => '\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1\2',
+            GESHI_AFTER => ''
+            ),
+        // highlight "[]"
+        // ([] is actually a keyword, but that causes problems in validation; putting it into symbols doesn't work.)
+        5 => array(
+            GESHI_SEARCH => "\[\]",
+            GESHI_REPLACE => '\0',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/parasail.php b/sources/inc/geshi/parasail.php
new file mode 100644
index 0000000..864eba1
--- /dev/null
+++ b/sources/inc/geshi/parasail.php
@@ -0,0 +1,133 @@
+ 'ParaSail',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'all', 'block', 'case', 'continue', 'each',
+            'else', 'elsif', 'exit', 'for',
+            'forward', 'if', 'loop', 'return', 'reverse', 'some',
+            'then', 'until', 'while', 'with'
+            ),
+        2 => array(
+            'abs', 'and','in', 'mod', 'not', 'null', 'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abstract', 'class',
+            'concurrent', 'const', 
+            'end', 'extends', 'exports', 
+            'func', 'global', 'implements', 'import',
+            'interface', 'is', 'lambda', 'locked', 
+            'new', 'of', 'op', 'optional',
+            'private', 'queued', 'ref',
+            'separate', 'type', 'var',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; 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: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/parigp.php b/sources/inc/geshi/parigp.php
new file mode 100644
index 0000000..c9c7309
--- /dev/null
+++ b/sources/inc/geshi/parigp.php
@@ -0,0 +1,277 @@
+ 'PARI/GP',
+    'COMMENT_SINGLE' => array(1 => '\\\\'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' => array(
+        # Integers
+        1 => GESHI_NUMBER_INT_BASIC,
+        # Reals
+        2 => GESHI_NUMBER_FLT_SCI_ZERO
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'addprimes','bestappr','bezout','bezoutres','bigomega','binomial',
+            'chinese','content','contfrac','contfracpnqn','core','coredisc',
+            'dirdiv','direuler','dirmul','divisors','eulerphi','factor',
+            'factorback','factorcantor','factorff','factorial','factorint',
+            'factormod','ffgen','ffinit','fflog','fforder','ffprimroot',
+            'fibonacci','gcd','hilbert','isfundamental','ispower','isprime',
+            'ispseudoprime','issquare','issquarefree','kronecker','lcm',
+            'moebius','nextprime','numbpart','numdiv','omega','partitions',
+            'polrootsff','precprime','prime','primepi','primes','qfbclassno',
+            'qfbcompraw','qfbhclassno','qfbnucomp','qfbnupow','qfbpowraw',
+            'qfbprimeform','qfbred','qfbsolve','quadclassunit','quaddisc',
+            'quadgen','quadhilbert','quadpoly','quadray','quadregulator',
+            'quadunit','removeprimes','sigma','sqrtint','stirling',
+            'sumdedekind','zncoppersmith','znlog','znorder','znprimroot',
+            'znstar','Col','List','Mat','Mod','Pol','Polrev','Qfb','Ser','Set',
+            'Str','Strchr','Strexpand','Strtex','Vec','Vecrev','Vecsmall',
+            'binary','bitand','bitneg','bitnegimply','bitor','bittest','bitxor',
+            'ceil','centerlift','component','conj','conjvec','denominator',
+            'floor','frac','imag','length','lift','norm','norml2','numerator',
+            'numtoperm','padicprec','permtonum','precision','random','real',
+            'round','simplify','sizebyte','sizedigit','truncate','valuation',
+            'variable','ellL1','elladd','ellak','ellan','ellanalyticrank',
+            'ellap','ellbil','ellchangecurve','ellchangepoint','ellconvertname',
+            'elldivpol','elleisnum','elleta','ellgenerators','ellglobalred',
+            'ellgroup','ellheight','ellheightmatrix','ellidentify','ellinit',
+            'ellisoncurve','ellj','elllocalred','elllog','elllseries',
+            'ellminimalmodel','ellmodulareqn','ellorder','ellordinate',
+            'ellpointtoz','ellpow','ellrootno','ellsearch','ellsigma','ellsub',
+            'elltaniyama','elltatepairing','elltors','ellweilpairing','ellwp',
+            'ellzeta','ellztopoint','bnfcertify','bnfcompress',
+            'bnfdecodemodule','bnfinit','bnfisintnorm','bnfisnorm',
+            'bnfisprincipal','bnfissunit','bnfisunit','bnfnarrow','bnfsignunit',
+            'bnfsunit','bnrL1','bnrclassno','bnrclassnolist','bnrconductor',
+            'bnrconductorofchar','bnrdisc','bnrdisclist','bnrinit',
+            'bnrisconductor','bnrisprincipal','bnrrootnumber','bnrstark',
+            'dirzetak','factornf','galoisexport','galoisfixedfield',
+            'galoisgetpol','galoisidentify','galoisinit','galoisisabelian',
+            'galoisisnormal','galoispermtopol','galoissubcyclo',
+            'galoissubfields','galoissubgroups','idealadd','idealaddtoone',
+            'idealappr','idealchinese','idealcoprime','idealdiv','idealfactor',
+            'idealfactorback','idealfrobenius','idealhnf','idealintersect',
+            'idealinv','ideallist','ideallistarch','ideallog','idealmin',
+            'idealmul','idealnorm','idealpow','idealprimedec','idealramgroups',
+            'idealred','idealstar','idealtwoelt','idealval','matalgtobasis',
+            'matbasistoalg','modreverse','newtonpoly','nfalgtobasis','nfbasis',
+            'nfbasistoalg','nfdetint','nfdisc','nfeltadd','nfeltdiv',
+            'nfeltdiveuc','nfeltdivmodpr','nfeltdivrem','nfeltmod','nfeltmul',
+            'nfeltmulmodpr','nfeltnorm','nfeltpow','nfeltpowmodpr',
+            'nfeltreduce','nfeltreducemodpr','nfelttrace','nfeltval','nffactor',
+            'nffactorback','nffactormod','nfgaloisapply','nfgaloisconj',
+            'nfhilbert','nfhnf','nfhnfmod','nfinit','nfisideal','nfisincl',
+            'nfisisom','nfkermodpr','nfmodprinit','nfnewprec','nfroots',
+            'nfrootsof1','nfsnf','nfsolvemodpr','nfsubfields','polcompositum',
+            'polgalois','polred','polredabs','polredord','poltschirnhaus',
+            'rnfalgtobasis','rnfbasis','rnfbasistoalg','rnfcharpoly',
+            'rnfconductor','rnfdedekind','rnfdet','rnfdisc','rnfeltabstorel',
+            'rnfeltdown','rnfeltreltoabs','rnfeltup','rnfequation',
+            'rnfhnfbasis','rnfidealabstorel','rnfidealdown','rnfidealhnf',
+            'rnfidealmul','rnfidealnormabs','rnfidealnormrel',
+            'rnfidealreltoabs','rnfidealtwoelt','rnfidealup','rnfinit',
+            'rnfisabelian','rnfisfree','rnfisnorm','rnfisnorminit','rnfkummer',
+            'rnflllgram','rnfnormgroup','rnfpolred','rnfpolredabs',
+            'rnfpseudobasis','rnfsteinitz','subgrouplist','zetak','zetakinit',
+            'plot','plotbox','plotclip','plotcolor','plotcopy','plotcursor',
+            'plotdraw','ploth','plothraw','plothsizes','plotinit','plotkill',
+            'plotlines','plotlinetype','plotmove','plotpoints','plotpointsize',
+            'plotpointtype','plotrbox','plotrecth','plotrecthraw','plotrline',
+            'plotrmove','plotrpoint','plotscale','plotstring','psdraw',
+            'psploth','psplothraw','O','deriv','diffop','eval','factorpadic',
+            'intformal','padicappr','padicfields','polchebyshev','polcoeff',
+            'polcyclo','poldegree','poldisc','poldiscreduced','polhensellift',
+            'polhermite','polinterpolate','polisirreducible','pollead',
+            'pollegendre','polrecip','polresultant','polroots','polrootsmod',
+            'polrootspadic','polsturm','polsubcyclo','polsylvestermatrix',
+            'polsym','poltchebi','polzagier','serconvol','serlaplace',
+            'serreverse','subst','substpol','substvec','taylor','thue',
+            'thueinit','break','for','fordiv','forell','forprime','forstep',
+            'forsubgroup','forvec','if','next','return','until','while',
+            'Strprintf','addhelp','alarm','alias','allocatemem','apply',
+            'default','error','extern','externstr','getheap','getrand',
+            'getstack','gettime','global','input','install','kill','print1',
+            'print','printf','printtex','quit','read','readvec','select',
+            'setrand','system','trap','type','version','warning','whatnow',
+            'write1','write','writebin','writetex','divrem','lex','max','min',
+            'shift','shiftmul','sign','vecmax','vecmin','derivnum','intcirc',
+            'intfouriercos','intfourierexp','intfouriersin','intfuncinit',
+            'intlaplaceinv','intmellininv','intmellininvshort','intnum',
+            'intnuminit','intnuminitgen','intnumromb','intnumstep','prod',
+            'prodeuler','prodinf','solve','sum','sumalt','sumdiv','suminf',
+            'sumnum','sumnumalt','sumnuminit','sumpos','Euler','I','Pi','abs',
+            'acos','acosh','agm','arg','asin','asinh','atan','atanh','bernfrac',
+            'bernreal','bernvec','besselh1','besselh2','besseli','besselj',
+            'besseljh','besselk','besseln','cos','cosh','cotan','dilog','eint1',
+            'erfc','eta','exp','gamma','gammah','hyperu','incgam','incgamc',
+            'lngamma','log','polylog','psi','sin','sinh','sqr','sqrt','sqrtn',
+            'tan','tanh','teichmuller','theta','thetanullk','weber','zeta',
+            'algdep','charpoly','concat','lindep','listcreate','listinsert',
+            'listkill','listpop','listput','listsort','matadjoint',
+            'matcompanion','matdet','matdetint','matdiagonal','mateigen',
+            'matfrobenius','mathess','mathilbert','mathnf','mathnfmod',
+            'mathnfmodid','matid','matimage','matimagecompl','matindexrank',
+            'matintersect','matinverseimage','matisdiagonal','matker',
+            'matkerint','matmuldiagonal','matmultodiagonal','matpascal',
+            'matrank','matrix','matrixqz','matsize','matsnf','matsolve',
+            'matsolvemod','matsupplement','mattranspose','minpoly','qfgaussred',
+            'qfjacobi','qflll','qflllgram','qfminim','qfperfection','qfrep',
+            'qfsign','setintersect','setisset','setminus','setsearch','cmp',
+            'setunion','trace','vecextract','vecsort','vector','vectorsmall',
+            'vectorv','ellheegner'
+            ),
+
+        2 => array(
+            'void','bool','negbool','small','int',/*'real',*/'mp','var','lg','pol',
+            'vecsmall','vec','list','str','genstr','gen','typ'
+            ),
+
+        3 => array(
+            'TeXstyle','breakloop','colors','compatible','datadir','debug',
+            'debugfiles','debugmem','echo','factor_add_primes','factor_proven',
+            'format','graphcolormap','graphcolors','help','histfile','histsize',
+            'lines','linewrap',/*'log',*/'logfile','new_galois_format','output',
+            'parisize','path','prettyprinter','primelimit','prompt_cont',
+            'prompt','psfile','readline','realprecision','recover','secure',
+            'seriesprecision',/*'simplify',*/'strictmatch','timer'
+            ),
+
+        4 => array(
+            'alarmer','archer','errpile','gdiver','impl','syntaxer','invmoder',
+            'overflower','talker','typeer','user'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(',')','{','}','[',']','+','-','*','/','%','=','<','>','!','^','&','|','?',';',':',',','\\','\''
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #e07022;',
+            3 => 'color: #00d2d2;',
+            4 => 'color: #00d2d2;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #111111; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #002222;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #666666;',
+            1 => 'color: #666666;',
+            2 => 'color: #666666;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #e07022',    # Should be the same as keyword group 2
+            1 => 'color: #555555'
+            ),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array( # types marked on variables
+            GESHI_SEARCH => '(? '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '"',
+            GESHI_AFTER => '"'
+            ),
+        1 => array( # literal variables
+            GESHI_SEARCH => '(? '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        2 => array(
+            '[a-zA-Z][a-zA-Z0-9_]*:' => ''
+            ),
+        3 => array(
+            'default(' => ''
+            ),
+        4 => array(
+            'trap(' => ''
+            ),
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff --git a/sources/inc/geshi/pascal.php b/sources/inc/geshi/pascal.php
new file mode 100644
index 0000000..de5ca87
--- /dev/null
+++ b/sources/inc/geshi/pascal.php
@@ -0,0 +1,165 @@
+ 'Pascal',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('(*' => '*)', '{' => '}'),
+    //Compiler directives
+    'COMMENT_REGEXP' => array(2 => '/\\{\\$.*?}|\\(\\*\\$.*?\\*\\)/U'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+
+    'KEYWORDS' => array(
+        1 => array(
+            'absolute','asm','assembler','begin','break','case','catch','cdecl',
+            'const','constructor','default','destructor','div','do','downto',
+            'else','end','except','export','exports','external','far',
+            'finalization','finally','for','forward','function','goto','if',
+            'implementation','in','index','inherited','initialization','inline',
+            'interface','interrupt','label','library','mod','name','not','of',
+            'or','overload','override','private','procedure','program',
+            'property','protected','public','published','raise','repeat',
+            'resourcestring','shl','shr','stdcall','stored','switch','then',
+            'to','try','type','unit','until','uses','var','while','with','xor'
+            ),
+        2 => array(
+            'nil', 'false', 'true',
+            ),
+        3 => array(
+            'abs','and','arc','arctan','blockread','blockwrite','chr','dispose',
+            'cos','eof','eoln','exp','get','ln','new','odd','ord','ordinal',
+            'pred','read','readln','sin','sqrt','succ','write','writeln'
+            ),
+        4 => array(
+            'ansistring','array','boolean','byte','bytebool','char','file',
+            'integer','longbool','longint','object','packed','pointer','real',
+            'record','set','shortint','smallint','string','union','word'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '[', ']'),
+        1 => array('.', ',', ':', ';'),
+        2 => array('@', '^'),
+        3 => array('=', '+', '-', '*', '/')
+        ),
+    '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(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000; 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;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000cc;',
+            1 => 'color: #ff0000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000066;',
+            2 => 'color: #000066;',
+            3 => 'color: #000066;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '\$[0-9a-fA-F]+',
+        //Characters
+        1 => '\#(?:\$[0-9a-fA-F]{1,2}|\d{1,3})'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/pcre.php b/sources/inc/geshi/pcre.php
new file mode 100644
index 0000000..13a2e02
--- /dev/null
+++ b/sources/inc/geshi/pcre.php
@@ -0,0 +1,188 @@
+ 'PCRE',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(
+        ),
+    'COMMENT_REGEXP' => array(
+        // Non-matching groups
+        1 => "/(?<=\()\?(?::|(?=\())/",
+
+        // Modifier groups
+        2 => "/(?<=\()\?[cdegimopsuxUX\-]+(?::|(?=\)))/",
+
+        // Look-Aheads
+        3 => "/(?<=\()\?[!=]/",
+
+        // Look-Behinds
+        4 => "/(?<=\()\?<[!=]/",
+
+        // Forward Matching
+        5 => "/(?<=\()\?>/",
+
+        // Recursive Matching
+        6 => "/(?<=\()\?R(?=\))/",
+
+        // Named Subpattern
+        7 => "/(?<=\()\?(?:P?<\w+>|\d+(?=\))|P[=>]\w+(?=\)))/",
+
+        // Back Reference
+        8 => "/\\\\(?:[1-9]\d?|g\d+|g\{(?:-?\d+|\w+)\}|k<\w+>|k'\w+'|k\{\w+\})/",
+
+        // Byte sequence: Octal
+        9 => "/\\\\[0-7]{2,3}/",
+
+        // Byte sequence: Hex
+        10 => "/\\\\x[0-9a-fA-F]{2}/",
+
+        // Byte sequence: Hex
+        11 => "/\\\\u[0-9a-fA-F]{4}/",
+
+        // Byte sequence: Hex
+        12 => "/\\\\U[0-9a-fA-F]{8}/",
+
+        // Byte sequence: Unicode
+        13 => "/\\\\[pP]\{[^}\n]+\}/",
+
+        // One-Char Escapes
+        14 => "/\\\\[abdefnrstvwzABCDGSWXZ\\\\\\.\[\]\(\)\{\}\^\\\$\?\+\*]/",
+
+        // Byte sequence: Control-X sequence
+        15 => "/\\\\c./",
+
+        // Quantifier
+        16 => "/\{(?:\d+,?|\d*,\d+)\}/",
+
+        // Comment Subpattern
+        17 => "/(?<=\()\?#[^\)]*/",
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        0 => array('.'),
+        1 => array('(', ')'),
+        2 => array('[', ']', '|'),
+        3 => array('^', '$'),
+        4 => array('?', '+', '*'),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #993333; font-weight: bold;',
+            2 => 'color: #cc3300; font-weight: bold;',
+            3 => 'color: #cc0066; font-weight: bold;',
+            4 => 'color: #cc0066; font-weight: bold;',
+            5 => 'color: #cc6600; font-weight: bold;',
+            6 => 'color: #cc00cc; font-weight: bold;',
+            7 => 'color: #cc9900; font-weight: bold; font-style: italic;',
+            8 => 'color: #cc9900; font-style: italic;',
+            9 => 'color: #669933; font-style: italic;',
+            10 => 'color: #339933; font-style: italic;',
+            11 => 'color: #339966; font-style: italic;',
+            12 => 'color: #339999; font-style: italic;',
+            13 => 'color: #663399; font-style: italic;',
+            14 => 'color: #999933; font-style: italic;',
+            15 => 'color: #993399; font-style: italic;',
+            16 => 'color: #333399; font-style: italic;',
+            17 => '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: #ff0000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #333399; font-weight: bold;',
+            1 => 'color: #993333; font-weight: bold;',
+            2 => 'color: #339933; font-weight: bold;',
+            3 => 'color: #333399; font-weight: bold;',
+            4 => 'color: #333399; font-style: italic;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/per.php b/sources/inc/geshi/per.php
new file mode 100644
index 0000000..c42ddb5
--- /dev/null
+++ b/sources/inc/geshi/per.php
@@ -0,0 +1,302 @@
+ 'per',
+    'COMMENT_SINGLE' => array(1 => '--', 2 => '#'),
+    'COMMENT_MULTI' => array('{' => '}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "ACCELERATOR",
+            "ACCELERATOR2",
+            "ACTION",
+            "ALT",
+            "AND",
+            "AUTO",
+            "AUTONEXT",
+            "AUTOSCALE",
+            "BETWEEN",
+            "BOTH",
+            "BUTTON",
+            "BUTTONEDIT",
+            "BUTTONTEXTHIDDEN",
+            "BY",
+            "BYTE",
+            "CANVAS",
+            "CENTER",
+            "CHECKBOX",
+            "CLASS",
+            "COLOR",
+            "COLUMNS",
+            "COMBOBOX",
+            "COMMAND",
+            "COMMENT",
+            "COMMENTS",
+            "COMPACT",
+            "COMPRESS",
+            "CONFIG",
+            "CONTROL",
+            "CURRENT",
+            "DATABASE",
+            "DATEEDIT",
+            "DEC",
+            "DEFAULT",
+            "DEFAULTS",
+            "DELIMITERS",
+            "DISPLAY",
+            "DISPLAYONLY",
+            "DOWNSHIFT",
+            "DYNAMIC",
+            "EDIT",
+            "FIXED",
+            "FOLDER",
+            "FONTPITCH",
+            "FORMAT",
+            "FORMONLY",
+            "GRID",
+            "GRIDCHILDRENINPARENT",
+            "GROUP",
+            "HBOX",
+            "HEIGHT",
+            "HIDDEN",
+            "HORIZONTAL",
+            "INCLUDE",
+            "INITIAL",
+            "INITIALIZER",
+            "INPUT",
+            "INSTRUCTIONS",
+            "INTERVAL",
+            "INVISIBLE",
+            "IS",
+            "ITEM",
+            "ITEMS",
+            "JUSTIFY",
+            "KEY",
+            "KEYS",
+            "LABEL",
+            "LEFT",
+            "LIKE",
+            "LINES",
+            "MATCHES",
+            "NAME",
+            "NOENTRY",
+            "NONCOMPRESS",
+            "NORMAL",
+            "NOT",
+            "NOUPDATE",
+            "OPTIONS",
+            "OR",
+            "ORIENTATION",
+            "PACKED",
+            "PAGE",
+            "PICTURE",
+            "PIXELHEIGHT",
+            "PIXELS",
+            "PIXELWIDTH",
+            "POINTS",
+            "PROGRAM",
+            "PROGRESSBAR",
+            "QUERYCLEAR",
+            "QUERYEDITABLE",
+            "RADIOGROUP",
+            "RECORD",
+            "REQUIRED",
+            "REVERSE",
+            "RIGHT",
+            "SAMPLE",
+            "SCREEN",
+            "SCROLL",
+            "SCROLLBARS",
+            "SCROLLGRID",
+            "SECOND",
+            "SEPARATOR",
+            "SHIFT",
+            "SIZE",
+            "SIZEPOLICY",
+            "SMALLFLOAT",
+            "SMALLINT",
+            "SPACING",
+            "STRETCH",
+            "STYLE",
+            "TABINDEX",
+            "TABLE",
+            "TAG",
+            "TEXT",
+            "TEXTEDIT",
+            "THROUGH",
+            "THRU",
+            "TITLE",
+            "TO",
+            "TOOLBAR",
+            "TOPMENU",
+            "TYPE",
+            "UNHIDABLE",
+            "UNHIDABLECOLUMNS",
+            "UNMOVABLE",
+            "UNMOVABLECOLUMNS",
+            "UNSIZABLE",
+            "UNSIZABLECOLUMNS",
+            "UNSORTABLE",
+            "UNSORTABLECOLUMNS",
+            "UPSHIFT",
+            "USER",
+            "VALIDATE",
+            "VALUECHECKED",
+            "VALUEMAX",
+            "VALUEMIN",
+            "VALUEUNCHECKED",
+            "VARCHAR",
+            "VARIABLE",
+            "VBOX",
+            "VERIFY",
+            "VERSION",
+            "VERTICAL",
+            "TIMESTAMP",
+            "WANTCOLUMNSANCHORED", /* to be removed! */
+            "WANTFIXEDPAGESIZE",
+            "WANTNORETURNS",
+            "WANTTABS",
+            "WHERE",
+            "WIDGET",
+            "WIDTH",
+            "WINDOWSTYLE",
+            "WITHOUT",
+            "WORDWRAP",
+            "X",
+            "Y",
+            "ZEROFILL",
+            "SCHEMA",
+            "ATTRIBUTES",
+            "TABLES",
+            "LAYOUT",
+            "END"
+            ),
+        2 => array(
+            "YEAR",
+            "BLACK",
+            "BLINK",
+            "BLUE",
+            "YELLOW",
+            "WHITE",
+            "UNDERLINE",
+            "CENTURY",
+            "FRACTION",
+            "CHAR",
+            "CHARACTER",
+            "CHARACTERS",
+            "CYAN",
+            "DATE",
+            "DATETIME",
+            "DAY",
+            "DECIMAL",
+            "FALSE",
+            "FLOAT",
+            "GREEN",
+            "HOUR",
+            "INT",
+            "INTEGER",
+            "MAGENTA",
+            "MINUTE",
+            "MONEY",
+            "NONE",
+            "NULL",
+            "REAL",
+            "RED",
+            "TRUE",
+            "TODAY",
+            "MONTH",
+            "IMAGE"
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '>', '<', '^', '!', '|', ':',
+        '(', ')', '[', ']'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #0000FF; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #008080;',
+            'MULTI' => 'color: green'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #808080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => 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(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/perl.php b/sources/inc/geshi/perl.php
new file mode 100644
index 0000000..309ebd8
--- /dev/null
+++ b/sources/inc/geshi/perl.php
@@ -0,0 +1,213 @@
+ 'Perl',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(
+        '=back' => '=cut',
+        '=head' => '=cut',
+        '=item' => '=cut',
+        '=over' => '=cut',
+        '=begin' => '=cut',
+        '=end' => '=cut',
+        '=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",
+        //Regular expression match variables
+        3 => '/\$\d+/',
+        //Heredoc
+        4 => '/<<\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Predefined variables
+        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
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'case', 'do', 'else', 'elsif', 'for', 'if', 'then', 'until', 'while', 'foreach', 'my',
+            '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', 'ARGV', 'ARGVOUT'
+            ),
+        3 => array(
+            'abs', 'accept', 'alarm', 'atan2', 'bind', 'binmode', 'bless',
+            'caller', 'chdir', 'chmod', 'chomp', 'chop', 'chown', 'chr',
+            'chroot', 'close', 'closedir', 'connect', 'cos',
+            'crypt', 'dbmclose', 'dbmopen', 'defined', 'delete', 'die',
+            'dump', 'each', 'endgrent', 'endhostent', 'endnetent', 'endprotoent',
+            'endpwent', 'endservent', 'eof', 'eval', 'exec', 'exists', 'exit',
+            'exp', 'fcntl', 'fileno', 'flock', 'fork', 'format', 'formline',
+            'getc', 'getgrent', 'getgrgid', 'getgrnam', 'gethostbyaddr',
+            'gethostbyname', 'gethostent', 'getlogin', 'getnetbyaddr', 'getnetbyname',
+            'getnetent', 'getpeername', 'getpgrp', 'getppid', 'getpriority',
+            'getprotobyname', 'getprotobynumber', 'getprotoent', 'getpwent',
+            'getpwnam', 'getpwuid', 'getservbyname', 'getservbyport', 'getservent',
+            'getsockname', 'getsockopt', 'glob', 'gmtime', 'goto', 'grep',
+            'hex', 'import', 'index', 'int', 'ioctl', 'join', 'keys', 'kill',
+            'lc', 'lcfirst', 'length', 'link', 'listen', 'local',
+            'localtime', 'log', 'lstat', 'm', 'map', 'mkdir', 'msgctl', 'msgget',
+            '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', 'ref', 'rename', 'require', 'return',
+            'reverse', 'rewinddir', 'rindex', 'rmdir', 's', 'scalar', 'seek',
+            'seekdir', 'select', 'semctl', 'semget', 'semop', 'send', 'setgrent',
+            'sethostent', 'setnetent', 'setpgrp', 'setpriority', 'setprotoent',
+            'setpwent', 'setservent', 'setsockopt', 'shift', 'shmctl', 'shmget',
+            'shmread', 'shmwrite', 'shutdown', 'sin', 'sleep', 'socket', 'socketpair',
+            'sort', 'splice', 'split', 'sprintf', 'sqrt', 'srand', 'stat',
+            'study', 'substr', 'symlink', 'syscall', 'sysopen', 'sysread',
+            'sysseek', 'system', 'syswrite', 'tell', 'telldir', 'tie', 'tied',
+            'time', 'times', 'tr', 'truncate', 'uc', 'ucfirst', 'umask', 'undef',
+            'unlink', 'unpack', 'unshift', 'untie', 'utime', 'values',
+            'vec', 'wait', 'waitpid', 'wantarray', 'warn', 'write', 'y'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|', '^',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', '.', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        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 => 'color: #009966; font-style: italic;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #cc0000; font-style: italic;',
+            5 => 'color: #0000ff;',
+            '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 => '',
+        2 => '',
+        3 => 'http://perldoc.perl.org/functions/{FNAMEL}.html'
+        ),
+    '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(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/perl6.php b/sources/inc/geshi/perl6.php
new file mode 100644
index 0000000..706eabc
--- /dev/null
+++ b/sources/inc/geshi/perl6.php
@@ -0,0 +1,197 @@
+ 'Perl 6',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('=begin' => '=end'),
+    'COMMENT_REGEXP' => array(
+        //Regular expressions
+        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        //Regular expression match variables
+        3 => '/\$\d+/',
+        //Heredoc
+        4 => '/<<\s*?([\'"]?)([a-zA-Z0-9]+)\1;[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        //Beastly hack to finish highlighting each POD block
+        5 => '((?<==end) .+)'
+        ),
+    '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
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'do', 'else', 'elsif', 'for', 'if', 'then', 'until',
+            'while', 'loop', 'repeat', 'my', 'xor', 'or', 'and',
+            'unless', 'next', 'last', 'redo', 'not', 'our', 'let',
+            'temp', 'state', 'enum', 'constant', 'continue', 'cmp',
+            'ne', 'eq', 'lt', 'gt', 'le', 'ge', 'leg', 'div', 'X',
+            'Z', 'x', 'xx', 'given', 'when', 'default', 'has',
+            'returns', 'of', 'is', 'does', 'where', 'subset', 'but',
+            'True', 'False', 'return', 'die', 'fail'
+            ),
+        2 => array(
+            'use', 'sub', 'multi', 'method', 'submethod', 'proto',
+            'class', 'role', 'grammar', 'regex', 'token', 'rule',
+            'new', 'BEGIN', 'END', 'CHECK', 'INIT', 'START', 'FIRST',
+            'ENTER', 'LEAVE', 'KEEP', 'UNDO', 'NEXT', 'LAST', 'PRE',
+            'POST', 'CATCH', 'CONTROL', 'BUILD'
+            ),
+        3 => array(
+            'all', 'any', 'cat', 'classify', 'defined', 'grep', 'first',
+            'keys', 'kv', 'join', 'map', 'max', 'min', 'none', 'one', 'pairs',
+            'print', 'printf', 'roundrobin', 'pick', 'reduce', 'reverse', 'say',
+            'shape', 'sort', 'srand', 'undefine', 'uri', 'values', 'warn', 'zip',
+
+            # Container
+            'rotate', 'comb', 'end', 'elems', 'delete',
+            'exists', 'pop', 'push', 'shift', 'splice',
+            'unshift', 'invert', 'decode',
+
+            # Numeric
+            'succ', 'pred', 'abs', 'exp', 'log',
+            'log10', 'rand', 'roots', 'cis', 'unpolar', 'i', 'floor',
+            'ceiling', 'round', 'truncate', 'sign', 'sqrt',
+            'polar', 're', 'im', 'I', 'atan2', 'nude',
+            'denominator', 'numerator',
+
+            # Str
+            'p5chop', 'chop', 'p5chomp', 'chomp', 'lc', 'lcfirst',
+            'uc', 'ucfirst', 'normalize', 'samecase', 'sameaccent',
+            'capitalize', 'length', 'chars', 'graphs', 'codes',
+            'bytes', 'encode', 'index', 'pack', 'quotemeta', 'rindex',
+            'split', 'words', 'flip', 'sprintf', 'fmt',
+            'substr', 'trim', 'unpack', 'match', 'subst', 'trans'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|', '^',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', '.', ':',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        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 => 'color: #009966; font-style: italic;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #cc0000; font-style: italic;',
+            5 => '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: #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;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variable
+        0 => '(?:[$@%]|&)(?:(?:[\^:*?!~]|<)?[a-zA-Z_][a-zA-Z0-9_]*|(?=\.))'
+        # We treat the . twigil specially so the name can be highlighted as an
+        # object field (via OBJECT_SPLITTERS).
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/pf.php b/sources/inc/geshi/pf.php
new file mode 100644
index 0000000..818e11b
--- /dev/null
+++ b/sources/inc/geshi/pf.php
@@ -0,0 +1,178 @@
+ 'OpenBSD Packet Filter',
+    'COMMENT_SINGLE' => array('#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        2 => '/<<-?\s*?(\'?)([a-zA-Z0-9]+)\1\\n.*\\n\\2(?![a-zA-Z0-9])/siU',
+        3 => "/\\\\['\"]/siU"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    'ESCAPE_CHAR' => '',
+    'ESCAPE_REGEXP' => array(
+        1 => "#\\\\[nfrtv\\$\\\"\n]#i",
+        2 => "#\\$[a-z_][a-z0-9_]*#i",
+        3 => "/\\$\\{[^\\n\\}]*?\\}/i",
+        4 => "/\\$\\([^\\n\\)]*?\\)/i",
+        5 => "/`[^`]*`/"
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'pass'
+        ),
+        2 => array(
+            'block'
+            ),
+        3 => array(
+            'quick','keep','state','antispoof','table','persist','file','scrub',
+            'set','skip','flags','on'
+            ),
+        4 => array(
+            'in','out','proto'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>', ';;', '`','='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #009900; font-weight: bold;',
+            2 => 'color: #990000; font-weight: bold;',
+            3 => 'color: #7a0874;',
+            4 => 'color: #336699;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #666666; font-style: italic;',
+            1 => 'color: #800000;',
+            2 => 'color: #cc0000; font-style: italic;',
+            3 => 'color: #000000; font-weight: bold;'
+            ),
+        'ESCAPE_CHAR' => array(
+            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: #CC0000;',
+            'HARD' => 'color: #CC0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff00cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #007800;',
+            1 => 'color: #007800;',
+            2 => 'color: #007800;',
+            4 => 'color: #007800;',
+            5 => 'color: #660033;',
+            6 => 'color: #000099; font-weight: bold;',
+            7 => 'color: #0000ff;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables (will be handled by comment_regexps)
+        0 => "\\$\\{[a-zA-Z_][a-zA-Z0-9_]*?\\}",
+        //Variables without braces
+        1 => "\\$[a-zA-Z_][a-zA-Z0-9_]*",
+        //Variable assignment
+        2 => "(? "\\$[*#\$\\-\\?!]",
+        //Parameters of commands
+        5 => "(?<=\s)--?[0-9a-zA-Z\-]+(?=[\s=]|$)",
+        //IPs
+        6 => "([0-9]{1,3}\.){3}[0-9]{1,3}",
+        //Tables
+        7 => "(<(.*)>)"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '$'
+        ),
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?  "(?![\.\-a-zA-Z0-9_%\\/])"
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/php-brief.php b/sources/inc/geshi/php-brief.php
new file mode 100644
index 0000000..a4804b4
--- /dev/null
+++ b/sources/inc/geshi/php-brief.php
@@ -0,0 +1,222 @@
+ 'PHP (brief)',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    //Heredoc and Nowdoc syntax
+    'COMMENT_REGEXP' => array(3 => '/<<<\s*?(\'?)([a-zA-Z0-9]+)\1[^\n]*?\\n.*\\n\\2(?![a-zA-Z0-9])/siU'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'HARDQUOTE' => array("'", "'"),
+    'HARDESCAPE' => array("\'"),
+    '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', 'as', 'foreach', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch',
+            'return', 'break'
+            ),
+        2 => array(
+            'null', '__LINE__', '__FILE__',
+            'false', '<?php',
+            'true', 'var', 'default',
+            'function', 'class', 'new', '&new', 'public', 'private', 'interface', 'extends',
+            'const', 'self'
+            ),
+        3 => array(
+            'func_num_args', 'func_get_arg', 'func_get_args', 'strlen', 'strcmp', 'strncmp', 'strcasecmp', 'strncasecmp', 'each', 'error_reporting', 'define', 'defined',
+            'trigger_error', 'user_error', 'set_error_handler', 'restore_error_handler', 'get_declared_classes', 'get_loaded_extensions',
+            'extension_loaded', 'get_extension_funcs', 'debug_backtrace',
+            'constant', 'bin2hex', 'sleep', 'usleep', 'time', 'mktime', 'gmmktime', 'strftime', 'gmstrftime', 'strtotime', 'date', 'gmdate', 'getdate', 'localtime', 'checkdate', 'flush', 'wordwrap', 'htmlspecialchars', 'htmlentities', 'html_entity_decode', 'md5', 'md5_file', 'crc32', 'getimagesize', 'image_type_to_mime_type', 'phpinfo', 'phpversion', 'phpcredits', 'strnatcmp', 'strnatcasecmp', 'substr_count', 'strspn', 'strcspn', 'strtok', 'strtoupper', 'strtolower', 'strpos', 'strrpos', 'strrev', 'hebrev', 'hebrevc', 'nl2br', 'basename', 'dirname', 'pathinfo', 'stripslashes', 'stripcslashes', 'strstr', 'stristr', 'strrchr', 'str_shuffle', 'str_word_count', 'strcoll', 'substr', 'substr_replace', 'quotemeta', 'ucfirst', 'ucwords', 'strtr', 'addslashes', 'addcslashes', 'rtrim', 'str_replace', 'str_repeat', 'count_chars', 'chunk_split', 'trim', 'ltrim', 'strip_tags', 'similar_text', 'explode', 'implode', 'setlocale', 'localeconv',
+            'parse_str', 'str_pad', 'chop', 'strchr', 'sprintf', 'printf', 'vprintf', 'vsprintf', 'sscanf', 'fscanf', 'parse_url', 'urlencode', 'urldecode', 'rawurlencode', 'rawurldecode', 'readlink', 'linkinfo', 'link', 'unlink', 'exec', 'system', 'escapeshellcmd', 'escapeshellarg', 'passthru', 'shell_exec', 'proc_open', 'proc_close', 'rand', 'srand', 'getrandmax', 'mt_rand', 'mt_srand', 'mt_getrandmax', 'base64_decode', 'base64_encode', 'abs', 'ceil', 'floor', 'round', 'is_finite', 'is_nan', 'is_infinite', 'bindec', 'hexdec', 'octdec', 'decbin', 'decoct', 'dechex', 'base_convert', 'number_format', 'fmod', 'ip2long', 'long2ip', 'getenv', 'putenv', 'getopt', 'microtime', 'gettimeofday', 'getrusage', 'uniqid', 'quoted_printable_decode', 'set_time_limit', 'get_cfg_var', 'magic_quotes_runtime', 'set_magic_quotes_runtime', 'get_magic_quotes_gpc', 'get_magic_quotes_runtime',
+            'import_request_variables', 'error_log', 'serialize', 'unserialize', 'memory_get_usage', 'var_dump', 'var_export', 'debug_zval_dump', 'print_r','highlight_file', 'show_source', 'highlight_string', 'ini_get', 'ini_get_all', 'ini_set', 'ini_alter', 'ini_restore', 'get_include_path', 'set_include_path', 'restore_include_path', 'setcookie', 'header', 'headers_sent', 'connection_aborted', 'connection_status', 'ignore_user_abort', 'parse_ini_file', 'is_uploaded_file', 'move_uploaded_file', 'intval', 'floatval', 'doubleval', 'strval', 'gettype', 'settype', 'is_null', 'is_resource', 'is_bool', 'is_long', 'is_float', 'is_int', 'is_integer', 'is_double', 'is_real', 'is_numeric', 'is_string', 'is_array', 'is_object', 'is_scalar',
+            'ereg', 'ereg_replace', 'eregi', 'eregi_replace', 'split', 'spliti', 'join', 'sql_regcase', 'dl', 'pclose', 'popen', 'readfile', 'rewind', 'rmdir', 'umask', 'fclose', 'feof', 'fgetc', 'fgets', 'fgetss', 'fread', 'fopen', 'fpassthru', 'ftruncate', 'fstat', 'fseek', 'ftell', 'fflush', 'fwrite', 'fputs', 'mkdir', 'rename', 'copy', 'tempnam', 'tmpfile', 'file', 'file_get_contents', 'stream_select', 'stream_context_create', 'stream_context_set_params', 'stream_context_set_option', 'stream_context_get_options', 'stream_filter_prepend', 'stream_filter_append', 'fgetcsv', 'flock', 'get_meta_tags', 'stream_set_write_buffer', 'set_file_buffer', 'set_socket_blocking', 'stream_set_blocking', 'socket_set_blocking', 'stream_get_meta_data', 'stream_register_wrapper', 'stream_wrapper_register', 'stream_set_timeout', 'socket_set_timeout', 'socket_get_status', 'realpath', 'fnmatch', 'fsockopen', 'pfsockopen', 'pack', 'unpack', 'get_browser', 'crypt', 'opendir', 'closedir', 'chdir', 'getcwd', 'rewinddir', 'readdir', 'dir', 'glob', 'fileatime', 'filectime', 'filegroup', 'fileinode', 'filemtime', 'fileowner', 'fileperms', 'filesize', 'filetype', 'file_exists', 'is_writable', 'is_writeable', 'is_readable', 'is_executable', 'is_file', 'is_dir', 'is_link', 'stat', 'lstat', 'chown',
+            'touch', 'clearstatcache', 'mail', 'ob_start', 'ob_flush', 'ob_clean', 'ob_end_flush', 'ob_end_clean', 'ob_get_flush', 'ob_get_clean', 'ob_get_length', 'ob_get_level', 'ob_get_status', 'ob_get_contents', 'ob_implicit_flush', 'ob_list_handlers', 'ksort', 'krsort', 'natsort', 'natcasesort', 'asort', 'arsort', 'sort', 'rsort', 'usort', 'uasort', 'uksort', 'shuffle', 'array_walk', 'count', 'end', 'prev', 'next', 'reset', 'current', 'key', 'min', 'max', 'in_array', 'array_search', 'extract', 'compact', 'array_fill', 'range', 'array_multisort', 'array_push', 'array_pop', 'array_shift', 'array_unshift', 'array_splice', 'array_slice', 'array_merge', 'array_merge_recursive', 'array_keys', 'array_values', 'array_count_values', 'array_reverse', 'array_reduce', 'array_pad', 'array_flip', 'array_change_key_case', 'array_rand', 'array_unique', 'array_intersect', 'array_intersect_assoc', 'array_diff', 'array_diff_assoc', 'array_sum', 'array_filter', 'array_map', 'array_chunk', 'array_key_exists', 'pos', 'sizeof', 'key_exists', 'assert', 'assert_options', 'version_compare', 'ftok', 'str_rot13', 'aggregate',
+            'session_name', 'session_module_name', 'session_save_path', 'session_id', 'session_regenerate_id', 'session_decode', 'session_register', 'session_unregister', 'session_is_registered', 'session_encode',
+            'session_start', 'session_destroy', 'session_unset', 'session_set_save_handler', 'session_cache_limiter', 'session_cache_expire', 'session_set_cookie_params', 'session_get_cookie_params', 'session_write_close', 'preg_match', 'preg_match_all', 'preg_replace', 'preg_replace_callback', 'preg_split', 'preg_quote', 'preg_grep', 'overload', 'ctype_alnum', 'ctype_alpha', 'ctype_cntrl', 'ctype_digit', 'ctype_lower', 'ctype_graph', 'ctype_print', 'ctype_punct', 'ctype_space', 'ctype_upper', 'ctype_xdigit', 'virtual', 'apache_request_headers', 'apache_note', 'apache_lookup_uri', 'apache_child_terminate', 'apache_setenv', 'apache_response_headers', 'apache_get_version', 'getallheaders', 'mysql_connect', 'mysql_pconnect', 'mysql_close', 'mysql_select_db', 'mysql_create_db', 'mysql_drop_db', 'mysql_query', 'mysql_unbuffered_query', 'mysql_db_query', 'mysql_list_dbs', 'mysql_list_tables', 'mysql_list_fields', 'mysql_list_processes', 'mysql_error', 'mysql_errno', 'mysql_affected_rows', 'mysql_insert_id', 'mysql_result', 'mysql_num_rows', 'mysql_num_fields', 'mysql_fetch_row', 'mysql_fetch_array', 'mysql_fetch_assoc', 'mysql_fetch_object', 'mysql_data_seek', 'mysql_fetch_lengths', 'mysql_fetch_field', 'mysql_field_seek', 'mysql_free_result', 'mysql_field_name', 'mysql_field_table', 'mysql_field_len', 'mysql_field_type', 'mysql_field_flags', 'mysql_escape_string', 'mysql_real_escape_string', 'mysql_stat',
+            'mysql_thread_id', 'mysql_client_encoding', 'mysql_get_client_info', 'mysql_get_host_info', 'mysql_get_proto_info', 'mysql_get_server_info', 'mysql_info', 'mysql', 'mysql_fieldname', 'mysql_fieldtable', 'mysql_fieldlen', 'mysql_fieldtype', 'mysql_fieldflags', 'mysql_selectdb', 'mysql_createdb', 'mysql_dropdb', 'mysql_freeresult', 'mysql_numfields', 'mysql_numrows', 'mysql_listdbs', 'mysql_listtables', 'mysql_listfields', 'mysql_db_name', 'mysql_dbname', 'mysql_tablename', 'mysql_table_name', 'pg_connect', 'pg_pconnect', 'pg_close', 'pg_connection_status', 'pg_connection_busy', 'pg_connection_reset', 'pg_host', 'pg_dbname', 'pg_port', 'pg_tty', 'pg_options', 'pg_ping', 'pg_query', 'pg_send_query', 'pg_cancel_query', 'pg_fetch_result', 'pg_fetch_row', 'pg_fetch_assoc', 'pg_fetch_array', 'pg_fetch_object', 'pg_fetch_all', 'pg_affected_rows', 'pg_get_result', 'pg_result_seek', 'pg_result_status', 'pg_free_result', 'pg_last_oid', 'pg_num_rows', 'pg_num_fields', 'pg_field_name', 'pg_field_num', 'pg_field_size', 'pg_field_type', 'pg_field_prtlen', 'pg_field_is_null', 'pg_get_notify', 'pg_get_pid', 'pg_result_error', 'pg_last_error', 'pg_last_notice', 'pg_put_line', 'pg_end_copy', 'pg_copy_to', 'pg_copy_from',
+            'pg_trace', 'pg_untrace', 'pg_lo_create', 'pg_lo_unlink', 'pg_lo_open', 'pg_lo_close', 'pg_lo_read', 'pg_lo_write', 'pg_lo_read_all', 'pg_lo_import', 'pg_lo_export', 'pg_lo_seek', 'pg_lo_tell', 'pg_escape_string', 'pg_escape_bytea', 'pg_unescape_bytea', 'pg_client_encoding', 'pg_set_client_encoding', 'pg_meta_data', 'pg_convert', 'pg_insert', 'pg_update', 'pg_delete', 'pg_select', 'pg_exec', 'pg_getlastoid', 'pg_cmdtuples', 'pg_errormessage', 'pg_numrows', 'pg_numfields', 'pg_fieldname', 'pg_fieldsize', 'pg_fieldtype', 'pg_fieldnum', 'pg_fieldprtlen', 'pg_fieldisnull', 'pg_freeresult', 'pg_result', 'pg_loreadall', 'pg_locreate', 'pg_lounlink', 'pg_loopen', 'pg_loclose', 'pg_loread', 'pg_lowrite', 'pg_loimport', 'pg_loexport',
+            'echo', 'print', 'global', 'static', 'exit', 'array', 'empty', 'eval', 'isset', 'unset', 'die'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '<%', '<%=', '%>', ''
+            ),
+        0 => 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: #990000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #0000cc; 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: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.php.net/{FNAMEL}'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '->',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "[\\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            ' '?>'
+            ),
+        1 => array(
+            ' '?>'
+            ),
+        2 => array(
+            '<%' => '%>'
+            ),
+        3 => array(
+            ''
+            ),
+        4 => "/(?P<\\?(?>php\b)?)(?:".
+            "(?>[^\"'?\\/<]+)|".
+            "\\?(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?P\w+)\s.*?\s\k".
+            ")*(?P\\?>|\Z)/sm",
+        5 => "/(?P<%)(?:".
+            "(?>[^\"'%\\/<]+)|".
+            "%(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?$)|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?P\w+)\s.*?\s\k".
+            ")*(?P%>)/sm"
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/php.php b/sources/inc/geshi/php.php
new file mode 100644
index 0000000..2827457
--- /dev/null
+++ b/sources/inc/geshi/php.php
@@ -0,0 +1,1117 @@
+ 'PHP',
+    'COMMENT_SINGLE' => array(1 => '//', 2 => '#'),
+    'COMMENT_MULTI' => 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',
+        // Advanced # handling
+        2 => "/#.*?(?:(?=\?\>)|^)/smi"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    '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(
+            'as','break','case','continue','default','do','else','elseif',
+            'endfor','endforeach','endif','endswitch','endwhile','for',
+            'foreach','if','include','include_once','require','require_once',
+            'return','switch','throw','while',
+
+            'echo','print'
+            ),
+        2 => array(
+            '&new','</script>','<?php','<script language',
+            'abstract','class','const','declare','extends','function','global',
+            'interface','namespace','new','private','protected','public','self',
+            'use','var'
+            ),
+        3 => array(
+            '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;',
+            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: #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(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            'HARD' => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            ),
+        'METHODS' => array(
+            1 => 'color: #004000;',
+            2 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;',
+            1 => 'color: #000000; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000088;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => '',
+            4 => '',
+            5 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.php.net/{FNAMEL}',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '->',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "[\\$]+[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<'.'?php' => '?'.'>'
+            ),
+        1 => array(
+            '<'.'?' => '?'.'>'
+            ),
+        2 => array(
+            '<'.'%' => '%'.'>'
+            ),
+        3 => array(
+            ''
+            ),
+        4 => "/(?P<\\?(?>php\b)?)(?:".
+            "(?>[^\"'?\\/<]+)|".
+            "\\?(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?(?:\\?>|$))|".
+            "#(?>.*?(?:\\?>|$))|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?P\w+)\s.*?\s\k".
+            ")*?(?P\\?>|\Z)/sm",
+        5 => "/(?P<%)(?:".
+            "(?>[^\"'%\\/<]+)|".
+            "%(?!>)|".
+            "(?>'(?>[^'\\\\]|\\\\'|\\\\\\\|\\\\)*')|".
+            "(?>\"(?>[^\\\"\\\\]|\\\\\"|\\\\\\\\|\\\\)*\")|".
+            "(?>\\/\\*(?>[^\\*]|(?!\\*\\/)\\*)*\\*\\/)|".
+            "\\/\\/(?>.*?(?:%>|$))|".
+            "#(?>.*?(?:%>|$))|".
+            "\\/(?=[^*\\/])|".
+            "<(?!<<)|".
+            "<<<(?P\w+)\s.*?\s\k".
+            ")*?(?P%>|\Z)/sm",
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/pic16.php b/sources/inc/geshi/pic16.php
new file mode 100644
index 0000000..46d7ac9
--- /dev/null
+++ b/sources/inc/geshi/pic16.php
@@ -0,0 +1,141 @@
+ 'PIC16',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*Instructions*/
+        1 => array(
+            'addcf','adddcf','addlw','addwf','andlw','andwf','bc','bcf','bdc',
+            'bnc','bndc','bnz','bsf','btfsc','btfss','bz','call','clrc','clrdc',
+            'clrf','clrw','clrwdt','clrz','comf','decf','goto','incf','incfsz',
+            'iorlw','iorwf','lcall','lgoto','movf','movfw','movlw','movwf',
+            'option','negf','nop','retfie','retlw','return','rlf','rrf','setc',
+            'setdc','setz','skpc','skpdc','skpnc','skpndc','skpnz','skpz',
+            'sleep','subcf','subdcf','sublw','subwf','swapf','tris','tstf',
+            'xorlw','xorwf'
+            ),
+        /*Registers*/
+        2 => array(
+            'INDF','TMR0','OPTION','PCL','STATUS','FSR','PORTA','PORTB','PORTC',
+            'PORTD','PORTE','PORTF','TRISA','TRISB','TRISC','TRISD','TRISE',
+            'TRISF','PCLATH','INTCON','PIR1','PIE1','PCON','CMCON','VRCON',
+            'F','W'
+            ),
+        /*Directives*/
+        3 => array(
+            '_BADRAM','BANKISEL','BANKSEL','CBLOCK','CODE','_CONFIG','CONSTANT',
+            'DA','DATA','DB','DE','#DEFINE','DT','DW','ELSE','END','ENDC',
+            'ENDIF','ENDM','ENDW','EQU','ERROR','ERRORLEVEL','EXITM','EXPAND',
+            'EXTERN','FILL','GLOBAL','IDATA','_IDLOCS','IF','IFDEF','IFNDEF',
+            'INCLUDE','#INCLUDE','LIST','LOCAL','MACRO','_MAXRAM','MESSG',
+            'NOEXPAND','NOLIST','ORG','PAGE','PAGESEL','PROCESSOR','RADIX',
+            'RES','SET','SPACE','SUBTITLE','TITLE','UDATA','UDATA_ACS',
+            'UDATA_OVR','UDATA_SHR','#UNDEFINE','VARIABLE','WHILE',
+            'D','H','O','B','A'
+            ),
+        ),
+    'SYMBOLS' => array('=','.',',',':'),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000a0; font-weight: bold;',
+            2 => 'color: #aa3300; font-weight: bold;',
+            3 => 'color: #0000ff;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #00a000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff7700;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff7700;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #7777ff;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC |
+        GESHI_NUMBER_BIN_SUFFIX |
+        GESHI_NUMBER_HEX_PREFIX |
+        GESHI_NUMBER_HEX_SUFFIX,
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "a-zA-Z0-9\$_\|\#>|^",
+            'DISALLOWED_AFTER' => "a-zA-Z0-9_<\|%"
+            )
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/pike.php b/sources/inc/geshi/pike.php
new file mode 100644
index 0000000..743f711
--- /dev/null
+++ b/sources/inc/geshi/pike.php
@@ -0,0 +1,103 @@
+ 'Pike',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'goto', 'break', 'continue', 'return', 'case', 'default', 'if',
+            'else', 'switch', 'while', 'foreach', 'do', 'for', 'gauge',
+            'destruct', 'lambda', 'inherit', 'import', 'typeof', 'catch',
+            'inline', 'nomask', 'private', 'protected', 'public', 'static'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%', '=', '!', '&', '|', '?', ';'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff --git a/sources/inc/geshi/pixelbender.php b/sources/inc/geshi/pixelbender.php
new file mode 100644
index 0000000..7b29ee6
--- /dev/null
+++ b/sources/inc/geshi/pixelbender.php
@@ -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 --git a/sources/inc/geshi/pli.php b/sources/inc/geshi/pli.php
new file mode 100644
index 0000000..c299851
--- /dev/null
+++ b/sources/inc/geshi/pli.php
@@ -0,0 +1,200 @@
+ 'PL/I',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'abnormal', 'abs', 'acos', 'acosf', 'add', 'addbuff', 'addr',
+            'addrdata', 'alias', 'aligned', 'all', 'alloc', 'allocate',
+            'allocation', 'allocn', 'allocsize', 'any', 'anycondition', 'area',
+            'ascii', 'asin', 'asinf', 'asm', 'asmtdli', 'assembler',
+            'assignable', 'atan', 'atand', 'atanf', 'atanh', 'attach',
+            'attention', 'attn', 'auto', 'automatic', 'availablearea',
+            'backwards', 'based', 'begin', 'bigendian', 'bin', 'binary',
+            'binaryvalue', 'bind', 'binvalue', 'bit', 'bitloc', 'bitlocation',
+            'bkwd', 'blksize', 'bool', 'buf', 'buffered', 'buffers', 'bufnd',
+            'bufni', 'bufoff', 'bufsp', 'builtin', 'bx', 'by', 'byaddr', 'byte',
+            'byvalue', 'b4', 'call', 'cast', 'cds', 'ceil', 'center',
+            'centerleft', 'centerright', 'centre', 'centreleft', 'centreright',
+            'char', 'character', 'charg', 'chargraphic', 'charval', 'check',
+            'checkstg', 'close', 'cmpat', 'cobol', 'col', 'collate', 'column',
+            'comment', 'compare', 'compiledate', 'compiletime', 'completion',
+            'complex', 'cond', 'condition', 'conjg', 'conn', 'connected',
+            'consecutive', 'controlled', 'conv', 'conversion', 'copy', 'cos',
+            'cosd', 'cosf', 'cosh', 'count', 'counter', 'cpln', 'cplx', 'cs',
+            'cstg', 'ctl', 'ctlasa', 'ctl360', 'currentsize', 'currentstorage',
+            'data', 'datafield', 'date', 'datetime', 'days', 'daystodate',
+            'daystosecs', 'db', 'dcl', 'dec', 'decimal', 'declare', 'def',
+            'default', 'define', 'defined', 'delay', 'delete', 'descriptor',
+            'descriptors', 'detach', 'dft', 'dim', 'dimacross', 'dimension',
+            'direct', 'display', 'divide', 'do', 'downthru', 'edit', 'else',
+            'empty', 'end', 'endfile', 'endpage', 'entry', 'entryaddr', 'env',
+            'environment', 'epsilon', 'erf', 'erfc', 'error', 'event', 'excl',
+            'exclusive', 'exit', 'exp', 'expf', 'exponent', 'exports', 'ext',
+            'external', 'fb', 'fbs', 'fetch', 'file', 'fileddint', 'fileddtest',
+            'fileddword', 'fileid', 'fileopen', 'fileread', 'fileseek',
+            'filetell', 'filewrite', 'finish', 'first', 'fixed', 'fixedbin',
+            'fixeddec', 'fixedoverflow', 'float', 'floatbin', 'floatdec',
+            'floor', 'flush', 'fofl', 'format', 'fortran', 'free', 'from',
+            'fromalien', 'fs', 'gamma', 'generic', 'genkey', 'get', 'getenv',
+            'go', 'goto', 'graphic', 'gx', 'handle', 'hbound', 'hex', 'hexadec',
+            'heximage', 'high', 'huge', 'iand', 'ieee', 'ieor', 'if', 'ignore',
+            'imag', 'in', 'index', 'indexarea', 'indexed', 'init', 'initial',
+            'inline', 'inonly', 'inot', 'inout', 'input', 'int', 'inter',
+            'internal', 'into', 'invalidop', 'ior', 'irred', 'irreducible',
+            'isfinite', 'isigned', 'isinf', 'isll', 'ismain', 'isnan',
+            'isnormal', 'isrl', 'iszero', 'iunsigned', 'key', 'keyed',
+            'keyfrom', 'keylength', 'keyloc', 'keyto', 'label', 'last',
+            'lbound', 'leave', 'left', 'length', 'like', 'limited', 'line',
+            'lineno', 'linesize', 'linkage', 'list', 'littleendian', 'loc',
+            'locate', 'location', 'log', 'logf', 'loggamma', 'log10', 'log10f',
+            'log2', 'low', 'lowercase', 'lower2', 'maccol', 'maclmar',
+            'macname', 'macrmar', 'main', 'max', 'maxexp', 'maxlength',
+            'memconvert', 'memcu12', 'memcu14', 'memcu21', 'memcu24', 'memcu41',
+            'memcu42', 'memindex', 'memsearch', 'memsearchr', 'memverify',
+            'memverifyr', 'min', 'minexp', 'mod', 'mpstr', 'multiply', 'name',
+            'native', 'ncp', 'new', 'nocharg', 'nochargraphic', 'nocheck',
+            'nocmpat', 'noconv', 'noconversion', 'nodescriptor', 'noexecops',
+            'nofixedoverflow', 'nofofl', 'noinline', 'nolock', 'nomap',
+            'nomapin', 'nomapout', 'nonasgn', 'nonassignable', 'nonconnected',
+            'nonnative', 'noofl', 'nooverflow', 'norescan', 'normal', 'nosize',
+            'nostrg', 'nostringrange', 'nostringsize', 'nostrz', 'nosubrg',
+            'nosubscriptrange', 'noufl', 'nounderflow', 'nowrite', 'nozdiv',
+            'nozerodivide', 'null', 'offset', 'offsetadd', 'offsetdiff',
+            'offsetsubtract', 'offsetvalue', 'ofl', 'omitted', 'on', 'onarea',
+            'onchar', 'oncode', 'oncondcond', 'oncondid', 'oncount', 'onfile',
+            'ongsource', 'onkey', 'online', 'onloc', 'onoffset', 'onsource',
+            'onsubcode', 'onwchar', 'onwsource', 'open', 'optional', 'options',
+            'order', 'ordinal', 'ordinalname', 'ordinalpred', 'ordinalsucc',
+            'other', 'otherwise', 'outonly', 'output', 'overflow', 'package',
+            'packagename', 'page', 'pageno', 'pagesize', 'parameter', 'parmset',
+            'password', 'pending', 'pic', 'picspec', 'picture', 'places',
+            'pliascii', 'plicanc', 'plickpt', 'plidelete', 'plidump',
+            'pliebcdic', 'plifill', 'plifree', 'plimove', 'pliover', 'plirest',
+            'pliretc', 'pliretv', 'plisaxa', 'plisaxb', 'plisaxc', 'plisaxd',
+            'plisrta', 'plisrtb', 'plisrtc', 'plisrtd', 'plitdli', 'plitran11',
+            'plitran12', 'plitran21', 'plitran22', 'pointer', 'pointeradd',
+            'pointerdiff', 'pointersubtract', 'pointervalue', 'poly', 'pos',
+            'position', 'prec', 'precision', 'pred', 'present', 'print',
+            'priority', 'proc', 'procedure', 'procedurename', 'procname',
+            'prod', 'ptr', 'ptradd', 'ptrdiff', 'ptrsubtract', 'ptrvalue',
+            'put', 'putenv', 'quote', 'radix', 'raise2', 'random', 'range',
+            'rank', 'read', 'real', 'record', 'recsize', 'recursive', 'red',
+            'reducible', 'reentrant', 'refer', 'regional', 'reg12', 'release',
+            'rem', 'reorder', 'repattern', 'repeat', 'replaceby2', 'reply',
+            'reread', 'rescan', 'reserved', 'reserves', 'resignal', 'respec',
+            'retcode', 'return', 'returns', 'reuse', 'reverse', 'revert',
+            'rewrite', 'right', 'round', 'rounddec', 'samekey', 'scalarvarying',
+            'scale', 'search', 'searchr', 'secs', 'secstodate', 'secstodays',
+            'select', 'seql', 'sequential', 'serialize4', 'set', 'sign',
+            'signal', 'signed', 'sin', 'sind', 'sinf', 'sinh', 'sis', 'size',
+            'skip', 'snap', 'sourcefile', 'sourceline', 'sqrt', 'sqrtf',
+            'stackaddr', 'statement', 'static', 'status', 'stg', 'stmt', 'stop',
+            'storage', 'stream', 'strg', 'string', 'stringrange', 'stringsize',
+            'structure', 'strz', 'subrg', 'subscriptrange', 'substr',
+            'subtract', 'succ', 'sum', 'suppress', 'sysin', 'sysnull',
+            'sysparm', 'sysprint', 'system', 'sysversion', 'tally', 'tan',
+            'tand', 'tanf', 'tanh', 'task', 'then', 'thread', 'threadid',
+            'time', 'tiny', 'title', 'to', 'total', 'tpk', 'tpm', 'transient',
+            'translate', 'transmit', 'trim', 'trkofl', 'trunc', 'type', 'ufl',
+            'ulength', 'ulength16', 'ulength8', 'unal', 'unaligned',
+            'unallocated', 'unbuf', 'unbuffered', 'undefinedfile', 'underflow',
+            'undf', 'unlock', 'unsigned', 'unspec', 'until', 'update', 'upos',
+            'uppercase', 'upthru', 'usubstr', 'usurrogate', 'uvalid', 'uwidth',
+            'valid', 'validdate', 'value', 'var', 'varglist', 'vargsize',
+            'variable', 'varying', 'varyingz', 'vb', 'vbs', 'verify', 'verifyr',
+            'vs', 'vsam', 'wait', 'wchar', 'wcharval', 'weekday', 'when',
+            'whigh', 'while', 'widechar', 'wlow', 'write', 'xmlchar', 'y4date',
+            'y4julian', 'y4year', 'zdiv', 'zerodivide'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '+', '-', '*', '/', '=', '<', '>', '&', '^', '|', ':', '(', ')', ';', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/plsql.php b/sources/inc/geshi/plsql.php
new file mode 100644
index 0000000..09f90a2
--- /dev/null
+++ b/sources/inc/geshi/plsql.php
@@ -0,0 +1,256 @@
+
+ * Copyright: (c) 2006 Victor Engmark (http://l0b0.net/)
+ * Release Version: 1.0.8.11
+ * Date Started: 2006/10/26
+ *
+ * Oracle 9.2 PL/SQL language file for GeSHi.
+ * Formatting is based on the default setup of TOAD 8.6.
+ *
+ * CHANGES
+ * -------
+ * 2006/10/27 (1.0.0)
+ *    -    First Release
+ *
+ * TODO (updated 2006/10/27)
+ * -------------------------
+ * * Add < and > to brackets
+ * * Remove symbols which are also comment delimiters / quote marks?
+ *
+ *************************************************************************************
+ *
+ *         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' => 'PL/SQL',
+    'COMMENT_SINGLE' => array(1 =>'--'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2930
+    'COMMENT_MULTI' => array('/*' => '*/'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2950
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'), //http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        //PL/SQL reserved keywords (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/f_words.htm#LNPLS019)
+        1 => array('ZONE', 'YEAR', 'WRITE', 'WORK', 'WITH', 'WHILE', 'WHERE',
+        'WHENEVER', 'WHEN', 'VIEW', 'VARCHAR2', 'VARCHAR', 'VALUES',
+        'VALIDATE', 'USE', 'UPDATE', 'UNIQUE', 'UNION', 'TYPE', 'TRUE',
+        'TRIGGER', 'TO', 'TIMEZONE_REGION', 'TIMEZONE_MINUTE', 'TIMEZONE_HOUR',
+        'TIMEZONE_ABBR', 'TIMESTAMP', 'TIME', 'THEN', 'TABLE', 'SYNONYM',
+        'SUCCESSFUL', 'SUBTYPE', 'START', 'SQLERRM', 'SQLCODE', 'SQL', 'SPACE',
+        'SMALLINT', 'SHARE', 'SET', 'SEPARATE', 'SELECT', 'SECOND',
+        'SAVEPOINT', 'ROWTYPE', 'ROWNUM', 'ROWID', 'ROW', 'ROLLBACK',
+        'REVERSE', 'RETURN', 'RELEASE', 'RECORD', 'REAL', 'RAW', 'RANGE',
+        'RAISE', 'PUBLIC', 'PROCEDURE', 'PRIVATE', 'PRIOR', 'PRAGMA',
+        'POSITIVEN', 'POSITIVE', 'PLS_INTEGER', 'PCTFREE', 'PARTITION',
+        'PACKAGE', 'OUT', 'OTHERS', 'ORGANIZATION', 'ORDER', 'OR', 'OPTION',
+        'OPERATOR', 'OPEN', 'OPAQUE', 'ON', 'OF', 'OCIROWID', 'NUMBER_BASE',
+        'NUMBER', 'NULL', 'NOWAIT', 'NOT', 'NOCOPY', 'NEXTVAL', 'NEW',
+        'NATURALN', 'NATURAL', 'MONTH', 'MODE', 'MLSLABEL', 'MINUTE', 'MINUS',
+        'LOOP', 'LONG', 'LOCK', 'LIMITED', 'LIKE', 'LEVEL', 'JAVA',
+        'ISOLATION', 'IS', 'INTO', 'INTERVAL', 'INTERSECT', 'INTERFACE',
+        'INTEGER', 'INSERT', 'INDICATOR', 'INDEX', 'IN', 'IMMEDIATE', 'IF',
+        'HOUR', 'HEAP', 'HAVING', 'GROUP', 'GOTO', 'FUNCTION', 'FROM',
+        'FORALL', 'FOR', 'FLOAT', 'FETCH', 'FALSE', 'EXTENDS', 'EXIT',
+        'EXISTS', 'EXECUTE', 'EXCLUSIVE', 'EXCEPTION', 'END', 'ELSIF', 'ELSE',
+        'DROP', 'DO', 'DISTINCT', 'DESC', 'DELETE', 'DEFAULT', 'DECLARE',
+        'DECIMAL', 'DAY', 'DATE', 'CURSOR', 'CURRVAL', 'CURRENT', 'CREATE',
+        'CONSTANT', 'CONNECT', 'COMPRESS', 'COMMIT', 'COMMENT', 'COLLECT',
+        'CLUSTER', 'CLOSE', 'CHECK', 'CHAR_BASE', 'CHAR', 'CASE', 'BY', 'BULK',
+        'BOOLEAN', 'BODY', 'BINARY_INTEGER', 'BETWEEN', 'BEGIN', 'AUTHID',
+        'AT', 'ASC', 'AS', 'ARRAY', 'ANY', 'AND', 'ALTER', 'ALL'),
+        //SQL functions (http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96540/toc.htm & http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96540/functions101a.htm#85925)
+        2 => array('XMLTRANSFORM', 'XMLSEQUENCE', 'XMLFOREST', 'XMLELEMENT',
+        'XMLCONCAT', 'XMLCOLATTVAL', 'XMLAGG', 'WIDTH_BUCKET', 'VSIZE',
+        'VARIANCE', 'VAR_SAMP', 'VAR_POP', 'VALUE', 'USERENV', 'USER', 'UPPER',
+        'UPDATEXML', 'UNISTR', 'UID', 'TZ_OFFSET', 'TRUNC', 'TRIM', 'TREAT',
+        'TRANSLATE', 'TO_YMINTERVAL', 'TO_TIMESTAMP_TZ', 'TO_TIMESTAMP',
+        'TO_SINGLE_BYTE', 'TO_NUMBER', 'TO_NCLOB', 'TO_NCHAR', 'TO_MULTI_BYTE',
+        'TO_LOB', 'TO_DSINTERVAL', 'TO_DATE', 'TO_CLOB', 'TO_CHAR', 'TANH',
+        'TAN', 'SYSTIMESTAMP', 'SYSDATE', 'SYS_XMLGEN', 'SYS_XMLAGG',
+        'SYS_TYPEID', 'SYS_GUID', 'SYS_EXTRACT_UTC', 'SYS_DBURIGEN',
+        'SYS_CONTEXT', 'SYS_CONNECT_BY_PATH', 'SUM', 'SUBSTR', 'STDDEV_SAMP',
+        'STDDEV_POP', 'STDDEV', 'SQRT', 'SOUNDEX', 'SINH', 'SIN', 'SIGN',
+        'SESSIONTIMEZONE', 'RTRIM', 'RPAD', 'ROWIDTONCHAR', 'ROWIDTOCHAR',
+        'ROW_NUMBER', 'ROUND', 'REPLACE', 'REGR_SYY', 'REGR_SXY', 'REGR_SXX',
+        'REGR_SLOPE', 'REGR_R2', 'REGR_INTERCEPT', 'REGR_COUNT', 'REGR_AVGY',
+        'REGR_AVGX', 'REFTOHEX', 'REF', 'RAWTONHEX', 'RAWTOHEX',
+        'RATIO_TO_REPORT', 'RANK', 'POWER', 'PERCENTILE_DISC',
+        'PERCENTILE_CONT', 'PERCENT_RANK', 'PATH', 'NVL2', 'NVL',
+        'NUMTOYMINTERVAL', 'NUMTODSINTERVAL', 'NULLIF', 'NTILE', 'NLSSORT',
+        'NLS_UPPER', 'NLS_LOWER', 'NLS_INITCAP', 'NLS_CHARSET_NAME',
+        'NLS_CHARSET_ID', 'NLS_CHARSET_DECL_LEN', 'NEXT_DAY', 'NEW_TIME',
+        'NCHR', 'MONTHS_BETWEEN', 'MOD', 'MIN', 'MAX', 'MAKE_REF', 'LTRIM',
+        'LPAD', 'LOWER', 'LOG', 'LOCALTIMESTAMP', 'LN', 'LENGTH', 'LEAST',
+        'LEAD', 'LAST_VALUE', 'LAST_DAY', 'LAST', 'LAG', 'INSTR', 'INITCAP',
+        'HEXTORAW', 'GROUPING_ID', 'GROUPING', 'GROUP_ID', 'GREATEST',
+        'FROM_TZ', 'FLOOR', 'FIRST_VALUE', 'FIRST', 'EXTRACTVALUE', 'EXTRACT',
+        'EXP', 'EXISTSNODE', 'EMPTY_CLOB', 'EMPTY_BLOB', 'DUMP', 'DEREF',
+        'DEPTH', 'DENSE_RANK', 'DECOMPOSE', 'DECODE', 'DBTIMEZONE',
+        'CURRENT_TIMESTAMP', 'CURRENT_DATE', 'CUME_DIST', 'COVAR_SAMP',
+        'COVAR_POP', 'COUNT', 'COSH', 'COS', 'CORR', 'CONVERT', 'CONCAT',
+        'COMPOSE', 'COALESCE', 'CHR', 'CHARTOROWID', 'CEIL', 'CAST', 'BITAND',
+        'BIN_TO_NUM', 'BFILENAME', 'AVG', 'ATAN2', 'ATAN', 'ASIN', 'ASCIISTR',
+        'ASCII', 'ADD_MONTHS', 'ACOS', 'ABS'),
+        //PL/SQL packages (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96612/intro2.htm#1025672)
+        3 => array('UTL_URL', 'UTL_TCP', 'UTL_SMTP', 'UTL_REF', 'UTL_RAW',
+        'UTL_PG', 'UTL_INADDR', 'UTL_HTTP', 'UTL_FILE', 'UTL_ENCODE',
+        'UTL_COLL', 'SDO_UTIL', 'SDO_TUNE', 'SDO_MIGRATE', 'SDO_LRS',
+        'SDO_GEOM', 'SDO_CS', 'DMBS_XMLQUERY', 'DMBS_FLASHBACK',
+        'DMBS_DEFER_SYS', 'DEBUG_EXTPROC', 'DBMS_XSLPROCESSOR', 'DBMS_XPLAN',
+        'DBMS_XMLSCHEMA', 'DBMS_XMLSAVE', 'DBMS_XMLPARSER', 'DBMS_XMLGEN',
+        'DBMS_XMLDOM', 'DBMS_XDBT', 'DBMS_XDB_VERSION', 'DBMS_XDB', 'DBMS_WM',
+        'DBMS_UTILITY', 'DBMS_TYPES', 'DBMS_TTS', 'DBMS_TRANSFORM',
+        'DBMS_TRANSACTION', 'DBMS_TRACE', 'DBMS_STRM_A', 'DBMS_STRM',
+        'DBMS_STORAGE_MAP', 'DBMS_STATS', 'DBMS_SQL', 'DBMS_SPACE_ADMIN',
+        'DBMS_SPACE', 'DBMS_SHARED_POOL', 'DBMS_SESSION', 'DBMS_RULE_ADM',
+        'DBMS_RULE', 'DBMS_ROWID', 'DBMS_RLS', 'DBMS_RESUMABLE',
+        'DBMS_RESOURCE_MANAGER_PRIVS', 'DBMS_RESOURCE_MANAGER', 'DBMS_REPUTIL',
+        'DBMS_REPCAT_RGT', 'DBMS_REPCAT_INSTATIATE', 'DBMS_REPCAT_ADMIN',
+        'DBMS_REPCAT', 'DBMS_REPAIR', 'DBMS_REFRESH', 'DBMS_REDEFINITION',
+        'DBMS_RECTIFIER_DIFF', 'DBMS_RANDOM', 'DBMS_PROPAGATION_ADM',
+        'DBMS_PROFILER', 'DBMS_PIPE', 'DBMS_PCLXUTIL', 'DBMS_OUTPUT',
+        'DBMS_OUTLN_EDIT', 'DBMS_OUTLN', 'DBMS_ORACLE_TRACE_USER',
+        'DBMS_ORACLE_TRACE_AGENT', 'DBMS_OLAP', 'DBMS_OFFLINE_SNAPSHOT',
+        'DBMS_OFFLINE_OG', 'DBMS_ODCI', 'DBMS_OBFUSCATION_TOOLKIT',
+        'DBMS_MVIEW', 'DBMS_MGWMSG', 'DBMS_MGWADM', 'DBMS_METADATA',
+        'DBMS_LOGSTDBY', 'DBMS_LOGMNR_D', 'DBMS_LOGMNR_CDC_SUBSCRIBE',
+        'DBMS_LOGMNR_CDC_PUBLISH', 'DBMS_LOGMNR', 'DBMS_LOCK', 'DBMS_LOB',
+        'DBMS_LIBCACHE', 'DBMS_LDAP', 'DBMS_JOB', 'DBMS_IOT',
+        'DBMS_HS_PASSTHROUGH', 'DBMS_FGA', 'DBMS_DISTRIBUTED_TRUST_ADMIN',
+        'DBMS_DESCRIBE', 'DBMS_DEFER_QUERY', 'DBMS_DEFER', 'DBMS_DEBUG',
+        'DBMS_DDL', 'DBMS_CAPTURE_ADM', 'DBMS_AW', 'DBMS_AQELM', 'DBMS_AQADM',
+        'DBMS_AQ', 'DBMS_APPLY_ADM', 'DBMS_APPLICATION_INFO', 'DBMS_ALERT',
+        'CWM2_OLAP_AW_ACCESS'),
+        //PL/SQL predefined exceptions (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/07_errs.htm#784)
+        4 => array('ZERO_DIVIDE', 'VALUE_ERROR', 'TOO_MANY_ROWS',
+        'TIMEOUT_ON_RESOURCE', 'SYS_INVALID_ROWID', 'SUBSCRIPT_OUTSIDE_LIMIT',
+        'SUBSCRIPT_BEYOND_COUNT', 'STORAGE_ERROR', 'SELF_IS_NULL',
+        'ROWTYPE_MISMATCH', 'PROGRAM_ERROR', 'NOT_LOGGED_ON', 'NO_DATA_FOUND',
+        'LOGIN_DENIED', 'INVALID_NUMBER', 'INVALID_CURSOR', 'DUP_VAL_ON_INDEX',
+        'CURSOR_ALREADY_OPEN', 'COLLECTION_IS_NULL', 'CASE_NOT_FOUND',
+        'ACCESS_INTO_NULL'),
+        //Static data dictionary views (http://download-uk.oracle.com/docs/cd/B10501_01/server.920/a96536/ch2.htm)
+        5 => array('USER_REPSITES', 'USER_REPSCHEMA',
+        'USER_REPRESOLUTION_STATISTICS', 'USER_REPRESOLUTION_METHOD',
+        'USER_REPRESOLUTION', 'USER_REPRESOL_STATS_CONTROL', 'USER_REPPROP',
+        'USER_REPPRIORITY_GROUP', 'USER_REPPRIORITY',
+        'USER_REPPARAMETER_COLUMN', 'USER_REPOBJECT', 'USER_REPKEY_COLUMNS',
+        'USER_REPGROUPED_COLUMN', 'USER_REPGROUP_PRIVILEGES', 'USER_REPGROUP',
+        'USER_REPGENOBJECTS', 'USER_REPGENERATED', 'USER_REPFLAVORS',
+        'USER_REPFLAVOR_OBJECTS', 'USER_REPFLAVOR_COLUMNS', 'USER_REPDDL',
+        'USER_REPCONFLICT', 'USER_REPCOLUMN_GROUP', 'USER_REPCOLUMN',
+        'USER_REPCATLOG', 'USER_REPCAT_USER_PARM_VALUES',
+        'USER_REPCAT_USER_AUTHORIZATIONS', 'USER_REPCAT_TEMPLATE_SITES',
+        'USER_REPCAT_TEMPLATE_PARMS', 'USER_REPCAT_TEMPLATE_OBJECTS',
+        'USER_REPCAT_REFRESH_TEMPLATES', 'USER_REPCAT', 'USER_REPAUDIT_COLUMN',
+        'USER_REPAUDIT_ATTRIBUTE', 'DBA_REPSITES_NEW', 'DBA_REPSITES',
+        'DBA_REPSCHEMA', 'DBA_REPRESOLUTION_STATISTICS',
+        'DBA_REPRESOLUTION_METHOD', 'DBA_REPRESOLUTION',
+        'DBA_REPRESOL_STATS_CONTROL', 'DBA_REPPROP', 'DBA_REPPRIORITY_GROUP',
+        'DBA_REPPRIORITY', 'DBA_REPPARAMETER_COLUMN', 'DBA_REPOBJECT',
+        'DBA_REPKEY_COLUMNS', 'DBA_REPGROUPED_COLUMN',
+        'DBA_REPGROUP_PRIVILEGES', 'DBA_REPGROUP', 'DBA_REPGENOBJECTS',
+        'DBA_REPGENERATED', 'DBA_REPFLAVORS', 'DBA_REPFLAVOR_OBJECTS',
+        'DBA_REPFLAVOR_COLUMNS', 'DBA_REPEXTENSIONS', 'DBA_REPDDL',
+        'DBA_REPCONFLICT', 'DBA_REPCOLUMN_GROUP', 'DBA_REPCOLUMN',
+        'DBA_REPCATLOG', 'DBA_REPCAT_USER_PARM_VALUES',
+        'DBA_REPCAT_USER_AUTHORIZATIONS', 'DBA_REPCAT_TEMPLATE_SITES',
+        'DBA_REPCAT_TEMPLATE_PARMS', 'DBA_REPCAT_TEMPLATE_OBJECTS',
+        'DBA_REPCAT_REFRESH_TEMPLATES', 'DBA_REPCAT_EXCEPTIONS', 'DBA_REPCAT',
+        'DBA_REPAUDIT_COLUMN', 'DBA_REPAUDIT_ATTRIBUTE', 'ALL_REPSITES',
+        'ALL_REPSCHEMA', 'ALL_REPRESOLUTION_STATISTICS',
+        'ALL_REPRESOLUTION_METHOD', 'ALL_REPRESOLUTION',
+        'ALL_REPRESOL_STATS_CONTROL', 'ALL_REPPROP', 'ALL_REPPRIORITY_GROUP',
+        'ALL_REPPRIORITY', 'ALL_REPPARAMETER_COLUMN', 'ALL_REPOBJECT',
+        'ALL_REPKEY_COLUMNS', 'ALL_REPGROUPED_COLUMN',
+        'ALL_REPGROUP_PRIVILEGES', 'ALL_REPGROUP', 'ALL_REPGENOBJECTS',
+        'ALL_REPGENERATED', 'ALL_REPFLAVORS', 'ALL_REPFLAVOR_OBJECTS',
+        'ALL_REPFLAVOR_COLUMNS', 'ALL_REPDDL', 'ALL_REPCONFLICT',
+        'ALL_REPCOLUMN_GROUP', 'ALL_REPCOLUMN', 'ALL_REPCATLOG',
+        'ALL_REPCAT_USER_PARM_VALUES', 'ALL_REPCAT_USER_AUTHORIZATIONS',
+        'ALL_REPCAT_TEMPLATE_SITES', 'ALL_REPCAT_TEMPLATE_PARMS',
+        'ALL_REPCAT_TEMPLATE_OBJECTS', 'ALL_REPCAT_REFRESH_TEMPLATES',
+        'ALL_REPCAT', 'ALL_REPAUDIT_COLUMN', 'ALL_REPAUDIT_ATTRIBUTE')
+        ),
+    'SYMBOLS' => array(
+        //PL/SQL delimiters (http://download-uk.oracle.com/docs/cd/B10501_01/appdev.920/a96624/02_funds.htm#2732)
+        '+', '%', "'", '.', '/', '(', ')', ':', ',', '*', '"', '=', '<', '>', '@', ';', '-', ':=', '=>', '||', '**', '<<', '>>', '/*', '*/', '..', '<>', '!=', '~=', '^=', '<=', '>='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00F;',
+            2 => 'color: #000;',
+            3 => 'color: #00F;',
+            4 => 'color: #F00;',
+            5 => 'color: #800;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #080; font-style: italic;',
+            'MULTI' => 'color: #080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #00F;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #F00;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #800;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #0F0;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00F;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => 'color: #0F0;'
+            )
+        ),
+        'URLS' => array(
+            1 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            2 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            3 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            4 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}',
+            5 => 'http://www.oracle.com/pls/db92/db92.drilldown?word={FNAMEU}'
+            ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
diff --git a/sources/inc/geshi/postgresql.php b/sources/inc/geshi/postgresql.php
new file mode 100644
index 0000000..662fdd7
--- /dev/null
+++ b/sources/inc/geshi/postgresql.php
@@ -0,0 +1,288 @@
+ 2010-05-03
+ * Copyright: (c) 2007 Christophe Chauvet (http://kryskool.org/), Nigel McNie (http://qbnz.com/highlighter)
+ * Release Version: 1.0.8.11
+ * Date Started: 2007/07/20
+ *
+ * PostgreSQL language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2007/07/20 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/07/20)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     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' => 'PostgreSQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        //Put PostgreSQL reserved keywords here.  I like mine uppercase.
+        1 => array(
+            'ABORT','ABSOLUTE','ACCESS','ACTION','ADD','ADMIN','AFTER',
+            'AGGREGATE','ALL','ALSO','ALTER','ALWAYS','ANALYSE','ANALYZE','AND',
+            'ANY','AS','ASC,','ASSERTION','ASSIGNMENT','ASYMMETRIC','AT',
+            'AUTHORIZATION','BACKWARD','BEFORE','BEGIN','BETWEEN','BOTH','BY',
+            'CACHE','CALLED','CASCADE','CASCADED','CASE','CAST','CATALOG',
+            'CHAIN','CHARACTERISTICS','CHECK','CHECKPOINT','CLASS','CLOSE',
+            'CLUSTER','COALESCE','COLLATE','COLUMN','COMMENT','COMMIT',
+            'COMMITTED','CONCURRENTLY','CONFIGURATION','CONNECTION',
+            'CONSTRAINT','CONSTRAINTS','CONTENT','CONTINUE','CONVERSION','COPY',
+            'COST','CREATE','CREATEDB','CREATEROLE','CREATEUSER','CROSS','CSV',
+            'CURRENT','CURRENT_CATALOG','CURRENT_DATE','CURRENT_ROLE',
+            'CURRENT_SCHEMA','CURRENT_TIME','CURRENT_TIMESTAMP','CURRENT_USER',
+            'CURSOR','CYCLE','DATA','DATABASE','DAY','DEALLOCATE','DEC',
+            'DECLARE','DEFAULT','DEFAULTS','DEFERRABLE','DEFERRED','DEFINER',
+            'DELETE','DELIMITER','DELIMITERS','DESC','DICTIONARY','DISABLE',
+            'DISCARD','DISTINCT','DO','DOCUMENT','DOMAIN','DOUBLE','DROP',
+            'EACH','ELSE','ENABLE','ENCODING','ENCRYPTED','END','ESCAPE',
+            'EXCEPT','EXCLUDING','EXCLUSIVE','EXECUTE','EXISTS','EXPLAIN',
+            'EXTERNAL','EXTRACT','FALSE','FAMILY','FETCH','FIRST','FOLLOWING',
+            'FOR','FORCE','FOREIGN','FORWARD','FREEZE','FROM','FULL','FUNCTION',
+            'GLOBAL','GRANT','GRANTED','GREATEST','GROUP','HANDLER','HAVING',
+            'HEADER','HOLD','HOUR','IDENTITY','IF','ILIKE','IMMEDIATE',
+            'IMMUTABLE','IMPLICIT','IN','INCLUDING','INCREMENT','INDEX',
+            'INDEXES','INHERIT','INHERITS','INITIALLY','INNER','INOUT','INPUT',
+            'INSENSITIVE','INSERT','INSTEAD','INTERSECT','INTO','INVOKER','IS',
+            'ISNULL','ISOLATION','JOIN','KEY','LANCOMPILER','LANGUAGE','LARGE',
+            'LAST','LC_COLLATE','LC_CTYPE','LEADING','LEAST','LEFT','LEVEL',
+            'LIKE','LIMIT','LISTEN','LOAD','LOCAL','LOCALTIME','LOCALTIMESTAMP',
+            'LOCATION','LOCK','LOGIN','LOOP','MAPPING','MATCH','MAXVALUE',
+            'MINUTE','MINVALUE','MODE','MONTH','MOVE','NAME','NAMES','NATIONAL',
+            'NATURAL','NEW','NEXT','NO','NOCREATEDB','NOCREATEROLE',
+            'NOCREATEUSER','NOINHERIT','NOLOGIN','NONE','NOSUPERUSER','NOT',
+            'NOTHING','NOTIFY','NOTNULL','NOWAIT','NULL','NULLIF','NULLS',
+            'NUMERIC','OBJECT','OF','OFF','OFFSET','OIDS','OLD','ON','ONLY',
+            'OPERATOR','OPTION','OPTIONS','OR','ORDER','OUT','OUTER','OVER',
+            'OVERLAPS','OVERLAY','OWNED','OWNER','PARSER','PARTIAL','PARTITION',
+            'PASSWORD','PLACING','PLANS','POSITION','PRECEDING','PRECISION',
+            'PREPARE','PREPARED','PRESERVE','PRIMARY','PRIOR','PRIVILEGES',
+            'PROCEDURAL','PROCEDURE','QUOTE','RANGE','READ','REASSIGN',
+            'RECHECK','RECURSIVE','REFERENCES','REINDEX','RELATIVE','RELEASE',
+            'RENAME','REPEATABLE','REPLACE','REPLICA','RESET','RESTART',
+            'RESTRICT','RETURN','RETURNING','RETURNS','REVOKE','RIGHT','ROLE',
+            'ROLLBACK','ROW','ROWS','RULE','SAVEPOINT','SCHEMA','SCROLL',
+            'SEARCH','SECOND',
+            'SECURITY','SELECT','SEQUENCE','SERIALIZABLE','SERVER','SESSION',
+            'SESSION_USER','SET','SETOF','SHARE','SHOW','SIMILAR','SIMPLE',
+            'SOME','STABLE','STANDALONE','START','STATEMENT','STATISTICS',
+            'STDIN','STDOUT','STORAGE','STRICT','STRIP','SUPERUSER',
+            'SYMMETRIC','SYSID','SYSTEM','TABLE','TABLESPACE','TEMP','TEMPLATE',
+            'TEMPORARY','THEN','TO','TRAILING','TRANSACTION','TREAT','TRIGGER',
+            'TRUE','TRUNCATE','TRUSTED','TYPE','UNBOUNDED','UNCOMMITTED',
+            'UNENCRYPTED','UNION','UNIQUE','UNKNOWN','UNLISTEN','UNTIL',
+            'UPDATE','USER','USING','VACUUM','VALID','VALIDATOR','VALUE',
+            'VALUES','VARIADIC','VERBOSE','VERSION','VIEW','VOLATILE','WHEN',
+            'WHERE','WHILE','WHITESPACE','WINDOW','WITH','WITHOUT','WORK','WRAPPER',
+            'WRITE','XMLATTRIBUTES','XMLCONCAT','XMLELEMENT','XMLFOREST',
+            'XMLPARSE','XMLPI','XMLROOT','XMLSERIALIZE','YEAR','YES','ZONE'
+            ),
+
+        //Put functions here
+        3 => array(
+            // mathematical functions
+            'ABS','CBRT','CEIL','CEILING','DEGREES','DIV','EXP','FLOOR','LN',
+            'LOG','MOD','PI','POWER','RADIANS','RANDOM','ROUND','SETSEED',
+            'SIGN','SQRT','TRUNC','WIDTH_BUCKET',
+            // trigonometric functions
+            'ACOS','ASIN','ATAN','ATAN2','COS','COT','SIN','TAN',
+            // string functions
+            'BIT_LENGTH','CHAR_LENGTH','CHARACTER_LENGTH','LOWER',
+            'OCTET_LENGTH','POSITION','SUBSTRING','TRIM','UPPER',
+            // other string functions
+            'ASCII','BTRIM','CHR','CONVERT','CONVERT_FROM','CONVERT_TO',
+            'DECODE','ENCODE','INITCAP','LENGTH','LPAD','LTRIM','MD5',
+            'PG_CLIENT_ENCODING','QUOTE_IDENT','QUOTE_LITERAL','QUOTE_NULLABLE',
+            'REGEXP_MATCHES','REGEXP_REPLACE','REGEXP_SPLIT_TO_ARRAY',
+            'REGEXP_SPLIT_TO_TABLE','REPEAT','RPAD','RTRIM','SPLIT_PART',
+            'STRPOS','SUBSTR','TO_ASCII','TO_HEX','TRANSLATE',
+            // binary string functions
+            'GET_BIT','GET_BYTE','SET_BIT','SET_BYTE',
+            // data type formatting functions
+            'TO_CHAR','TO_DATE','TO_NUMBER','TO_TIMESTAMP',
+            // date/time functions
+            'AGE','CLOCK_TIMESTAMP','DATE_PART','DATE_TRUNC','EXTRACT',
+            'ISFINITE','JUSTIFY_DAYS','JUSTIFY_HOURS','JUSTIFY_INTERVAL','NOW',
+            'STATEMENT_TIMESTAMP','TIMEOFDAY','TRANSACTION_TIMESTAMP',
+            // enum support functions
+            'ENUM_FIRST','ENUM_LAST','ENUM_RANGE',
+            // geometric functions
+            'AREA','CENTER','DIAMETER','HEIGHT','ISCLOSED','ISOPEN','NPOINTS',
+            'PCLOSE','POPEN','RADIUS','WIDTH',
+            'BOX','CIRCLE','LSEG','PATH','POINT','POLYGON',
+            // cidr and inet functions
+            'ABBREV','BROADCAST','FAMILY','HOST','HOSTMASK','MASKLEN','NETMASK',
+            'NETWORK','SET_MASKLEN',
+            // text search functions
+            'TO_TSVECTOR','SETWEIGHT','STRIP','TO_TSQUERY','PLAINTO_TSQUERY',
+            'NUMNODE','QUERYTREE','TS_RANK','TS_RANK_CD','TS_HEADLINE',
+            'TS_REWRITE','GET_CURRENT_TS_CONFIG','TSVECTOR_UPDATE_TRIGGER',
+            'TSVECTOR_UPDATE_TRIGGER_COLUMN',
+            'TS_DEBUG','TS_LEXISE','TS_PARSE','TS_TOKEN_TYPE','TS_STAT',
+            // XML functions
+            'XMLCOMMENT','XMLCONCAT','XMLELEMENT','XMLFOREST','XMLPI','XMLROOT',
+            'XMLAGG','XPATH','TABLE_TO_XMLSCHEMA','QUERY_TO_XMLSCHEMA',
+            'CURSOR_TO_XMLSCHEMA','TABLE_TO_XML_AND_XMLSCHEMA',
+            'QUERY_TO_XML_AND_XMLSCHEMA','SCHEMA_TO_XML','SCHEMA_TO_XMLSCHEMA',
+            'SCHEMA_TO_XML_AND_XMLSCHEMA','DATABASE_TO_XML',
+            'DATABASE_TO_XMLSCHEMA','DATABASE_TO_XML_AND_XMLSCHEMA',
+            // sequence manipulating functions
+            'CURRVAL','LASTVAL','NEXTVAL','SETVAL',
+            // conditional expressions
+            'COALESCE','NULLIF','GREATEST','LEAST',
+            // array functions
+            'ARRAY_APPEND','ARRAY_CAT','ARRAY_NDIMS','ARRAY_DIMS','ARRAY_FILL',
+            'ARRAY_LENGTH','ARRAY_LOWER','ARRAY_PREPEND','ARRAY_TO_STRING',
+            'ARRAY_UPPER','STRING_TO_ARRAY','UNNEST',
+            // aggregate functions
+            'ARRAY_AGG','AVG','BIT_AND','BIT_OR','BOOL_AND','BOOL_OR','COUNT',
+            'EVERY','MAX','MIN','STRING_AGG','SUM',
+            // statistic aggregate functions
+            'CORR','COVAR_POP','COVAR_SAMP','REGR_AVGX','REGR_AVGY',
+            'REGR_COUNT','REGR_INTERCEPT','REGR_R2','REGR_SLOPE','REGR_SXX',
+            'REGR_SXY','REGR_SYY','STDDEV','STDDEV_POP','STDDEV_SAMP',
+            'VARIANCE','VAR_POP','VAR_SAMP',
+            // window functions
+            'ROW_NUMBER','RANK','DENSE_RANK','PERCENT_RANK','CUME_DIST','NTILE',
+            'LAG','LEAD','FIRST_VALUE','LAST_VALUE','NTH_VALUE',
+            // set returning functions
+            'GENERATE_SERIES','GENERATE_SUBSCRIPTS'
+            // system information functions not currently included
+            ),
+
+        //Put your postgresql var
+        4 => array(
+            'client_encoding',
+            'standard_conforming_strings'
+            ),
+
+        //Put your data types here
+        5 => array(
+            'ARRAY','ABSTIME','BIGINT','BIGSERIAL','BINARY','BIT','BIT VARYING',
+            'BOOLEAN','BOX','BYTEA','CHAR','CHARACTER','CHARACTER VARYING',
+            'CIDR','CIRCLE','DATE','DECIMAL','DOUBLE PRECISION','ENUM','FLOAT',
+            'INET','INT','INTEGER','INTERVAL','NCHAR','REAL','SMALLINT','TEXT',
+            'TIME','TIMESTAMP','VARCHAR','XML',
+            ),
+
+        //        //Put your package names here
+        //        6 => array(
+        //            ),
+
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            // regular keywords
+            1 => 'color: #000000; font-weight: bold; text-transform: uppercase;',
+            // inbuilt functions
+            3 => 'color: #333399; font-weight: bold; text-transform: uppercase;',
+            // postgresql var(?)
+            4 => 'color: #993333; font-weight: bold; text-transform: uppercase;',
+            // data types
+            5 => '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 => 'http://paste.postgresql.fr/wiki/desc.php?def={FNAME}',
+        5 => '',
+        ),
+
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+
+            3 => array(
+                'DISALLOWED_AFTER' => '(?=\()'
+                ),
+
+            4 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+
+            5 => array(
+                'DISALLOWED_AFTER' => '(?![\(\w])'
+                ),
+            )
+        )
+
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/povray.php b/sources/inc/geshi/povray.php
new file mode 100644
index 0000000..c0ce35c
--- /dev/null
+++ b/sources/inc/geshi/povray.php
@@ -0,0 +1,199 @@
+ 'POVRAY',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'yes', 'wrinkles', 'wood', 'width', 'waves', 'water_level', 'warp', 'vturbulence',
+            'vstr', 'vrotate', 'vnormalize', 'vlength', 'vcross', 'vaxis_rotate', 'variance', 'v_steps',
+            'uv_mapping', 'utf8', 'use_index', 'use_colour', 'use_color', 'use_alpha', 'up', 'undef',
+            'ultra_wide_angle', 'u_steps', 'type', 'turbulence', 'turb_depth', 'ttf', 'true', 'triangle_wave',
+            'translate', 'transform', 'trace', 'toroidal', 'tolerance', 'tiles', 'tile2', 'tightness',
+            'tiff', 'threshold', 'thickness', 'tga', 'texture_map', 'target', 'sys', 'sum',
+            'substr', 'sturm', 'strupr', 'strlwr', 'strength', 'str', 'statistics', 'sqr',
+            'spotted', 'spotlight', 'split_union', 'spline', 'spiral2', 'spiral1', 'spherical', 'specular',
+            'spacing', 'solid', 'smooth', 'slope', 'slice', 'sky', 'size', 'sine_wave',
+            'shadowless', 'scattering', 'scallop_wave', 'scale', 'save_file', 'samples', 'roughness', 'rotate',
+            'ripples', 'right', 'rgbt', 'rgbft', 'rgbf', 'rgb', 'repeat', 'render',
+            'refraction', 'reflection_exponent', 'recursion_limit', 'reciprocal', 'ratio', 'ramp_wave', 'radius', 'radial',
+            'quilted', 'quick_colour', 'quick_color', 'quaternion', 'quadratic_spline', 'pwr', 'projected_through', 'prod',
+            'pretrace_start', 'pretrace_end', 'precompute', 'precision', 'ppm', 'pow', 'pot', 'poly_wave',
+            'point_at', 'png', 'planar', 'pigment_pattern', 'pi', 'phong_size', 'phong', 'phase',
+            'pgm', 'perspective', 'pattern', 'pass_through', 'parallel', 'panoramic', 'orthographic', 'orientation',
+            'orient', 'open', 'onion', 'once', 'on', 'omnimax', 'omega', 'offset',
+            'off', 'octaves', 'number_of_waves', 'noise_generator', 'no_shadow', 'no_reflection', 'no_image', 'no_bump_scale',
+            'no', 'nearest_count', 'natural_spline', 'mortar', 'minimum_reuse', 'min_extent', 'metric', 'method',
+            'metallic', 'media_interaction', 'media_attenuation', 'media', 'max_trace_level', 'max_trace', 'max_sample', 'max_iteration',
+            'max_intersections', 'max_gradient', 'max_extent', 'matrix', 'material_map', 'marble', 'map_type', 'mandel',
+            'major_radius', 'magnet', 'low_error_factor', 'look_at', 'location', 'load_file', 'linear_sweep', 'linear_spline',
+            'leopard', 'lambda', 'julia', 'jpeg', 'jitter', 'irid_wavelength', 'ior', 'inverse',
+            'intervals', 'interpolate', 'internal', 'inside_vector', 'inside', 'initial_frame', 'initial_clock', 'image_width',
+            'image_pattern', 'image_height', 'iff', 'hypercomplex', 'hollow', 'hierarchy', 'hf_gray_16', 'hexagon',
+            'gray_threshold', 'granite', 'gradient', 'global_lights', 'gif', 'gather', 'fresnel', 'frequency',
+            'frame_number', 'form', 'fog_type', 'fog_offset', 'fog_alt', 'focal_point', 'flip', 'flatness',
+            'fisheye', 'final_frame', 'final_clock', 'false', 'falloff_angle', 'falloff', 'fade_power', 'fade_distance',
+            'fade_colour', 'fade_color', 'facets', 'extinction', 'exterior', 'exponent', 'expand_thresholds', 'evaluate',
+            'error_bound', 'emission', 'eccentricity', 'double_illuminate', 'distance', 'dist_exp', 'dispersion_samples', 'dispersion',
+            'direction', 'diffuse', 'df3', 'dents', 'density_map', 'density_file', 'density', 'cylindrical',
+            'cutaway_textures', 'cubic_wave', 'cubic_spline', 'cube', 'crand', 'crackle', 'count', 'coords',
+            'control1', 'control0', 'conserve_energy', 'conic_sweep', 'confidence', 'concat', 'composite', 'component',
+            'colour_map', 'colour', 'color', 'collect', 'clock_on', 'clock_delta', 'clock', 'circular',
+            'chr', 'checker', 'charset', 'cells', 'caustics', 'bumps', 'bump_size', 'brilliance',
+            'brightness', 'brick_size', 'brick', 'bozo', 'boxed', 'blur_samples', 'black_hole', 'bezier_spline',
+            'b_spline', 'average', 'autostop', 'assumed_gamma', 'ascii', 'array', 'area_light', 'arc_angle',
+            'append', 'aperture', 'angle', 'ambient_light', 'ambient', 'always_sample', 'altitude', 'alpha',
+            'all_intersections', 'all', 'agate_turb', 'agate', 'adc_bailout', 'adaptive', 'accuracy', 'absorption',
+            'aa_threshold', 'aa_level', 'reflection'
+            ),
+        2 => array(
+            'abs', 'acos', 'acosh', 'asc', 'asin', 'asinh', 'atan', 'atanh',
+            'atan2', 'ceil', 'cos', 'cosh', 'defined', 'degrees', 'dimensions', 'dimension_size',
+            'div', 'exp', 'file_exists', 'floor', 'int', 'ln', 'log', 'max',
+            'min', 'mod', 'pov', 'radians', 'rand', 'seed', 'select', 'sin',
+            'sinh', 'sqrt', 'strcmp', 'strlen', 'tan', 'tanh', 'val', 'vdot',
+            'vlenght',
+            ),
+        3 => array (
+            'x', 'y', 'z', 't', 'u', 'v', 'red', 'blue',
+            'green', 'filter', 'transmit', 'gray', 'e',
+            ),
+        4 => array (
+            'camera', 'background', 'fog', 'sky_sphere', 'rainbow', 'global_settings', 'radiosity', 'photon',
+            'object', 'blob', 'sphere', 'cylinder', 'box', 'cone', 'height_field', 'julia_fractal',
+            'lathe', 'prism', 'sphere_sweep', 'superellipsoid', 'sor', 'text', 'torus', 'bicubic_patch',
+            'disc', 'mesh', 'triangle', 'smooth_triangle', 'mesh2', 'vertex_vectors', 'normal_vectors', 'uv_vectors',
+            'texture_list', 'face_indices', 'normal_indices', 'uv_indices', 'texture', 'polygon', 'plane', 'poly',
+            'cubic', 'quartic', 'quadric', 'isosurface', 'function', 'contained_by', 'parametric', 'pigment',
+            'union', 'intersection', 'difference', 'merge', 'light_source', 'looks_like', 'light_group', 'clipped_by',
+            'bounded_by', 'interior', 'material', 'interior_texture', 'normal', 'finish', 'color_map', 'pigment_map',
+            'image_map', 'bump_map', 'slope_map', 'normal_map', 'irid', 'photons',
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!',
+        '@', '%', '&', '*', '|', '/', '<',
+        '>', '+', '-', '.', '=', '<=', '>=',
+        '!=',
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #a63123;',
+            2 => 'color: #2312bc;',
+            3 => 'color: #cc1122; font-weight: bold;',
+            4 => 'color: #116688; font-weight: bold;',
+            ),
+        '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: #cc66aa;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #6666cc; font-weight: bold;',
+            1 => 'color: #66cc66; font-weight: bold;',
+            2 => 'color: #66cc66; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        # normal hash lines
+        0 => '\#(?!(include|declare|local|fopen|fclose|read|write|default|version|if|else|end|ifdef|ifndef|switch|case|range|break|while|debug|error|warning|macro) )[[:word:]]*',
+        # syntax functions hash thingis
+        1 => "\#(include|declare|local|fopen|fclose|read|write|default|version|if|else|end|ifdef|ifndef|switch|case|range|break|while|debug|error|warning|macro)",
+        2 => array(
+            GESHI_SEARCH  => "([a-zA-Z]+)(\n)(.*)(\n)(\\1;?)",
+            GESHI_REPLACE => '\3',
+            GESHI_BEFORE => '\1\2',
+            GESHI_AFTER => '\4\5',
+            GESHI_MODIFIERS => 'siU'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+?>
diff --git a/sources/inc/geshi/powerbuilder.php b/sources/inc/geshi/powerbuilder.php
new file mode 100644
index 0000000..d3fcf61
--- /dev/null
+++ b/sources/inc/geshi/powerbuilder.php
@@ -0,0 +1,418 @@
+ 'PowerBuilder',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '~',
+    'KEYWORDS' => array(
+        1 => array(
+            'alias', 'and', 'autoinstantiate', 'call',
+            'case', 'catch', 'choose', 'close', 'commit', 'connect',
+            'constant', 'continue', 'create', 'cursor', 'declare',
+            'delete', 'describe', 'descriptor', 'destroy', 'disconnect',
+            'do', 'dynamic', 'else', 'elseif', 'end', 'enumerated',
+            'event', 'execute', 'exit', 'external', 'false', 'fetch',
+            'first', 'for', 'forward', 'from', 'function', 'global',
+            'goto', 'halt', 'if', 'immediate', 'indirect', 'insert',
+            'into', 'intrinsic', 'is', 'last', 'library', 'loop', 'next',
+            'not', 'of', 'on', 'open', 'or', 'parent', 'post', 'prepare',
+            'prior', 'private', 'privateread', 'privatewrite', 'procedure',
+            'protected', 'protectedread', 'protectedwrite', 'prototypes',
+            'public', 'readonly', 'ref', 'return', 'rollback', 'rpcfunc',
+            'select', 'selectblob', 'shared', 'static', 'step', 'subroutine',
+            'super', 'system', 'systemread', 'systemwrite', 'then', 'this',
+            'to', 'trigger', 'true', 'try', 'type', 'until', 'update', 'updateblob',
+            'using', 'variables', 'where', 'while', 'with', 'within'
+            ),
+        2 => array (
+            'blob', 'boolean', 'char', 'character', 'date', 'datetime',
+            'dec', 'decimal',
+            'double', 'int', 'integer', 'long', 'real', 'string', 'time',
+            'uint', 'ulong', 'unsignedint', 'unsignedinteger', 'unsignedlong'
+            ),
+        3 => array (
+            'abortretryignore!', 'actbegin!', 'acterror!', 'actesql!',
+            'actgarbagecollect!', 'activate!', 'activatemanually!',
+            'activateondoubleclick!',
+            'activateongetfocus!', 'actline!', 'actobjectcreate!', 'actobjectdestroy!',
+            'actprofile!', 'actroutine!', 'acttrace!', 'actual!',
+            'actuser!', 'adoresultset!', 'adtdate!', 'adtdatetime!',
+            'adtdefault!', 'adtdouble!', 'adttext!', 'adttime!',
+            'aix!', 'alignatbottom!', 'alignatleft!', 'alignatright!',
+            'alignattop!', 'all!', 'allowpartialchanges!', 'alpha!',
+            'ansi!', 'any!', 'anycase!', 'anyfont!',
+            'append!', 'application!', 'arabiccharset!', 'area3d!',
+            'areagraph!', 'arraybounds!', 'arrow!', 'ascending!',
+            'asstatement!', 'atbottom!', 'atleft!', 'atright!',
+            'attop!', 'autosize!', 'background!', 'balticcharset!',
+            'bar3dgraph!', 'bar3dobjgraph!', 'bargraph!', 'barstack3dobjgraph!',
+            'barstackgraph!', 'bdiagonal!', 'beam!', 'begin!',
+            'begindrag!', 'beginlabeledit!', 'beginrightdrag!', 'behind!',
+            'blob!', 'bold!', 'boolean!', 'bottom!',
+            'boundedarray!', 'box!', 'byreferenceargument!', 'byvalueargument!',
+            'cancel!', 'cascade!', 'cascaded!', 'category!',
+            'center!', 'character!', 'charsetansi!', 'charsetansiarabic!',
+            'charsetansihebrew!', 'charsetdbcsjapanese!', 'charsetunicode!', 'checkbox!',
+            'child!', 'childtreeitem!', 'chinesebig5!', 'classdefinition!',
+            'classdefinitionobject!', 'classorstructuretype!', 'clicked!', 'clip!',
+            'clipboard!', 'clipformatbitmap!', 'clipformatdib!', 'clipformatdif!',
+            'clipformatenhmetafile!', 'clipformathdrop!', 'clipformatlocale!',
+            'clipformatmetafilepict!',
+            'clipformatoemtext!', 'clipformatpalette!', 'clipformatpendata!', 'clipformatriff!',
+            'clipformatsylk!', 'clipformattext!', 'clipformattiff!', 'clipformatunicodetext!',
+            'clipformatwave!', 'clock!', 'close!', 'closequery!',
+            'col3dgraph!', 'col3dobjgraph!', 'colgraph!',
+            'colstack3dobjgraph!', 'colstackgraph!', 'columnclick!', 'commandbutton!',
+            'connection!', 'connectioninfo!', 'connectobject!', 'connectprivilege!',
+            'connectwithadminprivilege!', 'constructor!', 'containsany!', 'containsembeddedonly!',
+            'containslinkedonly!', 'contextinformation!', 'contextkeyword!', 'continuous!',
+            'corbaobject!', 'corbaunion!', 'cplusplus!', 'cross!',
+            'csv!', 'cumulative!', 'cumulativepercent!', 'currenttreeitem!',
+            'customvisual!', 'dash!', 'dashdot!', 'dashdotdot!',
+            'data!', 'datachange!', 'datamodified!', 'datastore!',
+            'datawindow!', 'datawindowchild!', 'date!', 'datemask!',
+            'datetime!', 'datetimemask!', 'dbase2!', 'dbase3!',
+            'dberror!', 'deactivate!', 'decimal!', 'decimalmask!',
+            'decorative!', 'default!', 'defaultcharset!', 'delete!',
+            'deleteallitems!', 'deleteitem!', 'descending!', 'desktop!',
+            'destructor!', 'detail!', 'diamond!', 'dif!',
+            'dirall!', 'dirapplication!', 'dirdatawindow!', 'directionall!',
+            'directiondown!', 'directionleft!', 'directionright!', 'directionup!',
+            'dirfunction!', 'dirmenu!', 'dirpipeline!', 'dirproject!',
+            'dirquery!', 'dirstructure!', 'diruserobject!', 'dirwindow!',
+            'displayasactivexdocument!', 'displayascontent!', 'displayasicon!', 'dot!',
+            'double!', 'doubleclicked!', 'dragdrop!', 'dragenter!',
+            'dragleave!', 'dragobject!', 'dragwithin!', 'drawobject!',
+            'dropdownlistbox!', 'dropdownpicturelistbox!', 'drophighlighttreeitem!', 'dwobject!',
+            'dynamicdescriptionarea!', 'dynamicstagingarea!', 'easteuropecharset!', 'editchanged!',
+            'editmask!', 'editmenu!', 'end!', 'endlabeledit!',
+            'enterprise!', 'enterpriseonlyfeature!', 'enumeratedtype!', 'enumerationdefinition!',
+            'enumerationitemdefinition!', 'environment!', 'error!', 'errorlogging!',
+            'eventnotexisterror!', 'eventwrongprototypeerror!', 'excel!', 'excel5!',
+            'exceptionfail!', 'exceptionignore!', 'exceptionretry!',
+            'exceptionsubstitutereturnvalue!',
+            'exclamation!', 'exclude!', 'exportapplication!', 'exportdatawindow!',
+            'exportfunction!', 'exportmenu!', 'exportpipeline!', 'exportproject!',
+            'exportquery!', 'exportstructure!', 'exportuserobject!', 'exportwindow!',
+            'externalvisual!', 'extobject!', 'failonanyconflict!', 'fdiagonal!',
+            'featurenotsupportederror!', 'filealreadyopenerror!', 'filecloseerror!',
+            'fileexists!',
+            'fileinvalidformaterror!', 'filemenu!', 'filenotopenerror!', 'filenotseterror!',
+            'filereaderror!', 'filetyperichtext!', 'filetypetext!', 'filewriteerror!',
+            'filter!', 'first!', 'firstvisibletreeitem!', 'fixed!',
+            'floating!', 'focusrect!', 'footer!', 'foreground!',
+            'frombeginning!', 'fromcurrent!', 'fromend!', 'functionobject!',
+            'gb231charset!', 'getfocus!', 'graph!', 'graphicobject!',
+            'graxis!', 'grdispattr!', 'greekcharset!', 'groupbox!',
+            'hand!', 'hangeul!', 'header!', 'hebrewcharset!',
+            'helpmenu!', 'hide!', 'horizontal!', 'hotlinkalarm!',
+            'hourglass!', 'hppa!', 'hprogressbar!', 'hpux!',
+            'hscrollbar!', 'hticksonboth!', 'hticksonbottom!', 'hticksonneither!',
+            'hticksontop!', 'htmltable!', 'htrackbar!', 'i286!',
+            'i386!', 'i486!', 'icon!', 'icons!',
+            'idle!', 'importdatawindow!', 'indent!', 'index!',
+            'inet!', 'information!', 'inplace!', 'inputfieldselected!',
+            'insertitem!', 'inside!', 'integer!', 'internetresult!',
+            'italic!', 'itemchanged!', 'itemchanging!', 'itemcollapsed!',
+            'itemcollapsing!', 'itemerror!', 'itemexpanded!', 'itemexpanding!',
+            'itemfocuschanged!', 'itempopulate!', 'jaguarorb!', 'johabcharset!',
+            'justify!', 'key!', 'key0!', 'key1!',
+            'key2!', 'key3!', 'key4!', 'key5!',
+            'key6!', 'key7!', 'key8!', 'key9!',
+            'keya!', 'keyadd!', 'keyalt!', 'keyapps!',
+            'keyb!', 'keyback!', 'keybackquote!', 'keybackslash!',
+            'keyc!', 'keycapslock!', 'keycomma!', 'keycontrol!',
+            'keyd!', 'keydash!', 'keydecimal!', 'keydelete!',
+            'keydivide!', 'keydownarrow!', 'keye!', 'keyend!',
+            'keyenter!', 'keyequal!', 'keyescape!', 'keyf!',
+            'keyf1!', 'keyf10!', 'keyf11!', 'keyf12!',
+            'keyf2!', 'keyf3!', 'keyf4!', 'keyf5!',
+            'keyf6!', 'keyf7!', 'keyf8!', 'keyf9!',
+            'keyg!', 'keyh!', 'keyhome!', 'keyi!',
+            'keyinsert!', 'keyj!', 'keyk!', 'keyl!',
+            'keyleftarrow!', 'keyleftbracket!', 'keyleftbutton!', 'keyleftwindows!',
+            'keym!', 'keymiddlebutton!', 'keymultiply!', 'keyn!',
+            'keynull!', 'keynumlock!', 'keynumpad0!', 'keynumpad1!',
+            'keynumpad2!', 'keynumpad3!', 'keynumpad4!', 'keynumpad5!',
+            'keynumpad6!', 'keynumpad7!', 'keynumpad8!', 'keynumpad9!',
+            'keyo!', 'keyp!', 'keypagedown!', 'keypageup!',
+            'keypause!', 'keyperiod!', 'keyprintscreen!', 'keyq!',
+            'keyquote!', 'keyr!', 'keyrightarrow!', 'keyrightbracket!',
+            'keyrightbutton!', 'keyrightwindows!', 'keys!', 'keyscrolllock!',
+            'keysemicolon!', 'keyshift!', 'keyslash!', 'keyspacebar!',
+            'keysubtract!', 'keyt!', 'keytab!', 'keyu!',
+            'keyuparrow!', 'keyv!', 'keyw!', 'keyword!',
+            'keyx!', 'keyy!', 'keyz!', 'languageafrikaans!',
+            'languagealbanian!', 'languagearabicalgeria!', 'languagearabicbahrain!',
+            'languagearabicegypt!',
+            'languagearabiciraq!', 'languagearabicjordan!', 'languagearabickuwait!',
+            'languagearabiclebanon!',
+            'languagearabiclibya!', 'languagearabicmorocco!', 'languagearabicoman!',
+            'languagearabicqatar!',
+            'languagearabicsaudiarabia!', 'languagearabicsyria!', 'languagearabictunisia!',
+            'languagearabicuae!',
+            'languagearabicyemen!', 'languagebasque!', 'languagebulgarian!', 'languagebyelorussian!',
+            'languagecatalan!', 'languagechinese!', 'languagechinesehongkong!', 'languagechinesesimplified!',
+            'languagechinesesingapore!', 'languagechinesetraditional!', 'languagecroatian!', 'languageczech!',
+            'languagedanish!', 'languagedutch!', 'languagedutchbelgian!', 'languagedutchneutral!',
+            'languageenglish!', 'languageenglishaustralian!', 'languageenglishcanadian!',
+            'languageenglishirish!',
+            'languageenglishnewzealand!', 'languageenglishsouthafrica!', 'languageenglishuk!',
+            'languageenglishus!',
+            'languageestonian!', 'languagefaeroese!', 'languagefarsi!', 'languagefinnish!',
+            'languagefrench!', 'languagefrenchbelgian!', 'languagefrenchcanadian!', 'languagefrenchluxembourg!',
+            'languagefrenchneutral!', 'languagefrenchswiss!', 'languagegerman!', 'languagegermanaustrian!',
+            'languagegermanliechtenstein!', 'languagegermanluxembourg!', 'languagegermanneutral!',
+            'languagegermanswiss!',
+            'languagegreek!', 'languagehebrew!', 'languagehindi!', 'languagehungarian!',
+            'languageicelandic!', 'languageindonesian!', 'languageitalian!', 'languageitalianneutral!',
+            'languageitalianswiss!', 'languagejapanese!', 'languagekorean!', 'languagekoreanjohab!',
+            'languagelatvian!', 'languagelithuanian!', 'languagemacedonian!', 'languagemaltese!',
+            'languageneutral!', 'languagenorwegian!', 'languagenorwegianbokmal!', 'languagenorwegiannynorsk!',
+            'languagepolish!', 'languageportuguese!', 'languageportuguese_brazilian!',
+            'languageportugueseneutral!',
+            'languagerhaetoromanic!', 'languageromanian!', 'languageromanianmoldavia!', 'languagerussian!',
+            'languagerussianmoldavia!', 'languagesami!', 'languageserbian!', 'languageslovak!',
+            'languageslovenian!', 'languagesorbian!', 'languagesortnative!', 'languagesortunicode!',
+            'languagespanish!', 'languagespanishcastilian!', 'languagespanishmexican!', 'languagespanishmodern!',
+            'languagesutu!', 'languageswedish!', 'languagesystemdefault!', 'languagethai!',
+            'languagetsonga!', 'languagetswana!', 'languageturkish!', 'languageukrainian!',
+            'languageurdu!', 'languageuserdefault!', 'languagevenda!', 'languagexhosa!',
+            'languagezulu!', 'last!', 'layer!', 'layered!',
+            'Left!', 'leftmargin!', 'line!', 'line3d!',
+            'linear!', 'linecolor!', 'linedown!', 'linegraph!',
+            'lineleft!', 'linemode!', 'lineright!', 'lineup!',
+            'linkupdateautomatic!', 'linkupdatemanual!', 'listbox!', 'listview!',
+            'listviewitem!', 'listviewlargeicon!', 'listviewlist!', 'listviewreport!',
+            'listviewsmallicon!', 'lockread!', 'lockreadwrite!', 'lockwrite!',
+            'log10!', 'loge!', 'long!', 'losefocus!',
+            'lower!', 'lowered!', 'm68000!', 'm68020!',
+            'm68030!', 'm68040!', 'maccharset!', 'macintosh!',
+            'mailattach!', 'mailbcc!', 'mailbodyasfile!', 'mailcc!',
+            'maildownload!', 'mailentiremessage!', 'mailenvelopeonly!', 'mailfiledescription!',
+            'mailmessage!', 'mailnewsession!', 'mailnewsessionwithdownload!', 'mailole!',
+            'mailolestatic!', 'mailoriginator!', 'mailrecipient!', 'mailreturnaccessdenied!',
+            'mailreturnattachmentnotfound!', 'mailreturnattachmentopenfailure!',
+            'mailreturnattachmentwritefailure!', 'mailreturndiskfull!',
+            'mailreturnfailure!', 'mailreturninsufficientmemory!', 'mailreturninvalidmessage!',
+            'mailreturnloginfailure!',
+            'mailreturnmessageinuse!', 'mailreturnnomessages!', 'mailreturnsuccess!', 'mailreturntexttoolarge!',
+            'mailreturntoomanyfiles!', 'mailreturntoomanyrecipients!', 'mailreturntoomanysessions!',
+            'mailreturnunknownrecipient!',
+            'mailreturnuserabort!', 'mailsession!', 'mailsuppressattachments!', 'mailto!',
+            'main!', 'maximized!', 'mdi!', 'mdiclient!',
+            'mdihelp!', 'menu!', 'menucascade!', 'menuitemtypeabout!',
+            'menuitemtypeexit!', 'menuitemtypehelp!', 'menuitemtypenormal!', 'merge!',
+            'message!', 'minimized!', 'mips!', 'modelexistserror!',
+            'modelnotexistserror!', 'modern!', 'modified!', 'mousedown!',
+            'mousemove!', 'mouseup!', 'moved!', 'multiline!',
+            'multilineedit!', 'mutexcreateerror!', 'new!', 'newmodified!',
+            'next!', 'nexttreeitem!', 'nextvisibletreeitem!', 'noborder!',
+            'noconnectprivilege!', 'nolegend!', 'none!', 'nonvisualobject!',
+            'normal!', 'nosymbol!', 'notic!', 'notmodified!',
+            'notopmost!', 'notype!', 'numericmask!', 'objhandle!',
+            'oem!', 'off!', 'offsite!', 'ok!',
+            'okcancel!', 'olecontrol!', 'olecustomcontrol!', 'oleobject!',
+            'olestorage!', 'olestream!', 'oletxnobject!', 'omcontrol!',
+            'omcustomcontrol!', 'omembeddedcontrol!', 'omobject!', 'omstorage!',
+            'omstream!', 'open!', 'orb!', 'original!',
+            'osf1!', 'other!', 'outside!', 'oval!',
+            'pagedown!', 'pageleft!', 'pageright!', 'pageup!',
+            'parenttreeitem!', 'pbtocppobject!', 'pentium!', 'percentage!',
+            'picture!', 'picturebutton!', 'picturehyperlink!', 'picturelistbox!',
+            'pictureselected!', 'pie3d!', 'piegraph!', 'pipeend!',
+            'pipeline!', 'pipemeter!', 'pipestart!', 'popup!',
+            'powerobject!', 'powerpc!', 'powerrs!', 'ppc601!',
+            'ppc603!', 'ppc604!', 'previewdelete!', 'previewfunctionreselectrow!',
+            'previewfunctionretrieve!', 'previewfunctionupdate!', 'previewinsert!', 'previewselect!',
+            'previewupdate!', 'previoustreeitem!', 'previousvisibletreeitem!', 'primary!',
+            'printend!', 'printfooter!', 'printheader!', 'printpage!',
+            'printstart!', 'prior!', 'private!', 'process!',
+            'profilecall!', 'profileclass!', 'profileline!', 'profileroutine!',
+            'profiling!', 'protected!', 'psreport!', 'public!',
+            'question!', 'radiobutton!', 'raised!', 'rbuttondown!',
+            'rbuttonup!', 'read!', 'readonlyargument!', 'real!',
+            'rectangle!', 'regbinary!', 'regexpandstring!', 'reglink!',
+            'regmultistring!', 'regstring!', 'regulong!', 'regulongbigendian!',
+            'remoteexec!', 'remotehotlinkstart!', 'remotehotlinkstop!', 'remoteobject!',
+            'remoterequest!', 'remotesend!', 'rename!', 'replace!',
+            'resize!', 'resizeborder!', 'response!', 'resultset!',
+            'resultsets!', 'retrieveend!', 'retrieverow!', 'retrievestart!',
+            'retrycancel!', 'richtextedit!', 'Right!', 'rightclicked!',
+            'rightdoubleclicked!', 'rightmargin!', 'rnddays!', 'rnddefault!',
+            'rndhours!', 'rndmicroseconds!', 'rndminutes!', 'rndmonths!',
+            'rndnumber!', 'rndseconds!', 'rndyears!', 'roman!',
+            'roottreeitem!', 'roundrectangle!', 'routineesql!', 'routineevent!',
+            'routinefunction!', 'routinegarbagecollection!', 'routineobjectcreation!',
+            'routineobjectdestruction!',
+            'routineroot!', 'rowfocuschanged!', 'russiancharset!', 'save!',
+            'scalartype!', 'scattergraph!', 'script!', 'scriptdefinition!',
+            'scriptevent!', 'scriptfunction!', 'scrollhorizontal!', 'scrollvertical!',
+            'selected!', 'selectionchanged!', 'selectionchanging!', 'series!',
+            'service!', 'shade!', 'shadowbox!', 'shared!',
+            'sharedobjectcreateinstanceerror!', 'sharedobjectcreatepbsessionerror!',
+            'sharedobjectexistserror!', 'sharedobjectnotexistserror!',
+            'shiftjis!', 'show!', 'simpletype!', 'simpletypedefinition!',
+            'singlelineedit!', 'size!', 'sizenesw!', 'sizens!',
+            'sizenwse!', 'sizewe!', 'sol2!', 'solid!',
+            'sort!', 'sourcepblerror!', 'spacing1!', 'spacing15!',
+            'spacing2!', 'sparc!', 'sqlinsert!', 'sqlpreview!',
+            'square!', 'sslcallback!', 'sslserviceprovider!', 'statichyperlink!',
+            'statictext!', 'stgdenynone!', 'stgdenyread!', 'stgdenywrite!',
+            'stgexclusive!', 'stgread!', 'stgreadwrite!', 'stgwrite!',
+            'stopsign!', 'straddle!', 'streammode!', 'stretch!',
+            'strikeout!', 'string!', 'stringmask!', 'structure!',
+            'stylebox!', 'stylelowered!', 'styleraised!', 'styleshadowbox!',
+            'subscript!', 'success!', 'superscript!', 'swiss!',
+            'sylk!', 'symbol!', 'symbolhollowbox!', 'symbolhollowcircle!',
+            'symbolhollowdiamond!', 'symbolhollowdownarrow!', 'symbolhollowuparrow!', 'symbolplus!',
+            'symbolsolidbox!', 'symbolsolidcircle!', 'symbolsoliddiamond!', 'symbolsoliddownarrow!',
+            'symbolsoliduparrow!', 'symbolstar!', 'symbolx!', 'system!',
+            'systemerror!', 'systemfunctions!', 'systemkey!', 'tab!',
+            'tabsonbottom!', 'tabsonbottomandtop!', 'tabsonleft!', 'tabsonleftandright!',
+            'tabsonright!', 'tabsonrightandleft!', 'tabsontop!', 'tabsontopandbottom!',
+            'text!', 'thaicharset!', 'thread!', 'tile!',
+            'tilehorizontal!', 'time!', 'timemask!', 'timer!',
+            'timernone!', 'timing!', 'tobottom!', 'toolbarmoved!',
+            'top!', 'topic!', 'topmost!', 'totop!',
+            'traceactivitynode!', 'traceatomic!', 'tracebeginend!', 'traceerror!',
+            'traceesql!', 'tracefile!', 'tracegarbagecollect!', 'tracegeneralerror!',
+            'tracein!', 'traceline!', 'tracenomorenodes!', 'tracenotstartederror!',
+            'traceobject!', 'traceout!', 'traceroutine!', 'tracestartederror!',
+            'tracetree!', 'tracetreeerror!', 'tracetreeesql!', 'tracetreegarbagecollect!',
+            'tracetreeline!', 'tracetreenode!', 'tracetreeobject!', 'tracetreeroutine!',
+            'tracetreeuser!', 'traceuser!', 'transaction!', 'transactionserver!',
+            'transparent!', 'transport!', 'treeview!', 'treeviewitem!',
+            'turkishcharset!', 'typeboolean!', 'typecategory!', 'typecategoryaxis!',
+            'typecategorylabel!', 'typedata!', 'typedate!', 'typedatetime!',
+            'typedecimal!', 'typedefinition!', 'typedouble!', 'typegraph!',
+            'typeinteger!', 'typelegend!', 'typelong!', 'typereal!',
+            'typeseries!', 'typeseriesaxis!', 'typeserieslabel!', 'typestring!',
+            'typetime!', 'typetitle!', 'typeuint!', 'typeulong!',
+            'typeunknown!', 'typevalueaxis!', 'typevaluelabel!', 'ultrasparc!',
+            'unboundedarray!', 'underline!', 'underlined!', 'unsignedinteger!',
+            'unsignedlong!', 'unsorted!', 'uparrow!', 'updateend!',
+            'updatestart!', 'upper!', 'userdefinedsort!', 'userobject!',
+            'variable!', 'variableargument!', 'variablecardinalitydefinition!', 'variabledefinition!',
+            'variableglobal!', 'variableinstance!', 'variablelocal!', 'variableshared!',
+            'varlistargument!', 'vbxvisual!', 'vcenter!', 'vertical!',
+            'vietnamesecharset!', 'viewchange!', 'vprogressbar!', 'vscrollbar!',
+            'vticksonboth!', 'vticksonleft!', 'vticksonneither!', 'vticksonright!',
+            'vtrackbar!', 'window!', 'windowmenu!', 'windowobject!',
+            'windows!', 'windowsnt!', 'wk1!', 'wks!',
+            'wmf!', 'write!', 'xpixelstounits!', 'xunitstopixels!',
+            'xvalue!', 'yesno!', 'yesnocancel!', 'ypixelstounits!',
+            'yunitstopixels!',
+            'yvalue!',
+            'zoom!'
+            )
+        ),
+    'SYMBOLS' => array(
+            0 => array('(', ')', '[', ']', '{', '}'),
+            1 => array('|'),
+            2 => array('+', '-', '*', '/'),
+            3 => array('=', '<', '>', '^')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008000; font-weight: bold;',
+            2 => 'color: #990099; font-weight: bold;',
+            3 => 'color: #330099; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            'MULTI' => 'color: #0000ff; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #330099; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;',
+            1 => 'color: #ffff00; background-color:#993300; font-weight: bold',
+            2 => 'color: #000000;',
+            3 => 'color: #000000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => 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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/powershell.php b/sources/inc/geshi/powershell.php
new file mode 100644
index 0000000..bd78d73
--- /dev/null
+++ b/sources/inc/geshi/powershell.php
@@ -0,0 +1,277 @@
+ 'PowerShell',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array('<#' => '#>'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '`',
+    'KEYWORDS' => array(
+        1 => array(
+            // Cmdlets
+            'Add-Content', 'Add-History', 'Add-Member', 'Add-PSSnapin', 'Clear-Content', 'Clear-Item',
+            'Clear-ItemProperty', 'Clear-Variable', 'Compare-Object', 'ConvertFrom-SecureString',
+            'Convert-Path', 'ConvertTo-Html', 'ConvertTo-SecureString', 'Copy-Item', 'Copy-ItemProperty',
+            'Export-Alias', 'Export-Clixml', 'Export-Console', 'Export-Csv', 'ForEach-Object',
+            'Format-Custom', 'Format-List', 'Format-Table', 'Format-Wide', 'Get-Acl', 'Get-Alias',
+            'Get-AuthenticodeSignature', 'Get-ChildItem', 'Get-Command', 'Get-Content', 'Get-Credential',
+            'Get-Culture', 'Get-Date', 'Get-EventLog', 'Get-ExecutionPolicy', 'Get-Help', 'Get-History',
+            'Get-Host', 'Get-Item', 'Get-ItemProperty', 'Get-Location', 'Get-Member',
+            'Get-PfxCertificate', 'Get-Process', 'Get-PSDrive', 'Get-PSProvider', 'Get-PSSnapin',
+            'Get-Service', 'Get-TraceSource', 'Get-UICulture', 'Get-Unique', 'Get-Variable',
+            'Get-WmiObject', 'Group-Object', 'Import-Alias', 'Import-Clixml', 'Import-Csv',
+            'Invoke-Expression', 'Invoke-History', 'Invoke-Item', 'Join-Path', 'Measure-Command',
+            'Measure-Object', 'Move-Item', 'Move-ItemProperty', 'New-Alias', 'New-Item',
+            'New-ItemProperty', 'New-Object', 'New-PSDrive', 'New-Service', 'New-TimeSpan',
+            'New-Variable', 'Out-Default', 'Out-File', 'Out-Host', 'Out-Null', 'Out-Printer',
+            'Out-String', 'Pop-Location', 'Push-Location', 'Read-Host', 'Remove-Item',
+            'Remove-ItemProperty', 'Remove-PSDrive', 'Remove-PSSnapin', 'Remove-Variable', 'Rename-Item',
+            'Rename-ItemProperty', 'Resolve-Path', 'Restart-Service', 'Resume-Service', 'Select-Object',
+            'Select-String', 'Set-Acl', 'Set-Alias', 'Set-AuthenticodeSignature', 'Set-Content',
+            'Set-Date', 'Set-ExecutionPolicy', 'Set-Item', 'Set-ItemProperty', 'Set-Location',
+            'Set-PSDebug', 'Set-Service', 'Set-TraceSource', 'Set-Variable', 'Sort-Object', 'Split-Path',
+            'Start-Service', 'Start-Sleep', 'Start-Transcript', 'Stop-Process', 'Stop-Service',
+            'Stop-Transcript', 'Suspend-Service', 'Tee-Object', 'Test-Path', 'Trace-Command',
+            'Update-FormatData', 'Update-TypeData', 'Where-Object', 'Write-Debug', 'Write-Error',
+            'Write-Host', 'Write-Output', 'Write-Progress', 'Write-Verbose', 'Write-Warning'
+            ),
+        2 => array(
+            // Aliases
+            'ac', 'asnp', 'clc', 'cli', 'clp', 'clv', 'cpi', 'cpp', 'cvpa', 'diff', 'epal', 'epcsv', 'fc',
+            'fl', 'ft', 'fw', 'gal', 'gc', 'gci', 'gcm', 'gdr', 'ghy', 'gi', 'gl', 'gm',
+            'gp', 'gps', 'group', 'gsv', 'gsnp', 'gu', 'gv', 'gwmi', 'iex', 'ihy', 'ii', 'ipal', 'ipcsv',
+            'mi', 'mp', 'nal', 'ndr', 'ni', 'nv', 'oh', 'rdr', 'ri', 'rni', 'rnp', 'rp', 'rsnp', 'rv',
+            'rvpa', 'sal', 'sasv', 'sc', 'select', 'si', 'sl', 'sleep', 'sort', 'sp', 'spps', 'spsv', 'sv',
+            'tee', 'write', 'cat', 'cd', 'clear', 'cp', 'h', 'history', 'kill', 'lp', 'ls',
+            'mount', 'mv', 'popd', 'ps', 'pushd', 'pwd', 'r', 'rm', 'rmdir', 'echo', 'cls', 'chdir',
+            'copy', 'del', 'dir', 'erase', 'move', 'rd', 'ren', 'set', 'type'
+            ),
+        3 => array(
+            // Reserved words
+            'break', 'continue', 'do', 'for', 'foreach', 'while', 'if', 'switch', 'until', 'where',
+            'function', 'filter', 'else', 'elseif', 'in', 'return', 'param', 'throw', 'trap'
+            ),
+        4 => array(
+            // Operators
+            '-eq', '-ne', '-gt', '-ge', '-lt', '-le', '-ieq', '-ine', '-igt', '-ige', '-ilt', '-ile',
+            '-ceq', '-cne', '-cgt', '-cge', '-clt', '-cle', '-like', '-notlike', '-match', '-notmatch',
+            '-ilike', '-inotlike', '-imatch', '-inotmatch', '-clike', '-cnotlike', '-cmatch', '-cnotmatch',
+            '-contains', '-notcontains', '-icontains', '-inotcontains', '-ccontains', '-cnotcontains',
+            '-isnot', '-is', '-as', '-replace', '-ireplace', '-creplace', '-and', '-or', '-band', '-bor',
+            '-not', '-bnot', '-f', '-casesensitive', '-exact', '-file', '-regex', '-wildcard'
+            ),
+        5 => array(
+            // Options
+            '-Year', '-Wrap', '-Word', '-Width', '-WhatIf', '-Wait', '-View', '-Verbose', '-Verb',
+            '-Variable', '-ValueOnly', '-Value', '-Unique', '-UFormat', '-TypeName', '-Trace', '-TotalCount',
+            '-Title', '-TimestampServer', '-TargetObject', '-Syntax', '-SyncWindow', '-Sum', '-String',
+            '-Strict', '-Stream', '-Step', '-Status', '-Static', '-StartupType', '-Start', '-StackName',
+            '-Stack', '-SourceId', '-SimpleMatch', '-ShowError', '-Separator', '-SecureString', '-SecureKey',
+            '-SecondValue', '-SecondsRemaining', '-Seconds', '-Second', '-Scope', '-Root', '-Role',
+            '-Resolve', '-RemoveListener', '-RemoveFileListener', '-Registered', '-ReferenceObject',
+            '-Recurse', '-RecommendedAction', '-ReadCount', '-Quiet', '-Query', '-Qualifier', '-PSSnapin',
+            '-PSProvider', '-PSHost', '-PSDrive', '-PropertyType', '-Property', '-Prompt', '-Process',
+            '-PrependPath', '-PercentComplete', '-Pattern', '-PathType', '-Path', '-PassThru', '-ParentId',
+            '-Parent', '-Parameter', '-Paging', '-OutVariable', '-OutBuffer', '-Option', '-OnType', '-Off',
+            '-Object', '-Noun', '-NoTypeInformation', '-NoQualifier', '-NoNewline', '-NoElement',
+            '-NoClobber', '-NewName', '-Newest', '-Namespace', '-Name', '-Month', '-Minutes', '-Minute',
+            '-Minimum', '-Milliseconds', '-Message', '-MemberType', '-Maximum', '-LogName', '-LiteralPath',
+            '-LiteralName', '-ListenerOption', '-List', '-Line', '-Leaf', '-Last', '-Key', '-ItemType',
+            '-IsValid', '-IsAbsolute', '-InputObject', '-IncludeEqual', '-IncludeChain', '-Include',
+            '-IgnoreWhiteSpace', '-Id', '-Hours', '-Hour', '-HideTableHeaders', '-Head', '-GroupBy',
+            '-Functionality', '-Full', '-Format', '-ForegroundColor', '-Force', '-First', '-FilterScript',
+            '-Filter', '-FilePath', '-Expression', '-ExpandProperty', '-Expand', '-ExecutionPolicy',
+            '-ExcludeProperty', '-ExcludeDifferent', '-Exclude', '-Exception', '-Examples', '-ErrorVariable',
+            '-ErrorRecord', '-ErrorId', '-ErrorAction', '-End', '-Encoding', '-DisplayName', '-DisplayHint',
+            '-DisplayError', '-DifferenceObject', '-Detailed', '-Destination', '-Description', '-Descending',
+            '-Depth', '-DependsOn', '-Delimiter', '-Debugger', '-Debug', '-Days', '-Day', '-Date',
+            '-CurrentOperation', '-Culture', '-Credential', '-Count', '-Container', '-Confirm',
+            '-ComputerName', '-Component', '-Completed', '-ComObject', '-CommandType', '-Command',
+            '-Column', '-Class', '-ChildPath', '-Character', '-Certificate', '-CategoryTargetType',
+            '-CategoryTargetName', '-CategoryReason', '-CategoryActivity', '-Category', '-CaseSensitive',
+            '-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(
+        '(', ')', '[', ']', '{', '}', '=', '<', '>', '@', '|', '&', ',', '?',
+        '+=', '-=', '*=', '/=', '%=', '*', '/', '%', '!', '+', '-', '++', '--'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #008080; font-weight: bold;',
+            2 => 'color: #008080; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #FF0000;',
+            5 => 'color: #008080; font-style: italic;',
+            6 => 'color: #000080;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;',
+            'MULTI' => 'color: #008000;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #804000;'
+            ),
+        'METHODS' => array(
+            0 => 'color: pink;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: pink;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #800080;',
+            3 => 'color: #008080;',
+            4 => 'color: #008080;',
+            5 => 'color: #800000;',
+            6 => 'color: #000080;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => 'about:blank',
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // 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)((\[.*\])?\])',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => 'si',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Classes
+        4 => array(
+            GESHI_SEARCH => '(\[)(System\.Reflection\.Assembly|System\.Net\.CredentialCache|Microsoft\.SharePoint\.SPFileLevel|Microsoft\.SharePoint\.Publishing\.PublishingWeb|Microsoft\.SharePoint\.Publishing|Microsoft\.SharePoint\.SPWeb)(\])',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => '\3'
+            ),
+        // Members
+        // There's about a hundred million of these, add the ones you need as you need them
+        5 => array (
+            GESHI_SEARCH => '(::)(ReflectionOnlyLoadFrom|ReflectionOnlyLoad|ReferenceEquals|LoadWithPartialName|LoadFrom|LoadFile|Load|GetExecutingAssembly|GetEntryAssembly|GetCallingAssembly|GetAssembly|Equals|DefaultNetworkCredentials|DefaultCredentials|CreateQualifiedName|Checkout|Draft|Published|IsPublishingWeb)',
+            GESHI_REPLACE => '\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\1',
+            GESHI_AFTER => ''
+            ),
+        // Special variables
+        6 => array(
+            GESHI_SEARCH => '(\$)(\$[_\^]?|\?)(?!\w)',
+            GESHI_REPLACE => '\1\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            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' => '(?)\$'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/proftpd.php b/sources/inc/geshi/proftpd.php
new file mode 100644
index 0000000..330db4b
--- /dev/null
+++ b/sources/inc/geshi/proftpd.php
@@ -0,0 +1,374 @@
+ 'ProFTPd configuration',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            //mod_auth
+            'AccessDenyMsg', 'AccessGrantMsg', 'AnonRejectePasswords',
+            'AnonRequirePassword', 'AuthAliasOnly', 'AuthUsingAlias',
+            'CreateHome', 'DefaultChdir', 'DefaultRoot', 'GroupPassword',
+            'LoginPasswordPrompt', 'MaxClients', 'MaxClientsPerClass',
+            'MaxClientsPerHost', 'MaxClientsPerUser', 'MaxConnectionsPerHost',
+            'MaxHostsPerUser', 'MaxLoginAttempts', 'RequireValidShell',
+            'RootLogin', 'RootRevoke', 'TimeoutLogin', 'TimeoutSession',
+            'UseFtpUsers', 'UserAlias', 'UserDirRoot', 'UserPassword',
+
+            //mod_auth_file
+            'AuthGroupFile', 'AuthUserFile',
+
+            //mod_auth_pam
+            'AuthPAM', 'AuthPAMConfig',
+
+            //mod_auth_unix
+            'PersistentPasswd',
+
+            //mod_ban
+            'BanControlsACLs', 'BanEngine', 'BanLog', 'BanMessage', 'BanOnEvent',
+            'BanTable',
+
+            //mod_cap
+            'CapabilitiesEngine', 'CapabilitiesSet',
+
+            //mod_core
+            'Allow', 'AllowAll', 'AllowClass', 'AllowFilter',
+            'AllowForeignAddress', 'AllowGroup', 'AllowOverride',
+            'AllowRetrieveRestart', 'AllowStoreRestart', 'AllowUser',
+            'AnonymousGroup', 'AuthOrder', 'Bind', 'CDPath', 'Class', 'Classes',
+            'CommandBufferSize', 'DebugLevel', 'DefaultAddress',
+            'DefaultServer', 'DefaultTransferMode', 'DeferWelcome', 'Define',
+            'Deny', 'DenyAll', 'DenyClass', 'DenyFilter', 'DenyGroup',
+            'DenyUser', 'DisplayChdir', 'DisplayConnect', 'DisplayFirstChdir',
+            'DisplayGoAway', 'DisplayLogin', 'DisplayQuit', 'From', 'Group',
+            'GroupOwner', 'HideFiles', 'HideGroup', 'HideNoAccess', 'HideUser',
+            'IdentLookups', 'IgnoreHidden', 'Include', 'MasqueradeAddress',
+            'MaxConnectionRate', 'MaxInstances', 'MultilineRFC2228', 'Order',
+            'PassivePorts', 'PathAllowFilter', 'PathDenyFilter', 'PidFile',
+            'Port', 'RLimitCPU', 'RLimitMemory', 'RLimitOpenFiles', 'Satisfy',
+            'ScoreboardFile', 'ServerAdmin', 'ServerIdent', 'ServerName',
+            'ServerType', 'SetEnv', 'SocketBindTight', 'SocketOptions',
+            'SyslogFacility', 'SyslogLevel', 'tcpBackLog', 'tcpNoDelay',
+            'TimeoutIdle', 'TimeoutLinger', 'TimesGMT', 'TransferLog', 'Umask',
+            'UnsetEnv', 'UseIPv6', 'User', 'UseReverseDNS', 'UserOwner',
+            'UseUTF8', 'WtmpLog',
+
+            //mod_ctrls_admin
+            'AdminControlsACLs', 'AdminControlsEngine',
+
+            //mod_delay
+            'DelayEngine', 'DelayTable',
+
+            //mod_dynmasq
+            'DynMasqRefresh',
+
+            //mod_exec
+            'ExecBeforeCommand', 'ExecEngine', 'ExecEnviron', 'ExecLog',
+            'ExecOnCommand', 'ExecOnConnect', 'ExecOnError', 'ExecOnEvent',
+            'ExecOnExit', 'ExecOnRestart', 'ExecOptions', 'ExecTimeout',
+
+            //mod_ldap
+            'LDAPAliasDereference', 'LDAPAttr', 'LDAPAuthBinds',
+            'LDAPDefaultAuthScheme', 'LDAPDefaultGID', 'LDAPDefaultUID',
+            'LDAPDNInfo', 'LDAPDoAuth', 'LDAPDoGIDLookups',
+            'LDAPDoQuotaLookups', 'LDAPDoUIDLookups',
+            'LDAPForceGeneratedHomedir', 'LDAPForceHomedirOnDemand',
+            'LDAPGenerateHomedir', 'LDAPGenerateHomedirPrefix',
+            'LDAPGenerateHomedirPrefixNoUsername', 'LDAPHomedirOnDemand',
+            'LDAPHomedirOnDemandPrefix', 'LDAPHomedirOnDemandPrefixNoUsername',
+            'LDAPHomedirOnDemandSuffix', 'LDAPNegativeCache',
+            'LDAPProtocolVersion', 'LDAPQueryTimeout', 'LDAPSearchScope',
+            'LDAPServer',
+
+            //mod_load
+            'MaxLoad',
+
+            //mod_log
+            'AllowLogSymlinks', 'ExtendedLog', 'LogFormat', 'ServerLog',
+            'SystemLog',
+
+            //mod_ls'
+            'DirFakeGroup', 'DirFakeMode', 'DirFakeUser', 'ListOptions',
+            'ShowSymlinks', 'UseGlobbing',
+
+            //mod_quotatab
+            'QuotaDirectoryTally', 'QuotaDisplayUnits', 'QuotaEngine',
+            'QuotaExcludeFilter', 'QuotaLimitTable', 'QuotaLock', 'QuotaLog',
+            'QuotaOptions', 'QuotaShowQuotas', 'QuotaTallyTable',
+
+            //mod_quotatab_file
+
+            //mod_quotatab_ldap
+
+            //mod_quotatab_sql
+
+            //mod_radius
+            'RadiusAcctServer', 'RadiusAuthServer', 'RadiusEngine',
+            'RadiusGroupInfo', 'RadiusLog', 'RadiusNASIdentifier',
+            'RadiusQuotaInfo', 'RadiusRealm', 'RadiusUserInfo', 'RadiusVendor',
+
+            //mod_ratio
+            'AnonRatio', 'ByteRatioErrMsg', 'CwdRatioMsg', 'FileRatioErrMsg',
+            'GroupRatio', 'HostRatio', 'LeechRatioMsg', 'RatioFile', 'Ratios',
+            'RatioTempFile', 'SaveRatios', 'UserRatio',
+
+            //mod_readme
+            'DisplayReadme',
+
+            //mod_rewrite
+            'RewriteCondition', 'RewriteEngine', 'RewriteLock', 'RewriteLog',
+            'RewriteMap', 'RewriteRule',
+
+            //mod_sftp
+            'SFTPAcceptEnv', 'SFTPAuthMethods', 'SFTPAuthorizedHostKeys',
+            'SFTPAuthorizedUserKeys', 'SFTPCiphers', 'SFTPClientMatch',
+            'SFTPCompression', 'SFTPCryptoDevice', 'SFTPDHParamFile',
+            'SFTPDigests', 'SFTPDisplayBanner', 'SFTPEngine', 'SFTPExtensions',
+            'SFTPHostKey', 'SFTPKeyBlacklist', 'SFTPKeyExchanges', 'SFTPLog',
+            'SFTPMaxChannels', 'SFTPOptions', 'SFTPPassPhraseProvider',
+            'SFTPRekey', 'SFTPTrafficPolicy',
+
+            //mod_sftp_pam
+            'SFTPPAMEngine', 'SFTPPAMOptions', 'SFTPPAMServiceName',
+
+            //mod_sftp_sql
+
+            //mod_shaper
+            'ShaperAll', 'ShaperControlsACLs', 'ShaperEngine', 'ShaperLog',
+            'ShaperSession', 'ShaperTable',
+
+            //mod_sql
+            'SQLAuthenticate', 'SQLAuthTypes', 'SQLBackend', 'SQLConnectInfo',
+            'SQLDefaultGID', 'SQLDefaultHomedir', 'SQLDefaultUID', 'SQLEngine',
+            'SQLGroupInfo', 'SQLGroupWhereClause', 'SQLHomedirOnDemand',
+            'SQLLog', 'SQLLogFile', 'SQLMinID', 'SQLMinUserGID',
+            'SQLMinUserUID', 'SQLNamedQuery', 'SQLNegativeCache', 'SQLOptions',
+            'SQLRatios', 'SQLRatioStats', 'SQLShowInfo', 'SQLUserInfo',
+            'SQLUserWhereClause',
+
+            //mod_sql_passwd
+            'SQLPasswordEncoding', 'SQLPasswordEngine', 'SQLPasswordSaltFile',
+            'SQLPasswordUserSalt',
+
+            //mod_tls
+            'TLSCACertificateFile', 'TLSCACertificatePath',
+            'TLSCARevocationFile', 'TLSCARevocationPath',
+            'TLSCertificateChainFile', 'TLSCipherSuite', 'TLSControlsACLs',
+            'TLSCryptoDevice', 'TLSDHParamFile', 'TLSDSACertificateFile',
+            'TLSDSACertificateKeyFile', 'TLSEngine', 'TLSLog', 'TLSOptions',
+            'TLSPKCS12File', 'TLSPassPhraseProvider', 'TLSProtocol',
+            'TLSRandomSeed', 'TLSRenegotiate', 'TLSRequired',
+            'TLSRSACertificateFile', 'TLSRSACertificateKeyFile',
+            'TLSSessionCache', 'TLSTimeoutHandshake', 'TLSVerifyClient',
+            'TLSVerifyDepth', 'TLSVerifyOrder',
+
+            //mod_tls_shmcache
+
+            //mod_unique_id
+            'UniqueIDEngine',
+
+            //mod_wrap
+            'TCPAccessFiles', 'TCPAccessSyslogLevels', 'TCPGroupAccessFiles',
+            'TCPServiceName', 'TCPUserAccessFiles',
+
+            //mod_wrap2
+            'WrapAllowMsg', 'WrapDenyMsg', 'WrapEngine', 'WrapGroupTables',
+            'WrapLog', 'WrapServiceName', 'WrapTables', 'WrapUserTables',
+
+            //mod_wrap2_file
+
+            //mod_wrap2_sql
+
+            //mod_xfer
+            'AllowOverwrite', 'DeleteAbortedStores', 'DisplayFileTransfer',
+            'HiddenStor', 'HiddenStores', 'MaxRetrieveFileSize',
+            'MaxStoreFileSize', 'StoreUniquePrefix', 'TimeoutNoTransfer',
+            'TimeoutStalled', 'TransferRate', 'UseSendfile',
+
+            //unknown
+            'ScoreboardPath', 'ScoreboardScrub'
+            ),
+        /*keywords 3*/
+        3 => array(
+            //mod_core
+            'Anonymous',
+            'Class',
+            'Directory',
+            'IfDefine',
+            'IfModule',
+            'Limit',
+            'VirtualHost',
+
+            //mod_ifsession
+            'IfClass', 'IfGroup', 'IfUser',
+
+            //mod_version
+            'IfVersion'
+            ),
+        /*permissions*/
+        4 => array(
+            //mod_core
+            'ALL',
+            'CDUP',
+            'CMD',
+            'CWD',
+            'DELE',
+            'DIRS',
+            'LOGIN',
+            'MKD',
+            'READ',
+            'RETR',
+            'RMD',
+            'RNFR',
+            'RNTO',
+            'STOR',
+            'WRITE',
+            'XCWD',
+            'XMKD',
+            'XRMD',
+
+            //mod_copy
+            'SITE_CPFR', 'SITE_CPTO',
+
+            //mod_quotatab
+            'SITE_QUOTA',
+
+            //mod_site
+            'SITE_HELP', 'SITE_CHMOD', 'SITE_CHGRP',
+
+            //mod_site_misc
+            'SITE_MKDIR', 'SITE_RMDIR', 'SITE_SYMLINK', 'SITE_UTIME',
+            ),
+        /*keywords 2*/
+        2 => array(
+            'all','on','off','yes','no',
+            'standalone', 'inetd',
+            'default', 'auth', 'write',
+            'internet', 'local', 'limit', 'ip',
+            'from'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000000; font-weight:bold;',
+            4 => 'color: #000080; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #339933;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.google.com/search?hl=en&q={FNAMEL}+site:www.proftpd.org+inurl:docs&btnI=I%27m%20Feeling%20Lucky',
+        2 => '',
+        3 => 'http://www.google.com/search?hl=en&q={FNAMEL}+site:www.proftpd.org+inurl:docs&btnI=I%27m%20Feeling%20Lucky',
+        4 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER
+        ),
+        'KEYWORDS' => array(
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)(? '(?!\+)(?!\w)',
+            ),
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=<|<\/)',
+                'DISALLOWED_AFTER' => '(?=\s|\/|>)',
+            ),
+            4 => array(
+                'DISALLOWED_BEFORE' => '(?<=\s)(? '(?!\+)(?=\/|(?:\s+\w+)*\s*>)',
+            )
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/progress.php b/sources/inc/geshi/progress.php
new file mode 100644
index 0000000..7990026
--- /dev/null
+++ b/sources/inc/geshi/progress.php
@@ -0,0 +1,485 @@
+ 'Progress',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array (
+        1 => array(
+            'ACCUMULATE','APPLY','ASSIGN','BELL','QUERY',
+            'BUFFER-COMPARE','BUFFER-COPY','CALL','CASE',
+            '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',
+            'CREATE DATABASE','CREATE DATASET','CREATE DATA-SOURCE','CREATE QUERY',
+            'CREATE SAX-attributeS','CREATE SAX-READER','CREATE SAX-WRITER','CREATE SERVER',
+            'CREATE SERVER-SOCKET','CREATE SOAP-HEADER','CREATE SOAP-HEADER-ENTRYREF','CREATE SOCKET',
+            'CREATE TEMP-TABLE','CREATE WIDGET','CREATE widget-POOL','CREATE X-DOCUMENT',
+            'CREATE X-NODEREF','CURRENT-LANGUAGE','CURRENT-VALUE','DDE ADVISE',
+            'DDE EXECUTE','DDE GET','DDE INITIATE','DDE REQUEST',
+            'DDE SEND','DDE TERMINATE','DEFINE BROWSE','DEFINE BUFFER','DEFINE',
+            'DEFINE BUTTON','DEFINE DATASET','DEFINE DATA-SOURCE','DEFINE FRAME','DEF','VAR',
+            'DEFINE IMAGE','DEFINE MENU','DEFINE PARAMETER','DEFINE property','PARAM',
+            'DEFINE QUERY','DEFINE RECTANGLE','DEFINE STREAM','DEFINE SUB-MENU',
+            'DEFINE TEMP-TABLE','DEFINE WORKFILE','DEFINE WORK-TABLE',
+            'DELETE','DELETE ALIAS','DELETE object','DELETE PROCEDURE',
+            'DELETE widget','DELETE widget-POOL','DESTRUCTOR','DICTIONARY',
+            'DISABLE','DISABLE TRIGGERS','DISCONNECT','DISPLAY',
+            'DO','DOS','DOWN','DYNAMIC-CURRENT-VALUE',
+            'ELSE','EMPTY TEMP-TABLE','ENABLE','END',
+            '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',
+            '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',
+            'OS-RENAME','OUTPUT CLOSE','OUTPUT THROUGH','OUTPUT TO',
+            'OVERLAY','PAGE','PAUSE','PROCEDURE',
+            'PROCESS EVENTS','PROMPT-FOR','PROMSGS','PROPATH',
+            'PUBLISH','PUT','PUT CURSOR','PUT SCREEN',
+            'PUT-BITS','PUT-BYTE','PUT-BYTES','PUT-DOUBLE',
+            'PUT-FLOAT','PUT-INT64','PUT-KEY-VALUE','PUT-LONG',
+            'PUT-SHORT','PUT-STRING','PUT-UNSIGNED-LONG','PUT-UNSIGNED-SHORT',
+            'QUIT','RAW-TRANSFER','READKEY','RELEASE',
+            'RELEASE EXTERNAL','RELEASE object','REPEAT','REPOSITION',
+            'RUN','RUN STORED-PROCEDURE','RUN SUPER',
+            'SAVE CACHE','SCROLL','SEEK','SET',
+            'SET-BYTE-ORDER','SET-POINTER-VALUE','SET-SIZE','SHOW-STATS',
+            'STATUS','STOP','SUBSCRIBE','SUBSTRING',
+            'system-DIALOG COLOR','system-DIALOG FONT','system-DIALOG GET-DIR','system-DIALOG GET-FILE',
+            'system-DIALOG PRINTER-SETUP','system-HELP','THEN','THIS-object',
+            'TRANSACTION-MODE AUTOMATIC','TRIGGER PROCEDURE','UNDERLINE','UNDO',
+            'UNIX','UNLOAD','UNSUBSCRIBE','UP','STRING',
+            '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',
+            '&MESSAGE','&SCOPED-DEFINE','&UNDEFINE','DEFINED',
+            'BROWSE','BUTTON','COMBO-BOX','CONTROL-FRAME',
+            'DIALOG-BOX','EDITOR','FIELD-GROUP','FILL-IN',
+            'FRAME','IMAGE','LITERAL','MENU',
+            'MENU-ITEM','RADIO-SET','RECTANGLE','SELECTION-LIST',
+            'SLIDER','SUB-MENU','TEXT','TOGGLE-BOX',
+            'WINDOW','WITH','AT','OF','EDITING','ON ENDKEY','output',
+            'ON ERROR','ON QUIT','ON STOP','PRESELECT',
+            'QUERY-TUNING','SIZE','Trigger','VIEW-AS','ALERT-BOX',
+            'Buffer','Data-relation','ProDataSet','SAX-attributes',
+            'SAX-reader','SAX-writer','Server socket','SOAP-fault',
+            'SOAP-header','SOAP-header-entryref','Socket','Temp-table',
+            'X-noderef','Height','Left','Top','TO',
+            'Width','ACTIVE-WINDOW','AUDIT-CONTROL','FIRST','LAST',
+            'AUDIT-POLICY','CLIPBOARD','CODEBASE-LOCATOR','COLOR-TABLE',
+            'COMPILER','COM-SELF','DEBUGGER','DEFAULT-WINDOW',
+            'ERROR-STATUS','FILE-INFO','FOCUS','FONT-TABLE',
+            'LAST-EVENT','LOG-MANAGER','RCODE-INFO','SECURITY-POLICY',
+            'SELF','SESSION','SOURCE-PROCEDURE','TARGET-PROCEDURE','NO-LOCK','NO-error',
+            'THIS-PROCEDURE','WEB-CONTEXT','FUNCTION','RETURNS','NO-UNDO'
+            ),
+        2 => array(
+            'ACCEPT-CHANGES','ACCEPT-ROW-CHANGES','ADD-BUFFER','ADD-CALC-COLUMN',
+            'ADD-COLUMNS-FROM','ADD-EVENTS-PROCEDURE','ADD-FIELDS-FROM','ADD-FIRST',
+            'ADD-HEADER-ENTRY','ADD-INDEX-FIELD','ADD-LAST','ADD-LIKE-COLUMN',
+            '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-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','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-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-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',
+            'FIND-LAST','FIND-UNIQUE','GET-attribute','GET-attribute-NODE',
+            'GET-BINARY-DATA','GET-BLUE-VALUE','GET-BROWSE-COLUMN','GET-BUFFER-HANDLE',
+            'GET-BYTES-AVAILABLE','GET-CALLBACK-PROC-CONTEXT','GET-CALLBACK-PROC-NAME','GET-CGI-LIST',
+            'GET-CGI-LONG-VALUE','GET-CGI-VALUE','GET-CHANGES','GET-CHILD',
+            'GET-CHILD-RELATION','GET-CONFIG-VALUE','GET-CURRENT','GET-DATASET-BUFFER',
+            'GET-DOCUMENT-ELEMENT','GET-DROPPED-FILE','GET-DYNAMIC','GET-ERROR-COLUMN ',
+            'GET-ERROR-ROW ','GET-FILE-NAME ','GET-FILE-OFFSET ','GET-FIRST',
+            'GET-GREEN-VALUE','GET-HEADER-ENTRY','GET-INDEX-BY-NAMESPACE-NAME','GET-INDEX-BY-QNAME',
+            'GET-ITERATION','GET-LAST','GET-LOCALNAME-BY-INDEX','GET-MESSAGE',
+            'GET-NEXT','GET-NODE','GET-NUMBER','GET-PARENT',
+            'GET-PREV','GET-PRINTERS','GET-property','GET-QNAME-BY-INDEX',
+            'GET-RED-VALUE','GET-RELATION','GET-REPOSITIONED-ROW','GET-RGB-VALUE',
+            'GET-SELECTED-widget','GET-SERIALIZED','GET-SIGNATURE','GET-SOCKET-OPTION',
+            'GET-SOURCE-BUFFER','GET-TAB-ITEM','GET-TEXT-HEIGHT-CHARS','GET-TEXT-HEIGHT-PIXELS',
+            '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','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',
+            'LIST-property-NAMES','LOAD','LoadControls','LOAD-DOMAINS',
+            'LOAD-ICON','LOAD-IMAGE','LOAD-IMAGE-DOWN','LOAD-IMAGE-INSENSITIVE',
+            'LOAD-IMAGE-UP','LOAD-MOUSE-POINTER','LOAD-SMALL-ICON','LOCK-REGISTRATION',
+            'LOG-AUDIT-EVENT','LOGOUT','LONGCHAR-TO-NODE-VALUE','LOOKUP',
+            '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',
+            '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',
+            'REMOVE-SUPER-PROCEDURE','REPLACE','REPLACE-CHILD','REPLACE-SELECTION-TEXT',
+            'REPOSITION-BACKWARD','REPOSITION-FORWARD','REPOSITION-TO-ROW','REPOSITION-TO-ROWID',
+            'RESET','SAVE','SAVE-FILE','SAVE-ROW-CHANGES',
+            'SAX-PARSE','SAX-PARSE-FIRST','SAX-PARSE-NEXT','SCROLL-TO-CURRENT-ROW',
+            'SCROLL-TO-ITEM','SCROLL-TO-SELECTED-ROW','SEAL','SEARCH',
+            'SELECT-ALL','SELECT-FOCUSED-ROW','SELECT-NEXT-ROW','SELECT-PREV-ROW',
+            'SELECT-ROW','SET-ACTOR','SET-APPL-CONTEXT','SET-attribute',
+            'SET-attribute-NODE','SET-BLUE-VALUE','SET-BREAK','SET-BUFFERS',
+            'SET-CALLBACK','SET-CALLBACK-PROCEDURE','SET-CLIENT','SET-COMMIT',
+            'SET-CONNECT-PROCEDURE','SET-DYNAMIC','SET-GREEN-VALUE','SET-INPUT-SOURCE',
+            'SET-MUST-UNDERSTAND','SET-NODE','SET-NUMERIC-FORMAT','SET-OUTPUT-DESTINATION',
+            'SET-PARAMETER','SET-property','SET-READ-RESPONSE-PROCEDURE','SET-RED-VALUE',
+            'SET-REPOSITIONED-ROW','SET-RGB-VALUE','SET-ROLLBACK','SET-SELECTION',
+            'SET-SERIALIZED','SET-SOCKET-OPTION','SET-SORT-ARROW','SET-WAIT-STATE',
+            'START-DOCUMENT','START-ELEMENT','STOP-PARSING','SYNCHRONIZE',
+            'TEMP-TABLE-PREPARE','UPDATE-attribute','URL-DECODE','URL-ENCODE',
+            'VALIDATE','VALIDATE-SEAL','WRITE','WRITE-CDATA','USE-INDEX',
+            'WRITE-CHARACTERS','WRITE-COMMENT','WRITE-DATA-ELEMENT','WRITE-EMPTY-ELEMENT',
+            'WRITE-ENTITY-REF','WRITE-EXTERNAL-DTD','WRITE-FRAGMENT','WRITE-MESSAGE',
+            'WRITE-PROCESSING-INSTRUCTION','WRITE-XML','WRITE-XMLSCHEMA','FALSE','true'
+            ),
+        3 => array(
+            'ABSOLUTE','ACCUM','ADD-INTERVAL','ALIAS','mod',
+            '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',
+            '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','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',
+            'GENERATE-UUID','GET-BITS','GET-BYTE','GET-BYTE-ORDER',
+            'GET-BYTES','GET-CODEPAGE','GET-CODEPAGES','GET-COLLATION',
+            'GET-COLLATIONS','GET-DOUBLE','GET-FLOAT','GET-INT64',
+            'GET-LONG','GET-POINTER-VALUE','GET-SHORT','GET-SIZE',
+            'GET-STRING','GET-UNSIGNED-LONG','GET-UNSIGNED-SHORT','GO-PENDING',
+            'GUID','HEX-DECODE','INDEX',
+            'INT64','INTEGER','INTERVAL','IS-ATTR-SPACE',
+            'IS-CODEPAGE-FIXED','IS-COLUMN-CODEPAGE','IS-LEAD-BYTE','ISO-DATE',
+            'KBLABEL','KEYCODE','KEYFUNCTION','KEYLABEL',
+            'KEYWORD','KEYWORD-ALL','LASTKEY',
+            'LAST-OF','LC','LDBNAME','LEFT-TRIM',
+            'LIBRARY','LINE-COUNTER','LIST-EVENTS','LIST-QUERY-ATTRS',
+            'LIST-SET-ATTRS','LIST-widgetS','LOCKED',
+            'LOGICAL','MAXIMUM','MD5-DIGEST',
+            'MEMBER','MESSAGE-LINES','MINIMUM','MONTH',
+            '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',
+            'RETRY','RETURN-VALUE','RGB-VALUE',
+            'RIGHT-TRIM','R-INDEX','ROUND','ROWID','LENGTH',
+            'SDBNAME','SET-DB-CLIENT','SETUSERID',
+            'SHA1-DIGEST','SQRT','SUBSTITUTE','VARIABLE',
+            'SUPER','TERMINAL','TIME','TIMEZONE','external',
+            'TODAY','TO-ROWID','TRIM','TRUNCATE','return',
+            'TYPE-OF','USERID','VALID-EVENT','VALID-HANDLE',
+            'VALID-object','WEEKDAY','YEAR','BEGINS','VALUE',
+            'EQ','GE','GT','LE','LT','MATCHES','AS','BY','LIKE'
+            ),
+        4 => array(
+            'ACCELERATOR','ACTIVE','ACTOR','ADM-DATA',
+            'AFTER-BUFFER','AFTER-ROWID','AFTER-TABLE','ALLOW-COLUMN-SEARCHING',
+            'ALWAYS-ON-TOP','APPL-ALERT-BOXES','APPL-CONTEXT-ID','APPSERVER-INFO',
+            'APPSERVER-PASSWORD','APPSERVER-USERID','ASYNCHRONOUS','ASYNC-REQUEST-COUNT',
+            'ASYNC-REQUEST-HANDLE','ATTACHED-PAIRLIST','attribute-NAMES','ATTR-SPACE',
+            'AUDIT-EVENT-CONTEXT','AUTO-COMPLETION','AUTO-DELETE','AUTO-DELETE-XML',
+            'AUTO-END-KEY','AUTO-GO','AUTO-INDENT','AUTO-RESIZE',
+            'AUTO-RETURN','AUTO-SYNCHRONIZE','AUTO-VALIDATE','AUTO-ZAP',
+            'AVAILABLE-FORMATS','BACKGROUND','BASE-ADE','BASIC-LOGGING',
+            'BATCH-MODE','BATCH-SIZE','BEFORE-BUFFER','BEFORE-ROWID',
+            'BEFORE-TABLE','BGCOLOR','BLANK','BLOCK-ITERATION-DISPLAY',
+            'BORDER-BOTTOM-CHARS','BORDER-BOTTOM-PIXELS','BORDER-LEFT-CHARS','BORDER-LEFT-PIXELS',
+            'BORDER-RIGHT-CHARS','BORDER-RIGHT-PIXELS','BORDER-TOP-CHARS','BORDER-TOP-PIXELS',
+            'BOX','BOX-SELECTABLE','BUFFER-CHARS','BUFFER-FIELD',
+            'BUFFER-HANDLE','BUFFER-LINES','BUFFER-NAME','BUFFER-VALUE',
+            'BYTES-READ','BYTES-WRITTEN','CACHE','CALL-NAME',
+            'CALL-TYPE','CANCEL-BUTTON','CANCELLED','CAN-CREATE',
+            'CAN-DELETE','CAN-READ','CAN-WRITE','CAREFUL-PAINT',
+            'CASE-SENSITIVE','CENTERED','CHARSET','CHECKED',
+            'CHILD-BUFFER','CHILD-NUM','CLASS-TYPE','CLIENT-CONNECTION-ID',
+            'CLIENT-TTY','CLIENT-TYPE','CLIENT-WORKSTATION','CODE',
+            'CODEPAGE','COLUMN','COLUMN-BGCOLOR','COLUMN-DCOLOR',
+            'COLUMN-FGCOLOR','COLUMN-FONT','COLUMN-LABEL','COLUMN-MOVABLE',
+            'COLUMN-PFCOLOR','COLUMN-READ-ONLY','COLUMN-RESIZABLE','COLUMN-SCROLLING',
+            'COM-HANDLE','COMPLETE','CONFIG-NAME','CONTEXT-HELP',
+            'CONTEXT-HELP-FILE','CONTEXT-HELP-ID','CONTROL-BOX','CONVERT-3D-COLORS',
+            'CPCASE','CPCOLL','CPINTERNAL','CPLOG',
+            'CPPRINT','CPRCODEIN','CPRCODEOUT','CPSTREAM',
+            'CPTERM','CRC-VALUE','CURRENT-COLUMN','CURRENT-ENVIRONMENT',
+            'CURRENT-ITERATION','CURRENT-ROW-MODIFIED','CURRENT-WINDOW','CURSOR-CHAR',
+            'CURSOR-LINE','CURSOR-OFFSET','DATA-ENTRY-RETURN','DATASET',
+            'DATA-SOURCE','DATA-SOURCE-COMPLETE-MAP','DATA-TYPE','DATE-FORMAT',
+            'DB-REFERENCES','DCOLOR','DDE-ERROR','DDE-ID',
+            'DDE-ITEM','DDE-NAME','DDE-TOPIC','DEBLANK',
+            'DEBUG-ALERT','DECIMALS','DEFAULT','DEFAULT-BUFFER-HANDLE',
+            'DEFAULT-BUTTON','DEFAULT-COMMIT','DELIMITER','DISABLE-AUTO-ZAP',
+            'DISPLAY-TIMEZONE','DISPLAY-TYPE','DOMAIN-DESCRIPTION','DOMAIN-NAME',
+            'DOMAIN-TYPE','DRAG-ENABLED','DROP-TARGET','DYNAMIC',
+            'EDGE-CHARS','EDGE-PIXELS','EDIT-CAN-PASTE','EDIT-CAN-UNDO',
+            'EMPTY','ENCODING','ENCRYPTION-SALT','END-USER-PROMPT',
+            'ENTRY-TYPES-LIST','ERROR-COLUMN','ERROR-object-DETAIL','ERROR-ROW',
+            'ERROR-STRING','EVENT-GROUP-ID','EVENT-PROCEDURE','EVENT-PROCEDURE-CONTEXT',
+            'EVENT-TYPE','EXCLUSIVE-ID','EXECUTION-LOG','EXPAND',
+            'EXPANDABLE','FGCOLOR','FILE-CREATE-DATE','FILE-CREATE-TIME',
+            'FILE-MOD-DATE','FILE-MOD-TIME','FILE-NAME','FILE-OFFSET',
+            'FILE-SIZE','FILE-TYPE','FILLED','FILL-MODE',
+            'FILL-WHERE-STRING','FIRST-ASYNC-REQUEST','FIRST-BUFFER','FIRST-CHILD',
+            'FIRST-COLUMN','FIRST-DATASET','FIRST-DATA-SOURCE','FIRST-object',
+            'FIRST-PROCEDURE','FIRST-QUERY','FIRST-SERVER','FIRST-SERVER-SOCKET',
+            'FIRST-SOCKET','FIRST-TAB-ITEM','FIT-LAST-COLUMN','FLAT-BUTTON',
+            'FOCUSED-ROW','FOCUSED-ROW-SELECTED','FONT','FOREGROUND',
+            'FORMAT','FORMATTED','FORM-INPUT','FORM-LONG-INPUT',
+            'FORWARD-ONLY','FRAGMENT','FRAME-COL','FRAME-NAME',
+            'FRAME-ROW','FRAME-SPACING','FRAME-X','FRAME-Y',
+            'FREQUENCY','FULL-HEIGHT-CHARS','FULL-HEIGHT-PIXELS','FULL-PATHNAME',
+            'FULL-WIDTH-CHARS','FULL-WIDTH-PIXELS','GRAPHIC-EDGE',
+            'GRID-FACTOR-HORIZONTAL','GRID-FACTOR-VERTICAL','GRID-SNAP','GRID-UNIT-HEIGHT-CHARS',
+            'GRID-UNIT-HEIGHT-PIXELS','GRID-UNIT-WIDTH-CHARS','GRID-UNIT-WIDTH-PIXELS','GRID-VISIBLE',
+            'GROUP-BOX','HANDLE','HANDLER','HAS-LOBS',
+            'HAS-RECORDS','HEIGHT-CHARS','HEIGHT-PIXELS','HELP',
+            'HIDDEN','HORIZONTAL','HTML-CHARSET','HTML-END-OF-LINE',
+            'HTML-END-OF-PAGE','HTML-FRAME-BEGIN','HTML-FRAME-END','HTML-HEADER-BEGIN',
+            'HTML-HEADER-END','HTML-TITLE-BEGIN','HTML-TITLE-END','HWND',
+            'ICFPARAMETER','ICON','IGNORE-CURRENT-MODIFIED','IMAGE-DOWN',
+            'IMAGE-INSENSITIVE','IMAGE-UP','IMMEDIATE-DISPLAY','INDEX-INFORMATION',
+            'IN-HANDLE','INHERIT-BGCOLOR','INHERIT-FGCOLOR','INITIAL','INIT',
+            'INNER-CHARS','INNER-LINES','INPUT-VALUE','INSTANTIATING-PROCEDURE',
+            'INTERNAL-ENTRIES','IS-CLASS','IS-OPEN','IS-PARAMETER-SET',
+            'IS-XML','ITEMS-PER-ROW','KEEP-CONNECTION-OPEN','KEEP-FRAME-Z-ORDER',
+            'KEEP-SECURITY-CACHE','KEY','KEYS','LABEL',
+            'LABEL-BGCOLOR','LABEL-DCOLOR','LABEL-FGCOLOR','LABEL-FONT',
+            'LABELS','LANGUAGES','LARGE','LARGE-TO-SMALL',
+            'LAST-ASYNC-REQUEST','LAST-BATCH','LAST-CHILD','LAST-object',
+            'LAST-PROCEDURE','LAST-SERVER','LAST-SERVER-SOCKET','LAST-SOCKET',
+            'LAST-TAB-ITEM','LINE','LIST-ITEM-PAIRS','LIST-ITEMS',
+            'LITERAL-QUESTION','LOCAL-HOST','LOCAL-NAME','LOCAL-PORT',
+            'LOCATOR-COLUMN-NUMBER','LOCATOR-LINE-NUMBER','LOCATOR-PUBLIC-ID','LOCATOR-system-ID',
+            'LOCATOR-TYPE','LOG-ENTRY-TYPES','LOGFILE-NAME','LOGGING-LEVEL',
+            'LOGIN-EXPIRATION-TIMESTAMP','LOGIN-HOST','LOGIN-STATE','LOG-THRESHOLD',
+            'MANDATORY','MANUAL-HIGHLIGHT','MAX-BUTTON','MAX-CHARS',
+            'MAX-DATA-GUESS','MAX-HEIGHT-CHARS','MAX-HEIGHT-PIXELS','MAX-VALUE',
+            'MAX-WIDTH-CHARS','MAX-WIDTH-PIXELS','MD5-VALUE','MENU-BAR',
+            'MENU-KEY','MENU-MOUSE','MERGE-BY-FIELD','MESSAGE-AREA',
+            'MESSAGE-AREA-FONT','MIN-BUTTON','MIN-COLUMN-WIDTH-CHARS','MIN-COLUMN-WIDTH-PIXELS',
+            'MIN-HEIGHT-CHARS','MIN-HEIGHT-PIXELS','MIN-SCHEMA-MARSHAL','MIN-VALUE',
+            'MIN-WIDTH-CHARS','MIN-WIDTH-PIXELS','MODIFIED','MOUSE-POINTER',
+            'MOVABLE','MULTI-COMPILE','MULTIPLE','MULTITASKING-INTERVAL',
+            'MUST-UNDERSTAND','NAME','NAMESPACE-PREFIX','NAMESPACE-URI',
+            'NEEDS-APPSERVER-PROMPT','NEEDS-PROMPT','NESTED','NEW-ROW',
+            'NEXT-COLUMN','NEXT-ROWID','NEXT-SIBLING','NEXT-TAB-ITEM', 'NO-BOX',
+            'NO-CURRENT-VALUE','NODE-VALUE','NO-EMPTY-SPACE','NO-FOCUS',
+            'NONAMESPACE-SCHEMA-LOCATION','NO-SCHEMA-MARSHAL','NO-VALIDATE','NUM-BUFFERS',
+            'NUM-BUTTONS','NUM-CHILD-RELATIONS','NUM-CHILDREN','NUM-COLUMNS',
+            'NUM-DROPPED-FILES','NUMERIC-DECIMAL-POINT','NUMERIC-FORMAT','NUMERIC-SEPARATOR',
+            'NUM-FIELDS','NUM-FORMATS','NUM-HEADER-ENTRIES','NUM-ITEMS',
+            'NUM-ITERATIONS','NUM-LINES','NUM-LOCKED-COLUMNS','NUM-LOG-FILES',
+            'NUM-MESSAGES','NUM-PARAMETERS','NUM-REFERENCES','NUM-RELATIONS',
+            'NUM-REPLACED','NUM-SELECTED-ROWS','NUM-SELECTED-WIDGETS','NUM-SOURCE-BUFFERS',
+            'NUM-TABS','NUM-TOP-BUFFERS','NUM-TO-RETAIN','NUM-VISIBLE-COLUMNS',
+            'ON-FRAME-BORDER','ORIGIN-HANDLE','ORIGIN-ROWID','OWNER',
+            'OWNER-DOCUMENT','PAGE-BOTTOM','PAGE-TOP','PARAMETER',
+            'PARENT','PARENT-BUFFER','PARENT-RELATION','PARSE-STATUS',
+            'PASSWORD-FIELD','PATHNAME','PBE-HASH-ALGORITHM','PBE-KEY-ROUNDS',
+            'PERSISTENT','PERSISTENT-CACHE-DISABLED','PERSISTENT-PROCEDURE','PFCOLOR',
+            'PIXELS-PER-COLUMN','PIXELS-PER-ROW','POPUP-MENU','POPUP-ONLY',
+            'POSITION','PREFER-DATASET','PREPARED','PREPARE-STRING',
+            'PREV-COLUMN','PREV-SIBLING','PREV-TAB-ITEM','PRIMARY',
+            'PRINTER-CONTROL-HANDLE','PRINTER-HDC','PRINTER-NAME','PRINTER-PORT',
+            'PRIVATE-DATA','PROCEDURE-NAME','PROGRESS-SOURCE','PROXY',
+            'PROXY-PASSWORD','PROXY-USERID','PUBLIC-ID','PUBLISHED-EVENTS',
+            'RADIO-BUTTONS','READ-ONLY','RECORD-LENGTH',
+            'REFRESHABLE','RELATION-FIELDS','RELATIONS-ACTIVE','REMOTE',
+            'REMOTE-HOST','REMOTE-PORT','RESIZABLE','RESIZE',
+            'RESTART-ROWID','RETAIN-SHAPE','RETURN-INSERTED','RETURN-VALUE-DATA-TYPE',
+            'ROLES','ROUNDED','COL','ROW','ROW-HEIGHT-CHARS',
+            'ROW-HEIGHT-PIXELS','ROW-MARKERS','ROW-RESIZABLE','ROW-STATE',
+            'SAVE-WHERE-STRING','SCHEMA-CHANGE','SCHEMA-LOCATION','SCHEMA-MARSHAL',
+            'SCHEMA-PATH','SCREEN-LINES','SCREEN-VALUE','SCROLLABLE',
+            'SCROLLBAR-HORIZONTAL','SCROLL-BARS','SCROLLBAR-VERTICAL','SEAL-TIMESTAMP',
+            'SELECTABLE','SELECTED','SELECTION-END','SELECTION-START',
+            'SELECTION-TEXT','SENSITIVE','SEPARATOR-FGCOLOR','SEPARATORS',
+            'SERVER','SERVER-CONNECTION-BOUND','SERVER-CONNECTION-BOUND-REQUEST','SERVER-CONNECTION-CONTEXT',
+            'SERVER-CONNECTION-ID','SERVER-OPERATING-MODE','SESSION-END','SESSION-ID',
+            'SHOW-IN-TASKBAR','SIDE-LABEL-HANDLE','SIDE-LABELS','SKIP-DELETED-RECORD',
+            'SMALL-ICON','SMALL-TITLE','SOAP-FAULT-ACTOR','SOAP-FAULT-CODE',
+            'SOAP-FAULT-DETAIL','SOAP-FAULT-STRING','SORT','SORT-ASCENDING',
+            'SORT-NUMBER','SSL-SERVER-NAME','STANDALONE','STARTUP-PARAMETERS',
+            'STATE-DETAIL','STATUS-AREA','STATUS-AREA-FONT','STOPPED',
+            'STREAM','STRETCH-TO-FIT','STRICT','STRING-VALUE',
+            'SUBTYPE','SUPER-PROCEDURES','SUPPRESS-NAMESPACE-PROCESSING','SUPPRESS-WARNINGS',
+            'SYMMETRIC-ENCRYPTION-ALGORITHM','SYMMETRIC-ENCRYPTION-IV','SYMMETRIC-ENCRYPTION-KEY','SYMMETRIC-SUPPORT',
+            'system-ALERT-BOXES','system-ID','TABLE','TABLE-CRC-LIST',
+            'TABLE-HANDLE','TABLE-LIST','TABLE-NUMBER','TAB-POSITION',
+            'TAB-STOP','TEMP-DIRECTORY','TEXT-SELECTED','THREE-D',
+            'TIC-MARKS','TIME-SOURCE','TITLE','TITLE-BGCOLOR','FIELD',
+            'TITLE-DCOLOR','TITLE-FGCOLOR','TITLE-FONT','TOOLTIP',
+            'TOOLTIPS','TOP-ONLY','TRACKING-CHANGES','TRANSACTION',
+            'TRANS-INIT-PROCEDURE','TRANSPARENT','TYPE','UNIQUE-ID',
+            'UNIQUE-MATCH','URL','URL-PASSWORD','URL-USERID','EXTENT',
+            'USER-ID','V6DISPLAY','VALIDATE-EXPRESSION','VALIDATE-MESSAGE',
+            'VALIDATE-XML','VALIDATION-ENABLED','VIEW-FIRST-COLUMN-ON-REOPEN',
+            'VIRTUAL-HEIGHT-CHARS','VIRTUAL-HEIGHT-PIXELS','VIRTUAL-WIDTH-CHARS','VIRTUAL-WIDTH-PIXELS',
+            'VISIBLE','WARNING','WHERE-STRING','widget-ENTER','DATE',
+            'widget-LEAVE','WIDTH-CHARS','WIDTH-PIXELS','WINDOW-STATE',
+            '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',
+            'LONGCHAR','MEMPTR','CHAR','DEC','INT','LOG','DECI','INTE','LOGI','long'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}',
+        '<', '>', '=',
+        '+', '-', '*', '/',
+        '!', '@', '%', '|', '$',
+        ':', '.', ';', ',',
+        '?', '<=','<>','>=', '\\'
+        ),
+    'CASE_SENSITIVE' => array (
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array (
+        'KEYWORDS' => array (
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #1D16B2;',
+            3 => 'color: #993333;',
+            4 => 'color: #0000ff;'
+            ),
+        '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 (
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array (
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array (
+            ),
+        'SCRIPT' => array (
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        0 => ':'
+        ),
+    'REGEXPS' => array (
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array (
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array (
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?  "(?![\-a-zA-Z0-9_%])",
+            1 => array(
+                'SPACE_AS_WHITESPACE' => true
+                ),
+            2 => array(
+                'SPACE_AS_WHITESPACE' => true
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/prolog.php b/sources/inc/geshi/prolog.php
new file mode 100644
index 0000000..a106a4e
--- /dev/null
+++ b/sources/inc/geshi/prolog.php
@@ -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
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/properties.php b/sources/inc/geshi/properties.php
new file mode 100644
index 0000000..e1317b2
--- /dev/null
+++ b/sources/inc/geshi/properties.php
@@ -0,0 +1,127 @@
+ 'PROPERTIES',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /* Common used variables */
+        1 => array(
+            '${user.home}'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #933;'
+            ),
+        'NUMBERS' => array(
+            0 => ''
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000080; font-weight:bold;',
+            1 => 'color: #008000; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Entry names
+        0 => array(
+            GESHI_SEARCH => '^(\s*)([.a-zA-Z0-9_\-]+)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        //Entry values
+        1 => array(
+            // Evil hackery to get around GeSHi bug: <>" and ; are added so s can be matched
+            // Explicit match on variable names because if a comment is before the first < of the span
+            // gets chewed up...
+            GESHI_SEARCH => '([<>";a-zA-Z0-9_]+\s*)=(.*)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1=',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/providex.php b/sources/inc/geshi/providex.php
new file mode 100644
index 0000000..1e735bd
--- /dev/null
+++ b/sources/inc/geshi/providex.php
@@ -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 --git a/sources/inc/geshi/purebasic.php b/sources/inc/geshi/purebasic.php
new file mode 100644
index 0000000..d78ffe9
--- /dev/null
+++ b/sources/inc/geshi/purebasic.php
@@ -0,0 +1,303 @@
+ 'PureBasic',
+    'COMMENT_SINGLE' => array( 1 => ";"  ),
+    'COMMENT_MULTI' => array( ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Keywords
+            'And', 'As', 'Break', 'CallDebugger', 'Case', 'CompilerCase', 'CompilerDefault', 'CompilerElse', 'CompilerEndIf', 'CompilerEndSelect',
+            'CompilerError', 'CompilerIf', 'CompilerSelect', 'Continue', 'Data', 'DataSection', 'EndDataSection', 'Debug', 'DebugLevel', 'Declare',
+            'DeclareCDLL', 'DeclareDLL', 'Default', 'Define', 'Dim', 'DisableASM', 'DisableDebugger', 'DisableExplicit', 'Else', 'ElseIf', 'EnableASM',
+            'EnableDebugger', 'EnableExplicit', 'End', 'EndEnumeration', 'EndIf', 'EndImport', 'EndInterface', 'EndMacro', 'EndProcedure',
+            'EndSelect', 'EndStructure', 'EndStructureUnion', 'EndWith', 'Enumeration', 'Extends', 'FakeReturn', 'For', 'Next', 'ForEach',
+            'ForEver', 'Global', 'Gosub', 'Goto', 'If', 'Import', 'ImportC', 'IncludeBinary', 'IncludeFile', 'IncludePath', 'Interface', 'Macro',
+            'NewList', 'Not', 'Or', 'Procedure', 'ProcedureC', 'ProcedureCDLL', 'ProcedureDLL', 'ProcedureReturn', 'Protected', 'Prototype',
+            'PrototypeC', 'Read', 'ReDim', 'Repeat', 'Until', 'Restore', 'Return', 'Select', 'Shared', 'Static', 'Step', 'Structure', 'StructureUnion',
+            'Swap', 'To', 'Wend', 'While', 'With', 'XIncludeFile', 'XOr'
+            ),
+        2 => array(
+            // All Functions
+            'Abs', 'ACos', 'Add3DArchive', 'AddBillboard', 'AddDate', 'AddElement', 'AddGadgetColumn', 'AddGadgetItem',
+            'AddKeyboardShortcut', 'AddMaterialLayer', 'AddPackFile', 'AddPackMemory', 'AddStatusBarField', 'AddSysTrayIcon',
+            'AllocateMemory', 'AmbientColor', 'AnimateEntity', 'Asc', 'ASin', 'ATan', 'AudioCDLength', 'AudioCDName', 'AudioCDStatus',
+            'AudioCDTrackLength', 'AudioCDTracks', 'AudioCDTrackSeconds', 'AvailableProgramOutput', 'AvailableScreenMemory',
+            'BackColor', 'Base64Decoder', 'Base64Encoder', 'BillboardGroupLocate', 'BillboardGroupMaterial', 'BillboardGroupX',
+            'BillboardGroupY', 'BillboardGroupZ', 'BillboardHeight', 'BillboardLocate', 'BillboardWidth', 'BillboardX', 'BillboardY', 'BillboardZ',
+            'Bin', 'BinQ', 'Blue', 'Box', 'ButtonGadget', 'ButtonImageGadget', 'CalendarGadget', 'CallCFunction', 'CallCFunctionFast',
+            'CallFunction', 'CallFunctionFast', 'CameraBackColor', 'CameraFOV', 'CameraLocate', 'CameraLookAt', 'CameraProjection',
+            'CameraRange', 'CameraRenderMode', 'CameraX', 'CameraY', 'CameraZ', 'CatchImage', 'CatchSound', 'CatchSprite',
+            'CatchXML', 'ChangeAlphaIntensity', 'ChangeCurrentElement', 'ChangeGamma', 'ChangeListIconGadgetDisplay',
+            'ChangeSysTrayIcon', 'CheckBoxGadget', 'CheckEntityCollision', 'CheckFilename', 'ChildXMLNode', 'Chr', 'Circle',
+            'ClearBillboards', 'ClearClipboard', 'ClearConsole', 'ClearError', 'ClearGadgetItemList', 'ClearList', 'ClearScreen', 'ClipSprite',
+            'CloseConsole', 'CloseDatabase', 'CloseFile', 'CloseGadgetList', 'CloseHelp', 'CloseLibrary', 'CloseNetworkConnection',
+            'CloseNetworkServer', 'ClosePack', 'ClosePreferences', 'CloseProgram', 'CloseScreen', 'CloseSubMenu', 'CloseWindow',
+            'ColorRequester', 'ComboBoxGadget', 'CompareMemory', 'CompareMemoryString', 'ConnectionID', 'ConsoleColor',
+            'ConsoleCursor', 'ConsoleError', 'ConsoleLocate', 'ConsoleTitle', 'ContainerGadget', 'CopyDirectory', 'CopyEntity',
+            'CopyFile', 'CopyImage', 'CopyLight', 'CopyMaterial', 'CopyMemory', 'CopyMemoryString', 'CopyMesh', 'CopySprite',
+            'CopyTexture', 'CopyXMLNode', 'Cos', 'CountBillboards', 'CountGadgetItems', 'CountLibraryFunctions', 'CountList',
+            'CountMaterialLayers', 'CountProgramParameters', 'CountRenderedTriangles', 'CountString', 'CRC32Fingerprint',
+            'CreateBillboardGroup', 'CreateCamera', 'CreateDirectory', 'CreateEntity', 'CreateFile', 'CreateGadgetList',
+            'CreateImage', 'CreateLight', 'CreateMaterial', 'CreateMenu', 'CreateMesh', 'CreateMutex', 'CreateNetworkServer',
+            'CreatePack', 'CreatePalette', 'CreateParticleEmitter', 'CreatePopupMenu', 'CreatePreferences', 'CreateSprite',
+            'CreateSprite3D', 'CreateStatusBar', 'CreateTerrain', 'CreateTexture', 'CreateThread', 'CreateToolBar', 'CreateXML',
+            'CreateXMLNode', 'DatabaseColumnName', 'DatabaseColumns', 'DatabaseColumnType', 'DatabaseDriverDescription',
+            'DatabaseDriverName', 'DatabaseError', 'DatabaseQuery', 'DatabaseUpdate', 'Date', 'DateGadget', 'Day', 'DayOfWeek',
+            'DayOfYear', 'DefaultPrinter', 'Defined', 'Delay', 'DeleteDirectory', 'DeleteElement', 'DeleteFile', 'DeleteXMLNode',
+            'DESFingerprint', 'DesktopDepth', 'DesktopFrequency', 'DesktopHeight', 'DesktopMouseX', 'DesktopMouseY', 'DesktopName',
+            'DesktopWidth', 'DirectoryEntryAttributes', 'DirectoryEntryDate', 'DirectoryEntryName', 'DirectoryEntrySize',
+            'DirectoryEntryType', 'DisableGadget', 'DisableMaterialLighting', 'DisableMenuItem', 'DisableToolBarButton', 'DisableWindow',
+            'DisASMCommand', 'DisplayAlphaSprite', 'DisplayPalette', 'DisplayPopupMenu', 'DisplayRGBFilter', 'DisplayShadowSprite',
+            'DisplaySolidSprite', 'DisplaySprite', 'DisplaySprite3D', 'DisplayTranslucentSprite', 'DisplayTransparentSprite', 'DragFiles',
+            'DragImage', 'DragOSFormats', 'DragPrivate', 'DragText', 'DrawAlphaImage', 'DrawImage', 'DrawingBuffer',
+            'DrawingBufferPitch', 'DrawingBufferPixelFormat', 'DrawingFont', 'DrawingMode', 'DrawText', 'EditorGadget',
+            'egrid_AddColumn', 'egrid_AddRows', 'egrid_AppendCells', 'egrid_ClearRows', 'egrid_CopyCells',
+            'egrid_CreateCellCallback', 'egrid_CreateGrid', 'egrid_DeleteCells', 'egrid_FastDeleteCells', 'egrid_FreeGrid',
+            'egrid_GetCellSelection', 'egrid_GetCellText', 'egrid_GetColumnOrderArray', 'egrid_HasSelectedCellChanged', 'egrid_Height',
+            'egrid_HideEdit', 'egrid_HideGrid', 'egrid_MakeCellVisible', 'egrid_NumberOfColumns', 'egrid_NumberOfRows',
+            'egrid_PasteCells', 'egrid_Register', 'egrid_RemoveCellCallback', 'egrid_RemoveColumn', 'egrid_RemoveRow', 'egrid_Resize',
+            'egrid_SelectCell', 'egrid_SelectedColumn', 'egrid_SelectedRow', 'egrid_SetCellSelection', 'egrid_SetCellText',
+            'egrid_SetColumnOrderArray', 'egrid_SetHeaderFont', 'egrid_SetHeaderHeight', 'egrid_SetOption', 'egrid_Width', 'egrid_x',
+            'egrid_y', 'EjectAudioCD', 'ElapsedMilliseconds', 'Ellipse', 'EnableGadgetDrop', 'EnableGraphicalConsole',
+            'EnableWindowDrop', 'EnableWorldCollisions', 'EnableWorldPhysics', 'Engine3DFrameRate', 'EntityAngleX',
+            'EntityAnimationLength', 'EntityLocate', 'EntityMaterial', 'EntityMesh', 'EntityPhysicBody', 'EntityRenderMode',
+            'EntityX', 'EntityY', 'EntityZ', 'EnvironmentVariableName', 'EnvironmentVariableValue', 'Eof', 'EventClient',
+            'EventDropAction', 'EventDropBuffer', 'EventDropFiles', 'EventDropImage', 'EventDropPrivate', 'EventDropSize',
+            'EventDropText', 'EventDropType', 'EventDropX', 'EventDropY', 'EventGadget', 'EventlParam', 'EventMenu', 'EventServer',
+            'EventType', 'EventWindow', 'EventwParam', 'ExamineDatabaseDrivers', 'ExamineDesktops', 'ExamineDirectory',
+            'ExamineEnvironmentVariables', 'ExamineIPAddresses', 'ExamineJoystick', 'ExamineKeyboard', 'ExamineLibraryFunctions',
+            'ExamineMouse', 'ExaminePreferenceGroups', 'ExaminePreferenceKeys', 'ExamineScreenModes', 'ExamineWorldCollisions',
+            'ExamineXMLAttributes', 'ExplorerComboGadget', 'ExplorerListGadget', 'ExplorerTreeGadget', 'ExportXML',
+            'ExportXMLSize', 'FileBuffersSize', 'FileID', 'FileSeek', 'FileSize', 'FillArea', 'FindString', 'FinishDirectory',
+            'FirstDatabaseRow', 'FirstElement', 'FirstWorldCollisionEntity', 'FlipBuffers', 'FlushFileBuffers', 'Fog', 'FontID',
+            'FontRequester', 'FormatDate', 'FormatXML', 'Frame3DGadget', 'FreeBillboardGroup', 'FreeCamera', 'FreeEntity',
+            'FreeFont', 'FreeGadget', 'FreeImage', 'FreeLight', 'FreeMaterial', 'FreeMemory', 'FreeMenu', 'FreeMesh',
+            'FreeModule', 'FreeMovie', 'FreeMutex', 'FreePalette', 'FreeParticleEmitter', 'FreeSound', 'FreeSprite',
+            'FreeSprite3D', 'FreeStatusBar', 'FreeTexture', 'FreeToolBar', 'FreeXML', 'FrontColor', 'GadgetHeight', 'GadgetID',
+            'GadgetItemID', 'GadgetToolTip', 'GadgetType', 'GadgetWidth', 'GadgetX', 'GadgetY', 'GetActiveGadget',
+            'GetActiveWindow', 'GetClientIP', 'GetClientPort', 'GetClipboardImage', 'GetClipboardText', 'GetCurrentDirectory',
+            'GetCurrentEIP', 'GetDatabaseDouble', 'GetDatabaseFloat', 'GetDatabaseLong', 'GetDatabaseQuad', 'GetDatabaseString',
+            'GetDisASMString', 'GetEntityAnimationTime', 'GetEntityFriction', 'GetEntityMass', 'GetEnvironmentVariable',
+            'GetErrorAddress', 'GetErrorCounter', 'GetErrorDescription', 'GetErrorDLL', 'GetErrorLineNR', 'GetErrorModuleName',
+            'GetErrorNumber', 'GetErrorRegister', 'GetExtensionPart', 'GetFileAttributes', 'GetFileDate', 'GetFilePart', 'GetFunction',
+            'GetFunctionEntry', 'GetGadgetAttribute', 'GetGadgetColor', 'GetGadgetData', 'GetGadgetFont',
+            'GetGadgetItemAttribute', 'GetGadgetItemColor', 'GetGadgetItemData', 'GetGadgetItemState', 'GetGadgetItemText',
+            'GetGadgetState', 'GetGadgetText', 'GetHomeDirectory', 'GetMenuItemState', 'GetMenuItemText', 'GetMenuTitleText',
+            'GetModulePosition', 'GetModuleRow', 'GetPaletteColor', 'GetPathPart', 'GetTemporaryDirectory',
+            'GetToolBarButtonState', 'GetWindowColor', 'GetWindowState', 'GetWindowTitle', 'GetXMLAttribute', 'GetXMLEncoding',
+            'GetXMLNodeName', 'GetXMLNodeOffset', 'GetXMLNodeText', 'GetXMLStandalone', 'GoToEIP', 'GrabImage', 'GrabSprite',
+            'Green', 'Hex', 'HexQ', 'HideBillboardGroup', 'HideEntity', 'HideGadget', 'HideLight', 'HideMenu', 'HideParticleEmitter',
+            'HideWindow', 'Hostname', 'Hour', 'HyperLinkGadget', 'ImageDepth', 'ImageGadget', 'ImageHeight', 'ImageID',
+            'ImageOutput', 'ImageWidth', 'InitAudioCD', 'InitEngine3D', 'InitJoystick', 'InitKeyboard', 'InitMouse', 'InitMovie',
+            'InitNetwork', 'InitPalette', 'InitScintilla', 'InitSound', 'InitSprite', 'InitSprite3D', 'Inkey', 'Input', 'InputRequester',
+            'InsertElement', 'Int', 'IntQ', 'IPAddressField', 'IPAddressGadget', 'IPString', 'IsBillboardGroup', 'IsCamera', 'IsDatabase',
+            'IsDirectory', 'IsEntity', 'IsFile', 'IsFont', 'IsGadget', 'IsImage', 'IsLibrary', 'IsLight', 'IsMaterial', 'IsMenu', 'IsMesh',
+            'IsModule', 'IsMovie', 'IsPalette', 'IsParticleEmitter', 'IsProgram', 'IsScreenActive', 'IsSound', 'IsSprite', 'IsSprite3D',
+            'IsStatusBar', 'IsSysTrayIcon', 'IsTexture', 'IsThread', 'IsToolBar', 'IsWindow', 'IsXML', 'JoystickAxisX', 'JoystickAxisY',
+            'JoystickButton', 'KeyboardInkey', 'KeyboardMode', 'KeyboardPushed', 'KeyboardReleased', 'KillProgram', 'KillThread',
+            'LastElement', 'LCase', 'Left', 'Len', 'LibraryFunctionAddress', 'LibraryFunctionName', 'LibraryID', 'LightColor',
+            'LightLocate', 'LightSpecularColor', 'Line', 'LineXY', 'ListIconGadget', 'ListIndex', 'ListViewGadget', 'LoadFont',
+            'LoadImage', 'LoadMesh', 'LoadModule', 'LoadMovie', 'LoadPalette', 'LoadSound', 'LoadSprite', 'LoadTexture',
+            'LoadWorld', 'LoadXML', 'Loc', 'LockMutex', 'Lof', 'Log', 'Log10', 'LSet', 'LTrim', 'MainXMLNode', 'MakeIPAddress',
+            'MaterialAmbientColor', 'MaterialBlendingMode', 'MaterialDiffuseColor', 'MaterialFilteringMode', 'MaterialID',
+            'MaterialShadingMode', 'MaterialSpecularColor', 'MD5FileFingerprint', 'MD5Fingerprint', 'MDIGadget', 'MemorySize',
+            'MemoryStringLength', 'MenuBar', 'MenuHeight', 'MenuID', 'MenuItem', 'MenuTitle', 'MeshID', 'MessageRequester',
+            'Mid', 'Minute', 'ModuleVolume', 'Month', 'MouseButton', 'MouseDeltaX', 'MouseDeltaY', 'MouseLocate', 'MouseWheel',
+            'MouseX', 'MouseY', 'MoveBillboard', 'MoveBillboardGroup', 'MoveCamera', 'MoveEntity', 'MoveLight', 'MoveMemory',
+            'MoveParticleEmitter', 'MoveXMLNode', 'MovieAudio', 'MovieHeight', 'MovieInfo', 'MovieLength', 'MovieSeek',
+            'MovieStatus', 'MovieWidth', 'NetworkClientEvent', 'NetworkServerEvent', 'NewPrinterPage', 'NextDatabaseDriver',
+            'NextDatabaseRow', 'NextDirectoryEntry', 'NextElement', 'NextEnvironmentVariable', 'NextIPAddress',
+            'NextLibraryFunction', 'NextPackFile', 'NextPreferenceGroup', 'NextPreferenceKey', 'NextScreenMode',
+            'NextSelectedFileName', 'NextWorldCollision', 'NextXMLAttribute', 'NextXMLNode', 'OffsetOf', 'OnErrorExit',
+            'OnErrorGosub', 'OnErrorGoto', 'OnErrorResume', 'OpenComPort', 'OpenConsole', 'OpenDatabase',
+            'OpenDatabaseRequester', 'OpenFile', 'OpenFileRequester', 'OpenGadgetList', 'OpenHelp', 'OpenLibrary',
+            'OpenNetworkConnection', 'OpenPack', 'OpenPreferences', 'OpenScreen', 'OpenSubMenu', 'OpenWindow',
+            'OpenWindowedScreen', 'OptionGadget', 'OSVersion', 'PackerCallback', 'PackFileSize', 'PackMemory', 'PanelGadget',
+            'ParentXMLNode', 'Parse3DScripts', 'ParseDate', 'ParticleColorFader', 'ParticleColorRange', 'ParticleEmissionRate',
+            'ParticleEmitterDirection', 'ParticleEmitterLocate', 'ParticleEmitterX', 'ParticleEmitterY', 'ParticleEmitterZ',
+            'ParticleMaterial', 'ParticleSize', 'ParticleTimeToLive', 'ParticleVelocity', 'PathRequester', 'PauseAudioCD',
+            'PauseMovie', 'PauseThread', 'PeekB', 'PeekC', 'PeekD', 'PeekF', 'PeekL', 'PeekQ', 'PeekS', 'PeekW', 'PlayAudioCD',
+            'PlayModule', 'PlayMovie', 'PlaySound', 'Plot', 'Point', 'PokeB', 'PokeC', 'PokeD', 'PokeF', 'PokeL', 'PokeQ', 'PokeS',
+            'PokeW', 'Pow', 'PreferenceComment', 'PreferenceGroup', 'PreferenceGroupName', 'PreferenceKeyName',
+            'PreferenceKeyValue', 'PreviousDatabaseRow', 'PreviousElement', 'PreviousXMLNode', 'Print', 'PrinterOutput',
+            'PrinterPageHeight', 'PrinterPageWidth', 'PrintN', 'PrintRequester', 'ProgramExitCode', 'ProgramFilename',
+            'ProgramID', 'ProgramParameter', 'ProgramRunning', 'ProgressBarGadget', 'Random', 'RandomSeed', 'RawKey',
+            'ReadByte', 'ReadCharacter', 'ReadConsoleData', 'ReadData', 'ReadDouble', 'ReadFile', 'ReadFloat', 'ReadLong',
+            'ReadPreferenceDouble', 'ReadPreferenceFloat', 'ReadPreferenceLong', 'ReadPreferenceQuad',
+            'ReadPreferenceString', 'ReadProgramData', 'ReadProgramError', 'ReadProgramString', 'ReadQuad', 'ReadString',
+            'ReadStringFormat', 'ReadWord', 'ReAllocateMemory', 'ReceiveNetworkData', 'ReceiveNetworkFile', 'Red',
+            'Reg_DeleteEmptyKey', 'Reg_DeleteKey', 'Reg_DeleteValue', 'Reg_GetErrorMsg', 'Reg_GetErrorNr',
+            'Reg_GetValueTyp', 'Reg_ListSubKey', 'Reg_ListSubValue', 'Reg_ReadBinary', 'Reg_ReadExpandString',
+            'Reg_ReadLong', 'Reg_ReadMultiLineString', 'Reg_ReadQuad', 'Reg_ReadString', 'Reg_WriteBinary',
+            'Reg_WriteExpandString', 'Reg_WriteLong', 'Reg_WriteMultiLineString', 'Reg_WriteQuad', 'Reg_WriteString',
+            'ReleaseMouse', 'RemoveBillboard', 'RemoveEnvironmentVariable', 'RemoveGadgetColumn', 'RemoveGadgetItem',
+            'RemoveKeyboardShortcut', 'RemoveMaterialLayer', 'RemovePreferenceGroup', 'RemovePreferenceKey',
+            'RemoveString', 'RemoveSysTrayIcon', 'RemoveXMLAttribute', 'RenameFile', 'RenderMovieFrame', 'RenderWorld',
+            'ReplaceString', 'ResetList', 'ResizeBillboard', 'ResizeEntity', 'ResizeGadget', 'ResizeImage', 'ResizeMovie',
+            'ResizeParticleEmitter', 'ResizeWindow', 'ResolveXMLAttributeName', 'ResolveXMLNodeName', 'ResumeAudioCD',
+            'ResumeMovie', 'ResumeThread', 'RGB', 'Right', 'RootXMLNode', 'RotateBillboardGroup', 'RotateCamera',
+            'RotateEntity', 'RotateMaterial', 'RotateSprite3D', 'Round', 'RSet', 'RTrim', 'RunProgram', 'SaveFileRequester',
+            'SaveImage', 'SaveSprite', 'SaveXML', 'ScaleEntity', 'ScaleMaterial', 'ScintillaGadget', 'ScintillaSendMessage',
+            'ScreenID', 'ScreenModeDepth', 'ScreenModeHeight', 'ScreenModeRefreshRate', 'ScreenModeWidth',
+            'ScreenOutput', 'ScrollAreaGadget', 'ScrollBarGadget', 'ScrollMaterial', 'Second', 'SecondWorldCollisionEntity',
+            'SelectedFilePattern', 'SelectedFontColor', 'SelectedFontName', 'SelectedFontSize', 'SelectedFontStyle',
+            'SelectElement', 'SendNetworkData', 'SendNetworkFile', 'SendNetworkString', 'SetActiveGadget',
+            'SetActiveWindow', 'SetClipboardImage', 'SetClipboardText', 'SetCurrentDirectory', 'SetDragCallback',
+            'SetDropCallback', 'SetEntityAnimationTime', 'SetEntityFriction', 'SetEntityMass', 'SetEnvironmentVariable',
+            'SetErrorNumber', 'SetFileAttributes', 'SetFileDate', 'SetFrameRate', 'SetGadgetAttribute', 'SetGadgetColor',
+            'SetGadgetData', 'SetGadgetFont', 'SetGadgetItemAttribute', 'SetGadgetItemColor', 'SetGadgetItemData',
+            'SetGadgetItemState', 'SetGadgetItemText', 'SetGadgetState', 'SetGadgetText', 'SetMenuItemState',
+            'SetMenuItemText', 'SetMenuTitleText', 'SetMeshData', 'SetModulePosition', 'SetPaletteColor', 'SetRefreshRate',
+            'SetToolBarButtonState', 'SetWindowCallback', 'SetWindowColor', 'SetWindowState', 'SetWindowTitle',
+            'SetXMLAttribute', 'SetXMLEncoding', 'SetXMLNodeName', 'SetXMLNodeOffset', 'SetXMLNodeText',
+            'SetXMLStandalone', 'Sin', 'SizeOf', 'SkyBox', 'SkyDome', 'SmartWindowRefresh', 'SortArray', 'SortList',
+            'SortStructuredArray', 'SortStructuredList', 'SoundFrequency', 'SoundPan', 'SoundVolume', 'Space',
+            'SpinGadget', 'SplitterGadget', 'Sprite3DBlendingMode', 'Sprite3DQuality', 'SpriteCollision', 'SpriteDepth',
+            'SpriteHeight', 'SpriteID', 'SpriteOutput', 'SpritePixelCollision', 'SpriteWidth', 'Sqr', 'Start3D', 'StartDrawing',
+            'StartPrinting', 'StartSpecialFX', 'StatusBarHeight', 'StatusBarIcon', 'StatusBarID', 'StatusBarText',
+            'StickyWindow', 'Stop3D', 'StopAudioCD', 'StopDrawing', 'StopModule', 'StopMovie', 'StopPrinting',
+            'StopSound', 'StopSpecialFX', 'Str', 'StrD', 'StrF', 'StringByteLength', 'StringField', 'StringGadget', 'StrQ',
+            'StrU', 'Subsystem', 'SwapElements', 'SysTrayIconToolTip', 'Tan', 'TerrainHeight', 'TextGadget', 'TextHeight',
+            'TextureHeight', 'TextureID', 'TextureOutput', 'TextureWidth', 'TextWidth', 'ThreadID', 'ThreadPriority',
+            'ToolBarHeight', 'ToolBarID', 'ToolBarImageButton', 'ToolBarSeparator', 'ToolBarStandardButton',
+            'ToolBarToolTip', 'TrackBarGadget', 'TransformSprite3D', 'TransparentSpriteColor', 'TreeGadget', 'Trim',
+            'TruncateFile', 'TryLockMutex', 'UCase', 'UnlockMutex', 'UnpackMemory', 'UseAudioCD', 'UseBuffer',
+            'UseGadgetList', 'UseJPEGImageDecoder', 'UseJPEGImageEncoder', 'UseODBCDatabase', 'UseOGGSoundDecoder',
+            'UsePNGImageDecoder', 'UsePNGImageEncoder', 'UseTGAImageDecoder', 'UseTIFFImageDecoder', 'Val', 'ValD',
+            'ValF', 'ValQ', 'WaitProgram', 'WaitThread', 'WaitWindowEvent', 'WebGadget', 'WebGadgetPath', 'WindowEvent',
+            'WindowHeight', 'WindowID', 'WindowMouseX', 'WindowMouseY', 'WindowOutput', 'WindowWidth', 'WindowX',
+            'WindowY', 'WorldGravity', 'WorldShadows', 'WriteByte', 'WriteCharacter', 'WriteConsoleData', 'WriteData',
+            'WriteDouble', 'WriteFloat', 'WriteLong', 'WritePreferenceDouble', 'WritePreferenceFloat', 'WritePreferenceLong',
+            'WritePreferenceQuad', 'WritePreferenceString', 'WriteProgramData', 'WriteProgramString', 'WriteProgramStringN',
+            'WriteQuad', 'WriteString', 'WriteStringFormat', 'WriteStringN', 'WriteWord', 'XMLAttributeName', 'XMLAttributeValue',
+            'XMLChildCount', 'XMLError', 'XMLErrorLine', 'XMLErrorPosition', 'XMLNodeFromID', 'XMLNodeFromPath', 'XMLNodePath',
+            'XMLNodeType', 'XMLStatus', 'Year', 'ZoomSprite3D'
+            ),
+        3 => array(
+            // some ASM instructions
+            'AAA', 'AAD', 'AAM', 'AAS', 'ADC', 'ADD', 'AND', 'ARPL', 'BOUND', 'BSF', 'BSR', 'BSWAP', 'BT', 'BTC', 'BTR',
+            'BTS', 'CALL', 'CBW', 'CDQ', 'CLC', 'CLD', 'CLI', 'CLTS', 'CMC', 'CMP', 'CMPS', 'CMPXCHG', 'CWD', 'CWDE',
+            'DAA', 'DAS', 'DB', 'DD', 'DEC', 'DIV', 'DW', 'ENTER', 'ESC', 'F2XM1', 'FABS', 'FADD', 'FCHS', 'FCLEX',
+            'FCOM', 'FDIV', 'FDIVR', 'FFREE', 'FINCSTP', 'FINIT', 'FLD', 'FLD1', 'FLDCW', 'FMUL', 'FNOP', 'FPATAN',
+            'FPREM', 'FRNDINT', 'FSAVE', 'FSCALE', 'FSETPM', 'FSIN', 'FSQRT', 'FST', 'FSTENV', 'FSTSW', 'FSUB',
+            'FSUBR', 'FTST', 'FUCOM', 'FWAIT', 'FXAM', 'FXCH', 'FXTRACT', 'FYL2X', 'FYL2XP1', 'HLT', 'IDIV', 'IMUL',
+            'IN', 'INC', 'INS', 'INT', 'INTO', 'INVLPG', 'IRET', 'IRETD', 'JA', 'JAE', 'JB', 'JBE', 'JC', 'JCXZ', 'JE', 'JECXZ',
+            'JG', 'JGE', 'JL', 'JLE', 'JMP', 'JNA', 'JNAE', 'JNB', 'JNBE', 'JNC', 'JNE', 'JNG', 'JNGE', 'JNL', 'JNLE', 'JNO', 'JNP',
+            'JNS', 'JNZ', 'JO', 'JP', 'JPE', 'JPO', 'JS', 'JZ', 'LAHF', 'LAR', 'LDS', 'LEA', 'LEAVE', 'LES', 'LFS', 'LGDT', 'LGS',
+            'LIDT', 'LLDT', 'LMSW', 'LOCK', 'LODS', 'LOOP', 'LOOPE', 'LOOPNE', 'LOOPNZ', 'LOOPZ', 'LSL', 'LSS', 'LTR',
+            'MOV', 'MOVS', 'MOVSX', 'MOVZX', 'MUL', 'NEG', 'NOP', 'NOT', 'OR', 'OUT', 'OUTS', 'POP', 'POPA', 'POPAD',
+            'POPF', 'POPFD', 'PUSH', 'PUSHA', 'PUSHAD', 'PUSHF', 'PUSHFD', 'RCL', 'RCR', 'REP', 'REPE', 'REPNE',
+            'REPNZ', 'REPZ', 'RET', 'RETF', 'ROL', 'ROR', 'SAHF', 'SAL', 'SAR', 'SBB', 'SCAS', 'SETAE', 'SETB', 'SETBE',
+            'SETC', 'SETE', 'SETG', 'SETGE', 'SETL', 'SETLE', 'SETNA', 'SETNAE', 'SETNB', 'SETNC', 'SETNE', 'SETNG',
+            'SETNGE', 'SETNL', 'SETNLE', 'SETNO', 'SETNP', 'SETNS', 'SETNZ', 'SETO', 'SETP', 'SETPE', 'SETPO',
+            'SETS', 'SETZ', 'SGDT', 'SHL', 'SHLD', 'SHR', 'SHRD', 'SIDT', 'SLDT', 'SMSW', 'STC', 'STD', 'STI',
+            'STOS', 'STR', 'SUB', 'TEST', 'VERR', 'VERW', 'WAIT', 'WBINVD', 'XCHG', 'XLAT', 'XLATB', 'XOR'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '+', '-', '*', '/', '\\', '>', '<', '=', '<=', '>=', '&', '|', '!', '~', '<>', '>>', '<<', '%'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000066; font-weight: bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000fff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #ff0000; font-style: italic;',
+            'MULTI' => 'color: #ff0000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '\\'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => false,
+        1 => false
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/pycon.php b/sources/inc/geshi/pycon.php
new file mode 100644
index 0000000..ac2b34d
--- /dev/null
+++ b/sources/inc/geshi/pycon.php
@@ -0,0 +1,64 @@
+>>).*?$(?:\n\.\.\..*?$)*($)/m';
+$language_data['HIGHLIGHT_STRICT_BLOCK'][-1] = true;
+
+$language_data['STYLES']['SCRIPT'][-1] = 'color: #222222;';
+
+if(!isset($language_data['COMMENT_REGEXP'])) {
+    $language_data['COMMENT_REGEXP'] = array();
+}
+
+$language_data['COMMENT_REGEXP'][-1] = '/(?:^|\A\s)(?:>>>|\.\.\.)/m';
+$language_data['STYLES']['COMMENTS'][-1] = 'color: #444444;';
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/pys60.php b/sources/inc/geshi/pys60.php
new file mode 100644
index 0000000..59c67fa
--- /dev/null
+++ b/sources/inc/geshi/pys60.php
@@ -0,0 +1,273 @@
+ 'Python for S60',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'", '"""',"'''",'""','""'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+
+        /*
+         ** Set 1: reserved words
+         ** http://python.org/doc/current/ref/keywords.html
+         */
+        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', "<<", ">>", "as"
+            ),
+
+        /*
+         ** Set 2: builtins
+         ** http://python.org/doc/current/lib/built-in-funcs.html
+         */
+        2 => array(
+            '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp',
+            'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile',
+            'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
+            'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
+            'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
+            'raw_input', 'reduce', 'reload', 'repr', 'reversed', 'round', 'set', 'setattr', 'slice',
+            'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode',
+            'vars', 'xrange', 'zip',
+            // Built-in constants: http://python.org/doc/current/lib/node35.html
+            'False', 'True', 'None', 'NotImplemented', 'Ellipsis',
+            // Built-in Exceptions: http://python.org/doc/current/lib/module-exceptions.html
+            'Exception', 'StandardError', 'ArithmeticError', 'LookupError', 'EnvironmentError',
+            'AssertionError', 'AttributeError', 'EOFError', 'FloatingPointError', 'IOError',
+            'ImportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', 'NameError',
+            'NotImplementedError', 'OSError', 'OverflowError', 'ReferenceError', 'RuntimeError',
+            'StopIteration', 'SyntaxError', 'SystemError', 'SystemExit', 'TypeError',
+            'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
+            'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
+            'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
+            'RuntimeWarning', 'FutureWarning',
+            //Symbian Errors
+            "SymbianError", "KernelError",
+            // self: this is a common python convention (but not a reserved word)
+            'self'
+            ),
+
+        /*
+         ** Set 3: standard library
+         ** http://python.org/doc/current/lib/modindex.html
+         */
+        3 => array(
+            '__builtin__', '__future__', '__main__', '_winreg', 'aifc', 'AL', 'al', 'anydbm',
+            'array', 'asynchat', 'asyncore', 'atexit', 'audioop', 'base64', 'BaseHTTPServer',
+            'Bastion', 'binascii', 'binhex', 'bisect', 'bsddb', 'bz2', 'calendar', 'cd', 'cgi',
+            'CGIHTTPServer', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop',
+            'collections', 'colorsys', 'commands', 'compileall', 'compiler',
+            'ConfigParser', 'Cookie', 'cookielib', 'copy', 'copy_reg', 'cPickle', 'crypt',
+            'cStringIO', 'csv', 'curses', 'datetime', 'dbhash', 'dbm', 'decimal', 'DEVICE',
+            'difflib', 'dircache', 'dis', 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', 'dumbdbm',
+            'dummy_thread', 'dummy_threading', 'email', 'encodings', 'errno', 'exceptions', 'fcntl',
+            'filecmp', 'fileinput', 'FL', 'fl', 'flp', 'fm', 'fnmatch', 'formatter', 'fpectl',
+            'fpformat', 'ftplib', 'gc', 'gdbm', 'getopt', 'getpass', 'gettext', 'GL', 'gl', 'glob',
+            'gopherlib', 'grp', 'gzip', 'heapq', 'hmac', 'hotshot', 'htmlentitydefs', 'htmllib',
+            'HTMLParser', 'httplib', 'imageop', 'imaplib', 'imgfile', 'imghdr', 'imp', 'inspect',
+            'itertools', 'jpeg', 'keyword', 'linecache', 'locale', 'logging', 'mailbox', 'mailcap',
+            'marshal', 'math', 'md5', 'mhlib', 'mimetools', 'mimetypes', 'MimeWriter', 'mimify',
+            'mmap', 'msvcrt', 'multifile', 'mutex', 'netrc', 'new', 'nis', 'nntplib', 'operator',
+            'optparse', 'os', 'ossaudiodev', 'parser', 'pdb', 'pickle', 'pickletools', 'pipes',
+            'pkgutil', 'platform', 'popen2', 'poplib', 'posix', 'posixfile', 'pprint', 'profile',
+            'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'Queue', 'quopri', 'random',
+            're', 'readline', 'resource', 'rexec', 'rgbimg', 'rlcompleter',
+            'robotparser', 'sched', 'ScrolledText', 'select', 'sets', 'sgmllib', 'sha', 'shelve',
+            'shlex', 'shutil', 'signal', 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'site', 'smtpd',
+            'smtplib', 'sndhdr', 'socket', 'SocketServer', 'stat', 'statcache', 'statvfs', 'string',
+            'StringIO', 'stringprep', 'struct', 'subprocess', 'sunau', 'SUNAUDIODEV', 'sunaudiodev',
+            'symbol', 'sys', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios',
+            'test', 'textwrap', 'thread', 'threading', 'time', 'timeit', 'Tix', 'Tkinter', 'token',
+            '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', "os.path", "sys.path",
+
+            //PythonS60 Standard Library
+            //http://pys60.garage.maemo.org/doc/s60/
+            //These are the standard modules in the archive
+
+            "appuifw", "globalui","e32", "telephone", "aosocket", "btsocket",
+            "sysinfo","camera","graphics","keycapture","key_codes","topwindow", "gles",
+            "glcanvas","sensor", "audio","messaging", "inbox","location","positioning",
+            "contacts", "e32calendar", "e32db","e32dbm","logs","scriptext",
+            "series60_console",
+
+            //These are external but very often usable modules
+
+            "appuifw2","ArchetypeUI","elementtree","lightblue",
+            "activaprofile","Adjustor","akntextutils","aosocketnativenew",
+            "appreciation","applicationmanager","appswitch","atextit","bt_teror","btconsole",
+            "btswitch","cElementTree","cenrep","cerealizer","cl_gui","clipboard",
+            "clipboard_CHN","debugger","decompile2",
+            "dir_iter","download","easydb","ECenrep","Edit_find","efeature","elocation","envy",
+            "EProfile","erestart","error","esyagent","Execwap","exprofile","fastcamera",
+            "feature","fgimage","filebrowser","firmware","fold","fonts","fraction","FTP",
+            "ftplibnew","fy_manager","fy_menu","gles_utils","gps_location","hack",
+            "HTML2TXT","iapconnect","icon_image","image_decoder",
+            "ini","interactive_console","inting","key_modifiers","key_tricks","keypress",
+            "landmarks","lite_fm","locationacq","locationrequestor",
+            "logo","markupbase","mbm","mbm2","minidb","miniinfo","MISC",
+            "misty","Msg","ntpath","odict","Paintbox","pathinfo","pexif","pickcolor",
+            "powlite_fm","powlite_fm2","powlite_fm3","powlite_fme","prgbar","prodb",
+            "profileengine","progressbar","progressbartw","progressnotes",
+            "ProgressBarTW2","proshivka","py_upload","pyConnection","PyFileMan",
+            "pykeylock","PyPyc","pyqq","pys60crypto","pys60usb","rfc822",
+            "RUSOS","scmk","scrollpage","SISFIELDS","SISFIELD","sisfile",
+            "SISINFO","sisreader","Sistools","smidi","smsreject","speechy","sre_compile",
+            "sre_constants","sre_parse","sre","sysagent","syslang","TextMan",
+            "textrenderer","TextWrap","topwind","tsocket","uikludge","uikludges","uitricks",
+            "walkfile","wallpaper","wfm_lite",
+            "wif_keys","wif","window","wlanmgmt","wlantools","wt_color","wt_requesters",
+            "zhkey",
+
+            //These are recent additions
+            "miffile"
+            ),
+
+        /*
+         ** Set 4: special methods
+         ** http://python.org/doc/current/ref/specialnames.html
+         */
+        4 => array(
+            ///*
+            //// Iterator types: http://python.org/doc/current/lib/typeiter.html
+            //'__iter__', 'next',
+            //// String types: http://python.org/doc/current/lib/string-methods.html
+            //'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
+            //'find', 'index', 'isalnum', 'isalpha', 'isdigit', 'islower', 'isspace', 'istitle',
+            //'isupper', 'join', 'ljust', 'lower', 'lstrip', 'replace', 'rfind', 'rindex', 'rjust',
+            //'rsplit', 'rstrip', 'split', 'splitlines', 'startswith', 'strip', 'swapcase', 'title',
+            //'translate', 'upper', 'zfill',
+            // */
+
+            // Basic customization: http://python.org/doc/current/ref/customization.html
+            '__new__', '__init__', '__del__', '__repr__', '__str__',
+            '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
+            '__hash__', '__nonzero__', '__unicode__', '__dict__',
+            // Attribute access: http://python.org/doc/current/ref/attribute-access.html
+            '__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
+            '__delete__', '__slots__',
+            // Class creation, callable objects
+            '__metaclass__', '__call__',
+            // Container types: http://python.org/doc/current/ref/sequence-types.html
+            '__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
+            '__getslice__', '__setslice__', '__delslice__',
+            // Numeric types: http://python.org/doc/current/ref/numeric-types.html
+            '__abs__','__add__','__and__','__coerce__','__div__','__divmod__','__float__',
+            '__hex__','__iadd__','__isub__','__imod__','__idiv__','__ipow__','__iand__',
+            '__ior__','__ixor__', '__ilshift__','__irshift__','__invert__','__int__',
+            '__long__','__lshift__',
+            '__mod__','__mul__','__neg__','__oct__','__or__','__pos__','__pow__',
+            '__radd__','__rdiv__','__rdivmod__','__rmod__','__rpow__','__rlshift__','__rrshift__',
+            '__rshift__','__rsub__','__rmul__','__rand__','__rxor__','__ror__',
+            '__sub__','__xor__'
+            )
+
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?', '`'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #006000;font-weight:bold;',   // Reserved
+            2 => 'color: #800950;font-size:105%',                  // Built-ins + self
+            3 => 'color: #003399;font-size:106%',                  // Standard lib
+            4 => 'color: #0000cd;'                  // Special methods
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style:italic;font-size:92%',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #930; font-weight: bold;font-size:105%'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: maroon;font-size:102%;padding:2px'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2356F8;'
+            ),
+        'METHODS' => array(
+            1 => 'color: navy;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66ccFF;'
+            ),
+        '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(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/python.php b/sources/inc/geshi/python.php
new file mode 100644
index 0000000..ec9b17e
--- /dev/null
+++ b/sources/inc/geshi/python.php
@@ -0,0 +1,244 @@
+ 'Python',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    //Longest quotemarks ALWAYS first
+    'QUOTEMARKS' => array('"""', "'''", '"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_BIN_PREFIX_0B |
+        GESHI_NUMBER_OCT_PREFIX_0O | 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(
+
+        /*
+        ** Set 1: reserved words
+        ** http://python.org/doc/current/ref/keywords.html
+        */
+        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', 'with', 'as', 'nonlocal'
+            ),
+
+        /*
+        ** Set 2: builtins
+        ** http://python.org/doc/current/lib/built-in-funcs.html
+        */
+        2 => array(
+            '__import__', 'abs', 'basestring', 'bool', 'callable', 'chr', 'classmethod', 'cmp',
+            'compile', 'complex', 'delattr', 'dict', 'dir', 'divmod', 'enumerate', 'eval', 'execfile',
+            'file', 'filter', 'float', 'frozenset', 'getattr', 'globals', 'hasattr', 'hash', 'help',
+            'hex', 'id', 'input', 'int', 'isinstance', 'issubclass', 'iter', 'len', 'list', 'locals',
+            'long', 'map', 'max', 'min', 'object', 'oct', 'open', 'ord', 'pow', 'property', 'range',
+            'raw_input', 'reduce', 'reload', 'reversed', 'round', 'set', 'setattr', 'slice',
+            'sorted', 'staticmethod', 'str', 'sum', 'super', 'tuple', 'type', 'unichr', 'unicode',
+            'vars', 'xrange', 'zip',
+            // Built-in constants: http://python.org/doc/current/lib/node35.html
+            'False', 'True', 'None', 'NotImplemented', 'Ellipsis',
+            // Built-in Exceptions: http://python.org/doc/current/lib/module-exceptions.html
+            'Exception', 'StandardError', 'ArithmeticError', 'LookupError', 'EnvironmentError',
+            'AssertionError', 'AttributeError', 'EOFError', 'FloatingPointError', 'IOError',
+            'ImportError', 'IndexError', 'KeyError', 'KeyboardInterrupt', 'MemoryError', 'NameError',
+            'NotImplementedError', 'OSError', 'OverflowError', 'ReferenceError', 'RuntimeError',
+            'StopIteration', 'SyntaxError', 'SystemError', 'SystemExit', 'TypeError',
+            'UnboundlocalError', 'UnicodeError', 'UnicodeEncodeError', 'UnicodeDecodeError',
+            'UnicodeTranslateError', 'ValueError', 'WindowsError', 'ZeroDivisionError', 'Warning',
+            'UserWarning', 'DeprecationWarning', 'PendingDeprecationWarning', 'SyntaxWarning',
+            'RuntimeWarning', 'FutureWarning',
+            // self: this is a common python convention (but not a reserved word)
+            'self',
+            // other
+            'any', 'all'
+            ),
+
+        /*
+        ** Set 3: standard library
+        ** http://python.org/doc/current/lib/modindex.html
+        */
+        3 => array(
+            '__builtin__', '__future__', '__main__', '_winreg', 'aifc', 'AL', 'al', 'anydbm',
+            'array', 'asynchat', 'asyncore', 'atexit', 'audioop', 'base64', 'BaseHTTPServer',
+            'Bastion', 'binascii', 'binhex', 'bisect', 'bsddb', 'bz2', 'calendar', 'cd', 'cgi',
+            'CGIHTTPServer', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', 'codeop',
+            'collections', 'colorsys', 'commands', 'compileall', 'compiler',
+            'ConfigParser', 'Cookie', 'cookielib', 'copy', 'copy_reg', 'cPickle', 'crypt',
+            'cStringIO', 'csv', 'curses', 'datetime', 'dbhash', 'dbm', 'decimal', 'DEVICE',
+            'difflib', 'dircache', 'dis', 'distutils', 'dl', 'doctest', 'DocXMLRPCServer', 'dumbdbm',
+            'dummy_thread', 'dummy_threading', 'email', 'encodings', 'errno', 'exceptions', 'fcntl',
+            'filecmp', 'fileinput', 'FL', 'fl', 'flp', 'fm', 'fnmatch', 'formatter', 'fpectl',
+            'fpformat', 'ftplib', 'gc', 'gdbm', 'getopt', 'getpass', 'gettext', 'GL', 'gl', 'glob',
+            'gopherlib', 'grp', 'gzip', 'heapq', 'hmac', 'hotshot', 'htmlentitydefs', 'htmllib',
+            'HTMLParser', 'httplib', 'imageop', 'imaplib', 'imgfile', 'imghdr', 'imp', 'inspect',
+            'itertools', 'jpeg', 'keyword', 'linecache', 'locale', 'logging', 'mailbox', 'mailcap',
+            'marshal', 'math', 'md5', 'mhlib', 'mimetools', 'mimetypes', 'MimeWriter', 'mimify',
+            'mmap', 'msvcrt', 'multifile', 'mutex', 'netrc', 'new', 'nis', 'nntplib', 'operator',
+            'optparse', 'os', 'ossaudiodev', 'parser', 'pdb', 'pickle', 'pickletools', 'pipes',
+            'pkgutil', 'platform', 'popen2', 'poplib', 'posix', 'posixfile', 'pprint', 'profile',
+            'pstats', 'pty', 'pwd', 'py_compile', 'pyclbr', 'pydoc', 'Queue', 'quopri', 'random',
+            're', 'readline', 'repr', 'resource', 'rexec', 'rfc822', 'rgbimg', 'rlcompleter',
+            'robotparser', 'sched', 'ScrolledText', 'select', 'sets', 'sgmllib', 'sha', 'shelve',
+            'shlex', 'shutil', 'signal', 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'site', 'smtpd',
+            'smtplib', 'sndhdr', 'socket', 'SocketServer', 'stat', 'statcache', 'statvfs', 'string',
+            'StringIO', 'stringprep', 'struct', 'subprocess', 'sunau', 'SUNAUDIODEV', 'sunaudiodev',
+            'symbol', 'sys', 'syslog', 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios',
+            'test', 'textwrap', 'thread', 'threading', 'time', 'timeit', 'Tix', 'Tkinter', 'token',
+            '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',
+            // Python 3.0
+            'bytes', 'bytearray'
+            ),
+
+        /*
+        ** Set 4: special methods
+        ** http://python.org/doc/current/ref/specialnames.html
+        */
+        4 => array(
+            /*
+            // Iterator types: http://python.org/doc/current/lib/typeiter.html
+            '__iter__', 'next',
+            // String types: http://python.org/doc/current/lib/string-methods.html
+            'capitalize', 'center', 'count', 'decode', 'encode', 'endswith', 'expandtabs',
+            'find', 'index', 'isalnum', 'isalpha', 'isdigit', 'islower', 'isspace', 'istitle',
+            'isupper', 'join', 'ljust', 'lower', 'lstrip', 'replace', 'rfind', 'rindex', 'rjust',
+            'rsplit', 'rstrip', 'split', 'splitlines', 'startswith', 'strip', 'swapcase', 'title',
+            'translate', 'upper', 'zfill',
+            */
+            // Basic customization: http://python.org/doc/current/ref/customization.html
+            '__new__', '__init__', '__del__', '__repr__', '__str__',
+            '__lt__', '__le__', '__eq__', '__ne__', '__gt__', '__ge__', '__cmp__', '__rcmp__',
+            '__hash__', '__nonzero__', '__unicode__', '__dict__',
+            // Attribute access: http://python.org/doc/current/ref/attribute-access.html
+            '__setattr__', '__delattr__', '__getattr__', '__getattribute__', '__get__', '__set__',
+            '__delete__', '__slots__',
+            // Class creation, callable objects
+            '__metaclass__', '__call__',
+            // Container types: http://python.org/doc/current/ref/sequence-types.html
+            '__len__', '__getitem__', '__setitem__', '__delitem__', '__iter__', '__contains__',
+            '__getslice__', '__setslice__', '__delslice__',
+            // Numeric types: http://python.org/doc/current/ref/numeric-types.html
+            '__abs__','__add__','__and__','__coerce__','__div__','__divmod__','__float__',
+            '__hex__','__iadd__','__isub__','__imod__','__idiv__','__ipow__','__iand__',
+            '__ior__','__ixor__', '__ilshift__','__irshift__','__invert__','__int__',
+            '__long__','__lshift__',
+            '__mod__','__mul__','__neg__','__oct__','__or__','__pos__','__pow__',
+            '__radd__','__rdiv__','__rdivmod__','__rmod__','__rpow__','__rlshift__','__rrshift__',
+            '__rshift__','__rsub__','__rmul__','__rand__','__rxor__','__ror__',
+            '__sub__','__xor__'
+            )
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=', '!', '<=', '>=',             //·comparison·operators
+        '~', '@',                                   //·unary·operators
+        ';', ','                                    //·statement·separator
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
+            2 => 'color: #008000;',                        // Built-ins + self
+            3 => 'color: #dc143c;',                        // Standard lib
+            4 => 'color: #0000cd;'                        // Special methods
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        '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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/q.php b/sources/inc/geshi/q.php
new file mode 100644
index 0000000..ade9928
--- /dev/null
+++ b/sources/inc/geshi/q.php
@@ -0,0 +1,149 @@
+)
+ * -------------------------
+ *  - Fix the handling of single line comments
+ *
+ *************************************************************************************
+ *
+ *     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'                 => 'q/kdb+',
+    'COMMENT_SINGLE'            => array(1 => '//'),
+    'COMMENT_MULTI'             => array(),
+    'COMMENT_REGEXP'            => array(
+        2 => '/ \s\/.*/',         # This needs to get fixed up, since it won't catch some instances
+        # Multi line comments (Moved from REGEXPS)
+        3 => '/^\/\s*?\n.*?\n\\\s*?\n/smi'
+        ),
+    'CASE_KEYWORDS'             => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS'                => array('"'),
+    'ESCAPE_CHAR'               => '\\',
+    'OOLANG'                    => false,
+    'OBJECT_SPLITTERS'          => array(),
+    'STRICT_MODE_APPLIES'       => GESHI_NEVER,
+    'SCRIPT_DELIMITERS'         => array(),
+    'HIGHLIGHT_STRICT_BLOCK'    => array(),
+    'TAB_WIDTH'                 => 4,
+    'KEYWORDS' => array(
+        1 => array(
+            'abs', 'acos', 'all', 'and', 'any', 'asc', 'asin', 'asof', 'atan', 'attr', 'avg', 'avgs', 'bin', 'ceiling',
+            'cols', 'cor', 'cos', 'count', 'cov', 'cross', 'cut', 'deltas', 'desc', 'dev', 'differ', 'distinct',
+            'div', 'each', 'enlist', 'eval', 'except', 'exec', 'exit', 'exp', 'fills', 'first', 'flip', 'floor',
+            'fkeys', 'get', 'getenv', 'group', 'gtime', 'hclose', 'hcount', 'hdel', 'hopen', 'hsym', 'iasc', 'idesc',
+            'in', 'insert', 'inter', 'inv', 'joins', 'key', 'keys', 'last', 'like', 'load', 'log', 'lower',
+            'lsq', 'ltime', 'ltrim', 'mavg', 'max', 'maxs', 'mcount', 'md5', 'mdev', 'med', 'meta', 'min', 'mins',
+            'mmax', 'mmin', 'mmu', 'mod', 'msum', 'neg', 'next', 'not', 'null', 'or', 'over', 'parse', 'peach',
+            'plist', 'prd', 'prds', 'prev', 'rand', 'rank', 'ratios', 'raze', 'read0', 'read1', 'reciprocal',
+            'reverse', 'rload', 'rotate', 'rsave', 'rtrim', 'save', 'scan', 'set', 'setenv', 'show', 'signum',
+            'sin', 'sqrt', 'ss', 'ssr', 'string', 'sublist', 'sum', 'sums', 'sv', 'system', 'tables', 'tan', 'til', 'trim',
+            'txf', 'type', 'ungroup', 'union', 'upper', 'upsert', 'value', 'var', 'view', 'views', 'vs',
+            'wavg', 'within', 'wsum', 'xasc', 'xbar', 'xcol', 'xcols', 'xdesc', 'xexp', 'xgroup', 'xkey',
+            'xlog', 'xprev', 'xrank'
+            ),
+        # kdb database template keywords
+        2 => array(
+            'aj', 'by', 'delete', 'fby', 'from', 'ij', 'lj', 'pj', 'select', 'uj', 'update', 'where', 'wj',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '?', '#', ',', '_', '@', '.', '^', '~', '$', '!', '\\', '\\', '/:', '\:', "'", "':", '::', '+', '-', '%', '*'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000099; font-weight: bold;',
+            2 => 'color: #009900; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; 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: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #990000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            2   => 'color: #999900;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'REGEXPS' => array(
+        # Symbols
+        2 => '`[^\s"]*',
+        ),
+    'URLS'  => array(
+        1   => '',
+        2   => '',
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/qbasic.php b/sources/inc/geshi/qbasic.php
new file mode 100644
index 0000000..3345e3c
--- /dev/null
+++ b/sources/inc/geshi/qbasic.php
@@ -0,0 +1,162 @@
+ 'QBasic/QuickBASIC',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Single-Line Comments using REM command
+        2 => "/\bREM.*?$/i",
+        //Line numbers
+        3 => "/^\s*\d+/im"
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'NUMBERS' =>
+        GESHI_NUMBER_INT_BASIC | GESHI_NUMBER_FLT_NONSCI |
+        GESHI_NUMBER_FLT_NONSCI_F | GESHI_NUMBER_FLT_SCI_SHORT |
+        GESHI_NUMBER_FLT_SCI_ZERO,
+    'KEYWORDS' => array(
+        1 => array(
+            'DO', 'LOOP', 'WHILE', 'WEND', 'THEN', 'ELSE', 'ELSEIF', 'IF',
+            'FOR', 'TO', 'NEXT', 'STEP', 'GOTO', 'GOSUB', 'CALL', 'CALLS',
+            'SUB', 'FUNCTION', 'RETURN', 'RESUME', 'SELECT', 'CASE', 'UNTIL'
+            ),
+        3 => array(
+            'ABS', 'ABSOLUTE', 'ACCESS', 'ALIAS', 'AND', 'ANY', 'APPEND', 'AS', 'ASC', 'ATN',
+            'BASE', 'BEEP', 'BINARY', 'BLOAD', 'BSAVE', 'BYVAL',
+            'CDBL', 'CDECL', 'CHAIN', 'CHDIR', 'CHR$', 'CINT', 'CIRCLE', 'CLEAR',
+            'CLNG', 'CLOSE', 'CLS', 'COM', 'COMMAND$', 'COMMON', 'CONST', 'COS', 'CSNG',
+            'CSRLIN', 'CVD', 'CVDMBF', 'CVI', 'CVL', 'CVS', 'CVSMDF', 'DATA', 'DATE$',
+            'DECLARE', 'DEF', 'FN', 'SEG', 'DEFDBL', 'DEFINT', 'DEFLNG', 'DEFSNG', 'DEFSTR',
+            'DIM', 'DOUBLE', 'DRAW', 'END', 'ENVIRON', 'ENVIRON$', 'EOF', 'EQV', 'ERASE',
+            'ERDEV', 'ERDEV$', 'ERL', 'ERR', 'ERROR', 'EXIT', 'EXP', 'FIELD', 'FILEATTR',
+            'FILES', 'FIX', 'FRE', 'FREEFILE', 'GET', 'HEX$', 'IMP', 'INKEY$',
+            'INP', 'INPUT', 'INPUT$', 'INSTR', 'INT', 'INTEGER', 'IOCTL', 'IOCTL$', 'IS',
+            'KEY', 'KILL', 'LBOUND', 'LCASE$', 'LEFT$', 'LEN', 'LET', 'LINE', 'LIST', 'LOC',
+            'LOCAL', 'LOCATE', 'LOCK', 'LOF', 'LOG', 'LONG', 'LPOS', 'LPRINT',
+            'LSET', 'LTRIM$', 'MID$', 'MKD$', 'MKDIR', 'MKDMBF$', 'MKI$', 'MKL$',
+            'MKS$', 'MKSMBF$', 'MOD', 'NAME', 'NOT', 'OCT$', 'OFF', 'ON', 'PEN', 'PLAY',
+            'OPEN', 'OPTION', 'OR', 'OUT', 'OUTPUT',
+            'PAINT', 'PALETTE', 'PCOPY', 'PEEK', 'PMAP', 'POINT', 'POKE', 'POS', 'PRESET',
+            'PRINT', 'PSET', 'PUT', 'RANDOM', 'RANDOMIZE', 'READ', 'REDIM', 'RESET',
+            'RESTORE', 'RIGHT$', 'RMDIR', 'RND', 'RSET', 'RTRIM$', 'RUN', 'SADD', 'SCREEN',
+            'SEEK', 'SETMEM', 'SGN', 'SHARED', 'SHELL', 'SIGNAL', 'SIN', 'SINGLE', 'SLEEP',
+            'SOUND', 'SPACE$', 'SPC', 'SQR', 'STATIC', 'STICK', 'STOP', 'STR$', 'STRIG',
+            'STRING', 'STRING$', 'SWAP', 'SYSTEM', 'TAB', 'TAN', 'TIME$', 'TIMER',
+            'TROFF', 'TRON', 'TYPE', 'UBOUND', 'UCASE$', 'UEVENT', 'UNLOCK', 'USING', 'VAL',
+            'VARPTR', 'VARPTR$', 'VARSEG', 'VIEW', 'WAIT', 'WIDTH', 'WINDOW', 'WRITE', 'XOR'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', ',', '+', '-', '*', '/', '=', '<', '>', '^'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #a1a100;',
+            3 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;',
+            3 => 'color: #8080C0;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #cc66cc;',
+            2 => 'color: #339933;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        3 => 'http://www.qbasicnews.com/qboho/qck{FNAMEL}.shtml'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        1 => '&(?:H[0-9a-fA-F]+|O[0-7]+)(?!\w)',
+        2 => '#[0-9]+(?!\w)'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/rails.php b/sources/inc/geshi/rails.php
new file mode 100644
index 0000000..65ddee8
--- /dev/null
+++ b/sources/inc/geshi/rails.php
@@ -0,0 +1,406 @@
+ 'Rails',
+    'COMMENT_SINGLE' => array(1 => "#"),
+    'COMMENT_MULTI' => array("=begin" => "=end"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '`','\''),
+    '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'
+            ),
+        2 => array(
+            '__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'
+            ),
+        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',
+            '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',
+            'assert_equal', 'assert_not_equal', 'before_filter',
+            'after_filter', 'render', 'redirect_to', 'hide_action',
+            'render_to_string', 'url_for', 'controller_name',
+            'controller_class_name', 'controller_path', 'session',
+            'render_component', 'render_component_as_string', 'cookie',
+            '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', 'scaffold', 'send_data',
+            'send_file', 'deliver', 'receive', 'error_messages_for',
+            'error_message_on', 'form', 'input', 'stylesheet_link_tag',
+            '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',
+            'options_from_collection_for_select', 'file_field_tag',
+            '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',
+            'submit_to_remote', 'remote_function', 'observe_form',
+            'observe_field', 'remote_form_for', 'options_for_ajax', 'alert',
+            'call', 'assign', 'show', 'hide', 'insert_html', 'sortable',
+            'toggle', 'visual_effect', 'replace', 'replace_html', 'remove',
+            'save', 'save!', 'draggable', 'drop_receiving', 'literal',
+            'draggable_element', 'drop_receiving_element', 'sortable_element',
+            'content_tag', 'tag', 'link_to_image', 'link_to_if',
+            'link_to_unless', 'mail_to', 'link_image_to', 'button_to',
+            'current_page?', 'act_as_list', 'act_as_nested', 'act_as_tree',
+            'has_many', 'has_one', 'belongs_to', 'has_many_and_belogns_to',
+            'delete', 'destroy', 'destroy_all', 'clone', 'deep_clone', 'copy',
+            'update', 'table_name', 'primary_key', 'sum', 'maximun', 'minimum',
+            'count', 'size', 'after_save', 'after_create', 'before_save',
+            'before_create', 'add_to_base', 'errors', 'add', 'validate',
+            '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,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#9966CC; font-weight:bold;',
+            2 => 'color:#0000FF; font-weight:bold;',
+            3 => 'color:#CC0066; font-weight:bold;',
+            4 => 'color:#CC00FF; font-weight:bold;',
+            5 => 'color:#5A0A0A; 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(
+            0 => 'color:#ff6633; font-weight:bold;',
+            1 => 'color:#0066ff; font-weight:bold;',
+            2 => 'color:#6666ff; font-weight:bold;',
+            3 => 'color:#ff3333; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*", //Static OOP References
+        3 => array(
+            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/rebol.php b/sources/inc/geshi/rebol.php
new file mode 100644
index 0000000..ea86c21
--- /dev/null
+++ b/sources/inc/geshi/rebol.php
@@ -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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/reg.php b/sources/inc/geshi/reg.php
new file mode 100644
index 0000000..157b2bd
--- /dev/null
+++ b/sources/inc/geshi/reg.php
@@ -0,0 +1,233 @@
+ 'Microsoft Registry',
+    'COMMENT_SINGLE' => array(1 =>';'),
+    'COMMENT_MULTI' => array( ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+//        1 => array(),
+//        2 => array(),
+        /* Registry Key Constants Not Used */
+        3 => array(
+            'HKEY_LOCAL_MACHINE',
+            'HKEY_CLASSES_ROOT',
+            'HKEY_CURRENT_USER',
+            'HKEY_USERS',
+            'HKEY_CURRENT_CONFIG',
+            'HKEY_DYN_DATA',
+            'HKLM', 'HKCR', 'HKCU', 'HKU', 'HKCC', 'HKDD'
+            )
+        ),
+    'SYMBOLS' => array(
+        '='
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+//        1 => false,
+//        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+//            1 => 'color: #00CCFF;',
+//            2 => 'color: #0000FF;',
+            3 => 'color: #800000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #009900;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #009900;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #00CCFF;',
+            1 => 'color: #0000FF;',
+            2 => '',
+            3 => 'color: #0000FF;',
+            4 => 'color: #0000FF;',
+            5 => '',
+            6 => '',
+            7 => '',
+            8 => 'color: #FF6600;',
+            )
+        ),
+    'URLS' => array(
+//        1 => '',
+//        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        // Highlight Key Delimiters
+        0 => array(
+            GESHI_SEARCH => '((^|\\n)\\s*)(\\\\\\[(.*)\\\\\\])(\\s*(\\n|$))',
+            GESHI_REPLACE => '\\3',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\5'
+//            GESHI_CLASS => 'kw1'
+            ),
+        // Highlight File Format Header Version 5
+        1 => array(
+            GESHI_SEARCH => '(^\s*)(Windows Registry Editor Version \d+\.\d+)(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_registry_header'
+            ),
+        // Highlight File Format Header Version 4
+        2 => array(
+            GESHI_SEARCH => '(^\\s*)(REGEDIT\s?\d+)(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_registry_header'
+            ),
+        // Highlight dword: 32 bit integer values
+        3 => array(
+            GESHI_SEARCH => '(=\s*)(dword:[0-9a-fA-F]{8})(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+//            GESHI_CLASS => 'kw2'
+            ),
+        // Highlight variable names
+        4 => array(
+            GESHI_SEARCH => '(^\s*)(\".*?\")(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_variable'
+            ),
+        // Highlight String Values
+        5 => array(
+            GESHI_SEARCH => '(=\s*)(\".*?\")(\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'st0'
+            ),
+        // Highlight Hexadecimal Values (Single-Line and Multi-Line)
+        6 => array(
+            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',
+            GESHI_AFTER => '',
+            GESHI_CLASS => 'kw2'
+            ),
+        // Highlight Default Variable
+        7 => array(
+            GESHI_SEARCH => '(^\s*)(@)(\s*=)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3',
+            GESHI_CLASS => 'geshi_variable'
+            ),
+        // Highlight GUID's found anywhere.
+        8 => array(
+            GESHI_SEARCH => '(\{[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\})',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            GESHI_CLASS => 'geshi_guid'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER,
+        )
+    )
+);
+
+?>
diff --git a/sources/inc/geshi/rexx.php b/sources/inc/geshi/rexx.php
new file mode 100644
index 0000000..b3cb932
--- /dev/null
+++ b/sources/inc/geshi/rexx.php
@@ -0,0 +1,162 @@
+ 'rexx',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'address', 'arg', 'attribute', 'call', 'constant', 'do',
+            'drop', 'exit', 'forward', 'if',
+            'interpret', 'iterate', 'leave', 'loop', 'nop', 'numeric',
+            'options', 'parse', 'procedure', 'pull', 'push', 'queue',
+            'raise', 'return', 'say', 'select', 'signal', 'trace'
+            ),
+        2 => array(
+            'by', 'digits', 'engineering', 'error', 'expose',
+            'failure', 'for', 'forever', 'form', 'fuzz', 'halt',
+            'name', 'novalue', 'off', 'on', 'over', 'scientific', 'source',
+            'syntax', 'to', 'until', 'upper', 'version',
+            'while', 'with'
+            ),
+        3 => array(
+            'else', 'end', 'otherwise', 'then', 'when'
+            ),
+        4 => array(
+            'rc', 'result', 'sigl'
+            ),
+        5 => array(
+            'placeholderforoorexxdirectives'
+            ),
+        6 => array(
+            'abbrev', 'abs', 'beep', 'bitand', 'bitor',
+            'bitxor', 'b2x', 'center', 'centre', 'changestr', 'charin',
+            'charout', 'chars', 'compare', 'condition', 'copies',
+            'countstr', 'c2d', 'c2x', 'datatype', 'date', 'delstr',
+            'delword', 'directory', 'd2c', 'd2x', 'endlocal',
+            'errortext', 'filespec', 'format', 'insert',
+            'lastpos', 'left', 'length', 'linein', 'lineout', 'lines',
+            'lower', 'max', 'min', 'overlay', 'pos', 'queued', 'random',
+            'reverse', 'right', 'rxfuncadd', 'rxfuncdrop', 'rxfuncquery',
+            'rxqueue', 'setlocal', 'sign', 'sourceline', 'space',
+            'stream', 'strip', 'substr', 'subword', 'symbol', 'time',
+            'translate', 'trunc', 'userid', 'value',
+            'var', 'verify', 'word', 'wordindex', 'wordlength', 'wordpos',
+            'words', 'xrange', 'x2b', 'x2c', 'x2d'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '<', '>', '=', '+', '-', '*', '**', '/', '|', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => true,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #ff0000; font-weight: bold;',
+            3 => 'color: #00ff00; font-weight: bold;',
+            4 => 'color: #0000ff; font-weight: bold;',
+            5 => 'color: #880088; font-weight: bold;',
+            6 => 'color: #888800; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            'MULTI' => 'color: #808080;'
+            ),
+        '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: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/robots.php b/sources/inc/geshi/robots.php
new file mode 100644
index 0000000..0b75f71
--- /dev/null
+++ b/sources/inc/geshi/robots.php
@@ -0,0 +1,100 @@
+ 'robots.txt',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(1 => "/^Comment:.*?/m"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'Allow', 'Crawl-delay', 'Disallow', 'Request-rate', 'Robot-version',
+            'Sitemap', 'User-agent', 'Visit-time'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        '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(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://www.robotstxt.org/wc/norobots.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/rpmspec.php b/sources/inc/geshi/rpmspec.php
new file mode 100644
index 0000000..fd6a561
--- /dev/null
+++ b/sources/inc/geshi/rpmspec.php
@@ -0,0 +1,133 @@
+ 'RPM Specification File',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'QUOTEMARKS' => array('"','`'),
+    'ESCAPE_CHAR' => '\\',
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        '<', '>', '=',
+        '!', '@', '~', '&', '|', '^',
+        '+','-', '*', '/', '%',
+        ',', ';', '?', '.', ':'
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        '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: #ff0000;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;',
+            2 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #009999;',
+            3 => 'color: #000000; font-weight: bold;',
+            4 => 'color: #ff6600; font-style: italic;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'REGEXPS' => array(
+        1 => array(
+            // search for generic macros
+            GESHI_SEARCH => '(%{?[a-zA-Z0-9_]+}?)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        2 => array(
+            // search for special macros
+            GESHI_SEARCH => '(%(?:define|patch\d*|mklibname|mkrel|configure\S+|makeinstall\S+|make_session|make|defattr|config|doc|setup))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        3 => array (
+            // special definitions
+            GESHI_SEARCH => '((?:summary|license|buildroot|buildrequires|provides|version|release|source\d*|group|buildarch|autoreqprov|provides|obsoletes|vendor|distribution|suggests|autoreq|autoprov|conflicts|name|url|requires|patch\d*):)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        4 => array (
+            // section delimiting words
+            GESHI_SEARCH => '(%(?:description|package|prep|build|install|clean|postun|preun|post|pre|files|changelog))',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '',
+            ),
+        ),
+    'URLS' => array(),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/rsplus.php b/sources/inc/geshi/rsplus.php
new file mode 100644
index 0000000..e8a4e72
--- /dev/null
+++ b/sources/inc/geshi/rsplus.php
@@ -0,0 +1,483 @@
+ 'R / S+',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'else','global','in', 'otherwise','persistent',
+            ),
+        2 => array( // base package
+            '$.package_version', '$<-', '$<-.data.frame', 'abbreviate', 'abs', 'acos', 'acosh', 'addNA', 'addTaskCallback',
+            'agrep', 'alist', 'all', 'all.equal', 'all.equal.character', 'all.equal.default', 'all.equal.factor',
+            'all.equal.formula', 'all.equal.language', 'all.equal.list', 'all.equal.numeric', 'all.equal.POSIXct',
+            'all.equal.raw', 'all.names', 'all.vars', 'any', 'aperm', 'append', 'apply', 'Arg', 'args', 'array', 'as.array',
+            'as.array.default', 'as.call', 'as.character', 'as.character.condition', 'as.character.Date', 'as.character.default',
+            'as.character.error', 'as.character.factor', 'as.character.hexmode', 'as.character.numeric_version', 'as.character.octmode',
+            'as.character.POSIXt', 'as.character.srcref', 'as.complex', 'as.data.frame', 'as.data.frame.array', 'as.data.frame.AsIs',
+            'as.data.frame.character', 'as.data.frame.complex', 'as.data.frame.data.frame', 'as.data.frame.Date', 'as.data.frame.default',
+            'as.data.frame.difftime', 'as.data.frame.factor', 'as.data.frame.integer', 'as.data.frame.list', 'as.data.frame.logical',
+            'as.data.frame.matrix', 'as.data.frame.model.matrix', 'as.data.frame.numeric', 'as.data.frame.numeric_version',
+            'as.data.frame.ordered', 'as.data.frame.POSIXct', 'as.data.frame.POSIXlt', 'as.data.frame.raw', 'as.data.frame.table',
+            'as.data.frame.ts', 'as.data.frame.vector', 'as.Date', 'as.Date.character', 'as.Date.date', 'as.Date.dates',
+            'as.Date.default', 'as.Date.factor', 'as.Date.numeric', 'as.Date.POSIXct', 'as.Date.POSIXlt', 'as.difftime', 'as.double',
+            'as.double.difftime', 'as.double.POSIXlt', 'as.environment', 'as.expression', 'as.expression.default', 'as.factor',
+            'as.function', 'as.function.default', 'as.hexmode', 'as.integer', 'as.list', 'as.list.data.frame', 'as.list.default',
+            'as.list.environment', 'as.list.factor', 'as.list.function', 'as.list.numeric_version', 'as.logical', 'as.matrix',
+            'as.matrix.data.frame', 'as.matrix.default', 'as.matrix.noquote', 'as.matrix.POSIXlt', 'as.name', 'as.null', 'as.null.default',
+            'as.numeric', 'as.numeric_version', 'as.octmode', 'as.ordered', 'as.package_version', 'as.pairlist', 'as.POSIXct',
+            'as.POSIXct.date', 'as.POSIXct.Date', 'as.POSIXct.dates', 'as.POSIXct.default', 'as.POSIXct.numeric', 'as.POSIXct.POSIXlt',
+            'as.POSIXlt', 'as.POSIXlt.character', 'as.POSIXlt.date', 'as.POSIXlt.Date', 'as.POSIXlt.dates', 'as.POSIXlt.default',
+            'as.POSIXlt.factor', 'as.POSIXlt.numeric', 'as.POSIXlt.POSIXct', 'as.qr', 'as.raw', 'as.real', 'as.single',
+            'as.single.default', 'as.symbol', 'as.table', 'as.table.default', 'as.vector', 'as.vector.factor', 'asin', 'asinh',
+            'asNamespace', 'asS4', 'assign', 'atan', 'atan2', 'atanh', 'attach', 'attachNamespace', 'attr', 'attr.all.equal',
+            'attr<-', 'attributes', 'attributes<-', 'autoload', 'autoloader', 'backsolve', 'baseenv', 'basename', 'besselI',
+            'besselJ', 'besselK', 'besselY', 'beta', 'bindingIsActive', 'bindingIsLocked', 'bindtextdomain', 'body', 'body<-',
+            'bquote', 'break', 'browser', 'builtins', 'by', 'by.data.frame', 'by.default', 'bzfile', 'c', 'c.Date', 'c.noquote',
+            'c.numeric_version', 'c.POSIXct', 'c.POSIXlt', 'call', 'callCC', 'capabilities', 'casefold', 'cat', 'category',
+            'cbind', 'cbind.data.frame', 'ceiling', 'char.expand', 'character', 'charmatch', 'charToRaw', 'chartr', 'check_tzones',
+            'chol', 'chol.default', 'chol2inv', 'choose', 'class', 'class<-', 'close', 'close.connection', 'close.srcfile',
+            'closeAllConnections', 'codes', 'codes.factor', 'codes.ordered', 'codes<-', 'col', 'colMeans', 'colnames',
+            'colnames<-', 'colSums', 'commandArgs', 'comment', 'comment<-', 'complex', 'computeRestarts', 'conditionCall',
+            'conditionCall.condition', 'conditionMessage', 'conditionMessage.condition', 'conflicts', 'Conj', 'contributors',
+            'cos', 'cosh', 'crossprod', 'Cstack_info', 'cummax', 'cummin', 'cumprod', 'cumsum', 'cut', 'cut.Date', 'cut.default',
+            'cut.POSIXt', 'data.class', 'data.frame', 'data.matrix', 'date', 'debug', 'default.stringsAsFactors', 'delay',
+            'delayedAssign', 'deparse', 'det', 'detach', 'determinant', 'determinant.matrix', 'dget', 'diag', 'diag<-', 'diff',
+            'diff.Date', 'diff.default', 'diff.POSIXt', 'difftime', 'digamma', 'dim', 'dim.data.frame', 'dim<-', 'dimnames',
+            'dimnames.data.frame', 'dimnames<-', 'dimnames<-.data.frame', 'dir', 'dir.create', 'dirname', 'do.call', 'double',
+            'dput', 'dQuote', 'drop', 'dump', 'duplicated', 'duplicated.array', 'duplicated.data.frame', 'duplicated.default',
+            'duplicated.matrix', 'duplicated.numeric_version', 'duplicated.POSIXlt', 'dyn.load', 'dyn.unload', 'eapply', 'eigen',
+            'emptyenv', 'encodeString', 'Encoding', 'Encoding<-', 'env.profile', 'environment', 'environment<-', 'environmentIsLocked',
+            'environmentName', 'eval', 'eval.parent', 'evalq', 'exists', 'exp', 'expand.grid', 'expm1', 'expression', 'F', 'factor',
+            'factorial', 'fifo', 'file', 'file.access', 'file.append', 'file.choose', 'file.copy', 'file.create', 'file.exists',
+            'file.info', 'file.path', 'file.remove', 'file.rename', 'file.show', 'file.symlink', 'Filter', 'Find', 'findInterval',
+            'findPackageEnv', 'findRestart', 'floor', 'flush', 'flush.connection', 'for', 'force', 'formals', 'formals<-',
+            'format', 'format.AsIs', 'format.char', 'format.data.frame', 'format.Date', 'format.default', 'format.difftime',
+            'format.factor', 'format.hexmode', 'format.info', 'format.octmode', 'format.POSIXct', 'format.POSIXlt',
+            'format.pval', 'formatC', 'formatDL', 'forwardsolve', 'function', 'gamma', 'gammaCody', 'gc', 'gc.time',
+            'gcinfo', 'gctorture', 'get', 'getAllConnections', 'getCallingDLL', 'getCallingDLLe', 'getCConverterDescriptions',
+            'getCConverterStatus', 'getConnection', 'getDLLRegisteredRoutines', 'getDLLRegisteredRoutines.character',
+            'getDLLRegisteredRoutines.DLLInfo', 'getenv', 'geterrmessage', 'getExportedValue', 'getHook', 'getLoadedDLLs',
+            'getNamespace', 'getNamespaceExports', 'getNamespaceImports', 'getNamespaceInfo', 'getNamespaceName',
+            'getNamespaceUsers', 'getNamespaceVersion', 'getNativeSymbolInfo', 'getNumCConverters', 'getOption', 'getRversion',
+            'getSrcLines', 'getTaskCallbackNames', 'gettext', 'gettextf', 'getwd', 'gl', 'globalenv', 'gregexpr', 'grep',
+            'grepl', 'gsub', 'gzcon', 'gzfile', 'httpclient', 'I', 'iconv', 'iconvlist', 'icuSetCollate', 'identical', 'identity',
+            'if', 'ifelse', 'Im', 'importIntoEnv', 'inherits', 'integer', 'interaction', 'interactive', 'intersect', 'intToBits',
+            'intToUtf8', 'inverse.rle', 'invisible', 'invokeRestart', 'invokeRestartInteractively', 'is.array', 'is.atomic',
+            'is.call', 'is.character', 'is.complex', 'is.data.frame', 'is.double', 'is.element', 'is.environment',
+            'is.expression', 'is.factor', 'is.finite', 'is.function', 'is.infinite', 'is.integer', 'is.language',
+            'is.list', 'is.loaded', 'is.logical', 'is.matrix', 'is.na', 'is.na.data.frame', 'is.na.POSIXlt', 'is.na<-',
+            'is.na<-.default', 'is.na<-.factor', 'is.name', 'is.nan', 'is.null', 'is.numeric', 'is.numeric_version',
+            'is.numeric.Date', 'is.numeric.POSIXt', 'is.object', 'is.ordered', 'is.package_version', 'is.pairlist', 'is.primitive',
+            'is.qr', 'is.R', 'is.raw', 'is.real', 'is.recursive', 'is.single', 'is.symbol', 'is.table', 'is.unsorted', 'is.vector',
+            'isBaseNamespace', 'isdebugged', 'isIncomplete', 'isNamespace', 'ISOdate', 'ISOdatetime', 'isOpen', 'isRestart', 'isS4',
+            'isSeekable', 'isSymmetric', 'isSymmetric.matrix', 'isTRUE', 'jitter', 'julian', 'julian.Date', 'julian.POSIXt', 'kappa',
+            'kappa.default', 'kappa.lm', 'kappa.qr', 'kappa.tri', 'kronecker', 'l10n_info', 'La.chol', 'La.chol2inv', 'La.eigen',
+            'La.svd', 'labels', 'labels.default', 'lapply', 'lazyLoad', 'lazyLoadDBfetch', 'lbeta', 'lchoose', 'length', 'length<-',
+            'length<-.factor', 'letters', 'LETTERS', 'levels', 'levels.default', 'levels<-', 'levels<-.factor', 'lfactorial', 'lgamma',
+            'library', 'library.dynam', 'library.dynam.unload', 'licence', 'license', 'list', 'list.files', 'load', 'loadedNamespaces',
+            'loadingNamespaceInfo', 'loadNamespace', 'loadURL', 'local', 'lockBinding', 'lockEnvironment', 'log', 'log10', 'log1p', 'log2',
+            'logb', 'logical', 'lower.tri', 'ls', 'machine', 'Machine', 'make.names', 'make.unique', 'makeActiveBinding', 'manglePackageName',
+            'Map', 'mapply', 'margin.table', 'mat.or.vec', 'match', 'match.arg', 'match.call', 'match.fun', 'Math.data.frame', 'Math.Date',
+            'Math.difftime', 'Math.factor', 'Math.POSIXt', 'matrix', 'max', 'max.col', 'mean', 'mean.data.frame', 'mean.Date', 'mean.default',
+            'mean.difftime', 'mean.POSIXct', 'mean.POSIXlt', 'mem.limits', 'memory.profile', 'merge', 'merge.data.frame', 'merge.default',
+            'message', 'mget', 'min', 'missing', 'Mod', 'mode', 'mode<-', 'month.abb', 'month.name', 'months', 'months.Date',
+            'months.POSIXt', 'mostattributes<-', 'names', 'names<-', 'namespaceExport', 'namespaceImport', 'namespaceImportClasses',
+            'namespaceImportFrom', 'namespaceImportMethods', 'nargs', 'nchar', 'ncol', 'NCOL', 'Negate', 'new.env', 'next', 'NextMethod',
+            'ngettext', 'nlevels', 'noquote', 'nrow', 'NROW', 'numeric', 'numeric_version', 'nzchar', 'objects', 'oldClass',
+            'oldClass<-', 'on.exit', 'open', 'open.connection', 'open.srcfile', 'open.srcfilecopy', 'Ops.data.frame', 'Ops.Date',
+            'Ops.difftime', 'Ops.factor', 'Ops.numeric_version', 'Ops.ordered', 'Ops.POSIXt', 'options', 'order', 'ordered',
+            'outer', 'package_version', 'package.description', 'packageEvent', 'packageHasNamespace', 'packageStartupMessage',
+            'packBits', 'pairlist', 'parent.env', 'parent.env<-', 'parent.frame', 'parse', 'parse.dcf', 'parseNamespaceFile',
+            'paste', 'path.expand', 'pentagamma', 'pi', 'pipe', 'Platform', 'pmatch', 'pmax', 'pmax.int', 'pmin', 'pmin.int',
+            'polyroot', 'pos.to.env', 'Position', 'pretty', 'prettyNum', 'print', 'print.AsIs', 'print.atomic', 'print.by',
+            'print.condition', 'print.connection', 'print.data.frame', 'print.Date', 'print.default', 'print.difftime',
+            'print.DLLInfo', 'print.DLLInfoList', 'print.DLLRegisteredRoutines', 'print.factor', 'print.hexmode', 'print.libraryIQR',
+            'print.listof', 'print.NativeRoutineList', 'print.noquote', 'print.numeric_version', 'print.octmode', 'print.packageInfo',
+            'print.POSIXct', 'print.POSIXlt', 'print.proc_time', 'print.restart', 'print.rle', 'print.simple.list',
+            'print.srcfile', 'print.srcref', 'print.summary.table', 'print.table', 'print.warnings', 'printNoClass',
+            'prmatrix', 'proc.time', 'prod', 'prop.table', 'provide', 'psigamma', 'pushBack', 'pushBackLength', 'q', 'qr',
+            'qr.coef', 'qr.default', 'qr.fitted', 'qr.Q', 'qr.qty', 'qr.qy', 'qr.R', 'qr.resid', 'qr.solve', 'qr.X', 'quarters',
+            'quarters.Date', 'quarters.POSIXt', 'quit', 'quote', 'R_system_version', 'R.home', 'R.version', 'R.Version',
+            'R.version.string', 'range', 'range.default', 'rank', 'rapply', 'raw', 'rawConnection', 'rawConnectionValue',
+            'rawShift', 'rawToBits', 'rawToChar', 'rbind', 'rbind.data.frame', 'rcond', 'Re', 'read.dcf', 'read.table.url',
+            'readBin', 'readChar', 'readline', 'readLines', 'real', 'Recall', 'Reduce', 'reg.finalizer', 'regexpr',
+            'registerS3method', 'registerS3methods', 'remove', 'removeCConverter', 'removeTaskCallback', 'rep', 'rep.Date',
+            'rep.factor', 'rep.int', 'rep.numeric_version', 'rep.POSIXct', 'rep.POSIXlt', 'repeat', 'replace', 'replicate',
+            'require', 'restart', 'restartDescription', 'restartFormals', 'retracemem', 'return', 'rev', 'rev.default', 'rle',
+            'rm', 'RNGkind', 'RNGversion', 'round', 'round.Date', 'round.difftime', 'round.POSIXt', 'row', 'row.names',
+            'row.names.data.frame', 'row.names.default', 'row.names<-', 'row.names<-.data.frame', 'row.names<-.default',
+            'rowMeans', 'rownames', 'rownames<-', 'rowsum', 'rowsum.data.frame', 'rowsum.default', 'rowSums', 'sample',
+            'sample.int', 'sapply', 'save', 'save.image', 'saveNamespaceImage', 'scale', 'scale.default', 'scan', 'scan.url',
+            'search', 'searchpaths', 'seek', 'seek.connection', 'seq', 'seq_along', 'seq_len', 'seq.Date', 'seq.default',
+            'seq.int', 'seq.POSIXt', 'sequence', 'serialize', 'set.seed', 'setCConverterStatus', 'setdiff', 'setequal',
+            'setHook', 'setNamespaceInfo', 'setSessionTimeLimit', 'setTimeLimit', 'setwd', 'showConnections', 'shQuote',
+            'sign', 'signalCondition', 'signif', 'simpleCondition', 'simpleError', 'simpleMessage', 'simpleWarning', 'sin',
+            'single', 'sinh', 'sink', 'sink.number', 'slice.index', 'socketConnection', 'socketSelect', 'solve', 'solve.default',
+            'solve.qr', 'sort', 'sort.default', 'sort.int', 'sort.list', 'sort.POSIXlt', 'source', 'source.url', 'split',
+            'split.data.frame', 'split.Date', 'split.default', 'split.POSIXct', 'split<-', 'split<-.data.frame', 'split<-.default',
+            'sprintf', 'sqrt', 'sQuote', 'srcfile', 'srcfilecopy', 'srcref', 'standardGeneric', 'stderr', 'stdin', 'stdout',
+            'stop', 'stopifnot', 'storage.mode', 'storage.mode<-', 'strftime', 'strptime', 'strsplit', 'strtrim', 'structure',
+            'strwrap', 'sub', 'subset', 'subset.data.frame', 'subset.default', 'subset.matrix', 'substitute', 'substr',
+            'substr<-', 'substring', 'substring<-', 'sum', 'summary', 'summary.connection', 'summary.data.frame',
+            'Summary.data.frame', 'summary.Date', 'Summary.Date', 'summary.default', 'Summary.difftime',
+            'summary.factor', 'Summary.factor', 'summary.matrix', 'Summary.numeric_version', 'summary.POSIXct',
+            'Summary.POSIXct', 'summary.POSIXlt', 'Summary.POSIXlt', 'summary.table', 'suppressMessages',
+            'suppressPackageStartupMessages', 'suppressWarnings', 'svd', 'sweep', 'switch', 'symbol.C',
+            'symbol.For', 'sys.call', 'sys.calls', 'Sys.chmod', 'Sys.Date', 'sys.frame', 'sys.frames',
+            'sys.function', 'Sys.getenv', 'Sys.getlocale', 'Sys.getpid', 'Sys.glob', 'Sys.info', 'sys.load.image',
+            'Sys.localeconv', 'sys.nframe', 'sys.on.exit', 'sys.parent', 'sys.parents', 'Sys.putenv',
+            'sys.save.image', 'Sys.setenv', 'Sys.setlocale', 'Sys.sleep', 'sys.source', 'sys.status',
+            'Sys.time', 'Sys.timezone', 'Sys.umask', 'Sys.unsetenv', 'Sys.which', 'system', 'system.file',
+            'system.time', 't', 'T', 't.data.frame', 't.default', 'table', 'tabulate', 'tan', 'tanh', 'tapply',
+            'taskCallbackManager', 'tcrossprod', 'tempdir', 'tempfile', 'testPlatformEquivalence', 'tetragamma',
+            'textConnection', 'textConnectionValue', 'tolower', 'topenv', 'toString', 'toString.default', 'toupper',
+            'trace', 'traceback', 'tracemem', 'tracingState', 'transform', 'transform.data.frame', 'transform.default',
+            'trigamma', 'trunc', 'trunc.Date', 'trunc.POSIXt', 'truncate', 'truncate.connection', 'try', 'tryCatch',
+            'typeof', 'unclass', 'undebug', 'union', 'unique', 'unique.array', 'unique.data.frame', 'unique.default',
+            'unique.matrix', 'unique.numeric_version', 'unique.POSIXlt', 'units', 'units.difftime', 'units<-',
+            'units<-.difftime', 'unix', 'unix.time', 'unlink', 'unlist', 'unloadNamespace', 'unlockBinding',
+            'unname', 'unserialize', 'unsplit', 'untrace', 'untracemem', 'unz', 'upper.tri', 'url', 'UseMethod',
+            'utf8ToInt', 'vector', 'Vectorize', 'version', 'Version', 'warning', 'warnings', 'weekdays',
+            'weekdays.Date', 'weekdays.POSIXt', 'which', 'which.max', 'which.min', 'while', 'with',
+            'with.default', 'withCallingHandlers', 'within', 'within.data.frame', 'within.list', 'withRestarts',
+            'withVisible', 'write', 'write.dcf', 'write.table0', 'writeBin', 'writeChar', 'writeLines', 'xor',
+            'xpdrows.data.frame', 'xtfrm', 'xtfrm.Date', 'xtfrm.default', 'xtfrm.factor', 'xtfrm.numeric_version',
+            'xtfrm.POSIXct', 'xtfrm.POSIXlt', 'xtfrm.Surv', 'zapsmall',
+            ),
+        3 => array( // Datasets
+            'ability.cov', 'airmiles', 'AirPassengers', 'airquality',
+            'anscombe', 'attenu', 'attitude', 'austres', 'beaver1',
+            'beaver2', 'BJsales', 'BJsales.lead', 'BOD', 'cars',
+            'ChickWeight', 'chickwts', 'co2', 'crimtab',
+            'discoveries', 'DNase', 'esoph', 'euro', 'euro.cross',
+            'eurodist', 'EuStockMarkets', 'faithful', 'fdeaths',
+            'Formaldehyde', 'freeny', 'freeny.x', 'freeny.y',
+            'HairEyeColor', 'Harman23.cor', 'Harman74.cor', 'Indometh',
+            'infert', 'InsectSprays', 'iris', 'iris3', 'islands',
+            'JohnsonJohnson', 'LakeHuron', 'ldeaths', 'lh', 'LifeCycleSavings',
+            'Loblolly', 'longley', 'lynx', 'mdeaths', 'morley', 'mtcars',
+            'nhtemp', 'Nile', 'nottem', 'occupationalStatus', 'Orange',
+            'OrchardSprays', 'PlantGrowth', 'precip', 'presidents',
+            'pressure', 'Puromycin', 'quakes', 'randu', 'rivers', 'rock',
+            'Seatbelts', 'sleep', 'stack.loss', 'stack.x', 'stackloss',
+            'state.abb', 'state.area', 'state.center', 'state.division',
+            'state.name', 'state.region', 'state.x77', 'sunspot.month',
+            'sunspot.year', 'sunspots', 'swiss', 'Theoph', 'Titanic', 'ToothGrowth',
+            'treering', 'trees', 'UCBAdmissions', 'UKDriverDeaths', 'UKgas',
+            'USAccDeaths', 'USArrests', 'USJudgeRatings', 'USPersonalExpenditure',
+            'uspop', 'VADeaths', 'volcano', 'warpbreaks', 'women', 'WorldPhones',
+            'WWWusage',
+            ),
+        4 => array( // graphics package
+            'abline', 'arrows', 'assocplot', 'axis', 'Axis', 'axis.Date', 'axis.POSIXct',
+            'axTicks', 'barplot', 'barplot.default', 'box', 'boxplot', 'boxplot.default',
+            'boxplot.matrix', 'bxp', 'cdplot', 'clip', 'close.screen', 'co.intervals',
+            'contour', 'contour.default', 'coplot', 'curve', 'dotchart', 'erase.screen',
+            'filled.contour', 'fourfoldplot', 'frame', 'grconvertX', 'grconvertY', 'grid',
+            'hist', 'hist.default', 'identify', 'image', 'image.default', 'layout',
+            'layout.show', 'lcm', 'legend', 'lines', 'lines.default', 'locator', 'matlines',
+            'matplot', 'matpoints', 'mosaicplot', 'mtext', 'pairs', 'pairs.default',
+            'panel.smooth', 'par', 'persp', 'pie', 'piechart', 'plot', 'plot.default',
+            'plot.design', 'plot.new', 'plot.window', 'plot.xy', 'points', 'points.default',
+            'polygon', 'rect', 'rug', 'screen', 'segments', 'smoothScatter', 'spineplot',
+            'split.screen', 'stars', 'stem', 'strheight', 'stripchart', 'strwidth', 'sunflowerplot',
+            'symbols', 'text', 'text.default', 'title', 'xinch', 'xspline', 'xyinch', 'yinch',
+            ),
+        5 => array( // grDevices pkg
+            'as.graphicsAnnot', 'bitmap', 'blues9', 'bmp', 'boxplot.stats', 'cairo_pdf', 'cairo_ps', 'check.options',
+            'chull', 'CIDFont', 'cm', 'cm.colors', 'col2rgb', 'colorConverter', 'colorRamp', 'colorRampPalette',
+            'colors', 'colorspaces', 'colours', 'contourLines', 'convertColor', 'densCols', 'dev.control', 'dev.copy',
+            'dev.copy2eps', 'dev.copy2pdf', 'dev.cur', 'dev.interactive', 'dev.list', 'dev.new', 'dev.next', 'dev.off',
+            'dev.prev', 'dev.print', 'dev.set', 'dev.size', 'dev2bitmap', 'devAskNewPage', 'deviceIsInteractive',
+            'embedFonts', 'extendrange', 'getGraphicsEvent', 'graphics.off', 'gray', 'gray.colors', 'grey', 'grey.colors',
+            'hcl', 'heat.colors', 'Hershey', 'hsv', 'jpeg', 'make.rgb', 'n2mfrow', 'nclass.FD', 'nclass.scott',
+            'nclass.Sturges', 'palette', 'pdf', 'pdf.options', 'pdfFonts', 'pictex', 'png', 'postscript', 'postscriptFont',
+            'postscriptFonts', 'ps.options', 'quartz', 'quartz.options', 'quartzFont', 'quartzFonts', 'rainbow',
+            'recordGraphics', 'recordPlot', 'replayPlot', 'rgb', 'rgb2hsv', 'savePlot', 'setEPS', 'setPS', 'svg',
+            'terrain.colors', 'tiff', 'topo.colors', 'trans3d', 'Type1Font', 'x11', 'X11', 'X11.options', 'X11Font',
+            'X11Fonts', 'xfig', 'xy.coords', 'xyTable', 'xyz.coords',
+            ),
+        6 => array( // methods package
+            'addNextMethod', 'allGenerics', 'allNames', 'Arith', 'as', 'as<-',
+            'asMethodDefinition', 'assignClassDef', 'assignMethodsMetaData', 'balanceMethodsList',
+            'cacheGenericsMetaData', 'cacheMetaData', 'cacheMethod', 'callGeneric',
+            'callNextMethod', 'canCoerce', 'cbind2', 'checkSlotAssignment', 'classesToAM',
+            'classMetaName', 'coerce', 'coerce<-', 'Compare', 'completeClassDefinition',
+            'completeExtends', 'completeSubclasses', 'Complex', 'conformMethod', 'defaultDumpName',
+            'defaultPrototype', 'doPrimitiveMethod', 'dumpMethod', 'dumpMethods', 'el', 'el<-',
+            'elNamed', 'elNamed<-', 'empty.dump', 'emptyMethodsList', 'existsFunction', 'existsMethod',
+            'extends', 'finalDefaultMethod', 'findClass', 'findFunction', 'findMethod', 'findMethods',
+            'findMethodSignatures', 'findUnique', 'fixPre1.8', 'formalArgs', 'functionBody',
+            'functionBody<-', 'generic.skeleton', 'getAccess', 'getAllMethods', 'getAllSuperClasses',
+            'getClass', 'getClassDef', 'getClasses', 'getClassName', 'getClassPackage', 'getDataPart',
+            'getExtends', 'getFunction', 'getGeneric', 'getGenerics', 'getGroup', 'getGroupMembers',
+            'getMethod', 'getMethods', 'getMethodsForDispatch', 'getMethodsMetaData', 'getPackageName',
+            'getProperties', 'getPrototype', 'getSlots', 'getSubclasses', 'getValidity', 'getVirtual',
+            'hasArg', 'hasMethod', 'hasMethods', 'implicitGeneric', 'initialize', 'insertMethod', 'is',
+            'isClass', 'isClassDef', 'isClassUnion', 'isGeneric', 'isGrammarSymbol', 'isGroup',
+            'isSealedClass', 'isSealedMethod', 'isVirtualClass', 'isXS3Class', 'languageEl', 'languageEl<-',
+            'linearizeMlist', 'listFromMethods', 'listFromMlist', 'loadMethod', 'Logic',
+            'makeClassRepresentation', 'makeExtends', 'makeGeneric', 'makeMethodsList',
+            'makePrototypeFromClassDef', 'makeStandardGeneric', 'matchSignature', 'Math', 'Math2', 'mergeMethods',
+            'metaNameUndo', 'method.skeleton', 'MethodAddCoerce', 'methodSignatureMatrix', 'MethodsList',
+            'MethodsListSelect', 'methodsPackageMetaName', 'missingArg', 'mlistMetaName', 'new', 'newBasic',
+            'newClassRepresentation', 'newEmptyObject', 'Ops', 'packageSlot', 'packageSlot<-', 'possibleExtends',
+            'prohibitGeneric', 'promptClass', 'promptMethods', 'prototype', 'Quote', 'rbind2',
+            'reconcilePropertiesAndPrototype', 'registerImplicitGenerics', 'rematchDefinition',
+            'removeClass', 'removeGeneric', 'removeMethod', 'removeMethods', 'removeMethodsObject', 'representation',
+            'requireMethods', 'resetClass', 'resetGeneric', 'S3Class', 'S3Class<-', 'S3Part', 'S3Part<-', 'sealClass',
+            'seemsS4Object', 'selectMethod', 'selectSuperClasses', 'sessionData', 'setAs', 'setClass', 'setClassUnion',
+            'setDataPart', 'setGeneric', 'setGenericImplicit', 'setGroupGeneric', 'setIs', 'setMethod', 'setOldClass',
+            'setPackageName', 'setPrimitiveMethods', 'setReplaceMethod', 'setValidity', 'show', 'showClass', 'showDefault',
+            'showExtends', 'showMethods', 'showMlist', 'signature', 'SignatureMethod', 'sigToEnv', 'slot', 'slot<-',
+            'slotNames', 'slotsFromS3', 'substituteDirect', 'substituteFunctionArgs', 'Summary', 'superClassDepth',
+            'testInheritedMethods', 'testVirtual', 'traceOff', 'traceOn', 'tryNew', 'trySilent', 'unRematchDefinition',
+            'validObject', 'validSlotNames',
+            ),
+        7 => array( // stats pkg
+            'acf', 'acf2AR', 'add.scope', 'add1', 'addmargins', 'aggregate',
+            'aggregate.data.frame', 'aggregate.default', 'aggregate.ts', 'AIC',
+            'alias', 'anova', 'anova.glm', 'anova.glmlist', 'anova.lm', 'anova.lmlist',
+            'anova.mlm', 'anovalist.lm', 'ansari.test', 'aov', 'approx', 'approxfun',
+            'ar', 'ar.burg', 'ar.mle', 'ar.ols', 'ar.yw', 'arima', 'arima.sim',
+            'arima0', 'arima0.diag', 'ARMAacf', 'ARMAtoMA', 'as.dendrogram', 'as.dist',
+            'as.formula', 'as.hclust', 'as.stepfun', 'as.ts', 'asOneSidedFormula', 'ave',
+            'bandwidth.kernel', 'bartlett.test', 'binom.test', 'binomial', 'biplot',
+            'Box.test', 'bw.bcv', 'bw.nrd', 'bw.nrd0', 'bw.SJ', 'bw.ucv', 'C', 'cancor',
+            'case.names', 'ccf', 'chisq.test', 'clearNames', 'cmdscale', 'coef', 'coefficients',
+            'complete.cases', 'confint', 'confint.default', 'constrOptim', 'contr.helmert',
+            'contr.poly', 'contr.SAS', 'contr.sum', 'contr.treatment', 'contrasts', 'contrasts<-',
+            'convolve', 'cooks.distance', 'cophenetic', 'cor', 'cor.test', 'cov', 'cov.wt',
+            'cov2cor', 'covratio', 'cpgram', 'cutree', 'cycle', 'D', 'dbeta', 'dbinom', 'dcauchy',
+            'dchisq', 'decompose', 'delete.response', 'deltat', 'dendrapply', 'density', 'density.default',
+            'deriv', 'deriv.default', 'deriv.formula', 'deriv3', 'deriv3.default', 'deriv3.formula',
+            'deviance', 'dexp', 'df', 'df.kernel', 'df.residual', 'dfbeta', 'dfbetas', 'dffits',
+            'dgamma', 'dgeom', 'dhyper', 'diff.ts', 'diffinv', 'dist', 'dlnorm', 'dlogis',
+            'dmultinom', 'dnbinom', 'dnorm', 'dpois', 'drop.scope', 'drop.terms', 'drop1',
+            'dsignrank', 'dt', 'dummy.coef', 'dunif', 'dweibull', 'dwilcox', 'ecdf', 'eff.aovlist',
+            'effects', 'embed', 'end', 'estVar', 'expand.model.frame', 'extractAIC', 'factanal',
+            'factor.scope', 'family', 'fft', 'filter', 'fisher.test', 'fitted', 'fitted.values',
+            'fivenum', 'fligner.test', 'formula', 'frequency', 'friedman.test', 'ftable', 'Gamma',
+            'gaussian', 'get_all_vars', 'getInitial', 'glm', 'glm.control', 'glm.fit', 'glm.fit.null',
+            'hasTsp', 'hat', 'hatvalues', 'hatvalues.lm', 'hclust', 'heatmap', 'HoltWinters', 'influence',
+            'influence.measures', 'integrate', 'interaction.plot', 'inverse.gaussian', 'IQR',
+            'is.empty.model', 'is.leaf', 'is.mts', 'is.stepfun', 'is.ts', 'is.tskernel', 'isoreg',
+            'KalmanForecast', 'KalmanLike', 'KalmanRun', 'KalmanSmooth', 'kernapply', 'kernel', 'kmeans',
+            'knots', 'kruskal.test', 'ks.test', 'ksmooth', 'lag', 'lag.plot', 'line', 'lines.ts', 'lm',
+            'lm.fit', 'lm.fit.null', 'lm.influence', 'lm.wfit', 'lm.wfit.null', 'loadings', 'loess',
+            'loess.control', 'loess.smooth', 'logLik', 'loglin', 'lowess', 'ls.diag', 'ls.print', 'lsfit',
+            'mad', 'mahalanobis', 'make.link', 'makeARIMA', 'makepredictcall', 'manova', 'mantelhaen.test',
+            'mauchley.test', 'mauchly.test', 'mcnemar.test', 'median', 'median.default', 'medpolish',
+            'model.extract', 'model.frame', 'model.frame.aovlist', 'model.frame.default', 'model.frame.glm',
+            'model.frame.lm', 'model.matrix', 'model.matrix.default', 'model.matrix.lm', 'model.offset',
+            'model.response', 'model.tables', 'model.weights', 'monthplot', 'mood.test', 'mvfft', 'na.action',
+            'na.contiguous', 'na.exclude', 'na.fail', 'na.omit', 'na.pass', 'napredict', 'naprint', 'naresid',
+            'nextn', 'nlm', 'nlminb', 'nls', 'nls.control', 'NLSstAsymptotic', 'NLSstClosestX', 'NLSstLfAsymptote',
+            'NLSstRtAsymptote', 'numericDeriv', 'offset', 'oneway.test', 'optim', 'optimise', 'optimize',
+            'order.dendrogram', 'p.adjust', 'p.adjust.methods', 'pacf', 'pairwise.prop.test', 'pairwise.t.test',
+            'pairwise.table', 'pairwise.wilcox.test', 'pbeta', 'pbinom', 'pbirthday', 'pcauchy', 'pchisq', 'pexp',
+            'pf', 'pgamma', 'pgeom', 'phyper', 'plclust', 'plnorm', 'plogis', 'plot.density', 'plot.ecdf', 'plot.lm',
+            'plot.mlm', 'plot.spec', 'plot.spec.coherency', 'plot.spec.phase', 'plot.stepfun', 'plot.ts', 'plot.TukeyHSD',
+            'pnbinom', 'pnorm', 'poisson', 'poisson.test', 'poly', 'polym', 'power', 'power.anova.test', 'power.prop.test',
+            'power.t.test', 'PP.test', 'ppoints', 'ppois', 'ppr', 'prcomp', 'predict', 'predict.glm', 'predict.lm',
+            'predict.mlm', 'predict.poly', 'preplot', 'princomp', 'print.anova', 'print.coefmat', 'print.density',
+            'print.family', 'print.formula', 'print.ftable', 'print.glm', 'print.infl', 'print.integrate', 'print.lm',
+            'print.logLik', 'print.terms', 'print.ts', 'printCoefmat', 'profile', 'proj', 'promax', 'prop.test',
+            'prop.trend.test', 'psignrank', 'pt', 'ptukey', 'punif', 'pweibull', 'pwilcox', 'qbeta', 'qbinom',
+            'qbirthday', 'qcauchy', 'qchisq', 'qexp', 'qf', 'qgamma', 'qgeom', 'qhyper', 'qlnorm', 'qlogis',
+            'qnbinom', 'qnorm', 'qpois', 'qqline', 'qqnorm', 'qqnorm.default', 'qqplot', 'qsignrank', 'qt',
+            'qtukey', 'quade.test', 'quantile', 'quantile.default', 'quasi', 'quasibinomial', 'quasipoisson',
+            'qunif', 'qweibull', 'qwilcox', 'r2dtable', 'rbeta', 'rbinom', 'rcauchy', 'rchisq', 'read.ftable',
+            'rect.hclust', 'reformulate', 'relevel', 'reorder', 'replications', 'reshape', 'reshapeLong', 'reshapeWide',
+            'resid', 'residuals', 'residuals.default', 'residuals.glm', 'residuals.lm', 'rexp', 'rf', 'rgamma', 'rgeom',
+            'rhyper', 'rlnorm', 'rlogis', 'rmultinom', 'rnbinom', 'rnorm', 'rpois', 'rsignrank', 'rstandard', 'rstandard.glm',
+            'rstandard.lm', 'rstudent', 'rstudent.glm', 'rstudent.lm', 'rt', 'runif', 'runmed', 'rweibull', 'rwilcox',
+            'scatter.smooth', 'screeplot', 'sd', 'se.contrast', 'selfStart', 'setNames', 'shapiro.test', 'simulate',
+            'smooth', 'smooth.spline', 'smoothEnds', 'sortedXyData', 'spec.ar', 'spec.pgram', 'spec.taper', 'spectrum',
+            'spline', 'splinefun', 'splinefunH', 'SSasymp', 'SSasympOff', 'SSasympOrig', 'SSbiexp', 'SSD', 'SSfol',
+            'SSfpl', 'SSgompertz', 'SSlogis', 'SSmicmen', 'SSweibull', 'start', 'stat.anova', 'step', 'stepfun', 'stl',
+            'StructTS', 'summary.aov', 'summary.aovlist', 'summary.glm', 'summary.infl', 'summary.lm', 'summary.manova',
+            'summary.mlm', 'summary.stepfun', 'supsmu', 'symnum', 't.test', 'termplot', 'terms', 'terms.aovlist',
+            'terms.default', 'terms.formula', 'terms.terms', 'time', 'toeplitz', 'ts', 'ts.intersect', 'ts.plot',
+            'ts.union', 'tsdiag', 'tsp', 'tsp<-', 'tsSmooth', 'TukeyHSD', 'TukeyHSD.aov', 'uniroot', 'update',
+            'update.default', 'update.formula', 'var', 'var.test', 'variable.names', 'varimax', 'vcov', 'weighted.mean',
+            'weighted.residuals', 'weights', 'wilcox.test', 'window', 'window<-', 'write.ftable', 'xtabs',
+            ),
+        8 => array( // utils pkg
+            'alarm', 'apropos', 'argsAnywhere', 'as.person', 'as.personList', 'as.relistable', 'as.roman',
+            'assignInNamespace', 'available.packages', 'browseEnv', 'browseURL', 'browseVignettes', 'bug.report',
+            'capture.output', 'checkCRAN', 'chooseCRANmirror', 'citation', 'citEntry', 'citFooter', 'citHeader',
+            'close.socket', 'combn', 'compareVersion', 'contrib.url', 'count.fields', 'CRAN.packages', 'data',
+            'data.entry', 'dataentry', 'de', 'de.ncols', 'de.restore', 'de.setup', 'debugger', 'demo', 'download.file',
+            'download.packages', 'dump.frames', 'edit', 'emacs', 'example', 'file_test', 'file.edit', 'find', 'fix',
+            'fixInNamespace', 'flush.console', 'formatOL', 'formatUL', 'getAnywhere', 'getCRANmirrors', 'getFromNamespace',
+            'getS3method', 'getTxtProgressBar', 'glob2rx', 'head', 'head.matrix', 'help', 'help.request', 'help.search',
+            'help.start', 'history', 'index.search', 'install.packages', 'installed.packages', 'is.relistable',
+            'limitedLabels', 'loadhistory', 'localeToCharset', 'ls.str', 'lsf.str', 'make.packages.html', 'make.socket',
+            'makeRweaveLatexCodeRunner', 'memory.limit', 'memory.size', 'menu', 'methods', 'mirror2html', 'modifyList',
+            'new.packages', 'normalizePath', 'nsl', 'object.size', 'old.packages', 'package.contents', 'package.skeleton',
+            'packageDescription', 'packageStatus', 'page', 'person', 'personList', 'pico', 'prompt', 'promptData',
+            'promptPackage', 'rc.getOption', 'rc.options', 'rc.settings', 'rc.status', 'read.csv', 'read.csv2', 'read.delim',
+            'read.delim2', 'read.DIF', 'read.fortran', 'read.fwf', 'read.socket', 'read.table', 'readCitationFile', 'recover',
+            'relist', 'remove.packages', 'Rprof', 'Rprofmem', 'RShowDoc', 'RSiteSearch', 'rtags', 'Rtangle', 'RtangleSetup',
+            'RtangleWritedoc', 'RweaveChunkPrefix', 'RweaveEvalWithOpt', 'RweaveLatex', 'RweaveLatexFinish', 'RweaveLatexOptions',
+            'RweaveLatexSetup', 'RweaveLatexWritedoc', 'RweaveTryStop', 'savehistory', 'select.list', 'sessionInfo',
+            'setRepositories', 'setTxtProgressBar', 'stack', 'Stangle', 'str', 'strOptions', 'summaryRprof', 'Sweave',
+            'SweaveHooks', 'SweaveSyntaxLatex', 'SweaveSyntaxNoweb', 'SweaveSyntConv', 'tail', 'tail.matrix', 'timestamp',
+            'toBibtex', 'toLatex', 'txtProgressBar', 'type.convert', 'unstack', 'unzip', 'update.packages', 'update.packageStatus',
+            'upgrade', 'url.show', 'URLdecode', 'URLencode', 'vi', 'View', 'vignette', 'write.csv', 'write.csv2', 'write.socket',
+            'write.table', 'wsbrowser', 'xedit', 'xemacs', 'zip.file.extract',
+            ),
+        ),
+    '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; font-weight: bold;',
+            2 => 'color: #0000FF; font-weight: bold;',
+            3 => 'color: #CC9900; font-weight: bold;',
+            4 => 'color: #0000FF; font-weight: bold;',
+            5 => 'color: #0000FF; font-weight: bold;',
+            6 => 'color: #0000FF; font-weight: bold;',
+            7 => 'color: #0000FF; font-weight: bold;',
+            8 => 'color: #0000FF; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #228B22;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:#A020F0;'
+            ),
+        'SCRIPT' => array(
+            0 => ''            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => 'http://stat.ethz.ch/R-manual/R-devel/library/base/html/{FNAME}.html', // Base Package
+        3 => 'http://stat.ethz.ch/R-manual/R-devel/library/datasets/html/{FNAME}.html', // Datasets
+        4 => 'http://stat.ethz.ch/R-manual/R-devel/library/graphics/html/{FNAME}.html', // Graphics Package
+        5 => 'http://stat.ethz.ch/R-manual/R-devel/library/grDevices/html/{FNAME}.html', // grDevices
+        6 => 'http://stat.ethz.ch/R-manual/R-devel/library/methods/html/{FNAME}.html', // methods
+        7 => 'http://stat.ethz.ch/R-manual/R-devel/library/stats/html/{FNAME}.html', // stats
+        8 => 'http://stat.ethz.ch/R-manual/R-devel/library/utils/html/{FNAME}.html' // utils
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => "([^\w])'([^\\n\\r']*)'",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => "\\1'",
+            GESHI_AFTER => "'"
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^&\\.])(? "(?![a-zA-Z0-9_\|%\\-&;\\.])"
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/ruby.php b/sources/inc/geshi/ruby.php
new file mode 100644
index 0000000..f6eb1b1
--- /dev/null
+++ b/sources/inc/geshi/ruby.php
@@ -0,0 +1,231 @@
+ 'Ruby',
+    'COMMENT_SINGLE' => array(1 => "#"),
+    'COMMENT_MULTI' => array("=begin" => "=end"),
+    'COMMENT_REGEXP' => array(
+        //Heredoc
+        4 => '/<<\s*?(\w+)\\n.*?\\n\\1(?![a-zA-Z0-9])/si',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '`','\''),
+    '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', 'include'
+            ),
+        2 => array(
+                '__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'
+            ),
+        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',
+                'HTML::Selector', 'HashWithIndifferentAccess', 'Inflector',
+                'Inflector::Inflections', 'Mime', 'Mime::Type',
+                'OCI8AutoRecover', 'TimeZone', 'XmlSimple'
+            ),
+        ),
+    '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:#CC0066; font-weight:bold;',
+            4 => 'color:#CC00FF; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+            4 => 'color: #cc0000; 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(
+            0 => 'color:#ff6633; font-weight:bold;',
+            1 => 'color:#0066ff; font-weight:bold;',
+            2 => 'color:#6666ff; font-weight:bold;',
+            3 => 'color:#ff3333; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array(//Variables
+            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(//Arrays
+            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*",//Static OOP symbols
+        3 => array(
+            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/sas.php b/sources/inc/geshi/sas.php
new file mode 100644
index 0000000..dbf95a1
--- /dev/null
+++ b/sources/inc/geshi/sas.php
@@ -0,0 +1,290 @@
+ 'SAS',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('/*' => '*/', '*' => ';'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '_ALL_','_CHARACTER_','_INFILE_','_N_','_NULL_','_NUMERIC_',
+            '_WEBOUT_'
+            ),
+        2 => array(
+            '%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',
+            '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','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'
+            ),
+        6 => array(
+            'RUN','QUIT','DATA'
+            ),
+        7 => array(
+            'ERROR'
+            ),
+        8 => array(
+            'WARNING'
+            ),
+        9 => array(
+            'NOTE'
+            )
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #0000ff;',
+            5 => 'color: #0000ff;',
+            6 => 'color: #000080; font-weight: bold;',
+            7 => 'color: #ff0000;',
+            8 => 'color: #00ff00;',
+            9 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+//            1 => 'color: #006400; font-style: italic;',
+            'MULTI' => 'color: #006400; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a020f0;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #2e8b57; font-weight: bold;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff; font-weight: bold;',
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #006400; font-style: italic;',
+            3 => 'color: #006400; font-style: italic;',
+            4 => 'color: #006400; font-style: italic;',
+            5 => 'color: #ff0000; font-weight: bold;',
+            6 => 'color: #00ff00; font-style: italic;',
+            7 => 'color: #0000ff; font-style: normal;',
+            8 => 'color: #b218b2; font-weight: bold;',
+            9 => 'color: #b218b2; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => '',
+        9 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => "&[a-zA-Z_][a-zA-Z0-9_]*",
+        1 => array(//Procedures
+            GESHI_SEARCH => '(^\\s*)(PROC \\w+)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => '(^\\s*)(\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '(.*;\\s*)(\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        4 => array(
+            GESHI_SEARCH => '(^\\s*)(%\\*.*;)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        5 => array(//Error messages
+            GESHI_SEARCH => '(^ERROR.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        6 => array(//Warning messages
+            GESHI_SEARCH => '(^WARNING.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        7 => array(//Notice messages
+            GESHI_SEARCH => '(^NOTE.*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'im',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        8 => array(
+            GESHI_SEARCH => '(^\\s*)(CARDS.*)(^\\s*;\\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'sim',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+        9 => array(
+            GESHI_SEARCH => '(^\\s*)(DATALINES.*)(^\\s*;\\s*$)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'sim',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/scala.php b/sources/inc/geshi/scala.php
new file mode 100644
index 0000000..405f59d
--- /dev/null
+++ b/sources/inc/geshi/scala.php
@@ -0,0 +1,138 @@
+ 'Scala',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(2 => "/\\'(?!\w\\'|\\\\)\w+(?=\s)/"),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'",'"'),
+    'ESCAPE_CHAR' => '\\',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[nfrtv\$\"\n\\\\]#i",
+        //Hexadecimal Char Specs
+        2 => "#\\\\x[\da-fA-F]{1,2}#i",
+        //Hexadecimal Char Specs (unicode)
+        3 => "#\\\\u[\da-fA-F]{1,4}#",
+        //Hexadecimal Char Specs (Extended Unicode)
+        4 => "#\\\\U[\da-fA-F]{1,8}#",
+        ),
+    'KEYWORDS' => array(
+        1 => array(
+            'abstract', 'case', 'catch', 'class', 'def',
+            'do', 'else', 'extends', 'false', 'final',
+            'finally', 'for', 'forSome', 'if', 'implicit',
+            'import', 'match', 'new', 'null', 'object',
+            'override', 'package', 'private', 'protected', 'requires',
+            'return', 'sealed', 'super', 'this', 'throw',
+            'trait', 'try', 'true', 'type', 'val',
+            'var', 'while', 'with', 'yield'
+            ),
+        2 => array(
+            'void', 'double', 'int', 'boolean', 'byte', 'short', 'long', 'char', 'float'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '*', '&', '%', '!', ';', '<', '>', '?',
+        '_', ':', '=', '=>', '<<:',
+        '<%', '>:', '#', '@'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight: bold;',
+            2 => 'color: #9999cc; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #CC66FF;',
+            'MULTI' => 'color: #00ff00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #6666ff; font-weight: bold;',
+            1 => 'color: #6666ff; font-weight: bold;',
+            2 => 'color: #5555ff; font-weight: bold;',
+            3 => 'color: #4444ff; font-weight: bold;',
+            4 => 'color: #3333ff; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #F78811;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #6666FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #F78811;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;',
+            2 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000080;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://scala-lang.org',
+        2 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/scheme.php b/sources/inc/geshi/scheme.php
new file mode 100644
index 0000000..a84b908
--- /dev/null
+++ b/sources/inc/geshi/scheme.php
@@ -0,0 +1,170 @@
+ 'Scheme',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array('#|' => '|#'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'abs', 'acos', 'and', 'angle', 'append', 'appply', 'approximate',
+            'asin', 'assoc', 'assq', 'assv', 'atan',
+
+            'begin', 'boolean?', 'bound-identifier=?',
+
+            'caar', 'caddr', 'cadr', 'call-with-current-continuation',
+            'call-with-input-file', 'call-with-output-file', 'call/cc', 'car',
+            'case', 'catch', 'cdddar', 'cddddr', 'cdr', 'ceiling', 'char->integer',
+            'char-alphabetic?', 'char-ci<=?', 'char-ci=?',
+            'char-ci>?', 'char-ci=?', 'char-downcase', 'char-lower-case?',
+            'char-numeric', 'char-ready', 'char-ready?', 'char-upcase',
+            'char-upper-case?', 'char-whitespace?', 'char<=?', 'char=?', 'char>?', 'char?', 'close-input-port', 'close-output-port',
+            'complex?', 'cond', 'cons', 'construct-identifier', 'cos',
+            'current-input-port', 'current-output-port',
+
+            'd', 'define', 'define-syntax', 'delay', 'denominator', 'display', 'do',
+
+            'e', 'eof-object?', 'eq?', 'equal?', 'eqv?', 'even?', 'exact->inexact',
+            'exact?', 'exp', 'expt', 'else',
+
+            'f', 'floor', 'for-each', 'force', 'free-identifer=?',
+
+            'gcd', 'gen-counter', 'gen-loser', 'generate-identifier',
+
+            'identifier->symbol', 'identifier', 'if', 'imag-part', 'inexact->exact',
+            'inexact?', 'input-port?', 'integer->char', 'integer?', 'integrate-system',
+
+            'l', 'lambda', 'last-pair', 'lcm', 'length', 'let', 'let*', 'letrec',
+            'list', 'list->string', 'list->vector', 'list-ref', 'list-tail', 'list?',
+            'load', 'log',
+
+            'magnitude', 'make-polar', 'make-promise', 'make-rectangular',
+            'make-string', 'make-vector', 'map', 'map-streams', 'max', 'member',
+            'memq', 'memv', 'min', 'modulo',
+
+            'negative', 'newline', 'nil', 'not', 'null?', 'number->string', 'number?',
+            'numerator',
+
+            'odd?', 'open-input-file', 'open-output-file', 'or', 'output-port',
+
+            'pair?', 'peek-char', 'positive?', 'procedure?',
+
+            'quasiquote', 'quote', 'quotient',
+
+            'rational', 'rationalize', 'read', 'read-char', 'real-part', 'real?',
+            'remainder', 'return', 'reverse',
+
+            's', 'sequence', 'set!', 'set-char!', 'set-cdr!', 'sin', 'sqrt', 'string',
+            'string->list', 'string->number', 'string->symbol', 'string-append',
+            'string-ci<=?', 'string-ci=?',
+            'string-ci>?', 'string-copy', 'string-fill!', 'string-length',
+            'string-ref', 'string-set!', 'string<=?', 'string=?', 'string>?', 'string?', 'substring', 'symbol->string',
+            'symbol?', 'syntax', 'syntax-rules',
+
+            't', 'tan', 'template', 'transcript-off', 'transcript-on', 'truncate',
+
+            'unquote', 'unquote-splicing', 'unwrap-syntax',
+
+            'vector', 'vector->list', 'vector-fill!', 'vector-length', 'vector-ref',
+            'vector-set!', 'vector?',
+
+            'with-input-from-file', 'with-output-to-file', 'write', 'write-char',
+
+            'zero?'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '!', '%', '^', '&', '/','+','-','*','=','<','>',';','|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => '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(
+            0 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/scilab.php b/sources/inc/geshi/scilab.php
new file mode 100644
index 0000000..f011497
--- /dev/null
+++ b/sources/inc/geshi/scilab.php
@@ -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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/sdlbasic.php b/sources/inc/geshi/sdlbasic.php
new file mode 100644
index 0000000..381161f
--- /dev/null
+++ b/sources/inc/geshi/sdlbasic.php
@@ -0,0 +1,165 @@
+ 'sdlBasic',
+    'COMMENT_SINGLE' => array(1 => "'", 2 => "rem", 3 => "!", 4 => "#"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'const', 'option', 'explicit', 'qbasic', 'include', 'argc',
+            'argv', 'command', 'command$', 'run', 'shell', 'os', 'declare',
+            'sub', 'function', 'return', 'while', 'wend', 'exit', 'end',
+            'continue', 'if', 'then', 'else', 'elseif',
+            'select', 'case', 'for', 'each', 'step',
+            'next', 'to', 'dim', 'shared', 'common', 'lbound', 'bound',
+            'erase', 'asc', 'chr', 'chr$', 'insert', 'insert$', 'instr', 'lcase',
+            'lcase$', 'left', 'left$', 'len', 'length', 'ltrim', 'ltrim$', 'mid',
+            'mid$', 'replace', 'replace$', 'replacesubstr', 'replacesubstr$',
+            'reverse', 'reverse$', 'right', 'right$', 'rinstr', 'rtrim', 'rtrim$',
+            'space', 'space$', 'str', 'str$', 'strf', 'strf$', 'string', 'string$',
+            'tally', 'trim', 'trim$', 'typeof', 'typeof$', 'ucase', 'ucase$', 'val',
+            'abs', 'acos', 'andbit', 'asin', 'atan', 'bitwiseand', 'bitwiseor',
+            'bitwisexor', 'cos', 'exp', 'fix', 'floor', 'frac', 'hex', 'hex$', 'int',
+            'log', 'min', 'max', 'orbit', 'randomize', 'rnd', 'round', 'sgn', 'sin',
+            'sqr', 'tan', 'xorbit', 'open', 'as', 'file', 'input', 'close', 'output',
+            'append', 'eof', 'fileexists', 'filecopy', 'filemove', 'filerename',
+            'freefile', 'kill', 'loc', 'lof', 'readbyte', 'rename', 'seek',
+            'writebyte', 'chdir', 'dir', 'dir$', 'direxists', 'dirfirst', 'dirnext',
+            'mkdir', 'rmdir', 'print', 'date', 'date$', 'time', 'time$', 'ticks',
+            'data', 'read', 'reservebank', 'freebank', 'copybank', 'loadbank',
+            'savebank', 'setbank', 'sizebank', 'poke', 'doke', 'loke', 'peek', 'deek',
+            'leek', 'memcopy', 'setdisplay', 'setcaption', 'caption', 'displaywidth',
+            'displayheight', 'displaybpp', 'screen', 'directscreen', 'screenopen',
+            'screenclose', 'screenclone', 'screencopy', 'screenfade', 'screenfadein',
+            'screencrossfade', 'screenalpha', 'screenlock', 'screenunlock',
+            'screenrect', 'xscreenrect', 'yscreenrect', 'wscreenrect', 'hscreenrect',
+            'flagscreenrect', 'screenwidth', 'screenheight', 'offset', 'xoffset',
+            'yoffset', 'cls', 'screenswap', 'autoback', 'setautoback',
+            'dualplayfield', 'waitvbl', 'fps', 'rgb', 'enablepalette', 'color',
+            'palette', 'colorcycling', 'ink', 'point', 'dot', 'plot', 'line', 'box',
+            'bar', 'circle', 'fillcircle', 'ellipse', 'fillellipse', 'paint',
+            'loadimage', 'saveimage', 'loadsound', 'savesound', 'loadmusic',
+            'hotspot', 'setcolorkey', 'imageexists', 'imagewidth', 'imageheight',
+            'deleteimage', 'copyimage', 'setalpha', 'zoomimage', 'rotateimage',
+            'rotozoomimage', 'blt', 'pastebob', 'pasteicon', 'grab', 'spriteclip',
+            'sprite', 'deletesprite', 'xsprite', 'ysprite', 'spritewidth',
+            'spriteheight', 'frsprite', 'livesprite', 'spritehit', 'autoupdatesprite',
+            'updatesprite', 'setbob', 'bob', 'deletebob', 'xbob', 'ybob', 'bobwidth',
+            'bobheight', 'frbob', 'livebob', 'bobhit', 'autoupdatebob', 'updatebob',
+            'text', 'setfont', 'textrender', 'pen', 'paper', 'prints', 'locate',
+            'atx', 'aty', 'curson', 'cursoff', 'inputs', 'zoneinputs',
+            'isenabledsound', 'soundexists', 'deletesound', 'copysound',
+            'musicexists', 'playsound', 'volumesound', 'stopsound', 'pausesound',
+            'resumesound', 'vumetersound', 'positionsound', 'soundchannels',
+            'playmusic', 'positionmusic', 'stopmusic', 'fademusic', 'pausemusic',
+            'resumemusic', 'rewindmusic', 'volumemusic', 'speedmusic', 'numdrivescd',
+            'namecd', 'getfreecd', 'opencd', 'indrivecd', 'trackscd', 'curtrackcd',
+            'curframecd', 'playcd', 'playtrackscd',
+            'pausecd', 'resumecd', 'stopcd', 'ejectcd', 'closecd', 'tracktypecd',
+            'tracklengthcd', 'trackoffsetcd', 'key', 'inkey', 'waitkey', 'xmouse',
+            'ymouse', 'xmousescreen', 'ymousescreen', 'bmouse', 'changemouse',
+            'locatemouse', 'mouseshow', 'mousehide', 'mousezone', 'numjoysticks',
+            'namejoystick', 'numaxesjoystick', 'numballsjoystick', 'numhatsjoystick',
+            'numbuttonsjoystick', 'getaxisjoystick', 'gethatjoystick',
+            'getbuttonjoystick', 'xgetballjoystick', 'ygetballjoystick', 'joy',
+            'bjoy', 'wait', 'timer', 'isenabledsock', 'getfreesock', 'opensock',
+            'acceptsock', 'isserverready', 'connectsock', 'connectionreadysock',
+            'isclientready', 'losesock', 'peeksock', 'readsock', 'readbytesock',
+            'readlinesock', 'writesock', 'writebytesock', 'writelinesock',
+            'getremoteip', 'getremoteport', 'getlocalip'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;',
+            2 => 'color: #808080;',
+            3 => 'color: #808080;',
+            4 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/smalltalk.php b/sources/inc/geshi/smalltalk.php
new file mode 100644
index 0000000..5b61bad
--- /dev/null
+++ b/sources/inc/geshi/smalltalk.php
@@ -0,0 +1,154 @@
+ 'Smalltalk',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('"' => '"'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'"),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'self','super','true','false','nil'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '=' , ':=', '(', ')', '#'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #7f007f;'
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #007f00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => ''
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #7f0000;'
+            ),
+        'METHODS' => array(
+            0 => ''
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;',
+            1 => 'color: #7f0000;',
+            2 => 'color: #7f0000;',
+            3 => 'color: #00007f;',
+            5 => 'color: #00007f;',
+            6 => 'color: #00007f;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(
+            GESHI_SEARCH => '([^a-zA-Z0-9_#<])([A-Z]+[a-zA-Z0-9_]*)(?!>)', //class names
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(
+            GESHI_SEARCH => '(#+)([a-zA-Z0-9_]+)', //symbols
+            GESHI_REPLACE => '\\1\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(
+            GESHI_SEARCH => '(#\s*\([^)]*\))', //array symbols
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        3 => array(
+            GESHI_SEARCH => '([a-zA-Z0-9_\s]+)', //temporary variables
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '|',
+            GESHI_AFTER => '|'
+            ),
+        5 => array(
+            GESHI_SEARCH => '([:(,=[.*\/+-]\s*(?!\d+\/))([a-zA-Z0-9_]+)', //message parameters, message receivers
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        6 => array(
+            GESHI_SEARCH => '([a-zA-Z0-9_]+)(\s*:=)', //assignment targets
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/smarty.php b/sources/inc/geshi/smarty.php
new file mode 100644
index 0000000..86e9d44
--- /dev/null
+++ b/sources/inc/geshi/smarty.php
@@ -0,0 +1,192 @@
+ 'Smarty',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array('{*' => '*}'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            '$smarty', 'now', 'const', 'capture', 'config', 'section', 'foreach', 'template', 'version', 'ldelim', 'rdelim',
+            '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',
+            'default', 'escape', 'indent', 'lower', 'nl2br', 'regex_replace', 'replace', 'spacify', 'string_format',
+            'strip', 'strip_tags', 'truncate', 'upper', 'wordwrap',
+            ),
+        3 => array(
+            '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'
+            ),
+        4 => array(
+            '$template_dir', '$compile_dir', '$config_dir', '$plugins_dir', '$debugging', '$debug_tpl',
+            '$debugging_ctrl', '$autoload_filters', '$compile_check', '$force_compile', '$caching', '$cache_dir',
+            '$cache_lifetime', '$cache_handler_func', '$cache_modified_check', '$config_overwrite',
+            '$config_booleanize', '$config_read_hidden', '$config_fix_newlines', '$default_template_handler_func',
+            '$php_handling', '$security', '$secure_dir', '$security_settings', '$trusted_dir', '$left_delimiter',
+            '$right_delimiter', '$compiler_class', '$request_vars_order', '$request_use_auto_globals',
+            '$error_reporting', '$compile_id', '$use_sub_dirs', '$default_modifiers', '$default_resource_type'
+            ),
+        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',
+            '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',
+            'unregister_compiler_function', 'unregister_function', 'unregister_modifier', 'unregister_object',
+            'unregister_outputfilter', 'unregister_postfilter', 'unregister_prefilter', 'unregister_resource'
+            ),
+        6 => array(
+            'name', 'file', 'scope', 'global', 'key', 'once', 'script',
+            'loop', 'start', 'step', 'max', 'show', 'values', 'value', 'from', 'item'
+            ),
+        7 => array(
+            'eq', 'neq', 'ne', 'lte', 'gte', 'ge', 'le', 'not', 'mod'
+            ),
+        8 => array(
+            // some common php functions
+            'isset', 'is_array', 'empty', 'count', 'sizeof'
+            )
+        ),
+    'SYMBOLS' => array(
+        '/', '=', '==', '!=', '>', '<', '>=', '<=', '!', '%'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',        //Functions
+            2 => 'color: #008000;',        //Modifiers
+            3 => 'color: #0600FF;',        //Custom Functions
+            4 => 'color: #804040;',        //Variables
+            5 => 'color: #008000;',        //Methods
+            6 => 'color: #6A0A0A;',        //Attributes
+            7 => 'color: #D36900;',        //Text-based symbols
+            8 => 'color: #0600FF;'        //php functions
+            ),
+        'COMMENTS' => array(
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #D36900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #D36900;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #009000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #00aaff;'
+            )
+        ),
+    'URLS' => array(
+        1 => 'http://smarty.php.net/{FNAMEL}',
+        2 => 'http://smarty.php.net/{FNAMEL}',
+        3 => 'http://smarty.php.net/{FNAMEL}',
+        4 => 'http://smarty.php.net/{FNAMEL}',
+        5 => 'http://smarty.php.net/{FNAMEL}',
+        6 => '',
+        7 => 'http://smarty.php.net/{FNAMEL}',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        // variables
+        0 => '\$[a-zA-Z][a-zA-Z0-9_]*'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '{' => '}'
+            ),
+        1 => array(
+            '',
+        ),
+        2 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => false,
+        2 => false
+    ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-&])"
+        )
+    )
+);
+
+?>
diff --git a/sources/inc/geshi/spark.php b/sources/inc/geshi/spark.php
new file mode 100644
index 0000000..0284a1a
--- /dev/null
+++ b/sources/inc/geshi/spark.php
@@ -0,0 +1,132 @@
+ 'SPARK',
+    'COMMENT_SINGLE' => array(1 => '--', 2 => '--#'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'begin', 'declare', 'do', 'else', 'elsif', 'exception', 'for', 'if',
+            'is', 'loop', 'while', 'then', 'end', 'select', 'case', 'until',
+            'goto', 'return'
+            ),
+        2 => array(
+            'abs', 'and', 'at', 'mod', 'not', 'or', 'rem', 'xor'
+            ),
+        3 => array(
+            'abort', 'abstract', 'accept', 'access', 'aliased', 'all', 'array',
+            'body', 'constant', 'delay', 'delta', 'digits', 'entry', 'exit',
+            'function', 'generic', 'in', 'interface', 'limited', 'new', 'null',
+            'of', 'others', 'out', 'overriding', 'package', 'pragma', 'private',
+            'procedure', 'protected', 'raise', 'range', 'record', 'renames',
+            'requeue', 'reverse', 'separate', 'subtype', 'synchronized',
+            'tagged', 'task', 'terminate', 'type', 'use', 'when', 'with'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00007f;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            2 => 'color: #adadad; font-style: italic; font-weight: bold;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/sparql.php b/sources/inc/geshi/sparql.php
new file mode 100644
index 0000000..282165a
--- /dev/null
+++ b/sources/inc/geshi/sparql.php
@@ -0,0 +1,155 @@
+ 'SPARQL',
+    'COMMENT_SINGLE' => array('#'),
+    'COMMENT_MULTI' => array('/*' => '*/' ),
+    'COMMENT_REGEXP' => array(
+        //IRI (it's not a comment ;)
+        1 => "/<[^> ]*>/i"
+        ),
+    'CASE_KEYWORDS' => 1,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'BASE','PREFIX','SELECT','DISTINCT','REDUCED','CONSTRUCT','DESCRIBE','ASK','FROM',
+            'NAMED','WHERE','ORDER','BY','ASC','DESC','LIMIT','OFFSET','OPTIONAL','GRAPH',
+            'UNION','FILTER','STR','LANG','LANGMATCHES','DATATYPE','BOUND','SAMETERM',
+            'ISIRI','ISURI','ISBLANK',
+            'ISLITERAL','REGEX','SUBSTR','TRUE',
+            'FALSE','LOAD','CLEAR',
+            'DROP','ADD','MOVE','COPY',
+            'CREATE','DELETE','INSERT',
+            'USING','SILENT','DEFAULT','ALL',
+            'DATA','WITH','INTO','TO',
+            'AS','GROUP','HAVING','UNDEF',
+            'BINDINGS','SERVICE','BIND','MINUS_KEYWORD',
+            'IRI','URI', 'BNODE',
+            'RAND','ABS','CEIL','FLOOR','ROUND',
+            'CONCAT','STRLEN',
+            'UCASE','LCASE','ENCODE_FOR_URI',
+            'CONTAINS','STRSTARTS',
+            'STRENDS','STRBEFORE',
+            'STRAFTER','REPLACE',
+            'YEAR','MONTH',
+            'DAY','HOURS',
+            'MINUTES','SECONDS',
+            'TIMEZONE','TZ',
+            'NOW','MD5',
+            'SHA1','SHA224',
+            'SHA256','SHA384',
+            'SHA512','COALESCE',
+            'IF','STRLANG','STRDT',
+            'ISNUMERIC','COUNT',
+            'SUM','MIN',
+            'MAX','AVG','SAMPLE',
+            'GROUP_CONCAT ','NOT',
+            'IN','EXISTS','SEPARATOR'
+            )
+        ),
+    'REGEXPS' => array(
+        //Variables without braces
+        1 => "\\?[a-zA-Z_][a-zA-Z0-9_]*",
+        //prefix
+        2 => "[a-zA-Z_.\\-0-9]*:",
+        //tag lang
+        3 => "@[^ .)}]*",
+        ),
+    'SYMBOLS' => array(
+        0 => array(
+            '{', '}' , '.', ';'
+            ),
+        1 => array(
+            '^^',
+            '<=','>=','!=','=','<','>','|',
+            '&&','||',
+            '(',')','[', ']',
+            '+','-','*','!','/'
+            ),
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #808080; font-style: italic;',
+            1 => 'color: #000078;',
+            //2 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF63C3;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;',
+            1 => 'color: #FF8000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(),
+        'REGEXPS' => array(
+            1 => 'color: #007800;',
+            2 => 'color: #780078;',
+            3 => 'color: #005078;'
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/sql.php b/sources/inc/geshi/sql.php
new file mode 100644
index 0000000..4d08a51
--- /dev/null
+++ b/sources/inc/geshi/sql.php
@@ -0,0 +1,165 @@
+ 'SQL',
+    'COMMENT_SINGLE' => array(1 =>'--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => 1,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'ADD', 'ALL', 'ALTER', 'AND', 'AS', 'ASC', 'AUTO_INCREMENT',
+            'BEFORE', 'BEGIN', 'BETWEEN', 'BIGINT', 'BINARY', 'BLOB', 'BOOLEAN', 'BOTH', 'BY',
+            'CALL', 'CASE', 'CAST', 'CEIL', 'CEILING', 'CHANGE', 'CHAR', 'CHAR_LENGTH', 'CHARACTER',
+            'CHARACTER_LENGTH', 'CHECK', 'CLOB', 'COALESCE', 'COLLATE', 'COLUMN', 'COLUMNS',
+            'CONNECT', 'CONSTRAINT', 'CONVERT', 'COUNT', 'CREATE', 'CROSS', 'CURRENT',
+            'CURRENT_DATE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
+            'DATA', 'DATABASE', 'DATABASES', 'DATE', 'DAY', 'DEC', 'DECIMAL', 'DECLARE',
+            'DEFAULT', 'DELAYED', 'DELETE', 'DESC', 'DESCRIBE', 'DISTINCT', 'DOUBLE',
+            'DOMAIN', 'DROP',
+            'ELSE', 'ENCLOSED', 'END', 'ESCAPED', 'EXCEPT', 'EXEC', 'EXECUTE', 'EXISTS', 'EXP',
+            'EXPLAIN', 'EXTRACT',
+            'FALSE', 'FIELD', 'FIELDS', 'FILTER', 'FIRST', 'FLOAT', 'FLOOR', 'FLUSH', 'FOR',
+            'FOREIGN', 'FROM', 'FULL', 'FUNCTION',
+            'GET', 'GROUP', 'GROUPING', 'GO', 'GOTO', 'GRANT', 'GRANTED',
+            'HAVING', 'HOUR',
+            'IDENTIFIED', 'IDENTITY', 'IF', 'IGNORE', 'IN', 'INCREMENT', 'INDEX', 'INFILE', 'INNER',
+            'INOUT', 'INPUT', 'INSERT', 'INT', 'INTEGER', 'INTERSECT', 'INTERSECTION', 'INTERVAL',
+            'INTO', 'IS',
+            'JOIN',
+            'KEY', 'KEYS', 'KILL',
+            'LANGUAGE', 'LARGE', 'LAST', 'LEADING', 'LEFT', 'LENGTH', 'LIKE', 'LIMIT', 'LINES', 'LOAD',
+            'LOCAL', 'LOCK', 'LOW_PRIORITY', 'LOWER',
+            'MATCH', 'MAX', 'MERGE', 'MIN', 'MINUTE', 'MOD', 'MODIFIES', 'MODIFY', 'MONTH',
+            'NATIONAL', 'NATURAL', 'NCHAR', 'NEW', 'NEXT', 'NEXTVAL', 'NONE', 'NOT',
+            'NULL', 'NULLABLE', 'NULLIF', 'NULLS', 'NUMBER', 'NUMERIC',
+            'OF', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPTIMIZE', 'OPTION',
+            'OPTIONALLY', 'OR', 'ORDER', 'OUT', 'OUTER', 'OUTFILE', 'OVER',
+            'POSITION', 'POWER', 'PRECISION', 'PREPARE', 'PRIMARY', 'PROCEDURAL', 'PROCEDURE',
+            'READ', 'REAL', 'REF', 'REFERENCES', 'REFERENCING', 'REGEXP', 'RENAME', 'REPLACE',
+            'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'RLIKE', 'ROLLBACK', 'ROW',
+            'ROW_NUMBER', 'ROWS', 'RESTRICT', 'ROLE', 'ROUTINE', 'ROW_COUNT',
+            'SAVEPOINT', 'SEARCH', 'SECOND', 'SECTION', 'SELECT', 'SELF', 'SEQUENCE',
+            'SESSION', 'SET', 'SETVAL', 'SHOW', 'SIMILAR', 'SIZE', 'SMALLINT', 'SOME',
+            'SONAME', 'SOURCE', 'SPACE', 'SQL', 'SQRT', 'START', 'STATUS',
+            'STRAIGHT_JOIN', 'STRUCTURE', 'STYLE', 'SUBSTRING', 'SUM',
+            'TABLE', 'TABLE_NAME', 'TABLES', 'TERMINATED', 'TEMPORARY', 'THEN', 'TIME',
+            'TIMESTAMP', 'TO', 'TRAILING', 'TRANSACTION', 'TRIGGER', 'TRIM', 'TRUE', 'TRUNCATE',
+            'TRUSTED', 'TYPE',
+            'UNDER', 'UNION', 'UNIQUE', 'UNKNOWN', 'UNLOCK', 'UNSIGNED',
+            'UPDATE', 'UPPER', 'USE', 'USER', 'USING',
+            'VALUE', 'VALUES', 'VARCHAR', 'VARIABLES', 'VARYING', 'VIEW',
+            'WHEN', 'WHERE', 'WITH', 'WITHIN', 'WITHOUT', 'WORK', 'WRITE',
+            'XOR',
+            'YEAR',
+            'ZEROFILL'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '=', '<', '>', '|', ',', '.', '+', '-', '*', '/'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #993333; font-weight: bold;'
+            ),
+        '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(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/stonescript.php b/sources/inc/geshi/stonescript.php
new file mode 100644
index 0000000..2844e88
--- /dev/null
+++ b/sources/inc/geshi/stonescript.php
@@ -0,0 +1,307 @@
+ 'StoneScript',
+    'COMMENT_SINGLE' => array(1 => "--"),
+    'COMMENT_MULTI' => array("--[[" => "]]"),
+    'COMMENT_REGEXP' => array(
+        4 => '/<<\s*?(\w+)\\n.*?\\n\\1(?![a-zA-Z0-9])/si',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '`','\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // Blue - General Keywords
+        1 => array(
+                'and', 'begin', 'break', 'do', 'else', 'elseif', 'end',
+                'for', 'if', 'in', 'while', 'next', 'not', 'or', 'redo',
+                'then', 'unless', 'until', 'when', 'false', 'nil', 'self',
+                'true', 'local', 'this', 'return',
+            ),
+        // Dark Blue - Main API names
+        2 => array(
+                'animation', 'application', 'cache', 'camera', 'debug',
+                'dynamics', 'group', 'hashtable', 'hud', 'input', 'light',
+                'log', 'math', 'mesh', 'microphone', 'music', 'navigation',
+                'network', 'object', 'pixelmap', 'projector', 'scene',
+                'sensor', 'server', 'session', 'sfx', 'shape', 'sound',
+                'string', 'system', 'table', 'user', 'video', 'xml',
+                // Plugin API names
+                'plasma', 'watersim',
+                'winDirectories',
+                'ActionSheet', 'Alert', 'Mail', 'Picker', 'StatusBar',
+            ),
+        // Constants
+        // Can be commented out if performance is crucial -> then these keywords will appear in a slightly lighter color
+        3 => array(
+                //Animation
+                'kPlaybackModeLoop', 'kPlaybackModeLoopMirrored', 'kPlaybackModeLoopReversed',
+                'kPlaybackModeOnce', 'kPlaybackModeOnceReversed',
+                //Application - Environment
+                'kStatusLoading', 'kStatusReady', 'kStatusSaving', // 'kStatusNone'
+                //Application - Options
+                'kOptionAudioMasterVolume', 'kOptionAutomaticVirtualKeyboard', 'kOptionDynamicShadowsBufferCount',
+                'kOptionDynamicShadowsBufferSize', 'kOptionDynamicShadowsConstantSampling', 'kOptionDynamicShadowsPCFSampleCount',
+                'kOptionDynamicShadowsQuality', 'kOptionDynamicShadowsScreenSpaceBlur', 'kOptionFullscreen',
+                'kOptionFullscreenHeight', 'kOptionFullscreenWidth', 'kOptionHardwareOcclusion',
+                'kOptionMaxEventBouncesPerFrame', 'kOptionNetworkStreams', 'kOptionNetworkStreamsUseBrowser',
+                'kOptionPrioritizeEventBounces', 'kOptionRenderingEnabled', 'kOptionShadersQuality',
+                'kOptionSwapInterval', 'kOptionTerrainsQuality', 'kOptionTexturesAnisotropyLevel',
+                'kOptionTexturesMipmapBias', 'kOptionTexturesQuality', 'kOptionViewportRotation',
+                //Application - Resource Types
+                'kResourceTypeAnimBank', 'kResourceTypeFont', 'kResourceTypeHUD',
+                'kResourceTypeMaterial', 'kResourceTypeMesh', 'kResourceTypeParticle',
+                'kResourceTypePixelMap', 'kResourceTypeSoundBank', 'kResourceTypeTexture',
+                'kResourceTypeTextureClip', 'kResourceTypeTrail',
+                //Cache
+                'kPropertyHeight', 'kPropertySize', 'kPropertyWidth',
+                //Dynamics
+                'kAxisX', 'kAxisY', 'kAxisZ',
+                'kTypeBox', 'kTypeCapsule', 'kTypeSphere',
+                //HUD
+                'kAddressingModeClamp', 'kAddressingModeRepeat', 'kAlignCenter', 'kAlignJustify','kAlignLeft', 'kAlignRight',
+                'kAlignTop', 'kBlendModeAdd', 'kBlendModeDefault', 'kBlendModeModulate', 'kCaseFixed', 'kCaseVariable',
+                'kCommandTypeCallAction', 'kCommandTypeCopyCheckStateToRegister', 'kCommandTypeCopyEditTextToRegister',
+                'kCommandTypeCopyListItemTextToRegister', 'kCommandTypeCopyListLastSelectedItemToRegister',
+                'kCommandTypeCopyProgressValueToRegister', 'kCommandTypeCopySliderValueToRegister', 'kCommandTypeCopyTagToRegister',
+                'kCommandTypeEnterModalMode', 'kCommandTypeInterpolateBackgroundColor', 'kCommandTypeInterpolateBorderColor',
+                'kCommandTypeInterpolateForegroundColor', 'kCommandTypeInterpolateHeight', 'kCommandTypeInterpolateOpacity',
+                'kCommandTypeInterpolatePosition', 'kCommandTypeInterpolateProgressValue', 'kCommandTypeInterpolateRotation',
+                'kCommandTypeInterpolateSize', 'kCommandTypeInterpolateWidth', 'kCommandTypeLeaveModalMode',
+                'kCommandTypeMatchScreenSpaceBottomLeftCorner', 'kCommandTypeMatchScreenSpaceBottomRightCorner',
+                'kCommandTypeMatchScreenSpaceCenter', 'kCommandTypeMatchScreenSpaceHeight', 'kCommandTypeMatchScreenSpaceTopLeftCorner',
+                'kCommandTypeMatchScreenSpaceTopRightCorner', 'kCommandTypeMatchScreenSpaceWidth', 'kCommandTypePauseMovie',
+                'kCommandTypePauseSound', 'kCommandTypePauseTimer', 'kCommandTypePlayMovie', 'kCommandTypePlaySound',
+                'kCommandTypePlaySoundLoop', 'kCommandTypeResumeSound', 'kCommandTypeSendEventToUser', 'kCommandTypeSetActive',
+                'kCommandTypeSetBackgroundColor', 'kCommandTypeSetBackgroundImage', 'kCommandTypeSetBackgroundImageUVOffset',
+                'kCommandTypeSetBackgroundImageUVScale', 'kCommandTypeSetBorderColor', 'kCommandTypeSetButtonText',
+                'kCommandTypeSetCheckState', 'kCommandTypeSetCheckText', 'kCommandTypeSetCursorPosition', 'kCommandTypeSetCursorVisible',
+                'kCommandTypeSetEditText', 'kCommandTypeSetFocus', 'kCommandTypeSetForegroundColor', 'kCommandTypeSetHeight',
+                'kCommandTypeSetLabelText', 'kCommandTypeSetOpacity', 'kCommandTypeSetPosition', 'kCommandTypeSetRotation',
+                'kCommandTypeSetSize', 'kCommandTypeSetVisible', 'kCommandTypeSetWidth', 'kCommandTypeSleep', 'kCommandTypeStartTimer',
+                'kCommandTypeStopAction', 'kCommandTypeStopMovie', 'kCommandTypeStopSound', 'kCommandTypeStopTimer',
+                'kComponentTypeButton', 'kComponentTypeCheck', 'kComponentTypeContainer', 'kComponentTypeEdit', 'kComponentTypeLabel',
+                'kComponentTypeList', 'kComponentTypeMovie', 'kComponentTypePicture', 'kComponentTypePixelMap', 'kComponentTypeProgress',
+                'kComponentTypeRenderMap', 'kComponentTypeSlider', 'kCursorShapeCross', 'kCursorShapeDefault', 'kCursorShapeHandPointing',
+                'kCursorShapeIBeam', 'kCursorShapeNone', 'kCursorShapeWaiting', 'kDirectionLeftToRight', 'kDirectionRightToLeft',
+                'kEncodingASCII', 'kEncodingUTF8', 'kEventTypeGainFocus', 'kEventTypeLooseFocus', 'kEventTypeMouseEnter',
+                'kEventTypeMouseLeave', 'kFillModeSolid', 'kInterpolatorTypeLinear', 'kInterpolatorTypePower2', 'kInterpolatorTypePower3',
+                'kInterpolatorTypePower4', 'kInterpolatorTypeRoot2', 'kInterpolatorTypeRoot3', 'kInterpolatorTypeRoot4',
+                'kInterpolatorTypeSpring1', 'kInterpolatorTypeSpring2', 'kInterpolatorTypeSpring3', 'kInterpolatorTypeSpring4',
+                'kInterpolatorTypeSpring5', 'kInterpolatorTypeSpring6',
+                'kOriginBottom', 'kOriginBottomLeft', 'kOriginBottomRight', 'kOriginCenter', 'kOriginLeft', 'kOriginRight',
+                'kOriginTop', 'kOriginTopLeft', 'kOriginTopRight', 'kProgressTypeBottomToTop', 'kProgressTypeLeftToRight',
+                'kProgressTypeRightToLeft', 'kProgressTypeTopToBottom', 'kRuntimeValueCallArgument0', 'kRuntimeValueCallArgument1',
+                'kRuntimeValueCallArgument2', 'kRuntimeValueCallArgument3', 'kRuntimeValueCurrentUser', 'kRuntimeValueCurrentUserMainCamera',
+                'kRuntimeValueRegister0', 'kRuntimeValueRegister1', 'kRuntimeValueRegister2', 'kRuntimeValueRegister3',
+                'kShapeTypeEllipsoid', 'kShapeTypeRectangle', 'kShapeTypeRoundRectangle', 'kSliderTypeBottomToTop',
+                'kSliderTypeLeftToRight', 'kSliderTypeRightToLeft', 'kSliderTypeTopToBottom', 'kWaveTypeConstant',
+                'kWaveTypeSawtooth', 'kWaveTypeSawtoothInv', 'kWaveTypeSinus', 'kWaveTypeSinusNoise', 'kWaveTypeSquare', 'kWaveTypeTriangle',
+                //Input
+                'kJoypadTypeIPhone', 'kJoypadTypeNone', 'kJoypadTypePhone', 'kJoypadTypeStandard', 'kJoypadTypeWiimote',
+                'kKey0', 'kKey1', 'kKey2', 'kKey3', 'kKey4', 'kKey5', 'kKey6', 'kKey7', 'kKey8', 'kKey9', 'kKeyA', 'kKeyB',
+                'kKeyBackspace', 'kKeyC', 'kKeyD', 'kKeyDelete', 'kKeyDown', 'kKeyE', 'kKeyEnd', 'kKeyEscape', 'kKeyF',
+                'kKeyF1', 'kKeyF10', 'kKeyF11', 'kKeyF12', 'kKeyF2', 'kKeyF3', 'kKeyF4', 'kKeyF5', 'kKeyF6', 'kKeyF7',
+                'kKeyF8', 'kKeyF9', 'kKeyG', 'kKeyH', 'kKeyHome', 'kKeyI', 'kKeyInsert', 'kKeyJ', 'kKeyK', 'kKeyL',
+                'kKeyLAlt', 'kKeyLControl', 'kKeyLeft', 'kKeyLShift', 'kKeyM', 'kKeyN', 'kKeyO', 'kKeyP', 'kKeyPageDown',
+                'kKeyPageUp', 'kKeyQ', 'kKeyR', 'kKeyRAlt', 'kKeyRControl', 'kKeyReturn', 'kKeyRight', 'kKeyRShift',
+                'kKeyS', 'kKeySpace', 'kKeyT', 'kKeyTab', 'kKeyU', 'kKeyUp', 'kKeyV', 'kKeyW', 'kKeyX', 'kKeyY',
+                'kKeyZ', 'kJoypadButtonPSPCircle', 'kJoypadButtonPSPCross', 'kJoypadButtonPSPDown', 'kJoypadButtonPSPL',
+                'kJoypadButtonPSPLeft', 'kJoypadButtonPSPR', 'kJoypadButtonPSPRight', 'kJoypadButtonPSPSelect',
+                'kJoypadButtonPSPSquare', 'kJoypadButtonPSPStart', 'kJoypadButtonPSPTriangle', 'kJoypadButtonPSPUp',
+                'kJoypadTypePSP', 'kJoypadButtonWiimoteA', 'kJoypadButtonWiimoteB', 'kJoypadButtonWiimoteC',
+                'kJoypadButtonWiimoteDown', 'kJoypadButtonWiimoteHome', 'kJoypadButtonWiimoteLeft',
+                'kJoypadButtonWiimoteMinus', 'kJoypadButtonWiimoteOne', 'kJoypadButtonWiimotePlus',
+                'kJoypadButtonWiimoteRight', 'kJoypadButtonWiimoteTwo', 'kJoypadButtonWiimoteUp', 'kJoypadButtonWiimoteZ',
+                //Light
+                'kTypeDirectional', 'kTypePoint',
+                //Math
+                'kEpsilon', 'kInfinity', 'kPi',
+                //Mesh
+                'kLockModeRead', 'kLockModeWrite', 'kLockReadWrite',
+                //Network
+                'kBluetoothServerPort', 'kDefaultServerPort', 'kStatusAuthenticated', 'kStatusSearchFinished', // 'kStatusNone', 'kStatusPending',
+                //Object
+                'kControllerTypeAI', 'kControllerTypeAnimation', 'kControllerTypeAny', 'kControllerTypeDynamics',
+                'kControllerTypeNavigation', 'kControllerTypeSound', 'kGlobalSpace', 'kLocalSpace', 'kParentSpace',
+                'kTransformOptionInheritsParentRotation', 'kTransformOptionInheritsParentScale', 'kTransformOptionInheritsParentTranslation',
+                'kTransformOptionTranslationAffectedByParentRotation', 'kTransformOptionTranslationAffectedByParentScale', 'kTypeCamera',
+                'kTypeCollider', 'kTypeDummy', 'kTypeGroup', 'kTypeLight', 'kTypeOccluder', 'kTypeProjector', 'kTypeReflector',
+                'kTypeSensor', 'kTypeSfx', 'kTypeShape',
+                //Pixelmap
+                'kBlendModeDecal', 'kBlendModeReplace', 'kFillModeBrush', 'kFillModeNone', 'kPenModeBrush', // 'kFillModeSolid',
+                'kPenModeNone', 'kPenModeSolid',
+                //Projector
+                'kMapTypeMovie', 'kMapTypePixelMap', 'kMapTypeRenderMap', 'kMapTypeTexture', 'kMapTypeTextureClip',
+                //Scene
+                'kFilteringModeBilinear', 'kFilteringModeNearest', 'kFilteringModeTrilinear', // 'kAddressingModeClamp', 'kAddressingModeRepeat',
+                'kSkyBoxFaceBack', 'kSkyBoxFaceBottom', 'kSkyBoxFaceFront', 'kSkyBoxFaceLeft', 'kSkyBoxFaceRight', 'kSkyBoxFaceTop',
+                //Sensor
+                'kShapeTypeBox', 'kShapeTypeSphere',
+                //Server
+                'kStatusConnected', 'kStatusNone', 'kStatusPending',
+                //Session - duplicate keywords
+                //'kStatusConnected', 'kStatusNone', 'kStatusPending',
+                //Shape
+                'kMapTypeUnknown', 'kCurveTypeBezier', 'kCurveTypeBSpline', 'kCurveTypeCatmullRom', 'kCurveTypePolyLine',
+                // 'kMapTypeMovie', 'kMapTypePixelMap', 'kMapTypeRenderMap', 'kMapTypeTexture',  'kMapTypeTextureClip',
+
+                //System
+                'kOSType3DS', 'kOSTypeBada', 'kOSTypeBrew', 'kOSTypePalm', 'kOSTypePS3',
+                'kClientTypeEditor', 'kClientTypeEmbedded', 'kClientTypeStandalone',
+                'kGPUCapabilityBloomFilterSupport', 'kGPUCapabilityContrastFilterSupport', 'kGPUCapabilityDepthBlurFilterSupport',
+                'kGPUCapabilityDistortionFilterSupport', 'kGPUCapabilityDynamicShadowsSupport', 'kGPUCapabilityHardwareOcclusionSupport',
+                'kGPUCapabilityHardwareRenderingSupport', 'kGPUCapabilityMonochromeFilterSupport', 'kGPUCapabilityMotionBlurFilterSupport',
+                'kGPUCapabilityPixelShaderSupport', 'kGPUCapabilityVelocityBlurFilterSupport', 'kGPUCapabilityVertexShaderSupport',
+                'kLanguageAlbanian', 'kLanguageArabic', 'kLanguageBulgarian', 'kLanguageCatalan', 'kLanguageCzech', 'kLanguageDanish',
+                'kLanguageDutch', 'kLanguageEnglish', 'kLanguageFinnish', 'kLanguageFrench', 'kLanguageGerman', 'kLanguageGreek',
+                'kLanguageHebrew', 'kLanguageHungarian', 'kLanguageIcelandic', 'kLanguageItalian', 'kLanguageJapanese', 'kLanguageKorean',
+                'kLanguageNorwegian', 'kLanguagePolish', 'kLanguagePortuguese', 'kLanguageRomanian', 'kLanguageRussian',
+                'kLanguageSerboCroatian', 'kLanguageSlovak', 'kLanguageSpanish', 'kLanguageSwedish', 'kLanguageThai',
+                'kLanguageTurkish', 'kLanguageUnknown', 'kLanguageUrdu', 'kOSTypeAndroid', 'kOSTypeAngstrom', 'kOSTypeIPhone',
+                'kOSTypeLinux', 'kOSTypeMac', 'kOSTypePSP', 'kOSTypeSymbian', 'kOSTypeWii', 'kOSTypeWindows', 'kOSTypeWindowsCE',
+            ),
+        // Not used yet
+        4 => array(
+                'dummycommand',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '%', '&', '*', '|', '/', '<', '>',
+        '+', '-', '=>', '<<'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color:#0000FF; font-weight:bold;',
+            2 => 'color:#000088; font-weight:bold;',
+            3 => 'color:#C088C0; font-weight:bold;',
+            4 => 'color:#00FEFE; font-weight:bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color:#008000; font-style:italic;',
+            4 => 'color: #cc0000; font-style: italic;',
+            'MULTI' => 'color:#008000; font-style:italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color:#000099;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color:#000000; font-weight:bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color:#888800;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color:#AA0000;'
+            ),
+        // names after "."
+        'METHODS' => array(
+            1 => 'color:#FF00FF; font-weight:bold;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color:#000000; font-weight:bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color:#ff6633; font-weight:bold;',
+            1 => 'color:#0066ff; font-weight:bold;',
+            2 => 'color:#6666ff; font-weight:bold;',
+            3 => 'color:#ff3333; font-weight:bold;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.'
+        ),
+    'REGEXPS' => array(
+        0 => array(//Variables
+            GESHI_SEARCH => "([[:space:]])(\\$[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        1 => array(//Arrays
+            GESHI_SEARCH => "([[:space:]])(@[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+        2 => "([A-Z][a-zA-Z0-9_]*::)+[A-Z][a-zA-Z0-9_]*",//Static OOP symbols
+        3 => array(
+            GESHI_SEARCH => "([[:space:]]|\[|\()(:[a-zA-Z_][a-zA-Z0-9_]*)",
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        0 => array(
+            '<%' => '%>'
+            )
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        ),
+    'TAB_WIDTH' => 2
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/systemverilog.php b/sources/inc/geshi/systemverilog.php
new file mode 100644
index 0000000..f2ba92b
--- /dev/null
+++ b/sources/inc/geshi/systemverilog.php
@@ -0,0 +1,317 @@
+.
+ *
+ ************************************************************************
+ * Title:        SystemVerilog Language Keywords File for GeSHi
+ * Description:  This file contains the SV keywords defined in the
+ *               IEEE1800-2009 Draft Standard in the format expected by
+ *               GeSHi.
+ *
+ * Original Author: Sean O'Boyle
+ * Contact:         seanoboyle@intelligentdv.com
+ * Company:         Intelligent Design Verification
+ * Company URL:     http://intelligentdv.com
+ *
+ * Download the most recent version here:
+ *                  http://intelligentdv.com/downloads
+ *
+ * File Bugs Here:  http://bugs.intelligentdv.com
+ *        Project:  SyntaxFiles
+ *
+ * File: systemverilog.php
+ * $LastChangedBy: benbe $
+ * $LastChangedDate: 2012-08-18 01:56:20 +0200 (Sa, 18. Aug 2012) $
+ * $LastChangedRevision: 2542 $
+ *
+ ************************************************************************/
+
+$language_data = array (
+    'LANG_NAME' => 'SystemVerilog',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // system tasks
+        1 => array(
+            'acos','acosh','asin','asinh','assertfailoff','assertfailon',
+            'assertkill','assertnonvacuouson','assertoff','asserton',
+            'assertpassoff','assertpasson','assertvacuousoff','async$and$array',
+            'async$and$plane','async$nand$array','async$nand$plane',
+            'async$nor$array','async$nor$plane','async$or$array',
+            'async$or$plane','atan','atan2','atanh','bits','bitstoreal',
+            'bitstoshortreal','cast','ceil','changed','changed_gclk',
+            'changing_gclk','clog2','cos','cosh','countones','coverage_control',
+            'coverage_get','coverage_get_max','coverage_merge','coverage_save',
+            'dimensions','display','displayb','displayh','displayo',
+            'dist_chi_square','dist_erlang','dist_exponential','dist_normal',
+            'dist_poisson','dist_t','dist_uniform','dumpall','dumpfile',
+            'dumpflush','dumplimit','dumpoff','dumpon','dumpports',
+            'dumpportsall','dumpportsflush','dumpportslimit','dumpportsoff',
+            'dumpportson','dumpvars','error','exit','exp','falling_gclk',
+            'fclose','fdisplay','fdisplayb','fdisplayh','fdisplayo','fell',
+            'fell_gclk','feof','ferror','fflush','fgetc','fgets','finish',
+            'floor','fmonitor','fmonitorb','fmonitorh','fmonitoro','fopen',
+            'fread','fscanf','fseek','fstrobe','fstrobeb','fstrobeh','fstrobeo',
+            'ftell','future_gclk','fwrite','fwriteb','fwriteh','fwriteo',
+            'get_coverage','high','hypot','increment','info','isunbounded',
+            'isunknown','itor','left','ln','load_coverage_db','log10','low',
+            'monitor','monitorb','monitorh','monitoro','monitoroff','monitoron',
+            'onehot','onehot0','past','past_gclk','pow','printtimescale',
+            'q_add','q_exam','q_full','q_initialize','q_remove','random',
+            'readmemb','readmemh','realtime','realtobits','rewind','right',
+            'rising_gclk','rose','rose_gclk','rtoi','sampled',
+            'set_coverage_db_name','sformat','sformatf','shortrealtobits',
+            'signed','sin','sinh','size','sqrt','sscanf','stable','stable_gclk',
+            'steady_gclk','stime','stop','strobe','strobeb','strobeh','strobeo',
+            'swrite','swriteb','swriteh','swriteo','sync$and$array',
+            'sync$and$plane','sync$nand$array','sync$nand$plane',
+            'sync$nor$array','sync$nor$plane','sync$or$array','sync$or$plane',
+            'system','tan','tanh','test$plusargs','time','timeformat',
+            'typename','ungetc','unpacked_dimensions','unsigned',
+            'value$plusargs','warning','write','writeb','writeh','writememb',
+            'writememh','writeo',
+            ),
+        // compiler directives
+        2 => array(
+            '`__FILE__', '`__LINE__', '`begin_keywords', '`case', '`celldefine',
+            '`endcelldefine', '`default_nettype', '`define', '`default', '`else',
+            '`elsif', '`end_keywords', '`endfor', '`endif',
+            '`endprotect', '`endswitch', '`endwhile', '`for', '`format',
+            '`if', '`ifdef', '`ifndef', '`include', '`let',
+            '`line', '`nounconnected_drive', '`pragma', '`protect', '`resetall',
+            '`switch', '`timescale', '`unconnected_drive', '`undef', '`undefineall',
+            '`while'
+            ),
+        // keywords
+        3 => array(
+            'assert', 'assume', 'cover', 'expect', 'disable',
+            'iff', 'binsof', 'intersect', 'first_match', 'throughout',
+            'within', 'coverpoint', 'cross', 'wildcard', 'bins',
+            'ignore_bins', 'illegal_bins', 'genvar', 'if', 'else',
+            'unique', 'priority', 'matches', 'default', 'forever',
+            'repeat', 'while', 'for', 'do', 'foreach',
+            'break', 'continue', 'return', 'pulsestyle_onevent', 'pulsestyle_ondetect',
+            'noshowcancelled', 'showcancelled', 'ifnone', 'posedge', 'negedge',
+            'edge', 'wait', 'wait_order', 'timeunit', 'timeprecision',
+            's', 'ms', 'us', 'ns',
+            'ps', 'fs', 'step', 'new', 'extends',
+            'this', 'super', 'protected', 'local', 'rand',
+            'randc', 'bind', 'constraint', 'solve', 'before',
+            'dist', 'inside', 'with', 'virtual', 'extern',
+            'pure', 'forkjoin', 'design', 'instance', 'cell',
+            'liblist', 'use', 'library', 'incdir', 'include',
+            'modport', 'sync_accept_on', 'reject_on', 'accept_on',
+            'sync_reject_on', 'restrict', 'let', 'until', 'until_with',
+            'unique0', 'eventually', 's_until', 's_always', 's_eventually',
+            's_nexttime', 's_until_with', 'global', 'untyped', 'implies',
+            'weak', 'strong', 'nexttime'
+            ),
+        // block keywords
+        4 => array(
+            'begin', 'end', 'package', 'endpackage', 'macromodule',
+            'module', 'endmodule', 'generate', 'endgenerate', 'program',
+            'endprogram', 'class', 'endclass', 'function', 'endfunction',
+            'case', 'casex', 'casez', 'randcase', 'endcase',
+            'interface', 'endinterface', 'clocking', 'endclocking', 'task',
+            'endtask', 'primitive', 'endprimitive', 'fork', 'join',
+            'join_any', 'join_none', 'covergroup', 'endgroup', 'checker',
+            'endchecker', 'property', 'endproperty', 'randsequence', 'sequence',
+            'endsequence', 'specify', 'endspecify', 'config', 'endconfig',
+            'table', 'endtable', 'initial', 'final', 'always',
+            'always_comb', 'always_ff', 'always_latch', 'alias', 'assign',
+            'force', 'release'
+            ),
+
+        // types
+        5 => array(
+            'parameter', 'localparam', 'specparam', 'input', 'output',
+            'inout', 'ref', 'byte', 'shortint', 'int',
+            'integer', 'longint', 'time', 'bit', 'logic',
+            'reg', 'supply0', 'supply1', 'tri', 'triand',
+            'trior', 'trireg', 'tri0', 'tri1', 'wire',
+            'uwire', 'wand', 'wor', 'signed', 'unsigned',
+            'shortreal', 'real', 'realtime', 'type', 'void',
+            'struct', 'union', 'tagged', 'const', 'var',
+            'automatic', 'static', 'packed', 'vectored', 'scalared',
+            'typedef', 'enum', 'string', 'chandle', 'event',
+            'null', 'pullup', 'pulldown', 'cmos', 'rcmos',
+            'nmos', 'pmos', 'rnmos', 'rpmos', 'and',
+            'nand', 'or', 'nor', 'xor', 'xnor',
+            'not', 'buf', 'tran', 'rtran', 'tranif0',
+            'tranif1', 'rtranif0', 'rtranif1', 'bufif0', 'bufif1',
+            'notif0', 'notif1', 'strong0', 'strong1', 'pull0',
+            'pull1', 'weak0', 'weak1', 'highz0', 'highz1',
+            'small', 'medium', 'large'
+            ),
+
+        // DPI
+        6 => array(
+            'DPI', 'DPI-C', 'import', 'export', 'context'
+            ),
+
+        // stdlib
+        7 => array(
+            'randomize', 'mailbox', 'semaphore', 'put', 'get',
+            'try_put', 'try_get', 'peek', 'try_peek', 'process',
+            'state', 'self', 'status', 'kill', 'await',
+            'suspend', 'resume', 'size', 'delete', 'insert',
+            'num', 'first', 'last', 'next', 'prev',
+            'pop_front', 'pop_back', 'push_front', 'push_back', 'find',
+            'find_index', 'find_first', 'find_last', 'find_last_index', 'min',
+            'max', 'unique_index', 'reverse', 'sort', 'rsort',
+            'shuffle', 'sum', 'product', 'List', 'List_Iterator',
+            'neq', 'eq', 'data', 'empty', 'front',
+            'back', 'start', 'finish', 'insert_range', 'erase',
+            'erase_range', 'set', 'swap', 'clear', 'purge'
+            ),
+
+        // key_deprecated
+        8 => array(
+            'defparam', 'deassign', 'TODO'
+        ),
+
+        ),
+    'SYMBOLS' => array(
+            '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%',
+            '^', '&', '|', '~',
+            '?', ':',
+            '#', '<<', '<<<',
+            '>', '<', '>=', '<=',
+            '@', ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #996666; font-weight: bold;',
+            2 => 'color: #336600; font-weight: bold;',
+            3 => 'color: #996600; font-weight: bold;',
+            4 => 'color: #000033; font-weight: bold;',
+            5 => 'color: #330033; font-weight: bold;',
+            6 => 'color: #996600; font-weight: bold;',
+            7 => 'color: #CC9900; font-weight: bold;',
+            8 => 'color: #990000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #00008B; font-style: italic;',
+            'MULTI' => 'color: #00008B; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #9F79EE'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #9F79EE;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0055;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #5D478B;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0055;',
+            1 => 'color: #ff0055;',
+            2 => 'color: #ff0055;',
+            3 => 'color: #ff0055;'
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        // integer
+        0 => "\d'[bdh][0-9_a-fA-FxXzZ]+",
+        // realtime
+        1 => "\d*\.\d+[munpf]?s",
+        // time s, ms, us, ns, ps, of fs
+        2 => "\d+[munpf]?s",
+        // real
+        3 => "\d*\.\d+"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        0 => ''
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true
+        ),
+    'TAB_WIDTH' => 3,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=$)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/tcl.php b/sources/inc/geshi/tcl.php
new file mode 100644
index 0000000..4dd7be8
--- /dev/null
+++ b/sources/inc/geshi/tcl.php
@@ -0,0 +1,194 @@
+ 'TCL',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => '/(? '/{[^}\n]+}/'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', "'"),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        /*
+         * Set 1: reserved words
+         * http://python.org/doc/current/ref/keywords.html
+         */
+        1 => array(
+            'proc', 'global', 'upvar', 'if', 'then', 'else', 'elseif', 'for', 'foreach',
+            'break', 'continue', 'while', 'set', 'eval', 'case', 'in', 'switch',
+            'default', 'exit', 'error', 'return', 'uplevel', 'loop',
+            'for_array_keys', 'for_recursive_glob', 'for_file', 'unwind_protect',
+            'expr', 'catch', 'namespace', 'rename', 'variable',
+            // itcl
+            'method', 'itcl_class', 'public', 'protected'),
+
+        /*
+         * Set 2: builtins
+         * http://asps.activatestate.com/ASPN/docs/ActiveTcl/8.4/tcl/tcl_2_contents.htm
+         */
+        2 => array(
+            // string handling
+            'append', 'binary', 'format', 're_syntax', 'regexp', 'regsub',
+            'scan', 'string', 'subst',
+            // list handling
+            'concat', 'join', 'lappend', 'lindex', 'list', 'llength', 'lrange',
+            'lreplace', 'lsearch', 'lset', 'lsort', 'split',
+            // procedures and output
+            'incr', 'close', 'eof', 'fblocked', 'fconfigure', 'fcopy', 'file',
+            'fileevent', 'flush', 'gets', 'open', 'puts', 'read', 'seek',
+            'socket', 'tell',
+            // packages and source files
+            'load', 'loadTk', 'package', 'pgk::create', 'pgk_mkIndex', 'source',
+            // interpreter routines
+            'bgerror', 'history', 'info', 'interp', 'memory', 'unknown',
+            // library routines
+            'enconding', 'http', 'msgcat',
+            // system related
+            'cd', 'clock', 'exec', 'glob', 'pid', 'pwd', 'time',
+            // platform specified
+            'dde', 'registry', 'resource',
+            // special variables
+            '$argc', '$argv', '$errorCode', '$errorInfo', '$argv0',
+            '$auto_index', '$auto_oldpath', '$auto_path', '$env',
+            '$tcl_interactive', '$tcl_libpath', '$tcl_library',
+            '$tcl_pkgPath', '$tcl_platform', '$tcl_precision', '$tcl_traceExec',
+            ),
+
+        /*
+         * Set 3: standard library
+         */
+        3 => array(
+            'comment', 'filename', 'library', 'packagens', 'tcltest', 'tclvars',
+            ),
+
+        /*
+         * Set 4: special methods
+         */
+//        4 => array(
+//            )
+
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '$', '*', '&', '%', '!', ';', '<', '>', '?'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+//        4 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ff7700;font-weight:bold;',    // Reserved
+            2 => 'color: #008000;',                        // Built-ins + self
+            3 => 'color: #dc143c;',                        // Standard lib
+//            4 => 'color: #0000cd;'                        // Special methods
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+//            2 => 'color: #483d8b;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: black;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #483d8b;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff4500;'
+            ),
+        'METHODS' => array(
+            1 => 'color: black;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff3333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+//        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '::'
+        ),
+    'REGEXPS' => array(
+        //Special variables
+        0 => '[\\$]+[a-zA-Z_][a-zA-Z0-9_]*',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'COMMENTS' => array(
+            'DISALLOWED_BEFORE' => '\\'
+        )
+    )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/teraterm.php b/sources/inc/geshi/teraterm.php
new file mode 100644
index 0000000..f125642
--- /dev/null
+++ b/sources/inc/geshi/teraterm.php
@@ -0,0 +1,354 @@
+ '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',
+            'Call',
+            'CallMenu',
+            'ChangeDir',
+            'ClearScreen',
+            'Clipb2Var',
+            'ClosesBox',
+            'CloseTT',
+            'Code2Str',
+            'Connect',
+            'CRC32',
+            'CRC32File',
+            'CygConnect',
+            'DelPassword',
+            'Disconnect',
+            'DispStr',
+            'Do',
+            'Else',
+            'ElseIf',
+            'EnableKeyb',
+            'End',
+            'EndIf',
+            'EndUntil',
+            'EndWhile',
+            'Exec',
+            'ExecCmnd',
+            'Exit',
+            'FileClose',
+            'FileConcat',
+            'FileCopy',
+            'FileCreate',
+            'FileDelete',
+            'FileMarkPtr',
+            'FileNameBox',
+            'FileOpen',
+            'FileRead',
+            'FileReadln',
+            'FileRename',
+            'FileSearch',
+            'FileSeek',
+            'FileSeekBack',
+            'FileStat',
+            'FileStrSeek',
+            'FileStrSeek2',
+            'FileTruncate',
+            'FileWrite',
+            'FileWriteLn',
+            'FindClose',
+            'FindFirst',
+            'FindNext',
+            'FlushRecv',
+            'For',
+            'GetDate',
+            'GetDir',
+            'GetEnv',
+            'GetHostname',
+            'GetPassword',
+            'GetTime',
+            'GetTitle',
+            'GetTTDir',
+            'Getver',
+            'GoTo',
+            'If',
+            'IfDefined',
+            'Include',
+            'InputBox',
+            'Int2Str',
+            'KmtFinish',
+            'KmtGet',
+            'KmtRecv',
+            'KmtSend',
+            'LoadKeymap',
+            'LogClose',
+            'LogOpen',
+            'LogPause',
+            'LogStart',
+            'LogWrite',
+            'Loop',
+            'MakePath',
+            'MessageBox',
+            'MPause',
+            'Next',
+            'PasswordBox',
+            'Pause',
+            'QuickVANRecv',
+            'QuickVANSend',
+            'Random',
+            'RecvLn',
+            'RestoreSetup',
+            'Return',
+            'RotateLeft',
+            'RotateRight',
+            'ScpRecv',
+            'ScpSend',
+            'Send',
+            'SendBreak',
+            'SendBroadcast',
+            'SendFile',
+            'SendKCode',
+            'SendLn',
+            'SendLnBroadcast',
+            'SendMulticast',
+            'SetBaud',
+            'SetDate',
+            'SetDebug',
+            'SetDir',
+            'SetDlgPos',
+            'SetDTR',
+            'SetEcho',
+            'SetEnv',
+            'SetExitCode',
+            'SetMulticastName',
+            'SetRTS',
+            'SetSync',
+            'SetTime',
+            'SetTitle',
+            'Show',
+            'ShowTT',
+            'SPrintF',
+            'SPrintF2',
+            'StatusBox',
+            'Str2Code',
+            'Str2Int',
+            'StrCompare',
+            'StrConcat',
+            'StrCopy',
+            'StrInsert',
+            'StrJoin',
+            'StrLen',
+            'StrMatch',
+            'StrRemove',
+            'StrReplace',
+            'StrScan',
+            'StrSpecial',
+            'StrSplit',
+            'StrTrim',
+            'TestLink',
+            'Then',
+            'ToLower',
+            'ToUpper',
+            'UnLink',
+            'Until',
+            'Var2Clipb',
+            'Wait',
+            'Wait4All',
+            'WaitEvent',
+            'WaitLn',
+            'WaitN',
+            'WaitRecv',
+            'WaitRegEx',
+            'While',
+            'XmodemRecv',
+            'XmodemSend',
+            'YesNoBox',
+            'YmodemRecv',
+            'YmodemSend',
+            'ZmodemRecv',
+            'ZmodemSend'
+            ),
+        /* System Variables */
+        2 => array(
+            'groupmatchstr1',
+            'groupmatchstr2',
+            'groupmatchstr3',
+            'groupmatchstr4',
+            'groupmatchstr5',
+            'groupmatchstr6',
+            'groupmatchstr7',
+            'groupmatchstr8',
+            'groupmatchstr9',
+            'inputstr',
+            'matchstr',
+            'mtimeout',
+            'param2',
+            'param3',
+            'param4',
+            'param5',
+            'param6',
+            'param7',
+            'param8',
+            'param9',
+            'result',
+            'timeout'
+            ),
+        /* LogMeTT Key Words */
+        3 => array(
+            '$[1]',
+            '$[2]',
+            '$[3]',
+            '$[4]',
+            '$[5]',
+            '$[6]',
+            '$[7]',
+            '$[8]',
+            '$[9]',
+            '$branch$',
+            '$computername$',
+            '$connection$',
+            '$email$',
+            '$logdir$',
+            '$logfilename$',
+            '$lttfilename$',
+            '$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
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/text.php b/sources/inc/geshi/text.php
new file mode 100644
index 0000000..87fb711
--- /dev/null
+++ b/sources/inc/geshi/text.php
@@ -0,0 +1,84 @@
+ 'Text',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(),
+    'SYMBOLS' => array(),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(),
+        'COMMENTS' => array(),
+        'ESCAPE_CHAR' => array(),
+        'BRACKETS' => array(),
+        'STRINGS' => array(),
+        'NUMBERS' => array(),
+        'METHODS' => array(),
+        'SYMBOLS' => 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(),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'ALL' => GESHI_NEVER
+        ),
+    )
+);
+
+?>
diff --git a/sources/inc/geshi/thinbasic.php b/sources/inc/geshi/thinbasic.php
new file mode 100644
index 0000000..f54959e
--- /dev/null
+++ b/sources/inc/geshi/thinbasic.php
@@ -0,0 +1,868 @@
+ 'thinBasic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'XOR','XML_TREETOSTRING','XML_PARSEFILE','XML_PARSE','XML_PARENT','XML_NODETYPE','XML_NODETOSTRING','XML_NEXTSIBLING',
+            'XML_LASTERROR','XML_GETTAG','XML_FREE','XML_FINDNODE','XML_DECODEPARAM','XML_CHILDDATA','XML_CHILD','XML_ATTRIBVALUE',
+            'XML_ATTRIBNAME','XML_ATTRIBCOUNT','WORD','WITH','WIN_SHOW','WIN_SETTITLE','WIN_SETFOREGROUND','WIN_ISZOOMED',
+            'WIN_ISVISIBLE','WIN_ISICONIC','WIN_GETTITLE','WIN_GETFOREGROUND','WIN_GETCLASS','WIN_GETACTIVE','WIN_FLASH','WIN_FINDBYTITLE',
+            'WIN_FINDBYCLASS','WHILE','WEND','VERIFY','VARPTR','VARIANTVT$','VARIANTVT','VARIANT',
+            'VARIABLE_GETINFO','VARIABLE_EXISTS','VARIABLE_EXIST','VALUE','VAL','USING$','USING','USES',
+            'USER','UNTIL','UNITS','UNION','UNICODE2ASCII','UDP_SEND','UDP_RECV','UDP_OPENSERVER',
+            'UDP_OPEN','UDP_FREEFILE','UDP_CLOSE','UCODE$','UCASE$','UBOUND','TYPE','TRIMFULL$',
+            'TRIM$','TOOLTIP','TOKENIZER_MOVETOEOL','TOKENIZER_KEYSETUSERSTRING','TOKENIZER_KEYSETUSERNUMBER','TOKENIZER_KEYGETUSERSTRING','TOKENIZER_KEYGETUSERNUMBER','TOKENIZER_KEYGETSUBTYPE',
+            'TOKENIZER_KEYGETNAME','TOKENIZER_KEYGETMAINTYPE','TOKENIZER_KEYFIND','TOKENIZER_KEYADD','TOKENIZER_GETNEXTTOKEN','TOKENIZER_DEFAULT_SET','TOKENIZER_DEFAULT_GET','TOKENIZER_DEFAULT_CODE',
+            'TOKENIZER_DEFAULT_CHAR','TO','TIMER','TIME$','THEN','TEXTBOX','TEXT','TCP_SEND',
+            'TCP_RECV','TCP_PRINT','TCP_OPEN','TCP_LINEINPUT','TCP_FREEFILE','TCP_CLOSE','TB_IMGCTX_SETIMAGEADJUSTMENT','TB_IMGCTX_LOADIMAGE',
+            'TB_IMGCTX_GETIMAGEADJUSTMENT','TBGL_VIEWPORT','TBGL_VERTEX','TBGL_USETEXTUREFLAG','TBGL_USETEXTURE','TBGL_USELINESTIPPLEFLAG','TBGL_USELINESTIPPLE','TBGL_USELIGHTSOURCEFLAG',
+            'TBGL_USELIGHTSOURCE','TBGL_USELIGHTINGFLAG','TBGL_USELIGHTING','TBGL_USEFOGFLAG','TBGL_USEFOG','TBGL_USEDEPTHMASK','TBGL_USEDEPTHFLAG','TBGL_USEDEPTH',
+            'TBGL_USECLIPPLANEFLAG','TBGL_USECLIPPLANE','TBGL_USEBLENDFLAG','TBGL_USEBLEND','TBGL_USEALPHATEST','TBGL_TRANSLATE','TBGL_TORUS','TBGL_TEXCOORD2D',
+            'TBGL_SPHERE','TBGL_SHOWWINDOW','TBGL_SHOWCURSOR','TBGL_SETWINDOWTITLE','TBGL_SETUPLIGHTSOURCE','TBGL_SETUPFOG','TBGL_SETUPCLIPPLANE','TBGL_SETPRIMITIVEQUALITY',
+            'TBGL_SETLIGHTPARAMETER','TBGL_SETDRAWDISTANCE','TBGL_SCALE','TBGL_SAVESCREENSHOT','TBGL_ROTATEXYZ','TBGL_ROTATE','TBGL_RESETMATRIX','TBGL_RENDERTOTEXTURE',
+            'TBGL_RENDERMATRIX3D','TBGL_RENDERMATRIX2D','TBGL_PUSHMATRIX','TBGL_PRINTFONT','TBGL_PRINTBMP','TBGL_PRINT','TBGL_POS3DTOPOS2D','TBGL_POPMATRIX',
+            'TBGL_POLYGONLOOK','TBGL_POINTSIZE','TBGL_POINTINSIDE3D','TBGL_NORMAL','TBGL_NEWLIST','TBGL_MOUSEGETWHEELDELTA','TBGL_MOUSEGETRBUTTON','TBGL_MOUSEGETPOSY',
+            'TBGL_MOUSEGETPOSX','TBGL_MOUSEGETMBUTTON','TBGL_MOUSEGETLBUTTON','TBGL_M15SETVERTEXZ','TBGL_M15SETVERTEXY','TBGL_M15SETVERTEXXYZ','TBGL_M15SETVERTEXX','TBGL_M15SETVERTEXTEXY',
+            'TBGL_M15SETVERTEXTEXXY','TBGL_M15SETVERTEXTEXX','TBGL_M15SETVERTEXTEXN','TBGL_M15SETVERTEXRGB','TBGL_M15SETVERTEXR','TBGL_M15SETVERTEXPSTOP','TBGL_M15SETVERTEXPARAM','TBGL_M15SETVERTEXLAYER',
+            'TBGL_M15SETVERTEXG','TBGL_M15SETVERTEXB','TBGL_M15SETMODELVERTEXCOUNT','TBGL_M15SETBONECHILD','TBGL_M15ROTBONEZ','TBGL_M15ROTBONEY','TBGL_M15ROTBONEX','TBGL_M15ROTBONE',
+            'TBGL_M15RESETBONES','TBGL_M15RECALCNORMALS','TBGL_M15LOADMODEL','TBGL_M15INITMODELBUFFERS','TBGL_M15GETVERTEXZ','TBGL_M15GETVERTEXY','TBGL_M15GETVERTEXXYZ','TBGL_M15GETVERTEXX',
+            'TBGL_M15GETVERTEXTEXY','TBGL_M15GETVERTEXTEXXY','TBGL_M15GETVERTEXTEXX','TBGL_M15GETVERTEXTEXN','TBGL_M15GETVERTEXRGB','TBGL_M15GETVERTEXR','TBGL_M15GETVERTEXPSTOP','TBGL_M15GETVERTEXPARAM',
+            'TBGL_M15GETVERTEXLAYER','TBGL_M15GETVERTEXG','TBGL_M15GETVERTEXB','TBGL_M15GETMODELVERTEXCOUNT','TBGL_M15GETMODELPOLYCOUNT','TBGL_M15ERASECHILDBONES','TBGL_M15DRAWMODEL','TBGL_M15DEFBONERESET',
+            'TBGL_M15DEFBONELAYER','TBGL_M15DEFBONEBOX','TBGL_M15DEFBONEANCHOR','TBGL_M15DEFBONEADDVERTEX','TBGL_M15CLEARMODEL','TBGL_M15APPLYBONES','TBGL_M15ADDBONETREEITEM','TBGL_LOADTEXTURE',
+            'TBGL_LOADFONT','TBGL_LOADBMPFONT','TBGL_LINEWIDTH','TBGL_LINESTIPPLE','TBGL_KILLFONT','TBGL_ISWINDOW','TBGL_ISPOINTVISIBLE','TBGL_ISPOINTBEHINDVIEW',
+            'TBGL_GETWINDOWMULTIKEYSTATE','TBGL_GETWINDOWKEYSTATE','TBGL_GETWINDOWKEYONCE','TBGL_GETWINDOWCLIENT','TBGL_GETTEXTURENAME','TBGL_GETTEXTURELIST','TBGL_GETPIXELINFO','TBGL_GETMULTIASYNCKEYSTATE',
+            'TBGL_GETLASTGLERROR','TBGL_GETFRAMERATE','TBGL_GETDESKTOPINFO','TBGL_GETASYNCKEYSTATE','TBGL_ERRORMESSAGES','TBGL_ENDPOLY','TBGL_ENDLIST','TBGL_DRAWFRAME',
+            'TBGL_DESTROYWINDOW','TBGL_DELETELIST','TBGL_CYLINDER','TBGL_CREATEWINDOWEX','TBGL_CREATEWINDOW','TBGL_COLORALPHA','TBGL_COLOR','TBGL_CLEARFRAME',
+            'TBGL_CAMERA','TBGL_CALLLIST','TBGL_BUILDFONT','TBGL_BOX','TBGL_BLENDFUNC','TBGL_BINDTEXTURE','TBGL_BEGINPOLY','TBGL_BACKCOLOR',
+            'TBGL_ALPHAFUNC','TBDI_JOYZ','TBDI_JOYY','TBDI_JOYX','TBDI_JOYSTOPEFFECT','TBDI_JOYSLIDER','TBDI_JOYSETRANGEZ','TBDI_JOYSETRANGEY',
+            'TBDI_JOYSETRANGEXYZ','TBDI_JOYSETRANGEX','TBDI_JOYSETDEADZONEZ','TBDI_JOYSETDEADZONEY','TBDI_JOYSETDEADZONEXYZ','TBDI_JOYSETDEADZONEX','TBDI_JOYSETAUTOCENTER','TBDI_JOYRZ',
+            'TBDI_JOYRY','TBDI_JOYRX','TBDI_JOYPOV','TBDI_JOYPLAYEFFECT','TBDI_JOYLOADEFFECT','TBDI_JOYHASFF','TBDI_JOYHASEFFECT','TBDI_JOYGETEFFECTNAME',
+            'TBDI_JOYGETEFFECTGUID','TBDI_JOYCREATEEFFECT','TBDI_JOYCOUNTPOV','TBDI_JOYCOUNTEFFECTS','TBDI_JOYCOUNTBTN','TBDI_JOYCOUNTAXES','TBDI_JOYBUTTON','TBDI_JOYAVAIL',
+            'TBDI_INIT','TBASS_STREAMFREE','TBASS_STREAMCREATEFILE','TBASS_SETVOLUME','TBASS_SETEAXPRESET','TBASS_SETEAXPARAMETERS','TBASS_SETCONFIG','TBASS_SET3DPOSITION',
+            'TBASS_SET3DFACTORS','TBASS_SAMPLELOAD','TBASS_SAMPLEGETCHANNEL','TBASS_MUSICLOAD','TBASS_MUSICFREE','TBASS_INIT','TBASS_GETVOLUME','TBASS_GETVERSION',
+            'TBASS_GETCONFIG','TBASS_FREE','TBASS_ERRORGETCODE','TBASS_CHANNELSTOP','TBASS_CHANNELSETPOSITION','TBASS_CHANNELSETATTRIBUTES','TBASS_CHANNELSET3DPOSITION','TBASS_CHANNELPLAY',
+            'TBASS_CHANNELPAUSE','TBASS_CHANNELISACTIVE','TBASS_CHANNELGETPOSITION','TBASS_CHANNELGETLENGTH','TBASS_CHANNELGETATTRIBUTES','TBASS_APPLY3D','TANH','TANGENT',
+            'TAN','TALLY','TABCTRL_ONNOTIFY','TABCTRL_INSERTITEM','TABCTRL_GETCURSEL','SWAP','SUB','STRZIP$',
+            'STRUNZIP$','STRREVERSE$','STRPTRLEN','STRPTR','STRINSERT$','STRING$','STRING','STRDELETE$',
+            'STR$','STOP','STEP','STDOUT','STDIN','STAT_SUM','STAT_STDERROR','STAT_STDDEVIATION',
+            'STAT_RANDOM','STAT_PRODUCT','STAT_MIN','STAT_MEDIAN','STAT_MEANHARMONIC','STAT_MEANGEOMETRIC','STAT_MEANARITHMETIC','STAT_MAX',
+            'STAT_INVERSESUM','STAT_HISTOGRAM','STAT_FILLARRAY','STAT_COUNT','STAT_COPYARRAY','STAT_CLONEARRAY','STAT_CHISQUARE','STATIC',
+            'STATE','SQR','SPLIT','SORT','SMTP_STATISTICS','SMTP_SETOPTION','SMTP_SETLOGFILE','SMTP_SENDHTML',
+            'SMTP_SENDEMAIL','SMTP_GETERROR','SMTP_FINISHED','SMTP_DEBUG','SMTP_CONNECT','SMTP_CLOSE','SLEEP','SIZEOF',
+            'SIZE','SINH','SINGLE','SIN','SIGNED','SHOW','SHIFT','SHAPETOBMP',
+            'SGN','SETAT','SET','SENDMESSAGE','SENDKEYSBULK','SENDKEYS','SEND','SELECTEXPRESSION',
+            'SELECT','SECH','SEC','SCAN','SAPI_SPEAK','SAPI_SETVOLUME','SAPI_SETRATE','SAPI_MODULELOADED',
+            'SAPI_GETVOLUME','SAPI_GETRATE','RTRIM$','RTF_SETTEXT','RTF_SETFONTSIZE','RTF_SETFONTNAME','RTF_SETFGCOLOR','RTF_SETEFFECT',
+            'RTF_SETBGCOLOR','RTF_SETALIGN','RTF_SAVETOFILE','RTF_LOADFROMFILE','RTF_GETTEXT','RTF_GETFONTSIZE','RTF_GETFONTNAME','RTF_GETEFFECT',
+            'RTF_GETCLASS','RTF_APPENDTEXT','RSET$','ROUND','RNDF','RND','RIGHT$','RIGHT',
+            'RGB','RESOURCE','RESIZE','RESET','REPLACE$','REPEAT$','REMOVE$','REM',
+            'REGISTRY_SETVALUE','REGISTRY_SETTXTNUM','REGISTRY_SETTXTBOOL','REGISTRY_SETDWORD','REGISTRY_GETVALUE','REGISTRY_GETTXTNUM','REGISTRY_GETTXTBOOL','REGISTRY_GETDWORD',
+            'REGISTRY_GETALLKEYS','REGISTRY_DELVALUE','REGISTRY_DELKEY','REFERENCE','REF','REDRAW','REDIM','RAS_SETPARAMS',
+            'RAS_OPENDIALUPDIALOG','RAS_LOADENTRIES','RAS_HANGUPALL','RAS_HANGUP','RAS_GETENTRY','RAS_BEGINDIAL','RANDOMIZE','RADTODEG',
+            'QUERYPERFORMANCEFREQUENCY','QUERYPERFORMANCECOUNTER','QUAD','PTR','PRESERVE','POST','POPUP','POKE$',
+            'POKE','PIXELS','PI','PERMUTATIONS','PEEKMESSAGE','PEEK$','PEEK','PC_SYSTEMUPFROM',
+            'PC_SUSPENDSTATE','PC_SHUTDOWN','PC_SHOWCARET','PC_SETCARETBLINKTIME','PC_RESTARTDIALOG','PC_PREVENTSHUTDOWN','PC_LOCK','PC_INSERTCD',
+            'PC_HIDECARET','PC_GETSTATEONOFF','PC_GETSCROLLLOCKKEYSTATE','PC_GETNUMLOCKKEYSTATE','PC_GETCARETBLINKTIME','PC_GETCAPSLOCKKEYSTATE','PC_EMPTYBIN','PC_EJECTCD',
+            'PC_DECODECDERROR','PCT','PARSESET$','PARSECOUNT','PARSE$','PARSE','PARAMETERS','OUTSIDE',
+            'OS_WINVERSIONTEXT','OS_WINGETVERSIONTIMELINE','OS_SHELLEXECUTE','OS_SHELLABOUT','OS_SHELL','OS_SETLASTCALLDLLERROR','OS_SERVICESTOP','OS_SERVICESTATUSDESCRIPTION',
+            'OS_SERVICESTARTTYPEDESCRIPTION','OS_SERVICESTART','OS_SERVICESETSTARTTYPE','OS_SERVICEQUERY','OS_SERVICEGETSTARTTYPE','OS_SERVICEGETLIST','OS_PROCESSKILLBYNAME','OS_PROCESSKILLBYID',
+            'OS_PROCESSISRUNNING','OS_PROCESSGETLIST','OS_PROCESSGETID','OS_PROCESSARERUNNING','OS_MESSAGEBEEP','OS_ISWOW64','OS_ISFEATUREPRESENT','OS_IEVERSION',
+            'OS_GETWINDOWSDIR','OS_GETUSERNAME','OS_GETTEMPDIR','OS_GETSYSTEMDIR','OS_GETSPECIALFOLDER','OS_GETLASTCALLDLLSTATUS','OS_GETLASTCALLDLLERROR','OS_GETCURRENTTHREADID',
+            'OS_GETCURRENTPROCESSID','OS_GETCOMPUTERNAME','OS_GETCOMMANDS','OS_GETCOMMAND','OS_FLASHWINDOW','OS_FATALAPPEXIT','OS_ENVIRON','OS_CALLDLL',
+            'OR','OPTIONAL','OPTION','OPT','ONCE','ON','OFF','NUMBER',
+            'NOT','NEXT','NEW','MSGBOX','MOUSEPTR','MODULE','MODELESS','MODAL',
+            'MOD','MKWRD$','MKS$','MKQ$','MKL$','MKI$','MKE$','MKDWD$',
+            'MKD$','MKCUX$','MKCUR$','MKBYT$','MIN$','MIN','MID$','MENU',
+            'MDI_CREATE','MCASE$','MAX$','MAX','MAKWRD','MAKLNG','MAKINT','MAKDWR',
+            'LTRIM$','LSET$','LOWRD','LOOP','LONG','LOINT','LOG_WRITE','LOGB',
+            'LOG2','LOG10','LOG','LOCAL','LOC','LL_UPDATEBYNAME','LL_UPDATE','LL_TOSTRING',
+            'LL_TOFILE','LL_NAME','LL_GETITEM','LL_GETBYNUMBER','LL_FROMFILE','LL_FREE','LL_FINDLAST','LL_FINDBYNAME',
+            'LL_FINDBYDATA','LL_DELETELIKE','LL_DELETEBYNAME','LL_DELETE','LL_DATABYNAME','LL_DATA','LL_COUNT','LL_ADD',
+            'LISTBOX','LINE','LIBRARY_EXISTS','LIB','LEN','LEFT$','LEFT','LCASE$',
+            'LBOUND','LABEL','KILL','JOIN$','ITERATE','ISWINDOW','ISUNICODE','ISTRUE',
+            'ISODD','ISLIKE','ISFALSE','ISEVEN','IP_TOSTRING','IP_ADDR','INTERNALINFO','INTEGER',
+            'INT','INSTR','INSIDE','INPUTBOX$','INI_SETKEY','INI_GETSECTIONSLIST','INI_GETSECTIONKEYLIST','INI_GETKEY',
+            'INET_URLDOWNLOAD','INET_PING','INET_OPENDIALUPDIALOG','INET_GETSTATE','INET_GETREMOTEMACADDRESS','INET_GETIP','INET_GETCONNECTIONMODE','INCR',
+            'IN','IMAGE','IIF$','IIF','IF','ICRYPTO_TESTSHA1','ICRYPTO_TESTMD5','ICRYPTO_TESTCRC32',
+            'ICRYPTO_TESTCRC16','ICRYPTO_STRING2ASCII','ICRYPTO_SHA1','ICRYPTO_MD5','ICRYPTO_ENCRYPTRIJNDAEL','ICRYPTO_ENCRYPTRC4','ICRYPTO_DECRYPTRIJNDAEL','ICRYPTO_DECRYPTRC4',
+            'ICRYPTO_CRC32','ICRYPTO_CRC16','ICRYPTO_BYTEXOR','ICRYPTO_BIN2ASCII','ICRYPTO_ASCII2STRING','ICRYPTO_ASCII2BIN','HOST_ADDR','HOSTNAME_TOIP',
+            'HOSTIP_TONAME','HIWRD','HIINT','HEX$','HASH','HANDLE','GUIDTXT$','GUID$',
+            'GRAPHIC','GLVOID','GLUSHORT','GLUINT','GLUBYTE','GLSIZEI','GLSHORT','GLOBAL',
+            'GLINT','GLFLOAT','GLENUM','GLDOUBLE','GLCLAMPF','GLCLAMPD','GLBYTE','GLBOOLEAN',
+            'GLBITFIELD','GETWINDOWMULTIKEYSTATE','GETWINDOWKEYSTATE','GETTICKCOUNT','GETS','GETMULTIASYNCKEYSTATE','GETMESSAGE','GETCURRENTINSTANCE',
+            'GETAT','GETASYNCKEYSTATE','GET','FUNCTION_NPARAMS','FUNCTION_EXISTS','FUNCTION_CPARAMS','FUNCTION','FTP_SETSTRING',
+            'FTP_SETSERVERDIR','FTP_SETNUMBER','FTP_SETMODE','FTP_SETLOGFILE','FTP_SETLOCALDIR','FTP_QUIT','FTP_PUTFILE','FTP_GETSTRING',
+            'FTP_GETSERVERDIR','FTP_GETNUMBER','FTP_GETLOCALDIR','FTP_GETLIST','FTP_GETFILE','FTP_GETERRORSTRING','FTP_GETERRORNUMBER','FTP_FINISHED',
+            'FTP_EXTRACT','FTP_DELFILE','FTP_CONNECT','FTP_COMMAND','FRAME','FRAC','FORMAT$','FOR',
+            'FONT_LIST','FONT_CREATE','FONT','FOCUS','FLUSH','FIX','FILE_SIZE','FILE_SHELLDELETE',
+            'FILE_SHELLCOPY','FILE_SETDATETIME','FILE_SEEK','FILE_SAVE','FILE_RENAME','FILE_PUT','FILE_PATHSPLIT','FILE_OPEN',
+            'FILE_LOF','FILE_LOAD','FILE_LINEPRINT','FILE_LINEINPUT','FILE_KILL','FILE_GETVERSIONSTRING','FILE_GETVERSION','FILE_GETTIME',
+            'FILE_GETDATETIMESTAMP','FILE_GETDATETIME','FILE_GETDATE','FILE_GET','FILE_EXISTS','FILE_EOF','FILE_COPY','FILE_CLOSE',
+            'FILE_CHANGED','FILE_APPEND','FACTORIAL','EXTRACT$','EXT','EXPORT','EXP2','EXP10',
+            'EXP','EXIT','EVAL_STRING','EVAL_SETSTRING','EVAL_SETNUMBER','EVAL_MATH','EVAL_LINKEXT','EVAL_GETSTRING',
+            'EVAL_GETNUMBER','EVAL_ERRORGETTOKEN','EVAL_ERRORDESCRIPTION','EVAL_ERRORCLEAR','EVAL','ERRCLEAR','ERR','ENGINE_GETCURRENTTOKEN',
+            'ENDIF','END','ENABLE','ELSEIF','ELSE','ECHO','DWORD','DT_YEAR',
+            'DT_TIMETOSEC','DT_TIMESUBSECONDS','DT_TIMEFORMAT','DT_TIMEADDSECONDS','DT_SETTIMESEPARATOR','DT_SETDATESEPARATOR','DT_SETDATECENTURY','DT_SECTOTIME',
+            'DT_SECTODATE','DT_SECOND','DT_MONTH','DT_MINUTE','DT_LASTDAYOFMONTH','DT_ISVALIDDATE','DT_ISLEAPYEAR','DT_HOUR',
+            'DT_GETWEEKDAYNAME','DT_GETWEEKDAY','DT_GETTIMESTAMP','DT_GETTIMESEPARATOR','DT_GETMONTHNAME','DT_GETDATESEPARATOR','DT_GETDATECENTURY','DT_DAY',
+            'DT_DATETOSEC','DT_DATETIMESUBSECONDS','DT_DATETIMEADDSECONDS','DT_DATESUBDAYS','DT_DATEFORMAT','DT_DATEDIFF','DT_DATEADDDAYS','DT_COOKIEDATE',
+            'DRAW','DOUBLE','DOEVENTS','DO','DISABLE','DIR_REMOVE','DIR_MAKEALL','DIR_MAKE',
+            'DIR_LISTARRAY','DIR_LIST','DIR_ISEMPTY','DIR_ISDIR','DIR_GETCURRENT','DIR_EXISTS','DIR_CHANGEDRIVE','DIR_CHANGE',
+            'DIM','DICTIONARY_MEMINFO','DICTIONARY_LISTKEYS','DICTIONARY_FREE','DICTIONARY_FIND','DICTIONARY_EXISTS','DICTIONARY_CREATE','DICTIONARY_COUNT',
+            'DICTIONARY_ADD','DIALOG_STOPEVENTS','DIALOG_SAVEFILE','DIALOG_OPENFILE','DIALOG_GETCONTROL','DIALOG_CHOOSECOLOR','DIALOG_BROWSEFORFOLDER','DIALOG',
+            'DESKTOP','DESCENDING','DESCEND','DELETEOBJECT','DELETE','DEGTORAD','DECR','DECLARE',
+            'DATE$','CVWRD','CVS','CVQ','CVL','CVI','CVE','CVDWD',
+            'CVD','CVCUX','CVCUR','CVBYT','CURRENCY','CUR','CSET$','CSCH',
+            'CSC','CRYPTO_GETPROVIDERTYPESCOUNT','CRYPTO_GETPROVIDERSCOUNT','CRYPTO_GETDEFAULTPROVIDER','CRYPTO_GENRANDOMSTRING','CRYPTO_ENUMPROVIDERTYPES','CRYPTO_ENUMPROVIDERS','CRYPTO_ENCRYPT',
+            'CRYPTO_DECRYPT','CREATEFONT','COTH','COTAN','COSH','COS','CONTROL_SETTEXT','CONTROL_GETTEXT',
+            'CONTROL_GETNUMBER','CONTROL','CONST','CONSOLE_WRITELINE','CONSOLE_WRITE','CONSOLE_WAITKEY','CONSOLE_SHOWWINDOW','CONSOLE_SHOWCURSOR',
+            'CONSOLE_SETTITLE','CONSOLE_SETTEXTATTRIBUTE','CONSOLE_SETSTDHANDLE','CONSOLE_SETSCREENBUFFERSIZE','CONSOLE_SETPROGRESSBARCHAR','CONSOLE_SETOUTPUTMODE','CONSOLE_SETOUTPUTCP','CONSOLE_SETINPUTMODE',
+            'CONSOLE_SETFILEAPISTOOEM','CONSOLE_SETFILEAPISTOANSI','CONSOLE_SETCURSORSIZE','CONSOLE_SETCURSORPOSITION','CONSOLE_SETCP','CONSOLE_SETACTIVESCREENBUFFER','CONSOLE_SCROLLWINDOW','CONSOLE_SCROLLBUFFERONEROW',
+            'CONSOLE_SCROLLBUFFER','CONSOLE_SAVESCREEN','CONSOLE_RESTORESCREEN','CONSOLE_READLINE','CONSOLE_READ','CONSOLE_PROGRESSBAR','CONSOLE_PRINTLINE','CONSOLE_PRINTAT',
+            'CONSOLE_PRINT','CONSOLE_NORMALSCREEN','CONSOLE_LINE','CONSOLE_INKEYB','CONSOLE_INKEY','CONSOLE_HIDECURSOR','CONSOLE_GETTITLE','CONSOLE_GETTEXTATTRIBUTE',
+            'CONSOLE_GETSTDHANDLE','CONSOLE_GETSIZEY','CONSOLE_GETSIZEX','CONSOLE_GETPROGRESSBARCHAR','CONSOLE_GETOUTPUTMODE','CONSOLE_GETOUTPUTCP','CONSOLE_GETNUMBEROFMOUSEBUTTONS','CONSOLE_GETINPUTMODE',
+            'CONSOLE_GETCURSORY','CONSOLE_GETCURSORX','CONSOLE_GETCURSORSIZE','CONSOLE_GETCURRENTFONTINDEX','CONSOLE_GETCP','CONSOLE_GENERATECTRLEVENT','CONSOLE_FULLSCREEN','CONSOLE_FREE',
+            'CONSOLE_FOREGROUNDRGB','CONSOLE_ENABLECTRLC','CONSOLE_DISABLECTRLC','CONSOLE_CREATESCREENBUFFER','CONSOLE_COLORAT','CONSOLE_CLS','CONSOLE_BOX','CONSOLE_BACKGROUNDRGB',
+            'CONSOLE_ATTACH','CONSOLE_AREFILEAPISANSI','CONSOLE_ALLOC','COM_VARIANTINIT','COM_VARIANTCOPY','COM_VARIANTCLEAR','COM_SUCCEEDED','COM_STRINGFROMCLSID',
+            'COM_RELEASE','COM_QUERYINTERFACE','COM_PROGIDFROMCLSID','COM_ISEQUALIID','COM_ISEQUALGUID','COM_ISEQUALCLSID','COM_GETOBJECT','COM_GETENGINEGUID',
+            'COM_EXECUTE','COM_DISPLAYERROR','COM_CREATEOBJECT','COM_CLSIDFROMSTRING','COM_CLSIDFROMPROGID','COM_BUILDVARIANT','COMBOBOX','COMBINATIONS',
+            'COLOR','CLIPBOARD_SETTEXT','CLIPBOARD_GETTEXT','CLIENT','CLEARMESSAGES','CHR$','CHOOSE$','CHOOSE',
+            'CHECKBOX','CHECK3STATE','CHECK','CGI_WRITELOGFILE','CGI_WRITE','CGI_URLDECODESTRING','CGI_UPLOADFILESTIME','CGI_UPLOADFILESNUMBER',
+            'CGI_UPLOADFILESIZE','CGI_STARTSESSION','CGI_SETSESSIONVARIABLE','CGI_RESETDEFAULTSETTINGS','CGI_REMOVESPECIALCHARSPREFIX','CGI_REMOVEQUOTE','CGI_READ','CGI_LOADCONFIGFILE',
+            'CGI_HEADER','CGI_GETSESSIONVARIABLE','CGI_GETREQUESTMETHOD','CGI_GETQUERYVALUE','CGI_GETCURRENTSESSION','CGI_GETCURRENTGUID','CGI_ENVIRON','CGI_CFGSETOPTION',
+            'CGI_CFGGETOPTION','CGI_ADDSPECIALCHARSPREFIX','CGI_ADDQUOTE','CEIL','CASE','CALL','BYVAL','BYTE',
+            'BYREF','BYCMD','BUTTON','BUNDLE_SETSCRIPTPARAMETERS','BUNDLE_SETSCRIPTNAME','BUNDLE_SETFLAGOBFUSCATEMAINSCRIPT','BUNDLE_SETFLAGDELETEAFTERRUN','BUNDLE_SETFLAGCOMPRESSALLFILES',
+            'BUNDLE_SETFLAGASKBEFOREEXTRACT','BUNDLE_SETEXTRACTIONFOLDER','BUNDLE_SETCREATIONFOLDER','BUNDLE_SETBUNDLENAME','BUNDLE_RESET','BUNDLE_MAKE','BUNDLE_BUILDER','BUNDLE_ADDFOLDER',
+            'BUNDLE_ADDFILE','BOUNDCHECK','BIN$','BIFF_WRITETEXT','BIFF_WRITENUMBER','BIFF_WRITEDATE','BIFF_SETROWHEIGHT','BIFF_SETCOLWIDTH',
+            'BIFF_SETBUFFER','BIFF_CREATEFILE','BIFF_CLOSEFILE','BETWEEN','BEEP','BAR','ATTACH','ATN',
+            'AT','ASSIGN','ASCIZ','ASCIIZ','ASCII2UNICODE','ASCENDING','ASCEND','ASC',
+            'AS','ARRAY','ARCTANH','ARCSINH','ARCSIN','ARCSECH','ARCSEC','ARCCSCH',
+            'ARCCSC','ARCCOTH','ARCCOT','ARCCOSH','ARCCOS','APP_TIMER','APP_SOURCEPATH','APP_SOURCENAME',
+            'APP_SOURCEFULLNAME','APP_PATH','APP_NAME','APP_LISTVARIABLES','APP_LISTKEYWORDS','APP_LISTFUNCTIONS','APP_LISTEQUATES','APP_INCLUDEPATH',
+            'APP_GETMODULEFULLPATH','APP_COUNTER','APPEND','ANY','ANIMATE_STOP','ANIMATE_PLAY','ANIMATE_OPEN','AND',
+            'ALIAS','ALERT','ADD','ACODE$','ABS','%DEF','#MINVERSION','#IF',
+            '#ENDIF','#ELSEIF','#ELSE','#DEFAULT','#DEF','SQLWRITEPRIVATEPROFILESTRING','SQLWRITEFILEDSN','SQLWRITEDSNTOINI',
+            'SQLVALIDDSN','SQLTRANSACT','SQLTABLES','SQLTABLEPRIVILEGES','SQLSTATISTICS','SQLSPECIALCOLUMNS','SQLSETSTMTOPTION','SQLSETSTMTATTR',
+            'SQLSETSCROLLOPTIONS','SQLSETPOS','SQLSETPARAM','SQLSETENVATTR','SQLSETDESCREC','SQLSETDESCFIELD','SQLSETCURSORNAME','SQLSETCONNECTOPTION',
+            'SQLSETCONNECTATTR','SQLSETCONFIGMODE','SQLROWCOUNT','SQLREMOVETRANSLATOR','SQLREMOVEDSNFROMINI','SQLREMOVEDRIVERMANAGER','SQLREMOVEDRIVER','SQLREADFILEDSN',
+            'SQLPUTDATA','SQLPROCEDURES','SQLPROCEDURECOLUMNS','SQLPRIMARYKEYS','SQLPREPARE','SQLPOSTINSTALLERERROR','SQLPARAMOPTIONS','SQLPARAMDATA',
+            'SQLNUMRESULTCOLS','SQLNUMPARAMS','SQLNATIVESQL','SQLMORERESULTS','SQLMANAGEDATASOURCES','SQLINSTALLTRANSLATOREX','SQLINSTALLERERROR','SQLINSTALLDRIVERMANAGER',
+            'SQLINSTALLDRIVEREX','SQLGETTYPEINFO','SQLGETTRANSLATOR','SQLGETSTMTOPTION','SQLGETSTMTATTR','SQLGETPRIVATEPROFILESTRING','SQLGETINSTALLEDDRIVERS','SQLGETINFO',
+            'SQLGETFUNCTIONS','SQLGETENVATTR','SQLGETDIAGREC','SQLGETDIAGFIELD','SQLGETDESCREC','SQLGETDESCFIELD','SQLGETDATA','SQLGETCURSORNAME',
+            'SQLGETCONNECTOPTION','SQLGETCONNECTATTR','SQLGETCONFIGMODE','SQLFREESTMT','SQLFREEHANDLE','SQLFREEENV','SQLFREECONNECT','SQLFOREIGNKEYS',
+            'SQLFETCHSCROLL','SQLFETCH','SQLEXTENDEDFETCH','SQLEXECUTE','SQLEXECDIRECT','SQLERROR','SQLENDTRAN','SQLDRIVERS',
+            'SQLDRIVERCONNECT','SQLDISCONNECT','SQLDESCRIBEPARAM','SQLDESCRIBECOL','SQLDATASOURCES','SQLCREATEDATASOURCE','SQLCOPYDESC','SQLCONNECT',
+            'SQLCONFIGDRIVER','SQLCONFIGDATASOURCE','SQLCOLUMNS','SQLCOLUMNPRIVILEGES','SQLCOLATTRIBUTES','SQLCOLATTRIBUTE','SQLCLOSECURSOR','SQLCANCEL',
+            'SQLBULKOPERATIONS','SQLBROWSECONNECT','SQLBINDPARAMETER','SQLBINDPARAM','SQLBINDCOL','SQLALLOCSTMT','SQLALLOCHANDLE','SQLALLOCENV',
+            'SQLALLOCCONNECT','ODBCWRONGDRIVER','ODBCWRITEPRIVATEPROFILESTRING','ODBCWRITEFILEDSN','ODBCWRITEDSNTOINI','ODBCVALIDDSN','ODBCUPDATERECORD','ODBCUPDATEBYBOOKMARK',
+            'ODBCUNLOCKRECORD','ODBCUNBINDCOLUMNS','ODBCUNBINDCOL','ODBCTABLESCOUNT','ODBCTABLES','ODBCTABLEPRIVILEGESCOUNT','ODBCTABLEPRIVILEGES','ODBCSUPPORTS',
+            'ODBCSTATTABLESCHEMANAME','ODBCSTATTABLEPAGES','ODBCSTATTABLECATALOGNAME','ODBCSTATTABLECARDINALITY','ODBCSTATISTICSCOUNT','ODBCSTATISTICS','ODBCSTATINDEXSORTSEQUENCE','ODBCSTATINDEXSCHEMANAME',
+            'ODBCSTATINDEXQUALIFIER','ODBCSTATINDEXPAGES','ODBCSTATINDEXFILTERCONDITION','ODBCSTATINDEXCOLUMNORDINALPOSITION','ODBCSTATINDEXCOLUMNNAME','ODBCSTATINDEXCATALOGNAME','ODBCSTATINDEXCARDINALITY','ODBCSTATINDEXALLOWDUPLICATES',
+            'ODBCSPECIALCOLUMNSCOUNT','ODBCSPECIALCOLUMNS','ODBCSETTXNISOLATION','ODBCSETTRANSLATELIB','ODBCSETTRACEFILE','ODBCSETTRACE','ODBCSETSTMTUSEBOOKMARKS','ODBCSETSTMTSIMULATECURSOR',
+            'ODBCSETSTMTROWSTATUSPTR','ODBCSETSTMTROWSFETCHEDPTR','ODBCSETSTMTROWOPERATIONPTR','ODBCSETSTMTROWBINDTYPE','ODBCSETSTMTROWBINDOFFSETPTR','ODBCSETSTMTROWARRAYSIZE','ODBCSETSTMTRETRIEVEDATA','ODBCSETSTMTQUERYTIMEOUT',
+            'ODBCSETSTMTPARAMSTATUSPTR','ODBCSETSTMTPARAMSPROCESSEDPTR','ODBCSETSTMTPARAMSETSIZE','ODBCSETSTMTPARAMOPERATIONPTR','ODBCSETSTMTPARAMBINDTYPE','ODBCSETSTMTPARAMBINDOFFSETPTR','ODBCSETSTMTNOSCAN','ODBCSETSTMTMETADATAID',
+            'ODBCSETSTMTMAXROWS','ODBCSETSTMTMAXLENGTH','ODBCSETSTMTKEYSETSIZE','ODBCSETSTMTFETCHBOOKMARKPTR','ODBCSETSTMTENABLEAUTOIPD','ODBCSETSTMTCURSORTYPE','ODBCSETSTMTCURSORSENSITIVITY','ODBCSETSTMTCURSORSCROLLABLE',
+            'ODBCSETSTMTCONCURRENCY','ODBCSETSTMTATTR','ODBCSETSTMTASYNCENABLE','ODBCSETSTMTAPPROWDESC','ODBCSETSTMTAPPPARAMDESC','ODBCSETSTATICCURSOR','ODBCSETROWVERCONCURRENCY','ODBCSETRESULT',
+            'ODBCSETRELATIVEPOSITION','ODBCSETREADONLYCONCURRENCY','ODBCSETQUIETMODE','ODBCSETPOSITION','ODBCSETPOS','ODBCSETPACKETMODE','ODBCSETOPTIMISTICCONCURRENCY','ODBCSETODBCCURSORS',
+            'ODBCSETMULTIUSERKEYSETCURSOR','ODBCSETMETADATAID','ODBCSETLOGINTIMEOUT','ODBCSETLOCKCONCURRENCY','ODBCSETKEYSETDRIVENCURSOR','ODBCSETFORWARDONLYCURSOR','ODBCSETENVOUTPUTNTS','ODBCSETENVODBCVERSION',
+            'ODBCSETENVCPMATCH','ODBCSETENVCONNECTIONPOOLING','ODBCSETENVATTR','ODBCSETDYNAMICCURSOR','ODBCSETDESCREC','ODBCSETDESCFIELD','ODBCSETCURSORTYPE','ODBCSETCURSORSENSITIVITY',
+            'ODBCSETCURSORSCROLLABILITY','ODBCSETCURSORNAME','ODBCSETCURSORLOCKTYPE','ODBCSETCURSORKEYSETSIZE','ODBCSETCURSORCONCURRENCY','ODBCSETCURRENTCATALOG','ODBCSETCONNECTIONTIMEOUT','ODBCSETCONNECTATTR',
+            'ODBCSETCONFIGMODE','ODBCSETCONCURVALUESCONCURRENCY','ODBCSETAUTOCOMMITON','ODBCSETAUTOCOMMITOFF','ODBCSETAUTOCOMMIT','ODBCSETASYNCENABLE','ODBCSETACCESSMODE','ODBCSETABSOLUTEPOSITION',
+            'ODBCROWCOUNT','ODBCROLLBACKTRAN','ODBCROLLBACKENVTRAN','ODBCROLLBACKDBCTRAN','ODBCRESULT','ODBCRESETPARAMS','ODBCREMOVETRANSLATOR','ODBCREMOVEDSNFROMINI',
+            'ODBCREMOVEDRIVERMANAGER','ODBCREMOVEDRIVER','ODBCREFRESHRECORD','ODBCRECORDCOUNT','ODBCREADFILEDSN','ODBCQUOTEDIDENTIFIERCASE','ODBCPUTDATA','ODBCPROCEDURESCOUNT',
+            'ODBCPROCEDURES','ODBCPROCEDURECOLUMNSCOUNT','ODBCPROCEDURECOLUMNS','ODBCPRIMARYKEYSCOUNT','ODBCPRIMARYKEYS','ODBCPREPARE','ODBCPOSTINSTALLERERROR','ODBCPARAMDATA',
+            'ODBCOPENSTMT','ODBCOPENCONNECTION','ODBCNUMRESULTCOLS','ODBCNUMPARAMS','ODBCNATIVESQL','ODBCMOVEPREVIOUS','ODBCMOVENEXT','ODBCMOVELAST',
+            'ODBCMOVEFIRST','ODBCMOVE','ODBCMORERESULTS','ODBCMANAGEDATASOURCES','ODBCLOCKRECORD','ODBCINSTALLTRANSLATOREX','ODBCINSTALLERERROR','ODBCINSTALLDRIVERMANAGER',
+            'ODBCINSTALLDRIVEREX','ODBCGETXOPENCLIYEAR','ODBCGETUSERNAME','ODBCGETUNION','ODBCGETTYPEINFOCOUNT','ODBCGETTYPEINFO','ODBCGETTXNISOLATIONOPTION','ODBCGETTXNISOLATION',
+            'ODBCGETTXNCAPABLE','ODBCGETTRANSLATOR','ODBCGETTRANSLATELIB','ODBCGETTRACEFILE','ODBCGETTRACE','ODBCGETTIMEDATEFUNCTIONS','ODBCGETTIMEDATEDIFFINTERVALS','ODBCGETTIMEDATEADDINTERVALS',
+            'ODBCGETTABLETERM','ODBCGETSYSTEMFUNCTIONS','ODBCGETSUBQUERIES','ODBCGETSTRINGFUNCTIONS','ODBCGETSTMTUSEBOOKMARKS','ODBCGETSTMTSQLSTATE','ODBCGETSTMTSIMULATECURSOR','ODBCGETSTMTROWSTATUSPTR',
+            'ODBCGETSTMTROWSFETCHEDPTR','ODBCGETSTMTROWOPERATIONPTR','ODBCGETSTMTROWNUMBER','ODBCGETSTMTROWBINDTYPE','ODBCGETSTMTROWBINDOFFSETPTR','ODBCGETSTMTROWARRAYSIZE','ODBCGETSTMTRETRIEVEDATA','ODBCGETSTMTQUERYTIMEOUT',
+            'ODBCGETSTMTPARAMSTATUSPTR','ODBCGETSTMTPARAMSPROCESSEDPTR','ODBCGETSTMTPARAMSETSIZE','ODBCGETSTMTPARAMOPERATIONPTR','ODBCGETSTMTPARAMBINDTYPE','ODBCGETSTMTPARAMBINDOFFSETPTR','ODBCGETSTMTNOSCAN','ODBCGETSTMTMETADATAID',
+            'ODBCGETSTMTMAXROWS','ODBCGETSTMTMAXLENGTH','ODBCGETSTMTKEYSETSIZE','ODBCGETSTMTIMPROWDESC','ODBCGETSTMTIMPPARAMDESC','ODBCGETSTMTFETCHBOOKMARKPTR','ODBCGETSTMTERRORINFO','ODBCGETSTMTENABLEAUTOIPD',
+            'ODBCGETSTMTCURSORTYPE','ODBCGETSTMTCURSORSENSITIVITY','ODBCGETSTMTCURSORSCROLLABLE','ODBCGETSTMTCONCURRENCY','ODBCGETSTMTATTR','ODBCGETSTMTASYNCENABLE','ODBCGETSTMTAPPROWDESC','ODBCGETSTMTAPPPARAMDESC',
+            'ODBCGETSTATICCURSORATTRIBUTES2','ODBCGETSTATICCURSORATTRIBUTES1','ODBCGETSTATEMENTSQLSTATE','ODBCGETSTATEMENTERRORINFO','ODBCGETSTANDARDCLICONFORMANCE','ODBCGETSQLSTATE','ODBCGETSQLCONFORMANCE','ODBCGETSQL92VALUEEXPRESSIONS',
+            'ODBCGETSQL92STRINGFUNCTIONS','ODBCGETSQL92ROWVALUECONSTRUCTOR','ODBCGETSQL92REVOKE','ODBCGETSQL92RELATIONALJOINOPERATORS','ODBCGETSQL92PREDICATES','ODBCGETSQL92NUMERICVALUEFUNCTIONS','ODBCGETSQL92GRANT','ODBCGETSQL92FOREIGNKEYUPDATERULE',
+            'ODBCGETSQL92FOREIGNKEYDELETERULE','ODBCGETSQL92DATETIMEFUNCTIONS','ODBCGETSPECIALCHARACTERS','ODBCGETSERVERNAME','ODBCGETSEARCHPATTERNESCAPE','ODBCGETSCROLLOPTIONS','ODBCGETSCHEMAUSAGE','ODBCGETSCHEMATERM',
+            'ODBCGETROWUPDATES','ODBCGETQUIETMODE','ODBCGETPROCEDURETERM','ODBCGETPROCEDURESSUPPORT','ODBCGETPRIVATEPROFILESTRING','ODBCGETPOSOPERATIONS','ODBCGETPARAMARRAYSELECTS','ODBCGETPARAMARRAYROWCOUNTS',
+            'ODBCGETPACKETMODE','ODBCGETOUTERJOINS','ODBCGETORDERBYCOLUMNSINSELECT','ODBCGETOJCAPABILITIES','ODBCGETODBCVER','ODBCGETODBCINTERFACECONFORMANCE','ODBCGETODBCCURSORS','ODBCGETNUMERICFUNCTIONS',
+            'ODBCGETNULLCOLLATION','ODBCGETNONNULLABLECOLUMNS','ODBCGETNEEDLONGDATALEN','ODBCGETMULTRESULTSETS','ODBCGETMULTIPLEACTIVETXN','ODBCGETMETADATAID','ODBCGETMAXUSERNAMELEN','ODBCGETMAXTABLESINSELECT',
+            'ODBCGETMAXTABLENAMELEN','ODBCGETMAXSTATEMENTLEN','ODBCGETMAXSCHEMANAMELEN','ODBCGETMAXROWSIZEINCLUDESLONG','ODBCGETMAXROWSIZE','ODBCGETMAXPROCEDURENAMELEN','ODBCGETMAXINDEXSIZE','ODBCGETMAXIDENTIFIERLEN',
+            'ODBCGETMAXDRIVERCONNECTIONS','ODBCGETMAXCURSORNAMELEN','ODBCGETMAXCONCURRENTACTIVITIES','ODBCGETMAXCOLUMNSINTABLE','ODBCGETMAXCOLUMNSINSELECT','ODBCGETMAXCOLUMNSINORDERBY','ODBCGETMAXCOLUMNSININDEX','ODBCGETMAXCOLUMNSINGROUPBY',
+            'ODBCGETMAXCOLUMNNAMELEN','ODBCGETMAXCHARLITERALLEN','ODBCGETMAXCATALOGNAMELEN','ODBCGETMAXBINARYLITERALLEN','ODBCGETMAXASYNCCONCURRENTSTATEMENTS','ODBCGETLONGVARCHARDATABYCOLNAME','ODBCGETLONGVARCHARDATA','ODBCGETLOGINTIMEOUT',
+            'ODBCGETLIKEESCAPECLAUSE','ODBCGETKEYWORDS','ODBCGETKEYSETCURSORATTRIBUTES2','ODBCGETKEYSETCURSORATTRIBUTES1','ODBCGETINTEGRITY','ODBCGETINSTALLERERRORMESSAGE','ODBCGETINSTALLERERRORCODE','ODBCGETINSTALLEDDRIVERS',
+            'ODBCGETINSERTSTATEMENT','ODBCGETINFOSTR','ODBCGETINFOSCHEMAVIEWS','ODBCGETINFOLONG','ODBCGETINFOINT','ODBCGETINFO','ODBCGETINDEXKEYWORDS','ODBCGETIMPROWDESCREC',
+            'ODBCGETIMPROWDESCFIELDTYPE','ODBCGETIMPROWDESCFIELDSCALE','ODBCGETIMPROWDESCFIELDPRECISION','ODBCGETIMPROWDESCFIELDOCTETLENGTH','ODBCGETIMPROWDESCFIELDNULLABLE','ODBCGETIMPROWDESCFIELDNAME','ODBCGETIMPROWDESCFIELD','ODBCGETIMPPARAMDESCREC',
+            'ODBCGETIMPPARAMDESCFIELDTYPE','ODBCGETIMPPARAMDESCFIELDSCALE','ODBCGETIMPPARAMDESCFIELDPRECISION','ODBCGETIMPPARAMDESCFIELDOCTETLENGTH','ODBCGETIMPPARAMDESCFIELDNULLABLE','ODBCGETIMPPARAMDESCFIELDNAME','ODBCGETIMPPARAMDESCFIELD','ODBCGETIDENTIFIERQUOTECHAR',
+            'ODBCGETIDENTIFIERCASE','ODBCGETGROUPBY','ODBCGETFUNCTIONS','ODBCGETFORWARDONLYCURSORATTRIBUTES2','ODBCGETFORWARDONLYCURSORATTRIBUTES1','ODBCGETFILEUSAGE','ODBCGETEXPRESSIONSINORDERBY','ODBCGETERRORINFO',
+            'ODBCGETENVSQLSTATE','ODBCGETENVOUTPUTNTS','ODBCGETENVODBCVERSION','ODBCGETENVIRONMENTSQLSTATE','ODBCGETENVIRONMENTERRORINFO','ODBCGETENVERRORINFO','ODBCGETENVCPMATCH','ODBCGETENVCONNECTIONPOOLING',
+            'ODBCGETENVATTR','ODBCGETDYNAMICCURSORATTRIBUTES2','ODBCGETDYNAMICCURSORATTRIBUTES1','ODBCGETDROPVIEW','ODBCGETDROPTRANSLATION','ODBCGETDROPTABLE','ODBCGETDROPSCHEMA','ODBCGETDROPDOMAIN',
+            'ODBCGETDROPCOLLATION','ODBCGETDROPCHARACTERSET','ODBCGETDROPASSERTION','ODBCGETDRIVERVER','ODBCGETDRIVERODBCVER','ODBCGETDRIVERNAME','ODBCGETDRIVERMANAGERINSTALLPATH','ODBCGETDRIVERHLIB',
+            'ODBCGETDRIVERHENV','ODBCGETDRIVERHDBC','ODBCGETDMVERMINOR','ODBCGETDMVERMAJOR','ODBCGETDMVER','ODBCGETDIAGREC','ODBCGETDIAGFIELD','ODBCGETDESCSQLSTATE',
+            'ODBCGETDESCRIPTORSQLSTATE','ODBCGETDESCRIPTORERRORINFO','ODBCGETDESCRIBEPARAMETER','ODBCGETDESCREC','ODBCGETDESCFIELD','ODBCGETDESCERRORINFO','ODBCGETDEFAULTTXNISOLATION','ODBCGETDDLINDEX',
+            'ODBCGETDBMSVER','ODBCGETDBMSNAME','ODBCGETDBCSQLSTATE','ODBCGETDBCERRORINFO','ODBCGETDATETIMELITERALS','ODBCGETDATASTRINGBYCOLNAME','ODBCGETDATASTRING','ODBCGETDATASOURCEREADONLY',
+            'ODBCGETDATASOURCENAME','ODBCGETDATAEXTENSIONS','ODBCGETDATABASENAME','ODBCGETDATA','ODBCGETCURSORTYPE','ODBCGETCURSORSENSITIVITYSUPPORT','ODBCGETCURSORSENSITIVITY','ODBCGETCURSORSCROLLABILITY',
+            'ODBCGETCURSORROLLBACKBEHAVIOR','ODBCGETCURSORNAME','ODBCGETCURSORLOCKTYPE','ODBCGETCURSORKEYSETSIZE','ODBCGETCURSORCONCURRENCY','ODBCGETCURSORCOMMITBEHAVIOR','ODBCGETCURRENTCATALOG','ODBCGETCREATEVIEW',
+            'ODBCGETCREATETRANSLATION','ODBCGETCREATETABLE','ODBCGETCREATESCHEMA','ODBCGETCREATEDOMAIN','ODBCGETCREATECOLLATION','ODBCGETCREATECHARACTERSET','ODBCGETCREATEASSERTION','ODBCGETCORRELATIONNAME',
+            'ODBCGETCONVERTVARCHAR','ODBCGETCONVERTVARBINARY','ODBCGETCONVERTTINYINT','ODBCGETCONVERTTIMESTAMP','ODBCGETCONVERTTIME','ODBCGETCONVERTSMALLINT','ODBCGETCONVERTREAL','ODBCGETCONVERTNUMERIC',
+            'ODBCGETCONVERTLONGVARCHAR','ODBCGETCONVERTLONGVARBINARY','ODBCGETCONVERTINTERVALYEARMONTH','ODBCGETCONVERTINTERVALDAYTIME','ODBCGETCONVERTINTEGER','ODBCGETCONVERTFUNCTIONS','ODBCGETCONVERTFLOAT','ODBCGETCONVERTDOUBLE',
+            'ODBCGETCONVERTDECIMAL','ODBCGETCONVERTDATE','ODBCGETCONVERTCHAR','ODBCGETCONVERTBIT','ODBCGETCONVERTBINARY','ODBCGETCONVERTBIGINT','ODBCGETCONNECTIONTIMEOUT','ODBCGETCONNECTIONSQLSTATE',
+            'ODBCGETCONNECTIONERRORINFO','ODBCGETCONNECTIONDEAD','ODBCGETCONNECTATTR','ODBCGETCONFIGMODE','ODBCGETCONCATNULLBEHAVIOR','ODBCGETCOLUMNALIAS','ODBCGETCOLLATIONSEQ','ODBCGETCATALOGUSAGE',
+            'ODBCGETCATALOGTERM','ODBCGETCATALOGNAMESEPARATOR','ODBCGETCATALOGNAME','ODBCGETCATALOGLOCATION','ODBCGETBOOKMARKPERSISTENCE','ODBCGETBATCHSUPPORT','ODBCGETBATCHROWCOUNT','ODBCGETAUTOIPD',
+            'ODBCGETAUTOCOMMIT','ODBCGETASYNCMODE','ODBCGETASYNCENABLE','ODBCGETALTERTABLE','ODBCGETALTERDOMAIN','ODBCGETAGGREGATEFUNCTIONS','ODBCGETACTIVEENVIRONMENTS','ODBCGETACCESSMODE',
+            'ODBCGETACCESSIBLETABLES','ODBCGETACCESSIBLEPROCEDURES','ODBCFREESTMT','ODBCFREEHANDLE','ODBCFREEENV','ODBCFREEDESC','ODBCFREEDBC','ODBCFREECONNECT',
+            'ODBCFOREIGNKEYSCOUNT','ODBCFOREIGNKEYS','ODBCFETCHSCROLL','ODBCFETCHBYBOOKMARK','ODBCFETCH','ODBCEXTENDEDFETCH','ODBCEXECUTE','ODBCEXECDIRECT',
+            'ODBCERROR','ODBCEOF','ODBCENDTRAN','ODBCDRIVERSCOUNT','ODBCDRIVERS','ODBCDRIVERCONNECT','ODBCDISCONNECT','ODBCDESCRIBEPARAM',
+            'ODBCDESCRIBECOL','ODBCDELETERECORD','ODBCDELETEBYBOOKMARK','ODBCDATASOURCES','ODBCCREATEDATASOURCE','ODBCCOPYDESC','ODBCCONNECTIONISDEAD','ODBCCONNECTIONISALIVE',
+            'ODBCCONNECT','ODBCCONFIGDRIVER','ODBCCONFIGDATASOURCE','ODBCCOMMITTRAN','ODBCCOMMITENVTRAN','ODBCCOMMITDBCTRAN','ODBCCOLUPDATABLE','ODBCCOLUNSIGNED',
+            'ODBCCOLUNNAMED','ODBCCOLUMNSCOUNT','ODBCCOLUMNS','ODBCCOLUMNPRIVILEGESCOUNT','ODBCCOLUMNPRIVILEGES','ODBCCOLUMN','ODBCCOLTYPENAME','ODBCCOLTYPE',
+            'ODBCCOLTABLENAME','ODBCCOLSEARCHABLE','ODBCCOLSCHEMANAME','ODBCCOLSCALE','ODBCCOLPRECISION','ODBCCOLOCTETLENGTH','ODBCCOLNUMPRECRADIX','ODBCCOLNULLABLE',
+            'ODBCCOLNAME','ODBCCOLLOCALTYPENAME','ODBCCOLLITERALSUFFIX','ODBCCOLLITERALPREFIX','ODBCCOLLENGTH','ODBCCOLLABEL','ODBCCOLISNULL','ODBCCOLFIXEDPRECSCALE',
+            'ODBCCOLDISPLAYSIZE','ODBCCOLCOUNT','ODBCCOLCONCISETYPE','ODBCCOLCATALOGNAME','ODBCCOLCASESENSITIVE','ODBCCOLBASETABLENAME','ODBCCOLBASECOLUMNNAME','ODBCCOLAUTOUNIQUEVALUE',
+            'ODBCCOLATTRIBUTE','ODBCCLOSESTMTCURSOR','ODBCCLOSESTMT','ODBCCLOSECURSOR','ODBCCLOSECONNECTION','ODBCCLEARRESULT','ODBCCANCEL','ODBCBULKOPERATIONS',
+            'ODBCBROWSECONNECT','ODBCBINDPARAMETER','ODBCBINDCOLTOWORD','ODBCBINDCOLTOTIMESTAMP','ODBCBINDCOLTOTIME','ODBCBINDCOLTOSTRING','ODBCBINDCOLTOSINGLE','ODBCBINDCOLTOQUAD',
+            'ODBCBINDCOLTONUMERIC','ODBCBINDCOLTOLONG','ODBCBINDCOLTOINTEGER','ODBCBINDCOLTODWORD','ODBCBINDCOLTODOUBLE','ODBCBINDCOLTODECIMAL','ODBCBINDCOLTODATE','ODBCBINDCOLTOCURRENCY',
+            'ODBCBINDCOLTOBYTE','ODBCBINDCOLTOBIT','ODBCBINDCOLTOBINARY','ODBCBINDCOL','ODBCALLOCSTMT','ODBCALLOCHANDLE','ODBCALLOCENV','ODBCALLOCDESC',
+            'ODBCALLOCDBC','ODBCALLOCCONNECT','ODBCADDRECORD','GLVIEWPORT','GLVERTEXPOINTER','GLVERTEX4SV','GLVERTEX4S','GLVERTEX4IV',
+            'GLVERTEX4I','GLVERTEX4FV','GLVERTEX4F','GLVERTEX4DV','GLVERTEX4D','GLVERTEX3SV','GLVERTEX3S','GLVERTEX3IV',
+            'GLVERTEX3I','GLVERTEX3FV','GLVERTEX3F','GLVERTEX3DV','GLVERTEX3D','GLVERTEX2SV','GLVERTEX2S','GLVERTEX2IV',
+            'GLVERTEX2I','GLVERTEX2FV','GLVERTEX2F','GLVERTEX2DV','GLVERTEX2D','GLUUNPROJECT','GLUTESSVERTEX','GLUTESSPROPERTY',
+            'GLUTESSNORMAL','GLUTESSENDPOLYGON','GLUTESSENDCONTOUR','GLUTESSCALLBACK','GLUTESSBEGINPOLYGON','GLUTESSBEGINCONTOUR','GLUSPHERE','GLUSCALEIMAGE',
+            'GLUQUADRICTEXTURE','GLUQUADRICORIENTATION','GLUQUADRICNORMALS','GLUQUADRICDRAWSTYLE','GLUQUADRICCALLBACK','GLUPWLCURVE','GLUPROJECT','GLUPICKMATRIX',
+            'GLUPERSPECTIVE','GLUPARTIALDISK','GLUORTHO2D','GLUNURBSSURFACE','GLUNURBSPROPERTY','GLUNURBSCURVE','GLUNURBSCALLBACK','GLUNEXTCONTOUR',
+            'GLUNEWTESS','GLUNEWQUADRIC','GLUNEWNURBSRENDERER','GLULOOKAT','GLULOADSAMPLINGMATRICES','GLUGETTESSPROPERTY','GLUGETSTRING','GLUGETNURBSPROPERTY',
+            'GLUERRORSTRING','GLUENDTRIM','GLUENDSURFACE','GLUENDPOLYGON','GLUENDCURVE','GLUDISK','GLUDELETETESS','GLUDELETEQUADRIC',
+            'GLUDELETENURBSRENDERER','GLUCYLINDER','GLUBUILD2DMIPMAPS','GLUBUILD1DMIPMAPS','GLUBEGINTRIM','GLUBEGINSURFACE','GLUBEGINPOLYGON','GLUBEGINCURVE',
+            'GLTRANSLATEF','GLTRANSLATED','GLTEXSUBIMAGE2D','GLTEXSUBIMAGE1D','GLTEXPARAMETERIV','GLTEXPARAMETERI','GLTEXPARAMETERFV','GLTEXPARAMETERF',
+            'GLTEXIMAGE2D','GLTEXIMAGE1D','GLTEXGENIV','GLTEXGENI','GLTEXGENFV','GLTEXGENF','GLTEXGENDV','GLTEXGEND',
+            'GLTEXENVIV','GLTEXENVI','GLTEXENVFV','GLTEXENVF','GLTEXCOORDPOINTER','GLTEXCOORD4SV','GLTEXCOORD4S','GLTEXCOORD4IV',
+            'GLTEXCOORD4I','GLTEXCOORD4FV','GLTEXCOORD4F','GLTEXCOORD4DV','GLTEXCOORD4D','GLTEXCOORD3SV','GLTEXCOORD3S','GLTEXCOORD3IV',
+            'GLTEXCOORD3I','GLTEXCOORD3FV','GLTEXCOORD3F','GLTEXCOORD3DV','GLTEXCOORD3D','GLTEXCOORD2SV','GLTEXCOORD2S','GLTEXCOORD2IV',
+            'GLTEXCOORD2I','GLTEXCOORD2FV','GLTEXCOORD2F','GLTEXCOORD2DV','GLTEXCOORD2D','GLTEXCOORD1SV','GLTEXCOORD1S','GLTEXCOORD1IV',
+            'GLTEXCOORD1I','GLTEXCOORD1FV','GLTEXCOORD1F','GLTEXCOORD1DV','GLTEXCOORD1D','GLSTENCILOP','GLSTENCILMASK','GLSTENCILFUNC',
+            'GLSHADEMODEL','GLSELECTBUFFER','GLSCISSOR','GLSCALEF','GLSCALED','GLROTATEF','GLROTATED','GLRENDERMODE',
+            'GLRECTSV','GLRECTS','GLRECTIV','GLRECTI','GLRECTFV','GLRECTF','GLRECTDV','GLRECTD',
+            'GLREADPIXELS','GLREADBUFFER','GLRASTERPOS4SV','GLRASTERPOS4S','GLRASTERPOS4IV','GLRASTERPOS4I','GLRASTERPOS4FV','GLRASTERPOS4F',
+            'GLRASTERPOS4DV','GLRASTERPOS4D','GLRASTERPOS3SV','GLRASTERPOS3S','GLRASTERPOS3IV','GLRASTERPOS3I','GLRASTERPOS3FV','GLRASTERPOS3F',
+            'GLRASTERPOS3DV','GLRASTERPOS3D','GLRASTERPOS2SV','GLRASTERPOS2S','GLRASTERPOS2IV','GLRASTERPOS2I','GLRASTERPOS2FV','GLRASTERPOS2F',
+            'GLRASTERPOS2DV','GLRASTERPOS2D','GLPUSHNAME','GLPUSHMATRIX','GLPUSHCLIENTATTRIB','GLPUSHATTRIB','GLPRIORITIZETEXTURES','GLPOPNAME',
+            'GLPOPMATRIX','GLPOPCLIENTATTRIB','GLPOPATTRIB','GLPOLYGONSTIPPLE','GLPOLYGONOFFSET','GLPOLYGONMODE','GLPOINTSIZE','GLPIXELZOOM',
+            'GLPIXELTRANSFERI','GLPIXELTRANSFERF','GLPIXELSTOREI','GLPIXELSTOREF','GLPIXELMAPUSV','GLPIXELMAPUIV','GLPIXELMAPFV','GLPASSTHROUGH',
+            'GLORTHO','GLNORMALPOINTER','GLNORMAL3SV','GLNORMAL3S','GLNORMAL3IV','GLNORMAL3I','GLNORMAL3FV','GLNORMAL3F',
+            'GLNORMAL3DV','GLNORMAL3D','GLNORMAL3BV','GLNORMAL3B','GLNEWLIST','GLMULTMATRIXF','GLMULTMATRIXD','GLMATRIXMODE',
+            'GLMATERIALIV','GLMATERIALI','GLMATERIALFV','GLMATERIALF','GLMAPGRID2F','GLMAPGRID2D','GLMAPGRID1F','GLMAPGRID1D',
+            'GLMAP2F','GLMAP2D','GLMAP1F','GLMAP1D','GLLOGICOP','GLLOADNAME','GLLOADMATRIXF','GLLOADMATRIXD',
+            'GLLOADIDENTITY','GLLISTBASE','GLLINEWIDTH','GLLINESTIPPLE','GLLIGHTMODELIV','GLLIGHTMODELI','GLLIGHTMODELFV','GLLIGHTMODELF',
+            'GLLIGHTIV','GLLIGHTI','GLLIGHTFV','GLLIGHTF','GLISTEXTURE','GLISLIST','GLISENABLED','GLINTERLEAVEDARRAYS',
+            'GLINITNAMES','GLINDEXUBV','GLINDEXUB','GLINDEXSV','GLINDEXS','GLINDEXPOINTER','GLINDEXMASK','GLINDEXIV',
+            'GLINDEXI','GLINDEXFV','GLINDEXF','GLINDEXDV','GLINDEXD','GLHINT','GLGETTEXPARAMETERIV','GLGETTEXPARAMETERFV',
+            'GLGETTEXLEVELPARAMETERIV','GLGETTEXLEVELPARAMETERFV','GLGETTEXIMAGE','GLGETTEXGENIV','GLGETTEXGENFV','GLGETTEXGENDV','GLGETTEXENVIV','GLGETTEXENVFV',
+            'GLGETSTRING','GLGETPOLYGONSTIPPLE','GLGETPOINTERV','GLGETPIXELMAPUSV','GLGETPIXELMAPUIV','GLGETPIXELMAPFV','GLGETMATERIALIV','GLGETMATERIALFV',
+            'GLGETMAPIV','GLGETMAPFV','GLGETMAPDV','GLGETLIGHTIV','GLGETLIGHTFV','GLGETINTEGERV','GLGETFLOATV','GLGETERROR',
+            'GLGETDOUBLEV','GLGETCLIPPLANE','GLGETBOOLEANV','GLGENTEXTURES','GLGENLISTS','GLFRUSTUM','GLFRONTFACE','GLFOGIV',
+            'GLFOGI','GLFOGFV','GLFOGF','GLFLUSH','GLFINISH','GLFEEDBACKBUFFER','GLEVALPOINT2','GLEVALPOINT1',
+            'GLEVALMESH2','GLEVALMESH1','GLEVALCOORD2FV','GLEVALCOORD2F','GLEVALCOORD2DV','GLEVALCOORD2D','GLEVALCOORD1FV','GLEVALCOORD1F',
+            'GLEVALCOORD1DV','GLEVALCOORD1D','GLENDLIST','GLEND','GLENABLECLIENTSTATE','GLENABLE','GLEDGEFLAGV','GLEDGEFLAGPOINTER',
+            'GLEDGEFLAG','GLDRAWPIXELS','GLDRAWELEMENTS','GLDRAWBUFFER','GLDRAWARRAYS','GLDISABLECLIENTSTATE','GLDISABLE','GLDEPTHRANGE',
+            'GLDEPTHMASK','GLDEPTHFUNC','GLDELETETEXTURES','GLDELETELISTS','GLCULLFACE','GLCOPYTEXSUBIMAGE2D','GLCOPYTEXSUBIMAGE1D','GLCOPYTEXIMAGE2D',
+            'GLCOPYTEXIMAGE1D','GLCOPYPIXELS','GLCOLORPOINTER','GLCOLORMATERIAL','GLCOLORMASK','GLCOLOR4USV','GLCOLOR4US','GLCOLOR4UIV',
+            'GLCOLOR4UI','GLCOLOR4UBV','GLCOLOR4UB','GLCOLOR4SV','GLCOLOR4S','GLCOLOR4IV','GLCOLOR4I','GLCOLOR4FV',
+            'GLCOLOR4F','GLCOLOR4DV','GLCOLOR4D','GLCOLOR4BV','GLCOLOR4B','GLCOLOR3USV','GLCOLOR3US','GLCOLOR3UIV',
+            'GLCOLOR3UI','GLCOLOR3UBV','GLCOLOR3UB','GLCOLOR3SV','GLCOLOR3S','GLCOLOR3IV','GLCOLOR3I','GLCOLOR3FV',
+            'GLCOLOR3F','GLCOLOR3DV','GLCOLOR3D','GLCOLOR3BV','GLCOLOR3B','GLCLIPPLANE','GLCLEARSTENCIL','GLCLEARINDEX',
+            'GLCLEARDEPTH','GLCLEARCOLOR','GLCLEARACCUM','GLCLEAR','GLCALLLISTS','GLCALLLIST','GLBLENDFUNC','GLBITMAP',
+            'GLBINDTEXTURE','GLBEGIN','GLARRAYELEMENT','GLARETEXTURESRESIDENT','GLALPHAFUNC','GLACCUM'),
+        2 => array(
+            '$BEL','$BS','$CR','$CRLF','$DQ','$DT_DATE_SEPARATOR','$DT_LANGUAGE','$DT_TIME_SEPARATOR',
+            '$ESC','$FF','$LF','$NUL','$PC_SD_MY_PC','$SPC','$SQL_OPT_TRACE_FILE_DEFAULT','$SQL_SPEC_STRING',
+            '$TAB','$TRACKBAR_CLASS','$VT','%ACM_OPEN','%ACM_OPENW','%ACM_PLAY','%ACM_STOP','%ACN_START',
+            '%ACN_STOP','%ACS_AUTOPLAY','%ACS_CENTER','%ACS_TIMER','%ACS_TRANSPARENT','%APP_COUNTER_FUNLOOKUP','%APP_COUNTER_KEYLOOKUP','%APP_COUNTER_LOOKUP',
+            '%APP_COUNTER_TESTALPHA','%APP_COUNTER_UDTLOOKUP','%APP_COUNTER_VARLOOKUP','%APP_TIMER_EXECTOTAL','%APP_TIMER_INIT','%APP_TIMER_LOAD','%APP_TIMER_PREPROCESSOR','%AW_ACTIVATE',
+            '%AW_BLEND','%AW_CENTER','%AW_HIDE','%AW_HOR_NEGATIVE','%AW_HOR_POSITIVE','%AW_SLIDE','%AW_VER_NEGATIVE','%AW_VER_POSITIVE',
+            '%BCM_FIRST','%BLACK','%BLUE','%BM_GETCHECK','%BM_SETCHECK','%BST_CHECKED','%BST_UNCHECKED','%BS_AUTOCHECKBOX',
+            '%BS_BOTTOM','%BS_CENTER','%BS_DEFAULT','%BS_DEFPUSHBUTTON','%BS_FLAT','%BS_LEFT','%BS_LEFTTEXT','%BS_MULTILINE',
+            '%BS_NOTIFY','%BS_OWNERDRAW','%BS_PUSHLIKE','%BS_RIGHT','%BS_TOP','%BS_VCENTER','%BUNDLE_BUILDER_CANCELLED','%CBM_FIRST',
+            '%CBN_CLOSEUP','%CBN_DBLCLK','%CBN_DROPDOWN','%CBN_EDITCHANGE','%CBN_EDITUPDATE','%CBN_ERRSPACE','%CBN_KILLFOCUS','%CBN_SELCANCEL',
+            '%CBN_SELCHANGE','%CBN_SELENDCANCEL','%CBN_SELENDOK','%CBN_SETFOCUS','%CBS_AUTOHSCROLL','%CBS_DISABLENOSCROLL','%CBS_DROPDOWN','%CBS_DROPDOWNLIST',
+            '%CBS_HASSTRINGS','%CBS_LOWERCASE','%CBS_NOINTEGRALHEIGHT','%CBS_SIMPLE','%CBS_SORT','%CBS_UPPERCASE','%CB_SELECTSTRING','%CCM_FIRST',
+            '%CC_ANYCOLOR','%CC_ENABLEHOOK','%CC_ENABLETEMPLATE','%CC_ENABLETEMPLATEHANDLE','%CC_FULLOPEN','%CC_PREVENTFULLOPEN','%CC_RGBINIT','%CC_SHOWHELP',
+            '%CC_SOLIDCOLOR','%CFE_BOLD','%CFE_ITALIC','%CFE_LINK','%CFE_PROTECTED','%CFE_STRIKEOUT','%CFE_UNDERLINE','%CFM_ANIMATION',
+            '%CFM_BACKCOLOR','%CFM_BOLD','%CFM_CHARSET','%CFM_COLOR','%CFM_FACE','%CFM_ITALIC','%CFM_KERNING','%CFM_LCID',
+            '%CFM_LINK','%CFM_OFFSET','%CFM_PROTECTED','%CFM_REVAUTHOR','%CFM_SIZE','%CFM_SPACING','%CFM_STRIKEOUT','%CFM_STYLE',
+            '%CFM_UNDERLINE','%CFM_UNDERLINETYPE','%CFM_WEIGHT','%CGI_ACCEPT_FILE_UPLOAD','%CGI_AUTO_ADD_SPECIAL_CHARS_PREFIX','%CGI_AUTO_CREATE_VARS','%CGI_BUFFERIZE_OUTPUT','%CGI_DOUBLE_QUOTE',
+            '%CGI_FILE_UPLOAD_BASEPATH','%CGI_FORCE_SESSION_VALIDATION','%CGI_MAX_BYTE_FROM_STD_IN','%CGI_REQUEST_METHOD_GET','%CGI_REQUEST_METHOD_POST','%CGI_SESSION_FILE_BASEPATH','%CGI_SINGLE_QUOTE','%CGI_SPECIAL_CHARS_PREFIX',
+            '%CGI_TEMPORARY_UPLOAD_PATH','%CGI_UPLOAD_CAN_OVERWRITE','%CGI_WRITE_LOG_FILE','%CGI_WRITE_VARS_INTO_LOG_FILE','%CONOLE_ATTACH_PARENT_PROCESS','%CONSOLE_BACKGROUND_BLUE','%CONSOLE_BACKGROUND_GREEN','%CONSOLE_BACKGROUND_INTENSITY',
+            '%CONSOLE_BACKGROUND_RED','%CONSOLE_BOX_FLAG_3DOFF','%CONSOLE_BOX_FLAG_3DON','%CONSOLE_BOX_FLAG_SHADOW','%CONSOLE_COMMON_LVB_GRID_HORIZONTAL','%CONSOLE_COMMON_LVB_GRID_LVERTICAL','%CONSOLE_COMMON_LVB_GRID_RVERTICAL','%CONSOLE_COMMON_LVB_LEADING_BYTE',
+            '%CONSOLE_COMMON_LVB_REVERSE_VIDEO','%CONSOLE_COMMON_LVB_TRAILING_BYTE','%CONSOLE_COMMON_LVB_UNDERSCORE','%CONSOLE_CTRL_BREAK_EVENT','%CONSOLE_CTRL_C_EVENT','%CONSOLE_DOUBLE_CLICK','%CONSOLE_ENABLE_AUTO_POSITION','%CONSOLE_ENABLE_ECHO_INPUT',
+            '%CONSOLE_ENABLE_EXTENDED_FLAGS','%CONSOLE_ENABLE_INSERT_MODE','%CONSOLE_ENABLE_LINE_INPUT','%CONSOLE_ENABLE_MOUSE_INPUT','%CONSOLE_ENABLE_PROCESSED_INPUT','%CONSOLE_ENABLE_PROCESSED_OUTPUT','%CONSOLE_ENABLE_QUICK_EDIT_MODE','%CONSOLE_ENABLE_WINDOW_INPUT',
+            '%CONSOLE_ENABLE_WRAP_AT_EOL_OUTPUT','%CONSOLE_FOREGROUND_BLUE','%CONSOLE_FOREGROUND_GREEN','%CONSOLE_FOREGROUND_INTENSITY','%CONSOLE_FOREGROUND_RED','%CONSOLE_LBUTTON','%CONSOLE_LINE_HORIZONTAL','%CONSOLE_LINE_VERTICAL',
+            '%CONSOLE_MBUTTON','%CONSOLE_MOUSE_MOVED','%CONSOLE_MOUSE_WHEELED','%CONSOLE_RBUTTON','%CONSOLE_SCROLLBUF_DOWN','%CONSOLE_SCROLLBUF_UP','%CONSOLE_SCROLLWND_ABSOLUTE','%CONSOLE_SCROLLWND_RELATIVE',
+            '%CONSOLE_STD_ERROR_HANDLE','%CONSOLE_STD_INPUT_HANDLE','%CONSOLE_STD_OUTPUT_HANDLE','%CONSOLE_SW_FORCEMINIMIZE','%CONSOLE_SW_HIDE','%CONSOLE_SW_MAXIMIZE','%CONSOLE_SW_MINIMIZE','%CONSOLE_SW_RESTORE',
+            '%CONSOLE_SW_SHOW','%CONSOLE_SW_SHOWDEFAULT','%CONSOLE_SW_SHOWMAXIMIZED','%CONSOLE_SW_SHOWMINIMIZED','%CONSOLE_SW_SHOWMINNOACTIVE','%CONSOLE_SW_SHOWNA','%CONSOLE_SW_SHOWNOACTIVATE','%CONSOLE_SW_SHOWNORMAL',
+            '%CONSOLE_UNAVAILABLE','%CRYPTO_CALG_DES','%CRYPTO_CALG_RC2','%CRYPTO_CALG_RC4','%CRYPTO_PROV_DH_SCHANNEL','%CRYPTO_PROV_DSS','%CRYPTO_PROV_DSS_DH','%CRYPTO_PROV_FORTEZZA',
+            '%CRYPTO_PROV_MS_EXCHANGE','%CRYPTO_PROV_RSA_FULL','%CRYPTO_PROV_RSA_SCHANNEL','%CRYPTO_PROV_RSA_SIG','%CRYPTO_PROV_SSL','%CSIDL_ADMINTOOLS','%CSIDL_ALTSTARTUP','%CSIDL_APPDATA',
+            '%CSIDL_BITBUCKET','%CSIDL_CDBURN_AREA','%CSIDL_COMMON_ADMINTOOLS','%CSIDL_COMMON_ALTSTARTUP','%CSIDL_COMMON_APPDATA','%CSIDL_COMMON_DESKTOPDIRECTORY','%CSIDL_COMMON_DOCUMENTS','%CSIDL_COMMON_FAVORITES',
+            '%CSIDL_COMMON_MUSIC','%CSIDL_COMMON_PICTURES','%CSIDL_COMMON_PROGRAMS','%CSIDL_COMMON_STARTMENU','%CSIDL_COMMON_STARTUP','%CSIDL_COMMON_TEMPLATES','%CSIDL_COMMON_VIDEO','%CSIDL_CONTROLS',
+            '%CSIDL_COOKIES','%CSIDL_DESKTOP','%CSIDL_DESKTOPDIRECTORY','%CSIDL_DRIVES','%CSIDL_FAVORITES','%CSIDL_FLAG_CREATE','%CSIDL_FONTS','%CSIDL_HISTORY',
+            '%CSIDL_INTERNET','%CSIDL_INTERNET_CACHE','%CSIDL_LOCAL_APPDATA','%CSIDL_MYDOCUMENTS','%CSIDL_MYMUSIC','%CSIDL_MYPICTURES','%CSIDL_MYVIDEO','%CSIDL_NETHOOD',
+            '%CSIDL_NETWORK','%CSIDL_PERSONAL','%CSIDL_PRINTERS','%CSIDL_PRINTHOOD','%CSIDL_PROFILE','%CSIDL_PROGRAMS','%CSIDL_PROGRAM_FILES','%CSIDL_PROGRAM_FILES_COMMON',
+            '%CSIDL_RECENT','%CSIDL_SENDTO','%CSIDL_STARTMENU','%CSIDL_STARTUP','%CSIDL_SYSTEM','%CSIDL_TEMPLATES','%CSIDL_WINDOWS','%CW_USEDEFAULT',
+            '%CYAN','%DATE_TIME_FILE_CREATION','%DATE_TIME_LAST_FILE_ACCESS','%DATE_TIME_LAST_FILE_WRITE','%DICTIONARY_MEMINFO_DATA','%DICTIONARY_MEMINFO_KEYS','%DICTIONARY_MEMINFO_TOTAL','%DICTIONARY_SORTDESCENDING',
+            '%DICTIONARY_SORTKEYS','%DSCAPS_CERTIFIED','%DSCAPS_CONTINUOUSRATE','%DSCAPS_EMULDRIVER','%DSCAPS_SECONDARY16BIT','%DSCAPS_SECONDARY8BIT','%DSCAPS_SECONDARYMONO','%DSCAPS_SECONDARYSTEREO',
+            '%DSCCAPS_CERTIFIED','%DSCCAPS_EMULDRIVER','%DS_3DLOOK','%DS_ABSALIGN','%DS_CENTER','%DS_CENTERMOUSE','%DS_CONTEXTHELP','%DS_CONTROL',
+            '%DS_MODALFRAME','%DS_NOFAILCREATE','%DS_SETFONT','%DS_SETFOREGROUND','%DS_SYSMODAL','%DTM_FIRST','%DTM_GETMCCOLOR','%DTM_GETMCFONT',
+            '%DTM_GETMONTHCAL','%DTM_GETRANGE','%DTM_GETSYSTEMTIME','%DTM_SETFORMAT','%DTM_SETFORMATW','%DTM_SETMCCOLOR','%DTM_SETMCFONT','%DTM_SETRANGE',
+            '%DTM_SETSYSTEMTIME','%DTN_CLOSEUP','%DTN_DATETIMECHANGE','%DTN_DROPDOWN','%DTN_FORMAT','%DTN_FORMATQUERY','%DTN_FORMATQUERYW','%DTN_FORMATW',
+            '%DTN_USERSTRING','%DTN_USERSTRINGW','%DTN_WMKEYDOWN','%DTN_WMKEYDOWNW','%DTS_APPCANPARSE','%DTS_LONGDATEFORMAT','%DTS_RIGHTALIGN','%DTS_SHORTDATECENTURYFORMAT',
+            '%DTS_SHORTDATEFORMAT','%DTS_SHOWNONE','%DTS_TIMEFORMAT','%DTS_UPDOWN','%DT_DATE_CENTURY','%DT_DATE_OK','%DT_DAY_IN_YEAR','%DT_DIFF_IN_DAYS',
+            '%DT_DIFF_IN_HOURS','%DT_DIFF_IN_MINUTES','%DT_DIFF_IN_SECONDS','%DT_HOURS_IN_DAY','%DT_MINUTES_IN_HOUR','%DT_SECONDS_IN_DAY','%DT_SECONDS_IN_HOUR','%DT_SECONDS_IN_MINUTE',
+            '%DT_SECONDS_IN_YEAR','%DT_USE_LONG_FORM','%DT_USE_SHORT_FORM','%DT_WRONG_DATE','%DT_WRONG_DAY','%DT_WRONG_MONTH','%ECM_FIRST','%ECOOP_AND',
+            '%ECOOP_OR','%ECOOP_SET','%ECOOP_XOR','%ECO_AUTOHSCROLL','%ECO_AUTOVSCROLL','%ECO_AUTOWORDSELECTION','%ECO_NOHIDESEL','%ECO_READONLY',
+            '%ECO_SELECTIONBAR','%ECO_WANTRETURN','%EM_AUTOURLDETECT','%EM_CANPASTE','%EM_CANREDO','%EM_CANUNDO','%EM_CHARFROMPOS','%EM_DISPLAYBAND',
+            '%EM_EMPTYUNDOBUFFER','%EM_EXGETSEL','%EM_EXLIMITTEXT','%EM_EXLINEFROMCHAR','%EM_EXSETSEL','%EM_FINDTEXT','%EM_FINDTEXTEX','%EM_FINDWORDBREAK',
+            '%EM_FMTLINES','%EM_FORMATRANGE','%EM_GETAUTOURLDETECT','%EM_GETCHARFORMAT','%EM_GETEDITSTYLE','%EM_GETEVENTMASK','%EM_GETFIRSTVISIBLELINE','%EM_GETHANDLE',
+            '%EM_GETIMESTATUS','%EM_GETLIMITTEXT','%EM_GETLINE','%EM_GETLINECOUNT','%EM_GETMARGINS','%EM_GETMODIFY','%EM_GETOLEINTERFACE','%EM_GETOPTIONS',
+            '%EM_GETPARAFORMAT','%EM_GETPASSWORDCHAR','%EM_GETRECT','%EM_GETREDONAME','%EM_GETSCROLLPOS','%EM_GETSEL','%EM_GETSELTEXT','%EM_GETTEXTMODE',
+            '%EM_GETTEXTRANGE','%EM_GETTHUMB','%EM_GETUNDONAME','%EM_GETWORDBREAKPROC','%EM_GETWORDBREAKPROCEX','%EM_HIDESELECTION','%EM_LIMITTEXT','%EM_LINEFROMCHAR',
+            '%EM_LINEINDEX','%EM_LINELENGTH','%EM_LINESCROLL','%EM_PASTESPECIAL','%EM_POSFROMCHAR','%EM_REDO','%EM_REPLACESEL','%EM_REQUESTRESIZE',
+            '%EM_SCROLL','%EM_SCROLLCARET','%EM_SELECTIONTYPE','%EM_SETBKGNDCOLOR','%EM_SETCHARFORMAT','%EM_SETEDITSTYLE','%EM_SETEVENTMASK','%EM_SETHANDLE',
+            '%EM_SETIMESTATUS','%EM_SETLIMITTEXT','%EM_SETMARGINS','%EM_SETMODIFY','%EM_SETOLECALLBACK','%EM_SETOPTIONS','%EM_SETPARAFORMAT','%EM_SETPASSWORDCHAR',
+            '%EM_SETREADONLY','%EM_SETRECT','%EM_SETRECTNP','%EM_SETSCROLLPOS','%EM_SETSEL','%EM_SETTABSTOPS','%EM_SETTARGETDEVICE','%EM_SETTEXTMODE',
+            '%EM_SETUNDOLIMIT','%EM_SETWORDBREAKPROC','%EM_SETWORDBREAKPROCEX','%EM_SETWORDWRAPMODE','%EM_SETZOOM','%EM_STOPGROUPTYPING','%EM_STREAMIN','%EM_STREAMOUT',
+            '%EM_UNDO','%ENM_CHANGE','%ENM_CORRECTTEXT','%ENM_DRAGDROPDONE','%ENM_DROPFILES','%ENM_KEYEVENTS','%ENM_MOUSEEVENTS','%ENM_NONE',
+            '%ENM_PARAGRAPHEXPANDED','%ENM_PROTECTED','%ENM_REQUESTRESIZE','%ENM_SCROLL','%ENM_SCROLLEVENTS','%ENM_SELCHANGE','%ENM_UPDATE','%EN_CHANGE',
+            '%EN_MSGFILTER','%EN_SELCHANGE','%EN_UPDATE','%ES_AUTOHSCROLL','%ES_AUTOVSCROLL','%ES_CENTER','%ES_DISABLENOSCROLL','%ES_EX_NOCALLOLEINIT',
+            '%ES_LEFT','%ES_LOWERCASE','%ES_MULTILINE','%ES_NOHIDESEL','%ES_NOOLEDRAGDROP','%ES_NUMBER','%ES_OEMCONVERT','%ES_PASSWORD',
+            '%ES_READONLY','%ES_RIGHT','%ES_SAVESEL','%ES_SELECTIONBAR','%ES_SUNKEN','%ES_UPPERCASE','%ES_WANTRETURN','%EVAL_EXEC_STRING',
+            '%FALSE','%FILE_ADDPATH','%FILE_ARCHIVE','%FILE_BUILDVERSION','%FILE_HIDDEN','%FILE_MAJORVERSION','%FILE_MINORVERSION','%FILE_NORMAL',
+            '%FILE_READONLY','%FILE_REVISIONVERSION','%FILE_SUBDIR','%FILE_SYSTEM','%FILE_VLABEL','%FTP_GET_CONNECT_STATUS','%FTP_GET_FILE_BYTES_RCVD','%FTP_GET_FILE_BYTES_SENT',
+            '%FTP_GET_LAST_RESPONSE','%FTP_GET_LOCAL_IP','%FTP_GET_SERVER_IP','%FTP_GET_TOTAL_BYTES_RCVD','%FTP_GET_TOTAL_BYTES_SENT','%FTP_LIST_FULLLIST','%FTP_LIST_FULLLISTDIR','%FTP_LIST_FULLLISTFILE',
+            '%FTP_SET_ASYNC','%FTP_SET_CONNECT_WAIT','%FTP_SET_MAX_LISTEN_WAIT','%FTP_SET_MAX_RESPONSE_WAIT','%FTP_SET_PASSIVE','%FTP_SET_SYNC','%FW_BLACK','%FW_BOLD',
+            '%FW_DEMIBOLD','%FW_DONTCARE','%FW_EXTRABOLD','%FW_EXTRALIGHT','%FW_HEAVY','%FW_LIGHT','%FW_MEDIUM','%FW_NORMAL',
+            '%FW_REGULAR','%FW_SEMIBOLD','%FW_THIN','%FW_ULTRABOLD','%FW_ULTRALIGHT','%GDTR_MAX','%GDTR_MIN','%GLU_AUTO_LOAD_MATRIX',
+            '%GLU_BEGIN','%GLU_CCW','%GLU_CULLING','%GLU_CW','%GLU_DISPLAY_MODE','%GLU_DOMAIN_DISTANCE','%GLU_EDGE_FLAG','%GLU_END',
+            '%GLU_ERROR','%GLU_EXTENSIONS','%GLU_EXTERIOR','%GLU_FALSE','%GLU_FILL','%GLU_FLAT','%GLU_INCOMPATIBLE_GL_VERSION','%GLU_INSIDE',
+            '%GLU_INTERIOR','%GLU_INVALID_ENUM','%GLU_INVALID_VALUE','%GLU_LINE','%GLU_MAP1_TRIM_2','%GLU_MAP1_TRIM_3','%GLU_NONE','%GLU_NURBS_ERROR1',
+            '%GLU_NURBS_ERROR10','%GLU_NURBS_ERROR11','%GLU_NURBS_ERROR12','%GLU_NURBS_ERROR13','%GLU_NURBS_ERROR14','%GLU_NURBS_ERROR15','%GLU_NURBS_ERROR16','%GLU_NURBS_ERROR17',
+            '%GLU_NURBS_ERROR18','%GLU_NURBS_ERROR19','%GLU_NURBS_ERROR2','%GLU_NURBS_ERROR20','%GLU_NURBS_ERROR21','%GLU_NURBS_ERROR22','%GLU_NURBS_ERROR23','%GLU_NURBS_ERROR24',
+            '%GLU_NURBS_ERROR25','%GLU_NURBS_ERROR26','%GLU_NURBS_ERROR27','%GLU_NURBS_ERROR28','%GLU_NURBS_ERROR29','%GLU_NURBS_ERROR3','%GLU_NURBS_ERROR30','%GLU_NURBS_ERROR31',
+            '%GLU_NURBS_ERROR32','%GLU_NURBS_ERROR33','%GLU_NURBS_ERROR34','%GLU_NURBS_ERROR35','%GLU_NURBS_ERROR36','%GLU_NURBS_ERROR37','%GLU_NURBS_ERROR4','%GLU_NURBS_ERROR5',
+            '%GLU_NURBS_ERROR6','%GLU_NURBS_ERROR7','%GLU_NURBS_ERROR8','%GLU_NURBS_ERROR9','%GLU_OUTLINE_PATCH','%GLU_OUTLINE_POLYGON','%GLU_OUTSIDE','%GLU_OUT_OF_MEMORY',
+            '%GLU_PARAMETRIC_ERROR','%GLU_PARAMETRIC_TOLERANCE','%GLU_PATH_LENGTH','%GLU_POINT','%GLU_SAMPLING_METHOD','%GLU_SAMPLING_TOLERANCE','%GLU_SILHOUETTE','%GLU_SMOOTH',
+            '%GLU_TESS_BEGIN','%GLU_TESS_BEGIN_DATA','%GLU_TESS_BOUNDARY_ONLY','%GLU_TESS_COMBINE','%GLU_TESS_COMBINE_DATA','%GLU_TESS_COORD_TOO_LARGE','%GLU_TESS_EDGE_FLAG','%GLU_TESS_EDGE_FLAG_DATA',
+            '%GLU_TESS_END','%GLU_TESS_END_DATA','%GLU_TESS_ERROR','%GLU_TESS_ERROR1','%GLU_TESS_ERROR2','%GLU_TESS_ERROR3','%GLU_TESS_ERROR4','%GLU_TESS_ERROR5',
+            '%GLU_TESS_ERROR6','%GLU_TESS_ERROR7','%GLU_TESS_ERROR8','%GLU_TESS_ERROR_DATA','%GLU_TESS_MISSING_BEGIN_CONTOUR','%GLU_TESS_MISSING_BEGIN_POLYGON','%GLU_TESS_MISSING_END_CONTOUR','%GLU_TESS_MISSING_END_POLYGON',
+            '%GLU_TESS_NEED_COMBINE_CALLBACK','%GLU_TESS_TOLERANCE','%GLU_TESS_VERTEX','%GLU_TESS_VERTEX_DATA','%GLU_TESS_WINDING_ABS_GEQ_TWO','%GLU_TESS_WINDING_NEGATIVE','%GLU_TESS_WINDING_NONZERO','%GLU_TESS_WINDING_ODD',
+            '%GLU_TESS_WINDING_POSITIVE','%GLU_TESS_WINDING_RULE','%GLU_TRUE','%GLU_UNKNOWN','%GLU_U_STEP','%GLU_VERSION','%GLU_VERSION_1_1','%GLU_VERSION_1_2',
+            '%GLU_VERTEX','%GLU_V_STEP','%GL_2D','%GL_2_BYTES','%GL_3D','%GL_3D_COLOR','%GL_3D_COLOR_TEXTURE','%GL_3_BYTES',
+            '%GL_4D_COLOR_TEXTURE','%GL_4_BYTES','%GL_ABGR_EXT','%GL_ACCUM','%GL_ACCUM_ALPHA_BITS','%GL_ACCUM_BLUE_BITS','%GL_ACCUM_BUFFER_BIT','%GL_ACCUM_CLEAR_VALUE',
+            '%GL_ACCUM_GREEN_BITS','%GL_ACCUM_RED_BITS','%GL_ADD','%GL_ALL_ATTRIB_BITS','%GL_ALPHA','%GL_ALPHA12','%GL_ALPHA16','%GL_ALPHA4',
+            '%GL_ALPHA8','%GL_ALPHA_BIAS','%GL_ALPHA_BITS','%GL_ALPHA_SCALE','%GL_ALPHA_TEST','%GL_ALPHA_TEST_FUNC','%GL_ALPHA_TEST_REF','%GL_ALWAYS',
+            '%GL_AMBIENT','%GL_AMBIENT_AND_DIFFUSE','%GL_AND','%GL_AND_INVERTED','%GL_AND_REVERSE','%GL_ARRAY_ELEMENT_LOCK_COUNT_EXT','%GL_ARRAY_ELEMENT_LOCK_FIRST_EXT','%GL_ATTRIB_STACK_DEPTH',
+            '%GL_AUTO_NORMAL','%GL_AUX0','%GL_AUX1','%GL_AUX2','%GL_AUX3','%GL_AUX_BUFFERS','%GL_BACK','%GL_BACK_LEFT',
+            '%GL_BACK_RIGHT','%GL_BGRA_EXT','%GL_BGR_EXT','%GL_BITMAP','%GL_BITMAP_TOKEN','%GL_BLEND','%GL_BLEND_COLOR_EXT','%GL_BLEND_DST',
+            '%GL_BLEND_EQUATION_EXT','%GL_BLEND_SRC','%GL_BLUE','%GL_BLUE_BIAS','%GL_BLUE_BITS','%GL_BLUE_SCALE','%GL_BYTE','%GL_C3F_V3F',
+            '%GL_C4F_N3F_V3F','%GL_C4UB_V2F','%GL_C4UB_V3F','%GL_CCW','%GL_CLAMP','%GL_CLEAR','%GL_CLIENT_ALL_ATTRIB_BITS','%GL_CLIENT_ATTRIB_STACK_DEPTH',
+            '%GL_CLIENT_PIXEL_STORE_BIT','%GL_CLIENT_VERTEX_ARRAY_BIT','%GL_CLIP_PLANE0','%GL_CLIP_PLANE1','%GL_CLIP_PLANE2','%GL_CLIP_PLANE3','%GL_CLIP_PLANE4','%GL_CLIP_PLANE5',
+            '%GL_CLIP_VOLUME_CLIPPING_HINT_EXT','%GL_COEFF','%GL_COLOR','%GL_COLOR_ARRAY','%GL_COLOR_ARRAY_COUNT_EXT','%GL_COLOR_ARRAY_EXT','%GL_COLOR_ARRAY_POINTER','%GL_COLOR_ARRAY_POINTER_EXT',
+            '%GL_COLOR_ARRAY_SIZE','%GL_COLOR_ARRAY_SIZE_EXT','%GL_COLOR_ARRAY_STRIDE','%GL_COLOR_ARRAY_STRIDE_EXT','%GL_COLOR_ARRAY_TYPE','%GL_COLOR_ARRAY_TYPE_EXT','%GL_COLOR_BUFFER_BIT','%GL_COLOR_CLEAR_VALUE',
+            '%GL_COLOR_INDEX','%GL_COLOR_INDEX12_EXT','%GL_COLOR_INDEX16_EXT','%GL_COLOR_INDEX1_EXT','%GL_COLOR_INDEX2_EXT','%GL_COLOR_INDEX4_EXT','%GL_COLOR_INDEX8_EXT','%GL_COLOR_INDEXES',
+            '%GL_COLOR_LOGIC_OP','%GL_COLOR_MATERIAL','%GL_COLOR_MATERIAL_FACE','%GL_COLOR_MATERIAL_PARAMETER','%GL_COLOR_SUM_EXT','%GL_COLOR_TABLE_ALPHA_SIZE_EXT','%GL_COLOR_TABLE_BIAS_EXT','%GL_COLOR_TABLE_BLUE_SIZE_EXT',
+            '%GL_COLOR_TABLE_EXT','%GL_COLOR_TABLE_FORMAT_EXT','%GL_COLOR_TABLE_GREEN_SIZE_EXT','%GL_COLOR_TABLE_INTENSITY_SIZE_EXT','%GL_COLOR_TABLE_LUMINANCE_SIZE_EXT','%GL_COLOR_TABLE_RED_SIZE_EXT','%GL_COLOR_TABLE_SCALE_EXT','%GL_COLOR_TABLE_WIDTH_EXT',
+            '%GL_COLOR_WRITEMASK','%GL_COMPILE','%GL_COMPILE_AND_EXECUTE','%GL_CONSTANT_ALPHA_EXT','%GL_CONSTANT_ATTENUATION','%GL_CONSTANT_COLOR_EXT','%GL_CONVOLUTION_1D_EXT','%GL_CONVOLUTION_2D_EXT',
+            '%GL_CONVOLUTION_BORDER_MODE_EXT','%GL_CONVOLUTION_FILTER_BIAS_EXT','%GL_CONVOLUTION_FILTER_SCALE_EXT','%GL_CONVOLUTION_FORMAT_EXT','%GL_CONVOLUTION_HEIGHT_EXT','%GL_CONVOLUTION_WIDTH_EXT','%GL_COPY','%GL_COPY_INVERTED',
+            '%GL_COPY_PIXEL_TOKEN','%GL_CULL_FACE','%GL_CULL_FACE_MODE','%GL_CULL_VERTEX_EXT','%GL_CULL_VERTEX_EYE_POSITION_EXT','%GL_CULL_VERTEX_OBJECT_POSITION_EXT','%GL_CURRENT_BIT','%GL_CURRENT_COLOR',
+            '%GL_CURRENT_INDEX','%GL_CURRENT_NORMAL','%GL_CURRENT_RASTER_COLOR','%GL_CURRENT_RASTER_DISTANCE','%GL_CURRENT_RASTER_INDEX','%GL_CURRENT_RASTER_POSITION','%GL_CURRENT_RASTER_POSITION_VALID','%GL_CURRENT_RASTER_TEXTURE_COORDS',
+            '%GL_CURRENT_SECONDARY_COLOR_EXT','%GL_CURRENT_TEXTURE_COORDS','%GL_CW','%GL_DECAL','%GL_DECR','%GL_DEPTH','%GL_DEPTH_BIAS','%GL_DEPTH_BITS',
+            '%GL_DEPTH_BUFFER_BIT','%GL_DEPTH_CLEAR_VALUE','%GL_DEPTH_COMPONENT','%GL_DEPTH_FUNC','%GL_DEPTH_RANGE','%GL_DEPTH_SCALE','%GL_DEPTH_TEST','%GL_DEPTH_WRITEMASK',
+            '%GL_DIFFUSE','%GL_DITHER','%GL_DOMAIN','%GL_DONT_CARE','%GL_DOUBLE','%GL_DOUBLEBUFFER','%GL_DOUBLE_EXT','%GL_DRAW_BUFFER',
+            '%GL_DRAW_PIXEL_TOKEN','%GL_DST_ALPHA','%GL_DST_COLOR','%GL_EDGE_FLAG','%GL_EDGE_FLAG_ARRAY','%GL_EDGE_FLAG_ARRAY_COUNT_EXT','%GL_EDGE_FLAG_ARRAY_EXT','%GL_EDGE_FLAG_ARRAY_POINTER',
+            '%GL_EDGE_FLAG_ARRAY_POINTER_EXT','%GL_EDGE_FLAG_ARRAY_STRIDE','%GL_EDGE_FLAG_ARRAY_STRIDE_EXT','%GL_EMISSION','%GL_ENABLE_BIT','%GL_EQUAL','%GL_EQUIV','%GL_EVAL_BIT',
+            '%GL_EXP','%GL_EXP2','%GL_EXTENSIONS','%GL_EXT_ABGR','%GL_EXT_BGRA','%GL_EXT_BLEND_COLOR','%GL_EXT_BLEND_MINMAX','%GL_EXT_BLEND_SUBTRACT',
+            '%GL_EXT_CLIP_VOLUME_HINT','%GL_EXT_COLOR_TABLE','%GL_EXT_COMPILED_VERTEX_ARRAY','%GL_EXT_CONVOLUTION','%GL_EXT_CULL_VERTEX','%GL_EXT_HISTOGRAM','%GL_EXT_PACKED_PIXELS','%GL_EXT_PALETTED_TEXTURE',
+            '%GL_EXT_POLYGON_OFFSET','%GL_EXT_SECONDARY_COLOR','%GL_EXT_SEPARATE_SPECULAR_COLOR','%GL_EXT_VERTEX_ARRAY','%GL_EYE_LINEAR','%GL_EYE_PLANE','%GL_FALSE','%GL_FASTEST',
+            '%GL_FEEDBACK','%GL_FEEDBACK_BUFFER_POINTER','%GL_FEEDBACK_BUFFER_SIZE','%GL_FEEDBACK_BUFFER_TYPE','%GL_FILL','%GL_FLAT','%GL_FLOAT','%GL_FOG',
+            '%GL_FOG_BIT','%GL_FOG_COLOR','%GL_FOG_DENSITY','%GL_FOG_END','%GL_FOG_HINT','%GL_FOG_INDEX','%GL_FOG_MODE','%GL_FOG_START',
+            '%GL_FRONT','%GL_FRONT_AND_BACK','%GL_FRONT_FACE','%GL_FRONT_LEFT','%GL_FRONT_RIGHT','%GL_FUNC_ADD_EXT','%GL_FUNC_REVERSE_SUBTRACT_EXT','%GL_FUNC_SUBTRACT_EXT',
+            '%GL_GEQUAL','%GL_GREATER','%GL_GREEN','%GL_GREEN_BIAS','%GL_GREEN_BITS','%GL_GREEN_SCALE','%GL_HINT_BIT','%GL_HISTOGRAM_ALPHA_SIZE_EXT',
+            '%GL_HISTOGRAM_BLUE_SIZE_EXT','%GL_HISTOGRAM_EXT','%GL_HISTOGRAM_FORMAT_EXT','%GL_HISTOGRAM_GREEN_SIZE_EXT','%GL_HISTOGRAM_LUMINANCE_SIZE_EXT','%GL_HISTOGRAM_RED_SIZE_EXT','%GL_HISTOGRAM_SINK_EXT','%GL_HISTOGRAM_WIDTH_EXT',
+            '%GL_INCR','%GL_INDEX_ARRAY','%GL_INDEX_ARRAY_COUNT_EXT','%GL_INDEX_ARRAY_EXT','%GL_INDEX_ARRAY_POINTER','%GL_INDEX_ARRAY_POINTER_EXT','%GL_INDEX_ARRAY_STRIDE','%GL_INDEX_ARRAY_STRIDE_EXT',
+            '%GL_INDEX_ARRAY_TYPE','%GL_INDEX_ARRAY_TYPE_EXT','%GL_INDEX_BITS','%GL_INDEX_CLEAR_VALUE','%GL_INDEX_LOGIC_OP','%GL_INDEX_MODE','%GL_INDEX_OFFSET','%GL_INDEX_SHIFT',
+            '%GL_INDEX_WRITEMASK','%GL_INT','%GL_INTENSITY','%GL_INTENSITY12','%GL_INTENSITY16','%GL_INTENSITY4','%GL_INTENSITY8','%GL_INVALID_ENUM',
+            '%GL_INVALID_OPERATION','%GL_INVALID_VALUE','%GL_INVERT','%GL_KEEP','%GL_LEFT','%GL_LEQUAL','%GL_LESS','%GL_LIGHT0',
+            '%GL_LIGHT1','%GL_LIGHT2','%GL_LIGHT3','%GL_LIGHT4','%GL_LIGHT5','%GL_LIGHT6','%GL_LIGHT7','%GL_LIGHTING',
+            '%GL_LIGHTING_BIT','%GL_LIGHT_MODEL_AMBIENT','%GL_LIGHT_MODEL_COLOR_CONTROL_EXT','%GL_LIGHT_MODEL_LOCAL_VIEWER','%GL_LIGHT_MODEL_TWO_SIDE','%GL_LINE','%GL_LINEAR','%GL_LINEAR_ATTENUATION',
+            '%GL_LINEAR_MIPMAP_LINEAR','%GL_LINEAR_MIPMAP_NEAREST','%GL_LINES','%GL_LINE_BIT','%GL_LINE_LOOP','%GL_LINE_RESET_TOKEN','%GL_LINE_SMOOTH','%GL_LINE_SMOOTH_HINT',
+            '%GL_LINE_STIPPLE','%GL_LINE_STIPPLE_PATTERN','%GL_LINE_STIPPLE_REPEAT','%GL_LINE_STRIP','%GL_LINE_TOKEN','%GL_LINE_WIDTH','%GL_LINE_WIDTH_GRANULARITY','%GL_LINE_WIDTH_RANGE',
+            '%GL_LIST_BASE','%GL_LIST_BIT','%GL_LIST_INDEX','%GL_LIST_MODE','%GL_LOAD','%GL_LOGIC_OP','%GL_LOGIC_OP_MODE','%GL_LUMINANCE',
+            '%GL_LUMINANCE12','%GL_LUMINANCE12_ALPHA12','%GL_LUMINANCE12_ALPHA4','%GL_LUMINANCE16','%GL_LUMINANCE16_ALPHA16','%GL_LUMINANCE4','%GL_LUMINANCE4_ALPHA4','%GL_LUMINANCE6_ALPHA2',
+            '%GL_LUMINANCE8','%GL_LUMINANCE8_ALPHA8','%GL_LUMINANCE_ALPHA','%GL_MAP1_COLOR_4','%GL_MAP1_GRID_DOMAIN','%GL_MAP1_GRID_SEGMENTS','%GL_MAP1_INDEX','%GL_MAP1_NORMAL',
+            '%GL_MAP1_TEXTURE_COORD_1','%GL_MAP1_TEXTURE_COORD_2','%GL_MAP1_TEXTURE_COORD_3','%GL_MAP1_TEXTURE_COORD_4','%GL_MAP1_VERTEX_3','%GL_MAP1_VERTEX_4','%GL_MAP2_COLOR_4','%GL_MAP2_GRID_DOMAIN',
+            '%GL_MAP2_GRID_SEGMENTS','%GL_MAP2_INDEX','%GL_MAP2_NORMAL','%GL_MAP2_TEXTURE_COORD_1','%GL_MAP2_TEXTURE_COORD_2','%GL_MAP2_TEXTURE_COORD_3','%GL_MAP2_TEXTURE_COORD_4','%GL_MAP2_VERTEX_3',
+            '%GL_MAP2_VERTEX_4','%GL_MAP_COLOR','%GL_MAP_STENCIL','%GL_MATRIX_MODE','%GL_MAX_ATTRIB_STACK_DEPTH','%GL_MAX_CLIENT_ATTRIB_STACK_DEPTH','%GL_MAX_CLIP_PLANES','%GL_MAX_CONVOLUTION_HEIGHT_EXT',
+            '%GL_MAX_CONVOLUTION_WIDTH_EXT','%GL_MAX_EVAL_ORDER','%GL_MAX_EXT','%GL_MAX_LIGHTS','%GL_MAX_LIST_NESTING','%GL_MAX_MODELVIEW_STACK_DEPTH','%GL_MAX_NAME_STACK_DEPTH','%GL_MAX_PIXEL_MAP_TABLE',
+            '%GL_MAX_PROJECTION_STACK_DEPTH','%GL_MAX_TEXTURE_SIZE','%GL_MAX_TEXTURE_STACK_DEPTH','%GL_MAX_VIEWPORT_DIMS','%GL_MINMAX_EXT','%GL_MINMAX_FORMAT_EXT','%GL_MINMAX_SINK_EXT','%GL_MIN_EXT',
+            '%GL_MODELVIEW','%GL_MODELVIEW_MATRIX','%GL_MODELVIEW_STACK_DEPTH','%GL_MODULATE','%GL_MULT','%GL_N3F_V3F','%GL_NAME_STACK_DEPTH','%GL_NAND',
+            '%GL_NEAREST','%GL_NEAREST_MIPMAP_LINEAR','%GL_NEAREST_MIPMAP_NEAREST','%GL_NEVER','%GL_NICEST','%GL_NONE','%GL_NOOP','%GL_NOR',
+            '%GL_NORMALIZE','%GL_NORMAL_ARRAY','%GL_NORMAL_ARRAY_COUNT_EXT','%GL_NORMAL_ARRAY_EXT','%GL_NORMAL_ARRAY_POINTER','%GL_NORMAL_ARRAY_POINTER_EXT','%GL_NORMAL_ARRAY_STRIDE','%GL_NORMAL_ARRAY_STRIDE_EXT',
+            '%GL_NORMAL_ARRAY_TYPE','%GL_NORMAL_ARRAY_TYPE_EXT','%GL_NOTEQUAL','%GL_NO_ERROR','%GL_OBJECT_LINEAR','%GL_OBJECT_PLANE','%GL_ONE','%GL_ONE_MINUS_CONSTANT_ALPHA_EXT',
+            '%GL_ONE_MINUS_CONSTANT_COLOR_EXT','%GL_ONE_MINUS_DST_ALPHA','%GL_ONE_MINUS_DST_COLOR','%GL_ONE_MINUS_SRC_ALPHA','%GL_ONE_MINUS_SRC_COLOR','%GL_OR','%GL_ORDER','%GL_OR_INVERTED',
+            '%GL_OR_REVERSE','%GL_OUT_OF_MEMORY','%GL_PACK_ALIGNMENT','%GL_PACK_LSB_FIRST','%GL_PACK_ROW_LENGTH','%GL_PACK_SKIP_PIXELS','%GL_PACK_SKIP_ROWS','%GL_PACK_SWAP_BYTES',
+            '%GL_PASS_THROUGH_TOKEN','%GL_PERSPECTIVE_CORRECTION_HINT','%GL_PIXEL_MAP_A_TO_A','%GL_PIXEL_MAP_A_TO_A_SIZE','%GL_PIXEL_MAP_B_TO_B','%GL_PIXEL_MAP_B_TO_B_SIZE','%GL_PIXEL_MAP_G_TO_G','%GL_PIXEL_MAP_G_TO_G_SIZE',
+            '%GL_PIXEL_MAP_I_TO_A','%GL_PIXEL_MAP_I_TO_A_SIZE','%GL_PIXEL_MAP_I_TO_B','%GL_PIXEL_MAP_I_TO_B_SIZE','%GL_PIXEL_MAP_I_TO_G','%GL_PIXEL_MAP_I_TO_G_SIZE','%GL_PIXEL_MAP_I_TO_I','%GL_PIXEL_MAP_I_TO_I_SIZE',
+            '%GL_PIXEL_MAP_I_TO_R','%GL_PIXEL_MAP_I_TO_R_SIZE','%GL_PIXEL_MAP_R_TO_R','%GL_PIXEL_MAP_R_TO_R_SIZE','%GL_PIXEL_MAP_S_TO_S','%GL_PIXEL_MAP_S_TO_S_SIZE','%GL_PIXEL_MODE_BIT','%GL_POINT',
+            '%GL_POINTS','%GL_POINT_BIT','%GL_POINT_SIZE','%GL_POINT_SIZE_GRANULARITY','%GL_POINT_SIZE_RANGE','%GL_POINT_SMOOTH','%GL_POINT_SMOOTH_HINT','%GL_POINT_TOKEN',
+            '%GL_POLYGON','%GL_POLYGON_BIT','%GL_POLYGON_MODE','%GL_POLYGON_OFFSET_BIAS_EXT','%GL_POLYGON_OFFSET_EXT','%GL_POLYGON_OFFSET_FACTOR','%GL_POLYGON_OFFSET_FACTOR_EXT','%GL_POLYGON_OFFSET_FILL',
+            '%GL_POLYGON_OFFSET_LINE','%GL_POLYGON_OFFSET_POINT','%GL_POLYGON_OFFSET_UNITS','%GL_POLYGON_SMOOTH','%GL_POLYGON_SMOOTH_HINT','%GL_POLYGON_STIPPLE','%GL_POLYGON_STIPPLE_BIT','%GL_POLYGON_TOKEN',
+            '%GL_POSITION','%GL_POST_COLOR_MATRIX_COLOR_TABLE_EXT','%GL_POST_CONVOLUTION_ALPHA_BIAS_EXT','%GL_POST_CONVOLUTION_ALPHA_SCALE_EXT','%GL_POST_CONVOLUTION_BLUE_BIAS_EXT','%GL_POST_CONVOLUTION_BLUE_SCALE_EXT','%GL_POST_CONVOLUTION_COLOR_TABLE_EXT','%GL_POST_CONVOLUTION_GREEN_BIAS_EXT',
+            '%GL_POST_CONVOLUTION_GREEN_SCALE_EXT','%GL_POST_CONVOLUTION_RED_BIAS_EXT','%GL_POST_CONVOLUTION_RED_SCALE_EXT','%GL_PROJECTION','%GL_PROJECTION_MATRIX','%GL_PROJECTION_STACK_DEPTH','%GL_PROXY_COLOR_TABLE_EXT','%GL_PROXY_HISTOGRAM_EXT',
+            '%GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_EXT','%GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_EXT','%GL_PROXY_TEXTURE_1D','%GL_PROXY_TEXTURE_2D','%GL_Q','%GL_QUADRATIC_ATTENUATION','%GL_QUADS','%GL_QUAD_STRIP',
+            '%GL_R','%GL_R3_G3_B2','%GL_READ_BUFFER','%GL_RED','%GL_REDUCE_EXT','%GL_RED_BIAS','%GL_RED_BITS','%GL_RED_SCALE',
+            '%GL_RENDER','%GL_RENDERER','%GL_RENDER_MODE','%GL_REPEAT','%GL_REPLACE','%GL_RETURN','%GL_RGB','%GL_RGB10',
+            '%GL_RGB10_A2','%GL_RGB12','%GL_RGB16','%GL_RGB4','%GL_RGB5','%GL_RGB5_A1','%GL_RGB8','%GL_RGBA',
+            '%GL_RGBA12','%GL_RGBA16','%GL_RGBA2','%GL_RGBA4','%GL_RGBA8','%GL_RGBA_MODE','%GL_RIGHT','%GL_S',
+            '%GL_SCISSOR_BIT','%GL_SCISSOR_BOX','%GL_SCISSOR_TEST','%GL_SECONDARY_COLOR_ARRAY_EXT','%GL_SECONDARY_COLOR_ARRAY_POINTER_EXT','%GL_SECONDARY_COLOR_ARRAY_SIZE_EXT','%GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT','%GL_SECONDARY_COLOR_ARRAY_TYPE_EXT',
+            '%GL_SELECT','%GL_SELECTION_BUFFER_POINTER','%GL_SELECTION_BUFFER_SIZE','%GL_SEPARABLE_2D_EXT','%GL_SEPARATE_SPECULAR_COLOR_EXT','%GL_SET','%GL_SHADE_MODEL','%GL_SHININESS',
+            '%GL_SHORT','%GL_SINGLE_COLOR_EXT','%GL_SMOOTH','%GL_SPECULAR','%GL_SPHERE_MAP','%GL_SPOT_CUTOFF','%GL_SPOT_DIRECTION','%GL_SPOT_EXPONENT',
+            '%GL_SRC_ALPHA','%GL_SRC_ALPHA_SATURATE','%GL_SRC_COLOR','%GL_STACK_OVERFLOW','%GL_STACK_UNDERFLOW','%GL_STENCIL','%GL_STENCIL_BITS','%GL_STENCIL_BUFFER_BIT',
+            '%GL_STENCIL_CLEAR_VALUE','%GL_STENCIL_FAIL','%GL_STENCIL_FUNC','%GL_STENCIL_INDEX','%GL_STENCIL_PASS_DEPTH_FAIL','%GL_STENCIL_PASS_DEPTH_PASS','%GL_STENCIL_REF','%GL_STENCIL_TEST',
+            '%GL_STENCIL_VALUE_MASK','%GL_STENCIL_WRITEMASK','%GL_STEREO','%GL_SUBPIXEL_BITS','%GL_T','%GL_T2F_C3F_V3F','%GL_T2F_C4F_N3F_V3F','%GL_T2F_C4UB_V3F',
+            '%GL_T2F_N3F_V3F','%GL_T2F_V3F','%GL_T4F_C4F_N3F_V4F','%GL_T4F_V4F','%GL_TABLE_TOO_LARGE_EXT','%GL_TEXTURE','%GL_TEXTURE_1D','%GL_TEXTURE_2D',
+            '%GL_TEXTURE_ALPHA_SIZE','%GL_TEXTURE_BINDING_1D','%GL_TEXTURE_BINDING_2D','%GL_TEXTURE_BIT','%GL_TEXTURE_BLUE_SIZE','%GL_TEXTURE_BORDER','%GL_TEXTURE_BORDER_COLOR','%GL_TEXTURE_COMPONENTS',
+            '%GL_TEXTURE_COORD_ARRAY','%GL_TEXTURE_COORD_ARRAY_COUNT_EXT','%GL_TEXTURE_COORD_ARRAY_EXT','%GL_TEXTURE_COORD_ARRAY_POINTER','%GL_TEXTURE_COORD_ARRAY_POINTER_EXT','%GL_TEXTURE_COORD_ARRAY_SIZE','%GL_TEXTURE_COORD_ARRAY_SIZE_EXT','%GL_TEXTURE_COORD_ARRAY_STRIDE',
+            '%GL_TEXTURE_COORD_ARRAY_STRIDE_EXT','%GL_TEXTURE_COORD_ARRAY_TYPE','%GL_TEXTURE_COORD_ARRAY_TYPE_EXT','%GL_TEXTURE_ENV','%GL_TEXTURE_ENV_COLOR','%GL_TEXTURE_ENV_MODE','%GL_TEXTURE_GEN_MODE','%GL_TEXTURE_GEN_Q',
+            '%GL_TEXTURE_GEN_R','%GL_TEXTURE_GEN_S','%GL_TEXTURE_GEN_T','%GL_TEXTURE_GREEN_SIZE','%GL_TEXTURE_HEIGHT','%GL_TEXTURE_INTENSITY_SIZE','%GL_TEXTURE_INTERNAL_FORMAT','%GL_TEXTURE_LUMINANCE_SIZE',
+            '%GL_TEXTURE_MAG_FILTER','%GL_TEXTURE_MATRIX','%GL_TEXTURE_MIN_FILTER','%GL_TEXTURE_PRIORITY','%GL_TEXTURE_RED_SIZE','%GL_TEXTURE_RESIDENT','%GL_TEXTURE_STACK_DEPTH','%GL_TEXTURE_WIDTH',
+            '%GL_TEXTURE_WRAP_S','%GL_TEXTURE_WRAP_T','%GL_TRANSFORM_BIT','%GL_TRIANGLES','%GL_TRIANGLE_FAN','%GL_TRIANGLE_STRIP','%GL_TRUE','%GL_UNPACK_ALIGNMENT',
+            '%GL_UNPACK_LSB_FIRST','%GL_UNPACK_ROW_LENGTH','%GL_UNPACK_SKIP_PIXELS','%GL_UNPACK_SKIP_ROWS','%GL_UNPACK_SWAP_BYTES','%GL_UNSIGNED_BYTE','%GL_UNSIGNED_BYTE_3_3_2_EXT','%GL_UNSIGNED_INT',
+            '%GL_UNSIGNED_INT_10_10_10_2_EXT','%GL_UNSIGNED_INT_8_8_8_8_EXT','%GL_UNSIGNED_SHORT','%GL_UNSIGNED_SHORT_4_4_4_4_EXT','%GL_UNSIGNED_SHORT_5_5_5_1_EXT','%GL_V2F','%GL_V3F','%GL_VENDOR',
+            '%GL_VERSION','%GL_VERSION_1_1','%GL_VERTEX_ARRAY','%GL_VERTEX_ARRAY_COUNT_EXT','%GL_VERTEX_ARRAY_EXT','%GL_VERTEX_ARRAY_POINTER','%GL_VERTEX_ARRAY_POINTER_EXT','%GL_VERTEX_ARRAY_SIZE',
+            '%GL_VERTEX_ARRAY_SIZE_EXT','%GL_VERTEX_ARRAY_STRIDE','%GL_VERTEX_ARRAY_STRIDE_EXT','%GL_VERTEX_ARRAY_TYPE','%GL_VERTEX_ARRAY_TYPE_EXT','%GL_VIEWPORT','%GL_VIEWPORT_BIT','%GL_WIN_SWAP_HINT',
+            '%GL_XOR','%GL_ZERO','%GL_ZOOM_X','%GL_ZOOM_Y','%GRAY','%GREEN','%GWLP_HINSTANCE','%GWLP_HWNDPARENT',
+            '%GWLP_ID','%GWLP_USERDATA','%GWLP_WNDPROC','%GWL_EXSTYLE','%GWL_HINSTANCE','%GWL_HWNDPARENT','%GWL_ID','%GWL_STYLE',
+            '%GWL_USERDATA','%GWL_WNDPROC','%HDM_FIRST','%HTCAPTION','%HWND_BOTTOM','%HWND_DESKTOP','%HWND_MESSAGE','%HWND_NOTOPMOST',
+            '%HWND_TOP','%HWND_TOPMOST','%ICRYPTO_XOR_DECREASE','%ICRYPTO_XOR_INCREASE','%ICRYPTO_XOR_NORMAL','%IDABORT','%IDCANCEL','%IDCONTINUE',
+            '%IDIGNORE','%IDNO','%IDOK','%IDRETRY','%IDTIMEOUT','%IDTRYAGAIN','%IDYES','%INTERNET_CONNECTION_CONFIGURED',
+            '%INTERNET_CONNECTION_LAN','%INTERNET_CONNECTION_MODEM','%INTERNET_CONNECTION_MODEM_BUSY','%INTERNET_CONNECTION_OFFLINE','%INTERNET_CONNECTION_PROXY','%INTERNET_RAS_INSTALLED','%LBN_DBLCLK','%LBN_KILLFOCUS',
+            '%LBN_SELCANCEL','%LBN_SELCHANGE','%LBN_SETFOCUS','%LBS_DISABLENOSCROLL','%LBS_EXTENDEDSEL','%LBS_MULTICOLUMN','%LBS_MULTIPLESEL','%LBS_NOINTEGRALHEIGHT',
+            '%LBS_NOSEL','%LBS_NOTIFY','%LBS_SORT','%LBS_STANDARD','%LBS_USETABSTOPS','%LB_ADDFILE','%LB_ADDSTRING','%LB_DELETESTRING',
+            '%LB_DIR','%LB_FINDSTRING','%LB_FINDSTRINGEXACT','%LB_GETANCHORINDEX','%LB_GETCARETINDEX','%LB_GETCOUNT','%LB_GETCURSEL','%LB_GETHORIZONTALEXTENT',
+            '%LB_GETITEMDATA','%LB_GETITEMHEIGHT','%LB_GETITEMRECT','%LB_GETLISTBOXINFO','%LB_GETLOCALE','%LB_GETSEL','%LB_GETSELCOUNT','%LB_GETSELITEMS',
+            '%LB_GETTEXT','%LB_GETTEXTLEN','%LB_GETTOPINDEX','%LB_INITSTORAGE','%LB_INSERTSTRING','%LB_ITEMFROMPOINT','%LB_MULTIPLEADDSTRING','%LB_RESETCONTENT',
+            '%LB_SELECTSTRING','%LB_SELITEMRANGE','%LB_SELITEMRANGEEX','%LB_SETANCHORINDEX','%LB_SETCARETINDEX','%LB_SETCOLUMNWIDTH','%LB_SETCOUNT','%LB_SETCURSEL',
+            '%LB_SETHORIZONTALEXTENT','%LB_SETITEMDATA','%LB_SETITEMHEIGHT','%LB_SETLOCALE','%LB_SETSEL','%LB_SETTABSTOPS','%LB_SETTOPINDEX','%LF_FACESIZE',
+            '%LTGRAY','%LVM_FIRST','%LWA_ALPHA','%LWA_COLORKEY','%MAGENTA','%MAXBYTE','%MAXCHAR','%MAXDWORD',
+            '%MAXSHORT','%MAXWORD','%MAX_PATH','%MB_ABORTRETRYIGNORE','%MB_APPLMODAL','%MB_CANCELTRYCONTINUE','%MB_DEFBUTTON1','%MB_DEFBUTTON2',
+            '%MB_DEFBUTTON3','%MB_HELP','%MB_ICONASTERISK','%MB_ICONERROR','%MB_ICONEXCLAMATION','%MB_ICONHAND','%MB_ICONINFORMATION','%MB_ICONQUESTION',
+            '%MB_ICONSTOP','%MB_ICONWARNING','%MB_OK','%MB_OKCANCEL','%MB_RETRYCANCEL','%MB_SIMPLE','%MB_SYSTEMMODAL','%MB_TOPMOST',
+            '%MB_YESNO','%MB_YESNOCANCEL','%MF_CHECKED','%MF_DISABLED','%MF_ENABLED','%MF_GRAYED','%MF_SEPARATOR','%MF_UNCHECKED',
+            '%MINCHAR','%MINLONG','%MINSHORT','%NULL','%ODBC352_INC','%ODBCVER','%ODBC_ADD_DSN','%ODBC_ADD_SYS_DSN',
+            '%ODBC_BOTH_DSN','%ODBC_CONFIG_DRIVER','%ODBC_CONFIG_DRIVER_MAX','%ODBC_CONFIG_DSN','%ODBC_CONFIG_SYS_DSN','%ODBC_DRIVER_VERSION','%ODBC_ERROR_COMPONENT_NOT_FOUND','%ODBC_ERROR_CREATE_DSN_FAILED',
+            '%ODBC_ERROR_GENERAL_ERR','%ODBC_ERROR_INVALID_BUFF_LEN','%ODBC_ERROR_INVALID_DSN','%ODBC_ERROR_INVALID_HWND','%ODBC_ERROR_INVALID_INF','%ODBC_ERROR_INVALID_KEYWORD_VALUE','%ODBC_ERROR_INVALID_LOG_FILE','%ODBC_ERROR_INVALID_NAME',
+            '%ODBC_ERROR_INVALID_PARAM_SEQUENCE','%ODBC_ERROR_INVALID_PATH','%ODBC_ERROR_INVALID_REQUEST_TYPE','%ODBC_ERROR_INVALID_STR','%ODBC_ERROR_LOAD_LIB_FAILED','%ODBC_ERROR_OUTPUT_STRING_TRUNCATED','%ODBC_ERROR_OUT_OF_MEM','%ODBC_ERROR_REMOVE_DSN_FAILED',
+            '%ODBC_ERROR_REQUEST_FAILED','%ODBC_ERROR_USAGE_UPDATE_FAILED','%ODBC_ERROR_USER_CANCELED','%ODBC_ERROR_WRITING_SYSINFO_FAILED','%ODBC_INSTALL_COMPLETE','%ODBC_INSTALL_DRIVER','%ODBC_INSTALL_INQUIRY','%ODBC_REMOVE_DEFAULT_DSN',
+            '%ODBC_REMOVE_DRIVER','%ODBC_REMOVE_DSN','%ODBC_REMOVE_SYS_DSN','%ODBC_SYSTEM_DSN','%ODBC_USER_DSN','%OFN_ALLOWMULTISELECT','%OFN_CREATEPROMPT','%OFN_ENABLEHOOK',
+            '%OFN_ENABLEINCLUDENOTIFY','%OFN_ENABLESIZING','%OFN_ENABLETEMPLATE','%OFN_ENABLETEMPLATEHANDLE','%OFN_EXPLORER','%OFN_EXTENSIONDIFFERENT','%OFN_FILEMUSTEXIST','%OFN_HIDEREADONLY',
+            '%OFN_LONGNAMES','%OFN_NOCHANGEDIR','%OFN_NODEREFERENCELINKS','%OFN_NOLONGNAMES','%OFN_NONETWORKBUTTON','%OFN_NOREADONLYRETURN','%OFN_NOTESTFILECREATE','%OFN_NOVALIDATE',
+            '%OFN_OVERWRITEPROMPT','%OFN_PATHMUSTEXIST','%OFN_READONLY','%OFN_SHAREAWARE','%OFN_SHOWHELP','%OS_ERROR_CALLFUNCTION','%OS_ERROR_EMPTYSTRING','%OS_ERROR_LOADLIBRARY',
+            '%OS_ERROR_SUCCESS','%OS_ERROR_WRONGPARAMETER','%OS_SHELL_ASYNC','%OS_SHELL_SYNC','%OS_WINDOWS_2K','%OS_WINDOWS_95','%OS_WINDOWS_95_OSR2','%OS_WINDOWS_98',
+            '%OS_WINDOWS_98_SE','%OS_WINDOWS_ME','%OS_WINDOWS_NT','%OS_WINDOWS_SERVER_2003','%OS_WINDOWS_SERVER_LONGHORN','%OS_WINDOWS_SERVER_LONGHORN_DC','%OS_WINDOWS_VISTA','%OS_WINDOWS_XP',
+            '%OS_WNDSTYLE_HIDE','%OS_WNDSTYLE_MAXIMIZED','%OS_WNDSTYLE_MINIMIZED','%OS_WNDSTYLE_MINIMIZEDNOFOCUS','%OS_WNDSTYLE_NORMAL','%OS_WNDSTYLE_NORMALNOFOCUS','%PATH_EXT','%PATH_FILE',
+            '%PATH_FILEEXT','%PATH_ROOT','%PATH_ROOTPATH','%PATH_ROOTPATHPROG','%PATH_ROOTPATHPROGEXT','%PBM_DELTAPOS','%PBM_GETPOS','%PBM_GETRANGE',
+            '%PBM_SETBARCOLOR','%PBM_SETBKCOLOR','%PBM_SETPOS','%PBM_SETRANGE','%PBM_SETRANGE32','%PBM_SETSTEP','%PBM_STEPIT','%PBS_SMOOTH',
+            '%PBS_VERTICAL','%PC_DISABLEWAKEEVENT_OFF','%PC_DISABLEWAKEEVENT_ON','%PC_EB_NOCONFIRMATION','%PC_EB_NOPROGRESSUI','%PC_EB_NORMAL','%PC_EB_NOSOUND','%PC_FORCECRITICAL_OFF',
+            '%PC_FORCECRITICAL_ON','%PC_HIBERNATE_OFF','%PC_HIBERNATE_ON','%PC_RD_FORCE','%PC_RD_FORCEIFHUNG','%PC_RD_LOGOFF','%PC_RD_POWEROFF','%PC_RD_REBOOT',
+            '%PC_RD_SHUTDOWN','%PC_SD_DONOT_FORCE','%PC_SD_DONOT_REBOOT','%PC_SD_FORCE','%PC_SD_REBOOT','%PFA_CENTER','%PFA_LEFT','%PFA_RIGHT',
+            '%PF_3DNOW_INSTRUCTIONS_AVAILABLE','%PF_CHANNELS_ENABLED','%PF_COMPARE64_EXCHANGE128','%PF_COMPARE_EXCHANGE128','%PF_COMPARE_EXCHANGE_DOUBLE','%PF_FLOATING_POINT_EMULATED','%PF_FLOATING_POINT_PRECISION_ERRATA','%PF_MMX_INSTRUCTIONS_AVAILABLE',
+            '%PF_NX_ENABLED','%PF_PAE_ENABLED','%PF_RDTSC_INSTRUCTION_AVAILABLE','%PF_SSE3_INSTRUCTIONS_AVAILABLE','%PF_XMMI64_INSTRUCTIONS_AVAILABLE','%PF_XMMI_INSTRUCTIONS_AVAILABLE','%PGM_FIRST','%RED',
+            '%RTF_UBB','%SAPI_SVSFDEFAULT','%SAPI_SVSFISFILENAME','%SAPI_SVSFISNOTXML','%SAPI_SVSFISXML','%SAPI_SVSFLAGSASYNC','%SAPI_SVSFNLPMASK','%SAPI_SVSFNLPSPEAKPUNC',
+            '%SAPI_SVSFPERSISTXML','%SAPI_SVSFPURGEBEFORESPEAK','%SAPI_SVSFUNUSEDFLAGS','%SAPI_SVSFVOICEMASK','%SBS_SIZEGRIP','%SB_BOTTOM','%SB_ENDSCROLL','%SB_LEFT',
+            '%SB_LINEDOWN','%SB_LINELEFT','%SB_LINERIGHT','%SB_LINEUP','%SB_PAGEDOWN','%SB_PAGELEFT','%SB_PAGERIGHT','%SB_PAGEUP',
+            '%SB_RIGHT','%SB_SETPARTS','%SB_SETTEXT','%SB_THUMBPOSITION','%SB_THUMBTRACK','%SB_TOP','%SCF_ALL','%SCF_ASSOCIATEFONT',
+            '%SCF_DEFAULT','%SCF_NOKBUPDATE','%SCF_SELECTION','%SCF_USEUIRULES','%SCF_WORD','%SC_CLOSE','%SC_CONTEXTHELP','%SC_HOTKEY',
+            '%SC_HSCROLL','%SC_KEYMENU','%SC_MAXIMIZE','%SC_MINIMIZE','%SC_MONITORPOWER','%SC_MOUSEMENU','%SC_MOVE','%SC_NEXTWINDOW',
+            '%SC_PREVWINDOW','%SC_RESTORE','%SC_SCREENSAVE','%SC_SIZE','%SC_TASKLIST','%SC_VSCROLL','%SERVICE_ACTIVE','%SERVICE_AUTO_START',
+            '%SERVICE_BOOT_START','%SERVICE_CONTINUE_PENDING','%SERVICE_DEMAND_START','%SERVICE_DISABLED','%SERVICE_DRIVER','%SERVICE_INACTIVE','%SERVICE_INFO_DISPLAY_NAME','%SERVICE_INFO_NAME',
+            '%SERVICE_PAUSED','%SERVICE_PAUSE_PENDING','%SERVICE_RUNNING','%SERVICE_START_PENDING','%SERVICE_STATE_ALL','%SERVICE_STOPPED','%SERVICE_STOP_PENDING','%SERVICE_SYSTEM_START',
+            '%SERVICE_TYPE_ALL','%SERVICE_WIN32','%SES_ALLOWBEEPS','%SES_BEEPONMAXTEXT','%SES_BIDI','%SES_EMULATE10','%SES_EMULATESYSEDIT','%SES_EXTENDBACKCOLOR',
+            '%SES_LOWERCASE','%SES_MAPCPS','%SES_NOIME','%SES_NOINPUTSEQUENCECHK','%SES_SCROLLONKILLFOCUS','%SES_UPPERCASE','%SES_USEAIMM','%SES_USECRLF',
+            '%SES_XLTCRCRLFTOCR','%SF_RTF','%SF_TEXT','%SMTP_SET_ATTACH_CONTENT_TYPE','%SMTP_SET_CONTENT_TYPE_PREFIX','%SQL_AA_FALSE','%SQL_AA_TRUE','%SQL_ACCESSIBLE_PROCEDURES',
+            '%SQL_ACCESSIBLE_TABLES','%SQL_ACCESS_MODE','%SQL_ACTIVE_CONNECTIONS','%SQL_ACTIVE_ENVIRONMENTS','%SQL_ACTIVE_STATEMENTS','%SQL_ADD','%SQL_AD_ADD_CONSTRAINT_DEFERRABLE','%SQL_AD_ADD_CONSTRAINT_INITIALLY_DEFERRED',
+            '%SQL_AD_ADD_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_AD_ADD_CONSTRAINT_NON_DEFERRABLE','%SQL_AD_ADD_DOMAIN_CONSTRAINT','%SQL_AD_ADD_DOMAIN_DEFAULT','%SQL_AD_CONSTRAINT_NAME_DEFINITION','%SQL_AD_DROP_DOMAIN_CONSTRAINT','%SQL_AD_DROP_DOMAIN_DEFAULT','%SQL_AF_ALL',
+            '%SQL_AF_AVG','%SQL_AF_COUNT','%SQL_AF_DISTINCT','%SQL_AF_MAX','%SQL_AF_MIN','%SQL_AF_SUM','%SQL_AGGREGATE_FUNCTIONS','%SQL_ALL_EXCEPT_LIKE',
+            '%SQL_ALL_TYPES','%SQL_ALTER_DOMAIN','%SQL_ALTER_TABLE','%SQL_AM_CONNECTION','%SQL_AM_NONE','%SQL_AM_STATEMENT','%SQL_API_ALL_FUNCTIONS','%SQL_API_LOADBYORDINAL',
+            '%SQL_API_ODBC3_ALL_FUNCTIONS','%SQL_API_ODBC3_ALL_FUNCTIONS_SIZE','%SQL_API_SQLALLOCCONNECT','%SQL_API_SQLALLOCENV','%SQL_API_SQLALLOCHANDLE','%SQL_API_SQLALLOCHANDLESTD','%SQL_API_SQLALLOCSTMT','%SQL_API_SQLBINDCOL',
+            '%SQL_API_SQLBINDPARAM','%SQL_API_SQLBINDPARAMETER','%SQL_API_SQLBROWSECONNECT','%SQL_API_SQLBULKOPERATIONS','%SQL_API_SQLCANCEL','%SQL_API_SQLCLOSECURSOR','%SQL_API_SQLCOLATTRIBUTE','%SQL_API_SQLCOLATTRIBUTES',
+            '%SQL_API_SQLCOLUMNPRIVILEGES','%SQL_API_SQLCOLUMNS','%SQL_API_SQLCONNECT','%SQL_API_SQLCOPYDESC','%SQL_API_SQLDATASOURCES','%SQL_API_SQLDESCRIBECOL','%SQL_API_SQLDESCRIBEPARAM','%SQL_API_SQLDISCONNECT',
+            '%SQL_API_SQLDRIVERCONNECT','%SQL_API_SQLDRIVERS','%SQL_API_SQLENDTRAN','%SQL_API_SQLERROR','%SQL_API_SQLEXECDIRECT','%SQL_API_SQLEXECUTE','%SQL_API_SQLEXTENDEDFETCH','%SQL_API_SQLFETCH',
+            '%SQL_API_SQLFETCHSCROLL','%SQL_API_SQLFOREIGNKEYS','%SQL_API_SQLFREECONNECT','%SQL_API_SQLFREEENV','%SQL_API_SQLFREEHANDLE','%SQL_API_SQLFREESTMT','%SQL_API_SQLGETCONNECTATTR','%SQL_API_SQLGETCONNECTOPTION',
+            '%SQL_API_SQLGETCURSORNAME','%SQL_API_SQLGETDATA','%SQL_API_SQLGETDESCFIELD','%SQL_API_SQLGETDESCREC','%SQL_API_SQLGETDIAGFIELD','%SQL_API_SQLGETDIAGREC','%SQL_API_SQLGETENVATTR','%SQL_API_SQLGETFUNCTIONS',
+            '%SQL_API_SQLGETINFO','%SQL_API_SQLGETSTMTATTR','%SQL_API_SQLGETSTMTOPTION','%SQL_API_SQLGETTYPEINFO','%SQL_API_SQLMORERESULTS','%SQL_API_SQLNATIVESQL','%SQL_API_SQLNUMPARAMS','%SQL_API_SQLNUMRESULTCOLS',
+            '%SQL_API_SQLPARAMDATA','%SQL_API_SQLPARAMOPTIONS','%SQL_API_SQLPREPARE','%SQL_API_SQLPRIMARYKEYS','%SQL_API_SQLPROCEDURECOLUMNS','%SQL_API_SQLPROCEDURES','%SQL_API_SQLPUTDATA','%SQL_API_SQLROWCOUNT',
+            '%SQL_API_SQLSETCONNECTATTR','%SQL_API_SQLSETCONNECTOPTION','%SQL_API_SQLSETCURSORNAME','%SQL_API_SQLSETDESCFIELD','%SQL_API_SQLSETDESCREC','%SQL_API_SQLSETENVATTR','%SQL_API_SQLSETPARAM','%SQL_API_SQLSETPOS',
+            '%SQL_API_SQLSETSCROLLOPTIONS','%SQL_API_SQLSETSTMTATTR','%SQL_API_SQLSETSTMTOPTION','%SQL_API_SQLSPECIALCOLUMNS','%SQL_API_SQLSTATISTICS','%SQL_API_SQLTABLEPRIVILEGES','%SQL_API_SQLTABLES','%SQL_API_SQLTRANSACT',
+            '%SQL_ARD_TYPE','%SQL_ASYNC_ENABLE','%SQL_ASYNC_ENABLE_DEFAULT','%SQL_ASYNC_ENABLE_OFF','%SQL_ASYNC_ENABLE_ON','%SQL_ASYNC_MODE','%SQL_ATTR_ACCESS_MODE','%SQL_ATTR_ANSI_APP',
+            '%SQL_ATTR_APP_PARAM_DESC','%SQL_ATTR_APP_ROW_DESC','%SQL_ATTR_ASYNC_ENABLE','%SQL_ATTR_AUTOCOMMIT','%SQL_ATTR_AUTO_IPD','%SQL_ATTR_CONCURRENCY','%SQL_ATTR_CONNECTION_DEAD','%SQL_ATTR_CONNECTION_POOLING',
+            '%SQL_ATTR_CONNECTION_TIMEOUT','%SQL_ATTR_CP_MATCH','%SQL_ATTR_CURRENT_CATALOG','%SQL_ATTR_CURSOR_SCROLLABLE','%SQL_ATTR_CURSOR_SENSITIVITY','%SQL_ATTR_CURSOR_TYPE','%SQL_ATTR_DISCONNECT_BEHAVIOR','%SQL_ATTR_ENABLE_AUTO_IPD',
+            '%SQL_ATTR_ENLIST_IN_DTC','%SQL_ATTR_ENLIST_IN_XA','%SQL_ATTR_FETCH_BOOKMARK_PTR','%SQL_ATTR_IMP_PARAM_DESC','%SQL_ATTR_IMP_ROW_DESC','%SQL_ATTR_KEYSET_SIZE','%SQL_ATTR_LOGIN_TIMEOUT','%SQL_ATTR_MAX_LENGTH',
+            '%SQL_ATTR_MAX_ROWS','%SQL_ATTR_METADATA_ID','%SQL_ATTR_NOSCAN','%SQL_ATTR_ODBC_CURSORS','%SQL_ATTR_ODBC_VERSION','%SQL_ATTR_OUTPUT_NTS','%SQL_ATTR_PACKET_SIZE','%SQL_ATTR_PARAMSET_SIZE',
+            '%SQL_ATTR_PARAMS_PROCESSED_PTR','%SQL_ATTR_PARAM_BIND_OFFSET_PTR','%SQL_ATTR_PARAM_BIND_TYPE','%SQL_ATTR_PARAM_OPERATION_PTR','%SQL_ATTR_PARAM_STATUS_PTR','%SQL_ATTR_QUERY_TIMEOUT','%SQL_ATTR_QUIET_MODE','%SQL_ATTR_READONLY',
+            '%SQL_ATTR_READWRITE_UNKNOWN','%SQL_ATTR_RETRIEVE_DATA','%SQL_ATTR_ROWS_FETCHED_PTR','%SQL_ATTR_ROW_ARRAY_SIZE','%SQL_ATTR_ROW_BIND_OFFSET_PTR','%SQL_ATTR_ROW_BIND_TYPE','%SQL_ATTR_ROW_NUMBER','%SQL_ATTR_ROW_OPERATION_PTR',
+            '%SQL_ATTR_ROW_STATUS_PTR','%SQL_ATTR_SIMULATE_CURSOR','%SQL_ATTR_TRACE','%SQL_ATTR_TRACEFILE','%SQL_ATTR_TRANSLATE_LIB','%SQL_ATTR_TRANSLATE_OPTION','%SQL_ATTR_TXN_ISOLATION','%SQL_ATTR_USE_BOOKMARKS',
+            '%SQL_ATTR_WRITE','%SQL_AT_ADD_COLUMN','%SQL_AT_ADD_COLUMN_COLLATION','%SQL_AT_ADD_COLUMN_DEFAULT','%SQL_AT_ADD_COLUMN_SINGLE','%SQL_AT_ADD_CONSTRAINT','%SQL_AT_ADD_TABLE_CONSTRAINT','%SQL_AT_CONSTRAINT_DEFERRABLE',
+            '%SQL_AT_CONSTRAINT_INITIALLY_DEFERRED','%SQL_AT_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_AT_CONSTRAINT_NAME_DEFINITION','%SQL_AT_CONSTRAINT_NON_DEFERRABLE','%SQL_AT_DROP_COLUMN','%SQL_AT_DROP_COLUMN_CASCADE','%SQL_AT_DROP_COLUMN_DEFAULT','%SQL_AT_DROP_COLUMN_RESTRICT',
+            '%SQL_AT_DROP_TABLE_CONSTRAINT_CASCADE','%SQL_AT_DROP_TABLE_CONSTRAINT_RESTRICT','%SQL_AT_SET_COLUMN_DEFAULT','%SQL_AUTOCOMMIT','%SQL_AUTOCOMMIT_DEFAULT','%SQL_AUTOCOMMIT_OFF','%SQL_AUTOCOMMIT_ON','%SQL_BATCH_ROW_COUNT',
+            '%SQL_BATCH_SUPPORT','%SQL_BEST_ROWID','%SQL_BIGINT','%SQL_BINARY','%SQL_BIND_BY_COLUMN','%SQL_BIND_TYPE','%SQL_BIND_TYPE_DEFAULT','%SQL_BIT',
+            '%SQL_BOOKMARK_PERSISTENCE','%SQL_BP_CLOSE','%SQL_BP_DELETE','%SQL_BP_DROP','%SQL_BP_OTHER_HSTMT','%SQL_BP_SCROLL','%SQL_BP_TRANSACTION','%SQL_BP_UPDATE',
+            '%SQL_BRC_EXPLICIT','%SQL_BRC_PROCEDURES','%SQL_BRC_ROLLED_UP','%SQL_BS_ROW_COUNT_EXPLICIT','%SQL_BS_ROW_COUNT_PROC','%SQL_BS_SELECT_EXPLICIT','%SQL_BS_SELECT_PROC','%SQL_CA1_ABSOLUTE',
+            '%SQL_CA1_BOOKMARK','%SQL_CA1_BULK_ADD','%SQL_CA1_BULK_DELETE_BY_BOOKMARK','%SQL_CA1_BULK_FETCH_BY_BOOKMARK','%SQL_CA1_BULK_UPDATE_BY_BOOKMARK','%SQL_CA1_LOCK_EXCLUSIVE','%SQL_CA1_LOCK_NO_CHANGE','%SQL_CA1_LOCK_UNLOCK',
+            '%SQL_CA1_NEXT','%SQL_CA1_POSITIONED_DELETE','%SQL_CA1_POSITIONED_UPDATE','%SQL_CA1_POS_DELETE','%SQL_CA1_POS_POSITION','%SQL_CA1_POS_REFRESH','%SQL_CA1_POS_UPDATE','%SQL_CA1_RELATIVE',
+            '%SQL_CA1_SELECT_FOR_UPDATE','%SQL_CA2_CRC_APPROXIMATE','%SQL_CA2_CRC_EXACT','%SQL_CA2_LOCK_CONCURRENCY','%SQL_CA2_MAX_ROWS_AFFECTS_ALL','%SQL_CA2_MAX_ROWS_CATALOG','%SQL_CA2_MAX_ROWS_DELETE','%SQL_CA2_MAX_ROWS_INSERT',
+            '%SQL_CA2_MAX_ROWS_SELECT','%SQL_CA2_MAX_ROWS_UPDATE','%SQL_CA2_OPT_ROWVER_CONCURRENCY','%SQL_CA2_OPT_VALUES_CONCURRENCY','%SQL_CA2_READ_ONLY_CONCURRENCY','%SQL_CA2_SENSITIVITY_ADDITIONS','%SQL_CA2_SENSITIVITY_DELETIONS','%SQL_CA2_SENSITIVITY_UPDATES',
+            '%SQL_CA2_SIMULATE_NON_UNIQUE','%SQL_CA2_SIMULATE_TRY_UNIQUE','%SQL_CA2_SIMULATE_UNIQUE','%SQL_CASCADE','%SQL_CATALOG_LOCATION','%SQL_CATALOG_NAME','%SQL_CATALOG_NAME_SEPARATOR','%SQL_CATALOG_TERM',
+            '%SQL_CATALOG_USAGE','%SQL_CA_CONSTRAINT_DEFERRABLE','%SQL_CA_CONSTRAINT_INITIALLY_DEFERRED','%SQL_CA_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CA_CONSTRAINT_NON_DEFERRABLE','%SQL_CA_CREATE_ASSERTION','%SQL_CB_CLOSE','%SQL_CB_DELETE',
+            '%SQL_CB_NON_NULL','%SQL_CB_NULL','%SQL_CB_PRESERVE','%SQL_CCOL_CREATE_COLLATION','%SQL_CCS_COLLATE_CLAUSE','%SQL_CCS_CREATE_CHARACTER_SET','%SQL_CCS_LIMITED_COLLATION','%SQL_CC_CLOSE',
+            '%SQL_CC_DELETE','%SQL_CC_PRESERVE','%SQL_CDO_COLLATION','%SQL_CDO_CONSTRAINT','%SQL_CDO_CONSTRAINT_DEFERRABLE','%SQL_CDO_CONSTRAINT_INITIALLY_DEFERRED','%SQL_CDO_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CDO_CONSTRAINT_NAME_DEFINITION',
+            '%SQL_CDO_CONSTRAINT_NON_DEFERRABLE','%SQL_CDO_CREATE_DOMAIN','%SQL_CDO_DEFAULT','%SQL_CD_FALSE','%SQL_CD_TRUE','%SQL_CHAR','%SQL_CLOSE','%SQL_CL_END',
+            '%SQL_CL_START','%SQL_CN_ANY','%SQL_CN_DIFFERENT','%SQL_CN_NONE','%SQL_CODE_DATE','%SQL_CODE_DAY','%SQL_CODE_DAY_TO_HOUR','%SQL_CODE_DAY_TO_MINUTE',
+            '%SQL_CODE_DAY_TO_SECOND','%SQL_CODE_HOUR','%SQL_CODE_HOUR_TO_MINUTE','%SQL_CODE_HOUR_TO_SECOND','%SQL_CODE_MINUTE','%SQL_CODE_MINUTE_TO_SECOND','%SQL_CODE_MONTH','%SQL_CODE_SECOND',
+            '%SQL_CODE_TIME','%SQL_CODE_TIMESTAMP','%SQL_CODE_YEAR','%SQL_CODE_YEAR_TO_MONTH','%SQL_COLATT_OPT_MAX','%SQL_COLATT_OPT_MIN','%SQL_COLLATION_SEQ','%SQL_COLUMN_ALIAS',
+            '%SQL_COLUMN_AUTO_INCREMENT','%SQL_COLUMN_CASE_SENSITIVE','%SQL_COLUMN_COUNT','%SQL_COLUMN_DISPLAY_SIZE','%SQL_COLUMN_IGNORE','%SQL_COLUMN_LABEL','%SQL_COLUMN_LENGTH','%SQL_COLUMN_MONEY',
+            '%SQL_COLUMN_NAME','%SQL_COLUMN_NULLABLE','%SQL_COLUMN_NUMBER_UNKNOWN','%SQL_COLUMN_OWNER_NAME','%SQL_COLUMN_PRECISION','%SQL_COLUMN_QUALIFIER_NAME','%SQL_COLUMN_SCALE','%SQL_COLUMN_SEARCHABLE',
+            '%SQL_COLUMN_TABLE_NAME','%SQL_COLUMN_TYPE','%SQL_COLUMN_TYPE_NAME','%SQL_COLUMN_UNSIGNED','%SQL_COLUMN_UPDATABLE','%SQL_COL_PRED_BASIC','%SQL_COL_PRED_CHAR','%SQL_COMMIT',
+            '%SQL_CONCAT_NULL_BEHAVIOR','%SQL_CONCURRENCY','%SQL_CONCUR_DEFAULT','%SQL_CONCUR_LOCK','%SQL_CONCUR_READ_ONLY','%SQL_CONCUR_ROWVER','%SQL_CONCUR_TIMESTAMP','%SQL_CONCUR_VALUES',
+            '%SQL_CONVERT_BIGINT','%SQL_CONVERT_BINARY','%SQL_CONVERT_BIT','%SQL_CONVERT_CHAR','%SQL_CONVERT_DATE','%SQL_CONVERT_DECIMAL','%SQL_CONVERT_DOUBLE','%SQL_CONVERT_FLOAT',
+            '%SQL_CONVERT_FUNCTIONS','%SQL_CONVERT_GUID','%SQL_CONVERT_INTEGER','%SQL_CONVERT_INTERVAL_DAY_TIME','%SQL_CONVERT_INTERVAL_YEAR_MONTH','%SQL_CONVERT_LONGVARBINARY','%SQL_CONVERT_LONGVARCHAR','%SQL_CONVERT_NUMERIC',
+            '%SQL_CONVERT_REAL','%SQL_CONVERT_SMALLINT','%SQL_CONVERT_TIME','%SQL_CONVERT_TIMESTAMP','%SQL_CONVERT_TINYINT','%SQL_CONVERT_VARBINARY','%SQL_CONVERT_VARCHAR','%SQL_CONVERT_WCHAR',
+            '%SQL_CONVERT_WLONGVARCHAR','%SQL_CONVERT_WVARCHAR','%SQL_CORRELATION_NAME','%SQL_CP_DEFAULT','%SQL_CP_MATCH_DEFAULT','%SQL_CP_OFF','%SQL_CP_ONE_PER_DRIVER','%SQL_CP_ONE_PER_HENV',
+            '%SQL_CP_RELAXED_MATCH','%SQL_CP_STRICT_MATCH','%SQL_CREATE_ASSERTION','%SQL_CREATE_CHARACTER_SET','%SQL_CREATE_COLLATION','%SQL_CREATE_DOMAIN','%SQL_CREATE_SCHEMA','%SQL_CREATE_TABLE',
+            '%SQL_CREATE_TRANSLATION','%SQL_CREATE_VIEW','%SQL_CR_CLOSE','%SQL_CR_DELETE','%SQL_CR_PRESERVE','%SQL_CS_AUTHORIZATION','%SQL_CS_CREATE_SCHEMA','%SQL_CS_DEFAULT_CHARACTER_SET',
+            '%SQL_CTR_CREATE_TRANSLATION','%SQL_CT_COLUMN_COLLATION','%SQL_CT_COLUMN_CONSTRAINT','%SQL_CT_COLUMN_DEFAULT','%SQL_CT_COMMIT_DELETE','%SQL_CT_COMMIT_PRESERVE','%SQL_CT_CONSTRAINT_DEFERRABLE','%SQL_CT_CONSTRAINT_INITIALLY_DEFERRED',
+            '%SQL_CT_CONSTRAINT_INITIALLY_IMMEDIATE','%SQL_CT_CONSTRAINT_NAME_DEFINITION','%SQL_CT_CONSTRAINT_NON_DEFERRABLE','%SQL_CT_CREATE_TABLE','%SQL_CT_GLOBAL_TEMPORARY','%SQL_CT_LOCAL_TEMPORARY','%SQL_CT_TABLE_CONSTRAINT','%SQL_CURRENT_QUALIFIER',
+            '%SQL_CURSOR_COMMIT_BEHAVIOR','%SQL_CURSOR_DYNAMIC','%SQL_CURSOR_FORWARD_ONLY','%SQL_CURSOR_KEYSET_DRIVEN','%SQL_CURSOR_ROLLBACK_BEHAVIOR','%SQL_CURSOR_SENSITIVITY','%SQL_CURSOR_STATIC','%SQL_CURSOR_TYPE',
+            '%SQL_CURSOR_TYPE_DEFAULT','%SQL_CUR_DEFAULT','%SQL_CUR_USE_DRIVER','%SQL_CUR_USE_IF_NEEDED','%SQL_CUR_USE_ODBC','%SQL_CU_DML_STATEMENTS','%SQL_CU_INDEX_DEFINITION','%SQL_CU_PRIVILEGE_DEFINITION',
+            '%SQL_CU_PROCEDURE_INVOCATION','%SQL_CU_TABLE_DEFINITION','%SQL_CVT_BIGINT','%SQL_CVT_BINARY','%SQL_CVT_BIT','%SQL_CVT_CHAR','%SQL_CVT_DATE','%SQL_CVT_DECIMAL',
+            '%SQL_CVT_DOUBLE','%SQL_CVT_FLOAT','%SQL_CVT_GUID','%SQL_CVT_INTEGER','%SQL_CVT_INTERVAL_DAY_TIME','%SQL_CVT_INTERVAL_YEAR_MONTH','%SQL_CVT_LONGVARBINARY','%SQL_CVT_LONGVARCHAR',
+            '%SQL_CVT_NUMERIC','%SQL_CVT_REAL','%SQL_CVT_SMALLINT','%SQL_CVT_TIME','%SQL_CVT_TIMESTAMP','%SQL_CVT_TINYINT','%SQL_CVT_VARBINARY','%SQL_CVT_VARCHAR',
+            '%SQL_CVT_WCHAR','%SQL_CVT_WLONGVARCHAR','%SQL_CVT_WVARCHAR','%SQL_CV_CASCADED','%SQL_CV_CHECK_OPTION','%SQL_CV_CREATE_VIEW','%SQL_CV_LOCAL','%SQL_C_BINARY',
+            '%SQL_C_BIT','%SQL_C_BOOKMARK','%SQL_C_CHAR','%SQL_C_DATE','%SQL_C_DEFAULT','%SQL_C_DOUBLE','%SQL_C_FLOAT','%SQL_C_GUID',
+            '%SQL_C_INTERVAL_DAY','%SQL_C_INTERVAL_DAY_TO_HOUR','%SQL_C_INTERVAL_DAY_TO_MINUTE','%SQL_C_INTERVAL_DAY_TO_SECOND','%SQL_C_INTERVAL_HOUR','%SQL_C_INTERVAL_HOUR_TO_MINUTE','%SQL_C_INTERVAL_HOUR_TO_SECOND','%SQL_C_INTERVAL_MINUTE',
+            '%SQL_C_INTERVAL_MINUTE_TO_SECOND','%SQL_C_INTERVAL_MONTH','%SQL_C_INTERVAL_SECOND','%SQL_C_INTERVAL_YEAR','%SQL_C_INTERVAL_YEAR_TO_MONTH','%SQL_C_LONG','%SQL_C_NUMERIC','%SQL_C_SBIGINT',
+            '%SQL_C_SHORT','%SQL_C_SLONG','%SQL_C_SSHORT','%SQL_C_STINYINT','%SQL_C_TIME','%SQL_C_TIMESTAMP','%SQL_C_TINYINT','%SQL_C_TYPE_DATE',
+            '%SQL_C_TYPE_TIME','%SQL_C_TYPE_TIMESTAMP','%SQL_C_UBIGINT','%SQL_C_ULONG','%SQL_C_USHORT','%SQL_C_UTINYINT','%SQL_C_VARBOOKMARK','%SQL_DATABASE_NAME',
+            '%SQL_DATA_AT_EXEC','%SQL_DATA_SOURCE_NAME','%SQL_DATA_SOURCE_READ_ONLY','%SQL_DATE','%SQL_DATETIME','%SQL_DATETIME_LITERALS','%SQL_DATE_LEN','%SQL_DAY',
+            '%SQL_DAY_TO_HOUR','%SQL_DAY_TO_MINUTE','%SQL_DAY_TO_SECOND','%SQL_DA_DROP_ASSERTION','%SQL_DBMS_NAME','%SQL_DBMS_VER','%SQL_DB_DEFAULT','%SQL_DB_DISCONNECT',
+            '%SQL_DB_RETURN_TO_POOL','%SQL_DCS_DROP_CHARACTER_SET','%SQL_DC_DROP_COLLATION','%SQL_DDL_INDEX','%SQL_DD_CASCADE','%SQL_DD_DROP_DOMAIN','%SQL_DD_RESTRICT','%SQL_DECIMAL',
+            '%SQL_DEFAULT','%SQL_DEFAULT_PARAM','%SQL_DEFAULT_TXN_ISOLATION','%SQL_DELETE','%SQL_DELETE_BY_BOOKMARK','%SQL_DESCRIBE_PARAMETER','%SQL_DESC_ALLOC_AUTO','%SQL_DESC_ALLOC_TYPE',
+            '%SQL_DESC_ALLOC_USER','%SQL_DESC_ARRAY_SIZE','%SQL_DESC_ARRAY_STATUS_PTR','%SQL_DESC_AUTO_UNIQUE_VALUE','%SQL_DESC_BASE_COLUMN_NAME','%SQL_DESC_BASE_TABLE_NAME','%SQL_DESC_BIND_OFFSET_PTR','%SQL_DESC_BIND_TYPE',
+            '%SQL_DESC_CASE_SENSITIVE','%SQL_DESC_CATALOG_NAME','%SQL_DESC_CONCISE_TYPE','%SQL_DESC_COUNT','%SQL_DESC_DATA_PTR','%SQL_DESC_DATETIME_INTERVAL_CODE','%SQL_DESC_DATETIME_INTERVAL_PRECISION','%SQL_DESC_DISPLAY_SIZE',
+            '%SQL_DESC_FIXED_PREC_SCALE','%SQL_DESC_INDICATOR_PTR','%SQL_DESC_LABEL','%SQL_DESC_LENGTH','%SQL_DESC_LITERAL_PREFIX','%SQL_DESC_LITERAL_SUFFIX','%SQL_DESC_LOCAL_TYPE_NAME','%SQL_DESC_MAXIMUM_SCALE',
+            '%SQL_DESC_MINIMUM_SCALE','%SQL_DESC_NAME','%SQL_DESC_NULLABLE','%SQL_DESC_NUM_PREC_RADIX','%SQL_DESC_OCTET_LENGTH','%SQL_DESC_OCTET_LENGTH_PTR','%SQL_DESC_PARAMETER_TYPE','%SQL_DESC_PRECISION',
+            '%SQL_DESC_ROWS_PROCESSED_PTR','%SQL_DESC_SCALE','%SQL_DESC_SCHEMA_NAME','%SQL_DESC_SEARCHABLE','%SQL_DESC_TABLE_NAME','%SQL_DESC_TYPE','%SQL_DESC_TYPE_NAME','%SQL_DESC_UNNAMED',
+            '%SQL_DESC_UNSIGNED','%SQL_DESC_UPDATABLE','%SQL_DIAG_ALTER_TABLE','%SQL_DIAG_CALL','%SQL_DIAG_CLASS_ORIGIN','%SQL_DIAG_COLUMN_NUMBER','%SQL_DIAG_CONNECTION_NAME','%SQL_DIAG_CREATE_INDEX',
+            '%SQL_DIAG_CREATE_TABLE','%SQL_DIAG_CREATE_VIEW','%SQL_DIAG_CURSOR_ROW_COUNT','%SQL_DIAG_DELETE_WHERE','%SQL_DIAG_DROP_INDEX','%SQL_DIAG_DROP_TABLE','%SQL_DIAG_DROP_VIEW','%SQL_DIAG_DYNAMIC_DELETE_CURSOR',
+            '%SQL_DIAG_DYNAMIC_FUNCTION','%SQL_DIAG_DYNAMIC_FUNCTION_CODE','%SQL_DIAG_DYNAMIC_UPDATE_CURSOR','%SQL_DIAG_GRANT','%SQL_DIAG_INSERT','%SQL_DIAG_MESSAGE_TEXT','%SQL_DIAG_NATIVE','%SQL_DIAG_NUMBER',
+            '%SQL_DIAG_RETURNCODE','%SQL_DIAG_REVOKE','%SQL_DIAG_ROW_COUNT','%SQL_DIAG_ROW_NUMBER','%SQL_DIAG_SELECT_CURSOR','%SQL_DIAG_SERVER_NAME','%SQL_DIAG_SQLSTATE','%SQL_DIAG_SUBCLASS_ORIGIN',
+            '%SQL_DIAG_UNKNOWN_STATEMENT','%SQL_DIAG_UPDATE_WHERE','%SQL_DI_CREATE_INDEX','%SQL_DI_DROP_INDEX','%SQL_DL_SQL92_DATE','%SQL_DL_SQL92_INTERVAL_DAY','%SQL_DL_SQL92_INTERVAL_DAY_TO_HOUR','%SQL_DL_SQL92_INTERVAL_DAY_TO_MINUTE',
+            '%SQL_DL_SQL92_INTERVAL_DAY_TO_SECOND','%SQL_DL_SQL92_INTERVAL_HOUR','%SQL_DL_SQL92_INTERVAL_HOUR_TO_MINUTE','%SQL_DL_SQL92_INTERVAL_HOUR_TO_SECOND','%SQL_DL_SQL92_INTERVAL_MINUTE','%SQL_DL_SQL92_INTERVAL_MINUTE_TO_SECOND','%SQL_DL_SQL92_INTERVAL_MONTH','%SQL_DL_SQL92_INTERVAL_SECOND',
+            '%SQL_DL_SQL92_INTERVAL_YEAR','%SQL_DL_SQL92_INTERVAL_YEAR_TO_MONTH','%SQL_DL_SQL92_TIME','%SQL_DL_SQL92_TIMESTAMP','%SQL_DM_VER','%SQL_DOUBLE','%SQL_DRIVER_COMPLETE','%SQL_DRIVER_COMPLETE_REQUIRED',
+            '%SQL_DRIVER_HDBC','%SQL_DRIVER_HDESC','%SQL_DRIVER_HENV','%SQL_DRIVER_HLIB','%SQL_DRIVER_HSTMT','%SQL_DRIVER_NAME','%SQL_DRIVER_NOPROMPT','%SQL_DRIVER_ODBC_VER',
+            '%SQL_DRIVER_PROMPT','%SQL_DRIVER_VER','%SQL_DROP','%SQL_DROP_ASSERTION','%SQL_DROP_CHARACTER_SET','%SQL_DROP_COLLATION','%SQL_DROP_DOMAIN','%SQL_DROP_SCHEMA',
+            '%SQL_DROP_TABLE','%SQL_DROP_TRANSLATION','%SQL_DROP_VIEW','%SQL_DS_CASCADE','%SQL_DS_DROP_SCHEMA','%SQL_DS_RESTRICT','%SQL_DTC_DONE','%SQL_DTC_ENLIST_EXPENSIVE',
+            '%SQL_DTC_TRANSITION_COST','%SQL_DTC_UNENLIST_EXPENSIVE','%SQL_DTR_DROP_TRANSLATION','%SQL_DT_CASCADE','%SQL_DT_DROP_TABLE','%SQL_DT_RESTRICT','%SQL_DV_CASCADE','%SQL_DV_DROP_VIEW',
+            '%SQL_DV_RESTRICT','%SQL_DYNAMIC_CURSOR_ATTRIBUTES1','%SQL_DYNAMIC_CURSOR_ATTRIBUTES2','%SQL_ENSURE','%SQL_ENTIRE_ROWSET','%SQL_ERROR','%SQL_EXPRESSIONS_IN_ORDERBY','%SQL_FALSE',
+            '%SQL_FD_FETCH_ABSOLUTE','%SQL_FD_FETCH_BOOKMARK','%SQL_FD_FETCH_FIRST','%SQL_FD_FETCH_LAST','%SQL_FD_FETCH_NEXT','%SQL_FD_FETCH_PREV','%SQL_FD_FETCH_PRIOR','%SQL_FD_FETCH_RELATIVE',
+            '%SQL_FETCH_ABSOLUTE','%SQL_FETCH_BOOKMARK','%SQL_FETCH_BY_BOOKMARK','%SQL_FETCH_DIRECTION','%SQL_FETCH_FIRST','%SQL_FETCH_FIRST_SYSTEM','%SQL_FETCH_FIRST_USER','%SQL_FETCH_LAST',
+            '%SQL_FETCH_NEXT','%SQL_FETCH_PREV','%SQL_FETCH_PRIOR','%SQL_FETCH_RELATIVE','%SQL_FILE_CATALOG','%SQL_FILE_NOT_SUPPORTED','%SQL_FILE_QUALIFIER','%SQL_FILE_TABLE',
+            '%SQL_FILE_USAGE','%SQL_FLOAT','%SQL_FN_CVT_CAST','%SQL_FN_CVT_CONVERT','%SQL_FN_NUM_ABS','%SQL_FN_NUM_ACOS','%SQL_FN_NUM_ASIN','%SQL_FN_NUM_ATAN',
+            '%SQL_FN_NUM_ATAN2','%SQL_FN_NUM_CEILING','%SQL_FN_NUM_COS','%SQL_FN_NUM_COT','%SQL_FN_NUM_DEGREES','%SQL_FN_NUM_EXP','%SQL_FN_NUM_FLOOR','%SQL_FN_NUM_LOG',
+            '%SQL_FN_NUM_LOG10','%SQL_FN_NUM_MOD','%SQL_FN_NUM_PI','%SQL_FN_NUM_POWER','%SQL_FN_NUM_RADIANS','%SQL_FN_NUM_RAND','%SQL_FN_NUM_ROUND','%SQL_FN_NUM_SIGN',
+            '%SQL_FN_NUM_SIN','%SQL_FN_NUM_SQRT','%SQL_FN_NUM_TAN','%SQL_FN_NUM_TRUNCATE','%SQL_FN_STR_ASCII','%SQL_FN_STR_BIT_LENGTH','%SQL_FN_STR_CHAR','%SQL_FN_STR_CHARACTER_LENGTH',
+            '%SQL_FN_STR_CHAR_LENGTH','%SQL_FN_STR_CONCAT','%SQL_FN_STR_DIFFERENCE','%SQL_FN_STR_INSERT','%SQL_FN_STR_LCASE','%SQL_FN_STR_LEFT','%SQL_FN_STR_LENGTH','%SQL_FN_STR_LOCATE',
+            '%SQL_FN_STR_LOCATE_2','%SQL_FN_STR_LTRIM','%SQL_FN_STR_OCTET_LENGTH','%SQL_FN_STR_POSITION','%SQL_FN_STR_REPEAT','%SQL_FN_STR_REPLACE','%SQL_FN_STR_RIGHT','%SQL_FN_STR_RTRIM',
+            '%SQL_FN_STR_SOUNDEX','%SQL_FN_STR_SPACE','%SQL_FN_STR_SUBSTRING','%SQL_FN_STR_UCASE','%SQL_FN_SYS_DBNAME','%SQL_FN_SYS_IFNULL','%SQL_FN_SYS_USERNAME','%SQL_FN_TD_CURDATE',
+            '%SQL_FN_TD_CURRENT_DATE','%SQL_FN_TD_CURRENT_TIME','%SQL_FN_TD_CURRENT_TIMESTAMP','%SQL_FN_TD_CURTIME','%SQL_FN_TD_DAYNAME','%SQL_FN_TD_DAYOFMONTH','%SQL_FN_TD_DAYOFWEEK','%SQL_FN_TD_DAYOFYEAR',
+            '%SQL_FN_TD_EXTRACT','%SQL_FN_TD_HOUR','%SQL_FN_TD_MINUTE','%SQL_FN_TD_MONTH','%SQL_FN_TD_MONTHNAME','%SQL_FN_TD_NOW','%SQL_FN_TD_QUARTER','%SQL_FN_TD_SECOND',
+            '%SQL_FN_TD_TIMESTAMPADD','%SQL_FN_TD_TIMESTAMPDIFF','%SQL_FN_TD_WEEK','%SQL_FN_TD_YEAR','%SQL_FN_TSI_DAY','%SQL_FN_TSI_FRAC_SECOND','%SQL_FN_TSI_HOUR','%SQL_FN_TSI_MINUTE',
+            '%SQL_FN_TSI_MONTH','%SQL_FN_TSI_QUARTER','%SQL_FN_TSI_SECOND','%SQL_FN_TSI_WEEK','%SQL_FN_TSI_YEAR','%SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES1','%SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2','%SQL_GB_COLLATE',
+            '%SQL_GB_GROUP_BY_CONTAINS_SELECT','%SQL_GB_GROUP_BY_EQUALS_SELECT','%SQL_GB_NOT_SUPPORTED','%SQL_GB_NO_RELATION','%SQL_GD_ANY_COLUMN','%SQL_GD_ANY_ORDER','%SQL_GD_BLOCK','%SQL_GD_BOUND',
+            '%SQL_GETDATA_EXTENSIONS','%SQL_GET_BOOKMARK','%SQL_GROUP_BY','%SQL_GUID','%SQL_HANDLE_DBC','%SQL_HANDLE_DESC','%SQL_HANDLE_ENV','%SQL_HANDLE_SENV',
+            '%SQL_HANDLE_STMT','%SQL_HOUR','%SQL_HOUR_TO_MINUTE','%SQL_HOUR_TO_SECOND','%SQL_IC_LOWER','%SQL_IC_MIXED','%SQL_IC_SENSITIVE','%SQL_IC_UPPER',
+            '%SQL_IDENTIFIER_CASE','%SQL_IDENTIFIER_QUOTE_CHAR','%SQL_IGNORE','%SQL_IK_ALL','%SQL_IK_ASC','%SQL_IK_DESC','%SQL_IK_NONE','%SQL_INDEX_ALL',
+            '%SQL_INDEX_CLUSTERED','%SQL_INDEX_HASHED','%SQL_INDEX_KEYWORDS','%SQL_INDEX_OTHER','%SQL_INDEX_UNIQUE','%SQL_INFO_FIRST','%SQL_INFO_SCHEMA_VIEWS','%SQL_INITIALLY_DEFERRED',
+            '%SQL_INITIALLY_IMMEDIATE','%SQL_INSENSITIVE','%SQL_INSERT_STATEMENT','%SQL_INTEGER','%SQL_INTEGRITY','%SQL_INTERVAL','%SQL_INTERVAL_DAY','%SQL_INTERVAL_DAY_TO_HOUR',
+            '%SQL_INTERVAL_DAY_TO_MINUTE','%SQL_INTERVAL_DAY_TO_SECOND','%SQL_INTERVAL_HOUR','%SQL_INTERVAL_HOUR_TO_MINUTE','%SQL_INTERVAL_HOUR_TO_SECOND','%SQL_INTERVAL_MINUTE','%SQL_INTERVAL_MINUTE_TO_SECOND','%SQL_INTERVAL_MONTH',
+            '%SQL_INTERVAL_SECOND','%SQL_INTERVAL_YEAR','%SQL_INTERVAL_YEAR_TO_MONTH','%SQL_INVALID_HANDLE','%SQL_ISV_ASSERTIONS','%SQL_ISV_CHARACTER_SETS','%SQL_ISV_CHECK_CONSTRAINTS','%SQL_ISV_COLLATIONS',
+            '%SQL_ISV_COLUMNS','%SQL_ISV_COLUMN_DOMAIN_USAGE','%SQL_ISV_COLUMN_PRIVILEGES','%SQL_ISV_CONSTRAINT_COLUMN_USAGE','%SQL_ISV_CONSTRAINT_TABLE_USAGE','%SQL_ISV_DOMAINS','%SQL_ISV_DOMAIN_CONSTRAINTS','%SQL_ISV_KEY_COLUMN_USAGE',
+            '%SQL_ISV_REFERENTIAL_CONSTRAINTS','%SQL_ISV_SCHEMATA','%SQL_ISV_SQL_LANGUAGES','%SQL_ISV_TABLES','%SQL_ISV_TABLE_CONSTRAINTS','%SQL_ISV_TABLE_PRIVILEGES','%SQL_ISV_TRANSLATIONS','%SQL_ISV_USAGE_PRIVILEGES',
+            '%SQL_ISV_VIEWS','%SQL_ISV_VIEW_COLUMN_USAGE','%SQL_ISV_VIEW_TABLE_USAGE','%SQL_IS_DAY','%SQL_IS_DAY_TO_HOUR','%SQL_IS_DAY_TO_MINUTE','%SQL_IS_DAY_TO_SECOND','%SQL_IS_HOUR',
+            '%SQL_IS_HOUR_TO_MINUTE','%SQL_IS_HOUR_TO_SECOND','%SQL_IS_INSERT_LITERALS','%SQL_IS_INSERT_SEARCHED','%SQL_IS_INTEGER','%SQL_IS_MINUTE','%SQL_IS_MINUTE_TO_SECOND','%SQL_IS_MONTH',
+            '%SQL_IS_POINTER','%SQL_IS_SECOND','%SQL_IS_SELECT_INTO','%SQL_IS_SMALLINT','%SQL_IS_UINTEGER','%SQL_IS_USMALLINT','%SQL_IS_YEAR','%SQL_IS_YEAR_TO_MONTH',
+            '%SQL_KEYSET_CURSOR_ATTRIBUTES1','%SQL_KEYSET_CURSOR_ATTRIBUTES2','%SQL_KEYSET_SIZE','%SQL_KEYSET_SIZE_DEFAULT','%SQL_KEYWORDS','%SQL_LCK_EXCLUSIVE','%SQL_LCK_NO_CHANGE','%SQL_LCK_UNLOCK',
+            '%SQL_LEN_BINARY_ATTR_OFFSET','%SQL_LEN_DATA_AT_EXEC_OFFSET','%SQL_LIKE_ESCAPE_CLAUSE','%SQL_LIKE_ONLY','%SQL_LOCK_EXCLUSIVE','%SQL_LOCK_NO_CHANGE','%SQL_LOCK_TYPES','%SQL_LOCK_UNLOCK',
+            '%SQL_LOGIN_TIMEOUT','%SQL_LOGIN_TIMEOUT_DEFAULT','%SQL_LONGVARBINARY','%SQL_LONGVARCHAR','%SQL_MAXIMUM_CATALOG_NAME_LENGTH','%SQL_MAXIMUM_COLUMNS_IN_GROUP_BY','%SQL_MAXIMUM_COLUMNS_IN_INDEX','%SQL_MAXIMUM_COLUMNS_IN_ORDER_BY',
+            '%SQL_MAXIMUM_COLUMNS_IN_SELECT','%SQL_MAXIMUM_COLUMN_NAME_LENGTH','%SQL_MAXIMUM_CONCURRENT_ACTIVITIES','%SQL_MAXIMUM_CURSOR_NAME_LENGTH','%SQL_MAXIMUM_DRIVER_CONNECTIONS','%SQL_MAXIMUM_IDENTIFIER_LENGTH','%SQL_MAXIMUM_INDEX_SIZE','%SQL_MAXIMUM_ROW_SIZE',
+            '%SQL_MAXIMUM_SCHEMA_NAME_LENGTH','%SQL_MAXIMUM_STATEMENT_LENGTH','%SQL_MAXIMUM_TABLES_IN_SELECT','%SQL_MAXIMUM_USER_NAME_LENGTH','%SQL_MAX_ASYNC_CONCURRENT_STATEMENTS','%SQL_MAX_BINARY_LITERAL_LEN','%SQL_MAX_CATALOG_NAME_LEN','%SQL_MAX_CHAR_LITERAL_LEN',
+            '%SQL_MAX_COLUMNS_IN_GROUP_BY','%SQL_MAX_COLUMNS_IN_INDEX','%SQL_MAX_COLUMNS_IN_ORDER_BY','%SQL_MAX_COLUMNS_IN_SELECT','%SQL_MAX_COLUMNS_IN_TABLE','%SQL_MAX_COLUMN_NAME_LEN','%SQL_MAX_CONCURRENT_ACTIVITIES','%SQL_MAX_CURSOR_NAME_LEN',
+            '%SQL_MAX_DRIVER_CONNECTIONS','%SQL_MAX_DSN_LENGTH','%SQL_MAX_IDENTIFIER_LEN','%SQL_MAX_INDEX_SIZE','%SQL_MAX_LENGTH','%SQL_MAX_LENGTH_DEFAULT','%SQL_MAX_MESSAGE_LENGTH','%SQL_MAX_NUMERIC_LEN',
+            '%SQL_MAX_OPTION_STRING_LENGTH','%SQL_MAX_OWNER_NAME_LEN','%SQL_MAX_PROCEDURE_NAME_LEN','%SQL_MAX_QUALIFIER_NAME_LEN','%SQL_MAX_ROWS','%SQL_MAX_ROWS_DEFAULT','%SQL_MAX_ROW_SIZE','%SQL_MAX_ROW_SIZE_INCLUDES_LONG',
+            '%SQL_MAX_SCHEMA_NAME_LEN','%SQL_MAX_STATEMENT_LEN','%SQL_MAX_TABLES_IN_SELECT','%SQL_MAX_TABLE_NAME_LEN','%SQL_MAX_USER_NAME_LEN','%SQL_MINUTE','%SQL_MINUTE_TO_SECOND','%SQL_MODE_DEFAULT',
+            '%SQL_MODE_READ_ONLY','%SQL_MODE_READ_WRITE','%SQL_MONTH','%SQL_MULTIPLE_ACTIVE_TXN','%SQL_MULT_RESULT_SETS','%SQL_NAMED','%SQL_NC_END','%SQL_NC_HIGH',
+            '%SQL_NC_LOW','%SQL_NC_START','%SQL_NEED_DATA','%SQL_NEED_LONG_DATA_LEN','%SQL_NNC_NON_NULL','%SQL_NNC_NULL','%SQL_NONSCROLLABLE','%SQL_NON_NULLABLE_COLUMNS',
+            '%SQL_NOSCAN','%SQL_NOSCAN_DEFAULT','%SQL_NOSCAN_OFF','%SQL_NOSCAN_ON','%SQL_NOT_DEFERRABLE','%SQL_NO_ACTION','%SQL_NO_COLUMN_NUMBER','%SQL_NO_DATA',
+            '%SQL_NO_DATA_FOUND','%SQL_NO_NULLS','%SQL_NO_ROW_NUMBER','%SQL_NO_TOTAL','%SQL_NTS','%SQL_NTSL','%SQL_NULLABLE','%SQL_NULLABLE_UNKNOWN',
+            '%SQL_NULL_COLLATION','%SQL_NULL_DATA','%SQL_NULL_HANDLE','%SQL_NULL_HDBC','%SQL_NULL_HDESC','%SQL_NULL_HENV','%SQL_NULL_HSTMT','%SQL_NUMERIC',
+            '%SQL_NUMERIC_FUNCTIONS','%SQL_OAC_LEVEL1','%SQL_OAC_LEVEL2','%SQL_OAC_NONE','%SQL_ODBC_API_CONFORMANCE','%SQL_ODBC_CURSORS','%SQL_ODBC_INTERFACE_CONFORMANCE','%SQL_ODBC_SAG_CLI_CONFORMANCE',
+            '%SQL_ODBC_SQL_CONFORMANCE','%SQL_ODBC_SQL_OPT_IEF','%SQL_ODBC_VER','%SQL_OIC_CORE','%SQL_OIC_LEVEL1','%SQL_OIC_LEVEL2','%SQL_OJ_ALL_COMPARISON_OPS','%SQL_OJ_CAPABILITIES',
+            '%SQL_OJ_FULL','%SQL_OJ_INNER','%SQL_OJ_LEFT','%SQL_OJ_NESTED','%SQL_OJ_NOT_ORDERED','%SQL_OJ_RIGHT','%SQL_OPT_TRACE','%SQL_OPT_TRACEFILE',
+            '%SQL_OPT_TRACE_DEFAULT','%SQL_OPT_TRACE_OFF','%SQL_OPT_TRACE_ON','%SQL_ORDER_BY_COLUMNS_IN_SELECT','%SQL_OSCC_COMPLIANT','%SQL_OSCC_NOT_COMPLIANT','%SQL_OSC_CORE','%SQL_OSC_EXTENDED',
+            '%SQL_OSC_MINIMUM','%SQL_OUTER_JOINS','%SQL_OUTER_JOIN_CAPABILITIES','%SQL_OU_DML_STATEMENTS','%SQL_OU_INDEX_DEFINITION','%SQL_OU_PRIVILEGE_DEFINITION','%SQL_OU_PROCEDURE_INVOCATION','%SQL_OU_TABLE_DEFINITION',
+            '%SQL_OV_ODBC2','%SQL_OV_ODBC3','%SQL_OWNER_TERM','%SQL_OWNER_USAGE','%SQL_PACKET_SIZE','%SQL_PARAM_ARRAY_ROW_COUNTS','%SQL_PARAM_ARRAY_SELECTS','%SQL_PARAM_BIND_BY_COLUMN',
+            '%SQL_PARAM_BIND_TYPE_DEFAULT','%SQL_PARAM_DIAG_UNAVAILABLE','%SQL_PARAM_ERROR','%SQL_PARAM_IGNORE','%SQL_PARAM_INPUT','%SQL_PARAM_INPUT_OUTPUT','%SQL_PARAM_OUTPUT','%SQL_PARAM_PROCEED',
+            '%SQL_PARAM_SUCCESS','%SQL_PARAM_SUCCESS_WITH_INFO','%SQL_PARAM_TYPE_DEFAULT','%SQL_PARAM_TYPE_UNKNOWN','%SQL_PARAM_UNUSED','%SQL_PARC_BATCH','%SQL_PARC_NO_BATCH','%SQL_PAS_BATCH',
+            '%SQL_PAS_NO_BATCH','%SQL_PAS_NO_SELECT','%SQL_PC_NON_PSEUDO','%SQL_PC_NOT_PSEUDO','%SQL_PC_PSEUDO','%SQL_PC_UNKNOWN','%SQL_POSITION','%SQL_POSITIONED_STATEMENTS',
+            '%SQL_POS_ADD','%SQL_POS_DELETE','%SQL_POS_OPERATIONS','%SQL_POS_POSITION','%SQL_POS_REFRESH','%SQL_POS_UPDATE','%SQL_PRED_BASIC','%SQL_PRED_CHAR',
+            '%SQL_PRED_NONE','%SQL_PRED_SEARCHABLE','%SQL_PROCEDURES','%SQL_PROCEDURE_TERM','%SQL_PS_POSITIONED_DELETE','%SQL_PS_POSITIONED_UPDATE','%SQL_PS_SELECT_FOR_UPDATE','%SQL_PT_FUNCTION',
+            '%SQL_PT_PROCEDURE','%SQL_PT_UNKNOWN','%SQL_QL_END','%SQL_QL_START','%SQL_QUALIFIER_LOCATION','%SQL_QUALIFIER_NAME_SEPARATOR','%SQL_QUALIFIER_TERM','%SQL_QUALIFIER_USAGE',
+            '%SQL_QUERY_TIMEOUT','%SQL_QUERY_TIMEOUT_DEFAULT','%SQL_QUICK','%SQL_QUIET_MODE','%SQL_QUOTED_IDENTIFIER_CASE','%SQL_QU_DML_STATEMENTS','%SQL_QU_INDEX_DEFINITION','%SQL_QU_PRIVILEGE_DEFINITION',
+            '%SQL_QU_PROCEDURE_INVOCATION','%SQL_QU_TABLE_DEFINITION','%SQL_RD_DEFAULT','%SQL_RD_OFF','%SQL_RD_ON','%SQL_REAL','%SQL_REFRESH','%SQL_RESET_PARAMS',
+            '%SQL_RESTRICT','%SQL_RESULT_COL','%SQL_RETRIEVE_DATA','%SQL_RETURN_VALUE','%SQL_ROLLBACK','%SQL_ROWSET_SIZE','%SQL_ROWSET_SIZE_DEFAULT','%SQL_ROWVER',
+            '%SQL_ROW_ADDED','%SQL_ROW_DELETED','%SQL_ROW_ERROR','%SQL_ROW_IDENTIFIER','%SQL_ROW_IGNORE','%SQL_ROW_NOROW','%SQL_ROW_NUMBER','%SQL_ROW_NUMBER_UNKNOWN',
+            '%SQL_ROW_PROCEED','%SQL_ROW_SUCCESS','%SQL_ROW_SUCCESS_WITH_INFO','%SQL_ROW_UPDATED','%SQL_ROW_UPDATES','%SQL_SCCO_LOCK','%SQL_SCCO_OPT_ROWVER','%SQL_SCCO_OPT_TIMESTAMP',
+            '%SQL_SCCO_OPT_VALUES','%SQL_SCCO_READ_ONLY','%SQL_SCC_ISO92_CLI','%SQL_SCC_XOPEN_CLI_VERSION1','%SQL_SCHEMA_TERM','%SQL_SCHEMA_USAGE','%SQL_SCOPE_CURROW','%SQL_SCOPE_SESSION',
+            '%SQL_SCOPE_TRANSACTION','%SQL_SCROLLABLE','%SQL_SCROLL_CONCURRENCY','%SQL_SCROLL_DYNAMIC','%SQL_SCROLL_FORWARD_ONLY','%SQL_SCROLL_KEYSET_DRIVEN','%SQL_SCROLL_OPTIONS','%SQL_SCROLL_STATIC',
+            '%SQL_SC_FIPS127_2_TRANSITIONAL','%SQL_SC_NON_UNIQUE','%SQL_SC_SQL92_ENTRY','%SQL_SC_SQL92_FULL','%SQL_SC_SQL92_INTERMEDIATE','%SQL_SC_TRY_UNIQUE','%SQL_SC_UNIQUE','%SQL_SDF_CURRENT_DATE',
+            '%SQL_SDF_CURRENT_TIME','%SQL_SDF_CURRENT_TIMESTAMP','%SQL_SEARCHABLE','%SQL_SEARCH_PATTERN_ESCAPE','%SQL_SECOND','%SQL_SENSITIVE','%SQL_SERVER_NAME','%SQL_SETPARAM_VALUE_MAX',
+            '%SQL_SETPOS_MAX_LOCK_VALUE','%SQL_SETPOS_MAX_OPTION_VALUE','%SQL_SET_DEFAULT','%SQL_SET_NULL','%SQL_SFKD_CASCADE','%SQL_SFKD_NO_ACTION','%SQL_SFKD_SET_DEFAULT','%SQL_SFKD_SET_NULL',
+            '%SQL_SFKU_CASCADE','%SQL_SFKU_NO_ACTION','%SQL_SFKU_SET_DEFAULT','%SQL_SFKU_SET_NULL','%SQL_SG_DELETE_TABLE','%SQL_SG_INSERT_COLUMN','%SQL_SG_INSERT_TABLE','%SQL_SG_REFERENCES_COLUMN',
+            '%SQL_SG_REFERENCES_TABLE','%SQL_SG_SELECT_TABLE','%SQL_SG_UPDATE_COLUMN','%SQL_SG_UPDATE_TABLE','%SQL_SG_USAGE_ON_CHARACTER_SET','%SQL_SG_USAGE_ON_COLLATION','%SQL_SG_USAGE_ON_DOMAIN','%SQL_SG_USAGE_ON_TRANSLATION',
+            '%SQL_SG_WITH_GRANT_OPTION','%SQL_SIGNED_OFFSET','%SQL_SIMULATE_CURSOR','%SQL_SMALLINT','%SQL_SNVF_BIT_LENGTH','%SQL_SNVF_CHARACTER_LENGTH','%SQL_SNVF_CHAR_LENGTH','%SQL_SNVF_EXTRACT',
+            '%SQL_SNVF_OCTET_LENGTH','%SQL_SNVF_POSITION','%SQL_SO_DYNAMIC','%SQL_SO_FORWARD_ONLY','%SQL_SO_KEYSET_DRIVEN','%SQL_SO_MIXED','%SQL_SO_STATIC','%SQL_SPECIAL_CHARACTERS',
+            '%SQL_SPEC_MAJOR','%SQL_SPEC_MINOR','%SQL_SP_BETWEEN','%SQL_SP_COMPARISON','%SQL_SP_EXISTS','%SQL_SP_IN','%SQL_SP_ISNOTNULL','%SQL_SP_ISNULL',
+            '%SQL_SP_LIKE','%SQL_SP_MATCH_FULL','%SQL_SP_MATCH_PARTIAL','%SQL_SP_MATCH_UNIQUE_FULL','%SQL_SP_MATCH_UNIQUE_PARTIAL','%SQL_SP_OVERLAPS','%SQL_SP_QUANTIFIED_COMPARISON','%SQL_SP_UNIQUE',
+            '%SQL_SQL92_DATETIME_FUNCTIONS','%SQL_SQL92_FOREIGN_KEY_DELETE_RULE','%SQL_SQL92_FOREIGN_KEY_UPDATE_RULE','%SQL_SQL92_GRANT','%SQL_SQL92_NUMERIC_VALUE_FUNCTIONS','%SQL_SQL92_PREDICATES','%SQL_SQL92_RELATIONAL_JOIN_OPERATORS','%SQL_SQL92_REVOKE',
+            '%SQL_SQL92_ROW_VALUE_CONSTRUCTOR','%SQL_SQL92_STRING_FUNCTIONS','%SQL_SQL92_VALUE_EXPRESSIONS','%SQL_SQLSTATE_SIZE','%SQL_SQL_CONFORMANCE','%SQL_SQ_COMPARISON','%SQL_SQ_CORRELATED_SUBQUERIES','%SQL_SQ_EXISTS',
+            '%SQL_SQ_IN','%SQL_SQ_QUANTIFIED','%SQL_SRJO_CORRESPONDING_CLAUSE','%SQL_SRJO_CROSS_JOIN','%SQL_SRJO_EXCEPT_JOIN','%SQL_SRJO_FULL_OUTER_JOIN','%SQL_SRJO_INNER_JOIN','%SQL_SRJO_INTERSECT_JOIN',
+            '%SQL_SRJO_LEFT_OUTER_JOIN','%SQL_SRJO_NATURAL_JOIN','%SQL_SRJO_RIGHT_OUTER_JOIN','%SQL_SRJO_UNION_JOIN','%SQL_SRVC_DEFAULT','%SQL_SRVC_NULL','%SQL_SRVC_ROW_SUBQUERY','%SQL_SRVC_VALUE_EXPRESSION',
+            '%SQL_SR_CASCADE','%SQL_SR_DELETE_TABLE','%SQL_SR_GRANT_OPTION_FOR','%SQL_SR_INSERT_COLUMN','%SQL_SR_INSERT_TABLE','%SQL_SR_REFERENCES_COLUMN','%SQL_SR_REFERENCES_TABLE','%SQL_SR_RESTRICT',
+            '%SQL_SR_SELECT_TABLE','%SQL_SR_UPDATE_COLUMN','%SQL_SR_UPDATE_TABLE','%SQL_SR_USAGE_ON_CHARACTER_SET','%SQL_SR_USAGE_ON_COLLATION','%SQL_SR_USAGE_ON_DOMAIN','%SQL_SR_USAGE_ON_TRANSLATION','%SQL_SSF_CONVERT',
+            '%SQL_SSF_LOWER','%SQL_SSF_SUBSTRING','%SQL_SSF_TRANSLATE','%SQL_SSF_TRIM_BOTH','%SQL_SSF_TRIM_LEADING','%SQL_SSF_TRIM_TRAILING','%SQL_SSF_UPPER','%SQL_SS_ADDITIONS',
+            '%SQL_SS_DELETIONS','%SQL_SS_UPDATES','%SQL_STANDARD_CLI_CONFORMANCE','%SQL_STATIC_CURSOR_ATTRIBUTES1','%SQL_STATIC_CURSOR_ATTRIBUTES2','%SQL_STATIC_SENSITIVITY','%SQL_STILL_EXECUTING','%SQL_STRING_FUNCTIONS',
+            '%SQL_SUBQUERIES','%SQL_SUCCESS','%SQL_SUCCESS_WITH_INFO','%SQL_SU_DML_STATEMENTS','%SQL_SU_INDEX_DEFINITION','%SQL_SU_PRIVILEGE_DEFINITION','%SQL_SU_PROCEDURE_INVOCATION','%SQL_SU_TABLE_DEFINITION',
+            '%SQL_SVE_CASE','%SQL_SVE_CAST','%SQL_SVE_COALESCE','%SQL_SVE_NULLIF','%SQL_SYSTEM_FUNCTIONS','%SQL_TABLE_STAT','%SQL_TABLE_TERM','%SQL_TC_ALL',
+            '%SQL_TC_DDL_COMMIT','%SQL_TC_DDL_IGNORE','%SQL_TC_DML','%SQL_TC_NONE','%SQL_TIME','%SQL_TIMEDATE_ADD_INTERVALS','%SQL_TIMEDATE_DIFF_INTERVALS','%SQL_TIMEDATE_FUNCTIONS',
+            '%SQL_TIMESTAMP','%SQL_TIMESTAMP_LEN','%SQL_TIME_LEN','%SQL_TINYINT','%SQL_TRANSACTION_CAPABLE','%SQL_TRANSACTION_ISOLATION_OPTION','%SQL_TRANSACTION_READ_COMMITTED','%SQL_TRANSACTION_READ_UNCOMMITTED',
+            '%SQL_TRANSACTION_REPEATABLE_READ','%SQL_TRANSACTION_SERIALIZABLE','%SQL_TRANSLATE_DLL','%SQL_TRANSLATE_OPTION','%SQL_TRUE','%SQL_TXN_CAPABLE','%SQL_TXN_ISOLATION','%SQL_TXN_ISOLATION_OPTION',
+            '%SQL_TXN_READ_COMMITTED','%SQL_TXN_READ_UNCOMMITTED','%SQL_TXN_REPEATABLE_READ','%SQL_TXN_SERIALIZABLE','%SQL_TYPE_DATE','%SQL_TYPE_NULL','%SQL_TYPE_TIME','%SQL_TYPE_TIMESTAMP',
+            '%SQL_UB_DEFAULT','%SQL_UB_FIXED','%SQL_UB_OFF','%SQL_UB_ON','%SQL_UB_VARIABLE','%SQL_UNBIND','%SQL_UNICODE','%SQL_UNICODE_CHAR',
+            '%SQL_UNICODE_LONGVARCHAR','%SQL_UNICODE_VARCHAR','%SQL_UNION','%SQL_UNION_STATEMENT','%SQL_UNKNOWN_TYPE','%SQL_UNNAMED','%SQL_UNSEARCHABLE','%SQL_UNSIGNED_OFFSET',
+            '%SQL_UNSPECIFIED','%SQL_UPDATE','%SQL_UPDATE_BY_BOOKMARK','%SQL_USER_NAME','%SQL_USE_BOOKMARKS','%SQL_US_UNION','%SQL_US_UNION_ALL','%SQL_U_UNION',
+            '%SQL_U_UNION_ALL','%SQL_VARBINARY','%SQL_VARCHAR','%SQL_XOPEN_CLI_YEAR','%SQL_YEAR','%SQL_YEAR_TO_MONTH','%SRCCOPY','%SS_BITMAP',
+            '%SS_BLACKFRAME','%SS_BLACKRECT','%SS_CENTER','%SS_CENTERIMAGE','%SS_ENDELLIPSIS','%SS_ETCHEDFRAME','%SS_ETCHEDHORZ','%SS_ETCHEDVERT',
+            '%SS_GRAYFRAME','%SS_GRAYRECT','%SS_LEFT','%SS_NOPREFIX','%SS_NOTIFY','%SS_NOWORDWRAP','%SS_PATHELLIPSIS','%SS_RIGHT',
+            '%SS_RIGHTJUST','%SS_SIMPLE','%SS_SUNKEN','%SS_WHITEFRAME','%SS_WHITERECT','%SS_WORDELLIPSIS','%STAT_FILL_FROM_MEMORY','%STAT_FILL_NATURAL',
+            '%STAT_FILL_NATURAL_ERASTONE','%STAT_FILL_NATURAL_EVEN','%STAT_FILL_NATURAL_FIBONACCI','%STAT_FILL_NATURAL_ODD','%STAT_FILL_WITH_NUMBER','%STAT_MINMAX_INDEX','%STAT_MINMAX_VALUE','%STAT_TYPE_BYTE',
+            '%STAT_TYPE_CURRENCY','%STAT_TYPE_DOUBLE','%STAT_TYPE_DWORD','%STAT_TYPE_EXT','%STAT_TYPE_INTEGER','%STAT_TYPE_LONG','%STAT_TYPE_QUAD','%STAT_TYPE_SINGLE',
+            '%STAT_TYPE_WORD','%SWP_ASYNCWINDOWPOS','%SWP_DEFERERASE','%SWP_DRAWFRAME','%SWP_FRAMECHANGED','%SWP_HIDEWINDOW','%SWP_NOACTIVATE','%SWP_NOCOPYBITS',
+            '%SWP_NOMOVE','%SWP_NOOWNERZORDER','%SWP_NOREDRAW','%SWP_NOREPOSITION','%SWP_NOSENDCHANGING','%SWP_NOSIZE','%SWP_NOZORDER','%SWP_SHOWWINDOW',
+            '%SW_FORCEMINIMIZE','%SW_HIDE','%SW_MAXIMIZE','%SW_MINIMIZE','%SW_NORMAL','%SW_RESTORE','%SW_SHOW','%SW_SHOWDEFAULT',
+            '%SW_SHOWMAXIMIZED','%SW_SHOWMINIMIZED','%SW_SHOWMINNOACTIVE','%SW_SHOWNA','%SW_SHOWNOACTIVATE','%SW_SHOWNORMAL','%TBASS_3DALG_DEFAULT','%TBASS_3DALG_FULL',
+            '%TBASS_3DALG_LIGHT','%TBASS_3DALG_OFF','%TBASS_3DMODE_NORMAL','%TBASS_3DMODE_OFF','%TBASS_3DMODE_RELATIVE','%TBASS_ACTIVE_PAUSED','%TBASS_ACTIVE_PLAYING','%TBASS_ACTIVE_STALLED',
+            '%TBASS_ACTIVE_STOPPED','%TBASS_CONFIG_3DALGORITHM','%TBASS_CONFIG_BUFFER','%TBASS_CONFIG_CURVE_PAN','%TBASS_CONFIG_CURVE_VOL','%TBASS_CONFIG_FLOATDSP','%TBASS_CONFIG_GVOL_MUSIC','%TBASS_CONFIG_GVOL_SAMPLE',
+            '%TBASS_CONFIG_GVOL_STREAM','%TBASS_CONFIG_MAXVOL','%TBASS_CONFIG_MP3_CODEC','%TBASS_CONFIG_NET_AGENT','%TBASS_CONFIG_NET_BUFFER','%TBASS_CONFIG_NET_PASSIVE','%TBASS_CONFIG_NET_PREBUF','%TBASS_CONFIG_NET_PROXY',
+            '%TBASS_CONFIG_NET_TIMEOUT','%TBASS_CONFIG_PAUSE_NOPLAY','%TBASS_CONFIG_UPDATEPERIOD','%TBASS_CTYPE_MUSIC_IT','%TBASS_CTYPE_MUSIC_MO3','%TBASS_CTYPE_MUSIC_MOD','%TBASS_CTYPE_MUSIC_MTM','%TBASS_CTYPE_MUSIC_S3M',
+            '%TBASS_CTYPE_MUSIC_XM','%TBASS_CTYPE_RECORD','%TBASS_CTYPE_SAMPLE','%TBASS_CTYPE_STREAM','%TBASS_CTYPE_STREAM_AIFF','%TBASS_CTYPE_STREAM_MP1','%TBASS_CTYPE_STREAM_MP2','%TBASS_CTYPE_STREAM_MP3',
+            '%TBASS_CTYPE_STREAM_OGG','%TBASS_CTYPE_STREAM_WAV','%TBASS_CTYPE_STREAM_WAV_FLOAT','%TBASS_CTYPE_STREAM_WAV_PCM','%TBASS_DATA_AVAILABLE','%TBASS_DATA_FFT1024','%TBASS_DATA_FFT2048','%TBASS_DATA_FFT4096',
+            '%TBASS_DATA_FFT512','%TBASS_DATA_FFT_INDIVIDUAL','%TBASS_DATA_FFT_NOWINDOW','%TBASS_DATA_FLOAT','%TBASS_DEVICE_3D','%TBASS_DEVICE_8BITS','%TBASS_DEVICE_LATENCY','%TBASS_DEVICE_MONO',
+            '%TBASS_DEVICE_NOSPEAKER','%TBASS_DEVICE_SPEAKERS','%TBASS_EAX_ENVIRONMENT_ALLEY','%TBASS_EAX_ENVIRONMENT_ARENA','%TBASS_EAX_ENVIRONMENT_AUDITORIUM','%TBASS_EAX_ENVIRONMENT_BATHROOM','%TBASS_EAX_ENVIRONMENT_CARPETEDHALLWAY','%TBASS_EAX_ENVIRONMENT_CAVE',
+            '%TBASS_EAX_ENVIRONMENT_CITY','%TBASS_EAX_ENVIRONMENT_CONCERTHALL','%TBASS_EAX_ENVIRONMENT_COUNT','%TBASS_EAX_ENVIRONMENT_DIZZY','%TBASS_EAX_ENVIRONMENT_DRUGGED','%TBASS_EAX_ENVIRONMENT_FOREST','%TBASS_EAX_ENVIRONMENT_GENERIC','%TBASS_EAX_ENVIRONMENT_HALLWAY',
+            '%TBASS_EAX_ENVIRONMENT_HANGAR','%TBASS_EAX_ENVIRONMENT_LIVINGROOM','%TBASS_EAX_ENVIRONMENT_MOUNTAINS','%TBASS_EAX_ENVIRONMENT_PADDEDCELL','%TBASS_EAX_ENVIRONMENT_PARKINGLOT','%TBASS_EAX_ENVIRONMENT_PLAIN','%TBASS_EAX_ENVIRONMENT_PSYCHOTIC','%TBASS_EAX_ENVIRONMENT_QUARRY',
+            '%TBASS_EAX_ENVIRONMENT_ROOM','%TBASS_EAX_ENVIRONMENT_SEWERPIPE','%TBASS_EAX_ENVIRONMENT_STONECORRIDOR','%TBASS_EAX_ENVIRONMENT_STONEROOM','%TBASS_EAX_ENVIRONMENT_UNDERWATER','%TBASS_ERROR_ALREADY','%TBASS_ERROR_BUFLOST','%TBASS_ERROR_CODEC',
+            '%TBASS_ERROR_CREATE','%TBASS_ERROR_DECODE','%TBASS_ERROR_DEVICE','%TBASS_ERROR_DRIVER','%TBASS_ERROR_DX','%TBASS_ERROR_EMPTY','%TBASS_ERROR_FILEFORM','%TBASS_ERROR_FILEOPEN',
+            '%TBASS_ERROR_FORMAT','%TBASS_ERROR_FREQ','%TBASS_ERROR_HANDLE','%TBASS_ERROR_ILLPARAM','%TBASS_ERROR_ILLTYPE','%TBASS_ERROR_INIT','%TBASS_ERROR_MEM','%TBASS_ERROR_NO3D',
+            '%TBASS_ERROR_NOCHAN','%TBASS_ERROR_NOEAX','%TBASS_ERROR_NOFX','%TBASS_ERROR_NOHW','%TBASS_ERROR_NONET','%TBASS_ERROR_NOPAUSE','%TBASS_ERROR_NOPLAY','%TBASS_ERROR_NOTAVAIL',
+            '%TBASS_ERROR_NOTFILE','%TBASS_ERROR_PLAYING','%TBASS_ERROR_POSITION','%TBASS_ERROR_SPEAKER','%TBASS_ERROR_START','%TBASS_ERROR_TIMEOUT','%TBASS_ERROR_UNKNOWN','%TBASS_ERROR_VERSION',
+            '%TBASS_FALSE','%TBASS_FILEPOS_CURRENT','%TBASS_FILEPOS_DECODE','%TBASS_FILEPOS_DOWNLOAD','%TBASS_FILEPOS_END','%TBASS_FILEPOS_START','%TBASS_FILE_CLOSE','%TBASS_FILE_LEN',
+            '%TBASS_FILE_READ','%TBASS_FILE_SEEK','%TBASS_FX_CHORUS','%TBASS_FX_COMPRESSOR','%TBASS_FX_DISTORTION','%TBASS_FX_ECHO','%TBASS_FX_FLANGER','%TBASS_FX_GARGLE',
+            '%TBASS_FX_I3DL2REVERB','%TBASS_FX_PARAMEQ','%TBASS_FX_PHASE_180','%TBASS_FX_PHASE_90','%TBASS_FX_PHASE_NEG_180','%TBASS_FX_PHASE_NEG_90','%TBASS_FX_PHASE_ZERO','%TBASS_FX_REVERB',
+            '%TBASS_INPUT_LEVEL','%TBASS_INPUT_OFF','%TBASS_INPUT_ON','%TBASS_INPUT_TYPE_ANALOG','%TBASS_INPUT_TYPE_AUX','%TBASS_INPUT_TYPE_CD','%TBASS_INPUT_TYPE_DIGITAL','%TBASS_INPUT_TYPE_LINE',
+            '%TBASS_INPUT_TYPE_MASK','%TBASS_INPUT_TYPE_MIC','%TBASS_INPUT_TYPE_PHONE','%TBASS_INPUT_TYPE_SPEAKER','%TBASS_INPUT_TYPE_SYNTH','%TBASS_INPUT_TYPE_UNDEF','%TBASS_INPUT_TYPE_WAVE','%TBASS_MP3_SETPOS',
+            '%TBASS_MUSIC_3D','%TBASS_MUSIC_ATTRIB_AMPLIFY','%TBASS_MUSIC_ATTRIB_BPM','%TBASS_MUSIC_ATTRIB_PANSEP','%TBASS_MUSIC_ATTRIB_PSCALER','%TBASS_MUSIC_ATTRIB_SPEED','%TBASS_MUSIC_ATTRIB_VOL_CHAN','%TBASS_MUSIC_ATTRIB_VOL_GLOBAL',
+            '%TBASS_MUSIC_ATTRIB_VOL_INST','%TBASS_MUSIC_AUTOFREE','%TBASS_MUSIC_CALCLEN','%TBASS_MUSIC_DECODE','%TBASS_MUSIC_FLOAT','%TBASS_MUSIC_FT2MOD','%TBASS_MUSIC_FX','%TBASS_MUSIC_LOOP',
+            '%TBASS_MUSIC_MONO','%TBASS_MUSIC_NONINTER','%TBASS_MUSIC_NOSAMPLE','%TBASS_MUSIC_POSRESET','%TBASS_MUSIC_POSRESETEX','%TBASS_MUSIC_PRESCAN','%TBASS_MUSIC_PT1MOD','%TBASS_MUSIC_RAMP',
+            '%TBASS_MUSIC_RAMPS','%TBASS_MUSIC_STOPBACK','%TBASS_MUSIC_SURROUND','%TBASS_MUSIC_SURROUND2','%TBASS_OBJECT_DS','%TBASS_OBJECT_DS3DL','%TBASS_OK','%TBASS_RECORD_PAUSE',
+            '%TBASS_SAMPLE_3D','%TBASS_SAMPLE_8BITS','%TBASS_SAMPLE_FLOAT','%TBASS_SAMPLE_FX','%TBASS_SAMPLE_LOOP','%TBASS_SAMPLE_MONO','%TBASS_SAMPLE_MUTEMAX','%TBASS_SAMPLE_OVER_DIST',
+            '%TBASS_SAMPLE_OVER_POS','%TBASS_SAMPLE_OVER_VOL','%TBASS_SAMPLE_SOFTWARE','%TBASS_SAMPLE_VAM','%TBASS_SLIDE_FREQ','%TBASS_SLIDE_PAN','%TBASS_SLIDE_VOL','%TBASS_SPEAKER_CENLFE',
+            '%TBASS_SPEAKER_CENTER','%TBASS_SPEAKER_FRONT','%TBASS_SPEAKER_FRONTLEFT','%TBASS_SPEAKER_FRONTRIGHT','%TBASS_SPEAKER_LEFT','%TBASS_SPEAKER_LFE','%TBASS_SPEAKER_REAR','%TBASS_SPEAKER_REAR2',
+            '%TBASS_SPEAKER_REAR2LEFT','%TBASS_SPEAKER_REAR2RIGHT','%TBASS_SPEAKER_REARLEFT','%TBASS_SPEAKER_REARRIGHT','%TBASS_SPEAKER_RIGHT','%TBASS_STREAMPROC_END','%TBASS_STREAM_AUTOFREE','%TBASS_STREAM_BLOCK',
+            '%TBASS_STREAM_DECODE','%TBASS_STREAM_PRESCAN','%TBASS_STREAM_RESTRATE','%TBASS_STREAM_STATUS','%TBASS_SYNC_DOWNLOAD','%TBASS_SYNC_END','%TBASS_SYNC_FREE','%TBASS_SYNC_MESSAGE',
+            '%TBASS_SYNC_META','%TBASS_SYNC_MIXTIME','%TBASS_SYNC_MUSICFX','%TBASS_SYNC_MUSICINST','%TBASS_SYNC_MUSICPOS','%TBASS_SYNC_ONETIME','%TBASS_SYNC_POS','%TBASS_SYNC_SLIDE',
+            '%TBASS_SYNC_STALL','%TBASS_TAG_HTTP','%TBASS_TAG_ICY','%TBASS_TAG_ID3','%TBASS_TAG_ID3V2','%TBASS_TAG_META','%TBASS_TAG_MUSIC_INST','%TBASS_TAG_MUSIC_MESSAGE',
+            '%TBASS_TAG_MUSIC_NAME','%TBASS_TAG_MUSIC_SAMPLE','%TBASS_TAG_OGG','%TBASS_TAG_RIFF_INFO','%TBASS_TAG_VENDOR','%TBASS_TRUE','%TBASS_UNICODE','%TBASS_VAM_HARDWARE',
+            '%TBASS_VAM_SOFTWARE','%TBASS_VAM_TERM_DIST','%TBASS_VAM_TERM_PRIO','%TBASS_VAM_TERM_TIME','%TBASS_VERSION','%TBCD_CHANNEL','%TBCD_THUMB','%TBCD_TICS',
+            '%TBGL_ALIGN_CENTER','%TBGL_ALIGN_CENTER_CENTER','%TBGL_ALIGN_CENTER_DOWN','%TBGL_ALIGN_CENTER_UP','%TBGL_ALIGN_LEFT','%TBGL_ALIGN_LEFT_CENTER','%TBGL_ALIGN_LEFT_DOWN','%TBGL_ALIGN_LEFT_UP',
+            '%TBGL_ALIGN_RIGHT','%TBGL_ALIGN_RIGHT_CENTER','%TBGL_ALIGN_RIGHT_DOWN','%TBGL_ALIGN_RIGHT_UP','%TBGL_ALWAYS','%TBGL_EQUAL','%TBGL_ERROR_FILE','%TBGL_ERROR_MSGBOX',
+            '%TBGL_ERROR_NONE','%TBGL_GEQUAL','%TBGL_GREATER','%TBGL_LEQUAL','%TBGL_LESS','%TBGL_LIGHT_AMBIENT','%TBGL_LIGHT_CONSTANT_ATTENUATION','%TBGL_LIGHT_DIFFUSE',
+            '%TBGL_LIGHT_LINEAR_ATTENUATION','%TBGL_LIGHT_POSITION','%TBGL_LIGHT_QUADRATIC_ATTENUATION','%TBGL_LIGHT_SPECULAR','%TBGL_LIGHT_SPOT_CUTOFF','%TBGL_LIGHT_SPOT_DIRECTION','%TBGL_LIGHT_SPOT_EXPONENT','%TBGL_M15B',
+            '%TBGL_M15G','%TBGL_M15LAYER','%TBGL_M15PSTOP','%TBGL_M15R','%TBGL_M15TEXN','%TBGL_M15TEXX','%TBGL_M15TEXY','%TBGL_M15X',
+            '%TBGL_M15Y','%TBGL_M15Z','%TBGL_NEVER','%TBGL_NORMAL_NONE','%TBGL_NORMAL_PRECISE','%TBGL_NORMAL_SMOOTH','%TBGL_NOTEQUAL','%TBGL_OBJ_CUBE',
+            '%TBGL_OBJ_CUBE3','%TBGL_OBJ_CYLINDER','%TBGL_OBJ_SPHERE','%TBGL_PINFO_RGB','%TBGL_PINFO_XYZ','%TBGL_TEX_LINEAR','%TBGL_TEX_MIPMAP','%TBGL_TEX_NEAREST',
+            '%TBM_CLEARSEL','%TBM_CLEARTICS','%TBM_GETBUDDY','%TBM_GETCHANNELRECT','%TBM_GETLINESIZE','%TBM_GETNUMTICS','%TBM_GETPAGESIZE','%TBM_GETPOS',
+            '%TBM_GETPTICS','%TBM_GETRANGEMAX','%TBM_GETRANGEMIN','%TBM_GETSELEND','%TBM_GETSELSTART','%TBM_GETTHUMBLENGTH','%TBM_GETTHUMBRECT','%TBM_GETTIC',
+            '%TBM_GETTICPOS','%TBM_GETTOOLTIPS','%TBM_GETUNICODEFORMAT','%TBM_SETBUDDY','%TBM_SETLINESIZE','%TBM_SETPAGESIZE','%TBM_SETPOS','%TBM_SETRANGE',
+            '%TBM_SETRANGEMAX','%TBM_SETRANGEMIN','%TBM_SETSEL','%TBM_SETSELEND','%TBM_SETSELSTART','%TBM_SETTHUMBLENGTH','%TBM_SETTIC','%TBM_SETTICFREQ',
+            '%TBM_SETTIPSIDE','%TBM_SETTOOLTIPS','%TBM_SETUNICODEFORMAT','%TBS_AUTOTICKS','%TBS_BOTH','%TBS_BOTTOM','%TBS_DOWNISLEFT','%TBS_ENABLESELRANGE',
+            '%TBS_FIXEDLENGTH','%TBS_HORZ','%TBS_LEFT','%TBS_NOTHUMB','%TBS_NOTICKS','%TBS_REVERSED','%TBS_RIGHT','%TBS_TOOLTIPS',
+            '%TBS_TOP','%TBS_VERT','%TBTS_BOTTOM','%TBTS_LEFT','%TBTS_RIGHT','%TBTS_TOP','%TB_%VT_BSTR','%TB_%VT_CY',
+            '%TB_%VT_DATE','%TB_%VT_EMPTY','%TB_%VT_I2','%TB_%VT_I4','%TB_%VT_NULL','%TB_%VT_R4','%TB_%VT_R8','%TB_BOTTOM',
+            '%TB_CLASS_E_NOAGGREGATION','%TB_CO_E_CLASSSTRING','%TB_DISPATCH_METHOD','%TB_DISPATCH_PROPERTYGET','%TB_DISPATCH_PROPERTYPUT','%TB_DISPATCH_PROPERTYPUTREF','%TB_ENDTRACK','%TB_E_INVALIDARG',
+            '%TB_E_NOINTERFACE','%TB_E_OUTOFMEMORY','%TB_IMGCTX_ACTUALSIZE','%TB_IMGCTX_AUTOSIZE','%TB_IMGCTX_FITTOHEIGHT','%TB_IMGCTX_FITTOWIDTH','%TB_IMGCTX_STRETCH','%TB_LINEDOWN',
+            '%TB_LINEUP','%TB_MK_E_CONNECTMANUALLY','%TB_MK_E_EXCEEDEDDEADLINE','%TB_MK_E_INTERMEDIATEINTERFACENOTSUPPORTED','%TB_MK_E_NOOBJECT','%TB_MK_E_SYNTAX','%TB_PAGEDOWN','%TB_PAGEUP',
+            '%TB_REGDB_E_CLASSNOTREG','%TB_REGDB_E_WRITEREGDB','%TB_SIZEOF_TBVARIANT','%TB_S_FALSE','%TB_S_OK','%TB_THUMBPOSITION','%TB_THUMBTRACK','%TB_TOP',
+            '%TCM_FIRST','%TCM_GETCURSEL','%TCN_FOCUSCHANGE','%TCN_GETOBJECT','%TCN_SELCHANGE','%TCN_SELCHANGING','%TCS_BOTTOM','%TCS_BUTTONS',
+            '%TCS_EX_FLATSEPARATORS','%TCS_EX_REGISTERDROP','%TCS_FIXEDWIDTH','%TCS_FLATBUTTONS','%TCS_FOCUSNEVER','%TCS_FOCUSONBUTTONDOWN','%TCS_FORCEICONLEFT','%TCS_FORCELABELLEFT',
+            '%TCS_HOTTRACK','%TCS_MULTILINE','%TCS_MULTISELECT','%TCS_OWNERDRAWFIXED','%TCS_RAGGEDRIGHT','%TCS_RIGHT','%TCS_RIGHTJUSTIFY','%TCS_SCROLLOPPOSITE',
+            '%TCS_SINGLELINE','%TCS_TABS','%TCS_TOOLTIPS','%TCS_VERTICAL','%TM_PLAINTEXT','%TM_RICHTEXT','%TOKENIZER_DEFAULT_ALPHA','%TOKENIZER_DEFAULT_DELIM',
+            '%TOKENIZER_DEFAULT_DQUOTE','%TOKENIZER_DEFAULT_NEWLINE','%TOKENIZER_DEFAULT_NUMERIC','%TOKENIZER_DEFAULT_SPACE','%TOKENIZER_DELIMITER','%TOKENIZER_EOL','%TOKENIZER_ERROR','%TOKENIZER_FINISHED',
+            '%TOKENIZER_NUMBER','%TOKENIZER_QUOTE','%TOKENIZER_STRING','%TOKENIZER_UNDEFTOK','%TRUE','%TV_FIRST','%UDM_GETACCEL','%UDM_GETBASE',
+            '%UDM_GETBUDDY','%UDM_GETPOS','%UDM_GETPOS32','%UDM_GETRANGE','%UDM_GETRANGE32','%UDM_GETUNICODEFORMAT','%UDM_SETACCEL','%UDM_SETBASE',
+            '%UDM_SETBUDDY','%UDM_SETPOS','%UDM_SETPOS32','%UDM_SETRANGE','%UDM_SETRANGE32','%UDM_SETUNICODEFORMAT','%UDS_ALIGNLEFT','%UDS_ALIGNRIGHT',
+            '%UDS_ARROWKEYS','%UDS_AUTOBUDDY','%UDS_HORZ','%UDS_HOTTRACK','%UDS_NOTHOUSANDS','%UDS_SETBUDDYINT','%UDS_WRAP','%UD_MAXVAL',
+            '%UD_MINVAL','%VK_0','%VK_1','%VK_2','%VK_3','%VK_4','%VK_5','%VK_6',
+            '%VK_7','%VK_8','%VK_9','%VK_A','%VK_ACCEPT','%VK_ADD','%VK_APPS','%VK_B',
+            '%VK_BACK','%VK_C','%VK_CANCEL','%VK_CAPITAL','%VK_CLEAR','%VK_CONTROL','%VK_CONVERT','%VK_D',
+            '%VK_DECIMAL','%VK_DELETE','%VK_DIVIDE','%VK_DOWN','%VK_E','%VK_END','%VK_ESCAPE','%VK_EXECUTE',
+            '%VK_F','%VK_F1','%VK_F10','%VK_F11','%VK_F12','%VK_F13','%VK_F14','%VK_F15',
+            '%VK_F16','%VK_F17','%VK_F18','%VK_F19','%VK_F2','%VK_F20','%VK_F21','%VK_F22',
+            '%VK_F23','%VK_F24','%VK_F3','%VK_F4','%VK_F5','%VK_F6','%VK_F7','%VK_F8',
+            '%VK_F9','%VK_FINAL','%VK_G','%VK_H','%VK_HANGEUL','%VK_HANGUL','%VK_HANJA','%VK_HELP',
+            '%VK_HOME','%VK_I','%VK_INSERT','%VK_J','%VK_JUNJA','%VK_K','%VK_KANA','%VK_KANJI',
+            '%VK_L','%VK_LBUTTON','%VK_LEFT','%VK_LINEFEED','%VK_LWIN','%VK_M','%VK_MBUTTON','%VK_MENU',
+            '%VK_MODECHANGE','%VK_MULTIPLY','%VK_N','%VK_NEXT','%VK_NONCONVERT','%VK_NUMLOCK','%VK_NUMPAD0','%VK_NUMPAD1',
+            '%VK_NUMPAD2','%VK_NUMPAD3','%VK_NUMPAD4','%VK_NUMPAD5','%VK_NUMPAD6','%VK_NUMPAD7','%VK_NUMPAD8','%VK_NUMPAD9',
+            '%VK_O','%VK_P','%VK_PAUSE','%VK_PGDN','%VK_PGUP','%VK_PRINT','%VK_PRIOR','%VK_Q',
+            '%VK_R','%VK_RBUTTON','%VK_RETURN','%VK_RIGHT','%VK_RWIN','%VK_S','%VK_SCROLL','%VK_SELECT',
+            '%VK_SEPARATOR','%VK_SHIFT','%VK_SLEEP','%VK_SNAPSHOT','%VK_SPACE','%VK_SUBTRACT','%VK_T','%VK_TAB',
+            '%VK_U','%VK_UP','%VK_V','%VK_W','%VK_X','%VK_XBUTTON1','%VK_XBUTTON2','%VK_Y',
+            '%VK_Z','%VT_ARRAY','%VT_BLOB','%VT_BLOB_OBJECT','%VT_BOOL','%VT_BSTR','%VT_BYREF','%VT_CARRAY',
+            '%VT_CF','%VT_CLSID','%VT_CY','%VT_DATE','%VT_DISPATCH','%VT_EMPTY','%VT_ERROR','%VT_FILETIME',
+            '%VT_HRESULT','%VT_I1','%VT_I2','%VT_I4','%VT_I8','%VT_INT','%VT_LPSTR','%VT_LPWSTR',
+            '%VT_NULL','%VT_PTR','%VT_R4','%VT_R8','%VT_RECORD','%VT_RESERVED','%VT_SAFEARRAY','%VT_STORAGE',
+            '%VT_STORED_OBJECT','%VT_STREAM','%VT_STREAMED_OBJECT','%VT_UI1','%VT_UI2','%VT_UI4','%VT_UI8','%VT_UINT',
+            '%VT_UNKNOWN','%VT_USERDEFINED','%VT_VARIANT','%VT_VECTOR','%VT_VOID','%WAVE_FORMAT_1M08','%WAVE_FORMAT_1M16','%WAVE_FORMAT_1S08',
+            '%WAVE_FORMAT_1S16','%WAVE_FORMAT_2M08','%WAVE_FORMAT_2M16','%WAVE_FORMAT_2S08','%WAVE_FORMAT_2S16','%WAVE_FORMAT_4M08','%WAVE_FORMAT_4M16','%WAVE_FORMAT_4S08',
+            '%WAVE_FORMAT_4S16','%WBF_CUSTOM','%WBF_LEVEL1','%WBF_LEVEL2','%WBF_OVERFLOW','%WBF_WORDBREAK','%WBF_WORDWRAP','%WHITE',
+            '%WIN_FINDTITLECONTAIN','%WIN_FINDTITLEEND','%WIN_FINDTITLEEQUAL','%WIN_FINDTITLESTART','%WM_ACTIVATE','%WM_ACTIVATEAPP','%WM_CAPTURECHANGED','%WM_CHAR',
+            '%WM_CLOSE','%WM_COMMAND','%WM_DESTROY','%WM_DROPFILES','%WM_ERASEBKGND','%WM_GETTEXTLENGTH','%WM_HOTKEY','%WM_HSCROLL',
+            '%WM_IDLE','%WM_INITDIALOG','%WM_KEYDOWN','%WM_KEYUP','%WM_KILLFOCUS','%WM_LBUTTONDBLCLK','%WM_LBUTTONDOWN','%WM_LBUTTONUP',
+            '%WM_MBUTTONDBLCLK','%WM_MBUTTONDOWN','%WM_MBUTTONUP','%WM_MOUSEFIRST','%WM_MOUSEMOVE','%WM_MOUSEWHEEL','%WM_MOVE','%WM_MOVING',
+            '%WM_NCLBUTTONDOWN','%WM_NCRBUTTONDOWN','%WM_NEXTDLGCTL','%WM_NOTIFY','%WM_PAINT','%WM_QUIT','%WM_RBUTTONDBLCLK','%WM_RBUTTONDOWN',
+            '%WM_RBUTTONUP','%WM_SETFOCUS','%WM_SETFONT','%WM_SETTEXT','%WM_SIZE','%WM_SIZING','%WM_SYSCOMMAND','%WM_TIMER',
+            '%WM_USER','%WM_VSCROLL','%WS_BORDER','%WS_CAPTION','%WS_CHILD','%WS_CLIPCHILDREN','%WS_CLIPSIBLINGS','%WS_DISABLED',
+            '%WS_DLGFRAME','%WS_EX_ACCEPTFILES','%WS_EX_APPWINDOW','%WS_EX_CLIENTEDGE','%WS_EX_CONTEXTHELP','%WS_EX_CONTROLPARENT','%WS_EX_LAYERED','%WS_EX_LEFT',
+            '%WS_EX_LEFTSCROLLBAR','%WS_EX_LTRREADING','%WS_EX_MDICHILD','%WS_EX_NOPARENTNOTIFY','%WS_EX_OVERLAPPEDWINDOW','%WS_EX_PALETTEWINDOW','%WS_EX_RIGHT','%WS_EX_RIGHTSCROLLBAR',
+            '%WS_EX_RTLREADING','%WS_EX_STATICEDGE','%WS_EX_TOOLWINDOW','%WS_EX_TOPMOST','%WS_EX_TRANSPARENT','%WS_EX_WINDOWEDGE','%WS_GROUP','%WS_HSCROLL',
+            '%WS_ICONIC','%WS_MAXIMIZE','%WS_MAXIMIZEBOX','%WS_MINIMIZE','%WS_MINIMIZEBOX','%WS_OVERLAPPEDWINDOW','%WS_POPUP','%WS_POPUPWINDOW',
+            '%WS_SYSMENU','%WS_TABSTOP','%WS_THICKFRAME','%WS_VISIBLE','%WS_VSCROLL','%YELLOW','%ZERO','CRLF',
+            'FALSE','M_E','M_PI','NULL','TAB','TRUE'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%', '^', '&', ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #993333; font-style: italic; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #333333;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800080;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #CC0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #333333;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => '_'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/tsql.php b/sources/inc/geshi/tsql.php
new file mode 100644
index 0000000..b4bf6bd
--- /dev/null
+++ b/sources/inc/geshi/tsql.php
@@ -0,0 +1,375 @@
+ 'T-SQL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            // Datatypes
+            'bigint', 'tinyint', 'money',
+            'smallmoney', 'datetime', 'smalldatetime',
+            'text', 'nvarchar', 'ntext', 'varbinary', 'image',
+            'sql_variant', 'uniqueidentifier',
+
+            // Keywords
+            'ABSOLUTE', 'ACTION', 'ADD', 'ADMIN', 'AFTER', 'AGGREGATE', 'ALIAS', 'ALLOCATE', 'ALTER', 'ARE', 'ARRAY', 'AS',
+            'ASC', 'ASSERTION', 'AT', 'AUTHORIZATION', 'BACKUP', 'BEFORE', 'BEGIN', 'BINARY', 'BIT', 'BLOB', 'BOOLEAN', 'BOTH', 'BREADTH',
+            'BREAK', 'BROWSE', 'BULK', 'BY', 'CALL', 'CASCADE', 'CASCADED', 'CASE', 'CAST', 'CATALOG', 'CATCH', 'CHAR', 'CHARACTER', 'CHECK', 'CHECKPOINT',
+            'CLASS', 'CLOB', 'CLOSE', 'CLUSTERED', 'COALESCE', 'COLLATE', 'COLLATION', 'COLUMN', 'COMMIT', 'COMPLETION', 'COMPUTE', 'CONNECT',
+            'CONNECTION', 'CONSTRAINT', 'CONSTRAINTS', 'CONSTRUCTOR', 'CONTAINS', 'CONTAINSTABLE', 'CONTINUE', 'CONVERT', 'CORRESPONDING', 'CREATE',
+            'CUBE', 'CURRENT', 'CURRENT_DATE', 'CURRENT_PATH', 'CURRENT_ROLE', 'CURRENT_TIME', 'CURRENT_TIMESTAMP', 'CURRENT_USER',
+            'CURSOR', 'CYCLE', 'DATA', 'DATABASE', 'DATE', 'DAY', 'DBCC', 'DEALLOCATE', 'DEC', 'DECIMAL', 'DECLARE', 'DEFAULT', 'DEFERRABLE',
+            'DEFERRED', 'DELETE', 'DENY', 'DEPTH', 'DEREF', 'DESC', 'DESCRIBE', 'DESCRIPTOR', 'DESTROY', 'DESTRUCTOR', 'DETERMINISTIC',
+            'DIAGNOSTICS', 'DICTIONARY', 'DISCONNECT', 'DISK', 'DISTINCT', 'DISTRIBUTED', 'DOMAIN', 'DOUBLE', 'DROP', 'DUMMY', 'DUMP', 'DYNAMIC',
+            'EACH', 'ELSE', 'END', 'END-EXEC', 'EQUALS', 'ERRLVL', 'ESCAPE', 'EVERY', 'EXCEPT', 'EXCEPTION', 'EXEC', 'EXECUTE', 'EXIT',
+            'EXTERNAL', 'FALSE', 'FETCH', 'FILE', 'FILLFACTOR', 'FIRST', 'FLOAT', 'FOR', 'FOREIGN', 'FOUND', 'FREE', 'FREETEXT', 'FREETEXTTABLE',
+            'FROM', 'FULL', 'FUNCTION', 'GENERAL', 'GET', 'GLOBAL', 'GOTO', 'GRANT', 'GROUP', 'GROUPING', 'HAVING', 'HOLDLOCK', 'HOST', 'HOUR',
+            'IDENTITY', 'IDENTITY_INSERT', 'IDENTITYCOL', 'IF', 'IGNORE', 'IMMEDIATE', 'INDEX', 'INDICATOR', 'INITIALIZE', 'INITIALLY',
+            'INNER', 'INOUT', 'INPUT', 'INSERT', 'INT', 'INTEGER', 'INTERSECT', 'INTERVAL', 'INTO', 'IS', 'ISOLATION', 'ITERATE', 'KEY',
+            'KILL', 'LANGUAGE', 'LARGE', 'LAST', 'LATERAL', 'LEADING', 'LEFT', 'LESS', 'LEVEL', 'LIMIT', 'LINENO', 'LOAD', 'LOCAL',
+            'LOCALTIME', 'LOCALTIMESTAMP', 'LOCATOR', 'MAP', 'MATCH', 'MINUTE', 'MODIFIES', 'MODIFY', 'MODULE', 'MONTH', 'NAMES', 'NATIONAL',
+            'NATURAL', 'NCHAR', 'NCLOB', 'NEW', 'NEXT', 'NO', 'NOCHECK', 'NONCLUSTERED', 'NONE', 'NULLIF', 'NUMERIC', 'OBJECT', 'OF',
+            'OFF', 'OFFSETS', 'OLD', 'ON', 'ONLY', 'OPEN', 'OPENDATASOURCE', 'OPENQUERY', 'OPENROWSET', 'OPENXML', 'OPERATION', 'OPTION',
+            'ORDER', 'ORDINALITY', 'OUT', 'OUTPUT', 'OVER', 'PAD', 'PARAMETER', 'PARAMETERS', 'PARTIAL', 'PATH', 'PERCENT', 'PLAN',
+            'POSTFIX', 'PRECISION', 'PREFIX', 'PREORDER', 'PREPARE', 'PRESERVE', 'PRIMARY', 'PRINT', 'PRIOR', 'PRIVILEGES', 'PROC', 'PROCEDURE',
+            'PUBLIC', 'RAISERROR', 'READ', 'READS', 'READTEXT', 'REAL', 'RECONFIGURE', 'RECURSIVE', 'REF', 'REFERENCES', 'REFERENCING', 'RELATIVE',
+            'REPLICATION', 'RESTORE', 'RESTRICT', 'RESULT', 'RETURN', 'RETURNS', 'REVOKE', 'RIGHT', 'ROLE', 'ROLLBACK', 'ROLLUP', 'ROUTINE', 'ROW',
+            'ROWGUIDCOL', 'ROWS', 'RULE', 'SAVE', 'SAVEPOINT', 'SCHEMA', 'SCOPE', 'SCROLL', 'SEARCH', 'SECOND', 'SECTION', 'SELECT',
+            'SEQUENCE', 'SESSION', 'SESSION_USER', 'SET', 'SETS', 'SETUSER', 'SHUTDOWN', 'SIZE', 'SMALLINT', 'SPACE', 'SPECIFIC',
+            'SPECIFICTYPE', 'SQL', 'SQLEXCEPTION', 'SQLSTATE', 'SQLWARNING', 'START', 'STATE', 'STATEMENT', 'STATIC', 'STATISTICS', 'STRUCTURE',
+            'SYSTEM_USER', 'TABLE', 'TEMPORARY', 'TERMINATE', 'TEXTSIZE', 'THAN', 'THEN', 'TIME', 'TIMESTAMP', 'TIMEZONE_HOUR', 'TIMEZONE_MINUTE',
+            'TO', 'TOP', 'TRAILING', 'TRAN', 'TRANSACTION', 'TRANSLATION', 'TREAT', 'TRIGGER', 'TRUE', 'TRUNCATE', 'TRY', 'TSEQUAL', 'UNDER', 'UNION',
+            'UNIQUE', 'UNKNOWN', 'UNNEST', 'UPDATE', 'UPDATETEXT', 'USAGE', 'USE', 'USER', 'USING', 'VALUE', 'VALUES', 'VARCHAR', 'VARIABLE',
+            'VARYING', 'VIEW', 'WAITFOR', 'WHEN', 'WHENEVER', 'WHERE', 'WHILE', 'WITH', 'WITHOUT', 'WORK', 'WRITE', 'WRITETEXT', 'YEAR', 'ZONE',
+            'UNCOMMITTED', 'NOCOUNT',
+            ),
+        2 => array(
+            /*
+                Built-in functions
+                Highlighted in pink.
+            */
+
+            //Configuration Functions
+            '@@DATEFIRST','@@OPTIONS','@@DBTS','@@REMSERVER','@@LANGID','@@SERVERNAME',
+            '@@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','GETDATE','GETUTCDATE',
+
+            //Mathematical Functions
+            'ABS','DEGREES','RAND','ACOS','EXP','ROUND','ASIN','FLOOR','SIGN',
+            'ATAN','LOG','SIN','ATN2','LOG10','SQUARE','CEILING','PI','SQRT','COS',
+            'POWER','TAN','COT','RADIANS',
+
+            //Meta Data Functions
+            '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',
+            '@@PROCID','FILEGROUP_NAME','SQL_VARIANT_PROPERTY','FILEGROUPPROPERTY',
+            'TYPEPROPERTY','FILEPROPERTY',
+
+            //Security Functions
+            'IS_SRVROLEMEMBER','SUSER_SID','SUSER_SNAME','USER_ID',
+            'HAS_DBACCESS','IS_MEMBER',
+
+            //String Functions
+            'ASCII','SOUNDEX','PATINDEX','CHARINDEX','REPLACE','STR',
+            'DIFFERENCE','QUOTENAME','STUFF','REPLICATE','SUBSTRING','LEN',
+            'REVERSE','UNICODE','LOWER','UPPER','LTRIM','RTRIM',
+
+            //System Functions
+            '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',
+            'STATS_DATE','@@TRANCOUNT','USER_NAME',
+
+            //System Statistical Functions
+            '@@CONNECTIONS','@@PACK_RECEIVED','@@CPU_BUSY','@@PACK_SENT',
+            '@@TIMETICKS','@@IDLE','@@TOTAL_ERRORS','@@IO_BUSY',
+            '@@TOTAL_READ','@@PACKET_ERRORS','@@TOTAL_WRITE',
+
+            //Text and Image Functions
+            'TEXTPTR','TEXTVALID',
+
+            //Aggregate functions
+            'AVG', 'MAX', 'BINARY_CHECKSUM', 'MIN', 'CHECKSUM', 'SUM', 'CHECKSUM_AGG',
+            'STDEV', 'COUNT', 'STDEVP', 'COUNT_BIG', 'VAR', 'VARP'
+            ),
+        3 => array(
+            /*
+                System stored procedures
+                Higlighted dark brown
+            */
+
+            //Active Directory Procedures
+            'sp_ActiveDirectory_Obj', 'sp_ActiveDirectory_SCP',
+
+            //Catalog Procedures
+            'sp_column_privileges', 'sp_special_columns', 'sp_columns', 'sp_sproc_columns',
+            'sp_databases', 'sp_statistics', 'sp_fkeys', 'sp_stored_procedures', 'sp_pkeys',
+            'sp_table_privileges', 'sp_server_info', 'sp_tables',
+
+            //Cursor Procedures
+            'sp_cursor_list', 'sp_describe_cursor_columns', 'sp_describe_cursor', 'sp_describe_cursor_tables',
+
+            //Database Maintenance Plan Procedures
+            'sp_add_maintenance_plan', 'sp_delete_maintenance_plan_db', 'sp_add_maintenance_plan_db',
+            'sp_delete_maintenance_plan_job', 'sp_add_maintenance_plan_job', 'sp_help_maintenance_plan',
+            'sp_delete_maintenance_plan',
+
+            //Distributed Queries Procedures
+            'sp_addlinkedserver', 'sp_indexes', 'sp_addlinkedsrvlogin', 'sp_linkedservers', 'sp_catalogs',
+            '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',
+            'sp_help_fulltext_columns', 'sp_fulltext_database', 'sp_help_fulltext_columns_cursor',
+            'sp_fulltext_service', 'sp_help_fulltext_tables', 'sp_fulltext_table',
+            'sp_help_fulltext_tables_cursor', 'sp_help_fulltext_catalogs',
+
+            //Log Shipping Procedures
+            'sp_add_log_shipping_database', 'sp_delete_log_shipping_database', 'sp_add_log_shipping_plan',
+            'sp_delete_log_shipping_plan', 'sp_add_log_shipping_plan_database',
+            'sp_delete_log_shipping_plan_database', 'sp_add_log_shipping_primary',
+            'sp_delete_log_shipping_primary', 'sp_add_log_shipping_secondary',
+            'sp_delete_log_shipping_secondary', 'sp_can_tlog_be_applied', 'sp_get_log_shipping_monitor_info',
+            'sp_change_monitor_role', 'sp_remove_log_shipping_monitor', 'sp_change_primary_role',
+            'sp_resolve_logins', 'sp_change_secondary_role', 'sp_update_log_shipping_monitor_info',
+            'sp_create_log_shipping_monitor_account', 'sp_update_log_shipping_plan',
+            'sp_define_log_shipping_monitor', 'sp_update_log_shipping_plan_database',
+
+            //OLE Automation Extended Stored Procedures
+            'sp_OACreate', 'sp_OAMethod', 'sp_OADestroy', 'sp_OASetProperty', 'sp_OAGetErrorInfo',
+            'sp_OAStop', 'sp_OAGetProperty',
+
+            //Replication Procedures
+            'sp_add_agent_parameter', 'sp_enableagentoffload', 'sp_add_agent_profile',
+            'sp_enumcustomresolvers', 'sp_addarticle', 'sp_enumdsn', 'sp_adddistpublisher',
+            'sp_enumfullsubscribers', 'sp_adddistributiondb', 'sp_expired_subscription_cleanup',
+            'sp_adddistributor', 'sp_generatefilters', 'sp_addmergealternatepublisher',
+            'sp_getagentoffloadinfo', 'sp_addmergearticle', 'sp_getmergedeletetype', 'sp_addmergefilter',
+            'sp_get_distributor', 'sp_addmergepublication', 'sp_getqueuedrows', 'sp_addmergepullsubscription',
+            'sp_getsubscriptiondtspackagename', 'sp_addmergepullsubscription_agent', 'sp_grant_publication_access',
+            'sp_addmergesubscription', 'sp_help_agent_default', 'sp_addpublication', 'sp_help_agent_parameter',
+            'sp_addpublication_snapshot', 'sp_help_agent_profile', 'sp_addpublisher70', 'sp_helparticle',
+            'sp_addpullsubscription', 'sp_helparticlecolumns', 'sp_addpullsubscription_agent', 'sp_helparticledts',
+            'sp_addscriptexec', 'sp_helpdistpublisher', 'sp_addsubscriber', 'sp_helpdistributiondb',
+            'sp_addsubscriber_schedule', 'sp_helpdistributor', 'sp_addsubscription', 'sp_helpmergealternatepublisher',
+            'sp_addsynctriggers', 'sp_helpmergearticle', 'sp_addtabletocontents', 'sp_helpmergearticlecolumn',
+            'sp_adjustpublisheridentityrange', 'sp_helpmergearticleconflicts', 'sp_article_validation',
+            'sp_helpmergeconflictrows', 'sp_articlecolumn', 'sp_helpmergedeleteconflictrows', 'sp_articlefilter',
+            'sp_helpmergefilter', 'sp_articlesynctranprocs', 'sp_helpmergepublication', 'sp_articleview',
+            'sp_helpmergepullsubscription', 'sp_attachsubscription', 'sp_helpmergesubscription', 'sp_browsesnapshotfolder',
+            'sp_helppublication', 'sp_browsemergesnapshotfolder', 'sp_help_publication_access', 'sp_browsereplcmds',
+            'sp_helppullsubscription', 'sp_change_agent_parameter', 'sp_helpreplfailovermode', 'sp_change_agent_profile',
+            'sp_helpreplicationdboption', 'sp_changearticle', 'sp_helpreplicationoption', 'sp_changedistpublisher',
+            'sp_helpsubscriberinfo', 'sp_changedistributiondb', 'sp_helpsubscription', 'sp_changedistributor_password',
+            'sp_ivindexhasnullcols', 'sp_changedistributor_property', 'sp_helpsubscription_properties', 'sp_changemergearticle',
+            'sp_link_publication', 'sp_changemergefilter', 'sp_marksubscriptionvalidation', 'sp_changemergepublication',
+            'sp_mergearticlecolumn', 'sp_changemergepullsubscription', 'sp_mergecleanupmetadata', 'sp_changemergesubscription',
+            'sp_mergedummyupdate', 'sp_changepublication', 'sp_mergesubscription_cleanup', 'sp_changesubscriber',
+            'sp_publication_validation', 'sp_changesubscriber_schedule', 'sp_refreshsubscriptions', 'sp_changesubscriptiondtsinfo',
+            'sp_reinitmergepullsubscription', 'sp_changesubstatus', 'sp_reinitmergesubscription', 'sp_change_subscription_properties',
+            'sp_reinitpullsubscription', 'sp_check_for_sync_trigger', 'sp_reinitsubscription', 'sp_copymergesnapshot',
+            'sp_removedbreplication', 'sp_copysnapshot', 'sp_repladdcolumn', 'sp_copysubscription', 'sp_replcmds',
+            'sp_deletemergeconflictrow', 'sp_replcounters', 'sp_disableagentoffload', 'sp_repldone', 'sp_drop_agent_parameter',
+            'sp_repldropcolumn', 'sp_drop_agent_profile', 'sp_replflush', 'sp_droparticle', 'sp_replicationdboption',
+            'sp_dropanonymouseagent', 'sp_replication_agent_checkup', 'sp_dropdistpublisher', 'sp_replqueuemonitor',
+            'sp_dropdistributiondb', 'sp_replsetoriginator', 'sp_dropmergealternatepublisher', 'sp_replshowcmds',
+            'sp_dropdistributor', 'sp_repltrans', 'sp_dropmergearticle', 'sp_restoredbreplication', 'sp_dropmergefilter',
+            'sp_revoke_publication_access', 'sp_scriptsubconflicttable', 'sp_dropmergepublication', 'sp_script_synctran_commands',
+            'sp_dropmergepullsubscription', 'sp_setreplfailovermode', 'sp_showrowreplicainfo', 'sp_dropmergesubscription',
+            'sp_subscription_cleanup', 'sp_droppublication', 'sp_table_validation', 'sp_droppullsubscription',
+            'sp_update_agent_profile', 'sp_dropsubscriber', 'sp_validatemergepublication', 'sp_dropsubscription',
+            'sp_validatemergesubscription', 'sp_dsninfo', 'sp_vupgrade_replication', 'sp_dumpparamcmd',
+
+            //Security Procedures
+            'sp_addalias', 'sp_droprolemember', 'sp_addapprole', 'sp_dropserver', 'sp_addgroup', 'sp_dropsrvrolemember',
+            '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',
+            'sp_changegroup', 'sp_helprolemember', 'sp_changeobjectowner', 'sp_helprotect', 'sp_change_users_login',
+            'sp_helpsrvrole', 'sp_dbfixedrolepermission', 'sp_helpsrvrolemember', 'sp_defaultdb', 'sp_helpuser',
+            'sp_defaultlanguage', 'sp_MShasdbaccess', 'sp_denylogin', 'sp_password', 'sp_dropalias', 'sp_remoteoption',
+            'sp_dropapprole', 'sp_revokedbaccess', 'sp_dropgroup', 'sp_revokelogin', 'sp_droplinkedsrvlogin',
+            'sp_setapprole', 'sp_droplogin', 'sp_srvrolepermission', 'sp_dropremotelogin', 'sp_validatelogins', 'sp_droprole',
+
+            //SQL Mail Procedures
+            'sp_processmail', 'xp_sendmail', 'xp_deletemail', 'xp_startmail', 'xp_findnextmsg', 'xp_stopmail', 'xp_readmail',
+
+            //SQL Profiler Procedures
+            'sp_trace_create', 'sp_trace_setfilter', 'sp_trace_generateevent', 'sp_trace_setstatus', 'sp_trace_setevent',
+
+            //SQL Server Agent Procedures
+            'sp_add_alert', 'sp_help_jobhistory', 'sp_add_category', 'sp_help_jobschedule', 'sp_add_job',
+            'sp_help_jobserver', 'sp_add_jobschedule', 'sp_help_jobstep', 'sp_add_jobserver', 'sp_help_notification',
+            'sp_add_jobstep', 'sp_help_operator', 'sp_add_notification', 'sp_help_targetserver',
+            'sp_add_operator', 'sp_help_targetservergroup', 'sp_add_targetservergroup', 'sp_helptask',
+            'sp_add_targetsvrgrp_member', 'sp_manage_jobs_by_login', 'sp_addtask', 'sp_msx_defect',
+            'sp_apply_job_to_targets', 'sp_msx_enlist', 'sp_delete_alert', 'sp_post_msx_operation',
+            'sp_delete_category', 'sp_purgehistory', 'sp_delete_job', 'sp_purge_jobhistory', 'sp_delete_jobschedule',
+            'sp_reassigntask', 'sp_delete_jobserver', 'sp_remove_job_from_targets', 'sp_delete_jobstep',
+            'sp_resync_targetserver', 'sp_delete_notification', 'sp_start_job', 'sp_delete_operator',
+            'sp_stop_job', 'sp_delete_targetserver', 'sp_update_alert', 'sp_delete_targetservergroup',
+            'sp_update_category', 'sp_delete_targetsvrgrp_member', 'sp_update_job', 'sp_droptask',
+            'sp_update_jobschedule', 'sp_help_alert', 'sp_update_jobstep', 'sp_help_category',
+            'sp_update_notification', 'sp_help_downloadlist', 'sp_update_operator', 'sp_helphistory',
+            'sp_update_targetservergroup', 'sp_help_job', 'sp_updatetask', 'xp_sqlagent_proxy_account',
+
+            //System Procedures
+            'sp_add_data_file_recover_suspect_db', 'sp_helpconstraint', 'sp_addextendedproc',
+            'sp_helpdb', 'sp_addextendedproperty', 'sp_helpdevice', 'sp_add_log_file_recover_suspect_db',
+            'sp_helpextendedproc', 'sp_addmessage', 'sp_helpfile', 'sp_addtype', 'sp_helpfilegroup',
+            'sp_addumpdevice', 'sp_helpindex', 'sp_altermessage', 'sp_helplanguage', 'sp_autostats',
+            'sp_helpserver', 'sp_attach_db', 'sp_helpsort', 'sp_attach_single_file_db', 'sp_helpstats',
+            'sp_bindefault', 'sp_helptext', 'sp_bindrule', 'sp_helptrigger', 'sp_bindsession',
+            'sp_indexoption', 'sp_certify_removable', 'sp_invalidate_textptr', 'sp_configure',
+            'sp_lock', 'sp_create_removable', 'sp_monitor', 'sp_createstats', 'sp_procoption',
+            'sp_cycle_errorlog', 'sp_recompile', 'sp_datatype_info', 'sp_refreshview', 'sp_dbcmptlevel',
+            'sp_releaseapplock', 'sp_dboption', 'sp_rename', 'sp_dbremove', 'sp_renamedb',
+            'sp_delete_backuphistory', 'sp_resetstatus', 'sp_depends', 'sp_serveroption', 'sp_detach_db',
+            'sp_setnetname', 'sp_dropdevice', 'sp_settriggerorder', 'sp_dropextendedproc', 'sp_spaceused',
+            'sp_dropextendedproperty', 'sp_tableoption', 'sp_dropmessage', 'sp_unbindefault', 'sp_droptype',
+            'sp_unbindrule', 'sp_executesql', 'sp_updateextendedproperty', 'sp_getapplock', 'sp_updatestats',
+            'sp_getbindtoken', 'sp_validname', 'sp_help', 'sp_who',
+
+            //Web Assistant Procedures
+            'sp_dropwebtask', 'sp_makewebtask', 'sp_enumcodepages', 'sp_runwebtask',
+
+            //XML Procedures
+            'sp_xml_preparedocument', 'sp_xml_removedocument',
+
+            //General Extended Procedures
+            'xp_cmdshellxp_logininfo', 'xp_enumgroups', 'xp_msver', 'xp_findnextmsgxp_revokelogin',
+            'xp_grantlogin', 'xp_sprintf', 'xp_logevent', 'xp_sqlmaint', 'xp_loginconfig', 'xp_sscanf',
+
+            //API System Stored Procedures
+            'sp_cursor', 'sp_cursorclose', 'sp_cursorexecute', 'sp_cursorfetch', 'sp_cursoropen',
+            'sp_cursoroption', 'sp_cursorprepare', 'sp_cursorunprepare', 'sp_execute', 'sp_prepare', 'sp_unprepare',
+
+            //Misc
+            'sp_createorphan', 'sp_droporphans', 'sp_reset_connection', 'sp_sdidebug'
+            ),
+        4 => array(
+            //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_listextendedproperty',
+            ),
+        ),
+    'SYMBOLS' => array(
+        '!', '!=', '%', '&', '&&', '(', ')', '*', '+', '-', '/', '<', '<<', '<=',
+        '<=>', '<>', '=', '>', '>=', '>>', '^', 'ALL', 'AND', 'ANY', 'BETWEEN', 'CROSS',
+        'EXISTS', 'IN', 'JOIN', 'LIKE', 'NOT', 'NULL', 'OR', 'OUTER', 'SOME', '|', '||', '~'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #FF00FF;',
+            3 => 'color: #AF0000;',
+            4 => 'color: #AF0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080;',
+            'MULTI' => 'color: #008080;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #808080;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #808080;'
+            ),
+        '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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/typoscript.php b/sources/inc/geshi/typoscript.php
new file mode 100644
index 0000000..6751aaa
--- /dev/null
+++ b/sources/inc/geshi/typoscript.php
@@ -0,0 +1,300 @@
+ Complete rewrite
+ * 2005/07/29 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2004/07/14)
+ * -------------------------
+ * 
+ *
+ *************************************************************************************
+ *
+ *     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' => 'TypoScript',
+    'COMMENT_SINGLE' => array(1  => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(2 => '/(? GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        // Conditions: http://documentation.typo3.org/documentation/tsref/conditions/
+        1 => array(
+            'browser', 'compatVersion', 'dayofmonth', 'dayofweek', 'device',
+            'globalString', 'globalVars', 'hostname', 'hour',
+            'ip', 'language', 'loginUser', 'loginuser', 'minute',
+            'month', 'PIDinRootline', 'PIDupinRootline',
+            'system', 'treelevel', 'useragent', 'userFunc',
+            'usergroup', 'version'
+            ),
+
+        // Functions: http://documentation.typo3.org/documentation/tsref/functions/
+        2 => array(
+            'addParams', 'encapsLines', 'filelink', 'HTMLparser',
+            'HTMLparser_tags', 'if', 'imageLinkWrap',
+            'imgResource', 'makelinks', 'numRows', 'parseFunc',
+            'select', 'split', 'stdWrap', 'tableStyle', 'tags',
+            'textStyle', 'typolink'
+            ),
+
+        // 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://documentation.typo3.org/documentation/tsref/cobjects/
+        4 => array(
+            'CASE', 'CLEARGIF', 'COA', 'COA_INT', 'COBJ_ARRAY', 'COLUMNS',
+            'CONTENT', 'CTABLE', 'EDITPANEL', 'FILE', 'FORM',
+            'HMENU', 'HRULER', 'HTML', 'IMAGE', 'IMGTEXT',
+            'IMG_RESOURCE', 'LOAD_REGISTER', 'MULTIMEDIA',
+            'OTABLE', 'PHP_SCRIPT', 'PHP_SCRIPT_EXT',
+            'PHP_SCRIPT_INT', 'RECORDS', 'RESTORE_REGISTER',
+            'SEARCHRESULT', 'TEMPLATE', 'TEXT', 'USER',
+            'USER_INT'
+            ),
+
+        // GIFBUILDER toplevel link: http://documentation.typo3.org/documentation/tsref/gifbuilder/
+        5 => array(
+            '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
+        6 => array(
+            'ADJUST', 'BOX', 'CROP', 'EFFECT', 'EMBOSS',
+            'IMGMAP', 'OUTLINE', 'SCALE', 'SHADOW',
+            'WORKAREA'
+            ),
+
+        // 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://documentation.typo3.org/documentation/tsref/menu/common-properties/
+        8 => array(
+            'alternativeSortingField', 'begin', 'debugItemConf',
+            'imgNameNotRandom', 'imgNamePrefix',
+            'itemArrayProcFunc', 'JSWindow', 'maxItems',
+            'minItems', 'overrideId', 'sectionIndex',
+            'showAccessRestrictedPages', 'submenuObjSuffixes'
+            ),
+
+        // 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',
+            'SPC', 'USERDEF1', 'USERDEF1RO', 'USERDEF2',
+            'USERDEF2RO', 'USR', 'USRRO'
+            ),
+        ),
+
+    // Does not include '-' because of stuff like htmlTag_langKey = en-GB and
+    // lib.nav-sub
+    'SYMBOLS' => array(
+        0 => array(
+            '|',
+            '+', '*', '/', '%',
+            '!', '&&', '^',
+            '<', '>', '=',
+            '?', ':',
+            '.'
+            ),
+        1 => array(
+            '(', ')', '{', '}', '[', ']'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true,
+        9 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #ed7d14;',
+            2 => 'font-weight: bold;',
+            3 => 'color: #990000; font-weight: bold;',
+            4 => 'color: #990000; font-weight: bold;',
+            5 => 'color: #990000; font-weight: bold;',
+            6 => 'color: #990000; font-weight: bold;',
+            7 => 'color: #990000; font-weight: bold;',
+            8 => 'font-weight: bold;',
+            9 => 'color: #990000; font-weight: bold;',
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #aaa; font-style: italic;',
+            2 => 'color: #aaa; font-style: italic;',
+            'MULTI' => 'color: #aaa; font-style: italic;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ac14aa;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000e0; font-weight: bold;',
+            2 => 'color: #0000e0; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933; font-weight: bold;',
+                // Set this to the same value as brackets above
+            1 => 'color: #009900; font-weight: bold;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #009900;',
+            1 => 'color: #009900; font-weight: bold;',
+            2 => 'color: #3366CC;',
+            3 => 'color: #000066; font-weight: bold;',
+            4 => 'color: #ed7d14;',
+            5 => 'color: #000066; font-weight: bold;',
+            6 => 'color: #009900;',
+            7 => 'color: #3366CC;'
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        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(
+        ),
+    'REGEXPS' => array(
+            // xhtml tag
+        2 => array(
+            GESHI_SEARCH => '(<)([a-zA-Z\\/][^\\/\\|]*?)(>)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 's',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+
+            // Constant
+        0 => array(
+            GESHI_SEARCH => '(\{)(\$[a-zA-Z_\.]+[a-zA-Z0-9_\.]*)(\})',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => '\\3'
+            ),
+
+            // Constant dollar sign
+        1 => array(
+            GESHI_SEARCH => '(\$)([a-zA-Z_\.]+[a-zA-Z0-9_\.]*)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => '\\2'
+            ),
+
+            // extension keys / tables: (static|user|ttx|tx|tt|fe)_something[_something]
+        3 => array(
+            GESHI_SEARCH => '(plugin\.|[^\.]\b)((?:static|user|ttx|tx|tt|fe)(?:_[0-9A-Za-z_]+?)\b)',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // conditions and controls
+        4 => array(
+            GESHI_SEARCH => '(\[)(globalVar|global|end)\b',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // lowlevel setup and constant objects
+        5 => array(
+            GESHI_SEARCH => '([^\.\$-\{]\b)(cObj|field|config|content|file|frameset|includeLibs|lib|page|plugin|register|resources|sitemap|sitetitle|styles|temp|tt_content|tt_news|types|xmlnews)\b',
+            GESHI_REPLACE => '\\2',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '\\1',
+            GESHI_AFTER => ''
+            ),
+
+            // markers
+        6 => array(
+            GESHI_SEARCH => '(###[^#]+###)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+
+            // hex color codes
+        7 => array(
+            GESHI_SEARCH => '(#[a-fA-F0-9]{6}\b|#[a-fA-F0-9]{3}\b)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => '',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+);
+
+?>
diff --git a/sources/inc/geshi/unicon.php b/sources/inc/geshi/unicon.php
new file mode 100644
index 0000000..6fe62d0
--- /dev/null
+++ b/sources/inc/geshi/unicon.php
@@ -0,0 +1,210 @@
+ 'Unicon (Unified Extended Dialect of Icon)',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'case', 'class', 'continue', 'create', 'default', 'do',
+            'else', 'end', 'every', 'fail', 'for', 'if', 'import', 'initial', 'initially',
+            'invocable', 'link', 'method', 'next', 'not', 'of', 'package', 'procedure', 'record',
+            'repeat', 'return', 'switch', 'suspend', 'then', 'to', 'until', 'while'
+            ),
+        2 => array(
+            'global', 'local', 'static'
+            ),
+        3 => array(
+            'allocated', 'ascii', 'clock', 'collections',
+            'column', 'cset', 'current', 'date', 'dateline', 'digits',
+            'dump', 'e', 'error', 'errornumber', 'errortext',
+            'errorvalue', 'errout', 'eventcode', 'eventsource', 'eventvalue',
+            'fail', 'features', 'file', 'host', 'input', 'lcase',
+            'letters', 'level', 'line', 'main', 'now', 'null',
+            'output', 'phi', 'pi', 'pos', 'progname', 'random',
+            'regions', 'source', 'storage', 'subject', 'syserr', 'time',
+            'trace', 'ucase', 'version', 'col', 'control', 'interval',
+            'ldrag', 'lpress', 'lrelease', 'mdrag', 'meta', 'mpress',
+            'mrelease', 'rdrag', 'resize', 'row', 'rpress', 'rrelease',
+            'shift', 'window', 'x', 'y'
+            ),
+        4 => array(
+            'abs', 'acos', 'any', 'args', 'asin', 'atan', 'bal', 'center', 'char',
+            'chmod', 'close', 'cofail', 'collect', 'copy', 'cos', 'cset', 'ctime', 'dbcolumns',
+            'dbdriver', 'dbkeys', 'dblimits', 'dbproduction', 'dbtables', 'delay', 'delete', 'detab',
+            'display', 'dtor', 'entab', 'errorclear', 'event', 'eventmask', 'EvGet', 'exit', 'exp',
+            'fetch', 'fieldnames', 'find', 'flock', 'flush', 'function', 'get', 'getch', 'getche',
+            'getenv', 'gettimeofday', 'globalnames', 'gtime', 'iand', 'icom', 'image', 'insert',
+            'integer', 'ior', 'ishift', 'ixor', 'key', 'left', 'list', 'load', 'loadfunc',
+            'localnames', 'log', 'many', 'map', 'match', 'member', 'mkdir', 'move', 'name', 'numeric',
+            'open', 'opmask', 'ord', 'paramnames', 'parent', 'pipe', 'pop', 'pos', 'proc', 'pull',
+            'push', 'put', 'read', 'reads', 'real', 'receive', 'remove', 'rename', 'repl', 'reverse',
+            'right', 'rmdir', 'rtod', 'runerr', 'seek', 'select', 'send', 'seq', 'serial', 'set',
+            'setenv', 'sort', 'sortf', 'sql', 'sqrt', 'stat', 'staticnames', 'stop', 'string', 'system', 'tab',
+            'table', 'tan', 'trap', 'trim', 'truncate', 'type', 'upto', 'utime', 'variable', 'where',
+            'write', 'writes'
+            ),
+        5 => array(
+            'Active', 'Alert', 'Bg', 'Clip', 'Clone', 'Color', 'ColorValue',
+            'CopyArea', 'Couple', 'DrawArc', 'DrawCircle', 'DrawCurve', 'DrawCylinder', 'DrawDisk',
+            'DrawImage', 'DrawLine', 'DrawPoint', 'DrawPolygon', 'DrawRectangle', 'DrawSegment',
+            'DrawSphere', 'DrawString', 'DrawTorus', 'EraseArea', 'Event', 'Fg', 'FillArc',
+            'FillCircle', 'FillPolygon', 'FillRectangle', 'Font', 'FreeColor', 'GotoRC', 'GotoXY',
+            'IdentifyMatrix', 'Lower', 'MatrixMode', 'NewColor', 'PaletteChars', 'PaletteColor',
+            'PaletteKey', 'Pattern', 'Pending', 'Pixel', 'PopMatrix', 'PushMatrix', 'PushRotate',
+            'PushScale', 'PushTranslate', 'QueryPointer', 'Raise', 'ReadImage', 'Refresh', 'Rotate',
+            'Scale', 'Texcoord', 'TextWidth', 'Texture', 'Translate', 'Uncouple', 'WAttrib',
+            'WDefault', 'WFlush', 'WindowContents', 'WriteImage', 'WSync'
+            ),
+        6 => array(
+            'define', 'include', 'ifdef', 'ifndef', 'else', 'endif', 'error',
+            'line', 'undef'
+            ),
+        7 => array(
+            '_V9', '_AMIGA', '_ACORN', '_CMS', '_MACINTOSH', '_MSDOS_386',
+            '_MS_WINDOWS_NT', '_MSDOS', '_MVS', '_OS2', '_POR', 'T', '_UNIX', '_POSIX', '_DBM',
+            '_VMS', '_ASCII', '_EBCDIC', '_CO_EXPRESSIONS', '_CONSOLE_WINDOW', '_DYNAMIC_LOADING',
+            '_EVENT_MONITOR', '_EXTERNAL_FUNCTIONS', '_KEYBOARD_FUNCTIONS', '_LARGE_INTEGERS',
+            '_MULTITASKING', '_PIPES', '_RECORD_IO', '_SYSTEM_FUNCTION', '_MESSAGING', '_GRAPHICS',
+            '_X_WINDOW_SYSTEM', '_MS_WINDOWS', '_WIN32', '_PRESENTATION_MGR', '_ARM_FUNCTIONS',
+            '_DOS_FUNCTIONS'
+            ),
+        8 => array(
+            'line')
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '\\', '%', '=', '<', '>', '!', '^',
+            '&', '|', '?', ':', ';', ',', '.', '~', '@'
+            ),
+        2 => array(
+            '$(', '$)', '$<', '$>'
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        5 => true,
+        6 => true,
+        7 => true,
+        8 => true
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #b1b100;',
+            3 => 'color: #b1b100;',
+            4 => 'color: #b1b100;',
+            5 => 'color: #b1b100;',
+            6 => 'color: #b1b100;',
+            7 => 'color: #b1b100;',
+            8 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(1 => '.'),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array(),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            3 => array(
+                'DISALLOWED_BEFORE' => '(?<=&)'
+                ),
+            4 => array(
+                'DISALLOWED_BEFORE' => "(? "(?![a-zA-Z0-9_\"\'])"
+                ),
+            6 => array(
+                'DISALLOWED_BEFORE' => '(?<=\$)'
+                ),
+            8 => array(
+                'DISALLOWED_BEFORE' => '(?<=#)'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/upc.php b/sources/inc/geshi/upc.php
new file mode 100644
index 0000000..e053032
--- /dev/null
+++ b/sources/inc/geshi/upc.php
@@ -0,0 +1,270 @@
+ 'UPC',
+    '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' => '',
+    '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',
+            'do', 'else', 'for', 'switch', 'goto',
+
+            'upc_forall', 'upc_barrier', 'upc_notify', 'upc_wait', 'upc_fence'
+            ),
+        2 => array(
+            'null', 'false', 'break', 'true', 'function', 'enum', 'extern', 'inline'
+            ),
+        3 => array(
+            // assert.h
+            'assert',
+
+            //complex.h
+            'cabs', 'cacos', 'cacosh', 'carg', 'casin', 'casinh', 'catan',
+            'catanh', 'ccos', 'ccosh', 'cexp', 'cimag', 'cis', 'clog', 'conj',
+            'cpow', 'cproj', 'creal', 'csin', 'csinh', 'csqrt', 'ctan', 'ctanh',
+
+            //ctype.h
+            'digittoint', 'isalnum', 'isalpha', 'isascii', 'isblank', 'iscntrl',
+            'isdigit', 'isgraph', 'islower', 'isprint', 'ispunct', 'isspace',
+            'isupper', 'isxdigit', 'toascii', 'tolower', 'toupper',
+
+            //inttypes.h
+            'imaxabs', 'imaxdiv', 'strtoimax', 'strtoumax', 'wcstoimax',
+            'wcstoumax',
+
+            //locale.h
+            'localeconv', 'setlocale',
+
+            //math.h
+            'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh', 'exp',
+            'fabs', 'floor', 'frexp', 'ldexp', 'log', 'log10', 'modf', 'pow',
+            'sin', 'sinh', 'sqrt', 'tan', 'tanh',
+
+            //setjmp.h
+            'longjmp', 'setjmp',
+
+            //signal.h
+            'raise',
+
+            //stdarg.h
+            'va_arg', 'va_copy', 'va_end', 'va_start',
+
+            //stddef.h
+            'offsetof',
+
+            //stdio.h
+            'clearerr', 'fclose', 'fdopen', 'feof', 'ferror', 'fflush', 'fgetc',
+            'fgetpos', 'fgets', 'fopen', 'fprintf', 'fputc', 'fputchar',
+            'fputs', 'fread', 'freopen', 'fscanf', 'fseek', 'fsetpos', 'ftell',
+            'fwrite', 'getc', 'getch', 'getchar', 'gets', 'perror', 'printf',
+            'putc', 'putchar', 'puts', 'remove', 'rename', 'rewind', 'scanf',
+            'setbuf', 'setvbuf', 'snprintf', 'sprintf', 'sscanf', 'tmpfile',
+            'tmpnam', 'ungetc', 'vfprintf', 'vfscanf', 'vprintf', 'vscanf',
+            'vsprintf', 'vsscanf',
+
+            //stdlib.h
+            'abort', 'abs', 'atexit', 'atof', 'atoi', 'atol', 'bsearch',
+            'calloc', 'div', 'exit', 'free', 'getenv', 'itoa', 'labs', 'ldiv',
+            'ltoa', 'malloc', 'qsort', 'rand', 'realloc', 'srand', 'strtod',
+            'strtol', 'strtoul', 'system',
+
+            //string.h
+            'memchr', 'memcmp', 'memcpy', 'memmove', 'memset', 'strcat',
+            'strchr', 'strcmp', 'strcoll', 'strcpy', 'strcspn', 'strerror',
+            'strlen', 'strncat', 'strncmp', 'strncpy', 'strpbrk', 'strrchr',
+            'strspn', 'strstr', 'strtok', 'strxfrm',
+
+            //time.h
+            'asctime', 'clock', 'ctime', 'difftime', 'gmtime', 'localtime',
+            'mktime', 'strftime', 'time',
+
+            //wchar.h
+            'btowc', 'fgetwc', 'fgetws', 'fputwc', 'fputws', 'fwide',
+            'fwprintf', 'fwscanf', 'getwc', 'getwchar', 'mbrlen', 'mbrtowc',
+            'mbsinit', 'mbsrtowcs', 'putwc', 'putwchar', 'swprintf', 'swscanf',
+            'ungetwc', 'vfwprintf', 'vswprintf', 'vwprintf', 'wcrtomb',
+            'wcscat', 'wcschr', 'wcscmp', 'wcscoll', 'wcscpy', 'wcscspn',
+            'wcsftime', 'wcslen', 'wcsncat', 'wcsncmp', 'wcsncpy', 'wcspbrk',
+            'wcsrchr', 'wcsrtombs', 'wcsspn', 'wcsstr', 'wcstod', 'wcstok',
+            'wcstol', 'wcstoul', 'wcsxfrm', 'wctob', 'wmemchr', 'wmemcmp',
+            'wmemcpy', 'wmemmove', 'wmemset', 'wprintf', 'wscanf',
+
+            //wctype.h
+            'iswalnum', 'iswalpha', 'iswcntrl', 'iswctype', 'iswdigit',
+            'iswgraph', 'iswlower', 'iswprint', 'iswpunct', 'iswspace',
+            'iswupper', 'iswxdigit', 'towctrans', 'towlower', 'towupper',
+            'wctrans', 'wctype'
+            ),
+        4 => array(
+            'auto', 'char', 'const', 'double',  'float', 'int', 'long',
+            'register', 'short', 'signed', 'sizeof', 'static', 'struct',
+            'typedef', 'union', 'unsigned', 'void', 'volatile', 'wchar_t',
+
+            'int8', 'int16', 'int32', 'int64',
+            'uint8', 'uint16', 'uint32', 'uint64',
+
+            'int_fast8_t', 'int_fast16_t', 'int_fast32_t', 'int_fast64_t',
+            'uint_fast8_t', 'uint_fast16_t', 'uint_fast32_t', 'uint_fast64_t',
+
+            'int_least8_t', 'int_least16_t', 'int_least32_t', 'int_least64_t',
+            'uint_least8_t', 'uint_least16_t', 'uint_least32_t', 'uint_least64_t',
+
+            'int8_t', 'int16_t', 'int32_t', 'int64_t',
+            'uint8_t', 'uint16_t', 'uint32_t', 'uint64_t',
+
+            'intmax_t', 'uintmax_t', 'intptr_t', 'uintptr_t',
+            'size_t', 'off_t',
+
+            'upc_lock_t', 'shared', 'strict', 'relaxed', 'upc_blocksizeof',
+            'upc_localsizeof', 'upc_elemsizeof'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']',
+        '+', '-', '*', '/', '%',
+        '=', '<', '>',
+        '!', '^', '&', '|',
+        '?', ':',
+        ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #000000; font-weight: bold;',
+            3 => 'color: #000066;',
+            4 => 'color: #993333;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #339933;',
+            'MULTI' => 'color: #808080; 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: #660099; font-weight: bold;',
+            5 => 'color: #006699; font-weight: bold;',
+            'HARD' => '',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;',
+            GESHI_NUMBER_BIN_PREFIX_0B => 'color: #208080;',
+            GESHI_NUMBER_OCT_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_HEX_PREFIX => 'color: #208080;',
+            GESHI_NUMBER_FLT_SCI_SHORT => 'color:#800080;',
+            GESHI_NUMBER_FLT_SCI_ZERO => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI_F => 'color:#800080;',
+            GESHI_NUMBER_FLT_NONSCI => 'color:#800080;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.opengroup.org/onlinepubs/009695399/functions/{FNAMEL}.html',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/urbi.php b/sources/inc/geshi/urbi.php
new file mode 100644
index 0000000..a7353ea
--- /dev/null
+++ b/sources/inc/geshi/urbi.php
@@ -0,0 +1,200 @@
+ 'Urbi',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Multiline-continued single-line comments
+        1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        //Multiline-continued preprocessor define
+        2 => '/#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        // Urbi warning.
+        3 => "#\[[0-9a-f]{8}:warning\].*#",
+        // Urbi message from echo.
+        4 => '#\[[0-9a-f]{8}\] \*\*\*.*#',
+        // Urbi error message.
+        6 => '#\[[0-9a-f]{8}:error\].*#',
+        // Urbi system message.
+        5 => '#\[00.*\].*#',
+        // Nested comment. Max depth 4.
+        7 => '#\/\*(.|\n)*\/\*(.|\n)*\*\/(.|\n)*\*\/#',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(
+        0 => '"',
+        1 => '\'',
+        ),
+    // For Urbi, disable escape char is better.
+    'ESCAPE_CHAR' => '\\',
+    'ESCAPE_REGEXP' => array(
+        //Simple Single Char Escapes
+        1 => "#\\\\[abfnrtv\\\'\"?\n]#",
+        //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(
+        // Condition keywords.
+        1 => array(
+            'at', 'at;', 'at|', 'at&', 'at,', 'break', 'call', 'case', 'catch', 'continue',
+            'do', 'else', 'every', 'every&', 'every,', 'every;', 'every|', 'for', 'for&',
+            'for,', 'for;', 'foreach', 'for|', 'freezeif', 'goto', 'if', 'in', 'loop',
+            'loop&', 'loop,', 'loop;', 'loop|', 'or_eq', 'stopif', 'switch', 'try',
+            'waituntil', 'when', 'whenever', 'while', 'while&', 'while,', 'while;',
+            'while|', 'throw', 'onleave', 'watch', 'return', 'and_eq', 'default', 'finally',
+            'timeout', 'xor_eq'
+            ),
+        // Type.
+        2 => array(
+            'virtual', 'using', 'namespace', 'inline', 'protected', 'private', 'public',
+            'typename', 'typeid', 'class', 'const_cast', 'dynamic_cast', 'friend',
+            'template', 'enum', 'static_cast', 'reinterpret_cast', 'mutable', 'explicit'
+            ),
+        // Standard function.
+        3 => array(
+            'this', 'sizeof', 'delete', 'assert', 'isdef', 'compl', 'detach',
+            'disown', '__HERE__', 'asm'
+            ),
+        // Type.
+        4 => array(
+            'char', 'const', 'double', 'int', 'long', 'typedef', 'union',
+            'unsigned', 'var', 'short', 'wchar_t', 'volatile', 'signed', 'bool',
+            'float', 'struct', 'auto', 'register', 'static', 'extern', 'function',
+            'export', 'external', 'internal', 'closure', 'BIN'
+            ),
+        ),
+    'SYMBOLS' => array(
+        0 => array('(', ')', '{', '}', '[', ']'),
+        1 => array('<', '>','=', '!=', '==', '==='),
+        2 => array('+', '-', '*', '/', '%', 'bitand', 'bitor', 'xor'),
+        3 => array('!', '^', '&', '|'),
+        4 => array('?', ':', ';')
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000dd;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666;',
+            2 => 'color: #339900;',
+            3 => 'color: #d46b0f;',
+            4 => 'color: #20b537;',
+            5 => 'color: #73776f;',
+            6 => 'color: #a71616;',
+            7 => 'color: #666666;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #ff0000;',
+            1 => 'color: #ff0000;',
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #7a0874; font-weight: bold;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;',
+            1 => 'color: #007788;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #0000dd;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #007788;',
+            2 => 'color: #007788;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;',
+            1 => 'color: #0000f8;',
+            2 => 'color: #000040;',
+            3 => 'color: #000040; font-weight: bold;',
+            4 => 'color: #008080;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000dd',
+            1 => 'color: #0000dd;',
+            2 => 'color: #0000dd;',
+            3 => 'color: #0000dd;',
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::',
+        // FIXME: add -> splitter.
+        ),
+    'REGEXPS' => array(
+        0 => '0x[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])*',
+        1 => '[0-9]([0-9_]*[0-9])*(e|E)(-|\+)?[0-9]([0-9_]*[0-9])*',
+        2 => '[0-9]([0-9_]*[0-9])*(min|s|ms|h|d)',
+        3 => '[0-9]+_([0-9_])*[0-9]',
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+);
+
+?>
diff --git a/sources/inc/geshi/uscript.php b/sources/inc/geshi/uscript.php
new file mode 100644
index 0000000..58cdb8d
--- /dev/null
+++ b/sources/inc/geshi/uscript.php
@@ -0,0 +1,299 @@
+ 'Unreal Script',
+    'COMMENT_SINGLE' => array(
+            1 => '//',
+            2 => '#'
+            ),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(        //declaration keywords
+            'simulated', 'state', 'class', 'function', 'event', 'var', 'local',
+            'ignores', 'globalconfig', 'config', 'abstract', 'nativereplication', 'native',
+            'auto', 'coerce', 'const', 'default',
+            'defaultproperties',
+            'enum', 'extends', 'expands', 'final', 'guid', 'latent', 'localized',
+            'new', 'noexport', 'operator', 'preoperator', 'optional', 'out',
+            'private', 'public', 'protected', 'reliable', 'replication',
+            'singular', 'static', 'struct', 'transient', 'unreliable',
+            'hidedropdown', 'cacheexempt', 'exec', 'delegate', 'import', 'placeable', 'exportstructs'
+            ),
+        2 => array(        //control flow keywords
+            'for', 'while', 'do', 'if', 'else', 'switch', 'case', 'return', 'break', 'continue',
+            'begin', 'loop', 'assert',
+            'foreach', 'AllActors', 'DynamicActors', 'ChildActors', 'BasedActors', 'TouchingActors',
+            'TraceActors', 'RadiusActors', 'VisibleActors', 'CollidingActors', 'VisibleCollidingActors'
+            ),
+        3 => array(        //global (object) functions
+            'log', 'warn', 'rot', 'vect', 'Rand', 'Min', 'Max', 'Clamp', 'Abs', 'Sin', 'ASin',
+            'Cos', 'ACos', 'Tan', 'ATan', 'Exp', 'Loge', 'Sqrt', 'Square', 'FRand', 'FMin', 'FMax', 'FClamp',
+            'Lerp', 'Smerp', 'Ceil', 'Round', 'VSize', 'Normal', 'Invert', 'VRand', 'MirrorVectorByNormal',
+            'GetAxes', 'GetUnAxes', 'RotRand', 'OrthoRotation', 'Normalize', 'ClockwiseFrom',
+            'Len', 'InStr', 'Mid', 'Left', 'Right', 'Caps', 'Chr', 'Asc', 'Locs',
+            'Divide', 'Split', 'StrCmp', 'Repl', 'Eval',
+            'InterpCurveEval', 'InterpCurveGetOutputRange', 'InterpCurveGetInputDomain',
+            'QuatProduct', 'QuatInvert', 'QuatRotateVector', 'QuatFindBetween', 'QuatFromAxisAndAngle',
+            'QuatFromRotator', 'QuatToRotator', 'QuatSlerp',
+            'Localize', 'GotoState', 'IsInState', 'GetStateName',
+            'ClassIsChildOf', 'IsA', 'Enable', 'Disable',
+            'GetPropertyText', 'SetPropertyText', 'GetEnum', 'DynamicLoadObject', 'FindObject',
+            'SaveConfig', 'ClearConfig', 'StaticSaveConfig', 'ResetConfig', 'StaticClearConfig',
+            'GetPerObjectNames', 'RandRange', 'StopWatch', 'IsOnConsole', 'IsSoaking',
+            'PlatformIsMacOS', 'PlatformIsUnix', 'PlatformIsWindows', 'PlatformIs64Bit',
+            'BeginState', 'EndState', 'Created', 'AllObjects', 'GetReferencers', 'GetItemName',
+            'ReplaceText', 'EatStr'
+            ),
+        4 => array(        //common almost-global (actor) functions
+            'ClientMessage', 'ConsoleCommand', 'CopyObjectToClipboard', 'TextToSpeech',
+            'Error', 'Sleep', 'SetCollision', 'SetCollisionSize', 'SetDrawScale', 'SetDrawScale3D',
+            'SetStaticMesh', 'SetDrawType', 'Move', 'SetLocation', 'SetRotation',
+            'SetRelativeLocation', 'SetRelativeRotation', 'MoveSmooth', 'AutonomousPhysics',
+            'SetBase', 'SetOwner', 'IsJoinedTo', 'GetMeshName', 'PlayAnim', 'LoopAnim', 'TweenAnim',
+            'IsAnimating', 'FinishAnim', 'HasAnim', 'StopAnimating', 'FreezeFrameAt', 'SetAnimFrame',
+            'IsTweening', 'AnimStopLooping', 'AnimEnd', 'LinkSkelAnim', 'LinkMesh', 'BoneRefresh',
+            'GetBoneCoords', 'GetBoneRotation', 'GetRootLocation', 'GetRootRotation', 'AttachToBone',
+            'DetachFromBone', 'SetBoneScale', 'UpdateURL', 'GetURLOption', 'SetPhysics', 'KAddImpulse',
+            'KImpact', 'KApplyForce', 'Clock', 'UnClock', 'Destroyed', 'GainedChild', 'LostChild',
+            'Tick', 'PostNetReceive', 'ClientTrigger', 'Trigger', 'UnTrigger', 'BeginEvent', 'EndEvent',
+            'Timer', 'HitWall', 'Falling', 'Landed', 'ZoneChange', 'PhysicsVolumeChange', 'Touch',
+            'PostTouch', 'UnTouch', 'Bump', 'BaseChange', 'Attach', 'Detach', 'SpecialHandling',
+            'EncroachingOn', 'EncroachedBy', 'RanInto', 'FinishedInterpolation', 'EndedRotation',
+            'UsedBy', 'FellOutOfWorld', 'KilledBy', 'TakeDamage', 'HealDamage', 'Trace', 'FastTrace',
+            'TraceThisActor', 'spawn', 'Destroy', 'TornOff', 'SetTimer', 'PlaySound', 'PlayOwnedSound',
+            'GetSoundDuration', 'MakeNoise', 'BeginPlay', 'GetAllInt', 'RenderOverlays', 'RenderTexture',
+            'PreBeginPlay', 'PostBeginPlay', 'PostNetBeginPlay', 'HurtRadius', 'Reset', 'Crash'
+            ),
+        5 => array(        //data types
+            'none', 'null',
+            'float', 'int', 'bool', 'byte', 'char', 'double', 'iterator', 'name', 'string',    //primitive
+            'plane', 'rotator', 'vector', 'spline',    'coords', 'Quat', 'Range', 'RangeVector', //structs
+            'Scale', 'Color', 'Box', 'IntBox', 'FloatBox', 'BoundingVolume', 'Matrix', 'InterpCurvePoint',
+            'InterpCurve', 'CompressedPosition', 'TMultiMap', 'PointRegion',
+            'KRigidBodyState', 'KSimParams', 'AnimRep', 'FireProperties',
+            'lodmesh', 'skeletalmesh', 'mesh', 'StaticMesh', 'MeshInstance',    //3d resources
+            'sound',    //sound resources
+            'material', 'texture', 'combiner', 'modifier', 'ColorModifier', 'FinalBlend',    //2d resources
+            'MaterialSequence', 'MaterialSwitch', 'OpacityModifier', 'TexModifier', 'TexEnvMap',
+            'TexCoordSource', 'TexMatrix', 'TexOscillator', 'TexPanner', 'TexRotator', 'TexScaler',
+            'RenderedMaterial', 'BitmapMaterial', 'ScriptedTexture', 'ShadowBitmapMaterial', 'Cubemap',
+            'FractalTexture', 'FireTexture', 'IceTexture', 'WaterTexture', 'FluidTexture', 'WaveTexture',
+            'WetTexture', 'ConstantMaterial', 'ConstantColor', 'FadeColor', 'ParticleMaterial',
+            'ProjectorMaterial', 'Shader', 'TerrainMaterial', 'VertexColor'
+            ),
+        6 => array(        //misc keywords
+            'false', 'true', 'self', 'super', 'MaxInt', 'Pi'
+            ),
+        7 => array(        //common actor enums & variables
+            'DT_None', 'DT_Sprite', 'DT_Mesh', 'DT_Brush', 'DT_RopeSprite',
+            'DT_VerticalSprite', 'DT_TerraForm', 'DT_SpriteAnimOnce', 'DT_StaticMesh', 'DT_DrawType',
+            'DT_Particle', 'DT_AntiPortal', 'DT_FluidSurface',
+            'PHYS_None', 'PHYS_Walking', 'PHYS_Falling', 'PHYS_Swimming', 'PHYS_Flying',
+            'PHYS_Rotating', 'PHYS_Projectile', 'PHYS_Interpolating', 'PHYS_MovingBrush', 'PHYS_Spider',
+            'PHYS_Trailer', 'PHYS_Ladder', 'PHYS_RootMotion', 'PHYS_Karma', 'PHYS_KarmaRagDoll',
+            'PHYS_Hovering', 'PHYS_CinMotion',
+            'ROLE_None', 'ROLE_DumbProxy', 'ROLE_SimulatedProxy',
+            'ROLE_AutonomousProxy', 'ROLE_Authority',
+            'STY_None', 'STY_Normal', 'STY_Masked', 'STY_Translucent', 'STY_Modulated', 'STY_Alpha',
+            'STY_Additive', 'STY_Subtractive', 'STY_Particle', 'STY_AlphaZ',
+            'OCCLUSION_None', 'OCCLUSION_BSP', 'OCCLUSION_Default', 'OCCLUSION_StaticMeshes',
+            'SLOT_None', 'SLOT_Misc', 'SLOT_Pain', 'SLOT_Interact', 'SLOT_Ambient', 'SLOT_Talk',
+            'SLOT_Interface', 'MTRAN_None', 'MTRAN_Instant', 'MTRAN_Segue', 'MTRAN_Fade',
+            'MTRAN_FastFade', 'MTRAN_SlowFade',
+
+            'DrawType', 'Physics', 'Owner', 'Base', 'Level', 'Game', 'Instigator', 'RemoteRole', 'Role',
+            'LifeSpan', 'Tag', 'Event', 'Location', 'Rotation', 'Velocity', 'Acceleration',
+            'RelativeLocation', 'RelativeRotation', 'DrawScale', 'DrawScale3D', 'Skins', 'Style',
+            'SoundVolume', 'SoundPitch', 'SoundRadius', 'TransientSoundVolume', 'TransientSoundRadius',
+            'CollisionRadius', 'CollisionHeight', 'Mass', 'Buoyancy', 'RotationRate', 'DesiredRotation'
+            ),
+        8 => array(        //common non-actor uscript classes
+            'Object',
+            'CacheManager', 'CameraEffect', 'Canvas', 'CheatManager', 'Commandlet', 'DecoText', 'GUI',
+            'InteractionMaster', 'Interactions', 'Interaction', 'KarmaParamsCollision', 'KarmaParamsRBFull',
+            'KarmaParamsSkel', 'KarmaParams', 'LevelSummary', 'Locale', 'Manifest', 'MaterialFactory',
+            'MeshObject', 'ObjectPool', 'Pallete',
+            'ParticleEmitter', 'MeshEmitter', 'BeamEmitter', 'SpriteEmitter', 'SparkEmitter', 'TrailEmitter',
+            'Player', 'PlayerInput', 'PlayInfo', 'ReachSpec', 'Resource', 'LatentScriptedAction', 'ScriptedAction',
+            'speciesType', 'StreamBase', 'Stream', 'EditorEngine', 'Engine', 'Time', 'WeaponFire',
+            'WebApplication', 'WebRequest', 'WebResponse', 'WebSkin', 'xPawnGibGroup', 'xPawnSoundGroup',
+            'xUtil'
+            ),
+        9 => array(        //common actor-based uscript classes
+            'Actor',
+            'Controller', 'AIController', 'ScriptedController', 'Bot', 'xBot',
+            'PlayerController', 'UnrealPlayer', 'xPlayer',
+            'DamageType', 'WeaponDamageType', 'Effects', 'Emitter', 'NetworkEmitter',
+            'Gib', 'HUD', 'HudBase', 'Info', 'FluidSurfaceInfo', 'Combo',
+            'GameInfo', 'UnrealMPGameInfo', 'DeathMatch', 'TeamGame', 'CTFGame',
+            'xCTFGame', 'xBombingRun', 'xDoubleDom', 'xTeamGame',
+            'ASGameInfo', 'Invasion', 'ONSOnslaughtGame', 'xDeathmatch',
+            'Mutator', 'Inventory', 'Ammunition', 'KeyInventory', 'Powerups', 'Armor', 'Weapon',
+            'InventoryAttachment', 'WeaponAttachment',
+            'KActor', 'KConstraint', 'KBSJoint', 'KCarWheelJoint', 'KConeLimit', 'KHinge', 'KTire',
+            'KVehicleFactory', 'Keypoint', 'AIScript', 'ScriptedSequence', 'ScriptedTrigger',
+            'AmbientSound', 'Light', 'SpotLight', 'SunLight', 'TriggerLight',
+            'MeshEffect', 'NavigationPoint', 'GameObjective', 'DestroyableObjective',
+            'PathNode', 'FlyingPathNode', 'RoadPathNode', 'InventorySpot', 'PlayerStart',
+            'Pawn', 'Vehicle', 'UnrealPawn', 'xPawn', 'Monster', 'ASVehicle', 'KVehicle', 'KCar',
+            'ONSWeaponPawn', 'SVehicle', 'ONSVehicle', 'ONSChopperCraft', 'ONSHoverCraft',
+            'ONSPlaneCraft', 'ONSTreadCraft', 'ONSWheeledCraft',
+            'Pickup', 'Ammo', 'UTAmmoPickup', 'ArmorPickup', 'KeyPickup', 'TournamentPickup',
+            'Projectile', 'Projector', 'DynamicProjector', 'ShadowProjector', 'xScorch',
+            'xEmitter', 'xPickupBase', 'xProcMesh', 'xWeatherEffect', 'PhysicsVolume', 'Volume'
+            ),
+        10 => array(    //symbol-like operators
+            'dot','cross'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+','-','=','/','*','-','%','>','<','&','^','!','|','`','(',')','[',']','{','}',
+        '<<','>>','$','@'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false,
+        7 => false,
+        8 => false,
+        9 => false,
+        10 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;',
+            3 => 'color: #0066AA;',
+            4 => 'color: #0088FF;',
+            5 => 'color: #E000E0;',
+            6 => 'color: #900000;',
+            7 => 'color: #888800;',
+            8 => 'color: #AA6600;',
+            9 => 'color: #FF8800;',
+            10 => 'color: #0000FF;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            2 => 'color: #000000; font-weight: bold;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => ''
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #999999;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #669966;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #E000E0;',
+            1 => 'color: #E000E0;'
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => '',
+        7 => '',
+        8 => 'http://wiki.beyondunreal.com/wiki?search={FNAME}',
+        9 => 'http://wiki.beyondunreal.com/wiki?search={FNAME}',
+        10 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array('.'),
+    'REGEXPS' => array(            //handle template-style variable definitions
+        0 => array(
+            GESHI_SEARCH => '(class\s*)<(\s*(\w+)\s*)>',
+            GESHI_REPLACE => "\${1}",
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => "< \${3} >"
+            ),
+        1 => array(
+            GESHI_SEARCH => '(array\s*)<(\s*(\w+)\s*)>',
+            GESHI_REPLACE => "\${1}",
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => "< \${3} >"
+            )
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            10 => array(
+                'DISALLOWED_BEFORE' => '(?)'
+                )
+            )
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/vala.php b/sources/inc/geshi/vala.php
new file mode 100644
index 0000000..acac57e
--- /dev/null
+++ b/sources/inc/geshi/vala.php
@@ -0,0 +1,151 @@
+ 'Vala',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        //Using and Namespace directives (basic support)
+        //Please note that the alias syntax for using is not supported
+        3 => '/(?:(?<=using[\\n\\s])|(?<=namespace[\\n\\s]))[\\n\\s]*([a-zA-Z0-9_]+\\.)*[a-zA-Z0-9_]+[\n\s]*(?=[;=])/i'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'HARDQUOTE' => array('"""'),
+    'HARDESCAPE' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'as', 'abstract', 'base', 'break', 'case', 'catch', 'const',
+            'construct', 'continue', 'default', 'delete', 'dynamic', 'do',
+            'else', 'ensures', 'extern', 'false', 'finally', 'for', 'foreach',
+            'get', 'if', 'in', 'inline', 'internal', 'lock', 'namespace',
+            'null', 'out', 'override', 'private', 'protected', 'public', 'ref',
+            'requires', 'return', 'set', 'static', 'switch', 'this', 'throw',
+            'throws', 'true', 'try', 'using', 'value', 'var', 'virtual',
+            'volatile', 'void', 'yield', 'yields', 'while'
+            ),
+        2 => array(
+            '#elif', '#endif', '#else', '#if'
+            ),
+        3 => array(
+            'is', 'new', 'owned', 'sizeof', 'typeof', 'unchecked', 'unowned', 'weak'
+            ),
+        4 => array(
+            'bool', 'char', 'class', 'delegate', 'double', 'enum',
+            'errordomain', 'float', 'int', 'int8', 'int16', 'int32', 'int64',
+            'interface', 'long', 'short', 'signal', 'size_t', 'ssize_t',
+            'string', 'struct', 'uchar', 'uint', 'uint8', 'uint16', 'uint32',
+            'ulong', 'unichar', 'ushort'
+            )
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!', ':', ';',
+        '(', ')', '{', '}', '[', ']', '|'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => true,
+        2 => true,
+        3 => true,
+        4 => true,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0600FF;',
+            2 => 'color: #FF8000; font-weight: bold;',
+            3 => 'color: #008000;',
+            4 => 'color: #FF0000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008080; font-style: italic;',
+            3 => 'color: #008080;',
+            'MULTI' => 'color: #008080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;',
+            'HARD' => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #666666;',
+            'HARD' => 'color: #666666;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #FF0000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #0000FF;',
+            2 => 'color: #0000FF;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        '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,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            'DISALLOWED_BEFORE' => "(?|^])",
+            'DISALLOWED_AFTER' => "(?![a-zA-Z0-9_<\|%\\-])"
+        )
+    )
+);
+
+?>
diff --git a/sources/inc/geshi/vb.php b/sources/inc/geshi/vb.php
new file mode 100644
index 0000000..528e7cd
--- /dev/null
+++ b/sources/inc/geshi/vb.php
@@ -0,0 +1,157 @@
+ 'Visual Basic',
+    '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(
+            'Binary', 'Boolean', 'Byte', 'Currency', 'Date', 'Decimal', 'Double',
+            'String', 'Enum', 'Integer', 'Long', 'Object', 'Single', 'Variant'
+            ),
+        2 => array(
+            'CreateObject', 'GetObject', 'New', 'Option', 'Function',
+            'Call', 'Private', 'Public', 'Sub', 'Explicit', 'Compare', 'Exit'
+            ),
+        3 => array(
+            'And', 'Case', 'Do', 'Each', 'Else', 'ElseIf', 'For',
+            'Goto', 'If', 'Is', 'Loop', 'Next', 'Not', 'Or', 'Select', 'Step',
+            'Then', 'To', 'Until', 'While', 'With', 'Xor', 'WithEvents',
+            'DoEvents', 'Close', 'Like', 'In', 'End'
+            ),
+        4 => array(
+            'As', 'Dim', 'Get', 'Set', 'ReDim', 'Error',
+            'Resume', 'Declare', 'Let', 'ByRef', 'ByVal',
+            'Optional', 'Property', 'Control', 'UBound', 'Mod',
+            'GoSub', 'Implements', 'Input', 'LBound', 'Static', 'Stop',
+            'Type', 'TypeOf', 'On', 'Open', 'Output', 'ParamArray',
+            'Preserve', 'Print', 'RaiseEvent', 'Random', 'Line'
+            ),
+        5 => array(
+            'Nothing', 'False', 'True', 'Null', 'Empty'
+            ),
+        6 => array(
+            'ErrorHandler','ExitProc', 'PublishReport'
+            ),
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        6 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #F660AB; font-weight: bold;',
+            2 => 'color: #E56717; font-weight: bold;',
+            3 => 'color: #8D38C9; font-weight: bold;',
+            4 => 'color: #151B8D; font-weight: bold;',
+            5 => 'color: #00C2FF; font-weight: bold;',
+            6 => 'color: #3EA99F; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000;'
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #800000;'
+            ),
+        'NUMBERS' => array(
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #800000; font-weight: bold;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => '',
+        6 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/vbnet.php b/sources/inc/geshi/vbnet.php
new file mode 100644
index 0000000..758df98
--- /dev/null
+++ b/sources/inc/geshi/vbnet.php
@@ -0,0 +1,182 @@
+ 'vb.net',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        //Keywords
+        1 => array(
+            'AddHandler', 'AddressOf', 'Alias', 'And', 'AndAlso', 'As', 'ByRef', 'ByVal',
+            'Call', 'Case', 'Catch', 'Char', 'Class', 'Const', 'Continue',
+            'Declare', 'Default',
+            'Delegate', 'Dim', 'DirectCast', 'Do', 'Each', 'Else', 'ElseIf', 'End', 'EndIf',
+            'Enum', 'Erase', 'Error', 'Event', 'Exit', 'False', 'Finally', 'For', 'Friend', 'Function',
+            'Get', 'GetType', 'GetXMLNamespace', 'Global', 'GoSub', 'GoTo', 'Handles', 'If', 'Implements',
+            'Imports', 'In', 'Inherits', 'Interface', 'Is', 'IsNot', 'Let', 'Lib', 'Like', 'Loop', 'Me',
+            'Mod', 'Module', 'Module Statement', 'MustInherit', 'MustOverride', 'MyBase', 'MyClass', 'Namespace',
+            'Narrowing', 'New', 'Next', 'Not', 'Nothing', 'NotInheritable', 'NotOverridable', 'Of', 'On',
+            'Operator', 'Option', 'Optional', 'Or', 'OrElse', 'Out', 'Overloads', 'Overridable', 'Overrides',
+            'ParamArray', 'Partial', 'Private', 'Property', 'Protected', 'Public', 'RaiseEvent', 'ReadOnly', 'ReDim',
+            'REM', 'RemoveHandler', 'Resume', 'Return', 'Select','Set', 'Shadows', 'Shared', 'Static', 'Step',
+            'Stop', 'Structure', 'Sub', 'SyncLock', 'Then', 'Throw', 'To', 'True', 'Try', 'TryCast', 'TypeOf',
+            'Using', 'Wend', 'When', 'While', 'Widening', 'With', 'WithEvents', 'WriteOnly', 'Xor'
+            ),
+        //Data Types
+        2 => array(
+            'Boolean', 'Byte', 'Date', 'Decimal', 'Double', 'Integer', 'Long', 'Object',
+            'SByte', 'Short', 'Single', 'String', 'UInteger', 'ULong', 'UShort'
+            ),
+        //Compiler Directives
+        3 => array(
+            '#Const', '#Else', '#ElseIf', '#End', '#If'
+            ),
+        //Constants
+        4 => array(
+            'CBool', 'CByte', 'CChar', 'CChr', 'CDate', 'CDbl', 'CDec','CInt', 'CLng', 'CLng8', 'CObj', 'CSByte', 'CShort',
+            'CSng', 'CStr', 'CType', 'CUInt', 'CULng', 'CUShort'
+            ),
+        //Linq
+        5 => array(
+            'By','From','Group','Where'
+            ),
+        //Built-in functions
+        7 => array(
+            'ABS', 'ARRAY', 'ASC', 'ASCB', 'ASCW', 'CALLBYNAME', 'CHOOSE', 'CHR', 'CHR$', 'CHRB', 'CHRB$', 'CHRW',
+            'CLOSE', 'COMMAND', 'COMMAND$', 'CONVERSION',
+            'COS', 'CREATEOBJECT', 'CURDIR', 'CVDATE', 'DATEADD',
+            'DATEDIFF', 'DATEPART', 'DATESERIAL', 'DATEVALUE', 'DAY', 'DDB', 'DIR', 'DIR$',
+            'EOF', 'ERROR$', 'EXP', 'FILEATTR', 'FILECOPY', 'FILEDATATIME', 'FILELEN', 'FILTER',
+            'FIX', 'FORMAT', 'FORMAT$', 'FORMATCURRENCY', 'FORMATDATETIME', 'FORMATNUMBER',
+            'FORMATPERCENT', 'FREEFILE', 'FV', 'GETALLSETTINGS', 'GETATTRGETOBJECT', 'GETSETTING',
+            'HEX', 'HEX$', 'HOUR', 'IIF', 'IMESTATUS', 'INPUT$', 'INPUTB', 'INPUTB$', 'INPUTBOX',
+            'INSTR', 'INSTRB', 'INSTRREV', 'INT', 'IPMT', 'IRR', 'ISARRAY', 'ISDATE', 'ISEMPTY',
+            'ISERROR', 'ISNULL', 'ISNUMERIC', 'ISOBJECT', 'JOIN', 'LBOUND', 'LCASE', 'LCASE$',
+            'LEFT', 'LEFT$', 'LEFTB', 'LEFTB$', 'LENB', 'LINEINPUT', 'LOC', 'LOF', 'LOG', 'LTRIM',
+            'LTRIM$', 'MID$', 'MIDB', 'MIDB$', 'MINUTE', 'MIRR', 'MKDIR', 'MONTH', 'MONTHNAME',
+            'MSGBOX', 'NOW', 'NPER', 'NPV', 'OCT', 'OCT$', 'PARTITION', 'PMT', 'PPMT', 'PV',
+            'RATE', 'REPLACE', 'RIGHT', 'RIGHT$', 'RIGHTB', 'RIGHTB$', 'RMDIR', 'RND', 'RTRIM',
+            'RTRIM$', 'SECOND', 'SIN', 'SLN', 'SPACE', 'SPACE$', 'SPC', 'SPLIT', 'SQRT', 'STR', 'STR$',
+            'STRCOMP', 'STRCONV', 'STRING$', 'STRREVERSE', 'SYD', 'TAB', 'TAN', 'TIMEOFDAY',
+            'TIMER', 'TIMESERIAL', 'TIMEVALUE', 'TODAY', 'TRIM', 'TRIM$', 'TYPENAME', 'UBOUND',
+            'UCASE', 'UCASE$', 'VAL', 'WEEKDAY', 'WEEKDAYNAME', 'YEAR'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '+', '-', '*', '?', '=', '/', '%', '&', '>', '<', '^', '!',
+        '(', ')', '{', '}', '.'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false,
+        7 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',  //Keywords
+            2 => 'color: #6a5acd;',                     //primitive Data Types
+            3 => 'color: #6a5acd; font-weight: bold;',  //preprocessor-commands
+            4 => 'color: #cd6a5a;',                     //Constants
+            5 => 'color: #cd6a5a; font-weight: bold;',  //LinQ
+            7 => 'color: #000066;',                     //Built-in functions
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #008080; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #a52a2a; back-color: #fffacd;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #a52a2a; back-color: #fffacd;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000000;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.google.com/search?q={FNAMEU}+site:msdn.microsoft.com',
+        4 => '',
+        5 => '',
+        7 => 'http://www.google.com/search?q={FNAMEU}+site:msdn.microsoft.com'
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 =>'.'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            7 => array(
+                'DISALLOWED_AFTER' => '(?!\w)(?=\s*\()'
+                )
+            )
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/vedit.php b/sources/inc/geshi/vedit.php
new file mode 100644
index 0000000..19b2bdb
--- /dev/null
+++ b/sources/inc/geshi/vedit.php
@@ -0,0 +1,103 @@
+ 'Vedit macro language',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"', '\''),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'break', 'breakout', 'break_out', 'continue', 'do', 'else', 'for',
+            'goto', 'if', 'repeat', 'return', 'while'
+            )
+        ),
+    'SYMBOLS' => array(
+        1 => array(
+            '(', ')', '{', '}', '[', ']', '+', '-', '*', '/', '%',
+            '=', '<', '>', '!', '^', '&', '|', '?', ':', ';', ','
+            )
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            'MULTI' => 'color: #666666; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #009900;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;',
+            ),
+        'METHODS' => array(
+            0 => 'color: #004000;'
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: #339933;'
+            ),
+        'REGEXPS' => array(),
+        'SCRIPT' => array()
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(),
+    'HIGHLIGHT_STRICT_BLOCK' => array()
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/verilog.php b/sources/inc/geshi/verilog.php
new file mode 100644
index 0000000..2bf66d1
--- /dev/null
+++ b/sources/inc/geshi/verilog.php
@@ -0,0 +1,173 @@
+
+ * Copyright: (C) 2008 Guenter Dannoritzer
+ * Release Version: 1.0.8.11
+ * Date Started: 2008/05/28
+ *
+ * Verilog language file for GeSHi.
+ *
+ * CHANGES
+ * -------
+ * 2008/05/29
+ *   -  added regular expression to find numbers of the form 4'b001xz
+ *   -  added regular expression to find values for `timescale command
+ *   -  extended macro keywords
+ *
+ * TODO (updated 2008/05/29)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     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' => 'Verilog',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(1 => '/\/\/(?:\\\\\\\\|\\\\\\n|.)*$/m'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // keywords
+        1 => array('always', 'and', 'assign', 'begin', 'buf', 'bufif0', 'bufif1', 'case',
+            'casex', 'casez', 'cmos', 'deassign', 'default', 'defparam',
+            'disable', 'edge', 'else', 'end', 'endcase', 'endfunction',
+            'endmodule', 'endprimitive', 'endspecify', 'endtable', 'endtask',
+            'event', 'fork', 'for', 'force', 'forever', 'function', 'highz0',
+            'highz1', 'if', 'ifnone', 'initial', 'inout', 'input', 'integer',
+            'join', 'large', 'macromodule', 'medium', 'module', 'nand',
+            'negedge', 'nmos', 'nor', 'not', 'notif0', 'notif1', 'or',
+            'output', 'parameter', 'pmos', 'posedge', 'primitive', 'pull0',
+            'pull1', 'pulldown', 'pullup', 'rcmos', 'real', 'realtime', 'reg',
+            'release', 'repeat', 'rnmos', 'rpmos', 'rtran', 'rtranif0',
+            'rtranif1', 'scalared', 'small', 'specify', 'specparam',
+            'strong0', 'strong1', 'supply0', 'supply1', 'table', 'task',
+            'time', 'tran', 'tranif0', 'tranif1', 'tri', 'tri0', 'tri1',
+            'triand', 'trior', 'trireg', 'vectored', 'wait', 'wand', 'weak0',
+            'weak1', 'while', 'wire', 'wor', 'xnor', 'xor'
+            ),
+        // system tasks
+        2 => array(
+            '$display', '$monitor',
+            '$dumpall', '$dumpfile', '$dumpflush', '$dumplimit', '$dumpoff',
+            '$dumpon', '$dumpvars',
+            '$fclose', '$fdisplay', '$fopen',
+            '$finish', '$fmonitor', '$fstrobe', '$fwrite',
+            '$fgetc', '$ungetc', '$fgets', '$fscanf', '$fread', '$ftell',
+            '$fseek', '$frewind', '$ferror', '$fflush', '$feof',
+            '$random',
+            '$readmemb', '$readmemh', '$readmemx',
+            '$signed', '$stime', '$stop',
+            '$strobe', '$time', '$unsigned', '$write'
+            ),
+        // macros
+        3 => array(
+            '`default-net', '`define',
+            '`celldefine', '`default_nettype', '`else', '`elsif', '`endcelldefine',
+            '`endif', '`ifdef', '`ifndef', '`include', '`line', '`nounconnected_drive',
+            '`resetall', '`timescale', '`unconnected_drive', '`undef'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '{', '}', '[', ']', '=', '+', '-', '*', '/', '!', '%',
+        '^', '&', '|', '~',
+        '?', ':',
+        '#', '<<', '<<<',
+        '>', '<', '>=', '<=',
+        '@', ';', ','
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #A52A2A; font-weight: bold;',
+            2 => 'color: #9932CC;',
+            3 => 'color: #008800;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #00008B; font-style: italic;',
+            'MULTI' => 'color: #00008B; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #9F79EE'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #9F79EE;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #FF00FF;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0055;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #202020;',
+            2 => 'color: #202020;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #5D478B;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0055;',
+            1 => 'color: #ff0055;',
+            ),
+        'SCRIPT' => array(
+            0 => '',
+            1 => '',
+            2 => '',
+            3 => ''
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        1 => ''
+        ),
+    'REGEXPS' => array(
+        // numbers
+        0 => "\d'[bdh][0-9_a-fA-FxXzZ]+",
+        // time -> 1, 10, or 100; s, ms, us, ns, ps, of fs
+        1 => "1[0]{0,2}[munpf]?s"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        1 => ''
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        0 => true,
+        1 => true,
+        2 => true,
+        3 => true
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/vhdl.php b/sources/inc/geshi/vhdl.php
new file mode 100644
index 0000000..a8f37e6
--- /dev/null
+++ b/sources/inc/geshi/vhdl.php
@@ -0,0 +1,183 @@
+ 'VHDL',
+    'COMMENT_SINGLE' => array(1 => '--'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'COMMENT_REGEXP' => array(
+        // PSL adds C-preprocessor support
+        1 => '/(?<=\s)#(?:\\\\\\\\|\\\\\\n|.)*$/m',
+        // PSL metacomments (single-line only for now)
+        2 => '/--\s*@?psl(?:.)*?;$/m',
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*keywords*/
+        1 => array(
+            'access','after','alias','all','attribute','architecture','array','begin',
+            'block','body','buffer','bus','case','case?','component','configuration','constant','context',
+            'disconnect','downto','else','elsif','end','entity','exit','file','for','force',
+            'function','generate','generic','group','guarded','if','impure','in',
+            'inertial','inout','is','label','library','linkage','literal','loop',
+            'map','new','next','null','of','on','open','others','out','package',
+            'port','postponed','procedure','process','protected','pure','range','record','register',
+            'reject','release','report','return','select','severity','shared','signal','subtype',
+            'then','to','transport','type','unaffected','units','until','use','variable',
+            'wait','when','while','with'
+            ),
+        /*types and standard libs*/
+        2 => array(
+            'bit','bit_vector','character','boolean','integer','real','time','delay_length','string',
+            'severity_level','positive','natural','signed','unsigned','line','text',
+            'std_logic','std_logic_vector','std_ulogic','std_ulogic_vector',
+            'sfixed','ufixed','float','float32','float64','float128',
+            'work','ieee','std_logic_1164','math_real','math_complex','textio',
+            'numeric_std','numeric_std_signed','numeric_std_unsigned','numeric_bit'
+            ),
+        /*operators*/
+        3 => array(
+            'abs','and','mod','nor','not','or','rem','rol','ror','sla','sll','sra','srl','xnor','xor'
+            ),
+        /*psl*/
+        4 => array(
+            'assert','assume','assume_guarantee','clock','const','countones','cover','default',
+            'endpoint','fairness','fell','forall','inf','inherit','isunknown','onehot','onehot0','property',
+            'prev','restrict','restrict_guarantee','rose','sequence','stable','strong','union','vmode','vprop','vunit'
+            ),
+        /*psl operators*/
+        5 => array(
+            'abort','always','before','before!','before!_','before_','eventually!','never',
+            'next!','next_a','next_a!','next_e','next_e!','next_event','next_event!','next_event_a','next_event_a!',
+            'next_event_e','next_event_e!','until!','until!_','until_','within'
+            )
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')',
+        ';',':',
+        '<','>','=','+','-','*','/','&','|','?'
+    ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #000080; font-weight: bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #000066;',
+            4 => 'color: #000080; font-weight: bold;',
+            5 => 'color: #000066;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #ff0000; font-weight: bold;',
+            'MULTI' => 'color: #008000; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000066;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #000066;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #ff0000;',
+            //1 => 'color: #ff0000;',
+            2 => 'color: #ee82ee;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Based literals, scientific notation, and time units
+        0 => '(\b\d+#[[:xdigit:]_]+#)|'.
+            '(\b[\d_]+(\.[\d_]+)?[eE][+\-]?[\d_]+)|'.
+            '(\b(hr|min|sec|ms|us|ns|ps|fs)\b)',
+        //Character literals
+        /* GeSHi won't match this pattern for some reason and QUOTEMARKS
+         * can't be used because it interferes with attribute parsing */
+        /*1 => "\b'.'\b",*/
+        //Attributes
+        2 => "'\w+(?!')"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/vim.php b/sources/inc/geshi/vim.php
new file mode 100644
index 0000000..fe7e5e0
--- /dev/null
+++ b/sources/inc/geshi/vim.php
@@ -0,0 +1,420 @@
+  ...   ... works event if they aren't surround by space.
+ *
+ *************************************************************************************
+ *
+ *     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' => 'Vim Script',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_REGEXP' => array(
+        1 => "/\s*\"[^\"]*?$/m",
+        //Regular expressions (Ported from perl.php)
+//        2 => "/(?<=[\\s^])(s|tr|y)\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/(?:\\\\.|(?!\n)[^\\/\\\\])*\\/[msixpogcde]*(?=[\\s$\\.\\;])|(?<=[\\s^(=])(m|q[qrwx]?)?\\/(?:\\\\.|(?!\n)[^\\/\\\\])+\\/[msixpogc]*(?=[\\s$\\.\\,\\;\\)])/iU",
+        ),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'au', 'augroup', 'autocmd', 'brea', 'break', 'bufadd',
+            'bufcreate', 'bufdelete', 'bufenter', 'buffilepost',
+            'buffilepre', 'bufleave', 'bufnew', 'bufnewfile',
+            'bufread', 'bufreadcmd', 'bufreadpost', 'bufreadpre',
+            'bufunload', 'bufwinenter', 'bufwinleave', 'bufwipeout',
+            'bufwrite', 'bufwritecmd', 'bufwritepost', 'bufwritepre',
+            'call', 'cat', 'catc', 'catch', 'cmd-event', 'cmdwinenter',
+            'cmdwinleave', 'colorscheme', 'con', 'confirm', 'cont', 'conti',
+            'contin', 'continu', 'continue', 'cursorhold', 'cursorholdi',
+            'cursormoved', 'cursormovedi', 'ec', 'echo', 'echoe',
+            'echoer', 'echoerr', 'echoh', 'echohl', 'echom', 'echoms',
+            'echomsg', 'echon', 'el', 'els', 'else', 'elsei', 'elseif',
+            'en', 'encodingchanged', 'end', 'endfo', 'endfor', 'endi',
+            'endif', 'endt', 'endtr', 'endtry', 'endw', 'endwh', 'endwhi',
+            'endwhil', 'endwhile', 'exe', 'exec', 'execu', 'execut',
+            'execute', 'fileappendcmd', 'fileappendpost', 'fileappendpre',
+            'filechangedro', 'filechangedshell', 'filechangedshellpost',
+            'filereadcmd', 'filereadpost', 'filereadpre',
+            'filetype', 'filewritecmd', 'filewritepost', 'filewritepre',
+            'filterreadpost', 'filterreadpre', 'filterwritepost',
+            'filterwritepre', 'fina', 'final', 'finall', 'finally',
+            'finish', 'focusgained', 'focuslost', 'for', 'fun', 'func',
+            'funct', 'functi', 'functio', 'function', 'funcundefined',
+            'guienter', 'guifailed', 'hi', 'highlight', 'if', 'in',
+            'insertchange', 'insertenter', 'insertleave', 'let', 'lockv',
+            'lockva', 'lockvar', 'map', 'match', 'menupopup', 'nnoremap',
+            'quickfixcmdpost', 'quickfixcmdpre', 'remotereply', 'retu',
+            'retur', 'return', 'sessionloadpost', 'set', 'setlocal',
+            'shellcmdpost', 'shellfilterpost', 'sourcecmd', 'sourcepre',
+            'spellfilemissing', 'stdinreadpost', 'stdinreadpre',
+            'swapexists', 'syntax', 'tabenter', 'tableave', 'termchanged',
+            'termresponse', 'th', 'thr', 'thro', 'throw', 'tr', 'try', 'unl',
+            'unle', 'unlet', 'unlo', 'unloc', 'unlock', 'unlockv',
+            'unlockva', 'unlockvar', 'user', 'usergettingbored',
+            'vimenter', 'vimleave', 'vimleavepre', 'vimresized', 'wh',
+            'whi', 'whil', 'while', 'winenter', 'winleave'
+            ),
+        2 => array(
+            '<CR>', '<Esc>', '<F1>', '<F10>',
+            '<F11>', '<F12>', '<F2>', '<F3>',
+            '<F4>', '<F5>', '<F6>', '<F7>',
+            '<F8>', '<F9>', '<cr>', '<silent>',
+            '-nargs', 'acd', 'ai', 'akm', 'al', 'aleph',
+            'allowrevins', 'altkeymap', 'ambiwidth', 'ambw',
+            'anti', 'antialias', 'ar', 'arab', 'arabic',
+            'arabicshape', 'ari', 'arshape', 'autochdir',
+            'autoindent', 'autoread', 'autowrite', 'autowriteall',
+            'aw', 'awa', 'background', 'backspace', 'backup',
+            'backupcopy', 'backupdir', 'backupext',
+            'backupskip', 'balloondelay', 'ballooneval', 'balloonexpr',
+            'bdir', 'bdlay', 'beval', 'bex', 'bexpr', 'bg',
+            'bh', 'bin', 'binary', 'biosk', 'bioskey',
+            'bk', 'bkc', 'bl', 'bomb', 'breakat', 'brk',
+            'bs', 'bsdir', 'bsk', 'bt', 'bufhidden',
+            'buftype', 'casemap', 'cb',
+            'ccv', 'cd', 'cdpath', 'cedit', 'cf', 'cfu', 'ch',
+            'charconvert', 'ci', 'cin', 'cink',
+            'cinkeys', 'cino', 'cinoptions', 'cinw', 'cinwords',
+            'clipboard', 'cmdheight', 'cmdwinheight',
+            'cmp', 'cms', 'co', 'columns', 'com',
+            'comc', 'comcl', 'comcle', 'comclea', 'comclear', 'comm',
+            'comma', 'comman', 'command', 'comments', 'commentstring',
+            'compatible', 'completefunc', 'completeopt',
+            'consk', 'conskey', 'copyindent',
+            'cot', 'cp', 'cpo', 'cpoptions', 'cpt',
+            'cscopepathcomp', 'cscopeprg', 'cscopequickfix', 'cscopetag',
+            'cscopetagorder', 'cscopeverbose',
+            'cspc', 'csprg', 'csqf', 'cst', 'csto', 'csverb', 'cuc',
+            'cul', 'cursorcolumn', 'cursorline', 'cwh', 'debug',
+            'deco', 'def', 'define', 'delc', 'delco', 'delcom',
+            'delcombine', 'delcomm', 'delcomman', 'delcommand', 'dex',
+            'dg', 'dict', 'dictionary', 'diff', 'diffexpr',
+            'diffopt', 'digraph', 'dip', 'dir', 'directory', 'display',
+            'dlcomma', 'dy', 'ea', 'ead', 'eadirection',
+            'eb', 'ed', 'edcompatible', 'ef', 'efm',
+            'ei', 'ek', 'enc', 'encoding', 'endfun', 'endofline',
+            'eol', 'ep', 'equalalways', 'equalprg', 'errorbells',
+            'errorfile', 'errorformat', 'esckeys', 'et',
+            'eventignore', 'ex', 'expandtab', 'exrc', 'fcl',
+            'fcs', 'fdc', 'fde', 'fdi', 'fdl', 'fdls', 'fdm',
+            'fdn', 'fdo', 'fdt', 'fen', 'fenc', 'fencs', 'fex',
+            'ff', 'ffs', 'fileencoding', 'fileencodings', 'fileformat',
+            'fileformats', /*'filetype',*/ 'fillchars', 'fk',
+            'fkmap', 'flp', 'fml', 'fmr', 'fo', 'foldclose',
+            'foldcolumn', 'foldenable', 'foldexpr', 'foldignore',
+            'foldlevelstart', 'foldmarker', 'foldmethod', 'foldminlines',
+            'foldnestmax', 'foldopen', 'formatexpr', 'formatlistpat',
+            'formatoptions', 'formatprg', 'fp', 'fs', 'fsync', 'ft',
+            'gcr', 'gd', 'gdefault', 'gfm', 'gfn', 'gfs', 'gfw',
+            'ghr', 'go', 'gp', 'grepformat', 'grepprg', 'gtl',
+            'gtt', 'guicursor', 'guifont', 'guifontset',
+            'guifontwide', 'guiheadroom', 'guioptions', 'guipty',
+            'guitablabel', 'guitabtooltip', 'helpfile',
+            'helpheight', 'helplang', 'hf', 'hh', 'hid', 'hidden',
+            'history', 'hk', 'hkmap', 'hkmapp', 'hkp', 'hl',
+            'hlg', 'hls', 'hlsearch', 'ic', 'icon', 'iconstring',
+            'ignorecase', 'im', 'imactivatekey', 'imak', 'imc',
+            'imcmdline', 'imd', 'imdisable', 'imi', 'iminsert', 'ims',
+            'imsearch', 'inc', 'include', 'includeexpr',
+            'incsearch', 'inde', 'indentexpr', 'indentkeys',
+            'indk', 'inex', 'inf', 'infercase', 'insertmode', 'is', 'isf',
+            'isfname', 'isi', 'isident', 'isk', 'iskeyword',
+            'isp', 'isprint', 'joinspaces', 'js', 'key',
+            'keymap', 'keymodel', 'keywordprg', 'km', 'kmp', 'kp',
+            'langmap', 'langmenu', 'laststatus', 'lazyredraw', 'lbr',
+            'lcs', 'linebreak', 'lines', 'linespace', 'lisp',
+            'lispwords', 'list', 'listchars', 'lm', 'lmap',
+            'loadplugins', 'lpl', 'ls', 'lsp', 'lw', 'lz', 'ma',
+            'macatsui', 'magic', 'makeef', 'makeprg', 'mat',
+            'matchpairs', 'matchtime', 'maxcombine', 'maxfuncdepth',
+            'maxmapdepth', 'maxmem', 'maxmempattern',
+            'maxmemtot', 'mco', 'mef', 'menuitems', 'mfd', 'mh',
+            'mis', 'mkspellmem', 'ml', 'mls', 'mm', 'mmd', 'mmp',
+            'mmt', 'mod', 'modeline', 'modelines', 'modifiable',
+            'modified', 'more', 'mouse', 'mousef', 'mousefocus',
+            'mousehide', 'mousem', 'mousemodel', 'mouses',
+            'mouseshape', 'mouset', 'mousetime', 'mp', 'mps', 'msm',
+            'mzq', 'mzquantum', 'nf', 'noacd', 'noai', 'noakm',
+            'noallowrevins', 'noaltkeymap', 'noanti', 'noantialias',
+            'noar', 'noarab', 'noarabic', 'noarabicshape', 'noari',
+            'noarshape', 'noautochdir', 'noautoindent', 'noautoread',
+            'noautowrite', 'noautowriteall', 'noaw', 'noawa', 'nobackup',
+            'noballooneval', 'nobeval', 'nobin', 'nobinary', 'nobiosk',
+            'nobioskey', 'nobk', 'nobl', 'nobomb', 'nobuflisted', 'nocf',
+            'noci', 'nocin', 'nocindent', 'nocompatible', 'noconfirm',
+            'noconsk', 'noconskey', 'nocopyindent', 'nocp', 'nocscopetag',
+            'nocscopeverbose', 'nocst', 'nocsverb', 'nocuc', 'nocul',
+            'nocursorcolumn', 'nocursorline', 'nodeco', 'nodelcombine',
+            'nodg', 'nodiff', 'nodigraph', 'nodisable', 'noea', 'noeb',
+            'noed', 'noedcompatible', 'noek', 'noendofline', 'noeol',
+            'noequalalways', 'noerrorbells', 'noesckeys', 'noet',
+            'noex', 'noexpandtab', 'noexrc', 'nofen', 'nofk', 'nofkmap',
+            'nofoldenable', 'nogd', 'nogdefault', 'noguipty', 'nohid',
+            'nohidden', 'nohk', 'nohkmap', 'nohkmapp', 'nohkp', 'nohls',
+            'nohlsearch', 'noic', 'noicon', 'noignorecase', 'noim',
+            'noimc', 'noimcmdline', 'noimd', 'noincsearch', 'noinf',
+            'noinfercase', 'noinsertmode', 'nois', 'nojoinspaces',
+            'nojs', 'nolazyredraw', 'nolbr', 'nolinebreak', 'nolisp',
+            'nolist', 'noloadplugins', 'nolpl', 'nolz', 'noma',
+            'nomacatsui', 'nomagic', 'nomh', 'noml', 'nomod',
+            'nomodeline', 'nomodifiable', 'nomodified', 'nomore',
+            'nomousef', 'nomousefocus', 'nomousehide', 'nonu',
+            'nonumber', 'noodev', 'noopendevice', 'nopaste', 'nopi',
+            'nopreserveindent', 'nopreviewwindow', 'noprompt', 'nopvw',
+            'noreadonly', 'noremap', 'norestorescreen', 'norevins',
+            'nori', 'norightleft', 'norightleftcmd', 'norl', 'norlc',
+            'noro', 'nors', 'noru', 'noruler', 'nosb', 'nosc', 'noscb',
+            'noscrollbind', 'noscs', 'nosecure', 'nosft', 'noshellslash',
+            'noshelltemp', 'noshiftround', 'noshortname', 'noshowcmd',
+            'noshowfulltag', 'noshowmatch', 'noshowmode', 'nosi', 'nosm',
+            'nosmartcase', 'nosmartindent', 'nosmarttab', 'nosmd',
+            'nosn', 'nosol', 'nospell', 'nosplitbelow', 'nosplitright',
+            'nospr', 'nosr', 'nossl', 'nosta', 'nostartofline',
+            'nostmp', 'noswapfile', 'noswf', 'nota', 'notagbsearch',
+            'notagrelative', 'notagstack', 'notbi', 'notbidi', 'notbs',
+            'notermbidi', 'noterse', 'notextauto', 'notextmode',
+            'notf', 'notgst', 'notildeop', 'notimeout', 'notitle',
+            'noto', 'notop', 'notr', 'nottimeout', 'nottybuiltin',
+            'nottyfast', 'notx', 'novb', 'novisualbell', 'nowa',
+            'nowarn', 'nowb', 'noweirdinvert', 'nowfh', 'nowfw',
+            'nowildmenu', 'nowinfixheight', 'nowinfixwidth', 'nowiv',
+            'nowmnu', 'nowrap', 'nowrapscan', 'nowrite', 'nowriteany',
+            'nowritebackup', 'nows', 'nrformats', 'nu', 'number',
+            'numberwidth', 'nuw', 'odev', 'oft', 'ofu',
+            'omnifunc', 'opendevice', 'operatorfunc', 'opfunc',
+            'osfiletype', 'pa', 'para', 'paragraphs',
+            'paste', 'pastetoggle', 'patchexpr',
+            'patchmode', 'path', 'pdev', 'penc', 'pex', 'pexpr',
+            'pfn', 'ph', 'pheader', 'pi', 'pm', 'pmbcs',
+            'pmbfn', 'popt', 'preserveindent', 'previewheight',
+            'previewwindow', 'printdevice', 'printencoding', 'printexpr',
+            'printfont', 'printheader', 'printmbcharset',
+            'printmbfont', 'printoptions', 'prompt', 'pt', 'pumheight',
+            'pvh', 'pvw', 'qe', 'quoteescape', 'rdt',
+            'readonly', 'redrawtime', 'remap', 'report',
+            'restorescreen', 'revins', 'ri', 'rightleft', 'rightleftcmd',
+            'rl', 'rlc', 'ro', 'rs', 'rtp', 'ru',
+            'ruf', 'ruler', 'rulerformat', 'runtimepath', 'sb', 'sbo',
+            'sbr', 'sc', 'scb', 'scr', 'scroll', 'scrollbind',
+            'scrolljump', 'scrolloff', 'scrollopt',
+            'scs', 'sect', 'sections', 'secure', 'sel',
+            'selection', 'selectmode', 'sessionoptions', 'sft',
+            'sh', 'shcf', 'shell', 'shellcmdflag', 'shellpipe',
+            'shellquote', 'shellredir', 'shellslash',
+            'shelltemp', 'shelltype', 'shellxquote', 'shiftround',
+            'shiftwidth', 'shm', 'shortmess', 'shortname',
+            'showbreak', 'showcmd', 'showfulltag', 'showmatch',
+            'showmode', 'showtabline', 'shq', 'si', 'sidescroll',
+            'sidescrolloff', 'siso', 'sj', 'slm', 'sm', 'smartcase',
+            'smartindent', 'smarttab', 'smc', 'smd', 'sn',
+            'so', 'softtabstop', 'sol', 'sp', 'spc', 'spell',
+            'spellcapcheck', 'spellfile', 'spelllang',
+            'spf', 'spl', 'splitbelow', 'splitright', 'spr',
+            'sps', 'sr', 'srr', 'ss', 'ssl', 'ssop', 'st', 'sta',
+            'stal', 'startofline', 'statusline', 'stl', 'stmp',
+            'sts', 'su', 'sua', 'suffixes', 'suffixesadd', 'sw',
+            'swapfile', 'swapsync', 'swb', 'swf', 'switchbuf',
+            'sws', 'sxq', 'syn', 'synmaxcol', 'ta',
+            'tabline', 'tabpagemax', 'tabstop', 'tag',
+            'tagbsearch', 'taglength', 'tagrelative', 'tags', 'tagstack',
+            'tal', 'tb', 'tbi', 'tbidi', 'tbis', 'tbs',
+            'tenc', 'term', 'termbidi', 'termencoding', 'terse',
+            'textauto', 'textmode', 'textwidth', 'tf', 'tgst',
+            'thesaurus', 'tildeop', 'timeout', 'timeoutlen',
+            'title', 'titlelen', 'titleold', 'titlestring',
+            'tl', 'tm', 'to', 'toolbar', 'toolbariconsize', 'top',
+            'tpm', 'ts', 'tsl', 'tsr', 'ttimeout',
+            'ttimeoutlen', 'ttm', 'tty', 'ttybuiltin', 'ttyfast', 'ttym',
+            'ttymouse', 'ttyscroll', 'ttytype', 'tw', 'tx', 'uc',
+            'ul', 'undolevels', 'updatecount', 'updatetime', 'ut',
+            'vb', 'vbs', 'vdir', 've', 'verbose', 'verbosefile',
+            'vfile', 'vi', 'viewdir', 'viewoptions', 'viminfo',
+            'virtualedit', 'visualbell', 'vop', 'wa', 'wak',
+            'warn', 'wb', 'wc', 'wcm', 'wd', 'weirdinvert', 'wfh',
+            'wfw', /*'wh',*/ 'whichwrap', 'wi', 'wig', 'wildchar',
+            'wildcharm', 'wildignore', 'wildmenu',
+            'wildmode', 'wildoptions', 'wim', 'winaltkeys', 'window',
+            'winfixheight', 'winfixwidth', 'winheight',
+            'winminheight', 'winminwidth', 'winwidth', 'wiv',
+            'wiw', 'wm', 'wmh', 'wmnu', 'wmw', 'wop', 'wrap',
+            'wrapmargin', 'wrapscan', 'write', 'writeany',
+            'writebackup', 'writedelay', 'ws', 'ww'
+            ),
+        3 => array(
+            'BufAdd', 'BufCreate', 'BufDelete', 'BufEnter', 'BufFilePost',
+            'BufFilePre', 'BufHidden', 'BufLeave', 'BufNew', 'BufNewFile',
+            'BufRead', 'BufReadCmd', 'BufReadPost', 'BufReadPre',
+            'BufUnload', 'BufWinEnter', 'BufWinLeave', 'BufWipeout',
+            'BufWrite', 'BufWriteCmd', 'BufWritePost', 'BufWritePre',
+            'Cmd-event', 'CmdwinEnter', 'CmdwinLeave', 'ColorScheme',
+            'CursorHold', 'CursorHoldI', 'CursorMoved', 'CursorMovedI',
+            'EncodingChanged', 'FileAppendCmd', 'FileAppendPost',
+            'FileAppendPre', 'FileChangedRO', 'FileChangedShell',
+            'FileChangedShellPost', 'FileEncoding', 'FileReadCmd',
+            'FileReadPost', 'FileReadPre', 'FileType',
+            'FileWriteCmd', 'FileWritePost', 'FileWritePre',
+            'FilterReadPost', 'FilterReadPre', 'FilterWritePost',
+            'FilterWritePre', 'FocusGained', 'FocusLost', 'FuncUndefined',
+            'GUIEnter', 'GUIFailed', 'InsertChange', 'InsertEnter',
+            'InsertLeave', 'MenuPopup', 'QuickFixCmdPost',
+            'QuickFixCmdPre', 'RemoteReply', 'SessionLoadPost',
+            'ShellCmdPost', 'ShellFilterPost', 'SourceCmd',
+            'SourcePre', 'SpellFileMissing', 'StdinReadPost',
+            'StdinReadPre', 'SwapExists', 'Syntax', 'TabEnter',
+            'TabLeave', 'TermChanged', 'TermResponse', 'User',
+            'UserGettingBored', 'VimEnter', 'VimLeave', 'VimLeavePre',
+            'VimResized', 'WinEnter', 'WinLeave', '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', 'copy',
+            'cos', 'count', 'cscope_connection', 'cursor', 'deepcopy',
+            'delete', 'did_filetype', 'diff_filler', 'diff_hlID',
+            'empty', 'escape', 'eval', 'eventhandler', 'executable',
+            'exists', 'expand', 'extend', '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', 'getfontname',
+            'getfperm', 'getfsize', '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', 'hlID', 'hlexists', 'hostname', 'iconv',
+            'indent', 'index', 'input', 'inputdialog', 'inputlist',
+            'inputrestore', 'inputsave', 'inputsecret', 'insert',
+            'isdirectory', 'islocked', 'items', 'join', 'keys', 'len',
+            'libcall', 'libcallnr', 'line', 'line2byte', 'lispindent',
+            'localtime', 'log10', 'maparg', 'mapcheck', 'matchadd',
+            'matcharg', 'matchdelete', 'matchend', 'matchlist',
+            'matchstr', 'max', 'min', 'mkdir', 'mode', 'nextnonblank',
+            'nr2char', 'off', 'on', 'pathshorten', 'plugin', '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', 'tagfiles',
+            'taglist', 'tempname', 'tolower', 'toupper', 'trunc',
+            'type', 'values', 'virtcol', 'visualmode', 'winbufnr',
+            'wincol', 'winline', 'winnr', 'winrestcmd',
+            'winrestview', 'winsaveview', '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;',
+//            2 => 'color: #009966; 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 --git a/sources/inc/geshi/visualfoxpro.php b/sources/inc/geshi/visualfoxpro.php
new file mode 100644
index 0000000..123a3db
--- /dev/null
+++ b/sources/inc/geshi/visualfoxpro.php
@@ -0,0 +1,456 @@
+ 'Visual Fox Pro',
+    'COMMENT_SINGLE' => array(1 => "//", 2 => "\n*"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            'Case', 'Else', '#Else', 'Then',
+            'Endcase', 'Enddefine', 'Enddo', 'Endfor', 'Endfunc', 'Endif', 'Endprintjob',
+            'Endproc', 'Endscan', 'Endtext', 'Endwith', '#Endif',
+            '#Elif','#Define','#If','#Include',
+            '#Itsexpression','#Readclauses','#Region','#Section','#Undef','#Wname',
+            'Define','Do',
+            'For','Function','Hidden',
+            'If','Local','Lparameter','Lparameters','Next','Otherwise',
+            'Parameters','Printjob','Procedure','Protected','Public','Scan',
+            'Text','While','With','Abs','Accept','Access','Aclass','Acopy',
+            'Acos','Adatabases','Adbobjects','Addbs','Addrelationtoenv','Addtabletoenv',
+            'Adel','Adir','Aelement','Aerror','Afields','Afont',
+            'Agetclass','Agetfileversion','Ains','Ainstance','Alen','Align',
+            'Alines','Alltrim','Alter','Amembers','Amouseobj','Anetresources',
+            'Ansitooem','Append','Aprinters','Ascan','Aselobj','Asin',
+            'Asort','Assert','Asserts','Assist','Asubscript','Asynchronous',
+            'At_c','Atan','Atc','Atcc','Atcline','Atline',
+            'Atn2','Aused','Autoform','Autoreport','Avcxclasses','Average',
+            'BarCount','BarPrompt','BatchMode','BatchUpdateCount','Begin','BellSound',
+            'BinToC','Bitand','Bitclear','Bitlshift','Bitnot',
+            'Bitor','Bitrshift','Bitset','Bittest','Bitxor','Bof',
+            'Browse','BrowseRefresh','Buffering','BuilderLock','COMArray','COMReturnError',
+            'CToBin','Calculate','Call','Capslock','Cd','Cdow',
+            'Ceiling','Central','Change','Char','Chdir','Chr',
+            'Chrsaw','Chrtran','Chrtranc','Close','Cmonth','Cntbar',
+            'Cntpad','Col','Comclassinfo','CommandTargetQuery','Compile','Completed',
+            'Compobj','Compute','Concat','ConnectBusy','ConnectHandle','ConnectName',
+            'ConnectString','ConnectTimeOut','ContainerReleaseType','Continue','Copy','Cos',
+            'Cot','Count','Coverage','Cpconvert','Cpcurrent','Cpdbf',
+            'Cpnotrans','Create','CreateBinary','Createobject','Createobjectex','Createoffline',
+            'CrsBuffering','CrsFetchMemo','CrsFetchSize','CrsMaxRows','CrsMethodUsed','CrsNumBatch',
+            'CrsShareConnection','CrsUseMemoSize','CrsWhereClause','Ctod','Ctot',
+            'Curdate','Curdir','CurrLeft','CurrSymbol','CursorGetProp','CursorSetProp',
+            'Curtime','Curval','DBGetProp','DBSetProp','DB_BufLockRow','DB_BufLockTable',
+            'DB_BufOff','DB_BufOptRow','DB_BufOptTable','DB_Complette','DB_DeleteInsert','DB_KeyAndModified',
+            'DB_KeyAndTimestamp','DB_KeyAndUpdatable','DB_LocalSQL','DB_NoPrompt','DB_Prompt','DB_RemoteSQL',
+            'DB_TransAuto','DB_TransManual','DB_TransNone','DB_Update','Datetime','Day',
+            'Dayname','Dayofmonth','Dayofweek','Dayofyear','Dbalias','Dbused',
+            'Ddeaborttrans','Ddeadvise','Ddeenabled','Ddeexecute','Ddeinitiate','Ddelasterror',
+            'Ddepoke','Dderequest','Ddesetoption','Ddesetservice','Ddesettopic','Ddeterminate',
+            'Debugout','Declare','DefOLELCid','DefaultValue','Defaultext','Degrees',
+            'DeleteTrigger','Desc','Description','Difference','Dimension','Dir',
+            'Directory','Diskspace','DispLogin','DispWarnings','Display','Dll',
+            'Dmy','DoDefault','DoEvents','Doc','Dow',
+            'Drivetype','Drop','Dropoffline','Dtoc','Dtor','Dtos',
+            'Dtot','DynamicInputMask','Each','Edit','Eject','Elif',
+            'End','Eof','Erase','Evaluate','Event','Eventtracking',
+            'Exclude','Exclusive','Exit','Exp','Export','External',
+            'FDate','FTime','Fchsize','Fclose','Fcount','Fcreate',
+            'Feof','Ferror','FetchMemo','FetchSize','Fflush','Fgets',
+            'Filer','Filetostr','Find','Fklabel','Fkmax','Fldlist',
+            'Flock','Floor','Flush','Fontmetric','Fopen','Forceext',
+            'Forcepath','FormSetClass','FormSetLib','FormsClass','FormsLib','Found',
+            'FoxPro','Foxcode','Foxdoc','Foxgen','Foxgraph','Foxview',
+            'Fputs','Fread','French','Fseek','Fsize','Fv',
+            'Fwrite','Gather','German','GetPem','Getbar','Getcolor',
+            'Getcp','Getdir','Getenv','Getexpr','Getfile','Getfldstate',
+            'Getfont','Gethost','Getnextmodified','Getobject','Getpad','Getpict',
+            'Getprinter','Go','Gomonth','Goto','Graph','GridHorz',
+            'GridShow','GridShowPos','GridSnap','GridVert','Help','HelpOn',
+            'HelpTo','HighLightRow','Home','Hour','IMEStatus','IdleTimeOut',
+            'Idxcollate','Ifdef','Ifndef','Iif','Import','Include',
+            'Indbc','Index','Indexseek','Inkey','Inlist','Input',
+            'Insert','InsertTrigger','Insmode','IsBlank','IsFLocked','IsLeadByte',
+            'IsMouse','IsNull','IsRLocked','Isalpha','Iscolor','Isdigit',
+            'IsExclusive','Ishosted','IsLower','IsReadOnly',
+            'IsUpper','Italian','Japan','Join','Justdrive','Justext',
+            'Justfname','Justpath','Juststem','KeyField','KeyFieldList','Keyboard'
+            ),
+        2 => array('Keymatch','LastProject','Lastkey','Lcase','Leftc','Len',
+            'Lenc','Length','Likec','Lineno','LoadPicture',
+            'Locate','Locfile','Log','Log10','Logout','Lookup',
+            'Loop','Lower','Ltrim','Lupdate','Mail','MaxRecords',
+            'Mcol','Md','Mdown','Mdx','Mdy','Memlines',
+            'Menu','Messagebox','Minute','Mkdir','Mline','Modify',
+            'Month','Monthname','Mouse','Mrkbar','Mrkpad','Mrow',
+            'Mtdll','Mton','Mwindow','Native','Ndx','Network',
+            'NoFilter','Nodefault','Normalize','Note','Now','Ntom',
+            'NullString','Numlock','Nvl','ODBChdbc','ODBChstmt','OLEDropTextInsertion',
+            'OLELCid','Objnum','Objref','Objtoclient','Objvar','Occurs',
+            'Oemtoansi','Oldval','OlePublic','Olereturnerror','On','Open',
+            'Oracle','Order','Os','Outer','PCount','Pack',
+            'PacketSize','Padc','Padl','Padr','Payment','Pcol',
+            'PemStatus','Pi','Pivot','Play','Pop','Popup',
+            'Power','PrimaryKey','Printstatus','Private','Prmbar','Prmpad',
+            'ProjectClick','Proper','Prow','Prtinfo','Push','Putfile',
+            'Pv','Qpr','Quater','QueryTimeOut','Quit','Radians',
+            'Rand','Rat','Ratc','Ratline','Rd','Rdlevel',
+            'Read','Readkey','Recall','Reccount','RecentlyUsedFiles','Recno',
+            'Recsize','Regional','Reindex','RelatedChild','RelatedTable','RelatedTag',
+            'Remove','Rename','Repeat','Replace','Replicate','Report',
+            'ResHeight','ResWidth','ResourceOn','ResourceTo','Resources','Restore',
+            'Resume','Retry','Return','Revertoffline','Rgbscheme','Rightc',
+            'Rlock','Rmdir','Rollback','Round','Rtod','Rtrim',
+            'RuleExpression','RuleText','Run','Runscript','Rview','SQLAsynchronous',
+            'SQLBatchMode','SQLCancel','SQLColumns','SQLConnect','SQLConnectTimeOut','SQLDisconnect',
+            'SQLDispLogin','SQLDispWarnings','SQLExec','SQLGetProp','SQLIdleTimeOut','SQLMoreResults',
+            'SQLPrepare','SQLQueryTimeOut','SQLSetProp','SQLTables','SQLTransactions','SQLWaitTime',
+            'Save','SavePicture','ScaleUnits','Scatter','Scols',
+            'Scroll','Sec','Second','Seek','Select','SendUpdates',
+            'Set','SetDefault','Setfldstate','Setup','ShareConnection','ShowOLEControls',
+            'ShowOLEInsertable','ShowVCXs','Sign','Sin','Size','SizeBox',
+            'Skpbar','Skppad','Sort','Soundex','SourceName','Sqlcommit',
+            'Sqll','Sqlrollback','Sqlstringconnect','Sqrt','Srows','StatusBar',
+            'Store','Str','Strconv','Strtofile','Strtran','Stuff',
+            'Stuffc','Substr','Substrc','Substring','Sum','Suspend',
+            'Sys','Sysmetric','TabOrdering','Table','TableRefresh','Tablerevert',
+            'Tableupdate','TagCount','TagNo','Tan','Target','This',
+            'Thisform','Thisformset','Timestamp','Timestampdiff','Total','Transactions',
+            'Transform','Trim','Truncate','Ttoc','Ttod','Txnlevel',
+            'Txtwidth','Type','Ucase','Undefine','Unlock','Unpack',
+            'Updatable','UpdatableFieldList','Update','UpdateName','UpdateNameList','UpdateTrigger',
+            'UpdateType','Updated','Upper','Upsizing','Usa','Use',
+            'UseMemoSize','Used','Val','Validate','Varread','Vartype',
+            'Version','VersionLanguage','Wait','WaitTime','Wborder','Wchild',
+            'Wcols','Week','Wexist','Wfont','WhereType','Windcmd',
+            'Windhelp','Windmemo','Windmenu','Windmodify','Windquery','Windscreen',
+            'Windsnip','Windstproc','WizardPrompt','Wlast','Wlcol','Wlrow',
+            'Wmaximum','Wminimum','Wontop','Woutput','Wparent','Wread',
+            'Wrows','Wtitle','Wvisible','Year','Zap','_Alignment',
+            '_Asciicols','_Asciirows','_Assist','_Beautify','_Box','_Browser',
+            '_Builder','_Calcmem','_Calcvalue','_Cliptext','_Converter','_Coverage',
+            '_Curobj','_Dblclick','_Diarydate','_Dos','_Foxdoc','_Foxgraph',
+            '_Gallery','_Gengraph','_Genhtml','_Genmenu','_Genpd','_Genscrn',
+            '_Genxtab','_Getexpr','_Include','_Indent','_Lmargin','_Mac',
+            '_Mbr_appnd','_Mbr_cpart','_Mbr_delet','_Mbr_font','_Mbr_goto','_Mbr_grid',
+            '_Mbr_link','_Mbr_mode','_Mbr_mvfld','_Mbr_mvprt','_Mbr_seek','_Mbr_sp100',
+            '_Mbr_sp200','_Mbr_szfld','_Mbrowse','_Mda_appnd','_Mda_avg','_Mda_brow',
+            '_Mda_calc','_Mda_copy','_Mda_count','_Mda_label','_Mda_pack','_Mda_reprt',
+            '_Mda_rindx','_Mda_setup','_Mda_sort','_Mda_sp100','_Mda_sp200','_Mda_sp300',
+            '_Mda_sum','_Mda_total','_Mdata','_Mdiary','_Med_clear','_Med_copy',
+            '_Med_cut','_Med_cvtst','_Med_find','_Med_finda','_Med_goto','_Med_insob',
+            '_Med_link','_Med_obj','_Med_paste','_Med_pref','_Med_pstlk','_Med_redo',
+            '_Med_repl','_Med_repla','_Med_slcta','_Med_sp100','_Med_sp200','_Med_sp300',
+            '_Med_sp400','_Med_sp500','_Med_undo','_Medit','_Mfi_clall','_Mfi_close',
+            '_Mfi_export','_Mfi_import','_Mfi_new','_Mfi_open','_Mfi_pgset','_Mfi_prevu',
+            '_Mfi_print','_Mfi_quit','_Mfi_revrt','_Mfi_savas','_Mfi_save','_Mfi_send',
+            '_Mfi_setup','_Mfi_sp100','_Mfi_sp200','_Mfi_sp300','_Mfi_sp400','_Mfile',
+            '_Mfiler','_Mfirst','_Mlabel','_Mlast','_Mline','_Mmacro',
+            '_Mmbldr','_Mpr_beaut','_Mpr_cancl','_Mpr_compl','_Mpr_do','_Mpr_docum',
+            '_Mpr_formwz','_Mpr_gener','_Mpr_graph','_Mpr_resum','_Mpr_sp100','_Mpr_sp200',
+            '_Mpr_sp300','_Mpr_suspend','_Mprog','_Mproj','_Mrc_appnd','_Mrc_chnge',
+            '_Mrc_cont','_Mrc_delet','_Mrc_goto','_Mrc_locat','_Mrc_recal','_Mrc_repl',
+            '_Mrc_seek','_Mrc_sp100','_Mrc_sp200','_Mrecord','_Mreport','_Mrqbe',
+            '_Mscreen','_Msm_data','_Msm_edit','_Msm_file','_Msm_format','_Msm_prog',
+            '_Msm_recrd','_Msm_systm','_Msm_text','_Msm_tools','_Msm_view','_Msm_windo',
+            '_Mst_about','_Mst_ascii','_Mst_calcu','_Mst_captr','_Mst_dbase','_Mst_diary',
+            '_Mst_filer','_Mst_help','_Mst_hphow','_Mst_hpsch','_Mst_macro','_Mst_office',
+            '_Mst_puzzl','_Mst_sp100','_Mst_sp200','_Mst_sp300','_Mst_specl','_Msysmenu',
+            '_Msystem','_Mtable','_Mtb_appnd','_Mtb_cpart','_Mtb_delet','_Mtb_delrc',
+            '_Mtb_goto','_Mtb_link','_Mtb_mvfld','_Mtb_mvprt','_Mtb_props','_Mtb_recal',
+            '_Mtb_sp100','_Mtb_sp200','_Mtb_sp300','_Mtb_sp400','_Mtb_szfld','_Mwi_arran',
+            '_Mwi_clear','_Mwi_cmd','_Mwi_color','_Mwi_debug','_Mwi_hide','_Mwi_hidea',
+            '_Mwi_min','_Mwi_move','_Mwi_rotat','_Mwi_showa','_Mwi_size','_Mwi_sp100',
+            '_Mwi_sp200','_Mwi_toolb','_Mwi_trace','_Mwi_view','_Mwi_zoom','_Mwindow',
+            '_Mwizards','_Mwz_all','_Mwz_form','_Mwz_foxdoc','_Mwz_import','_Mwz_label',
+            '_Mwz_mail','_Mwz_pivot','_Mwz_query','_Mwz_reprt','_Mwz_setup','_Mwz_table',
+            '_Mwz_upsizing','_Netware','_Oracle','_Padvance','_Pageno','_Pbpage',
+            '_Pcolno','_Pcopies','_Pdparms','_Pdriver','_Pdsetup','_Pecode',
+            '_Peject','_Pepage','_Pform','_Plength','_Plineno','_Ploffset',
+            '_Ppitch','_Pquality','_Pretext','_Pscode','_Pspacing','_Pwait',
+            '_Rmargin','_Runactivedoc','_Samples','_Screen','_Shell','_Spellchk',
+            '_Sqlserver','_Startup','_Tabs','_Tally','_Text','_Throttle',
+            '_Transport','_Triggerlevel','_Unix','_WebDevOnly','_WebMenu','_WebMsftHomePage',
+            '_WebVFPHomePage','_WebVfpOnlineSupport','_Windows','_Wizard','_Wrap','_scctext',
+            '_vfp','Additive','After','Again','Aindent','Alignright',
+            'All','Alt','Alternate','And','Ansi','Any',
+            'Aplabout','App','Array','As','Asc','Ascending',
+            'Ascii','At','Attributes','Automatic','Autosave','Avg',
+            'Bar','Before','Bell','Between','Bitmap','Blank',
+            'Blink','Blocksize','Border','Bottom','Brstatus','Bucket',
+            'Buffers','By','Candidate','Carry','Cascade','Catalog',
+            'Cdx','Center','Century','Cga','Character','Check',
+            'Classlib','Clock','Cnt','Codepage','Collate','Color',
+            'Com1','Com2','Command','Compact','Compatible','Compress',
+            'Confirm','Connection','Connections','Connstring','Console','Copies',
+            'Cpcompile','Cpdialog','Csv','Currency','Cycle','Databases',
+            'Datasource','Date','Db4','Dbc','Dbf','Dbmemo3',
+            'Debug','Decimals','Defaultsource','Deletetables','Delimited','Delimiters',
+            'Descending','Design','Development','Device','Dif','Disabled',
+            'Distinct','Dlls','Dohistory','Dos','Dosmem','Double',
+            'Driver','Duplex','Echo','Editwork','Ega25','Ega43',
+            'Ems','Ems64','Encrypt','Encryption','Environment','Escape',
+            'Events','Exact','Except','Exe','Exists','Expression',
+            'Extended','F','Fdow','Fetch','Field','Fields',
+            'File','Files','Fill','Fixed','Float','Foldconst',
+            'Font','Footer','Force','Foreign','Fox2x','Foxplus',
+            'Free','Freeze','From','Fullpath','Fw2','Fweek',
+            'Get','Gets','Global','Group','Grow','Halfheight',
+            'Having','Heading','Headings','Helpfilter','History','Hmemory',
+            'Hours','Id','In','Indexes','Information','Instruct',
+            'Int','Integer','Intensity','Intersect','Into','Is',
+            'Isometric','Key','Keycolumns','Keycomp','Keyset','Last',
+            'Ledit','Level','Library','Like','Linked','Lock',
+            'Logerrors','Long','Lpartition','Mac','Macdesktop','Machelp',
+            'Mackey','Macros','Mark','Master','Max','Maxmem',
+            'Mdi','Memlimit','Memory','Memos','Memowidth','Memvar',
+            'Menus','Messages','Middle','Min','Minimize','Minus',
+            'Mod','Modal','Module','Mono43','Movers','Multilocks',
+            'Mvarsiz','Mvcount','N','Near','Negotiate','Noalias',
+            'Noappend','Noclear','Noclose','Noconsole','Nocptrans','Nodata',
+            'Nodebug','Nodelete','Nodup','Noedit','Noeject','Noenvironment',
+            'Nofloat','Nofollow','Nogrow','Noinit','Nolgrid','Nolink',
+            'Nolock','Nomargin','Nomdi','Nomenu','Nominimize','Nomodify'
+            ),
+        3 => array('Nomouse','None','Nooptimize','Nooverwrite','Noprojecthook','Noprompt',
+            'Noread','Norefresh','Norequery','Norgrid','Norm','Normal',
+            'Nosave','Noshadow','Noshow','Nospace','Not','Notab',
+            'Notify','Noupdate','Novalidate','Noverify','Nowait','Nowindow',
+            'Nowrap','Nozoom','Npv','Null','Number','Objects',
+            'Odometer','Of','Off','Oleobjects','Only','Optimize',
+            'Or','Orientation','Output','Outshow','Overlay','Overwrite',
+            'Pad','Palette','Paperlength','Papersize','Paperwidth','Password',
+            'Path','Pattern','Pause','Pdox','Pdsetup','Pen',
+            'Pfs','Pixels','Plain','Popups','Precision','Preference',
+            'Preview','Primary','Printer','Printquality','Procedures','Production',
+            'Program','Progwork','Project','Prompt','Query','Random',
+            'Range','Readborder','Readerror','Record','Recover','Redit',
+            'Reference','References','Relative','Remote','Reprocess','Resource',
+            'Rest','Restrict','Rgb','Right','Row','Rowset',
+            'Rpd','Runtime','Safety','Same','Sample','Say',
+            'Scale','Scheme','Scoreboard','Screen','Sdf','Seconds',
+            'Selection','Shadows','Shared','Sheet','Shell','Shift',
+            'Shutdown','Single','Some','Sortwork','Space','Sql',
+            'Standalone','Status','Std','Step','Sticky','String',
+            'Structure','Subclass','Summary','Sylk','Sysformats','Sysmenus',
+            'System','T','Tab','Tables','Talk','Tedit',
+            'Textmerge','Time','Timeout','Titles','Tmpfiles','To',
+            'Topic','Transaction','Trap','Trbetween','Trigger','Ttoption',
+            'Typeahead','Udfparms','Union','Unique','Userid','Users',
+            'Values','Var','Verb','Vga25','Vga50','Views',
+            'Volume','Where','Windows','Wk1','Wk3','Wks',
+            'Workarea','Wp','Wr1','Wrap','Wrk','Xcmdfile',
+            'Xl5','Xl8','Xls','Y','Yresolution','Zoom',
+            'Activate','ActivateCell','Add','AddColumn','AddItem','AddListItem',
+            'AddObject','AddProperty','AddToSCC','AfterBuild','AfterCloseTables','AfterDock',
+            'AfterRowColChange','BeforeBuild','BeforeDock','BeforeOpenTables','BeforeRowColChange','Box',
+            'Build','CheckIn','CheckOut','Circle','Clear','ClearData',
+            'Cleanup','Click','CloneObject','CloseEditor','CloseTables','Cls',
+            'CommandTargetExec','CommandTargetQueryStas','ContainerRelease','DataToClip','DblClick','Deactivate',
+            'Delete','DeleteColumn','Deleted','Destroy','DoCmd','Dock',
+            'DoScroll','DoVerb','DownClick','Drag','DragDrop','DragOver',
+            'DropDown','Draw','EnterFocus','Error','ErrorMessage','Eval',
+            'ExitFocus','FormatChange','GetData','GetFormat','GetLatestVersion','GoBack',
+            'GotFocus','GoForward','GridHitTest','Hide','HideDoc','IndexToItemId',
+            'Init','InteractiveChange','Item','ItemIdToIndex','KeyPress','Line',
+            'Load','LostFocus','Message','MiddleClick','MouseDown','MouseMove',
+            'MouseUp','MouseWheel','Move','Moved','NavigateTo','Newobject',
+            'OLECompleteDrag','OLEDrag','OLEDragDrop','OLEDragOver','OLEGiveFeedback','OLESetData',
+            'OLEStartDrag','OpenEditor','OpenTables','Paint','Point','Print',
+            'ProgrammaticChange','PSet','QueryAddFile','QueryModifyFile','QueryRemoveFile','QueryRunFile',
+            'QueryUnload','RangeHigh','RangeLow','ReadActivate','ReadExpression','ReadDeactivate',
+            'ReadMethod','ReadShow','ReadValid','ReadWhen','Refresh','Release',
+            'RemoveFromSCC','RemoveItem','RemoveListItem','RemoveObject','Requery','RequestData',
+            'Reset','ResetToDefault','Resize','RightClick','SaveAs','SaveAsClass',
+            'Scrolled','SetAll','SetData','SetFocus','SetFormat','SetMain',
+            'SetVar','SetViewPort','ShowDoc','ShowWhatsThis','TextHeight','TextWidth',
+            'Timer','UIEnable','UnDock','UndoCheckOut','Unload','UpClick',
+            'Valid','WhatsThisMode','When','WriteExpression','WriteMethod','ZOrder',
+            'ATGetColors','ATListColors','Accelerate','ActiveColumn','ActiveControl','ActiveForm',
+            'ActiveObjectId','ActivePage','ActiveProject','ActiveRow','AddLineFeeds','Alias',
+            'Alignment','AllowAddNew','AllowHeaderSizing','AllowResize','AllowRowSizing','AllowTabs',
+            'AlwaysOnTop','Application','AutoActivate','AutoCenter','AutoCloseTables','AutoIncrement',
+            'AutoOpenTables','AutoRelease','AutoSize','AutoVerbMenu','AutoYield','AvailNum',
+            'BackColor','BackStyle','BaseClass','BorderColor','BorderStyle','BorderWidth',
+            'Bound','BoundColumn','BoundTo','BrowseAlignment','BrowseCellMarg','BrowseDestWidth',
+            'BufferMode','BufferModeOverride','BuildDateTime','ButtonCount','ButtonIndex','Buttons',
+            'CLSID','CanAccelerate','CanGetFocus','CanLoseFocus','Cancel','Caption',
+            'ChildAlias','ChildOrder','Class','ClassLibrary','ClipControls','ClipRect',
+            'Closable','ColorScheme','ColorSource','ColumnCount','ColumnHeaders','ColumnLines',
+            'ColumnOrder','ColumnWidths','Columns','Comment','ContinuousScroll','ControlBox',
+            'ControlCount','ControlIndex','ControlSource','Controls','CurrentControl','CurrentX',
+            'CurrentY','CursorSource','Curvature','DataSession','DataSessionId','DataSourceObj',
+            'DataType','Database','DateFormat','DateMark','DefButton','DefButtonOrig',
+            'DefHeight','DefLeft','DefTop','DefWidth','Default','DefaultFilePath',
+            'DefineWindows','DeleteMark','Desktop','Dirty','DisabledBackColor','DisabledByEOF',
+            'DisabledForeColor','DisabledItemBackColor','DisabledItemForeColor','DisabledPicture','DispPageHeight','DispPageWidth',
+            'DisplayCount','DisplayValue','DoCreate','DockPosition','Docked','DocumentFile',
+            'DownPicture','DragIcon','DragMode','DragState','DrawMode','DrawStyle',
+            'DrawWidth','DynamicAlignment','DynamicBackColor','DynamicCurrentControl','DynamicFontBold','DynamicFontItalic',
+            'DynamicFontName','DynamicFontOutline','DynamicFontShadow','DynamicFontSize','DynamicFontStrikethru','DynamicFontUnderline',
+            'DynamicForeColor','EditFlags','Enabled','EnabledByReadLock','Encrypted','EnvLevel',
+            'ErasePage','FileClass','FileClassLibrary','FillColor','FillStyle','Filter',
+            'FirstElement','FontBold','FontItalic','FontName','FontOutline','FontShadow',
+            'FontSize','FontStrikethru','FontUnderline','ForceFocus','ForeColor','FormCount',
+            'FormIndex','FormPageCount','FormPageIndex','Format','Forms','FoxFont',
+            'FullName','GoFirst','GoLast','GridLineColor','GridLineWidth','GridLines'
+            ),
+        4 => array('HPROJ','HWnd','HalfHeightCaption','HasClip','HeaderGap','HeaderHeight',
+            'Height','HelpContextID','HideSelection','Highlight','HomeDir','HostName',
+            'HotKey','HscrollSmallChange','IMEMode','Icon','IgnoreInsert','InResize',
+            'Increment','IncrementalSearch','InitialSelectedAlias','InputMask','Instancing','IntegralHeight',
+            'Interval','ItemBackColor','ItemData','ItemForeColor','ItemIDData','ItemTips',
+            'JustReadLocked','KeyPreview','KeyboardHighValue','KeyboardLowValue','LastModified','Left',
+            'LeftColumn','LineSlant','LinkMaster','List','ListCount','ListIndex',
+            'ListItem','ListItemId','LockDataSource','LockScreen','MDIForm','MainClass',
+            'MainFile','Margin','MaxButton','MaxHeight','MaxLeft','MaxLength',
+            'MaxTop','MaxWidth','MemoWindow','MinButton','MinHeight','MinWidth',
+            'MouseIcon','MousePointer','Movable','MoverBars','MultiSelect','Name',
+            'NapTime','NewIndex','NewItemId','NoDataOnLoad','NoDefine','NotifyContainer',
+            'NullDisplay','NumberOfElements','OLEDragMode','OLEDragPicture','OLEDropEffects','OLEDropHasData',
+            'OLEDropMode','OLERequestPendingTimeOut','OLEServerBusyRaiseError','OLEServerBusyTimeOut','OLETypeAllowed','OleClass',
+            'OleClassId','OleControlContainer','OleIDispInValue','OleIDispOutValue','OleIDispatchIncoming','OleIDispatchOutgoing',
+            'OnResize','OneToMany','OpenViews','OpenWindow','PageCount','PageHeight',
+            'PageOrder','PageWidth','Pages','Panel','PanelLink','Parent',
+            'ParentAlias','ParentClass','Partition','PasswordChar','Picture','ProcessID',
+            'ProgID','ProjectHookClass','ProjectHookLibrary','Projects','ReadColors','ReadCycle',
+            'ReadFiller','ReadLock','ReadMouse','ReadOnly','ReadSave','ReadSize',
+            'ReadTimeout','RecordMark','RecordSource','RecordSourceType','Rect','RelationalExpr',
+            'RelativeColumn','RelativeRow','ReleaseErase','ReleaseType','ReleaseWindows','Resizable',
+            'RightToLeft','RowHeight','RowSource','RowSourceType','SCCProvider','SCCStatus',
+            'SDIForm','ScaleMode','ScrollBars','SelLength','SelStart','SelText',
+            'SelectOnEntry','Selected','SelectedBackColor','SelectedForeColor','SelectedID','SelectedItemBackColor',
+            'SelectedItemForeColor','SelfEdit','ServerClass','ServerClassLibrary','ServerHelpFile','ServerName',
+            'ServerProject','ShowTips','ShowWindow','Sizable','Size','Size',
+            'Size','Skip','SkipForm','Sorted','SourceType','Sparse',
+            'SpecialEffect','SpinnerHighValue','SpinnerLowValue','SplitBar','StartMode','StatusBarText',
+            'Stretch','StrictDateEntry','Style','SystemRefCount','TabIndex','TabStop',
+            'TabStretch','TabStyle','Tabhit','Tabs','Tag','TerminateRead',
+            'ThreadID','TitleBar','ToolTipText','Top','TopIndex','TopItemId',
+            'TypeLibCLSID','TypeLibDesc','TypeLibName','UnlockDataSource','Value','ValueDirty',
+            'VersionComments','VersionCompany','VersionCopyright','VersionDescription','VersionNumber','VersionProduct',
+            'VersionTrademarks','View','ViewPortHeight','ViewPortLeft','ViewPortTop','ViewPortWidth',
+            'Visible','VscrollSmallChange','WasActive','WasOpen','WhatsThisButton','WhatsThisHelp',
+            'WhatsThisHelpID','Width','WindowList','WindowNTIList','WindowState','WindowType',
+            'WordWrap','ZOrderSet','ActiveDoc','Checkbox','Column','ComboBox',
+            'CommandButton','CommandGroup','Container','Control','Cursor','Custom',
+            'DataEnvironment','EditBox','Empty','FontClass','Form','Formset',
+            'General','Grid','Header','HyperLink','Image','Label',
+            'ListBox','Memo','OleBaseControl','OleBoundControl','OleClassIDispOut','OleControl',
+            'OptionButton','OptionGroup','Page','PageFrame','ProjectHook','RectClass',
+            'Relation','Session','Shape','Spinner','TextBox' ,'Toolbar'
+            ),
+        ),
+    'SYMBOLS' => array(
+        "!", "@", "$", "%",
+        "(", ")", "{", "}", "[", "]",
+        "-", "+", "*", "/",
+        "=", "<", ">",
+        ":", ";", ",", ".", "&",
+        "?", "??", "???"
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: blue;',
+            2 => 'color: blue;',
+            3 => 'color: blue;',
+            4 => 'color: blue;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: green; font-style: italic;',
+            2 => 'color: green; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: blue;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: blue;'
+            ),
+        '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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/visualprolog.php b/sources/inc/geshi/visualprolog.php
new file mode 100644
index 0000000..d36f1c6
--- /dev/null
+++ b/sources/inc/geshi/visualprolog.php
@@ -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 --git a/sources/inc/geshi/whitespace.php b/sources/inc/geshi/whitespace.php
new file mode 100644
index 0000000..58f3963
--- /dev/null
+++ b/sources/inc/geshi/whitespace.php
@@ -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 --git a/sources/inc/geshi/whois.php b/sources/inc/geshi/whois.php
new file mode 100644
index 0000000..a89e473
--- /dev/null
+++ b/sources/inc/geshi/whois.php
@@ -0,0 +1,181 @@
+ 'Whois (RPSL format)',
+    'COMMENT_SINGLE' => array(1 => '% ', 2 => '%ERROR:'),
+    'COMMENT_MULTI' => array(),
+    'COMMENT_REGEXP' => array(
+        //Description
+        3 => '/(?:(?<=^remarks:)|(?<=^descr:))(.|\n\s)*$/mi',
+
+        //Contact Details
+        4 => '/(?<=^address:)(.|\n\s)*$/mi',
+        5 => '/\+\d+(?:(?:\s\(\d+(\s\d+)*\))?(?:\s\d+)+|-\d+-\d+)/',
+        6 => '/\b(?!-|\.)[\w\-\.]+(?!-|\.)@((?!-)[\w\-]+\.)+\w+\b/',
+
+        //IP, Networks and AS information\links
+        7 => '/\b(? '/\bAS\d+\b/'
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array(),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array( //Object Types
+            'as-block','as-set','aut-num','domain','filter-set','inet-rtr',
+            'inet6num','inetnum','irt','key-cert','limerick','mntner',
+            'organisation','peering-set','person','poem','role','route-set',
+            'route','route6','rtr-set'
+            ),
+        2 => array( //Field Types
+            'abuse-mailbox','address','admin-c','aggr-bndry','aggr-mtd','alias',
+            'as-block','as-name','as-set','aut-num','auth','author','certif',
+            'changed','components','country','default','descr','dom-net',
+            'domain','ds-rdata','e-mail','encryption','export','export-comps',
+            'fax-no','filter','filter-set','fingerpr','form','holes','ifaddr',
+            'import','inet-rtr','inet6num','inetnum','inject','interface','irt',
+            'irt-nfy','key-cert','limerick','local-as','mbrs-by-ref',
+            'member-of','members','method','mnt-by','mnt-domains','mnt-irt',
+            'mnt-lower','mnt-nfy','mnt-ref','mnt-routes','mntner','mp-default',
+            'mp-export','mp-filter','mp-import','mp-members','mp-peer',
+            'mp-peering','netname','nic-hdl','notify','nserver','org',
+            'org-name','org-type','organisation','origin','owner','peer',
+            'peering','peering-set','person','phone','poem','ref-nfy','refer',
+            'referral-by','remarks','rev-srv','role','route','route-set',
+            'route6','rtr-set','signature','source','status','sub-dom','tech-c',
+            'text','upd-to','zone-c'
+            ),
+        3 => array( //RPSL reserved
+            'accept','action','and','announce','any','as-any','at','atomic',
+            'except','from','inbound','into','networks','not','or','outbound',
+            'peeras','refine','rs-any','to'
+            )
+        ),
+    'SYMBOLS' => array(
+        ':'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000FF; font-weight: bold;',
+            2 => 'color: #000080; font-weight: bold;',
+            3 => 'color: #990000; font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #666666; font-style: italic;',
+            2 => 'color: #666666; font-style: italic;',
+            3 => 'color: #404080;',
+            4 => 'color: #408040;',
+            5 => 'color: #408040;',
+            6 => 'color: #408040;',
+            7 => 'color: #804040;',
+            8 => 'color: #804040;',
+            '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 => '',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000080;',
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #0000FF;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000088;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.irr.net/docs/rpsl.html'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Variables
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4,
+    'PARSER_CONTROL' => array(
+        'KEYWORDS' => array(
+            1 => array(
+                'DISALLOWED_BEFORE' => '(?<=\A |\A \n(?m:^)|\n\n(?m:^))'
+                ),
+            2 => array(
+                'DISALLOWED_BEFORE' => '(?m:^)'
+                )
+            ),
+        'ENABLE_FLAGS' => array(
+            'BRACKETS' => GESHI_NEVER,
+            'SYMBOLS' => GESHI_NEVER,
+            'BRACKETS' => GESHI_NEVER,
+            'STRINGS' => GESHI_NEVER,
+            'ESCAPE_CHAR' => GESHI_NEVER,
+            'NUMBERS' => GESHI_NEVER,
+            'METHODS' => GESHI_NEVER,
+            'SCRIPT' => GESHI_NEVER
+            )
+        ),
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/winbatch.php b/sources/inc/geshi/winbatch.php
new file mode 100644
index 0000000..3599a02
--- /dev/null
+++ b/sources/inc/geshi/winbatch.php
@@ -0,0 +1,369 @@
+ 'Winbatch',
+    'COMMENT_SINGLE' => array(1 => ';', 2 => ':'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"', '`'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'While', 'To', 'Then', 'Switch', 'Select', 'Return', 'Next', 'IntControl', 'Include', 'In', 'If',
+            'Goto', 'GoSub', 'ForEach', 'For', 'Exit', 'Execute', 'ErrorMode', 'EndWhile', 'EndSwitch', '#EndSubRoutine',
+            'EndSelect', 'EndIf', '#EEndFunction', 'EndFor', 'End', 'Else', 'DropWild', 'Drop', '#DefineSubRoutine',
+            '#DefineFunction', 'Debug', 'Continue', 'Case', 'CallExt', 'Call', 'By', 'BreakPoint', 'Break'
+            ),
+        2 => array(
+            'ZOOMED', 'YES', 'WORD4', 'WORD2', 'WORD1', 'WHOLESECTION', 'WAIT', 'UNSORTED', 'UNCHECK', 'TRUE', 'TILE',
+            'TAB', 'STRING', 'STACK', 'SPC2NET', 'SORTED', 'SOK', 'SNET2PC', 'SINGLE', 'SHIFT', 'SERVER', 'SERRWINSOCK',
+            'SERRVOICE', 'SERRSOCKET', 'SERRSERVICE', 'SERRSELECT', 'SERRPARAM', 'SERROUTOFMEM', 'SERRNOTFOUND', 'SERRNOCONN',
+            'SERRNOANSWER', 'SERRMUSTWAIT', 'SERRIPADDR', 'SERRHOSTNAME', 'SERRFAILURE', 'SERRBUSY', 'SCROLLLOCK', 'SCANCEL',
+            'SAVE', 'SALREADY', 'ROWS', 'REGUSERS', 'REGROOT', 'REGMACHINE', 'REGCURRENT', 'REGCLASSES', 'RDBLCLICK', 'RCLICK',
+            'RBUTTON', 'RAD2DEG', 'QSUCCESSINFO', 'QSUCCESS', 'QSTILLEX', 'QROLLBACK', 'QNULL', 'QNODATA', 'QNEXT', 'QNEEDDATA',
+            'QFIRST', 'QCOMMIT', 'QBADHANDLE', 'PRINTER', 'PLANCKJOULES', 'PLANCKERGS', 'PI', 'PARSEONLY', 'PARSEC', 'P3ERRREPLY',
+            'OPEN', 'ON', 'OFF', 'NUMLOCK', 'NOWAIT', 'NOTIFY', 'NORMAL', 'NORESIZE', 'NONE', 'NO', 'NCSAFORMAT', 'MULTIPLE',
+            'MSFORMAT', 'MPLAYRDBLCK', 'MPLAYRCLK', 'MPLAYRBUTTON', 'MPLAYMDBLCK', 'MPLAYMCLK', 'MPLAYMBUTTON', 'MPLAYLDBLCK',
+            'MPLAYLCLK', 'MPLAYLBUTTON', 'MINOR', 'MDBLCLICK', 'MCLICK', 'MBYESNO', 'MBUTTON', 'MBOKCANCEL', 'MAJOR', 'MAGFIELD',
+            'LOCALGROUP', 'LIGHTMTPS', 'LIGHTMPS', 'LF', 'LDBLCLICK', 'LCLICK', 'LBUTTON', 'LAFFDBERROR', 'ICON', 'HTTPS', 'HTTP',
+            'HNOHEADER', 'HMETHODPOST', 'HMETHODGET', 'HIDDEN', 'HHEADERONLY', 'HHEADER', 'GRAVITATION', 'GOPHER', 'GOLDENRATIO',
+            'GMTSEC', 'GLOBALGROUP', 'GFTSEC', 'GETPROCID', 'GETEXITCODE', 'FWDSCAN', 'FTPPASSIVE', 'FTP', 'FLOAT8', 'FARADAY',
+            'FALSE', 'EXTENDED', 'EULERS', 'ENABLE', 'ELECTRIC', 'DRIVE', 'DISABLE', 'DESCENDING', 'DEG2RAD', 'DEFAULT', 'CTRL',
+            'CRLF', 'CR', 'COMMONFORMAT', 'COLUMNS', 'CHECK', 'CAPSLOCK', 'CANCEL', 'BOLTZMANN', 'BACKSCAN', 'AVOGADRO', 'ATTR_X',
+            'ATTR_T', 'ATTR_SY', 'ATTR_SH', 'ATTR_RO', 'ATTR_RI', 'ATTR_P', 'ATTR_IC', 'ATTR_H', 'ATTR_DM', 'ATTR_DI', 'ATTR_DC',
+            'ATTR_CI', 'ATTR_A', 'ASCENDING', 'ARRANGE', 'AMC', 'ACC_WRITE', 'ACC_READ_NT', 'ACC_READ_95', 'ACC_READ', 'ACC_PRINT_NT',
+            'ACC_PMANG_NT', 'ACC_PFULL_NT', 'ACC_LIST', 'ACC_FULL_NT', 'ACC_FULL_95', 'ACC_DELETE', 'ACC_CREATE', 'ACC_CONTROL',
+            'ACC_CHNG_NT', 'ACC_ATTRIB', 'ABOVEICONS'
+            ),
+        3 => array(
+            'Yields', 'Yield', 'WinZoom', 'WinWaitExist', 'WinWaitClose', 'WinWaitChild', 'WinVersion', 'WinTitle', 'WinSysInfo',
+            'WinState', 'WinShow', 'WinResources', 'WinPositionChild', 'WinPosition', 'WinPlaceSet', 'WinPlaceGet', 'WinPlaceChild',
+            'WinPlace', 'WinParmSet', 'WinParmGet', 'WinName', 'WinMetrics', 'WinItemProcId', 'WinItemNameId', 'WinItemizeEx',
+            'WinItemize', 'WinItemChild', 'WinIsDos', 'WinIdGet', 'WinIconize', 'WinHide', 'WinHelp', 'WinGetactive', 'WinExistchild',
+            'WinExist', 'WinExename', 'WinConfig', 'WinClosenot', 'WinClose', 'WinArrange', 'WinActivechild', 'WinActivchild',
+            'WinActivate', 'WebVerifyCard', 'WebSetTimeout', 'WebParamSize', 'WebParamNames', 'WebParamFile', 'WebParamData',
+            'WebParamBuf', 'WebOutFile', 'WebOutBinary', 'WebOut', 'WebDumpError', 'WebDatData', 'WebCounter', 'WebConSize', 'WebConData',
+            'WebConBuf', 'WebCmdData', 'WebBaseConv', 'Wallpaper', 'WaitForKeyEX', 'WaitForKey', 'VersionDLL', 'Version', 'VarType',
+            'TimeYmdHms', 'TimeWait', 'TimeSubtract', 'TimeJulToYmd', 'TimeJulianDay', 'TimeDiffSecs', 'TimeDiffDays', 'TimeDiff', 'TimeDelay',
+            'TimeDate', 'TimeAdd', 'TextSelect', 'TextBoxSort', 'TextBox', 'Terminate', 'Tanh', 'Tan', 'SysParamInfo', 'SvcWaitForCmd',
+            'SvcSetState', 'SvcSetAccept', 'StrUpper', 'StrTrim', 'StrSubWild', 'StrSub', 'StrScan', 'StrReplace', 'StrLower', 'StrLenWild',
+            'StrLen', 'StrIndexWild', 'StrIndexNC', 'StrIndex', 'StriCmp', 'StrFixLeft', 'StrFixCharsL', 'StrFixChars', 'StrFix', 'StrFill',
+            'StrCnt', 'StrCmp', 'StrClean', 'StrCharCount', 'StrCat', 'StrByteCount', 'Sqrt', 'SoundVolume', 'Sounds', 'Snapshot', 'Sinh', 'Sin',
+            'ShortCutMake', 'ShortCutInfo', 'ShortCutExtra', 'ShortCutEdit', 'ShortCutDir', 'ShellExecute', 'SendMenusToEx', 'SendMenusTo',
+            'SendKeysTo', 'SendKeysChild', 'SendKey', 'RunZoomWait', 'RunZoom', 'RunWithLogon', 'RunWait', 'RunShell', 'RunIconWait',
+            'RunIcon', 'RunHideWait', 'RunHide', 'RunExit', 'RunEnviron', 'Run', 'RtStatus', 'Reload', 'RegUnloadHive', 'RegSetValue',
+            'RegSetQword', 'RegSetMulSz', 'RegSetExpSz', 'RegSetEx', 'RegSetDword', 'RegSetBin', 'RegQueryValue', 'RegQueryStr',
+            'RegQueryQword', 'RegQueryMulSz', 'RegQueryKeys', 'RegQueryKeyLastWriteTime', 'RegQueryKey', 'RegQueryItem', 'RegQueryExpSz',
+            'RegQueryEx', 'RegQueryDword', 'RegQueryBin', 'RegOpenKeyEx', 'RegOpenKey', 'RegOpenFlags', 'RegLoadHive', 'RegExistValue',
+            'RegExistKey', 'RegEntryType', 'RegDelValue', 'RegDeleteKey', 'RegCreateKey', 'RegConnect', 'RegCloseKey', 'RegApp', 'Random',
+            'PtrPersistent', 'PtrGlobalDefine', 'PtrGlobal', 'Print', 'PlayWaveform', 'PlayMidi', 'PlayMedia', 'PipeServerWrite', 'PipeServerRead',
+            'PipeServerCreate', 'PipeServerClose', 'PipeInfo', 'PipeClientSendRecvData', 'PipeClientOpen', 'PipeClientClose', 'Pause',
+            'ParseData', 'ObjectTypeGet', 'ObjectType', 'ObjectOpen', 'ObjectGet', 'ObjectEventRemove', 'ObjectEventAdd',
+            'ObjectCreate', 'ObjectConstToArray', 'ObjectConstantsGet', 'ObjectCollectionOpen', 'ObjectCollectionNext',
+            'ObjectCollectionClose', 'ObjectClose', 'ObjectAccess', 'Num2Char', 'NetInfo', 'MsgTextGet', 'MousePlay', 'MouseMove', 'MouseInfo',
+            'MouseDrag', 'MouseCoords', 'MouseClickBtn', 'MouseClick', 'mod', 'Min', 'Message', 'Max', 'Loge', 'LogDisk', 'Log10', 'LastError',
+            'KeyToggleSet', 'KeyToggleGet', 'ItemSortNc', 'ItemSort', 'ItemSelect', 'ItemReplace', 'ItemRemove', 'ItemLocate', 'ItemInsert',
+            'ItemExtractCSV', 'ItemExtract', 'ItemCountCSV', 'ItemCount', 'IsNumber', 'IsLicensed', 'IsKeyDown', 'IsInt', 'IsFloat', 'IsDefined',
+            'Int', 'InstallFile', 'IniWritePvt', 'IniWrite', 'IniReadPvt', 'IniRead', 'IniItemizePvt', 'IniItemize', 'IniDeletePvt', 'IniDelete',
+            'IgnoreInput', 'IconReplace', 'IconInfo', 'IconExtract', 'IconArrange', 'GetTickCount', 'GetObject', 'GetExactTime', 'Floor',
+            'FindWindow', 'FileYmdHms', 'FileWrite', 'FileVerInfo', 'FileTimeTouch', 'FileTimeSetEx', 'FileTimeSet', 'FileTimeGetEx',
+            'FileTimeGet', 'FileTimeCode', 'FileSizeEx', 'FileSize', 'FileRoot', 'FileRename', 'FileRead', 'FilePutW', 'FilePut', 'FilePath',
+            'FileOpen', 'FileNameShort', 'FileNameLong', 'FileNameEval2', 'FileNameEval1', 'FileMoveAttr', 'FileMove', 'FileMapName',
+            'FileLocate', 'FileItemPath', 'FileItemize', 'FileInfoToArray', 'FileGetW', 'FileGet', 'FileFullname', 'FileExtension', 'FileExist',
+            'FileDelete', 'FileCreateTemp', 'FileCopyAttr', 'FileCopy', 'FileCompare', 'FileClose', 'FileBaseName', 'FileAttrSetEx',
+            'FileAttrSet', 'FileAttrGetEx', 'FileAttrGet', 'FileAppend', 'Fabs', 'ExtractAttachedFile', 'Exp', 'ExeTypeInfo', 'Exclusive',
+            'EnvItemize', 'EnvironSet', 'Environment', 'EndSession', 'DosVersion', 'DllLoad', 'DllLastError', 'DllHwnd', 'DllHinst',
+            'DllFree', 'DllCallCDecl', 'DllCall', 'Display', 'DiskVolinfo', 'DiskSize', 'DiskScan', 'DiskInfo', 'DiskFree', 'DiskExist',
+            'DirWindows', 'DirSize', 'DirScript', 'DirRename', 'DirRemove', 'DirMake', 'DirItemize', 'DirInfoToArray', 'DirHome', 'DirGet',
+            'DirExist', 'DirChange', 'DirAttrSetEx', 'DirAttrSet', 'DirAttrGetEx', 'DirAttrGet', 'DialogProcOptions', 'DialogObject',
+            'DialogControlState', 'DialogControlSet', 'DialogControlGet', 'DialogBox', 'Dialog', 'Delay', 'Decimals', 'DebugTrace',
+            'DebugData', 'DDETimeout', 'DDETerminate', 'DDERequest', 'DDEPoke', 'DDEInitiate', 'DDEExecute', 'DateTime', 'CurrFilepath',
+            'CurrentPath', 'CurrentFile', 'CreateObject', 'Cosh', 'Cos', 'ClipPut', 'ClipHasFormat', 'ClipGetEx', 'ClipGet', 'ClipAppend',
+            'ChrUnicodeToString', 'ChrUnicodeToHex', 'ChrStringToUnicode', 'ChrSetCodepage', 'ChrHexToUnicode', 'ChrGetCodepage',
+            'Char2Num', 'Ceiling', 'ButtonNames', 'BoxUpdates', 'BoxTitle', 'BoxTextFont', 'BoxTextColor', 'BoxText', 'BoxShut', 'BoxPen',
+            'BoxOpen', 'BoxNew', 'BoxMapmode', 'BoxesUp', 'BoxDrawText', 'BoxDrawRect', 'BoxDrawLine', 'BoxDrawCircle', 'BoxDestroy',
+            'BoxDataTag', 'BoxDataClear', 'BoxColor', 'BoxCaption', 'BoxButtonWait', 'BoxButtonStat', 'BoxButtonKill', 'BoxButtonDraw',
+            'BoxBitMap', 'BinaryXor', 'BinaryXlate', 'BinaryWriteEx', 'BinaryWrite', 'BinaryTagRepl', 'BinaryTagLen', 'BinaryTagInit',
+            'BinaryTagIndex', 'BinaryTagFind', 'BinaryTagExtr', 'BinaryStrCnt', 'BinarySort', 'BinaryReplace', 'BinaryReadEx',
+            'BinaryRead', 'BinaryPokeStrW', 'BinaryPokeStr', 'BinaryPokeHex', 'BinaryPokeFlt', 'BinaryPoke4', 'BinaryPoke2', 'BinaryPoke',
+            'BinaryPeekStrW', 'BinaryPeekStr', 'BinaryPeekHex', 'BinaryPeekFlt', 'BinaryPeek4', 'BinaryPeek2', 'BinaryPeek', 'BinaryOr',
+            'BinaryOleType', 'BinaryIndexNc', 'BinaryIndexEx', 'BinaryIndexBin', 'BinaryIndex', 'BinaryIncrFlt', 'BinaryIncr4',
+            'BinaryIncr2', 'BinaryIncr', 'BinaryHashRec', 'BinaryFree', 'BinaryEodSet', 'BinaryEodGet', 'BinaryCopy', 'BinaryConvert',
+            'BinaryCompare', 'BinaryClipPut', 'BinaryClipGet', 'BinaryChecksum', 'BinaryBufInfo', 'BinaryAnd', 'BinaryAllocArray',
+            'BinaryAlloc', 'Beep', 'Average', 'Atan', 'AskYesNo', 'AskTextbox', 'AskPassword', 'AskLine', 'AskItemlist', 'AskFont',
+            'AskFiletext', 'AskFilename', 'AskDirectory', 'AskColor', 'Asin', 'ArrInitialize', 'ArrInfo', 'ArrDimension',
+            'Arrayize', 'ArrayFilePutCSV', 'ArrayFilePut', 'ArrayFileGetCSV', 'ArrayFileGet', 'AppWaitClose', 'AppExist', 'AddExtender',
+            'Acos', 'Abs', 'About'
+            ),
+        4 => array(
+            'zZipFiles', 'zVersionInfo', 'zVersion', 'zUnZipFiles', 'zSetPortBit', 'zRPortShift', 'zPortOut', 'zPortIn', 'zNotPortBit',
+            'zLPortShift', 'zGetPortBit', 'zClrPortBit', 'xVerifyCCard', 'xSendMessage', 'xMessageBox', 'xMemCompact', 'xHex', 'xGetElapsed',
+            'xGetChildHwnd', 'xExtenderInfo', 'xEnumStreams', 'xEjectMedia', 'xDriveReady', 'xDiskLabelGet', 'xCursorSet', 'xBaseConvert',
+            'wxPing', 'wxParmSet', 'wxParmGet', 'wxMsgSetHdr', 'wxMsgGetHdr', 'wxMsgGetBody', 'wxHost2Addr', 'wxGetLastErr', 'wxGetInfo',
+            'wxGetErrDesc', 'wxAddr2Host', 'wtsWaitSystemEvent', 'wtsVersion', 'wtsTerminateProcess', 'wtsShutdownSystem', 'wtsSendMessage',
+            'wtsQuerySessionInfo', 'wtsProcIdToSessId', 'wtsLogoffSession', 'wtsLastErrMsg', 'wtsIsTSEnabled', 'wtsIsCitrixEnabled',
+            'wtsGetActiveConsoleSessId', 'wtsEnumSessions', 'wtsEnumProcesses', 'wtsDisconnectSession', 'wnWrkGroups', 'wnVersion', 'wntWtsUserSet',
+            'wntWtsUserGet', 'wntVersion', 'wntUserSidChk', 'wntUserSetDat', 'wntUserRename', 'wntUserProps', 'wntUserList', 'wntUserInfo',
+            'wntUserGetDat', 'wntUserFiles', 'wntUserExist', 'wntUserDel', 'wntUserAddDat', 'wntUserAdd', 'wntSvcStatus', 'wntSvcStart',
+            'wntSvcList', 'wntSvcDelete', 'wntSvcCreate', 'wntSvcControl', 'wntSvcCfgSet', 'wntSvcCfgGet', 'wntShutdown', 'wntShareUsers',
+            'wntShareSet', 'wntShareList', 'wntShareInfo', 'wntShareDel', 'wntShareAdd', 'wntServiceInf', 'wntServiceAt', 'wntServerType',
+            'wntServerList', 'wntServerInfo', 'wntSecurityGet', 'wntRunAsUser', 'wntResources2', 'wntResources', 'wntRemoteTime', 'wntRasUserSet',
+            'wntRasUserGet', 'wntProfileInfo', 'wntProfileDel', 'wntPrivUsers', 'wntPrivList', 'wntPrivGet', 'wntPrivDel', 'wntPrivAdd',
+            'wntOwnerSet', 'wntOwnerGet', 'wntMemberSet', 'wntMemberLst2', 'wntMemberList', 'wntMemberGrps', 'wntMemberGet', 'wntMemberDel',
+            'wntLsaPolSet', 'wntLsaPolGet', 'wntListGroups', 'wntLastErrMsg', 'wntGroupRen', 'wntGroupInfo', 'wntGroupEdit', 'wntGroupDel',
+            'wntGroupAdd', 'wntGetUser', 'wntGetDrive', 'wntGetDc', 'wntGetCon', 'wntFileUsers', 'wntFilesOpen', 'wntFileClose', 'wntEventWrite',
+            'wntEventLog', 'wntDomainSync', 'wntDirDialog', 'wntDfsList', 'wntDfsGetInfo', 'wntCurrUsers', 'wntChgPswd', 'wntCancelCon',
+            'wntAuditMod', 'wntAuditList', 'wntAuditGet', 'wntAuditDel', 'wntAuditAdd2', 'wntAuditAdd', 'wntAddPrinter', 'wntAddDrive',
+            'wntAcctPolSet', 'wntAcctPolGet', 'wntAcctList', 'wntAcctInfo', 'wntAccessMod', 'wntAccessList', 'wntAccessGet', 'wntAccessDel',
+            'wntaccessadd2', 'wntAccessAdd', 'wnShares', 'wnSharePath', 'wnShareName', 'wnShareCnt', 'wnServers', 'wnRestore', 'wnNetNames',
+            'wnGetUser', 'wnGetCon', 'wnGetCaps', 'wnDlgShare', 'wnDlgNoShare', 'wnDlgDiscon', 'wnDlgCon4', 'wnDlgCon3', 'wnDlgCon2', 'wnDlgCon',
+            'wnDlgBrowse', 'wnDialog', 'wnCmptrInfo', 'wnCancelCon', 'wnAddCon', 'WaitSRQ', 'w9xVersion', 'w9xUserSetDat', 'w9xUserRename',
+            'w9xUserprops', 'w9xUserList', 'w9xUserinfo', 'w9xUserGetDat', 'w9xUserExist', 'w9xUserDel', 'w9xUserAddDat', 'w9xUserAdd', 'w9xShareSet',
+            'w9xShareInfo', 'w9xShareDel', 'w9xShareAdd', 'w9xServiceAt', 'w9xServerList', 'w9xRemoteTime', 'w9xOwnerGet', 'w9xMemberSet',
+            'w9xMemberList', 'w9xMemberGrps', 'w9xMemberGet', 'w9xMemberDel', 'w9xListGroups', 'w9xGroupInfo', 'w9xGroupDel', 'w9xGroupAdd',
+            'w9xGetDC', 'w9xFileUsers', 'w9xAccessList', 'w9xAccessGet', 'w9xAccessDel', 'w9xAccessAdd', 'w95Version', 'w95ShareUsers',
+            'w95ShareSet', 'w95ShareList', 'w95ShareInfo', 'w95ShareDel', 'w95ShareAdd', 'w95ServiceInf', 'w95ServiceAt', 'w95ServerType',
+            'w95ServerInfo', 'w95Resources', 'w95GetUser', 'w95GetDrive', 'w95GetCon', 'w95FileUsers', 'w95FileClose', 'w95DirDialog',
+            'w95CancelCon', 'w95AddPrinter', 'w95AddDrive', 'w95AccessDel', 'w95AccessAdd', 'w3Version', 'w3PrtBrowse', 'w3NetGetUser',
+            'w3NetDialog', 'w3GetCon', 'w3GetCaps', 'w3DirBrowse', 'w3CancelCon', 'w3AddCon', 'urlGetScheme', 'urlEncode', 'urlDecode',
+            'tVersion', 'tSetPriority', 'TriggerList', 'Trigger', 'tRemoteConn', 'tOpenProc', 'tListProc', 'tListMod', 'tKillProc', 'tGetProcInfo',
+            'tGetPriority', 'tGetModInfo', 'tGetLastError', 'tGetData', 'TestSys', 'TestSRQ', 'tCountProc', 'tCompatible', 'tCloseProc',
+            'tBrowseCntrs', 'sSendString', 'sSendNum', 'sSendLine', 'sSendBinary', 'sRecvNum', 'sRecvLine', 'sRecvBinary', 'SrchVersion',
+            'SrchNext', 'SrchInit', 'SrchFree', 'sOpen', 'sOK2Send', 'sOK2Recv', 'smtpSendText', 'smtpSendFile', 'sListen', 'SetRWLS',
+            'SendSetup', 'SendLLO', 'SendList', 'SendIFC', 'SendDataBytes', 'SendCmds', 'Send', 'sConnect', 'sClose', 'SByteOrder32',
+            'sByteOrder16', 'sAccept', 'rRegVersion', 'rRegSearch', 'ResetSys', 'ReceiveSetup', 'Receive', 'ReadStsByte', 'RcvRespMsg',
+            'RasVersion', 'RasTypeSize', 'RasRename', 'RasNumCons', 'RasNameValid', 'RasListActCon', 'RasItemize', 'RasHangUp', 'RasGetLastErr',
+            'RasGetConStat', 'RasEntrySet', 'RasEntryInfo', 'RasEntryExist', 'RasEntryDel', 'RasEntryAdd', 'RasDialInfo', 'RasDial',
+            'RasCopy', 'RasConStatus', 'qVersionInfo', 'qTransact', 'qTables', 'qSpecial', 'qSetConnOpt', 'qNumRsltCol', 'qNativeSql', 'qLastCode',
+            'qGetData', 'qFreeStmt', 'qFreeEnv', 'qFreeConnect', 'qFetch', 'qExecDirect', 'qError', 'qDriverList', 'qDriverCon', 'qDisconnect',
+            'qDataSources', 'qConnect', 'qConfigError', 'qConfigData', 'qColumns', 'qBindCol', 'qAllocStmt', 'qAllocEnv', 'qAllocConnect',
+            'pWaitFor', 'pVersionInfo', 'pTimeout', 'pSetPublish', 'pSetPrtInfo', 'pSetPrtAttrib', 'pSetDefPrtEx', 'pSetDefPrt', 'pSendFile',
+            'pRecvFile', 'pPutString', 'pPutLine', 'pPutChar', 'pPutByte', 'pPutBinary', 'PPollUnconfig', 'PPollConfig', 'PPoll', 'pPeekChar',
+            'pPeekByte', 'pPaperSizes', 'pPaperBins', 'pModemSReg', 'pModemParams', 'pModemInit', 'pModemHangUp', 'pModemDial', 'pModemControl',
+            'pModemConnect', 'pModemCommand', 'pModemAnsRing', 'pModemAnsCall', 'pMediaTypes', 'pGetString', 'pGetPublish', 'pGetPrtList',
+            'pGetPrtInfo', 'pGetPrtAttrib', 'pGetLine', 'pGetLastError', 'pGetErrorMsg', 'pGetErrorCode', 'pGetDefPrtInf', 'pGetChar',
+            'pGetByte', 'pGetBinary', 'pDelPrtConn', 'pDelPrinter', 'pComOpen', 'pComModify', 'pComInfo', 'pComControl', 'pComClose',
+            'pCheckSum', 'pCheckBinary', 'pCaptureOn', 'pCaptureOff', 'pCaptureLog', 'PassControl', 'pAddPrtConn', 'pAddPrinter', 'p3RecvText',
+            'p3RecvFile', 'p3Peek', 'p3Open', 'p3GetReply', 'p3Delete', 'p3Count', 'p3Close', 'nwWhoAmI', 'nwVfyPassword', 'nwVersion',
+            'nwSrvShutdown', 'nwSrvNLMMgr', 'nwSrvGenGUID', 'nwSrvExecNCF', 'nwSetVolLimit', 'nwSetSrvParam', 'nwSetSrvInfo', 'nwSetPrimServ',
+            'nwSetPassword', 'nwSetOptions', 'nwSetFileInfo', 'nwSetDirLimit', 'nwSetDirInfo', 'nwSetContext', 'nwSetBcastMode', 'nwServerList',
+            'nwSendBcastMsg', 'nwSearchObjects', 'nwSearchFilter', 'nwRenameObject', 'nwRemoveObject', 'nwReceiveBcastMsg', 'nwNameConvert',
+            'nwMutateObject', 'nwMoveObject', 'nwModifyObject', 'nwMapDelete', 'nwMap', 'nwLogout', 'nwLogin', 'nwListUserGroups',
+            'nwListObjects', 'nwListGroupMembers', 'nwLastErrMsg', 'nwIsUserInGroup', 'nwGetVolLimit', 'nwGetSrvStats', 'nwGetSrvParam',
+            'nwGetSrvInfo', 'nwGetSrvCfg', 'nwGetOptions', 'nwGetObjValue', 'nwGetObjInfo', 'nwGetNLMInfo', 'nwGetMapped', 'nwGetFileInfo',
+            'nwGetDirLimit', 'nwGetDirInfo', 'nwGetContext', 'nwGetConnInfo', 'nwGetCapture', 'nwGetBcastMode', 'nwGetAttrInfo',
+            'nwDriveStatus', 'nwDrivePath', 'nwDetachFromServer', 'nwDelUserFromGroup', 'nwDelConnNum', 'nwCompareObject', 'nwClientInfo',
+            'nwChgPassword', 'nwAttachToServer', 'nwAddUserToGroup', 'nwAddObject', 'netVersion', 'netResources', 'netGetUser', 'netGetCon',
+            'netDirDialog', 'netCancelCon', 'netAddPrinter', 'netAddDrive', 'n4Version', 'n4UserGroups', 'n4UserGroupEx', 'n4SetPrimServ',
+            'n4SetOptions', 'n4SetContextG', 'n4SetContext', 'n4ServerList', 'n4ServerInfo', 'n4ObjSearch', 'n4ObjRename', 'n4ObjOptions',
+            'n4ObjMove', 'n4ObjGetVal', 'n4ObjectProps', 'n4ObjectList', 'n4ObjectInfo', 'n4ObjDelete', 'n4NameConvert', 'n4MsgsEndAll',
+            'n4MsgsEnd', 'n4MemberSet', 'n4MemberGet', 'n4MemberDel', 'n4MapRoot', 'n4MapDir', 'n4MapDelete', 'n4Map', 'n4LogoutTree',
+            'n4Logout', 'n4Login', 'n4GetUserName', 'n4GetUserId', 'n4GetUser', 'n4GetNetAddr', 'n4GetMapped', 'n4GetContext',
+            'n4GetConnNum', 'n4FileUsers', 'n4FileTimeGet', 'n4FileAttrSet', 'n4FileAttrGet', 'n4DriveStatus', 'n4DrivePath', 'n4DirTimeGet',
+            'n4DirAttrSet', 'n4DirAttrGet', 'n4Detach', 'n4ChgPassword', 'n4CapturePrt', 'n4CaptureGet', 'n4CaptureEnd', 'n4Attach',
+            'n3Version', 'n3UserGroups', 'n3ServerList', 'n3ServerInfo', 'n3MsgsEndAll', 'n3MsgsEnd', 'n3MemberSet', 'n3MemberGet',
+            'n3MemberDel', 'n3Maproot', 'n3Mapdir', 'n3Mapdelete', 'n3Map', 'n3Logout', 'n3GetUserId', 'n3GetUser', 'n3GetNetAddr',
+            'n3GetMapped', 'n3GetConnNum', 'n3FileTimeGet', 'n3FileAttrSet', 'n3FileAttrGet', 'n3DriveStatus', 'n3DrivePath',
+            'n3DirTimeGet', 'n3DirAttrSet', 'n3DirAttrGet', 'n3Detach', 'n3ChgPassword', 'n3CapturePrt', 'n3CaptureGet',
+            'n3CaptureEnd', 'n3Attach', 'mVersion', 'mSyncMail', 'mSendMailEx', 'mSendMail', 'mrecvmail', 'mReadNextMsg', 'mLogOn',
+            'mLogOff', 'mFindNext', 'mError', 'mCompatible', 'kVerInfo', 'kStatusInfo', 'kSendText', 'kSendFile', 'kManageImap4',
+            'kInit', 'kGetMail', 'kExtra', 'kDest', 'kDeletePop3', 'iWriteDataBuf', 'iWriteData', 'iVersion', 'IUrlOpen', 'iUrlEncode',
+            'iUrlDecode', 'iReadDataBuf', 'iReadData', 'ipVersion', 'ipPing', 'iPing', 'ipHost2Addr', 'ipGetLastErr', 'ipGetAddress',
+            'iParseURL', 'ipAddr2Host', 'iOptionSet', 'iOptionGet', 'ImgWave', 'ImgVersion', 'ImgUnsharpMask', 'ImgThreshold', 'ImgSwirl',
+            'ImgSpread', 'ImgSolarize', 'ImgShear', 'ImgSharpen', 'ImgShade', 'ImgScale', 'ImgSample', 'ImgRotate', 'ImgResize',
+            'ImgReduceNoise', 'ImgRaise', 'ImgOilPaint', 'ImgNormalize', 'ImgNegate', 'ImgMotionBlur', 'ImgModulate', 'ImgMinify',
+            'ImgMedianFilter', 'ImgMagnify', 'ImgLevel', 'ImgIsValid', 'ImgIsPalette', 'ImgIsMono', 'ImgIsGray', 'ImgInfo', 'ImgImplode',
+            'ImgGetImageType', 'ImgGetColorCount', 'ImgGaussianBlur', 'ImgGamma', 'ImgFrame', 'ImgFlop', 'ImgFlip', 'ImgEqualize',
+            'ImgEnhance', 'ImgEmboss', 'ImgCrop', 'ImgConvert', 'ImgContrast', 'ImgCompare', 'ImgColorize', 'ImgChop', 'ImgCharcoal',
+            'ImgBorder', 'ImgBlur', 'ImgAddNoise', 'iLocFindNext', 'iLocFindInit', 'iHttpOpen', 'iHttpInit', 'iHttpHeaders', 'iHttpAccept',
+            'iHostConnect', 'iHost2Addr', 'iGetResponse', 'iGetLastError', 'iGetIEVer', 'iGetConStatEx', 'iGetConState', 'iFtpRename',
+            'iFtpPut', 'iFtpOpen', 'iFtpGet', 'iFtpFindNext', 'iFtpFindInit', 'iFtpDirRemove', 'iFtpDirMake', 'iFtpDirGet', 'iFtpDirChange',
+            'iFtpDialog', 'iFtpDelete', 'iFtpCmd', 'iErrorDialog', 'iDialItemize', 'iDialHangUp', 'iDial', 'iCookieSet', 'iCookieGet',
+            'iContentURL', 'iContentFile', 'iContentData', 'iClose', 'ibWrtf', 'ibWrt', 'ibWait', 'ibVersion', 'ibUnlock', 'ibTrg',
+            'ibTmo', 'ibStop', 'ibStatus', 'ibSta', 'ibSre', 'ibSic', 'ibSad', 'ibRsv', 'ibRsp', 'ibRsc', 'ibRpp', 'ibRdf', 'ibRd',
+            'ibPpc', 'ibPoke', 'ibPct', 'ibPad', 'ibOnl', 'ibMakeAddr', 'ibLock', 'ibLoc', 'ibLn', 'ibLines', 'ibIst', 'ibInit',
+            'ibGts', 'ibGetSad', 'ibGetPad', 'ibFind', 'ibEvent', 'ibErr', 'ibEot', 'ibEos', 'iBegin', 'ibDma', 'ibDev', 'ibConfig',
+            'ibCntl', 'ibCnt', 'ibCmda', 'ibCmd', 'ibClr', 'ibCac', 'ibBna', 'ibAsk', 'iAddr2Host', 'huge_Thousands', 'huge_Subtract',
+            'huge_SetOptions', 'huge_Multiply', 'huge_GetLastError', 'huge_ExtenderInfo', 'huge_Divide', 'huge_Decimal', 'huge_Add',
+            'httpStripHTML', 'httpRecvTextF', 'httpRecvText', 'httpRecvQuery', 'httpRecvQryF', 'httpRecvFile', 'httpGetServer',
+            'httpGetQuery', 'httpGetPath', 'httpGetFile', 'httpGetDir', 'httpGetAnchor', 'httpFullPath', 'httpFirewall', 'httpAuth',
+            'ftpRename', 'ftpQuote', 'ftpPut', 'ftpOpen', 'ftpList', 'ftpGet', 'ftpFirewall', 'ftpDelete', 'ftpClose', 'ftpChDir',
+            'FindRQS', 'FindLstn', 'EnvSetVar', 'EnvPathDel', 'EnvPathChk', 'EnvPathAdd', 'EnvListVars', 'EnvGetVar', 'EnvGetInfo',
+            'EnableRemote', 'EnableLocal', 'ehllapiWait', 'ehllapiVersion', 'ehllapiUninit', 'ehllapiStopKeyIntercept', 'ehllapiStopHostNotify',
+            'ehllapiStopCloseIntercept', 'ehllapiStartKeyIntercept', 'ehllapiStartHostNotify', 'ehllapiStartCloseIntercept',
+            'ehllapiSetWindowStatus', 'ehllapiSetSessionParams', 'ehllapiSetPSWindowName', 'ehllapiSetCursorLoc', 'ehllapiSendKey',
+            'ehllapiSendFile', 'ehllapiSearchPS', 'ehllapiSearchField', 'ehllapiRunProfile', 'ehllapiResetSystem', 'ehllapiReserve',
+            'ehllapiRelease', 'ehllapiReceiveFile', 'ehllapiQuerySystem', 'ehllapiQueryPSStatus', 'ehllapiQueryHostNotify',
+            'ehllapiQueryFieldAttr', 'ehllapiQueryCursorLoc', 'ehllapiQueryCloseIntercept', 'ehllapiPostInterceptStatus',
+            'ehllapiPause', 'ehllapiLastErrMsg', 'ehllapiInit', 'ehllapiGetWindowStatus', 'ehllapiGetPSHWND', 'ehllapiGetKey',
+            'ehllapiFindFieldPos', 'ehllapiFindFieldLen', 'ehllapiDisconnectPS', 'ehllapiCvtRCToPos', 'ehllapiCvtPosToRC',
+            'ehllapiCopyTextToPS', 'ehllapiCopyTextToField', 'ehllapiCopyTextFromPS', 'ehllapiCopyTextFromField', 'ehllapiCopyOIA',
+            'ehllapiConnectPS', 'dunItemize', 'dunDisconnect', 'dunConnectEx', 'dunConnect', 'dsTestParam', 'dsSIDtoHexStr', 'dsSetSecProp',
+            'dsSetProperty', 'dsSetPassword', 'dsSetObj', 'dsSetCredentX', 'dsSetCredent', 'dsRemFromGrp', 'dsRelSecObj', 'dsMoveObj',
+            'dsIsObject', 'dsIsMemberGrp', 'dsIsContainer', 'dsGetUsersGrps', 'dsGetSecProp', 'dsGetPropName', 'dsGetProperty',
+            'dsGetPrntPath', 'dsGetPrimGrp', 'dsGetMemGrp', 'dsGetInfo', 'dsGetClass', 'dsGetChldPath', 'dsFindPath', 'dsDeleteObj',
+            'dsCreatSecObj', 'dsCreateObj', 'dsCopySecObj', 'dsAddToGrp', 'dsAclRemAce', 'dsAclOrderAce', 'dsAclGetAces', 'dsAclAddAce',
+            'DevClearList', 'DevClear', 'dbTest', 'dbSwapColumns', 'dbSort', 'dbSetRecordField', 'dbSetOptions', 'dbSetErrorReporting',
+            'dbSetEntireRecord', 'dbSetDelimiter', 'dbSave', 'dbOpen', 'dbNameColumn', 'dbMakeNewItem', 'dbInsertColumn', 'dbGetVersion',
+            'dbGetSaveStatus', 'dbGetRecordField', 'dbGetRecordCount', 'dbGetNextItem', 'dbGetLastError', 'dbGetEntireRecord',
+            'dbGetColumnType', 'dbGetColumnNumber', 'dbGetColumnName', 'dbGetColumnCount', 'dbFindRecord', 'dbExist', 'dbEasterEgg',
+            'dbDeleteRecord', 'dbDeleteColumn', 'dbDebug', 'dbCookDatabases', 'dbClose', 'dbCloneRecord', 'dbBindCol', 'cWndState',
+            'cWndinfo', 'cWndGetWndSpecName', 'cWndGetWndSpec', 'cWndexist', 'cWndByWndSpecName', 'cWndByWndSpec', 'cWndbyseq',
+            'cWndbyname', 'cWndbyid', 'cWndbyclass', 'cWinIDConvert', 'cVersionInfo', 'cVendorId', 'cSetWndText', 'cSetUpDownPos',
+            'cSetTvItem', 'cSetTrackPos', 'cSetTabItem', 'cSetLvItem', 'cSetLbItemEx', 'cSetLbItem', 'cSetIpAddr', 'cSetFocus',
+            'cSetEditText', 'cSetDtpDate', 'cSetCbItem', 'cSetCalDate', 'cSendMessage', 'cRadioButton', 'cPostMessage', 'cPostButton',
+            'cMemStat', 'cGetWndCursor', 'cGetUpDownPos', 'cGetUpDownMin', 'cGetUpDownMax', 'cGetTVItem', 'cGetTrackPos', 'cGetTrackMin',
+            'cGetTrackMax', 'cGetTbText', 'cGetSbText', 'cGetLvText', 'cGetLvSelText', 'cGetLvFocText', 'cGetLvDdtText', 'cGetLvColText',
+            'cGetLbText', 'cGetLbSelText', 'cGetLbCount', 'cGetIpAddr', 'cGetInfo', 'cGetHrText', 'cGetFocus', 'cGetEditText', 'cGetDtpDate',
+            'cGetControlImageCRC', 'cGetCBText', 'cGetCbCount', 'cGetCalDate', 'cFindByName', 'cFindByClass', 'cEnablestate', 'cDblClickItem',
+            'cCpuSupt', 'cCpuSpeed', 'cCpuIdExt', 'cCpuId', 'cCpuFeat', 'cCpuBenchmark', 'cCloneCheck', 'cClickToolbar', 'cClickButton',
+            'cClearTvItem', 'cClearLvItem', 'cClearLbAll', 'cCheckbox', 'aVersion', 'aStatusbar', 'aShellFolder', 'aMsgTimeout', 'AllSPoll',
+            'aGetLastError', 'aFileRename', 'aFileMove', 'aFileDelete', 'aFileCopy'
+            ),
+        5 => array(
+            'wWordRight', 'wWordLeft', 'wWinTile', 'wWinRestore', 'wWinNext', 'wWinMinimize', 'wWinMaximize', 'wWinCloseAll', 'wWinClose',
+            'wWinCascade', 'wWinArricons', 'wViewOutput', 'wViewOptions', 'wViewHtml', 'wUpperCase', 'wUpline', 'wUndo', 'wTopOfFile', 'wToggleIns',
+            'wTab', 'wStatusMsg', 'wStartSel', 'wSpellcheck', 'wSetProject', 'wSetPrefs', 'wSetColblk', 'wSetBookmark', 'wSelWordRight',
+            'wSelWordLeft', 'wSelUp', 'wSelTop', 'wSelRight', 'wSelPgUp', 'wSelPgDn', 'wSelLeft', 'wSelInfo', 'wSelHome', 'wSelEnd', 'wSelectAll',
+            'wSelDown', 'wSelBottom', 'wRunRebuild', 'wRunMake', 'wRunExecute', 'wRunDebug', 'wRunConfig', 'wRunCompile', 'wRunCommand', 'wRight',
+            'wRepeat', 'wRedo', 'wRecord', 'wProperties', 'wPrintDirect', 'wPrinSetup', 'wPrevError', 'wPaste', 'wPageUp', 'wPageDown', 'wNextError',
+            'wNewLine', 'wLowerCase', 'wLineCount', 'wLeft', 'wInvertCase', 'wInsString', 'wInsLine', 'wHome', 'wHelpKeyword', 'wHelpKeybrd',
+            'wHelpIndex', 'wHelpHelp', 'wHelpCmds', 'wHelpAbout', 'wGotoLine', 'wGotoCol', 'wGetWrap', 'wGetWord', 'wGetUndo', 'wGetSelstate',
+            'wGetRedo', 'wGetOutput', 'wGetModified', 'wGetLineNo', 'wGetIns', 'wGetFilename', 'wGetColNo', 'wGetChar', 'wFtpOpen', 'wFindNext',
+            'wFindInFiles', 'wFind', 'wFileSaveAs', 'wFileSave', 'wFileRevert', 'wFilePrint', 'wFilePgSetup', 'wFileOpen', 'wFileNew', 'wFileMerge',
+            'wFileList', 'wFileExit', 'wEndSel', 'wEndOfFile', 'wEnd', 'wEdWrap', 'wEdWordRight', 'wEdWordLeft', 'wEdUpLine', 'wEdUndo', 'wEdTopOfFile',
+            'wEdToggleIns', 'wEdTab', 'wEdStartSel', 'wEdSetColBlk', 'wEdSelectAll', 'wEdRight', 'wEdRedo', 'wEdPaste', 'wEdPageUp', 'wEdPageDown',
+            'wEdNewLine', 'wEdLeft', 'wEdInsString', 'wEdHome', 'wEdGoToLine', 'wEdGoToCol', 'wEdGetWord', 'wEdEndSel', 'wEdEndOfFile', 'wEdEnd',
+            'wEdDownLine', 'wEdDelete', 'wEdCutLine', 'wEdCut', 'wEdCopyLine', 'wEdCopy', 'wEdClearSel', 'wEdBackTab', 'wEdBackspace', 'wDownLine',
+            'wDelete', 'wDelButton', 'wCutMarked', 'wCutLine', 'wCutAppend', 'wCut', 'wCopyMarked', 'wCopyLine', 'wCopyAppend', 'wCopy', 'wCompile',
+            'wClearSel', 'wChange', 'wCallMacro', 'wBackTab', 'wBackspace', 'wAutoIndent', 'wAddButton', 'edWindowTile', 'edWindowRestore',
+            'edWindowNext', 'edWindowMinimize', 'edWindowMaximize', 'edWindowCloseall', 'edWindowClose', 'edWindowCascade', 'edWindowArrangeIcons',
+            'edStatusMsg', 'edSearchViewOutput', 'edSearchRepeat', 'edSearchPrevError', 'edSearchNextError', 'edSearchFind', 'edSearchChange',
+            'edRunRebuild', 'edRunMake', 'edRunExecute', 'edRunDebug', 'edRunConfigure', 'edRunCompile', 'edRunCommand', 'edRecord', 'edHelpProcedures',
+            'edHelpKeyword', 'edHelpKeyboard', 'edHelpIndex', 'edHelpHelp', 'edHelpCommands', 'edHelpAbout', 'edGetWordWrapState', 'edGetWindowName',
+            'edGetUndoState', 'edGetSelectionState', 'edGetRedoState', 'edGetModifiedStatus', 'edGetLineNumber', 'edGetInsertState', 'edGetColumnNumber',
+            'edGetChar', 'edFileSetPreferences', 'edFileSaveAs', 'edFileSave', 'edFilePrinterSetup', 'edFilePrint', 'edFilePageSetup', 'edFileOpen',
+            'edFileNew', 'edFileMerge', 'edFileList', 'edFileExit', 'edEditWrap', 'edEditWordRight', 'edEditWordLeft', 'edEditUpLine', 'edEditUndo',
+            'edEditToggleIns', 'edEditTab', 'edEditStartSelection', 'edEditSetColumnBlock', 'edEditSetBookmark', 'edEditSelectAll', 'edEditRight',
+            'edEditRedo', 'edEditPaste', 'edEditPageUp', 'edEditPageDown', 'edEditLeft', 'edEditInsertString', 'edEditGoToLine', 'edEditGoToColumn',
+            'edEditGoToBookmark', 'edEditGetCurrentWord', 'edEditEndSelection', 'edEditEndOfLine', 'edEditEndOfFile', 'edEditDownline', 'edEditDelete',
+            'edEditCutline', 'edEditCut', 'edEditCopyline', 'edEditCopy', 'edEditClearSelection', 'edEditBeginningOfLine', 'edEditBeginningOfFile',
+            'edEditBackTab', 'edEditBackspace', 'edDeleteButton', 'edAddButton'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '{', '}', '!', '+', '-', '~', '$', '^', '?', '@', '%', '#', '&', '*', '|', '/', '<', '>'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false,
+        5 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #800080;',
+            2 => 'color: #0080FF; font-weight: bold;',
+            3 => 'color: #0000FF;',
+            4 => 'color: #FF00FF;',
+            5 => 'color: #008000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #008000; font-style: italic;',
+            2 => 'color: #FF1010; font-weight: bold;',
+            '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(
+            0 => 'color: #006600;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => '',
+        5 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(),
+    'REGEXPS' => array(//Variable names
+        0 => "[\\$]{1,2}[a-zA-Z_][a-zA-Z0-9_]*"
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_MAYBE,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/xbasic.php b/sources/inc/geshi/xbasic.php
new file mode 100644
index 0000000..2edede3
--- /dev/null
+++ b/sources/inc/geshi/xbasic.php
@@ -0,0 +1,143 @@
+ 'XBasic',
+    'COMMENT_SINGLE' => array(1 => "'"),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'WHILE', 'UNTIL', 'TRUE', 'TO', 'THEN', 'SUB', 'STOP', 'STEP',
+            'SELECT', 'RETURN', 'PROGRAM', 'NEXT', 'LOOP', 'IFZ',
+            'IFT', 'IFF', 'IF', 'GOTO', 'GOSUB', 'FOR', 'FALSE', 'EXIT',
+            'ENDIF', 'END', 'ELSE', 'DO', 'CASE', 'ALL'
+            ),
+        2 => array(
+            'XMAKE', 'XLONGAT', 'XLONG', 'WRITE', 'VOID', 'VERSION$', 'VERSION',
+            'USHORTAT', 'USHORT', 'UNION', 'ULONGAT', 'ULONG', 'UCASE$',
+            'UBYTEAT', 'UBYTE', 'UBOUND', 'TYPE','TRIM$', 'TAB', 'SWAP',
+            'SUBADDRESS', 'SUBADDR', 'STUFF$', 'STRING', 'STRING$', 'STR$',
+            'STATIC', 'SSHORTAT', 'SSHORT', 'SPACE$', 'SMAKE', 'SLONGAT', 'SLONG',
+            'SIZE', 'SINGLEAT', 'SINGLE', 'SIGNED$', 'SIGN', 'SHELL', 'SHARED',
+            'SGN', 'SFUNCTION', 'SET', 'SEEK', 'SCOMPLEX', 'SBYTEAT', 'SBYTE',
+            'RTRIM$', 'ROTATER', 'ROTATEL', 'RJUST$', 'RINSTRI', 'RINSTR',
+            'RINCHRI', 'RINCHR', 'RIGHT$', 'REDIM', 'READ', 'RCLIP$', 'QUIT',
+            'PROGRAM$', 'PRINT', 'POF', 'OPEN', 'OCTO$', 'OCT$', 'NULL$', 'MIN',
+            'MID$', 'MAX', 'MAKE', 'LTRIM$', 'LOF', 'LJUST$', 'LIBRARY', 'LEN',
+            'LEFT$', 'LCLIP$', 'LCASE$', 'INTERNAL', 'INT', 'INSTRI', 'INSTR',
+            'INLINE$', 'INFILE$', 'INCHRI', 'INCHR', 'INC', 'IMPORT', 'HIGH1',
+            'HIGH0', 'HEXX$', 'HEX$', 'GOADDRESS', 'GOADDR', 'GMAKE', 'GLOW',
+            'GIANTAT', 'GIANT', 'GHIGH', 'FUNCTION', 'FUNCADDRESS', 'FUNCADDR',
+            'FORMAT$', 'FIX', 'EXTU', 'EXTS', 'EXTERNAL', 'ERROR', 'ERROR$',
+            'EOF', 'DOUBLEAT', 'DOUBLE', 'DMAKE', 'DLOW', 'DIM', 'DHIGH',
+            'DECLARE', 'DEC', 'DCOMPLEX', 'CSTRING$', 'CSIZE', 'CSIZE$', 'CLR',
+            'CLOSE', 'CLEAR', 'CJUST$', 'CHR$', 'CFUNCTION', 'BITFIELD', 'BINB$',
+            'BIN$', 'AUTOX', 'AUTOS', 'AUTO', 'ATTACH', 'ASC', 'ABS'
+            ),
+        3 => array(
+            'XOR', 'OR', 'NOT', 'MOD', 'AND'
+            ),
+        4 => array(
+            'TANH', 'TAN', 'SQRT', 'SINH', 'SIN', 'SECH', 'SEC', 'POWER',
+            'LOG10', 'LOG', 'EXP10', 'EXP', 'CSCH', 'CSC', 'COTH', 'COT', 'COSH',
+            'COS', 'ATANH', 'ATAN', 'ASINH', 'ASIN', 'ASECH', 'ASEC', 'ACSCH',
+            'ACSC', 'ACOSH', 'ACOS'
+            )
+        ),
+    'SYMBOLS' => array(
+        '(', ')', '[', ']', '!', '@', '%', '&', '*', '|', '/', '<', '>',
+        '=','+','-'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #00a1a1;font-weight: bold',
+            2 => 'color: #000066;font-weight: bold',
+            3 => 'color: #00a166;font-weight: bold',
+            4 => 'color: #0066a1;font-weight: bold'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => 'http://www.xbasic.org',
+        4 => 'http://www.xbasic.org'
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/xml.php b/sources/inc/geshi/xml.php
new file mode 100644
index 0000000..6354e45
--- /dev/null
+++ b/sources/inc/geshi/xml.php
@@ -0,0 +1,157 @@
+ 'XML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            ),
+        '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(
+            -1 => 'color: #808080; font-style: italic;', // comments
+            0 => 'color: #00bbdd;',
+            1 => 'color: #ddbb00;',
+            2 => 'color: #339933;',
+            3 => 'color: #009900;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #000066;',
+            1 => 'color: #000000; font-weight: bold;',
+            2 => 'color: #000000; font-weight: bold;'
+            )
+        ),
+    'URLS' => array(
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        0 => array(//attribute names
+            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-z_:][\w\-\.:]*(\??>)?)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        2 => array(//Tag end markers
+            GESHI_SEARCH => '(([\/|\?])?>)',
+            GESHI_REPLACE => '\\1',
+            GESHI_MODIFIERS => 'i',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_ALWAYS,
+    'SCRIPT_DELIMITERS' => array(
+        -1 => array(
+            ''
+            ),
+        0 => array(
+            ' '>'
+            ),
+        1 => array(
+            '&' => ';'
+            ),
+        2 => array(
+            ' ']]>'
+            ),
+        3 => array(
+            '<' => '>'
+            )
+    ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        -1 => false,
+        0 => false,
+        1 => false,
+        2 => false,
+        3 => true
+        ),
+    'TAB_WIDTH' => 2,
+    'PARSER_CONTROL' => array(
+        'ENABLE_FLAGS' => array(
+            'NUMBERS' => GESHI_NEVER
+        )
+    )
+);
+
+?>
diff --git a/sources/inc/geshi/xorg_conf.php b/sources/inc/geshi/xorg_conf.php
new file mode 100644
index 0000000..99edc66
--- /dev/null
+++ b/sources/inc/geshi/xorg_conf.php
@@ -0,0 +1,124 @@
+ 'Xorg configuration',
+    'COMMENT_SINGLE' => array(1 => '#'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        // sections
+        1 => array(
+            'Section', 'EndSection', 'SubSection', 'EndSubSection'
+            ),
+        2 => array(
+            // see http://www.x.org/archive/X11R6.9.0/doc/html/xorg.conf.5.html
+            'BiosBase', 'Black', 'Boardname', 'BusID', 'ChipID', 'ChipRev',
+            'Chipset', 'ClockChip', 'Clocks', 'DacSpeed',
+            'DefaultDepth', 'DefaultFbBpp', 'Depth', 'Device',
+            'DisplaySize', 'Driver', 'FbBpp', 'Gamma',
+            'HorizSync', 'IOBase', 'Identifier', 'InputDevice',
+            'Load', 'MemBase', 'Mode', 'Modeline', 'Modelname',
+            'Modes', 'Monitor', 'Option', 'Ramdac', 'RgbPath',
+            'Screen', 'TextClockFreq', 'UseModes', 'VendorName',
+            'VertRefresh', 'VideoAdaptor', 'VideoRam',
+            'ViewPort', 'Virtual', 'Visual', 'Weight', 'White'
+            ),
+        3 => array(
+            // some sub-keywords
+            // screen position
+            'Above', 'Absolute', 'Below', 'LeftOf', 'Relative', 'RightOf',
+            // modes
+            'DotClock', 'Flags', 'HSkew', 'HTimings', 'VScan', 'VTimings'
+            ),
+        ),
+    'REGEXPS' => array(
+        ),
+    'SYMBOLS' => array(
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #b1b100;',
+            2 => 'color: #990000;',
+            3 => 'color: #550000;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #0000ff;',
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #cc66cc;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 4
+);
+
+?>
diff --git a/sources/inc/geshi/xpp.php b/sources/inc/geshi/xpp.php
new file mode 100644
index 0000000..a06e277
--- /dev/null
+++ b/sources/inc/geshi/xpp.php
@@ -0,0 +1,436 @@
+
+ *
+ * CHANGES
+ * -------
+ * 2007/02/28 (1.0.0)
+ *  -  First Release
+ *
+ * TODO (updated 2007/02/27)
+ * -------------------------
+ *
+ *************************************************************************************
+ *
+ *     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' => 'X++',
+    'COMMENT_SINGLE' => array(1 => '//'),
+    'COMMENT_MULTI' => array('/*' => '*/'),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array( // Primitive types
+            'void',
+            'str',
+            'real',
+            'int64',
+            'int',
+            'date',
+            'container',
+            'boolean',
+            'anytype'
+            ),
+        2 => array( // Keywords
+            'window',
+            'while',
+            'try',
+            'true',
+            'throw',
+            'switch',
+            'super',
+            'static',
+            'server',
+            'right',
+            'return',
+            'retry',
+            'public',
+            'protected',
+            'private',
+            'print',
+            'pause',
+            'null',
+            'new',
+            'mod',
+            'left',
+            'interface',
+            'implements',
+            'if',
+            'for',
+            'final',
+            'false',
+            'extends',
+            'else',
+            'edit',
+            'do',
+            'div',
+            'display',
+            'default',
+            'continue',
+            'client',
+            'class',
+            'changeCompany',
+            'case',
+            'breakpoint',
+            'break',
+            'at',
+            'abstract'
+            ),
+        3 => array( // Functions within the Axapta kernel
+            'year',
+            'wkofyr',
+            'webwebpartstr',
+            'webstaticfilestr',
+            'websitetempstr',
+            'websitedefstr',
+            'webreportstr',
+            'webpagedefstr',
+            'weboutputcontentitemstr',
+            'webmenustr',
+            'webletitemstr',
+            'webformstr',
+            'webdisplaycontentitemstr',
+            'webactionitemstr',
+            'varstr',
+            'utilmoyr',
+            'uint2str',
+            'typeof',
+            'typeid',
+            'trunc',
+            'today',
+            'timenow',
+            'time2str',
+            'term',
+            'tanh',
+            'tan',
+            'tablestr',
+            'tablestaticmethodstr',
+            'tablepname',
+            'tablenum',
+            'tablename2id',
+            'tablemethodstr',
+            'tableid2pname',
+            'tableid2name',
+            'tablefieldgroupstr',
+            'tablecollectionstr',
+            'systemdateset',
+            'systemdateget',
+            'syd',
+            'substr',
+            'strupr',
+            'strscan',
+            'strrtrim',
+            'strrep',
+            'strrem',
+            'strprompt',
+            'strpoke',
+            'strnfind',
+            'strlwr',
+            'strltrim',
+            'strline',
+            'strlen',
+            'strkeep',
+            'strins',
+            'strfmt',
+            'strfind',
+            'strdel',
+            'strcolseq',
+            'strcmp',
+            'stralpha',
+            'str2time',
+            'str2num',
+            'str2int64',
+            'str2int',
+            'str2guid',
+            'str2enum',
+            'str2date',
+            'staticmethodstr',
+            'sln',
+            'sleep',
+            'sinh',
+            'sin',
+            'setprefix',
+            'sessionid',
+            'securitykeystr',
+            'securitykeynum',
+            'runbuf',
+            'runas',
+            'round',
+            'resourcestr',
+            'reportstr',
+            'refprintall',
+            'rate',
+            'querystr',
+            'pv',
+            'pt',
+            'prmisdefault',
+            'primoyr',
+            'prevyr',
+            'prevqtr',
+            'prevmth',
+            'power',
+            'pmt',
+            'num2str',
+            'num2date',
+            'num2char',
+            'nextyr',
+            'nextqtr',
+            'nextmth',
+            'newguid',
+            'mthofyr',
+            'mthname',
+            'mkdate',
+            'minint',
+            'min',
+            'methodstr',
+            'menustr',
+            'menuitemoutputstr',
+            'menuitemdisplaystr',
+            'menuitemactionstr',
+            'maxint',
+            'maxdate',
+            'max',
+            'match',
+            'logn',
+            'log10',
+            'literalstr',
+            'licensecodestr',
+            'licensecodenum',
+            'intvnorm',
+            'intvno',
+            'intvname',
+            'intvmax',
+            'int64str',
+            'indexstr',
+            'indexnum',
+            'indexname2id',
+            'indexid2name',
+            'idg',
+            'identifierstr',
+            'helpfilestr',
+            'helpdevstr',
+            'helpapplstr',
+            'guid2str',
+            'getprefix',
+            'getCurrentUTCTime',
+            'fv',
+            'funcname',
+            'frac',
+            'formstr',
+            'fieldstr',
+            'fieldpname',
+            'fieldnum',
+            'fieldname2id',
+            'fieldid2pname',
+            'fieldid2name',
+            'extendedTypeStr',
+            'extendedTypeNum',
+            'exp10',
+            'exp',
+            'evalbuf',
+            'enumstr',
+            'enumnum',
+            'enumcnt',
+            'enum2str',
+            'endmth',
+            'dimof',
+            'dg',
+            'decround',
+            'ddb',
+            'dayofyr',
+            'dayofwk',
+            'dayofmth',
+            'dayname',
+            'date2str',
+            'date2num',
+            'curuserid',
+            'curext',
+            'cterm',
+            'cosh',
+            'cos',
+            'corrflagset',
+            'corrflagget',
+            'convertUTCTimeToLocalTime',
+            'convertUTCDateToLocalDate',
+            'conpoke',
+            'conpeek',
+            'connull',
+            'conlen',
+            'conins',
+            'confind',
+            'configurationkeystr',
+            'configurationkeynum',
+            'condel',
+            'classstr',
+            'classnum',
+            'classidget',
+            'char2num',
+            'beep',
+            'atan',
+            'asin',
+            'ascii2ansi',
+            'any2str',
+            'any2real',
+            'any2int64',
+            'any2int',
+            'any2guid',
+            'any2enum',
+            'any2date',
+            'ansi2ascii',
+            'acos',
+            'abs'
+            ),
+        4 => array( // X++ SQL stuff
+            'where',
+            'update_recordset',
+            'ttsCommit',
+            'ttsBegin',
+            'ttsAbort',
+            'sum',
+            'setting',
+            'select',
+            'reverse',
+            'pessimisticLock',
+            'outer',
+            'order by',
+            'optimisticLock',
+            'notExists',
+            'noFetch',
+            'next',
+            'minof',
+            'maxof',
+            'like',
+            'join',
+            'insert_recordset',
+            'index hint',
+            'index',
+            'group by',
+            'from',
+            'forUpdate',
+            'forceSelectOrder',
+            'forcePlaceholders',
+            'forceNestedLoop',
+            'forceLiterals',
+            'flush',
+            'firstOnly',
+            'firstFast',
+            'exists',
+            'desc',
+            'delete_from',
+            'count',
+            'avg',
+            'asc'
+            )
+        ),
+    'SYMBOLS' => array( // X++ symbols
+        '!',
+        '&',
+        '(',
+        ')',
+        '*',
+        '^',
+        '|',
+        '~',
+        '+',
+        ',',
+        '-',
+        '/',
+        ':',
+        '<',
+        '=',
+        '>',
+        '?',
+        '[',
+        ']',
+        '{',
+        '}'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        4 => false
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #0000ff;',
+            4 => 'color: #0000ff;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #007f00;',
+            'MULTI' => 'color: #007f00; font-style: italic;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000000;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #000000;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #ff0000;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #000000;'
+            ),
+        'METHODS' => array(
+            1 => 'color: #000000;',
+            2 => 'color: #000000;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #00007f;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => '',
+        4 => ''
+        ),
+    'OOLANG' => true,
+    'OBJECT_SPLITTERS' => array(
+        1 => '.',
+        2 => '::'
+        ),
+    'REGEXPS' => array(
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        )
+);
+
+?>
diff --git a/sources/inc/geshi/yaml.php b/sources/inc/geshi/yaml.php
new file mode 100644
index 0000000..a2974eb
--- /dev/null
+++ b/sources/inc/geshi/yaml.php
@@ -0,0 +1,150 @@
+: since PHP offers no variable-width lookbehind,
+ *      these blocks will still be highlighted even when commented out. As it happens,
+ *      any line ending with | or > could result in the unintentional highlighting of
+ *      all remaining lines in the file, just because I couldn't check for this regex
+ *      as a lookbehind:  '/:(\s+)(!!(\w+)(\s+))?/'
+ *      If there is a workaround for that, it needs implemented.
+ *   *  I may be missing some operators. I deliberately omitted inline array notation
+ *      as, in general, it's ugly and tends to conflict with plain-text. Ensuring all
+ *      highlighted list delimiters are not plain text would be as simple as checking
+ *      that they follow a colon directly. Alas, without variable-length lookbehinds,
+ *      if there is a way to do so in GeSHi I am unaware of it.
+ *   *  I kind of whored the comment regexp array. It seemed like a safe bet, so it's
+ *      where I crammed everything. Some of it may need moved elsewhere for neatness.
+ *   *  The !!typename highlight needs not to interfere with ": |" and ": >": Pairing
+ *      key: !!type | value is perfectly legal, but again due to lookbehind issues, I
+ *      can't add a case for that. Also, it is likely that multiple spaces can be put
+ *      between the colon and pipe symbol, which would also break it.
+ *
+ *************************************************************************************
+ *
+ *     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' => 'YAML',
+    'COMMENT_SINGLE' => array(),
+    'COMMENT_MULTI' => array(),
+    //Keys
+    'COMMENT_REGEXP' => array( // ENTRY ZERO  SHOULD CHECK FOR (\n(\s*)([^#%]+?):(\s+)(!!(\w+)(\s+))?) AS A LOOKBEHIND, BUT IT CAN'T.
+        0 => '/(?<=\s[\|>]\n)(\s+)(.*)((?=[\n$])(([\n^](\1(.*)|(?=[\n$])))*)|$)/', // Pipe blocks and > blocks.
+        1 => '/#(.*)/', // Blue # comments
+        2 => '/%(.*)/', // Red % comments
+        3 => '/(^|\n)([^#%^\n]+?)(?=: )/',  // Key-value names
+        4 => '/(^|\n)([^#%^\n]+?)(?=:\n)/',// Key-group names
+        5 => '/(?<=^---)(\s*)!(\S+)/',    // Comments after ---
+        6 => '/(?<=: )(\s*)\&(\S+)/',    // References
+        7 => '/(?<=: )(\s*)\*(\S+)/',   // Dereferences
+        8 => '/!!(\w+)/',              // Types
+        //9 => '/(?<=\n)(\s*)-(?!-)/',       // List items: This needs to search within comments 3 and 4, but I don't know how.
+        ),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        1 => array(
+            'all','any','none', "yes", "no"
+            ),
+        ),
+    'SYMBOLS' => array(
+        1 => array('---', '...'),
+        2 => array(': ', ">\n", "|\n", '<<:', ":\n") // It'd be nice if I could specify that the colon must
+        //                                              follow comment 3 or 4 to be considered, and the > and |
+        //                                              must follow such a colon.
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'font-weight: bold;'
+            ),
+        'COMMENTS' => array(
+            0 => 'color: #303050;background-color: #F5F5F5',
+            1 => 'color: blue;',
+            2 => 'font-weight: bold; color: red;',
+            3 => 'color: green;',
+            4 => 'color: #007F45;',
+            5 => 'color: #7f7fFF;',
+            6 => 'color: #FF7000;',
+            7 => 'color: #FF45C0;',
+            8 => 'font-weight: bold; color: #005F5F;',
+            //9 => 'font-weight: bold; color: #000000;',
+            ),
+        'ESCAPE_CHAR' => array(
+            ),
+        'BRACKETS' => array(
+            ),
+        'STRINGS' => array(
+            0 => 'color: #CF00CF;'
+            ),
+        'NUMBERS' => array(
+            // 0 => 'color: #33f;' // Don't highlight numbers, really...
+            ),
+        'METHODS' => array(
+            1 => '',
+            2 => ''
+            ),
+        'SYMBOLS' => array(
+            1 => 'color: cyan;',
+            2 => 'font-weight: bold; color: brown;'
+            ),
+        'REGEXPS' => array(
+            ),
+        'SCRIPT' => array(
+            0 => ''
+            )
+        ),
+    'URLS' => array(1 => ''),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array( ),
+    'REGEXPS' => array( ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array( ),
+    'HIGHLIGHT_STRICT_BLOCK' => array( )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/z80.php b/sources/inc/geshi/z80.php
new file mode 100644
index 0000000..47326bb
--- /dev/null
+++ b/sources/inc/geshi/z80.php
@@ -0,0 +1,144 @@
+ 'ZiLOG Z80 Assembler',
+    'COMMENT_SINGLE' => array(1 => ';'),
+    'COMMENT_MULTI' => array(),
+    'CASE_KEYWORDS' => GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array("'", '"'),
+    'ESCAPE_CHAR' => '',
+    'KEYWORDS' => array(
+        /*CPU*/
+        1 => array(
+            'adc','add','and','bit','call','ccf','cp','cpd','cpdr','cpir','cpi',
+            'cpl','daa','dec','di','djnz','ei','ex','exx','halt','im','in',
+            'in0','inc','ind','indr','inir','ini','jp','jr','ld','ldd','lddr',
+            'ldir','ldi','mlt','neg','nop','or','otdm','otdmr','otdr','otim',
+            'otimr','otir','out','out0','outd','outi','pop','push','res','ret',
+            'reti','retn','rl','rla','rlc','rlca','rld','rr','rra','rrc','rrca',
+            'rrd','rst','sbc','scf','set','sla','sl1','sll','slp','sra','srl',
+            'sub','tst','tstio','xor'
+            ),
+        /*registers*/
+        2 => array(
+            'a','b','c','d','e','h','l',
+            'af','bc','de','hl','ix','iy','sp',
+            'af\'','ixh','ixl','iyh','iyl'
+            ),
+        /*Directive*/
+        3 => array(
+            '#define','#endif','#else','#ifdef','#ifndef','#include','#undef',
+            '.db','.dd','.df','.dq','.dt','.dw','.end','.org','equ'
+            ),
+        ),
+    'SYMBOLS' => array(
+        '[', ']', '(', ')', '?', '+', '-', '*', '/', '%', '$'
+        ),
+    'CASE_SENSITIVE' => array(
+        GESHI_COMMENTS => false,
+        1 => false,
+        2 => false,
+        3 => false,
+        ),
+    'STYLES' => array(
+        'KEYWORDS' => array(
+            1 => 'color: #0000ff; font-weight:bold;',
+            2 => 'color: #0000ff;',
+            3 => 'color: #46aa03; font-weight:bold;'
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #adadad; font-style: italic;',
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099; font-weight: bold;'
+            ),
+        'BRACKETS' => array(
+            0 => 'color: #0000ff;'
+            ),
+        'STRINGS' => array(
+            0 => 'color: #7f007f;'
+            ),
+        'NUMBERS' => array(
+            0 => 'color: #dd22dd;'
+            ),
+        'METHODS' => array(
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #008000;'
+            ),
+        'REGEXPS' => array(
+            0 => 'color: #22bbff;',
+            1 => 'color: #22bbff;',
+            2 => 'color: #993333;'
+            ),
+        'SCRIPT' => array(
+            )
+        ),
+    'URLS' => array(
+        1 => '',
+        2 => '',
+        3 => ''
+        ),
+    'OOLANG' => false,
+    'OBJECT_SPLITTERS' => array(
+        ),
+    'REGEXPS' => array(
+        //Hex numbers
+        0 => '0[0-9a-fA-F]{1,32}[hH]',
+        //Binary numbers
+        1 => '\%[01]{1,64}|[01]{1,64}[bB]?(?![^<]*>)',
+        //Labels
+        2 => '^[_a-zA-Z][_a-zA-Z0-9]?\:'
+        ),
+    'STRICT_MODE_APPLIES' => GESHI_NEVER,
+    'SCRIPT_DELIMITERS' => array(
+        ),
+    'HIGHLIGHT_STRICT_BLOCK' => array(
+        ),
+    'TAB_WIDTH' => 8
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/geshi/zxbasic.php b/sources/inc/geshi/zxbasic.php
new file mode 100644
index 0000000..b1de472
--- /dev/null
+++ b/sources/inc/geshi/zxbasic.php
@@ -0,0 +1,150 @@
+ 'ZXBasic',
+    'COMMENT_SINGLE' => array(
+        1 => "'",
+        2 => '#',
+        3 => 'REM'
+        ),
+    'COMMENT_MULTI' => array("/'" => "'/"),
+    'CASE_KEYWORDS' => GESHI_CAPS_UPPER, //GESHI_CAPS_NO_CHANGE,
+    'QUOTEMARKS' => array('"'),
+    'ESCAPE_CHAR' => '\\',
+    'KEYWORDS' => array(
+        1 => array(
+            "ASM", "BEEP", "BOLD", "BORDER", "BRIGHT", "ByRef", "ByVal", "CAST",
+            "CIRCLE", "CLS", "CONST", "CONTINUE", "DECLARE", "DIM", "DO",
+            "DRAW", "ELSE", "ELSEIF", "END", "EXIT", "FastCall", "FLASH", "FOR",
+            "FUNCTION", "GOTO", "GOSUB", "GO", "IF", "INK", "INVERSE", "ITALIC",
+            "LET", "LOAD", "LOOP", "NEXT", "OVER", "PAPER", "PAUSE", "PI",
+            "PLOT", "POKE", "PRINT", "RANDOMIZE", "REM", "RETURN", "SAVE",
+            "StdCall", "Sub", "THEN", "TO", "UNTIL", "VERIFY", "WEND", "WHILE",
+            ),
+
+        // types
+        2 => array(
+            'byte', 'ubyte', 'integer', 'uinteger', 'long', 'ulong', 'fixed',
+            'float', 'string'
+            ),
+
+        // Functions
+        3 => array(
+            "ABS", "ACS", "ASN", "ATN", "CHR", "CODE", "COS", "CSRLIN", "EXP",
+            "HEX", "HEX16", "INKEY", "INT", "LEN", "LN", "PEEK", "POS", "RND",
+            "SCREEN$", "SGN", "SIN", "SQR", "STR", "TAN", "VAL",
+            ),
+
+        // Operators and modifiers
+        4 => array(
+            "AT", "AS", "AND", "MOD", "NOT", "OR", "SHL", "SHR", "STEP", "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;', // Commands
+            2 => 'color: #800080; font-weight: bold;', // Types
+            3 => 'color: #006000; font-weight: bold;', // Functions
+            4 => 'color: #801010; font-weight: bold;'  // Operators and Modifiers
+            ),
+        'COMMENTS' => array(
+            1 => 'color: #808080; font-style: italic;',
+            2 => 'color: #339933;',
+            3 => 'color: #808080; font-style: italic;',
+            'MULTI' => 'color: #808080; font-style: italic;'
+            ),
+        'BRACKETS' => array(
+            //0 => 'color: #66cc66;'
+            0 => 'color: #007676;'
+            ),
+        'STRINGS' => array(
+            //0 => 'color: #ff0000;'
+            0 => 'color: #A00000; font-style: italic;'
+            ),
+        'NUMBERS' => array(
+            //0 => 'color: #cc66cc;'
+            0 => 'color: #b05103;'// font-weight: bold;'
+            ),
+        'METHODS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'SYMBOLS' => array(
+            0 => 'color: #66cc66;'
+            ),
+        'ESCAPE_CHAR' => array(
+            0 => 'color: #000099;'
+            ),
+        'SCRIPT' => array(
+            ),
+        'REGEXPS' => 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(
+        )
+);
+
+?>
\ No newline at end of file
diff --git a/sources/inc/html.php b/sources/inc/html.php
new file mode 100644
index 0000000..7f473cd
--- /dev/null
+++ b/sources/inc/html.php
@@ -0,0 +1,1990 @@
+
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+if(!defined('NL')) define('NL',"\n");
+
+/**
+ * Convenience function to quickly build a wikilink
+ *
+ * @author Andreas Gohr 
+ * @param string  $id      id of the target page
+ * @param string  $name    the name of the link, i.e. the text that is displayed
+ * @param string|array  $search  search string(s) that shall be highlighted in the target page
+ * @return string the HTML code of the link
+ */
+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');
+}
+
+/**
+ * The loginform
+ *
+ * @author   Andreas Gohr 
+ */
+function html_login(){
+    global $lang;
+    global $conf;
+    global $ID;
+    global $INPUT;
+
+    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', ((!$INPUT->bool('http_credentials')) ? $INPUT->str('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(actionOK('register')){
+        $form->addElement('
        '.$lang['reghere'].': '.tpl_actionlink('register','','','',true).'
        ');
+    }
+
+    if (actionOK('resendpwd')) {
+        $form->addElement('
        '.$lang['pwdforget'].': '.tpl_actionlink('resendpwd','','','',true).'
        ');
+    }
+
+    html_form('login', $form);
+    print '
        '.NL;
+}
+
+/**
+ * inserts section edit buttons if wanted or removes the markers
+ *
+ * @author Andreas Gohr 
+ */
+function html_secedit($text,$show=true){
+    global $INFO;
+
+    $regexp = '##';
+
+    if(!$INFO['writable'] || !$show || $INFO['rev']){
+        return preg_replace($regexp,'',$text);
+    }
+
+    return preg_replace_callback($regexp,
+                'html_secedit_button', $text);
+}
+
+/**
+ * prepares section edit button data for event triggering
+ * used as a callback in html_secedit
+ *
+ * @triggers HTML_SECEDIT_BUTTON
+ * @author Andreas Gohr 
+ */
+function html_secedit_button($matches){
+    $data = array('secid'  => $matches[1],
+                  'target' => strtolower($matches[2]),
+                  'range'  => $matches[count($matches) - 1]);
+    if (count($matches) === 5) {
+        $data['name'] = $matches[3];
+    }
+
+    return trigger_event('HTML_SECEDIT_BUTTON', $data,
+                         'html_secedit_get_button');
+}
+
+/**
+ * prints a section editing button
+ * used as default action form HTML_SECEDIT_BUTTON
+ *
+ * @author Adrian Lang 
+ */
+function html_secedit_get_button($data) {
+    global $ID;
+    global $INFO;
+
+    if (!isset($data['name']) || $data['name'] === '') return '';
+
+    $name = $data['name'];
+    unset($data['name']);
+
+    $secid = $data['secid'];
+    unset($data['secid']);
+
+    return "
        " .
+           html_btn('secedit', $ID, '',
+                    array_merge(array('do'  => 'edit',
+                                      'rev' => $INFO['lastmod'],
+                                      'summary' => '['.$name.'] '), $data),
+                    'post', $name) . '
        ';
+}
+
+/**
+ * Just the back to top button (in its own form)
+ *
+ * @author Andreas Gohr 
+ */
+function html_topbtn(){
+    global $lang;
+
+    $ret  = '';
+
+    return $ret;
+}
+
+/**
+ * Displays a button (using its own form)
+ * If tooltip exists, the access key tooltip is replaced.
+ *
+ * @author Andreas Gohr 
+ */
+function html_btn($name,$id,$akey,$params,$method='get',$tooltip='',$label=false){
+    global $conf;
+    global $lang;
+
+    if (!$label)
+        $label = $lang['btn_'.$name];
+
+    $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=null){
+    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 (!is_null($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;
+    }
+}
+
+/**
+ * ask the user about how to handle an exisiting draft
+ *
+ * @author Andreas Gohr 
+ */
+function html_draft(){
+    global $INFO;
+    global $ID;
+    global $lang;
+    $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);
+}
+
+/**
+ * Highlights searchqueries in HTML code
+ *
+ * @author Andreas Gohr 
+ * @author Harry Fuecks 
+ */
+function html_hilight($html,$phrases){
+    $phrases = (array) $phrases;
+    $phrases = array_map('preg_quote_cb', $phrases);
+    $phrases = array_map('ft_snippet_re_preprocess', $phrases);
+    $phrases = array_filter($phrases);
+    $regex = join('|',$phrases);
+
+    if ($regex === '') return $html;
+    if (!utf8_check($regex)) return $html;
+    $html = @preg_replace_callback("/((<[^>]*)|$regex)/ui",'html_hilight_callback',$html);
+    return $html;
+}
+
+/**
+ * Callback used by html_hilight()
+ *
+ * @author Harry Fuecks 
+ */
+function html_hilight_callback($m) {
+    $hlight = unslash($m[0]);
+    if ( !isset($m[2])) {
+        $hlight = ''.$hlight.'';
+    }
+    return $hlight;
+}
+
+/**
+ * Run a search and display the result
+ *
+ * @author Andreas Gohr 
+ */
+function html_search(){
+    global $QUERY;
+    global $lang;
+
+    $intro = p_locale_xhtml('searchpage');
+    // allow use of placeholder in search intro
+    $intro = str_replace(
+                array('@QUERY@','@SEARCH@'),
+                array(hsc(rawurlencode($QUERY)),hsc($QUERY)),
+                $intro);
+    echo $intro;
+    flush();
+
+    //show progressbar
+    print '
        '.NL;
+    print ''.NL;
+    print '
        '.NL;
+    flush();
+
+    //do quick pagesearch
+    $data = ft_pageLookup($QUERY,true,useHeading('navigation'));
+    if(count($data)){
+        print '
        ';
+        print '
        '.$lang['quickhits'].':
        ';
+        print '
          ';
+        foreach($data as $id => $title){
+            print '
        •  ';
+            if (useHeading('navigation')) {
+                $name = $title;
+            }else{
+                $ns = getNS($id);
+                if($ns){
+                    $name = shorten(noNS($id), ' ('.$ns.')',30);
+                }else{
+                    $name = $id;
+                }
+            }
+            print html_wikilink(':'.$id,$name);
+            print '
          •  ';
+        }
+        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)){
+        print '
        ';
+        $num = 1;
+        foreach($data as $id => $cnt){
+            print '
        ';
+            print html_wikilink(':'.$id,useHeading('navigation')?null:$id,$regex);
+            if($cnt !== 0){
+                print ': '.$cnt.' '.$lang['hits'].'';
+            }
+            print '
        ';
+            if($cnt !== 0){
+                if($num < FT_SNIPPET_NUMBER){ // create snippets for the first number of matches only
+                    print '
        '.ft_snippet($id,$regex).'
        ';
+                }
+                $num++;
+            }
+            flush();
+        }
+        print '
        ';
+    }else{
+        print '
        '.$lang['nothingfound'].'
        ';
+    }
+
+    //hide progressbar
+    print ''.NL;
+    flush();
+}
+
+/**
+ * Display error on locked pages
+ *
+ * @author Andreas Gohr 
+ */
+function html_locked(){
+    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 '
        ';
+}
+
+/**
+ * list old revisions
+ *
+ * @author Andreas Gohr 
+ * @author Ben Coburn 
+ * @author Kate Arzamastseva 
+ */
+function html_revisions($first=0, $media_id = false){
+    global $ID;
+    global $INFO;
+    global $conf;
+    global $lang;
+    $id = $ID;
+    /* we need to get one additional log entry to be able to
+     * decide if this is the last page or is there another one.
+     * see html_recent()
+     */
+    if (!$media_id) $revisions = getRevisions($ID, $first, $conf['recent']+1);
+    else {
+        $revisions = getRevisions($media_id, $first, $conf['recent']+1, 8192, true);
+        $id = $media_id;
+    }
+
+    if(count($revisions)==0 && $first!=0){
+        $first=0;
+        if (!$media_id) $revisions = getRevisions($ID, $first, $conf['recent']+1);
+        else $revisions = getRevisions($media_id, $first, $conf['recent']+1, 8192, true);
+    }
+    $hasNext = false;
+    if (count($revisions)>$conf['recent']) {
+        $hasNext = true;
+        array_pop($revisions); // remove extra log entry
+    }
+
+    if (!$media_id) $date = dformat($INFO['lastmod']);
+    else $date = dformat(@filemtime(mediaFN($id)));
+
+    if (!$media_id) print p_locale_xhtml('revisions');
+
+    $params = array('id' => 'page__revisions', 'class' => 'changes');
+    if ($media_id) $params['action'] = media_managerURL(array('image' => $media_id), '&');
+
+    $form = new Doku_Form($params);
+    $form->addElement(form_makeOpenTag('ul'));
+
+    if (!$media_id) $exists = $INFO['exists'];
+    else $exists = @file_exists(mediaFN($id));
+
+    $display_name = (!$media_id && useHeading('navigation')) ? hsc(p_get_first_heading($id)) : $id;
+    if (!$display_name) $display_name = $id;
+
+    if($exists && $first==0){
+        if (!$media_id && isset($INFO['meta']) && isset($INFO['meta']['last_change']) && $INFO['meta']['last_change']['type']===DOKU_CHANGE_TYPE_MINOR_EDIT)
+            $form->addElement(form_makeOpenTag('li', array('class' => 'minor')));
+        else
+            $form->addElement(form_makeOpenTag('li'));
+        $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('');
+
+        if (!$media_id) $href = wl($id);
+        else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view'), '&');
+        $form->addElement(form_makeOpenTag('a', array(
+                        'class' => 'wikilink1',
+                        'href'  => $href)));
+        $form->addElement($display_name);
+        $form->addElement(form_makeCloseTag('a'));
+
+        if ($media_id) $form->addElement(form_makeOpenTag('div'));
+
+        if (!$media_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 (!$media_id) $editor = $INFO['editor'];
+        else {
+            $revinfo = getRevisionInfo($id, @filemtime(fullpath(mediaFN($id))), 1024, true);
+            if($revinfo['user']){
+                $editor = $revinfo['user'];
+            }else{
+                $editor = $revinfo['ip'];
+            }
+        }
+        $form->addElement((empty($editor))?('('.$lang['external_edit'].')'):editorinfo($editor));
+        $form->addElement(form_makeCloseTag('span'));
+
+        $form->addElement('('.$lang['current'].')');
+
+        if ($media_id) $form->addElement(form_makeCloseTag('div'));
+
+        $form->addElement(form_makeCloseTag('div'));
+        $form->addElement(form_makeCloseTag('li'));
+    }
+
+    foreach($revisions as $rev){
+        $date = dformat($rev);
+        if (!$media_id) {
+            $info = getRevisionInfo($id,$rev,true);
+            $exists = page_exists($id,$rev);
+        }  else {
+            $info = getRevisionInfo($id,$rev,true,true);
+            $exists = @file_exists(mediaFN($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->addElement(form_makeOpenTag('span', array('class' => 'date')));
+        $form->addElement($date);
+        $form->addElement(form_makeCloseTag('span'));
+
+        if($exists){
+            if (!$media_id) $href = wl($id,"rev=$rev,do=diff", false, '&');
+            else $href = media_managerURL(array('image' => $id, 'rev' => $rev, 'mediado' => 'diff'), '&');
+            $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'diff_link')));
+            $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'));
+            if (!$media_id) $href = wl($id,"rev=$rev",false,'&');
+            else $href = media_managerURL(array('image' => $id, 'tab_details' => 'view', 'rev' => $rev), '&');
+            $form->addElement(form_makeOpenTag('a', array('href' => $href, 'class' => 'wikilink1')));
+            $form->addElement($display_name);
+            $form->addElement(form_makeCloseTag('a'));
+        }else{
+            $form->addElement('');
+            $form->addElement($display_name);
+        }
+
+        if ($media_id) $form->addElement(form_makeOpenTag('div'));
+
+        if ($info['sum']) {
+            $form->addElement(form_makeOpenTag('span', array('class' => 'sum')));
+            if (!$media_id) $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'));
+
+        if ($media_id) $form->addElement(form_makeCloseTag('div'));
+
+        $form->addElement(form_makeCloseTag('div'));
+        $form->addElement(form_makeCloseTag('li'));
+    }
+    $form->addElement(form_makeCloseTag('ul'));
+    if (!$media_id) {
+        $form->addElement(form_makeButton('submit', 'diff', $lang['diff2']));
+    } else {
+        $form->addHidden('mediado', 'diff');
+        $form->addElement(form_makeButton('submit', '', $lang['diff2']));
+    }
+    html_form('revisions', $form);
+
+    print '
        ';
+    $last = $first + $conf['recent'];
+    if ($first > 0) {
+        $first -= $conf['recent'];
+        if ($first < 0) $first = 0;
+        print '
        ';
+        if ($media_id) {
+            print html_btn('newer',$media_id,"p",media_managerURL(array('first' => $first), '&', false, true));
+        } else {
+            print html_btn('newer',$id,"p",array('do' => 'revisions', 'first' => $first));
+        }
+        print '
        ';
+    }
+    if ($hasNext) {
+        print '
        ';
+        if ($media_id) {
+            print html_btn('older',$media_id,"n",media_managerURL(array('first' => $last), '&', false, true));
+        } else {
+            print html_btn('older',$id,"n",array('do' => 'revisions', 'first' => $last));
+        }
+        print '
        ';
+    }
+    print '
        ';
+
+}
+
+/**
+ * display recent changes
+ *
+ * @author Andreas Gohr 
+ * @author Matthias Grimm 
+ * @author Ben Coburn 
+ * @author Kate Arzamastseva 
+ */
+function html_recent($first=0, $show_changes='both'){
+    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.
+     */
+    $flags = 0;
+    if ($show_changes == 'mediafiles' && $conf['mediarevisions']) {
+        $flags = RECENTS_MEDIA_CHANGES;
+    } elseif ($show_changes == 'pages') {
+        $flags = 0;
+    } elseif ($conf['mediarevisions']) {
+        $show_changes = 'both';
+        $flags = RECENTS_MEDIA_PAGES_MIXED;
+    }
+
+    $recents = getRecents($first,$conf['recent'] + 1,getNS($ID),$flags);
+    if(count($recents) == 0 && $first != 0){
+        $first=0;
+        $recents = getRecents($first,$conf['recent'] + 1,getNS($ID),$flags);
+    }
+    $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', 'class' => 'changes'));
+    $form->addHidden('sectok', null);
+    $form->addHidden('do', 'recent');
+    $form->addHidden('id', $ID);
+
+    if ($conf['mediarevisions']) {
+        $form->addElement('
        ');
+        $form->addElement(form_makeListboxField(
+                    'show_changes',
+                    array(
+                        'pages'      => $lang['pages_changes'],
+                        'mediafiles' => $lang['media_changes'],
+                        'both'       => $lang['both_changes']),
+                    $show_changes,
+                    $lang['changes_type'],
+                    '','',
+                    array('class'=>'quickselect')));
+
+        $form->addElement(form_makeButton('submit', 'recent', $lang['btn_apply']));
+        $form->addElement('
        ');
+    }
+
+    $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')));
+
+        if ($recent['media']) {
+            $form->addElement(media_printicon($recent['id']));
+        } else {
+            $icon = DOKU_BASE.'lib/images/fileicons/file.png';
+            $form->addElement(''.$recent['id'].'');
+        }
+
+        $form->addElement(form_makeOpenTag('span', array('class' => 'date')));
+        $form->addElement($date);
+        $form->addElement(form_makeCloseTag('span'));
+
+        $diff = false;
+        $href = '';
+
+        if ($recent['media']) {
+            $diff = (count(getRevisions($recent['id'], 0, 1, 8192, true)) && @file_exists(mediaFN($recent['id'])));
+            if ($diff) {
+                $href = media_managerURL(array('tab_details' => 'history',
+                    'mediado' => 'diff', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
+            }
+        } else {
+            $href = wl($recent['id'],"do=diff", false, '&');
+        }
+
+        if ($recent['media'] && !$diff) {
+            $form->addElement('');
+        } else {
+            $form->addElement(form_makeOpenTag('a', array('class' => 'diff_link', 'href' => $href)));
+            $form->addElement(form_makeTag('img', array(
+                            'src'   => DOKU_BASE.'lib/images/diff.png',
+                            'width' => 15,
+                            'height'=> 11,
+                            'title' => $lang['diff'],
+                            'alt'   => $lang['diff']
+                            )));
+            $form->addElement(form_makeCloseTag('a'));
+        }
+
+        if ($recent['media']) {
+            $href = media_managerURL(array('tab_details' => 'history',
+                'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
+        } else {
+            $href = wl($recent['id'],"do=revisions",false,'&');
+        }
+        $form->addElement(form_makeOpenTag('a', array('class' => 'revisions_link', 'href' => $href)));
+        $form->addElement(form_makeTag('img', array(
+                        'src'   => DOKU_BASE.'lib/images/history.png',
+                        'width' => 12,
+                        'height'=> 14,
+                        'title' => $lang['btn_revs'],
+                        'alt'   => $lang['btn_revs']
+                        )));
+        $form->addElement(form_makeCloseTag('a'));
+
+        if ($recent['media']) {
+            $href = media_managerURL(array('tab_details' => 'view', 'image' => $recent['id'], 'ns' => getNS($recent['id'])), '&');
+            $class = (file_exists(mediaFN($recent['id']))) ? 'wikilink1' : $class = 'wikilink2';
+            $form->addElement(form_makeOpenTag('a', array('class' => $class, 'href' => $href)));
+            $form->addElement($recent['id']);
+            $form->addElement(form_makeCloseTag('a'));
+        } else {
+            $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 show'
+                    )));
+        $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 show'
+                        )));
+        $form->addElement(form_makeCloseTag('div'));
+    }
+    $form->addElement(form_makeCloseTag('div'));
+    html_form('recent', $form);
+}
+
+/**
+ * Display page index
+ *
+ * @author Andreas Gohr 
+ */
+function html_index($ns){
+    global $conf;
+    global $ID;
+    $ns  = cleanID($ns);
+    #fixme use appropriate function
+    if(empty($ns)){
+        $ns = dirname(str_replace(':','/',$ID));
+        if($ns == '.') $ns ='';
+    }
+    $ns  = 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 '
        ';
+}
+
+/**
+ * Index item formatter
+ *
+ * User function for html_buildlist()
+ *
+ * @author Andreas Gohr 
+ */
+function html_list_index($item){
+    global $ID, $conf;
+
+    // prevent searchbots needlessly following links
+    $nofollow = ($ID != $conf['start'] || $conf['sitemap']) ? ' rel="nofollow"' : '';
+
+    $ret = '';
+    $base = ':'.$item['id'];
+    $base = substr($base,strrpos($base,':')+1);
+    if($item['type']=='d'){
+        // FS#2766, no need for search bots to follow namespace links in the index
+        $ret .= '';
+        $ret .= $base;
+        $ret .= '';
+    }else{
+        // default is noNSorNS($id), but we want noNS($id) when useheading is off FS#2605
+        $ret .= html_wikilink(':'.$item['id'], useHeading('navigation') ? null : noNS($item['id']));
+    }
+    return $ret;
+}
+
+/**
+ * Index List item
+ *
+ * This user function is used in html_buildlist to build the
+ * 
      1.  tags for namespaces when displaying the page index
+ * it gives different classes to opened or closed "folders"
+ *
+ * @author Andreas Gohr 
+ */
+function html_li_index($item){
+    if($item['type'] == "f"){
+        return '
      2. ';
+    }elseif($item['open']){
+        return '
      3. ';
+    }else{
+        return '
      4. ';
+    }
+}
+
+/**
+ * Default List item
+ *
+ * @author Andreas Gohr 
+ */
+function html_li_default($item){
+    return '
      5. ';
+}
+
+/**
+ * Build an unordered list
+ *
+ * Build an unordered list from the given $data array
+ * Each item in the array has to have a 'level' property
+ * the item itself gets printed by the given $func user
+ * function. The second and optional function is used to
+ * print the 
      6.  tag. Both user function need to accept
+ * a single item.
+ *
+ * Both user functions can be given as array to point to
+ * a member of an object.
+ *
+ * @author Andreas Gohr 
+ */
+function html_buildlist($data,$class,$func,$lifunc='html_li_default',$forcewrapper=false){
+    if (count($data) === 0) {
+        return '';
+    }
+
+    $start_level = $data[0]['level'];
+    $level = $start_level;
+    $ret   = '';
+    $open  = 0;
+
+    foreach ($data as $item){
+
+        if( $item['level'] > $level ){
+            //open new list
+            for($i=0; $i<($item['level'] - $level); $i++){
+                if ($i) $ret .= "
      7. ";
+                $ret .= "\n
          \n";
+                $open++;
+            }
+            $level = $item['level'];
+
+        }elseif( $item['level'] < $level ){
+            //close last item
+            $ret .= "\n";
+            while( $level > $item['level'] && $open > 0 ){
+                //close higher lists
+                $ret .= "
        \n
        8. \n";
+                $level--;
+                $open--;
+            }
+        } elseif ($ret !== '') {
+            //close previous item
+            $ret .= "\n";
+        }
+
+        //print item
+        $ret .= call_user_func($lifunc,$item);
+        $ret .= '
        ';
+
+        $ret .= call_user_func($func,$item);
+        $ret .= '
        ';
+    }
+
+    //close remaining items and lists
+    $ret .= "\n";
+    while($open-- > 0) {
+        $ret .= "\n";
+    }
+
+    if ($forcewrapper || $start_level < 2) {
+        // Trigger building a wrapper ul if the first level is
+        // 0 (we have a root object) or 1 (just the root content)
+        $ret = "\n
          \n".$ret."
        \n";
+    }
+
+    return $ret;
+}
+
+/**
+ * display backlinks
+ *
+ * @author Andreas Gohr 
+ * @author Michael Klier 
+ */
+function html_backlinks(){
+    global $ID;
+    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'] . '
        ';
+    }
+}
+
+/**
+ * Get header of diff HTML
+ * @param string $l_rev   Left revisions
+ * @param string $r_rev   Right revision
+ * @param string $id      Page id, if null $ID is used
+ * @param bool   $media   If it is for media files
+ * @param bool   $inline  Return the header on a single line
+ * @return array HTML snippets for diff header
+ */
+function html_diff_head($l_rev, $r_rev, $id = null, $media = false, $inline = false) {
+    global $lang;
+    if ($id === null) {
+        global $ID;
+        $id = $ID;
+    }
+    $head_separator = $inline ? ' ' : '
        ';
+    $media_or_wikiFN = $media ? 'mediaFN' : 'wikiFN';
+    $ml_or_wl = $media ? 'ml' : 'wl';
+    $l_minor = $r_minor = '';
+
+    if(!$l_rev){
+        $l_head = '—';
+    }else{
+        $l_info   = getRevisionInfo($id,$l_rev,true, $media);
+        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_title = ($media) ? dformat($l_rev) : $id.' ['.dformat($l_rev).']';
+        $l_head = ''.
+        $l_head_title.''.
+        $head_separator.$l_user.' '.$l_sum;
+    }
+
+    if($r_rev){
+        $r_info   = getRevisionInfo($id,$r_rev,true, $media);
+        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_title = ($media) ? dformat($r_rev) : $id.' ['.dformat($r_rev).']';
+        $r_head = ''.
+        $r_head_title.''.
+        $head_separator.$r_user.' '.$r_sum;
+    }elseif($_rev = @filemtime($media_or_wikiFN($id))){
+        $_info   = getRevisionInfo($id,$_rev,true, $media);
+        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_title = ($media) ? dformat($_rev) : $id.' ['.dformat($_rev).']';
+        $r_head  = ''.
+        $r_head_title.' '.
+        '('.$lang['current'].')'.
+        $head_separator.$_user.' '.$_sum;
+    }else{
+        $r_head = '— ('.$lang['current'].')';
+    }
+
+    return array($l_head, $r_head, $l_minor, $r_minor);
+}
+
+/**
+ * show diff
+ *
+ * @author Andreas Gohr 
+ * @param  string $text - compare with this text with most current version
+ * @param  bool   $intro - display the intro text
+ * @param  string $type type of the diff (inline or sidebyside)
+ */
+function html_diff($text='',$intro=true,$type=null){
+    global $ID;
+    global $REV;
+    global $lang;
+    global $INPUT;
+    global $INFO;
+
+    if(!$type) {
+        $type = $INPUT->str('difftype');
+        if (empty($type)) {
+            $type = get_doku_pref('difftype', $type);
+            if (empty($type) && $INFO['ismobile']) {
+                $type = 'inline';
+            }
+        }
+    }
+    if($type != 'inline') $type = 'sidebyside';
+
+    // 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;
+
+    $rev2 = $INPUT->ref('rev2');
+    if(is_array($rev2)){
+        $rev1 = (int) $rev2[0];
+        $rev2 = (int) $rev2[1];
+
+        if(!$rev1){
+            $rev1 = $rev2;
+            unset($rev2);
+        }
+    }else{
+        $rev2 = $INPUT->int('rev2');
+    }
+
+    $r_minor = '';
+    $l_minor = '';
+
+    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 && isset($rev2) && $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);
+
+        list($l_head, $r_head, $l_minor, $r_minor) = html_diff_head($l_rev, $r_rev, null, false, $type == 'inline');
+    }
+
+    $df = new Diff(explode("\n",$l_text),explode("\n",$r_text));
+
+    if($type == 'inline'){
+        $tdf = new InlineDiffFormatter();
+    } else {
+        $tdf = new TableDiffFormatter();
+    }
+
+    if($intro) print p_locale_xhtml('diff');
+
+    if (!$text) {
+        ptln('
        ');
+
+        $form = new Doku_Form(array('action'=>wl()));
+        $form->addHidden('id',$ID);
+        $form->addHidden('rev2[0]',$l_rev);
+        $form->addHidden('rev2[1]',$r_rev);
+        $form->addHidden('do','diff');
+        $form->addElement(form_makeListboxField(
+                            'difftype',
+                            array(
+                                'sidebyside' => $lang['diff_side'],
+                                'inline'     => $lang['diff_inline']),
+                            $type,
+                            $lang['diff_type'],
+                            '','',
+                            array('class'=>'quickselect')));
+        $form->addElement(form_makeButton('submit', 'diff','Go'));
+        $form->printForm();
+
+        $diffurl = wl($ID, array(
+                        'do'       => 'diff',
+                        'rev2[0]'  => $l_rev,
+                        'rev2[1]'  => $r_rev,
+                        'difftype' => $type,
+                      ));
+        ptln('
        '.$lang['difflink'].'
        ');
+        ptln('
        ');
+    }
+    ?>
+    
        
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    format($df)); ?>
+    
        ->
+    
+    
        +>
+    
+    
        >
+    
+    >
+    
+    
        
+    
        
+    ]*>|[^<> ]{12,}/','html_softbreak_callback',$diffhtml);
+}
+
+function html_softbreak_callback($match){
+    // if match is an html tag, return it intact
+    if ($match[0]{0} == '<') return $match[0];
+
+    // its a long string without a breaking character,
+    // make certain characters into breaking characters by inserting a
+    // breaking character (zero length space, U+200B / #8203) in front them.
+    $regex = <<< REGEX
+(?(?=                                 # start a conditional expression with a positive look ahead ...
+&\#?\\w{1,6};)                        # ... for html entities - we don't want to split them (ok to catch some invalid combinations)
+&\#?\\w{1,6};                         # yes pattern - a quicker match for the html entity, since we know we have one
+|
+[?/,&\#;:]                            # no pattern - any other group of 'special' characters to insert a breaking character after
+)+                                    # end conditional expression
+REGEX;
+
+    return preg_replace('<'.$regex.'>xu','\0​',$match[0]);
+}
+
+/**
+ * show warning on conflict detection
+ *
+ * @author Andreas Gohr 
+ */
+function html_conflict($text,$summary){
+    global $ID;
+    global $lang;
+
+    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;
+}
+
+/**
+ * Prints the global message array
+ *
+ * @author Andreas Gohr 
+ */
+function html_msgarea(){
+    global $MSG, $MSG_shown;
+    /** @var array $MSG */
+    // store if the global $MSG has already been shown and thus HTML output has been started
+    $MSG_shown = true;
+
+    if(!isset($MSG)) return;
+
+    $shown = array();
+    foreach($MSG as $msg){
+        $hash = md5($msg['msg']);
+        if(isset($shown[$hash])) continue; // skip double messages
+        if(info_msg_allowed($msg)){
+            print '
        ';
+            print $msg['msg'];
+            print '
        ';
+        }
+        $shown[$hash] = 1;
+    }
+
+    unset($GLOBALS['MSG']);
+}
+
+/**
+ * Prints the registration form
+ *
+ * @author Andreas Gohr 
+ */
+function html_register(){
+    global $lang;
+    global $conf;
+    global $INPUT;
+
+    $base_attrs = array('size'=>50,'required'=>'required');
+    $email_attrs = $base_attrs + array('type'=>'email','class'=>'edit');
+
+    print p_locale_xhtml('register');
+    print '
        '.NL;
+    $form = new Doku_Form(array('id' => 'dw__register'));
+    $form->startFieldset($lang['btn_register']);
+    $form->addHidden('do', 'register');
+    $form->addHidden('save', '1');
+    $form->addElement(form_makeTextField('login', $INPUT->post->str('login'), $lang['user'], '', 'block', $base_attrs));
+    if (!$conf['autopasswd']) {
+        $form->addElement(form_makePasswordField('pass', $lang['pass'], '', 'block', $base_attrs));
+        $form->addElement(form_makePasswordField('passchk', $lang['passchk'], '', 'block', $base_attrs));
+    }
+    $form->addElement(form_makeTextField('fullname', $INPUT->post->str('fullname'), $lang['fullname'], '', 'block', $base_attrs));
+    $form->addElement(form_makeField('email','email', $INPUT->post->str('email'), $lang['email'], '', 'block', $email_attrs));
+    $form->addElement(form_makeButton('submit', '', $lang['btn_register']));
+    $form->endFieldset();
+    html_form('register', $form);
+
+    print '
        '.NL;
+}
+
+/**
+ * Print the update profile form
+ *
+ * @author Christopher Smith 
+ * @author Andreas Gohr 
+ */
+function html_updateprofile(){
+    global $lang;
+    global $conf;
+    global $INPUT;
+    global $INFO;
+    /** @var auth_basic $auth */
+    global $auth;
+
+    print p_locale_xhtml('updateprofile');
+    print '
        '.NL;
+
+    $fullname = $INPUT->post->str('fullname', $INFO['userinfo']['name'], true);
+    $email = $INPUT->post->str('email', $INFO['userinfo']['mail'], true);
+    $form = new Doku_Form(array('id' => 'dw__register'));
+    $form->startFieldset($lang['profile']);
+    $form->addHidden('do', 'profile');
+    $form->addHidden('save', '1');
+    $form->addElement(form_makeTextField('login', $_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', $fullname, $lang['fullname'], '', 'block', $attr));
+    $attr = array('size'=>'50', 'class'=>'edit');
+    if (!$auth->canDo('modMail')) $attr['disabled'] = 'disabled';
+    $form->addElement(form_makeField('email','email', $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']) {
+        $form->addElement(form_makeTag('br'));
+        $form->addElement(form_makePasswordField('oldpass', $lang['oldpass'], '', 'block', array('size'=>'50', 'required' => 'required')));
+    }
+    $form->addElement(form_makeButton('submit', '', $lang['btn_save']));
+    $form->addElement(form_makeButton('reset', '', $lang['btn_reset']));
+
+    $form->endFieldset();
+    html_form('updateprofile', $form);
+
+    if ($auth->canDo('delUser') && actionOK('profile_delete')) {
+        $form_profiledelete = new Doku_Form(array('id' => 'dw__profiledelete'));
+        $form_profiledelete->startFieldset($lang['profdeleteuser']);
+        $form_profiledelete->addHidden('do', 'profile_delete');
+        $form_profiledelete->addHidden('delete', '1');
+        $form_profiledelete->addElement(form_makeCheckboxField('confirm_delete', '1', $lang['profconfdelete'],'dw__confirmdelete','', array('required' => 'required')));
+        if ($conf['profileconfirm']) {
+            $form_profiledelete->addElement(form_makeTag('br'));
+            $form_profiledelete->addElement(form_makePasswordField('oldpass', $lang['oldpass'], '', 'block', array('size'=>'50', 'required' => 'required')));
+        }
+        $form_profiledelete->addElement(form_makeButton('submit', '', $lang['btn_deleteuser']));
+        $form_profiledelete->endFieldset();
+
+        html_form('profiledelete', $form_profiledelete);
+    }
+
+    print '
        '.NL;
+}
+
+/**
+ * Preprocess edit form data
+ *
+ * @author   Andreas Gohr 
+ *
+ * @triggers HTML_EDITFORM_OUTPUT
+ */
+function html_edit(){
+    global $INPUT;
+    global $ID;
+    global $REV;
+    global $DATE;
+    global $PRE;
+    global $SUF;
+    global $INFO;
+    global $SUM;
+    global $lang;
+    global $conf;
+    global $TEXT;
+    global $RANGE;
+
+    if ($INPUT->has('changecheck')) {
+        $check = $INPUT->str('changecheck');
+    } elseif(!$INFO['exists']){
+        // $TEXT has been loaded from page template
+        $check = md5('');
+    } else {
+        $check = md5($TEXT);
+    }
+    $mod = md5($TEXT) !== $check;
+
+    $wr = $INFO['writable'] && !$INFO['locked'];
+    $include = 'edit';
+    if($wr){
+        if ($REV) $include = 'editrev';
+    }else{
+        // check pseudo action 'source'
+        if(!actionOK('source')){
+            msg('Command disabled: source',-1);
+            return;
+        }
+        $include = 'read';
+    }
+
+    global $license;
+
+    $form = new Doku_Form(array('id' => '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);
+
+    $data = array('form' => $form,
+                  'wr'   => $wr,
+                  'media_manager' => true,
+                  'target' => ($INPUT->has('target') && $wr) ? $INPUT->str('target') : 'section',
+                  'intro_locale' => $include);
+
+    if ($data['target'] !== 'section') {
+        // Only emit event if page is writable, section edit data is valid and
+        // edit target is not section.
+        trigger_event('HTML_EDIT_FORMSELECTION', $data, 'html_edit_form', true);
+    } else {
+        html_edit_form($data);
+    }
+    if (isset($data['intro_locale'])) {
+        echo p_locale_xhtml($data['intro_locale']);
+    }
+
+    $form->addHidden('target', $data['target']);
+    $form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar', 'class'=>'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'));
+    }
+
+    if ($wr) {
+        // sets changed to true when previewed
+        echo '' . NL;
+    } ?>
+    
        
+
+    
        
+        
        
+        
        
+    
        
+    '.NL;
+}
+
+/**
+ * Display the default edit form
+ *
+ * Is the default action for HTML_EDIT_FORMSELECTION.
+ */
+function html_edit_form($param) {
+    global $TEXT;
+
+    if ($param['target'] !== 'section') {
+        msg('No editor for edit target ' . hsc($param['target']) . ' found.', -1);
+    }
+
+    $attr = array('tabindex'=>'1');
+    if (!$param['wr']) $attr['readonly'] = 'readonly';
+
+    $param['form']->addElement(form_makeWikiText($TEXT, $attr));
+}
+
+/**
+ * Adds a checkbox for minor edits for logged in users
+ *
+ * @author Andreas Gohr 
+ */
+function html_minoredit(){
+    global $conf;
+    global $lang;
+    global $INPUT;
+    // minor edits are for logged in users only
+    if(!$conf['useacl'] || !$_SERVER['REMOTE_USER']){
+        return false;
+    }
+
+    $p = array();
+    $p['tabindex'] = 3;
+    if($INPUT->bool('minor')) $p['checked']='checked';
+    return form_makeCheckboxField('minor', '1', $lang['minoredit'], 'minoredit', 'nowrap', $p);
+}
+
+/**
+ * prints some debug info
+ *
+ * @author Andreas Gohr 
+ */
+function html_debug(){
+    global $conf;
+    global $lang;
+    /** @var auth_basic $auth */
+    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:
        ';
+        foreach ($auth->getCapabilities() as $cando){
+            print '   '.str_pad($cando,16) . ' => ' . (int)$auth->canDo($cando) . NL;
+        }
+        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 '';
+}
+
+/**
+ * List available Administration Tasks
+ *
+ * @author Andreas Gohr 
+ * @author Håkan Sandell 
+ */
+function html_admin(){
+    global $ID;
+    global $INFO;
+    global $conf;
+    /** @var DokuWiki_Auth_Plugin $auth */
+    global $auth;
+
+    // build menu of admin functions from the plugins that handle them
+    $pluginlist = plugin_list('admin');
+    $menu = array();
+    foreach ($pluginlist as $p) {
+        /** @var DokuWiki_Admin_Plugin $obj */
+        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()
+                );
+    }
+
+    // data security check
+    // simple check if the 'savedir' is relative and accessible when appended to DOKU_URL
+    // it verifies either:
+    //   'savedir' has been moved elsewhere, or
+    //   has protection to prevent the webserver serving files from it
+    if (substr($conf['savedir'],0,2) == './'){
+        echo '
+                Your data directory seems to be protected properly.';
+    }
+
+    print p_locale_xhtml('admin');
+
+    // Admin Tasks
+    if($INFO['isadmin']){
+        ptln('');
+
+    // Manager Tasks
+    ptln('');
+    echo '
        ';
+    echo getVersion();
+    echo '
        ';
+
+    // 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('
        ');
+    }
+}
+
+/**
+ * Form to request a new password for an existing account
+ *
+ * @author Benoit Chesneau 
+ * @author Andreas Gohr 
+ */
+function html_resendpwd() {
+    global $lang;
+    global $conf;
+    global $INPUT;
+
+    $token = preg_replace('/[^a-f0-9]+/','',$INPUT->str('pwauth'));
+
+    if(!$conf['autopasswd'] && $token){
+        print p_locale_xhtml('resetpwd');
+        print '
        '.NL;
+        $form = new Doku_Form(array('id' => 'dw__resendpwd'));
+        $form->startFieldset($lang['btn_resendpwd']);
+        $form->addHidden('token', $token);
+        $form->addHidden('do', 'resendpwd');
+
+        $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_makeButton('submit', '', $lang['btn_resendpwd']));
+        $form->endFieldset();
+        html_form('resendpwd', $form);
+        print '
        '.NL;
+    }else{
+        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', $INPUT->post->str('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;
+    }
+}
+
+/**
+ * Return the TOC rendered to XHTML
+ *
+ * @author Andreas Gohr 
+ */
+function html_TOC($toc){
+    if(!count($toc)) return '';
+    global $lang;
+    $out  = ''.DOKU_LF;
+    $out .= '
        '.DOKU_LF;
+    $out .= '
        ';
+    $out .= $lang['toc'];
+    $out .= '
        '.DOKU_LF;
+    $out .= '
        '.DOKU_LF;
+    $out .= html_buildlist($toc,'toc','html_list_toc','html_li_default',true);
+    $out .= '
        '.DOKU_LF.'
        '.DOKU_LF;
+    $out .= ''.DOKU_LF;
+    return $out;
+}
+
+/**
+ * Callback for html_buildlist
+ */
+function html_list_toc($item){
+    if(isset($item['hid'])){
+        $link = '#'.$item['hid'];
+    }else{
+        $link = $item['link'];
+    }
+
+    return ''.hsc($item['title']).'';
+}
+
+/**
+ * Helper function to build TOC items
+ *
+ * Returns an array ready to be added to a TOC array
+ *
+ * @param string $link  - where to link (if $hash set to '#' it's a local anchor)
+ * @param string $text  - what to display in the TOC
+ * @param int    $level - nesting level
+ * @param string $hash  - is prepended to the given $link, set blank if you want full links
+ * @return array the toc item
+ */
+function html_mktocitem($link, $text, $level, $hash='#'){
+    return  array( 'link'  => $hash.$link,
+            'title' => $text,
+            'type'  => 'ul',
+            'level' => $level);
+}
+
+/**
+ * Output a Doku_Form object.
+ * Triggers an event with the form name: HTML_{$name}FORM_OUTPUT
+ *
+ * @author Tom N Harris 
+ * @param string     $name The name of the form
+ * @param Doku_Form  $form The form
+ */
+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);
+}
+
+/**
+ * Form print function.
+ * Just calls printForm() on the data object.
+ * @param Doku_Form $data The form
+ */
+function html_form_output($data) {
+    $data->printForm();
+}
+
+/**
+ * Embed a flash object in HTML
+ *
+ * This will create the needed HTML to embed a flash movie in a cross browser
+ * compatble way using valid XHTML
+ *
+ * The parameters $params, $flashvars and $atts need to be associative arrays.
+ * No escaping needs to be done for them. The alternative content *has* to be
+ * escaped because it is used as is. If no alternative content is given
+ * $lang['noflash'] is used.
+ *
+ * @author Andreas Gohr 
+ * @link   http://latrine.dgx.cz/how-to-correctly-insert-a-flash-into-xhtml
+ *
+ * @param string $swf      - the SWF movie to embed
+ * @param int $width       - width of the flash movie in pixels
+ * @param int $height      - height of the flash movie in pixels
+ * @param array $params    - additional parameters ()
+ * @param array $flashvars - parameters to be passed in the flashvar parameter
+ * @param array $atts      - additional attributes for the  tag
+ * @param string $alt      - alternative content (is NOT automatically escaped!)
+ * @return string         - the XHTML markup
+ */
+function html_flashobject($swf,$width,$height,$params=null,$flashvars=null,$atts=null,$alt=''){
+    global $lang;
+
+    $out = '';
+
+    // prepare the object attributes
+    if(is_null($atts)) $atts = array();
+    $atts['width']  = (int) $width;
+    $atts['height'] = (int) $height;
+    if(!$atts['width'])  $atts['width']  = 425;
+    if(!$atts['height']) $atts['height'] = 350;
+
+    // add object attributes for standard compliant browsers
+    $std = $atts;
+    $std['type'] = 'application/x-shockwave-flash';
+    $std['data'] = $swf;
+
+    // add object attributes for IE
+    $ie  = $atts;
+    $ie['classid'] = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
+
+    // open object (with conditional comments)
+    $out .= ''.NL;
+    $out .= ''.NL;
+    $out .= ''.NL;
+    $out .= ''.NL;
+
+    // print params
+    if(is_array($params)) foreach($params as $key => $val){
+        $out .= '  '.NL;
+    }
+
+    // add flashvars
+    if(is_array($flashvars)){
+        $out .= '  '.NL;
+    }
+
+    // alternative content
+    if($alt){
+        $out .= $alt.NL;
+    }else{
+        $out .= $lang['noflash'].NL;
+    }
+
+    // finish
+    $out .= ''.NL;
+    $out .= ''.NL;
+
+    return $out;
+}
+
+/**
+ * Prints HTML code for the given tab structure
+ *
+ * @param array  $tabs        tab structure
+ * @param string $current_tab the current tab id
+ */
+function html_tabs($tabs, $current_tab = null) {
+    echo '
          '.NL;
+
+    foreach($tabs as $id => $tab) {
+        html_tab($tab['href'], $tab['caption'], $id === $current_tab);
+    }
+
+    echo '
        '.NL;
+}
+/**
+ * Prints a single tab
+ *
+ * @author Kate Arzamastseva 
+ * @author Adrian Lang 
+ *
+ * @param string $href - tab href
+ * @param string $caption - tab caption
+ * @param boolean $selected - is tab selected
+ */
+
+function html_tab($href, $caption, $selected=false) {
+    $tab = '
      8. ';
+    if ($selected) {
+        $tab .= '';
+    } else {
+        $tab .= '';
+    }
+    $tab .= hsc($caption)
+         .  ''
+         .  '
        9. '.NL;
+    echo $tab;
+}
+
diff --git a/sources/inc/httputils.php b/sources/inc/httputils.php
new file mode 100644
index 0000000..ca60ed5
--- /dev/null
+++ b/sources/inc/httputils.php
@@ -0,0 +1,331 @@
+
+ */
+
+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://simonwillison.net/2003/Apr/23/conditionalGet/
+ * @param    int $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/2002/10/21/http_conditional_get_for_rss_hackers/
+    $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 via 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 (or return if testing)
+    if (defined('SIMPLE_TEST')) return;
+    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;
+}
+
+/**
+ * Set HTTP headers and echo cachefile, if useable
+ *
+ * This function handles output of cacheable resource files. It ses the needed
+ * HTTP headers. If a useable cache is present, it is passed to the web server
+ * and the scrpt is terminated.
+ */
+function http_cached($cache, $cache_ok) {
+    global $conf;
+
+    // check cache age & handle conditional request
+    // since the resource files are timestamped, we can use a long max age: 1 year
+    header('Cache-Control: public, max-age=31536000');
+    header('Pragma: public');
+    if($cache_ok){
+        http_conditionalRequest(filemtime($cache));
+        if($conf['allowdebug']) header("X-CacheUsed: $cache");
+
+        // finally send output
+        if ($conf['gzip_output'] && http_gzip_valid($cache)) {
+            header('Vary: Accept-Encoding');
+            header('Content-Encoding: gzip');
+            readfile($cache.".gz");
+        } else {
+            if (!http_sendfile($cache)) readfile($cache);
+        }
+        exit;
+    }
+
+    http_conditionalRequest(time());
+}
+
+/**
+ * Cache content and print it
+ */
+function http_cached_finish($file, $content) {
+    global $conf;
+
+    // save cache file
+    io_saveFile($file, $content);
+    if(function_exists('gzopen')) io_saveFile("$file.gz",$content);
+
+    // finally send output
+    if ($conf['gzip_output']) {
+        header('Vary: Accept-Encoding');
+        header('Content-Encoding: gzip');
+        print gzencode($content,9,FORCE_GZIP);
+    } else {
+        print $content;
+    }
+}
+
+/**
+ * Fetches raw, unparsed POST data
+ *
+ * @return string
+ */
+function http_get_raw_post_data() {
+    static $postData = null;
+    if ($postData === null) {
+        $postData = file_get_contents('php://input');
+    }
+    return $postData;
+}
+
+/**
+ * Set the HTTP response status and takes care of the used PHP SAPI
+ *
+ * Inspired by CodeIgniter's set_status_header function
+ *
+ * @param int    $code
+ * @param string $text
+ */
+function http_status($code = 200, $text = '') {
+    static $stati = array(
+        200 => 'OK',
+        201 => 'Created',
+        202 => 'Accepted',
+        203 => 'Non-Authoritative Information',
+        204 => 'No Content',
+        205 => 'Reset Content',
+        206 => 'Partial Content',
+
+        300 => 'Multiple Choices',
+        301 => 'Moved Permanently',
+        302 => 'Found',
+        304 => 'Not Modified',
+        305 => 'Use Proxy',
+        307 => 'Temporary Redirect',
+
+        400 => 'Bad Request',
+        401 => 'Unauthorized',
+        403 => 'Forbidden',
+        404 => 'Not Found',
+        405 => 'Method Not Allowed',
+        406 => 'Not Acceptable',
+        407 => 'Proxy Authentication Required',
+        408 => 'Request Timeout',
+        409 => 'Conflict',
+        410 => 'Gone',
+        411 => 'Length Required',
+        412 => 'Precondition Failed',
+        413 => 'Request Entity Too Large',
+        414 => 'Request-URI Too Long',
+        415 => 'Unsupported Media Type',
+        416 => 'Requested Range Not Satisfiable',
+        417 => 'Expectation Failed',
+
+        500 => 'Internal Server Error',
+        501 => 'Not Implemented',
+        502 => 'Bad Gateway',
+        503 => 'Service Unavailable',
+        504 => 'Gateway Timeout',
+        505 => 'HTTP Version Not Supported'
+    );
+
+    if($text == '' && isset($stati[$code])) {
+        $text = $stati[$code];
+    }
+
+    $server_protocol = (isset($_SERVER['SERVER_PROTOCOL'])) ? $_SERVER['SERVER_PROTOCOL'] : false;
+
+    if(substr(php_sapi_name(), 0, 3) == 'cgi' || defined('SIMPLE_TEST')) {
+        header("Status: {$code} {$text}", true);
+    } elseif($server_protocol == 'HTTP/1.1' OR $server_protocol == 'HTTP/1.0') {
+        header($server_protocol." {$code} {$text}", true, $code);
+    } else {
+        header("HTTP/1.1 {$code} {$text}", true, $code);
+    }
+}
diff --git a/sources/inc/indexer.php b/sources/inc/indexer.php
new file mode 100644
index 0000000..658fb96
--- /dev/null
+++ b/sources/inc/indexer.php
@@ -0,0 +1,1543 @@
+
+ * @author     Tom N Harris 
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+
+// Version tag used to force rebuild on upgrade
+define('INDEXER_VERSION', 7);
+
+// set the minimum token length to use in the index (note, this doesn't apply to numeric tokens)
+if (!defined('IDX_MINWORDLENGTH')) define('IDX_MINWORDLENGTH',2);
+
+// Asian characters are handled as words. The following regexp defines the
+// Unicode-Ranges for Asian characters
+// Ranges taken from http://en.wikipedia.org/wiki/Unicode_block
+// I'm no language expert. If you think some ranges are wrongly chosen or
+// a range is missing, please contact me
+define('IDX_ASIAN1','[\x{0E00}-\x{0E7F}]'); // Thai
+define('IDX_ASIAN2','['.
+                   '\x{2E80}-\x{3040}'.  // CJK -> Hangul
+                   '\x{309D}-\x{30A0}'.
+                   '\x{30FD}-\x{31EF}\x{3200}-\x{D7AF}'.
+                   '\x{F900}-\x{FAFF}'.  // CJK Compatibility Ideographs
+                   '\x{FE30}-\x{FE4F}'.  // CJK Compatibility Forms
+                   "\xF0\xA0\x80\x80-\xF0\xAA\x9B\x9F". // CJK Extension B
+                   "\xF0\xAA\x9C\x80-\xF0\xAB\x9C\xBF". // CJK Extension C
+                   "\xF0\xAB\x9D\x80-\xF0\xAB\xA0\x9F". // CJK Extension D
+                   "\xF0\xAF\xA0\x80-\xF0\xAF\xAB\xBF". // CJK Compatibility Supplement
+                   ']');
+define('IDX_ASIAN3','['.                // Hiragana/Katakana (can be two characters)
+                   '\x{3042}\x{3044}\x{3046}\x{3048}'.
+                   '\x{304A}-\x{3062}\x{3064}-\x{3082}'.
+                   '\x{3084}\x{3086}\x{3088}-\x{308D}'.
+                   '\x{308F}-\x{3094}'.
+                   '\x{30A2}\x{30A4}\x{30A6}\x{30A8}'.
+                   '\x{30AA}-\x{30C2}\x{30C4}-\x{30E2}'.
+                   '\x{30E4}\x{30E6}\x{30E8}-\x{30ED}'.
+                   '\x{30EF}-\x{30F4}\x{30F7}-\x{30FA}'.
+                   ']['.
+                   '\x{3041}\x{3043}\x{3045}\x{3047}\x{3049}'.
+                   '\x{3063}\x{3083}\x{3085}\x{3087}\x{308E}\x{3095}-\x{309C}'.
+                   '\x{30A1}\x{30A3}\x{30A5}\x{30A7}\x{30A9}'.
+                   '\x{30C3}\x{30E3}\x{30E5}\x{30E7}\x{30EE}\x{30F5}\x{30F6}\x{30FB}\x{30FC}'.
+                   '\x{31F0}-\x{31FF}'.
+                   ']?');
+define('IDX_ASIAN', '(?:'.IDX_ASIAN1.'|'.IDX_ASIAN2.'|'.IDX_ASIAN3.')');
+
+/**
+ * Version of the indexer taking into consideration the external tokenizer.
+ * The indexer is only compatible with data written by the same version.
+ *
+ * @triggers INDEXER_VERSION_GET
+ * Plugins that modify what gets indexed should hook this event and
+ * add their version info to the event data like so:
+ *     $data[$plugin_name] = $plugin_version;
+ *
+ * @author Tom N Harris 
+ * @author Michael Hamann 
+ */
+function idx_get_version(){
+    static $indexer_version = null;
+    if ($indexer_version == null) {
+        $version = INDEXER_VERSION;
+
+        // DokuWiki version is included for the convenience of plugins
+        $data = array('dokuwiki'=>$version);
+        trigger_event('INDEXER_VERSION_GET', $data, null, false);
+        unset($data['dokuwiki']); // this needs to be first
+        ksort($data);
+        foreach ($data as $plugin=>$vers)
+            $version .= '+'.$plugin.'='.$vers;
+        $indexer_version = $version;
+    }
+    return $indexer_version;
+}
+
+/**
+ * Measure the length of a string.
+ * Differs from strlen in handling of asian characters.
+ *
+ * @author Tom N Harris 
+ */
+function wordlen($w){
+    $l = strlen($w);
+    // If left alone, all chinese "words" will get put into w3.idx
+    // So the "length" of a "word" is faked
+    if(preg_match_all('/[\xE2-\xEF]/',$w,$leadbytes)) {
+        foreach($leadbytes[0] as $b)
+            $l += ord($b) - 0xE1;
+    }
+    return $l;
+}
+
+/**
+ * Class that encapsulates operations on the indexer database.
+ *
+ * @author Tom N Harris 
+ */
+class Doku_Indexer {
+    /**
+     * @var array $pidCache Cache for getPID()
+     */
+    protected $pidCache = array();
+
+    /**
+     * Adds the contents of a page to the fulltext index
+     *
+     * The added text replaces previous words for the same page.
+     * An empty value erases the page.
+     *
+     * @param string    $page   a page name
+     * @param string    $text   the body of the page
+     * @return boolean          the function completed successfully
+     * @author Tom N Harris 
+     * @author Andreas Gohr 
+     */
+    public function addPageWords($page, $text) {
+        if (!$this->lock())
+            return "locked";
+
+        // load known documents
+        $pid = $this->getPIDNoLock($page);
+        if ($pid === false) {
+            $this->unlock();
+            return false;
+        }
+
+        $pagewords = array();
+        // get word usage in page
+        $words = $this->getPageWords($text);
+        if ($words === false) {
+            $this->unlock();
+            return false;
+        }
+
+        if (!empty($words)) {
+            foreach (array_keys($words) as $wlen) {
+                $index = $this->getIndex('i', $wlen);
+                foreach ($words[$wlen] as $wid => $freq) {
+                    $idx = ($widupdateTuple($idx, $pid, $freq);
+                    $pagewords[] = "$wlen*$wid";
+                }
+                if (!$this->saveIndex('i', $wlen, $index)) {
+                    $this->unlock();
+                    return false;
+                }
+            }
+        }
+
+        // Remove obsolete index entries
+        $pageword_idx = $this->getIndexKey('pageword', '', $pid);
+        if ($pageword_idx !== '') {
+            $oldwords = explode(':',$pageword_idx);
+            $delwords = array_diff($oldwords, $pagewords);
+            $upwords = array();
+            foreach ($delwords as $word) {
+                if ($word != '') {
+                    list($wlen,$wid) = explode('*', $word);
+                    $wid = (int)$wid;
+                    $upwords[$wlen][] = $wid;
+                }
+            }
+            foreach ($upwords as $wlen => $widx) {
+                $index = $this->getIndex('i', $wlen);
+                foreach ($widx as $wid) {
+                    $index[$wid] = $this->updateTuple($index[$wid], $pid, 0);
+                }
+                $this->saveIndex('i', $wlen, $index);
+            }
+        }
+        // Save the reverse index
+        $pageword_idx = join(':', $pagewords);
+        if (!$this->saveIndexKey('pageword', '', $pid, $pageword_idx)) {
+            $this->unlock();
+            return false;
+        }
+
+        $this->unlock();
+        return true;
+    }
+
+    /**
+     * Split the words in a page and add them to the index.
+     *
+     * @param string    $text   content of the page
+     * @return array            list of word IDs and number of times used
+     * @author Andreas Gohr 
+     * @author Christopher Smith 
+     * @author Tom N Harris 
+     */
+    protected function getPageWords($text) {
+
+        $tokens = $this->tokenizer($text);
+        $tokens = array_count_values($tokens);  // count the frequency of each token
+
+        $words = array();
+        foreach ($tokens as $w=>$c) {
+            $l = wordlen($w);
+            if (isset($words[$l])){
+                $words[$l][$w] = $c + (isset($words[$l][$w]) ? $words[$l][$w] : 0);
+            }else{
+                $words[$l] = array($w => $c);
+            }
+        }
+
+        // arrive here with $words = array(wordlen => array(word => frequency))
+        $word_idx_modified = false;
+        $index = array();   //resulting index
+        foreach (array_keys($words) as $wlen) {
+            $word_idx = $this->getIndex('w', $wlen);
+            foreach ($words[$wlen] as $word => $freq) {
+                $wid = array_search($word, $word_idx, true);
+                if ($wid === false) {
+                    $wid = count($word_idx);
+                    $word_idx[] = $word;
+                    $word_idx_modified = true;
+                }
+                if (!isset($index[$wlen]))
+                    $index[$wlen] = array();
+                $index[$wlen][$wid] = $freq;
+            }
+            // save back the word index
+            if ($word_idx_modified && !$this->saveIndex('w', $wlen, $word_idx))
+                return false;
+        }
+
+        return $index;
+    }
+
+    /**
+     * Add/update keys to/of the metadata index.
+     *
+     * Adding new keys does not remove other keys for the page.
+     * An empty value will erase the key.
+     * The $key parameter can be an array to add multiple keys. $value will
+     * not be used if $key is an array.
+     *
+     * @param string    $page   a page name
+     * @param mixed     $key    a key string or array of key=>value pairs
+     * @param mixed     $value  the value or list of values
+     * @return boolean          the function completed successfully
+     * @author Tom N Harris 
+     * @author Michael Hamann 
+     */
+    public function addMetaKeys($page, $key, $value=null) {
+        if (!is_array($key)) {
+            $key = array($key => $value);
+        } elseif (!is_null($value)) {
+            // $key is array, but $value is not null
+            trigger_error("array passed to addMetaKeys but value is not null", E_USER_WARNING);
+        }
+
+        if (!$this->lock())
+            return "locked";
+
+        // load known documents
+        $pid = $this->getPIDNoLock($page);
+        if ($pid === false) {
+            $this->unlock();
+            return false;
+        }
+
+        // Special handling for titles so the index file is simpler
+        if (array_key_exists('title', $key)) {
+            $value = $key['title'];
+            if (is_array($value))
+                $value = $value[0];
+            $this->saveIndexKey('title', '', $pid, $value);
+            unset($key['title']);
+        }
+
+        foreach ($key as $name => $values) {
+            $metaname = idx_cleanName($name);
+            $this->addIndexKey('metadata', '', $metaname);
+            $metaidx = $this->getIndex($metaname.'_i', '');
+            $metawords = $this->getIndex($metaname.'_w', '');
+            $addwords = false;
+
+            if (!is_array($values)) $values = array($values);
+
+            $val_idx = $this->getIndexKey($metaname.'_p', '', $pid);
+            if ($val_idx != '') {
+                $val_idx = explode(':', $val_idx);
+                // -1 means remove, 0 keep, 1 add
+                $val_idx = array_combine($val_idx, array_fill(0, count($val_idx), -1));
+            } else {
+                $val_idx = array();
+            }
+
+            foreach ($values as $val) {
+                $val = (string)$val;
+                if ($val !== "") {
+                    $id = array_search($val, $metawords, true);
+                    if ($id === false) {
+                        $id = count($metawords);
+                        $metawords[$id] = $val;
+                        $addwords = true;
+                    }
+                    // test if value is already in the index
+                    if (isset($val_idx[$id]) && $val_idx[$id] <= 0)
+                        $val_idx[$id] = 0;
+                    else // else add it
+                        $val_idx[$id] = 1;
+                }
+            }
+
+            if ($addwords)
+                $this->saveIndex($metaname.'_w', '', $metawords);
+            $vals_changed = false;
+            foreach ($val_idx as $id => $action) {
+                if ($action == -1) {
+                    $metaidx[$id] = $this->updateTuple($metaidx[$id], $pid, 0);
+                    $vals_changed = true;
+                    unset($val_idx[$id]);
+                } elseif ($action == 1) {
+                    $metaidx[$id] = $this->updateTuple($metaidx[$id], $pid, 1);
+                    $vals_changed = true;
+                }
+            }
+
+            if ($vals_changed) {
+                $this->saveIndex($metaname.'_i', '', $metaidx);
+                $val_idx = implode(':', array_keys($val_idx));
+                $this->saveIndexKey($metaname.'_p', '', $pid, $val_idx);
+            }
+
+            unset($metaidx);
+            unset($metawords);
+        }
+
+        $this->unlock();
+        return true;
+    }
+
+    /**
+     * Rename a page in the search index without changing the indexed content. This function doesn't check if the
+     * old or new name exists in the filesystem. It returns an error if the old page isn't in the page list of the
+     * indexer and it deletes all previously indexed content of the new page.
+     *
+     * @param string $oldpage The old page name
+     * @param string $newpage The new page name
+     * @return string|bool If the page was successfully renamed, can be a message in the case of an error
+     */
+    public function renamePage($oldpage, $newpage) {
+        if (!$this->lock()) return 'locked';
+
+        $pages = $this->getPages();
+
+        $id = array_search($oldpage, $pages, true);
+        if ($id === false) {
+            $this->unlock();
+            return 'page is not in index';
+        }
+
+        $new_id = array_search($newpage, $pages, true);
+        if ($new_id !== false) {
+            // make sure the page is not in the index anymore
+            if ($this->deletePageNoLock($newpage) !== true) {
+                return false;
+            }
+
+            $pages[$new_id] = 'deleted:'.time().rand(0, 9999);
+        }
+
+        $pages[$id] = $newpage;
+
+        // update index
+        if (!$this->saveIndex('page', '', $pages)) {
+            $this->unlock();
+            return false;
+        }
+
+        // reset the pid cache
+        $this->pidCache = array();
+
+        $this->unlock();
+        return true;
+    }
+
+    /**
+     * Renames a meta value in the index. This doesn't change the meta value in the pages, it assumes that all pages
+     * will be updated.
+     *
+     * @param string $key       The metadata key of which a value shall be changed
+     * @param string $oldvalue  The old value that shall be renamed
+     * @param string $newvalue  The new value to which the old value shall be renamed, can exist (then values will be merged)
+     * @return bool|string      If renaming the value has been successful, false or error message on error.
+     */
+    public function renameMetaValue($key, $oldvalue, $newvalue) {
+        if (!$this->lock()) return 'locked';
+
+        // change the relation references index
+        $metavalues = $this->getIndex($key, '_w');
+        $oldid = array_search($oldvalue, $metavalues, true);
+        if ($oldid !== false) {
+            $newid = array_search($newvalue, $metavalues, true);
+            if ($newid !== false) {
+                // free memory
+                unset ($metavalues);
+
+                // okay, now we have two entries for the same value. we need to merge them.
+                $indexline = $this->getIndexKey($key.'_i', '', $oldid);
+                if ($indexline != '') {
+                    $newindexline = $this->getIndexKey($key.'_i', '', $newid);
+                    $pagekeys     = $this->getIndex($key.'_p', '');
+                    $parts = explode(':', $indexline);
+                    foreach ($parts as $part) {
+                        list($id, $count) = explode('*', $part);
+                        $newindexline =  $this->updateTuple($newindexline, $id, $count);
+
+                        $keyline = explode(':', $pagekeys[$id]);
+                        // remove old meta value
+                        $keyline = array_diff($keyline, array($oldid));
+                        // add new meta value when not already present
+                        if (!in_array($newid, $keyline)) {
+                            array_push($keyline, $newid);
+                        }
+                        $pagekeys[$id] = implode(':', $keyline);
+                    }
+                    $this->saveIndex($key.'_p', '', $pagekeys);
+                    unset($pagekeys);
+                    $this->saveIndexKey($key.'_i', '', $oldid, '');
+                    $this->saveIndexKey($key.'_i', '', $newid, $newindexline);
+                }
+            } else {
+                $metavalues[$oldid] = $newvalue;
+                if (!$this->saveIndex($key.'_w', '', $metavalues)) {
+                    $this->unlock();
+                    return false;
+                }
+            }
+        }
+
+        $this->unlock();
+        return true;
+    }
+
+    /**
+     * Remove a page from the index
+     *
+     * Erases entries in all known indexes.
+     *
+     * @param string    $page   a page name
+     * @return boolean          the function completed successfully
+     * @author Tom N Harris 
+     */
+    public function deletePage($page) {
+        if (!$this->lock())
+            return "locked";
+
+        $result = $this->deletePageNoLock($page);
+
+        $this->unlock();
+
+        return $result;
+    }
+
+    /**
+     * Remove a page from the index without locking the index, only use this function if the index is already locked
+     *
+     * Erases entries in all known indexes.
+     *
+     * @param string    $page   a page name
+     * @return boolean          the function completed successfully
+     * @author Tom N Harris 
+     */
+    protected function deletePageNoLock($page) {
+        // load known documents
+        $pid = $this->getPIDNoLock($page);
+        if ($pid === false) {
+            return false;
+        }
+
+        // Remove obsolete index entries
+        $pageword_idx = $this->getIndexKey('pageword', '', $pid);
+        if ($pageword_idx !== '') {
+            $delwords = explode(':',$pageword_idx);
+            $upwords = array();
+            foreach ($delwords as $word) {
+                if ($word != '') {
+                    list($wlen,$wid) = explode('*', $word);
+                    $wid = (int)$wid;
+                    $upwords[$wlen][] = $wid;
+                }
+            }
+            foreach ($upwords as $wlen => $widx) {
+                $index = $this->getIndex('i', $wlen);
+                foreach ($widx as $wid) {
+                    $index[$wid] = $this->updateTuple($index[$wid], $pid, 0);
+                }
+                $this->saveIndex('i', $wlen, $index);
+            }
+        }
+        // Save the reverse index
+        if (!$this->saveIndexKey('pageword', '', $pid, "")) {
+            return false;
+        }
+
+        $this->saveIndexKey('title', '', $pid, "");
+        $keyidx = $this->getIndex('metadata', '');
+        foreach ($keyidx as $metaname) {
+            $val_idx = explode(':', $this->getIndexKey($metaname.'_p', '', $pid));
+            $meta_idx = $this->getIndex($metaname.'_i', '');
+            foreach ($val_idx as $id) {
+                if ($id === '') continue;
+                $meta_idx[$id] = $this->updateTuple($meta_idx[$id], $pid, 0);
+            }
+            $this->saveIndex($metaname.'_i', '', $meta_idx);
+            $this->saveIndexKey($metaname.'_p', '', $pid, '');
+        }
+
+        return true;
+    }
+
+    /**
+     * Clear the whole index
+     *
+     * @return bool If the index has been cleared successfully
+     */
+    public function clear() {
+        global $conf;
+
+        if (!$this->lock()) return false;
+
+        @unlink($conf['indexdir'].'/page.idx');
+        @unlink($conf['indexdir'].'/title.idx');
+        @unlink($conf['indexdir'].'/pageword.idx');
+        @unlink($conf['indexdir'].'/metadata.idx');
+        $dir = @opendir($conf['indexdir']);
+        if($dir!==false){
+            while(($f = readdir($dir)) !== false){
+                if(substr($f,-4)=='.idx' &&
+                    (substr($f,0,1)=='i' || substr($f,0,1)=='w'
+                        || substr($f,-6)=='_w.idx' || substr($f,-6)=='_i.idx' || substr($f,-6)=='_p.idx'))
+                    @unlink($conf['indexdir']."/$f");
+            }
+        }
+        @unlink($conf['indexdir'].'/lengths.idx');
+
+        // clear the pid cache
+        $this->pidCache = array();
+
+        $this->unlock();
+        return true;
+    }
+
+    /**
+     * Split the text into words for fulltext search
+     *
+     * TODO: does this also need &$stopwords ?
+     *
+     * @triggers INDEXER_TEXT_PREPARE
+     * This event allows plugins to modify the text before it gets tokenized.
+     * Plugins intercepting this event should also intercept INDEX_VERSION_GET
+     *
+     * @param string    $text   plain text
+     * @param boolean   $wc     are wildcards allowed?
+     * @return array            list of words in the text
+     * @author Tom N Harris 
+     * @author Andreas Gohr 
+     */
+    public function tokenizer($text, $wc=false) {
+        $wc = ($wc) ? '' : '\*';
+        $stopwords =& idx_get_stopwords();
+
+        // prepare the text to be tokenized
+        $evt = new Doku_Event('INDEXER_TEXT_PREPARE', $text);
+        if ($evt->advise_before(true)) {
+            if (preg_match('/[^0-9A-Za-z ]/u', $text)) {
+                // handle asian chars as single words (may fail on older PHP version)
+                $asia = @preg_replace('/('.IDX_ASIAN.')/u', ' \1 ', $text);
+                if (!is_null($asia)) $text = $asia; // recover from regexp falure
+            }
+        }
+        $evt->advise_after();
+        unset($evt);
+
+        $text = strtr($text,
+                       array(
+                           "\r" => ' ',
+                           "\n" => ' ',
+                           "\t" => ' ',
+                           "\xC2\xAD" => '', //soft-hyphen
+                       )
+                     );
+        if (preg_match('/[^0-9A-Za-z ]/u', $text))
+            $text = utf8_stripspecials($text, ' ', '\._\-:'.$wc);
+
+        $wordlist = explode(' ', $text);
+        foreach ($wordlist as $i => $word) {
+            $wordlist[$i] = (preg_match('/[^0-9A-Za-z]/u', $word)) ?
+                utf8_strtolower($word) : strtolower($word);
+        }
+
+        foreach ($wordlist as $i => $word) {
+            if ((!is_numeric($word) && strlen($word) < IDX_MINWORDLENGTH)
+              || array_search($word, $stopwords, true) !== false)
+                unset($wordlist[$i]);
+        }
+        return array_values($wordlist);
+    }
+
+    /**
+     * Get the numeric PID of a page
+     *
+     * @param string $page The page to get the PID for
+     * @return bool|int The page id on success, false on error
+     */
+    public function getPID($page) {
+        // return PID without locking when it is in the cache
+        if (isset($this->pidCache[$page])) return $this->pidCache[$page];
+
+        if (!$this->lock())
+            return false;
+
+        // load known documents
+        $pid = $this->getPIDNoLock($page);
+        if ($pid === false) {
+            $this->unlock();
+            return false;
+        }
+
+        $this->unlock();
+        return $pid;
+    }
+
+    /**
+     * Get the numeric PID of a page without locking the index.
+     * Only use this function when the index is already locked.
+     *
+     * @param string $page The page to get the PID for
+     * @return bool|int The page id on success, false on error
+     */
+    protected function getPIDNoLock($page) {
+        // avoid expensive addIndexKey operation for the most recently requested pages by using a cache
+        if (isset($this->pidCache[$page])) return $this->pidCache[$page];
+        $pid = $this->addIndexKey('page', '', $page);
+        // limit cache to 10 entries by discarding the oldest element as in DokuWiki usually only the most recently
+        // added item will be requested again
+        if (count($this->pidCache) > 10) array_shift($this->pidCache);
+        $this->pidCache[$page] = $pid;
+        return $pid;
+    }
+
+    /**
+     * Get the page id of a numeric PID
+     *
+     * @param int $pid The PID to get the page id for
+     * @return string The page id
+     */
+    public function getPageFromPID($pid) {
+        return $this->getIndexKey('page', '', $pid);
+    }
+
+    /**
+     * Find pages in the fulltext index containing the words,
+     *
+     * The search words must be pre-tokenized, meaning only letters and
+     * numbers with an optional wildcard
+     *
+     * The returned array will have the original tokens as key. The values
+     * in the returned list is an array with the page names as keys and the
+     * number of times that token appears on the page as value.
+     *
+     * @param array  $tokens list of words to search for
+     * @return array         list of page names with usage counts
+     * @author Tom N Harris 
+     * @author Andreas Gohr 
+     */
+    public function lookup(&$tokens) {
+        $result = array();
+        $wids = $this->getIndexWords($tokens, $result);
+        if (empty($wids)) return array();
+        // load known words and documents
+        $page_idx = $this->getIndex('page', '');
+        $docs = array();
+        foreach (array_keys($wids) as $wlen) {
+            $wids[$wlen] = array_unique($wids[$wlen]);
+            $index = $this->getIndex('i', $wlen);
+            foreach($wids[$wlen] as $ixid) {
+                if ($ixid < count($index))
+                    $docs["$wlen*$ixid"] = $this->parseTuples($page_idx, $index[$ixid]);
+            }
+        }
+        // merge found pages into final result array
+        $final = array();
+        foreach ($result as $word => $res) {
+            $final[$word] = array();
+            foreach ($res as $wid) {
+                // handle the case when ($ixid < count($index)) has been false
+                // and thus $docs[$wid] hasn't been set.
+                if (!isset($docs[$wid])) continue;
+                $hits = &$docs[$wid];
+                foreach ($hits as $hitkey => $hitcnt) {
+                    // make sure the document still exists
+                    if (!page_exists($hitkey, '', false)) continue;
+                    if (!isset($final[$word][$hitkey]))
+                        $final[$word][$hitkey] = $hitcnt;
+                    else
+                        $final[$word][$hitkey] += $hitcnt;
+                }
+            }
+        }
+        return $final;
+    }
+
+    /**
+     * Find pages containing a metadata key.
+     *
+     * The metadata values are compared as case-sensitive strings. Pass a
+     * callback function that returns true or false to use a different
+     * comparison function. The function will be called with the $value being
+     * searched for as the first argument, and the word in the index as the
+     * second argument. The function preg_match can be used directly if the
+     * values are regexes.
+     *
+     * @param string    $key    name of the metadata key to look for
+     * @param string    $value  search term to look for, must be a string or array of strings
+     * @param callback  $func   comparison function
+     * @return array            lists with page names, keys are query values if $value is array
+     * @author Tom N Harris 
+     * @author Michael Hamann 
+     */
+    public function lookupKey($key, &$value, $func=null) {
+        if (!is_array($value))
+            $value_array = array($value);
+        else
+            $value_array =& $value;
+
+        // the matching ids for the provided value(s)
+        $value_ids = array();
+
+        $metaname = idx_cleanName($key);
+
+        // get all words in order to search the matching ids
+        if ($key == 'title') {
+            $words = $this->getIndex('title', '');
+        } else {
+            $words = $this->getIndex($metaname.'_w', '');
+        }
+
+        if (!is_null($func)) {
+            foreach ($value_array as $val) {
+                foreach ($words as $i => $word) {
+                    if (call_user_func_array($func, array($val, $word)))
+                        $value_ids[$i][] = $val;
+                }
+            }
+        } else {
+            foreach ($value_array as $val) {
+                $xval = $val;
+                $caret = '^';
+                $dollar = '$';
+                // check for wildcards
+                if (substr($xval, 0, 1) == '*') {
+                    $xval = substr($xval, 1);
+                    $caret = '';
+                }
+                if (substr($xval, -1, 1) == '*') {
+                    $xval = substr($xval, 0, -1);
+                    $dollar = '';
+                }
+                if (!$caret || !$dollar) {
+                    $re = $caret.preg_quote($xval, '/').$dollar;
+                    foreach(array_keys(preg_grep('/'.$re.'/', $words)) as $i)
+                        $value_ids[$i][] = $val;
+                } else {
+                    if (($i = array_search($val, $words, true)) !== false)
+                        $value_ids[$i][] = $val;
+                }
+            }
+        }
+
+        unset($words); // free the used memory
+
+        // initialize the result so it won't be null
+        $result = array();
+        foreach ($value_array as $val) {
+            $result[$val] = array();
+        }
+
+        $page_idx = $this->getIndex('page', '');
+
+        // Special handling for titles
+        if ($key == 'title') {
+            foreach ($value_ids as $pid => $val_list) {
+                $page = $page_idx[$pid];
+                foreach ($val_list as $val) {
+                    $result[$val][] = $page;
+                }
+            }
+        } else {
+            // load all lines and pages so the used lines can be taken and matched with the pages
+            $lines = $this->getIndex($metaname.'_i', '');
+
+            foreach ($value_ids as $value_id => $val_list) {
+                // parse the tuples of the form page_id*1:page2_id*1 and so on, return value
+                // is an array with page_id => 1, page2_id => 1 etc. so take the keys only
+                $pages = array_keys($this->parseTuples($page_idx, $lines[$value_id]));
+                foreach ($val_list as $val) {
+                    $result[$val] = array_merge($result[$val], $pages);
+                }
+            }
+        }
+        if (!is_array($value)) $result = $result[$value];
+        return $result;
+    }
+
+    /**
+     * Find the index ID of each search term.
+     *
+     * The query terms should only contain valid characters, with a '*' at
+     * either the beginning or end of the word (or both).
+     * The $result parameter can be used to merge the index locations with
+     * the appropriate query term.
+     *
+     * @param array  $words  The query terms.
+     * @param array  $result Set to word => array("length*id" ...)
+     * @return array         Set to length => array(id ...)
+     * @author Tom N Harris 
+     */
+    protected function getIndexWords(&$words, &$result) {
+        $tokens = array();
+        $tokenlength = array();
+        $tokenwild = array();
+        foreach ($words as $word) {
+            $result[$word] = array();
+            $caret = '^';
+            $dollar = '$';
+            $xword = $word;
+            $wlen = wordlen($word);
+
+            // check for wildcards
+            if (substr($xword, 0, 1) == '*') {
+                $xword = substr($xword, 1);
+                $caret = '';
+                $wlen -= 1;
+            }
+            if (substr($xword, -1, 1) == '*') {
+                $xword = substr($xword, 0, -1);
+                $dollar = '';
+                $wlen -= 1;
+            }
+            if ($wlen < IDX_MINWORDLENGTH && $caret && $dollar && !is_numeric($xword))
+                continue;
+            if (!isset($tokens[$xword]))
+                $tokenlength[$wlen][] = $xword;
+            if (!$caret || !$dollar) {
+                $re = $caret.preg_quote($xword, '/').$dollar;
+                $tokens[$xword][] = array($word, '/'.$re.'/');
+                if (!isset($tokenwild[$xword]))
+                    $tokenwild[$xword] = $wlen;
+            } else {
+                $tokens[$xword][] = array($word, null);
+            }
+        }
+        asort($tokenwild);
+        // $tokens = array( base word => array( [ query term , regexp ] ... ) ... )
+        // $tokenlength = array( base word length => base word ... )
+        // $tokenwild = array( base word => base word length ... )
+        $length_filter = empty($tokenwild) ? $tokenlength : min(array_keys($tokenlength));
+        $indexes_known = $this->indexLengths($length_filter);
+        if (!empty($tokenwild)) sort($indexes_known);
+        // get word IDs
+        $wids = array();
+        foreach ($indexes_known as $ixlen) {
+            $word_idx = $this->getIndex('w', $ixlen);
+            // handle exact search
+            if (isset($tokenlength[$ixlen])) {
+                foreach ($tokenlength[$ixlen] as $xword) {
+                    $wid = array_search($xword, $word_idx, true);
+                    if ($wid !== false) {
+                        $wids[$ixlen][] = $wid;
+                        foreach ($tokens[$xword] as $w)
+                            $result[$w[0]][] = "$ixlen*$wid";
+                    }
+                }
+            }
+            // handle wildcard search
+            foreach ($tokenwild as $xword => $wlen) {
+                if ($wlen >= $ixlen) break;
+                foreach ($tokens[$xword] as $w) {
+                    if (is_null($w[1])) continue;
+                    foreach(array_keys(preg_grep($w[1], $word_idx)) as $wid) {
+                        $wids[$ixlen][] = $wid;
+                        $result[$w[0]][] = "$ixlen*$wid";
+                    }
+                }
+            }
+        }
+        return $wids;
+    }
+
+    /**
+     * Return a list of all pages
+     * Warning: pages may not exist!
+     *
+     * @param string    $key    list only pages containing the metadata key (optional)
+     * @return array            list of page names
+     * @author Tom N Harris 
+     */
+    public function getPages($key=null) {
+        $page_idx = $this->getIndex('page', '');
+        if (is_null($key)) return $page_idx;
+
+        $metaname = idx_cleanName($key);
+
+        // Special handling for titles
+        if ($key == 'title') {
+            $title_idx = $this->getIndex('title', '');
+            array_splice($page_idx, count($title_idx));
+            foreach ($title_idx as $i => $title)
+                if ($title === "") unset($page_idx[$i]);
+            return array_values($page_idx);
+        }
+
+        $pages = array();
+        $lines = $this->getIndex($metaname.'_i', '');
+        foreach ($lines as $line) {
+            $pages = array_merge($pages, $this->parseTuples($page_idx, $line));
+        }
+        return array_keys($pages);
+    }
+
+    /**
+     * Return a list of words sorted by number of times used
+     *
+     * @param int       $min    bottom frequency threshold
+     * @param int       $max    upper frequency limit. No limit if $max<$min
+     * @param int       $minlen minimum length of words to count
+     * @param string    $key    metadata key to list. Uses the fulltext index if not given
+     * @return array            list of words as the keys and frequency as values
+     * @author Tom N Harris 
+     */
+    public function histogram($min=1, $max=0, $minlen=3, $key=null) {
+        if ($min < 1)
+            $min = 1;
+        if ($max < $min)
+            $max = 0;
+
+        $result = array();
+
+        if ($key == 'title') {
+            $index = $this->getIndex('title', '');
+            $index = array_count_values($index);
+            foreach ($index as $val => $cnt) {
+                if ($cnt >= $min && (!$max || $cnt <= $max) && strlen($val) >= $minlen)
+                    $result[$val] = $cnt;
+            }
+        }
+        elseif (!is_null($key)) {
+            $metaname = idx_cleanName($key);
+            $index = $this->getIndex($metaname.'_i', '');
+            $val_idx = array();
+            foreach ($index as $wid => $line) {
+                $freq = $this->countTuples($line);
+                if ($freq >= $min && (!$max || $freq <= $max))
+                    $val_idx[$wid] = $freq;
+            }
+            if (!empty($val_idx)) {
+                $words = $this->getIndex($metaname.'_w', '');
+                foreach ($val_idx as $wid => $freq) {
+                    if (strlen($words[$wid]) >= $minlen)
+                        $result[$words[$wid]] = $freq;
+                }
+            }
+        }
+        else {
+            $lengths = idx_listIndexLengths();
+            foreach ($lengths as $length) {
+                if ($length < $minlen) continue;
+                $index = $this->getIndex('i', $length);
+                $words = null;
+                foreach ($index as $wid => $line) {
+                    $freq = $this->countTuples($line);
+                    if ($freq >= $min && (!$max || $freq <= $max)) {
+                        if ($words === null)
+                            $words = $this->getIndex('w', $length);
+                        $result[$words[$wid]] = $freq;
+                    }
+                }
+            }
+        }
+
+        arsort($result);
+        return $result;
+    }
+
+    /**
+     * Lock the indexer.
+     *
+     * @author Tom N Harris 
+     */
+    protected function lock() {
+        global $conf;
+        $status = true;
+        $run = 0;
+        $lock = $conf['lockdir'].'/_indexer.lock';
+        while (!@mkdir($lock, $conf['dmode'])) {
+            usleep(50);
+            if(is_dir($lock) && time()-@filemtime($lock) > 60*5){
+                // looks like a stale lock - remove it
+                if (!@rmdir($lock)) {
+                    $status = "removing the stale lock failed";
+                    return false;
+                } else {
+                    $status = "stale lock removed";
+                }
+            }elseif($run++ == 1000){
+                // we waited 5 seconds for that lock
+                return false;
+            }
+        }
+        if (!empty($conf['dperm'])) {
+            chmod($lock, $conf['dperm']);
+        }
+        return $status;
+    }
+
+    /**
+     * Release the indexer lock.
+     *
+     * @author Tom N Harris 
+     */
+    protected function unlock() {
+        global $conf;
+        @rmdir($conf['lockdir'].'/_indexer.lock');
+        return true;
+    }
+
+    /**
+     * Retrieve the entire index.
+     *
+     * The $suffix argument is for an index that is split into
+     * multiple parts. Different index files should use different
+     * base names.
+     *
+     * @param string    $idx    name of the index
+     * @param string    $suffix subpart identifier
+     * @return array            list of lines without CR or LF
+     * @author Tom N Harris 
+     */
+    protected function getIndex($idx, $suffix) {
+        global $conf;
+        $fn = $conf['indexdir'].'/'.$idx.$suffix.'.idx';
+        if (!@file_exists($fn)) return array();
+        return file($fn, FILE_IGNORE_NEW_LINES);
+    }
+
+    /**
+     * Replace the contents of the index with an array.
+     *
+     * @param string    $idx    name of the index
+     * @param string    $suffix subpart identifier
+     * @param array     $lines  list of lines without LF
+     * @return bool             If saving succeeded
+     * @author Tom N Harris 
+     */
+    protected function saveIndex($idx, $suffix, &$lines) {
+        global $conf;
+        $fn = $conf['indexdir'].'/'.$idx.$suffix;
+        $fh = @fopen($fn.'.tmp', 'w');
+        if (!$fh) return false;
+        fwrite($fh, join("\n", $lines));
+        if (!empty($lines))
+            fwrite($fh, "\n");
+        fclose($fh);
+        if (isset($conf['fperm']))
+            chmod($fn.'.tmp', $conf['fperm']);
+        io_rename($fn.'.tmp', $fn.'.idx');
+        return true;
+    }
+
+    /**
+     * Retrieve a line from the index.
+     *
+     * @param string    $idx    name of the index
+     * @param string    $suffix subpart identifier
+     * @param int       $id     the line number
+     * @return string           a line with trailing whitespace removed
+     * @author Tom N Harris 
+     */
+    protected function getIndexKey($idx, $suffix, $id) {
+        global $conf;
+        $fn = $conf['indexdir'].'/'.$idx.$suffix.'.idx';
+        if (!@file_exists($fn)) return '';
+        $fh = @fopen($fn, 'r');
+        if (!$fh) return '';
+        $ln = -1;
+        while (($line = fgets($fh)) !== false) {
+            if (++$ln == $id) break;
+        }
+        fclose($fh);
+        return rtrim((string)$line);
+    }
+
+    /**
+     * Write a line into the index.
+     *
+     * @param string    $idx    name of the index
+     * @param string    $suffix subpart identifier
+     * @param int       $id     the line number
+     * @param string    $line   line to write
+     * @return bool             If saving succeeded
+     * @author Tom N Harris 
+     */
+    protected function saveIndexKey($idx, $suffix, $id, $line) {
+        global $conf;
+        if (substr($line, -1) != "\n")
+            $line .= "\n";
+        $fn = $conf['indexdir'].'/'.$idx.$suffix;
+        $fh = @fopen($fn.'.tmp', 'w');
+        if (!$fh) return false;
+        $ih = @fopen($fn.'.idx', 'r');
+        if ($ih) {
+            $ln = -1;
+            while (($curline = fgets($ih)) !== false) {
+                fwrite($fh, (++$ln == $id) ? $line : $curline);
+            }
+            if ($id > $ln) {
+                while ($id > ++$ln)
+                    fwrite($fh, "\n");
+                fwrite($fh, $line);
+            }
+            fclose($ih);
+        } else {
+            $ln = -1;
+            while ($id > ++$ln)
+                fwrite($fh, "\n");
+            fwrite($fh, $line);
+        }
+        fclose($fh);
+        if (isset($conf['fperm']))
+            chmod($fn.'.tmp', $conf['fperm']);
+        io_rename($fn.'.tmp', $fn.'.idx');
+        return true;
+    }
+
+    /**
+     * Retrieve or insert a value in the index.
+     *
+     * @param string    $idx    name of the index
+     * @param string    $suffix subpart identifier
+     * @param string    $value  line to find in the index
+     * @return int|bool          line number of the value in the index or false if writing the index failed
+     * @author Tom N Harris 
+     */
+    protected function addIndexKey($idx, $suffix, $value) {
+        $index = $this->getIndex($idx, $suffix);
+        $id = array_search($value, $index, true);
+        if ($id === false) {
+            $id = count($index);
+            $index[$id] = $value;
+            if (!$this->saveIndex($idx, $suffix, $index)) {
+                trigger_error("Failed to write $idx index", E_USER_ERROR);
+                return false;
+            }
+        }
+        return $id;
+    }
+
+    /**
+     * Get the list of lengths indexed in the wiki.
+     *
+     * Read the index directory or a cache file and returns
+     * a sorted array of lengths of the words used in the wiki.
+     *
+     * @author YoBoY 
+     */
+    protected function listIndexLengths() {
+        return idx_listIndexLengths();
+    }
+
+    /**
+     * Get the word lengths that have been indexed.
+     *
+     * Reads the index directory and returns an array of lengths
+     * that there are indices for.
+     *
+     * @author YoBoY 
+     */
+    protected function indexLengths($filter) {
+        global $conf;
+        $idx = array();
+        if (is_array($filter)) {
+            // testing if index files exist only
+            $path = $conf['indexdir']."/i";
+            foreach ($filter as $key => $value) {
+                if (@file_exists($path.$key.'.idx'))
+                    $idx[] = $key;
+            }
+        } else {
+            $lengths = idx_listIndexLengths();
+            foreach ($lengths as $key => $length) {
+                // keep all the values equal or superior
+                if ((int)$length >= (int)$filter)
+                    $idx[] = $length;
+            }
+        }
+        return $idx;
+    }
+
+    /**
+     * Insert or replace a tuple in a line.
+     *
+     * @author Tom N Harris 
+     */
+    protected function updateTuple($line, $id, $count) {
+        $newLine = $line;
+        if ($newLine !== '')
+            $newLine = preg_replace('/(^|:)'.preg_quote($id,'/').'\*\d*/', '', $newLine);
+        $newLine = trim($newLine, ':');
+        if ($count) {
+            if (strlen($newLine) > 0)
+                return "$id*$count:".$newLine;
+            else
+                return "$id*$count".$newLine;
+        }
+        return $newLine;
+    }
+
+    /**
+     * Split a line into an array of tuples.
+     *
+     * @author Tom N Harris 
+     * @author Andreas Gohr 
+     */
+    protected function parseTuples(&$keys, $line) {
+        $result = array();
+        if ($line == '') return $result;
+        $parts = explode(':', $line);
+        foreach ($parts as $tuple) {
+            if ($tuple === '') continue;
+            list($key, $cnt) = explode('*', $tuple);
+            if (!$cnt) continue;
+            $key = $keys[$key];
+            if (!$key) continue;
+            $result[$key] = $cnt;
+        }
+        return $result;
+    }
+
+    /**
+     * Sum the counts in a list of tuples.
+     *
+     * @author Tom N Harris 
+     */
+    protected function countTuples($line) {
+        $freq = 0;
+        $parts = explode(':', $line);
+        foreach ($parts as $tuple) {
+            if ($tuple === '') continue;
+            list($pid, $cnt) = explode('*', $tuple);
+            $freq += (int)$cnt;
+        }
+        return $freq;
+    }
+}
+
+/**
+ * Create an instance of the indexer.
+ *
+ * @return Doku_Indexer               a Doku_Indexer
+ * @author Tom N Harris 
+ */
+function idx_get_indexer() {
+    static $Indexer;
+    if (!isset($Indexer)) {
+        $Indexer = new Doku_Indexer();
+    }
+    return $Indexer;
+}
+
+/**
+ * Returns words that will be ignored.
+ *
+ * @return array                list of stop words
+ * @author Tom N Harris 
+ */
+function & idx_get_stopwords() {
+    static $stopwords = null;
+    if (is_null($stopwords)) {
+        global $conf;
+        $swfile = DOKU_INC.'inc/lang/'.$conf['lang'].'/stopwords.txt';
+        if(@file_exists($swfile)){
+            $stopwords = file($swfile, FILE_IGNORE_NEW_LINES);
+        }else{
+            $stopwords = array();
+        }
+    }
+    return $stopwords;
+}
+
+/**
+ * Adds/updates the search index for the given page
+ *
+ * Locking is handled internally.
+ *
+ * @param string        $page   name of the page to index
+ * @param boolean       $verbose    print status messages
+ * @param boolean       $force  force reindexing even when the index is up to date
+ * @return boolean              the function completed successfully
+ * @author Tom N Harris 
+ */
+function idx_addPage($page, $verbose=false, $force=false) {
+    $idxtag = metaFN($page,'.indexed');
+    // check if page was deleted but is still in the index
+    if (!page_exists($page)) {
+        if (!@file_exists($idxtag)) {
+            if ($verbose) print("Indexer: $page does not exist, ignoring".DOKU_LF);
+            return false;
+        }
+        $Indexer = idx_get_indexer();
+        $result = $Indexer->deletePage($page);
+        if ($result === "locked") {
+            if ($verbose) print("Indexer: locked".DOKU_LF);
+            return false;
+        }
+        @unlink($idxtag);
+        return $result;
+    }
+
+    // check if indexing needed
+    if(!$force && @file_exists($idxtag)){
+        if(trim(io_readFile($idxtag)) == idx_get_version()){
+            $last = @filemtime($idxtag);
+            if($last > @filemtime(wikiFN($page))){
+                if ($verbose) print("Indexer: index for $page up to date".DOKU_LF);
+                return false;
+            }
+        }
+    }
+
+    $indexenabled = p_get_metadata($page, 'internal index', METADATA_RENDER_UNLIMITED);
+    if ($indexenabled === false) {
+        $result = false;
+        if (@file_exists($idxtag)) {
+            $Indexer = idx_get_indexer();
+            $result = $Indexer->deletePage($page);
+            if ($result === "locked") {
+                if ($verbose) print("Indexer: locked".DOKU_LF);
+                return false;
+            }
+            @unlink($idxtag);
+        }
+        if ($verbose) print("Indexer: index disabled for $page".DOKU_LF);
+        return $result;
+    }
+
+    $Indexer = idx_get_indexer();
+    $pid = $Indexer->getPID($page);
+    if ($pid === false) {
+        if ($verbose) print("Indexer: getting the PID failed for $page".DOKU_LF);
+        return false;
+    }
+    $body = '';
+    $metadata = array();
+    $metadata['title'] = p_get_metadata($page, 'title', METADATA_RENDER_UNLIMITED);
+    if (($references = p_get_metadata($page, 'relation references', METADATA_RENDER_UNLIMITED)) !== null)
+        $metadata['relation_references'] = array_keys($references);
+    else
+        $metadata['relation_references'] = array();
+
+    if (($media = p_get_metadata($page, 'relation media', METADATA_RENDER_UNLIMITED)) !== null)
+        $metadata['relation_media'] = array_keys($media);
+    else
+        $metadata['relation_media'] = array();
+
+    $data = compact('page', 'body', 'metadata', 'pid');
+    $evt = new Doku_Event('INDEXER_PAGE_ADD', $data);
+    if ($evt->advise_before()) $data['body'] = $data['body'] . " " . rawWiki($page);
+    $evt->advise_after();
+    unset($evt);
+    extract($data);
+
+    $result = $Indexer->addPageWords($page, $body);
+    if ($result === "locked") {
+        if ($verbose) print("Indexer: locked".DOKU_LF);
+        return false;
+    }
+
+    if ($result) {
+        $result = $Indexer->addMetaKeys($page, $metadata);
+        if ($result === "locked") {
+            if ($verbose) print("Indexer: locked".DOKU_LF);
+            return false;
+        }
+    }
+
+    if ($result)
+        io_saveFile(metaFN($page,'.indexed'), idx_get_version());
+    if ($verbose) {
+        print("Indexer: finished".DOKU_LF);
+        return true;
+    }
+    return $result;
+}
+
+/**
+ * Find tokens in the fulltext index
+ *
+ * Takes an array of words and will return a list of matching
+ * pages for each one.
+ *
+ * Important: No ACL checking is done here! All results are
+ *            returned, regardless of permissions
+ *
+ * @param array      $words  list of words to search for
+ * @return array             list of pages found, associated with the search terms
+ */
+function idx_lookup(&$words) {
+    $Indexer = idx_get_indexer();
+    return $Indexer->lookup($words);
+}
+
+/**
+ * Split a string into tokens
+ *
+ */
+function idx_tokenizer($string, $wc=false) {
+    $Indexer = idx_get_indexer();
+    return $Indexer->tokenizer($string, $wc);
+}
+
+/* For compatibility */
+
+/**
+ * Read the list of words in an index (if it exists).
+ *
+ * @author Tom N Harris 
+ */
+function idx_getIndex($idx, $suffix) {
+    global $conf;
+    $fn = $conf['indexdir'].'/'.$idx.$suffix.'.idx';
+    if (!@file_exists($fn)) return array();
+    return file($fn);
+}
+
+/**
+ * Get the list of lengths indexed in the wiki.
+ *
+ * Read the index directory or a cache file and returns
+ * a sorted array of lengths of the words used in the wiki.
+ *
+ * @author YoBoY 
+ */
+function idx_listIndexLengths() {
+    global $conf;
+    // testing what we have to do, create a cache file or not.
+    if ($conf['readdircache'] == 0) {
+        $docache = false;
+    } else {
+        clearstatcache();
+        if (@file_exists($conf['indexdir'].'/lengths.idx')
+        && (time() < @filemtime($conf['indexdir'].'/lengths.idx') + $conf['readdircache'])) {
+            if (($lengths = @file($conf['indexdir'].'/lengths.idx', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES)) !== false) {
+                $idx = array();
+                foreach ($lengths as $length) {
+                    $idx[] = (int)$length;
+                }
+                return $idx;
+            }
+        }
+        $docache = true;
+    }
+
+    if ($conf['readdircache'] == 0 || $docache) {
+        $dir = @opendir($conf['indexdir']);
+        if ($dir === false)
+            return array();
+        $idx = array();
+        while (($f = readdir($dir)) !== false) {
+            if (substr($f, 0, 1) == 'i' && substr($f, -4) == '.idx') {
+                $i = substr($f, 1, -4);
+                if (is_numeric($i))
+                    $idx[] = (int)$i;
+            }
+        }
+        closedir($dir);
+        sort($idx);
+        // save this in a file
+        if ($docache) {
+            $handle = @fopen($conf['indexdir'].'/lengths.idx', 'w');
+            @fwrite($handle, implode("\n", $idx));
+            @fclose($handle);
+        }
+        return $idx;
+    }
+
+    return array();
+}
+
+/**
+ * Get the word lengths that have been indexed.
+ *
+ * Reads the index directory and returns an array of lengths
+ * that there are indices for.
+ *
+ * @author YoBoY 
+ */
+function idx_indexLengths($filter) {
+    global $conf;
+    $idx = array();
+    if (is_array($filter)) {
+        // testing if index files exist only
+        $path = $conf['indexdir']."/i";
+        foreach ($filter as $key => $value) {
+            if (@file_exists($path.$key.'.idx'))
+                $idx[] = $key;
+        }
+    } else {
+        $lengths = idx_listIndexLengths();
+        foreach ($lengths as $key => $length) {
+            // keep all the values equal or superior
+            if ((int)$length >= (int)$filter)
+                $idx[] = $length;
+        }
+    }
+    return $idx;
+}
+
+/**
+ * Clean a name of a key for use as a file name.
+ *
+ * Romanizes non-latin characters, then strips away anything that's
+ * not a letter, number, or underscore.
+ *
+ * @author Tom N Harris 
+ */
+function idx_cleanName($name) {
+    $name = utf8_romanize(trim((string)$name));
+    $name = preg_replace('#[ \./\\:-]+#', '_', $name);
+    $name = preg_replace('/[^A-Za-z0-9_]/', '', $name);
+    return strtolower($name);
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/inc/infoutils.php b/sources/inc/infoutils.php
new file mode 100644
index 0000000..7358955
--- /dev/null
+++ b/sources/inc/infoutils.php
@@ -0,0 +1,439 @@
+
+ */
+if(!defined('DOKU_INC')) die('meh.');
+if(!defined('DOKU_MESSAGEURL')) define('DOKU_MESSAGEURL','http://update.dokuwiki.org/check/');
+
+/**
+ * Check for new messages from upstream
+ *
+ * @author Andreas Gohr 
+ */
+function checkUpdateMessages(){
+    global $conf;
+    global $INFO;
+    global $updateVersion;
+    if(!$conf['updatecheck']) return;
+    if($conf['useacl'] && !$INFO['ismanager']) return;
+
+    $cf = $conf['cachedir'].'/messages.txt';
+    $lm = @filemtime($cf);
+
+    // check if new messages needs to be fetched
+    if($lm < time()-(60*60*24) || $lm < @filemtime(DOKU_INC.DOKU_SCRIPT)){
+        @touch($cf);
+        dbglog("checkUpdateMessages(): downloading messages.txt");
+        $http = new DokuHTTPClient();
+        $http->timeout = 12;
+        $data = $http->get(DOKU_MESSAGEURL.$updateVersion);
+        io_saveFile($cf,$data);
+    }else{
+        dbglog("checkUpdateMessages(): messages.txt up to date");
+        $data = io_readFile($cf);
+    }
+
+    // show messages through the usual message mechanism
+    $msgs = explode("\n%\n",$data);
+    foreach($msgs as $msg){
+        if($msg) msg($msg,2);
+    }
+}
+
+
+/**
+ * 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';
+    }elseif(is_dir(DOKU_INC.'.git')){
+        $version['type'] = 'Git';
+        $version['date'] = 'unknown';
+
+        $inventory = DOKU_INC.'.git/logs/HEAD';
+        if(is_file($inventory)){
+            $sz   = filesize($inventory);
+            $seek = max(0,$sz-2000); // read from back of the file
+            $fh   = fopen($inventory,'rb');
+            fseek($fh,$seek);
+            $chunk = fread($fh,2000);
+            fclose($fh);
+            $chunk = trim($chunk);
+            $chunk = @array_pop(explode("\n",$chunk));   //last log line
+            $chunk = @array_shift(explode("\t",$chunk)); //strip commit msg
+            $chunk = explode(" ",$chunk);
+            array_pop($chunk); //strip timezone
+            $date = date('Y-m-d',array_pop($chunk));
+            if($date) $version['date'] = $date;
+        }
+    }else{
+        global $updateVersion;
+        $version['date'] = 'update version '.$updateVersion;
+        $version['type'] = 'snapshot?';
+    }
+    return $version;
+}
+
+/**
+ * Return DokuWiki's version (as a string)
+ *
+ * @author Anika Henke 
+ */
+function getVersion(){
+    $version = getVersionData();
+    return $version['type'].' '.$version['date'];
+}
+
+/**
+ * Run a few sanity checks
+ *
+ * @author Andreas Gohr 
+ */
+function check(){
+    global $conf;
+    global $INFO;
+
+    if ($INFO['isadmin'] || $INFO['ismanager']){
+        msg('DokuWiki version: '.getVersion(),1);
+    }
+
+    if(version_compare(phpversion(),'5.2.0','<')){
+        msg('Your PHP version is too old ('.phpversion().' vs. 5.2.0+ 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(DOKU_CONF)){
+        msg('conf directory is writable',1);
+    }else{
+        msg('conf directory is not writable',-1);
+    }
+
+    if($conf['authtype'] == 'plain'){
+        global $config_cascade;
+        if(is_writable($config_cascade['plainauth.users']['default'])){
+            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 (!UTF8_PREGSUPPORT) {
+        msg('PHP is missing UTF-8 support in Perl-Compatible Regular Expressions (PCRE)', -1);
+    }
+    if (!UTF8_PROPERTYSUPPORT) {
+        msg('PHP is missing Unicode properties support in Perl-Compatible Regular Expressions (PCRE)', -1);
+    }
+
+    $loc = setlocale(LC_ALL, 0);
+    if(!$loc){
+        msg('No valid locale is set for your PHP setup. You should fix this',-1);
+    }elseif(stripos($loc,'utf') === false){
+        msg('Your locale '.hsc($loc).' seems not to be a UTF-8 locale, you should fix this if you encounter problems.',0);
+    }else{
+        msg('Valid locale '.hsc($loc).' found.', 1);
+    }
+
+    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);
+    }
+
+    // Check for corrupted search index
+    $lengths = idx_listIndexLengths();
+    $index_corrupted = false;
+    foreach ($lengths as $length) {
+        if (count(idx_getIndex('w', $length)) != count(idx_getIndex('i', $length))) {
+            $index_corrupted = true;
+            break;
+        }
+    }
+
+    foreach (idx_getIndex('metadata', '') as $index) {
+        if (count(idx_getIndex($index.'_w', '')) != count(idx_getIndex($index.'_i', ''))) {
+            $index_corrupted = true;
+            break;
+        }
+    }
+
+    if ($index_corrupted)
+        msg('The search index is corrupted. It might produce wrong results and most
+                probably needs to be rebuilt. See
+                faq:searchindex
+                for ways to rebuild the search index.', -1);
+    elseif (!empty($lengths))
+        msg('The search index seems to be working', 1);
+    else
+        msg('The search index is empty. See
+                faq:searchindex
+                for help on how to fix the search index. If the default indexer
+                isn\'t used or the wiki is actually empty this is normal.');
+}
+
+/**
+ * print a message
+ *
+ * If HTTP headers were not sent yet the message is added
+ * to the global message array else it's printed directly
+ * using html_msgarea()
+ *
+ *
+ * Levels can be:
+ *
+ * -1 error
+ *  0 info
+ *  1 success
+ *
+ * @author Andreas Gohr 
+ * @see    html_msgarea
+ */
+
+define('MSG_PUBLIC', 0);
+define('MSG_USERS_ONLY', 1);
+define('MSG_MANAGERS_ONLY',2);
+define('MSG_ADMINS_ONLY',4);
+
+function msg($message,$lvl=0,$line='',$file='',$allow=MSG_PUBLIC){
+    global $MSG, $MSG_shown;
+    $errors[-1] = 'error';
+    $errors[0]  = 'info';
+    $errors[1]  = 'success';
+    $errors[2]  = 'notify';
+
+    if($line || $file) $message.=' ['.utf8_basename($file).':'.$line.']';
+
+    if(!isset($MSG)) $MSG = array();
+    $MSG[]=array('lvl' => $errors[$lvl], 'msg' => $message, 'allow' => $allow);
+    if(isset($MSG_shown) || headers_sent()){
+        if(function_exists('html_msgarea')){
+            html_msgarea();
+        }else{
+            print "ERROR($lvl) $message";
+        }
+        unset($GLOBALS['MSG']);
+    }
+}
+/**
+ * Determine whether the current user is allowed to view the message
+ * in the $msg data structure
+ *
+ * @param  $msg   array    dokuwiki msg structure
+ *                         msg   => string, the message
+ *                         lvl   => int, level of the message (see msg() function)
+ *                         allow => int, flag used to determine who is allowed to see the message
+ *                                       see MSG_* constants
+ */
+function info_msg_allowed($msg){
+    global $INFO, $auth;
+
+    // is the message public? - everyone and anyone can see it
+    if (empty($msg['allow']) || ($msg['allow'] == MSG_PUBLIC)) return true;
+
+    // restricted msg, but no authentication
+    if (empty($auth)) return false;
+
+    switch ($msg['allow']){
+        case MSG_USERS_ONLY:
+            return !empty($INFO['userinfo']);
+
+        case MSG_MANAGERS_ONLY:
+            return $INFO['ismanager'];
+
+        case MSG_ADMINS_ONLY:
+            return $INFO['isadmin'];
+
+        default:
+            trigger_error('invalid msg allow restriction.  msg="'.$msg['msg'].'" allow='.$msg['allow'].'"', E_USER_WARNING);
+            return $INFO['isadmin'];
+    }
+
+    return false;
+}
+
+/**
+ * print debug messages
+ *
+ * little function to print the content of a var
+ *
+ * @author Andreas Gohr 
+ */
+function dbg($msg,$hidden=false){
+    if($hidden){
+        echo "";
+    }else{
+        echo '
        ';
+        echo hsc(print_r($msg,true));
+        echo '
        ';
+    }
+}
+
+/**
+ * Print info to a log file
+ *
+ * @author Andreas Gohr 
+ */
+function dbglog($msg,$header=''){
+    global $conf;
+    // The debug log isn't automatically cleaned thus only write it when
+    // debugging has been enabled by the user.
+    if($conf['allowdebug'] !== 1) return;
+    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);
+    }
+}
+
+/**
+ * Print a reversed, prettyprinted backtrace
+ *
+ * @author Gary Owen 
+ */
+function dbg_backtrace(){
+    // Get backtrace
+    $backtrace = debug_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.'"';
+                }
+            }
+        }
+        $params = implode(', ',$params);
+
+        $calls[$depth - $i] = sprintf('%s(%s) called at %s',
+                $function,
+                str_replace("\n", '\n', $params),
+                $location);
+    }
+    ksort($calls);
+
+    return implode("\n", $calls);
+}
+
+/**
+ * Remove all data from an array where the key seems to point to sensitive data
+ *
+ * This is used to remove passwords, mail addresses and similar data from the
+ * debug output
+ *
+ * @author Andreas Gohr 
+ */
+function debug_guard(&$data){
+    foreach($data as $key => $value){
+        if(preg_match('/(notify|pass|auth|secret|ftp|userinfo|token|buid|mail|proxy)/i',$key)){
+            $data[$key] = '***';
+            continue;
+        }
+        if(is_array($value)) debug_guard($data[$key]);
+    }
+}
diff --git a/sources/inc/init.php b/sources/inc/init.php
new file mode 100644
index 0000000..a937b93
--- /dev/null
+++ b/sources/inc/init.php
@@ -0,0 +1,579 @@
+')) {
+        session_set_cookie_params(0,$cookieDir,'',($conf['securecookie'] && is_ssl()),true);
+    }else{
+        session_set_cookie_params(0,$cookieDir,'',($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']);
+    }
+}
+
+// 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);
+}
+if(function_exists('set_magic_quotes_runtime')) @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);
+
+// 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')){
+    $conf['compression'] = 'gz';
+}
+if($conf['compression'] == 'gz' && !function_exists('gzopen')){
+    $conf['compression'] = 0;
+}
+
+// fix dateformat for upgraders
+if(strpos($conf['dformat'],'%') === false){
+    $conf['dformat'] = '%Y/%m/%d %H:%M';
+}
+
+// precalculate file creation modes
+init_creationmodes();
+
+// make real paths and check them
+init_paths();
+init_files();
+
+// setup plugin controller class (can be overwritten in preload.php)
+$plugin_types = array('auth', 'admin','syntax','action','renderer', 'helper','remote');
+global $plugin_controller_class, $plugin_controller;
+if (empty($plugin_controller_class)) $plugin_controller_class = 'Doku_Plugin_Controller';
+
+// load libraries
+require_once(DOKU_INC.'inc/load.php');
+
+// input handle class
+global $INPUT;
+$INPUT = new Input();
+
+// initialize plugin controller
+$plugin_controller = new $plugin_controller_class();
+
+// initialize the event handler
+global $EVENT_HANDLER;
+$EVENT_HANDLER = new Doku_Event_Handler();
+
+$local = $conf['lang'];
+trigger_event('INIT_LANG_LOAD', $local, 'init_lang', true);
+
+
+// setup authentication system
+if (!defined('NOSESSION')) {
+    auth_setup();
+}
+
+// setup mail system
+mail_setup();
+
+/**
+ * Checks paths from config file
+ */
+function init_paths(){
+    global $conf;
+
+    $paths = array('datadir'   => 'pages',
+            'olddir'    => 'attic',
+            'mediadir'  => 'media',
+            'mediaolddir' => 'media_attic',
+            'metadir'   => 'meta',
+            'mediametadir' => 'media_meta',
+            'cachedir'  => 'cache',
+            'indexdir'  => 'index',
+            'lockdir'   => 'locks',
+            'tmpdir'    => 'tmp');
+
+    foreach($paths as $c => $p) {
+        $path = empty($conf[$c]) ? $conf['savedir'].'/'.$p : $conf[$c];
+        $conf[$c] = init_path($path);
+        if(empty($conf[$c]))
+            nice_die("The $c ('$p') at $path is not found, 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';
+}
+
+function init_lang($langCode) {
+    //prepare language array
+    global $lang;
+    $lang = array();
+
+    //load the language files
+    require(DOKU_INC.'inc/lang/en/lang.php');
+    if ($langCode && $langCode != 'en') {
+        if (file_exists(DOKU_INC."inc/lang/$langCode/lang.php")) {
+            require(DOKU_INC."inc/lang/$langCode/lang.php");
+        }
+    }
+}
+
+/**
+ * Checks the existence of certain files and creates them if missing.
+ */
+function init_files(){
+    global $conf;
+
+    $files = array($conf['indexdir'].'/page.idx');
+
+    foreach($files as $file){
+        if(!@file_exists($file)){
+            $fh = @fopen($file,'a');
+            if($fh){
+                fclose($fh);
+                if(!empty($conf['fperm'])) chmod($file, $conf['fperm']);
+            }else{
+                nice_die("$file is not writable. Check your permissions settings!");
+            }
+        }
+    }
+
+    # create title index (needs to have same length as page.idx)
+    /*
+    $file = $conf['indexdir'].'/title.idx';
+    if(!@file_exists($file)){
+        $pages = file($conf['indexdir'].'/page.idx');
+        $pages = count($pages);
+        $fh = @fopen($file,'a');
+        if($fh){
+            for($i=0; $i<$pages; $i++){
+                fwrite($fh,"\n");
+            }
+            fclose($fh);
+        }else{
+            nice_die("$file is not writable. Check your permissions settings!");
+        }
+    }
+    */
+}
+
+/**
+ * Returns absolute path
+ *
+ * This tries the given path first, then checks in DOKU_INC.
+ * Check for accessibility on directories as well.
+ *
+ * @author Andreas Gohr 
+ */
+function init_path($path){
+    // check existence
+    $p = fullpath($path);
+    if(!@file_exists($p)){
+        $p = fullpath(DOKU_INC.$path);
+        if(!@file_exists($p)){
+            return '';
+        }
+    }
+
+    // check writability
+    if(!@is_writable($p)){
+        return '';
+    }
+
+    // check accessability (execute bit) for directories
+    if(@is_dir($p) && !@file_exists("$p/.")){
+        return '';
+    }
+
+    return $p;
+}
+
+/**
+ * Sets the internal config values fperm and dperm which, when set,
+ * will be used to change the permission of a newly created dir or
+ * file with chmod. Considers the influence of the system's umask
+ * setting the values only if needed.
+ */
+function init_creationmodes(){
+    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'];
+}
+
+/**
+ * remove magic quotes recursivly
+ *
+ * @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]);
+        }
+    }
+}
+
+/**
+ * Returns the full absolute URL to the directory where
+ * DokuWiki is installed in (includes a trailing slash)
+ *
+ * @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
+    if(isset($_SERVER['HTTP_HOST'])){
+        $parsed_host = parse_url('http://'.$_SERVER['HTTP_HOST']);
+        $host = $parsed_host['host'];
+        $port = $parsed_host['port'];
+    }elseif(isset($_SERVER['SERVER_NAME'])){
+        $parsed_host = parse_url('http://'.$_SERVER['SERVER_NAME']);
+        $host = $parsed_host['host'];
+        $port = $parsed_host['port'];
+    }else{
+        $host = php_uname('n');
+        $port = '';
+    }
+
+    if(!$port && isset($_SERVER['SERVER_PORT'])) {
+        $port = $_SERVER['SERVER_PORT'];
+    }
+
+    if(is_null($port)){
+        $port = '';
+    }
+
+    if(!is_ssl()){
+        $proto = 'http://';
+        if ($port == '80') {
+            $port = '';
+        }
+    }else{
+        $proto = 'https://';
+        if ($port == '443') {
+            $port = '';
+        }
+    }
+
+    if($port !== '') $port = ':'.$port;
+
+    return $proto.$host.$port.$dir;
+}
+
+/**
+ * Check if accessed via HTTPS
+ *
+ * Apache leaves ,$_SERVER['HTTPS'] empty when not available, IIS sets it to 'off'.
+ * 'false' and 'disabled' are just guessing
+ *
+ * @returns bool true when SSL is active
+ */
+function is_ssl(){
+    if (!isset($_SERVER['HTTPS']) ||
+        preg_match('/^(|off|false|disabled)$/i',$_SERVER['HTTPS'])){
+        return false;
+    }else{
+        return true;
+    }
+}
+
+/**
+ * print a nice message even if no styles are loaded yet.
+ */
+function nice_die($msg){
+    echo<<
+
+DokuWiki Setup Error
+
+    
        
+        
        DokuWiki Setup Error
        
+        
        $msg
        
+    
        
+
+
+EOT;
+    exit;
+}
+
+/**
+ * A realpath() replacement
+ *
+ * This function behaves similar to PHP's realpath() but does not resolve
+ * symlinks or accesses upper directories
+ *
+ * @author Andreas Gohr 
+ * @author 
+ * @link   http://de3.php.net/manual/en/function.realpath.php#75992
+ */
+function fullpath($path,$exists=false){
+    static $run = 0;
+    $root  = '';
+    $iswin = (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN' || @$GLOBALS['DOKU_UNITTEST_ASSUME_WINDOWS']);
+
+    // find the (indestructable) root of the path - keeps windows stuff intact
+    if($path{0} == '/'){
+        $root = '/';
+    }elseif($iswin){
+        // match drive letter and UNC paths
+        if(preg_match('!^([a-zA-z]:)(.*)!',$path,$match)){
+            $root = $match[1].'/';
+            $path = $match[2];
+        }else if(preg_match('!^(\\\\\\\\[^\\\\/]+\\\\[^\\\\/]+[\\\\/])(.*)!',$path,$match)){
+            $root = $match[1];
+            $path = $match[2];
+        }
+    }
+    $path = str_replace('\\','/',$path);
+
+    // if the given path wasn't absolute already, prepend the script path and retry
+    if(!$root){
+        $base = dirname($_SERVER['SCRIPT_FILENAME']);
+        $path = $base.'/'.$path;
+        if($run == 0){ // avoid endless recursion when base isn't absolute for some reason
+            $run++;
+            return fullpath($path,$exists);
+        }
+    }
+    $run = 0;
+
+    // canonicalize
+    $path=explode('/', $path);
+    $newpath=array();
+    foreach($path as $p) {
+        if ($p === '' || $p === '.') continue;
+        if ($p==='..') {
+            array_pop($newpath);
+            continue;
+        }
+        array_push($newpath, $p);
+    }
+    $finalpath = $root.implode('/', $newpath);
+
+    // check for existence when needed (except when unit testing)
+    if($exists && !defined('DOKU_UNITTEST') && !@file_exists($finalpath)) {
+        return false;
+    }
+    return $finalpath;
+}
+
diff --git a/sources/inc/io.php b/sources/inc/io.php
new file mode 100644
index 0000000..eff0279
--- /dev/null
+++ b/sources/inc/io.php
@@ -0,0 +1,593 @@
+
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+
+/**
+ * Removes empty directories
+ *
+ * Sends IO_NAMESPACE_DELETED events for 'pages' and 'media' namespaces.
+ * Event data:
+ * $data[0]    ns: The colon separated namespace path minus the trailing page name.
+ * $data[1]    ns_type: 'pages' or 'media' namespace tree.
+ *
+ * @todo use safemode hack
+ * @param string $id      - a pageid, the namespace of that id will be tried to deleted
+ * @param string $basedir - the config name of the type to delete (datadir or mediadir usally)
+ * @return bool - true if at least one namespace was deleted
+ * @author  Andreas Gohr 
+ * @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;
+}
+
+/**
+ * Used to read in a DokuWiki page from file, and send IO_WIKIPAGE_READ events.
+ *
+ * Generates the action event which delegates to io_readFile().
+ * Action plugins are allowed to modify the page content in transit.
+ * The file path should not be changed.
+ *
+ * Event data:
+ * $data[0]    The raw arguments for io_readFile as an array.
+ * $data[1]    ns: The colon separated namespace path minus the trailing page name. (false if root ns)
+ * $data[2]    page_name: The wiki page name.
+ * $data[3]    rev: The page revision, false for current wiki pages.
+ *
+ * @author Ben Coburn 
+ */
+function io_readWikiPage($file, $id, $rev=false) {
+    if (empty($rev)) { $rev = false; }
+    $data = array(array($file, true), getNS($id), noNS($id), $rev);
+    return trigger_event('IO_WIKIPAGE_READ', $data, '_io_readWikiPage_action', false);
+}
+
+/**
+ * Callback adapter for io_readFile().
+ * @author Ben Coburn 
+ */
+function _io_readWikiPage_action($data) {
+    if (is_array($data) && is_array($data[0]) && count($data[0])===2) {
+        return call_user_func_array('io_readFile', $data[0]);
+    } else {
+        return ''; //callback error
+    }
+}
+
+/**
+ * Returns content of $file as cleaned string.
+ *
+ * Uses gzip if extension is .gz
+ *
+ * If you want to use the returned value in unserialize
+ * be sure to set $clean to false!
+ *
+ * @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);
+        }else{
+            $ret = file_get_contents($file);
+        }
+    }
+    if($clean){
+        return cleanText($ret);
+    }else{
+        return $ret;
+    }
+}
+/**
+ * Returns the content of a .bz2 compressed file as string
+ * @author marcel senf 
+ */
+
+function bzfile($file){
+    $bz = bzopen($file,"r");
+    $str = '';
+    while (!feof($bz)){
+        //8192 seems to be the maximum buffersize?
+        $str = $str . bzread($bz,8192);
+    }
+    bzclose($bz);
+    return $str;
+}
+
+
+/**
+ * Used to write out a DokuWiki page to file, and send IO_WIKIPAGE_WRITE events.
+ *
+ * This generates an action event and delegates to io_saveFile().
+ * Action plugins are allowed to modify the page content in transit.
+ * The file path should not be changed.
+ * (The append parameter is set to false.)
+ *
+ * Event data:
+ * $data[0]    The raw arguments for io_saveFile as an array.
+ * $data[1]    ns: The colon separated namespace path minus the trailing page name. (false if root ns)
+ * $data[2]    page_name: The wiki page name.
+ * $data[3]    rev: The page revision, false for current wiki pages.
+ *
+ * @author Ben Coburn 
+ */
+function io_writeWikiPage($file, $content, $id, $rev=false) {
+    if (empty($rev)) { $rev = false; }
+    if ($rev===false) { io_createNamespace($id); } // create namespaces as needed
+    $data = array(array($file, $content, false), getNS($id), noNS($id), $rev);
+    return trigger_event('IO_WIKIPAGE_WRITE', $data, '_io_writeWikiPage_action', false);
+}
+
+/**
+ * Callback adapter for io_saveFile().
+ * @author Ben Coburn 
+ */
+function _io_writeWikiPage_action($data) {
+    if (is_array($data) && is_array($data[0]) && count($data[0])===3) {
+        return call_user_func_array('io_saveFile', $data[0]);
+    } else {
+        return false; //callback error
+    }
+}
+
+/**
+ * Saves $content to $file.
+ *
+ * If the third parameter is set to true the given content
+ * will be appended.
+ *
+ * Uses gzip if extension is .gz
+ * and bz2 if extension is .bz2
+ *
+ * @author  Andreas Gohr 
+ * @return bool true on success
+ */
+function io_saveFile($file,$content,$append=false){
+    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;
+        }
+        fwrite($fh, $content);
+        fclose($fh);
+    }
+
+    if(!$fileexists and !empty($conf['fperm'])) chmod($file, $conf['fperm']);
+    io_unlock($file);
+    return true;
+}
+
+/**
+ * Delete exact linematch for $badline from $file.
+ *
+ * Be sure to include the trailing newline in $badline
+ *
+ * Uses gzip if extension is .gz
+ *
+ * 2005-10-14 : added regex option -- Christopher Smith 
+ *
+ * @author Steven Danz 
+ * @return bool true on success
+ */
+function io_deleteFromFile($file,$badline,$regex=false){
+    if (!@file_exists($file)) return true;
+
+    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);
+        }
+    }
+
+    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{
+        @unlink($file);
+    }
+
+    io_unlock($file);
+    return true;
+}
+
+/**
+ * Tries to lock a file
+ *
+ * Locking is only done for io_savefile and uses directories
+ * inside $conf['lockdir']
+ *
+ * It waits maximal 3 seconds for the lock, after this time
+ * the lock is assumed to be stale and the function goes on
+ *
+ * @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);
+}
+
+/**
+ * Unlocks a file
+ *
+ * @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);
+}
+
+/**
+ * Create missing namespace directories and send the IO_NAMESPACE_CREATED events
+ * in the order of directory creation. (Parent directories first.)
+ *
+ * Event data:
+ * $data[0]    ns: The colon separated namespace path minus the trailing page name.
+ * $data[1]    ns_type: 'pages' or 'media' namespace tree.
+ *
+ * @author Ben Coburn 
+ */
+function io_createNamespace($id, $ns_type='pages') {
+    // verify ns_type
+    $types = array('pages'=>'wikiFN', 'media'=>'mediaFN');
+    if (!isset($types[$ns_type])) {
+        trigger_error('Bad $ns_type parameter for io_createNamespace().');
+        return;
+    }
+    // make event list
+    $missing = array();
+    $ns_stack = explode(':', $id);
+    $ns = $id;
+    $tmp = dirname( $file = call_user_func($types[$ns_type], $ns) );
+    while (!@is_dir($tmp) && !(@file_exists($tmp) && !is_dir($tmp))) {
+        array_pop($ns_stack);
+        $ns = implode(':', $ns_stack);
+        if (strlen($ns)==0) { break; }
+        $missing[] = $ns;
+        $tmp = dirname(call_user_func($types[$ns_type], $ns));
+    }
+    // make directories
+    io_makeFileDir($file);
+    // send the events
+    $missing = array_reverse($missing); // inside out
+    foreach ($missing as $ns) {
+        $data = array($ns, $ns_type);
+        trigger_event('IO_NAMESPACE_CREATED', $data);
+    }
+}
+
+/**
+ * Create the directory needed for the given file
+ *
+ * @author  Andreas Gohr 
+ */
+function io_makeFileDir($file){
+    global $conf;
+
+    $dir = dirname($file);
+    if(!@is_dir($dir)){
+        io_mkdir_p($dir) || msg("Creating directory $dir failed",-1);
+    }
+}
+
+/**
+ * Creates a directory hierachy.
+ *
+ * @link    http://www.php.net/manual/en/function.mkdir.php
+ * @author  
+ * @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 && !empty($conf['dperm'])) chmod($target, $conf['dperm']);
+            return $ret;
+        }
+    }
+    return 0;
+}
+
+/**
+ * Creates a directory using FTP
+ *
+ * This is used when the safemode workaround is enabled
+ *
+ * @author 
+ */
+function io_mkdir_ftp($dir){
+    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));
+
+    @ftp_close($conn);
+    return $ok;
+}
+
+/**
+ * Creates a unique temporary directory and returns
+ * its path.
+ *
+ * @author Michael Klier 
+ */
+function io_mktmpdir() {
+    global $conf;
+
+    $base = $conf['tmpdir'];
+    $dir  = md5(uniqid(mt_rand(), true));
+    $tmpdir = $base.'/'.$dir;
+
+    if(io_mkdir_p($tmpdir)) {
+        return($tmpdir);
+    } else {
+        return false;
+    }
+}
+
+/**
+ * downloads a file from the net and saves it
+ *
+ * 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
+ *
+ * @author Andreas Gohr 
+ * @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
+    $http->keep_alive = false; // we do single ops here, no need for keep-alive
+
+    $data = $http->get($url);
+    if(!$data) return false;
+
+    $name = '';
+    if ($useAttachment) {
+        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 = utf8_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;
+}
+
+/**
+ * Windows compatible rename
+ *
+ * rename() can not overwrite existing files on Windows
+ * 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;
+}
+
+/**
+ * Runs an external command with input and output pipes.
+ * Returns the exit code from the process.
+ *
+ * @author Tom N Harris 
+ */
+function io_exec($cmd, $input, &$output){
+    $descspec = array(
+            0=>array("pipe","r"),
+            1=>array("pipe","w"),
+            2=>array("pipe","w"));
+    $ph = proc_open($cmd, $descspec, $pipes);
+    if(!$ph) return -1;
+    fclose($pipes[2]); // ignore stderr
+    fwrite($pipes[0], $input);
+    fclose($pipes[0]);
+    $output = stream_get_contents($pipes[1]);
+    fclose($pipes[1]);
+    return proc_close($ph);
+}
+
+/**
+ * Search a file for matching lines
+ *
+ * This is probably not faster than file()+preg_grep() but less
+ * memory intensive because not the whole file needs to be loaded
+ * at once.
+ *
+ * @author Andreas Gohr 
+ * @param  string $file    The file to search
+ * @param  string $pattern PCRE pattern
+ * @param  int    $max     How many lines to return (0 for all)
+ * @param  bool   $backref When true returns array with backreferences instead of lines
+ * @return array 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;
+        $line = '';
+    }
+    fclose($fh);
+    return $matches;
+}
+
diff --git a/sources/inc/lang/af/lang.php b/sources/inc/lang/af/lang.php
new file mode 100644
index 0000000..826fda6
--- /dev/null
+++ b/sources/inc/lang/af/lang.php
@@ -0,0 +1,70 @@
+%s is nie beskibaar nie. Miskien is dit af gehaal.';
diff --git a/sources/inc/lang/ar/admin.txt b/sources/inc/lang/ar/admin.txt
new file mode 100644
index 0000000..bbb4438
--- /dev/null
+++ b/sources/inc/lang/ar/admin.txt
@@ -0,0 +1,3 @@
+====== الأدارة ======
+
+قائمة بالمهام الإدارية المتاحة فى دوكو ويكي.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/adminplugins.txt b/sources/inc/lang/ar/adminplugins.txt
new file mode 100644
index 0000000..44790a0
--- /dev/null
+++ b/sources/inc/lang/ar/adminplugins.txt
@@ -0,0 +1 @@
+===== إضافات إضافية =====
\ No newline at end of file
diff --git a/sources/inc/lang/ar/backlinks.txt b/sources/inc/lang/ar/backlinks.txt
new file mode 100644
index 0000000..f6d24f4
--- /dev/null
+++ b/sources/inc/lang/ar/backlinks.txt
@@ -0,0 +1,3 @@
+====== إرتباطات ======
+
+هذه قائمة بالصفحات المرتبطة بالصفحة الحالية.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/conflict.txt b/sources/inc/lang/ar/conflict.txt
new file mode 100644
index 0000000..4d7c4e8
--- /dev/null
+++ b/sources/inc/lang/ar/conflict.txt
@@ -0,0 +1,5 @@
+====== يوجد نسخة أحدث ======
+
+يوجد نسخة أحدث من هذه الصفحة. يحدث هذا عندما يحرر مشترك آخر الصفحة أثناء تعديلك لها.
+
+افحص الاختلافات جيداً، ثم حدد أية نسخة تحفظ. بالضغط على "حفظ" ستحفظ نسختك. أما بالضغط على "إلغاء" فستحافظ على النسخة الحالية.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/denied.txt b/sources/inc/lang/ar/denied.txt
new file mode 100644
index 0000000..1140523
--- /dev/null
+++ b/sources/inc/lang/ar/denied.txt
@@ -0,0 +1,3 @@
+====== لا صلاحيات ======
+
+عذرا، ليس مصرح لك الاستمرار، لعلك نسيت تسجيل الدخول؟
\ No newline at end of file
diff --git a/sources/inc/lang/ar/diff.txt b/sources/inc/lang/ar/diff.txt
new file mode 100644
index 0000000..ed1937c
--- /dev/null
+++ b/sources/inc/lang/ar/diff.txt
@@ -0,0 +1,3 @@
+====== اختلافات ======
+
+عرض الاختلافات بين النسخة المختارة و النسخة الحالية من الصفحة.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/draft.txt b/sources/inc/lang/ar/draft.txt
new file mode 100644
index 0000000..50c07f2
--- /dev/null
+++ b/sources/inc/lang/ar/draft.txt
@@ -0,0 +1,5 @@
+====== وجدت مسوّدة ======
+
+إن تعديلك لهذه الصفحة في المرة الماضية لم يتم بشكل صحيح، حفظت دوكو ويكي آلياً مسوّدة من عملك الأخير الذي يمكنك استخدامه الآن لمتابعة التعديل. فيما يلي البيانات التي حفظت من المرة الماضية.
+
+يرجى أن تقرر إن كنت تريد //استعادة// عملك السابق أو //حذف// المسوّدة أو //إلغاء// عملية التحرير.
diff --git a/sources/inc/lang/ar/edit.txt b/sources/inc/lang/ar/edit.txt
new file mode 100644
index 0000000..d4e1eb4
--- /dev/null
+++ b/sources/inc/lang/ar/edit.txt
@@ -0,0 +1 @@
+حرر هذه الصفحة ثم اضغط على "حفظ". انظر [[wiki:syntax|دليل الصياغة]] لمعرفة صيغة الويكي. يرجى تعديل الصفحة فقط إذا كنت ستحسنها. إذا رغبت فى اختبار شيء ما، تعلم الخطوات الأولى فى [[playground:playground|الملعب]].
\ No newline at end of file
diff --git a/sources/inc/lang/ar/editrev.txt b/sources/inc/lang/ar/editrev.txt
new file mode 100644
index 0000000..a51fe94
--- /dev/null
+++ b/sources/inc/lang/ar/editrev.txt
@@ -0,0 +1,2 @@
+**لقد حملت نسخة قديمة من الصفحة!** إذا حفظتها، سيتم إنشاء نسخة جديدة بهذه المعلومات.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/ar/index.txt b/sources/inc/lang/ar/index.txt
new file mode 100644
index 0000000..43840ec
--- /dev/null
+++ b/sources/inc/lang/ar/index.txt
@@ -0,0 +1,3 @@
+====== فهرس ======
+
+هذا فهرس لجميع الصفحات مرتبة حسب [[doku>namespaces|namespaces]].
diff --git a/sources/inc/lang/ar/install.html b/sources/inc/lang/ar/install.html
new file mode 100644
index 0000000..3ef23ae
--- /dev/null
+++ b/sources/inc/lang/ar/install.html
@@ -0,0 +1,12 @@
+
        تساعد هذه الصفحة في التثبيت والإعداد الأوليين ل دوكو ويكي. مزيد من المعلومات عن هذا المثبت في
+صفحة التوثيق الخاصة به.
        
+
+
        دوكو ويكي تستخدم ملفات عادية لتخزين الصفحات و المعلومات المرتبطة بها (مثل. الصور , وفهارس البحث, والنسخ القديمة, إلخ). لكي تعمل بنجاح دوكو ويكي يجب ان يكون لديها اذن بالكتابة على المجلدات التي تحوي هذه الملفات. هذا المثبت غير قادر على اعداد اذونات المجلدات. عادة يجب عمل هذا مباشرة باستخدام أمر في محث الاوامر أو إن كنت تستخدم استضافة، عن طريقة FTP في لوحة تحكم الاستضافة (مثل. cPanel).
        
+
+
        سيُعد هذا المثبت اعدادات دوكو ويكي ل
+ACL, الذي سيسمح للمدير بالولوج و الوصول لقائمة إدارة دوكو ويكي لتثبيت الإضافات، وإدارة المستخدمين، و التحكم بالوصول لصفحات الويكي، وتعديل الاعدادات.
+ليس مطلوبا لأجل عمل دوكو ويكي, لكنه سيجعل دوكو ويكي أسهل على المدير.
        
+
+
        المستخدمين الخبراء و المستخدمين مع متطلبات خاصة عليهم استخدام هذا الرابط لتفاصيل تتعلق ب
+توجيهات التثبيت
+و ضبط الإعدادات.
        
\ No newline at end of file
diff --git a/sources/inc/lang/ar/lang.php b/sources/inc/lang/ar/lang.php
new file mode 100644
index 0000000..fdb407d
--- /dev/null
+++ b/sources/inc/lang/ar/lang.php
@@ -0,0 +1,333 @@
+
+ * @author Yaman Hokan 
+ * @author Usama Akkad 
+ * @author uahello@gmail.com
+ * @author Ahmad Abd-Elghany 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'rtl';
+$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_profile']           = 'حدث الملف الشخصي';
+$lang['btn_reset']             = 'صفّر';
+$lang['btn_resendpwd']         = 'اضبط كلمة سر جديدة';
+$lang['btn_draft']             = 'حرر المسودة';
+$lang['btn_recover']           = 'استرجع المسودة';
+$lang['btn_draftdel']          = 'احذف المسوّدة';
+$lang['btn_revert']            = 'استعد';
+$lang['btn_register']          = 'سجّل';
+$lang['btn_apply']             = 'طبق';
+$lang['btn_media']             = 'مدير الوسائط';
+$lang['btn_deleteuser']        = 'احذف حسابي الخاص';
+$lang['loggedinas']            = 'داخل باسم';
+$lang['user']                  = 'اسم المستخدم';
+$lang['pass']                  = 'كلمة السر';
+$lang['newpass']               = 'كلمة سر جديدة';
+$lang['oldpass']               = 'أكد كلمة السر الحالية';
+$lang['passchk']               = 'مرة أخرى';
+$lang['remember']              = 'تذكرني';
+$lang['fullname']              = 'الاسم الحقيقي';
+$lang['email']                 = 'البريد الإلكتروني';
+$lang['profile']               = 'الملف الشخصي';
+$lang['badlogin']              = 'عذرا، اسم المشترك أو كلمة السر غير صحيحة';
+$lang['badpassconfirm']        = 'عذراً,كلمة السر غير صحيحة';
+$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['profnodelete']          = 'هذه الموسوعه لا ندعم حذف الأشخاص';
+$lang['profdeleteuser']        = 'احذف حساب';
+$lang['profdeleted']           = 'حسابك الخاص تم حذفه من هذه الموسوعة';
+$lang['profconfdelete']        = 'أنا أرغب في حذف حسابي من هذه الموسوعة.
         
+هذا الحدث غير ممكن.';
+$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['maxuploadsize']         = 'الحجم الاقصى %s للملف';
+$lang['lockedby']              = 'مقفلة حاليا لـ';
+$lang['lockexpire']            = 'ينتهي القفل في';
+$lang['js']['willexpire']      = 'سينتهي قفل تحرير هذه الصفحه خلال دقيقة.\nلتجنب التعارض استخدم زر المعاينة لتصفير مؤقت القفل.';
+$lang['js']['notsavedyet']     = 'التعديلات غير المحفوظة ستفقد.';
+$lang['js']['searchmedia']     = 'ابحث عن ملفات';
+$lang['js']['keepopen']        = 'أبقي النافذة مفتوحة أثناء الاختيار';
+$lang['js']['hidedetails']     = 'أخف التفاصيل';
+$lang['js']['mediatitle']      = 'إعدادات الرابط';
+$lang['js']['mediadisplay']    = 'نوع الرابط';
+$lang['js']['mediaalign']      = 'المحاذاة';
+$lang['js']['mediasize']       = 'حجم الصورة';
+$lang['js']['mediatarget']     = 'هدف الرابط';
+$lang['js']['mediaclose']      = 'أغلق';
+$lang['js']['mediainsert']     = 'أدرج';
+$lang['js']['mediadisplayimg'] = 'أظهر الصورة.';
+$lang['js']['mediadisplaylnk'] = 'اظهر الرابط فقط.';
+$lang['js']['mediasmall']      = 'نسخة مصغرة';
+$lang['js']['mediamedium']     = 'نسخة متوسطة';
+$lang['js']['medialarge']      = 'نسخة كبيرة';
+$lang['js']['mediaoriginal']   = 'النسخة الأصلية';
+$lang['js']['medialnk']        = 'الرابط لصفحة التفاصيل';
+$lang['js']['mediadirect']     = 'رابط مباشر للأصل';
+$lang['js']['medianolnk']      = 'لا رابط';
+$lang['js']['medianolink']     = 'لا تربط الصورة';
+$lang['js']['medialeft']       = 'حاذي الصورة إلى اليسار.';
+$lang['js']['mediaright']      = 'حاذي الصورة إلى اليمين.';
+$lang['js']['mediacenter']     = 'حاذي الصورة إلى الوسط.';
+$lang['js']['medianoalign']    = 'لا تستعمل المحاذاة.';
+$lang['js']['nosmblinks']      = 'الروابط لمجلدات مشاركة وندز تعمل فقط مع متصفح مايكروسفت Internet Explorer.
+ما زال بإمكانك قص و لصق الرابط.';
+$lang['js']['linkwiz']         = 'مرشد الروابط';
+$lang['js']['linkto']          = 'الرابط إلى :';
+$lang['js']['del_confirm']     = 'هل حقاً تريد حذف البنود المختارة؟';
+$lang['js']['restore_confirm'] = 'أمتأكد من استرجاع هذه النسخة؟';
+$lang['js']['media_diff']      = 'عرض الفروق:';
+$lang['js']['media_diff_both'] = 'جنبا إلى جنب';
+$lang['js']['media_diff_opacity'] = 'Shine-through';
+$lang['js']['media_diff_portions'] = 'Swipe';
+$lang['js']['media_select']    = 'اختر ملفا...';
+$lang['js']['media_upload_btn'] = 'ارفع';
+$lang['js']['media_done_btn']  = 'تم';
+$lang['js']['media_drop']      = 'اسقط الملف هنا لرفعه';
+$lang['js']['media_cancel']    = 'أزل';
+$lang['js']['media_overwrt']   = 'أكتب فوق الملفات الموجودة';
+$lang['rssfailed']             = 'خطأ ما حدث أثناء جلب ملف التغذية:';
+$lang['nothingfound']          = 'لا يوجد شيء';
+$lang['mediaselect']           = 'ملفات الوسائط';
+$lang['fileupload']            = 'تحميل ملف وسائط';
+$lang['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['accessdenied']          = 'لا يسمح لك برؤية هذه الصفحة.';
+$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['difflink']              = 'رابط إلى هذه المقارنة';
+$lang['diff_type']             = 'أظهر الفروق:';
+$lang['diff_inline']           = 'ضمنا';
+$lang['diff_side']             = 'جنبا إلى جنب';
+$lang['line']                  = 'سطر';
+$lang['breadcrumb']            = 'أثر';
+$lang['youarehere']            = 'أنت هنا';
+$lang['lastmod']               = 'آخر تعديل';
+$lang['by']                    = 'بواسطة';
+$lang['deleted']               = 'حذفت';
+$lang['created']               = 'اُنشئت';
+$lang['restored']              = 'استعيدت نسخة قديمة (%s)';
+$lang['external_edit']         = 'تحرير خارجي';
+$lang['summary']               = 'ملخص التحرير';
+$lang['noflash']               = 'تحتاج إلىملحق فلاش أدوبي لعرض هذا المحتوى.';
+$lang['download']              = 'نزل Snippet';
+$lang['tools']                 = 'أدوات';
+$lang['user_tools']            = 'أدوات المستخدم';
+$lang['site_tools']            = 'أدوات الموقع';
+$lang['page_tools']            = 'أدوات الصفحة';
+$lang['skip_to_content']       = 'تجاوز إلى المحتوى';
+$lang['sidebar']               = 'العمود الجانبي';
+$lang['mail_newpage']          = 'إضافة صفحة:';
+$lang['mail_changed']          = 'تعديل صفحة:';
+$lang['mail_subscribe_list']   = 'صفحات غيرت في النطاق:';
+$lang['mail_new_user']         = 'مشترك جديد:';
+$lang['mail_upload']           = 'رفع ملف:';
+$lang['changes_type']          = 'أظهر تغييرات الـ';
+$lang['pages_changes']         = 'صفحات';
+$lang['media_changes']         = 'ملفات الوسائط';
+$lang['both_changes']          = 'كلا من الصفحات وملفات الوسائط';
+$lang['qb_bold']               = 'نص عريض';
+$lang['qb_italic']             = 'نص مائل';
+$lang['qb_underl']             = 'نص مسطر';
+$lang['qb_code']               = 'نص برمجي';
+$lang['qb_strike']             = 'نص مشطوب';
+$lang['qb_h1']                 = 'عنوان مستوى ١';
+$lang['qb_h2']                 = 'عنوان مستوى ٢';
+$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']                 = 'سطر أفقي';
+$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['img_width']             = 'العرض';
+$lang['img_height']            = 'الإرتفاع';
+$lang['img_manager']           = 'اعرض في مدير الوسائط';
+$lang['subscr_subscribe_success'] = 'اضيف %s لقائمة اشتراك %s';
+$lang['subscr_subscribe_error'] = 'خطأ في إضافة %s لقائمة اشتراك %s';
+$lang['subscr_subscribe_noaddress'] = 'ليس هناك عنوان مرتبط بولوجك، لا يمكن اضافتك لقائمة الاشتراك';
+$lang['subscr_unsubscribe_success'] = 'أزيل %s من قائمة اشتراك %s';
+$lang['subscr_unsubscribe_error'] = 'خطأ في إزالة %s من قائمة اشتراك %s';
+$lang['subscr_already_subscribed'] = '%s مشترك مسبقا في %s';
+$lang['subscr_not_subscribed'] = '%s ليس مشتركا في %s';
+$lang['subscr_m_not_subscribed'] = 'لست مشتركا حاليا بالصفحة او النطاق الحاليين';
+$lang['subscr_m_new_header']   = 'أضف اشتراكا';
+$lang['subscr_m_current_header'] = 'الاشتراكات الحالية';
+$lang['subscr_m_unsubscribe']  = 'ألغ الاشتراك';
+$lang['subscr_m_subscribe']    = 'اشترك';
+$lang['subscr_m_receive']      = 'استقبال';
+$lang['subscr_style_every']    = 'بريدا على كل تغيير';
+$lang['authtempfail']          = 'تصريح المشترك غير متوفر مؤقتاً، إن استمرت هذه الحالة يرجى مراسلة المدير';
+$lang['authpwdexpire']         = 'ستنتهي صلاحية كلمة السر في %d . عليك بتغييرها سريعا.';
+$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_confexists']          = 'إن %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_policy']              = 'تصريح ACL مبدئي';
+$lang['i_pol0']                = 'ويكي مفتوحة؛ أي القراءة والكتابة والتحميل مسموحة للجميع';
+$lang['i_pol1']                = 'ويكي عامة؛ أي القراءة للجميع ولكن الكتابة والتحميل للمشتركين المسجلين فقط';
+$lang['i_pol2']                = 'ويكي مغلقة؛ أي القراءة والكتابة والتحميل للمشتركين المسجلين فقط';
+$lang['i_retry']               = 'إعادة المحاولة';
+$lang['i_license']             = 'اختر الرخصة التي تريد وضع المحتوى تحتها:';
+$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 ثانية مضت';
+$lang['wordblock']             = 'لم تحفظ تغييراتك لاحتوائها على نص ممنوع )غثاء(';
+$lang['media_uploadtab']       = 'ارفع';
+$lang['media_searchtab']       = 'ابحث';
+$lang['media_file']            = 'ملف';
+$lang['media_viewtab']         = 'عرض';
+$lang['media_edittab']         = 'تحرير';
+$lang['media_historytab']      = 'التاريخ';
+$lang['media_list_thumbs']     = 'المصغرات';
+$lang['media_list_rows']       = 'صفوف';
+$lang['media_sort_name']       = 'الاسم';
+$lang['media_sort_date']       = 'التاريخ';
+$lang['media_namespaces']      = 'اختر نطاقا';
+$lang['media_files']           = 'الملفات في %s';
+$lang['media_upload']          = 'ارفع إلى %s';
+$lang['media_search']          = 'ابحث في %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s في %s';
+$lang['media_edit']            = 'حرر %s';
+$lang['media_history']         = 'تاريخ %s';
+$lang['media_meta_edited']     = 'عُدلت الميتاداتا';
+$lang['media_perm_read']       = 'عفوا، لست مخولا بقراءة الملفات.';
+$lang['media_perm_upload']     = 'عفوا، لست مخولا برفع الملفات.';
+$lang['media_update']          = 'ارفع إصدارا أحدث';
+$lang['media_restore']         = 'استرجع هذه النسخة';
diff --git a/sources/inc/lang/ar/locked.txt b/sources/inc/lang/ar/locked.txt
new file mode 100644
index 0000000..72e9be5
--- /dev/null
+++ b/sources/inc/lang/ar/locked.txt
@@ -0,0 +1,3 @@
+====== الصفحة مقفلة ======
+
+هذه الصفحة مقفلة للتحرير بواسطة مستخدم أخر. عليك أن تنتظر حتى ينتهى من تعديلاتة أو تتنتهى مدة القفل.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/login.txt b/sources/inc/lang/ar/login.txt
new file mode 100644
index 0000000..00ffccd
--- /dev/null
+++ b/sources/inc/lang/ar/login.txt
@@ -0,0 +1,3 @@
+====== دخول ======
+
+أنت لست مسجل دخولك. أدخل بيانات تسجيلك للدخول. يجب أن يكون مسموح للمتصفح بأستخدام الكوكي.
diff --git a/sources/inc/lang/ar/mailtext.txt b/sources/inc/lang/ar/mailtext.txt
new file mode 100644
index 0000000..21d4165
--- /dev/null
+++ b/sources/inc/lang/ar/mailtext.txt
@@ -0,0 +1,17 @@
+تم تغيير أو أضافة صفحة فى دوكو ويكي. اليك التفاصيل:
+
+التاريخ        : @DATE@
+المتصفح     : @BROWSER@
+عنوان الـIP  : @IPADDRESS@
+أسم الجهاز    : @HOSTNAME@
+النسخة القديمة: @OLDPAGE@
+النسخة الجديدة: @NEWPAGE@
+ملخص التحرير: @SUMMARY@
+مستخدم        : @USER@
+
+@DIFF@
+
+
+-- 
+تم أرسال هذه الرسالة من دوكو ويكي فى
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ar/mailwrap.html b/sources/inc/lang/ar/mailwrap.html
new file mode 100644
index 0000000..554e345
--- /dev/null
+++ b/sources/inc/lang/ar/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+تم انشاء هذا البريد الالكتروني بواسطة  DokuWiki في @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/ar/newpage.txt b/sources/inc/lang/ar/newpage.txt
new file mode 100644
index 0000000..ecaa7fa
--- /dev/null
+++ b/sources/inc/lang/ar/newpage.txt
@@ -0,0 +1,3 @@
+====== لا يوجد هذا الموضوع بعد ======
+
+لقد تابعت رابط لموضوع غير متواجد بعد. يمكنك إنشائة بالضعط على زر "انشيء هذه الصفحة".
diff --git a/sources/inc/lang/ar/norev.txt b/sources/inc/lang/ar/norev.txt
new file mode 100644
index 0000000..2aa2330
--- /dev/null
+++ b/sources/inc/lang/ar/norev.txt
@@ -0,0 +1,3 @@
+====== لا توجد تلك النسخة ======
+
+النسخة المختارة ليست موجودة. أسبخدم زر "نسخ قديمة" لعرض قائمة بالنسخ القديمة من هذه الصفحة.
diff --git a/sources/inc/lang/ar/password.txt b/sources/inc/lang/ar/password.txt
new file mode 100644
index 0000000..c8530bb
--- /dev/null
+++ b/sources/inc/lang/ar/password.txt
@@ -0,0 +1,10 @@
+أهلاً @FULLNAME@!
+
+ها هى معلومات المستخدم لـ @TITLE@ الموجودة على العنوان @DOKUWIKIURL@
+
+أسم المستخدم    : @LOGIN@
+كلمة السر : @PASSWORD@
+
+-- 
+تم أرسال هذه الرسالة من دوكو ويكي
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ar/preview.txt b/sources/inc/lang/ar/preview.txt
new file mode 100644
index 0000000..c537e6b
--- /dev/null
+++ b/sources/inc/lang/ar/preview.txt
@@ -0,0 +1,3 @@
+====== عرض التعديلات ======
+
+هذا عرض لما سيصبح علية نص الصفحة. تذكر أن التعديلات **لم تحفظ** بعد!
diff --git a/sources/inc/lang/ar/pwconfirm.txt b/sources/inc/lang/ar/pwconfirm.txt
new file mode 100644
index 0000000..401053e
--- /dev/null
+++ b/sources/inc/lang/ar/pwconfirm.txt
@@ -0,0 +1,8 @@
+مرحبا @FULLNAME@
+
+شخص ما طلب كلمة سر جديدة لـحسابك @TITLE@ في @DOKUWIKIURL@
+إذا لم تكن قد طلبت كلمة سر جديدة رجاء قم بتجاهل هذه الرسالة .
+لتأكيد أنك أنت قمت بطلب كلمة السر الجديدة . نرجو منك الضغط على الرابط في الأسفل . 
+@CONFIRM@ 
+ -- 
+لقد تم عمل هذه الرسالة من قبل DokuWiki .. في @DOKUWIKIURL@
diff --git a/sources/inc/lang/ar/read.txt b/sources/inc/lang/ar/read.txt
new file mode 100644
index 0000000..3e6c504
--- /dev/null
+++ b/sources/inc/lang/ar/read.txt
@@ -0,0 +1 @@
+هذه الصفحة للقراءة فقط. يمكنك تصفح مصدرها، ولكن لا يمكنك تعديلها. إن كنت تتعتفد أن هناك خطأ ما خاطب المدير.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/recent.txt b/sources/inc/lang/ar/recent.txt
new file mode 100644
index 0000000..94d6840
--- /dev/null
+++ b/sources/inc/lang/ar/recent.txt
@@ -0,0 +1,3 @@
+====== احدث التغييرات ======
+
+تم تعديل الصفحات التالية حديثا.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/register.txt b/sources/inc/lang/ar/register.txt
new file mode 100644
index 0000000..57406dd
--- /dev/null
+++ b/sources/inc/lang/ar/register.txt
@@ -0,0 +1,3 @@
+====== سجل كمستخدم جديد ======
+
+أملئ البيانات التالية لتسجيل حساب جديد على الويكي. تأكد من كتابة **بريد إلكترونى صحيح** - سترسل اليك كلمة سر جديدة. أسم الدخول يجب أن يكون [[doku>pagename|أسم صفحة]] صحيح.
diff --git a/sources/inc/lang/ar/registermail.txt b/sources/inc/lang/ar/registermail.txt
new file mode 100644
index 0000000..f04801f
--- /dev/null
+++ b/sources/inc/lang/ar/registermail.txt
@@ -0,0 +1,14 @@
+سجل مستخدم جديد. هذه هي التفاصيل:
+
+اسم المستخدم : @NEWUSER@
+الاسم الكامل : @NEWNAME@
+البريد: @NEWEMAIL@
+
+التاريخ : @DATE@
+المتصفح : @BROWSER@
+عنوان-IP: @IPADDRESS@
+اسم المضيف: @HOSTNAME@
+
+-- 
+وُلد هذا البريد من دوكو ويكي في
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ar/resendpwd.txt b/sources/inc/lang/ar/resendpwd.txt
new file mode 100644
index 0000000..c697137
--- /dev/null
+++ b/sources/inc/lang/ar/resendpwd.txt
@@ -0,0 +1,3 @@
+==== إرسال كلمة سر جديدة ====
+
+رجاء اكتب اسم المستخدم في الاستمارة الموجودة في الأسفل ليتم طلب رقم سري جديد لحسابك في هذا الويكي . سيرسل رابط لتأكيد طلبك إلى بريدك الإلكتروني المسجل .
\ No newline at end of file
diff --git a/sources/inc/lang/ar/resetpwd.txt b/sources/inc/lang/ar/resetpwd.txt
new file mode 100644
index 0000000..2bbd4a2
--- /dev/null
+++ b/sources/inc/lang/ar/resetpwd.txt
@@ -0,0 +1,3 @@
+====== اضبط كلمة سر جديدة ======
+
+أدخل كلمة سر جديدة لحسابك في هذه الويكي.
diff --git a/sources/inc/lang/ar/revisions.txt b/sources/inc/lang/ar/revisions.txt
new file mode 100644
index 0000000..930a4ef
--- /dev/null
+++ b/sources/inc/lang/ar/revisions.txt
@@ -0,0 +1,2 @@
+====== النسخ القديمة ======
+النسخ القديمة للصفحة الحالية. لإستعادة نسخة قديمة: أخترها من المعروض، ثم إضغط على زر "عدل هذه الصفحة" و أحفظها.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/searchpage.txt b/sources/inc/lang/ar/searchpage.txt
new file mode 100644
index 0000000..62c05f5
--- /dev/null
+++ b/sources/inc/lang/ar/searchpage.txt
@@ -0,0 +1,5 @@
+====== بحث ======
+
+نتائج البحث . إن لم تجد ما تبحث عنه، يمكنك إنشاء صفحة جديدة بعنوان ما تبحث عنة بالضغط على زر "حرر هذه الصفحة".
+
+===== نتائج البحث =====
\ No newline at end of file
diff --git a/sources/inc/lang/ar/showrev.txt b/sources/inc/lang/ar/showrev.txt
new file mode 100644
index 0000000..3012907
--- /dev/null
+++ b/sources/inc/lang/ar/showrev.txt
@@ -0,0 +1,2 @@
+**هذه نسخة قديمة من الصفحة!**
+----
\ No newline at end of file
diff --git a/sources/inc/lang/ar/stopwords.txt b/sources/inc/lang/ar/stopwords.txt
new file mode 100644
index 0000000..bc6eb48
--- /dev/null
+++ b/sources/inc/lang/ar/stopwords.txt
@@ -0,0 +1,29 @@
+# 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
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/ar/subscr_digest.txt b/sources/inc/lang/ar/subscr_digest.txt
new file mode 100644
index 0000000..6e8c2fa
--- /dev/null
+++ b/sources/inc/lang/ar/subscr_digest.txt
@@ -0,0 +1,20 @@
+مرحبا!
+
+تغيرت الصفحة @PAGE@ في ويكي @TITLE@.
+هذه هي التغيرات:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+النسخة القديمة: @OLDPAGE@
+النسخة الحديثة: @NEWPAGE@
+
+لإلغاء تنبيه الصفحة, لج الويكي في
+@DOKUWIKIURL@ ثم زُر
+@SUBSCRIBE@
+وألغ اشتراكك من الصفحات أو النظاقات
+
+--
+أنشئت هذه الرسالة من دوكو ويكي في
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ar/subscr_form.txt b/sources/inc/lang/ar/subscr_form.txt
new file mode 100644
index 0000000..919d256
--- /dev/null
+++ b/sources/inc/lang/ar/subscr_form.txt
@@ -0,0 +1,3 @@
+====== إدارة الإشتراكات ======
+
+تمكنك هذه الصفحة من إدارة اشتراكاتك للصفحة و النطاق الحاليين.
\ No newline at end of file
diff --git a/sources/inc/lang/ar/subscr_list.txt b/sources/inc/lang/ar/subscr_list.txt
new file mode 100644
index 0000000..22773a8
--- /dev/null
+++ b/sources/inc/lang/ar/subscr_list.txt
@@ -0,0 +1,17 @@
+مرحبا!
+
+صفحات في النطاق @PAGE@ في ويكي @TITLE@ غُيرت.
+هذه هي الصفحات المتغيرة:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+لإلغاء إشعارات الصفحة, لُج الويكي في
+@DOKUWIKIURL@ ثم زُر
+@SUBSCRIBE@
+ثم ألغ اشتراك تغييرات الصفحة و/أو النطاق.
+
+--
+وُلد هذا البريد من دوكو ويكي في
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ar/subscr_single.txt b/sources/inc/lang/ar/subscr_single.txt
new file mode 100644
index 0000000..6116884
--- /dev/null
+++ b/sources/inc/lang/ar/subscr_single.txt
@@ -0,0 +1,23 @@
+مرحبا!
+
+الصفحة @PAGE@ في ويكي @TITLE@ تغيرت.
+هذه هي التغييرات:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+التاريخ : @DATE@
+المستخدم : @USER@
+ملخص التحرير: @SUMMARY@
+الاصدار القديم: @OLDPAGE@
+الاصدار الحديث: @NEWPAGE@
+
+لإلغاء إشعارات الصفحة,لُج الويكي في 
+@DOKUWIKIURL@ ثم زُر
+@SUBSCRIBE@
+وألغ الاشتراك من تغييرات الصفحة و/أو النطاق.
+
+--
+ولد هذا البريد باستخدام دوكو ويكي في
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ar/updateprofile.txt b/sources/inc/lang/ar/updateprofile.txt
new file mode 100644
index 0000000..04a5a09
--- /dev/null
+++ b/sources/inc/lang/ar/updateprofile.txt
@@ -0,0 +1,3 @@
+==== تحديث بيانات حسابك ====
+
+عليك فقط أن تكمل كتابة الحقول التي تريد أن تغيرها . لا تستطيع تغيير اسم المستخدم .
\ No newline at end of file
diff --git a/sources/inc/lang/ar/uploadmail.txt b/sources/inc/lang/ar/uploadmail.txt
new file mode 100644
index 0000000..e4f16c7
--- /dev/null
+++ b/sources/inc/lang/ar/uploadmail.txt
@@ -0,0 +1,14 @@
+رُفع ملف إلى دوكو ويكي خاصتك. هذه هي التفاصيل:
+
+الملف : @MEDIA@
+التاريخ : @DATE@
+المستعرض : @BROWSER@
+عنوان-IP: @IPADDRESS@
+اسم المضيف: @HOSTNAME@
+الحجم : @SIZE@
+نوع MIME : @MIME@
+المستخدم: @USER@
+
+-- 
+ولد هذا البريد من دوكو ويكي في
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/az/admin.txt b/sources/inc/lang/az/admin.txt
new file mode 100644
index 0000000..000caa0
--- /dev/null
+++ b/sources/inc/lang/az/admin.txt
@@ -0,0 +1,4 @@
+====== İdarəetmə ======
+
+Aşağıda Dokuwiki-də mümkün olan administrativ əməliyyatların siyahısı göstərilib.
+
diff --git a/sources/inc/lang/az/adminplugins.txt b/sources/inc/lang/az/adminplugins.txt
new file mode 100644
index 0000000..62b1f87
--- /dev/null
+++ b/sources/inc/lang/az/adminplugins.txt
@@ -0,0 +1 @@
+===== Əlavə Plugin-lər =====
diff --git a/sources/inc/lang/az/backlinks.txt b/sources/inc/lang/az/backlinks.txt
new file mode 100644
index 0000000..72a7c85
--- /dev/null
+++ b/sources/inc/lang/az/backlinks.txt
@@ -0,0 +1,4 @@
+====== Əks linklər ======
+
+Bu, bu səhifəyə link saxlayan səhifələrin siyahısıdır.
+
diff --git a/sources/inc/lang/az/conflict.txt b/sources/inc/lang/az/conflict.txt
new file mode 100644
index 0000000..908be09
--- /dev/null
+++ b/sources/inc/lang/az/conflict.txt
@@ -0,0 +1,5 @@
+====== Daha yeni versiya var ======
+
+Düzəliş etdiyiniz sənədin daha yeni versiyası var. Siz və başqa istifadəçi eyni zamanda eyni sənədi düzəliş edən zaman belə vəziyyət yaranır.
+
+Aşağıda göstərilən fərqlər ilə tanış olun və lazım olan versiyanı təyin edin. Əgər ''Yadda Saxla'' düyməsini sıxsanız, onda sizin versiya seçilmiş olur. ''İmtina'' düyməsini sıxsanız isə onda hazırki versiya seçilmiş olur.
diff --git a/sources/inc/lang/az/denied.txt b/sources/inc/lang/az/denied.txt
new file mode 100644
index 0000000..a68b08c
--- /dev/null
+++ b/sources/inc/lang/az/denied.txt
@@ -0,0 +1,3 @@
+====== Müraciət qadağan edilmişdir ======
+
+Sizin bu əməliyyat üçün kifayət qədər haqqınız yoxdur. Bəlkə, Siz sistemə oz istifadəçi adınız ilə girməyi unutmusunuz?
diff --git a/sources/inc/lang/az/diff.txt b/sources/inc/lang/az/diff.txt
new file mode 100644
index 0000000..a944f84
--- /dev/null
+++ b/sources/inc/lang/az/diff.txt
@@ -0,0 +1,4 @@
+====== Fərqlər ======
+
+Burada bu səhifənin seçilmiş və hazırki versiyaların arasında olan fərqlər göstərilib.
+
diff --git a/sources/inc/lang/az/draft.txt b/sources/inc/lang/az/draft.txt
new file mode 100644
index 0000000..65c743d
--- /dev/null
+++ b/sources/inc/lang/az/draft.txt
@@ -0,0 +1,5 @@
+====== Qaralama tapılıb ======
+
+Bu səhifənin son düzəlişi düzgün başa çatdırılmamışdir. Düzəliş zamanı qaralama avtomatik yadda saxlanılmışdır. İndi Siz onu açıb düzəlişi davam edə bilərsiniz. Qaralama versiyası aşağıda göstərilib.
+
+İtmiş versiyanı //qaytarmaq//, qaralamanı //silmək//, və ya düzəlişi //imtina// etmək istədiyinizi təyin edin.
diff --git a/sources/inc/lang/az/edit.txt b/sources/inc/lang/az/edit.txt
new file mode 100644
index 0000000..7ce6630
--- /dev/null
+++ b/sources/inc/lang/az/edit.txt
@@ -0,0 +1 @@
+Səhifədə düzəliş edin və ''Yadda Saxla'' düyməsini sıxın. Sintaksis ilə tanış olmaq üçün [[wiki:syntax]] səhifəsini oxuyun. Ançaq səhifəni **daha yaxşı** etməki istədiyiniz halda düzəliş etməyinizi xahiş edirik. Əgər Siz nəyi isə ancaq test etmək istəyirsiniz sə, onda [[playground:playground]] xüsusi səhifədən istifadə edin.
diff --git a/sources/inc/lang/az/editrev.txt b/sources/inc/lang/az/editrev.txt
new file mode 100644
index 0000000..8e98d2f
--- /dev/null
+++ b/sources/inc/lang/az/editrev.txt
@@ -0,0 +1,2 @@
+**Sənədin köhnə versiyasını açmısınız!** Bu versiyanı yadda saxlasanız, bu mətn ilə olan yeni hazırki versiya yaratmış olarsınız.
+----
diff --git a/sources/inc/lang/az/index.txt b/sources/inc/lang/az/index.txt
new file mode 100644
index 0000000..dc3ffa3
--- /dev/null
+++ b/sources/inc/lang/az/index.txt
@@ -0,0 +1,4 @@
+====== Mündəricat ======
+
+Burada mövcud olan səhifələr Namespace-lərə ([[doku>namespaces|namespaces]]) görə sıralanmış halda göstərilib.
+
diff --git a/sources/inc/lang/az/install.html b/sources/inc/lang/az/install.html
new file mode 100644
index 0000000..d8382b1
--- /dev/null
+++ b/sources/inc/lang/az/install.html
@@ -0,0 +1,7 @@
+
        Bu səhifə Sizə DokuWiki-ni quraşdırmaqa kömək etmək üçündür. Quraşdırma haqqına əlavə məlumatı onun dokumentasiya səhifəsində var.
        
+
+
        Səhifələri və əlavə məlumatları (məsələn, şəkillər, axtarış indeksi, səhifələrin əvvəlki versiyaları, və sairə) saxlamaq üçün DokuWiki adi fayllardan istifadə edir. DokuWiki-nin uğurlu işləməsi üçün bu faylların yerləşən qovluqa yazı imkanı vacib lazımdır. Bu quraşdırma proqramı sistemin qovluqlarına olan haqları dəyişə bilmir. Çox vaxt bu birbaşa shell-dən, və ya, əgər Siz hostinq-dən istifadə edirsinizsə, FTP vasitəsi ya idarəetmə paneli vasitəsi (məsələn, cPanel) ilə edilir.
        
+
+
        Quraşdırma proqramı sizin DokuWiki-nizdə haqlar kontrolu siyahısını (ACL) quracaq. Bu, sistemə girdikdən sonra, administratora xüsusi menü vasitəsi ilə plugin-ləri quraşdırmaq, istifadiçiləri və səhifələrə giriş haqlarını idarəetmək, və həmçinin sistemin konfiqurasiyasını quraşdırmağa imkan verəcək. Haqlar kontrolu siyahısı DokuWiki-yə mütləq lazım deyil, amma o Sizə DokuWiki-nin idarəetməsini asanlaşdırır.
        
+
+
        Təcrübəli istifadəçilər və xüsusi tələbləri olan istifadəçilərə əlavə məlumat üçün quraşdırılma prosesi və konfiqurasiya parametrləri link-lərinə muraciyət etməsk tövsiyyə olunur.
        
diff --git a/sources/inc/lang/az/lang.php b/sources/inc/lang/az/lang.php
new file mode 100644
index 0000000..df54b4f
--- /dev/null
+++ b/sources/inc/lang/az/lang.php
@@ -0,0 +1,217 @@
+
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '«';
+$lang['doublequoteclosing']    = '»';
+$lang['singlequoteopening']    = '„';
+$lang['singlequoteclosing']    = '“';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Səhifəyə düzəliş et';
+$lang['btn_source']            = 'Səhifənin ilkin mətnini göstər';
+$lang['btn_show']              = 'Səhifəni göstər';
+$lang['btn_create']            = 'Səhifəni yarat';
+$lang['btn_search']            = 'Axtarış';
+$lang['btn_save']              = 'Yadda saxla';
+$lang['btn_preview']           = 'Baxış';
+$lang['btn_top']               = 'Yuxarı';
+$lang['btn_newer']             = '<< daha təzələr';
+$lang['btn_older']             = 'daha köhnələr >>';
+$lang['btn_revs']              = 'Səhifənin tarixçəsi';
+$lang['btn_recent']            = 'Yaxın dəyişiklər';
+$lang['btn_upload']            = 'Serverə yükə';
+$lang['btn_cancel']            = 'İmtina';
+$lang['btn_index']             = 'Bütün səhifələr';
+$lang['btn_secedit']           = 'Düzəliş et';
+$lang['btn_login']             = 'Giriş';
+$lang['btn_logout']            = 'Cıxış';
+$lang['btn_admin']             = 'İdarəetmə';
+$lang['btn_update']            = 'Yenilə';
+$lang['btn_delete']            = 'Sil';
+$lang['btn_back']              = 'Geri';
+$lang['btn_backlink']          = 'Bura olan link-lər';
+$lang['btn_backtomedia']       = 'media-fayl seçiminə qayıt';
+$lang['btn_subscribe']         = 'Abunə ol (bütün dəyişiklər)';
+$lang['btn_profile']           = 'Profil';
+$lang['btn_reset']             = 'Boşalt';
+$lang['btn_draft']             = 'Qaralamada düzəliş etmək';
+$lang['btn_recover']           = 'Qaralamanı qaytar';
+$lang['btn_draftdel']          = 'Qaralamanı sil';
+$lang['btn_revert']            = 'Qaytar';
+$lang['btn_register']          = 'Qeydiyyatdan keç';
+$lang['loggedinas']            = 'İstifadəcinin adı';
+$lang['user']                  = 'istifadəci adı';
+$lang['pass']                  = 'Şifrə';
+$lang['newpass']               = 'Yeni şifrə';
+$lang['oldpass']               = 'Hazırki şifrəni daxil edin';
+$lang['passchk']               = 'təkrarlayın';
+$lang['remember']              = 'Məni yadda saxla';
+$lang['fullname']              = 'Tam ad';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'İstifadəçi profili';
+$lang['badlogin']              = 'Təssüf ki istifadəçi adı və ya şifrə səhvdir.';
+$lang['minoredit']             = 'Az dəyişiklər';
+$lang['draftdate']             = 'Qaralama yadda saxlandı';
+$lang['nosecedit']             = 'Bu vaxt ərzində səhifə dəyişilmişdir, və bölmə haqqında məlumat köhnəlmişdir. Səhifənin tam versiyası yüklənmişdir.';
+$lang['regmissing']            = 'Təssüf ki Siz bütün xanələri doldurmalısınız.';
+$lang['reguexists']            = 'Təssüf ki bu ad ilə istifadəçi artıq mövcuddur.';
+$lang['regsuccess']            = 'İstivadəci yaradıldı və şifrə sizin e-maila göndərildi.';
+$lang['regsuccess2']           = 'İstifadəçi yaradıldı.';
+$lang['regmailfail']           = 'Deyəsən, xəta şifrə e-maila göndərildikdə baş verdi. Xaiş olunur, ki administrator ilə əlaqə saxlayasınız!';
+$lang['regbadmail']            = 'Deyəsən, daxil edilmiş e-mail ünvanı səhvdir. Əgər şübhəniz var isə administrator ilə əlaqə saxlayın.';
+$lang['regbadpass']            = 'Daxil edilmiş iki şifrə fərqlidir. Xaiş olunur ki, yenidən daxil edəsiniz.';
+$lang['regpwmail']             = 'Sizin DokuWiki sistemi üçün şifrəniz';
+$lang['reghere']               = 'Sizin hələ istifadəçi adınız yoxdur? Buyurun əldə edin';
+$lang['profna']                = 'Bu wiki profilin dəyişdirilməsini dəstəkləmir';
+$lang['profnochange']          = 'Dəyişiklər edilmədi, profil yenilənmədi.';
+$lang['profnoempty']           = 'istifadəci adı və e-mail ünvanı boş ola bilməz.';
+$lang['profchanged']           = 'İstifadəçi profili uğurla yeniləndi.';
+$lang['pwdforget']             = 'Şifrəni yaddan çıxartmısız? Buyurun yenisini əldə edin';
+$lang['resendna']              = 'Bu wiki şifrəni yenidən göndərməyi dəstəkləmir.';
+$lang['resendpwdmissing']      = 'Formanın bütün xanəlırini doldurun.';
+$lang['resendpwdnouser']       = 'Verilənlər bazasında bu ad ilə istifadəçi tapılmadı.';
+$lang['resendpwdbadauth']      = 'Ativləşdirmə kodu səhvdir. Link-i tam olaraq köçürdüyünüzü yoxlayın. ';
+$lang['resendpwdconfirm']      = 'Şifrəni təstiqləmək üçün sizin e-maila link göndərilmişdir. ';
+$lang['resendpwdsuccess']      = 'Yeni şifrəniz e-maila göndərildi.';
+$lang['license']               = 'Fərqli şey göstərilmiş hallardan başqa, bu wiki-nin mətni aşağıda göstərilmiş lisenziyanın şərtlərinə uyğun təqdim olunur:';
+$lang['licenseok']             = 'Qeyd: bu səhifəni düzəliş edərək, Siz elədiyiniz düzəlişi aşağıda göstərilmiş lisenziyanın şərtlərinə uyğun istifadəsinə razılıq verirsiniz:';
+$lang['searchmedia']           = 'Faylın adına görə axtarış:';
+$lang['searchmedia_in']        = '%s-ın içində axtarış';
+$lang['txt_upload']            = 'Serverə yükləmək üçün fayl seçin';
+$lang['txt_filename']          = 'Faylın wiki-də olan adını daxil edin (mütləq deyil)';
+$lang['txt_overwrt']           = 'Mövcud olan faylın üstündən yaz';
+$lang['lockedby']              = 'В данный момент заблокирован Bu an blokdadır';
+$lang['lockexpire']            = 'Blok bitir:';
+$lang['js']['willexpire']            = 'Sizin bu səhifədə dəyişik etmək üçün blokunuz bir dəqiqə ərzində bitəcək.\nMünaqişələrdən yayınmaq və blokun taymerini sıfırlamaq üçün, baxış düyməsini sıxın.';
+$lang['rssfailed']             = 'Aşağıda göstərilmiş xəbər lentini əldə edən zaman xəta baş verdi: ';
+$lang['nothingfound']          = 'Heçnə tapılmadı.';
+$lang['mediaselect']           = 'Mediya-faylın seçilməsi';
+$lang['fileupload']            = 'Mediya-faylın serverə yüklənməsi';
+$lang['uploadsucc']            = 'Yüklənmə uğur ilə başa çatdı';
+$lang['uploadfail']            = 'Yüklənmə zamanı xəta baş veri. Bəlkə giriş haqları ilə problem var?';
+$lang['uploadwrong']           = 'Yuklənməyə qadağa qoyuldu. Belə növlu faylları serverə yükləmək olmaz. ';
+$lang['uploadexist']           = 'Bu adlı fayl artıq serverdə var. Yükləmə alınmadı .';
+$lang['uploadbadcontent']      = 'Faylın tərkibi %s növünə uyğun gəlmir.';
+$lang['uploadspam']            = 'Yüklənmə spam-filtri tərəfindən dayandırıldı.';
+$lang['uploadxss']             = 'Yüklənmə təhlükəsizlik nəzərindən dayandırılmışdır.';
+$lang['uploadsize']            = 'Yüklənilmiş fayl çox boyükdür. (maks. %s)';
+$lang['deletesucc']            = '"%s" adlı fayl silindi.';
+$lang['deletefail']            = '"%s" adlı fayl silinmədi. Faylın giriş haqlarını yoxlayın.';
+$lang['mediainuse']            = '"%s" adlı fayl silinmədi. Fayl hələ istifadə olunur';
+$lang['namespaces']            = 'Namespace-lər';
+$lang['mediafiles']            = 'Mövcud olan fayllar';
+$lang['js']['searchmedia']     = 'Faylların axtarışı';
+$lang['js']['keepopen']        = 'Seçimdən sonra pəncərəni açıq saxlamaq';
+$lang['js']['hidedetails']     = 'Təfərruatı gizlət';
+$lang['js']['nosmblinks']      = 'Windows-un şəbəkə qovluqlarına link ancaq Internet Explorer-dən işləyir. \nAmma Siz linki köçürə bilərsiniz.';
+$lang['js']['linkwiz']         = 'Linklər köməkçisi';
+$lang['js']['linkto']          = 'Link göstərir:';
+$lang['js']['del_confirm']     = 'Siz əminsiz ki, seçilmişləri silmək istəyirsiniz?';
+$lang['mediausage']            = 'Bu fayla link yaratmaq üçün aşağıdakı sintaksisdən istifadə edin:';
+$lang['mediaview']             = 'Bu faylın ilkinə bax';
+$lang['mediaroot']             = 'kök';
+$lang['mediaupload']           = 'Burda faylı hazırki qovluqa yükləmək olar ("namespace"). Alt qovluqlar yaratmaq üçün, onların adlarını faylın adının avvəlinə artırın ("Adla yükləmək"). Alt qovluqların adları çütnöqtə ilə ayrılır. ';
+$lang['mediaextchange']        = 'Faylın nüvü .%s -dan .%s -ya dəyişdi!';
+$lang['reference']             = 'Linklər göstərir';
+$lang['ref_inuse']             = 'Bu fayl silinə bilməz, çünki o aşağıdaki səhifələr tərəfindən istifadə olunur:';
+$lang['ref_hidden']            = 'Bəzi link-lər sizin oxumaq haqqınız olmayan səhifələrdə yerləşir';
+$lang['hits']                  = 'uyğunluqlar';
+$lang['quickhits']             = 'Səhifələrin adlarında uyğunluqlar';
+$lang['toc']                   = 'Mündəricat';
+$lang['current']               = 'hazırki';
+$lang['yours']                 = 'Sizin versiyanız';
+$lang['diff']                  = 'hazırki versiyadan fərqləri göstər';
+$lang['diff2']                 = 'Versiyaların arasındaki fərqləri göstər  ';
+$lang['line']                  = 'Sətr';
+$lang['breadcrumb']            = 'Siz ziyarət etdiniz';
+$lang['youarehere']            = 'Siz burdasınız';
+$lang['lastmod']               = 'Son dəyişiklər';
+$lang['by']                    = ' Kimdən';
+$lang['deleted']               = 'silinib';
+$lang['created']               = 'yaranıb';
+$lang['restored']              = 'köhnə versiya qaytarıldı (%s)';
+$lang['external_edit']         = 'bayırdan dəyişik';
+$lang['summary']               = 'Dəyişiklər xülasəsi';
+$lang['noflash']               = 'Bu məzmuna baxmaq üçün Adobe Flash Plugin tələb olunur.';
+$lang['download']              = 'Kodu yüklə';
+$lang['mail_newpage']          = 'səhifə əlavə olundu:';
+$lang['mail_changed']          = 'səhifəyə düzəliş edildi:';
+$lang['mail_new_user']         = 'yeni istifadəçi:';
+$lang['mail_upload']           = 'fayl yükləndi:';
+$lang['qb_bold']               = 'Qalın şrift';
+$lang['qb_italic']             = 'Maili şrift';
+$lang['qb_underl']             = 'Alt-xətt';
+$lang['qb_code']               = 'Kodun mətni';
+$lang['qb_strike']             = 'Pozulmuş şrift';
+$lang['qb_h1']                 = '1 dərəcəli başlıq';
+$lang['qb_h2']                 = '2 dərəcəli başlıq';
+$lang['qb_h3']                 = '3 dərəcəli başlıq';
+$lang['qb_h4']                 = '4 dərəcəli başlıq';
+$lang['qb_h5']                 = '5 dərəcəli başlıq';
+$lang['qb_h']                  = 'Başlıq';
+$lang['qb_hs']                 = 'Başlıq seçimi';
+$lang['qb_hplus']              = 'Daha yüksək dərəcəli başlıq';
+$lang['qb_hminus']             = 'Daha aşağı dərəcəli başlıq (altbaşlıq)';
+$lang['qb_hequal']             = 'Hazırki dərəcəli başlıq';
+$lang['qb_link']               = 'İç link';
+$lang['qb_extlink']            = 'Bayır link';
+$lang['qb_hr']                 = 'Bölücü';
+$lang['qb_ol']                 = 'Nömrələnmiş siyahının element';
+$lang['qb_ul']                 = 'Nömrələnməmiş siyahının element';
+$lang['qb_media']              = 'Şəkillər və başqa fayllar əlavə et';
+$lang['qb_sig']                = 'İmza at';
+$lang['qb_smileys']            = 'Smayllar';
+$lang['qb_chars']              = 'Xüsusi simvollar';
+$lang['upperns']               = 'Ana namespace-ə keç';
+$lang['admin_register']        = 'İstifadəçi əlavə et';
+$lang['metaedit']              = 'Meta-məlumatlarda düzəliş et';
+$lang['metasaveerr']           = 'Meta-məlumatları yazan zamanı xəta';
+$lang['metasaveok']            = 'Meta-məlumatlar yadda saxlandı';
+$lang['img_backto']            = 'Qayıd';
+$lang['img_title']             = 'Başlıq';
+$lang['img_caption']           = 'İmza';
+$lang['img_date']              = 'Tarix';
+$lang['img_fname']             = 'Faylın adı';
+$lang['img_fsize']             = 'Boy';
+$lang['img_artist']            = 'Şkilin müəllifi';
+$lang['img_copyr']             = 'Müəllif hüquqları';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Model';
+$lang['img_keywords']          = 'Açar sözlər';
+$lang['authtempfail']          = 'İstifadəçilərin autentifikasiyası müvəqqəti dayandırılıb. Əgər bu problem uzun müddət davam edir sə, administrator ilə əlaqə saxlayın.';
+$lang['i_chooselang']          = 'Dili seçin/Language';
+$lang['i_installer']           = 'DokuWiki quraşdırılır';
+$lang['i_wikiname']            = 'wiki-nin adı';
+$lang['i_enableacl']           = 'Haqlar kontrolu siyahısının istifadəsinə icazə ver (tövsiyə edilir)';
+$lang['i_superuser']           = 'Super-istifadəci';
+$lang['i_problems']            = 'Quraşdırma proqramı aşağıdakı problemlər ilə üzləşdi. Davam etmək üçün onları həll etmək lazımdır. ';
+$lang['i_modified']            = 'Təhlükəsizlik baxımından bu proqram ancaq yeni, dəyişməmiş halda olan DokuWiki üzərində işləyir.
+                         Siz ya yüklənmiş quraşdırma paketini yenidən açmalısınız, ya da DokuWiki-nin tam quraşdırma instruksiyasına müraciyət etməlisiniz';
+$lang['i_funcna']              = 'PHP-nin %s funksiyası mövcud deyil. Bəlkə, o hansı sa səbəbdən sizin host-unuz tərəfindən blok edilib?';
+$lang['i_phpver']              = 'Sizin PHP-nin versiyası (%s) tələb olunan versiyadan aşagıdır (%s). Quraşdırılmış PHP-nin versiyasını yeniləyin.';
+$lang['i_permfail']            = '%s DokuWiki-yə yazı üçün bağlıdır. Bu qovluğun giriş haqlarını yoxlamaq lazımdır!';
+$lang['i_confexists']          = '%s artıq mövcuddur';
+$lang['i_writeerr']            = '%s yaradıla bilmədi. Faylın/qovluqların giriş haqlarını yaxlamaq lazımdır. Və faylı əl ilə yaradın. ';
+$lang['i_badhash']             = 'dokuwiki.php tanıla bilmir və ya dəyişdirilmişdir (hash=%s)';
+$lang['i_badval']              = '%s - səhv ya boş qiymətdir';
+$lang['i_success']             = 'Konfiqurasiya uğurla başa çatdı. İndi siz install.php faylını silə bilərsiniz.
+                        Yeni DokuWiki-nizə xoş gəlmişsiniz!';
+$lang['i_failure']             = 'Konfiqurasiya fayllarına məlumat yazan zaman səhvlər tapıldı. Yəgin ki, yeni DokuWiki-nizi istifadə etmədən öncə, Siz o xətaları əl ilə düzəltməli olacaqsınız.';
+$lang['i_policy']              = 'İlkin giriş haqları siyasəti';
+$lang['i_pol0']                = 'Tam açıq wiki (oxumaq, yazmaq, fayl yükləmək hamıya olar)';
+$lang['i_pol1']                = 'Acıq wiki (oxumaq hamıya olar, yazmaq və fayl yükləmək ancaq üzv olan istifadəçilərə olar)';
+$lang['i_pol2']                = 'Bağlı wiki (uxumaq, yazmaq və yükləmək ancaq üzv olan istifadəçilərə olar)';
+$lang['i_retry']               = 'Cəhdi təkrarla';
+$lang['recent_global']         = '%s namespace-də baş vermiş dəyışıklərə baxırsınız. Siz həmçinin wiki-də bu yaxında baş vermiş bütün dəyişiklərə baxa bilərsiniz.';
+$lang['years']                 = '%d il əvvəl';
+$lang['months']                = '%d ay əvvəl';
+$lang['weeks']                 = '%d həftə əvvəl';
+$lang['days']                  = '%d gün əvvəl';
+$lang['hours']                 = '%d saat əvvəl';
+$lang['minutes']               = '%d dəqiqə əvvəl';
+$lang['seconds']               = '%d saniyə əvvəl';
diff --git a/sources/inc/lang/az/locked.txt b/sources/inc/lang/az/locked.txt
new file mode 100644
index 0000000..8ab9344
--- /dev/null
+++ b/sources/inc/lang/az/locked.txt
@@ -0,0 +1,3 @@
+====== Səhifə blok edilmişdir ======
+
+Bu səhifə başqa istifadəçi tərəfindən dəyişdirilmə üçün blok edilmişdir. O istifadəçi dəyişdirməni başa çatdırınca ya blokun vaxtı bitincə, Siz gözləməlisiniz.
diff --git a/sources/inc/lang/az/login.txt b/sources/inc/lang/az/login.txt
new file mode 100644
index 0000000..e0a559b
--- /dev/null
+++ b/sources/inc/lang/az/login.txt
@@ -0,0 +1,4 @@
+====== Avtorizasiya ======
+
+Hazırda Siz sistemə daxil olmamısınız. Aşağıdakı formanı istifadə edib sistemə daxil olun. //Qeyd:// cookies qurlu olmalıdır.
+
diff --git a/sources/inc/lang/az/mailtext.txt b/sources/inc/lang/az/mailtext.txt
new file mode 100644
index 0000000..4394586
--- /dev/null
+++ b/sources/inc/lang/az/mailtext.txt
@@ -0,0 +1,18 @@
+Sizin DokuWiki-də səhifə yaradılıb ya dəyişdirilib. Ətraflı məlumat:
+
+Tarix                 : @DATE@
+Brauzer               : @BROWSER@
+IP-adres              : @IPADDRESS@
+Host                  : @HOSTNAME@
+Köhnə versiya         : @OLDPAGE@
+Yeni versiya          : @NEWPAGE@
+Dəyişiklərin xülasəsi : @SUMMARY@
+İstifadəçi            : @USER@
+
+@DIFF@
+
+
+-- 
+Bu məktub DokuWiki tərəfindən yaradıldı.
+DokuWiki aşağıdakı adresdə yerləşir:
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/az/newpage.txt b/sources/inc/lang/az/newpage.txt
new file mode 100644
index 0000000..c749f20
--- /dev/null
+++ b/sources/inc/lang/az/newpage.txt
@@ -0,0 +1,3 @@
+====== Bu səhifə hələ mövcud deyil ======
+
+Siz yaradılmamış səhifənin link-ini acmısınız. Əgər sizin giriş haqlarınız çatırsa, siz "Səhifəni yarat" düyməsini sixib, o səhifəni yarada bilərsiniz.
diff --git a/sources/inc/lang/az/norev.txt b/sources/inc/lang/az/norev.txt
new file mode 100644
index 0000000..453dad5
--- /dev/null
+++ b/sources/inc/lang/az/norev.txt
@@ -0,0 +1,4 @@
+====== Belə versiya mövcud deyil ======
+
+Bu səhifənin göstərilmiş versiyası mövcud deyil. Səhifənin bütün versiyalaraının siyahısını görmək üçün, ''Səhifənin tarixçəsi'' düyməsini sıxın.
+
diff --git a/sources/inc/lang/az/password.txt b/sources/inc/lang/az/password.txt
new file mode 100644
index 0000000..31bf387
--- /dev/null
+++ b/sources/inc/lang/az/password.txt
@@ -0,0 +1,11 @@
+Salam @FULLNAME@!
+
+Sizin @TITLE@ (@DOKUWIKIURL@) üçün olan məlumatlarınız
+
+İstifadəçi adı  : @LOGIN@
+Şifrə : @PASSWORD@
+
+-- 
+Bu məktub DokuWiki tərəfindən yaradıldı.
+DokuWiki aşağıdakı adresdə yerləşir:
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/az/preview.txt b/sources/inc/lang/az/preview.txt
new file mode 100644
index 0000000..dbeaa44
--- /dev/null
+++ b/sources/inc/lang/az/preview.txt
@@ -0,0 +1,4 @@
+====== Baxış ======
+
+Burda daxil elədiyiniz mətnin necə görünəcəyi göstərilir. Qeyd: mətn hələ **yadda saxlanılmayıb!**
+
diff --git a/sources/inc/lang/az/pwconfirm.txt b/sources/inc/lang/az/pwconfirm.txt
new file mode 100644
index 0000000..177e5a1
--- /dev/null
+++ b/sources/inc/lang/az/pwconfirm.txt
@@ -0,0 +1,14 @@
+Salam @FULLNAME@!
+
+Kimsə @DOKUWIKIURL@ adresində yerləşən @TITLE@ adlı wiki-yə giriş üçün yeni şifrə tələb eləyib.
+
+Əgər o şəxs siz deyildinizsə, bu məktuba fikir verməyin.
+
+Tələbi təsdiq etmək üçün, aşağıdakı link-ə keçin.
+
+@CONFIRM@
+
+-- 
+Bu məktub DokuWiki tərəfindən yaradıldı.
+DokuWiki aşağıdakı adresdə yerləşir:
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/az/read.txt b/sources/inc/lang/az/read.txt
new file mode 100644
index 0000000..39b31f1
--- /dev/null
+++ b/sources/inc/lang/az/read.txt
@@ -0,0 +1,2 @@
+Bu səhifəni ancaq oxumaq olar. Siz səhifənin ilkin mətninə baxa bilərsiniz, amma dəyişə bilməzsiniz. Əgər bunun düzgün olmadığını fikirləşirsinizsə onda administrator ilə əlaqə saxlayın.
+
diff --git a/sources/inc/lang/az/recent.txt b/sources/inc/lang/az/recent.txt
new file mode 100644
index 0000000..8766d99
--- /dev/null
+++ b/sources/inc/lang/az/recent.txt
@@ -0,0 +1,5 @@
+====== Son dəyişiklər ======
+
+Bu səhifələr yaxında dəyismişdirlər.
+
+
diff --git a/sources/inc/lang/az/register.txt b/sources/inc/lang/az/register.txt
new file mode 100644
index 0000000..eb6386f
--- /dev/null
+++ b/sources/inc/lang/az/register.txt
@@ -0,0 +1,3 @@
+====== Регистрация нового пользователя ======
+
+Qeydiyyat üçün bütün aşağıdaı xanalari doldurun. **e-mail adresinizin duz olduguna** fikir verin. Əgər şıfrəni əl ilə daxil etməyiniz xaiş olunmursa, onda şifrə e-mail adresinizə göndəriləcək. İstifadəçi adı [[doku>pagename|səhifənin identifikatorunun]] məhdudiyyətlərinə uyğun olmalıdır.
diff --git a/sources/inc/lang/az/registermail.txt b/sources/inc/lang/az/registermail.txt
new file mode 100644
index 0000000..5191975
--- /dev/null
+++ b/sources/inc/lang/az/registermail.txt
@@ -0,0 +1,15 @@
+Yeni istifadəçi qeydiyyatdan keçdi. Ətraflı məlumat:
+
+İstifadəçi adı       : @NEWUSER@
+Tam adı  : @NEWNAME@
+E-mail      : @NEWEMAIL@
+
+Tarix        : @DATE@
+Brauzer     : @BROWSER@
+IP adres    : @IPADDRESS@
+Host        : @HOSTNAME@
+
+-- 
+Bu məktub DokuWiki tərəfindən yaradıldı.
+DokuWiki aşağıdakı adresdə yerləşir:
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/az/resendpwd.txt b/sources/inc/lang/az/resendpwd.txt
new file mode 100644
index 0000000..cc28617
--- /dev/null
+++ b/sources/inc/lang/az/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Yeni şifrənin göndərilməsi ======
+
+Yeni şifrə əldə etmək üçün aşağıda tələb olunan məlumatları daxil edin. Yeni şifrə sizin istifadəçi adınıza aid olan e-mail adresə göndəriləcək. Aşagıda daxil olunan ad - sizin bu wiki-də olan istifadəçi adınız olmalıdır.
diff --git a/sources/inc/lang/az/revisions.txt b/sources/inc/lang/az/revisions.txt
new file mode 100644
index 0000000..7164a99
--- /dev/null
+++ b/sources/inc/lang/az/revisions.txt
@@ -0,0 +1,3 @@
+====== Səhifənin tarixçəsi ======
+
+Qarşınızda - hazırki sənədin dəyişiklər tarixçəsidir. Əvvəlki versiyaların birinə qayıtmaq üçün, lazım olan versiyanı seçin, ''Səhifəni düzəliş et'' düyməsini sıxın və yaddaşa yazın.
diff --git a/sources/inc/lang/az/searchpage.txt b/sources/inc/lang/az/searchpage.txt
new file mode 100644
index 0000000..4f8efe0
--- /dev/null
+++ b/sources/inc/lang/az/searchpage.txt
@@ -0,0 +1,5 @@
+====== Axtarış ======
+
+Qarşınızda - axtarışın nəticələridir. Əgər Siz axtardığınızı tapa bilmədinizsə, onda Siz adı axtarışınız ilə uyğun düşən yeni səhifə yarada bilərsiniz. Bunu eləmək üçün, sadəcə ''Səhifəni yarat'' düyməsini sıxın.
+
+===== Nəticələr =====
diff --git a/sources/inc/lang/az/showrev.txt b/sources/inc/lang/az/showrev.txt
new file mode 100644
index 0000000..dd39870
--- /dev/null
+++ b/sources/inc/lang/az/showrev.txt
@@ -0,0 +1,2 @@
+**Bu - sənədin köhnə versiyasıdır!**
+----
diff --git a/sources/inc/lang/az/stopwords.txt b/sources/inc/lang/az/stopwords.txt
new file mode 100644
index 0000000..04eb312
--- /dev/null
+++ b/sources/inc/lang/az/stopwords.txt
@@ -0,0 +1,64 @@
+# 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
+amma
+arada
+arasında
+başqa
+başqalar
+başqaların
+başqanın
+belə
+birdən
+bugün
+bunu
+burada
+bəlkə
+cəmi
+dedi
+dedilər
+dedim
+dediniz
+demək
+deyəsən
+görə
+hamını
+hansı
+hansılar
+hansınız
+həmçinin
+həmişə
+hərdən
+hətta
+həyat
+indi
+lazım
+lazımdır
+məncə
+məni
+niyə
+nəyi
+olacaq
+olar
+oldu
+oldum
+olmaq
+olmaz
+olub
+onda
+onlar
+onları
+onun
+ozunun
+qabaq
+quya
+sabağ
+sizcə
+sizi
+sonra
+sözsüz
+şübhəsiz
+səni
+yaxşı
+yenə
+əgər
diff --git a/sources/inc/lang/az/updateprofile.txt b/sources/inc/lang/az/updateprofile.txt
new file mode 100644
index 0000000..569e425
--- /dev/null
+++ b/sources/inc/lang/az/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Profili yenilə ======
+
+İstədiyiniz xanaları dəyiştirin. İstifadəşi adı dəyiştirilə bilməz.
+
+
diff --git a/sources/inc/lang/az/uploadmail.txt b/sources/inc/lang/az/uploadmail.txt
new file mode 100644
index 0000000..d538f82
--- /dev/null
+++ b/sources/inc/lang/az/uploadmail.txt
@@ -0,0 +1,15 @@
+Sizin DokuWiki-yə fayl yuklənildi. Ətraflı məlumat:
+
+Fayl        : @MEDIA@
+Tarix       : @DATE@
+Brauzer     : @BROWSER@
+IP Adres    : @IPADDRESS@
+Host        : @HOSTNAME@
+Həcm        : @SIZE@
+MIME Növ    : @MIME@
+İstifadəçi  : @USER@
+
+-- 
+Bu məktub DokuWiki tərəfindən yaradıldı.
+DokuWiki aşağıdakı adresdə yerləşir:
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/az/wordblock.txt b/sources/inc/lang/az/wordblock.txt
new file mode 100644
index 0000000..ec8b102
--- /dev/null
+++ b/sources/inc/lang/az/wordblock.txt
@@ -0,0 +1,3 @@
+====== SPAM-ın qarşısı alındı ======
+
+Sizin dəyişiklər **yaddaşa saxlanmadı**, çünki onların içində bir və ya daha çox içazəsiz sözlər var idi. Əgər siz wiki-yə spam əlavə etmək istəyirdinizsə, onda utanmırsız?! Əgər siz bunu səhv hesab edirsinizsə, onda administrator ilə əlaqə saxlayın.
diff --git a/sources/inc/lang/bg/admin.txt b/sources/inc/lang/bg/admin.txt
new file mode 100644
index 0000000..d3c14a0
--- /dev/null
+++ b/sources/inc/lang/bg/admin.txt
@@ -0,0 +1,3 @@
+====== Администриране ======
+
+Отдолу ще намерите списъка с администраторските задачи в DokuWiki.
\ No newline at end of file
diff --git a/sources/inc/lang/bg/adminplugins.txt b/sources/inc/lang/bg/adminplugins.txt
new file mode 100644
index 0000000..df24b05
--- /dev/null
+++ b/sources/inc/lang/bg/adminplugins.txt
@@ -0,0 +1 @@
+===== Допълнителни приставки =====
\ No newline at end of file
diff --git a/sources/inc/lang/bg/backlinks.txt b/sources/inc/lang/bg/backlinks.txt
new file mode 100644
index 0000000..e501614
--- /dev/null
+++ b/sources/inc/lang/bg/backlinks.txt
@@ -0,0 +1,3 @@
+====== Какво сочи насам ======
+
+Това е списък на страниците, които препращат обратно към текущата страница.
diff --git a/sources/inc/lang/bg/conflict.txt b/sources/inc/lang/bg/conflict.txt
new file mode 100644
index 0000000..8c62a37
--- /dev/null
+++ b/sources/inc/lang/bg/conflict.txt
@@ -0,0 +1,6 @@
+====== Съществува по-нова версия ======
+
+Съществува по-нова версия на документа, който сте редактирали. Това се случва когато друг потребител е променил документа докато сте го редактирали.
+
+Разгледайте внимателно разликите, след това решете коя версия да бъде запазена. Ако натиснете ''Запис'', ще бъде запазена вашата версия. Натиснете ли ''Отказ'', ще бъде запазена текущата версия.
+
diff --git a/sources/inc/lang/bg/denied.txt b/sources/inc/lang/bg/denied.txt
new file mode 100644
index 0000000..45ce637
--- /dev/null
+++ b/sources/inc/lang/bg/denied.txt
@@ -0,0 +1,4 @@
+====== Отказан достъп ======
+
+Нямате достатъчно права, за да продължите. Може би сте забравили да се впишете?
+
diff --git a/sources/inc/lang/bg/diff.txt b/sources/inc/lang/bg/diff.txt
new file mode 100644
index 0000000..a22031e
--- /dev/null
+++ b/sources/inc/lang/bg/diff.txt
@@ -0,0 +1,3 @@
+====== Разлики ======
+
+Тук са показани разликите между избраната и текущата версия на страницата.
diff --git a/sources/inc/lang/bg/draft.txt b/sources/inc/lang/bg/draft.txt
new file mode 100644
index 0000000..a592011
--- /dev/null
+++ b/sources/inc/lang/bg/draft.txt
@@ -0,0 +1,6 @@
+====== Намерена чернова ======
+
+Последната редакционна сесия на страницата не е завършена правилно. Dokuwiki автоматично запазва чернова по време на редактирането, която можете да ползвате сега, за да продължите работата си. Отдолу може да видите данните, които бяха запазени от последната сесия.
+
+Моля решете, дали искате да //възстановите// последната си редакционна сесия, //изтриете// автоматично запазената чернова или //откажете// редакцията.
+
diff --git a/sources/inc/lang/bg/edit.txt b/sources/inc/lang/bg/edit.txt
new file mode 100644
index 0000000..086d997
--- /dev/null
+++ b/sources/inc/lang/bg/edit.txt
@@ -0,0 +1,2 @@
+Редактирайте и натиснете ''Запис''. За информация относно ползвания синтаксис прочетете [[wiki:syntax]]. Моля, редактирайте само когато може да **подобрите** съдържанието. Ако ще пробвате разни неща, може да експериментирате в [[playground:playground|пясъчника]].
+
diff --git a/sources/inc/lang/bg/editrev.txt b/sources/inc/lang/bg/editrev.txt
new file mode 100644
index 0000000..ba97f25
--- /dev/null
+++ b/sources/inc/lang/bg/editrev.txt
@@ -0,0 +1,2 @@
+**Заредена е стара версия на документа!** Ако я запазите, ще създадете нова версия с текущите данни.
+----
diff --git a/sources/inc/lang/bg/index.txt b/sources/inc/lang/bg/index.txt
new file mode 100644
index 0000000..7dabac6
--- /dev/null
+++ b/sources/inc/lang/bg/index.txt
@@ -0,0 +1,4 @@
+====== Индекс ======
+
+Това е списък на всички налични страници подредени по [[doku>namespaces|именни пространства]].
+
diff --git a/sources/inc/lang/bg/install.html b/sources/inc/lang/bg/install.html
new file mode 100644
index 0000000..8763e4d
--- /dev/null
+++ b/sources/inc/lang/bg/install.html
@@ -0,0 +1,15 @@
+
        Страницата помага при инсталиране за първи път и настройване на
+Dokuwiki.  Повече информация
+за инсталатора ще намерите в документацията му.
        
+
+
        Dokuwiki ползва обикновени файлове за съхраняване на страниците и информацията свързана с тях (примерно картинки, търсения, стари версии, и др.).
+За да функционира нормално DokuWiki
+трябва да има право за писане в директориите, които съдържат тези
+файлове. Инсталаторът не може да настройва правата на директориите.
+Вие трябва да направите това директно от командният ред или ако ползвате хостинг през FTP или контролния панела на хоста (примерно cPanel).
        
+
+
        Инсталаторът ще настрои вашата DokuWiki конфигурация на
+ACL, което ще позволи на администратора да се впише и ползва администраторското меню в DokuWiki за инсталиране на приставки, контрол на потребителите, управление на достъпа до страниците и промяна на останалите настройки. Това не е необходимо за функционирането на DokuWiki, но прави администрирането по-лесно.
        
+
+
        Опитните потребители и потребителите със специални изисквания към настройките имат на разположение допълнителна информация относно инсталирането
+и настройването.
        
diff --git a/sources/inc/lang/bg/lang.php b/sources/inc/lang/bg/lang.php
new file mode 100644
index 0000000..e909980
--- /dev/null
+++ b/sources/inc/lang/bg/lang.php
@@ -0,0 +1,350 @@
+
+ * @author Viktor Usunov 
+ * @author Kiril 
+ */
+$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_profile']           = 'Профил';
+$lang['btn_reset']             = 'Изчистване';
+$lang['btn_resendpwd']         = 'Задаване на нова парола';
+$lang['btn_draft']             = 'Редактиране на черновата';
+$lang['btn_recover']           = 'Възстановяване на черновата';
+$lang['btn_draftdel']          = 'Изтриване на черновата';
+$lang['btn_revert']            = 'Възстановяване';
+$lang['btn_register']          = 'Регистриране';
+$lang['btn_apply']             = 'Прилагане';
+$lang['btn_media']             = 'Диспечер на файлове';
+
+$lang['loggedinas']            = 'Вписани сте като';
+$lang['user']                  = 'Потребител';
+$lang['pass']                  = 'Парола';
+$lang['newpass']               = 'Нова парола';
+$lang['oldpass']               = 'Потвърждение на текуща парола';
+$lang['passchk']               = 'още веднъж';
+$lang['remember']              = 'Запомни ме';
+$lang['fullname']              = 'Истинско име';
+$lang['email']                 = 'Електронна поща';
+$lang['profile']               = 'Потребителски профил';
+$lang['badlogin']              = 'Грешно потребителско име или парола.';
+$lang['minoredit']             = 'Промените са незначителни';
+$lang['draftdate']             = 'Черновата е автоматично записана на'; // full dformat date will be added
+$lang['nosecedit']             = 'Страницата бе междувременно променена, презареждане на страницата поради неактуална информация.';
+
+$lang['regmissing']            = 'Моля, попълнете всички полета.';
+$lang['reguexists']            = 'Вече съществува потребител с избраното име.';
+$lang['regsuccess']            = 'Потребителят е създаден, а паролата е пратена по електронната поща.';
+$lang['regsuccess2']           = 'Потребителят е създаден.';
+$lang['regmailfail']           = 'Изглежда, че има проблем с пращането на писмото с паролата. Моля, свържете се с администратора!';
+$lang['regbadmail']            = 'Въведеният адрес изглежда невалиден - ако мислите, че това е грешка, свържете се с администратора.';
+$lang['regbadpass']            = 'Двете въведени пароли не съвпадат, моля опитайте отново.';
+$lang['regpwmail']             = 'Паролата ви за DokuWiki';
+$lang['reghere']               = 'Все още нямате профил? Направете си';
+
+$lang['profna']                = 'Wiki-то не поддържа промяна на профила';
+$lang['profnochange']          = 'Няма промени.';
+$lang['profnoempty']           = 'Въвеждането на име и ел. поща е задължително';
+$lang['profchanged']           = 'Потребителският профил е обновен успешно.';
+
+$lang['pwdforget']             = 'Забравили сте паролата си? Получете нова';
+$lang['resendna']              = 'Wiki-то не поддържа повторно пращане на паролата.';
+$lang['resendpwd']             = 'Задаване на нова парола за';
+$lang['resendpwdmissing']      = 'Моля, попълнете всички полета.';
+$lang['resendpwdnouser']       = 'Потребителят не е намерен в базата от данни.';
+$lang['resendpwdbadauth']      = 'Кодът за потвърждение е невалиден. Проверете дали сте използвали целия линк за потвърждение.';
+$lang['resendpwdconfirm']      = 'Линк за потвърждение е пратен по електронната поща.';
+$lang['resendpwdsuccess']      = 'Новата ви паролата е пратена по електронната поща.';
+
+$lang['license']               = 'Ако не е посочено друго, съдържанието на Wiki-то е лицензирано под следния лиценз:';
+$lang['licenseok']             = 'Бележка: Редактирайки страницата, Вие се съгласявате да лицензирате промените (които сте направили) под следния лиценз:';
+
+$lang['searchmedia']           = 'Търсене на файл: ';
+$lang['searchmedia_in']        = 'Търсене в %s';
+$lang['txt_upload']            = 'Изберете файл за качване';
+$lang['txt_filename']          = 'Качи като (незадължително)';
+$lang['txt_overwrt']           = 'Презапиши съществуващите файлове';
+$lang['maxuploadsize']         = 'Макс. размер за отделните файлове е %s.';
+$lang['lockedby']              = 'В момента е заключена от';
+$lang['lockexpire']            = 'Ще бъде отключена на';
+
+$lang['js']['willexpire']      = 'Страницата ще бъде отключена за редактиране след минута.\nЗа предотвратяване на конфликти, ползвайте бутона "Преглед", за рестартиране на брояча за заключване.';
+$lang['js']['notsavedyet']     = 'Незаписаните промени ще бъдат загубени. Желаете ли да продължите?';
+$lang['js']['searchmedia']     = 'Търсене на файлове';
+$lang['js']['keepopen']        = 'Без затваряне на прозореца след избор';
+$lang['js']['hidedetails']     = 'Без подробности';
+$lang['js']['mediatitle']      = 'Настройки на препратката';
+$lang['js']['mediadisplay']    = 'Тип на препратката';
+$lang['js']['mediaalign']      = 'Подреждане';
+$lang['js']['mediasize']       = 'Размер на изображението';
+$lang['js']['mediatarget']     = 'Препращане към';
+$lang['js']['mediaclose']      = 'Затваряне';
+$lang['js']['mediainsert']     = 'Вмъкване';
+$lang['js']['mediadisplayimg'] = 'Показвай изображението.';
+$lang['js']['mediadisplaylnk'] = 'Показвай само препратката.';
+$lang['js']['mediasmall']      = 'Малка версия';
+$lang['js']['mediamedium']     = 'Средна версия';
+$lang['js']['medialarge']      = 'Голяма версия';
+$lang['js']['mediaoriginal']   = 'Оригинална версия';
+$lang['js']['medialnk']        = 'Препратка към подробна страница';
+$lang['js']['mediadirect']     = 'Директна препратка към оригинала';
+$lang['js']['medianolnk']      = 'Без препратка';
+$lang['js']['medianolink']     = 'Без препратка към изображението';
+$lang['js']['medialeft']       = 'Подреди изображението отляво.';
+$lang['js']['mediaright']      = 'Подреди изображението отдясно.';
+$lang['js']['mediacenter']     = 'Подреди изображението по средата.';
+$lang['js']['medianoalign']    = 'Без подреждане.';
+$lang['js']['nosmblinks']      = 'Връзките към Windows shares работят само под Internet Explorer.
        Можете да копирате и поставите връзката.';
+$lang['js']['linkwiz']         = 'Помощник за препратки';
+$lang['js']['linkto']          = 'Препратка към: ';
+$lang['js']['del_confirm']     = 'Да бъдат ли изтрити избраните елементи?';
+$lang['js']['restore_confirm'] = 'Наистина ли желаете да бъде възстановена тази версия?';
+$lang['js']['media_diff']      = 'Преглед на разликите:';
+$lang['js']['media_diff_both'] = 'Един до друг';
+$lang['js']['media_diff_opacity'] = 'Наслагване (и прозиране)';
+$lang['js']['media_diff_portions'] = 'По половинка';
+$lang['js']['media_select']    = 'Изберете файлове...';
+$lang['js']['media_upload_btn'] = 'Качване';
+$lang['js']['media_done_btn']  = 'Готово';
+$lang['js']['media_drop']      = 'Влачете и пуснете файливе тук, за да бъдат качени';
+$lang['js']['media_cancel']    = 'премахване';
+$lang['js']['media_overwrt']   = 'Презапиши съществуващите файлове';
+
+$lang['rssfailed']             = 'Възникна грешка при получаването на емисията: ';
+$lang['nothingfound']          = 'Нищо не е открито.';
+
+$lang['mediaselect']           = 'Файлове';
+$lang['fileupload']            = 'Качване на файлове';
+$lang['uploadsucc']            = 'Качването е успешно';
+$lang['uploadfail']            = 'Качването се провали. Може би поради грешни права?';
+$lang['uploadwrong']           = 'Качването е отказано. Файлово разширение е забранено!';
+$lang['uploadexist']           = 'Файлът вече съществува. Нищо не е направено.';
+$lang['uploadbadcontent']      = 'Каченото съдържание не съответства на файлово разширение %s .';
+$lang['uploadspam']            = 'Качването е блокирано от SPAM списъка.';
+$lang['uploadxss']             = 'Качването е блокирано, поради възможно зловредно съдържание.';
+$lang['uploadsize']            = 'Файлът за качване е прекалено голям. (макс. %s)';
+$lang['deletesucc']            = 'Файлът "%s" бе изтрит.';
+$lang['deletefail']            = '"%s" не може да бъде изтрит - проверете правата.';
+$lang['mediainuse']            = 'Файлът "%s" не бе изтрит - все още се ползва.';
+$lang['namespaces']            = 'Именни пространства';
+$lang['mediafiles']            = 'Налични файлове в';
+$lang['accessdenied']          = 'Нямате необходимите права за преглеждане на страницата.';
+$lang['mediausage']            = 'Ползвайте следния синтаксис, за да упоменете файла:';
+$lang['mediaview']             = 'Преглед на оригиналния файл';
+$lang['mediaroot']             = 'root';
+$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['difflink']              = 'Препратка към сравнението на версиите';
+$lang['diff_type']             = 'Преглед на разликите:';
+$lang['diff_inline']           = 'Вграден';
+$lang['diff_side']             = 'Един до друг';
+$lang['line']                  = 'Ред';
+$lang['breadcrumb']            = 'Следа';
+$lang['youarehere']            = 'Намирате се в';
+$lang['lastmod']               = 'Последна промяна';
+$lang['by']                    = 'от';
+$lang['deleted']               = 'изтрита';
+$lang['created']               = 'създадена';
+$lang['restored']              = 'възстановена предишна версия (%s)';
+$lang['external_edit']         = 'външна редакция';
+$lang['summary']               = 'Обобщение';
+$lang['noflash']               = 'Необходим е Adobe Flash Plugin за изобразяване на съдържанието.';
+$lang['download']              = 'Изтегляне на фрагмент';
+$lang['tools']                 = 'Инструменти';
+$lang['user_tools']            = 'Инструменти за потребители';
+$lang['site_tools']            = 'Инструменти за сайта';
+$lang['page_tools']            = 'Инструменти за страници';
+$lang['skip_to_content']       = 'към съдържанието';
+$lang['sidebar']               = 'Странична лента';
+
+$lang['mail_newpage']          = 'добавена страница: ';
+$lang['mail_changed']          = 'променена страница: ';
+$lang['mail_subscribe_list']   = 'променени страници в именно пространство: ';
+$lang['mail_new_user']         = 'нов потребител: ';
+$lang['mail_upload']           = 'качен файл: ';
+
+$lang['changes_type']          = 'Преглед на променените';
+$lang['pages_changes']         = 'Страници';
+$lang['media_changes']         = 'Файлове';
+$lang['both_changes']          = 'Страници и файлове';
+
+$lang['qb_bold']               = 'Удебелен текст';
+$lang['qb_italic']             = 'Курсив текст';
+$lang['qb_underl']             = 'Подчертан текст';
+$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['img_width']             = 'Ширина';
+$lang['img_height']            = 'Височина';
+$lang['img_manager']           = 'Преглед в диспечера на файлове';
+
+$lang['subscr_subscribe_success'] = '%s е добавен към списъка с абониралите се за %s';
+$lang['subscr_subscribe_error'] = 'Грешка при добавянето на %s към списъка с абониралите се за %s';
+$lang['subscr_subscribe_noaddress'] = 'Добавянето ви към списъка с абонати не е възможно поради липсата на свързан адрес (на ел. поща) с профила ви.';
+$lang['subscr_unsubscribe_success'] = '%s е премахнат от списъка с абониралите се за %s';
+$lang['subscr_unsubscribe_error'] = 'Грешка при премахването на %s от списъка с абониралите се за %s';
+$lang['subscr_already_subscribed'] = '%s е вече абониран за %s';
+$lang['subscr_not_subscribed'] = '%s не е абониран за %s';
+// Manage page for subscriptions
+$lang['subscr_m_not_subscribed'] = 'Не сте абониран за текущата страницата или именно пространство.';
+$lang['subscr_m_new_header']   = 'Добави абонамент';
+$lang['subscr_m_current_header'] = 'Текущи абонаменти';
+$lang['subscr_m_unsubscribe']  = 'Прекратяване на абонамента';
+$lang['subscr_m_subscribe']    = 'Абониране';
+$lang['subscr_m_receive']      = 'Получаване';
+$lang['subscr_style_every']    = 'на ел. писмо при всяка промяна';
+$lang['subscr_style_digest']   = 'на ел. писмо с обобщение на промените във всяка страница (всеки %.2f дни)';
+$lang['subscr_style_list']     = 'на списък с променените страници от последното ел. писмо (всеки %.2f дни)';
+
+/* auth.class language support */
+$lang['authtempfail']          = 'Удостоверяването на потребители не е възможно за момента. Ако продължи дълго, моля уведомете администратора на Wiki страницата.';
+$lang['authpwdexpire']         = 'Срока на паролата ви ще изтече след %d дни. Препорачително е да я смените по-скоро.';
+
+/* installer strings */
+$lang['i_chooselang']          = 'Изберете вашия изик';
+$lang['i_installer']           = 'Инсталатор на DokuWiki';
+$lang['i_wikiname']            = 'Име на Wiki-то';
+$lang['i_enableacl']           = 'Ползване на списък за достъп (ACL) [препоръчително]';
+$lang['i_superuser']           = 'Супер потребител';
+$lang['i_problems']            = 'Открити са проблеми, които възпрепятстват инсталирането. Ще можете да продължите след като отстраните долуизброените проблеми.';
+$lang['i_modified']            = 'Поради мерки за сигурност инсталаторът работи само с нови и непроменени инсталационни файлове.
+								  Трябва да разархивирате отново файловете от сваления архив или да се посъветвате с Инструкциите за инсталиране на Dokuwiki.';
+$lang['i_funcna']              = 'PHP функцията %s не е достъпна. Може би е забранена от доставчика на хостинг.';
+$lang['i_phpver']              = 'Инсталираната версия %s на PHP е по-стара от необходимата %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']             = 'Възникнаха грешки при записването на файловете с настройки. Вероятно ще се наложи да ги поправите ръчно,
+                                  за да можете да ползвате Вашето ново DokuWiki.';
+$lang['i_policy']              = 'Първоначална политика за достъп';
+$lang['i_pol0']                = 'Отворено Wiki (всеки може да чете, пише и качва)';
+$lang['i_pol1']                = 'Публично Wiki (всеки може да чете, само регистрирани пишат и качват)';
+$lang['i_pol2']                = 'Затворено Wiki (само регистрирани четат, пишат и качват)';
+$lang['i_retry']               = 'Повторен опит';
+$lang['i_license']             = 'Моля, изберете лиценз под който желаете да публикувате съдържанието:';
+$lang['i_license_none']        = 'Без показване на информация относно лиценза';
+$lang['i_pop_field']           = 'Моля, помогнете за усъвършенстването на DokuWiki:';
+$lang['i_pop_label']           = 'Изпращане на анонимна информация до разработчиците на DokuWiki, веднъж седмично';
+
+$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 секунди';
+
+$lang['wordblock']             = 'Направените от Вас промени не са съхранени, защото съдържат забранен текст (SPAM).';
+
+$lang['media_uploadtab']       = 'Качване';
+$lang['media_searchtab']       = 'Търсене';
+$lang['media_file']            = 'Файл';
+$lang['media_viewtab']         = 'Преглед';
+$lang['media_edittab']         = 'Редактиране';
+$lang['media_historytab']      = 'История';
+$lang['media_list_thumbs']     = 'Миниатюри';
+$lang['media_list_rows']       = 'Редове';
+$lang['media_sort_name']       = 'Име';
+$lang['media_sort_date']       = 'Дата';
+$lang['media_namespaces']      = 'Изберете:';
+$lang['media_files']           = 'Файлове в %s';
+$lang['media_upload']          = 'Качване в %s';
+$lang['media_search']          = 'Търсене в %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s в %s';
+$lang['media_edit']            = 'Редактиране на %s';
+$lang['media_history']         = 'История на %s';
+$lang['media_meta_edited']     = 'редактиране на метаданните';
+$lang['media_perm_read']       = 'За съжаление нямате достатъчно права, за да можете да прочетете файла.';
+$lang['media_perm_upload']     = 'За съжаление нямате достатъчно права, за да можете да качите файла.';
+$lang['media_update']          = 'Качване на нова версия';
+$lang['media_restore']         = 'Възстановяване на тази версия';
+
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/inc/lang/bg/locked.txt b/sources/inc/lang/bg/locked.txt
new file mode 100644
index 0000000..7cdfba7
--- /dev/null
+++ b/sources/inc/lang/bg/locked.txt
@@ -0,0 +1,3 @@
+====== Страницата е заключена ======
+
+В момента страницата е заключена за редактиране от друг потребител. Трябва да изчакате потребителя да приключи с редактирането на страницата или автоматичното отключване на страницата.
diff --git a/sources/inc/lang/bg/login.txt b/sources/inc/lang/bg/login.txt
new file mode 100644
index 0000000..e5061c3
--- /dev/null
+++ b/sources/inc/lang/bg/login.txt
@@ -0,0 +1,3 @@
+====== Вписване ======
+
+Не сте се вписали! Въведете данните си за удостоверяване отдолу, за да го направите. Бисквитките (cookies) трябва да са включени.
diff --git a/sources/inc/lang/bg/mailtext.txt b/sources/inc/lang/bg/mailtext.txt
new file mode 100644
index 0000000..a5f0cbd
--- /dev/null
+++ b/sources/inc/lang/bg/mailtext.txt
@@ -0,0 +1,16 @@
+Страница в DokuWiki е добавена или променена. Ето детайлите:
+
+Дата : @DATE@
+Браузър : @BROWSER@
+IP адрес : @IPADDRESS@
+Име на хоста : @HOSTNAME@
+Стара версия: @OLDPAGE@
+Нова версия: @NEWPAGE@
+Обобщение: @SUMMARY@
+Потребител : @USER@
+
+@DIFF@
+
+
+-- 
+Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
diff --git a/sources/inc/lang/bg/mailwrap.html b/sources/inc/lang/bg/mailwrap.html
new file mode 100644
index 0000000..26b0a1e
--- /dev/null
+++ b/sources/inc/lang/bg/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+    @TITLE@
+    
+
+
+
+@HTMLBODY@
+
+
        
+Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@.
+
+
diff --git a/sources/inc/lang/bg/newpage.txt b/sources/inc/lang/bg/newpage.txt
new file mode 100644
index 0000000..22d3bb6
--- /dev/null
+++ b/sources/inc/lang/bg/newpage.txt
@@ -0,0 +1,4 @@
+====== Несъществуваща тема ======
+
+Последвали сте препратка към тема, която не съществува. Ако правата ви позволяват, може да я създадете чрез бутона ''Създаване на страница''.
+
diff --git a/sources/inc/lang/bg/norev.txt b/sources/inc/lang/bg/norev.txt
new file mode 100644
index 0000000..fb7aeef
--- /dev/null
+++ b/sources/inc/lang/bg/norev.txt
@@ -0,0 +1,4 @@
+====== Няма такава версия ======
+
+Избраната версия не съществува. Натиснете бутона ''История'' за отваряне на списъка със стари версии на документа.
+
diff --git a/sources/inc/lang/bg/password.txt b/sources/inc/lang/bg/password.txt
new file mode 100644
index 0000000..7a70ef1
--- /dev/null
+++ b/sources/inc/lang/bg/password.txt
@@ -0,0 +1,9 @@
+Здравейте @FULLNAME@!
+
+Вашите потребителски данни за @TITLE@ на @DOKUWIKIURL@
+
+Потребител : @LOGIN@
+Парола : @PASSWORD@
+
+-- 
+Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/bg/preview.txt b/sources/inc/lang/bg/preview.txt
new file mode 100644
index 0000000..41fde73
--- /dev/null
+++ b/sources/inc/lang/bg/preview.txt
@@ -0,0 +1,3 @@
+====== Преглед ======
+
+Ето как ще изглежда страницата. Текста все още **не е запазен**!
\ No newline at end of file
diff --git a/sources/inc/lang/bg/pwconfirm.txt b/sources/inc/lang/bg/pwconfirm.txt
new file mode 100644
index 0000000..802153f
--- /dev/null
+++ b/sources/inc/lang/bg/pwconfirm.txt
@@ -0,0 +1,13 @@
+Здравейте @FULLNAME@!
+
+Някой е поискал нова парола за потребител @TITLE@
+на @DOKUWIKIURL@
+
+Ако не сте поискали нова парола, тогава просто игнорирайте това писмо.
+
+За да потвърдите, че искането е наистина от вас, моля ползвайте следния линк:
+
+@CONFIRM@
+
+-- 
+Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
diff --git a/sources/inc/lang/bg/read.txt b/sources/inc/lang/bg/read.txt
new file mode 100644
index 0000000..861d47f
--- /dev/null
+++ b/sources/inc/lang/bg/read.txt
@@ -0,0 +1,2 @@
+Страницата е само за четене. Може да разглеждате кода, но не и да го променяте. Обърнете се съм администратора, ако смятате, че това не е редно.
+
diff --git a/sources/inc/lang/bg/recent.txt b/sources/inc/lang/bg/recent.txt
new file mode 100644
index 0000000..c920290
--- /dev/null
+++ b/sources/inc/lang/bg/recent.txt
@@ -0,0 +1,4 @@
+====== Скорошни промени ======
+
+Следните страници са били променени наскоро.
+
diff --git a/sources/inc/lang/bg/register.txt b/sources/inc/lang/bg/register.txt
new file mode 100644
index 0000000..51fbb83
--- /dev/null
+++ b/sources/inc/lang/bg/register.txt
@@ -0,0 +1,4 @@
+====== Регистриране като нов потребител ======
+
+Моля, попълнете всичките полета отдолу, за да бъде създаден нов профил. Уверете се, че въведеният **адрес на ел. поща е правилен**. Ако няма поле за парола, ще ви бъде изпратена такава на въведения адрес. Потребителското име трябва да бъде валидно [[doku>pagename|име на страница]].
+
diff --git a/sources/inc/lang/bg/registermail.txt b/sources/inc/lang/bg/registermail.txt
new file mode 100644
index 0000000..4b0828c
--- /dev/null
+++ b/sources/inc/lang/bg/registermail.txt
@@ -0,0 +1,13 @@
+Регистриран е нов потребител. Ето детайлите:
+
+Потребител  : @NEWUSER@
+Пълно име : @NEWNAME@
+E. поща : @NEWEMAIL@
+
+Дата : @DATE@
+Браузър : @BROWSER@
+IP адрес : @IPADDRESS@
+Име на хоста : @HOSTNAME@
+
+-- 
+Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/bg/resendpwd.txt b/sources/inc/lang/bg/resendpwd.txt
new file mode 100644
index 0000000..38e2d1f
--- /dev/null
+++ b/sources/inc/lang/bg/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Пращане на нова парола ======
+
+Моля, въведете потребителското си име във формата по-долу, ако желаете да получите нова парола. По ел. поща ще получите линк, с който да потвърдите.
diff --git a/sources/inc/lang/bg/resetpwd.txt b/sources/inc/lang/bg/resetpwd.txt
new file mode 100644
index 0000000..caa4adf
--- /dev/null
+++ b/sources/inc/lang/bg/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Задаване на нова парола ======
+
+Моля, въведете нова парола за вашия акаунт в Wiki страницата.
+
diff --git a/sources/inc/lang/bg/revisions.txt b/sources/inc/lang/bg/revisions.txt
new file mode 100644
index 0000000..0e14662
--- /dev/null
+++ b/sources/inc/lang/bg/revisions.txt
@@ -0,0 +1,4 @@
+====== Стари версии======
+
+Това са старите версии на документа. За да възстановите стара версия, изберете я долу, натиснете ''Редактиране'' и я запазете.
+
diff --git a/sources/inc/lang/bg/searchpage.txt b/sources/inc/lang/bg/searchpage.txt
new file mode 100644
index 0000000..48d4751
--- /dev/null
+++ b/sources/inc/lang/bg/searchpage.txt
@@ -0,0 +1,5 @@
+====== Търсене ======
+
+Резултата от търсенето ще намерите по-долу. Ако не намирате каквото сте търсили, може да създадете или редактирате страница, кръстена на вашата заявка, чрез съответния бутон.
+
+===== Резултати =====
diff --git a/sources/inc/lang/bg/showrev.txt b/sources/inc/lang/bg/showrev.txt
new file mode 100644
index 0000000..a3848f8
--- /dev/null
+++ b/sources/inc/lang/bg/showrev.txt
@@ -0,0 +1,2 @@
+**Това е стара версия на документа!**
+----
diff --git a/sources/inc/lang/bg/stopwords.txt b/sources/inc/lang/bg/stopwords.txt
new file mode 100644
index 0000000..03fd137
--- /dev/null
+++ b/sources/inc/lang/bg/stopwords.txt
@@ -0,0 +1,29 @@
+# Това е списък с думи за игнориране при индексиране, с една дума на ред
+# Когато редактирате този файл, не забравяйте да използвате UNIX символ за нов ред
+# Не е нужно да включвате думи по-кратки от 3 символа - те биват игнорирани така или иначе
+# Списъкът се основава на думи от http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/bg/subscr_digest.txt b/sources/inc/lang/bg/subscr_digest.txt
new file mode 100644
index 0000000..f0533da
--- /dev/null
+++ b/sources/inc/lang/bg/subscr_digest.txt
@@ -0,0 +1,18 @@
+Здравейте!
+
+Страницата @PAGE@ в @TITLE@ wiki е променена.
+Промените са по-долу:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Стара версия: @OLDPAGE@
+Нова версия: @NEWPAGE@
+
+Ако желаете да прекратите уведомяването за страницата трябва да се впишете на адрес @DOKUWIKIURL@, да посетите
+@SUBSCRIBE@
+и да прекратите абонамента за промени по страницата или именното пространство.
+
+--
+Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/bg/subscr_form.txt b/sources/inc/lang/bg/subscr_form.txt
new file mode 100644
index 0000000..e32a5ec
--- /dev/null
+++ b/sources/inc/lang/bg/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Диспечер на абонаменти ======
+
+Страницата ви позволява да управлявате текущите си абонаменти за страници и именни пространства.
\ No newline at end of file
diff --git a/sources/inc/lang/bg/subscr_list.txt b/sources/inc/lang/bg/subscr_list.txt
new file mode 100644
index 0000000..e9e65bc
--- /dev/null
+++ b/sources/inc/lang/bg/subscr_list.txt
@@ -0,0 +1,15 @@
+Здравейте!
+
+Променени са страници от именното пространство @PAGE@ от @TITLE@ wiki.
+Ето променените страници:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Ако желаете да прекратите уведомяването за страницата трябва да се впишете на адрес @DOKUWIKIURL@, да посетите
+@SUBSCRIBE@
+и да прекратите абонамента за промени по страницата или именното пространство.
+
+--
+Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/bg/subscr_single.txt b/sources/inc/lang/bg/subscr_single.txt
new file mode 100644
index 0000000..a74a21f
--- /dev/null
+++ b/sources/inc/lang/bg/subscr_single.txt
@@ -0,0 +1,22 @@
+Здравейте!
+
+Страницата @PAGE@ в @TITLE@ wiki е променена.
+Промените са по-долу:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Дата : @DATE@
+Потребител : @USER@
+Обобщение: @SUMMARY@
+Стара версия: @OLDPAGE@
+Нова версия: @NEWPAGE@
+
+Ако желаете да прекратите уведомяването за страницата трябва да се впишете на адрес @DOKUWIKIURL@, да посетите
+@SUBSCRIBE@
+и да прекратите абонамента за промени по страницата или именното пространство.
+
+--
+Писмото е генерирано от DokuWiki на адрес
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/bg/updateprofile.txt b/sources/inc/lang/bg/updateprofile.txt
new file mode 100644
index 0000000..6113f0d
--- /dev/null
+++ b/sources/inc/lang/bg/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Обновете профила си ======
+
+Трябва само да допълните полетата, които искате да промените. Потребителското не може да бъде променяно.
diff --git a/sources/inc/lang/bg/uploadmail.txt b/sources/inc/lang/bg/uploadmail.txt
new file mode 100644
index 0000000..ebd8d91
--- /dev/null
+++ b/sources/inc/lang/bg/uploadmail.txt
@@ -0,0 +1,13 @@
+Качен е файл на вашето DokuWiki. Ето детайлите
+
+Файл : @MEDIA@
+Дата  : @DATE@
+Браузър : @BROWSER@
+IP адрес : @IPADDRESS@
+Име на хоста : @HOSTNAME@
+Размер : @SIZE@
+MIME тип : @MIME@
+Потребител : @USER@
+
+-- 
+Писмото е генерирано от DokuWiki на адрес @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/bn/admin.txt b/sources/inc/lang/bn/admin.txt
new file mode 100644
index 0000000..ede23c7
--- /dev/null
+++ b/sources/inc/lang/bn/admin.txt
@@ -0,0 +1,3 @@
+====== প্রশাসন ======
+
+আপনি DokuWiki পাওয়া প্রশাসনিক কাজগুলো একটি তালিকা পেতে পারেন নীচে.
\ No newline at end of file
diff --git a/sources/inc/lang/bn/adminplugins.txt b/sources/inc/lang/bn/adminplugins.txt
new file mode 100644
index 0000000..c491ff9
--- /dev/null
+++ b/sources/inc/lang/bn/adminplugins.txt
@@ -0,0 +1 @@
+===== অতিরিক্ত প্লাগইন =====
\ No newline at end of file
diff --git a/sources/inc/lang/bn/backlinks.txt b/sources/inc/lang/bn/backlinks.txt
new file mode 100644
index 0000000..61a7cac
--- /dev/null
+++ b/sources/inc/lang/bn/backlinks.txt
@@ -0,0 +1,3 @@
+====== ব্যাকলিঙ্কগুলি ======
+
+এই বর্তমান পৃষ্ঠায় ফিরে সংযোগ আছে বলে মনে হচ্ছে যে পেজের একটি তালিকা.
\ No newline at end of file
diff --git a/sources/inc/lang/bn/conflict.txt b/sources/inc/lang/bn/conflict.txt
new file mode 100644
index 0000000..b18ad95
--- /dev/null
+++ b/sources/inc/lang/bn/conflict.txt
@@ -0,0 +1,5 @@
+====== একটি নতুন সংস্করণ উপস্থিত ======
+
+আপনি সম্পাদিত ডকুমেন্টের একটি নতুন সংস্করণ বিদ্যমান. আপনি এটি সম্পাদনা যখন অন্য ব্যবহারকারীর নথি পরিবর্তিত যখন এটি হয়.
+
+পুঙ্খানুপুঙ্খভাবে নিচে দেখানো পার্থক্য পরীক্ষা, তারপর রাখা যা সংস্করণে ঠিক. আপনি "সংরক্ষণ" চয়ন, আপনার সংস্করণ সংরক্ষিত হবে অথবা বর্তমান সংস্করণ রাখা ''বাতিল'' হিট করুন.
\ No newline at end of file
diff --git a/sources/inc/lang/bn/denied.txt b/sources/inc/lang/bn/denied.txt
new file mode 100644
index 0000000..711275b
--- /dev/null
+++ b/sources/inc/lang/bn/denied.txt
@@ -0,0 +1,3 @@
+====== অনুমতি অস্বীকার =====
+
+দুঃখিত, আপনি কি এগিয়ে যেতে যথেষ্ট অধিকার নেই. সম্ভবত আপনি লগইন ভুলে গেছেন?
\ No newline at end of file
diff --git a/sources/inc/lang/bn/diff.txt b/sources/inc/lang/bn/diff.txt
new file mode 100644
index 0000000..5952e28
--- /dev/null
+++ b/sources/inc/lang/bn/diff.txt
@@ -0,0 +1,3 @@
+====== পার্থক্য ======
+
+এর মানে আপনি পৃষ্ঠার দুটি সংস্করণের মধ্যে পার্থক্য দেখায়.
\ No newline at end of file
diff --git a/sources/inc/lang/bn/draft.txt b/sources/inc/lang/bn/draft.txt
new file mode 100644
index 0000000..0b614f4
--- /dev/null
+++ b/sources/inc/lang/bn/draft.txt
@@ -0,0 +1,5 @@
+====== খসড়া ফাইল ====== পাওয়া
+
+এই পৃষ্ঠাতে আপনার সর্বশেষ সম্পাদনা সময় সঠিকভাবে সম্পন্ন করা হয় নি. DokuWiki স্বয়ংক্রিয়ভাবে আপনি এখন আপনার সম্পাদনা চালিয়ে যেতে ব্যবহার করতে পারেন যা আপনার কাজ করার সময় একটি খসড়া সংরক্ষিত. আপনি আপনার শেষ সময় থেকে সংরক্ষিত ছিল যে তথ্য দেখতে পারেন নিচে.
+
+আপনি / /ফিরাইয়া আনা / / আপনার হারিয়ে সম্পাদনা সময়, / / মুছে দিন / / স্বতঃসংরক্ষিত খসড়া অথবা / / বাতিল / / সম্পাদনা প্রক্রিয়া পুনরুদ্ধার করতে চান তা স্থির করুন.
\ No newline at end of file
diff --git a/sources/inc/lang/bn/edit.txt b/sources/inc/lang/bn/edit.txt
new file mode 100644
index 0000000..b294b64
--- /dev/null
+++ b/sources/inc/lang/bn/edit.txt
@@ -0,0 +1 @@
+পাতা সম্পাদনা করুন এবং ''সংরক্ষণ'' আঘাত. দেখুন [[উইকি: সিনট্যাক্স]] উইকি সিনট্যাক্স জন্য. আপনি এটি **উন্নত** করতে পারেন শুধুমাত্র যদি পাতাটি সম্পাদনা করুন. আপনি কিছু কিছু বিষয় পরীক্ষা আপনার প্রথম পদক্ষেপ করা শিখতে চান [[খেলার মাঠ: খেলার মাঠ | খেলার মাঠ]].
\ No newline at end of file
diff --git a/sources/inc/lang/bn/editrev.txt b/sources/inc/lang/bn/editrev.txt
new file mode 100644
index 0000000..1ea7236
--- /dev/null
+++ b/sources/inc/lang/bn/editrev.txt
@@ -0,0 +1,2 @@
+** আপনি নথির একটি পুরোনো সংস্করণ লোড করেছেন! ** যদি আপনি এটি সংরক্ষণ করেন, আপনি এই তথ্য দিয়ে একটি নতুন সংস্করণ তৈরি করবে.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/bn/index.txt b/sources/inc/lang/bn/index.txt
new file mode 100644
index 0000000..9f5ad75
--- /dev/null
+++ b/sources/inc/lang/bn/index.txt
@@ -0,0 +1,3 @@
+====== সাইটম্যাপ ======
+
+এই দ্বারা আদেশ সমস্ত উপলব্ধ পৃষ্ঠাগুলি উপর একটি সাইট ম্যাপ হল [[Doku> নামব্যবধান | নামব্যবধান]].
\ No newline at end of file
diff --git a/sources/inc/lang/bn/lang.php b/sources/inc/lang/bn/lang.php
new file mode 100644
index 0000000..eb8d09e
--- /dev/null
+++ b/sources/inc/lang/bn/lang.php
@@ -0,0 +1,27 @@
+
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'itr';
+$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']              = 'Save';
+$lang['btn_preview']           = 'পূর্বরূপ';
+$lang['btn_top']               = 'উপরে ফিরে যান ';
+$lang['btn_newer']             = '<< আরো সাম্প্রতিক';
+$lang['btn_older']             = 'কম সাম্প্রতিক >>';
+$lang['btn_revs']              = 'প্রাচীন সংশোধন';
+$lang['btn_recent']            = 'সাধিত পরিবর্তনসমূহ';
+$lang['btn_upload']            = 'আপলোড করুন';
diff --git a/sources/inc/lang/ca-valencia/admin.txt b/sources/inc/lang/ca-valencia/admin.txt
new file mode 100644
index 0000000..628948e
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/admin.txt
@@ -0,0 +1,4 @@
+====== Administració ======
+
+Avall pot trobar una llista de tasques administratives disponibles en DokuWiki.
+
diff --git a/sources/inc/lang/ca-valencia/adminplugins.txt b/sources/inc/lang/ca-valencia/adminplugins.txt
new file mode 100644
index 0000000..6c5c4f9
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/adminplugins.txt
@@ -0,0 +1 @@
+===== Plúgins adicionals =====
\ No newline at end of file
diff --git a/sources/inc/lang/ca-valencia/backlinks.txt b/sources/inc/lang/ca-valencia/backlinks.txt
new file mode 100644
index 0000000..06a1106
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/backlinks.txt
@@ -0,0 +1,3 @@
+====== Vínculs remitents ======
+
+Una llista de pàgines que pareixen vincular a la pàgina actual.
\ No newline at end of file
diff --git a/sources/inc/lang/ca-valencia/conflict.txt b/sources/inc/lang/ca-valencia/conflict.txt
new file mode 100644
index 0000000..6731961
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/conflict.txt
@@ -0,0 +1,6 @@
+====== Ya existix una versió més nova ======
+
+Existix una versió més 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 --git a/sources/inc/lang/ca-valencia/denied.txt b/sources/inc/lang/ca-valencia/denied.txt
new file mode 100644
index 0000000..39c45d9
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/denied.txt
@@ -0,0 +1,4 @@
+====== Permís denegat ======
+
+Disculpe, pero no té permís per a continuar. ¿Haurà oblidat iniciar sessió?
+
diff --git a/sources/inc/lang/ca-valencia/diff.txt b/sources/inc/lang/ca-valencia/diff.txt
new file mode 100644
index 0000000..2b5c60e
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/diff.txt
@@ -0,0 +1,4 @@
+====== Diferències ======
+
+Ací es mostren les diferències entre dos versions de la pàgina.
+
diff --git a/sources/inc/lang/ca-valencia/draft.txt b/sources/inc/lang/ca-valencia/draft.txt
new file mode 100644
index 0000000..e7e814a
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/draft.txt
@@ -0,0 +1,6 @@
+====== Borrador trobat ======
+
+L'ú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// esta edició.
+
diff --git a/sources/inc/lang/ca-valencia/edit.txt b/sources/inc/lang/ca-valencia/edit.txt
new file mode 100644
index 0000000..e1ca6bf
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/edit.txt
@@ -0,0 +1,2 @@
+Edite la pàgina i pulse 'Guardar". Consulte la [[wiki:syntax|Sintaxis]] del Wiki. Per favor, edite la pàgina només **si pot millorar-la**. Si vol fer proves, deprenga a utilisar el Wiki en el [[playground:playground|espai de proves]].
+
diff --git a/sources/inc/lang/ca-valencia/editrev.txt b/sources/inc/lang/ca-valencia/editrev.txt
new file mode 100644
index 0000000..99188a0
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/editrev.txt
@@ -0,0 +1,2 @@
+**¡Ha carregat una versió antiga del document!** Si la guarda crearà una nova versió en el contingut d'esta.
+----
diff --git a/sources/inc/lang/ca-valencia/index.txt b/sources/inc/lang/ca-valencia/index.txt
new file mode 100644
index 0000000..5e57c16
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/index.txt
@@ -0,0 +1,4 @@
+====== Índex ======
+
+Un índex de totes les pàgines disponibles ordenades per [[doku>namespaces|espais de noms]].
+
diff --git a/sources/inc/lang/ca-valencia/install.html b/sources/inc/lang/ca-valencia/install.html
new file mode 100644
index 0000000..49cd426
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/install.html
@@ -0,0 +1,11 @@
+
        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 corrents per a l'almagasenament de les pàgines del wiki 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 del sistema 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 accessos 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 la seua administració.
        
+
+
        Els usuaris experimentats o en necessitats especials de configuració deuen utilisar estos vínculs per a informació referent a
+instruccions d'instalació
+i ajusts de configuració.
        
diff --git a/sources/inc/lang/ca-valencia/lang.php b/sources/inc/lang/ca-valencia/lang.php
new file mode 100644
index 0000000..9ab4237
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/lang.php
@@ -0,0 +1,222 @@
+
+ * @author Bernat Arlandis 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$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']             = 'Iniciar sessió';
+$lang['btn_logout']            = 'Tancar sessió';
+$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_profile']           = 'Actualisar perfil';
+$lang['btn_reset']             = 'Reiniciar';
+$lang['btn_draft']             = 'Editar borrador';
+$lang['btn_recover']           = 'Recuperar borrador';
+$lang['btn_draftdel']          = 'Borrar borrador';
+$lang['btn_revert']            = 'Recuperar';
+$lang['btn_register']          = 'Registrar-se';
+$lang['loggedinas']            = 'Sessió de';
+$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']                 = 'Correu electrònic';
+$lang['profile']               = 'Perfil d\'usuari';
+$lang['badlogin']              = 'Disculpe, pero el nom d\'usuari o la contrasenya són incorrectes.';
+$lang['minoredit']             = 'Canvis menors';
+$lang['draftdate']             = 'Borrador gravat el';
+$lang['nosecedit']             = 'La pàgina ha canviat mentres tant, l\'informació de la secció no estava al dia, s\'ha carregat la pàgina sancera.';
+$lang['regmissing']            = 'Disculpe, pero deu omplir tots els camps.';
+$lang['reguexists']            = 'Disculpe, pero ya existix un usuari en este nom.';
+$lang['regsuccess']            = 'S\'ha creat l\'usuari i se li ha enviat la contrasenya per correu electrònic.';
+$lang['regsuccess2']           = 'S\'ha creat l\'usuari.';
+$lang['regmailfail']           = 'Pareix que ha hagut un erro enviant el correu en la contrasenya. ¡Per favor, contacte en l\'administrador!';
+$lang['regbadmail']            = 'La direcció de correu no pareix vàlida - contacte en l\'administrador si pensa que és deu a un erro nostre';
+$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 li permet modificar el 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']           = 'Perfil de l\'usuari actualisat.';
+$lang['pwdforget']             = '¿Ha oblidat la contrasenya? Demane\'n una nova';
+$lang['resendna']              = 'Este wiki no permet reenviar la contrasenya.';
+$lang['resendpwdmissing']      = 'Disculpe, pero deu omplir tots els camps.';
+$lang['resendpwdnouser']       = 'Disculpe, pero no trobem ad est usuari en la base de senyes.';
+$lang['resendpwdbadauth']      = 'Disculpe, pero este còdic d\'autenticació no es vàlit. Verifique que haja utilisat 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 per correu electrònic.';
+$lang['license']               = 'Excepte quan s\'indique una atra cosa, el contingut d\'este wiki està llicenciat baix la següent llicència:';
+$lang['licenseok']             = 'Nota: a l\'editar esta pàgina accepta llicenciar el seu contingut baix la següent llicència:';
+$lang['searchmedia']           = 'Buscar nom d\'archiu:';
+$lang['searchmedia_in']        = 'Buscar en %s';
+$lang['txt_upload']            = 'Seleccione l\'archiu que vol pujar';
+$lang['txt_filename']          = 'Enviar com (opcional)';
+$lang['txt_overwrt']           = 'Sobreescriure archius existents';
+$lang['lockedby']              = 'Actualment bloquejat per';
+$lang['lockexpire']            = 'El bloqueig venç a les';
+$lang['js']['willexpire']            = 'El seu bloqueig per a editar esta pàgina vencerà en un minut.\nPer a evitar conflictes utilise el botó de vista prèvia i reiniciarà el contador.';
+$lang['js']['notsavedyet']     = 'Els canvis no guardats es perdran.\n¿Segur que vol continuar?';
+$lang['rssfailed']             = 'Ha ocorregut un erro al solicitar este canal: ';
+$lang['nothingfound']          = 'No s\'ha trobat res.';
+$lang['mediaselect']           = 'Archius de mijos';
+$lang['fileupload']            = 'Enviar archius de mijos';
+$lang['uploadsucc']            = 'Enviament correcte';
+$lang['uploadfail']            = 'Enviament fallit. ¿Potser no tinga els permissos necessaris?';
+$lang['uploadwrong']           = 'Enviament denegat. ¡Esta extensió d\'archiu està prohibida!';
+$lang['uploadexist']           = 'L\'archiu ya existix. No s\'ha fet res.';
+$lang['uploadbadcontent']      = 'El contingut enviat no coincidix en l\'extensió de l\'archiu %s';
+$lang['uploadspam']            = 'L\'enviament ha segut bloquejat per la llista anti-spam.';
+$lang['uploadxss']             = 'L\'enviament ha segut bloquejat per ser possiblement perillós.';
+$lang['uploadsize']            = 'L\'archiu enviat és massa gran. (màx. %s)';
+$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 s\'està utilisant.';
+$lang['namespaces']            = 'Espais de noms';
+$lang['mediafiles']            = 'Archius disponibles en';
+$lang['js']['searchmedia']     = 'Buscar archius';
+$lang['js']['keepopen']        = 'Mantindre la finestra oberta al seleccionar';
+$lang['js']['hidedetails']     = 'Ocultar detalls';
+$lang['js']['nosmblinks']      = 'Els vínculs a recursos compartits de Windows només funcionen en Microsoft Internet Explorer. No obstant, es poden copiar i apegar.';
+$lang['js']['linkwiz']         = 'Assistent de vínculs';
+$lang['js']['linkto']          = 'Vincular a:';
+$lang['js']['del_confirm']     = '¿Realment vol borrar el(s) ítem(s) seleccionat(s)?';
+$lang['mediausage']            = 'Utilise la següent sintaxis per a referenciar est archiu:';
+$lang['mediaview']             = 'Vore l\'archiu original';
+$lang['mediaroot']             = 'base';
+$lang['mediaupload']           = 'Enviar un archiu a l\'espai de noms actual. Per a crear sub-espais, afigga\'ls separats per dos punts davant del nom de l\'archiu que pose en "Enviar 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 s\'utilisa 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ó (%s)';
+$lang['external_edit']         = 'edició externa';
+$lang['summary']               = 'Editar sumari';
+$lang['noflash']               = 'Necessita el plúgin d\'Adobe Flash per a vore este contingut.';
+$lang['download']              = 'Descarregar un tros';
+$lang['mail_newpage']          = 'pàgina afegida:';
+$lang['mail_changed']          = 'pàgina canviada:';
+$lang['mail_new_user']         = 'Usuari nou:';
+$lang['mail_upload']           = 'archiu enviat:';
+$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']                 = 'Titular de nivell 1';
+$lang['qb_h2']                 = 'Titular de nivell 2';
+$lang['qb_h3']                 = 'Titular de nivell 3';
+$lang['qb_h4']                 = 'Titular de nivell 4';
+$lang['qb_h5']                 = 'Titular de nivell 5';
+$lang['qb_h']                  = 'Titular';
+$lang['qb_hs']                 = 'Triar titular';
+$lang['qb_hplus']              = 'Titular superior';
+$lang['qb_hminus']             = 'Titular inferior';
+$lang['qb_hequal']             = 'Titular al mateix nivell';
+$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['upperns']               = 'anar a l\'espai de noms superior';
+$lang['admin_register']        = 'Afegir nou usuari';
+$lang['metaedit']              = 'Editar meta-senyes';
+$lang['metasaveerr']           = 'Erro escrivint meta-senyes';
+$lang['metasaveok']            = 'Meta-senyes 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['authtempfail']          = 'L\'autenticació d\'usuaris està desactivada temporalment. Si la situació persistix, per favor, informe a l\'administrador del Wiki.';
+$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']           = 'Super-usuari';
+$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 procés només 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 funció 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. Haurà de 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. Passe al
+nou DokuWiki.';
+$lang['i_failure']             = 'Han aparegut alguns erros escrivint els archius de configuració. Deurà arreglar-los manualment abans de que
+puga utilisar el nou DokuWiki.';
+$lang['i_policy']              = 'Política inicial ACL';
+$lang['i_pol0']                = 'Wiki obert (llegir, escriure i enviar tots)';
+$lang['i_pol1']                = 'Wiki públic (llegir tots, escriure i enviar només usuaris registrats)';
+$lang['i_pol2']                = 'Wiki tancat (llegir, escriure i enviar només usuaris registrats)';
+$lang['i_retry']               = 'Reintentar';
+$lang['recent_global']         = 'Està veent els canvis dins de l\'espai de noms %s. També pot vore els canvis recents en el wiki sancer.';
+$lang['years']                 = 'fa %d anys';
+$lang['months']                = 'fa %d mesos';
+$lang['weeks']                 = 'fa %d semanes';
+$lang['days']                  = 'fa %d dies';
+$lang['hours']                 = 'fa %d hores';
+$lang['minutes']               = 'fa %d minuts';
+$lang['seconds']               = 'fa %d segons';
diff --git a/sources/inc/lang/ca-valencia/locked.txt b/sources/inc/lang/ca-valencia/locked.txt
new file mode 100644
index 0000000..bdb2bdf
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/locked.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/ca-valencia/login.txt b/sources/inc/lang/ca-valencia/login.txt
new file mode 100644
index 0000000..b550c64
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/login.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/ca-valencia/mailtext.txt b/sources/inc/lang/ca-valencia/mailtext.txt
new file mode 100644
index 0000000..e8da6f8
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/mailtext.txt
@@ -0,0 +1,17 @@
+S'ha afegit o modificat una pàgina en el seu DokuWiki. Les senyes són:
+
+Data: @DATE@
+Navegador: @BROWSER@
+Direcció IP: @IPADDRESS@
+Nom de la màquina: @HOSTNAME@
+Revisió anterior: @OLDPAGE@
+Nova revisió: @NEWPAGE@
+Resum: @SUMMARY@
+Usuari: @USER@
+
+@DIFF@
+
+
+-- 
+Este correu l'ha generat DokuWiki en
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ca-valencia/newpage.txt b/sources/inc/lang/ca-valencia/newpage.txt
new file mode 100644
index 0000000..93b1544
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/newpage.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/ca-valencia/norev.txt b/sources/inc/lang/ca-valencia/norev.txt
new file mode 100644
index 0000000..434e62d
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/norev.txt
@@ -0,0 +1,3 @@
+====== No existix la versió ======
+
+La versió especificada no existix. Utilise el botó ''Versions antigues'' per a vore una llista de versions antigues d'este document.
\ No newline at end of file
diff --git a/sources/inc/lang/ca-valencia/password.txt b/sources/inc/lang/ca-valencia/password.txt
new file mode 100644
index 0000000..73e14e5
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/password.txt
@@ -0,0 +1,10 @@
+¡Hola @FULLNAME@!
+
+Estes són les seues senyes d'usuari per a @TITLE@ en @DOKUWIKIURL@
+
+Usuari      : @LOGIN@
+Contrasenya : @PASSWORD@
+
+-- 
+Este correu l'ha generat DokuWiki en
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ca-valencia/preview.txt b/sources/inc/lang/ca-valencia/preview.txt
new file mode 100644
index 0000000..0997f59
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/preview.txt
@@ -0,0 +1,4 @@
+====== Previsualisació ======
+
+Açò es una previsualisació per a vore cóm quedarà la pàgina. ¡Recorde que encara no està guardada!
+
diff --git a/sources/inc/lang/ca-valencia/pwconfirm.txt b/sources/inc/lang/ca-valencia/pwconfirm.txt
new file mode 100644
index 0000000..919c3d8
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/pwconfirm.txt
@@ -0,0 +1,15 @@
+¡Hola @FULLNAME@!
+
+Algú ha solicitat una nova contrasenya per a entrar com a
+@TITLE en @DOKUWIKIURL@
+
+Si no ha segut vosté qui ha solicitat 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 --git a/sources/inc/lang/ca-valencia/read.txt b/sources/inc/lang/ca-valencia/read.txt
new file mode 100644
index 0000000..80d96cd
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/read.txt
@@ -0,0 +1,2 @@
+Esta pàgina és només de llectura. Pot vore el còdic font, pero no pot canviar-lo. Pregunte a l'administrador si creu que és un erro.
+
diff --git a/sources/inc/lang/ca-valencia/recent.txt b/sources/inc/lang/ca-valencia/recent.txt
new file mode 100644
index 0000000..ca1f5c5
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/recent.txt
@@ -0,0 +1,5 @@
+====== Canvis recents ======
+
+Les següents pàgines han canviat recentment.
+
+
diff --git a/sources/inc/lang/ca-valencia/register.txt b/sources/inc/lang/ca-valencia/register.txt
new file mode 100644
index 0000000..7515be6
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/register.txt
@@ -0,0 +1,5 @@
+====== Registrar-se com a usuari nou ======
+
+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 electrònic vàlida** - si no se li demana una contrasenya ací se li enviarà a eixa direcció. El nom d'usuari deuria ser un
+[[doku>pagename|nom de pàgina]] vàlit.
+
diff --git a/sources/inc/lang/ca-valencia/registermail.txt b/sources/inc/lang/ca-valencia/registermail.txt
new file mode 100644
index 0000000..47b9318
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/registermail.txt
@@ -0,0 +1,14 @@
+S'ha registrat un usuari nou. Estes són les senyes:
+
+Nom d'usuari : @NEWUSER@
+Nom complet : @NEWNAME@
+Correu electrònic : @NEWEMAIL@
+
+Data : @DATE@
+Navegador : @BROWSER@
+Direcció IP : @IPADDRESS@
+Nom de la màquina : @HOSTNAME@
+
+-- 
+Este correu l'ha generat DokuWiki en
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ca-valencia/resendpwd.txt b/sources/inc/lang/ca-valencia/resendpwd.txt
new file mode 100644
index 0000000..2feac09
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Enviar contrasenya nova ======
+
+Per favor, introduïxca el 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 --git a/sources/inc/lang/ca-valencia/revisions.txt b/sources/inc/lang/ca-valencia/revisions.txt
new file mode 100644
index 0000000..08e7e04
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/revisions.txt
@@ -0,0 +1,4 @@
+====== Versions antigues ======
+
+Versions antigues del document actual. Per a recuperar una versió anterior de la pàgina, trie-la ací avall, pulse ''Editar esta pàgina'' i guarde-la.
+
diff --git a/sources/inc/lang/ca-valencia/searchpage.txt b/sources/inc/lang/ca-valencia/searchpage.txt
new file mode 100644
index 0000000..80f7e91
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/searchpage.txt
@@ -0,0 +1,5 @@
+====== Buscar ======
+
+Pot vore 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 --git a/sources/inc/lang/ca-valencia/showrev.txt b/sources/inc/lang/ca-valencia/showrev.txt
new file mode 100644
index 0000000..86f2822
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/showrev.txt
@@ -0,0 +1,2 @@
+**¡Açò és una versió antiga del document!**
+----
diff --git a/sources/inc/lang/ca-valencia/stopwords.txt b/sources/inc/lang/ca-valencia/stopwords.txt
new file mode 100644
index 0000000..1b4decb
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/stopwords.txt
@@ -0,0 +1,76 @@
+# 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 --git a/sources/inc/lang/ca-valencia/updateprofile.txt b/sources/inc/lang/ca-valencia/updateprofile.txt
new file mode 100644
index 0000000..9116fed
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Actualise el seu perfil ======
+
+Només deu completar els camps que vol canviar. No es pot canviar el nom d'usuari.
+
+
diff --git a/sources/inc/lang/ca-valencia/uploadmail.txt b/sources/inc/lang/ca-valencia/uploadmail.txt
new file mode 100644
index 0000000..c5a3302
--- /dev/null
+++ b/sources/inc/lang/ca-valencia/uploadmail.txt
@@ -0,0 +1,14 @@
+S'ha enviat un archiu al seu DokuWiki. Les senyes:
+
+Archiu: @MEDIA@
+Data: @DATE@
+Navegador: @BROWSER@
+Direcció IP: @IPADDRESS@
+Nom de la màquina: @HOSTNAME@
+Tamany: @SIZE@
+Tipo MIME: @MIME@
+Usuari: @USER@
+
+-- 
+Este correu ha segut generat per DokuWiki en
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ca/admin.txt b/sources/inc/lang/ca/admin.txt
new file mode 100644
index 0000000..5c0a6d0
--- /dev/null
+++ b/sources/inc/lang/ca/admin.txt
@@ -0,0 +1,4 @@
+====== Administració ======
+
+Heus ací una llista de les tasques administratives disponibles en DokuWiki.
+
diff --git a/sources/inc/lang/ca/adminplugins.txt b/sources/inc/lang/ca/adminplugins.txt
new file mode 100644
index 0000000..9ea165c
--- /dev/null
+++ b/sources/inc/lang/ca/adminplugins.txt
@@ -0,0 +1 @@
+===== Connectors addicionals =====
\ No newline at end of file
diff --git a/sources/inc/lang/ca/backlinks.txt b/sources/inc/lang/ca/backlinks.txt
new file mode 100644
index 0000000..e2ecaf4
--- /dev/null
+++ b/sources/inc/lang/ca/backlinks.txt
@@ -0,0 +1,4 @@
+====== Enllaços ======
+
+Heus ací una llista de pàgines enllaçades amb la pàgina actual.
+
diff --git a/sources/inc/lang/ca/conflict.txt b/sources/inc/lang/ca/conflict.txt
new file mode 100644
index 0000000..53183f0
--- /dev/null
+++ b/sources/inc/lang/ca/conflict.txt
@@ -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 mantenir. Si trieu ''desa'', es desarà la vostra versió. Si trieu ''cancel·la'' es mantindrà la versió actual.
+
diff --git a/sources/inc/lang/ca/denied.txt b/sources/inc/lang/ca/denied.txt
new file mode 100644
index 0000000..e6125e8
--- /dev/null
+++ b/sources/inc/lang/ca/denied.txt
@@ -0,0 +1,4 @@
+====== Permís denegat ======
+
+No teniu prou drets per continuar. Potser us heu descuidat d'entrar?
+
diff --git a/sources/inc/lang/ca/diff.txt b/sources/inc/lang/ca/diff.txt
new file mode 100644
index 0000000..83ca867
--- /dev/null
+++ b/sources/inc/lang/ca/diff.txt
@@ -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 --git a/sources/inc/lang/ca/draft.txt b/sources/inc/lang/ca/draft.txt
new file mode 100644
index 0000000..68593c2
--- /dev/null
+++ b/sources/inc/lang/ca/draft.txt
@@ -0,0 +1,5 @@
+====== S'ha trobat un esborrany ======
+
+La darrera sessió vostra d'edició d'aquesta pàgina no es va completar correctament. DokuWiki en va desar automàticament un esborrany mentre treballàveu, el qual podeu utilitzar ara per continuar l'edició. Més avall podeu veure la data i hora en què es va desar durant la vostra darrera sessió.
+
+Decidiu si voleu //recuperar// la vostra darrera sessió d'edició, //suprimir// l'esborrany que es va desar automàticament o //cancel·lar// el procés d'edició.
\ No newline at end of file
diff --git a/sources/inc/lang/ca/edit.txt b/sources/inc/lang/ca/edit.txt
new file mode 100644
index 0000000..743b0ff
--- /dev/null
+++ b/sources/inc/lang/ca/edit.txt
@@ -0,0 +1,2 @@
+Editeu la pàgina i premeu ''Desa''. Per a més informació sobre la sintaxi Wiki vegeu [[wiki:syntax|sintaxi]]. Si us plau, 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 --git a/sources/inc/lang/ca/editrev.txt b/sources/inc/lang/ca/editrev.txt
new file mode 100644
index 0000000..b2f304c
--- /dev/null
+++ b/sources/inc/lang/ca/editrev.txt
@@ -0,0 +1,2 @@
+**Heu penjat una revisió anterior del document.** Si la deseu, creareu una nova versió amb aquestes dades.
+----
diff --git a/sources/inc/lang/ca/index.txt b/sources/inc/lang/ca/index.txt
new file mode 100644
index 0000000..6ba71fd
--- /dev/null
+++ b/sources/inc/lang/ca/index.txt
@@ -0,0 +1,4 @@
+====== Índex ======
+
+Heus ací un índex de totes les pàgines disponibles, ordenades per [[doku>namespaces|espais]].
+
diff --git a/sources/inc/lang/ca/install.html b/sources/inc/lang/ca/install.html
new file mode 100644
index 0000000..363e598
--- /dev/null
+++ b/sources/inc/lang/ca/install.html
@@ -0,0 +1,8 @@
+
        Aquesta pàgina us ajuda a fer la primera instal·lació i la configuració de Dokuwiki. Hi ha més informació sobre aquest instal·lador en la seva pàgina de documentació.
        
+
+
        DokuWiki utilitza fitxers normals per a emmagatzemar les pàgines wiki i la informació associada a aquestes pàgines (p. ex. imatges, índexs de cerca, revisions anteriors, etc.). Per tal de funcionar correctament DokuWiki necessita tenir accés d'escriptura als directoris que contenen aquests fitxers. Aquest instal·lador no pot configurar els permisos del directori. Normalment això cal fer-ho directament en la línia d'ordres o, si esteu utilitzant un hostatge, mitjançant FTP o el tauler de control del vostre hostatge (p. ex. cPanel).
        
+
+
        Aquest 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 tinguin requeriments específics poden utilitzar els enllaços següents per a obtenir més detalls sobre instruccions d'instal·lació
+i paràmetres de configuració.
        
\ No newline at end of file
diff --git a/sources/inc/lang/ca/lang.php b/sources/inc/lang/ca/lang.php
new file mode 100644
index 0000000..fd19c68
--- /dev/null
+++ b/sources/inc/lang/ca/lang.php
@@ -0,0 +1,315 @@
+
+ * @author Carles Bellver 
+ * @author daniel@6temes.cat
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Edita aquesta pàgina';
+$lang['btn_source']            = 'Mostra codi font';
+$lang['btn_show']              = 'Mostra pàgina';
+$lang['btn_create']            = 'Crea aquesta pàgina';
+$lang['btn_search']            = 'Cerca';
+$lang['btn_save']              = 'Desa';
+$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']             = 'Mapa del lloc';
+$lang['btn_secedit']           = 'Edita';
+$lang['btn_login']             = 'Entra';
+$lang['btn_logout']            = 'Surt';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Actualitza';
+$lang['btn_delete']            = 'Suprimeix';
+$lang['btn_back']              = 'Enrere';
+$lang['btn_backlink']          = 'Què hi enllaça';
+$lang['btn_backtomedia']       = 'Torna a la selecció de fitxers';
+$lang['btn_subscribe']         = 'Subscripció a canvis d\'aquesta pàgina';
+$lang['btn_profile']           = 'Actualització del perfil';
+$lang['btn_reset']             = 'Reinicia';
+$lang['btn_resendpwd']         = 'Estableix una nova contrasenya';
+$lang['btn_draft']             = 'Edita esborrany';
+$lang['btn_recover']           = 'Recupera esborrany';
+$lang['btn_draftdel']          = 'Suprimeix esborrany';
+$lang['btn_revert']            = 'Restaura';
+$lang['btn_register']          = 'Registra\'m';
+$lang['btn_apply']             = 'Aplica';
+$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['profile']               = 'Perfil d\'usuari';
+$lang['badlogin']              = 'Nom d\'usuari o contrasenya incorrectes.';
+$lang['minoredit']             = 'Canvis menors';
+$lang['draftdate']             = 'L\'esborrany s\'ha desat 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 aquest 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, aquí en podeu obtenir un';
+$lang['profna']                = 'Aquest 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 obtenir-ne una de nova.';
+$lang['resendna']              = 'Aquest wiki no permet tornar a enviar la contrasenya.';
+$lang['resendpwd']             = 'Estableix una nova contrasenya per';
+$lang['resendpwdmissing']      = 'Heu d\'emplenar tots els camps.';
+$lang['resendpwdnouser']       = 'No s\'ha pogut trobar aquest usuari a la base de dades.';
+$lang['resendpwdbadauth']      = 'Aquest codi d\'autenticació no és vàlid. Assegureu-vos d\'utilitzar l\'enllaç de confirmació complet.';
+$lang['resendpwdconfirm']      = 'Se us ha enviat per correu electrònic un enllaç de confirmació.';
+$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';
+$lang['maxuploadsize']         = 'Puja com a màxim %s per arxiu.';
+$lang['lockedby']              = 'Actualment blocat per:';
+$lang['lockexpire']            = 'Venciment del blocatge:';
+$lang['js']['willexpire']      = 'El blocatge per a editar aquesta pàgina venç d\'aquí a un minut.\nUtilitzeu la visualització prèvia per reiniciar el rellotge i evitar conflictes.';
+$lang['js']['notsavedyet']     = 'Heu fet canvis que es perdran si no els deseu.
+Voleu continuar?';
+$lang['js']['searchmedia']     = 'Cerca fitxers';
+$lang['js']['keepopen']        = 'Manté la finestra oberta';
+$lang['js']['hidedetails']     = 'Oculta detalls';
+$lang['js']['mediatitle']      = 'Propietats de l\'enllaç';
+$lang['js']['mediadisplay']    = 'Tipus d\'enllaç';
+$lang['js']['mediaalign']      = 'Alineació';
+$lang['js']['mediasize']       = 'Mida de la imatge';
+$lang['js']['mediatarget']     = 'Destí de l\'enllaç';
+$lang['js']['mediaclose']      = 'Tanca';
+$lang['js']['mediainsert']     = 'Inserta';
+$lang['js']['mediadisplayimg'] = 'Mostra la imatge';
+$lang['js']['mediadisplaylnk'] = 'Mostra només l\'enllaç';
+$lang['js']['mediasmall']      = 'Versió petita';
+$lang['js']['mediamedium']     = 'Versió mitjana';
+$lang['js']['medialarge']      = 'Versió gran';
+$lang['js']['mediaoriginal']   = 'Versió original';
+$lang['js']['medialnk']        = 'Enllaç a la pàgina de detalls';
+$lang['js']['mediadirect']     = 'Enllaç directe a l\'original';
+$lang['js']['medianolnk']      = 'No hi ha enllaç';
+$lang['js']['medianolink']     = 'No enllacis la imatge';
+$lang['js']['medialeft']       = 'Alinea la imatge a l\'esquerra.';
+$lang['js']['mediaright']      = 'Alinea la imatge a la dreta.';
+$lang['js']['mediacenter']     = 'Alinea la imatge al mig.';
+$lang['js']['medianoalign']    = 'No facis servir alineació.';
+$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']['restore_confirm'] = 'Vols realment restaurar aquesta versió?';
+$lang['js']['media_diff']      = 'Veure les diferències:';
+$lang['js']['media_diff_both'] = 'Un al costat de l\'altre';
+$lang['js']['media_diff_opacity'] = 'Resalta';
+$lang['js']['media_diff_portions'] = 'Llisca';
+$lang['js']['media_select']    = 'Escull els arxius';
+$lang['js']['media_upload_btn'] = 'Pujar';
+$lang['js']['media_done_btn']  = 'Fet';
+$lang['js']['media_drop']      = 'Arrossega aquí els arxius a pujar';
+$lang['js']['media_cancel']    = 'esborra';
+$lang['js']['media_overwrt']   = 'Sobreescriu els arxius existents';
+$lang['rssfailed']             = 'S\'ha produït un error en recollir aquesta 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. Aquesta 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['accessdenied']          = 'No teniu permís per a veure aquesta pàgina.';
+$lang['mediausage']            = 'Utilitzeu la sintaxi següent per referir-vos a aquest enllaç:';
+$lang['mediaview']             = 'Mostra el fitxer original';
+$lang['mediaroot']             = 'arrel';
+$lang['mediaupload']           = 'Pengeu aquí 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['difflink']              = 'Enllaç a la visualització de la comparació';
+$lang['diff_type']             = 'Veieu les diferències:';
+$lang['diff_inline']           = 'En línia';
+$lang['diff_side']             = 'Un al costat de l\'altre';
+$lang['line']                  = 'Línia';
+$lang['breadcrumb']            = 'Camí';
+$lang['youarehere']            = 'Sou aquí';
+$lang['lastmod']               = 'Darrera modificació';
+$lang['by']                    = 'per';
+$lang['deleted']               = 'suprimit';
+$lang['created']               = 'creat';
+$lang['restored']              = 's\'ha restaurat una versió anterior %s';
+$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['tools']                 = 'Eines';
+$lang['user_tools']            = 'Eines de l\'usuari';
+$lang['site_tools']            = 'Eines del lloc';
+$lang['page_tools']            = 'Eines de la pàgina';
+$lang['skip_to_content']       = 'salta al contingut';
+$lang['sidebar']               = 'Barra lateral';
+$lang['mail_newpage']          = 'pàgina afegida:';
+$lang['mail_changed']          = 'pàgina modificada:';
+$lang['mail_new_user']         = 'nou usuari:';
+$lang['mail_upload']           = 'fitxer penjat:';
+$lang['changes_type']          = 'Veure els canvis de';
+$lang['pages_changes']         = 'Pàgines';
+$lang['media_changes']         = 'Arxius gràfics';
+$lang['both_changes']          = 'Pàgines i arxius gràfics';
+$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']              = 'Afegeix 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']        = 'Afegeix nou usuari';
+$lang['metaedit']              = 'Edita metadades';
+$lang['metasaveerr']           = 'No s\'han pogut escriure les metadades';
+$lang['metasaveok']            = 'S\'han desat 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']             = 'Mida';
+$lang['img_artist']            = 'Fotògraf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Càmera';
+$lang['img_keywords']          = 'Paraules clau';
+$lang['img_width']             = 'Ample';
+$lang['img_height']            = 'Alçada';
+$lang['subscr_subscribe_success'] = 'S\'ha afegit %s a la llista de subscripcions per %s';
+$lang['subscr_subscribe_error'] = 'Hi ha hagut un error a l\'afegir %s a la llista per %s';
+$lang['subscr_subscribe_noaddress'] = 'No hi ha cap adreça associada pel vostre nom d\'usuari, no podeu ser afegit a la llista de subscripcions';
+$lang['subscr_unsubscribe_success'] = 'S\'ha esborrat %s de la llista de subscripcions per %s';
+$lang['subscr_unsubscribe_error'] = 'Hi ha hagut un error a l\'esborrar %s de la llista de subscripcions per %s';
+$lang['subscr_already_subscribed'] = '%s ja està subscrit a %s';
+$lang['subscr_not_subscribed'] = '%s no està subscrit a %s';
+$lang['subscr_m_not_subscribed'] = 'En aquests moments no esteu subscrit a l\'actual pàgina o espai';
+$lang['subscr_m_new_header']   = 'Afegeix subcripció';
+$lang['subscr_m_current_header'] = 'Subscripcions actuals';
+$lang['subscr_m_unsubscribe']  = 'Donar-se de baixa';
+$lang['subscr_m_subscribe']    = 'Donar-se d\'alta';
+$lang['subscr_m_receive']      = 'Rebre';
+$lang['subscr_style_every']    = 'Envia\'m un correu electrònic per a cada canvi';
+$lang['subscr_style_digest']   = 'Envia\'m un correu electrònic amb un resum dels canvis per a cada pàgina (cada %.2f dies)';
+$lang['subscr_style_list']     = 'llistat de pàgines canviades des de l\'últim correu electrònic  (cada %.2f dies)';
+$lang['authtempfail']          = 'L\'autenticació d\'usuaris no està disponible temporalment. Si aquesta situació persisteix, si us plau informeu els administradors del wiki.';
+$lang['authpwdexpire']         = 'La vostra contrasenya caducarà en %d dies, l\'hauríeu de canviar aviat.';
+$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 hàgiu solucionat.';
+$lang['i_modified']            = 'Per raons de seguretat aquesta 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\'aquest 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['i_license']             = 'Escolliu el tipus de llicència que voleu fer servir per al vostre contingut:';
+$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';
+$lang['wordblock']             = 'El vostre canvi no s\'ha guardat perquè conté text blocat (spam)';
+$lang['media_uploadtab']       = 'Puja';
+$lang['media_searchtab']       = 'Busca';
+$lang['media_file']            = 'Fitxer';
+$lang['media_viewtab']         = 'Mostra';
+$lang['media_edittab']         = 'Edita';
+$lang['media_historytab']      = 'Històric';
+$lang['media_list_thumbs']     = 'Miniatura';
+$lang['media_list_rows']       = 'Files';
+$lang['media_sort_name']       = 'Nom';
+$lang['media_sort_date']       = 'Data';
+$lang['media_namespaces']      = 'Escolliu l\'espai';
+$lang['media_files']           = 'Arxius a %s';
+$lang['media_upload']          = 'Puja a %s';
+$lang['media_search']          = 'Busca a %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s a %s';
+$lang['media_edit']            = 'Edita %s';
+$lang['media_history']         = 'Històric de %s';
+$lang['media_meta_edited']     = 'metadata editada';
+$lang['media_perm_read']       = 'No teniu permisos suficients per a llegir arxius.';
+$lang['media_perm_upload']     = 'No teniu permisos suficients per a pujar arxius';
+$lang['media_update']          = 'Puja la nova versió';
+$lang['media_restore']         = 'Restaura aquesta versió';
diff --git a/sources/inc/lang/ca/locked.txt b/sources/inc/lang/ca/locked.txt
new file mode 100644
index 0000000..93487c2
--- /dev/null
+++ b/sources/inc/lang/ca/locked.txt
@@ -0,0 +1,3 @@
+====== Pàgina blocada ======
+
+Aquesta pàgina actualment està blocada per a edició per un altre usuari. Haureu d'esperar fins que aquest usuari acabe d'editar-la o fins que venci el blocatge.
diff --git a/sources/inc/lang/ca/login.txt b/sources/inc/lang/ca/login.txt
new file mode 100644
index 0000000..37ca4d5
--- /dev/null
+++ b/sources/inc/lang/ca/login.txt
@@ -0,0 +1,4 @@
+====== Entrada ======
+
+No heu entrat. Introduïu les vostres credencials d'autenticació en aquest formulari. A partir d'aquest moment heu de tenir les galetes habilitades en el vostre navegador.
+
diff --git a/sources/inc/lang/ca/mailtext.txt b/sources/inc/lang/ca/mailtext.txt
new file mode 100644
index 0000000..eda3309
--- /dev/null
+++ b/sources/inc/lang/ca/mailtext.txt
@@ -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 --git a/sources/inc/lang/ca/mailwrap.html b/sources/inc/lang/ca/mailwrap.html
new file mode 100644
index 0000000..ed3bb6e
--- /dev/null
+++ b/sources/inc/lang/ca/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Aquest correu electrònic ha estat generat per DokuWiki a @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/ca/newpage.txt b/sources/inc/lang/ca/newpage.txt
new file mode 100644
index 0000000..d0a2db9
--- /dev/null
+++ b/sources/inc/lang/ca/newpage.txt
@@ -0,0 +1,3 @@
+====== Aquest tema encara no existeix ======
+
+Heu seguit un enllaç a un tema que encara no existeix. Podeu crear-lo per mitjà del botó ''Crea aquesta pàgina''.
diff --git a/sources/inc/lang/ca/norev.txt b/sources/inc/lang/ca/norev.txt
new file mode 100644
index 0000000..b5089c5
--- /dev/null
+++ b/sources/inc/lang/ca/norev.txt
@@ -0,0 +1,5 @@
+====== No existeix aquesta revisió ======
+
+
+La revisió especificada no existeix. Utilitzeu el botó ''Revisions anteriors'' per obtenir una llista de revisions d'aquest document.
+
diff --git a/sources/inc/lang/ca/password.txt b/sources/inc/lang/ca/password.txt
new file mode 100644
index 0000000..4735fda
--- /dev/null
+++ b/sources/inc/lang/ca/password.txt
@@ -0,0 +1,10 @@
+Benvolgut/da @FULLNAME@,
+
+Aquestes són les teves dades per a entrar en @TITLE@ en l'adreça @DOKUWIKIURL@
+
+Usuari      : @LOGIN@
+Contrasenya : @PASSWORD@
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ca/preview.txt b/sources/inc/lang/ca/preview.txt
new file mode 100644
index 0000000..fa2f98c
--- /dev/null
+++ b/sources/inc/lang/ca/preview.txt
@@ -0,0 +1,4 @@
+====== Previsualització ======
+
+Heus ací una previsualització del vostre text. Recordeu que encara **no l'heu desat!**
+
diff --git a/sources/inc/lang/ca/pwconfirm.txt b/sources/inc/lang/ca/pwconfirm.txt
new file mode 100644
index 0000000..119c429
--- /dev/null
+++ b/sources/inc/lang/ca/pwconfirm.txt
@@ -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 aquesta 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@
\ No newline at end of file
diff --git a/sources/inc/lang/ca/read.txt b/sources/inc/lang/ca/read.txt
new file mode 100644
index 0000000..e173ad2
--- /dev/null
+++ b/sources/inc/lang/ca/read.txt
@@ -0,0 +1,2 @@
+Aquesta pàgina és només de lectura. Podeu veure'n el codi font, però no podeu canviar-la. Consulteu el vostre administrador si penseu que això és degut a algun error.
+
diff --git a/sources/inc/lang/ca/recent.txt b/sources/inc/lang/ca/recent.txt
new file mode 100644
index 0000000..cea2f5c
--- /dev/null
+++ b/sources/inc/lang/ca/recent.txt
@@ -0,0 +1,5 @@
+====== Canvis recents ======
+
+Les pàgines següents s'han modificat recentment.
+
+
diff --git a/sources/inc/lang/ca/register.txt b/sources/inc/lang/ca/register.txt
new file mode 100644
index 0000000..a91e6df
--- /dev/null
+++ b/sources/inc/lang/ca/register.txt
@@ -0,0 +1,4 @@
+====== Registre d'un usuari nou ======
+
+Empleneu tota la informació que se us demana per crear un compte nou en aquest wiki. Assegureu-vos que doneu una **adreça de correu vàlida**, on se us 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 --git a/sources/inc/lang/ca/registermail.txt b/sources/inc/lang/ca/registermail.txt
new file mode 100644
index 0000000..84bf5f1
--- /dev/null
+++ b/sources/inc/lang/ca/registermail.txt
@@ -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@
\ No newline at end of file
diff --git a/sources/inc/lang/ca/resendpwd.txt b/sources/inc/lang/ca/resendpwd.txt
new file mode 100644
index 0000000..cd59f89
--- /dev/null
+++ b/sources/inc/lang/ca/resendpwd.txt
@@ -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 us enviarà un enllaç de confirmació a l'adreça de correu amb què us vau registrar.
\ No newline at end of file
diff --git a/sources/inc/lang/ca/resetpwd.txt b/sources/inc/lang/ca/resetpwd.txt
new file mode 100644
index 0000000..565f1d5
--- /dev/null
+++ b/sources/inc/lang/ca/resetpwd.txt
@@ -0,0 +1,3 @@
+===== Establiu una nova contrasenya =====
+
+Introdueixi una nova contrasenya pel seu compte a aquest wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/ca/revisions.txt b/sources/inc/lang/ca/revisions.txt
new file mode 100644
index 0000000..5c044d8
--- /dev/null
+++ b/sources/inc/lang/ca/revisions.txt
@@ -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 aquesta pàgina'' i deseu-la.
+
diff --git a/sources/inc/lang/ca/searchpage.txt b/sources/inc/lang/ca/searchpage.txt
new file mode 100644
index 0000000..bf69aef
--- /dev/null
+++ b/sources/inc/lang/ca/searchpage.txt
@@ -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 aquesta pàgina''.
+
+===== Resultats =====
\ No newline at end of file
diff --git a/sources/inc/lang/ca/showrev.txt b/sources/inc/lang/ca/showrev.txt
new file mode 100644
index 0000000..b141182
--- /dev/null
+++ b/sources/inc/lang/ca/showrev.txt
@@ -0,0 +1,2 @@
+**Aquesta és una revisió antiga del document**
+----
diff --git a/sources/inc/lang/ca/stopwords.txt b/sources/inc/lang/ca/stopwords.txt
new file mode 100644
index 0000000..03be425
--- /dev/null
+++ b/sources/inc/lang/ca/stopwords.txt
@@ -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
+aquí
+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
+tenir
+teniu
+teu
+tinc
+tot
+una
+uns
+unes
+uns
+vaig
+van
+vosaltres
diff --git a/sources/inc/lang/ca/subscr_digest.txt b/sources/inc/lang/ca/subscr_digest.txt
new file mode 100644
index 0000000..2b95f97
--- /dev/null
+++ b/sources/inc/lang/ca/subscr_digest.txt
@@ -0,0 +1,21 @@
+Hola!
+
+La pàgina @PAGE@ al wiki @TITLE@ ha canviat.
+A continuació podeu veure els canvis:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Versió anterior: @OLDPAGE@
+Nova versió: @NEWPAGE@
+
+Si voleu cancel·lar les notificacions per a la pàgina, accediu al wiki a
+@DOKUWIKIURL@, visiteu
+@SUBSCRIBE@
+i doneu-vos de baixa dels canvis de la pàgina o de l'espai.
+
+
+--
+Aquest mail ha estat generat per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ca/subscr_form.txt b/sources/inc/lang/ca/subscr_form.txt
new file mode 100644
index 0000000..d367945
--- /dev/null
+++ b/sources/inc/lang/ca/subscr_form.txt
@@ -0,0 +1,3 @@
+===== Gestió de les Subscripcions =====
+
+Aquesta pàgina podeu gestiona les vostres subscripcions per a les pàgines i els espais actuals.
\ No newline at end of file
diff --git a/sources/inc/lang/ca/subscr_list.txt b/sources/inc/lang/ca/subscr_list.txt
new file mode 100644
index 0000000..56bcad5
--- /dev/null
+++ b/sources/inc/lang/ca/subscr_list.txt
@@ -0,0 +1,21 @@
+Hola!
+
+Alguna(es) pàgina(es) de l'espai @PAGE@ al wiki @TITLE@ han canviat.
+A continuació podeu veure els canvis:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Versió anterior: @OLDPAGE@
+Nova versió: @NEWPAGE@
+
+Si voleu cancel·lar les notificacions per a la pàgina, accediu al wiki a
+@DOKUWIKIURL@, visiteu
+@SUBSCRIBE@
+i doneu-vos de baixa dels canvis de la pàgina o de l'espai.
+
+
+--
+Aquest mail ha estat generat per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ca/updateprofile.txt b/sources/inc/lang/ca/updateprofile.txt
new file mode 100644
index 0000000..0ba0226
--- /dev/null
+++ b/sources/inc/lang/ca/updateprofile.txt
@@ -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.
\ No newline at end of file
diff --git a/sources/inc/lang/ca/uploadmail.txt b/sources/inc/lang/ca/uploadmail.txt
new file mode 100644
index 0000000..c282f1f
--- /dev/null
+++ b/sources/inc/lang/ca/uploadmail.txt
@@ -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@
+Mida: @SIZE@
+Tipus MIME: @MIME@
+Usuari: @USER@
+
+-- 
+Missatge generat per DokuWiki en
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/cs/admin.txt b/sources/inc/lang/cs/admin.txt
new file mode 100644
index 0000000..ccfbc44
--- /dev/null
+++ b/sources/inc/lang/cs/admin.txt
@@ -0,0 +1,3 @@
+====== Správa ======
+
+Níže je možno spravovat vaši DokuWiki.
diff --git a/sources/inc/lang/cs/adminplugins.txt b/sources/inc/lang/cs/adminplugins.txt
new file mode 100644
index 0000000..005f8f2
--- /dev/null
+++ b/sources/inc/lang/cs/adminplugins.txt
@@ -0,0 +1 @@
+===== Další pluginy =====
\ No newline at end of file
diff --git a/sources/inc/lang/cs/backlinks.txt b/sources/inc/lang/cs/backlinks.txt
new file mode 100644
index 0000000..59430ee
--- /dev/null
+++ b/sources/inc/lang/cs/backlinks.txt
@@ -0,0 +1,3 @@
+====== Zpětné odkazy ======
+
+Zde je seznam stránek, které pravděpodobně odkazují na aktuální stránku.
diff --git a/sources/inc/lang/cs/conflict.txt b/sources/inc/lang/cs/conflict.txt
new file mode 100644
index 0000000..941118d
--- /dev/null
+++ b/sources/inc/lang/cs/conflict.txt
@@ -0,0 +1,5 @@
+====== Existuje novější verze ======
+
+Existuje novější verze právě upravovaného dokumentu. To se stává, pokud někdo jiný změnil dokument, který právě upravujete.
+
+Prohlédněte si níže uvedené rozdíly, případně rozdíly z obou verzí ručně spojte dohromady a rozhodněte se, kterou verzi uchovat. Pokud zvolíte ''Uložit'', bude uložena vaše verze. Jinak stiskněte ''Storno'' pro uchování původní verze.
diff --git a/sources/inc/lang/cs/denied.txt b/sources/inc/lang/cs/denied.txt
new file mode 100644
index 0000000..00a8811
--- /dev/null
+++ b/sources/inc/lang/cs/denied.txt
@@ -0,0 +1,3 @@
+====== Nepovolená akce ======
+
+Promiňte, ale nemáte dostatečná oprávnění k této činnosti. Možná jste se zapomněli přihlásit?
diff --git a/sources/inc/lang/cs/diff.txt b/sources/inc/lang/cs/diff.txt
new file mode 100644
index 0000000..d49e569
--- /dev/null
+++ b/sources/inc/lang/cs/diff.txt
@@ -0,0 +1,4 @@
+====== Rozdíly ======
+
+Zde můžete vidět rozdíly mezi vybranou verzí a aktuální verzí dané stránky.
+
diff --git a/sources/inc/lang/cs/draft.txt b/sources/inc/lang/cs/draft.txt
new file mode 100644
index 0000000..ebdfb8d
--- /dev/null
+++ b/sources/inc/lang/cs/draft.txt
@@ -0,0 +1,5 @@
+====== Nalezen koncept ======
+
+Vaše minulá editace této stránky nebyla korektně dokončena. DokuWiki během editace automaticky uložila koncept, který nyní můžete použít a pokračovat v editaci. Níže je vidět text uložený během minulé editace.
+
+Prosím rozhodněte se, jestli chcete automaticky uložený koncept //obnovit// a pokračovat v editaci, nebo jej chcete //vymazat//, nebo úplně //zrušit// celý proces editace.
diff --git a/sources/inc/lang/cs/edit.txt b/sources/inc/lang/cs/edit.txt
new file mode 100644
index 0000000..1a135ae
--- /dev/null
+++ b/sources/inc/lang/cs/edit.txt
@@ -0,0 +1 @@
+Upravte stránku a stiskněte ''Uložit''. Na stránce [[wiki:syntax]] se můžete dozvědět více o wiki syntaxi. Prosím upravujte stránky pouze, pokud je můžete **vylepšit**. V případě, že si chcete něco pouze vyzkoušet, použijte raději [[playground:playground|pískoviště]].
diff --git a/sources/inc/lang/cs/editrev.txt b/sources/inc/lang/cs/editrev.txt
new file mode 100644
index 0000000..44f0bc6
--- /dev/null
+++ b/sources/inc/lang/cs/editrev.txt
@@ -0,0 +1,2 @@
+**Máte načtenou starší verzi dokumentu!** Pokud ji uložíte, vytvoříte tím novou aktuální verzi.
+----
diff --git a/sources/inc/lang/cs/index.txt b/sources/inc/lang/cs/index.txt
new file mode 100644
index 0000000..d19626f
--- /dev/null
+++ b/sources/inc/lang/cs/index.txt
@@ -0,0 +1,3 @@
+====== Index ======
+
+Zde je k dispozici index všech dostupných stránek seřazený podle [[doku>namespaces|jmenných prostorů]].
diff --git a/sources/inc/lang/cs/install.html b/sources/inc/lang/cs/install.html
new file mode 100644
index 0000000..043e924
--- /dev/null
+++ b/sources/inc/lang/cs/install.html
@@ -0,0 +1,23 @@
+
        Tato stránka vám pomůže při první instalaci a konfiguraci
+Dokuwiki. Více
+informací o tomto instalátoru naleznete v jeho vlastní dokumentaci.
        
+
+
        DokuWiki používá obyčejné soubory pro uložení wiki stránek a dalších informací
+spojených s nimi (např. obrázků, vyhledávacích indexů, starších verzí). Aby DokuWiki
+správně fungovala musí mít přístup k adresářům, kde jsou uloženy
+tyto soubory. Tento instalátor není schopen sám nastavit přístupová práva k souborům
+a adresářům. To se obyčejně dělá přímo v shellu nebo, používáte-li hosting, přes
+FTP nebo ovládací panel vašeho hostingu (např. cPanel).
        
+
+
        Tento instalátor nastaví ACL
+(přístupová práva uživatelů) pro vaši DokuWiki, což umožní správci přihlásit
+se do administrační části DokuWiki a tam instalovat pluginy, spravovat uživatele,
+nastavovat přístup k wiki stránkám a měnit další nastavení wiki. Není to
+nutné, ale zpříjemní to správu DokuWiki.
        
+
+
        Zkušení uživatelé nebo uživatelé se speciálními požadavky by se
+měli podívat na následující stránky pro další informace ohledně
+instalace a
+nastavení DokuWiki.
        
+
diff --git a/sources/inc/lang/cs/lang.php b/sources/inc/lang/cs/lang.php
new file mode 100644
index 0000000..56ffd91
--- /dev/null
+++ b/sources/inc/lang/cs/lang.php
@@ -0,0 +1,338 @@
+
+ * @author Tomas Valenta 
+ * @author Tomas Valenta 
+ * @author Zbynek Krivka 
+ * @author Marek Sacha 
+ * @author Lefty 
+ * @author Vojta Beran 
+ * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
+ * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
+ * @author Zbyněk Křivka 
+ * @author Gerrit Uitslag 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Upravit stránku';
+$lang['btn_source']            = 'Zdrojový kód stránky';
+$lang['btn_show']              = 'Zobrazit stránku';
+$lang['btn_create']            = 'Vytvořit stránku';
+$lang['btn_search']            = 'Hledat';
+$lang['btn_save']              = 'Uložit';
+$lang['btn_preview']           = 'Náhled';
+$lang['btn_top']               = 'Nahoru';
+$lang['btn_newer']             = '<< novější';
+$lang['btn_older']             = 'starší >>';
+$lang['btn_revs']              = 'Starší verze';
+$lang['btn_recent']            = 'Poslední úpravy';
+$lang['btn_upload']            = 'Načíst';
+$lang['btn_cancel']            = 'Storno';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Upravit';
+$lang['btn_login']             = 'Přihlásit se';
+$lang['btn_logout']            = 'Odhlásit se';
+$lang['btn_admin']             = 'Správa';
+$lang['btn_update']            = 'Aktualizovat';
+$lang['btn_delete']            = 'Vymazat';
+$lang['btn_back']              = 'Zpět';
+$lang['btn_backlink']          = 'Zpětné odkazy';
+$lang['btn_backtomedia']       = 'Zpět do Výběru dokumentu';
+$lang['btn_subscribe']         = 'Odebírat emailem změny stránky';
+$lang['btn_profile']           = 'Upravit profil';
+$lang['btn_reset']             = 'Reset';
+$lang['btn_resendpwd']         = 'Nastavit nové heslo';
+$lang['btn_draft']             = 'Upravit koncept';
+$lang['btn_recover']           = 'Obnovit koncept';
+$lang['btn_draftdel']          = 'Vymazat koncept';
+$lang['btn_revert']            = 'Vrátit zpět';
+$lang['btn_register']          = 'Registrovat';
+$lang['btn_apply']             = 'Použít';
+$lang['btn_media']             = 'Správa médií';
+$lang['btn_deleteuser']        = 'Odstranit můj účet';
+$lang['loggedinas']            = 'Přihlášen(a) jako';
+$lang['user']                  = 'Uživatelské jméno';
+$lang['pass']                  = 'Heslo';
+$lang['newpass']               = 'Nové heslo';
+$lang['oldpass']               = 'Současné heslo';
+$lang['passchk']               = 'ještě jednou';
+$lang['remember']              = 'Přihlásit se nastálo';
+$lang['fullname']              = 'Celé jméno';
+$lang['email']                 = 'E-mail';
+$lang['profile']               = 'Uživatelský profil';
+$lang['badlogin']              = 'Zadané uživatelské jméno a heslo není správně.';
+$lang['badpassconfirm']        = 'Bohužel špatné heslo';
+$lang['minoredit']             = 'Drobné změny';
+$lang['draftdate']             = 'Koncept automaticky uložen v';
+$lang['nosecedit']             = 'Stránka byla v mezičase změněna. Informace o sekci již nebylo platné, byla načtena celá stránka.';
+$lang['regmissing']            = 'Musíte vyplnit všechny údaje.';
+$lang['reguexists']            = 'Uživatel se stejným jménem už je zaregistrován.';
+$lang['regsuccess']            = 'Uživatelský účet byl vytvořen a heslo zasláno mailem.';
+$lang['regsuccess2']           = 'Uživatelský účet byl vytvořen.';
+$lang['regmailfail']           = 'Zdá se, že nastala chyba při posílání mailu s heslem. Zkuste kontaktovat správce.';
+$lang['regbadmail']            = 'Zadaná mailová adresa není platná. Pokud si myslíte, že to je špatně, zkuste kontaktovat správce.';
+$lang['regbadpass']            = 'Heslo nebylo zadáno dvakrát stejně, zkuste to prosím znovu.';
+$lang['regpwmail']             = 'Vaše heslo do systému DokuWiki';
+$lang['reghere']               = 'Nemáte uživatelský účet? Zřiďte si ho';
+$lang['profna']                = 'Tato wiki neumožňuje změnu profilu';
+$lang['profnochange']          = 'Žádné změny nebyly provedeny.';
+$lang['profnoempty']           = 'Nelze zadat prázdné jméno nebo mailová adresa.';
+$lang['profchanged']           = 'Uživatelský profil změněn.';
+$lang['profnodelete']          = 'Tato wiki nepodporuje mazání uživatelů';
+$lang['profdeleteuser']        = 'Smazat účet';
+$lang['profdeleted']           = 'Váš uživatelský účet byl z této wiki smazán';
+$lang['profconfdelete']        = 'Chci smazat můj účet z této wiki. 
         Tato akce je nevratná.';
+$lang['profconfdeletemissing'] = 'Potvrzovací tlačítko nezaškrtnuto';
+$lang['pwdforget']             = 'Zapomněli jste heslo? Nechte si zaslat nové';
+$lang['resendna']              = 'Tato wiki neumožňuje zasílání nových hesel.';
+$lang['resendpwd']             = 'Nastavit nové heslo pro';
+$lang['resendpwdmissing']      = 'Musíte vyplnit všechny položky.';
+$lang['resendpwdnouser']       = 'Bohužel takový uživatel v systému není.';
+$lang['resendpwdbadauth']      = 'Autorizační kód není platný. Zadali jste opravdu celý odkaz na potvrzovací stránku?';
+$lang['resendpwdconfirm']      = 'Odkaz na potvrzovací stránku byl odeslán mailem.';
+$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';
+$lang['maxuploadsize']         = 'Max. velikost souboru %s';
+$lang['lockedby']              = 'Právě zamknuto:';
+$lang['lockexpire']            = 'Zámek vyprší:';
+$lang['js']['willexpire']      = 'Váš zámek pro editaci za chvíli vyprší.\nAbyste předešli konfliktům, stiskněte tlačítko Náhled a zámek se prodlouží.';
+$lang['js']['notsavedyet']     = 'Jsou tu neuložené změny, které budou ztraceny.
+Chcete opravdu pokračovat?';
+$lang['js']['searchmedia']     = 'Hledat soubory';
+$lang['js']['keepopen']        = 'Po vybrání souboru nechat okno otevřené';
+$lang['js']['hidedetails']     = 'Skrýt detaily';
+$lang['js']['mediatitle']      = 'Nastavení odkazu';
+$lang['js']['mediadisplay']    = 'Typ odkazu';
+$lang['js']['mediaalign']      = 'Zarovnání';
+$lang['js']['mediasize']       = 'Velikost obrázku';
+$lang['js']['mediatarget']     = 'Cíl odkazu';
+$lang['js']['mediaclose']      = 'Zavřít';
+$lang['js']['mediainsert']     = 'Vložit';
+$lang['js']['mediadisplayimg'] = 'Ukázat obrázek';
+$lang['js']['mediadisplaylnk'] = 'Ukázat pouze odkaz';
+$lang['js']['mediasmall']      = 'Malá verze';
+$lang['js']['mediamedium']     = 'Střední verze';
+$lang['js']['medialarge']      = 'Velká verze';
+$lang['js']['mediaoriginal']   = 'Původní verze';
+$lang['js']['medialnk']        = 'Odkaz na stránku s detailem';
+$lang['js']['mediadirect']     = 'Přímý odkaz na originál';
+$lang['js']['medianolnk']      = 'Žádný odkaz';
+$lang['js']['medianolink']     = 'Neodkazovat na obrázek';
+$lang['js']['medialeft']       = 'Zarovnat obrázek doleva.';
+$lang['js']['mediaright']      = 'Zarovnat obrázek doprava.';
+$lang['js']['mediacenter']     = 'Zarovnat obrázek na střed.';
+$lang['js']['medianoalign']    = 'Nepoužívat zarovnání.';
+$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']['restore_confirm'] = 'Opravdu obnovit tuto verzi?';
+$lang['js']['media_diff']      = 'Prohlédnout rozdíly:';
+$lang['js']['media_diff_both'] = 'Vedle sebe';
+$lang['js']['media_diff_opacity'] = 'Zvýraznění';
+$lang['js']['media_diff_portions'] = 'Osvědčit';
+$lang['js']['media_select']    = 'Vybrat soubory...';
+$lang['js']['media_upload_btn'] = 'Nahrát';
+$lang['js']['media_done_btn']  = 'Hotovo';
+$lang['js']['media_drop']      = 'Sem přetáhněte soubory pro nahrátí';
+$lang['js']['media_cancel']    = 'odstranit';
+$lang['js']['media_overwrt']   = 'Přepsat existující soubory';
+$lang['rssfailed']             = 'Nastala chyba při vytváření tohoto RSS: ';
+$lang['nothingfound']          = 'Nic nenalezeno.';
+$lang['mediaselect']           = 'Výběr dokumentu';
+$lang['fileupload']            = 'Načtení dokumentu';
+$lang['uploadsucc']            = 'Přenos proběhl v pořádku';
+$lang['uploadfail']            = 'Chyba při načítání. Možná kvůli špatně nastaveným právům?';
+$lang['uploadwrong']           = 'Načtení souboru s takovouto příponou není dovoleno.';
+$lang['uploadexist']           = 'Soubor už existuje, necháme ho být.';
+$lang['uploadbadcontent']      = 'Nahraný obsah neodpovídá jeho příponě souboru %s.';
+$lang['uploadspam']            = 'Načtený dokument byl odmítnut, je na spamovém blacklistu.';
+$lang['uploadxss']             = 'Načtený dokument byl odmítnut. Zdá se, že obsahuje škodlivé věci.';
+$lang['uploadsize']            = 'Nahraný soubor byl příliš velký (max. %s)';
+$lang['deletesucc']            = 'Soubor "%s" byl vymazán.';
+$lang['deletefail']            = 'Soubor "%s" nelze vymazat - zkontrolujte oprávnění.';
+$lang['mediainuse']            = 'Soubor "%s" nebyl vymazán - stále se používá.';
+$lang['namespaces']            = 'Jmenné prostory';
+$lang['mediafiles']            = 'Dostupné soubory';
+$lang['accessdenied']          = 'Nejste autorizován k přístupu na tuto stránku.';
+$lang['mediausage']            = 'K odkázání se na tento soubor použijte následující syntax:';
+$lang['mediaview']             = 'Zobrazit původní soubor';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Načíst soubor do aktuálního jmenného prostoru. K vytvoření nových jmenných prostorů, přidejte jejich názvy na začátek wiki jména (oddělte dvojtečkou).';
+$lang['mediaextchange']        = 'Přípona souboru byla změněna z .%s na .%s!';
+$lang['reference']             = 'Odkazy na';
+$lang['ref_inuse']             = 'Soubor nelze vymazat, jelikož ho využívají následující stránky:';
+$lang['ref_hidden']            = 'Některé odkazy jsou na stránkách, kam nemáte právo přístupu';
+$lang['hits']                  = '- počet výskytů';
+$lang['quickhits']             = 'Odpovídající stránky';
+$lang['toc']                   = 'Obsah';
+$lang['current']               = 'aktuální';
+$lang['yours']                 = 'Vaše verze';
+$lang['diff']                  = 'Zobrazit rozdíly vůči aktuální verzi';
+$lang['diff2']                 = 'Zobrazit rozdíly mezi vybranými verzemi';
+$lang['difflink']              = 'Odkaz na výstup diff';
+$lang['diff_type']             = 'Zobrazit rozdíly:';
+$lang['diff_inline']           = 'Vložené';
+$lang['diff_side']             = 'Přidané';
+$lang['line']                  = 'Řádek';
+$lang['breadcrumb']            = 'Historie';
+$lang['youarehere']            = 'Umístění';
+$lang['lastmod']               = 'Poslední úprava';
+$lang['by']                    = 'autor:';
+$lang['deleted']               = 'odstraněno';
+$lang['created']               = 'vytvořeno';
+$lang['restored']              = 'stará verze byla obnovena (%s)';
+$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['tools']                 = 'Nástroje';
+$lang['user_tools']            = 'Uživatelské nástroje';
+$lang['site_tools']            = 'Nástroje pro tento web';
+$lang['page_tools']            = 'Nástroje pro stránku';
+$lang['skip_to_content']       = 'jít k obsahu';
+$lang['sidebar']               = 'Postranní lišta';
+$lang['mail_newpage']          = 'nová stránka:';
+$lang['mail_changed']          = 'změna stránky:';
+$lang['mail_subscribe_list']   = 'stránky změněné ve jmenném prostoru:';
+$lang['mail_new_user']         = 'nový uživatel:';
+$lang['mail_upload']           = 'nahraný soubor:';
+$lang['changes_type']          = 'Prohlednou změny ';
+$lang['pages_changes']         = 'stránek';
+$lang['media_changes']         = 'souborů médií';
+$lang['both_changes']          = 'stránek i médií';
+$lang['qb_bold']               = 'Tučně';
+$lang['qb_italic']             = 'Kurzíva';
+$lang['qb_underl']             = 'Podtržení';
+$lang['qb_code']               = 'Neformátovat (zdrojový kód)';
+$lang['qb_strike']             = 'Přeškrtnutý text';
+$lang['qb_h1']                 = 'Nadpis 1. úrovně';
+$lang['qb_h2']                 = 'Nadpis 2. úrovně';
+$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';
+$lang['qb_ol']                 = 'Číslovaný seznam';
+$lang['qb_ul']                 = 'Nečíslovaný seznam';
+$lang['qb_media']              = 'Vložit obrázky nebo jiné soubory';
+$lang['qb_sig']                = 'Vložit podpis';
+$lang['qb_smileys']            = 'Emotikony';
+$lang['qb_chars']              = 'Speciální znaky';
+$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';
+$lang['metasaveok']            = 'Metadata uložena';
+$lang['img_backto']            = 'Zpět na';
+$lang['img_title']             = 'Titulek';
+$lang['img_caption']           = 'Popis';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Jméno souboru';
+$lang['img_fsize']             = 'Velikost';
+$lang['img_artist']            = 'Autor fotografie';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formát';
+$lang['img_camera']            = 'Typ fotoaparátu';
+$lang['img_keywords']          = 'Klíčová slova';
+$lang['img_width']             = 'Šířka';
+$lang['img_height']            = 'Výška';
+$lang['img_manager']           = 'Zobrazit ve správě médií';
+$lang['subscr_subscribe_success'] = '%s byl přihlášen do seznamu odběratelů %s';
+$lang['subscr_subscribe_error'] = 'Došlo k chybě při přihlašování %s do seznamu odběratelů %s';
+$lang['subscr_subscribe_noaddress'] = 'K Vašemu loginu neexistuje žádná adresa, nemohl jste být přihlášen do seznamu odběratelů.';
+$lang['subscr_unsubscribe_success'] = '%s byl odhlášen ze seznamu odběratelů %s';
+$lang['subscr_unsubscribe_error'] = 'Došlo k chybě při odhlašování %s ze seznamu odběratelů %s';
+$lang['subscr_already_subscribed'] = '%s již je přihlášen do seznamu odběratelů %s';
+$lang['subscr_not_subscribed'] = '%s není přihlášen do seznamu odběratelů %s';
+$lang['subscr_m_not_subscribed'] = 'V současné době neodebíráte změny na aktuální stránce nebo ve jmenném prostoru.';
+$lang['subscr_m_new_header']   = 'Přihlásit k odebírání změn emailem';
+$lang['subscr_m_current_header'] = 'Aktuální odběratelé změn';
+$lang['subscr_m_unsubscribe']  = 'Odhlásit z odběru změn emailem';
+$lang['subscr_m_subscribe']    = 'Přihlásit se k odběru změn emailem';
+$lang['subscr_m_receive']      = 'Přejete si dostávat';
+$lang['subscr_style_every']    = 'email pro každou změnu';
+$lang['subscr_style_digest']   = 'souhrnný email změn pro každou stránku (každé %.2f dny/dní)';
+$lang['subscr_style_list']     = 'seznam změněných stránek od posledního emailu (každé %.2f dny/dní)';
+$lang['authtempfail']          = 'Autentizace uživatelů je dočasně nedostupná. Pokud tento problém přetrvává, informujte prosím správce této wiki.';
+$lang['authpwdexpire']         = 'Platnost vašeho hesla vyprší za %d dní, měli byste ho změnit co nejdříve.';
+$lang['i_chooselang']          = 'Vyberte si jazyk';
+$lang['i_installer']           = 'Instalace DokuWiki';
+$lang['i_wikiname']            = 'Název wiki';
+$lang['i_enableacl']           = 'Zapnout ACL (doporučeno)';
+$lang['i_superuser']           = 'Správce';
+$lang['i_problems']            = 'Instalátor narazil na níže popsané problémy. Nelze pokračovat v instalaci, dokud je neopravíte.';
+$lang['i_modified']            = 'Instalátor bude z bezpečnostních důvodů pracovat pouze s čistou a ještě neupravenou instalací DokuWiki. Buď znovu rozbalte soubory z instalačního balíčku, nebo zkuste prostudovat instrukce pro instalaci DokuWiki.';
+$lang['i_funcna']              = 'PHP funkce %s není dostupná. Váš webhosting ji možná z nějakého důvodu vypnul.';
+$lang['i_phpver']              = 'Verze vaší instalace PHP %s je nižší než požadovaná %s. Budete muset aktualizovat svou instalaci PHP.';
+$lang['i_permfail']            = 'DokuWiki nemůže zapisovat do %s. Budete muset opravit práva k tomuto adresáři.';
+$lang['i_confexists']          = '%s již existuje';
+$lang['i_writeerr']            = 'Nelze vytvořit %s. Budete muset zkontrolovat práva k souborům či adresářům a vytvořit tento soubor ručně.';
+$lang['i_badhash']             = 'soubor dokuwiki.php (hash=%s) nebyl rozpoznán nebo byl upraven';
+$lang['i_badval']              = '%s - neplatná nebo prázdná hodnota';
+$lang['i_success']             = 'Konfigurace byla úspěšně dokončena. Nyní můžete smazat soubor install.php. Pokračujte do své nové DokuWiki.';
+$lang['i_failure']             = 'Vyskytly se nějaké chyby při zápisu do konfiguračních souborů. Budete je nejspíš muset upravit ručně před použitím své nové DokuWiki.';
+$lang['i_policy']              = 'Úvodní politika ACL';
+$lang['i_pol0']                = 'Otevřená wiki (čtení, zápis a upload pro všechny)';
+$lang['i_pol1']                = 'Veřejná wiki (čtení pro všechny, zápis a upload pro registrované uživatele)';
+$lang['i_pol2']                = 'Uzavřená wiki (čtení, zápis a upload pouze pro registrované uživatele)';
+$lang['i_retry']               = 'Zkusit znovu';
+$lang['i_license']             = 'Vyberte prosím licenci obsahu:';
+$lang['i_license_none']        = 'Nezobrazovat žádné licenční informace';
+$lang['i_pop_field']           = 'Prosím, pomozte nám vylepšit DokuWiki:';
+$lang['i_pop_label']           = 'Jednou měsíčně zaslat anonymní data o využívání DokuWiki jejím vývojářům';
+$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 %d roky';
+$lang['months']                = 'před %d měsíci';
+$lang['weeks']                 = 'před %d týdny';
+$lang['days']                  = 'před %d dny';
+$lang['hours']                 = 'před %d hodinami';
+$lang['minutes']               = 'před %d minutami';
+$lang['seconds']               = 'před %d sekundami';
+$lang['wordblock']             = 'Vaše změny nebyly uloženy, protože obsahují blokovaný text(spam).';
+$lang['media_uploadtab']       = 'Nahrát';
+$lang['media_searchtab']       = 'Hledat';
+$lang['media_file']            = 'Soubor';
+$lang['media_viewtab']         = 'Zobrazit';
+$lang['media_edittab']         = 'Upravit';
+$lang['media_historytab']      = 'Historie';
+$lang['media_list_thumbs']     = 'Zmenšeniny';
+$lang['media_list_rows']       = 'Řádky';
+$lang['media_sort_name']       = 'Jméno';
+$lang['media_sort_date']       = 'Datum';
+$lang['media_namespaces']      = 'Vyber jmenný prostor';
+$lang['media_files']           = 'Soubory v %s';
+$lang['media_upload']          = 'Upload do %s';
+$lang['media_search']          = 'Hledat v %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s na %s';
+$lang['media_edit']            = 'Upravit %s';
+$lang['media_history']         = 'Historie %s';
+$lang['media_meta_edited']     = 'metadata upravena';
+$lang['media_perm_read']       = 'Bohužel, nemáte práva číst soubory.';
+$lang['media_perm_upload']     = 'Bohužel, nemáte práva nahrávat soubory.';
+$lang['media_update']          = 'Nahrát novou verzi';
+$lang['media_restore']         = 'Obnovit tuto verzi';
diff --git a/sources/inc/lang/cs/locked.txt b/sources/inc/lang/cs/locked.txt
new file mode 100644
index 0000000..23fd943
--- /dev/null
+++ b/sources/inc/lang/cs/locked.txt
@@ -0,0 +1,3 @@
+====== Stránka je zamknutá ======
+
+Tato stránka je právě zamknutá pro úpravy jiným uživatelem. Musíte počkat, než onen uživatel dokončí své úpravy nebo než tento zámek vyprší.
diff --git a/sources/inc/lang/cs/login.txt b/sources/inc/lang/cs/login.txt
new file mode 100644
index 0000000..a44ae59
--- /dev/null
+++ b/sources/inc/lang/cs/login.txt
@@ -0,0 +1,3 @@
+====== Přihlášení ======
+
+Momentálně nejste přihlášen(a)! Prosím vložte své identifikační údaje níže. Pro přihlášení musíte mít zapnuté cookies.
diff --git a/sources/inc/lang/cs/mailtext.txt b/sources/inc/lang/cs/mailtext.txt
new file mode 100644
index 0000000..f235a29
--- /dev/null
+++ b/sources/inc/lang/cs/mailtext.txt
@@ -0,0 +1,17 @@
+Stránka ve vaší DokuWiki byla změněna. Zde jsou podrobnosti:
+
+Datum       : @DATE@
+Prohlížeč   : @BROWSER@
+IP adresa   : @IPADDRESS@
+Hostitel    : @HOSTNAME@
+Stará verze : @OLDPAGE@
+Nová verze  : @NEWPAGE@
+Komentář    : @SUMMARY@
+Uživatel    : @USER@
+
+@DIFF@
+
+
+-- 
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/cs/mailwrap.html b/sources/inc/lang/cs/mailwrap.html
new file mode 100644
index 0000000..dacd38d
--- /dev/null
+++ b/sources/inc/lang/cs/mailwrap.html
@@ -0,0 +1,13 @@
+
+ 
+ @TITLE@
+ 
+ 
+ 
+
+ @HTMLBODY@
+
+ 
        
+ Tento mail byl vygenerován systémem DokuWiki na adrese @DOKUWIKIURL@.
+ 
+ 
\ No newline at end of file
diff --git a/sources/inc/lang/cs/newpage.txt b/sources/inc/lang/cs/newpage.txt
new file mode 100644
index 0000000..091250a
--- /dev/null
+++ b/sources/inc/lang/cs/newpage.txt
@@ -0,0 +1,3 @@
+====== Stránka s tímto názvem ještě neexistuje ======
+
+Odkaz vás zavedl na stránku, která ještě neexistuje. Můžete ji vytvořit stisknutím tlačítka ''Vytvořit stránku''.
diff --git a/sources/inc/lang/cs/norev.txt b/sources/inc/lang/cs/norev.txt
new file mode 100644
index 0000000..f601f58
--- /dev/null
+++ b/sources/inc/lang/cs/norev.txt
@@ -0,0 +1,3 @@
+====== Taková verze neexistuje ======
+
+Zadaná verze neexistuje. Stiskněte tlačítko ''Starší verze'' pro seznam starších verzí tohoto dokumentu.
diff --git a/sources/inc/lang/cs/password.txt b/sources/inc/lang/cs/password.txt
new file mode 100644
index 0000000..18f21f1
--- /dev/null
+++ b/sources/inc/lang/cs/password.txt
@@ -0,0 +1,11 @@
+Dobrý den,
+
+Zde jsou přihlašovací informace pro wiki @TITLE@ (@DOKUWIKIURL@)
+
+Jméno             : @FULLNAME@
+Uživatelské jméno : @LOGIN@
+Heslo             : @PASSWORD@
+
+-- 
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/cs/preview.txt b/sources/inc/lang/cs/preview.txt
new file mode 100644
index 0000000..079eda4
--- /dev/null
+++ b/sources/inc/lang/cs/preview.txt
@@ -0,0 +1,3 @@
+====== Náhled ======
+
+Zde je náhled, jak bude dokument vypadat. Pozor: Soubor zatím **není uložen**!
diff --git a/sources/inc/lang/cs/pwconfirm.txt b/sources/inc/lang/cs/pwconfirm.txt
new file mode 100644
index 0000000..aa37b3b
--- /dev/null
+++ b/sources/inc/lang/cs/pwconfirm.txt
@@ -0,0 +1,13 @@
+Dobrý den,
+
+Někdo požádal o nové heslo k vašemu uživatelskému účtu na wiki @TITLE@ (@DOKUWIKIURL@)
+
+Pokud jste o nové heslo nežádali, ignorujte prosím tento email.
+
+Pro potvrzení, že jste tento požadavek poslali opravdu vy, prosím otevřete následující odkaz.
+
+@CONFIRM@
+
+-- 
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/cs/read.txt b/sources/inc/lang/cs/read.txt
new file mode 100644
index 0000000..d5b2d73
--- /dev/null
+++ b/sources/inc/lang/cs/read.txt
@@ -0,0 +1 @@
+Tato stránka je pouze pro čtení. Můžete si pouze prohlédnout zdrojový kód, ale ne ho měnit. Zeptejte se správce, pokud si myslíte, že něco není v pořádku.
diff --git a/sources/inc/lang/cs/recent.txt b/sources/inc/lang/cs/recent.txt
new file mode 100644
index 0000000..e4ca5e9
--- /dev/null
+++ b/sources/inc/lang/cs/recent.txt
@@ -0,0 +1,3 @@
+====== Poslední úpravy ======
+
+Následující stránky byly nedávno změněny.
diff --git a/sources/inc/lang/cs/register.txt b/sources/inc/lang/cs/register.txt
new file mode 100644
index 0000000..b0d6bb1
--- /dev/null
+++ b/sources/inc/lang/cs/register.txt
@@ -0,0 +1,3 @@
+====== Zaregistrujte se jako nový uživatel ======
+
+Abyste získali uživatelský účet, vyplňte prosím všechny informace v následujícím formuláři. Zadejte **platnou** mailovou adresu, na níž bude zasláno heslo. Uživatelské jméno musí být v platném [[doku>pagename|formátu]] (který je stejný jako formát názvu stránky).
diff --git a/sources/inc/lang/cs/registermail.txt b/sources/inc/lang/cs/registermail.txt
new file mode 100644
index 0000000..201e7b7
--- /dev/null
+++ b/sources/inc/lang/cs/registermail.txt
@@ -0,0 +1,14 @@
+Zaregistroval se nový uživatel. Zde jsou detaily:
+
+Uživatelské jméno : @NEWUSER@
+Celé jméno : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Datum : @DATE@
+Prohlížeč : @BROWSER@
+IP adresa : @IPADDRESS@
+Hostitel : @HOSTNAME@
+
+-- 
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/cs/resendpwd.txt b/sources/inc/lang/cs/resendpwd.txt
new file mode 100644
index 0000000..1d2aa0d
--- /dev/null
+++ b/sources/inc/lang/cs/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Zaslat nové heslo ======
+
+Abyste získali nové heslo k vašemu učtu v této wiki, vyplňte všechny níže uvedené informace . Vaše nové heslo bude zasláno na emailovou adresu, kterou jste zadali při registraci. Uživatelské jméno by mělo být stejné jako vaše uživatelské jméno, s nímž se přihlašujete do této wiki.
diff --git a/sources/inc/lang/cs/resetpwd.txt b/sources/inc/lang/cs/resetpwd.txt
new file mode 100644
index 0000000..9aa449c
--- /dev/null
+++ b/sources/inc/lang/cs/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Nastavení nového hesla ======
+
+Zadejte prosím nové heslo pro váš účet.
\ No newline at end of file
diff --git a/sources/inc/lang/cs/revisions.txt b/sources/inc/lang/cs/revisions.txt
new file mode 100644
index 0000000..e3744b7
--- /dev/null
+++ b/sources/inc/lang/cs/revisions.txt
@@ -0,0 +1,3 @@
+====== Starší verze ======
+
+Zde jsou starší verze daného dokumentu. Pro návrat ke starší verzi si ji zvolte ze seznamu níže, stiskněte tlačítko ''Upravit stránku'' a uložte ji.
diff --git a/sources/inc/lang/cs/searchpage.txt b/sources/inc/lang/cs/searchpage.txt
new file mode 100644
index 0000000..ac045e1
--- /dev/null
+++ b/sources/inc/lang/cs/searchpage.txt
@@ -0,0 +1,5 @@
+====== Vyhledávání ======
+
+Výsledky hledání můžete vidět níže. Pokud jste nenašli, co hledáte, zkuste požadovanou stránku sami vytvořit stisknutím tlačítka ''Vytvořit stránku''.
+
+===== Výsledky =====
diff --git a/sources/inc/lang/cs/showrev.txt b/sources/inc/lang/cs/showrev.txt
new file mode 100644
index 0000000..48be467
--- /dev/null
+++ b/sources/inc/lang/cs/showrev.txt
@@ -0,0 +1,3 @@
+**Toto je starší verze dokumentu!**
+----
+
diff --git a/sources/inc/lang/cs/stopwords.txt b/sources/inc/lang/cs/stopwords.txt
new file mode 100644
index 0000000..26d8741
--- /dev/null
+++ b/sources/inc/lang/cs/stopwords.txt
@@ -0,0 +1,944 @@
+# Stopwords for Czech - generated from ispell-cs (license: GNU GPL)
+aby
+ako
+akorát
+ale
+and
+ani
+ano
+apod
+asi
+atd
+během
+bez
+beze
+blízko
+bohudík
+bohužel
+bokem
+buď
+bude
+budem
+budeme
+budeš
+budete
+budiž
+budou
+budu
+bůhvíco
+bůhvíčí
+bůhvíjak
+bůhvíjaký
+bůhvíkam
+bůhvíkde
+bůhvíkdo
+bůhvíkdy
+bůhvíkolik
+bůhvíkterý
+bůhvínač
+bůhvíproč
+bych
+bychom
+byl
+byla
+byli
+bylo
+byly
+bysme
+být
+cca
+cokoli
+cokoliv
+copak
+cosi
+což
+cože
+častěji
+často
+čeho
+čehokoli
+čehokoliv
+čehosi
+čehož
+čem
+čemkoli
+čemkoliv
+čemsi
+čemu
+čemukoli
+čemukoliv
+čemusi
+čemuž
+čemž
+čertvíco
+čertvíčí
+čertvíjak
+čertvíjaký
+čertvíkam
+čertvíkde
+čertvíkdo
+čertvíkdy
+čertvíkolik
+čertvíkterý
+čertvínač
+čertvíproč
+číhokoli
+číhosi
+číchkoli
+číchsi
+číkoli
+čím
+čímakoli
+čímasi
+čímikoli
+čímisi
+čímkoli
+čímkoliv
+čímpak
+čímsi
+čímukoli
+čímusi
+čímž
+čísi
+dál
+dále
+daleko
+další
+dám
+dle
+dnem
+dnes
+dneska
+dobrá
+dobré
+dobrý
+dobře
+docela
+dokonce
+doposavad
+doposud
+doprostřed
+dosavad
+dospod
+dospodu
+dost
+dosti
+dosud
+dovnitř
+eště
+formou
+ho
+hodinou
+hodně
+horší
+hůř
+hůře
+chceš
+chci
+chtěl
+jacíkoli
+jacíkoliv
+jacípak
+jacísi
+jak
+jakákoli
+jakákoliv
+jakápak
+jakási
+jaké
+jakéhokoli
+jakéhokoliv
+jakéhopak
+jakéhosi
+jakékoli
+jakékoliv
+jakémkoli
+jakémkoliv
+jakémpak
+jakémsi
+jakémukoli
+jakémukoliv
+jakémupak
+jakémusi
+jaképak
+jakési
+jakmile
+jako
+jakou
+jakoukoli
+jakoukoliv
+jakoupak
+jakousi
+jakož
+jakpak
+jaký
+jakýchkoli
+jakýchkoliv
+jakýchpak
+jakýchsi
+jakýkoli
+jakýkoliv
+jakýmakoli
+jakýmakoliv
+jakýmapak
+jakýmasi
+jakýmikoli
+jakýmikoliv
+jakýmipak
+jakýmisi
+jakýmkoli
+jakýmkoliv
+jakýmpak
+jakýmsi
+jakýpak
+jakýsi
+jakže
+jasné
+jasně
+jde
+je
+jediná
+jediné
+jediný
+jeho
+jehož
+jej
+její
+jejíhož
+jejich
+jejichž
+jejíchž
+jejímaž
+jejímiž
+jejímuž
+jejímž
+jejíž
+jejž
+jelikož
+jemu
+jemuž
+jen
+jenom
+jenž
+jenže
+jestli
+ještě
+jež
+ježto
+ji
+jí
+jich
+jichž
+jim
+jím
+jimi
+jimiž
+jimž
+jímž
+jiná
+jinak
+jiné
+jinou
+jiný
+jiných
+jiným
+jisté
+jistě
+již
+jíž
+jménem
+jsem
+jseš
+jsi
+jsme
+jsou
+jste
+kam
+každý
+kde
+kdeco
+kdečí
+kdejaký
+kdekdo
+kdekterý
+kdepak
+kdesi
+kdo
+kdokoli
+kdokoliv
+kdopak
+kdosi
+kdovíjak
+kdovíkde
+kdovíkdo
+kdož
+kdy
+kdysi
+když
+kohokoli
+kohokoliv
+kohopak
+kohosi
+kohož
+kol
+kolem
+kolik
+kolikže
+kolkolem
+komkoli
+komkoliv
+kompak
+komsi
+komu
+komukoli
+komukoliv
+komupak
+komusi
+komuž
+komž
+koncem
+konče
+končí
+končíc
+konec
+kontra
+kromě
+která
+kterákoli
+kterákoliv
+kterási
+kterážto
+které
+kteréhokoli
+kteréhokoliv
+kteréhosi
+kteréhož
+kterékoli
+kterékoliv
+kterém
+kterémkoli
+kterémkoliv
+kterémsi
+kterémukoli
+kterémukoliv
+kterémusi
+kterémuž
+kterémžto
+kterési
+kteréžto
+kterou
+kteroukoli
+kteroukoliv
+kterousi
+kteroužto
+který
+kterýchkoli
+kterýchkoliv
+kterýchsi
+kterýchžto
+kterýkoli
+kterýkoliv
+kterým
+kterýmakoli
+kterýmakoliv
+kterýmasi
+kterýmikoli
+kterýmikoliv
+kterýmisi
+kterýmiž
+kterýmkoli
+kterýmkoliv
+kterýmsi
+kterýmžto
+kterýsi
+kterýžto
+kteří
+kteřísi
+kteřížto
+ktříkoli
+ktříkoliv
+kupodivu
+kupříkladu
+kvůli
+kýmkoli
+kýmkoliv
+kýmpak
+kýmsi
+kýmž
+lecco
+leccos
+lecčems
+lecjak
+lecjaký
+leckam
+leckams
+leckde
+leckdo
+leckdy
+leckterý
+ledaco
+ledacos
+ledačí
+ledajak
+ledajaký
+ledakdo
+ledakterý
+ledaskam
+ledaskde
+ledaskdo
+ledaskdy
+lépe
+lepší
+líp
+má
+mají
+málo
+máloco
+málokdo
+málokterý
+mám
+máme
+máš
+máte
+max
+mé
+mě
+mého
+měl
+měla
+mělo
+mém
+mému
+mezi
+mi
+mí
+mimo
+min
+míň
+místo
+mít
+mne
+mně
+mnoho
+mnou
+moc
+mohl
+mohla
+mohou
+mohu
+moje
+moji
+mojí
+mou
+možná
+mu
+můj
+musel
+muset
+musí
+musím
+musíš
+musíte
+může
+můžeš
+můžete
+můžu
+my
+mých
+mým
+mými
+nač
+načež
+načpak
+nad
+nade
+nám
+námi
+namísto
+naň
+naprosto
+naproti
+např
+napříč
+nás
+náš
+naši
+navíc
+navrch
+navrchu
+navzdory
+ně
+nebo
+nebude
+nebyl
+nebyli
+nebyly
+něco
+něčí
+nedaleko
+nehledíc
+něho
+něhož
+nechceš
+nechci
+nechť
+nechtěl
+něj
+nějak
+nějaká
+nějaké
+nějakého
+nějakou
+nějaký
+nejasné
+nejasný
+nejčastěji
+nejde
+nejen
+nejhůř
+nejhůře
+nejlépe
+nejnižší
+nejsem
+nejsou
+nejvyšší
+nějž
+někam
+někde
+někdo
+někdy
+několik
+nekončí
+některý
+nelze
+něm
+nemá
+nemají
+nemálo
+nemám
+nemáme
+nemáš
+nemáte
+nemít
+nemohl
+nemohla
+nemohou
+nemohu
+němu
+nemusel
+nemuset
+nemusí
+nemusím
+nemusíš
+němuž
+nemůže
+nemůžeš
+nemůžete
+nemůžu
+němž
+není
+nepřesná
+nepřesné
+nepřesně
+nepřesný
+nepřímo
+netřeba
+netuším
+netýká
+neví
+nevím
+nevíš
+nevlastní
+nevyjímaje
+nevyjímajíc
+než
+něž
+ni
+ní
+nic
+ničeho
+ničem
+ničemu
+ničí
+ničím
+nie
+nieje
+nich
+nichž
+nijaký
+nikdo
+nikto
+nim
+ním
+nimi
+nimiž
+nimž
+nímž
+nízká
+niž
+níž
+nižádný
+níže
+nižší
+nový
+nutně
+oba
+obě
+oběma
+obou
+oč
+očpak
+ode
+odspoda
+odspodu
+ohledně
+okamžikem
+okolo
+on
+oň
+ona
+onen
+oni
+ono
+ony
+opravdu
+oproti
+ostatní
+osum
+pak
+poblíž
+počátkem
+počínaje
+počínajíc
+pod
+pode
+podél
+podle
+podobně
+pokud
+poměrně
+pomocí
+ponad
+pořád
+poslední
+posléze
+posud
+potom
+pražádný
+pro
+proč
+pročpak
+proň
+prostě
+proti
+proto
+protože
+před
+přede
+předem
+přes
+přese
+přesná
+přesné
+přesně
+přesný
+při
+přičemž
+přímo
+případná
+případné
+případně
+případný
+přitom
+půlí
+raději
+rokem
+sám
+sama
+samá
+samé
+samého
+samém
+samému
+sami
+samo
+samou
+samozřejmě
+samozřejmý
+samu
+samy
+samý
+samých
+samým
+samými
+se
+sebe
+sebou
+sem
+ses
+si
+sice
+sis
+skoro
+skrz
+skrze
+snad
+sobě
+som
+sotva
+sotvaco
+sotvakdo
+spíš
+spíše
+spodem
+spolu
+stačí
+stejně
+stranou
+středem
+svá
+své
+svého
+svém
+svému
+sví
+svoje
+svoji
+svojí
+svou
+svrchu
+svůj
+svých
+svým
+svými
+špatná
+špatné
+špatně
+špatný
+tací
+tady
+tahle
+tak
+taká
+také
+takhle
+takováto
+takové
+takovéhoto
+takovémto
+takovémuto
+takovéto
+takovíto
+takovouto
+takový
+takovýchto
+takovýma
+takovýmato
+takovýmito
+takovýmto
+takovýto
+takto
+taky
+taký
+takže
+tam
+tamten
+tatáž
+tato
+táž
+tě
+tebe
+tebou
+teď
+teda
+tedy
+téhle
+téhož
+těchhle
+těchto
+těchže
+těm
+téma
+těmahle
+těmhle
+těmihle
+těmito
+těmto
+těmu
+témuž
+témž
+témže
+ten
+tenhle
+tenhleten
+tento
+tentýž
+této
+téže
+ti
+tihle
+tím
+tímhle
+tímtéž
+tímto
+titíž
+tito
+tíž
+tobě
+tohle
+toho
+tohohle
+tohoto
+tom
+tomhle
+tomtéž
+tomto
+tomu
+tomuhle
+tomuto
+totéž
+toto
+touhle
+toutéž
+touto
+touž
+touže
+trochu
+trošku
+třeba
+tuhle
+tutéž
+tuto
+tvá
+tvé
+tvého
+tvém
+tvému
+tví
+tvoje
+tvoji
+tvojí
+tvou
+tvůj
+tvých
+tvým
+tvými
+ty
+tyhle
+týchž
+týká
+týmiž
+týmž
+tys
+tytéž
+tyto
+týž
+úderem
+uplná
+uplné
+úplně
+úplný
+uprostřed
+určitě
+uvnitř
+úvodem
+vám
+vámi
+vás
+váš
+vaše
+vaši
+včetně
+vedle
+velmi
+veprostřed
+versus
+vespod
+vespodu
+veškerý
+vevnitř
+víc
+více
+vím
+vinou
+víš
+viz
+vlastně
+vlivem
+vně
+vnitřka
+vnitřkem
+vnitřku
+von
+vrchem
+však
+vše
+všecek
+všecka
+všecko
+všecky
+všeho
+všech
+všechen
+všechna
+všechno
+všechnu
+všechny
+všelico
+všelicos
+všeličehos
+všeličems
+všeličemus
+všeličí
+všeličíms
+všelijaký
+všelikdo
+všeliký
+všeliskdo
+všem
+všemi
+všemu
+vši
+vší
+všicci
+všichni
+vším
+vůbec
+vůči
+vy
+vyjma
+vysoká
+výše
+vyšší
+vzdor
+vzhledem
+vždy
+za
+zač
+začátkem
+začpak
+zaň
+zásluhou
+zatím
+závěrem
+zboku
+zcela
+zčásti
+zda
+zdaleka
+zde
+zespoda
+zespodu
+zevnitř
+zeza
+znovu
+zpět
+zpod
+zponad
+zpoza
+zprostřed
+zřídkaco
+zřídkakdo
+zvnitřka
+zvnitřku
+žádný
diff --git a/sources/inc/lang/cs/subscr_digest.txt b/sources/inc/lang/cs/subscr_digest.txt
new file mode 100644
index 0000000..1b17709
--- /dev/null
+++ b/sources/inc/lang/cs/subscr_digest.txt
@@ -0,0 +1,22 @@
+Dobrý den!
+
+Byla změněna stránka @PAGE@ ve wiki @TITLE@.
+Zde jsou změny:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Stará revize: @OLDPAGE@
+Nová revize: @NEWPAGE@
+
+Pro odhlášení z odebírání změn na této webové stránce
+se prosím příhlašte do wiki na adrese 
+@DOKUWIKIURL@, pak navštivte 
+@SUBSCRIBE@ 
+a odhlaště se z odebírání změn na stránce či 
+ve jmenném prostoru.
+
+-- 
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/cs/subscr_form.txt b/sources/inc/lang/cs/subscr_form.txt
new file mode 100644
index 0000000..d051b64
--- /dev/null
+++ b/sources/inc/lang/cs/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Správa odběratelů změn ======
+
+Tato stránka Vám umožňuje spravovat uživatele přihlášené k odběru změn aktuální stránky nebo jmenného prostoru.
\ No newline at end of file
diff --git a/sources/inc/lang/cs/subscr_list.txt b/sources/inc/lang/cs/subscr_list.txt
new file mode 100644
index 0000000..f85be8a
--- /dev/null
+++ b/sources/inc/lang/cs/subscr_list.txt
@@ -0,0 +1,19 @@
+Dobrý den!
+
+Byly změněny stránky ve jmenném prostoru @PAGE@ wiki @TITLE@.
+Zde jsou:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pro odhlášení z odebírání změn
+se prosím příhlašte do wiki na adrese 
+@DOKUWIKIURL@, pak navštivte 
+@SUBSCRIBE@ 
+a odhlaště se z odebírání změn na stránce či 
+ve jmenném prostoru.
+
+-- 
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/cs/subscr_single.txt b/sources/inc/lang/cs/subscr_single.txt
new file mode 100644
index 0000000..1ee33da
--- /dev/null
+++ b/sources/inc/lang/cs/subscr_single.txt
@@ -0,0 +1,25 @@
+Dobrý den!
+
+Byla změněna stránka @PAGE@ ve wiki @TITLE@.
+Zde jsou změny:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum: @DATE@
+Uživatel: @USER@
+Souhrn editace: @SUMMARY@
+Stará revize: @OLDPAGE@
+Nová revize: @NEWPAGE@
+
+Pro odhlášení z odebírání změn na této webové stránce
+se prosím příhlašte do wiki na adrese 
+@DOKUWIKIURL@, pak navštivte 
+@SUBSCRIBE@ 
+a odhlaště se z odebírání změn na stránce či 
+ve jmenném prostoru.
+
+-- 
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/cs/updateprofile.txt b/sources/inc/lang/cs/updateprofile.txt
new file mode 100644
index 0000000..d5eadc6
--- /dev/null
+++ b/sources/inc/lang/cs/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Upravit profil vašeho učtu ======
+
+Vyplňte pouze pole, která chcete změnit. Nemůžete ale změnit své uživatelské jméno.
+
+
diff --git a/sources/inc/lang/cs/uploadmail.txt b/sources/inc/lang/cs/uploadmail.txt
new file mode 100644
index 0000000..b19b0bf
--- /dev/null
+++ b/sources/inc/lang/cs/uploadmail.txt
@@ -0,0 +1,14 @@
+Do vaší DokuWiki byl nahrán nový dokument. Tady jsou detaily:
+
+Soubor : @MEDIA@
+Datum : @DATE@
+Prohlážeč : @BROWSER@
+IP adresa : @IPADDRESS@
+Hostitel : @HOSTNAME@
+Velikost : @SIZE@
+MIME typ : @MIME@
+Uživatel : @USER@
+
+-- 
+Tento email byl automaticky vygenerován systémem DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/da/admin.txt b/sources/inc/lang/da/admin.txt
new file mode 100644
index 0000000..3ac4a70
--- /dev/null
+++ b/sources/inc/lang/da/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Nedenfor kan du finde en række administrative værktøjer.
+
diff --git a/sources/inc/lang/da/adminplugins.txt b/sources/inc/lang/da/adminplugins.txt
new file mode 100644
index 0000000..2a3d687
--- /dev/null
+++ b/sources/inc/lang/da/adminplugins.txt
@@ -0,0 +1 @@
+===== Yderligere udvidelser =====
\ No newline at end of file
diff --git a/sources/inc/lang/da/backlinks.txt b/sources/inc/lang/da/backlinks.txt
new file mode 100644
index 0000000..6dfa3cc
--- /dev/null
+++ b/sources/inc/lang/da/backlinks.txt
@@ -0,0 +1,4 @@
+====== Henvisninger bagud ======
+
+Dette er en liste over alle de dokumenter der henviser tilbage til det nuværende dokument.
+
diff --git a/sources/inc/lang/da/conflict.txt b/sources/inc/lang/da/conflict.txt
new file mode 100644
index 0000000..fc38cee
--- /dev/null
+++ b/sources/inc/lang/da/conflict.txt
@@ -0,0 +1,5 @@
+====== Der eksisterer en nyere udgave af dokumentet ======
+
+Der eksisterer en nyere udgave af dette dokument. Det sker når flere brugere ændrer i dokumentet på samme tid.
+
+Gennemgå de viste forskelle grundigt, og beslut hvilken udgave der skal bevares. Hvis du vælger ''Gem'', bliver din udgave af dokumentet gemt. Vælger du ''Fortryd'' beholder du den nuværende udgave.
diff --git a/sources/inc/lang/da/denied.txt b/sources/inc/lang/da/denied.txt
new file mode 100644
index 0000000..a4fa8b8
--- /dev/null
+++ b/sources/inc/lang/da/denied.txt
@@ -0,0 +1,3 @@
+====== Adgang nægtet! ======
+
+Du har ikke rettigheder til at fortsætte. Måske er du ikke logget ind.
diff --git a/sources/inc/lang/da/diff.txt b/sources/inc/lang/da/diff.txt
new file mode 100644
index 0000000..f77224f
--- /dev/null
+++ b/sources/inc/lang/da/diff.txt
@@ -0,0 +1,4 @@
+====== Forskelle ======
+
+Dette viser forskellene mellem den valgte og den nuværende udgave af dokumentet. Gul er linjer der findes i den gamle udgave, og grøn er linjer der findes i den nuværende.
+
diff --git a/sources/inc/lang/da/draft.txt b/sources/inc/lang/da/draft.txt
new file mode 100644
index 0000000..69c7801
--- /dev/null
+++ b/sources/inc/lang/da/draft.txt
@@ -0,0 +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 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 --git a/sources/inc/lang/da/edit.txt b/sources/inc/lang/da/edit.txt
new file mode 100644
index 0000000..0a9ea39
--- /dev/null
+++ b/sources/inc/lang/da/edit.txt
@@ -0,0 +1,2 @@
+Rediger dette dokument og tryk på knappen **''[Gem]''**. Se [[wiki:syntax|Formaterings tips]] for Wiki syntaks. Ret venligst kun dette dokument hvis du kan **forbedre** det. Brug venligst [[playground:playground|sandkassen]] til at teste før du retter i et rigtigt dokument. Husk også at bruge **''[Forhåndsvisning]''** før du gemmer dokumentet.
+
diff --git a/sources/inc/lang/da/editrev.txt b/sources/inc/lang/da/editrev.txt
new file mode 100644
index 0000000..438363e
--- /dev/null
+++ b/sources/inc/lang/da/editrev.txt
@@ -0,0 +1,2 @@
+**Du har hentet en gammel udgave af dette dokument!** Hvis du gemmer dokumentet vil du overskrive den nuværende med den gamle udgave.
+----
diff --git a/sources/inc/lang/da/index.txt b/sources/inc/lang/da/index.txt
new file mode 100644
index 0000000..74afb98
--- /dev/null
+++ b/sources/inc/lang/da/index.txt
@@ -0,0 +1,3 @@
+====== Indeks ======
+
+Dette er en oversigt over alle tilgængelige dokumenter, sorteret efter [[doku>namespaces|navnerum]].
diff --git a/sources/inc/lang/da/install.html b/sources/inc/lang/da/install.html
new file mode 100644
index 0000000..3cc13f8
--- /dev/null
+++ b/sources/inc/lang/da/install.html
@@ -0,0 +1,24 @@
+
        Denne side hjælper til første-gangs installation og konfiguration af
+Dokuwiki. Mere information om denne
+installer er tilgængelig på dens egen
+dokumentations side.
        
+
+
        DokuWiki bruger almindelige filer til at gemme wiki sider og anden
+information relaterende til disse sider (f.eks. billeder, søge indeks, gamle
+udgaver, osv).  For at fungerer optimalt skal DokuWiki have
+skrive adgang til mapperne der holder disse filer. Denne installer er ikke
+istand til at opsætte mappe tilladelser. Det skal normalt udføres direkte i en
+kommando shell eller hvis du bruger hosting, gennem FTP eller dit hostings
+kontrol panel (f.eks. cPanel).
        
+
+
        Denne installer vil opsætte din DokuWiki konfiguration for
+ACL, hvilket tillader
+administrator login og adgang til DokuWiki's adminstrative menu til
+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.
        
+
+
        Erfarne brugere og brugere med specielle opsætningskrav burde bruge disse
+henvisninger for detaljer vedrørende
+installations instruktioner
+og konfigurations indstillinger.
        
diff --git a/sources/inc/lang/da/lang.php b/sources/inc/lang/da/lang.php
new file mode 100644
index 0000000..eb50bb2
--- /dev/null
+++ b/sources/inc/lang/da/lang.php
@@ -0,0 +1,338 @@
+
+ * @author Jon Bendtsen 
+ * @author Lars Næsbye Christensen 
+ * @author Kalle Sommer Nielsen 
+ * @author Esben Laursen 
+ * @author Harith 
+ * @author Daniel Ejsing-Duun 
+ * @author Erik Bjørn Pedersen 
+ * @author rasmus@kinnerup.com
+ * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig 
+ * @author Soren Birk 
+ * @author Jens Hyllegaard 
+ * @author soer9648 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Rediger denne side';
+$lang['btn_source']            = 'Vis kildekode';
+$lang['btn_show']              = 'Vis side';
+$lang['btn_create']            = 'Opret denne side';
+$lang['btn_search']            = 'Søg';
+$lang['btn_save']              = 'Gem';
+$lang['btn_preview']           = 'Forhåndsvisning';
+$lang['btn_top']               = 'Tilbage til toppen';
+$lang['btn_newer']             = '<< forrige side';
+$lang['btn_older']             = 'næste side >>';
+$lang['btn_revs']              = 'Gamle udgaver';
+$lang['btn_recent']            = 'Nye ændringer';
+$lang['btn_upload']            = 'Overfør';
+$lang['btn_cancel']            = 'Fortryd';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Redigér';
+$lang['btn_login']             = 'Log ind';
+$lang['btn_logout']            = 'Log ud';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Opdatér';
+$lang['btn_delete']            = 'Slet';
+$lang['btn_back']              = 'Tilbage';
+$lang['btn_backlink']          = 'Henvisninger bagud';
+$lang['btn_backtomedia']       = 'Tilbage til valg af mediefil';
+$lang['btn_subscribe']         = 'Abonnér på ændringer';
+$lang['btn_profile']           = 'Opdatér profil';
+$lang['btn_reset']             = 'Nulstil';
+$lang['btn_resendpwd']         = 'Vælg ny adgangskode';
+$lang['btn_draft']             = 'Redigér kladde';
+$lang['btn_recover']           = 'Gendan kladde';
+$lang['btn_draftdel']          = 'Slet kladde';
+$lang['btn_revert']            = 'Reetablér';
+$lang['btn_register']          = 'Registrér';
+$lang['btn_apply']             = 'Anvend';
+$lang['btn_media']             = 'Media Manager';
+$lang['btn_deleteuser']        = 'Fjern Min Konto';
+$lang['loggedinas']            = 'Logget ind som';
+$lang['user']                  = 'Brugernavn';
+$lang['pass']                  = 'Adgangskode';
+$lang['newpass']               = 'Ny adgangskode';
+$lang['oldpass']               = 'Bekræft gammel adgangskode';
+$lang['passchk']               = 'Gentag ny adgangskode';
+$lang['remember']              = 'Automatisk log ind';
+$lang['fullname']              = 'Fulde navn';
+$lang['email']                 = 'E-mail';
+$lang['profile']               = 'Brugerprofil';
+$lang['badlogin']              = 'Brugernavn eller adgangskode var forkert.';
+$lang['badpassconfirm']        = 'Kodeordet var desværre 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 adgangskode bliver sendt til dig i en e-mail.';
+$lang['regsuccess2']           = 'Du er nu oprettet som bruger.';
+$lang['regmailfail']           = 'Dit adgangskode blev ikke sendt. Kontakt venligst administratoren.';
+$lang['regbadmail']            = 'E-mail-adressen er ugyldig. Kontakt venligst administratoren, hvis du mener dette er en fejl.';
+$lang['regbadpass']            = 'De to adgangskoder er ikke ens, vær venlig at prøve igen.';
+$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['profnodelete']          = 'Denne wiki supporterer ikke sletning af brugere';
+$lang['profdeleteuser']        = 'Slet Konto';
+$lang['profdeleted']           = 'Din brugerkonto er blevet slettet fra denne wiki';
+$lang['profconfdelete']        = 'Jeg ønsker at slette min konto fra denne wiki. 
         Denne handling kan ikke fortrydes.';
+$lang['pwdforget']             = 'Har du glemt dit adgangskode? Få et nyt';
+$lang['resendna']              = 'Denne wiki understøtter ikke udsendelse af nyt adgangskode.';
+$lang['resendpwd']             = 'Vælg ny 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 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['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['maxuploadsize']         = 'Upload max. %s pr. fil.';
+$lang['lockedby']              = 'Midlertidig låst af';
+$lang['lockexpire']            = 'Lås udløber kl.';
+$lang['js']['willexpire']      = 'Din lås på dette dokument udløber om et minut.\nTryk på Forhåndsvisning-knappen for at undgå konflikter.';
+$lang['js']['notsavedyet']     = 'Ugemte ændringer vil blive mistet
+Fortsæt alligevel?';
+$lang['js']['searchmedia']     = 'Søg efter filer';
+$lang['js']['keepopen']        = 'Hold vindue åbent ved valg';
+$lang['js']['hidedetails']     = 'Skjul detaljer';
+$lang['js']['mediatitle']      = 'Link indstillinger';
+$lang['js']['mediadisplay']    = 'Link type';
+$lang['js']['mediaalign']      = 'Juster';
+$lang['js']['mediasize']       = 'Billede størrelse';
+$lang['js']['mediatarget']     = 'Link mål';
+$lang['js']['mediaclose']      = 'Luk';
+$lang['js']['mediainsert']     = 'Indsæt';
+$lang['js']['mediadisplayimg'] = 'Vis billedet';
+$lang['js']['mediadisplaylnk'] = 'Vis kun linket';
+$lang['js']['mediasmall']      = 'Lille version';
+$lang['js']['mediamedium']     = 'Medium version';
+$lang['js']['medialarge']      = 'Stor version';
+$lang['js']['mediaoriginal']   = 'Original version';
+$lang['js']['medialnk']        = 'Link til detajle side';
+$lang['js']['mediadirect']     = 'Direkte link til originalen';
+$lang['js']['medianolnk']      = 'Intet link';
+$lang['js']['medianolink']     = 'Link ikke billedet';
+$lang['js']['medialeft']       = 'Juster billedet til venstre';
+$lang['js']['mediaright']      = 'Juster billedet til højre';
+$lang['js']['mediacenter']     = 'Centreret';
+$lang['js']['medianoalign']    = 'Brug ingen justering';
+$lang['js']['nosmblinks']      = 'Henvisninger til Windows shares virker kun i Microsoft Internet Explorer.
+Du kan stadig kopiere og indsætte linket.';
+$lang['js']['linkwiz']         = 'guiden til henvisninger';
+$lang['js']['linkto']          = 'Henvise til:';
+$lang['js']['del_confirm']     = 'Slet valgte post(er)?';
+$lang['js']['restore_confirm'] = 'Vil du virkeligt genskabe denne version?';
+$lang['js']['media_diff']      = 'Vis forskelle:';
+$lang['js']['media_diff_both'] = 'Side ved Side';
+$lang['js']['media_diff_opacity'] = 'Skin-igennem';
+$lang['js']['media_select']    = 'Vælg filer...';
+$lang['js']['media_upload_btn'] = 'Upload';
+$lang['js']['media_done_btn']  = 'Færdig';
+$lang['js']['media_drop']      = 'Drop filer her for at uploade';
+$lang['js']['media_cancel']    = 'fjern';
+$lang['js']['media_overwrt']   = 'Overskriv eksisterende filer';
+$lang['rssfailed']             = 'Der opstod en fejl ved indhentning af: ';
+$lang['nothingfound']          = 'Søgningen gav intet resultat.';
+$lang['mediaselect']           = 'Vælg mediefil';
+$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']      = '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['accessdenied']          = 'Du har ikke tilladelse til at se denne side';
+$lang['mediausage']            = 'Brug den følgende syntaks til at henvise til denne fil:';
+$lang['mediaview']             = 'Vis oprindelig fil';
+$lang['mediaroot']             = 'rod';
+$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:';
+$lang['ref_hidden']            = 'Nogle henvisninger er i dokumenter du ikke har læserettigheder til';
+$lang['hits']                  = 'Besøg';
+$lang['quickhits']             = 'Tilsvarende dokumentnavne';
+$lang['toc']                   = 'Indholdsfortegnelse';
+$lang['current']               = 'nuværende';
+$lang['yours']                 = 'Din version';
+$lang['diff']                  = 'Vis forskelle i forhold til den nuværende udgave';
+$lang['diff2']                 = 'Vis forskelle i forhold til de valgte revisioner';
+$lang['difflink']              = 'Link til denne sammenlinings vising';
+$lang['diff_type']             = 'Vis forskelle:';
+$lang['diff_inline']           = 'Indeni';
+$lang['diff_side']             = 'Side ved Side';
+$lang['line']                  = 'Linje';
+$lang['breadcrumb']            = 'Sti';
+$lang['youarehere']            = 'Du er her';
+$lang['lastmod']               = 'Sidst ændret';
+$lang['by']                    = 'af';
+$lang['deleted']               = 'slettet';
+$lang['created']               = 'oprettet';
+$lang['restored']              = 'gammel udgave reetableret (%s)';
+$lang['external_edit']         = 'ekstern redigering';
+$lang['summary']               = 'Redigerings resumé';
+$lang['noflash']               = 'Den Adobe Flash Plugin er nødvendig til at vise denne indehold.';
+$lang['download']              = 'Hente kodestykke';
+$lang['tools']                 = 'Værktøjer';
+$lang['user_tools']            = 'Brugerværktøjer';
+$lang['site_tools']            = 'Webstedsværktøjer';
+$lang['page_tools']            = 'Sideværktøjer';
+$lang['skip_to_content']       = 'hop til indhold';
+$lang['sidebar']               = 'Sidebjælke';
+$lang['mail_newpage']          = 'dokument tilføjet:';
+$lang['mail_changed']          = 'dokument ændret:';
+$lang['mail_subscribe_list']   = 'sider ændret i navnerum';
+$lang['mail_new_user']         = 'Ny bruger';
+$lang['mail_upload']           = 'fil overføret:';
+$lang['changes_type']          = 'Vis ændringer af';
+$lang['pages_changes']         = 'Sider';
+$lang['media_changes']         = 'Media filer';
+$lang['both_changes']          = 'Både sider og media filer';
+$lang['qb_bold']               = 'Fed';
+$lang['qb_italic']             = 'Kursiv';
+$lang['qb_underl']             = 'Understregning';
+$lang['qb_code']               = 'Skrivemaskine tekst';
+$lang['qb_strike']             = 'Gennemstregning';
+$lang['qb_h1']                 = 'Niveau 1 overskrift';
+$lang['qb_h2']                 = 'Niveau 2 overskrift';
+$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';
+$lang['qb_ol']                 = 'Nummereret liste';
+$lang['qb_ul']                 = 'Unummereret liste';
+$lang['qb_media']              = 'Tilføj billeder og andre filer';
+$lang['qb_sig']                = 'Indsæt signatur';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Specialtegn';
+$lang['upperns']               = 'Gå til overordnet navnerum';
+$lang['admin_register']        = 'Tilføj ny bruger';
+$lang['metaedit']              = 'Rediger metadata';
+$lang['metasaveerr']           = 'Skrivning af metadata fejlede';
+$lang['metasaveok']            = 'Metadata gemt';
+$lang['img_backto']            = 'Tilbage til';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Billedtekst';
+$lang['img_date']              = 'Dato';
+$lang['img_fname']             = 'Filnavn';
+$lang['img_fsize']             = 'Størrelse';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Ophavsret';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Emneord';
+$lang['img_width']             = 'Bredde';
+$lang['img_height']            = 'Højde';
+$lang['img_manager']           = 'Vis i Media Manager';
+$lang['subscr_subscribe_success'] = 'Tilføjede %s til abonnement listen for %s';
+$lang['subscr_subscribe_error'] = 'Fejl ved tilføjelse af %s til abonnement listen for %s';
+$lang['subscr_subscribe_noaddress'] = 'Der er ikke nogen addresse forbundet til din bruger, så du kan ikke blive tilføjet til abonnement listen';
+$lang['subscr_unsubscribe_success'] = 'Fjernede %s fra abonnement listen for %s';
+$lang['subscr_unsubscribe_error'] = 'Fejl ved fjernelse af %s fra abonnement listen for %s';
+$lang['subscr_already_subscribed'] = '%s har allerede et abonnement for listen %s';
+$lang['subscr_not_subscribed'] = '%s har ikke et abonnement for listen %s';
+$lang['subscr_m_not_subscribed'] = 'Du har ikke et abonnement til denne side eller navnerum';
+$lang['subscr_m_new_header']   = 'Tilføj abonnement';
+$lang['subscr_m_current_header'] = 'Nuværende abonnementer';
+$lang['subscr_m_unsubscribe']  = 'Fjern abonnement';
+$lang['subscr_m_subscribe']    = 'Abonér';
+$lang['subscr_m_receive']      = 'Modtag';
+$lang['subscr_style_every']    = 'email på hver ændring';
+$lang['subscr_style_digest']   = 'opsummeringsmail med ændringer for hver side (hver %.2f dage)';
+$lang['subscr_style_list']     = 'list af ændrede sider siden sidste email (hver %.2f dage)';
+$lang['authtempfail']          = 'Brugervalidering er midlertidigt ude af drift. Hvis dette er vedvarende, kontakt venligst wikiens administrator.';
+$lang['authpwdexpire']         = 'Din adgangskode vil udløbe om %d dage, du bør ændre det snart.';
+$lang['i_chooselang']          = 'Vælg dit sprog';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Wiki Navn';
+$lang['i_enableacl']           = 'Brug ACL (foreslået)';
+$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 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_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. 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 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['i_license']             = 'Vælg venligst licensen du vil tilføje dit indhold under:';
+$lang['i_license_none']        = 'Vis ikke licensinformationer';
+$lang['i_pop_field']           = 'Hjælp os venligst med at forbedre oplevelsen af DokuWiki:';
+$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';
+$lang['wordblock']             = 'Din ændring blev ikke gemt da den indeholder blokeret tekst (spam).';
+$lang['media_uploadtab']       = 'Upload';
+$lang['media_searchtab']       = 'Søg';
+$lang['media_file']            = 'Fil';
+$lang['media_viewtab']         = 'Vis';
+$lang['media_edittab']         = 'Rediger';
+$lang['media_historytab']      = 'Historie';
+$lang['media_list_thumbs']     = 'Thumbnails';
+$lang['media_list_rows']       = 'Rækker';
+$lang['media_sort_name']       = 'Navn';
+$lang['media_sort_date']       = 'Dato';
+$lang['media_namespaces']      = 'Vælg navneområde';
+$lang['media_files']           = 'Filer i %s';
+$lang['media_upload']          = 'Upload til %s';
+$lang['media_search']          = 'Søg i %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s ved %s';
+$lang['media_edit']            = 'Rediger %s';
+$lang['media_history']         = 'Historie for %s';
+$lang['media_meta_edited']     = 'metadata redigered';
+$lang['media_perm_read']       = 'Du har ikke nok rettigheder til at læse filer.';
+$lang['media_perm_upload']     = 'Du har ikke nok rettigheder til at uploade filer.';
+$lang['media_update']          = 'Upload ny version';
+$lang['media_restore']         = 'Genskab denne version';
diff --git a/sources/inc/lang/da/locked.txt b/sources/inc/lang/da/locked.txt
new file mode 100644
index 0000000..74b677d
--- /dev/null
+++ b/sources/inc/lang/da/locked.txt
@@ -0,0 +1,3 @@
+====== Låst Dokument ======
+
+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 --git a/sources/inc/lang/da/login.txt b/sources/inc/lang/da/login.txt
new file mode 100644
index 0000000..039bb0a
--- /dev/null
+++ b/sources/inc/lang/da/login.txt
@@ -0,0 +1,3 @@
+====== Login ======
+
+Du er ikke logget ind! Indtast brugernavn og adgangskode. Din browser skal have tilladt cookies for at du kan logge ind.
diff --git a/sources/inc/lang/da/mailtext.txt b/sources/inc/lang/da/mailtext.txt
new file mode 100644
index 0000000..948a265
--- /dev/null
+++ b/sources/inc/lang/da/mailtext.txt
@@ -0,0 +1,17 @@
+Et dokument i din DokuWiki blev ændret eller tilføjet. Her er detajlerne:
+
+Dato               : @DATE@
+Browser            : @BROWSER@
+IP-adresse         : @IPADDRESS@
+Hostnavn           : @HOSTNAME@
+Gammel udgave      : @OLDPAGE@
+Ny udgave          : @NEWPAGE@
+Redigerings resumé : @SUMMARY@
+Bruger             : @USER@
+
+@DIFF@
+
+
+-- 
+Denne e-mail blev genereret af DokuWiki på:
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/da/mailwrap.html b/sources/inc/lang/da/mailwrap.html
new file mode 100644
index 0000000..0eb2e0b
--- /dev/null
+++ b/sources/inc/lang/da/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Denne mail blev sendt af DokuWiki på @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/da/newpage.txt b/sources/inc/lang/da/newpage.txt
new file mode 100644
index 0000000..1d602c0
--- /dev/null
+++ b/sources/inc/lang/da/newpage.txt
@@ -0,0 +1,3 @@
+====== Dette dokument eksisterer ikke (endnu) ======
+
+Du har fulgt en henvisning til et dokument der ikke eksisterer (endnu). Du kan oprette dokumentet ved at trykke på knappen **''[Opret dette dokument]''**.
diff --git a/sources/inc/lang/da/norev.txt b/sources/inc/lang/da/norev.txt
new file mode 100644
index 0000000..aa68962
--- /dev/null
+++ b/sources/inc/lang/da/norev.txt
@@ -0,0 +1,4 @@
+====== Den valgte udgave findes ikke ======
+
+Den valgte udgave af dokumentet findes ikke! Tryk på knappen **''[Gamle udgaver]''** for at se en liste af gamle udgaver af dette dokument.
+
diff --git a/sources/inc/lang/da/password.txt b/sources/inc/lang/da/password.txt
new file mode 100644
index 0000000..051564c
--- /dev/null
+++ b/sources/inc/lang/da/password.txt
@@ -0,0 +1,11 @@
+Hej @FULLNAME@!
+
+Her er dine brugeroplysninger @TITLE@ at @DOKUWIKIURL@
+
+Brugernavn  : @LOGIN@
+Adgangskode : @PASSWORD@
+
+-- 
+Denne e-mail blev genereret af DokuWiki på
+@DOKUWIKIURL@
+ 
\ No newline at end of file
diff --git a/sources/inc/lang/da/preview.txt b/sources/inc/lang/da/preview.txt
new file mode 100644
index 0000000..23e65e8
--- /dev/null
+++ b/sources/inc/lang/da/preview.txt
@@ -0,0 +1,4 @@
+====== Forhåndsvisning ======
+
+Dette er en forhåndsvisning af hvordan dokumentet vil se ud. Husk: Det er //**IKKE**// gemt endnu! Hvis det ser godt ud, så tryk på knappen **''[Gem]''**
+
diff --git a/sources/inc/lang/da/pwconfirm.txt b/sources/inc/lang/da/pwconfirm.txt
new file mode 100644
index 0000000..3df556e
--- /dev/null
+++ b/sources/inc/lang/da/pwconfirm.txt
@@ -0,0 +1,14 @@
+Hej @FULLNAME@!
+
+Nogen har bedt om et nyt password til dit @TITLE@
+login på @DOKUWIKIURL@
+
+Hvis du ikke bad om dette, så ignorer venligst denne email.
+
+For at bekræfte at det var dig der bad om dette, benyt venligst det følgende henvisning.
+
+@CONFIRM@
+
+-- 
+Denne e-mail blev genereret af DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/da/read.txt b/sources/inc/lang/da/read.txt
new file mode 100644
index 0000000..49f6583
--- /dev/null
+++ b/sources/inc/lang/da/read.txt
@@ -0,0 +1,2 @@
+Dette dokument kan kun læses. Du kan se kildekoden, men ikke gemme ændringer i det. Hvis du mener at dette er en fejl, så skriv det venligst på [[wiki:fejl-oversigt]].
+
diff --git a/sources/inc/lang/da/recent.txt b/sources/inc/lang/da/recent.txt
new file mode 100644
index 0000000..c44fa36
--- /dev/null
+++ b/sources/inc/lang/da/recent.txt
@@ -0,0 +1,5 @@
+====== Nye ændringer ======
+
+Følgende dokumenter er blevet ændret for nylig.
+
+
diff --git a/sources/inc/lang/da/register.txt b/sources/inc/lang/da/register.txt
new file mode 100644
index 0000000..4ff2ed1
--- /dev/null
+++ b/sources/inc/lang/da/register.txt
@@ -0,0 +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 adgangskode bliver sendt til dig. Dit brugernavn skal være et gyldigt [[doku>pagename|dokumentnavn]].
+
diff --git a/sources/inc/lang/da/registermail.txt b/sources/inc/lang/da/registermail.txt
new file mode 100644
index 0000000..d431f75
--- /dev/null
+++ b/sources/inc/lang/da/registermail.txt
@@ -0,0 +1,14 @@
+En ny bruger har registreret. Her er detaljerne:
+
+Brugernavn : @NEWUSER@
+Navn       : @NEWNAME@
+E-mail     : @NEWEMAIL@
+
+Dato       : @DATE@
+Browser    : @BROWSER@
+IP-adresse : @IPADDRESS@
+Værtsnavn  : @HOSTNAME@
+
+-- 
+Denne mail blev genereret af DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/da/resendpwd.txt b/sources/inc/lang/da/resendpwd.txt
new file mode 100644
index 0000000..e96861e
--- /dev/null
+++ b/sources/inc/lang/da/resendpwd.txt
@@ -0,0 +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-mail-adresse. Brugernavnet bør være dit wiki brugernavn.
diff --git a/sources/inc/lang/da/resetpwd.txt b/sources/inc/lang/da/resetpwd.txt
new file mode 100644
index 0000000..e0823db
--- /dev/null
+++ b/sources/inc/lang/da/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Vælg ny adgangskode ======
+
+Indtast venligst en ny adgangskode for din konto på denne wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/da/revisions.txt b/sources/inc/lang/da/revisions.txt
new file mode 100644
index 0000000..08f6f20
--- /dev/null
+++ b/sources/inc/lang/da/revisions.txt
@@ -0,0 +1,3 @@
+====== Gamle udgaver ======
+
+Her er de gamle udgaver af dette dokument. Du kan vende tilbage til en tidligere udgave af dokumentet ved at vælge det nedenfor, trykke på knappen **''[Rediger dette dokument]''**, og til sidst gemme dokumentet.
diff --git a/sources/inc/lang/da/searchpage.txt b/sources/inc/lang/da/searchpage.txt
new file mode 100644
index 0000000..eca1b58
--- /dev/null
+++ b/sources/inc/lang/da/searchpage.txt
@@ -0,0 +1,5 @@
+====== Søgning ======
+
+Du kan se resultaterne af din søgning nedenunder. Hvis resultaterne ikke indeholder det du søgte efter kan du oprette et nyt dokument med samme navn som søgningen ved at trykke på knappen **''[Opret dette dokument]''**.
+
+===== Søgeresultater =====
diff --git a/sources/inc/lang/da/showrev.txt b/sources/inc/lang/da/showrev.txt
new file mode 100644
index 0000000..3d48903
--- /dev/null
+++ b/sources/inc/lang/da/showrev.txt
@@ -0,0 +1,2 @@
+**Dette er en gammel udgave af dokumentet!**
+----
diff --git a/sources/inc/lang/da/stopwords.txt b/sources/inc/lang/da/stopwords.txt
new file mode 100644
index 0000000..0fb9267
--- /dev/null
+++ b/sources/inc/lang/da/stopwords.txt
@@ -0,0 +1,87 @@
+# This is a list of words the indexer ignores, one word per line
+# When you edit this file be sure to use UNIX line endings (single newline)
+# No need to include words shorter than 3 chars - these are ignored anyway
+# This list is based upon the ones found at http://www.ranks.nl/stopwords/
+alle
+andet
+andre
+begge
+den
+denne
+der
+deres
+det
+dette
+dig
+din
+dog
+eller
+end
+ene
+eneste
+enhver
+fem
+fire
+flere
+fleste
+for
+fordi
+forrige
+fra
+før
+god
+han
+hans
+har
+hendes
+her
+hun
+hvad
+hvem
+hver
+hvilken
+hvis
+hvor
+hvordan
+hvorfor
+hvornår
+ikke
+ind
+ingen
+intet
+jeg
+jeres
+kan
+kom
+kommer
+lav
+lidt
+lille
+man
+mand
+mange
+med
+meget
+men
+mens
+mere
+mig
+ned
+nogen
+noget
+nyt
+nær
+næste
+næsten
+otte
+over
+seks
+ses
+som
+stor
+store
+syv
+til
+tre
+var
+www
\ No newline at end of file
diff --git a/sources/inc/lang/da/subscr_digest.txt b/sources/inc/lang/da/subscr_digest.txt
new file mode 100644
index 0000000..0aa19ac
--- /dev/null
+++ b/sources/inc/lang/da/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hej,
+
+Siden @PAGE@ i @TITLE@ wikien er blevet ændret.
+Her er ændringerne:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Gammel Revision: @OLDPAGE@
+Ny Revision: @NEWPAGE@
+
+For at stoppe notifikationer om sideændringer, login på wikien på
+@DOKUWIKIURL@ og besøg så
+@SUBSCRIBE@
+for at afmelde side og/eller navneområde ændringer.
+
+-- 
+Denne mail blev sendt af DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/da/subscr_form.txt b/sources/inc/lang/da/subscr_form.txt
new file mode 100644
index 0000000..9de6565
--- /dev/null
+++ b/sources/inc/lang/da/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Abonnementadministration ======
+
+Denne side gør det muligt for dig at administrere dine abonnementer for den nuværende side eller navnerum.
\ No newline at end of file
diff --git a/sources/inc/lang/da/subscr_list.txt b/sources/inc/lang/da/subscr_list.txt
new file mode 100644
index 0000000..02a34d2
--- /dev/null
+++ b/sources/inc/lang/da/subscr_list.txt
@@ -0,0 +1,17 @@
+Hej,
+
+Sider i navneområdet @PAGE@ i @TITLE@ wikien er blevet ændret.
+Her er de ændrede sider:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+For at stoppe notifikationer om sideændringer, login på wikien på
+@DOKUWIKIURL@ og besøg så
+@SUBSCRIBE@
+for at afmelde side og/eller navneområde ændringer.
+
+-- 
+Denne mail blev sendt af DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/da/subscr_single.txt b/sources/inc/lang/da/subscr_single.txt
new file mode 100644
index 0000000..cdc5545
--- /dev/null
+++ b/sources/inc/lang/da/subscr_single.txt
@@ -0,0 +1,23 @@
+Hej!
+
+Siden @PAGE@ i wikien @TITLE@ er blevet ændret.
+Her er ændringerne:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dato : @DATE@
+Bruger : @USER@
+Summering: @SUMMARY@
+Gammel Revision: @OLDPAGE@
+Ny Revision: @NEWPAGE@
+
+For at slå side notifikationer fra, skal du logge ind på 
+@DOKUWIKIURL@ og besøge
+@SUBSCRIBE@
+og slå abonnoment for side / navnerum ændringer fra.
+
+--
+Denne email blev generet af DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/da/updateprofile.txt b/sources/inc/lang/da/updateprofile.txt
new file mode 100644
index 0000000..2c6ce3f
--- /dev/null
+++ b/sources/inc/lang/da/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Opdater din kontos profil ======
+
+Du behøver kun at udfylde de felter du ønsker at ændre. Du kan ikke ændre dit brugernavn.
diff --git a/sources/inc/lang/da/uploadmail.txt b/sources/inc/lang/da/uploadmail.txt
new file mode 100644
index 0000000..316463f
--- /dev/null
+++ b/sources/inc/lang/da/uploadmail.txt
@@ -0,0 +1,14 @@
+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@
+MIME Type   : @MIME@
+Bruger      : @USER@
+
+-- 
+Denne e-mail blev genereret af DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/de-informal/admin.txt b/sources/inc/lang/de-informal/admin.txt
new file mode 100644
index 0000000..c52f343
--- /dev/null
+++ b/sources/inc/lang/de-informal/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Folgende administrative Aufgaben stehen in DokuWiki zur Verfügung.
+
diff --git a/sources/inc/lang/de-informal/adminplugins.txt b/sources/inc/lang/de-informal/adminplugins.txt
new file mode 100644
index 0000000..a0ae21f
--- /dev/null
+++ b/sources/inc/lang/de-informal/adminplugins.txt
@@ -0,0 +1 @@
+===== Zusätzliche Plugins =====
\ No newline at end of file
diff --git a/sources/inc/lang/de-informal/backlinks.txt b/sources/inc/lang/de-informal/backlinks.txt
new file mode 100644
index 0000000..aae4c55
--- /dev/null
+++ b/sources/inc/lang/de-informal/backlinks.txt
@@ -0,0 +1,5 @@
+====== Backlinks ======
+
+Dies ist eine Liste der Seiten, die zurück zur momentanen Seite linken.
+
+
diff --git a/sources/inc/lang/de-informal/conflict.txt b/sources/inc/lang/de-informal/conflict.txt
new file mode 100644
index 0000000..eec3450
--- /dev/null
+++ b/sources/inc/lang/de-informal/conflict.txt
@@ -0,0 +1,6 @@
+====== Eine neuere Version existiert ======
+
+Eine neuere Version des aktuell in Bearbeitung befindlichen Dokuments existiert. Das heißt, jemand hat gleichzeitig 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 --git a/sources/inc/lang/de-informal/denied.txt b/sources/inc/lang/de-informal/denied.txt
new file mode 100644
index 0000000..0bc0e59
--- /dev/null
+++ b/sources/inc/lang/de-informal/denied.txt
@@ -0,0 +1,4 @@
+====== Zugang verweigert ======
+
+Du hast nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. Eventuell bist du nicht am Wiki angemeldet?
+
diff --git a/sources/inc/lang/de-informal/diff.txt b/sources/inc/lang/de-informal/diff.txt
new file mode 100644
index 0000000..82fbbc2
--- /dev/null
+++ b/sources/inc/lang/de-informal/diff.txt
@@ -0,0 +1,5 @@
+====== Unterschiede ======
+
+Hier werden die Unterschiede zwischen zwei Versionen gezeigt.
+
+
diff --git a/sources/inc/lang/de-informal/draft.txt b/sources/inc/lang/de-informal/draft.txt
new file mode 100644
index 0000000..e56dbe0
--- /dev/null
+++ b/sources/inc/lang/de-informal/draft.txt
@@ -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 //wiederherstellen// oder //löschen// willst oder ob du die Bearbeitung abbrechen möchtest.
+
diff --git a/sources/inc/lang/de-informal/edit.txt b/sources/inc/lang/de-informal/edit.txt
new file mode 100644
index 0000000..28a7641
--- /dev/null
+++ b/sources/inc/lang/de-informal/edit.txt
@@ -0,0 +1,4 @@
+Bitte bearbeite dieses Dokument nur, wenn du es **verbessern** kannst.
+
+Nach dem Bearbeiten den **''[Speichern]''**-Knopf drücken. Siehe [[wiki:syntax]] zur Wiki-Syntax. Zum Testen bitte erst im [[playground:playground|Spielplatz]] üben.
+
diff --git a/sources/inc/lang/de-informal/editrev.txt b/sources/inc/lang/de-informal/editrev.txt
new file mode 100644
index 0000000..6c1f642
--- /dev/null
+++ b/sources/inc/lang/de-informal/editrev.txt
@@ -0,0 +1,2 @@
+**Eine ältere Version des Dokuments wurde geladen!** Beim Speichern wird eine neue Version des Dokuments mit diesem Inhalt erstellt.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/de-informal/index.txt b/sources/inc/lang/de-informal/index.txt
new file mode 100644
index 0000000..fa8dc46
--- /dev/null
+++ b/sources/inc/lang/de-informal/index.txt
@@ -0,0 +1,4 @@
+====== Übersicht ======
+
+Dies ist eine Übersicht über alle vorhandenen Seiten und [[doku>namespaces|Namensräume]].
+
diff --git a/sources/inc/lang/de-informal/install.html b/sources/inc/lang/de-informal/install.html
new file mode 100644
index 0000000..19fae80
--- /dev/null
+++ b/sources/inc/lang/de-informal/install.html
@@ -0,0 +1,27 @@
+
        Diese Seite hilft dir bei der Erstinstallation 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 Administrationsmenü ermöglicht.
+Dort kannst du dann weitere Tätigkeiten wie das Installieren von Plugins, dass
+Verwalten von Benutzern und das Ändern von Konfigurationseinstellungen durchführen.
+Das Benutzen der Zugangskontrolle ist nicht zwingend erforderlich, es erleichtert aber
+die Administration von DokuWiki.
        
+
+
        Erfahrene Anwender oder Benutzer mit speziellen Konfigurationsbedürfnissen sollten
+die folgenden Links nutzen, um sich über
+Installation
+und Konfiguration zu
+informieren.
        
+
diff --git a/sources/inc/lang/de-informal/lang.php b/sources/inc/lang/de-informal/lang.php
new file mode 100644
index 0000000..be3f14a
--- /dev/null
+++ b/sources/inc/lang/de-informal/lang.php
@@ -0,0 +1,345 @@
+
+ * @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 
+ * @author Marcel Metz 
+ * @author Matthias Schulte 
+ * @author Christian Wichmann 
+ * @author Pierre Corell 
+ * @author Frank Loizzi 
+ * @author Volker Bödker 
+ * @author Janosch 
+ */
+$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']         = 'Aboverwaltung';
+$lang['btn_profile']           = 'Benutzerprofil';
+$lang['btn_reset']             = 'Zurücksetzen';
+$lang['btn_resendpwd']         = 'Setze neues Passwort';
+$lang['btn_draft']             = 'Entwurf bearbeiten';
+$lang['btn_recover']           = 'Entwurf wiederherstellen';
+$lang['btn_draftdel']          = 'Entwurf löschen';
+$lang['btn_revert']            = 'Wiederherstellen';
+$lang['btn_register']          = 'Registrieren';
+$lang['btn_apply']             = 'Übernehmen';
+$lang['btn_media']             = 'Medien-Manager';
+$lang['btn_deleteuser']        = 'Benutzerprofil löschen';
+$lang['loggedinas']            = 'Angemeldet als';
+$lang['user']                  = 'Benutzername';
+$lang['pass']                  = 'Passwort';
+$lang['newpass']               = 'Neues Passwort';
+$lang['oldpass']               = 'Bestätigen (Altes Passwort)';
+$lang['passchk']               = 'Passwort erneut eingeben';
+$lang['remember']              = 'Angemeldet bleiben';
+$lang['fullname']              = 'Voller Name';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'Benutzerprofil';
+$lang['badlogin']              = 'Benutzername oder Passwort sind falsch.';
+$lang['badpassconfirm']        = 'Das Passwort war falsch.';
+$lang['minoredit']             = 'Kleine Änderung';
+$lang['draftdate']             = 'Entwurf gespeichert am';
+$lang['nosecedit']             = 'Diese Seite wurde in der Zwischenzeit geändert, da das Sektionsinfo veraltet ist. Die ganze Seite wird stattdessen geladen.';
+$lang['regmissing']            = 'Alle Felder müssen ausgefüllt werden';
+$lang['reguexists']            = 'Der Benutzername existiert leider schon.';
+$lang['regsuccess']            = 'Der neue Benutzer wurde angelegt und das Passwort per E-Mail versandt.';
+$lang['regsuccess2']           = 'Der neue Benutzer 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 registrieren';
+$lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
+$lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
+$lang['profnoempty']           = 'Es muss ein Name oder eine E-Mail Adresse angegeben werden.';
+$lang['profchanged']           = 'Benutzerprofil erfolgreich geändert.';
+$lang['profnodelete']          = 'Dieses Wiki unterstützt nicht das Löschen von Benutzern.';
+$lang['profdeleteuser']        = 'Benutzerprofil löschen';
+$lang['profdeleted']           = 'Dein Benutzerprofil wurde im Wiki gelöscht.';
+$lang['profconfdelete']        = 'Ich möchte mein Benutzerprofil löschen.
         Diese Aktion ist nicht umkehrbar.';
+$lang['profconfdeletemissing'] = 'Bestätigungs-Checkbox wurde nicht angehakt.';
+$lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
+$lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
+$lang['resendpwd']             = 'Neues Passwort setzen 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 nach Datei:';
+$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['maxuploadsize']         = 'Max. %s pro Datei-Upload.';
+$lang['lockedby']              = 'Momentan gesperrt von';
+$lang['lockexpire']            = 'Sperre läuft ab am';
+$lang['js']['willexpire']      = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, solltest du sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
+$lang['js']['searchmedia']     = 'Suche nach Dateien';
+$lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
+$lang['js']['hidedetails']     = 'Details ausblenden';
+$lang['js']['mediatitle']      = 'Link-Eigenschaften';
+$lang['js']['mediadisplay']    = 'Linktyp';
+$lang['js']['mediaalign']      = 'Ausrichtung';
+$lang['js']['mediasize']       = 'Bildgröße';
+$lang['js']['mediatarget']     = 'Linkziel';
+$lang['js']['mediaclose']      = 'Schließen';
+$lang['js']['mediainsert']     = 'Einfügen';
+$lang['js']['mediadisplayimg'] = 'Bild anzeigen.';
+$lang['js']['mediadisplaylnk'] = 'Nur den Link anzeigen.';
+$lang['js']['mediasmall']      = 'Kleine Version';
+$lang['js']['mediamedium']     = 'Mittelgroße Version';
+$lang['js']['medialarge']      = 'Große Version';
+$lang['js']['mediaoriginal']   = 'Original Version';
+$lang['js']['medialnk']        = 'Link zu der Detailseite';
+$lang['js']['mediadirect']     = 'Direkter Link zum Original';
+$lang['js']['medianolnk']      = 'Kein link';
+$lang['js']['medianolink']     = 'Keine Verlinkung des Bildes';
+$lang['js']['medialeft']       = 'Bild nach links ausrichten.';
+$lang['js']['mediaright']      = 'Bild nach rechts ausrichten.';
+$lang['js']['mediacenter']     = 'Bild in der Mitte ausrichten';
+$lang['js']['medianoalign']    = 'Keine Ausrichtung des Bildes.';
+$lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktioniert nur im Microsoft Internet-Explorer.\nDer 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']['restore_confirm'] = 'Wirklich diese Version wiederherstellen?';
+$lang['js']['media_diff']      = 'Unterschiede anzeigen:';
+$lang['js']['media_diff_both'] = 'Seite für Seite';
+$lang['js']['media_diff_opacity'] = 'Überblenden';
+$lang['js']['media_diff_portions'] = 'Übergang';
+$lang['js']['media_select']    = 'Dateien auswählen…';
+$lang['js']['media_upload_btn'] = 'Hochladen';
+$lang['js']['media_done_btn']  = 'Fertig';
+$lang['js']['media_drop']      = 'Dateien hier hinziehen um sie hochzuladen';
+$lang['js']['media_cancel']    = 'Entfernen';
+$lang['js']['media_overwrt']   = 'Existierende Dateien überschreiben';
+$lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
+$lang['nothingfound']          = 'Nichts gefunden.';
+$lang['mediaselect']           = 'Dateiauswahl';
+$lang['fileupload']            = 'Datei hochladen';
+$lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
+$lang['uploadfail']            = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
+$lang['uploadwrong']           = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
+$lang['uploadexist']           = 'Datei existiert bereits. Keine Änderungen vorgenommen.';
+$lang['uploadbadcontent']      = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung %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)';
+$lang['deletesucc']            = 'Die Datei "%s" wurde gelöscht.';
+$lang['deletefail']            = '"%s" konnte nicht gelöscht werden. Keine Berechtigung?.';
+$lang['mediainuse']            = 'Die Datei "%s" wurde nicht gelöscht. Sie wird noch verwendet.';
+$lang['namespaces']            = 'Namensräume';
+$lang['mediafiles']            = 'Vorhandene Dateien in';
+$lang['accessdenied']          = 'Du hast keinen Zugriff auf diese Seite';
+$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 durch Doppelpunkt getrennt voran, nachdem Du die Datei ausgewählt hast.';
+$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['difflink']              = 'Link zu der Vergleichsansicht';
+$lang['diff_type']             = 'Unterschiede anzeigen:';
+$lang['diff_inline']           = 'Inline';
+$lang['diff_side']             = 'Side by Side';
+$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 wiederhergestellt (%s)';
+$lang['external_edit']         = 'Externe Bearbeitung';
+$lang['summary']               = 'Zusammenfassung';
+$lang['noflash']               = 'Das Adobe Flash Plugin wird benötigt, um diesen Inhalt anzuzeigen.';
+$lang['download']              = 'Schnipsel herunterladen';
+$lang['tools']                 = 'Werkzeuge';
+$lang['user_tools']            = 'Benutzer-Werkzeuge';
+$lang['site_tools']            = 'Webseiten-Werkzeuge';
+$lang['page_tools']            = 'Seiten-Werkzeuge';
+$lang['skip_to_content']       = 'zum Inhalt springen';
+$lang['sidebar']               = 'Seitenleiste';
+$lang['mail_newpage']          = 'Neue Seite:';
+$lang['mail_changed']          = 'Seite geändert:';
+$lang['mail_subscribe_list']   = 'Geänderte Seiten im Namensraum:';
+$lang['mail_new_user']         = 'Neuer Benutzer:';
+$lang['mail_upload']           = 'Datei hochgeladen:';
+$lang['changes_type']          = 'Änderungen anzeigen von';
+$lang['pages_changes']         = 'Seiten';
+$lang['media_changes']         = 'Mediendateien';
+$lang['both_changes']          = 'Beides, Seiten- und Mediendateien';
+$lang['qb_bold']               = 'Fetter Text';
+$lang['qb_italic']             = 'Kursiver Text';
+$lang['qb_underl']             = 'Unterstrichener Text';
+$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 übergeordneten Namensraum';
+$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öße';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Schlagwörter';
+$lang['img_width']             = 'Breite';
+$lang['img_height']            = 'Höhe';
+$lang['img_manager']           = 'Im Medien-Manager anzeigen';
+$lang['subscr_subscribe_success'] = 'Die Seite %s wurde zur Abonnementliste von %s hinzugefügt';
+$lang['subscr_subscribe_error'] = 'Fehler beim Hinzufügen von %s zur Abonnementliste von %s';
+$lang['subscr_subscribe_noaddress'] = 'In deinem Account ist keine E-Mail-Adresse hinterlegt. Dadurch kann die Seite nicht abonniert werden';
+$lang['subscr_unsubscribe_success'] = 'Die Seite %s wurde von der Abonnementliste von %s entfernt';
+$lang['subscr_unsubscribe_error'] = 'Fehler beim Entfernen von %s von der Abonnementliste von %s';
+$lang['subscr_already_subscribed'] = '%s ist bereits auf der Abonnementliste von %s';
+$lang['subscr_not_subscribed'] = '%s ist nicht auf der Abonnementliste von %s';
+$lang['subscr_m_not_subscribed'] = 'Du hast kein Abonnement von dieser Seite oder dem Namensraum.';
+$lang['subscr_m_new_header']   = 'Abonnementen hinzufügen';
+$lang['subscr_m_current_header'] = 'Aktive Abonnements';
+$lang['subscr_m_unsubscribe']  = 'Abbestellen';
+$lang['subscr_m_subscribe']    = 'Abonnieren';
+$lang['subscr_m_receive']      = 'Erhalten';
+$lang['subscr_style_every']    = 'E-Mail bei jeder Änderung';
+$lang['subscr_style_digest']   = 'E-Mail mit zusammengefasster Übersicht der Seitenänderungen (alle %.2f Tage)';
+$lang['subscr_style_list']     = 'Auflistung aller geänderten Seiten seit der letzten E-Mail (alle %.2f Tage)';
+$lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wende dich an den Admin.';
+$lang['authpwdexpire']         = 'Dein Passwort läuft in %d Tag(en) ab. Du solltest es es frühzeitig ändern.';
+$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']           = 'Benutzername des Administrators';
+$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 Skript nur mit einer neuen bzw. nicht modifizierten 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 von Hand beheben, bevor du dein neues DokuWiki nutzen kannst.';
+$lang['i_policy']              = 'Anfangseinstellungen der Zugangskontrolle (ACL)';
+$lang['i_pol0']                = 'Offenes Wiki (lesen, schreiben und hochladen für alle Benutzer)';
+$lang['i_pol1']                = 'Öffentliches Wiki (Lesen für alle, Schreiben und Hochladen nur für registrierte Benutzer)';
+$lang['i_pol2']                = 'Geschlossenes Wiki (Lesen, Schreiben und Hochladen nur für registrierte Benutzer)';
+$lang['i_allowreg']            = 'Benutzer können sich selbst registrieren';
+$lang['i_retry']               = 'Wiederholen';
+$lang['i_license']             = 'Bitte wähle die Lizenz aus unter der die Wiki-Inhalte veröffentlicht werden sollen:';
+$lang['i_license_none']        = 'Keine Lizenzinformationen anzeigen';
+$lang['i_pop_field']           = 'Bitte helfe uns, die DokuWiki-Erfahrung zu verbessern';
+$lang['i_pop_label']           = 'Sende einmal im Monat anonyme Nutzungsdaten an die DokuWiki Entwickler';
+$lang['recent_global']         = 'Im Moment siehst du die Änderungen im Namensraum %s. Du kannst 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';
+$lang['wordblock']             = 'Deine Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).';
+$lang['media_uploadtab']       = 'Hochladen';
+$lang['media_searchtab']       = 'Suchen';
+$lang['media_file']            = 'Datei';
+$lang['media_viewtab']         = 'Anzeigen';
+$lang['media_edittab']         = 'Bearbeiten';
+$lang['media_historytab']      = 'Verlauf';
+$lang['media_list_thumbs']     = 'Medien anzeigen als Miniaturansicht';
+$lang['media_list_rows']       = 'Medien anzeigen als Listenansicht';
+$lang['media_sort_name']       = 'Sortieren nach Name';
+$lang['media_sort_date']       = 'Sortieren nach Datum';
+$lang['media_namespaces']      = 'Namensraum wählen';
+$lang['media_files']           = 'Medien im Namensraum %s.';
+$lang['media_upload']          = 'In den %s Namensraum hochladen.';
+$lang['media_search']          = 'Im Namensraum %s suchen.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s in %s';
+$lang['media_edit']            = '%s bearbeiten';
+$lang['media_history']         = 'Versionen von %s';
+$lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
+$lang['media_perm_read']       = 'Du besitzt nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
+$lang['media_perm_upload']     = 'Du besitzt nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
+$lang['media_update']          = 'Neue Version hochladen';
+$lang['media_restore']         = 'Diese Version wiederherstellen';
+$lang['currentns']             = 'Aktueller Namensraum';
+$lang['searchresult']          = 'Suchergebnis';
diff --git a/sources/inc/lang/de-informal/locked.txt b/sources/inc/lang/de-informal/locked.txt
new file mode 100644
index 0000000..1cfa089
--- /dev/null
+++ b/sources/inc/lang/de-informal/locked.txt
@@ -0,0 +1,4 @@
+====== Seite gesperrt ======
+
+Diese Seite ist momentan von einem anderen Benutzer gesperrt. Warte, bis dieser mit dem Bearbeiten fertig ist oder die Sperre abläuft.
+
diff --git a/sources/inc/lang/de-informal/login.txt b/sources/inc/lang/de-informal/login.txt
new file mode 100644
index 0000000..5c99c48
--- /dev/null
+++ b/sources/inc/lang/de-informal/login.txt
@@ -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 --git a/sources/inc/lang/de-informal/mailtext.txt b/sources/inc/lang/de-informal/mailtext.txt
new file mode 100644
index 0000000..508c080
--- /dev/null
+++ b/sources/inc/lang/de-informal/mailtext.txt
@@ -0,0 +1,18 @@
+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 wurde vom DokuWiki auf
+@DOKUWIKIURL@
+erzeugt.
diff --git a/sources/inc/lang/de-informal/mailwrap.html b/sources/inc/lang/de-informal/mailwrap.html
new file mode 100644
index 0000000..420fdf8
--- /dev/null
+++ b/sources/inc/lang/de-informal/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+    @TITLE@
+    
+
+
+
+@HTMLBODY@
+
+
        
+Diese Mail kommt vom DokuWiki auf @DOKUWIKIURL@.
+
+
diff --git a/sources/inc/lang/de-informal/newpage.txt b/sources/inc/lang/de-informal/newpage.txt
new file mode 100644
index 0000000..5e261cc
--- /dev/null
+++ b/sources/inc/lang/de-informal/newpage.txt
@@ -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 --git a/sources/inc/lang/de-informal/norev.txt b/sources/inc/lang/de-informal/norev.txt
new file mode 100644
index 0000000..c624331
--- /dev/null
+++ b/sources/inc/lang/de-informal/norev.txt
@@ -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 --git a/sources/inc/lang/de-informal/password.txt b/sources/inc/lang/de-informal/password.txt
new file mode 100644
index 0000000..e17dba4
--- /dev/null
+++ b/sources/inc/lang/de-informal/password.txt
@@ -0,0 +1,11 @@
+Hallo @FULLNAME@!
+
+Hier sind deine Benutzerdaten für @TITLE@ auf @DOKUWIKIURL@
+
+Benutzername: @LOGIN@
+Passwort    : @PASSWORD@
+
+-- 
+Diese Mail wurde vom DokuWiki auf
+@DOKUWIKIURL@
+erzeugt.
\ No newline at end of file
diff --git a/sources/inc/lang/de-informal/preview.txt b/sources/inc/lang/de-informal/preview.txt
new file mode 100644
index 0000000..d3a578f
--- /dev/null
+++ b/sources/inc/lang/de-informal/preview.txt
@@ -0,0 +1,5 @@
+====== Vorschau ======
+
+So wird dein Text später aussehen. Achtung: Der Text wurde noch **nicht gespeichert**!
+
+
diff --git a/sources/inc/lang/de-informal/pwconfirm.txt b/sources/inc/lang/de-informal/pwconfirm.txt
new file mode 100644
index 0000000..9029bf1
--- /dev/null
+++ b/sources/inc/lang/de-informal/pwconfirm.txt
@@ -0,0 +1,17 @@
+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 wurde vom DokuWiki auf
+@DOKUWIKIURL@
+erzeugt.
diff --git a/sources/inc/lang/de-informal/read.txt b/sources/inc/lang/de-informal/read.txt
new file mode 100644
index 0000000..1c5422a
--- /dev/null
+++ b/sources/inc/lang/de-informal/read.txt
@@ -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 --git a/sources/inc/lang/de-informal/recent.txt b/sources/inc/lang/de-informal/recent.txt
new file mode 100644
index 0000000..c05bbae
--- /dev/null
+++ b/sources/inc/lang/de-informal/recent.txt
@@ -0,0 +1,5 @@
+====== Letzte Änderungen ======
+
+Die folgenden Seiten wurden zuletzt geändert.
+
+
diff --git a/sources/inc/lang/de-informal/register.txt b/sources/inc/lang/de-informal/register.txt
new file mode 100644
index 0000000..f6bf6ed
--- /dev/null
+++ b/sources/inc/lang/de-informal/register.txt
@@ -0,0 +1,4 @@
+====== Als neuer Benutzer registrieren ======
+
+Bitte fülle alle Felder aus, um einen neuen Benutzer-Account in diesem Wiki anzulegen. Stelle sicher, dass eine **gültige E-Mail-Adresse** angegeben wird - das Passwort wird an diese Adresse gesendet. Der Benutzername sollte aus einem Wort ohne Umlaute, Leer- oder Sonderzeichen bestehen.
+
diff --git a/sources/inc/lang/de-informal/registermail.txt b/sources/inc/lang/de-informal/registermail.txt
new file mode 100644
index 0000000..ed37a95
--- /dev/null
+++ b/sources/inc/lang/de-informal/registermail.txt
@@ -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 --git a/sources/inc/lang/de-informal/resendpwd.txt b/sources/inc/lang/de-informal/resendpwd.txt
new file mode 100644
index 0000000..a0a7142
--- /dev/null
+++ b/sources/inc/lang/de-informal/resendpwd.txt
@@ -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 muss deinem Wiki-Benutzernamen entsprechen.
diff --git a/sources/inc/lang/de-informal/resetpwd.txt b/sources/inc/lang/de-informal/resetpwd.txt
new file mode 100644
index 0000000..8423bd8
--- /dev/null
+++ b/sources/inc/lang/de-informal/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Neues Passwort setzen  ======
+
+Bitte gib ein neues Passwort für deinen Wiki-Zugang ein.
+
diff --git a/sources/inc/lang/de-informal/revisions.txt b/sources/inc/lang/de-informal/revisions.txt
new file mode 100644
index 0000000..b69169a
--- /dev/null
+++ b/sources/inc/lang/de-informal/revisions.txt
@@ -0,0 +1,4 @@
+====== Ältere Versionen ======
+
+Dies sind ältere Versionen der gewählten Seite. Um zu einer älteren Version zurückzukehren, wähle die entsprechende Version aus, klicke auf **''[Diese Seite bearbeiten]''** und speichere sie erneut ab.
+
diff --git a/sources/inc/lang/de-informal/searchpage.txt b/sources/inc/lang/de-informal/searchpage.txt
new file mode 100644
index 0000000..72c57b7
--- /dev/null
+++ b/sources/inc/lang/de-informal/searchpage.txt
@@ -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 --git a/sources/inc/lang/de-informal/showrev.txt b/sources/inc/lang/de-informal/showrev.txt
new file mode 100644
index 0000000..65f53c9
--- /dev/null
+++ b/sources/inc/lang/de-informal/showrev.txt
@@ -0,0 +1,2 @@
+**Dies ist eine alte Version des Dokuments!**
+----
diff --git a/sources/inc/lang/de-informal/stopwords.txt b/sources/inc/lang/de-informal/stopwords.txt
new file mode 100644
index 0000000..443b177
--- /dev/null
+++ b/sources/inc/lang/de-informal/stopwords.txt
@@ -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 --git a/sources/inc/lang/de-informal/subscr_digest.txt b/sources/inc/lang/de-informal/subscr_digest.txt
new file mode 100644
index 0000000..f8cab21
--- /dev/null
+++ b/sources/inc/lang/de-informal/subscr_digest.txt
@@ -0,0 +1,21 @@
+Hallo!
+
+Die Seite @PAGE@ im @TITLE@ Wiki wurde bearbeitet.
+Üersicht der Änderungen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Alte Revision: @OLDPAGE@
+Neue Revision: @NEWPAGE@
+
+Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an
+@DOKUWIKIURL@, besuchen dann
+@SUBSCRIBE@
+und klicke auf den Link 'Aboverwaltung'.
+
+--
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
+
diff --git a/sources/inc/lang/de-informal/subscr_form.txt b/sources/inc/lang/de-informal/subscr_form.txt
new file mode 100644
index 0000000..7bf74f2
--- /dev/null
+++ b/sources/inc/lang/de-informal/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Abonnementverwaltung ======
+
+Hier kannst du deine Abonnements für die aktuelle Seite oder den aktuellen [[doku>Namespaces|Namespace]] verwalten.
diff --git a/sources/inc/lang/de-informal/subscr_list.txt b/sources/inc/lang/de-informal/subscr_list.txt
new file mode 100644
index 0000000..5f99cf9
--- /dev/null
+++ b/sources/inc/lang/de-informal/subscr_list.txt
@@ -0,0 +1,17 @@
+Hallo!
+
+Die Seiten im Namensraum @PAGE@ im @TITLE@ wurden geändert.
+Nachfolgenden findest du die geänderten Seiten:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Um die Benachrichtigungen zu deaktivieren, melde dich am Wiki unter 
+@DOKUWIKIURL@ an, gehe zur Seite 
+@SUBSCRIBE@
+und deaktiviere das Abonnement für die Seite und/oder den Namensraum.
+
+--
+Diese E-Mail wurde erzeugt vom DokuWiki unter
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/de-informal/subscr_single.txt b/sources/inc/lang/de-informal/subscr_single.txt
new file mode 100644
index 0000000..6e3f58b
--- /dev/null
+++ b/sources/inc/lang/de-informal/subscr_single.txt
@@ -0,0 +1,24 @@
+Hallo!
+
+Die Seite @PAGE@ im @TITLE@ Wiki wurde bearbeitet.
+Übersicht der Änderungen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum: @DATE@
+Benutzer: @USER@
+Zusammenfassung: @SUMMARY@
+Alte Revision: @OLDPAGE@
+Neue Revision: @NEWPAGE@
+
+Um das Abonnement für diese Seite aufzulösen, melde dich im Wiki an
+@DOKUWIKIURL@, besuche dann
+@SUBSCRIBE@
+und klicke auf den Link 'Aboverwaltung'.
+
+--
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
+
diff --git a/sources/inc/lang/de-informal/updateprofile.txt b/sources/inc/lang/de-informal/updateprofile.txt
new file mode 100644
index 0000000..66c2e82
--- /dev/null
+++ b/sources/inc/lang/de-informal/updateprofile.txt
@@ -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 --git a/sources/inc/lang/de-informal/uploadmail.txt b/sources/inc/lang/de-informal/uploadmail.txt
new file mode 100644
index 0000000..69f1140
--- /dev/null
+++ b/sources/inc/lang/de-informal/uploadmail.txt
@@ -0,0 +1,16 @@
+Eine Datei wurde in deinem Wiki hochgeladen. Hier sind die Details:
+
+Datei       : @MEDIA@
+Alte Version: @OLD@
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adresse  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Größe       : @SIZE@
+MIME-Typ    : @MIME@
+Benutzer    : @USER@
+
+-- 
+Diese Mail wurde vom DokuWiki auf
+@DOKUWIKIURL@
+erzeugt.
diff --git a/sources/inc/lang/de/admin.txt b/sources/inc/lang/de/admin.txt
new file mode 100644
index 0000000..f079f7e
--- /dev/null
+++ b/sources/inc/lang/de/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Folgende administrative Aufgaben stehen in DokuWiki zur Verfügung:
+
diff --git a/sources/inc/lang/de/adminplugins.txt b/sources/inc/lang/de/adminplugins.txt
new file mode 100644
index 0000000..d3bfd09
--- /dev/null
+++ b/sources/inc/lang/de/adminplugins.txt
@@ -0,0 +1 @@
+===== Weitere Plugins =====
\ No newline at end of file
diff --git a/sources/inc/lang/de/backlinks.txt b/sources/inc/lang/de/backlinks.txt
new file mode 100644
index 0000000..1ffa815
--- /dev/null
+++ b/sources/inc/lang/de/backlinks.txt
@@ -0,0 +1,5 @@
+====== Links hierher ======
+
+Dies ist eine Liste der Seiten, welche zurück zur momentanen Seite verlinken.
+
+
diff --git a/sources/inc/lang/de/conflict.txt b/sources/inc/lang/de/conflict.txt
new file mode 100644
index 0000000..d24e5b1
--- /dev/null
+++ b/sources/inc/lang/de/conflict.txt
@@ -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ählen Sie  **''[Speichern]''** zum Sichern Ihrer Version oder **''[Abbrechen]''**,  um Ihre Version zu verwerfen und die zuerst gespeicherte Seite zu behalten.
+
diff --git a/sources/inc/lang/de/denied.txt b/sources/inc/lang/de/denied.txt
new file mode 100644
index 0000000..8efa81f
--- /dev/null
+++ b/sources/inc/lang/de/denied.txt
@@ -0,0 +1,4 @@
+====== Zugang verweigert ======
+
+Sie haben nicht die erforderliche Berechtigung, um diese Aktion durchzuführen. Eventuell sind Sie nicht am Wiki angemeldet?
+
diff --git a/sources/inc/lang/de/diff.txt b/sources/inc/lang/de/diff.txt
new file mode 100644
index 0000000..82fbbc2
--- /dev/null
+++ b/sources/inc/lang/de/diff.txt
@@ -0,0 +1,5 @@
+====== Unterschiede ======
+
+Hier werden die Unterschiede zwischen zwei Versionen gezeigt.
+
+
diff --git a/sources/inc/lang/de/draft.txt b/sources/inc/lang/de/draft.txt
new file mode 100644
index 0000000..77a55b1
--- /dev/null
+++ b/sources/inc/lang/de/draft.txt
@@ -0,0 +1,6 @@
+====== Entwurf gefunden ======
+
+Ihre letzte Bearbeitungssitzung wurde nicht ordnungsgemäß abgeschlossen. DokuWiki hat während Ihrer Arbeit automatisch einen Zwischenentwurf gespeichert, den Sie jetzt nutzen können, um Ihre Arbeit fortzusetzen. Unten sehen Sie die Daten, die bei Ihrer letzten Sitzung gespeichert wurden.
+
+Bitte entscheiden Sie, ob Sie den Entwurf //wiederherstellen// oder //löschen// wollen oder ob Sie die Bearbeitung abbrechen möchten.
+
diff --git a/sources/inc/lang/de/edit.txt b/sources/inc/lang/de/edit.txt
new file mode 100644
index 0000000..15e02c6
--- /dev/null
+++ b/sources/inc/lang/de/edit.txt
@@ -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 --git a/sources/inc/lang/de/editrev.txt b/sources/inc/lang/de/editrev.txt
new file mode 100644
index 0000000..6c1f642
--- /dev/null
+++ b/sources/inc/lang/de/editrev.txt
@@ -0,0 +1,2 @@
+**Eine ältere Version des Dokuments wurde geladen!** Beim Speichern wird eine neue Version des Dokuments mit diesem Inhalt erstellt.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/de/index.txt b/sources/inc/lang/de/index.txt
new file mode 100644
index 0000000..fa8dc46
--- /dev/null
+++ b/sources/inc/lang/de/index.txt
@@ -0,0 +1,4 @@
+====== Übersicht ======
+
+Dies ist eine Übersicht über alle vorhandenen Seiten und [[doku>namespaces|Namensräume]].
+
diff --git a/sources/inc/lang/de/install.html b/sources/inc/lang/de/install.html
new file mode 100644
index 0000000..47dcdf6
--- /dev/null
+++ b/sources/inc/lang/de/install.html
@@ -0,0 +1,27 @@
+
        Diese Seite hilft Ihnen bei der Erstinstallation und Konfiguration von
+DokuWiki. Zusätzliche Informationen zu
+diesem Installationsskript finden Sie 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 Sie setzen. Sie müssen dies
+manuell auf einer Kommando-Shell oder, falls Sie DokuWiki bei einem Fremdanbieter
+hosten, über FTP oder ein entsprechendes Werkzeug (z.B. cPanel) durchführen.
        
+
+
        Dieses Skript hilft Ihnen beim ersten Einrichten des Zugangsschutzes
+(ACL) von DokuWiki, welcher eine
+Administratoranmeldung und damit Zugang zum Administrationsmenu ermöglicht.
+Dort können Sie dann weitere Tätigkeiten wie das Installieren von Plugins, dass
+Verwalten von Benutzern 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 Benutzer mit speziellen Konfigurationsbedürfnissen sollten
+die folgenden Links nutzen, um sich über
+Installation
+und Konfiguration zu
+informieren.
        
+
diff --git a/sources/inc/lang/de/lang.php b/sources/inc/lang/de/lang.php
new file mode 100644
index 0000000..9df1035
--- /dev/null
+++ b/sources/inc/lang/de/lang.php
@@ -0,0 +1,347 @@
+
+ * @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 Dirk Einecke 
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider 
+ * @author Niels Lange 
+ * @author Christian Wichmann 
+ * @author Matthias Schulte 
+ * @author Paul Lachewsky 
+ * @author Pierre Corell 
+ * @author Mateng Schimmerlos 
+ * @author Benedikt Fey 
+ */
+$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']         = 'Aboverwaltung';
+$lang['btn_profile']           = 'Benutzerprofil';
+$lang['btn_reset']             = 'Zurücksetzen';
+$lang['btn_resendpwd']         = 'Setze neues Passwort';
+$lang['btn_draft']             = 'Entwurf bearbeiten';
+$lang['btn_recover']           = 'Entwurf wiederherstellen';
+$lang['btn_draftdel']          = 'Entwurf löschen';
+$lang['btn_revert']            = 'Wiederherstellen';
+$lang['btn_register']          = 'Registrieren';
+$lang['btn_apply']             = 'Übernehmen';
+$lang['btn_media']             = 'Medien-Manager';
+$lang['btn_deleteuser']        = 'Benutzerprofil löschen';
+$lang['loggedinas']            = 'Angemeldet als';
+$lang['user']                  = 'Benutzername';
+$lang['pass']                  = 'Passwort';
+$lang['newpass']               = 'Neues Passwort';
+$lang['oldpass']               = 'Bestätigen (Altes Passwort)';
+$lang['passchk']               = 'Passwort erneut eingeben';
+$lang['remember']              = 'Angemeldet bleiben';
+$lang['fullname']              = 'Voller Name';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'Benutzerprofil';
+$lang['badlogin']              = 'Benutzername oder Passwort sind falsch.';
+$lang['badpassconfirm']        = 'Das Passwort war 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 Benutzername existiert leider schon.';
+$lang['regsuccess']            = 'Der neue Benutzer wurde angelegt und das Passwort per E-Mail versandt.';
+$lang['regsuccess2']           = 'Der neue Benutzer wurde angelegt.';
+$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 registrieren';
+$lang['profna']                = 'Änderung des Benutzerprofils in diesem Wiki nicht möglich.';
+$lang['profnochange']          = 'Keine Änderungen, nichts zu tun.';
+$lang['profnoempty']           = 'Es muss ein Name und eine E-Mail-Adresse angegeben werden.';
+$lang['profchanged']           = 'Benutzerprofil erfolgreich geändert.';
+$lang['profnodelete']          = 'Dieses Wiki unterstützt nicht das Löschen von Benutzern.';
+$lang['profdeleteuser']        = 'Benutzerprofil löschen';
+$lang['profdeleted']           = 'Ihr Benutzerprofil wurde im Wiki gelöscht.';
+$lang['profconfdelete']        = 'Ich möchte mein Benutzerprofil löschen.
         Diese Aktion ist nicht umkehrbar.';
+$lang['profconfdeletemissing'] = 'Bestätigungs-Checkbox wurde nicht angehakt.';
+$lang['pwdforget']             = 'Passwort vergessen? Fordere ein neues an';
+$lang['resendna']              = 'Passwörter versenden ist in diesem Wiki nicht möglich.';
+$lang['resendpwd']             = 'Neues Passwort setzen für';
+$lang['resendpwdmissing']      = 'Es tut mir leid, aber Sie müssen 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. 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['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';
+$lang['maxuploadsize']         = 'Max. %s pro Datei-Upload.';
+$lang['lockedby']              = 'Momentan gesperrt von';
+$lang['lockexpire']            = 'Sperre läuft ab am';
+$lang['js']['willexpire']      = 'Die Sperre zur Bearbeitung dieser Seite läuft in einer Minute ab.\nUm Bearbeitungskonflikte zu vermeiden, sollten Sie sie durch einen Klick auf den Vorschau-Knopf verlängern.';
+$lang['js']['notsavedyet']     = 'Nicht gespeicherte Änderungen gehen verloren!';
+$lang['js']['searchmedia']     = 'Suche Dateien';
+$lang['js']['keepopen']        = 'Fenster nach Auswahl nicht schließen';
+$lang['js']['hidedetails']     = 'Details ausblenden';
+$lang['js']['mediatitle']      = 'Linkeinstellungen';
+$lang['js']['mediadisplay']    = 'Linktyp';
+$lang['js']['mediaalign']      = 'Anordnung';
+$lang['js']['mediasize']       = 'Bildgröße';
+$lang['js']['mediatarget']     = 'Linkziel';
+$lang['js']['mediaclose']      = 'Schließen';
+$lang['js']['mediainsert']     = 'Einfügen';
+$lang['js']['mediadisplayimg'] = 'Bild anzeigen.';
+$lang['js']['mediadisplaylnk'] = 'Nur den Link anzeigen.';
+$lang['js']['mediasmall']      = 'Kleine Version';
+$lang['js']['mediamedium']     = 'Mittlere Version';
+$lang['js']['medialarge']      = 'Große Version';
+$lang['js']['mediaoriginal']   = 'Originalversion';
+$lang['js']['medialnk']        = 'Link zur Detailseite';
+$lang['js']['mediadirect']     = 'Direktlink zum Original';
+$lang['js']['medianolnk']      = 'Kein Link';
+$lang['js']['medianolink']     = 'Bild nicht verlinken';
+$lang['js']['medialeft']       = 'Das Bild links anordnen.';
+$lang['js']['mediaright']      = 'Das Bild rechts anordnen.';
+$lang['js']['mediacenter']     = 'Das Bild in der Mitte anordnen.';
+$lang['js']['medianoalign']    = 'Keine Anordnung benutzen.';
+$lang['js']['nosmblinks']      = 'Das Verlinken von Windows-Freigaben funktioniert nur im Microsoft Internet Explorer.\nDer 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']['restore_confirm'] = 'Wirklich diese Version wiederherstellen?';
+$lang['js']['media_diff']      = 'Unterschiede anzeigen:';
+$lang['js']['media_diff_both'] = 'Side by Side';
+$lang['js']['media_diff_opacity'] = 'Überblenden';
+$lang['js']['media_diff_portions'] = 'Übergang';
+$lang['js']['media_select']    = 'Dateien auswählen…';
+$lang['js']['media_upload_btn'] = 'Hochladen';
+$lang['js']['media_done_btn']  = 'Fertig';
+$lang['js']['media_drop']      = 'Dateien hier hinziehen um sie hochzuladen';
+$lang['js']['media_cancel']    = 'Entfernen';
+$lang['js']['media_overwrt']   = 'Existierende Dateien überschreiben';
+$lang['rssfailed']             = 'Es ist ein Fehler beim Laden des Feeds aufgetreten: ';
+$lang['nothingfound']          = 'Nichts gefunden.';
+$lang['mediaselect']           = 'Dateiauswahl';
+$lang['fileupload']            = 'Datei hochladen';
+$lang['uploadsucc']            = 'Datei wurde erfolgreich hochgeladen';
+$lang['uploadfail']            = 'Hochladen fehlgeschlagen. Keine Berechtigung?';
+$lang['uploadwrong']           = 'Hochladen verweigert. Diese Dateiendung ist nicht erlaubt.';
+$lang['uploadexist']           = 'Datei existiert bereits. Keine Änderungen vorgenommen.';
+$lang['uploadbadcontent']      = 'Die hochgeladenen Daten stimmen nicht mit der Dateiendung %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)';
+$lang['deletesucc']            = 'Die Datei "%s" wurde gelöscht.';
+$lang['deletefail']            = '"%s" konnte nicht gelöscht werden - prüfen Sie 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['accessdenied']          = 'Es ist Ihnen nicht gestattet, diese Seite zu sehen.';
+$lang['mediausage']            = 'Syntax zum Verwenden dieser Datei:';
+$lang['mediaview']             = 'Originaldatei öffnen';
+$lang['mediaroot']             = 'Wurzel';
+$lang['mediaupload']           = 'Laden Sie hier eine Datei in den momentanen Namensraum hoch. Um Unterordner zu erstellen, stellen Sie diese dem Dateinamen durch Doppelpunkt getrennt voran, nachdem Sie die Datei ausgewählt haben.';
+$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 Sie keine Leseberechtigung haben.';
+$lang['hits']                  = 'Treffer';
+$lang['quickhits']             = 'Passende Seitennamen';
+$lang['toc']                   = 'Inhaltsverzeichnis';
+$lang['current']               = 'aktuell';
+$lang['yours']                 = 'Ihre Version';
+$lang['diff']                  = 'Zeige Unterschiede zu aktueller Version';
+$lang['diff2']                 = 'Zeige Unterschiede der ausgewählten Versionen';
+$lang['difflink']              = 'Link zu dieser Vergleichsansicht';
+$lang['diff_type']             = 'Unterschiede anzeigen:';
+$lang['diff_inline']           = 'Inline';
+$lang['diff_side']             = 'Side by Side';
+$lang['line']                  = 'Zeile';
+$lang['breadcrumb']            = 'Zuletzt angesehen';
+$lang['youarehere']            = 'Sie befinden sich hier';
+$lang['lastmod']               = 'Zuletzt geändert';
+$lang['by']                    = 'von';
+$lang['deleted']               = 'gelöscht';
+$lang['created']               = 'angelegt';
+$lang['restored']              = 'alte Version wieder hergestellt (%s)';
+$lang['external_edit']         = 'Externe Bearbeitung';
+$lang['summary']               = 'Zusammenfassung';
+$lang['noflash']               = 'Das Adobe Flash Plugin wird benötigt, um diesen Inhalt anzuzeigen.';
+$lang['download']              = 'Schnipsel herunterladen';
+$lang['tools']                 = 'Werkzeuge';
+$lang['user_tools']            = 'Benutzer-Werkzeuge';
+$lang['site_tools']            = 'Webseiten-Werkzeuge';
+$lang['page_tools']            = 'Seiten-Werkzeuge';
+$lang['skip_to_content']       = 'zum Inhalt springen';
+$lang['sidebar']               = 'Seitenleiste';
+$lang['mail_newpage']          = 'Neue Seite:';
+$lang['mail_changed']          = 'Seite geändert:';
+$lang['mail_subscribe_list']   = 'Geänderte Seiten im Namensraum:';
+$lang['mail_new_user']         = 'Neuer Benutzer:';
+$lang['mail_upload']           = 'Datei hochgeladen:';
+$lang['changes_type']          = 'Änderungen anzeigen von';
+$lang['pages_changes']         = 'Seiten';
+$lang['media_changes']         = 'Mediendateien';
+$lang['both_changes']          = 'Beides, Seiten- und Mediendateien';
+$lang['qb_bold']               = 'Fetter Text';
+$lang['qb_italic']             = 'Kursiver Text';
+$lang['qb_underl']             = 'Unterstrichener Text';
+$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 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';
+$lang['qb_ol']                 = 'Nummerierter Listenpunkt';
+$lang['qb_ul']                 = 'Listenpunkt';
+$lang['qb_media']              = 'Bilder und andere Dateien hinzufügen (öffnet sich in einem neuen Fenster)';
+$lang['qb_sig']                = 'Unterschrift einfügen';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Sonderzeichen';
+$lang['upperns']               = 'zum übergeordneten Namensraum springen';
+$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öße';
+$lang['img_artist']            = 'FotografIn';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Schlagwörter';
+$lang['img_width']             = 'Breite';
+$lang['img_height']            = 'Höhe';
+$lang['img_manager']           = 'Im Medien-Manager anzeigen';
+$lang['subscr_subscribe_success'] = '%s hat nun Änderungen der Seite %s abonniert';
+$lang['subscr_subscribe_error'] = '%s kann die Änderungen der Seite %s nicht abonnieren';
+$lang['subscr_subscribe_noaddress'] = 'Weil Ihre E-Mail-Adresse fehlt, können Sie das Thema nicht abonnieren';
+$lang['subscr_unsubscribe_success'] = 'Das Abonnement von %s für die Seite %s wurde aufgelöst';
+$lang['subscr_unsubscribe_error'] = 'Das Abonnement von %s für die Seite %s konnte nicht aufgelöst werden';
+$lang['subscr_already_subscribed'] = '%s hat %s bereits abonniert';
+$lang['subscr_not_subscribed'] = '%s hat %s nicht abonniert';
+$lang['subscr_m_not_subscribed'] = 'Sie haben die aktuelle Seite und ihre Namensräume nicht abonniert.';
+$lang['subscr_m_new_header']   = 'Abonnement hinzufügen';
+$lang['subscr_m_current_header'] = 'Aktuelle Abonnements';
+$lang['subscr_m_unsubscribe']  = 'Löschen';
+$lang['subscr_m_subscribe']    = 'Abonnieren';
+$lang['subscr_m_receive']      = 'Benachrichtigung';
+$lang['subscr_style_every']    = 'E-Mail bei jeder Bearbeitung';
+$lang['subscr_style_digest']   = 'Zusammenfassung der Änderungen für jede veränderte Seite (Alle %.2f Tage)';
+$lang['subscr_style_list']     = 'Liste der geänderten Seiten (Alle %.2f Tage)';
+$lang['authtempfail']          = 'Benutzerüberprüfung momentan nicht möglich. Falls das Problem andauert, wenden Sie sich an den Admin.';
+$lang['authpwdexpire']         = 'Ihr Passwort läuft in %d Tag(en) ab. Sie sollten es frühzeitig ändern.';
+$lang['i_chooselang']          = 'Wählen Sie Ihre Sprache';
+$lang['i_installer']           = 'DokuWiki Installation';
+$lang['i_wikiname']            = 'Wiki-Name';
+$lang['i_enableacl']           = 'Zugangskontrolle (ACL) aktivieren (empfohlen)';
+$lang['i_superuser']           = 'Benutzername des Administrators';
+$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 Skript nur mit einer neuen bzw. nicht modifizierten 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_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_failure']             = 'Es sind Fehler beim Schreiben der Konfigurationsdateien aufgetreten. Sie müssen diese von Hand beheben, bevor Sie Ihr neues DokuWiki nutzen können.';
+$lang['i_policy']              = 'Anfangseinstellungen der Zugangskontrolle (ACL)';
+$lang['i_pol0']                = 'Offenes Wiki (lesen, schreiben und hochladen für alle Benutzer)';
+$lang['i_pol1']                = 'Öffentliches Wiki (Lesen für alle, Schreiben und Hochladen nur für registrierte Benutzer)';
+$lang['i_pol2']                = 'Geschlossenes Wiki (Lesen, Schreiben und Hochladen nur für registrierte Benutzer)';
+$lang['i_allowreg']            = 'Benutzer dürfen sich registrieren';
+$lang['i_retry']               = 'Wiederholen';
+$lang['i_license']             = 'Bitte wählen Sie die Lizenz, unter die Sie Ihre Inhalte stellen möchten:';
+$lang['i_license_none']        = 'Lizensierungsinformation nicht anzeigen';
+$lang['i_pop_field']           = 'Bitte helfen Sie mit, DokuWiki zu verbessern:';
+$lang['i_pop_label']           = 'Einmal monatlich anonymisierte Nutzungsdaten an das DokuWiki-Entwicklerteam senden';
+$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';
+$lang['wordblock']             = 'Ihre Bearbeitung wurde nicht gespeichert, da sie gesperrten Text enthielt (Spam).';
+$lang['media_uploadtab']       = 'Hochladen';
+$lang['media_searchtab']       = 'Suchen';
+$lang['media_file']            = 'Datei';
+$lang['media_viewtab']         = 'Anzeigen';
+$lang['media_edittab']         = 'Bearbeiten';
+$lang['media_historytab']      = 'Verlauf';
+$lang['media_list_thumbs']     = 'Vorschaubilder';
+$lang['media_list_rows']       = 'Reihen';
+$lang['media_sort_name']       = 'nach Name';
+$lang['media_sort_date']       = 'nach Datum';
+$lang['media_namespaces']      = 'Namensraum wählen';
+$lang['media_files']           = 'Dateien in %s';
+$lang['media_upload']          = 'In den %s Namensraum hochladen.';
+$lang['media_search']          = 'Im Namensraum %s suchen.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s in %s';
+$lang['media_edit']            = '%s bearbeiten';
+$lang['media_history']         = 'Versionsverlauf von %s.';
+$lang['media_meta_edited']     = 'Meta-Informationen bearbeitet';
+$lang['media_perm_read']       = 'Sie besitzen nicht die notwendigen Berechtigungen um die Datei anzuzeigen.';
+$lang['media_perm_upload']     = 'Sie besitzen nicht die notwendigen Berechtigungen um Dateien hochzuladen.';
+$lang['media_update']          = 'Neue Version hochladen';
+$lang['media_restore']         = 'Diese Version wiederherstellen';
+$lang['currentns']             = 'Aktueller Namensraum';
+$lang['searchresult']          = 'Suchergebnisse';
+$lang['plainhtml']             = 'HTML Klartext';
diff --git a/sources/inc/lang/de/locked.txt b/sources/inc/lang/de/locked.txt
new file mode 100644
index 0000000..97323ca
--- /dev/null
+++ b/sources/inc/lang/de/locked.txt
@@ -0,0 +1,4 @@
+====== Seite gesperrt ======
+
+Diese Seite ist momentan von einem anderen Benutzer gesperrt. Warten Sie, bis dieser mit dem Bearbeiten fertig ist oder die Sperre abläuft.
+
diff --git a/sources/inc/lang/de/login.txt b/sources/inc/lang/de/login.txt
new file mode 100644
index 0000000..6698da6
--- /dev/null
+++ b/sources/inc/lang/de/login.txt
@@ -0,0 +1,4 @@
+====== Anmelden ======
+
+Geben Sie Ihren Benutzernamen und Ihr Passwort in das Formular unten ein, um sich anzumelden. Bitte beachten Sie, dass dafür "Cookies" in den Sicherheitseinstellungen Ihres Browsers erlaubt sein müssen.
+
diff --git a/sources/inc/lang/de/mailtext.txt b/sources/inc/lang/de/mailtext.txt
new file mode 100644
index 0000000..fee88d4
--- /dev/null
+++ b/sources/inc/lang/de/mailtext.txt
@@ -0,0 +1,17 @@
+Eine Seite in Ihrem 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 --git a/sources/inc/lang/de/mailwrap.html b/sources/inc/lang/de/mailwrap.html
new file mode 100644
index 0000000..420fdf8
--- /dev/null
+++ b/sources/inc/lang/de/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+    @TITLE@
+    
+
+
+
+@HTMLBODY@
+
+
        
+Diese Mail kommt vom DokuWiki auf @DOKUWIKIURL@.
+
+
diff --git a/sources/inc/lang/de/newpage.txt b/sources/inc/lang/de/newpage.txt
new file mode 100644
index 0000000..7871c67
--- /dev/null
+++ b/sources/inc/lang/de/newpage.txt
@@ -0,0 +1,5 @@
+====== 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 --git a/sources/inc/lang/de/norev.txt b/sources/inc/lang/de/norev.txt
new file mode 100644
index 0000000..8a9c692
--- /dev/null
+++ b/sources/inc/lang/de/norev.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/de/password.txt b/sources/inc/lang/de/password.txt
new file mode 100644
index 0000000..cce3b8e
--- /dev/null
+++ b/sources/inc/lang/de/password.txt
@@ -0,0 +1,10 @@
+Hallo @FULLNAME@!
+
+Hier sind Ihre Benutzerdaten für @TITLE@ auf @DOKUWIKIURL@
+
+Benutzername: @LOGIN@
+Passwort    : @PASSWORD@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/de/preview.txt b/sources/inc/lang/de/preview.txt
new file mode 100644
index 0000000..b07ae50
--- /dev/null
+++ b/sources/inc/lang/de/preview.txt
@@ -0,0 +1,5 @@
+====== Vorschau ======
+
+So wird Ihr Text später aussehen. Achtung: Der Text wurde noch **nicht gespeichert**!
+
+
diff --git a/sources/inc/lang/de/pwconfirm.txt b/sources/inc/lang/de/pwconfirm.txt
new file mode 100644
index 0000000..3aa81bf
--- /dev/null
+++ b/sources/inc/lang/de/pwconfirm.txt
@@ -0,0 +1,16 @@
+Hallo @FULLNAME@!
+
+Jemand hat ein neues Passwort für Ihren @TITLE@
+login auf @DOKUWIKIURL@ angefordert.
+
+Wenn Sie diese Änderung nicht angefordert haben, ignorieren Sie diese
+E-Mail einfach.
+
+Um die Anforderung zu bestätigen, folgen Sie bitte dem unten angegebenen
+Bestätigungslink.
+
+@CONFIRM@
+
+-- 
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/de/read.txt b/sources/inc/lang/de/read.txt
new file mode 100644
index 0000000..bc011d0
--- /dev/null
+++ b/sources/inc/lang/de/read.txt
@@ -0,0 +1,2 @@
+Diese Seite ist nicht editierbar. Sie können den Quelltext sehen, jedoch nicht verändern. Kontaktieren Sie den Administrator, wenn Sie glauben, dass hier ein Fehler vorliegt.
+
diff --git a/sources/inc/lang/de/recent.txt b/sources/inc/lang/de/recent.txt
new file mode 100644
index 0000000..c05bbae
--- /dev/null
+++ b/sources/inc/lang/de/recent.txt
@@ -0,0 +1,5 @@
+====== Letzte Änderungen ======
+
+Die folgenden Seiten wurden zuletzt geändert.
+
+
diff --git a/sources/inc/lang/de/register.txt b/sources/inc/lang/de/register.txt
new file mode 100644
index 0000000..f1ea30a
--- /dev/null
+++ b/sources/inc/lang/de/register.txt
@@ -0,0 +1,4 @@
+====== Als neuer Benutzer registrieren ======
+
+Bitte füllen Sie alle Felder aus, um einen neuen Benutzer-Account in diesem Wiki anzulegen. Stellen Sie sicher, dass eine **gültige E-Mail-Adresse** angegeben wird - das Passwort wird an diese Adresse gesendet. Der Benutzername sollte aus einem Wort ohne Umlaute, Leer- oder Sonderzeichen bestehen.
+
diff --git a/sources/inc/lang/de/registermail.txt b/sources/inc/lang/de/registermail.txt
new file mode 100644
index 0000000..ed37a95
--- /dev/null
+++ b/sources/inc/lang/de/registermail.txt
@@ -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 --git a/sources/inc/lang/de/resendpwd.txt b/sources/inc/lang/de/resendpwd.txt
new file mode 100644
index 0000000..a63fd5d
--- /dev/null
+++ b/sources/inc/lang/de/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Neues Passwort anfordern ======
+
+Füllen Sie alle Felder unten aus, um ein neues Passwort für Ihren Zugang zu erhalten. Das neue Passwort wird an Ihre gespeicherte E-Mail-Adresse geschickt. Der Benutzername muss Ihrem Wiki-Benutzernamen entsprechen.
diff --git a/sources/inc/lang/de/resetpwd.txt b/sources/inc/lang/de/resetpwd.txt
new file mode 100644
index 0000000..a0a55c6
--- /dev/null
+++ b/sources/inc/lang/de/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Neues Passwort setzen  ======
+
+Bitte geben Sie ein neues Passwort für Ihren Wiki-Zugang ein.
+
diff --git a/sources/inc/lang/de/revisions.txt b/sources/inc/lang/de/revisions.txt
new file mode 100644
index 0000000..843c3f9
--- /dev/null
+++ b/sources/inc/lang/de/revisions.txt
@@ -0,0 +1,4 @@
+====== Ältere Versionen ======
+
+Dies sind ältere Versionen der gewählten Seite. Um zu einer älteren Version zurückzukehren, wählen Sie die entsprechende Version aus, klicken auf **''[Diese Seite bearbeiten]''** und speichern Sie diese erneut ab.
+
diff --git a/sources/inc/lang/de/searchpage.txt b/sources/inc/lang/de/searchpage.txt
new file mode 100644
index 0000000..5610455
--- /dev/null
+++ b/sources/inc/lang/de/searchpage.txt
@@ -0,0 +1,7 @@
+====== 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 =====
+
+
diff --git a/sources/inc/lang/de/showrev.txt b/sources/inc/lang/de/showrev.txt
new file mode 100644
index 0000000..65f53c9
--- /dev/null
+++ b/sources/inc/lang/de/showrev.txt
@@ -0,0 +1,2 @@
+**Dies ist eine alte Version des Dokuments!**
+----
diff --git a/sources/inc/lang/de/stopwords.txt b/sources/inc/lang/de/stopwords.txt
new file mode 100644
index 0000000..0487a94
--- /dev/null
+++ b/sources/inc/lang/de/stopwords.txt
@@ -0,0 +1,125 @@
+# 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
+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 --git a/sources/inc/lang/de/subscr_digest.txt b/sources/inc/lang/de/subscr_digest.txt
new file mode 100644
index 0000000..7cc79bb
--- /dev/null
+++ b/sources/inc/lang/de/subscr_digest.txt
@@ -0,0 +1,21 @@
+Hallo!
+
+Die Seite @PAGE@ im @TITLE@ Wiki wurde bearbeitet.
+Übersicht der Änderungen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Alte Revision: @OLDPAGE@
+Neue Revision: @NEWPAGE@
+
+Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an
+@DOKUWIKIURL@, besuchen dann
+@SUBSCRIBE@
+und klicken auf den Link 'Aboverwaltung'.
+
+--
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
+
diff --git a/sources/inc/lang/de/subscr_form.txt b/sources/inc/lang/de/subscr_form.txt
new file mode 100644
index 0000000..4ba6afb
--- /dev/null
+++ b/sources/inc/lang/de/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Abonnementverwaltung ======
+
+Hier können Sie Ihre Abonnements für die aktuelle Seite oder den aktuellen [[doku>Namespaces|Namespace]] verwalten.
diff --git a/sources/inc/lang/de/subscr_list.txt b/sources/inc/lang/de/subscr_list.txt
new file mode 100644
index 0000000..98ec4c2
--- /dev/null
+++ b/sources/inc/lang/de/subscr_list.txt
@@ -0,0 +1,18 @@
+Hallo!
+
+Seite im Namensraum @PAGE@ im @TITLE@ Wiki wurden bearbeitet.
+Das sind die geänderten Seiten:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Um das Abonnement für diese Seite aufzulösen, melde Sie sich im Wiki an
+@DOKUWIKIURL@, besuchen dann
+@SUBSCRIBE@
+und klicken auf die Taste 'Änderungen abbestellen'.
+
+--
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
+
diff --git a/sources/inc/lang/de/subscr_single.txt b/sources/inc/lang/de/subscr_single.txt
new file mode 100644
index 0000000..da9914e
--- /dev/null
+++ b/sources/inc/lang/de/subscr_single.txt
@@ -0,0 +1,24 @@
+Hallo!
+
+Die Seite @PAGE@ im @TITLE@ Wiki wurde bearbeitet.
+Übersicht der Änderungen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum: @DATE@
+Benutzer: @USER@
+Zusammenfassung: @SUMMARY@
+Alte Revision: @OLDPAGE@
+Neue Revision: @NEWPAGE@
+
+Um das Abonnement für diese Seite aufzulösen, melden Sie sich im Wiki an
+@DOKUWIKIURL@, besuchen dann
+@SUBSCRIBE@
+und klicken auf die Taste 'Aboverwaltung'.
+
+--
+Diese Mail kommt vom DokuWiki auf
+@DOKUWIKIURL@
+
diff --git a/sources/inc/lang/de/updateprofile.txt b/sources/inc/lang/de/updateprofile.txt
new file mode 100644
index 0000000..f19dd13
--- /dev/null
+++ b/sources/inc/lang/de/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Benutzerprofil ändern ======
+
+Nur die Felder, die Sie ändern, werden aktualisiert. Alle anderen bleiben, wie sie sind. Ihren Benutzernamen können Sie jedoch nicht ändern.
+
+
diff --git a/sources/inc/lang/de/uploadmail.txt b/sources/inc/lang/de/uploadmail.txt
new file mode 100644
index 0000000..977e756
--- /dev/null
+++ b/sources/inc/lang/de/uploadmail.txt
@@ -0,0 +1,15 @@
+Eine Datei wurde in Ihrem Wiki hochgeladen. Hier sind die Details:
+
+Datei       : @MEDIA@
+Alte Version: @OLD@
+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 --git a/sources/inc/lang/el/admin.txt b/sources/inc/lang/el/admin.txt
new file mode 100644
index 0000000..729004b
--- /dev/null
+++ b/sources/inc/lang/el/admin.txt
@@ -0,0 +1,3 @@
+====== Διαχείριση ======
+
+Παρακάτω μπορείτε να βρείτε μια λίστα με τις λειτουργίες διαχείρισης στο DokuWiki
diff --git a/sources/inc/lang/el/adminplugins.txt b/sources/inc/lang/el/adminplugins.txt
new file mode 100644
index 0000000..ef1a285
--- /dev/null
+++ b/sources/inc/lang/el/adminplugins.txt
@@ -0,0 +1 @@
+===== Πρόσθετα =====
\ No newline at end of file
diff --git a/sources/inc/lang/el/backlinks.txt b/sources/inc/lang/el/backlinks.txt
new file mode 100644
index 0000000..572f857
--- /dev/null
+++ b/sources/inc/lang/el/backlinks.txt
@@ -0,0 +1,3 @@
+====== Σύνδεσμοι προς την τρέχουσα σελίδα ======
+
+Οι παρακάτω σελίδες περιέχουν συνδέσμους προς την τρέχουσα σελίδα.
\ No newline at end of file
diff --git a/sources/inc/lang/el/conflict.txt b/sources/inc/lang/el/conflict.txt
new file mode 100644
index 0000000..a2065c0
--- /dev/null
+++ b/sources/inc/lang/el/conflict.txt
@@ -0,0 +1,8 @@
+====== Υπάρχει μία νεώτερη έκδοση αυτής της σελίδας ======
+
+Υπάρχει μία νεώτερη έκδοση της σελίδας που τρoποποιήσατε. 
+Αυτό συμβαίνει εάν κάποιος άλλος χρήστης τροποποίησε την ίδια σελίδα ενώ την επεξεργαζόσασταν και εσείς.
+
+Ελέγξτε προσεκτικά τις διαφορές που παρουσιάζονται παρακάτω και έπειτα αποφασίστε ποια έκδοση θα κρατήσετε.
+Εάν επιλέξετε ''Αποθήκευση'', η δική σας έκδοση θα αποθηκευτεί. 
+Εάν επιλέξετε ''Ακύρωση'', η νεώτερη έκδοση θα διατηρηθεί ως τρέχουσα.
diff --git a/sources/inc/lang/el/denied.txt b/sources/inc/lang/el/denied.txt
new file mode 100644
index 0000000..36d7ae1
--- /dev/null
+++ b/sources/inc/lang/el/denied.txt
@@ -0,0 +1,5 @@
+====== Μη επιτρεπτή ενέργεια ======
+
+Συγγνώμη, αλλά δεν έχετε επαρκή δικαιώματα για την συγκεκριμένη ενέργεια.
+
+Μήπως παραλείψατε να συνδεθείτε;
diff --git a/sources/inc/lang/el/diff.txt b/sources/inc/lang/el/diff.txt
new file mode 100644
index 0000000..dde065b
--- /dev/null
+++ b/sources/inc/lang/el/diff.txt
@@ -0,0 +1,3 @@
+====== Σύγκριση εκδόσεων ======
+
+Εδώ βλέπετε τις διαφορές μεταξύ της επιλεγμένης έκδοσης και της τρέχουσας έκδοσης της σελίδας.
diff --git a/sources/inc/lang/el/draft.txt b/sources/inc/lang/el/draft.txt
new file mode 100644
index 0000000..5ca7b8d
--- /dev/null
+++ b/sources/inc/lang/el/draft.txt
@@ -0,0 +1,9 @@
+====== Βρέθηκε μία αυτόματα αποθηκευμένη σελίδα ======
+
+Η τελευταία τροποποίηση αυτής της σελίδας δεν ολοκληρώθηκε επιτυχώς. 
+Η εφαρμογή αποθήκευσε αυτόματα μία εκδοχή της σελίδας την ώρα που την επεξεργαζόσασταν και μπορείτε να την χρησιμοποιήσετε για να συνεχίσετε την εργασία σας.
+Παρακάτω φαίνεται αυτή η πιο πρόσφατη αυτόματα αποθηκευμένη σελίδα.
+
+Μπορείτε να //επαναφέρετε// αυτή την αυτόματα αποθηκευμένη σελίδα ως τρέχουσα, να την //διαγράψετε// ή να //ακυρώσετε// τη διαδικασία τροποποίησης της τρέχουσας σελίδας.
+
+
diff --git a/sources/inc/lang/el/edit.txt b/sources/inc/lang/el/edit.txt
new file mode 100644
index 0000000..8d9559f
--- /dev/null
+++ b/sources/inc/lang/el/edit.txt
@@ -0,0 +1,3 @@
+Τροποποιήστε την σελίδα **μόνο** εάν μπορείτε να την **βελτιώσετε**. 
+Για να κάνετε δοκιμές με ασφάλεια ή να εξοικειωθείτε με το περιβάλλον χρησιμοποιήστε το [[:playground:playground|playground]]. 
+Αφού τροποποιήστε την σελίδα επιλέξτε ''Αποθήκευση''. Δείτε τις [[:wiki:syntax|οδηγίες]] για την σωστή σύνταξη.
diff --git a/sources/inc/lang/el/editrev.txt b/sources/inc/lang/el/editrev.txt
new file mode 100644
index 0000000..ac6bc5a
--- /dev/null
+++ b/sources/inc/lang/el/editrev.txt
@@ -0,0 +1,2 @@
+**Φορτώσατε μια παλαιότερη έκδοση της σελίδας!** Εάν την αποθηκεύσετε, θα αντικαταστήσει την τρέχουσα έκδοση.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/el/index.txt b/sources/inc/lang/el/index.txt
new file mode 100644
index 0000000..e2da3a8
--- /dev/null
+++ b/sources/inc/lang/el/index.txt
@@ -0,0 +1,3 @@
+====== Κατάλογος ======
+
+Εδώ βλέπετε τον κατάλογο όλων των διαθέσιμων σελίδων, ταξινομημένες κατά [[doku>namespaces|φακέλους]].
diff --git a/sources/inc/lang/el/install.html b/sources/inc/lang/el/install.html
new file mode 100644
index 0000000..c99a02f
--- /dev/null
+++ b/sources/inc/lang/el/install.html
@@ -0,0 +1,26 @@
+
        Αυτή η σελίδα περιέχει πληροφορίες που βοηθούν στην αρχική εγκατάσταση και
+ρύθμιση της εφαρμογής Dokuwiki.
+Περισσότερες πληροφορίες υπάρχουν στη 
+σελίδα τεκμηρίωσης του οδηγού εγκατάστασης.
        
+
+
        Η εφαρμογή DokuWiki χρησιμοποιεί απλά αρχεία για να αποθηκεύει τις σελίδες
+wiki καθώς και πληροφορίες που σχετίζονται με αυτές (π.χ. εικόνες, καταλόγους
+αναζήτησης, παλαιότερες εκδόσεις σελίδων, κλπ). Για να λειτουργεί σωστά η εφαρμογή
+DokuWiki πρέπει να έχει δικαιώματα εγγραφής στους φακέλους που
+φιλοξενούν αυτά τα αρχεία. Ο οδηγός εγκατάστασης δεν έχει την δυνατότητα να
+παραχωρήσει αυτά τα δικαιώματα εγγραφής στους σχετικούς φακέλους. Ο κανονικός
+τρόπος για να γίνει αυτό είναι είτε απευθείας σε περιβάλλον γραμμής εντολών ή,
+εάν δεν έχετε τέτοια πρόσβαση, μέσω FTP ή του πίνακα ελέγχου του περιβάλλοντος
+φιλοξενίας (π.χ. cPanel).
        
+
+
        Ο οδηγός εγκατάστασης θα ρυθμίσει την εφαρμογή DokuWiki ώστε να χρησιμοποιεί
+ACL, με τρόπο ώστε ο διαχειριστής
+να έχει δυνατότητα εισόδου και πρόσβαση στο μενού διαχείρισης της εφαρμογής για
+εγκατάσταση επεκτάσεων, διαχείριση χρηστών, διαχείριση δικαιωμάτων πρόσβασης στις
+διάφορες σελίδες και αλλαγή των ρυθμίσεων. Αυτό δεν είναι απαραίτητο για να
+λειτουργήσει η εφαρμογή, αλλά κάνει την διαχείρισή της ευκολότερη.
        
+
+
        Οι έμπειροι χρήστες και οι χρήστες με ειδικές απαιτήσεις μπορούν να επισκεφθούν
+τις σελίδες που περιέχουν λεπτομερείς 
+οδηγίες εγκατάστασης και πληροφορίες
+για τις ρυθμίσεις.
        
\ No newline at end of file
diff --git a/sources/inc/lang/el/lang.php b/sources/inc/lang/el/lang.php
new file mode 100644
index 0000000..8007f2b
--- /dev/null
+++ b/sources/inc/lang/el/lang.php
@@ -0,0 +1,331 @@
+
+ * @author Αθανάσιος Νταής 
+ * @author Konstantinos Koryllos 
+ * @author George Petsagourakis 
+ * @author Petros Vidalis 
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
+ * @author Constantinos Xanthopoulos 
+ * @author chris taklis 
+ */
+$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_profile']           = 'Επεξεργασία προφίλ';
+$lang['btn_reset']             = 'Ακύρωση';
+$lang['btn_resendpwd']         = 'Εισαγωγή νέου κωδικού';
+$lang['btn_draft']             = 'Επεξεργασία  αυτόματα αποθηκευμένης σελίδας';
+$lang['btn_recover']           = 'Επαναφορά αυτόματα αποθηκευμένης σελίδας';
+$lang['btn_draftdel']          = 'Διαγραφή αυτόματα αποθηκευμένης σελίδας';
+$lang['btn_revert']            = 'Αποκατάσταση';
+$lang['btn_register']          = 'Εγγραφή';
+$lang['btn_apply']             = 'Εφαρμογή';
+$lang['btn_media']             = 'Διαχειριστής πολυμέσων';
+$lang['btn_deleteuser']        = 'Αφαίρεσε τον λογαριασμό μου';
+$lang['loggedinas']            = 'Συνδεδεμένος ως';
+$lang['user']                  = 'Όνομα χρήστη';
+$lang['pass']                  = 'Κωδικός';
+$lang['newpass']               = 'Νέος κωδικός';
+$lang['oldpass']               = 'Επιβεβαίωση τρέχοντος κωδικού';
+$lang['passchk']               = 'ακόμη μια φορά';
+$lang['remember']              = 'Απομνημόνευση στοιχείων λογαριασμού';
+$lang['fullname']              = 'Ονοματεπώνυμο';
+$lang['email']                 = 'e-mail';
+$lang['profile']               = 'Προφίλ χρήστη';
+$lang['badlogin']              = 'Συγνώμη, το όνομα χρήστη ή ο κωδικός ήταν λανθασμένο.';
+$lang['badpassconfirm']        = 'Ο κωδικός που εισάγατε είναι λανθασμένος';
+$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['regbadpass']            = 'Οι δύο κωδικοί δεν είναι ίδιοι, προσπαθήστε ξανά.';
+$lang['regpwmail']             = 'Ο κωδικός σας';
+$lang['reghere']               = 'Δεν έχετε λογαριασμό ακόμη? Δημιουργήστε έναν';
+$lang['profna']                = 'Αυτό το wiki δεν υποστηρίζει την επεξεργασία προφίλ.';
+$lang['profnochange']          = 'Καμία αλλαγή.';
+$lang['profnoempty']           = 'Δεν επιτρέπεται κενό όνομα χρήστη η κενή διεύθυνση email.';
+$lang['profchanged']           = 'Το προφίλ χρήστη τροποποιήθηκε επιτυχώς.';
+$lang['profnodelete']          = 'Το wiki δεν υποστηρίζει την διαγραφή χρηστών';
+$lang['profdeleteuser']        = 'Διαγραφή λογαριασμού';
+$lang['profdeleted']           = 'Ο λογαριασμός διαγράφηκε από αυτό το wiki';
+$lang['profconfdelete']        = 'Επιθυμώ να διαγράψω τον λογαριασμό μου από αυτό το wiki. 
         Αυτή η επιλογή δεν μπορεί να αναιρεθεί.';
+$lang['pwdforget']             = 'Ξεχάσατε το κωδικό σας; Αποκτήστε νέο.';
+$lang['resendna']              = 'Αυτό το wiki δεν υποστηρίζει την εκ\' νέου αποστολή κωδικών.';
+$lang['resendpwd']             = 'Εισαγωγή νέου ωδικού για';
+$lang['resendpwdmissing']      = 'Πρέπει να συμπληρώσετε όλα τα πεδία.';
+$lang['resendpwdnouser']       = 'Αυτός ο χρήστης δεν υπάρχει στα αρχεία μας.';
+$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['maxuploadsize']         = 'Μέγιστο μέγεθος αρχείου: %s.';
+$lang['lockedby']              = 'Προσωρινά κλειδωμένο από';
+$lang['lockexpire']            = 'Το κλείδωμα λήγει στις';
+$lang['js']['willexpire']      = 'Το κλείδωμά σας για την επεξεργασία αυτής της σελίδας θα λήξει σε ένα λεπτό.\n Για να το ανανεώσετε χρησιμοποιήστε την Προεπισκόπηση.';
+$lang['js']['notsavedyet']     = 'Οι μη αποθηκευμένες αλλαγές θα χαθούν.
+Θέλετε να συνεχίσετε;';
+$lang['js']['searchmedia']     = 'Αναζήτηση για αρχεία';
+$lang['js']['keepopen']        = 'Το παράθυρο να μην κλείνει';
+$lang['js']['hidedetails']     = 'Απόκρυψη λεπτομερειών';
+$lang['js']['mediatitle']      = 'Ρυθμίσεις συνδέσμων';
+$lang['js']['mediadisplay']    = 'Τύπος συνδέσμου';
+$lang['js']['mediaalign']      = 'Στοίχηση';
+$lang['js']['mediasize']       = 'Μέγεθος εικόνας';
+$lang['js']['mediatarget']     = 'Προορισμός συνδέσμου';
+$lang['js']['mediaclose']      = 'Κλείσιμο';
+$lang['js']['mediainsert']     = 'Εισαγωγή';
+$lang['js']['mediadisplayimg'] = 'Προβολή εικόνας.';
+$lang['js']['mediadisplaylnk'] = 'Προβολή μόνο του συνδέσμου.';
+$lang['js']['mediasmall']      = 'Μικρό μέγεθος';
+$lang['js']['mediamedium']     = 'Μεσαίο μέγεθος';
+$lang['js']['medialarge']      = 'Μεγάλο μέγεθος';
+$lang['js']['mediaoriginal']   = 'Αρχικό μέγεθος';
+$lang['js']['medialnk']        = 'Σύνδεσμος στην σελίδα λεπτομερειών';
+$lang['js']['mediadirect']     = 'Απευθείας σύνδεσμος στο αυθεντικό';
+$lang['js']['medianolnk']      = 'Χωρίς σύνδεσμο';
+$lang['js']['medianolink']     = 'Να μην γίνει σύνδεσμος η εικόνα';
+$lang['js']['medialeft']       = 'Αριστερή στοίχιση εικόνας.';
+$lang['js']['mediaright']      = 'Δεξιά στοίχιση εικόνας.';
+$lang['js']['mediacenter']     = 'Κέντρική στοίχιση εικόνας.';
+$lang['js']['medianoalign']    = 'Χωρίς στοίχηση.';
+$lang['js']['nosmblinks']      = 'Οι σύνδεσμοι προς Windows shares δουλεύουν μόνο στον Microsoft Internet Explorer.
+Μπορείτε πάντα να κάνετε αντιγραφή και επικόλληση του συνδέσμου.';
+$lang['js']['linkwiz']         = 'Αυτόματος Οδηγός Συνδέσμων';
+$lang['js']['linkto']          = 'Σύνδεση σε:';
+$lang['js']['del_confirm']     = 'Να διαγραφεί;';
+$lang['js']['restore_confirm'] = 'Θέλετε την επαναφορά σε αυτή την έκδοση;';
+$lang['js']['media_diff']      = 'Εμφάνιση διαφορών:';
+$lang['js']['media_diff_both'] = 'Δίπλα δίπλα';
+$lang['js']['media_diff_opacity'] = 'Επικάλυψη';
+$lang['js']['media_diff_portions'] = 'Κύλιση';
+$lang['js']['media_select']    = 'Επιλογή αρχείων...';
+$lang['js']['media_upload_btn'] = 'Φόρτωση';
+$lang['js']['media_done_btn']  = 'Ολοκλήρωση';
+$lang['js']['media_drop']      = 'Ρίξτε αρχεία εδώ για να τα φορτώσετε';
+$lang['js']['media_cancel']    = 'αφαίρεση';
+$lang['js']['media_overwrt']   = 'Αντικατάσταση υπάρχοντων αρχείων';
+$lang['rssfailed']             = 'Παρουσιάστηκε κάποιο σφάλμα κατά την ανάγνωση αυτού του feed: ';
+$lang['nothingfound']          = 'Δεν βρέθηκαν σχετικά αποτελέσματα.';
+$lang['mediaselect']           = 'Επιλογή Αρχείων';
+$lang['fileupload']            = 'Φόρτωση αρχείου';
+$lang['uploadsucc']            = 'Επιτυχής φόρτωση';
+$lang['uploadfail']            = 'Η μεταφόρτωση απέτυχε. Πιθανόν αυτό να οφείλεται στις ρυθμίσεις πρόσβασης του αρχείου.';
+$lang['uploadwrong']           = 'Η μεταφόρτωση δεν έγινε δεκτή. Δεν επιτρέπονται αρχεία αυτού του τύπου!';
+$lang['uploadexist']           = 'Το αρχείο ήδη υπάρχει. Δεν έγινε καμία αλλαγή.';
+$lang['uploadspam']            = 'Η μεταφόρτωση ακυρώθηκε από το φίλτρο spam.';
+$lang['uploadxss']             = 'Η μεταφόρτωση ακυρώθηκε λόγω πιθανού επικίνδυνου περιεχομένου.';
+$lang['uploadsize']            = 'Το αρχείο ήταν πολύ μεγάλο. (μέγιστο %s)';
+$lang['deletesucc']            = 'Το αρχείο "%s" διαγράφηκε.';
+$lang['deletefail']            = 'Το αρχείο "%s" δεν διαγράφηκε. Πιθανόν αυτό να οφείλεται στις ρυθμίσεις πρόσβασης του αρχείου.';
+$lang['mediainuse']            = 'Το αρχείο "%s" δεν διαγράφηκε - είναι ακόμα σε χρήση.';
+$lang['namespaces']            = 'Φάκελοι';
+$lang['mediafiles']            = 'Διαθέσιμα αρχεία σε';
+$lang['accessdenied']          = 'Δεν σας επιτρέπεται να δείτε αυτήν την σελίδα.';
+$lang['mediausage']            = 'Χρησιμοποιήστε την ακόλουθη σύνταξη για να παραθέσετε αυτό το αρχείο:';
+$lang['mediaview']             = 'Κανονική προβολή αρχείου';
+$lang['mediaroot']             = 'root';
+$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['difflink']              = 'Σύνδεσμος σε αυτή την προβολή διαφορών.';
+$lang['diff_type']             = 'Προβολή διαφορών:';
+$lang['diff_inline']           = 'Σε σειρά';
+$lang['diff_side']             = 'Δίπλα-δίπλα';
+$lang['line']                  = 'Γραμμή';
+$lang['breadcrumb']            = 'Ιστορικό';
+$lang['youarehere']            = 'Είστε εδώ';
+$lang['lastmod']               = 'Τελευταία τροποποίηση';
+$lang['by']                    = 'από';
+$lang['deleted']               = 'διαγράφηκε';
+$lang['created']               = 'δημιουργήθηκε';
+$lang['restored']              = 'παλαιότερη έκδοση επαναφέρθηκε (%s)';
+$lang['external_edit']         = 'εξωτερική τροποποίηση';
+$lang['summary']               = 'Επεξεργασία σύνοψης';
+$lang['noflash']               = 'Το Adobe Flash Plugin απαιτείται για την προβολή αυτού του στοιχείου.';
+$lang['download']              = 'Λήψη Κώδικα';
+$lang['tools']                 = 'Εργαλεία';
+$lang['user_tools']            = 'Εργαλεία Χρήστη';
+$lang['site_tools']            = 'Εργαλεία ιστότοπου';
+$lang['page_tools']            = 'Εργαλεία ιστοσελίδας';
+$lang['skip_to_content']       = 'παράληψη περιεχομένων';
+$lang['sidebar']               = 'Sidebar';
+$lang['mail_newpage']          = 'σελίδα προστέθηκε:';
+$lang['mail_changed']          = 'σελίδα τροποποιήθηκε:';
+$lang['mail_subscribe_list']   = 'σελίδες που άλλαξαν στον φάκελο:';
+$lang['mail_new_user']         = 'νέος χρήστης:';
+$lang['mail_upload']           = 'αρχείο φορτώθηκε:';
+$lang['changes_type']          = 'Εμφάνιση αλλαγών του';
+$lang['pages_changes']         = 'Σελίδες';
+$lang['media_changes']         = 'Αρχεία πολυμέσων';
+$lang['both_changes']          = 'Σελίδες και αρχεία πολυμέσων';
+$lang['qb_bold']               = 'Έντονο Κείμενο';
+$lang['qb_italic']             = 'Πλάγιο Κείμενο';
+$lang['qb_underl']             = 'Υπογραμμισμένο Κείμενο';
+$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']            = 'Smileys';
+$lang['qb_chars']              = 'Ειδικοί Χαρακτήρες';
+$lang['upperns']               = 'πήγαινε στον μητρικό φάκελο';
+$lang['admin_register']        = 'Προσθήκη νέου χρήστη';
+$lang['metaedit']              = 'Τροποποίηση metadata';
+$lang['metasaveerr']           = 'Η αποθήκευση των metadata απέτυχε';
+$lang['metasaveok']            = 'Επιτυχής αποθήκευση metadata';
+$lang['img_backto']            = 'Επιστροφή σε';
+$lang['img_title']             = 'Τίτλος';
+$lang['img_caption']           = 'Λεζάντα';
+$lang['img_date']              = 'Ημερομηνία';
+$lang['img_fname']             = 'Όνομα αρχείου';
+$lang['img_fsize']             = 'Μέγεθος';
+$lang['img_artist']            = 'Καλλιτέχνης';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Λέξεις-κλειδιά';
+$lang['img_width']             = 'Πλάτος';
+$lang['img_height']            = 'Ύψος';
+$lang['img_manager']           = 'Εμφάνιση στον διαχειριστή πολυμέσων';
+$lang['subscr_subscribe_success'] = 'Ο/η %s προστέθηκε στην λίστα ειδοποιήσεων για το %s';
+$lang['subscr_subscribe_error'] = 'Σφάλμα κατά την προσθήκη του/της %s στην λίστα ειδοποιήσεων για το %s';
+$lang['subscr_subscribe_noaddress'] = 'Δεν υπάρχει διεύθυνση ταχυδρομείου συσχετισμένη με το όνομα χρήστη σας. Κατά συνέπεια δεν μπορείτε να προστεθείτε στην λίστα ειδοποιήσεων';
+$lang['subscr_unsubscribe_success'] = 'Ο/η %s, απομακρύνθηκε από την λίστα ειδοποιήσεων για το %s';
+$lang['subscr_unsubscribe_error'] = 'Σφάλμα κατά την απομάκρυνση του/της %s στην λίστα ειδοποιήσεων για το %s';
+$lang['subscr_already_subscribed'] = 'Ο/η %s είναι ήδη στην λίστα ειδοποίησης για το %s';
+$lang['subscr_not_subscribed'] = 'Ο/η %s δεν είναι στην λίστα ειδοποίησης για το %s';
+$lang['subscr_m_not_subscribed'] = 'Αυτήν την στιγμή, δεν είσαστε εγεγγραμμένος/η στην λίστα ειδοποίησης της τρέχουσας σελίδας ή φακέλου.';
+$lang['subscr_m_new_header']   = 'Προσθήκη στην λίστα ειδοποίησης';
+$lang['subscr_m_current_header'] = 'Τρέχουσες εγγραφές ειδοποιήσεων';
+$lang['subscr_m_unsubscribe']  = 'Διαγραφή';
+$lang['subscr_m_subscribe']    = 'Εγγραφή';
+$lang['subscr_m_receive']      = 'Λήψη';
+$lang['subscr_style_every']    = 'email σε κάθε αλλαγή';
+$lang['subscr_style_digest']   = 'συνοπτικό email αλλαγών της σελίδας (κάθε %.2f μέρες)';
+$lang['subscr_style_list']     = 'λίστα σελίδων με αλλαγές μετά από το τελευταίο email (κάθε %.2f μέρες)';
+$lang['authtempfail']          = 'Η συνδεση χρηστών είναι απενεργοποιημένη αυτή την στιγμή. Αν αυτό διαρκέσει για πολύ, παρακαλούμε ενημερώστε τον διαχειριστή του wiki.';
+$lang['authpwdexpire']         = 'Ο κωδικός πρόσβασης θα λήξει σε %d ημέρες. Προτείνουμε να τον αλλάξετε σύντομα.';
+$lang['i_chooselang']          = 'Επιλογή γλώσσας';
+$lang['i_installer']           = 'Οδηγός εγκατάστασης DokuWiki';
+$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. Πρέπει να διορθώσετε τα δικαιώματα πρόσβασης αυτού του φακέλου!';
+$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']             = 'Εμφανίστηκαν κάποια προβλήματα στη διαδικασία ανανέωσης των αρχείων ρυθμίσεων. Πιθανόν να χρειάζεται να τα τροποποιήσετε χειροκίνητα ώστε να μπορείτε να χρησιμοποιήσετε το νέο σας DokuWiki.';
+$lang['i_policy']              = 'Αρχική πολιτική Λίστας Δικαιωμάτων Πρόσβασης - ACL';
+$lang['i_pol0']                = 'Ανοιχτό Wiki (όλοι μπορούν να διαβάσουν ή να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
+$lang['i_pol1']                = 'Δημόσιο Wiki (όλοι μπορούν να διαβάσουν σελίδες αλλά μόνο οι εγγεγραμμένοι χρήστες μπορούν να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
+$lang['i_pol2']                = 'Κλειστό Wiki (μόνο οι εγγεγραμμένοι χρήστες μπορούν να διαβάσουν ή να δημιουργήσουν/τροποποιήσουν σελίδες και να μεταφορτώσουν αρχεία)';
+$lang['i_allowreg']            = 'Οι χρήστες επιτρέπεται να εγγραφούν μόνοι τους';
+$lang['i_retry']               = 'Νέα προσπάθεια';
+$lang['i_license']             = 'Παρακαλώ επιλέξτε την άδεια που θα χρησιμοποιήσετε για την διάθεση του περιεχομένου σας:';
+$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 δευτερόλεπτα';
+$lang['wordblock']             = 'Η αλλαγή σας δεν αποθηκεύτηκε γιατί περιείχε spam.';
+$lang['media_uploadtab']       = 'Φόρτωση';
+$lang['media_searchtab']       = 'Αναζήτηση';
+$lang['media_file']            = 'Αρχείο';
+$lang['media_viewtab']         = 'Εμφάνιση';
+$lang['media_edittab']         = 'Επεξεργασία';
+$lang['media_historytab']      = 'Ιστορικό';
+$lang['media_list_thumbs']     = 'Μικρογραφίες';
+$lang['media_list_rows']       = 'Γραμμές';
+$lang['media_sort_name']       = 'ανά όνομα';
+$lang['media_sort_date']       = 'ανά ημερομηνία';
+$lang['media_namespaces']      = 'Επιλογή namespace';
+$lang['media_files']           = 'Αρχεία στο %s φάκελο';
+$lang['media_upload']          = 'Φόρτωση στο %s φάκελο.';
+$lang['media_search']          = 'Αναζήτηση στο %s φάκελο.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s στα %s';
+$lang['media_edit']            = 'Επεξεργασία %s';
+$lang['media_history']         = 'Ιστορικό των %s';
+$lang['media_meta_edited']     = 'τα μεταδεδομένα επεξεργάστηκαν';
+$lang['media_perm_read']       = 'Συγνώμη, δεν έχετε επαρκή διακαιώματα για να διαβάσετε αυτά τα αρχεία.';
+$lang['media_perm_upload']     = 'Συγνώμη, δεν έχετε επαρκή διακαιώματα για να φορτώσετε αυτά τα αρχεία.';
+$lang['media_update']          = 'Φόρτωση νέας έκδοσης';
+$lang['media_restore']         = 'Επαναφορά αυτή της έκδοσης';
+$lang['searchresult']          = 'Αποτέλεσμα έρευνας';
diff --git a/sources/inc/lang/el/locked.txt b/sources/inc/lang/el/locked.txt
new file mode 100644
index 0000000..425c334
--- /dev/null
+++ b/sources/inc/lang/el/locked.txt
@@ -0,0 +1,5 @@
+====== Κλειδωμένη σελίδα ======
+
+Αυτή η σελίδα είναι προς το παρόν δεσμευμένη για τροποποίηση από άλλον χρήστη. 
+Θα πρέπει να περιμένετε μέχρι ο συγκεκριμένος χρήστης να σταματήσει να την επεξεργάζεται ή να εκπνεύσει το χρονικό όριο για το σχετικό κλείδωμα.
+
diff --git a/sources/inc/lang/el/login.txt b/sources/inc/lang/el/login.txt
new file mode 100644
index 0000000..3021a19
--- /dev/null
+++ b/sources/inc/lang/el/login.txt
@@ -0,0 +1,5 @@
+====== Σύνδεση χρήστη ======
+
+Αυτή την στιγμή δεν έχετε συνδεθεί ως χρήστης!
+Για να συνδεθείτε, εισάγετε τα στοιχεία σας στην παρακάτω φόρμα.
+Πρέπει να έχετε ενεργοποιήσει τα cookies στο πρόγραμμα περιήγηση σας.
diff --git a/sources/inc/lang/el/mailtext.txt b/sources/inc/lang/el/mailtext.txt
new file mode 100644
index 0000000..a5059ca
--- /dev/null
+++ b/sources/inc/lang/el/mailtext.txt
@@ -0,0 +1,17 @@
+Μία σελίδα προστέθηκε ή τροποποιήθηκε στο DokuWiki σας.
+Αυτά είναι τα αντίστοιχα στοιχεία:
+
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
+Όνομα υπολογιστή: @HOSTNAME@
+Παλιά έκδοση    : @OLDPAGE@
+Νέα έκδοση      : @NEWPAGE@
+Σύνοψη          : @SUMMARY@
+Χρήστης         : @USER@
+
+@DIFF@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/el/mailwrap.html b/sources/inc/lang/el/mailwrap.html
new file mode 100644
index 0000000..b2e6557
--- /dev/null
+++ b/sources/inc/lang/el/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Το email έχει δημιουργηθεί από το DokuWiki στις @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/el/newpage.txt b/sources/inc/lang/el/newpage.txt
new file mode 100644
index 0000000..3349ad9
--- /dev/null
+++ b/sources/inc/lang/el/newpage.txt
@@ -0,0 +1,4 @@
+====== Αυτή η σελίδα δεν υπάρχει ακόμη ======
+
+Η σελίδα που ζητάτε δεν υπάρχει ακόμη. 
+Aν όμως έχετε επαρκή δικαιώματα, μπορείτε να την δημιουργήσετε επιλέγοντας ''Δημιουργία σελίδας''.
diff --git a/sources/inc/lang/el/norev.txt b/sources/inc/lang/el/norev.txt
new file mode 100644
index 0000000..2b13290
--- /dev/null
+++ b/sources/inc/lang/el/norev.txt
@@ -0,0 +1,5 @@
+====== Αυτή η έκδοση δεν υπάρχει ======
+
+Η έκδοση που αναζητήσατε δεν υπάρχει. 
+Μπορείτε να δείτε λίστα με τις παλαιότερες εκδόσεις της τρέχουσας σελίδας πατώντας ''Παλαιότερες εκδόσεις σελίδας''.
+
diff --git a/sources/inc/lang/el/password.txt b/sources/inc/lang/el/password.txt
new file mode 100644
index 0000000..d27fbb3
--- /dev/null
+++ b/sources/inc/lang/el/password.txt
@@ -0,0 +1,10 @@
+@FULLNAME@!, γειά σας.
+
+Αυτά είναι τα στοιχεία εισόδου για το @TITLE@ στο @DOKUWIKIURL@
+
+Όνομα       : @LOGIN@
+Συνθηματικό : @PASSWORD@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/el/preview.txt b/sources/inc/lang/el/preview.txt
new file mode 100644
index 0000000..aef65c9
--- /dev/null
+++ b/sources/inc/lang/el/preview.txt
@@ -0,0 +1,5 @@
+====== Προεπισκόπηση ======
+
+Αυτή είναι μια προεπισκόπηση του πως θα δείχνει η σελίδα. 
+Υπενθύμιση: Οι αλλαγές σας **δεν έχουν αποθηκευθεί** ακόμη!
+
diff --git a/sources/inc/lang/el/pwconfirm.txt b/sources/inc/lang/el/pwconfirm.txt
new file mode 100644
index 0000000..a9e58be
--- /dev/null
+++ b/sources/inc/lang/el/pwconfirm.txt
@@ -0,0 +1,14 @@
+Γεια σας @FULLNAME@!
+
+Κάποιος ζήτησε τη δημιουργία νέου συνθηματικού για τον λογαριασμό @TITLE@
+που διατηρείτε στο @DOKUWIKIURL@
+
+Αν δεν ζητήσατε εσείς την δημιουργία νέου συνθηματικού απλά αγνοήστε αυτό το e-mail.
+
+Αν όντως εσείς ζητήσατε την δημιουργία νέου συνθηματικού, ακολουθήστε τον παρακάτω σύνδεσμο για να το επιβεβαιώσετε.
+
+@CONFIRM@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/el/read.txt b/sources/inc/lang/el/read.txt
new file mode 100644
index 0000000..a620ab5
--- /dev/null
+++ b/sources/inc/lang/el/read.txt
@@ -0,0 +1,2 @@
+Μπορείτε να διαβάσετε αυτή την σελίδα αλλά δεν μπορείτε να την τροποποιήσετε. 
+Αν πιστεύετε ότι αυτό δεν είναι σωστό, απευθυνθείτε στον διαχειριστή της εφαρμογής.
diff --git a/sources/inc/lang/el/recent.txt b/sources/inc/lang/el/recent.txt
new file mode 100644
index 0000000..78c74a6
--- /dev/null
+++ b/sources/inc/lang/el/recent.txt
@@ -0,0 +1,3 @@
+====== Πρόσφατες αλλαγές ======
+
+Οι παρακάτω σελίδες τροποποιήθηκαν πρόσφατα:
diff --git a/sources/inc/lang/el/register.txt b/sources/inc/lang/el/register.txt
new file mode 100644
index 0000000..6a4e963
--- /dev/null
+++ b/sources/inc/lang/el/register.txt
@@ -0,0 +1,5 @@
+====== Εγγραφή νέου χρήστη ======
+
+Συμπληρώστε όλα τα παρακάτω πεδία για να δημιουργήσετε ένα νέο λογαριασμό σε αυτό το wiki.
+Πρέπει να δώσετε μια **υπαρκτή e-mail διεύθυνση** - ο κωδικός σας θα σας αποσταλεί σε αυτήν.
+Το όνομα χρήστη θα πρέπει να πληρεί τις ίδιες απαιτήσεις ονόματος που ισχύουν και για τους [[doku>el:pagename|φακέλους]].
diff --git a/sources/inc/lang/el/registermail.txt b/sources/inc/lang/el/registermail.txt
new file mode 100644
index 0000000..0b3e0b7
--- /dev/null
+++ b/sources/inc/lang/el/registermail.txt
@@ -0,0 +1,14 @@
+Ένας νέος χρήστης εγγράφηκε. Ορίστε οι λεπτομέρειες:
+
+Χρήστης         : @NEWUSER@
+Όνομα           : @NEWNAME@
+e-mail          : @NEWEMAIL@
+
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
+Όνομα υπολογιστή: @HOSTNAME@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/el/resendpwd.txt b/sources/inc/lang/el/resendpwd.txt
new file mode 100644
index 0000000..6b4f3bb
--- /dev/null
+++ b/sources/inc/lang/el/resendpwd.txt
@@ -0,0 +1,6 @@
+====== Αποστολή νέου κωδικού ======
+
+Συμπληρώστε όλα τα παρακάτω πεδία για να λάβετε ένα νέο κωδικό για τον λογαριασμό σας σε αυτό το wiki. 
+Ο νέος κωδικός σας θα σταλεί στην e-mail διεύθυνση που έχετε ήδη δηλώσει. 
+Το όνομα πρέπει να είναι αυτό που ισχύει για τον λογαριασμό σας σε αυτό το wiki.
+
diff --git a/sources/inc/lang/el/resetpwd.txt b/sources/inc/lang/el/resetpwd.txt
new file mode 100644
index 0000000..0d26d05
--- /dev/null
+++ b/sources/inc/lang/el/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Εισάγετε νέο κωδικό πρόσβασης ======
+
+Παρακαλούμε, εισάγετε έναν νέο κωδικό πρόσβασης για τον λογαριασμό σας.
\ No newline at end of file
diff --git a/sources/inc/lang/el/revisions.txt b/sources/inc/lang/el/revisions.txt
new file mode 100644
index 0000000..955fa17
--- /dev/null
+++ b/sources/inc/lang/el/revisions.txt
@@ -0,0 +1,8 @@
+====== Παλαιότερες εκδόσεις σελίδας ======
+
+Οι παρακάτω είναι παλαιότερες εκδόσεις της τρέχουσας σελίδας. 
+Εάν θέλετε να αντικαταστήσετε την τρέχουσα σελίδα με κάποια από τις παλαιότερες εκδόσεις της κάντε τα παρακάτω:
+  * επιλέξτε την σχετική έκδοση
+  * επιλέξτε ''Τροποποίηση σελίδας''
+  * κάνετε τυχόν αλλαγές 
+  * αποθηκεύστε την
diff --git a/sources/inc/lang/el/searchpage.txt b/sources/inc/lang/el/searchpage.txt
new file mode 100644
index 0000000..b52162b
--- /dev/null
+++ b/sources/inc/lang/el/searchpage.txt
@@ -0,0 +1,4 @@
+====== Αναζήτηση ======
+
+Τα αποτελέσματα της αναζήτησής σας:
+
diff --git a/sources/inc/lang/el/showrev.txt b/sources/inc/lang/el/showrev.txt
new file mode 100644
index 0000000..a6ba3f9
--- /dev/null
+++ b/sources/inc/lang/el/showrev.txt
@@ -0,0 +1,2 @@
+**Βλέπετε μια παλαιότερη έκδοση της σελίδας!**
+----
diff --git a/sources/inc/lang/el/stopwords.txt b/sources/inc/lang/el/stopwords.txt
new file mode 100644
index 0000000..01d5103
--- /dev/null
+++ b/sources/inc/lang/el/stopwords.txt
@@ -0,0 +1,103 @@
+# 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 provided by Fotis Lazarinis based on his research found at: http://lazarinf.teimes.gr/papers/J8.pdf
+και
+ήταν
+το
+ενός
+να
+πολύ
+του
+όμως
+η
+κατά
+της
+αυτή
+με
+όταν
+που
+μέσα
+την
+οποίο
+από
+πως
+για
+έτσι
+τα
+στους
+είναι
+μέσω
+των
+όλα
+σε
+καθώς
+ο
+αυτά
+οι
+προς
+στο
+ένας
+θα
+πριν
+τη
+μου
+στην
+όχι
+τον
+χωρίς
+τους
+επίσης
+δεν
+μεταξύ
+τις
+μέχρι
+ένα
+έναν
+μια
+μιας
+ότι
+αφού
+ή
+ακόμα
+στη
+όπου
+στα
+είχε
+μας
+δηλαδή
+αλλά
+τρόπος
+στον
+όσο
+στις
+ακόμη
+αυτό
+τόσο
+όπως
+έχουμε
+αν
+ώστε
+μπορεί
+αυτές
+μετά
+γιατί
+σας
+πάνω
+δύο
+τότε
+τι
+τώρα
+ως
+κάτι
+κάθε
+άλλο
+πρέπει
+μην
+πιο
+εδώ
+οποία
+είτε
+μόνο
+μη
+ενώ
\ No newline at end of file
diff --git a/sources/inc/lang/el/subscr_digest.txt b/sources/inc/lang/el/subscr_digest.txt
new file mode 100644
index 0000000..7dd0345
--- /dev/null
+++ b/sources/inc/lang/el/subscr_digest.txt
@@ -0,0 +1,20 @@
+Χαίρετε!
+
+Η σελίδα @PAGE@ στο @TITLE@ άλλαξε.
+Ορίστε οι αλλαγές:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Παλιά έκδοση: @OLDPAGE@
+Νέα έκδοση: @NEWPAGE@
+
+Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε 
+στο wiki στην διεύθυνση @DOKUWIKIURL@ 
+και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ 
+και διαγραφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου.
+
+--
+Αυτό το μήνυμα παράχθηκε απο το DokuWiki στην 
+διεύθυνση @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/el/subscr_form.txt b/sources/inc/lang/el/subscr_form.txt
new file mode 100644
index 0000000..c21a29a
--- /dev/null
+++ b/sources/inc/lang/el/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Διαχείριση Εγγραφών σε Ειδοποιήσεις ======
+
+Εδώ μπορείτε να διαχειριστείτε τις εγγραφές σας στις ειδοποιήσεις για αλλαγές στην τρέχουσα σελίδα και φάκελο.
\ No newline at end of file
diff --git a/sources/inc/lang/el/subscr_list.txt b/sources/inc/lang/el/subscr_list.txt
new file mode 100644
index 0000000..97b8dc4
--- /dev/null
+++ b/sources/inc/lang/el/subscr_list.txt
@@ -0,0 +1,20 @@
+Χαίρετε!
+
+Η σελίδα @PAGE@ στο @TITLE@ άλλαξε.
+
+Κάποιες σελίδες στον φάκελο @PAGE@ του wiki 
+@TITLE@ έχουν αλλάξει.
+Ορίστε οι αλλαγμένες σελίδες:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki 
+στην διεύθυνση @DOKUWIKIURL@ 
+και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ 
+και διαγραφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου.
+
+--
+Αυτό το μήνυμα παράχθηκε απο το DokuWiki στην 
+διεύθυνση @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/el/subscr_single.txt b/sources/inc/lang/el/subscr_single.txt
new file mode 100644
index 0000000..610af49
--- /dev/null
+++ b/sources/inc/lang/el/subscr_single.txt
@@ -0,0 +1,22 @@
+Χαίρετε!
+
+Η σελίδα @PAGE@ στο @TITLE@ άλλαξε.
+Ορίστε οι αλλαγές:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+Ημερομηνία : @DATE@
+Χρήστης : @USER@
+Περίληψη αλλαγών: @SUMMARY@
+Παλιά έκδοση: @OLDPAGE@
+Νέα έκδοση: @NEWPAGE@
+
+Για να σταματήσουν αυτές οι ειδοποιήσεις συνδεθείτε στο wiki 
+στην διεύθυνση @DOKUWIKIURL@ 
+και στην συνέχεια επισκεφθείτε το @SUBSCRIBE@ 
+και διαγραφείτε από τις ειδοποιήσεις της σελίδας ή του φακέλου.
+
+--
+Αυτό το μήνυμα παράχθηκε απο το DokuWiki στην 
+διεύθυνση @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/el/updateprofile.txt b/sources/inc/lang/el/updateprofile.txt
new file mode 100644
index 0000000..56f176d
--- /dev/null
+++ b/sources/inc/lang/el/updateprofile.txt
@@ -0,0 +1,4 @@
+====== Τροποποίηση προφίλ ======
+
+Τροποποιήστε **μόνο** τα πεδία που θέλετε να αλλάξετε. 
+Δεν μπορείτε να αλλάξετε το πεδίο ''Όνομα''.
diff --git a/sources/inc/lang/el/uploadmail.txt b/sources/inc/lang/el/uploadmail.txt
new file mode 100644
index 0000000..52d2f1f
--- /dev/null
+++ b/sources/inc/lang/el/uploadmail.txt
@@ -0,0 +1,15 @@
+Ένα αρχείο φορτώθηκε στο DokuWiki σας.
+Αυτά είναι τα αντίστοιχα στοιχεία:
+
+Αρχείο          : @MEDIA@
+Ημερομηνία      : @DATE@
+Φυλλομετρητής   : @BROWSER@
+IP-Διεύθυνση    : @IPADDRESS@
+Όνομα υπολογιστή: @HOSTNAME@
+Μέγεθος         : @SIZE@
+MIME Type       : @MIME@
+Χρήστης         : @USER@
+
+-- 
+Αυτό το e-mail δημιουργήθηκε αυτόματα από την εφαρμογή DokuWiki στην διεύθυνση
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/en/admin.txt b/sources/inc/lang/en/admin.txt
new file mode 100644
index 0000000..cfd21b2
--- /dev/null
+++ b/sources/inc/lang/en/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Below you can find a list of administrative tasks available in DokuWiki.
+
diff --git a/sources/inc/lang/en/adminplugins.txt b/sources/inc/lang/en/adminplugins.txt
new file mode 100644
index 0000000..3ec46cf
--- /dev/null
+++ b/sources/inc/lang/en/adminplugins.txt
@@ -0,0 +1,2 @@
+===== Additional Plugins =====
+
diff --git a/sources/inc/lang/en/backlinks.txt b/sources/inc/lang/en/backlinks.txt
new file mode 100644
index 0000000..5b40b84
--- /dev/null
+++ b/sources/inc/lang/en/backlinks.txt
@@ -0,0 +1,4 @@
+====== Backlinks ======
+
+This is a list of pages that seem to link back to the current page.
+
diff --git a/sources/inc/lang/en/conflict.txt b/sources/inc/lang/en/conflict.txt
new file mode 100644
index 0000000..624f17b
--- /dev/null
+++ b/sources/inc/lang/en/conflict.txt
@@ -0,0 +1,6 @@
+====== A newer version exists ======
+
+A newer version of the document you edited exists. This happens when another user changed the document while you were editing it.
+
+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 --git a/sources/inc/lang/en/denied.txt b/sources/inc/lang/en/denied.txt
new file mode 100644
index 0000000..3ac7282
--- /dev/null
+++ b/sources/inc/lang/en/denied.txt
@@ -0,0 +1,4 @@
+====== Permission Denied ======
+
+Sorry, you don't have enough rights to continue. Perhaps you forgot to login?
+
diff --git a/sources/inc/lang/en/diff.txt b/sources/inc/lang/en/diff.txt
new file mode 100644
index 0000000..934534d
--- /dev/null
+++ b/sources/inc/lang/en/diff.txt
@@ -0,0 +1,4 @@
+====== Differences ======
+
+This shows you the differences between two versions of the page.
+
diff --git a/sources/inc/lang/en/draft.txt b/sources/inc/lang/en/draft.txt
new file mode 100644
index 0000000..e84d34a
--- /dev/null
+++ b/sources/inc/lang/en/draft.txt
@@ -0,0 +1,6 @@
+====== Draft file found ======
+
+Your last edit session on this page was not completed correctly. DokuWiki automatically saved a draft during your work which you may now use to continue your editing. Below you can see the data that was saved from your last session.
+
+Please decide if you want to //recover// your lost edit session, //delete// the autosaved draft or //cancel// the editing process.
+
diff --git a/sources/inc/lang/en/edit.txt b/sources/inc/lang/en/edit.txt
new file mode 100644
index 0000000..48c9c29
--- /dev/null
+++ b/sources/inc/lang/en/edit.txt
@@ -0,0 +1,2 @@
+Edit the page and hit ''Save''. See [[wiki:syntax]] for Wiki syntax. Please edit the page only if you can **improve** it. If you want to test some things, learn to make your first steps on the [[playground:playground|playground]].
+
diff --git a/sources/inc/lang/en/editrev.txt b/sources/inc/lang/en/editrev.txt
new file mode 100644
index 0000000..638216b
--- /dev/null
+++ b/sources/inc/lang/en/editrev.txt
@@ -0,0 +1,2 @@
+**You've loaded an old revision of the document!** If you save it, you will create a new version with this data.
+----
diff --git a/sources/inc/lang/en/index.txt b/sources/inc/lang/en/index.txt
new file mode 100644
index 0000000..152911b
--- /dev/null
+++ b/sources/inc/lang/en/index.txt
@@ -0,0 +1,4 @@
+====== Sitemap ======
+
+This is a sitemap over all available pages ordered by [[doku>namespaces|namespaces]].
+
diff --git a/sources/inc/lang/en/install.html b/sources/inc/lang/en/install.html
new file mode 100644
index 0000000..df2b699
--- /dev/null
+++ b/sources/inc/lang/en/install.html
@@ -0,0 +1,24 @@
+
        This page assists in the first time installation and configuration of
+Dokuwiki. More info on this
+installer is available on it's own
+documentation page.
        
+
+
        DokuWiki uses ordinary files for the storage of wiki pages and other
+information associated with those pages (e.g. images, search indexes, old
+revisions, etc).  In order to operate successfully DokuWiki
+must have write access to the directories that hold those
+files.  This installer is not capable of setting up directory permissions. That
+normally needs to be done directly on a command shell or if you are using hosting,
+through FTP or your hosting control panel (e.g. cPanel).
        
+
+
        This installer will setup your DokuWiki configuration for
+ACL, which in turn allows administrator
+login and access to DokuWiki's admin menu for installing plugins, managing
+users, managing access to wiki pages and alteration of configuration settings.
+It isn't required for DokuWiki to operate, however it will make Dokuwiki easier
+to administer.
        
+
+
        Experienced users or users with special setup requirements should use these links
+for details concerning
+installation instructions
+and configuration settings.
        
diff --git a/sources/inc/lang/en/lang.php b/sources/inc/lang/en/lang.php
new file mode 100644
index 0000000..17a7580
--- /dev/null
+++ b/sources/inc/lang/en/lang.php
@@ -0,0 +1,364 @@
+
+ * @author     Anika Henke 
+ * @author     Matthias Grimm 
+ * @author     Matthias Schulte 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“'; //“
+$lang['doublequoteclosing']    = '”'; //”
+$lang['singlequoteopening']    = '‘'; //‘
+$lang['singlequoteclosing']    = '’'; //’
+$lang['apostrophe']            = '’'; //’
+
+$lang['btn_edit']              = 'Edit this page';
+$lang['btn_source']            = 'Show pagesource';
+$lang['btn_show']              = 'Show page';
+$lang['btn_create']            = 'Create this page';
+$lang['btn_search']            = 'Search';
+$lang['btn_save']              = 'Save';
+$lang['btn_preview']           = 'Preview';
+$lang['btn_top']               = 'Back to top';
+$lang['btn_newer']             = '<< more recent';
+$lang['btn_older']             = 'less recent >>';
+$lang['btn_revs']              = 'Old revisions';
+$lang['btn_recent']            = 'Recent changes';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Cancel';
+$lang['btn_index']             = 'Sitemap';
+$lang['btn_secedit']           = 'Edit';
+$lang['btn_login']             = 'Login';
+$lang['btn_logout']            = 'Logout';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Update';
+$lang['btn_delete']            = 'Delete';
+$lang['btn_back']              = 'Back';
+$lang['btn_backlink']          = 'Backlinks';
+$lang['btn_backtomedia']       = 'Back to Mediafile Selection';
+$lang['btn_subscribe']         = 'Manage Subscriptions';
+$lang['btn_profile']           = 'Update Profile';
+$lang['btn_reset']             = 'Reset';
+$lang['btn_resendpwd']         = 'Set new password';
+$lang['btn_draft']             = 'Edit draft';
+$lang['btn_recover']           = 'Recover draft';
+$lang['btn_draftdel']          = 'Delete draft';
+$lang['btn_revert']            = 'Restore';
+$lang['btn_register']          = 'Register';
+$lang['btn_apply']             = 'Apply';
+$lang['btn_media']             = 'Media Manager';
+$lang['btn_deleteuser']        = 'Remove My Account';
+
+$lang['loggedinas']            = 'Logged in as';
+$lang['user']                  = 'Username';
+$lang['pass']                  = 'Password';
+$lang['newpass']               = 'New password';
+$lang['oldpass']               = 'Confirm current password';
+$lang['passchk']               = 'once again';
+$lang['remember']              = 'Remember me';
+$lang['fullname']              = 'Real name';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'User Profile';
+$lang['badlogin']              = 'Sorry, username or password was wrong.';
+$lang['badpassconfirm']        = 'Sorry, the password was wrong';
+$lang['minoredit']             = 'Minor Changes';
+$lang['draftdate']             = 'Draft autosaved on'; // full dformat date will be added
+$lang['nosecedit']             = 'The page was changed in the meantime, section info was out of date loaded full page instead.';
+
+$lang['regmissing']            = 'Sorry, you must fill in all fields.';
+$lang['reguexists']            = 'Sorry, a user with this login already exists.';
+$lang['regsuccess']            = 'The user has been created and the password was sent by email.';
+$lang['regsuccess2']           = 'The user has been created.';
+$lang['regmailfail']           = 'Looks like there was an error on sending the password mail. Please contact the admin!';
+$lang['regbadmail']            = 'The given email address looks invalid - if you think this is an error, contact the admin';
+$lang['regbadpass']            = 'The two given passwords are not identical, please try again.';
+$lang['regpwmail']             = 'Your DokuWiki password';
+$lang['reghere']               = 'You don\'t have an account yet? Just get one';
+
+$lang['profna']                = 'This wiki does not support profile modification';
+$lang['profnochange']          = 'No changes, nothing to do.';
+$lang['profnoempty']           = 'An empty name or email address is not allowed.';
+$lang['profchanged']           = 'User profile successfully updated.';
+$lang['profnodelete']          = 'This wiki does not support deleting users';
+$lang['profdeleteuser']        = 'Delete Account';
+$lang['profdeleted']           = 'Your user account has been deleted from this wiki';
+$lang['profconfdelete']        = 'I wish to remove my account from this wiki. 
         This action can not be undone.';
+$lang['profconfdeletemissing'] = 'Confirmation check box not ticked';
+
+$lang['pwdforget']             = 'Forgotten your password? Get a new one';
+$lang['resendna']              = 'This wiki does not support password resending.';
+$lang['resendpwd']             = 'Set new password for';
+$lang['resendpwdmissing']      = 'Sorry, you must fill in all fields.';
+$lang['resendpwdnouser']       = 'Sorry, we can\'t find this user in our database.';
+$lang['resendpwdbadauth']      = 'Sorry, this auth code is not valid. Make sure you used the complete confirmation link.';
+$lang['resendpwdconfirm']      = 'A confirmation link has been sent by email.';
+$lang['resendpwdsuccess']      = 'Your new password has been sent by email.';
+
+$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';
+$lang['maxuploadsize']         = 'Upload max. %s per file.';
+$lang['lockedby']              = 'Currently locked by';
+$lang['lockexpire']            = 'Lock expires at';
+
+$lang['js']['willexpire']      = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+$lang['js']['notsavedyet']     = 'Unsaved changes will be lost.';
+$lang['js']['searchmedia']     = 'Search for files';
+$lang['js']['keepopen']        = 'Keep window open on selection';
+$lang['js']['hidedetails']     = 'Hide Details';
+$lang['js']['mediatitle']      = 'Link settings';
+$lang['js']['mediadisplay']    = 'Link type';
+$lang['js']['mediaalign']      = 'Alignment';
+$lang['js']['mediasize']       = 'Image size';
+$lang['js']['mediatarget']     = 'Link target';
+$lang['js']['mediaclose']      = 'Close';
+$lang['js']['mediainsert']     = 'Insert';
+$lang['js']['mediadisplayimg'] = 'Show the image.';
+$lang['js']['mediadisplaylnk'] = 'Show only the link.';
+$lang['js']['mediasmall']      = 'Small version';
+$lang['js']['mediamedium']     = 'Medium version';
+$lang['js']['medialarge']      = 'Large version';
+$lang['js']['mediaoriginal']   = 'Original version';
+$lang['js']['medialnk']        = 'Link to detail page';
+$lang['js']['mediadirect']     = 'Direct link to original';
+$lang['js']['medianolnk']      = 'No link';
+$lang['js']['medianolink']     = 'Do not link the image';
+$lang['js']['medialeft']       = 'Align the image on the left.';
+$lang['js']['mediaright']      = 'Align the image on the right.';
+$lang['js']['mediacenter']     = 'Align the image in the middle.';
+$lang['js']['medianoalign']    = 'Use no align.';
+$lang['js']['nosmblinks']      = 'Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.';
+$lang['js']['linkwiz']         = 'Link Wizard';
+$lang['js']['linkto']          = 'Link to:';
+$lang['js']['del_confirm']     = 'Really delete selected item(s)?';
+$lang['js']['restore_confirm'] = 'Really restore this version?';
+$lang['js']['media_diff']          = 'View differences:';
+$lang['js']['media_diff_both']     = 'Side by Side';
+$lang['js']['media_diff_opacity']  = 'Shine-through';
+$lang['js']['media_diff_portions'] = 'Swipe';
+$lang['js']['media_select']        = 'Select files…';
+$lang['js']['media_upload_btn']    = 'Upload';
+$lang['js']['media_done_btn']      = 'Done';
+$lang['js']['media_drop']          = 'Drop files here to upload';
+$lang['js']['media_cancel']        = 'remove';
+$lang['js']['media_overwrt']       = 'Overwrite existing files';
+
+$lang['rssfailed']             = 'An error occurred while fetching this feed: ';
+$lang['nothingfound']          = 'Nothing was found.';
+
+$lang['mediaselect']           = 'Media Files';
+$lang['fileupload']            = 'Media File Upload';
+$lang['uploadsucc']            = 'Upload successful';
+$lang['uploadfail']            = 'Upload failed. Maybe wrong permissions?';
+$lang['uploadwrong']           = 'Upload denied. This file extension is forbidden!';
+$lang['uploadexist']           = 'File already exists. Nothing done.';
+$lang['uploadbadcontent']      = 'The uploaded content did not match the %s file extension.';
+$lang['uploadspam']            = 'The upload was blocked by the spam blacklist.';
+$lang['uploadxss']             = 'The upload was blocked for possibly malicious content.';
+$lang['uploadsize']            = 'The uploaded file was too big. (max. %s)';
+$lang['deletesucc']            = 'The file "%s" has been deleted.';
+$lang['deletefail']            = '"%s" couldn\'t be deleted - check permissions.';
+$lang['mediainuse']            = 'The file "%s" hasn\'t been deleted - it is still in use.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'Available files in';
+$lang['accessdenied']          = 'You are not allowed to view this page.';
+$lang['mediausage']            = 'Use the following syntax to reference this file:';
+$lang['mediaview']             = 'View original file';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Upload a file to the current namespace here. To create subnamespaces, prepend them to your filename separated by colons after you selected the files. Files can also be selected by drag and drop.';
+$lang['mediaextchange']        = 'Filextension changed from .%s to .%s!';
+$lang['reference']             = 'References for';
+$lang['ref_inuse']             = 'The file can\'t be deleted, because it\'s still used by the following pages:';
+$lang['ref_hidden']            = 'Some references  are on pages you don\'t have permission to read';
+
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Matching pagenames';
+$lang['toc']                   = 'Table of Contents';
+$lang['current']               = 'current';
+$lang['yours']                 = 'Your Version';
+$lang['diff']                  = 'Show differences to current revisions';
+$lang['diff2']                 = 'Show differences between selected revisions';
+$lang['difflink']              = 'Link to this comparison view';
+$lang['diff_type']             = 'View differences:';
+$lang['diff_inline']           = 'Inline';
+$lang['diff_side']             = 'Side by Side';
+$lang['line']                  = 'Line';
+$lang['breadcrumb']            = 'Trace';
+$lang['youarehere']            = 'You are here';
+$lang['lastmod']               = 'Last modified';
+$lang['by']                    = 'by';
+$lang['deleted']               = 'removed';
+$lang['created']               = 'created';
+$lang['restored']              = 'old revision restored (%s)';
+$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['tools']                 = 'Tools';
+$lang['user_tools']            = 'User Tools';
+$lang['site_tools']            = 'Site Tools';
+$lang['page_tools']            = 'Page Tools';
+$lang['skip_to_content']       = 'skip to content';
+$lang['sidebar']               = 'Sidebar';
+
+$lang['mail_newpage']          = 'page added:';
+$lang['mail_changed']          = 'page changed:';
+$lang['mail_subscribe_list']   = 'pages changed in namespace:';
+$lang['mail_new_user']         = 'new user:';
+$lang['mail_upload']           = 'file uploaded:';
+
+$lang['changes_type']          = 'View changes of';
+$lang['pages_changes']         = 'Pages';
+$lang['media_changes']         = 'Media files';
+$lang['both_changes']          = 'Both pages and media files';
+
+$lang['qb_bold']               = 'Bold Text';
+$lang['qb_italic']             = 'Italic Text';
+$lang['qb_underl']             = 'Underlined Text';
+$lang['qb_code']               = 'Code Text';
+$lang['qb_strike']             = 'Strike-through Text';
+$lang['qb_h1']                 = 'Level 1 Headline';
+$lang['qb_h2']                 = 'Level 2 Headline';
+$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';
+$lang['qb_ol']                 = 'Ordered List Item';
+$lang['qb_ul']                 = 'Unordered List Item';
+$lang['qb_media']              = 'Add Images and other files (opens in a new window)';
+$lang['qb_sig']                = 'Insert Signature';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Special Chars';
+
+$lang['upperns']               = 'jump to parent namespace';
+
+$lang['admin_register']        = 'Add new user';
+
+$lang['metaedit']              = 'Edit Metadata';
+$lang['metasaveerr']           = 'Writing metadata failed';
+$lang['metasaveok']            = 'Metadata saved';
+$lang['img_backto']            = 'Back to';
+$lang['img_title']             = 'Title';
+$lang['img_caption']           = 'Caption';
+$lang['img_date']              = 'Date';
+$lang['img_fname']             = 'Filename';
+$lang['img_fsize']             = 'Size';
+$lang['img_artist']            = 'Photographer';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Keywords';
+$lang['img_width']             = 'Width';
+$lang['img_height']            = 'Height';
+$lang['img_manager']           = 'View in media manager';
+
+$lang['subscr_subscribe_success']   = 'Added %s to subscription list for %s';
+$lang['subscr_subscribe_error']     = 'Error adding %s to subscription list for %s';
+$lang['subscr_subscribe_noaddress'] = 'There is no address associated with your login, you cannot be added to the subscription list';
+$lang['subscr_unsubscribe_success'] = 'Removed %s from subscription list for %s';
+$lang['subscr_unsubscribe_error']   = 'Error removing %s from subscription list for %s';
+$lang['subscr_already_subscribed']  = '%s is already subscribed to %s';
+$lang['subscr_not_subscribed']      = '%s is not subscribed to %s';
+// Manage page for subscriptions
+$lang['subscr_m_not_subscribed']    = 'You are currently not subscribed to the current page or namespace.';
+$lang['subscr_m_new_header']        = 'Add subscription';
+$lang['subscr_m_current_header']    = 'Current subscriptions';
+$lang['subscr_m_unsubscribe']       = 'Unsubscribe';
+$lang['subscr_m_subscribe']         = 'Subscribe';
+$lang['subscr_m_receive']           = 'Receive';
+$lang['subscr_style_every']         = 'email on every change';
+$lang['subscr_style_digest']        = 'digest email of changes for each page (every %.2f days)';
+$lang['subscr_style_list']          = 'list of changed pages since last email (every %.2f days)';
+
+/* auth.class language support */
+$lang['authtempfail']          = 'User authentication is temporarily unavailable. If this situation persists, please inform your Wiki Admin.';
+$lang['authpwdexpire']         = 'Your password will expire in %d days, you should change it soon.';
+
+/* installer strings */
+$lang['i_chooselang']          = 'Choose your language';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Wiki Name';
+$lang['i_enableacl']           = 'Enable ACL (recommended)';
+$lang['i_superuser']           = 'Superuser';
+$lang['i_problems']            = 'The installer found some problems, indicated below. You can not continue until you have fixed them.';
+$lang['i_modified']            = 'For security reasons this script will only work with a new and unmodified Dokuwiki installation.
+                                  You should either re-extract the files from the downloaded package or consult the complete
+                                  Dokuwiki installation instructions';
+$lang['i_funcna']              = 'PHP function %s is not available. Maybe your hosting provider disabled it for some reason?';
+$lang['i_phpver']              = 'Your PHP version %s is lower than the needed %s. You need to upgrade your PHP install.';
+$lang['i_permfail']            = '%s is not writable by DokuWiki. You need to fix the permission settings of this directory!';
+$lang['i_confexists']          = '%s already exists';
+$lang['i_writeerr']            = 'Unable to create %s. You will need to check directory/file permissions and create the file manually.';
+$lang['i_badhash']             = 'unrecognised or modified dokuwiki.php (hash=%s)';
+$lang['i_badval']              = '%s - illegal or empty value';
+$lang['i_success']             = 'The configuration was finished successfully. You may delete the install.php file now. Continue to
+                                 your new DokuWiki.';
+$lang['i_failure']             = 'Some errors occurred while writing the configuration files. You may need to fix them manually before
+                                  you can use your new DokuWiki.';
+$lang['i_policy']              = 'Initial ACL policy';
+$lang['i_pol0']                = 'Open Wiki (read, write, upload for everyone)';
+$lang['i_pol1']                = 'Public Wiki (read for everyone, write and upload for registered users)';
+$lang['i_pol2']                = 'Closed Wiki (read, write, upload for registered users only)';
+$lang['i_allowreg']            = 'Allow users to register themselves';
+$lang['i_retry']               = 'Retry';
+$lang['i_license']             = 'Please choose the license you want to put your content under:';
+$lang['i_license_none']        = 'Do not show any license information';
+$lang['i_pop_field']           = 'Please, help us to improve the DokuWiki experience:';
+$lang['i_pop_label']           = 'Once a month, send anonymous usage data to the DokuWiki developers';
+
+$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';
+
+$lang['wordblock']             = 'Your change was not saved because it contains blocked text (spam).';
+
+$lang['media_uploadtab']       = 'Upload';
+$lang['media_searchtab']       = 'Search';
+$lang['media_file']            = 'File';
+$lang['media_viewtab']         = 'View';
+$lang['media_edittab']         = 'Edit';
+$lang['media_historytab']      = 'History';
+$lang['media_list_thumbs']     = 'Thumbnails';
+$lang['media_list_rows']       = 'Rows';
+$lang['media_sort_name']       = 'Name';
+$lang['media_sort_date']       = 'Date';
+$lang['media_namespaces']      = 'Choose namespace';
+$lang['media_files']           = 'Files in %s';
+$lang['media_upload']          = 'Upload to %s';
+$lang['media_search']          = 'Search in %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s at %s';
+$lang['media_edit']            = 'Edit %s';
+$lang['media_history']         = 'History of %s';
+$lang['media_meta_edited']     = 'metadata edited';
+$lang['media_perm_read']       = 'Sorry, you don\'t have enough rights to read files.';
+$lang['media_perm_upload']     = 'Sorry, you don\'t have enough rights to upload files.';
+$lang['media_update']          = 'Upload new version';
+$lang['media_restore']         = 'Restore this version';
+
+$lang['currentns']             = 'Current namespace';
+$lang['searchresult']          = 'Search Result';
+$lang['plainhtml']             = 'Plain HTML';
+$lang['wikimarkup']            = 'Wiki Markup';
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/inc/lang/en/locked.txt b/sources/inc/lang/en/locked.txt
new file mode 100644
index 0000000..af6347a
--- /dev/null
+++ b/sources/inc/lang/en/locked.txt
@@ -0,0 +1,3 @@
+====== Page locked ======
+
+This page is currently locked for editing by another user. You have to wait until this user finishes editing or the lock expires.
diff --git a/sources/inc/lang/en/login.txt b/sources/inc/lang/en/login.txt
new file mode 100644
index 0000000..2004ea1
--- /dev/null
+++ b/sources/inc/lang/en/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in.
+
diff --git a/sources/inc/lang/en/mailtext.txt b/sources/inc/lang/en/mailtext.txt
new file mode 100644
index 0000000..44a3f65
--- /dev/null
+++ b/sources/inc/lang/en/mailtext.txt
@@ -0,0 +1,17 @@
+A page in your DokuWiki was added or changed. Here are the details:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/en/mailwrap.html b/sources/inc/lang/en/mailwrap.html
new file mode 100644
index 0000000..f9f80fd
--- /dev/null
+++ b/sources/inc/lang/en/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+    @TITLE@
+    
+
+
+
+@HTMLBODY@
+
+
        
+This mail was generated by DokuWiki at @DOKUWIKIURL@.
+
+
diff --git a/sources/inc/lang/en/newpage.txt b/sources/inc/lang/en/newpage.txt
new file mode 100644
index 0000000..e78b534
--- /dev/null
+++ b/sources/inc/lang/en/newpage.txt
@@ -0,0 +1,4 @@
+====== 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 clicking on "Create this page".
+
diff --git a/sources/inc/lang/en/norev.txt b/sources/inc/lang/en/norev.txt
new file mode 100644
index 0000000..27c336b
--- /dev/null
+++ b/sources/inc/lang/en/norev.txt
@@ -0,0 +1,4 @@
+====== No such revision ======
+
+The specified revision doesn't exist. Click on "Old revisions" for a list of old revisions of this document.
+
diff --git a/sources/inc/lang/en/password.txt b/sources/inc/lang/en/password.txt
new file mode 100644
index 0000000..6d5cbe6
--- /dev/null
+++ b/sources/inc/lang/en/password.txt
@@ -0,0 +1,10 @@
+Hi @FULLNAME@!
+
+Here is your userdata for @TITLE@ at @DOKUWIKIURL@
+
+Login    : @LOGIN@
+Password : @PASSWORD@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/en/preview.txt b/sources/inc/lang/en/preview.txt
new file mode 100644
index 0000000..5ca6969
--- /dev/null
+++ b/sources/inc/lang/en/preview.txt
@@ -0,0 +1,4 @@
+====== Preview ======
+
+This is a preview of what your text will look like. Remember: It is **not saved** yet!
+
diff --git a/sources/inc/lang/en/pwconfirm.txt b/sources/inc/lang/en/pwconfirm.txt
new file mode 100644
index 0000000..a342ff9
--- /dev/null
+++ b/sources/inc/lang/en/pwconfirm.txt
@@ -0,0 +1,15 @@
+Hi @FULLNAME@!
+
+Someone requested a new password for your @TITLE@
+login at @DOKUWIKIURL@
+
+If you did not request a new password then just ignore this email.
+
+To confirm that the request was really sent by you please use the
+following link.
+
+@CONFIRM@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/en/read.txt b/sources/inc/lang/en/read.txt
new file mode 100644
index 0000000..9f56d81
--- /dev/null
+++ b/sources/inc/lang/en/read.txt
@@ -0,0 +1,2 @@
+This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
+
diff --git a/sources/inc/lang/en/recent.txt b/sources/inc/lang/en/recent.txt
new file mode 100644
index 0000000..3f7b58c
--- /dev/null
+++ b/sources/inc/lang/en/recent.txt
@@ -0,0 +1,5 @@
+====== Recent Changes ======
+
+The following pages were changed recently.
+
+
diff --git a/sources/inc/lang/en/register.txt b/sources/inc/lang/en/register.txt
new file mode 100644
index 0000000..db68d4f
--- /dev/null
+++ b/sources/inc/lang/en/register.txt
@@ -0,0 +1,4 @@
+====== Register as new user ======
+
+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>pagename|pagename]].
+
diff --git a/sources/inc/lang/en/registermail.txt b/sources/inc/lang/en/registermail.txt
new file mode 100644
index 0000000..f020157
--- /dev/null
+++ b/sources/inc/lang/en/registermail.txt
@@ -0,0 +1,14 @@
+A new user has registered. Here are the details:
+
+User name   : @NEWUSER@
+Full name   : @NEWNAME@
+E-mail      : @NEWEMAIL@
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/en/resendpwd.txt b/sources/inc/lang/en/resendpwd.txt
new file mode 100644
index 0000000..98c8c75
--- /dev/null
+++ b/sources/inc/lang/en/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Send new password ======
+
+Please enter your user name in the form below to request a new password for your account in this wiki. A confirmation link will be sent to your registered email address.
+
diff --git a/sources/inc/lang/en/resetpwd.txt b/sources/inc/lang/en/resetpwd.txt
new file mode 100644
index 0000000..993b487
--- /dev/null
+++ b/sources/inc/lang/en/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Set new password ======
+
+Please enter a new password for your account in this wiki.
+
diff --git a/sources/inc/lang/en/revisions.txt b/sources/inc/lang/en/revisions.txt
new file mode 100644
index 0000000..dd5f35b
--- /dev/null
+++ b/sources/inc/lang/en/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/en/searchpage.txt b/sources/inc/lang/en/searchpage.txt
new file mode 100644
index 0000000..50578db
--- /dev/null
+++ b/sources/inc/lang/en/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 tool.
+
+===== Results =====
diff --git a/sources/inc/lang/en/showrev.txt b/sources/inc/lang/en/showrev.txt
new file mode 100644
index 0000000..3608de3
--- /dev/null
+++ b/sources/inc/lang/en/showrev.txt
@@ -0,0 +1,2 @@
+**This is an old revision of the document!**
+----
diff --git a/sources/inc/lang/en/stopwords.txt b/sources/inc/lang/en/stopwords.txt
new file mode 100644
index 0000000..afc3016
--- /dev/null
+++ b/sources/inc/lang/en/stopwords.txt
@@ -0,0 +1,39 @@
+# 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
diff --git a/sources/inc/lang/en/subscr_digest.txt b/sources/inc/lang/en/subscr_digest.txt
new file mode 100644
index 0000000..35011b6
--- /dev/null
+++ b/sources/inc/lang/en/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hello!
+
+The page @PAGE@ in the @TITLE@ wiki changed.
+Here are the changes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+
+To cancel the page notifications, log into the wiki at
+@DOKUWIKIURL@ then visit
+@SUBSCRIBE@
+and unsubscribe page and/or namespace changes.
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/en/subscr_form.txt b/sources/inc/lang/en/subscr_form.txt
new file mode 100644
index 0000000..d606508
--- /dev/null
+++ b/sources/inc/lang/en/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Subscription Management ======
+
+This page allows you to manage your subscriptions for the current page and namespace.
diff --git a/sources/inc/lang/en/subscr_list.txt b/sources/inc/lang/en/subscr_list.txt
new file mode 100644
index 0000000..4c38b93
--- /dev/null
+++ b/sources/inc/lang/en/subscr_list.txt
@@ -0,0 +1,17 @@
+Hello!
+
+Pages in the namespace @PAGE@ of the @TITLE@ wiki changed.
+Here are the changed pages:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+To cancel the page notifications, log into the wiki at
+@DOKUWIKIURL@ then visit
+@SUBSCRIBE@
+and unsubscribe page and/or namespace changes.
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/en/subscr_single.txt b/sources/inc/lang/en/subscr_single.txt
new file mode 100644
index 0000000..0bc310e
--- /dev/null
+++ b/sources/inc/lang/en/subscr_single.txt
@@ -0,0 +1,23 @@
+Hello!
+
+The page @PAGE@ in the @TITLE@ wiki changed.
+Here are the changes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Date        : @DATE@
+User        : @USER@
+Edit Summary: @SUMMARY@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+
+To cancel the page notifications, log into the wiki at
+@DOKUWIKIURL@ then visit
+@SUBSCRIBE@
+and unsubscribe page and/or namespace changes.
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/en/updateprofile.txt b/sources/inc/lang/en/updateprofile.txt
new file mode 100644
index 0000000..b929fee
--- /dev/null
+++ b/sources/inc/lang/en/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Update your account profile ======
+
+You only need to complete those fields you wish to change.  You may not change your user name.
+
+
diff --git a/sources/inc/lang/en/uploadmail.txt b/sources/inc/lang/en/uploadmail.txt
new file mode 100644
index 0000000..16bb698
--- /dev/null
+++ b/sources/inc/lang/en/uploadmail.txt
@@ -0,0 +1,15 @@
+A file was uploaded to your DokuWiki. Here are the details:
+
+File        : @MEDIA@
+Old revision: @OLD@
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Size        : @SIZE@
+MIME Type   : @MIME@
+User        : @USER@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/eo/admin.txt b/sources/inc/lang/eo/admin.txt
new file mode 100644
index 0000000..4b0cf79
--- /dev/null
+++ b/sources/inc/lang/eo/admin.txt
@@ -0,0 +1,3 @@
+====== Administrado ======
+
+Sube vi povas trovi liston de administraj taskoj disponeblaj en DokuWiki.
diff --git a/sources/inc/lang/eo/adminplugins.txt b/sources/inc/lang/eo/adminplugins.txt
new file mode 100644
index 0000000..769a8c5
--- /dev/null
+++ b/sources/inc/lang/eo/adminplugins.txt
@@ -0,0 +1 @@
+===== Eksteraj kromaĵoj =====
\ No newline at end of file
diff --git a/sources/inc/lang/eo/backlinks.txt b/sources/inc/lang/eo/backlinks.txt
new file mode 100644
index 0000000..cd0cca9
--- /dev/null
+++ b/sources/inc/lang/eo/backlinks.txt
@@ -0,0 +1,3 @@
+====== Retroligiloj ======
+
+Ĉi tiu listo montras paĝojn, kiuj referencas al la aktuala paĝo.
\ No newline at end of file
diff --git a/sources/inc/lang/eo/conflict.txt b/sources/inc/lang/eo/conflict.txt
new file mode 100644
index 0000000..cd01929
--- /dev/null
+++ b/sources/inc/lang/eo/conflict.txt
@@ -0,0 +1,5 @@
+====== Pli nova versio ekzistas ======
+
+Ekzistas pli nova versio de la dokumento. Tio okazas kiam iu alia uzanto ŝanĝis enhavon de la dokumento dum vi redaktis ĝin.
+
+Atente esploru distingojn kaj decidu kiun version vi tenos. Se vi premos '"Konservi'", do via versio estos konservita. Presonte butonon '"Rezigni" vi tenos la kurantan version.
diff --git a/sources/inc/lang/eo/denied.txt b/sources/inc/lang/eo/denied.txt
new file mode 100644
index 0000000..3cd6c76
--- /dev/null
+++ b/sources/inc/lang/eo/denied.txt
@@ -0,0 +1,4 @@
+====== Aliro malpermesita ======
+
+Vi ne havas sufiĉajn rajtojn rigardi ĉi tiujn paĝojn. Eble vi forgesis identiĝi.
+
diff --git a/sources/inc/lang/eo/diff.txt b/sources/inc/lang/eo/diff.txt
new file mode 100644
index 0000000..5829a7d
--- /dev/null
+++ b/sources/inc/lang/eo/diff.txt
@@ -0,0 +1,4 @@
+====== Diferencoj ======
+
+Ĉi tie vi povas vidi diferencojn inter la aktuala versio kaj la elektita revizio de la paĝo.
+
diff --git a/sources/inc/lang/eo/draft.txt b/sources/inc/lang/eo/draft.txt
new file mode 100644
index 0000000..32ddc83
--- /dev/null
+++ b/sources/inc/lang/eo/draft.txt
@@ -0,0 +1,5 @@
+====== Skiza dosiero troviĝis ======
+
+Via lasta sekcio de redakto en tiu ĉi paĝo ne korekte kompletiĝis. DokuWiki aŭtomate konservis skizon dum vi laboris, kiun vi nun povas uzi por daŭrigi vian redaktadon. Sube vi povas vidi la datumaron, kiu konserviĝis el via lasta sekcio.
+
+Bonvolu decidi ĉu vi volas //restarigi// vian perditan redakton, //forigi// la aŭtomate konservitan skizon aŭ //rezigni// pri la redakta procezo.
diff --git a/sources/inc/lang/eo/edit.txt b/sources/inc/lang/eo/edit.txt
new file mode 100644
index 0000000..29b3382
--- /dev/null
+++ b/sources/inc/lang/eo/edit.txt
@@ -0,0 +1 @@
+Redaktu paĝon kaj poste premu butonon titolitan '"Konservi'". Bonvolu tralegi la [[wiki:syntax|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, bonvolu uzi specialan paĝon: [[wiki:playground|ludejo]].
diff --git a/sources/inc/lang/eo/editrev.txt b/sources/inc/lang/eo/editrev.txt
new file mode 100644
index 0000000..1640baa
--- /dev/null
+++ b/sources/inc/lang/eo/editrev.txt
@@ -0,0 +1,2 @@
+**Vi laboras kun malnova revizio de la dokumento!** Se vi konservos ĝin, kreiĝos nova kuranta versio kun la sama enhavo.
+----
diff --git a/sources/inc/lang/eo/index.txt b/sources/inc/lang/eo/index.txt
new file mode 100644
index 0000000..ac1f32c
--- /dev/null
+++ b/sources/inc/lang/eo/index.txt
@@ -0,0 +1,3 @@
+====== Enhavo ======
+
+Tio ĉi estas indekso pri ĉiuj disponeblaj paĝoj ordigitaj laŭ [[doku>namespaces|nomspacoj]].
diff --git a/sources/inc/lang/eo/install.html b/sources/inc/lang/eo/install.html
new file mode 100644
index 0000000..0fb94e4
--- /dev/null
+++ b/sources/inc/lang/eo/install.html
@@ -0,0 +1,9 @@
+
        Tiu ĉi paĝo helpas en la unua instalo kaj agordado de DokuWiki. Pli da informo pri tiu instalilo disponeblas en ĝia propra dokumentada paĝo.
        
+
+
        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 retprovidanto (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 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ŭ uzantoj kiuj bezonas specialajn agordrimedojn uzu tiujn ligilojn por havi pli detalojn pri instaladaj instrukcioj
+kaj agordadaj difinoj.
        
diff --git a/sources/inc/lang/eo/lang.php b/sources/inc/lang/eo/lang.php
new file mode 100644
index 0000000..a543b25
--- /dev/null
+++ b/sources/inc/lang/eo/lang.php
@@ -0,0 +1,336 @@
+
+ * @author Felipe Castro 
+ * @author Felipe Castro 
+ * @author Felipe Castro 
+ * @author Robert Bogenschneider 
+ * @author Erik Pedersen 
+ * @author Robert Bogenschneider 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Redakti la paĝon';
+$lang['btn_source']            = 'Montri fontan tekston';
+$lang['btn_show']              = 'Montri paĝon';
+$lang['btn_create']            = 'Krei paĝon';
+$lang['btn_search']            = 'Serĉi';
+$lang['btn_save']              = 'Konservi';
+$lang['btn_preview']           = 'Antaŭrigardi';
+$lang['btn_top']               = 'Supren';
+$lang['btn_newer']             = '<< pli freŝe';
+$lang['btn_older']             = 'malpli freŝe >>';
+$lang['btn_revs']              = 'Malnovaj revizioj';
+$lang['btn_recent']            = 'Freŝaj ŝanĝoj';
+$lang['btn_upload']            = 'Alŝuti';
+$lang['btn_cancel']            = 'Rezigni';
+$lang['btn_index']             = 'Indekso';
+$lang['btn_secedit']           = 'Redakti';
+$lang['btn_login']             = 'Ensaluti';
+$lang['btn_logout']            = 'Elsaluti';
+$lang['btn_admin']             = 'Administri';
+$lang['btn_update']            = 'Ĝisdatigi';
+$lang['btn_delete']            = 'Forigi';
+$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_profile']           = 'Ĝisdatigi profilon';
+$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['btn_register']          = 'Registriĝi';
+$lang['btn_apply']             = 'Apliki';
+$lang['btn_media']             = 'Medio-administrilo';
+$lang['btn_deleteuser']        = 'Forigi mian aliĝon';
+$lang['loggedinas']            = 'Ensalutinta kiel';
+$lang['user']                  = 'Uzant-nomo';
+$lang['pass']                  = 'Pasvorto';
+$lang['newpass']               = 'Nova pasvorto';
+$lang['oldpass']               = 'Konfirmu la nunan pasvorton';
+$lang['passchk']               = 'plian fojon';
+$lang['remember']              = 'Rememoru min';
+$lang['fullname']              = 'Kompleta nomo';
+$lang['email']                 = 'Retpoŝto';
+$lang['profile']               = 'Uzanto-profilo';
+$lang['badlogin']              = 'Pardonu, uzant-nomo aŭ pasvorto estis erara.';
+$lang['badpassconfirm']        = 'Pardonu, la pasvorto malĝustis';
+$lang['minoredit']             = 'Etaj modifoj';
+$lang['draftdate']             = 'Lasta konservo de la skizo:';
+$lang['nosecedit']             = 'La paĝo ŝanĝiĝis intertempe, sekcio-informo estis malĝisdata, tial la tuta paĝo estas reŝargita.';
+$lang['regmissing']            = 'Pardonu, vi devas plenigi ĉiujn kampojn.';
+$lang['reguexists']            = 'Pardonu, ĉi tiu uzanto-nomo jam ekzistas.';
+$lang['regsuccess']            = 'La uzanto kreiĝis kaj la pasvorto sendiĝis per retpoŝto.';
+$lang['regsuccess2']           = 'La uzanto kreiĝis.';
+$lang['regmailfail']           = 'Ŝajne okazis eraro dum elsendo de la pasvorto. Bonvolu informi administranton pri tio!';
+$lang['regbadmail']            = 'Entajpita retpoŝta adreso ŝajnas ne 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, vi povas akiri ĝin';
+$lang['profna']                = 'Tiu ĉi vikio ne ebligas modifon en la profiloj.';
+$lang['profnochange']          = 'Neniu ŝanĝo, nenio farinda.';
+$lang['profnoempty']           = 'Malplena nomo aŭ retadreso ne estas permesata.';
+$lang['profchanged']           = 'La profilo de la uzanto sukcese ĝisdatiĝis.';
+$lang['profnodelete']          = 'Tiu ĉi vikio ne subtenas forigo de uzantoj';
+$lang['profdeleteuser']        = 'Forigi aliĝon';
+$lang['profdeleted']           = 'Via uzant-aliĝo estis forigata de tiu ĉi vikio';
+$lang['profconfdelete']        = 'Mi deziras forigi mian aliĝon de tiu ĉi vikio. 
         Tiu ĉi ago ne povos esti malfarata.';
+$lang['profconfdeletemissing'] = 'Konfirmilo ne estas markita';
+$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, tiu uzanto ne troveblas en nia datumbazo.';
+$lang['resendpwdbadauth']      = 'Pardonu, tiu aŭtentiga kodo ne validas. Certiĝu, ke vi uzis la kompletan konfirmigan ligilon.';
+$lang['resendpwdconfirm']      = 'Konfirmiga ligilo sendiĝis per retpoŝto.';
+$lang['resendpwdsuccess']      = 'Via nova pasvorto sendiĝis 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ŝuti';
+$lang['txt_filename']          = 'Alŝuti kiel (laŭvole)';
+$lang['txt_overwrt']           = 'Anstataŭigi ekzistantan dosieron';
+$lang['maxuploadsize']         = 'Alŝuto maks. %s po dosiero.';
+$lang['lockedby']              = 'Nune ŝlosita de';
+$lang['lockexpire']            = 'Ŝlosado ĉesos en';
+$lang['js']['willexpire']      = 'Vi povos redakti ĉi tiun paĝon post unu minuto.\nSe vi volas nuligi tempokontrolon de la ŝlosado, premu la butonon "Antaŭrigardi".';
+$lang['js']['notsavedyet']     = 'Ne konservitaj modifoj perdiĝos.
+Ĉu vi certe volas daŭrigi la procezon?';
+$lang['js']['searchmedia']     = 'Serĉi dosierojn';
+$lang['js']['keepopen']        = 'Tenu la fenestron malferma dum elekto';
+$lang['js']['hidedetails']     = 'Kaŝi detalojn';
+$lang['js']['mediatitle']      = 'Ligilaj agordoj';
+$lang['js']['mediadisplay']    = 'Ligila tipo';
+$lang['js']['mediaalign']      = 'Poziciigo';
+$lang['js']['mediasize']       = 'Bildgrandeco';
+$lang['js']['mediatarget']     = 'Ligila celo';
+$lang['js']['mediaclose']      = 'Fermi';
+$lang['js']['mediainsert']     = 'Enmeti';
+$lang['js']['mediadisplayimg'] = 'Montri la bildon.';
+$lang['js']['mediadisplaylnk'] = 'Montri nur la ligilon.';
+$lang['js']['mediasmall']      = 'Malgranda versio';
+$lang['js']['mediamedium']     = 'Meza versio';
+$lang['js']['medialarge']      = 'Granda versio';
+$lang['js']['mediaoriginal']   = 'Origina versio';
+$lang['js']['medialnk']        = 'Ligilo al detala paĝo';
+$lang['js']['mediadirect']     = 'Rekta ligilo al la origino';
+$lang['js']['medianolnk']      = 'Neniu ligilo';
+$lang['js']['medianolink']     = 'Ne ligi la bildon';
+$lang['js']['medialeft']       = 'Meti la bildon maldekstren.';
+$lang['js']['mediaright']      = 'Meti la bildon dekstren.';
+$lang['js']['mediacenter']     = 'Meti la bildon mezen.';
+$lang['js']['medianoalign']    = 'Ne uzi poziciigon.';
+$lang['js']['nosmblinks']      = 'Tio ĉi nur funkcias en "Microsoft Internet Explorer".\nVi ankoraŭ povas kopii kaj almeti la ligilon.';
+$lang['js']['linkwiz']         = 'Ligil-Asistanto';
+$lang['js']['linkto']          = 'Ligilo al:';
+$lang['js']['del_confirm']     = 'Ĉu vere forigi elektita(j)n ero(j)n?';
+$lang['js']['restore_confirm'] = 'Ĉu vere restarigi ĉi tiun version?';
+$lang['js']['media_diff']      = 'Rigardu la diferencojn:';
+$lang['js']['media_diff_both'] = 'Flankon apud flanko';
+$lang['js']['media_diff_opacity'] = 'Unu super la alia';
+$lang['js']['media_diff_portions'] = 'Ŝovilo';
+$lang['js']['media_select']    = 'Elektu dosierojn...';
+$lang['js']['media_upload_btn'] = 'Alŝuto';
+$lang['js']['media_done_btn']  = 'Finita';
+$lang['js']['media_drop']      = 'Demetu ĉi-tien por alŝuti';
+$lang['js']['media_cancel']    = 'forigi';
+$lang['js']['media_overwrt']   = 'Anstataûi ekzistantajn dosierojn';
+$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';
+$lang['uploadsucc']            = 'Alŝuto sukcesis';
+$lang['uploadfail']            = 'Alŝuto malsukcesis. Ĉu eble estas problemoj pro permes-atributoj?';
+$lang['uploadwrong']           = 'Rifuzita alŝuto. Tiu ĉi dosiersufikso estas malpermesata!';
+$lang['uploadexist']           = 'La dosiero jam ekzistas. Nenio estas farita.';
+$lang['uploadbadcontent']      = 'La alŝutita enhavo ne kongruas al la sufikso %s.';
+$lang['uploadspam']            = 'La alŝutaĵo blokiĝis de kontraŭspama vortlisto.';
+$lang['uploadxss']             = 'La alŝutajo blokiĝis pro ebla malica enhavo.';
+$lang['uploadsize']            = 'La alŝutita dosiero estis tro granda. (maks. %s)';
+$lang['deletesucc']            = 'La dosiero "%s" forigiĝis.';
+$lang['deletefail']            = '"%s" ne povis esti forigita - kontrolu permes-atributojn.';
+$lang['mediainuse']            = 'La dosiero "%s" ne forigiĝis - ĝi ankoraŭ estas uzata.';
+$lang['namespaces']            = 'Nomspacoj';
+$lang['mediafiles']            = 'Disponeblaj dosieroj';
+$lang['accessdenied']          = 'Vi ne rajtas vidi tiun paĝon.';
+$lang['mediausage']            = 'Uzu 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 tien ĉi. Por krei subnomspacojn, antaŭmetu ilin al via "Alŝuti kiel" dosiernomo, disigigante 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 jenaj paĝoj:';
+$lang['ref_hidden']            = 'Kelkaj referencoj estas en paĝoj, kiujn vi ne rajtas legi';
+$lang['hits']                  = 'Trafoj';
+$lang['quickhits']             = 'Trafoj trovitaj en paĝnomoj';
+$lang['toc']                   = 'Enhavtabelo';
+$lang['current']               = 'aktuala';
+$lang['yours']                 = 'Via versio';
+$lang['diff']                  = 'Montri diferencojn el la aktuala versio';
+$lang['diff2']                 = 'Montri diferencojn inter la elektitaj revizioj';
+$lang['difflink']              = 'Ligilo al kompara rigardo';
+$lang['diff_type']             = 'Rigardi malsamojn:';
+$lang['diff_inline']           = 'Samlinie';
+$lang['diff_side']             = 'Apude';
+$lang['line']                  = 'Linio';
+$lang['breadcrumb']            = 'Paŝoj';
+$lang['youarehere']            = 'Vi estas ĉi tie';
+$lang['lastmod']               = 'Lastaj ŝanĝoj';
+$lang['by']                    = 'de';
+$lang['deleted']               = 'forigita';
+$lang['created']               = 'kreita';
+$lang['restored']              = 'malnova revizio restarigita (%s)';
+$lang['external_edit']         = 'ekstera redakto';
+$lang['summary']               = 'Bulteno de ŝanĝoj';
+$lang['noflash']               = 'La Adobe Flash Plugin necesas por montri tiun ĉi enhavon.';
+$lang['download']              = 'Elŝuti eltiraĵon';
+$lang['tools']                 = 'Iloj';
+$lang['user_tools']            = 'Uzantaj iloj';
+$lang['site_tools']            = 'Retejaj iloj';
+$lang['page_tools']            = 'Paĝaj iloj';
+$lang['skip_to_content']       = 'al la enhavo';
+$lang['sidebar']               = 'Flanka strio';
+$lang['mail_newpage']          = 'paĝo aldonita:';
+$lang['mail_changed']          = 'paĝo modifita:';
+$lang['mail_subscribe_list']   = 'ŝanĝitaj paĝoj en nomspaco:';
+$lang['mail_new_user']         = 'Nova uzanto:';
+$lang['mail_upload']           = 'dosiero alŝutita:';
+$lang['changes_type']          = 'Rigardi ŝanĝojn de';
+$lang['pages_changes']         = 'Paĝoj';
+$lang['media_changes']         = 'Mediaj dosieroj';
+$lang['both_changes']          = 'Ambaû - paĝojn kaj mediajn dosierojn';
+$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';
+$lang['qb_ol']                 = 'Elemento de numerita listo';
+$lang['qb_ul']                 = 'Elemento de ne numerita listo';
+$lang['qb_media']              = 'Aldoni bildojn kaj aliajn dosierojn';
+$lang['qb_sig']                = 'Inkluzivi subskribon';
+$lang['qb_smileys']            = 'Ridetuloj';
+$lang['qb_chars']              = 'Specialaj signaĵoj';
+$lang['upperns']               = 'saltu al la parenca nomspaco';
+$lang['admin_register']        = 'Aldoni novan uzanton';
+$lang['metaedit']              = 'Redakti metadatumaron';
+$lang['metasaveerr']           = 'La konservo de metadatumaro malsukcesis';
+$lang['metasaveok']            = 'La metadatumaro konserviĝis';
+$lang['img_backto']            = 'Iri reen al';
+$lang['img_title']             = 'Titolo';
+$lang['img_caption']           = 'Priskribo';
+$lang['img_date']              = 'Dato';
+$lang['img_fname']             = 'Dosiernomo';
+$lang['img_fsize']             = 'Grandeco';
+$lang['img_artist']            = 'Fotisto';
+$lang['img_copyr']             = 'Kopirajtoj';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Kamerao';
+$lang['img_keywords']          = 'Ŝlosilvortoj';
+$lang['img_width']             = 'Larĝeco';
+$lang['img_height']            = 'Alteco';
+$lang['img_manager']           = 'Rigardi en aŭdvidaĵ-administrilo';
+$lang['subscr_subscribe_success'] = 'Aldonis %s al la abonlisto por %s';
+$lang['subscr_subscribe_error'] = 'Eraro dum aldono de %s al la abonlisto por %s';
+$lang['subscr_subscribe_noaddress'] = 'Ne estas adreso ligita al via ensaluto, ne eblas aldoni vin al la abonlisto';
+$lang['subscr_unsubscribe_success'] = 'Forigis %s de la abonlisto por %s';
+$lang['subscr_unsubscribe_error'] = 'Eraro dum forigo de %s de la abonlisto por %s';
+$lang['subscr_already_subscribed'] = '%s jam estas abonanta al %s';
+$lang['subscr_not_subscribed'] = '%s ne abonas al %s';
+$lang['subscr_m_not_subscribed'] = 'Momente vi ne abonas la aktualan paĝon aŭ nomspacon.';
+$lang['subscr_m_new_header']   = 'Aldoni abonon';
+$lang['subscr_m_current_header'] = 'Momentaj abonoj';
+$lang['subscr_m_unsubscribe']  = 'Malaboni';
+$lang['subscr_m_subscribe']    = 'Aboni';
+$lang['subscr_m_receive']      = 'Ricevi';
+$lang['subscr_style_every']    = 'retpoŝtaĵo pro ĉiu ŝanĝo';
+$lang['subscr_style_digest']   = 'resuma retpoŝtaĵo de ŝanĝoj por ĉiu paĝo (je %.2f tagoj)';
+$lang['subscr_style_list']     = 'listo de ŝanĝitaj paĝoj ekde la lasta retpoŝtaĵo (je %.2f tagoj)';
+$lang['authtempfail']          = 'La identigo de via uzantonomo estas intertempe maldisponebla. Se tiu ĉi situacio daŭros, bonvolu informi la adminstranton de la vikio.';
+$lang['authpwdexpire']         = 'Via pasvorto malvalidos post %d tagoj, prefere ŝanĝu ĝin baldaũ.';
+$lang['i_chooselang']          = 'Elektu vian lingvon';
+$lang['i_installer']           = 'Instalilo de DokuWiki';
+$lang['i_wikiname']            = 'Nomo de la vikio';
+$lang['i_enableacl']           = 'Ebligi "ACL" (alirkontrolo, rekomendinde)';
+$lang['i_superuser']           = 'Superuzanto';
+$lang['i_problems']            = 'La instalilo trovis kelkajn problemojn, indikitaj sube. Vi ne povas pluiri ĝis ili estos iel korektitaj.';
+$lang['i_modified']            = 'Pro sekureco tiu ĉi instalilo nur funkcias por nova kaj nemodifita DokuWiki-pakaĵo.
+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?';
+$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". 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 sukcese kompletiĝis. 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']              = 'Komenca ACL-a agordo';
+$lang['i_pol0']                = 'Malferma Vikio (legi, skribi, alŝuti povas ĉiuj)';
+$lang['i_pol1']                = 'Publika Vikio (legi povas ĉiuj, skribi kaj alŝuti povas registritaj uzantoj)';
+$lang['i_pol2']                = 'Ferma Vikio (legi, skribi, alŝuti nur povas registritaj uzantoj)';
+$lang['i_retry']               = 'Reprovi';
+$lang['i_license']             = 'Bonvolu elekti la permesilon, sub kiun vi volas meti vian enhavon:';
+$lang['i_license_none']        = 'Ne montri licencinformojn';
+$lang['i_pop_field']           = 'Bonvolu helpi nin plibonigi la DokuWiki-sperton:';
+$lang['i_pop_label']           = 'Sendi unufoje monate anonimajn datumojn pri la uzo al la DokuWiki-evoluigantoj';
+$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';
+$lang['wordblock']             = 'Via ŝanĝo ne konserviĝis, ĉar ĝi enhavas blokitan tekston (spamon).';
+$lang['media_uploadtab']       = 'Alŝuto';
+$lang['media_searchtab']       = 'Serĉo';
+$lang['media_file']            = 'Dosiero';
+$lang['media_viewtab']         = 'Rigardi';
+$lang['media_edittab']         = 'Modifi';
+$lang['media_historytab']      = 'Historio';
+$lang['media_list_thumbs']     = 'Bildeto';
+$lang['media_list_rows']       = 'Kolumnoj';
+$lang['media_sort_name']       = 'per nomo';
+$lang['media_sort_date']       = 'per dato';
+$lang['media_namespaces']      = 'Elektu nomspacon';
+$lang['media_files']           = 'Dosieroj en %s';
+$lang['media_upload']          = 'Alŝuti al la nomspaco %s.';
+$lang['media_search']          = 'Serĉi en la nomspaco %s.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s ĉe %s';
+$lang['media_edit']            = 'Modifi %s';
+$lang['media_history']         = 'Protokolo de %s';
+$lang['media_meta_edited']     = 'metadatumoj ŝanĝitaj';
+$lang['media_perm_read']       = 'Bedaûrinde viaj rajtoj ne sufiĉas por legi dosierojn.';
+$lang['media_perm_upload']     = 'Bedaûrinde viaj rajtoj ne sufiĉas por alŝuti dosierojn.';
+$lang['media_update']          = 'Alŝuti novan version';
+$lang['media_restore']         = 'Restarigi ĉi tiun version';
+$lang['currentns']             = 'Aktuala nomspaco';
+$lang['searchresult']          = 'Serĉrezulto';
+$lang['plainhtml']             = 'Plena HTML';
+$lang['wikimarkup']            = 'Vikiteksto';
diff --git a/sources/inc/lang/eo/locked.txt b/sources/inc/lang/eo/locked.txt
new file mode 100644
index 0000000..abdc059
--- /dev/null
+++ b/sources/inc/lang/eo/locked.txt
@@ -0,0 +1,3 @@
+====== La paĝo estas ŝlosita ======
+
+Tiu ĉi paĝo nun blokiĝis pro redaktado de iu alia uzanto. Bonvolu atendi ke ŝi/li finu redakti aŭ ke la ŝlosada tempolimo finiĝu.
diff --git a/sources/inc/lang/eo/login.txt b/sources/inc/lang/eo/login.txt
new file mode 100644
index 0000000..2b9b343
--- /dev/null
+++ b/sources/inc/lang/eo/login.txt
@@ -0,0 +1,3 @@
+====== Enirejo ======
+
+Vi ankoraŭ ne identiĝis! Entajpu necesajn informojn sube por identiĝi. Kuketoj (cookies) devas esti ŝaltitaj.
\ No newline at end of file
diff --git a/sources/inc/lang/eo/mailtext.txt b/sources/inc/lang/eo/mailtext.txt
new file mode 100644
index 0000000..2765301
--- /dev/null
+++ b/sources/inc/lang/eo/mailtext.txt
@@ -0,0 +1,15 @@
+Paĝo en via DokuVikio ŝanĝiĝis aŭ aldoniĝis. Jen detaloj:
+
+Dato: @DATE@
+Foliumilo: @BROWSER@
+IP-adreso: @IPADDRESS@
+RetNodo: @HOSTNAME@
+Antaŭa revizio: @OLDPAGE@
+Nova revizio: @NEWPAGE@
+Bulteno de ŝanĝoj: @SUMMARY@
+Uzanto: @USER@
+
+@DIFF@
+
+-- 
+Tiu ĉi mesaĝo kreiĝis de DokuWiki, kiu lokiĝas ĉe @DOKUWIKIURL@
diff --git a/sources/inc/lang/eo/mailwrap.html b/sources/inc/lang/eo/mailwrap.html
new file mode 100644
index 0000000..9e92a00
--- /dev/null
+++ b/sources/inc/lang/eo/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Tiu retpoŝtaĵo venas de DokuWiki ĉe @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/eo/newpage.txt b/sources/inc/lang/eo/newpage.txt
new file mode 100644
index 0000000..53ab620
--- /dev/null
+++ b/sources/inc/lang/eo/newpage.txt
@@ -0,0 +1,4 @@
+====== Ĉi tiu paĝo ankoraŭ ne ekzistas ======
+
+Vi sekvis ligilon, kiu kondukas al artikolo ankoraŭ ne ekzistanta. Se vi rajtas, tiam vi povas krei tiun ĉi paĝon premante la butonon "Krei paĝon".
+
diff --git a/sources/inc/lang/eo/norev.txt b/sources/inc/lang/eo/norev.txt
new file mode 100644
index 0000000..e951a55
--- /dev/null
+++ b/sources/inc/lang/eo/norev.txt
@@ -0,0 +1,3 @@
+====== Tiu revizio ne ekzistas ======
+
+La elektita revizio ne ekzistas. Premu butonon "Malnovaj revizioj" por vidi liston de malnovaj revizioj de la dokumento.
diff --git a/sources/inc/lang/eo/password.txt b/sources/inc/lang/eo/password.txt
new file mode 100644
index 0000000..6dc42a9
--- /dev/null
+++ b/sources/inc/lang/eo/password.txt
@@ -0,0 +1,9 @@
+Saluton, @FULLNAME@!
+
+Jen viaj uzantodatumoj por @TITLE@ ĉe @DOKUWIKIURL@
+
+Ensalutnomo: @LOGIN@
+Pasvorto: @PASSWORD@
+
+-- 
+Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/sources/inc/lang/eo/preview.txt b/sources/inc/lang/eo/preview.txt
new file mode 100644
index 0000000..b3faef6
--- /dev/null
+++ b/sources/inc/lang/eo/preview.txt
@@ -0,0 +1,3 @@
+====== Antaŭrigardo ======
+
+Tiu ĉi estas antaŭrigardo de redaktita teksto. Memoru: ĝi ankoraŭ **ne konserviĝis**!
diff --git a/sources/inc/lang/eo/pwconfirm.txt b/sources/inc/lang/eo/pwconfirm.txt
new file mode 100644
index 0000000..5abc3d1
--- /dev/null
+++ b/sources/inc/lang/eo/pwconfirm.txt
@@ -0,0 +1,13 @@
+Saluton, @FULLNAME@!
+
+Iu petis novan pasvorton por via @TITLE@
+ensalutnomo ĉe @DOKUWIKIURL@
+
+Se ne vi petis tion, ignoru tiun ĉi mesaĝon.
+
+Por konfirmi, ke la peto estis vere via, bonvolu musklaki jenan ligilon:
+
+@CONFIRM@
+
+-- 
+Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/sources/inc/lang/eo/read.txt b/sources/inc/lang/eo/read.txt
new file mode 100644
index 0000000..b8c642f
--- /dev/null
+++ b/sources/inc/lang/eo/read.txt
@@ -0,0 +1,2 @@
+Tiu ĉi paĝo disponiĝas nur por legado (vi ne povas redakti ĝin). Sciigu administranton, se vi opinias ke tio estas falsa malpermeso.
+
diff --git a/sources/inc/lang/eo/recent.txt b/sources/inc/lang/eo/recent.txt
new file mode 100644
index 0000000..2454ea6
--- /dev/null
+++ b/sources/inc/lang/eo/recent.txt
@@ -0,0 +1,3 @@
+====== Freŝaj Ŝanĝoj ======
+
+Jenaj paĝoj ŝanĝiĝis antaŭ nelonge:
diff --git a/sources/inc/lang/eo/register.txt b/sources/inc/lang/eo/register.txt
new file mode 100644
index 0000000..10b303d
--- /dev/null
+++ b/sources/inc/lang/eo/register.txt
@@ -0,0 +1,4 @@
+====== Registriĝi ======
+
+Entajpu necesajn informojn por enregistriĝi. Certiĝu ke via retpoŝta adreso estas vera, ĉar ni sendos al ĝi vian pasvorton.
+
diff --git a/sources/inc/lang/eo/registermail.txt b/sources/inc/lang/eo/registermail.txt
new file mode 100644
index 0000000..9ef6013
--- /dev/null
+++ b/sources/inc/lang/eo/registermail.txt
@@ -0,0 +1,13 @@
+Nova uzanto registriĝis. Jen la detaloj:
+
+Uzantonomo: @NEWUSER@
+Kompleta nomo: @NEWNAME@
+Retadreso: @NEWEMAIL@
+
+Dato: @DATE@
+Foliumilo: @BROWSER@
+IP-Adreso: @IPADDRESS@
+Provizanto: @HOSTNAME@
+
+-- 
+Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/sources/inc/lang/eo/resendpwd.txt b/sources/inc/lang/eo/resendpwd.txt
new file mode 100644
index 0000000..556477a
--- /dev/null
+++ b/sources/inc/lang/eo/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Sendi novan pasvorton ======
+
+Bonvolu meti vian uzantonomon en la suban formularon petante novan pasvorton por via aliĝo en tiu ĉi vikio. Konfirma ligilo sendaiĝos al via registrita retadreso.
diff --git a/sources/inc/lang/eo/resetpwd.txt b/sources/inc/lang/eo/resetpwd.txt
new file mode 100644
index 0000000..442a7ac
--- /dev/null
+++ b/sources/inc/lang/eo/resetpwd.txt
@@ -0,0 +1,4 @@
+====== Difini novan pasvorton ======
+
+
+Bonvolu indiki novan pasvorton por via konto en tiu ĉi vikio.
\ No newline at end of file
diff --git a/sources/inc/lang/eo/revisions.txt b/sources/inc/lang/eo/revisions.txt
new file mode 100644
index 0000000..4f37bb1
--- /dev/null
+++ b/sources/inc/lang/eo/revisions.txt
@@ -0,0 +1,3 @@
+====== Malnovaj revizioj ======
+
+Sube estas listo de malnovaj revizioj de la dokumento. Elektu revizion se vi volas rigardi ĝin aŭ anstataŭigi kurantan paĝon per ĝi.
\ No newline at end of file
diff --git a/sources/inc/lang/eo/searchpage.txt b/sources/inc/lang/eo/searchpage.txt
new file mode 100644
index 0000000..a940c50
--- /dev/null
+++ b/sources/inc/lang/eo/searchpage.txt
@@ -0,0 +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 per la koresponda butono.
+
+===== Rezultoj =====
diff --git a/sources/inc/lang/eo/showrev.txt b/sources/inc/lang/eo/showrev.txt
new file mode 100644
index 0000000..3ece4f2
--- /dev/null
+++ b/sources/inc/lang/eo/showrev.txt
@@ -0,0 +1,2 @@
+**Tiu estas malnova revizio de la dokumento**. Klaku sur titolon por ricevi kurantan version.
+----
diff --git a/sources/inc/lang/eo/stopwords.txt b/sources/inc/lang/eo/stopwords.txt
new file mode 100644
index 0000000..d27c569
--- /dev/null
+++ b/sources/inc/lang/eo/stopwords.txt
@@ -0,0 +1,20 @@
+# Jen listo de vortoj, kiujn la indeksilo ignoras, unu vorton po linio
+# Kiam vi modifas la dosieron, estu certa ke vi uzas UNIX-stilajn linifinaĵojn (unuopa novlinio)
+# Ne enmetu vortojn malpli longajn ol 3 literoj - tiuj ĉiukaze ignoriĝas
+pri
+estas
+kaj
+mia
+via
+ili
+ilia
+kun
+por
+kiel
+tiu
+estis
+kio
+kiam
+kie
+kiu
+www
diff --git a/sources/inc/lang/eo/subscr_digest.txt b/sources/inc/lang/eo/subscr_digest.txt
new file mode 100644
index 0000000..42fc79a
--- /dev/null
+++ b/sources/inc/lang/eo/subscr_digest.txt
@@ -0,0 +1,19 @@
+Saluton!
+
+La paĝo @PAGE@ en la vikio @TITLE@ ŝanĝiĝis.
+Jen sekvas la ŝanĝoj:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Malnova versio: @OLDPAGE@
+Nova versio: @NEWPAGE@
+
+Por nuligi la paĝinformojn, ensalutu la vikion ĉe
+@DOKUWIKIURL@, poste iru al
+@SUBSCRIBE@
+kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
+
+--
+Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/sources/inc/lang/eo/subscr_form.txt b/sources/inc/lang/eo/subscr_form.txt
new file mode 100644
index 0000000..259b210
--- /dev/null
+++ b/sources/inc/lang/eo/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Abona administrado ======
+
+Tiu paĝo lasas vin administri viajn abonojn por la aktualaj paĝo kaj nomspaco.
\ No newline at end of file
diff --git a/sources/inc/lang/eo/subscr_list.txt b/sources/inc/lang/eo/subscr_list.txt
new file mode 100644
index 0000000..1957e85
--- /dev/null
+++ b/sources/inc/lang/eo/subscr_list.txt
@@ -0,0 +1,16 @@
+Saluton!
+
+Paĝoj en la nomspaco @PAGE@ en la vikio @TITLE@ ŝanĝiĝis.
+Jen sekvas la ŝanĝitaj paĝoj:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Por nuligi la paĝinformojn, ensalutu la vikion ĉe
+@DOKUWIKIURL@, poste iru al
+@SUBSCRIBE@
+kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
+
+--
+Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/sources/inc/lang/eo/subscr_single.txt b/sources/inc/lang/eo/subscr_single.txt
new file mode 100644
index 0000000..e4847e8
--- /dev/null
+++ b/sources/inc/lang/eo/subscr_single.txt
@@ -0,0 +1,22 @@
+Saluton!
+
+La paĝo @PAGE@ en la vikio @TITLE@ ŝanĝiĝis.
+Jen sekvas la ŝanĝoj:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dato: @DATE@
+Uzanto: @USER@
+Modifa resumo: @SUMMARY@
+Malnova versio: @OLDPAGE@
+Nova versio: @NEWPAGE@
+
+Por nuligi la paĝinformojn, ensalutu la vikion ĉe
+@DOKUWIKIURL@, poste iru al
+@SUBSCRIBE@
+kaj malabonu la paĝajn kaj/aŭ nomspacajn ŝanĝojn.
+
+--
+Tiu retpoŝtaĵo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/sources/inc/lang/eo/updateprofile.txt b/sources/inc/lang/eo/updateprofile.txt
new file mode 100644
index 0000000..4b52ff2
--- /dev/null
+++ b/sources/inc/lang/eo/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Ĝisdatigi vian profilon ======
+
+Vi nur kompletigu tiujn kampojn, kiujn vi deziras ŝanĝi. Vi ne povas ŝanĝi vian uzantonomon.
diff --git a/sources/inc/lang/eo/uploadmail.txt b/sources/inc/lang/eo/uploadmail.txt
new file mode 100644
index 0000000..1cb48ad
--- /dev/null
+++ b/sources/inc/lang/eo/uploadmail.txt
@@ -0,0 +1,13 @@
+Dosiero alŝutiĝis al via DokuVikio. Jen detaloj:
+
+Dosiero: @MEDIA@
+Dato: @DATE@
+Foliumilo: @BROWSER@
+IP-Adreso: @IPADDRESS@
+Ret-nodo: @HOSTNAME@
+Grandeco: @SIZE@
+Dosier-tipo: @MIME@
+Uzanto: @USER@
+
+-- 
+Tiu ĉi mesaĝo kreiĝis de DokuWiki ĉe @DOKUWIKIURL@
diff --git a/sources/inc/lang/es/admin.txt b/sources/inc/lang/es/admin.txt
new file mode 100644
index 0000000..320b1c5
--- /dev/null
+++ b/sources/inc/lang/es/admin.txt
@@ -0,0 +1,3 @@
+====== Administración ======
+
+Abajo puedes encontrar una lista de las tareas de administración disponibles en Dokuwiki.
diff --git a/sources/inc/lang/es/adminplugins.txt b/sources/inc/lang/es/adminplugins.txt
new file mode 100644
index 0000000..8e1b0f8
--- /dev/null
+++ b/sources/inc/lang/es/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugins Adicionales =====
\ No newline at end of file
diff --git a/sources/inc/lang/es/backlinks.txt b/sources/inc/lang/es/backlinks.txt
new file mode 100644
index 0000000..4de93ef
--- /dev/null
+++ b/sources/inc/lang/es/backlinks.txt
@@ -0,0 +1,4 @@
+====== Referencias ======
+
+Esta es una lista de páginas que parecen hacer referencia a la página actual.
+
diff --git a/sources/inc/lang/es/conflict.txt b/sources/inc/lang/es/conflict.txt
new file mode 100644
index 0000000..265ac1e
--- /dev/null
+++ b/sources/inc/lang/es/conflict.txt
@@ -0,0 +1,5 @@
+====== Existe una versión más reciente ======
+
+Existe una versión más reciente del documento que has editado. Esto sucede cuando otro usuario ha modificado el documento mientras lo estabas editando.
+
+Examina las diferencias mostradas abajo a fondo, y decide entonces cual conservar. Si eliges ''Guardar'', tu versión será guardada. Si eliges ''Cancelar'' se guardará la actual versión.
\ No newline at end of file
diff --git a/sources/inc/lang/es/denied.txt b/sources/inc/lang/es/denied.txt
new file mode 100644
index 0000000..d7b3740
--- /dev/null
+++ b/sources/inc/lang/es/denied.txt
@@ -0,0 +1,3 @@
+====== Permiso Denegado ======
+
+Lo siento, no tienes suficientes permisos para continuar. ¿Quizás has olvidado identificarte?
\ No newline at end of file
diff --git a/sources/inc/lang/es/diff.txt b/sources/inc/lang/es/diff.txt
new file mode 100644
index 0000000..e0e9e08
--- /dev/null
+++ b/sources/inc/lang/es/diff.txt
@@ -0,0 +1,4 @@
+====== Diferencias ======
+
+Muestra las diferencias entre dos versiones de la página.
+
diff --git a/sources/inc/lang/es/draft.txt b/sources/inc/lang/es/draft.txt
new file mode 100644
index 0000000..054d618
--- /dev/null
+++ b/sources/inc/lang/es/draft.txt
@@ -0,0 +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.
+
+Por favor decida si desea //recuperar// su sesión perdida, //eliminar// el borrador guardado automáticamente o //cancelar// el proceso de edición.
+
diff --git a/sources/inc/lang/es/edit.txt b/sources/inc/lang/es/edit.txt
new file mode 100644
index 0000000..55c3c1d
--- /dev/null
+++ b/sources/inc/lang/es/edit.txt
@@ -0,0 +1,2 @@
+Edita la página y pulsa ''Guardar''. Mira [[wiki:syntax]] para sintaxis Wiki. Por favor edita la página solo si puedes **mejorarla**. Si quieres testear algunas cosas aprende a dar tus primeros pasos en el [[playground:playground]].
+
diff --git a/sources/inc/lang/es/editrev.txt b/sources/inc/lang/es/editrev.txt
new file mode 100644
index 0000000..4b587b7
--- /dev/null
+++ b/sources/inc/lang/es/editrev.txt
@@ -0,0 +1,2 @@
+**Has cargado una revisión vieja del documento!** Si la guardas crearás una versión nueva con estos datos.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/es/index.txt b/sources/inc/lang/es/index.txt
new file mode 100644
index 0000000..148e5f4
--- /dev/null
+++ b/sources/inc/lang/es/index.txt
@@ -0,0 +1,4 @@
+====== Índice ======
+
+Este es un índice de todas las páginas disponibles ordenado por [[doku>namespaces|espacios de nombres]].
+
diff --git a/sources/inc/lang/es/install.html b/sources/inc/lang/es/install.html
new file mode 100644
index 0000000..94680bb
--- /dev/null
+++ b/sources/inc/lang/es/install.html
@@ -0,0 +1,14 @@
+
        Esta página lo asiste en la primera vez que instala y configura
+Dokuwiki.
+Más información sobre este instalador está disponible en la
+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).
        
+
+
        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
+instrucciones de instalación
+y configuración.
        
diff --git a/sources/inc/lang/es/lang.php b/sources/inc/lang/es/lang.php
new file mode 100644
index 0000000..216093f
--- /dev/null
+++ b/sources/inc/lang/es/lang.php
@@ -0,0 +1,358 @@
+
+ * @author Adrián Ariza 
+ * @author Gabiel Molina 
+ * @author Paco Avila 
+ * @author Bernardo Arlandis Mañó 
+ * @author Miguel Pagano 
+ * @author Oscar M. Lage 
+ * @author Gabriel Castillo 
+ * @author oliver@samera.com.py
+ * @author Enrico Nicoletto 
+ * @author Manuel Meco 
+ * @author Jordan Mero 
+ * @author Felipe Martinez 
+ * @author Javier Aranda 
+ * @author Zerial 
+ * @author Marvin Ortega 
+ * @author Daniel Castro Alvarado 
+ * @author Fernando J. Gómez 
+ * @author Victor Castelan 
+ * @author Mauro Javier Giamberardino 
+ * @author emezeta 
+ * @author Oscar Ciudad 
+ * @author Ruben Figols 
+ * @author Gerardo Zamudio 
+ * @author Mercè López mercelz@gmail.com
+ * @author r0sk 
+ * @author monica 
+ * @author Antonio Bueno 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Editar esta página';
+$lang['btn_source']            = 'Ver fuente';
+$lang['btn_show']              = 'Ver página';
+$lang['btn_create']            = 'Crear esta página';
+$lang['btn_search']            = 'Buscar';
+$lang['btn_save']              = 'Guardar';
+$lang['btn_preview']           = 'Previsualización';
+$lang['btn_top']               = 'Ir hasta arriba';
+$lang['btn_newer']             = '<< más reciente';
+$lang['btn_older']             = 'menos reciente >>';
+$lang['btn_revs']              = 'Revisiones antiguas';
+$lang['btn_recent']            = 'Cambios recientes';
+$lang['btn_upload']            = 'Cargar';
+$lang['btn_cancel']            = 'Cancelar';
+$lang['btn_index']             = 'Índice';
+$lang['btn_secedit']           = 'Editar';
+$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 a esta página';
+$lang['btn_backtomedia']       = 'Volver a la selección de archivos multimedia';
+$lang['btn_subscribe']         = 'Suscribirse a cambios de la página';
+$lang['btn_profile']           = 'Actualizar perfil';
+$lang['btn_reset']             = 'Restablecer';
+$lang['btn_resendpwd']         = 'Establecer nueva contraseña';
+$lang['btn_draft']             = 'Editar borrador';
+$lang['btn_recover']           = 'Recuperar borrador';
+$lang['btn_draftdel']          = 'Eliminar borrador';
+$lang['btn_revert']            = 'Restaurar';
+$lang['btn_register']          = 'Registrarse';
+$lang['btn_apply']             = 'Aplicar';
+$lang['btn_media']             = 'Gestor de ficheros';
+$lang['btn_deleteuser']        = 'Elimina Mi Cuenta';
+$lang['loggedinas']            = 'Conectado como ';
+$lang['user']                  = 'Usuario';
+$lang['pass']                  = 'Contraseña';
+$lang['newpass']               = 'Nueva contraseña';
+$lang['oldpass']               = 'Confirma tu contraseña actual';
+$lang['passchk']               = 'otra vez';
+$lang['remember']              = 'Recordarme';
+$lang['fullname']              = 'Nombre real';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'Perfil del usuario';
+$lang['badlogin']              = 'Lo siento, el usuario o la contraseña es incorrecto.';
+$lang['badpassconfirm']        = 'Lo siento, la contraseña es errónea';
+$lang['minoredit']             = 'Cambios menores';
+$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, 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, 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 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 actualizó correctamente el perfil del usuario.';
+$lang['profnodelete']          = 'Este wiki no soporta el borrado de usuarios';
+$lang['profdeleteuser']        = 'Eliminar Cuenta';
+$lang['profdeleted']           = 'Tu cuenta de usuario ha sido eliminada de este wiki';
+$lang['profconfdelete']        = 'Deseo eliminar mi cuenta de este wiki. 
         Esta acción es irreversible.';
+$lang['profconfdeletemissing'] = 'Casilla de verificación no activada.';
+$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']             = 'Establecer nueva contraseña para';
+$lang['resendpwdmissing']      = 'Lo siento, debes completar todos los campos.';
+$lang['resendpwdnouser']       = 'Lo siento, no se encuentra este usuario en nuestra base de datos.';
+$lang['resendpwdbadauth']      = 'Lo siento, este código de autenticación no es válido. Asegúrate de haber usado el enlace de confirmación entero.';
+$lang['resendpwdconfirm']      = 'Un enlace para confirmación ha sido enviado por correo electrónico.';
+$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['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']           = 'Sobreescribir archivo existente';
+$lang['maxuploadsize']         = 'Peso máximo de %s por archivo';
+$lang['lockedby']              = 'Actualmente bloqueado por';
+$lang['lockexpire']            = 'El bloqueo expira en';
+$lang['js']['willexpire']      = 'El bloqueo para la edición de esta página expira en un minuto.\nPAra prevenir conflictos uso el botón Previsualizar para restaurar el contador de bloqueo.';
+$lang['js']['notsavedyet']     = 'Los cambios que no se han guardado se perderán.
+¿Realmente quieres continuar?';
+$lang['js']['searchmedia']     = 'Buscar archivos';
+$lang['js']['keepopen']        = 'Mantener la ventana abierta luego de seleccionar';
+$lang['js']['hidedetails']     = 'Ocultar detalles';
+$lang['js']['mediatitle']      = 'Configuración del vínculo';
+$lang['js']['mediadisplay']    = 'Tipo de vínculo';
+$lang['js']['mediaalign']      = 'Alineación';
+$lang['js']['mediasize']       = 'Tamaño de la imagen';
+$lang['js']['mediatarget']     = 'Destino del vínculo';
+$lang['js']['mediaclose']      = 'Cerrar';
+$lang['js']['mediainsert']     = 'Insertar';
+$lang['js']['mediadisplayimg'] = 'Mostrar la imagen.';
+$lang['js']['mediadisplaylnk'] = 'Mostrar solo el vínculo.';
+$lang['js']['mediasmall']      = 'Versión en tamaño pequeño';
+$lang['js']['mediamedium']     = 'Versión en tamaño medio';
+$lang['js']['medialarge']      = 'Versión en tamaño grande';
+$lang['js']['mediaoriginal']   = 'Versión original';
+$lang['js']['medialnk']        = 'Vínculo a la pagina de descripción';
+$lang['js']['mediadirect']     = 'Vínculo al original';
+$lang['js']['medianolnk']      = 'Sin vínculo';
+$lang['js']['medianolink']     = 'No vincular la imagen';
+$lang['js']['medialeft']       = 'Alinear imagen a la izquierda';
+$lang['js']['mediaright']      = 'Alinear imagen a la derecha.';
+$lang['js']['mediacenter']     = 'Alinear imagen en el centro.';
+$lang['js']['medianoalign']    = 'No use alineación.';
+$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']['restore_confirm'] = '¿Estás seguro de querer restaurar esta versión?';
+$lang['js']['media_diff']      = 'Ver diferencias:';
+$lang['js']['media_diff_both'] = 'Lado por lado';
+$lang['js']['media_diff_opacity'] = 'A través de Shine';
+$lang['js']['media_diff_portions'] = 'Pasar';
+$lang['js']['media_select']    = 'Seleccionar ficheros';
+$lang['js']['media_upload_btn'] = 'Cargar';
+$lang['js']['media_done_btn']  = 'Hecho';
+$lang['js']['media_drop']      = 'Arrastra los ficheros aquí para cargar';
+$lang['js']['media_cancel']    = 'Eliminar';
+$lang['js']['media_overwrt']   = 'Sobreescribir ficheros exitentes';
+$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']           = '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.';
+$lang['uploadbadcontent']      = 'El contenido de la subida no coincide con la extensión de fichero %s';
+$lang['uploadspam']            = 'La subida ha sido bloqueada por una lista negra de spam';
+$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, aún está en uso.';
+$lang['namespaces']            = 'Espacios de nombres';
+$lang['mediafiles']            = 'Ficheros disponibles en';
+$lang['accessdenied']          = 'No tiene permisos para ver esta página.';
+$lang['mediausage']            = 'Use la siguiente sintaxis para hacer referencia a este fichero:';
+$lang['mediaview']             = 'Ver el fichero original';
+$lang['mediaroot']             = 'root';
+$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 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 seleccionadas';
+$lang['difflink']              = 'Enlace a la vista de comparación';
+$lang['diff_type']             = 'Ver diferencias';
+$lang['diff_inline']           = 'En línea';
+$lang['diff_side']             = 'Lado a lado';
+$lang['line']                  = 'Línea';
+$lang['breadcrumb']            = 'Traza';
+$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 (%s)';
+$lang['external_edit']         = 'editor externo';
+$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['tools']                 = 'Herramientas';
+$lang['user_tools']            = 'Herramientas de usuario';
+$lang['site_tools']            = 'Herramientas del sitio';
+$lang['page_tools']            = 'Herramientas de la página';
+$lang['skip_to_content']       = 'Saltar a contenido';
+$lang['sidebar']               = 'Barra lateral';
+$lang['mail_newpage']          = 'página añadida:';
+$lang['mail_changed']          = 'página cambiada:';
+$lang['mail_subscribe_list']   = 'páginas cambiadas en el espacio de nombre:';
+$lang['mail_new_user']         = 'nuevo usuario:';
+$lang['mail_upload']           = 'archivo subido:';
+$lang['changes_type']          = 'Ver cambios de';
+$lang['pages_changes']         = 'Páginas';
+$lang['media_changes']         = 'Archivos multimedia';
+$lang['both_changes']          = 'Ambas páginas y archivos multimedia';
+$lang['qb_bold']               = 'Negrita';
+$lang['qb_italic']             = 'Itálica';
+$lang['qb_underl']             = 'Subrayado';
+$lang['qb_code']               = 'Código';
+$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_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_media']              = 'Añadir Imágenes u otros ficheros';
+$lang['qb_sig']                = 'Insertar firma';
+$lang['qb_smileys']            = 'Sonrisas';
+$lang['qb_chars']              = 'Caracteres especiales';
+$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['img_backto']            = 'Volver a';
+$lang['img_title']             = 'Título';
+$lang['img_caption']           = 'Epígrafe';
+$lang['img_date']              = 'Fecha';
+$lang['img_fname']             = 'Nombre de fichero';
+$lang['img_fsize']             = 'Tamaño';
+$lang['img_artist']            = 'Fotógrafo';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Cámara';
+$lang['img_keywords']          = 'Palabras claves';
+$lang['img_width']             = 'Ancho';
+$lang['img_height']            = 'Alto';
+$lang['img_manager']           = 'Ver en el Administrador de medios';
+$lang['subscr_subscribe_success'] = 'Se agregó %s a las listas de suscripción para %s';
+$lang['subscr_subscribe_error'] = 'Error al agregar %s a las listas de suscripción para %s';
+$lang['subscr_subscribe_noaddress'] = 'No hay dirección asociada con tu registro, no se puede agregarte a la lista de suscripción';
+$lang['subscr_unsubscribe_success'] = 'Removido %s de la lista de suscripción para %s';
+$lang['subscr_unsubscribe_error'] = 'Error al remover %s de la lista de suscripción para %s';
+$lang['subscr_already_subscribed'] = '%s ya está suscrito a %s';
+$lang['subscr_not_subscribed'] = '%s no está suscrito a %s';
+$lang['subscr_m_not_subscribed'] = 'Actualmente no te encuentras suscrito a esta página o espacio de nombres';
+$lang['subscr_m_new_header']   = 'Agregar suscripción';
+$lang['subscr_m_current_header'] = 'Suscripciones actuales';
+$lang['subscr_m_unsubscribe']  = 'Darse de baja';
+$lang['subscr_m_subscribe']    = 'Suscribirse';
+$lang['subscr_m_receive']      = 'Recibir';
+$lang['subscr_style_every']    = 'enviar correo en cada cambio';
+$lang['subscr_style_digest']   = 'Resumen de correo electrónico de cambios por cada página (cada %.2f días)';
+$lang['subscr_style_list']     = 'lista de páginas modificadas desde el último correo electrónico (cada %.2f días)';
+$lang['authtempfail']          = 'La autenticación de usuarios no está disponible temporalmente. Si esta situación persiste, por favor avisa al administrador del wiki.';
+$lang['authpwdexpire']         = 'Su contraseña caducara en %d días, debería cambiarla lo antes posible';
+$lang['i_chooselang']          = 'Elija su idioma';
+$lang['i_installer']           = 'Instalador de DokuWiki';
+$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.';
+$lang['i_modified']            = 'Por razones de seguridad este script sólo funcionará con una instalación nueva y no modificada de Dokuwiki. Usted debe extraer nuevamente los ficheros del paquete bajado, o bien consultar las instrucciones de instalación de Dokuwiki completas.';
+$lang['i_funcna']              = 'La función de PHP %s no está disponible. ¿Tal vez su proveedor de hosting la ha deshabilitado por alguna razón?';
+$lang['i_phpver']              = 'Su versión de PHP %s es menor que la necesaria %s. Es necesario que actualice su instalación de PHP.';
+$lang['i_permfail']            = 'DokuWili no puede escribir %s. ¡Es necesario establecer  correctamente los permisos de este directorio!';
+$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 - 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 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_allowreg']            = 'Permitir que los usuarios se registren a sí mismos';
+$lang['i_retry']               = 'Reintentar';
+$lang['i_license']             = 'Por favor escoja una licencia bajo la que publicar su contenido:';
+$lang['i_license_none']        = 'No mostrar ninguna información sobre licencias';
+$lang['i_pop_field']           = 'Por favor, ayúdanos a mejorar la experiencia de DokuWiki:';
+$lang['i_pop_label']           = 'Una vez al mes, enviar información anónima de uso de datos a los desarrolladores de DokuWiki';
+$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';
+$lang['wordblock']             = 'Sus cambios no se han guardado porque contienen textos bloqueados (spam).';
+$lang['media_uploadtab']       = 'Cargar';
+$lang['media_searchtab']       = 'Buscar';
+$lang['media_file']            = 'Fichero';
+$lang['media_viewtab']         = 'Ver';
+$lang['media_edittab']         = 'Editar';
+$lang['media_historytab']      = 'Historial';
+$lang['media_list_thumbs']     = 'Miniaturas';
+$lang['media_list_rows']       = 'Celdas';
+$lang['media_sort_name']       = 'Nombre';
+$lang['media_sort_date']       = 'Fecha';
+$lang['media_namespaces']      = 'Escoge "espacio de nombre"';
+$lang['media_files']           = 'Ficheros en %s';
+$lang['media_upload']          = 'Cargar a %s';
+$lang['media_search']          = 'Buscar en %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s en %s';
+$lang['media_edit']            = 'Editar %s';
+$lang['media_history']         = 'Historial de %s';
+$lang['media_meta_edited']     = 'Metadatos editados';
+$lang['media_perm_read']       = 'Disculpa, no tienes los permisos necesarios para leer ficheros.';
+$lang['media_perm_upload']     = 'Disculpa, no tienes los permisos necesarios para cargar ficheros.';
+$lang['media_update']          = 'Actualizar nueva versión';
+$lang['media_restore']         = 'Restaurar esta versión';
+$lang['currentns']             = 'Espacio de nombres actual';
+$lang['searchresult']          = 'Resultado de la búsqueda';
+$lang['plainhtml']             = 'HTML sencillo';
+$lang['wikimarkup']            = 'Etiquetado Wiki';
diff --git a/sources/inc/lang/es/locked.txt b/sources/inc/lang/es/locked.txt
new file mode 100644
index 0000000..e151bf7
--- /dev/null
+++ b/sources/inc/lang/es/locked.txt
@@ -0,0 +1,3 @@
+====== 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.
\ No newline at end of file
diff --git a/sources/inc/lang/es/login.txt b/sources/inc/lang/es/login.txt
new file mode 100644
index 0000000..a8d9be7
--- /dev/null
+++ b/sources/inc/lang/es/login.txt
@@ -0,0 +1,3 @@
+====== Login ======
+
+¡Actualmente no estás identificado! Introduce abajo tus datos de identificación para abrir una sesión. Necesitas tener las cookies activadas para identificarte.
diff --git a/sources/inc/lang/es/mailtext.txt b/sources/inc/lang/es/mailtext.txt
new file mode 100644
index 0000000..893ec1c
--- /dev/null
+++ b/sources/inc/lang/es/mailtext.txt
@@ -0,0 +1,17 @@
+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@
+Nombre de Host : @HOSTNAME@
+Revisión Vieja: @OLDPAGE@
+Revisión Nueva : @NEWPAGE@
+Resumen de la edición: @SUMMARY@
+Usuario : @USER@
+
+@DIFF@
+
+
+-- 
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/es/mailwrap.html b/sources/inc/lang/es/mailwrap.html
new file mode 100644
index 0000000..3cf255f
--- /dev/null
+++ b/sources/inc/lang/es/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Este correo ha sido generado por DokuWiki desde @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/es/newpage.txt b/sources/inc/lang/es/newpage.txt
new file mode 100644
index 0000000..d119ca2
--- /dev/null
+++ b/sources/inc/lang/es/newpage.txt
@@ -0,0 +1,3 @@
+====== 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''.
diff --git a/sources/inc/lang/es/norev.txt b/sources/inc/lang/es/norev.txt
new file mode 100644
index 0000000..42ee6b5
--- /dev/null
+++ b/sources/inc/lang/es/norev.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/es/password.txt b/sources/inc/lang/es/password.txt
new file mode 100644
index 0000000..1312ed0
--- /dev/null
+++ b/sources/inc/lang/es/password.txt
@@ -0,0 +1,9 @@
+Hola @FULLNAME@!
+
+Estos son los datos de usuario para @TITLE@ en @DOKUWIKIURL@
+
+Usuario : @LOGIN@
+Contraseña : @PASSWORD@
+
+-- 
+Este correo ha sido generado por DokuWiki en @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/es/preview.txt b/sources/inc/lang/es/preview.txt
new file mode 100644
index 0000000..b4d5a2e
--- /dev/null
+++ b/sources/inc/lang/es/preview.txt
@@ -0,0 +1,4 @@
+====== Previsualización ======
+
+Esto es una previsualización de cómo aparecerá tu texto. Recuerda: **no está guardado** todavía!
+
diff --git a/sources/inc/lang/es/pwconfirm.txt b/sources/inc/lang/es/pwconfirm.txt
new file mode 100644
index 0000000..c3dad11
--- /dev/null
+++ b/sources/inc/lang/es/pwconfirm.txt
@@ -0,0 +1,16 @@
+Hola @FULLNAME@!
+
+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.
+
+Para confirmar que la solicitud fue realizada realmente por usted,
+por favor use el siguiente enlace.
+
+@CONFIRM@
+
+
+-- 
+Este mail ha sido generado por DokuWiki en
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/es/read.txt b/sources/inc/lang/es/read.txt
new file mode 100644
index 0000000..461b745
--- /dev/null
+++ b/sources/inc/lang/es/read.txt
@@ -0,0 +1 @@
+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 --git a/sources/inc/lang/es/recent.txt b/sources/inc/lang/es/recent.txt
new file mode 100644
index 0000000..432def2
--- /dev/null
+++ b/sources/inc/lang/es/recent.txt
@@ -0,0 +1,5 @@
+====== Cambios Recientes ======
+
+Las siguientes páginas han sido modificadas recientemente.
+
+
diff --git a/sources/inc/lang/es/register.txt b/sources/inc/lang/es/register.txt
new file mode 100644
index 0000000..9824826
--- /dev/null
+++ b/sources/inc/lang/es/register.txt
@@ -0,0 +1,3 @@
+====== Registro como nuevo usuario ======
+
+Completa toda la información del formulario para crear un nuevo usuario en este wiki. Asegúrate que escribes una **dirección de e-mail válida** puesto que allí se enviará tu contraseña. El nombre de usuario ha de ser un nombre válido según [[doku>pagename|pagename]].
diff --git a/sources/inc/lang/es/registermail.txt b/sources/inc/lang/es/registermail.txt
new file mode 100644
index 0000000..e773e32
--- /dev/null
+++ b/sources/inc/lang/es/registermail.txt
@@ -0,0 +1,14 @@
+Un nuevo usuario ha sido registrado. Aquí están los detalles:
+
+Usuario         : @NEWUSER@
+Nombre completo : @NEWNAME@
+E-Mail          : @NEWEMAIL@
+
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección-IP : @IPADDRESS@
+Nombre del host : @HOSTNAME@
+
+-- 
+Este mail ha sido generado por DokuWiki en
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/es/resendpwd.txt b/sources/inc/lang/es/resendpwd.txt
new file mode 100644
index 0000000..1d74e79
--- /dev/null
+++ b/sources/inc/lang/es/resendpwd.txt
@@ -0,0 +1,3 @@
+====== 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.
diff --git a/sources/inc/lang/es/resetpwd.txt b/sources/inc/lang/es/resetpwd.txt
new file mode 100644
index 0000000..6fade95
--- /dev/null
+++ b/sources/inc/lang/es/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Establecer nueva contraseña ======
+
+Favor de introducir una nueva contraseña para su cuenta en este wiki
\ No newline at end of file
diff --git a/sources/inc/lang/es/revisions.txt b/sources/inc/lang/es/revisions.txt
new file mode 100644
index 0000000..b093e85
--- /dev/null
+++ b/sources/inc/lang/es/revisions.txt
@@ -0,0 +1,4 @@
+====== Revisiones Antiguas ======
+
+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 --git a/sources/inc/lang/es/searchpage.txt b/sources/inc/lang/es/searchpage.txt
new file mode 100644
index 0000000..47a1a90
--- /dev/null
+++ b/sources/inc/lang/es/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
\ No newline at end of file
diff --git a/sources/inc/lang/es/showrev.txt b/sources/inc/lang/es/showrev.txt
new file mode 100644
index 0000000..c84bbc0
--- /dev/null
+++ b/sources/inc/lang/es/showrev.txt
@@ -0,0 +1,2 @@
+**¡Esta es una revisión vieja del documento!**
+----
diff --git a/sources/inc/lang/es/stopwords.txt b/sources/inc/lang/es/stopwords.txt
new file mode 100644
index 0000000..2569089
--- /dev/null
+++ b/sources/inc/lang/es/stopwords.txt
@@ -0,0 +1,171 @@
+# Esta es una lista de palabras que estan ignoradas por el indexador, una palabra por línea
+# Cuando se edita este archivo, asegúrese de usar la línea de terminaciones UNIX  (una sola nueva línea)
+# No necesita incluir palabras cortas con 3 caracteres - estas son ignoradas de todos modos
+#Esta lista esta basada en las que encontramos en la siguiente url http://www.ranks.nl/stopwords/
+una
+unas
+unos
+uno
+sobre
+todo
+también
+tras
+otro
+algún
+alguno
+alguna
+algunos
+algunas
+ser
+soy
+eres
+somos
+sois
+estoy
+esta
+estamos
+estais
+estan
+como
+para
+atras
+porque
+por
+qué
+estado
+estaba
+ante
+antes
+siendo
+ambos
+pero
+poder
+puede
+puedo
+podemos
+podeis
+pueden
+fui
+fue
+fuimos
+fueron
+hacer
+hago
+hace
+hacemos
+haceis
+hacen
+cada
+fin
+incluso
+primero
+desde
+conseguir
+consigo
+consigue
+consigues
+conseguimos
+consiguen
+voy
+va
+vamos
+vais
+van
+vaya
+gueno
+tener
+tengo
+tiene
+tenemos
+teneis
+tienen
+las
+los
+aqui
+mio
+tuyo
+ellos
+ellas
+nos
+nosotros
+vosotros
+vosotras
+dentro
+solo
+solamente
+saber
+sabes
+sabe
+sabemos
+sabeis
+saben
+ultimo
+largo
+bastante
+haces
+muchos
+aquellos
+aquellas
+sus
+entonces
+tiempo
+verdad
+verdadero
+verdadera
+cierto
+ciertos
+cierta
+ciertas
+intentar
+intento
+intenta
+intentas
+intentamos
+intentais
+intentan
+dos
+bajo
+arriba
+encima
+usar
+uso
+usas
+usa
+usamos
+usais
+usan
+emplear
+empleo
+empleas
+emplean
+ampleamos
+empleais
+valor
+muy
+era
+eras
+eramos
+eran
+modo
+bien
+cual
+cuando
+donde
+mientras
+quien
+con
+entre
+sin
+trabajo
+trabajar
+trabajas
+trabaja
+trabajamos
+trabajais
+trabajan
+podria
+podrias
+podriamos
+podrian
+podriais
+aquel
diff --git a/sources/inc/lang/es/subscr_digest.txt b/sources/inc/lang/es/subscr_digest.txt
new file mode 100644
index 0000000..df03fca
--- /dev/null
+++ b/sources/inc/lang/es/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hola!
+
+La página @PAGE@ en @TITLE@ wiki ha cambiado.
+Estos son los cambios:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Revisión Anterior: @OLDPAGE@
+Revisión Nueva: @NEWPAGE@
+
+Para cancelar la página de notificaciones, entra a la wiki en
+@DOKUWIKIURL@ luego visita
+@SUBSCRIBE@
+y date de baja en la página y/o cambios en el espacio de nombre.
+
+--
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/es/subscr_form.txt b/sources/inc/lang/es/subscr_form.txt
new file mode 100644
index 0000000..3a8143c
--- /dev/null
+++ b/sources/inc/lang/es/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Administrador de Suscripciones ======
+
+Esta página te permite administrar tus suscripciones para la página actual y espacio de nombres.
\ No newline at end of file
diff --git a/sources/inc/lang/es/subscr_list.txt b/sources/inc/lang/es/subscr_list.txt
new file mode 100644
index 0000000..80e8dc8
--- /dev/null
+++ b/sources/inc/lang/es/subscr_list.txt
@@ -0,0 +1,17 @@
+Hola!
+
+Las páginas en el espacio de nombres @PAGE@ en @TITLE@ wiki ha cambiado.
+Estos son los cambios:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Para cancelar la página de notificaciones, entra a la wiki en
+@DOKUWIKIURL@ luego visita
+@SUBSCRIBE@
+y date de baja en la página y/o cambios en el espacio de nombre.
+
+--
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/es/subscr_single.txt b/sources/inc/lang/es/subscr_single.txt
new file mode 100644
index 0000000..abddeeb
--- /dev/null
+++ b/sources/inc/lang/es/subscr_single.txt
@@ -0,0 +1,23 @@
+Hola!
+
+La página @PAGE@ en @TITLE@ wiki ha cambiado.
+Estos son los cambios:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Fecha : @DATE@
+Usuario : @USER@
+Resumen de edición: @SUMMARY@
+Revisión Anterior: @OLDPAGE@
+Nueva Revisión: @NEWPAGE@
+
+Para cancelar la página de notificaciones, entra a la wiki en
+@DOKUWIKIURL@ luego visita
+@SUBSCRIBE@
+y date de baja en la página y/o cambios en el espacio de nombre.
+
+--
+Este correo ha sido generado por DokuWiki en
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/es/updateprofile.txt b/sources/inc/lang/es/updateprofile.txt
new file mode 100644
index 0000000..822e558
--- /dev/null
+++ b/sources/inc/lang/es/updateprofile.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/es/uploadmail.txt b/sources/inc/lang/es/uploadmail.txt
new file mode 100644
index 0000000..9d2f980
--- /dev/null
+++ b/sources/inc/lang/es/uploadmail.txt
@@ -0,0 +1,14 @@
+Se ha subido un fichero a tu DokuWuki. Estos son los detalles:
+
+Archivo : @MEDIA@
+Fecha : @DATE@
+Navegador : @BROWSER@
+Dirección IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Tamaño : @SIZE@
+MIME Type : @MIME@
+Usuario : @USER@
+
+-- 
+Este correo fue generado por DokuWiki en
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/et/admin.txt b/sources/inc/lang/et/admin.txt
new file mode 100644
index 0000000..1934f48
--- /dev/null
+++ b/sources/inc/lang/et/admin.txt
@@ -0,0 +1,4 @@
+====== Administreerimine ======
+
+Alljärgnevalt leiate nimekirja administratiivsetest tegevustest, mida DokuWiki võimaldab.
+
diff --git a/sources/inc/lang/et/backlinks.txt b/sources/inc/lang/et/backlinks.txt
new file mode 100644
index 0000000..4b405cd
--- /dev/null
+++ b/sources/inc/lang/et/backlinks.txt
@@ -0,0 +1,4 @@
+====== Siia lehele lingiga haagitud lehed ======
+
+Nimekiri nendest lehtedest, kuskohalt Sa lingi abil siia lehele saad.
+
diff --git a/sources/inc/lang/et/conflict.txt b/sources/inc/lang/et/conflict.txt
new file mode 100644
index 0000000..cf9f571
--- /dev/null
+++ b/sources/inc/lang/et/conflict.txt
@@ -0,0 +1,6 @@
+====== Uus versioon täitsa olemas ======
+
+Sellest dokumendist, mis Sa toimetasid on tegelikult juba olemas ka uuem versioon. Selline asi juhtub siis kui sel ajal kui Sina vaikselt oma dokumendi kallal nokitsesid tegi keegi juba kähku omad Muutused sealsamas dokumendis ära.
+
+Vaata hoolikalt allpool näidatud erinevusi ja siis otsusta millise versiooni alles jätad. Kui Sa peaks valima ''salvesta'', siis juhtubki selline lugu, et Sinu versioon salvestatakse. kui Sa aga peaks klõpsama ''katkesta'' säilib hetkel kehtiv versioon.
+
diff --git a/sources/inc/lang/et/denied.txt b/sources/inc/lang/et/denied.txt
new file mode 100644
index 0000000..bb564ac
--- /dev/null
+++ b/sources/inc/lang/et/denied.txt
@@ -0,0 +1,3 @@
+====== Sul pole ligipääsuluba ======
+
+Kahju küll, aga sinu tublidusest ei piisa, et edasi liikuda, selleks on vastavaid õigusi vaja.
diff --git a/sources/inc/lang/et/diff.txt b/sources/inc/lang/et/diff.txt
new file mode 100644
index 0000000..d10a93b
--- /dev/null
+++ b/sources/inc/lang/et/diff.txt
@@ -0,0 +1,4 @@
+====== Erinevused ======
+
+Siin näed erinevusi valitud versiooni ja hetkel kehtiva lehekülje vahel.
+
diff --git a/sources/inc/lang/et/draft.txt b/sources/inc/lang/et/draft.txt
new file mode 100644
index 0000000..6669f3b
--- /dev/null
+++ b/sources/inc/lang/et/draft.txt
@@ -0,0 +1,6 @@
+====== Leidsin katkenud toimetamise ======
+
+Sinu viimane toimetamissessioon ei lõppenud eelmine kord korrapäraselt. DokuWiki automaatselt salvestas Sinu pooliku töö, mida võid nüüd kasutada töö jätkamiseks. Allpool näed teksti, mis suudeti päästa.
+
+Kas tahad //taastada// kaotused, //kustutada// poolik töö või //üldse mitte midagi teha//?
+
diff --git a/sources/inc/lang/et/edit.txt b/sources/inc/lang/et/edit.txt
new file mode 100644
index 0000000..6167c85
--- /dev/null
+++ b/sources/inc/lang/et/edit.txt
@@ -0,0 +1,2 @@
+Toimeta seda lehte ja klõpsa ''Salvesta'' peal. Wikis teksti kujundamise vahenditega tutvumiseks, st. kuidas teha rasvast ja kaldkirja jne., vaata [[wiki:syntax|süntaksitutvustus lehelt]]. Kui Sa tahad midagi testida, saad seda teha [[playground:playground|mängualal]].
+
diff --git a/sources/inc/lang/et/editrev.txt b/sources/inc/lang/et/editrev.txt
new file mode 100644
index 0000000..3ab6d71
--- /dev/null
+++ b/sources/inc/lang/et/editrev.txt
@@ -0,0 +1,3 @@
+**Sa oled omale tõmmanud selle dokumendi vana versiooni!** Kui Sa selle salvestad sünnib nende andmetega uus versioon.
+----
+
diff --git a/sources/inc/lang/et/index.txt b/sources/inc/lang/et/index.txt
new file mode 100644
index 0000000..8d2e25a
--- /dev/null
+++ b/sources/inc/lang/et/index.txt
@@ -0,0 +1,3 @@
+====== Sisukord ======
+
+See siin on nimekiri kõigist saadaval olevatest lehtedest järjestatud [[doku>namespaces|alajaotuste]] järgi.
diff --git a/sources/inc/lang/et/lang.php b/sources/inc/lang/et/lang.php
new file mode 100644
index 0000000..cc736db
--- /dev/null
+++ b/sources/inc/lang/et/lang.php
@@ -0,0 +1,231 @@
+
+ * @author Aari Juhanson 
+ * @author Kaiko Kaur 
+ * @author kristian.kankainen@kuu.la
+ * @author Rivo Zängov 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Toimeta seda lehte';
+$lang['btn_source']            = 'Näita lehepõhja';
+$lang['btn_show']              = 'Näita lehte';
+$lang['btn_create']            = 'Tekita selle lingi alla leht';
+$lang['btn_search']            = 'Otsi';
+$lang['btn_save']              = 'Salvesta';
+$lang['btn_preview']           = 'Eelvaade';
+$lang['btn_top']               = 'Tagasi lehe algusesse';
+$lang['btn_newer']             = '<< varajasemad';
+$lang['btn_older']             = '>> hilisemad';
+$lang['btn_revs']              = 'Eelmised versioonid';
+$lang['btn_recent']            = 'Viimased muudatused';
+$lang['btn_upload']            = 'Lae üles';
+$lang['btn_cancel']            = 'Katkesta';
+$lang['btn_index']             = 'Sisukord';
+$lang['btn_secedit']           = 'Toimeta';
+$lang['btn_login']             = 'Logi sisse';
+$lang['btn_logout']            = 'Logi välja';
+$lang['btn_admin']             = 'Administreeri';
+$lang['btn_update']            = 'Uuenda';
+$lang['btn_delete']            = 'Kustuta';
+$lang['btn_back']              = 'Tagasi';
+$lang['btn_backlink']          = 'Tagasilingid';
+$lang['btn_backtomedia']       = 'Tagasi faili valikusse';
+$lang['btn_subscribe']         = 'Jälgi seda lehte (teated meilile)';
+$lang['btn_profile']           = 'Minu info';
+$lang['btn_reset']             = 'Taasta';
+$lang['btn_draft']             = 'Toimeta mustandit';
+$lang['btn_recover']           = 'Taata mustand';
+$lang['btn_draftdel']          = 'Kustuta mustand';
+$lang['btn_revert']            = 'Taasta';
+$lang['btn_register']          = 'Registreeri uus kasutaja';
+$lang['loggedinas']            = 'Logis sisse kui';
+$lang['user']                  = 'Kasutaja';
+$lang['pass']                  = 'Parool';
+$lang['newpass']               = 'Uus parool';
+$lang['oldpass']               = 'Vana parool';
+$lang['passchk']               = 'Korda uut parooli';
+$lang['remember']              = 'Pea mind meeles';
+$lang['fullname']              = 'Täielik nimi';
+$lang['email']                 = 'E-post';
+$lang['profile']               = 'Kasutaja info';
+$lang['badlogin']              = 'Oops, Sinu kasutajanimi või parool oli vale.';
+$lang['minoredit']             = 'Ebaolulised muudatused';
+$lang['draftdate']             = 'Mustand automaatselt salvestatud';
+$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['regsuccess2']           = 'Kasutaja sai tehtud.';
+$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
+ekstitusega, suhtle oma serveri administraatoriga';
+$lang['regbadpass']            = 'Uus parool on kirjutatud erinevalt. Proovi uuesti.';
+$lang['regpwmail']             = 'Sinu DokuWiki parool';
+$lang['reghere']               = 'Sul ei olegi veel kasutajakontot? No aga tekita see siis endale!';
+$lang['profna']                = 'Viki ei toeta profiili muudatusi';
+$lang['profnochange']          = 'Muutused puuduvad.';
+$lang['profnoempty']           = 'Tühi nimi ega meiliaadress pole lubatud.';
+$lang['profchanged']           = 'Kasutaja info edukalt muudetud';
+$lang['pwdforget']             = 'Unustasid parooli? Tee uus';
+$lang['resendna']              = 'See wiki ei toeta parooli taassaatmist.';
+$lang['resendpwdmissing']      = 'Khmm... Sa pead täitma kõik väljad.';
+$lang['resendpwdnouser']       = 'Aga sellist kasutajat ei ole.';
+$lang['resendpwdbadauth']      = 'See autentimiskood ei ole õige. Kontrolli, et kopeerisid terve lingi.';
+$lang['resendpwdconfirm']      = 'Kinnituslink saadeti meilile.';
+$lang['resendpwdsuccess']      = 'Uus parool saadeti Sinu meilile.';
+$lang['searchmedia']           = 'Otsi failinime:';
+$lang['searchmedia_in']        = 'Otsi %s';
+$lang['txt_upload']            = 'Vali fail, mida üles laadida';
+$lang['txt_filename']          = 'Siseta oma Wikinimi (soovituslik)';
+$lang['txt_overwrt']           = 'Kirjutan olemasoleva faili üle';
+$lang['lockedby']              = 'Praegu on selle lukustanud';
+$lang['lockexpire']            = 'Lukustus aegub';
+$lang['js']['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['js']['notsavedyet']     = 'Sul on seal salvestamata muudatusi, mis kohe kõige kaduva teed lähevad.
+Kas Sa ikka tahad edasi liikuda?';
+$lang['js']['searchmedia']     = 'Otsi faile';
+$lang['js']['keepopen']        = 'Jäta aken peale valiku sooritamist avatuks';
+$lang['js']['hidedetails']     = 'Peida detailid';
+$lang['js']['mediatitle']      = 'Lingi sätted';
+$lang['js']['mediadisplay']    = 'Lingi liik';
+$lang['js']['mediaalign']      = 'Joondus';
+$lang['js']['mediasize']       = 'Pildi mõõtmed';
+$lang['js']['mediatarget']     = 'Lingi siht';
+$lang['js']['mediaclose']      = 'Sulge';
+$lang['js']['mediainsert']     = 'Sisesta';
+$lang['js']['mediadisplayimg'] = 'Näita pilti.';
+$lang['js']['mediadisplaylnk'] = 'Näita ainult linki.';
+$lang['js']['mediasmall']      = 'Väiksem suurus';
+$lang['js']['mediamedium']     = 'Keskmine suurus';
+$lang['js']['medialarge']      = 'Suurem suurus';
+$lang['js']['mediaoriginal']   = 'Originaali suurus';
+$lang['js']['medialnk']        = 'Link üksikasjadele';
+$lang['js']['mediadirect']     = 'Otselink originaalile';
+$lang['js']['medianolnk']      = 'Ilma lingita';
+$lang['js']['medianolink']     = 'Ära lingi pilti';
+$lang['js']['medialeft']       = 'Joonda pilt vasakule.';
+$lang['js']['mediaright']      = 'Joonda pilt paremale.';
+$lang['js']['mediacenter']     = 'Joonda pilt keskele.';
+$lang['js']['medianoalign']    = 'Ära joonda.';
+$lang['js']['nosmblinks']      = 'Lingid \'Windows shares\'ile töötab ainult Microsoft Internet Exploreriga.
+Siiski võid kopeerida ja asetada lingi.';
+$lang['js']['linkwiz']         = 'Lingi nõustaja';
+$lang['js']['linkto']          = 'Lingi:';
+$lang['js']['del_confirm']     = 'Kas kustutame selle kirje?';
+$lang['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['uploadwrong']           = 'Ei saa Sa midagi üles laadida. Oops, aga seda tüüpi faili sul lihtsalt ei lubata üles laadida';
+$lang['uploadexist']           = 'Fail on juba olemas. Midagi ei muudetud.';
+$lang['uploadbadcontent']      = 'Üles laaditu ei sobinud %s faililaiendiga.';
+$lang['uploadsize']            = 'Üles laaditud fail on liiga suur (maksimaalne suurus on %s).';
+$lang['deletesucc']            = 'Fail nimega "%s" sai kustutatud.';
+$lang['deletefail']            = 'Faili nimega "%s" ei kustutatud (kontrolli õigusi).';
+$lang['mediainuse']            = 'Faili nimega "%s" ei kustutatud, sest see on kasutuses.';
+$lang['namespaces']            = 'Alajaotus';
+$lang['mediafiles']            = 'Failid on Sulle kättesaadavad';
+$lang['accessdenied']          = 'Ligipääs keelatud.';
+$lang['mediausage']            = 'Kasuta järgmist kirjapilti sellele failile viitamaks:';
+$lang['mediaview']             = 'Vaata faili algsel kujul.';
+$lang['mediaroot']             = 'juur';
+$lang['mediaupload']           = 'Lae fail sellesse nimeruumi (kataloogi). Et tekitada veel alam nimeruum kasuta koolonit Wiki nimes.';
+$lang['mediaextchange']        = 'Faili laiend .%s-st %s-ks!';
+$lang['reference']             = 'Viited';
+$lang['ref_inuse']             = 'Seda faili ei saa kustutada, sest teda kasutavad järgmised lehed:';
+$lang['ref_hidden']            = 'Mõned viidad failile on lehtedel, millele sul ei ole ligipääsu';
+$lang['hits']                  = 'Päringu tabamused';
+$lang['quickhits']             = 'Päringule vastavad lehed';
+$lang['toc']                   = 'Sisujuht';
+$lang['current']               = 'Hetkel kehtiv';
+$lang['yours']                 = 'Sinu versioon';
+$lang['diff']                  = 'Näita erinevusi hetkel kehtiva versiooniga';
+$lang['diff2']                 = 'Näita valitud versioonide erinevusi';
+$lang['difflink']              = 'Lõlita võrdlemise vaatele';
+$lang['diff_type']             = 'Vaata erinevusi:';
+$lang['diff_side']             = 'Kõrvuti';
+$lang['line']                  = 'Rida';
+$lang['breadcrumb']            = 'Käidud rada';
+$lang['youarehere']            = 'Sa oled siin';
+$lang['lastmod']               = 'Viimati muutnud';
+$lang['by']                    = 'persoon';
+$lang['deleted']               = 'eemaldatud';
+$lang['created']               = 'tekitatud';
+$lang['restored']              = 'vana versioon taastatud (%s)';
+$lang['external_edit']         = 'väline muutmine';
+$lang['summary']               = 'kokkuvõte muudatustest';
+$lang['mail_newpage']          = 'leht lisatud:';
+$lang['mail_changed']          = 'leht muudetud';
+$lang['mail_new_user']         = 'Uus kasutaja:';
+$lang['qb_bold']               = 'Rasvane kiri';
+$lang['qb_italic']             = 'Kaldkiri';
+$lang['qb_underl']             = 'Alajoonega kiri';
+$lang['qb_code']               = 'Koodi tekst';
+$lang['qb_strike']             = 'Läbijoonitud tekst';
+$lang['qb_h1']                 = '1. astme pealkiri';
+$lang['qb_h2']                 = '2. astme pealkiri';
+$lang['qb_h3']                 = '3. astme pealkiri';
+$lang['qb_h4']                 = '4. astme pealkiri';
+$lang['qb_h5']                 = '5. astme pealkiri';
+$lang['qb_h']                  = 'Pealkiri';
+$lang['qb_hs']                 = 'Vali pealkiri';
+$lang['qb_hplus']              = 'Kõrgem pealkiri';
+$lang['qb_hminus']             = 'Madalam pealkiri';
+$lang['qb_hequal']             = 'Sama taseme pealkiri';
+$lang['qb_link']               = 'Siselink';
+$lang['qb_extlink']            = 'Välislink';
+$lang['qb_hr']                 = 'Horisontaalne vahejoon';
+$lang['qb_ol']                 = 'Nummerdatud nimikiri';
+$lang['qb_ul']                 = 'Mummuga nimekiri';
+$lang['qb_media']              = 'Lisa pilte ja muid faile';
+$lang['qb_sig']                = 'Lisa allkiri!';
+$lang['qb_smileys']            = 'Emotikonid';
+$lang['qb_chars']              = 'Erisümbolid';
+$lang['admin_register']        = 'Lisa kasutaja';
+$lang['metaedit']              = 'Muuda lisainfot';
+$lang['metasaveerr']           = 'Lisainfo salvestamine läks untsu.';
+$lang['metasaveok']            = 'Lisainfo salvestatud';
+$lang['img_backto']            = 'Tagasi';
+$lang['img_title']             = 'Tiitel';
+$lang['img_caption']           = 'Kirjeldus';
+$lang['img_date']              = 'Kuupäev';
+$lang['img_fname']             = 'Faili nimi';
+$lang['img_fsize']             = 'Suurus';
+$lang['img_artist']            = 'Autor';
+$lang['img_copyr']             = 'Autoriõigused';
+$lang['img_format']            = 'Formaat';
+$lang['img_camera']            = 'Kaamera';
+$lang['img_keywords']          = 'Võtmesõnad';
+$lang['authtempfail']          = 'Kasutajate autentimine on ajutiselt rivist väljas. Kui see olukord mõne aja jooksul ei parane, siis teavita sellest serveri haldajat.';
+$lang['i_chooselang']          = 'Vali keel';
+$lang['i_installer']           = 'DokuWiki paigaldaja';
+$lang['i_wikiname']            = 'Wiki nimi';
+$lang['i_enableacl']           = 'Kas lubada kasutajate haldus (soovitatav)';
+$lang['i_superuser']           = 'Superkasutaja';
+$lang['i_problems']            = 'Paigaldaja leidis mõned vead, mis on allpool välja toodud. Enne vigade eemaldamist ei saa jätkata.';
+$lang['i_modified']            = 'Õnnetuste vältimiseks läheb see skript käima ainult värskelt paigaldatud ja muutmata Dokuwiki peal.
+                       Sa peaksid ilmselt kogu koodi uuesti lahti pakkima. Vaata ka Dokuwiki installeerimis juhendit';
+$lang['i_funcna']              = 'PHP funktsiooni %s ei ole olemas.võibolla sinu serveri hooldaja on selle mingil põhjusel keelanud?';
+$lang['i_permfail']            = 'Dokuwiki ei saa kirjutada faili %s. Kontrolli serveris failide õigused üle.';
+$lang['i_confexists']          = '%s on juba olemas';
+$lang['i_writeerr']            = 'Faili %s ei lubata tekitada. Kontrolli kataloogi ja faili õigusi.';
+$lang['i_badval']              = '%s - lubamatu või tühi väärtus';
+$lang['i_success']             = 'Seadistamine on õnnelikult lõpule viidud. Sa võid nüüd kustutada faili install.php. Alusta oma uue DokuWiki täitmist.';
+$lang['i_failure']             = 'Konfiguratsiooni faili kirjutamisel esines vigu. Võimalik, et pead need käsitsi parandama enne uue DokuWiki täitma asumist.';
+$lang['i_policy']              = 'Wiki õiguste algne poliitika';
+$lang['i_pol0']                = 'Avatud (lugemine, kirjutamine ja üleslaadimine kõigile lubatud)';
+$lang['i_pol1']                = 'Avalikuks lugemiseks (lugeda saavad kõik, kirjutada ja üles laadida vaid registreeritud kasutajad)';
+$lang['i_pol2']                = 'Suletud (kõik õigused, kaasaarvatud lugemine on lubatud vaid registreeritud kasutajatele)';
+$lang['i_retry']               = 'Proovi uuesti';
diff --git a/sources/inc/lang/et/locked.txt b/sources/inc/lang/et/locked.txt
new file mode 100644
index 0000000..0fd2743
--- /dev/null
+++ b/sources/inc/lang/et/locked.txt
@@ -0,0 +1,3 @@
+====== Leht lukustatud ======
+
+Hetkel on see leht lukustatud kuna teine kasutaja toimetab tema kallal. Sa pead ootama kuni ta kas lõpetab või lukustus aegub.
diff --git a/sources/inc/lang/et/login.txt b/sources/inc/lang/et/login.txt
new file mode 100644
index 0000000..3e746cd
--- /dev/null
+++ b/sources/inc/lang/et/login.txt
@@ -0,0 +1,3 @@
+====== Logi sisse ======
+
+Hetkel pole Sa sisse logitud! Allpool saad sisestada kõik vajaliku, et sisse logida. Kui Sa oled oma arvuti taga ainukasutaja oleks hea kui Su arvutil  oleks lubatud 'cookies', st. järgmine kord kui siia lehele tuled oled automaatselt sisse logitud.
diff --git a/sources/inc/lang/et/mailtext.txt b/sources/inc/lang/et/mailtext.txt
new file mode 100644
index 0000000..3214584
--- /dev/null
+++ b/sources/inc/lang/et/mailtext.txt
@@ -0,0 +1,16 @@
+Sinu lehte DokuWiki-s on muudetud. Alljärgnevalt detailid:
+
+Kuupäev           : @DATE@
+Brauser           : @BROWSER@
+IP-Aadress        : @IPADDRESS@
+Arvuti nimi       : @HOSTNAME@
+Eelnev versioon   : @OLDPAGE@
+Uus versioon      : @NEWPAGE@
+Toimeta kokkuvõtet: @SUMMARY@
+Kasutaja          : @USER@
+
+@DIFF@
+
+
+-- 
+Selle e-posti tekitas Sulle DokuWiki @DOKUWIKIURL@
diff --git a/sources/inc/lang/et/newpage.txt b/sources/inc/lang/et/newpage.txt
new file mode 100644
index 0000000..fb78e64
--- /dev/null
+++ b/sources/inc/lang/et/newpage.txt
@@ -0,0 +1,3 @@
+====== Seda teemat veel ei ole ======
+
+Sa klikkisid lingile, mille all teemat veel pole. Selle saad Sa tekitada kasutades ''Tekita see leht nuppu''.
diff --git a/sources/inc/lang/et/norev.txt b/sources/inc/lang/et/norev.txt
new file mode 100644
index 0000000..42d204f
--- /dev/null
+++ b/sources/inc/lang/et/norev.txt
@@ -0,0 +1,4 @@
+====== Sellist versiooni pole ======
+
+Sellist versiooni ei ole olemas. Selle dokumendi eelmiste versioonide nägemiseks klõpsa ''Eelmised versioonid'' nupul.
+
diff --git a/sources/inc/lang/et/password.txt b/sources/inc/lang/et/password.txt
new file mode 100644
index 0000000..19db86d
--- /dev/null
+++ b/sources/inc/lang/et/password.txt
@@ -0,0 +1,9 @@
+Hi @FULLNAME@!
+
+Siin on sinu kasutajaandmed @TITLE@ks @DOKUWIKIURL@s
+
+Sisse logimisnimi : @LOGIN@
+Parool : @PASSWORD@
+
+-- 
+Selle kirja saatis DokuWiki @DOKUWIKIURL@st
diff --git a/sources/inc/lang/et/preview.txt b/sources/inc/lang/et/preview.txt
new file mode 100644
index 0000000..df45c65
--- /dev/null
+++ b/sources/inc/lang/et/preview.txt
@@ -0,0 +1,3 @@
+====== Eelvaade ======
+
+Siin saad eelnevalt vaadata, milline su tekst välja näeks. Pea aga meeles, et see **ei ole veel salvestatud** !
diff --git a/sources/inc/lang/et/pwconfirm.txt b/sources/inc/lang/et/pwconfirm.txt
new file mode 100644
index 0000000..4f17140
--- /dev/null
+++ b/sources/inc/lang/et/pwconfirm.txt
@@ -0,0 +1,12 @@
+Tere @FULLNAME@!
+
+Keegi on Sinu parooli uuendust soovinud kasutajale @TITLE@ (@DOKUWIKIURL@).
+
+Kui see ei olnud Sina, siis võid seda meili lihtsalt ignoreerida.
+Kinnitamaks uue parooli saamise soovi mine aadressile:
+
+@CONFIRM@
+
+-- 
+See meil on saadetud DokuWiki poolt
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/et/read.txt b/sources/inc/lang/et/read.txt
new file mode 100644
index 0000000..64696f0
--- /dev/null
+++ b/sources/inc/lang/et/read.txt
@@ -0,0 +1,2 @@
+Seda lehte saad ainult lugeda. Saad küll vaadata lehe põhja aga muuta midagi ei saa. Suhtle oma serveri administraatoriga kui Sa millegagi rahul pole.
+
diff --git a/sources/inc/lang/et/recent.txt b/sources/inc/lang/et/recent.txt
new file mode 100644
index 0000000..cf7a854
--- /dev/null
+++ b/sources/inc/lang/et/recent.txt
@@ -0,0 +1,5 @@
+====== Viimased muutused ======
+
+Viimati muudeti alljärgnevaid lehti.
+
+
diff --git a/sources/inc/lang/et/register.txt b/sources/inc/lang/et/register.txt
new file mode 100644
index 0000000..9cd0b91
--- /dev/null
+++ b/sources/inc/lang/et/register.txt
@@ -0,0 +1,4 @@
+====== Registreeri uus kasutaja ======
+
+Täida alljärgnevad lüngad et me saaks Sulle Wikis kasutajakonto tekitada. Ole nii kena ja kindlasti pane kirja oma **kehtiv e-posti aadress** - Sinu uus parool saadetakse sellele aadressile. Sisselogimise nimi peaks olema kehtiv [[doku>pagename|lehenimi]].
+
diff --git a/sources/inc/lang/et/registermail.txt b/sources/inc/lang/et/registermail.txt
new file mode 100644
index 0000000..47d2ef1
--- /dev/null
+++ b/sources/inc/lang/et/registermail.txt
@@ -0,0 +1,14 @@
+Uus kasutaja on registreeritud. Tema info:
+
+Kasutaja     : @NEWUSER@
+Täielik nimi : @NEWNAME@
+E-post       : @NEWEMAIL@
+
+Kuupäev      : @DATE@
+Lehitseja    : @BROWSER@
+IP-Aaddress  : @IPADDRESS@
+Hosti nimi   : @HOSTNAME@
+
+-- 
+See meil on saadetud DokuWiki poolt
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/et/resendpwd.txt b/sources/inc/lang/et/resendpwd.txt
new file mode 100644
index 0000000..cd0ef8d
--- /dev/null
+++ b/sources/inc/lang/et/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Saada uus parool ======
+
+Palun sisesta oma kasutaja nimi, et saada uut parooli. Soovi kinnitamiseks saadame Sinu meilile lingi.
+
diff --git a/sources/inc/lang/et/revisions.txt b/sources/inc/lang/et/revisions.txt
new file mode 100644
index 0000000..c546a1f
--- /dev/null
+++ b/sources/inc/lang/et/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/et/searchpage.txt b/sources/inc/lang/et/searchpage.txt
new file mode 100644
index 0000000..bbc86b6
--- /dev/null
+++ b/sources/inc/lang/et/searchpage.txt
@@ -0,0 +1,5 @@
+====== Otsi ======
+
+Leiad vasted oma otsingule. Kui Sa otsitavat ei leidnud võid tekitada oma otsingu nimelise uue lehe kasutades ''Toimeta seda lehte'' nuppu.
+
+===== Vasted =====
diff --git a/sources/inc/lang/et/showrev.txt b/sources/inc/lang/et/showrev.txt
new file mode 100644
index 0000000..ef73d74
--- /dev/null
+++ b/sources/inc/lang/et/showrev.txt
@@ -0,0 +1,2 @@
+**See on dokumendi vana versioon!**
+----
diff --git a/sources/inc/lang/et/stopwords.txt b/sources/inc/lang/et/stopwords.txt
new file mode 100644
index 0000000..5dda5f7
--- /dev/null
+++ b/sources/inc/lang/et/stopwords.txt
@@ -0,0 +1,15 @@
+# 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/
+ning
+ega
+see
+mina
+sina
+tema
+meie
+teie
+nemad
+com
+www
diff --git a/sources/inc/lang/et/updateprofile.txt b/sources/inc/lang/et/updateprofile.txt
new file mode 100644
index 0000000..35da128
--- /dev/null
+++ b/sources/inc/lang/et/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Uuenda oma kasutaja infot ======
+
+Täida ainult need väljad, mida tahad uuendada. Uuendada ei saa kasutajanime.
+
+
diff --git a/sources/inc/lang/eu/admin.txt b/sources/inc/lang/eu/admin.txt
new file mode 100644
index 0000000..1367326
--- /dev/null
+++ b/sources/inc/lang/eu/admin.txt
@@ -0,0 +1,3 @@
+====== Kudeaketa ======
+
+Jarraian wikia kudeatzeko erabilgarri dauden tresnak aurki ditzakezu.
diff --git a/sources/inc/lang/eu/adminplugins.txt b/sources/inc/lang/eu/adminplugins.txt
new file mode 100644
index 0000000..20709bf
--- /dev/null
+++ b/sources/inc/lang/eu/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugin Gehigarriak =====
\ No newline at end of file
diff --git a/sources/inc/lang/eu/backlinks.txt b/sources/inc/lang/eu/backlinks.txt
new file mode 100644
index 0000000..8cbb7b6
--- /dev/null
+++ b/sources/inc/lang/eu/backlinks.txt
@@ -0,0 +1,3 @@
+====== Itzulera Estekak ======
+
+Orri honetara bueltan estekatzen dutela diruditen orrien lista bat da honakoa.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/conflict.txt b/sources/inc/lang/eu/conflict.txt
new file mode 100644
index 0000000..d7d0d33
--- /dev/null
+++ b/sources/inc/lang/eu/conflict.txt
@@ -0,0 +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.
+
+Aztertu arretaz behean erakutsitako desberdintasunak eta erabaki zein bertsio mantendu. Zure aukera "Gorde" bada, zure bertsioa gordeko da. Uneko bertsioa mantentzeko "ezeztatu" sakatu.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/denied.txt b/sources/inc/lang/eu/denied.txt
new file mode 100644
index 0000000..257076a
--- /dev/null
+++ b/sources/inc/lang/eu/denied.txt
@@ -0,0 +1,3 @@
+====== Ez duzu baimenik ======
+
+Barkatu, ez duzu baimenik orri hau ikusteko. Agian sesioa hastea ahaztu zaizu?
\ No newline at end of file
diff --git a/sources/inc/lang/eu/diff.txt b/sources/inc/lang/eu/diff.txt
new file mode 100644
index 0000000..8d335ea
--- /dev/null
+++ b/sources/inc/lang/eu/diff.txt
@@ -0,0 +1,4 @@
+====== Aldaketak ======
+
+Aukeratutako bertsioaren eta egungo bertsioaren arteko aldaketak aurkezten ditu.
+
diff --git a/sources/inc/lang/eu/draft.txt b/sources/inc/lang/eu/draft.txt
new file mode 100644
index 0000000..5d64b0b
--- /dev/null
+++ b/sources/inc/lang/eu/draft.txt
@@ -0,0 +1,5 @@
+====== Zirriborro fitxategia aurkitu da ======
+
+Zure azken edizio saioa orri honetan ez zen zuzen burutu. DokuWiki-k automatikoki zirriborro bat gorde zuen lanean ari zinen bitartean eta orain zure edizioa jarraitzeko erabili dezakezu. Behean ikusi dezakezu zure asken saioan gorde ziren datuak.
+
+Erabaki mesedez zure edizio saio galdua //berreskuratu// nahi duzun, automatikoki gordetako zirriborroa //ezabatu// nahi duzun edo edizio prozesua //ezeztatu// nahi duzun.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/edit.txt b/sources/inc/lang/eu/edit.txt
new file mode 100644
index 0000000..c117731
--- /dev/null
+++ b/sources/inc/lang/eu/edit.txt
@@ -0,0 +1 @@
+Egin aldaketak eta ''Gorde'' pultsatu. Begiratu [[wiki:syntax]] Wiki-aren sintaxiarentzat. Mesedez aldaketak orrialdea **hobetzeko** bakarrik egin itzazu. Probak egin nahi badituzu, ikas ezazu [[playground:playground]] erabiltzen.
diff --git a/sources/inc/lang/eu/editrev.txt b/sources/inc/lang/eu/editrev.txt
new file mode 100644
index 0000000..920cd89
--- /dev/null
+++ b/sources/inc/lang/eu/editrev.txt
@@ -0,0 +1,2 @@
+**Dokumentuaren bertsio zahar bat ireki duzu!** Gordetzen baduzu bertsio berri bat sortuko duzu datu hauekin.
+----
diff --git a/sources/inc/lang/eu/index.txt b/sources/inc/lang/eu/index.txt
new file mode 100644
index 0000000..30f8849
--- /dev/null
+++ b/sources/inc/lang/eu/index.txt
@@ -0,0 +1,4 @@
+====== Aurkibidea ======
+
+[[doku>namespaces|namespaces]] bitartez ordenatutako aurkibidea da hau.
+
diff --git a/sources/inc/lang/eu/install.html b/sources/inc/lang/eu/install.html
new file mode 100644
index 0000000..ce2eeb3
--- /dev/null
+++ b/sources/inc/lang/eu/install.html
@@ -0,0 +1,9 @@
+
        Orri honek Dokuwiki-ren lehenengo instalazioan eta konfigurazioan gidatzen du. Instalatzaile honen informazio gehiago eskuragarri dago bere dokumentazio orrian.
        
+
+
        DokuWikik fitxategi arruntak erabiltzen ditu wiki orriak eta orri horiekin erlazionatutako informazioa (adb. irudiak, bilaketa indizeak, azken berrikuspenak, etab.) gordetzeko. Modu egokian funtziona dezan, DokuWikik idazketa baimena behar du fitxategi horiek gordetzen dituzten direktorioetan. Instalatzaile hau ez da gai direktorio baimenak ezartzeko. Hori normalean komando bidez egin beharra dago, edo hosting bat erabiliz gero, FTP bidez edo hosting-aren kontrol panel bidez (adb. cPanel).
        
+
+
        Instalatzaile honek zure DokiWikiren konfigurazioa ezarriko du
+AKLrentzat, zeinak administratzaileei ahalbidetzen dien saioa hasi eta DokuWikiren administrazio menua atzitzea plugin-ak instalatu, erabiltzaileak kudeatu, wiki orrietara atzipenak kudeatu eta konfigurazio aukerak aldatzeko. Hau ez da beharrezkoa DokuWikirentzat funtziona ahal dezan, baina DokuWiki administratzeko errazagoa egingo du.
        
+
+
        Esperientziadun erabiltzaileek edo ezarpen behar bereziak dituzten erabiltzaileek honako estekak erabili beharko lituzkete xehetasun gehiago lortzeko
+instalazio azalpenen inguruan eta konfigurazio ezarpenen inguruan.
        
\ No newline at end of file
diff --git a/sources/inc/lang/eu/lang.php b/sources/inc/lang/eu/lang.php
new file mode 100644
index 0000000..c7e7ead
--- /dev/null
+++ b/sources/inc/lang/eu/lang.php
@@ -0,0 +1,308 @@
+
+ * @author Inko Illarramendi 
+ * @author Zigor Astarbe 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Aldatu orri hau';
+$lang['btn_source']            = 'Kodea ikusi';
+$lang['btn_show']              = 'Orria ikusi';
+$lang['btn_create']            = 'Sortu orri hau';
+$lang['btn_search']            = 'Bilatu';
+$lang['btn_save']              = 'Gorde';
+$lang['btn_preview']           = 'Aurrebista';
+$lang['btn_top']               = 'Itzuli gora';
+$lang['btn_newer']             = '<< berriagoa';
+$lang['btn_older']             = 'zaharragoa >>';
+$lang['btn_revs']              = 'Berrikuspen zaharrak';
+$lang['btn_recent']            = 'Azken aldaketak';
+$lang['btn_upload']            = 'Ireki';
+$lang['btn_cancel']            = 'Ezeztatu';
+$lang['btn_index']             = 'Aurkibidea';
+$lang['btn_secedit']           = 'Aldatu';
+$lang['btn_login']             = 'Sartu';
+$lang['btn_logout']            = 'Irten';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Eguneratu';
+$lang['btn_delete']            = 'Ezabatu';
+$lang['btn_back']              = 'Atzera';
+$lang['btn_backlink']          = 'Itzulera estekak';
+$lang['btn_backtomedia']       = 'Atzera Multimedia Fitxategiaren Aukeraketara';
+$lang['btn_subscribe']         = 'Harpidetu Orri Aldaketetara';
+$lang['btn_profile']           = 'Eguneratu Profila ';
+$lang['btn_reset']             = 'Aldaketak Desegin';
+$lang['btn_resendpwd']         = 'Pasahitza berria ezarri';
+$lang['btn_draft']             = 'Editatu zirriborroa';
+$lang['btn_recover']           = 'Berreskuratu zirriborroa';
+$lang['btn_draftdel']          = 'Ezabatu zirriborroa';
+$lang['btn_revert']            = 'Berrezarri';
+$lang['btn_register']          = 'Erregistratu';
+$lang['btn_apply']             = 'Baieztatu';
+$lang['btn_media']             = 'Media Kudeatzailea';
+$lang['loggedinas']            = 'Erabiltzailea';
+$lang['user']                  = 'Erabiltzailea';
+$lang['pass']                  = 'Pasahitza';
+$lang['newpass']               = 'Pasahitz berria';
+$lang['oldpass']               = 'Baieztatu oraingo pasahitza';
+$lang['passchk']               = 'berriz';
+$lang['remember']              = 'Gogoratu';
+$lang['fullname']              = 'Izen Deiturak';
+$lang['email']                 = 'E-Maila';
+$lang['profile']               = 'Erabiltzaile Profila';
+$lang['badlogin']              = 'Barkatu, prozesuak huts egin du; saiatu berriz';
+$lang['minoredit']             = 'Aldaketa Txikiak';
+$lang['draftdate']             = 'Zirriborroa automatikoki gorde da hemen:';
+$lang['nosecedit']             = 'Orria aldatua izan da bitartean, info atala zaharkituta geratu da, orri osoa kargatu da horren ordez.';
+$lang['regmissing']            = 'Barkatu, hutsune guztiak bete behar dituzu.';
+$lang['reguexists']            = 'Barkatu, izen bereko erabiltzailea existitzen da.';
+$lang['regsuccess']            = 'Erabiltzailea sortu da. Pasahitza mailez bidaliko zaizu.';
+$lang['regsuccess2']           = 'Erabiltzailea sortua izan da.';
+$lang['regmailfail']           = 'Badirudi arazoren bat egon dela pasahitza mailez bidaltzeko orduan. Administratzailearekin harremanetan jarri!';
+$lang['regbadmail']            = 'Emandako helbidea ez da zuzena - jarri harremanetan administratzailearekin hau akats bat dela uste baduzu';
+$lang['regbadpass']            = 'Idatzitako bi pasahitzak ez dira berdinak, berriz saiatu.';
+$lang['regpwmail']             = 'Zure DokuWiki pasahitza';
+$lang['reghere']               = 'Oraindik ez duzu konturik? Eginzazu bat!';
+$lang['profna']                = 'Wiki honek ez du profilaren aldaketa ahalbidetzen';
+$lang['profnochange']          = 'Aldaketarik ez, ez dago egiteko ezer.';
+$lang['profnoempty']           = 'Izen edota e-posta hutsa ez dago onartua.';
+$lang['profchanged']           = 'Erabiltzaile profila arrakastaz eguneratua.';
+$lang['pwdforget']             = 'Pasahitza ahaztu duzu? Eskuratu berri bat';
+$lang['resendna']              = 'Wiki honek ez du pasahitz berbidalketa onartzen.';
+$lang['resendpwd']             = '-entzat pasahitza berria ezarri';
+$lang['resendpwdmissing']      = 'Barkatu, eremu guztiak bete behar dituzu.';
+$lang['resendpwdnouser']       = 'Barkatu, ez dugu erabiltzaile hori datu-basean aurkitzen';
+$lang['resendpwdbadauth']      = 'Barkatu, kautotze kodea ez da baliozkoa. Ziurtatu baieztapen esteka osoa erabili duzula.';
+$lang['resendpwdconfirm']      = 'Baieztapen esteka bat e-postaz bidali da.';
+$lang['resendpwdsuccess']      = 'Zure pasahitz berria e-postaz bidali da.';
+$lang['license']               = 'Besterik esan ezean, wiki hontako edukia ondorengo lizentziapean argitaratzen da:';
+$lang['licenseok']             = 'Oharra: Orri hau editatzean, zure edukia ondorengo lizentziapean argitaratzea onartzen duzu: ';
+$lang['searchmedia']           = 'Bilatu fitxategi izena:';
+$lang['searchmedia_in']        = 'Bilatu %s-n';
+$lang['txt_upload']            = 'Ireki nahi den fitxategia aukeratu';
+$lang['txt_filename']          = 'Idatzi wikiname-a (aukerazkoa)';
+$lang['txt_overwrt']           = 'Oraingo fitxategiaren gainean idatzi';
+$lang['lockedby']              = 'Momentu honetan blokeatzen:';
+$lang['lockexpire']            = 'Blokeaketa iraungitzen da:';
+$lang['js']['willexpire']      = 'Zure blokeaketa orri hau aldatzeko minutu batean iraungitzen da.\nGatazkak saihesteko, aurreikusi botoia erabili blokeaketa denboragailua berrabiarazteko.';
+$lang['js']['notsavedyet']     = 'Gorde gabeko aldaketak galdu egingo dira.
+Benetan jarraitu nahi duzu?';
+$lang['js']['searchmedia']     = 'Bilatu fitxategiak';
+$lang['js']['keepopen']        = 'Mantendu leihoa irekita aukeraketan';
+$lang['js']['hidedetails']     = 'Xehetasunak Ezkutatu';
+$lang['js']['mediatitle']      = 'Esteken ezarpenak';
+$lang['js']['mediadisplay']    = 'Esteka mota';
+$lang['js']['mediaalign']      = 'Lerrokatzea';
+$lang['js']['mediasize']       = 'Irudi tamaina';
+$lang['js']['mediatarget']     = 'Estekaren helburua';
+$lang['js']['mediaclose']      = 'Itxi';
+$lang['js']['mediainsert']     = 'Txertatu';
+$lang['js']['mediadisplayimg'] = 'Irudia erakutsi';
+$lang['js']['mediadisplaylnk'] = 'Esteka bakarrik erakutsi';
+$lang['js']['mediasmall']      = 'Bertsio txikia';
+$lang['js']['mediamedium']     = 'Bertsio ertaina';
+$lang['js']['medialarge']      = 'Bertsio handia';
+$lang['js']['mediaoriginal']   = 'Jatorrizko bertsioa';
+$lang['js']['medialnk']        = 'Esteka xehetasunen orrira';
+$lang['js']['mediadirect']     = 'Jatorrizkora esteka zuzena';
+$lang['js']['medianolnk']      = 'Estekarik ez';
+$lang['js']['medianolink']     = 'Ez estekatu irudia';
+$lang['js']['medialeft']       = 'Irudia ezkerrean lerrokatu';
+$lang['js']['mediaright']      = 'Irudia eskuinean lerrokatu';
+$lang['js']['mediacenter']     = 'Irudia erdian lerrokatu';
+$lang['js']['medianoalign']    = 'Ez erabili lerrokatzerik';
+$lang['js']['nosmblinks']      = 'Window baliabide konpartituetara estekek Microsoft Internet Explorer-en bakarrik balio dute.
+Esteka kopiatu eta itsatsi dezakezu dena den.';
+$lang['js']['linkwiz']         = 'Estekatze Laguntzailea';
+$lang['js']['linkto']          = 'Estekatu hona:';
+$lang['js']['del_confirm']     = 'Benetan ezabatu aukeratutako fitxategia(k)?';
+$lang['js']['restore_confirm'] = 'Benetan bertsio hau berrezarri?';
+$lang['js']['media_diff']      = 'Diferentziak ikusi:';
+$lang['js']['media_diff_both'] = 'Ondoz ondo';
+$lang['js']['media_select']    = 'Fitxategiak hautatu';
+$lang['js']['media_upload_btn'] = 'Igo';
+$lang['js']['media_done_btn']  = 'Egina';
+$lang['js']['media_drop']      = 'Fitxategiak igotzeko hona bota';
+$lang['js']['media_cancel']    = 'ezabatu';
+$lang['js']['media_overwrt']   = 'Dauden fitxategiak berridatzi';
+$lang['rssfailed']             = 'Errorea gertatu da feed hau irakurtzean:';
+$lang['nothingfound']          = 'Ez da ezer aurkitu.';
+$lang['mediaselect']           = 'Aukeratu Multimedia fitxategia';
+$lang['fileupload']            = 'Igo Multimedia Fitxategia';
+$lang['uploadsucc']            = 'Igoera arrakastatsua';
+$lang['uploadfail']            = 'Igoerak huts egin du. Baimen arazoengatik agian?';
+$lang['uploadwrong']           = 'Fitxategi igoera ukatua. Fitxategi-luzapen hau debekatua dago!';
+$lang['uploadexist']           = 'Fitxategia lehenagotik existitzen da. Ez da ezer egin.';
+$lang['uploadbadcontent']      = 'Igotako edukia ez dator bat %s fitxategi-luzapenarekin.';
+$lang['uploadspam']            = 'Igoera spam zerrenda beltzak blokeatu du.';
+$lang['uploadxss']             = 'Igoera blokeatua izan da eduki maltzurra edukitzeko susmoagatik.';
+$lang['uploadsize']            = 'Igotako fitxategia handiegia zen. (max. %s)';
+$lang['deletesucc']            = 'Ezabatua izan da "%s" fitxategia.';
+$lang['deletefail']            = 'Ezin izan da "%s" ezabatu - egiaztatu baimenak.';
+$lang['mediainuse']            = 'Ez da "%s" fitxategia ezabatu - oraindik erabilia izaten ari da.';
+$lang['namespaces']            = 'Izen-espazioak';
+$lang['mediafiles']            = 'Fitxategiak eskuragarri hemen:';
+$lang['accessdenied']          = 'Ez zaude orri hau ikusteko baimendua';
+$lang['mediausage']            = 'Erabili ondoko sintaxia fitxategi honi erreferentzia egiteko:';
+$lang['mediaview']             = 'Ikusi jatorrizko fitxategia';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Igo fitxategi bat uneko izen-espaziora. Azpi-izen-espazioak sortzeko, zure "Honela igo" fitxategi izenaren aurretik ezarri, bi puntuz (:) bananduta.';
+$lang['mediaextchange']        = 'Fitxategi-luzapena aldatua .%s -tik .%s! -ra';
+$lang['reference']             = 'Erreferentziak honentzat:';
+$lang['ref_inuse']             = 'Fitxategia ezin da ezabatu, honako orri hauek erabiltzen dutelako:';
+$lang['ref_hidden']            = 'Erreferentzi batzuk irakurtzeko baimenik ez duzun orrietan daude';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Matching pagenames';
+$lang['toc']                   = 'Eduki Taula';
+$lang['current']               = 'egungoa';
+$lang['yours']                 = 'Zure Bertsioa';
+$lang['diff']                  = 'egungo bertsioarekin dituen aldaketak aurkezten ditu';
+$lang['diff2']                 = 'Erakutsi desberdintasunak aukeratutako bertsioen artean';
+$lang['difflink']              = 'Estekatu konparaketa bista honetara';
+$lang['diff_type']             = 'Ikusi diferentziak:';
+$lang['diff_inline']           = 'Lerro tartean';
+$lang['diff_side']             = 'Ondoz ondo';
+$lang['line']                  = 'Marra';
+$lang['breadcrumb']            = 'Traza';
+$lang['youarehere']            = 'Hemen zaude';
+$lang['lastmod']               = 'Azken aldaketa';
+$lang['by']                    = 'egilea:';
+$lang['deleted']               = 'ezabatua';
+$lang['created']               = 'sortua';
+$lang['restored']              = 'bertsio zaharra berrezarria (%s)';
+$lang['external_edit']         = 'kanpoko aldaketa';
+$lang['summary']               = 'Aldatu laburpena';
+$lang['noflash']               = 'Adobe Flash Plugin beharrezkoa da eduki hau bistaratzeko.';
+$lang['download']              = 'Deskarga Snippet-a';
+$lang['tools']                 = 'Tresnak';
+$lang['user_tools']            = 'Erabiltzaile Tresnak';
+$lang['site_tools']            = 'Gune Tresnak';
+$lang['page_tools']            = 'Orri Tresnak';
+$lang['skip_to_content']       = 'edukira sahiestu';
+$lang['sidebar']               = 'Alboko-barra';
+$lang['mail_newpage']          = '[DokuWiki] gehitutako orria:';
+$lang['mail_changed']          = '[DokuWiki] aldatutako orria:';
+$lang['mail_subscribe_list']   = 'izen-espazioan aldatutako orriak:';
+$lang['mail_new_user']         = 'erabiltzaile berria:';
+$lang['mail_upload']           = 'fitxategia igota:';
+$lang['changes_type']          = '-ren aldaketak ikusi';
+$lang['pages_changes']         = 'Orriak';
+$lang['media_changes']         = 'Media fitxategiak';
+$lang['both_changes']          = 'Bai orriak nahiz media fitxategiak';
+$lang['qb_bold']               = 'Letra beltzez';
+$lang['qb_italic']             = 'Letra italiarrez';
+$lang['qb_underl']             = 'Azpimarratua';
+$lang['qb_code']               = 'Kodea';
+$lang['qb_strike']             = 'Marratu Testua';
+$lang['qb_h1']                 = 'Izenburua 1';
+$lang['qb_h2']                 = 'Izenburua 2';
+$lang['qb_h3']                 = 'Izenburua 3';
+$lang['qb_h4']                 = 'Izenburua 4';
+$lang['qb_h5']                 = 'Izenburua 5';
+$lang['qb_h']                  = 'Izenburua';
+$lang['qb_hs']                 = 'Izenburua Aukeratu';
+$lang['qb_hplus']              = 'Izenburu Handiagoa';
+$lang['qb_hminus']             = 'Izenburu Txikiagoa';
+$lang['qb_hequal']             = 'Maila Berdineko Izenburua';
+$lang['qb_link']               = 'Barruko Lotura';
+$lang['qb_extlink']            = 'Kanpoko Lotura';
+$lang['qb_hr']                 = 'Horizontal Marra';
+$lang['qb_ol']                 = 'Zerrenda ordenatuko gaia';
+$lang['qb_ul']                 = 'Zerrenda desordenatuko gaia';
+$lang['qb_media']              = 'Irudiak eta beste fitxategiak gehitu';
+$lang['qb_sig']                = 'Gehitu sinadura';
+$lang['qb_smileys']            = 'Irrifartxoak';
+$lang['qb_chars']              = 'Karaktere Bereziak';
+$lang['upperns']               = 'Jauzi izen-espazio gurasora';
+$lang['admin_register']        = 'Erabiltzaile berria gehitu';
+$lang['metaedit']              = 'Metadatua Aldatu';
+$lang['metasaveerr']           = 'Metadatuaren idazketak huts egin du';
+$lang['metasaveok']            = 'Metadatua gordea';
+$lang['img_backto']            = 'Atzera hona';
+$lang['img_title']             = 'Izenburua';
+$lang['img_caption']           = 'Epigrafea';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Fitxategi izena';
+$lang['img_fsize']             = 'Tamaina';
+$lang['img_artist']            = 'Artista';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formatua';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Hitz-gakoak';
+$lang['img_width']             = 'Zabalera';
+$lang['img_height']            = 'Altuera';
+$lang['img_manager']           = 'Media kudeatzailean ikusi';
+$lang['subscr_subscribe_success'] = '%s gehitua %s-ren harpidetza zerrendara';
+$lang['subscr_subscribe_error'] = 'Errorea %s gehitzen %s-ren harpidetza zerrendara';
+$lang['subscr_subscribe_noaddress'] = 'Ez dago helbiderik zure login-arekin lotuta, ezin zara harpidetza zerrendara gehitua izan.';
+$lang['subscr_unsubscribe_success'] = '%s ezabatua %s-ren harpidetza zerrendatik';
+$lang['subscr_unsubscribe_error'] = 'Errorea %s ezabatzen %s-ren harpidetza zerrendatik';
+$lang['subscr_already_subscribed'] = '%s lehendik harpidetua dago %s-n';
+$lang['subscr_not_subscribed'] = '%s ez dago %s-n harpidetua';
+$lang['subscr_m_not_subscribed'] = 'Momentu honetan ez zaude orri honetara edo izen-espazio honetara harpidetua.';
+$lang['subscr_m_new_header']   = 'Gehitu harpidetza';
+$lang['subscr_m_current_header'] = 'Uneko harpidetzak';
+$lang['subscr_m_unsubscribe']  = 'Kendu harpidetza';
+$lang['subscr_m_subscribe']    = 'Harpidetu';
+$lang['subscr_m_receive']      = 'Jaso';
+$lang['subscr_style_every']    = 'e-posta aldaketa bakoitzean';
+$lang['subscr_style_digest']   = 'e-posta laburbildua orri bakoitzeko aldaketentzat (%.2f egunero)';
+$lang['subscr_style_list']     = 'aldatutako orrien zerrenda azken e-postatik (%.2f egunero)';
+$lang['authtempfail']          = 'Erabiltzaile kautotzea denboraldi batez ez dago erabilgarri. Egoerak hala jarraitzen badu, mesedez, eman honen berri Wiki administratzaileari';
+$lang['authpwdexpire']         = 'Zure pasahitza %d egun barru iraungiko da, laster aldatu beharko zenuke.';
+$lang['i_chooselang']          = 'Hautatu zure hizkuntza';
+$lang['i_installer']           = 'DokuWiki instalatzailea';
+$lang['i_wikiname']            = 'Wiki Izena';
+$lang['i_enableacl']           = 'Gaitu ACL (gomendatua) (ACL: Atzipen Kontrol Lista)';
+$lang['i_superuser']           = 'Supererabiltzailea';
+$lang['i_problems']            = 'Instalatzaileak arazo batzuk aurkitu ditu, behean azalduak. Ezin duzu horiek konpondu arte jarraitu.';
+$lang['i_modified']            = 'Segurtasun arrazoiengatik, script hau DokuWikiren instalazio berri eta aldatu gabeko batekin bakarrik dabil. Deskargatutako paketetik fitxategiak berriz atera edo DokuWikiren instalazio azalpenak osorik irakurri beharko zenituzke.';
+$lang['i_funcna']              = 'PHP %s funtzioa ez dago erabilgarri. Agian zure hosting hornitzaileak arrazoiren batengatik ezgaituko zuen?';
+$lang['i_phpver']              = 'Zure PHP %s bertsioa behar den %s bertsioa baino zaharragoa da. PHP instalazioa eguneratu beharra daukazu.';
+$lang['i_permfail']            = 'DokuWiki ez da   %s idazteko gai. Direktorio honen baimenen konfigurazioa konpondu behar duzu!';
+$lang['i_confexists']          = '%s lehendik existitzen da';
+$lang['i_writeerr']            = 'Ezin da %s sortu. Direktorioaren/fitxategiaren baimenak egiaztatu eta sortu fitxategia eskuz.';
+$lang['i_badhash']             = 'aldatutakoa edo ezezaguna den dokuwiki.php (hash=%s)';
+$lang['i_badval']              = '%s - balioa arauen aurka edo hutsa';
+$lang['i_success']             = 'Konfigurazioa arrakastaz amaitu da. Orain, install.php fitxategia ezabatu dezakezu. Jarraitu ezazu zure DokuWiki berrian.';
+$lang['i_failure']             = 'Akats batzuk gertatu dira konfigurazio fitxategiak idazterakoan. Hauek eskuz konpondu beharra izan dezakezu zure DokuWiki berria erabili ahal izan aurretik.';
+$lang['i_policy']              = 'Hasierako ACL politika';
+$lang['i_pol0']                = 'Wiki Irekia (irakurri, idatzi, fitxategiak igo edonorentzat)';
+$lang['i_pol1']                = 'Wiki Publikoa (irakurri edonorentzat, idatzi eta fitxategiak igo erregistratutako erabiltzaileentzat)';
+$lang['i_pol2']                = 'Wiki Itxia (irakurri, idatzi, fitxategiak igo erregistratutako erabiltzaileentzat soilik)';
+$lang['i_retry']               = 'Berriz saiatu';
+$lang['i_license']             = 'Mesedez, aukeratu zein lizentzipean ezarri nahi duzun zure edukia:';
+$lang['recent_global']         = 'Une honetan %s izen-espazioaren barneko aldaketak ikusten ari zara. Wiki osoaren azken aldaketak ere ikusi ditzakezu.';
+$lang['years']                 = 'duela %d urte';
+$lang['months']                = 'duela %d hilabete';
+$lang['weeks']                 = 'duela %d aste';
+$lang['days']                  = 'duela %d egun';
+$lang['hours']                 = 'duela %d ordu';
+$lang['minutes']               = 'duela %d minutu';
+$lang['seconds']               = 'duela %d segundu';
+$lang['wordblock']             = 'Zure aldaketa ez da aldatua izan blokeatutako testua (spam) daukalako.';
+$lang['media_uploadtab']       = 'Igo';
+$lang['media_searchtab']       = 'Bilatu';
+$lang['media_file']            = 'Fitxategia';
+$lang['media_viewtab']         = 'Begiratu';
+$lang['media_edittab']         = 'Editatu';
+$lang['media_historytab']      = 'Historia';
+$lang['media_sort_name']       = 'Izena';
+$lang['media_sort_date']       = 'Data';
+$lang['media_files']           = '%s -n fitxategiak';
+$lang['media_upload']          = 'Igo %s -ra';
+$lang['media_search']          = 'Bilatu %s -n';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s -n %s';
+$lang['media_edit']            = '%s editatu';
+$lang['media_update']          = 'Bertsio berria igo';
+$lang['media_restore']         = 'Bertsio hau berrezarri';
diff --git a/sources/inc/lang/eu/locked.txt b/sources/inc/lang/eu/locked.txt
new file mode 100644
index 0000000..dc29e51
--- /dev/null
+++ b/sources/inc/lang/eu/locked.txt
@@ -0,0 +1,3 @@
+====== Orria blokeatua ======
+
+Orrialde hau blokeatua dago beste erabiltzaile batengatik. Berak aldaketak bukatu arte itxaron beharko duzu.
diff --git a/sources/inc/lang/eu/login.txt b/sources/inc/lang/eu/login.txt
new file mode 100644
index 0000000..ebb1607
--- /dev/null
+++ b/sources/inc/lang/eu/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Ez duzu sesiorik hasi! Sar ezazu zure erabiltzaile izena eta pasahitza. Gogoratu coockie-ak baimenduta izan behar dituzula.
+
diff --git a/sources/inc/lang/eu/mailtext.txt b/sources/inc/lang/eu/mailtext.txt
new file mode 100644
index 0000000..86ab1a3
--- /dev/null
+++ b/sources/inc/lang/eu/mailtext.txt
@@ -0,0 +1,17 @@
+DokuWiki-Eskuliburuetan orriren bat aldatu edo gehitu da. Hemen dituzu xehetasunak
+
+Data                : @DATE@
+Nabigatzailea       : @BROWSER@
+IP-Helbidea         : @IPADDRESS@
+Host izena          : @HOSTNAME@
+Bertsio zaharra : @OLDPAGE@
+Bertsio berria  : @NEWPAGE@
+Aldatu laburpena    : @SUMMARY@
+Erabiltzailea       : @USER@
+
+@DIFF@
+
+
+-- 
+Email hau DokuWiki erabiliz sortu da;
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/eu/mailwrap.html b/sources/inc/lang/eu/mailwrap.html
new file mode 100644
index 0000000..0cf92c2
--- /dev/null
+++ b/sources/inc/lang/eu/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Mezu elektroniko hau DokuWiki-k sortua da @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/eu/newpage.txt b/sources/inc/lang/eu/newpage.txt
new file mode 100644
index 0000000..cac872c
--- /dev/null
+++ b/sources/inc/lang/eu/newpage.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/eu/norev.txt b/sources/inc/lang/eu/norev.txt
new file mode 100644
index 0000000..7d9cc60
--- /dev/null
+++ b/sources/inc/lang/eu/norev.txt
@@ -0,0 +1,3 @@
+====== Berrikuspen hau ez da existitzen ======
+
+Zehaztutako bertsioa ez da existitzen. Erabili ''Bertsio zaharrak'' dokumentu honen aurreko bertsioen zerrenda bat ikusi ahal izateko.
diff --git a/sources/inc/lang/eu/password.txt b/sources/inc/lang/eu/password.txt
new file mode 100644
index 0000000..cf2a017
--- /dev/null
+++ b/sources/inc/lang/eu/password.txt
@@ -0,0 +1,10 @@
+Kaixo @FULLNAME@!
+
+Hau da zure erabiltzailea @TITLE@ -rentzako @DOKUWIKIURL@
+
+Erabiltzailea    : @LOGIN@
+Pasahitza : @PASSWORD@
+
+-- 
+eMail hau DokuWikiren bitartez sortu da;
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/eu/preview.txt b/sources/inc/lang/eu/preview.txt
new file mode 100644
index 0000000..1f0d14f
--- /dev/null
+++ b/sources/inc/lang/eu/preview.txt
@@ -0,0 +1,3 @@
+====== Aurreikuspena ======
+
+Hau zure testuaren aurrebista bat besterik ez da. Gogoratu: **ez da gorde** oraindik!
diff --git a/sources/inc/lang/eu/pwconfirm.txt b/sources/inc/lang/eu/pwconfirm.txt
new file mode 100644
index 0000000..0f0fd5e
--- /dev/null
+++ b/sources/inc/lang/eu/pwconfirm.txt
@@ -0,0 +1,12 @@
+Kaixo @FULLNAME@!
+
+Norbaitek zure @TITLE@ erabiltzailearentzat pasahitz berria eskatu du @DOKUWIKIURL@ gunean.
+
+Ez baduzu zuk eskatu pasahitz berria, ez kasurik egin posta honi.
+
+Eskakizuna zuk bidalia dela egiaztatzeko, mesedez, ondorengo esteka erabili.
+
+@CONFIRM@
+
+-- 
+Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/read.txt b/sources/inc/lang/eu/read.txt
new file mode 100644
index 0000000..f7ed7b0
--- /dev/null
+++ b/sources/inc/lang/eu/read.txt
@@ -0,0 +1 @@
+Orri hau irakurtzeko bakarrik da. Jatorria ikusi dezakezu baina ezin duzu aldatu. Administratzailearekin kontaktuan jarri  gaizki dagoela uste baduzu.
diff --git a/sources/inc/lang/eu/recent.txt b/sources/inc/lang/eu/recent.txt
new file mode 100644
index 0000000..4ab5482
--- /dev/null
+++ b/sources/inc/lang/eu/recent.txt
@@ -0,0 +1,3 @@
+====== Azken Aldaketak ======
+
+Ondorengo orriak aldatu berriak izan dira:
diff --git a/sources/inc/lang/eu/register.txt b/sources/inc/lang/eu/register.txt
new file mode 100644
index 0000000..4a8a49b
--- /dev/null
+++ b/sources/inc/lang/eu/register.txt
@@ -0,0 +1,3 @@
+====== Erregistratu erabiltzaile berri bezala ======
+
+Bete beheko informazio guztia wiki honetan kontu berri bat sortzeko. Ziurtatu **baliozko posta-e helbide** bat ematen duzula - ez bazaizu hemen eskatzen pasahitzik sartzeko, berri bat bidaliko zaizu helbide horretara. Saioa hasteko izenak baliozko [[doku>pagename|orri izena]] izan behar du.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/registermail.txt b/sources/inc/lang/eu/registermail.txt
new file mode 100644
index 0000000..a015444
--- /dev/null
+++ b/sources/inc/lang/eu/registermail.txt
@@ -0,0 +1,13 @@
+Erabiltzaile berri bat erregistratu da. Hona hemen xehetasunak:
+
+Erabiltzaile izena : @NEWUSER@
+Izen osoa : @NEWNAME@
+Posta-e : @NEWEMAIL@
+
+Data : @DATE@
+Nabigatzailea : @BROWSER@
+IP-Helbidea : @IPADDRESS@
+Hostalari izena : @HOSTNAME@
+
+-- 
+Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/resendpwd.txt b/sources/inc/lang/eu/resendpwd.txt
new file mode 100644
index 0000000..98f261c
--- /dev/null
+++ b/sources/inc/lang/eu/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Bidali pasahitz berria ======
+
+Mesedez, sartu zure erabiltzaile izena beheko formularioan zure wiki honetako kontuarentzat pasahitz berria eskatzeko. Baieztapen esteka bat bidaliko zaizu erregistratutako  zure posta-e helbidera.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/resetpwd.txt b/sources/inc/lang/eu/resetpwd.txt
new file mode 100644
index 0000000..9bb6e3a
--- /dev/null
+++ b/sources/inc/lang/eu/resetpwd.txt
@@ -0,0 +1,3 @@
+	====== Pasahitza berria ezarri ======
+
+Mesedez wiki honetako zure pasahitza berria sartu.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/revisions.txt b/sources/inc/lang/eu/revisions.txt
new file mode 100644
index 0000000..203cb7e
--- /dev/null
+++ b/sources/inc/lang/eu/revisions.txt
@@ -0,0 +1,3 @@
+====== Bertsio zaharrak ======
+
+Hauek egungo dokumentua baino zaharragoak diren bertsioak dira. Hauetako bertsio batetara itzultzeko aukera ezazu behetik, pultsatu ''Sortu orri hau'' eta gorde.
diff --git a/sources/inc/lang/eu/searchpage.txt b/sources/inc/lang/eu/searchpage.txt
new file mode 100644
index 0000000..2a487a3
--- /dev/null
+++ b/sources/inc/lang/eu/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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: =====
diff --git a/sources/inc/lang/eu/showrev.txt b/sources/inc/lang/eu/showrev.txt
new file mode 100644
index 0000000..ad1b360
--- /dev/null
+++ b/sources/inc/lang/eu/showrev.txt
@@ -0,0 +1,2 @@
+**Hau dokumentuaren bertsio zahar bat da!**
+----
diff --git a/sources/inc/lang/eu/stopwords.txt b/sources/inc/lang/eu/stopwords.txt
new file mode 100644
index 0000000..1aeb868
--- /dev/null
+++ b/sources/inc/lang/eu/stopwords.txt
@@ -0,0 +1,26 @@
+# 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/
+# FITXATEGI HONEK BEGIRATU BAT BEHAR DU!
+buruz
+dira
+da
+eta
+zure
+haiek
+haien
+com
+nondik
+nora
+nola
+zer
+hau
+zen
+noiz
+non
+nor
+nork
+und
+the
+www
\ No newline at end of file
diff --git a/sources/inc/lang/eu/subscr_digest.txt b/sources/inc/lang/eu/subscr_digest.txt
new file mode 100644
index 0000000..e7962ca
--- /dev/null
+++ b/sources/inc/lang/eu/subscr_digest.txt
@@ -0,0 +1,20 @@
+Kaixo!
+
+@TITLE@ wikiko @PAGE@ orria aldatu egin da.
+Hemen aldaketak:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Berrikuste zaharra: @OLDPAGE@
+Berrikuste berria: @NEWPAGE@
+
+Orri jakinarazpenak ezeztatzeko, sartu wikian 
+@DOKUWIKIURL@ helbidean, bisitatu
+@SUBSCRIBE@
+eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza.
+
+--
+E-posta hau DokuWiki-k sortua izan da helbide honetan:
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/eu/subscr_form.txt b/sources/inc/lang/eu/subscr_form.txt
new file mode 100644
index 0000000..02a1178
--- /dev/null
+++ b/sources/inc/lang/eu/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Harpidetza Kudeaketa ======
+
+Orri honek, oraingo orriko eta izen-espazioko harpidetzak kudeatzeko aukera ematen dizu.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/subscr_list.txt b/sources/inc/lang/eu/subscr_list.txt
new file mode 100644
index 0000000..950cd35
--- /dev/null
+++ b/sources/inc/lang/eu/subscr_list.txt
@@ -0,0 +1,17 @@
+Kaixo!
+
+@TITLE@ wikiko @PAGE@ izen-espazioko orri batzuk aldatu egin dira.
+Hemen aldatutako orriak:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Orri jakinarazpenak ezeztatzeko, sartu wikian 
+@DOKUWIKIURL@ helbidean, bisitatu
+@SUBSCRIBE@
+eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza.
+
+--
+E-posta hau DokuWiki-k sortua izan da helbide honetan:
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/eu/subscr_single.txt b/sources/inc/lang/eu/subscr_single.txt
new file mode 100644
index 0000000..4902117
--- /dev/null
+++ b/sources/inc/lang/eu/subscr_single.txt
@@ -0,0 +1,23 @@
+Kaixo!
+
+@TITLE@ wikiko @PAGE@ orria aldatu egin da.
+Hemen aldaketak:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Erabiltzailea : @USER@
+Aldaketaren Laburpena: @SUMMARY@
+Berrikuste Zaharra: @OLDPAGE@
+Berrikuste Berria: @NEWPAGE@
+
+Orri jakinarazpenak ezeztatzeko, sartu wikian 
+@DOKUWIKIURL@ helbidean, bisitatu
+@SUBSCRIBE@
+eta ezabatu orri eta/edo izen-espazio aldaketen harpidetza.
+
+--
+E-posta hau DokuWiki-k sortua izan da helbide honetan:
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/eu/updateprofile.txt b/sources/inc/lang/eu/updateprofile.txt
new file mode 100644
index 0000000..233bfec
--- /dev/null
+++ b/sources/inc/lang/eu/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Eguneratu zure kontuaren profila ======
+
+Aldatu nahi dituzun atalak bakarrik bete behar dituzu. Ezin duzu zure erabiltzaile izena aldatu.
\ No newline at end of file
diff --git a/sources/inc/lang/eu/uploadmail.txt b/sources/inc/lang/eu/uploadmail.txt
new file mode 100644
index 0000000..639f3d9
--- /dev/null
+++ b/sources/inc/lang/eu/uploadmail.txt
@@ -0,0 +1,13 @@
+Fitxategi bat igo da zure DokuWikira. Hona hemen xehetasunak:
+
+Fitxategia : @MEDIA@
+Data : @DATE@
+Nabigatzailea : @BROWSER@
+IP-Helbide : @IPADDRESS@
+Hostalari izena : @HOSTNAME@
+Tamaina : @SIZE@
+MIME Mota : @MIME@
+Erabiltzailea : @USER@
+
+-- 
+Posta hau @DOKUWIKIURL@ gunean DokuWikik sortua izan da.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/admin.txt b/sources/inc/lang/fa/admin.txt
new file mode 100644
index 0000000..ce75509
--- /dev/null
+++ b/sources/inc/lang/fa/admin.txt
@@ -0,0 +1,3 @@
+====== مدیریت ======
+
+در اینجا لیستی از وظیفه‌های مدیریتی را مشاهده می‌کنید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/adminplugins.txt b/sources/inc/lang/fa/adminplugins.txt
new file mode 100644
index 0000000..3d2bb4a
--- /dev/null
+++ b/sources/inc/lang/fa/adminplugins.txt
@@ -0,0 +1 @@
+===== برنامه های جانبی دیگر =====
\ No newline at end of file
diff --git a/sources/inc/lang/fa/backlinks.txt b/sources/inc/lang/fa/backlinks.txt
new file mode 100644
index 0000000..6864e22
--- /dev/null
+++ b/sources/inc/lang/fa/backlinks.txt
@@ -0,0 +1,3 @@
+====== پیوندهای بازگشتی ======
+
+در این‌جا لیستی از صفحاتی که به این صفحه پیوند داده‌اند را مشاهده می‌کنید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/conflict.txt b/sources/inc/lang/fa/conflict.txt
new file mode 100644
index 0000000..9de0370
--- /dev/null
+++ b/sources/inc/lang/fa/conflict.txt
@@ -0,0 +1,5 @@
+====== یک نگارش جدید وجود دارد ======
+
+این نگارش جدید از مطلبی که ویرایش کرده‌اید وجود دارد. این اتفاق زمانی رخ می‌دهد که یک کاربر دیگر زمانی که شما ویرایش می‌کرده‌اید، ان را تغییر داده است.
+
+تفاوت‌های زیر را بررسی کنید، و تصمیم بگیرید که کدام نگارش حفظ شود. اگر دکمه‌ی «ذخیره» را بفشارید، نسخه‌ی شما ذخیره می‌شود و اگر دکمه‌ی «لغو» را بفشارید، نسخه‌ی کنونی حفظ خواهد شد.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/denied.txt b/sources/inc/lang/fa/denied.txt
new file mode 100644
index 0000000..827f73e
--- /dev/null
+++ b/sources/inc/lang/fa/denied.txt
@@ -0,0 +1,3 @@
+====== دسترسی ممکن نیست ======
+
+شرمنده، شما اجازه‌ی دسترسی ب این صفحه را ندارید. ممکن است فراموش کرده باشید که وارد سایت شوید!
\ No newline at end of file
diff --git a/sources/inc/lang/fa/diff.txt b/sources/inc/lang/fa/diff.txt
new file mode 100644
index 0000000..d5354f7
--- /dev/null
+++ b/sources/inc/lang/fa/diff.txt
@@ -0,0 +1,3 @@
+====== تفاوت‌ها ======
+
+تفاوت دو نسخه‌ی متفاوت از صفحه را مشاهده می‌کنید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/draft.txt b/sources/inc/lang/fa/draft.txt
new file mode 100644
index 0000000..164b217
--- /dev/null
+++ b/sources/inc/lang/fa/draft.txt
@@ -0,0 +1,5 @@
+====== فایل چرک‌نویس یافت شد ======
+
+آخرین سشن ویرایش شما با موفقیت به پایان نرسیده. Dokuwiki به طور خودکار چرک‌نویسی از صفحه‌ی شما ذخیره می‌کند که شما می‌توانید آن را کامل کنید. در زیر مقادیر موجود در چرک‌نویس را مشاهده می‌کنید.
+
+خواهشمندیم تصمیم بگیرید که می‌خواهید چرک‌نویس را //بازیابی//، یا آن را //حذف// کنید و یا ویرایش را //لغو// نمایید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/edit.txt b/sources/inc/lang/fa/edit.txt
new file mode 100644
index 0000000..7c3873a
--- /dev/null
+++ b/sources/inc/lang/fa/edit.txt
@@ -0,0 +1 @@
+این صفحه را ویرایش کنید و کلید «ذخیره» را فشار دهید. صفحه [[wiki:syntax|قوانین نگارشی]] را برای روش نگارش ویکی مشاهده کنید. خواهشمندیم فقط در صورتی این صفحه را ویرایش کنید که توانایی **بهبود بخشیدن** به آن را دارید. اگر تصمیم دارید چیزی را تست کنید یا اولین قدم‌های‌تان را در نگارش ویکی بردارید، به [[playground:playground|زمین بازی]] بروید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/editrev.txt b/sources/inc/lang/fa/editrev.txt
new file mode 100644
index 0000000..ca896fe
--- /dev/null
+++ b/sources/inc/lang/fa/editrev.txt
@@ -0,0 +1 @@
+**شما یک نگارش قدیمی را مشاهده می‌کنید!** اگر این نگارش را ذخیره کنید، شما یک نگارش جدید ایجاد کرده‌اید!
\ No newline at end of file
diff --git a/sources/inc/lang/fa/index.txt b/sources/inc/lang/fa/index.txt
new file mode 100644
index 0000000..89ed74b
--- /dev/null
+++ b/sources/inc/lang/fa/index.txt
@@ -0,0 +1,3 @@
+====== فهرست ======
+
+این صفحه فهرست تمامی صفحات بر اساس [[doku>namespaces|فضای‌نام‌ها]] است.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/install.html b/sources/inc/lang/fa/install.html
new file mode 100644
index 0000000..7960f9c
--- /dev/null
+++ b/sources/inc/lang/fa/install.html
@@ -0,0 +1,12 @@
+
        این صفحه به شما در نصب و تنظیم
+Dokuwiki کمک می‌کند. اطلاعات بیشتری در این مورد را می‌توانید در بخش راهنما مشاهده کنید.
        
+
+
        DokuWiki از فایل‌های معمولی برای ذخیره‌ی صفحات ویکی و اطلاعات مربوط به آن‌ها استفاده می‌کند (مثل تصاویر، فهرست‌های جستجو، نگارش‌های پیشین و غیره). برای نصب موفقیت آمیز DokuWiki
+باید دسترسی نوشتن برای شاخه‌های این فایل‌ها داشته باشید. این کار باید توسط دستورات خط فرمان و یا دسترسی FTP و یا از طریق کنترل پنل خدمات میزبانی‌تون انجام شود. 
        
+
+
        این برنامه دسترسی‌های DokuWiki را برای شما تنظیم خواهد کرد،
+به این معنی که مدیر سیستم می‌تواند به صفحه‌ی مدیران وارد شود، افزونه نصب کنید، کاربران را مدیریت کند، دسترسی به صفحات ویکی را مدیریت کند و یا تنظیمات را تغییر دهد.
        
+
+
        برای اطلاعات بیشتر در مورد نصب می‌توانید از این پیوند‌ها استفاده کنید
+روش نصب
+و  تنظیمات پیکربندی.
        
\ No newline at end of file
diff --git a/sources/inc/lang/fa/lang.php b/sources/inc/lang/fa/lang.php
new file mode 100644
index 0000000..6cb5164
--- /dev/null
+++ b/sources/inc/lang/fa/lang.php
@@ -0,0 +1,324 @@
+
+ * @author Omid Mottaghi 
+ * @author Mohammad Reza Shoaei 
+ * @author Milad DZand 
+ * @author AmirH Hassaneini 
+ * @author mehrdad 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'rtl';
+$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_profile']           = 'به روز رسانی پروفایل';
+$lang['btn_reset']             = 'بازنشاندن';
+$lang['btn_resendpwd']         = 'تعیین کلمه عبور جدید';
+$lang['btn_draft']             = 'ویرایش پیش‌نویس';
+$lang['btn_recover']           = 'بازیابی پیش‌نویس';
+$lang['btn_draftdel']          = 'حذف پیش‌نویس';
+$lang['btn_revert']            = 'بازیابی';
+$lang['btn_register']          = 'یک حساب جدید بسازید';
+$lang['btn_apply']             = 'اعمال کن';
+$lang['btn_media']             = 'مدیریت محتوای چند رسانه ای';
+$lang['btn_deleteuser']        = 'حذف حساب کاربری خود';
+$lang['loggedinas']            = 'به عنوان کاربر روبرو وارد شده‌اید:';
+$lang['user']                  = 'نام کاربری:';
+$lang['pass']                  = 'گذرواژه‌ی شما';
+$lang['newpass']               = 'گذروازه‌ی جدید';
+$lang['oldpass']               = 'گذرواژه‌ی پیشین';
+$lang['passchk']               = 'گذرواژه را دوباره وارد کنید';
+$lang['remember']              = 'گذرواژه را به یاد بسپار.';
+$lang['fullname']              = '*نام واقعی شما';
+$lang['email']                 = 'ایمیل شما*';
+$lang['profile']               = 'پروفایل کاربر';
+$lang['badlogin']              = 'خطا در ورود به سیستم';
+$lang['badpassconfirm']        = 'متاسفم ، رمز عبور اشتباه است';
+$lang['minoredit']             = 'این ویرایش خُرد است';
+$lang['draftdate']             = 'ذخیره خودکار پیش‌نویس';
+$lang['nosecedit']             = 'این صفحه در این میان تغییر کرده است، اطلاعات بخش قدیمی شده است، در عوض محتوای کل نمایش داده می‌شود.';
+$lang['regmissing']            = 'متاسفم، شما باید همه قسمت‌ها را پر کنید.';
+$lang['reguexists']            = 'نام کاربری‌ای که وارد کردید قبلن استفاده شده است. خواهشمندیم یک نام دیگر انتخاب کنید.';
+$lang['regsuccess']            = 'کاربر ساخته شد و گذرواژه به صورت ایمیل ارسال گردید.';
+$lang['regsuccess2']           = 'حساب ایجاد شد.';
+$lang['regmailfail']           = 'مشکلی در ارسال ایمیل پیش آمده است، با مدیر تماس بگیرید!';
+$lang['regbadmail']            = 'نشانی واردشده‌ی ایمیل قابل‌قبول نیست، چرا که دارای ساختار نامعتبری است. خواهشمندیم نشانی‌ای با ساختار صحیح وارد کنید و یا بخش مربوط را خالی بگذارید.';
+$lang['regbadpass']            = 'گذرواژه‌هایی که وارد کردید یکسان نیستند.';
+$lang['regpwmail']             = 'گذرواژه‌ی DokuWiki شما';
+$lang['reghere']               = 'شما هنوز حسابی در اینجا ندارید؟ یکی ایجاد کنید';
+$lang['profna']                = 'این ویکی اجازه ویرایش پروفایل را نمی‌دهد';
+$lang['profnochange']          = 'تغییری صورت نگرفت';
+$lang['profnoempty']           = 'نام و آدرس ایمیل باید پر شود';
+$lang['profchanged']           = 'پروفایل کاربر با موفقیت به روز شد';
+$lang['profnodelete']          = 'ویکی توانایی پشتیبانی از حذف کاربران را ندارد';
+$lang['profdeleteuser']        = 'حذف حساب کاربری';
+$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['maxuploadsize']         = 'حداکثر %s برای هر فایل مجاز است.';
+$lang['lockedby']              = 'در حال حاضر قفل شده است';
+$lang['lockexpire']            = 'قفل منقضی شده است';
+$lang['js']['willexpire']      = 'حالت قفل شما مدتی است منقضی شده است \n برای جلوگیری از تداخل دکمه‌ی پیش‌نمایش را برای صفر شدن ساعت قفل بزنید.';
+$lang['js']['notsavedyet']     = 'تغییرات ذخیره شده از بین خواهد رفت.
+ می‌خواهید ادامه دهید؟';
+$lang['js']['searchmedia']     = 'جستجو برای فایل';
+$lang['js']['keepopen']        = 'پنجره را ر زمان انتخاب باز نگه‌دار';
+$lang['js']['hidedetails']     = 'پتهان کردن جزییات';
+$lang['js']['mediatitle']      = 'تنظیمات پیوند';
+$lang['js']['mediadisplay']    = 'نوع پیوند';
+$lang['js']['mediaalign']      = 'هم‌ترازی';
+$lang['js']['mediasize']       = 'اندازه تصویر';
+$lang['js']['mediatarget']     = 'هدف پیوند';
+$lang['js']['mediaclose']      = 'بستن';
+$lang['js']['mediainsert']     = 'درج کردن';
+$lang['js']['mediadisplayimg'] = 'نمایش تصویر';
+$lang['js']['mediadisplaylnk'] = 'فقط پیوند را نمایش بده.';
+$lang['js']['mediasmall']      = 'نگارش کوچک';
+$lang['js']['mediamedium']     = 'نگارش متوسط';
+$lang['js']['medialarge']      = 'نگارش بزرگ';
+$lang['js']['mediaoriginal']   = 'نگارش اصلی';
+$lang['js']['medialnk']        = 'پیوند به صفحه‌ی جزییات';
+$lang['js']['mediadirect']     = 'پیوند مستقیم به اصلی';
+$lang['js']['medianolnk']      = 'بدون پیوند';
+$lang['js']['medianolink']     = 'تصویر را پیوند نکن';
+$lang['js']['medialeft']       = 'تصویر را با چپ هم‌تراز کن.';
+$lang['js']['mediaright']      = 'تصویر را با راست هم‌تراز کن.';
+$lang['js']['mediacenter']     = 'تصویر را با وسط هم‌تراز کن.';
+$lang['js']['medianoalign']    = 'هم‌تراز نکن.';
+$lang['js']['nosmblinks']      = 'پیوند به Windows share فقط در اینترنت‌اکسپلورر قابل استفاده است.
+شما می‌توانید پیوند‌ها رو کپی کنید.';
+$lang['js']['linkwiz']         = 'ویزارد پیوند';
+$lang['js']['linkto']          = 'پیوند به:';
+$lang['js']['del_confirm']     = 'واقعن تصمیم به حذف این موارد دارید؟';
+$lang['js']['restore_confirm'] = 'آیا مطمئن هستید که می خواهید این نسخه را بازیابی کنید؟';
+$lang['js']['media_diff']      = 'تفاوت ها را ببینید : ';
+$lang['js']['media_diff_both'] = 'پهلو به پهلو';
+$lang['js']['media_diff_opacity'] = 'درخشش از';
+$lang['js']['media_diff_portions'] = 'کش رفتن';
+$lang['js']['media_select']    = 'انتخاب فایل -یا فایلها- ...';
+$lang['js']['media_upload_btn'] = 'آپلود';
+$lang['js']['media_done_btn']  = 'انجام شد';
+$lang['js']['media_drop']      = 'فایل ها را در اینجا قرار دهید تا آپلود شود';
+$lang['js']['media_cancel']    = 'حذف';
+$lang['js']['media_overwrt']   = 'جاینوشت فایل های موجود';
+$lang['rssfailed']             = 'بروز خطا در هنگام واکشی';
+$lang['nothingfound']          = 'چیزی پیدا نشد';
+$lang['mediaselect']           = 'فایل‌ها';
+$lang['fileupload']            = 'ارسال پرونده';
+$lang['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['accessdenied']          = 'شما اجازه‌ی مشاهده‌ی این صفحه را ندارید.';
+$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['difflink']              = 'پیوند به صفحه‌ی تفاوت‌ها';
+$lang['diff_type']             = 'مشاهده تغییرات:';
+$lang['diff_inline']           = 'خطی';
+$lang['diff_side']             = 'کلی';
+$lang['line']                  = 'خط';
+$lang['breadcrumb']            = 'ردپا';
+$lang['youarehere']            = 'محل شما';
+$lang['lastmod']               = 'آخرین ویرایش';
+$lang['by']                    = 'توسط';
+$lang['deleted']               = 'حذف شد';
+$lang['created']               = 'ایجاد شد';
+$lang['restored']              = 'یک نگارش پیشین واگردانی شد. (%s)';
+$lang['external_edit']         = 'ویرایش خارجی';
+$lang['summary']               = 'پیش‌نمایش';
+$lang['noflash']               = 'برای نمایش محتویات افزونه‌ی فلش مورد نیاز است.';
+$lang['download']              = 'دیافت فایل منقطع گردید';
+$lang['tools']                 = 'ابزار';
+$lang['user_tools']            = 'ابزار کاربر';
+$lang['site_tools']            = 'ابزار سایت';
+$lang['page_tools']            = 'ابزار صفحه';
+$lang['skip_to_content']       = 'پرش به محتوا';
+$lang['sidebar']               = 'نوار کناری';
+$lang['mail_newpage']          = 'صفحه اضافه شد:';
+$lang['mail_changed']          = 'صفحه تغییر داده شد:';
+$lang['mail_subscribe_list']   = 'صفحات تغییر داده شده در فضای‌نام';
+$lang['mail_new_user']         = 'کاربر جدید:';
+$lang['mail_upload']           = 'فایل ارسال شده:';
+$lang['changes_type']          = 'دیدن تغییرات';
+$lang['pages_changes']         = 'صفحات';
+$lang['media_changes']         = 'فایلهای چند رسانه ای';
+$lang['both_changes']          = 'صفحات و فایل های چند رسانه ای هر دو';
+$lang['qb_bold']               = 'متن پُررنگ';
+$lang['qb_italic']             = 'متن ایتالیک';
+$lang['qb_underl']             = 'متن زیرخط‌دار';
+$lang['qb_code']               = 'کد';
+$lang['qb_strike']             = 'متن وسط‌خط‌دار';
+$lang['qb_h1']                 = 'عنوان سطح ۱';
+$lang['qb_h2']                 = 'عنوان سطح ۲';
+$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']                 = 'خط افقی';
+$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['img_width']             = 'عرض';
+$lang['img_height']            = 'ارتفاع';
+$lang['img_manager']           = 'دیدن در مدیریت محتوای چند رسانه ای';
+$lang['subscr_subscribe_success'] = '%s به لیست آبونه %s افزوده شد';
+$lang['subscr_subscribe_error'] = 'اشکال در افزودن %s به لیست آبونه %s';
+$lang['subscr_subscribe_noaddress'] = 'هیچ آدرسی برای این عضویت اضافه نشده است، شما نمی‌توانید به لیست آبونه اضافه شوید';
+$lang['subscr_unsubscribe_success'] = '%s از لیست آبونه %s پاک شد';
+$lang['subscr_unsubscribe_error'] = 'اشکال در پاک کردن %s از لیست آبونه %s';
+$lang['subscr_already_subscribed'] = '%s پیش‌تر در %s آبونه شده است';
+$lang['subscr_not_subscribed'] = '%s در %s آبونه نشده است';
+$lang['subscr_m_not_subscribed'] = 'شما در این صفحه یا فضای‌نام آبونه نشده‌اید';
+$lang['subscr_m_new_header']   = 'افزودن آبونه';
+$lang['subscr_m_current_header'] = 'آبونه‌های کنونی';
+$lang['subscr_m_unsubscribe']  = 'لغو آبونه';
+$lang['subscr_m_subscribe']    = 'آبونه شدن';
+$lang['subscr_m_receive']      = 'دریافت کردن';
+$lang['subscr_style_every']    = 'ارسال رای‌نامه در تمامی تغییرات';
+$lang['authtempfail']          = 'معتبرسازی کابران موقتن مسدود می‌باشد. اگر این حالت پایدار بود، مدیر ویکی را باخبر سازید.';
+$lang['authpwdexpire']         = 'کلمه عبور شما در %d روز منقضی خواهد شد ، شما باید آن را زود تغییر دهید';
+$lang['i_chooselang']          = 'انتخاب زبان';
+$lang['i_installer']           = 'نصب کننده‌ی Dokuwiki';
+$lang['i_wikiname']            = 'نام ویکی';
+$lang['i_enableacl']           = 'فعال بودن کنترل دسترسی‌ها (توصیه شده)';
+$lang['i_superuser']           = 'کاربر اصلی';
+$lang['i_problems']            = 'نصب کننده با مشکلات زیر مواجه شد. در صورت رفع این مشکلات، امکان ادامه نصب خواهد بود.';
+$lang['i_modified']            = 'به دلایل امنیتی، این اسکریپت فقط با نصب تازه و بدون تغییر DokuWiki کار خواهد کرد.شما باید دوباره فایل فشرده را باز کنید راهنمای نصب DokuWiki را بررسی کنید.';
+$lang['i_funcna']              = 'تابع %s در PHP موجود نیست. ممکن است شرکت خدمات وب شما آن را مسدود کرده باشد.';
+$lang['i_phpver']              = 'نگارش پی‌اچ‌پی %s پایین‌تر از نگارش مورد نیاز، یعنی %s می‌باشد. خواهشمندیم به روز رسانی کنید.';
+$lang['i_permfail']            = 'شاخه‌ی %s قابلیت نوشتن ندارد. شما باید دسترسی‌های این شاخه را تنظیم کنید!';
+$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_failure']             = 'مشکلاتی در زمان نوشتن فایل تنظیمات پیش آمده است. شما باید این مشکلات را پیش از استفاده از DokuWiki برطرف کنید.';
+$lang['i_policy']              = 'کنترل دسترسی‌های اولیه';
+$lang['i_pol0']                = 'ویکی باز (همه می‌توانند بخوانند، بنویسند و فایل ارسال کنند)';
+$lang['i_pol1']                = 'ویکی عمومی (همه می‌توانند بخوانند، کاربران ثبت شده می‌توانند بنویسند و فایل ارسال کنند)';
+$lang['i_pol2']                = 'ویکی بسته (فقط کاربران ثبت شده می‌توانند بخوانند، بنویسند و فایل ارسال کنند)';
+$lang['i_retry']               = 'تلاش مجدد';
+$lang['i_license']             = 'لطفن مجوز این محتوا را وارد کنید:';
+$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 ثانیه‌ی پیش';
+$lang['wordblock']             = 'تغییرات شما به دلیل داشتن محتوای مشکوک (مثل اسپم) ذخیره نشد.';
+$lang['media_uploadtab']       = 'آپلود';
+$lang['media_searchtab']       = 'جستجو';
+$lang['media_file']            = 'فایل';
+$lang['media_viewtab']         = 'دیدن';
+$lang['media_edittab']         = 'ویرایش';
+$lang['media_historytab']      = 'تاریخچه';
+$lang['media_list_thumbs']     = 'ریز عکسها';
+$lang['media_list_rows']       = 'سطرها';
+$lang['media_sort_name']       = 'ستون ها';
+$lang['media_sort_date']       = 'تاریخ';
+$lang['media_namespaces']      = 'انتخاب فضای نام';
+$lang['media_files']           = 'فایل در %s';
+$lang['media_upload']          = 'آپلود به %s';
+$lang['media_search']          = 'جستجو در %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s در %s';
+$lang['media_edit']            = '%s ویرایش';
+$lang['media_history']         = 'تاریخچه %s';
+$lang['media_meta_edited']     = 'فرا داده ها ویرایش شدند.';
+$lang['media_perm_read']       = 'متاسفانه ، شما حق خواندن این فایل ها را ندارید.';
+$lang['media_perm_upload']     = 'متاسفانه ، شما حق آپلود این فایل ها را ندارید.';
+$lang['media_update']          = 'آپلود نسخه جدید';
+$lang['media_restore']         = 'بازیابی این نسخه';
diff --git a/sources/inc/lang/fa/locked.txt b/sources/inc/lang/fa/locked.txt
new file mode 100644
index 0000000..1400e22
--- /dev/null
+++ b/sources/inc/lang/fa/locked.txt
@@ -0,0 +1,3 @@
+====== قفل شده است ======
+
+این صفحه توسط یک کاربر دیگر، برای ویرایش، قفل شده است. شما باید تا پایان ویرایش این کاربر یا پایان زمان ویرایش، صبر کنید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/login.txt b/sources/inc/lang/fa/login.txt
new file mode 100644
index 0000000..0b1b3f9
--- /dev/null
+++ b/sources/inc/lang/fa/login.txt
@@ -0,0 +1,3 @@
+====== ورود ======
+
+شما وارد سایت نشده‌اید! موارد زیر را تایپ کنید تا وارد شوید. برای ورود، نیاز دارید که کوکی‌های مرورگر فعال باشد.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/mailtext.txt b/sources/inc/lang/fa/mailtext.txt
new file mode 100644
index 0000000..44e98db
--- /dev/null
+++ b/sources/inc/lang/fa/mailtext.txt
@@ -0,0 +1,17 @@
+یک صفحه در ویکی افزوده شده یا تغییر کرده، اطلاعات آن را می‌توانید در زیر بینید:
+
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+نگارش پیشین: @OLDPAGE@
+نگارش نو: @NEWPAGE@
+خلاصه ویرایش: @SUMMARY@
+کاربر: @USER@
+
+@DIFF@
+
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fa/mailwrap.html b/sources/inc/lang/fa/mailwrap.html
new file mode 100644
index 0000000..c313c0b
--- /dev/null
+++ b/sources/inc/lang/fa/mailwrap.html
@@ -0,0 +1,14 @@
+	
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+This mail was generated by DokuWiki at @DOKUWIKIURL@.
+ این ایمیل توسط DokuWiki at @DOKUWIKIURL@ تولید شده است. 
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/fa/newpage.txt b/sources/inc/lang/fa/newpage.txt
new file mode 100644
index 0000000..06377a9
--- /dev/null
+++ b/sources/inc/lang/fa/newpage.txt
@@ -0,0 +1,3 @@
+====== این صفحه وجود ندارد ======
+
+شما به این صفحه که وجود ندارد رسیده‌اید. اگر دسترسی‌ها به شما اجازه می‌دهند، می‌توانید این صفحه را با کلیلک کردن روی دکمه‌ی «ساخت این صفحه» ایجاد کنید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/norev.txt b/sources/inc/lang/fa/norev.txt
new file mode 100644
index 0000000..78a3d94
--- /dev/null
+++ b/sources/inc/lang/fa/norev.txt
@@ -0,0 +1,3 @@
+====== نگارشی یافت نشد ======
+
+نگارش موردنظر یافت نشد. از دکمه‌ی «نگارش‌های پیشین» برای مشاهده‌ی نگارش‌های پیشین این صفحه استفاده کنید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/password.txt b/sources/inc/lang/fa/password.txt
new file mode 100644
index 0000000..3f552c5
--- /dev/null
+++ b/sources/inc/lang/fa/password.txt
@@ -0,0 +1,10 @@
+سلام @FULLNAME@!
+
+اطلاعات شخصی خود را با عنوان @TITLE@ در @DOKUWIKIURL@ را در زیر مشاهده کنید:
+
+نام کاربری: @LOGIN@
+گذرواژه: @PASSWORD@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fa/preview.txt b/sources/inc/lang/fa/preview.txt
new file mode 100644
index 0000000..3a67326
--- /dev/null
+++ b/sources/inc/lang/fa/preview.txt
@@ -0,0 +1,3 @@
+====== پیش‌نمایش ======
+
+این پیش‌نمایش متن شماست. به یاد داشته باشید که این متن **هنوز ذخیره نشده‌است**
\ No newline at end of file
diff --git a/sources/inc/lang/fa/pwconfirm.txt b/sources/inc/lang/fa/pwconfirm.txt
new file mode 100644
index 0000000..fd76b7d
--- /dev/null
+++ b/sources/inc/lang/fa/pwconfirm.txt
@@ -0,0 +1,13 @@
+سلام @FULLNAME@!
+
+یک نفر برای ورود به @DOKUWIKIURL@ با عنوان @TITLE@ درخواست گذرواژه‌ای جدید کرده است:
+
+اگر شما چنین درخواستی نداده‌اید، این ایمیل را پاک کنید.
+
+اگر این درخواست توسط شما داده شده است، باید آن را تایید کنید، پس روی پیوند زیر کلیک کنید.
+
+@CONFIRM@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fa/read.txt b/sources/inc/lang/fa/read.txt
new file mode 100644
index 0000000..1acfdb4
--- /dev/null
+++ b/sources/inc/lang/fa/read.txt
@@ -0,0 +1 @@
+این صفحه فقط خواندنی است. شما می‌توانید متن صفحه را مشاهده کنید، اما نمی‌توانید آن را تغییر دهید. اگر فکر می‌کنید که مشکلی رخ داده است، مدیر ویکی را در جریان بگذارید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/recent.txt b/sources/inc/lang/fa/recent.txt
new file mode 100644
index 0000000..5d5b5b7
--- /dev/null
+++ b/sources/inc/lang/fa/recent.txt
@@ -0,0 +1,3 @@
+====== تغییرات اخیر ======
+
+این صفحه‌ها اخیرن تغییر کرده‌اند.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/register.txt b/sources/inc/lang/fa/register.txt
new file mode 100644
index 0000000..c6e1f0d
--- /dev/null
+++ b/sources/inc/lang/fa/register.txt
@@ -0,0 +1,3 @@
+====== ثبت نام ======
+
+تمامی فیلدها را پر کنید و اطمینان پیدا کنید که ایمیل معتبر وارد کرده‌اید - اگر شما گذرواژه‌ای وارد نکردید، یک مقدار جدید برای‌تان ارسال خواهد شد. نام کاربری شما باید یک [[doku>pagename|صفحه‌ی]] معتبر باشد.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/registermail.txt b/sources/inc/lang/fa/registermail.txt
new file mode 100644
index 0000000..e22c2d0
--- /dev/null
+++ b/sources/inc/lang/fa/registermail.txt
@@ -0,0 +1,14 @@
+یک کاربر تازه با مشخصات زیر عضو ویکی شده است:
+
+نام کاربری: @NEWUSER@
+اسم کامل: @NEWNAME@
+ایمیل: @NEWEMAIL@
+
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fa/resendpwd.txt b/sources/inc/lang/fa/resendpwd.txt
new file mode 100644
index 0000000..8b7b0d3
--- /dev/null
+++ b/sources/inc/lang/fa/resendpwd.txt
@@ -0,0 +1,3 @@
+====== ارسال گذرواژه‌ی جدید ======
+
+خواهشمندیم نام کاربری خود را در فرم زیر بنویسید تا گذرواژه‌ی جدید برای تان ارسال شود. یک پیوند تاییدیه برای ایمیل ثبت شده ارسال می‌شود.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/resetpwd.txt b/sources/inc/lang/fa/resetpwd.txt
new file mode 100644
index 0000000..6a1355e
--- /dev/null
+++ b/sources/inc/lang/fa/resetpwd.txt
@@ -0,0 +1,3 @@
+====== تعیین کلمه عبور جدید ======
+
+لطفاً یک کلمه عبور جدید برای حساب کاربری خود در این ویکی ایجاد کنید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/revisions.txt b/sources/inc/lang/fa/revisions.txt
new file mode 100644
index 0000000..7714ae6
--- /dev/null
+++ b/sources/inc/lang/fa/revisions.txt
@@ -0,0 +1,3 @@
+====== نگارش‌های پیشین ======
+
+در اینجا نگارش‌های پیشین این صفحه را مشاهده می‌کنید. برای بازگشتن به آن‌ها، آن را انتخاب کنید و کلید «ویرایش این صفحه» را انتخاب کنید و سپس ذخیره نمایید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/searchpage.txt b/sources/inc/lang/fa/searchpage.txt
new file mode 100644
index 0000000..3f0378e
--- /dev/null
+++ b/sources/inc/lang/fa/searchpage.txt
@@ -0,0 +1,5 @@
+====== جستجو ======
+
+نتایج جستجو در زیر آمده است. اگر به نتیجه‌ی مطلوبی نرسیده‌اید، می‌توانید صفحه‌ی مورد نظر را ایجاد کنید.
+
+===== نتایج =====
\ No newline at end of file
diff --git a/sources/inc/lang/fa/showrev.txt b/sources/inc/lang/fa/showrev.txt
new file mode 100644
index 0000000..9d05008
--- /dev/null
+++ b/sources/inc/lang/fa/showrev.txt
@@ -0,0 +1 @@
+**این یک نگارش قدیمی از این مطلب است!**
\ No newline at end of file
diff --git a/sources/inc/lang/fa/stopwords.txt b/sources/inc/lang/fa/stopwords.txt
new file mode 100644
index 0000000..58d3ca0
--- /dev/null
+++ b/sources/inc/lang/fa/stopwords.txt
@@ -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
+من
+تو
+او
+ما
+شما
+آنها
+ایشان
+ایشون
+از
+و
+را
+ای
+یا
+باید
+شاید
+چرا
+چون
+چگونه
+چه
+اگر
+الان
+سلام
+ممنون
+موفق
+باشید
+باش
+باشند
+باشی
+باشم
+باشد
+است
+نیست
+شد
+شدن
+شدند
+شدیم
+شدید
+درباره
+یک
+دو
+سه
+چهار
+پنج
+شش
+هفت
+هشت
+ده
+در
+هست
+هستم
+هستی
+هستیم
+هستید
+هستند
+برای
+این
+آن
+اون
+روی
+رو
+بود
+بودم
+بودی
+بودیم
+بودید
+بودند
+کجا
+کی
+با
+کس
+کسی
+پیرامون
+نزدیک
+بالا
+پایین
+بالای
+بالاتر
+موافق
+مطابق
+طبق
+برطبق
+همان
+سر
+درمیان
+عرض
+طرف
+عملا
+واقعا
+بعد
+قبل
+جستجو
+سپس
+دوباره
+رفتم
+رفتی
+رفت
+رفتیم
+رفتید
+رفتند
+بای
+اوه
+آه
+اه
+برابر
+بااینکه
+همواره
+همیشه
+پیوسته
+وقت
+هزار
+دیگر
+جدا
+شخص
+کدام
+هیچگونه
+بهرحال
+هرچیز
+هیچکار
+درهرصورت
+پدیدار
+درک
+باشه
+جنوب
+ضبط
+حوالی
+نزدیکی
+چنانچه
+بطوریکه
+هنگامیکه
+مثال
+مانند
+پرسیدن
+جویا
+خواهش
+خواستن
+انجمن
+کنار
+پیک
+بیرون
+خارج
+مرتبا
+آغاز
+پایان
+آمد
+امد
+به
+زیرا
+چونکه
+آمدن
+بودن
+درخور
+بوده
+پیش
+پس
+قبلا
+راحت
+مقدم
+کار
+برو
+بیا
+باور
+گمان
+بمیر
+چپ
+راست
+شمال
+غرب
+شرق
+دور
+گذشته
+آینده
+بهتر
+بهترین
+بدترین
+عظیم
+کوچک
+نیک
+بدتر
+خوب
+بد
+زشت
+میان
+هردو
+هم
+یکی
+کوتاه
+بلند
+مختصر
+حکم
+اما
+ولی
+لیکن
+حز
+مگر
+فقط
+بدون
+محض
+بخش
+بدست
+وسیله
+درجه
+اول
+دوم
+سوم
+چهارم
+پنجم
+ششم
+هفتم
+هشتم
+نهم
+دهم
+امکان
+داشتن
+داشتیم
+داشتی
+داشتند
+داشتید
+سبب
+علت
+موجب
+هدف
+صفر
+محتوی
+دارا
+شامل
+نیا
+چیز
+نرو
+مسیر
+روش
+جهت
+دقیقا
+درطی
+درضمن
+بسرعت
+رایج
+جاری
+طورقطعی
+شرح
+کرد
+انجام
+عدد
+غیر
+بریم
+کاملا
+قلم
+آب
+سایه
+مساوی
+صاف
+هموار
+حتی
+جفت
+هرگز
+درست
+کامل
+چنین
+دومین
+سومین
+چهارمین
+پنجمین
+ششمین
+هشتمین
+نهمین
+دهمین
+برید
+رفتن
+راه
+درود
+خداحافظ
+حاجی
+واقع
+سخت
+آسان
+مشکل
+اینجا
+آنجا
+خودش
+هنوز
+بلافاصله
+نگاه
+نگه
+آخر
+اخر
+عمرا
+کمترین
+کوچکترین
+اقل
+مثل
+شکل
+نظر
+چندین
+زیاد
+احتمالا
+متوسط
+یعنی
+اساسا
+عالی
+وای
+خودم
+خودت
+خودمان
+خودمون
+اسم
+نام
+آره
+حال
+حالا
+اینک
+خیلی
+بارها
+بسیار
+کن
+وسط
+ممکن
+راستی
+فعلا
+صحیح
+واقعی
+گفت
+گفتم
+گفتیم
+امثال
+آنکه
+مهم
+جدی
+چنان
+چندان
+زیادی
+بعضی
+گاهگاهی
+زود
+بزودی
+بگیر
+ببر
+بردن
+گیرنده
+تا
+تشکر
+سپاس
+ان
+آنان
+بکلی
+تماما
+بنا
+همدیگر
+جلو
+معمولا
+مقدار
+موقع
+اونجا
+آیا
+که
+بچه
+حاضر
+میخواستم
+بلی
+خیر
+فوروم
+خواهم
+داره
+نداره
+داری
+همون
+میبینم
+اینجوریه
+بهش
+هستن
+امضام
+اولی
+دومی
+سومی
+چهارمی
+بگذار
+بکنه
+امروز
+صدمین
+همش
+همگی
+هوا
+اعلام
+اخرین
+خودشون
+حد
+شده
+اینکه
+خب
+یه
+اینجوری
+گاه
+گهگاه
+گاهی
+گهگدار
+گهگداری
+ها
+میشه
+کمی
+راجبه
+توضیح
+بدی
+راجع
+می
+شه
+روز
+کنی
+اصلا
\ No newline at end of file
diff --git a/sources/inc/lang/fa/subscr_digest.txt b/sources/inc/lang/fa/subscr_digest.txt
new file mode 100644
index 0000000..0ba4c89
--- /dev/null
+++ b/sources/inc/lang/fa/subscr_digest.txt
@@ -0,0 +1,16 @@
+سلام،
+
+صفحه‌ی @PAGE@ با عنوان @TITLE@ در ویکی تغییر کرد.
+تغییرات عبارت است از:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+نگارش پیشین: @OLDPAGE@
+نگارش نو: @NEWPAGE@
+
+برای از بین بردن آگاهی‌های این صفحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده و صفحه‌ی @SUBSCRIBE@ را مرور کنید و عضویت خود را از صفحه یا فضای‌نام پاک کنید.
+
+--
+این رای‌نامه با نرم‌افزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/subscr_form.txt b/sources/inc/lang/fa/subscr_form.txt
new file mode 100644
index 0000000..39764d0
--- /dev/null
+++ b/sources/inc/lang/fa/subscr_form.txt
@@ -0,0 +1,3 @@
+====== مدیریت عضویت‌ها ======
+
+این صفحه به شما امکان مدیریت عضویت‌تان را برای این صفحه یا فضای‌نام می‌دهد.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/subscr_list.txt b/sources/inc/lang/fa/subscr_list.txt
new file mode 100644
index 0000000..92ac92b
--- /dev/null
+++ b/sources/inc/lang/fa/subscr_list.txt
@@ -0,0 +1,16 @@
+سلام،
+
+صفحه‌های فضای‌نام @PAGE@ با عنوان @TITLE@ در ویکی تغییر کرد.
+تغییرات عبارت است از:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+نگارش پیشین: @OLDPAGE@
+نگارش نو: @NEWPAGE@
+
+برای از بین بردن آگاهی‌های این صفحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده و صفحه‌ی @SUBSCRIBE@ را مرور کنید و عضویت خود را از صفحه یا فضای‌نام پاک کنید.
+
+--
+این رای‌نامه با نرم‌افزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/subscr_single.txt b/sources/inc/lang/fa/subscr_single.txt
new file mode 100644
index 0000000..a0d2a5d
--- /dev/null
+++ b/sources/inc/lang/fa/subscr_single.txt
@@ -0,0 +1,19 @@
+سلام،
+
+صفحه‌ی @PAGE@ با عنوان @TITLE@ در ویکی تغییر کرد.
+تغییرات عبارت است از:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+تاریخ : @DATE@
+نام‌کاربری: @USER@
+خلاصه ویرایش: @SUMMARY@
+نگارش پیشین: @OLDPAGE@
+نگارش نو: @NEWPAGE@
+
+برای از بین بردن آگاهی‌های این صفحه، از طریق آدرس @DOKUWIKIURL@ وارد ویکی شده و صفحه‌ی @NEWPAGE@ را مرور کنید و عضویت خود را از صفحه یا فضای‌نام پاک کنید.
+
+--
+این رای‌نامه با نرم‌افزار DokuWiki در آدرس @DOKUWIKIURL@ ساخته شده است.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/updateprofile.txt b/sources/inc/lang/fa/updateprofile.txt
new file mode 100644
index 0000000..d790833
--- /dev/null
+++ b/sources/inc/lang/fa/updateprofile.txt
@@ -0,0 +1,3 @@
+====== به روز رسانی پروفایل ======
+
+شما می‌توانید مقادیر زیر را تغییر دهید.
\ No newline at end of file
diff --git a/sources/inc/lang/fa/uploadmail.txt b/sources/inc/lang/fa/uploadmail.txt
new file mode 100644
index 0000000..625df73
--- /dev/null
+++ b/sources/inc/lang/fa/uploadmail.txt
@@ -0,0 +1,14 @@
+یک فایل به ویکی ارسال شد:
+
+فایل: @MEDIA@
+تاریخ: @DATE@
+مرورگر: @BROWSER@
+آدرس IP: @IPADDRESS@
+نام هوست: @HOSTNAME@
+اندازه: @SIZE@
+MIME: @MIME@
+کاربر: @USER@
+
+-- 
+این ایمیل توسط DokuWiki تولید شده است
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fi/admin.txt b/sources/inc/lang/fi/admin.txt
new file mode 100644
index 0000000..b57b608
--- /dev/null
+++ b/sources/inc/lang/fi/admin.txt
@@ -0,0 +1,3 @@
+====== Ylläpito ======
+
+Alla on lista DokuWiki:ssä käytössä olevista ylläpitotoiminnoista.
diff --git a/sources/inc/lang/fi/adminplugins.txt b/sources/inc/lang/fi/adminplugins.txt
new file mode 100644
index 0000000..fa3571e
--- /dev/null
+++ b/sources/inc/lang/fi/adminplugins.txt
@@ -0,0 +1 @@
+===== Muita liitännäisiä =====
\ No newline at end of file
diff --git a/sources/inc/lang/fi/backlinks.txt b/sources/inc/lang/fi/backlinks.txt
new file mode 100644
index 0000000..4577202
--- /dev/null
+++ b/sources/inc/lang/fi/backlinks.txt
@@ -0,0 +1,4 @@
+====== Linkitykset ======
+
+Tässä lista tälle sivuille linkittävistä sivuista.
+
diff --git a/sources/inc/lang/fi/conflict.txt b/sources/inc/lang/fi/conflict.txt
new file mode 100644
index 0000000..be788a1
--- /dev/null
+++ b/sources/inc/lang/fi/conflict.txt
@@ -0,0 +1,5 @@
+====== On olemassa uudempi versio ======
+
+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 valitset "tallenna", sinun versiosi tallennetaan. Valitse ''peru'' pitääksesi tämänhetkisen, toisen käyttäjän muuttaman version.
diff --git a/sources/inc/lang/fi/denied.txt b/sources/inc/lang/fi/denied.txt
new file mode 100644
index 0000000..cd31da0
--- /dev/null
+++ b/sources/inc/lang/fi/denied.txt
@@ -0,0 +1,3 @@
+====== Lupa evätty ======
+
+Sinulla ei ole tarpeeksi valtuuksia jatkaa. Ehkä unohdit kirjautua sisään?
diff --git a/sources/inc/lang/fi/diff.txt b/sources/inc/lang/fi/diff.txt
new file mode 100644
index 0000000..fbf62b7
--- /dev/null
+++ b/sources/inc/lang/fi/diff.txt
@@ -0,0 +1,3 @@
+====== Erot ======
+
+Tämä näyttää erot valitun ja nykyisen version kesken tästä sivusta.
diff --git a/sources/inc/lang/fi/draft.txt b/sources/inc/lang/fi/draft.txt
new file mode 100644
index 0000000..859f4d9
--- /dev/null
+++ b/sources/inc/lang/fi/draft.txt
@@ -0,0 +1,5 @@
+====== Vedos löydetty ======
+
+Edellinen muokkauksesi tälle sivulle ei ole päivittynyt oikein. DokuWiki on automaattisesti tallentanut vedoksen muokkauksen aikana. Voit nyt jatkaa muokkausta. Alla näet tallennetun version edellisestä istunnostasi.
+
+Valitse jos haluat //palauttaa// edellisen muutoksesi, //poistaa// automaattisesti tallennetun vedoksen, vai //peruuttaa// muutokset.
\ No newline at end of file
diff --git a/sources/inc/lang/fi/edit.txt b/sources/inc/lang/fi/edit.txt
new file mode 100644
index 0000000..81b7714
--- /dev/null
+++ b/sources/inc/lang/fi/edit.txt
@@ -0,0 +1 @@
+Muokkaa sivua ja paina ''Tallenna''. Katso [[wiki:syntax]] nähdäksesi Wikisyntaksi. Muuta sivua vain jos voit **parantaa** sitä. Jos haluat kokeilla Wikiä hyvä paikka siihen on [[playground:playground]].
diff --git a/sources/inc/lang/fi/editrev.txt b/sources/inc/lang/fi/editrev.txt
new file mode 100644
index 0000000..fd4d9a3
--- /dev/null
+++ b/sources/inc/lang/fi/editrev.txt
@@ -0,0 +1,2 @@
+**Olet ladannut vanhan version dokumentista** Jos tallennat tämän, tästä tulee uusin versio dokumentista.
+----
diff --git a/sources/inc/lang/fi/index.txt b/sources/inc/lang/fi/index.txt
new file mode 100644
index 0000000..9086e22
--- /dev/null
+++ b/sources/inc/lang/fi/index.txt
@@ -0,0 +1,3 @@
+====== hakemisto ======
+
+Tämä on hakemisto kaikista saatavilla olevista sivuista järjestettynä [[doku>namespace|nimiavaruuksittain]].
diff --git a/sources/inc/lang/fi/install.html b/sources/inc/lang/fi/install.html
new file mode 100644
index 0000000..1b43455
--- /dev/null
+++ b/sources/inc/lang/fi/install.html
@@ -0,0 +1,21 @@
+
        Tämä sivu avustaa Dokuwikin ensiasennuksessa ja
+  asetuksissa. Lisätietoa asennusohjelmasta löytyy ohjelman
+	dokumentaatiosta.
        
+
+
        DokuWiki käyttää tavallisia tiedostoja wiki-sivujen, sekä muiden niihin liittyvien
+  tietojen kuten kuvien, hakuindeksien, versionhallinnan jne. tallentamiseen. Toimiakseen
+	oikein DokuWikillä täytyy olla kirjoitusoikeus niihin hakemistoihin joissa nämä
+	tiedostot sijaitsevat. Asennusohjelma ei pysty asettamaan näitä oikeuksia. Tämä täytyy
+	useimmiten tehdä suoraan komentoriviltä tai muulla, esimerkiksi
+	internet-palveluntarjoajan määrittämällä tavalla, kuten FTP -ohjelmalla tai erillisen
+	asetusvalikon kautta. (cPanel).
        
+
+
        Asennusohjelma määrittelee DokuWikin käyttöoikeudet (ACL),
+  jotka mahdollistavat ylläpitäjän sisäänkirjautumisen ja pääsyn DokuWikin ylläpito -valikkoon,
+	josta voidaan asentaa plugineja, hallita käyttäjätietoja, wiki-sivujen luku- ja
+	kirjoitusoikeuksia sekä muita asetuksia. Käyttöoikeuksien käyttäminen ei ole pakollista,
+	mutta se helpottaa DokuWikin ylläpitämistä.
        
+
+
        Kokeneille käyttäjille tai käyttäjille joilla on erityisvaatimuksia asennukselle
+  löytyy lisätietoa asennuksesta sekä
+	asetuksista.
        
diff --git a/sources/inc/lang/fi/lang.php b/sources/inc/lang/fi/lang.php
new file mode 100644
index 0000000..feefc3d
--- /dev/null
+++ b/sources/inc/lang/fi/lang.php
@@ -0,0 +1,336 @@
+
+ * @author Matti Pöllä 
+ * @author Otto Vainio 
+ * @author Teemu Mattila 
+ * @author Sami Olmari 
+ * @author Rami Lehti 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '”';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '’';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Muokkaa tätä sivua';
+$lang['btn_source']            = 'Näytä sivun lähdekoodi';
+$lang['btn_show']              = 'Näytä sivu';
+$lang['btn_create']            = 'Luo tämä sivu';
+$lang['btn_search']            = 'Etsi';
+$lang['btn_save']              = 'Tallenna';
+$lang['btn_preview']           = 'Esikatselu';
+$lang['btn_top']               = 'Takaisin ylös';
+$lang['btn_newer']             = '<< uudemmat';
+$lang['btn_older']             = 'vanhemmat >>';
+$lang['btn_revs']              = 'Vanhat versiot';
+$lang['btn_recent']            = 'Viimeiset muutokset';
+$lang['btn_upload']            = 'Lähetä tiedosto';
+$lang['btn_cancel']            = 'Peru';
+$lang['btn_index']             = 'Hakemisto';
+$lang['btn_secedit']           = 'Muokkaa';
+$lang['btn_login']             = 'Kirjaudu sisään';
+$lang['btn_logout']            = 'Kirjaudu ulos';
+$lang['btn_admin']             = 'Ylläpito';
+$lang['btn_update']            = 'Päivitä';
+$lang['btn_delete']            = 'Poista';
+$lang['btn_back']              = 'Takaisin';
+$lang['btn_backlink']          = 'Paluulinkit';
+$lang['btn_backtomedia']       = 'Takaisin mediatiedostojen valintaan';
+$lang['btn_subscribe']         = 'Tilaa muutokset';
+$lang['btn_profile']           = 'Päivitä profiili';
+$lang['btn_reset']             = 'Tyhjennä';
+$lang['btn_resendpwd']         = 'Aseta uusi salasana';
+$lang['btn_draft']             = 'Muokkaa luonnosta';
+$lang['btn_recover']           = 'Palauta luonnos';
+$lang['btn_draftdel']          = 'Poista luonnos';
+$lang['btn_revert']            = 'palauta';
+$lang['btn_register']          = 'Rekisteröidy';
+$lang['btn_apply']             = 'Toteuta';
+$lang['btn_media']             = 'Media manager';
+$lang['btn_deleteuser']        = 'Poista tilini';
+$lang['loggedinas']            = 'Kirjautunut nimellä';
+$lang['user']                  = 'Käyttäjänimi';
+$lang['pass']                  = 'Salasana';
+$lang['newpass']               = 'Uusi salasana';
+$lang['oldpass']               = 'Vahvista nykyinen salasana';
+$lang['passchk']               = 'uudelleen';
+$lang['remember']              = 'Muista minut';
+$lang['fullname']              = 'Koko nimi';
+$lang['email']                 = 'Sähköposti';
+$lang['profile']               = 'Käyttäjän profiili';
+$lang['badlogin']              = 'Käyttäjänimi tai salasana oli väärä.';
+$lang['badpassconfirm']        = 'Valitan. Salasana oli väärin';
+$lang['minoredit']             = 'Pieni muutos';
+$lang['draftdate']             = 'Luonnos tallennettu automaattisesti';
+$lang['nosecedit']             = 'Sivu on muuttunut välillä ja kappaleen tiedot olivat vanhentuneet. Koko sivu ladattu.';
+$lang['regmissing']            = 'Kaikki kentät tulee täyttää.';
+$lang['reguexists']            = 'Käyttäjä tällä käyttäjänimellä on jo olemassa.';
+$lang['regsuccess']            = 'Käyttäjä luotiin ja salasana lähetettiin sähköpostilla.';
+$lang['regsuccess2']           = 'Käyttäjänimi on luotu.';
+$lang['regmailfail']           = 'Näyttää siltä, että salasanan lähettämisessä tapahtui virhe. Ota yhteys ylläpitäjään!';
+$lang['regbadmail']            = 'Antamasi sähköpostiosoite näyttää epäkelvolta. Jos pidät tätä virheenä ota yhteys ylläpitäjään.';
+$lang['regbadpass']            = 'Annetut kaksi salasanaa eivät täsmää. Yritä uudelleen.';
+$lang['regpwmail']             = 'DokuWiki salasanasi';
+$lang['reghere']               = 'Puuttuuko sinulta käyttäjätili? Hanki sellainen';
+$lang['profna']                = 'Tässä wikissä profiilien muokkaaminen ei ole mahdollista';
+$lang['profnochange']          = 'Ei muutoksia.';
+$lang['profnoempty']           = 'Tyhjä nimi tai sähköpostiosoite ei ole sallittu.';
+$lang['profchanged']           = 'Käyttäjän profiilin päivitys onnistui.';
+$lang['profnodelete']          = 'Tässä wikissä ei voi poistaa käyttäjiä';
+$lang['profdeleteuser']        = 'Poista tili';
+$lang['profdeleted']           = 'Käyttäjätilisi on postettu tästä wikistä';
+$lang['profconfdelete']        = 'Haluan poistaa käyttäjätilini tästä wikistä. 
         Tätä toimintoa ei voi myöhemmin peruuttaa.';
+$lang['profconfdeletemissing'] = 'Vahvistus rastia ei valittu';
+$lang['pwdforget']             = 'Unohtuiko salasana? Hanki uusi';
+$lang['resendna']              = 'Tämä wiki ei tue salasanan uudelleenlähettämistä.';
+$lang['resendpwd']             = 'Aseta uusisalasana';
+$lang['resendpwdmissing']      = 'Kaikki kentät on täytettävä.';
+$lang['resendpwdnouser']       = 'Käyttäjää ei löydy tietokannastamme.';
+$lang['resendpwdbadauth']      = 'Tunnistuskoodi on virheellinen. Varmista, että käytit koko varmistuslinkkiä.';
+$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 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';
+$lang['maxuploadsize']         = 'Palvelimelle siirto max. %s / tiedosto.';
+$lang['lockedby']              = 'Tällä hetkellä tiedoston on lukinnut';
+$lang['lockexpire']            = 'Lukitus päättyy';
+$lang['js']['willexpire']      = 'Lukituksesi tämän sivun muokkaukseen päättyy minuutin kuluttua.\nRistiriitojen välttämiseksi paina esikatselu-nappia nollataksesi lukitusajan.';
+$lang['js']['notsavedyet']     = 'Dokumentissa on tallentamattomia muutoksia, jotka häviävät.
+ Haluatko varmasti jatkaa?';
+$lang['js']['searchmedia']     = 'Etsi tiedostoja';
+$lang['js']['keepopen']        = 'Pidä valinnan ikkuna avoinna.';
+$lang['js']['hidedetails']     = 'Piilota yksityiskohdat';
+$lang['js']['mediatitle']      = 'Linkkien asetukset';
+$lang['js']['mediadisplay']    = 'Linkin tyyppi';
+$lang['js']['mediaalign']      = 'Tasaus';
+$lang['js']['mediasize']       = 'Kuvan koko';
+$lang['js']['mediatarget']     = 'Linkin kohde';
+$lang['js']['mediaclose']      = 'Sulje';
+$lang['js']['mediainsert']     = 'Liitä';
+$lang['js']['mediadisplayimg'] = 'Näytä kuva.';
+$lang['js']['mediadisplaylnk'] = 'Näytä vain linkki';
+$lang['js']['mediasmall']      = 'Pieni versio';
+$lang['js']['mediamedium']     = 'Keskikokoinen versio';
+$lang['js']['medialarge']      = 'Iso versio';
+$lang['js']['mediaoriginal']   = 'Alkuperäinen versio';
+$lang['js']['medialnk']        = 'Linkki tietosivuun';
+$lang['js']['mediadirect']     = 'Suora linkki alkuperäiseen';
+$lang['js']['medianolnk']      = 'Ei linkkiä';
+$lang['js']['medianolink']     = 'Älä linkitä kuvaa';
+$lang['js']['medialeft']       = 'Tasaa kuva vasemmalle.';
+$lang['js']['mediaright']      = 'Tasaa kuva oikealle.';
+$lang['js']['mediacenter']     = 'Tasaa kuva keskelle.';
+$lang['js']['medianoalign']    = 'Älä tasaa.';
+$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']['restore_confirm'] = 'Haluatko varmasti palauttaa tämän version?';
+$lang['js']['media_diff']      = 'Näytä erot:';
+$lang['js']['media_diff_both'] = 'Vierekkäin';
+$lang['js']['media_diff_opacity'] = 'Päällä';
+$lang['js']['media_diff_portions'] = 'Liukusäädin';
+$lang['js']['media_select']    = 'Valitse tiedostot...';
+$lang['js']['media_upload_btn'] = 'Lähetä';
+$lang['js']['media_done_btn']  = 'Valmis';
+$lang['js']['media_drop']      = 'Pudota lähetettävät tiedostot tähän';
+$lang['js']['media_cancel']    = 'Poista';
+$lang['js']['media_overwrt']   = 'Ylikirjoita olemassa olevat tiedostot';
+$lang['rssfailed']             = 'Virhe tapahtui noudettaessa tätä syötettä: ';
+$lang['nothingfound']          = 'Mitään ei löytynyt.';
+$lang['mediaselect']           = 'Mediatiedoston valinta';
+$lang['fileupload']            = 'Mediatiedoston lähetys';
+$lang['uploadsucc']            = 'Tiedoston lähetys onnistui';
+$lang['uploadfail']            = 'Tiedoston lähetys epäonnistui. Syynä ehkä väärät oikeudet?';
+$lang['uploadwrong']           = 'Tiedoston lähetys evätty. Tämä tiedostopääte on kielletty';
+$lang['uploadexist']           = 'Tiedosto on jo olemassa. Mitään ei tehty.';
+$lang['uploadbadcontent']      = 'Tiedoston sisältö ei vastannut päätettä %s';
+$lang['uploadspam']            = 'Roskapostin estolista esti tiedoston lähetyksen.';
+$lang['uploadxss']             = 'Tiedoston lähetys estettiin mahdollisen haitallisen sisällön vuoksi.';
+$lang['uploadsize']            = 'Lähetetty tiedosto oli liian iso. (max %s)';
+$lang['deletesucc']            = 'Tiedosto "%s" on poistettu.';
+$lang['deletefail']            = 'Kohdetta "%s" poistaminen ei onnistunut - tarkista oikeudet.';
+$lang['mediainuse']            = 'Tiedostoa "%s" ei ole poistettu - se on vielä käytössä.';
+$lang['namespaces']            = 'Nimiavaruudet';
+$lang['mediafiles']            = 'Tarjolla olevat tiedostot';
+$lang['accessdenied']          = 'Sinulla ei ole oikeuksia tämän sivun katsomiseen';
+$lang['mediausage']            = 'Käytä seuraavaa merkintätapaa viittausta tehtäessä:';
+$lang['mediaview']             = 'Katsele alkuperäistä tiedostoa';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Siirrä tiedosto nykyiseen nimiavaruuteen täällä. Voit luoda uusia alinimiavaruuksia laittamalla lisäämällä sen nimen ja kaksoispisteen "Lähetä nimellä" eteen.';
+$lang['mediaextchange']        = 'Tiedoston pääte muutettu: .%s on nyt .%s!';
+$lang['reference']             = 'Viitteet';
+$lang['ref_inuse']             = 'Tiedostoa ei voi poistaa, koska seuraavat sivut käyttävät sitä:';
+$lang['ref_hidden']            = 'Osa viitteistä on sivuilla, joihin sinulla ei ole lukuoikeutta';
+$lang['hits']                  = 'Osumia';
+$lang['quickhits']             = 'Sopivat sivunimet';
+$lang['toc']                   = 'Sisällysluettelo';
+$lang['current']               = 'nykyinen';
+$lang['yours']                 = 'Sinun versiosi';
+$lang['diff']                  = 'Näytä eroavaisuudet nykyiseen versioon';
+$lang['diff2']                 = 'Näytä eroavaisuudet valittuun versioon';
+$lang['difflink']              = 'Linkki vertailunäkymään';
+$lang['diff_type']             = 'Näytä eroavaisuudet:';
+$lang['diff_inline']           = 'Sisäkkäin';
+$lang['diff_side']             = 'Vierekkäin';
+$lang['line']                  = 'Rivi';
+$lang['breadcrumb']            = 'Jäljet';
+$lang['youarehere']            = 'Olet täällä';
+$lang['lastmod']               = 'Viimeksi muutettu';
+$lang['by']                    = '/';
+$lang['deleted']               = 'poistettu';
+$lang['created']               = 'luotu';
+$lang['restored']              = 'vanha versio palautettu (%s)';
+$lang['external_edit']         = 'ulkoinen muokkaus';
+$lang['summary']               = 'Yhteenveto muokkauksesta';
+$lang['noflash']               = 'Tarvitset Adobe Flash-liitännäisen nähdäksesi tämän sisällön.';
+$lang['download']              = 'Lataa palanen';
+$lang['tools']                 = 'Työkalut';
+$lang['user_tools']            = 'Käyttäjän työkalut';
+$lang['site_tools']            = 'Sivuston työkalut';
+$lang['page_tools']            = 'Sivutyökalut';
+$lang['skip_to_content']       = 'Siirry sisältöön';
+$lang['sidebar']               = 'Sivupalkki';
+$lang['mail_newpage']          = 'sivu lisätty:';
+$lang['mail_changed']          = 'sivu muutettu:';
+$lang['mail_subscribe_list']   = 'muuttuneet sivut nimiavaruudessa:';
+$lang['mail_new_user']         = 'uusi käyttäjä:';
+$lang['mail_upload']           = 'tiedosto lähetetty:';
+$lang['changes_type']          = 'Näytä muutokset:';
+$lang['pages_changes']         = 'Sivut';
+$lang['media_changes']         = 'Mediatiedostot';
+$lang['both_changes']          = 'Sivut ja mediatiedostot';
+$lang['qb_bold']               = 'Lihavoitu teksti';
+$lang['qb_italic']             = 'Kursivoitu teksti';
+$lang['qb_underl']             = 'Alleviivattu teksti';
+$lang['qb_code']               = 'Kooditeksti';
+$lang['qb_strike']             = 'Yliviivattu teksti';
+$lang['qb_h1']                 = 'Taso 1 otsikko';
+$lang['qb_h2']                 = 'Taso 2 otsikko';
+$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';
+$lang['qb_ol']                 = 'Järjestetyn listan osa ';
+$lang['qb_ul']                 = 'Epäjärjestetyn listan osa';
+$lang['qb_media']              = 'Lisää kuvia ja muita tiedostoja';
+$lang['qb_sig']                = 'Lisää allekirjoitus';
+$lang['qb_smileys']            = 'Hymiöt';
+$lang['qb_chars']              = 'Erikoismerkit';
+$lang['upperns']               = 'Hyppää edelliseen nimiavaruuteen';
+$lang['admin_register']        = 'Lisää uusi käyttäjä';
+$lang['metaedit']              = 'Muokkaa metadataa';
+$lang['metasaveerr']           = 'Metadatan kirjoittaminen epäonnistui';
+$lang['metasaveok']            = 'Metadata tallennettu';
+$lang['img_backto']            = 'Takaisin';
+$lang['img_title']             = 'Otsikko';
+$lang['img_caption']           = 'Kuvateksti';
+$lang['img_date']              = 'Päivämäärä';
+$lang['img_fname']             = 'Tiedoston nimi';
+$lang['img_fsize']             = 'Koko';
+$lang['img_artist']            = 'Kuvaaja';
+$lang['img_copyr']             = 'Tekijänoikeus';
+$lang['img_format']            = 'Formaatti';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Avainsanat';
+$lang['img_width']             = 'Leveys';
+$lang['img_height']            = 'Korkeus';
+$lang['img_manager']           = 'Näytä mediamanagerissa';
+$lang['subscr_subscribe_success'] = '%s lisätty %s tilauslistalle';
+$lang['subscr_subscribe_error'] = 'Virhe lisättäessä %s tilauslistalle %s';
+$lang['subscr_subscribe_noaddress'] = 'Login tiedoissasi ei ole sähköpostiosoitetta. Sinua ei voi lisätä tilaukseen';
+$lang['subscr_unsubscribe_success'] = '%s poistettu tilauslistalta %s';
+$lang['subscr_unsubscribe_error'] = 'Virhe tapahtui poistaessa %s tilauslistalta %s';
+$lang['subscr_already_subscribed'] = '%s on jo tilannut %s';
+$lang['subscr_not_subscribed'] = '%s ei ole tilannut %s';
+$lang['subscr_m_not_subscribed'] = 'Et ole tilannut sivua tai nimiavaruutta';
+$lang['subscr_m_new_header']   = 'Lisää tilaus';
+$lang['subscr_m_current_header'] = 'Voimassaolevat tilaukset';
+$lang['subscr_m_unsubscribe']  = 'Poista tilaus';
+$lang['subscr_m_subscribe']    = 'Tilaa';
+$lang['subscr_m_receive']      = 'Vastaanota';
+$lang['subscr_style_every']    = 'Sähköposti joka muutoksesta';
+$lang['subscr_style_digest']   = 'yhteenveto-sähköposti joka sivusta (joka %.2f. päivä)';
+$lang['subscr_style_list']     = 'lista muuttuneista sivuista edellisen sähköpostin jälkeen (joka %.2f. päivä)';
+$lang['authtempfail']          = 'Käyttäjien autentikointi ei tällä hetkellä onnistu. Jos ongelma jatkuu, ota yhteyttä wikin ylläpitäjään.';
+$lang['authpwdexpire']         = 'Salasanasi vanhenee %d pv:n päästä, vaihda salasanasi pikaisesti.';
+$lang['i_chooselang']          = 'Valitse kieli';
+$lang['i_installer']           = 'DokuWikin asentaja';
+$lang['i_wikiname']            = 'Wikin nimi';
+$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 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.';
+$lang['i_badhash']             = 'tunnistamaton tai muokattu dokuwiki.php (tarkistussumma=%s)';
+$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 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_allowreg']            = 'Salli käyttäjien rekisteröityminen';
+$lang['i_retry']               = 'Yritä uudelleen';
+$lang['i_license']             = 'Valitse lisenssi, jonka alle haluat sisältösi laittaa:';
+$lang['i_license_none']        = 'Älä näytä mitään lisenssitietoja';
+$lang['i_pop_field']           = 'Auta parantamaan DokuWikiä';
+$lang['i_pop_label']           = 'Lähetä kerran kuussa nimetöntä käyttäjätietoa DokuWikin kehittäjille';
+$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']               = '%d sekuntia sitten';
+$lang['wordblock']             = 'Muutostasi ei talletettu, koska se sisältää estettyä tekstiä (spam).';
+$lang['media_uploadtab']       = 'Lähetä';
+$lang['media_searchtab']       = 'Etsi';
+$lang['media_file']            = 'Tiedosto';
+$lang['media_viewtab']         = 'Näytä';
+$lang['media_edittab']         = 'Muokkaa';
+$lang['media_historytab']      = 'Historia';
+$lang['media_list_thumbs']     = 'Thumbnails';
+$lang['media_list_rows']       = 'Rivit';
+$lang['media_sort_name']       = 'nimen mukaan';
+$lang['media_sort_date']       = 'päivämäärän mukaan';
+$lang['media_namespaces']      = 'Valitse nimiavaruus';
+$lang['media_files']           = 'Tiedostoja %s';
+$lang['media_upload']          = 'Lähetä %s nimiavaruuteen';
+$lang['media_search']          = 'Etsi %s nimiavaruudesta';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s at %s';
+$lang['media_edit']            = 'Muokkaa %s';
+$lang['media_history']         = 'Nämä ovat vanhat versiot tiedostosta %s';
+$lang['media_meta_edited']     = 'Metadataa muokattu';
+$lang['media_perm_read']       = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lukeaksesi tiedostoja.';
+$lang['media_perm_upload']     = 'Anteeksi. Sinulla ei ole riittävästi oikeuksia lähettääksesi tiedostoja.';
+$lang['media_update']          = 'Lähetä uusi versio';
+$lang['media_restore']         = 'Palauta tämä versio';
+$lang['currentns']             = 'Nykyinen nimiavaruus';
+$lang['searchresult']          = 'Haun tulokset';
+$lang['plainhtml']             = 'pelkkä HTML';
+$lang['wikimarkup']            = 'Wiki markup';
diff --git a/sources/inc/lang/fi/locked.txt b/sources/inc/lang/fi/locked.txt
new file mode 100644
index 0000000..3a48ff8
--- /dev/null
+++ b/sources/inc/lang/fi/locked.txt
@@ -0,0 +1,3 @@
+====== Sivu lukittu ======
+
+Tämä sivu on tällä hetkellä lukittuna, koska se on toisen käyttäjän muokkauksessa. Joudut odottamaan, kunnes hän lopettaa muokkauksen, tai kunnes lukko aukeaa.
diff --git a/sources/inc/lang/fi/login.txt b/sources/inc/lang/fi/login.txt
new file mode 100644
index 0000000..efba262
--- /dev/null
+++ b/sources/inc/lang/fi/login.txt
@@ -0,0 +1,3 @@
+====== Sisäänkirjautuminen ======
+
+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 --git a/sources/inc/lang/fi/mailtext.txt b/sources/inc/lang/fi/mailtext.txt
new file mode 100644
index 0000000..1808ebc
--- /dev/null
+++ b/sources/inc/lang/fi/mailtext.txt
@@ -0,0 +1,17 @@
+DokuWikiisi lisättiin tai siellä muutettiin sivua. Tässä yksityiskohdat
+
+Päivämäärä : @DATE@
+Selain: @BROWSER@
+IP-Osoite: @IPADDRESS@
+Isäntänimi: @HOSTNAME@
+Vanha versio: @OLDPAGE@
+Uusi versio: @NEWPAGE@
+Yhteenveto: @SUMMARY@
+Käyttäjä : @USER@
+
+@DIFF@
+
+
+-- 
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fi/mailwrap.html b/sources/inc/lang/fi/mailwrap.html
new file mode 100644
index 0000000..6ff63c0
--- /dev/null
+++ b/sources/inc/lang/fi/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Tämä viesti on tehty DokuWiki:ssä  @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/fi/newpage.txt b/sources/inc/lang/fi/newpage.txt
new file mode 100644
index 0000000..fc6379b
--- /dev/null
+++ b/sources/inc/lang/fi/newpage.txt
@@ -0,0 +1,3 @@
+====== Tätä otsikkoa ei vielä ole ======
+
+Olet seurannut linkkiä otsikkoon jota ei vielä ole. Voit luoda tämän käyttämällä ''Luo tämä sivu'' -nappia.
diff --git a/sources/inc/lang/fi/norev.txt b/sources/inc/lang/fi/norev.txt
new file mode 100644
index 0000000..a5138cf
--- /dev/null
+++ b/sources/inc/lang/fi/norev.txt
@@ -0,0 +1,3 @@
+====== Ei tällaista versiota ======
+
+Kyseistä versiota ei ole. Käytä ''Vanha versio''-nappia nähdäksesi listan tämän dokumentin vanhoista versioista
diff --git a/sources/inc/lang/fi/password.txt b/sources/inc/lang/fi/password.txt
new file mode 100644
index 0000000..51e1604
--- /dev/null
+++ b/sources/inc/lang/fi/password.txt
@@ -0,0 +1,10 @@
+Terve @FULLNAME@!
+
+Tässä käyttäjätietosi sivulla @TITLE@ osoitteessa @DOKUWIKIURL@
+
+Käyttäjätunnus : @LOGIN@
+Salasana : @PASSWORD@
+
+-- 
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fi/preview.txt b/sources/inc/lang/fi/preview.txt
new file mode 100644
index 0000000..8487807
--- /dev/null
+++ b/sources/inc/lang/fi/preview.txt
@@ -0,0 +1,3 @@
+====== Esikatselu ======
+
+Tämä on esikatselu siitä, miltä tekstisi tulee näyttämään. Muista, että tätä **ei ole tallennettu** vielä!
diff --git a/sources/inc/lang/fi/pwconfirm.txt b/sources/inc/lang/fi/pwconfirm.txt
new file mode 100644
index 0000000..e552f5c
--- /dev/null
+++ b/sources/inc/lang/fi/pwconfirm.txt
@@ -0,0 +1,13 @@
+Hei @FULLNAME@!
+
+Joku pyysi uutta salasanaa login nimellesi @TITLE@ sivustolla @DOKUWIKIURL@
+
+Jos sinä ei pyytänyt uutta salasanaa, niin voit unohtaa tämän postin.
+
+Käytä alla olevaa linkkiä vahvistaaksesi, että pyynnön lähettäjä todella olet sinä.
+
+@CONFIRM@
+
+-- 
+Tämän postin loi DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fi/read.txt b/sources/inc/lang/fi/read.txt
new file mode 100644
index 0000000..eb43802
--- /dev/null
+++ b/sources/inc/lang/fi/read.txt
@@ -0,0 +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ä estoa virheellisenä.
diff --git a/sources/inc/lang/fi/recent.txt b/sources/inc/lang/fi/recent.txt
new file mode 100644
index 0000000..ffb0810
--- /dev/null
+++ b/sources/inc/lang/fi/recent.txt
@@ -0,0 +1,4 @@
+====== Viimeiset muutokset ======
+
+Seuraavat sivut ovat muuttuneet viime aikoina.
+
diff --git a/sources/inc/lang/fi/register.txt b/sources/inc/lang/fi/register.txt
new file mode 100644
index 0000000..cf7a625
--- /dev/null
+++ b/sources/inc/lang/fi/register.txt
@@ -0,0 +1,3 @@
+====== Rekisteröi uusi käyttäjä ======
+
+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 --git a/sources/inc/lang/fi/registermail.txt b/sources/inc/lang/fi/registermail.txt
new file mode 100644
index 0000000..c276873
--- /dev/null
+++ b/sources/inc/lang/fi/registermail.txt
@@ -0,0 +1,14 @@
+Uusi käyttäjä on rekisteröitynyt. Tässä tiedot:
+
+Käyttäjänimi : @NEWUSER@
+Kokonimi : @NEWNAME@
+Sähköposti : @NEWEMAIL@
+
+Päivämäärä : @DATE@
+Selain : @BROWSER@
+IP-osoite : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+-- 
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fi/resendpwd.txt b/sources/inc/lang/fi/resendpwd.txt
new file mode 100644
index 0000000..5a567b0
--- /dev/null
+++ b/sources/inc/lang/fi/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Lähetä uusi salasana ======
+
+Täytä käyttäjätunnuksesi kaavakkeeseen pyytääksesi uutta salasanaa wikin käyttäjätilillesi. Vahvistuslinkki lähetetään kirjautumisen yhteydessä antamaan sähköpostiosoitteeseen.
diff --git a/sources/inc/lang/fi/resetpwd.txt b/sources/inc/lang/fi/resetpwd.txt
new file mode 100644
index 0000000..c678094
--- /dev/null
+++ b/sources/inc/lang/fi/resetpwd.txt
@@ -0,0 +1,3 @@
+===== Aseta salasana =====
+
+Anna uusi salasanasi tässä wikissä.
\ No newline at end of file
diff --git a/sources/inc/lang/fi/revisions.txt b/sources/inc/lang/fi/revisions.txt
new file mode 100644
index 0000000..a48cd33
--- /dev/null
+++ b/sources/inc/lang/fi/revisions.txt
@@ -0,0 +1,3 @@
+====== Vanha versio ======
+
+Nämä ovat vanhoja versioita nykyisestä dokumentista. Jos haluat palauttaa vanhan version valitse se alhaalta, paina ''Muokkaa tätä sivua'' ja tallenna se.
diff --git a/sources/inc/lang/fi/searchpage.txt b/sources/inc/lang/fi/searchpage.txt
new file mode 100644
index 0000000..aa9fbf5
--- /dev/null
+++ b/sources/inc/lang/fi/searchpage.txt
@@ -0,0 +1,5 @@
+====== Etsi ======
+
+Löydät etsinnän tulokset alta. Jos et löytänyt etsimääsi voit luoda uuden sivun tiedustelusi pohjalta käyttämällä ''Muokkaa tätä sivua'' -napilla.
+
+===== Tulokset =====
diff --git a/sources/inc/lang/fi/showrev.txt b/sources/inc/lang/fi/showrev.txt
new file mode 100644
index 0000000..243f8d0
--- /dev/null
+++ b/sources/inc/lang/fi/showrev.txt
@@ -0,0 +1,2 @@
+**Tämä on vanha versio dokumentista!**
+----
diff --git a/sources/inc/lang/fi/stopwords.txt b/sources/inc/lang/fi/stopwords.txt
new file mode 100644
index 0000000..82d3daa
--- /dev/null
+++ b/sources/inc/lang/fi/stopwords.txt
@@ -0,0 +1,11 @@
+# Tämä on lista sanoista, jotka indeksoija ohittaa. Yksi sana riviä kohti
+# Kun muokkaat sivua, varmista että käytät UNIX rivinvaihtoa (yksi newline)
+# Ei tarvitse lisätä alle kolmen merkin sanoja. NE ohitetaan automaattisesti.
+# Jos wikissäsin muita kieliä, lisää sanoja listaan esimerkiksi sivulta http://www.ranks.nl/stopwords/
+www
+eli
+tai
+sinä
+sinun
+com
+oli
diff --git a/sources/inc/lang/fi/subscr_digest.txt b/sources/inc/lang/fi/subscr_digest.txt
new file mode 100644
index 0000000..4664844
--- /dev/null
+++ b/sources/inc/lang/fi/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hei!
+
+Sivu @PAGE@ wikissä @TITLE@ on muuttunut.
+Tässä ovat muutokset:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vanha versio: @OLDPAGE@
+Uusi versio: @NEWPAGE@
+
+Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
+@DOKUWIKIURL@ , jonka jälkeen katso
+@SUBSCRIBE@
+ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
+
+--
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fi/subscr_form.txt b/sources/inc/lang/fi/subscr_form.txt
new file mode 100644
index 0000000..70f2fde
--- /dev/null
+++ b/sources/inc/lang/fi/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Tilausten hallinta ======
+
+Tämä sivu avulla voit hallita silauksiasi nykyiseltä sivulta ja nimiavaruudelta.
\ No newline at end of file
diff --git a/sources/inc/lang/fi/subscr_list.txt b/sources/inc/lang/fi/subscr_list.txt
new file mode 100644
index 0000000..cd39014
--- /dev/null
+++ b/sources/inc/lang/fi/subscr_list.txt
@@ -0,0 +1,18 @@
+Hei!
+
+Sivut nimiavaruudessa @PAGE@ wikissä @TITLE@ ovat muuttuneet.
+Tässä ovat muuttuneet sivut:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Peruuttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
+@DOKUWIKIURL@ , jonka jälkeen katso
+@SUBSCRIBE@
+ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
+
+
+-- 
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fi/subscr_single.txt b/sources/inc/lang/fi/subscr_single.txt
new file mode 100644
index 0000000..0fd83e2
--- /dev/null
+++ b/sources/inc/lang/fi/subscr_single.txt
@@ -0,0 +1,23 @@
+Hei!
+
+Sivu @PAGE@ wikissä @TITLE@ on muuttunut.
+Tässä ovat muutokset:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Päivä : @DATE@
+Käyttäjä : @USER@
+Yhteenveto: @SUMMARY@
+Vanha versio: @OLDPAGE@
+Uusi versio: @NEWPAGE@
+
+Peruttaaksesi sivuilmoitukset kirjaudu wikiin osoitteessa
+@DOKUWIKIURL@ , jonka jälkeen katso
+@SUBSCRIBE@
+ja peruuta tilauksesi sivun ja/tai nimiavaruuden muutoksista.
+
+-- 
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fi/updateprofile.txt b/sources/inc/lang/fi/updateprofile.txt
new file mode 100644
index 0000000..7140795
--- /dev/null
+++ b/sources/inc/lang/fi/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Päivitä käyttäjätilisi profiilia ======
+
+Täytä vain ne kentät, joita haluat muuttaa. Et voi muuttaa käyttäjätunnustasi.
\ No newline at end of file
diff --git a/sources/inc/lang/fi/uploadmail.txt b/sources/inc/lang/fi/uploadmail.txt
new file mode 100644
index 0000000..0c116a7
--- /dev/null
+++ b/sources/inc/lang/fi/uploadmail.txt
@@ -0,0 +1,14 @@
+Tiedosto ladattiin DokuWikillesi. Tässä yksityiskohtaiset tiedot:
+
+Tiedosto : @MEDIA@
+PVM : @DATE@
+Selain : @BROWSER@
+IP-Osoite : @IPADDRESS@
+Hostname : @HOSTNAME@
+Koko : @SIZE@
+MIME Type : @MIME@
+Käyttäjä : @USER@
+
+-- 
+Tämän postin loi DokuWiki osoitteessa
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fo/admin.txt b/sources/inc/lang/fo/admin.txt
new file mode 100644
index 0000000..2774322
--- /dev/null
+++ b/sources/inc/lang/fo/admin.txt
@@ -0,0 +1,4 @@
+====== Fyrisiting ======
+
+Niðanfyri kanst tú finna eina røð av amboðum til fyrisiting.
+
diff --git a/sources/inc/lang/fo/backlinks.txt b/sources/inc/lang/fo/backlinks.txt
new file mode 100644
index 0000000..422377f
--- /dev/null
+++ b/sources/inc/lang/fo/backlinks.txt
@@ -0,0 +1,4 @@
+====== Ávísing afturúr ======
+
+Hetta er ein listi yvur øll tey skjøl sum vísa aftur á tað núverandi skjali.
+
diff --git a/sources/inc/lang/fo/conflict.txt b/sources/inc/lang/fo/conflict.txt
new file mode 100644
index 0000000..df3fe52
--- /dev/null
+++ b/sources/inc/lang/fo/conflict.txt
@@ -0,0 +1,5 @@
+====== Ein níggjari útgáva av skjalinum er til ======
+
+Ein nýggjari útgáva av hesum skjalinum er til. Hetta hendur tá fleiri brúkarir rætta í skjalinum samstundis.
+
+Eftirkanna tær vístu broytingar nágreiniliga, og avgerð hvat fyri útgávu sum skal goymast. Um tú velur ''Goym'', verður tín útgáva av skalinum goymd. Velur tú ''Angra'' varðveittur tú tí núverandi útgávuna.
diff --git a/sources/inc/lang/fo/denied.txt b/sources/inc/lang/fo/denied.txt
new file mode 100644
index 0000000..505b249
--- /dev/null
+++ b/sources/inc/lang/fo/denied.txt
@@ -0,0 +1,3 @@
+====== Atgongd nokta! ======
+
+Tú hevur ikki rættindi til at halda áfram. Møguliga hevur tú ikki rita inn.
diff --git a/sources/inc/lang/fo/diff.txt b/sources/inc/lang/fo/diff.txt
new file mode 100644
index 0000000..343818b
--- /dev/null
+++ b/sources/inc/lang/fo/diff.txt
@@ -0,0 +1,4 @@
+====== Munir ======
+
+Hetta vísur munir millum tí valdu og núverandu útgávu av skjalinum. Gular eru linjur sum er at finna í gomlu útgávuni, og grønar eru linjur sum eru at finna í núvarandi útgávuni.
+
diff --git a/sources/inc/lang/fo/edit.txt b/sources/inc/lang/fo/edit.txt
new file mode 100644
index 0000000..2ba92a2
--- /dev/null
+++ b/sources/inc/lang/fo/edit.txt
@@ -0,0 +1,2 @@
+Rætta hetta skjal og trýst so á **''[Goym]''** knappin. Sí [[wiki:syntax|snið ábending]] fyri Wiki setningsbygnað. Rætta vinarliga bert hetta skjali um tú kanst **fyrireika** tað. Nýt vinarliga [[playground:playground|sandkassan]] til at testa áðrenn tú rættar í einum røttum skjali. Minst eisini til at brúkar **''[Forskoðan]''** áðrenn tú goymur skjalið.
+
diff --git a/sources/inc/lang/fo/editrev.txt b/sources/inc/lang/fo/editrev.txt
new file mode 100644
index 0000000..274d423
--- /dev/null
+++ b/sources/inc/lang/fo/editrev.txt
@@ -0,0 +1,2 @@
+**Tú hevur heinta eina gamla útgávu av hesum skjalinum!** Um tú goymur skjali vilt tú skriva útyvir núverandi við gomlu útgávuni.
+----
diff --git a/sources/inc/lang/fo/index.txt b/sources/inc/lang/fo/index.txt
new file mode 100644
index 0000000..640edfb
--- /dev/null
+++ b/sources/inc/lang/fo/index.txt
@@ -0,0 +1,3 @@
+====== Evnisyvirlit ======
+
+Hetta er eitt yvirlit yvur øll atkomandi skjøl, flokka eftir [[doku>namespaces|navnarúm]].
diff --git a/sources/inc/lang/fo/lang.php b/sources/inc/lang/fo/lang.php
new file mode 100644
index 0000000..161e732
--- /dev/null
+++ b/sources/inc/lang/fo/lang.php
@@ -0,0 +1,171 @@
+
+ * @author Einar Petersen 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = 'Vanligt gásareygað byrjan';
+$lang['doublequoteclosing']    = 'Vanligt gásareygað endi';
+$lang['singlequoteopening']    = 'Einstakt gásareygað byrjan';
+$lang['singlequoteclosing']    = 'Einstakt gásareygað endi';
+$lang['apostrophe']            = 'Apostroff';
+$lang['btn_edit']              = 'Rætta hetta skjal';
+$lang['btn_source']            = 'Vís keldu';
+$lang['btn_show']              = 'Vís skjal';
+$lang['btn_create']            = 'Býrja uppá hetta skjal';
+$lang['btn_search']            = 'Leita';
+$lang['btn_save']              = 'Goym';
+$lang['btn_preview']           = 'Forskoðan';
+$lang['btn_top']               = 'Aftur til toppin';
+$lang['btn_newer']             = '<< undan síða';
+$lang['btn_older']             = 'næsta síðe >>';
+$lang['btn_revs']              = 'Gamlar útgávur';
+$lang['btn_recent']            = 'Nýggj broyting';
+$lang['btn_upload']            = 'Legg fílu upp';
+$lang['btn_cancel']            = 'Angra';
+$lang['btn_index']             = 'Evnisyvirlit';
+$lang['btn_secedit']           = 'Rætta';
+$lang['btn_login']             = 'Rita inn';
+$lang['btn_logout']            = 'Rita út';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Dagfør';
+$lang['btn_delete']            = 'Strika';
+$lang['btn_back']              = 'Aftur';
+$lang['btn_backlink']          = 'Ávísingar afturúr';
+$lang['btn_backtomedia']       = 'Aftur til val av miðlafílu';
+$lang['btn_subscribe']         = 'Tilmelda broytingar';
+$lang['btn_profile']           = 'Dagføra vangamynd';
+$lang['btn_reset']             = 'Nullstilla';
+$lang['btn_draft']             = 'Broyt kladdu';
+$lang['btn_recover']           = 'Endurbygg kladdu';
+$lang['btn_draftdel']          = 'Sletta';
+$lang['btn_revert']            = 'Endurbygg';
+$lang['btn_register']          = 'Melda til';
+$lang['loggedinas']            = 'Ritavur inn sum';
+$lang['user']                  = 'Brúkaranavn';
+$lang['pass']                  = 'Loyniorð';
+$lang['newpass']               = 'Nýtt loyniorð';
+$lang['oldpass']               = 'Vátta núverandi loyniorð';
+$lang['passchk']               = 'Endurtak nýtt loyniorð';
+$lang['remember']              = 'Minst til loyniorðið hjá mær';
+$lang['fullname']              = 'Navn';
+$lang['email']                 = 'T-postur';
+$lang['profile']               = 'Brúkara vangamynd';
+$lang['badlogin']              = 'Skeivt brúkaranavn ella loyniorð.';
+$lang['minoredit']             = 'Smærri broytingar';
+$lang['draftdate']             = 'Goym kladdu sett frá';
+$lang['nosecedit']             = 'Hendan síðan var broytt undir tilevnan, brotið var ikki rætt dagfest, heintaði fulla síðu í staðin';
+$lang['regmissing']            = 'Tú skalt fylla út øll øki.';
+$lang['reguexists']            = 'Hetta brúkaranavn er upptiki.';
+$lang['regsuccess']            = 'Tú ert nú stovnavur sum brúkari. Títt loyniorð verður sent til tín í einum T-posti.';
+$lang['regsuccess2']           = 'Tú ert nú stovnavur sum brúkari.';
+$lang['regmailfail']           = 'Títt loyniorð bleiv ikki sent. Fá vinarliga samband við administratorin.';
+$lang['regbadmail']            = 'T-post adressan er ógildig. Fá vinarliga samband við administratorin, um tú heldur at hetta er eitt brek.';
+$lang['regbadpass']            = 'Bæði loyniorðini eru ikki eins, royn vinarliga umaftur.';
+$lang['regpwmail']             = 'Títt DokuWiki loyniorð';
+$lang['reghere']               = 'Upprætta eina DokuWiki-konto her';
+$lang['profna']                = 'Tað er ikki møguligt at broyta tína vangamynd í hesu wiki';
+$lang['profnochange']          = 'Ongar broytingar, onki tillaga.';
+$lang['profnoempty']           = 'Tómt navn ella t-post adressa er ikki loyvt.';
+$lang['profchanged']           = 'Brúkara vangamynd dagført rætt.';
+$lang['pwdforget']             = 'Gloymt títt loyniorð? Fá eitt nýtt';
+$lang['resendna']              = 'Tað er ikki møguligt at fá sent nýtt loyniorð við hesu wiki.';
+$lang['resendpwdmissing']      = 'Tú skal filla út øll økir.';
+$lang['resendpwdnouser']       = 'Vit kunna ikki finna hendan brúkara í okkara dátagrunni.';
+$lang['resendpwdbadauth']      = 'Hald til góðar, hendan góðkenningar kodan er ikki gildug. Kanna eftir at tú nýtti tað fulfíggjaðu góðkenningarleinkjuna';
+$lang['resendpwdconfirm']      = 'Ein góðkenningarleinkja er send við e-posti';
+$lang['resendpwdsuccess']      = 'Títt nýggja loyniorð er sent við t-posti.';
+$lang['license']               = 'Um ikki annað er tilskilað, so er tilfar á hesari wiki loyvt margfaldað undir fylgjandi treytum:';
+$lang['licenseok']             = 'Legg til merkis: Við at dagføra hesa síðu samtykkir tú at loyva margfalding av tilfarinum undir fylgjandi treytum:';
+$lang['searchmedia']           = 'Leita eftir fíl navn:';
+$lang['searchmedia_in']        = 'Leita í %s';
+$lang['txt_upload']            = 'Vel tí fílu sum skal leggjast upp';
+$lang['txt_filename']          = 'Sláa inn wikinavn (valfrítt)';
+$lang['txt_overwrt']           = 'Yvurskriva verandi fílu';
+$lang['lockedby']              = 'Fyribils læst av';
+$lang['lockexpire']            = 'Lásið ferð úr gildi kl.';
+$lang['js']['willexpire']            = 'Títt lás á hetta skjalið ferð úr gildi um ein minnutt.\nTrýst á Forskoðan-knappin fyri at sleppa undan trupulleikum.';
+$lang['js']['notsavedyet']     = 'Tað eru gjørdar broytingar í skjalinum, um tú haldur fram vilja broytingar fara fyri skeytið.
+Ynskir tú at halda fram?';
+$lang['js']['searchmedia']     = 'Leita eftir dátufílum';
+$lang['js']['mediasize']       = 'Mynda stødd';
+$lang['js']['mediatarget']     = 'Leinkja til';
+$lang['js']['mediaclose']      = 'Læt aftur';
+$lang['js']['mediainsert']     = 'Set inn';
+$lang['js']['mediadisplayimg'] = 'Vís myndina';
+$lang['js']['mediadisplaylnk'] = 'Vís bert leinkjuna';
+$lang['js']['nosmblinks']      = 'Ávísingar til Windows shares virka bert í Microsoft Internet Explorer.
+Tú kanst enn avrita og sata inn slóðina.';
+$lang['js']['del_confirm']     = 'Strika post(ar)?';
+$lang['rssfailed']             = 'Eitt brek koma fyri tá roynt var at fáa: ';
+$lang['nothingfound']          = 'Leiting gav onki úrslit.';
+$lang['mediaselect']           = 'Vel miðlafílu';
+$lang['fileupload']            = 'Legg miðla fílu upp';
+$lang['uploadsucc']            = 'Upp legg av fílu var væl eydna';
+$lang['uploadfail']            = 'Brek við upp legg av fílu. Tað er møguliga trupuleikar við rættindunum';
+$lang['uploadwrong']           = 'Upp legg av fílu víst burtur. Fíluslag er ikki loyvt';
+$lang['uploadexist']           = 'Fílan er longu til.';
+$lang['deletesucc']            = 'Fílan "%s" er nú strika.';
+$lang['deletefail']            = '"%s" kundi ikki strikast - kanna rættindini.';
+$lang['mediainuse']            = 'Fíla "%s" er ikki strika - hen verður enn nýtt.';
+$lang['namespaces']            = 'Navnarúm';
+$lang['mediafiles']            = 'Atkomandi fílur í';
+$lang['reference']             = 'Ávísing til';
+$lang['ref_inuse']             = 'Fílan kan ikki strikast, síðan hon enn verður nýtt á fylgjandi síðum:';
+$lang['ref_hidden']            = 'Nakrar ávísingar eru í skjølum sum tú ikki hevur lesi rættindi til';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Samsvarandi skjøl';
+$lang['toc']                   = 'Innihaldsyvirlit';
+$lang['current']               = 'núverandi';
+$lang['yours']                 = 'Tín útgáva';
+$lang['diff']                  = 'vís broytingar í mun til núverandi útgávu';
+$lang['line']                  = 'Linja';
+$lang['breadcrumb']            = 'Leið';
+$lang['youarehere']            = 'Tú ert her';
+$lang['lastmod']               = 'Seinast broytt';
+$lang['by']                    = 'av';
+$lang['deleted']               = 'strika';
+$lang['created']               = 'stovna';
+$lang['restored']              = 'gomul útgáva endurstovna (%s)';
+$lang['summary']               = 'Samandráttur';
+$lang['mail_newpage']          = 'skjal skoyta uppí:';
+$lang['mail_changed']          = 'skjal broytt:';
+$lang['qb_bold']               = 'Feit';
+$lang['qb_italic']             = 'Skák';
+$lang['qb_underl']             = 'Undurstrika';
+$lang['qb_code']               = 'Skrivimaskinu tekstur';
+$lang['qb_strike']             = 'Gjøgnumstrika';
+$lang['qb_h1']                 = 'Stig 1 yvirskrift';
+$lang['qb_h2']                 = 'Stig 2 yvirskrift';
+$lang['qb_h3']                 = 'Stig 3 yvirskrift';
+$lang['qb_h4']                 = 'Stig 4 yvirskrift';
+$lang['qb_h5']                 = 'Stig 5 yvirskrift';
+$lang['qb_link']               = 'Innanhýsis slóð';
+$lang['qb_extlink']            = 'Útvortis slóð';
+$lang['qb_hr']                 = 'Vatnrætt linja';
+$lang['qb_ol']                 = 'Talmerktur listi';
+$lang['qb_ul']                 = 'Ótalmerktur listi';
+$lang['qb_media']              = 'Leggja myndir og aðrar fílur afturat';
+$lang['qb_sig']                = 'Set inn undirskrift';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Sertekn';
+$lang['admin_register']        = 'Upprætta nýggjan brúkara';
+$lang['metaedit']              = 'Rætta metadáta';
+$lang['metasaveerr']           = 'Brek við skriving av metadáta';
+$lang['metasaveok']            = 'Metadáta goymt';
+$lang['img_backto']            = 'Aftur til';
+$lang['img_title']             = 'Heitið';
+$lang['img_caption']           = 'Myndatekstur';
+$lang['img_date']              = 'Dato';
+$lang['img_fname']             = 'Fílunavn';
+$lang['img_fsize']             = 'Stødd';
+$lang['img_artist']            = 'Myndafólk';
+$lang['img_copyr']             = 'Upphavsrættur';
+$lang['img_format']            = 'Snið';
+$lang['img_camera']            = 'Fototól';
+$lang['img_keywords']          = 'Evnisorð';
+$lang['authtempfail']          = 'Validering av brúkara virkar fyribils ikki. Um hetta er varandi, fá so samband við umboðsstjóran á hesi wiki.';
diff --git a/sources/inc/lang/fo/locked.txt b/sources/inc/lang/fo/locked.txt
new file mode 100644
index 0000000..2e65a06
--- /dev/null
+++ b/sources/inc/lang/fo/locked.txt
@@ -0,0 +1,3 @@
+====== Læst skjal ======
+
+Hetta skjal er fyribils læst av einum øðrum brúkara. Bíða vinarliga til brúkarin er liðugur við at rætta skjali, ella at lásið er fara úr gildi.
diff --git a/sources/inc/lang/fo/login.txt b/sources/inc/lang/fo/login.txt
new file mode 100644
index 0000000..31a4c54
--- /dev/null
+++ b/sources/inc/lang/fo/login.txt
@@ -0,0 +1,3 @@
+====== Rita inn ======
+
+Tú hevur ikki rita inn! Slá inn brúkaranavn og loyniorð. Tín kagi skal loyva at cookies verða goymdar fyri at tú kanst rita inn.
diff --git a/sources/inc/lang/fo/mailtext.txt b/sources/inc/lang/fo/mailtext.txt
new file mode 100644
index 0000000..358a23b
--- /dev/null
+++ b/sources/inc/lang/fo/mailtext.txt
@@ -0,0 +1,17 @@
+Eitt skjal í tíni DokuWiki bleiv broytt ella skoytt uppí. Her er ein lýsing:
+
+Dato               : @DATE@
+Browser            : @BROWSER@
+IP-adressa         : @IPADDRESS@
+Hostnavn           : @HOSTNAME@
+Gomul útgáva       : @OLDPAGE@
+Nýggj útgáva       : @NEWPAGE@
+Rætti samandráttur : @SUMMARY@
+Brúkari            : @USER@
+
+@DIFF@
+
+
+-- 
+Hesin t-postur var skaptur av DokuWiki á:
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fo/newpage.txt b/sources/inc/lang/fo/newpage.txt
new file mode 100644
index 0000000..6eeb1ef
--- /dev/null
+++ b/sources/inc/lang/fo/newpage.txt
@@ -0,0 +1,3 @@
+====== Hetta skjal er ikki til (enn) ======
+
+Tú fylgdi ein ávísing til eitt skjal sum ikki er til (enn). Tú kanst stovna skjali við at trýsta á **''[Stovna hetta skjal]''** knappin.
diff --git a/sources/inc/lang/fo/norev.txt b/sources/inc/lang/fo/norev.txt
new file mode 100644
index 0000000..d0b463a
--- /dev/null
+++ b/sources/inc/lang/fo/norev.txt
@@ -0,0 +1,4 @@
+====== Valda útgávan er ikki til ======
+
+Valda útgávan av skjalinum er ikki til! Trýst á knappin **''[Gamlar útgávur]''** fyri at síggja ein lista yvur gamlar útgávur av hesum skjali.
+
diff --git a/sources/inc/lang/fo/password.txt b/sources/inc/lang/fo/password.txt
new file mode 100644
index 0000000..1e4797b
--- /dev/null
+++ b/sources/inc/lang/fo/password.txt
@@ -0,0 +1,10 @@
+Hey @FULLNAME@!
+
+Her eru tínar brúkaraupplýsingar @TITLE@ at @DOKUWIKIURL@
+
+Brúkaranavn : @LOGIN@
+Loyniorð    : @PASSWORD@
+
+-- 
+Hesin t-postur var skaptur av DokuWiki á:
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fo/preview.txt b/sources/inc/lang/fo/preview.txt
new file mode 100644
index 0000000..e3e65d8
--- /dev/null
+++ b/sources/inc/lang/fo/preview.txt
@@ -0,0 +1,4 @@
+====== Forskoðan ======
+
+Hetta er ein forskoðan skjalinum, sum vísur hvussi tað fer at síggja út. Minst til: Tað er //**IKKI**// goymt enn! Um tað sær rætt út, trýst so á **''[Goym]''** knappin
+
diff --git a/sources/inc/lang/fo/read.txt b/sources/inc/lang/fo/read.txt
new file mode 100644
index 0000000..bacf790
--- /dev/null
+++ b/sources/inc/lang/fo/read.txt
@@ -0,0 +1,2 @@
+Hetta skjal kan bert læsast. Tú kanst síggja kelduna, men ikki goyma  broytingar í tí. Um tú heldur at hetta er eitt brek, skriva so vinarliga í [[wiki:brek-yvirlit]].
+
diff --git a/sources/inc/lang/fo/recent.txt b/sources/inc/lang/fo/recent.txt
new file mode 100644
index 0000000..4704f37
--- /dev/null
+++ b/sources/inc/lang/fo/recent.txt
@@ -0,0 +1,5 @@
+====== Nýggjar broytingar ======
+
+Fylgjandi skjøl er broytt nýliga.
+
+
diff --git a/sources/inc/lang/fo/register.txt b/sources/inc/lang/fo/register.txt
new file mode 100644
index 0000000..24438af
--- /dev/null
+++ b/sources/inc/lang/fo/register.txt
@@ -0,0 +1,4 @@
+====== Upprætta eina wiki-konti ======
+
+Fylla út niðanfyrista skema fyri at upprætta eina konti í hesu wiki. Minst til at nýta eina **galdandi t-post-adressu** - títt loyniorð verður sent til tín. Títt brúkaranavn skal verða galdandi [[doku>pagename|skjalanavn]].
+
diff --git a/sources/inc/lang/fo/resendpwd.txt b/sources/inc/lang/fo/resendpwd.txt
new file mode 100644
index 0000000..450202c
--- /dev/null
+++ b/sources/inc/lang/fo/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Send nýtt loyniorð ======
+
+Fyll út øll niðanfyristandandi øki fyri at fáa sent eitt nýtt loyniorð til hesa wiki. Títt nýggja loyniorð verður sent til tí uppgivnu t-postadressu. Brúkaranavn eigur at verða títt wiki brúkaranavn.
diff --git a/sources/inc/lang/fo/revisions.txt b/sources/inc/lang/fo/revisions.txt
new file mode 100644
index 0000000..dcd845c
--- /dev/null
+++ b/sources/inc/lang/fo/revisions.txt
@@ -0,0 +1,3 @@
+====== Gamlar útgávur ======
+
+Her eru tær gomlu útgávurnar av hesum skalinum. Tú kanst venda aftur til eina eldri útgávu av skjalinum við at velja tað niðanfyri, trýst á **''[Rætta hetta skjal]''** knappin, og til síðst goyma skjali.
diff --git a/sources/inc/lang/fo/searchpage.txt b/sources/inc/lang/fo/searchpage.txt
new file mode 100644
index 0000000..6304a89
--- /dev/null
+++ b/sources/inc/lang/fo/searchpage.txt
@@ -0,0 +1,5 @@
+====== Leiting ======
+
+Tú kanst síggja úrslitini av tíni leiting niðanfyri. Um úrslitini ikki innihalda tað sum tú leitaði eftir kanst tú upprætta eitt nýtt skjal við sama navni sum leitingin við at trýsta á **''[Upprætta hetta skjal]''** knappin.
+
+===== Leitiúrslit =====
diff --git a/sources/inc/lang/fo/showrev.txt b/sources/inc/lang/fo/showrev.txt
new file mode 100644
index 0000000..515f80a
--- /dev/null
+++ b/sources/inc/lang/fo/showrev.txt
@@ -0,0 +1,2 @@
+**Hetta er ein gomul útgáva av skjalinum!**
+----
diff --git a/sources/inc/lang/fo/stopwords.txt b/sources/inc/lang/fo/stopwords.txt
new file mode 100644
index 0000000..210e859
--- /dev/null
+++ b/sources/inc/lang/fo/stopwords.txt
@@ -0,0 +1,87 @@
+# 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/
+annar
+báðir
+eg
+eingin
+einhvør
+eini
+eitt
+ella
+enn
+fim
+fleiri
+flestir
+frá
+fyri
+fyrr
+fýra
+góður
+hann
+hansara
+har
+hendan
+hennara
+her
+hetta
+hevur
+hon
+hvar
+hvat
+hvussi
+hví
+hvør
+ikki
+inn
+kan
+koma
+lítil
+man
+maður
+meira
+men
+miðan
+niður
+nær
+næstan
+næsti
+nógv
+nýtt
+okkurt
+ongin
+onki
+onkur
+seks
+sindur
+sjey
+smáur
+stórur
+større
+størst
+sum
+síggjast
+tann
+tað
+teir
+tey
+til
+tríggir
+trý
+tvey
+tykkara
+tær
+tí
+tín
+tó
+tú
+um
+undan
+var
+vera
+við
+yvur
+átta
+áðrenn
+øll
diff --git a/sources/inc/lang/fo/subscr_digest.txt b/sources/inc/lang/fo/subscr_digest.txt
new file mode 100644
index 0000000..3d9f097
--- /dev/null
+++ b/sources/inc/lang/fo/subscr_digest.txt
@@ -0,0 +1,20 @@
+Halló!
+
+Síðan @PAGE@ í @TITLE@ wiki er broytt.
+Her eru broytinganar:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Gamla skjalið: @OLDPAGE@
+Nýggja skjalið: @NEWPAGE@
+
+Fyri at avmelda síðu kunngerðir, logga inn í wikiina á
+@DOKUWIKIURL@ vitja so
+@SUBSCRIBE@
+og avmelda hald á síðu og/ella navnaøkis broytingar.
+
+--
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fo/updateprofile.txt b/sources/inc/lang/fo/updateprofile.txt
new file mode 100644
index 0000000..10ee40d
--- /dev/null
+++ b/sources/inc/lang/fo/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Dagføra vangamynd fyri tína konti ======
+
+Tú nýtist bert at fylla út tey øki sum tú ynskjur at broyta. Tú kanst ikki broyta títt brúkaranavn.
diff --git a/sources/inc/lang/fr/admin.txt b/sources/inc/lang/fr/admin.txt
new file mode 100644
index 0000000..eeeb231
--- /dev/null
+++ b/sources/inc/lang/fr/admin.txt
@@ -0,0 +1,3 @@
+====== Administration ======
+
+Ci-dessous, vous trouverez une liste des tâches d'administration disponibles dans DokuWiki.
diff --git a/sources/inc/lang/fr/adminplugins.txt b/sources/inc/lang/fr/adminplugins.txt
new file mode 100644
index 0000000..0b2bf18
--- /dev/null
+++ b/sources/inc/lang/fr/adminplugins.txt
@@ -0,0 +1 @@
+===== Extensions ===== 
\ No newline at end of file
diff --git a/sources/inc/lang/fr/backlinks.txt b/sources/inc/lang/fr/backlinks.txt
new file mode 100644
index 0000000..8e6d27d
--- /dev/null
+++ b/sources/inc/lang/fr/backlinks.txt
@@ -0,0 +1,4 @@
+====== Pages pointant sur la page en cours ======
+
+Ceci est la liste des pages qui semblent pointer sur la page actuelle.
+
diff --git a/sources/inc/lang/fr/conflict.txt b/sources/inc/lang/fr/conflict.txt
new file mode 100644
index 0000000..e34ec97
--- /dev/null
+++ b/sources/inc/lang/fr/conflict.txt
@@ -0,0 +1,6 @@
+====== Une version plus récente existe ======
+
+Une version plus récente du document que vous avez modifié existe. Cela se produit lorsqu'un autre utilisateur enregistre une nouvelle version du document alors que vous le modifiez.
+
+Examinez attentivement les différences ci-dessous et décidez quelle version conserver. Si vous choisissez « Enregistrer », votre version sera enregistrée. Cliquez sur « Annuler » pour conserver la version actuelle.
+
diff --git a/sources/inc/lang/fr/denied.txt b/sources/inc/lang/fr/denied.txt
new file mode 100644
index 0000000..20d4d67
--- /dev/null
+++ b/sources/inc/lang/fr/denied.txt
@@ -0,0 +1,3 @@
+====== Autorisation refusée ======
+
+Désolé, vous n'avez pas les droits pour continuer. Peut-être avez-vous oublié de vous identifier ?
diff --git a/sources/inc/lang/fr/diff.txt b/sources/inc/lang/fr/diff.txt
new file mode 100644
index 0000000..d1230cc
--- /dev/null
+++ b/sources/inc/lang/fr/diff.txt
@@ -0,0 +1,4 @@
+====== Différences ======
+
+Ci-dessous, les différences entre deux révisions de la page.
+
diff --git a/sources/inc/lang/fr/draft.txt b/sources/inc/lang/fr/draft.txt
new file mode 100644
index 0000000..ab383ee
--- /dev/null
+++ b/sources/inc/lang/fr/draft.txt
@@ -0,0 +1,6 @@
+====== Un fichier brouillon a été trouvé ======
+
+La dernière modification de cette page ne s'est pas terminée correctement. DokuWiki a enregistré automatiquement un brouillon de votre travail que vous pouvez utiliser pour votre modification. Ci-dessous figurent les données enregistrées lors de votre dernière session.
+
+À vous de décider si vous souhaitez //récupérer// votre session de modification précédente, //supprimer// le brouillon enregistré automatiquement ou //annuler// le processus d'édition.
+
diff --git a/sources/inc/lang/fr/edit.txt b/sources/inc/lang/fr/edit.txt
new file mode 100644
index 0000000..df8c9fc
--- /dev/null
+++ b/sources/inc/lang/fr/edit.txt
@@ -0,0 +1,2 @@
+Modifiez cette page et cliquez sur « Enregistrer ». Voyez le [[:wiki:syntax|guide de mise en page]] pour une aide à propos du formatage. Veuillez ne modifier cette page que si vous pouvez l'**améliorer**. Si vous souhaitez faire des tests, faites vos premiers pas dans le [[:playground:playground|bac à sable]].
+
diff --git a/sources/inc/lang/fr/editrev.txt b/sources/inc/lang/fr/editrev.txt
new file mode 100644
index 0000000..d3fa366
--- /dev/null
+++ b/sources/inc/lang/fr/editrev.txt
@@ -0,0 +1,2 @@
+**Vous affichez une ancienne révision du document !** Si vous l'enregistrez, vous créerez une nouvelle version avec ce contenu.
+----
diff --git a/sources/inc/lang/fr/index.txt b/sources/inc/lang/fr/index.txt
new file mode 100644
index 0000000..15e1673
--- /dev/null
+++ b/sources/inc/lang/fr/index.txt
@@ -0,0 +1,4 @@
+====== Plan du site ======
+
+Voici un plan du site de toutes les pages disponibles, triées par [[doku>fr:namespaces|catégories]].
+
diff --git a/sources/inc/lang/fr/install.html b/sources/inc/lang/fr/install.html
new file mode 100644
index 0000000..6dcba25
--- /dev/null
+++ b/sources/inc/lang/fr/install.html
@@ -0,0 +1,13 @@
+
        Cette page vous assiste dans l'installation et la
+configuration de DokuWiki.
+Pour plus d'informations sur cet installateur, reportez-vous à sa
+page de
+documentation.
        
+
+
        DokuWiki utilise des fichiers textes ordinaires pour stocker les pages du
+wiki et les autres informations associées à ces pages
+(par exemple, les images, les index de recherche, les anciennes révisions, ...). Pour fonctionner correctement, DokuWiki doit avoir accès en écriture aux différents répertoires qui contiennent ces fichiers. Cet installateur n'est pas capable de modifier les autorisations sur les répertoires. Cette opération doit-être effectué directement depuis votre ligne de commande shell, ou, si vous êtes hébergé, via FTP ou votre panneau de contrôle (par exemple cPanel, Plesk, ...).
        
+
+
        Cet installateur va paramétrer votre configuration de DokuWiki pour des contrôle d'accès (ACL), qui permettront l'accès à un identifiant administrateur et l'accès au menu d'administration de DokuWiki pour l'ajout d'extensions, la gestion d'utilisateurs, la gestion de l'accès aux pages du wiki et les modifications des paramètres de configuration. Les contrôle d'accès ne sont pas nécessaires au fonctionnement de DokuWiki, néanmoins elles facilitent l'administration de DokuWiki.
        
+
+
        Les utilisateurs expérimentés ou les utilisateurs possédants des besoins de configurations spécifiques devraient se reporter aux liens suivants pour les détails concernant les instructions d'installation et les paramètres de configuration.
        
diff --git a/sources/inc/lang/fr/lang.php b/sources/inc/lang/fr/lang.php
new file mode 100644
index 0000000..49f6173
--- /dev/null
+++ b/sources/inc/lang/fr/lang.php
@@ -0,0 +1,354 @@
+
+ * @author Antoine Fixary 
+ * @author cumulus 
+ * @author Gwenn Gueguen 
+ * @author Guy Brand 
+ * @author Fabien Chabreuil 
+ * @author Stéphane Chamberland 
+ * @author Delassaux Julien 
+ * @author Maurice A. LeBlanc 
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri 
+ * @author Erik Pedersen 
+ * @author olivier duperray 
+ * @author Vincent Feltz 
+ * @author Philippe Bajoit 
+ * @author Florian Gaub 
+ * @author Samuel Dorsaz 
+ * @author Johan Guilbaud 
+ * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
+ * @author Yannick Aure 
+ * @author Olivier DUVAL 
+ * @author Anael Mobilia 
+ * @author Bruno Veilleux 
+ * @author Emmanuel 
+ * @author Jérôme Brandt 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Modifier cette page';
+$lang['btn_source']            = 'Afficher le texte source';
+$lang['btn_show']              = 'Afficher la page';
+$lang['btn_create']            = 'Créer cette page';
+$lang['btn_search']            = 'Rechercher';
+$lang['btn_save']              = 'Enregistrer';
+$lang['btn_preview']           = 'Aperçu';
+$lang['btn_top']               = 'Haut de page';
+$lang['btn_newer']             = '<< Plus récent';
+$lang['btn_older']             = 'Moins récent >>';
+$lang['btn_revs']              = 'Anciennes révisions';
+$lang['btn_recent']            = 'Derniers changements';
+$lang['btn_upload']            = 'Envoyer';
+$lang['btn_cancel']            = 'Annuler';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Modifier';
+$lang['btn_login']             = 'Connexion';
+$lang['btn_logout']            = 'Déconnexion';
+$lang['btn_admin']             = 'Administrer';
+$lang['btn_update']            = 'Mettre à jour';
+$lang['btn_delete']            = 'Effacer';
+$lang['btn_back']              = 'Retour';
+$lang['btn_backlink']          = 'Liens vers cette page';
+$lang['btn_backtomedia']       = 'Retour à la sélection du fichier média';
+$lang['btn_subscribe']         = 'S\'abonner à la page';
+$lang['btn_profile']           = 'Mettre à jour le profil';
+$lang['btn_reset']             = 'Réinitialiser';
+$lang['btn_resendpwd']         = 'Définir un nouveau mot de passe';
+$lang['btn_draft']             = 'Modifier le brouillon';
+$lang['btn_recover']           = 'Récupérer le brouillon';
+$lang['btn_draftdel']          = 'Effacer le brouillon';
+$lang['btn_revert']            = 'Restaurer';
+$lang['btn_register']          = 'S\'enregistrer';
+$lang['btn_apply']             = 'Appliquer';
+$lang['btn_media']             = 'Gestionnaire de médias';
+$lang['btn_deleteuser']        = 'Supprimer mon compte';
+$lang['loggedinas']            = 'Connecté en tant que ';
+$lang['user']                  = 'Utilisateur';
+$lang['pass']                  = 'Mot de passe';
+$lang['newpass']               = 'Nouveau mot de passe';
+$lang['oldpass']               = 'Mot de passe actuel';
+$lang['passchk']               = 'Répétez le mot de passe';
+$lang['remember']              = 'Mémoriser';
+$lang['fullname']              = 'Nom';
+$lang['email']                 = 'Adresse de courriel';
+$lang['profile']               = 'Profil utilisateur';
+$lang['badlogin']              = 'L\'utilisateur ou le mot de passe est incorrect.';
+$lang['badpassconfirm']        = 'Désolé, le mot de passe est erroné';
+$lang['minoredit']             = 'Modification mineure';
+$lang['draftdate']             = 'Brouillon enregistré de manière automatique le';
+$lang['nosecedit']             = 'La page a changé entre temps, les informations de la section sont obsolètes ; la page complète a été chargée à la place.';
+$lang['regmissing']            = 'Désolé, vous devez remplir tous les champs.';
+$lang['reguexists']            = 'Désolé, ce nom d\'utilisateur est déjà utilisé.';
+$lang['regsuccess']            = 'L\'utilisateur a été créé. Le mot de passe a été expédié par courriel.';
+$lang['regsuccess2']           = 'L\'utilisateur a été créé.';
+$lang['regmailfail']           = 'Il semble y avoir un problème à l\'envoi du courriel. Contactez l\'administrateur.';
+$lang['regbadmail']            = 'L\'adresse de courriel semble incorrecte. Si vous pensez que c\'est une erreur, contactez l\'administrateur.';
+$lang['regbadpass']            = 'Les deux mots de passe fournis sont différents, veuillez recommencez.';
+$lang['regpwmail']             = 'Votre mot de passe DokuWiki';
+$lang['reghere']               = 'Vous n\'avez pas encore de compte ? Enregistrez-vous ici ';
+$lang['profna']                = 'Ce wiki ne permet pas de modifier les profils';
+$lang['profnochange']          = 'Pas de modification, rien à faire.';
+$lang['profnoempty']           = 'Un nom ou une adresse de courriel vide n\'est pas permis.';
+$lang['profchanged']           = 'Mise à jour du profil réussie.';
+$lang['profnodelete']          = 'Ce wiki ne permet pas la suppression des utilisateurs';
+$lang['profdeleteuser']        = 'Supprimer le compte';
+$lang['profdeleted']           = 'Votre compte utilisateur a été supprimé de ce wiki';
+$lang['profconfdelete']        = 'Je veux supprimer mon compte sur ce wiki. 
         Cette action est irréversible.';
+$lang['profconfdeletemissing'] = 'La case de confirmation n\'est pas cochée';
+$lang['pwdforget']             = 'Mot de passe oublié ? Obtenez-en un nouveau';
+$lang['resendna']              = 'Ce wiki ne permet pas le renvoi de mot de passe.';
+$lang['resendpwd']             = 'Définir un nouveau mot de passe pour';
+$lang['resendpwdmissing']      = 'Désolé, vous devez remplir tous les champs.';
+$lang['resendpwdnouser']       = 'Désolé, cet utilisateur n\'existe pas dans notre base de données.';
+$lang['resendpwdbadauth']      = 'Désolé, ce code d\'authentification est invalide. Assurez-vous d\'avoir utilisé le lien de confirmation intégral.';
+$lang['resendpwdconfirm']      = 'Un lien de confirmation vous a été expédié par courriel.';
+$lang['resendpwdsuccess']      = 'Votre nouveau mot de passe vous a été expédié par courriel.';
+$lang['license']               = 'Sauf mention contraire, le contenu de ce wiki est placé sous les termes de la licence suivante :';
+$lang['licenseok']             = 'Note : En modifiant cette page, vous acceptez que le contenu soit placé sous les termes de la licence suivante :';
+$lang['searchmedia']           = 'Chercher le nom de fichier :';
+$lang['searchmedia_in']        = 'Chercher dans %s';
+$lang['txt_upload']            = 'Sélectionnez un fichier à envoyer ';
+$lang['txt_filename']          = 'Envoyer en tant que (optionnel) ';
+$lang['txt_overwrt']           = 'Écraser le fichier cible (s\'il existe)';
+$lang['maxuploadsize']         = 'Taille d\'envoi maximale : %s par fichier';
+$lang['lockedby']              = 'Actuellement bloqué par';
+$lang['lockexpire']            = 'Le blocage expire à';
+$lang['js']['willexpire']      = 'Votre blocage pour la modification de cette page expire dans une minute.\nPour éviter les conflits, utilisez le bouton « Aperçu » pour réinitialiser le minuteur.';
+$lang['js']['notsavedyet']     = 'Les modifications non enregistrées seront perdues. Voulez-vous vraiment continuer ?';
+$lang['js']['searchmedia']     = 'Chercher des fichiers';
+$lang['js']['keepopen']        = 'Toujours conserver cette fenêtre ouverte';
+$lang['js']['hidedetails']     = 'Masquer les détails';
+$lang['js']['mediatitle']      = 'Paramètres de lien';
+$lang['js']['mediadisplay']    = 'Type de lien';
+$lang['js']['mediaalign']      = 'Alignement';
+$lang['js']['mediasize']       = 'Taille de l\'image';
+$lang['js']['mediatarget']     = 'Cible du lien';
+$lang['js']['mediaclose']      = 'Fermer';
+$lang['js']['mediainsert']     = 'Insérer';
+$lang['js']['mediadisplayimg'] = 'Afficher l\'image.';
+$lang['js']['mediadisplaylnk'] = 'N\'afficher que le lien.';
+$lang['js']['mediasmall']      = 'Petite taille';
+$lang['js']['mediamedium']     = 'Taille moyenne';
+$lang['js']['medialarge']      = 'Grande taille';
+$lang['js']['mediaoriginal']   = 'Taille originelle';
+$lang['js']['medialnk']        = 'Lien vers la page de détail';
+$lang['js']['mediadirect']     = 'Lien direct vers l\'original';
+$lang['js']['medianolnk']      = 'Aucun lien';
+$lang['js']['medianolink']     = 'Ne pas lier l\'image';
+$lang['js']['medialeft']       = 'Aligner l\'image à gauche.';
+$lang['js']['mediaright']      = 'Aligner l\'image à droite.';
+$lang['js']['mediacenter']     = 'Centrer l\'image.';
+$lang['js']['medianoalign']    = 'Ne pas aligner.';
+$lang['js']['nosmblinks']      = 'Les liens vers les partages Windows ne fonctionnent qu\'avec Microsoft Internet Explorer.\nVous pouvez toujours copier puis coller le lien.';
+$lang['js']['linkwiz']         = 'Assistant Lien';
+$lang['js']['linkto']          = 'Lien vers :';
+$lang['js']['del_confirm']     = 'Voulez-vous vraiment effacer ce(s) élément(s) ?';
+$lang['js']['restore_confirm'] = 'Voulez-vous vraiment restaurer cette version ?';
+$lang['js']['media_diff']      = 'Voir les différences :';
+$lang['js']['media_diff_both'] = 'Côte à côte';
+$lang['js']['media_diff_opacity'] = 'Calque';
+$lang['js']['media_diff_portions'] = 'Curseur';
+$lang['js']['media_select']    = 'Sélection de fichiers…';
+$lang['js']['media_upload_btn'] = 'Envoyer';
+$lang['js']['media_done_btn']  = 'Terminé';
+$lang['js']['media_drop']      = 'Déposez des fichiers ici pour les envoyer';
+$lang['js']['media_cancel']    = 'supprimer';
+$lang['js']['media_overwrt']   = 'Écraser les fichiers existants';
+$lang['rssfailed']             = 'Une erreur s\'est produite en récupérant ce flux : ';
+$lang['nothingfound']          = 'Pas de réponse.';
+$lang['mediaselect']           = 'Sélection de fichiers';
+$lang['fileupload']            = 'Envoi de fichier';
+$lang['uploadsucc']            = 'Envoi réussi';
+$lang['uploadfail']            = 'L\'envoi a échoué. Les autorisations sont-elles correctes ?';
+$lang['uploadwrong']           = 'Envoi refusé. Cette extension de fichier est interdite !';
+$lang['uploadexist']           = 'Le fichier existe déjà. L\'envoi a été annulé.';
+$lang['uploadbadcontent']      = 'Le contenu envoyé ne correspond pas à l\'extension du fichier (%s).';
+$lang['uploadspam']            = 'L\'envoi a été bloqué par la liste noire de l\'anti-spam.';
+$lang['uploadxss']             = 'L\'envoi a été bloqué car son contenu est peut-être malveillant.';
+$lang['uploadsize']            = 'Le fichier envoyé était trop gros. (max. : %s)';
+$lang['deletesucc']            = 'Le fichier « %s » a été effacé.';
+$lang['deletefail']            = 'Le fichier « %s » n\'a pas pu être effacé. Vérifiez les autorisations.';
+$lang['mediainuse']            = 'Le fichier « %s » n\'a pas été effacé : il est en toujours utilisé.';
+$lang['namespaces']            = 'Catégories';
+$lang['mediafiles']            = 'Fichiers disponibles dans';
+$lang['accessdenied']          = 'Vous n\'êtes pas autorisé à voir cette page.';
+$lang['mediausage']            = 'Utilisez la syntaxe suivante pour faire référence à ce fichier :';
+$lang['mediaview']             = 'Afficher le fichier original';
+$lang['mediaroot']             = 'racine';
+$lang['mediaupload']           = 'Envoyez un fichier dans la catégorie actuelle. Pour créer des sous-catégories, préfixez en le nom du fichier séparées par un double-point, après avoir choisis le(s) fichier(s). Le(s) fichier(s) peuvent également être envoyé(s) par glisser-déposer (drag & drop)';
+$lang['mediaextchange']        = 'Extension du fichier modifiée de .%s en .%s !';
+$lang['reference']             = 'Références pour';
+$lang['ref_inuse']             = 'Le fichier ne peut être effacé car il est toujours utilisé par les pages suivantes :';
+$lang['ref_hidden']            = 'Des références sont présentes dans des pages que vous ne pouvez pas voir (autorisations insuffisantes)';
+$lang['hits']                  = 'Occurrences trouvées';
+$lang['quickhits']             = 'Pages trouvées ';
+$lang['toc']                   = 'Table des matières';
+$lang['current']               = 'Version actuelle';
+$lang['yours']                 = 'Votre version';
+$lang['diff']                  = 'Différences avec la version actuelle';
+$lang['diff2']                 = 'Différences entre les versions sélectionnées';
+$lang['difflink']              = 'Lien vers cette vue comparative';
+$lang['diff_type']             = 'Voir les différences :';
+$lang['diff_inline']           = 'Sur une seule ligne';
+$lang['diff_side']             = 'Côte à côte';
+$lang['line']                  = 'Ligne';
+$lang['breadcrumb']            = 'Piste';
+$lang['youarehere']            = 'Vous êtes ici';
+$lang['lastmod']               = 'Dernière modification';
+$lang['by']                    = 'par';
+$lang['deleted']               = 'supprimée';
+$lang['created']               = 'créée';
+$lang['restored']              = 'ancienne révision (%s) restaurée';
+$lang['external_edit']         = 'modification externe';
+$lang['summary']               = 'Résumé';
+$lang['noflash']               = 'L\'extension Adobe Flash est nécessaire pour afficher ce contenu.';
+$lang['download']              = 'Télécharger un extrait';
+$lang['tools']                 = 'Outils';
+$lang['user_tools']            = 'Outils pour utilisateurs';
+$lang['site_tools']            = 'Outils du site';
+$lang['page_tools']            = 'Outils de la page';
+$lang['skip_to_content']       = 'Aller au contenu';
+$lang['sidebar']               = 'Panneau latéral';
+$lang['mail_newpage']          = 'page ajoutée :';
+$lang['mail_changed']          = 'page modifiée :';
+$lang['mail_subscribe_list']   = 'pages modifiées dans la catégorie :';
+$lang['mail_new_user']         = 'nouvel utilisateur :';
+$lang['mail_upload']           = 'fichier envoyé :';
+$lang['changes_type']          = 'Voir les changements';
+$lang['pages_changes']         = 'Pages';
+$lang['media_changes']         = 'Fichiers multimédias';
+$lang['both_changes']          = 'Pages et fichiers multimédias';
+$lang['qb_bold']               = 'Gras';
+$lang['qb_italic']             = 'Italique';
+$lang['qb_underl']             = 'Soulignage';
+$lang['qb_code']               = 'Code « machine à écrire »';
+$lang['qb_strike']             = 'Barré';
+$lang['qb_h1']                 = 'Titre de niveau 1';
+$lang['qb_h2']                 = 'Titre de niveau 2';
+$lang['qb_h3']                 = 'Titre de niveau 3';
+$lang['qb_h4']                 = 'Titre de niveau 4';
+$lang['qb_h5']                 = 'Titre de niveau 5';
+$lang['qb_h']                  = 'Titre';
+$lang['qb_hs']                 = 'Sélectionner la ligne de titre';
+$lang['qb_hplus']              = 'Titre de niveau supérieur';
+$lang['qb_hminus']             = 'Titre de niveau 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';
+$lang['qb_ol']                 = 'Liste numérotée';
+$lang['qb_ul']                 = 'Liste à puce';
+$lang['qb_media']              = 'Ajouter des images ou autres fichiers';
+$lang['qb_sig']                = 'Insérer une signature';
+$lang['qb_smileys']            = 'Émoticones';
+$lang['qb_chars']              = 'Caractères spéciaux';
+$lang['upperns']               = 'Aller à la catégorie parente';
+$lang['admin_register']        = 'Ajouter un nouvel utilisateur';
+$lang['metaedit']              = 'Modifier les métadonnées';
+$lang['metasaveerr']           = 'Erreur lors de l\'enregistrement des métadonnées';
+$lang['metasaveok']            = 'Métadonnées enregistrées';
+$lang['img_backto']            = 'Retour à';
+$lang['img_title']             = 'Titre';
+$lang['img_caption']           = 'Légende';
+$lang['img_date']              = 'Date';
+$lang['img_fname']             = 'Nom de fichier';
+$lang['img_fsize']             = 'Taille';
+$lang['img_artist']            = 'Photographe';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Appareil photo';
+$lang['img_keywords']          = 'Mots-clés';
+$lang['img_width']             = 'Largeur';
+$lang['img_height']            = 'Hauteur';
+$lang['img_manager']           = 'Voir dans le gestionnaire de médias';
+$lang['subscr_subscribe_success'] = '%s a été ajouté à la liste de souscription de %s';
+$lang['subscr_subscribe_error'] = 'Erreur à l\'ajout de %s à la liste de souscription de %s';
+$lang['subscr_subscribe_noaddress'] = 'Il n\'y a pas d\'adresse associée à votre identifiant, vous ne pouvez pas être ajouté à la liste de souscription';
+$lang['subscr_unsubscribe_success'] = '%s a été supprimé de la liste de souscription de %s';
+$lang['subscr_unsubscribe_error'] = 'Erreur au retrait de %s de la liste de souscription de %s';
+$lang['subscr_already_subscribed'] = '%s est déjà souscrit à %s';
+$lang['subscr_not_subscribed'] = '%s n\'est pas souscrit à %s';
+$lang['subscr_m_not_subscribed'] = 'Vous n\'avez pas souscrit pour l\'instant à la page actuelle ou à la catégorie';
+$lang['subscr_m_new_header']   = 'Ajouter une souscription';
+$lang['subscr_m_current_header'] = 'Souscriptions actives';
+$lang['subscr_m_unsubscribe']  = 'Annuler la souscription';
+$lang['subscr_m_subscribe']    = 'Souscrire';
+$lang['subscr_m_receive']      = 'Recevoir';
+$lang['subscr_style_every']    = 'Recevoir un courriel à chaque modification';
+$lang['subscr_style_digest']   = 'Courriel, tous les %.2f jours, résumant les modifications de chaque page';
+$lang['subscr_style_list']     = 'Liste des pages modifiées depuis le dernier courriel (tous les %.2f jours)';
+$lang['authtempfail']          = 'L\'authentification est temporairement indisponible. Si cela perdure, merci d\'en informer l\'administrateur du wiki.';
+$lang['authpwdexpire']         = 'Votre mot de passe expirera dans %d jours, vous devriez le changer bientôt.';
+$lang['i_chooselang']          = 'Choisissez votre langue';
+$lang['i_installer']           = 'Installateur DokuWiki';
+$lang['i_wikiname']            = 'Nom du wiki';
+$lang['i_enableacl']           = 'Activer le contrôle d\'accès (recommandé)';
+$lang['i_superuser']           = 'Super-utilisateur';
+$lang['i_problems']            = 'L\'installateur a détecté les problèmes indiqués ci-dessous. Vous ne pouvez pas poursuivre l\'installation tant qu\'ils n\'auront pas été corrigés.';
+$lang['i_modified']            = 'Pour des raisons de sécurité, ce script ne fonctionne qu\'avec une installation neuve et non modifiée de DokuWiki. Vous devriez ré-extraire les fichiers depuis le paquet téléchargé ou consulter les instructions d\'installation de DokuWiki';
+$lang['i_funcna']              = 'La fonction PHP %s n\'est pas disponible. Peut-être que votre hébergeur web l\'a désactivée ?';
+$lang['i_phpver']              = 'Votre version de PHP (%s) est antérieure à la version requise (%s). Vous devez mettre à jour votre installation de PHP.';
+$lang['i_permfail']            = '%s n\'est pas accessible en écriture pour DokuWiki. Vous devez corriger les autorisations de ce répertoire !';
+$lang['i_confexists']          = '%s existe déjà';
+$lang['i_writeerr']            = 'Impossible de créer %s. Vous devez vérifier les autorisations des répertoires/fichiers et créer le fichier manuellement.';
+$lang['i_badhash']             = 'dokuwiki.php non reconnu ou modifié (hash=%s)';
+$lang['i_badval']              = '%s - valeur interdite ou vide';
+$lang['i_success']             = 'L\'installation s\'est terminée avec succès. Vous pouvez maintenant supprimer le fichier « install.php ». Continuer avec votre nouveau DokuWiki.';
+$lang['i_failure']             = 'Des erreurs sont survenues lors de l\'écriture des fichiers de configuration. Il vous faudra les corriger manuellement avant de pouvoir utiliser votre nouveau DokuWiki.';
+$lang['i_policy']              = 'Politique de contrôle d\'accès initiale';
+$lang['i_pol0']                = 'Wiki ouvert (lecture, écriture, envoi de fichiers pour tout le monde)';
+$lang['i_pol1']                = 'Wiki public (lecture pour tout le monde, écriture et envoi de fichiers pour les utilisateurs enregistrés)';
+$lang['i_pol2']                = 'Wiki fermé (lecture, écriture, envoi de fichiers pour les utilisateurs enregistrés uniquement)';
+$lang['i_allowreg']            = 'Permettre aux utilisateurs de s\'enregistrer eux-mêmes.';
+$lang['i_retry']               = 'Réessayer';
+$lang['i_license']             = 'Veuillez choisir la licence sous laquelle vous souhaitez placer votre contenu :';
+$lang['i_license_none']        = 'Ne pas afficher d\'information de licence.';
+$lang['i_pop_field']           = 'Merci de nous aider à améliorer l\'expérience DokuWiki:';
+$lang['i_pop_label']           = 'Une fois par mois, envoyer des données d\'utilisation anonymes aux développeurs DokuWiki';
+$lang['recent_global']         = 'Vous êtes actuellement en train de regarder les modifications au sein de la catégorie %s. Vous pouvez également afficher les derniers changements sur l\'ensemble du 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';
+$lang['wordblock']             = 'Vos modifications n\'ont pas été enregistrées car elles contiennent du texte non autorisé (spam).';
+$lang['media_uploadtab']       = 'Envoyer';
+$lang['media_searchtab']       = 'Rechercher';
+$lang['media_file']            = 'Fichier';
+$lang['media_viewtab']         = 'Voir';
+$lang['media_edittab']         = 'Éditer';
+$lang['media_historytab']      = 'Historique';
+$lang['media_list_thumbs']     = 'Miniatures';
+$lang['media_list_rows']       = 'Lignes';
+$lang['media_sort_name']       = 'Nom';
+$lang['media_sort_date']       = 'Date';
+$lang['media_namespaces']      = 'Choisissez une catégorie';
+$lang['media_files']           = 'Fichiers dans %s';
+$lang['media_upload']          = 'Envoyer vers %s.';
+$lang['media_search']          = 'Rechercher dans %s.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s dans %s';
+$lang['media_edit']            = 'Éditer %s';
+$lang['media_history']         = 'Historique de %s';
+$lang['media_meta_edited']     = 'métadonnées éditées';
+$lang['media_perm_read']       = 'Désolé, vous n\'avez pas l\'autorisation de voir les fichiers.';
+$lang['media_perm_upload']     = 'Désolé, vous n\'avez pas l\'autorisation d\'envoyer des fichiers.';
+$lang['media_update']          = 'Envoyer une nouvelle version';
+$lang['media_restore']         = 'Restaurer cette version';
+$lang['currentns']             = 'Namespace actuel';
+$lang['searchresult']          = 'Résultat de la recherche';
+$lang['plainhtml']             = 'HTML brut';
+$lang['wikimarkup']            = 'Wiki balise';
diff --git a/sources/inc/lang/fr/locked.txt b/sources/inc/lang/fr/locked.txt
new file mode 100644
index 0000000..fe88b57
--- /dev/null
+++ b/sources/inc/lang/fr/locked.txt
@@ -0,0 +1,3 @@
+====== Page bloquée ======
+
+Cette page est actuellement bloquée pour modification par un autre utilisateur. Vous devez attendre que cet utilisateur ait terminé ou que le blocage de la page expire.
diff --git a/sources/inc/lang/fr/login.txt b/sources/inc/lang/fr/login.txt
new file mode 100644
index 0000000..c8d40c8
--- /dev/null
+++ b/sources/inc/lang/fr/login.txt
@@ -0,0 +1,3 @@
+====== Connexion ======
+
+Vous n'êtes pas connecté ! Entrez vos identifiants ci-dessous pour vous connecter. Votre navigateur doit accepter les cookies pour pouvoir vous connecter.
diff --git a/sources/inc/lang/fr/mailtext.txt b/sources/inc/lang/fr/mailtext.txt
new file mode 100644
index 0000000..3f19175
--- /dev/null
+++ b/sources/inc/lang/fr/mailtext.txt
@@ -0,0 +1,18 @@
+Une page dans votre wiki a été ajoutée ou modifiée. Voici les
+détails :
+
+Date              : @DATE@
+Navigateur        : @BROWSER@
+Adresse IP        : @IPADDRESS@
+Nom d'hôte        : @HOSTNAME@
+Ancienne révision : @OLDPAGE@
+Nouvelle révision : @NEWPAGE@
+Résumé            : @SUMMARY@
+Utilisateur       : @USER@
+
+@DIFF@
+
+
+-- 
+Ce courriel a été généré par DokuWiki depuis
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fr/mailwrap.html b/sources/inc/lang/fr/mailwrap.html
new file mode 100644
index 0000000..aa50110
--- /dev/null
+++ b/sources/inc/lang/fr/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Ce courriel a été automatiquement généré par DokuWiki depuis @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/fr/newpage.txt b/sources/inc/lang/fr/newpage.txt
new file mode 100644
index 0000000..b23bf4f
--- /dev/null
+++ b/sources/inc/lang/fr/newpage.txt
@@ -0,0 +1,4 @@
+====== Cette page n'existe pas encore ======
+
+Vous avez suivi un lien vers une page qui n'existe pas encore. Si vos autorisations sont suffisants, vous pouvez la créer en cliquant sur « Créer cette page ».
+
diff --git a/sources/inc/lang/fr/norev.txt b/sources/inc/lang/fr/norev.txt
new file mode 100644
index 0000000..0d40dbe
--- /dev/null
+++ b/sources/inc/lang/fr/norev.txt
@@ -0,0 +1,4 @@
+====== Révision non trouvée ======
+
+La révision demandée n'existe pas. Cliquez sur « Anciennes révisions » pour obtenir une liste des révisions de ce document.
+
diff --git a/sources/inc/lang/fr/password.txt b/sources/inc/lang/fr/password.txt
new file mode 100644
index 0000000..47cb391
--- /dev/null
+++ b/sources/inc/lang/fr/password.txt
@@ -0,0 +1,10 @@
+Bonjour @FULLNAME@ !
+
+Voici vos identifiants pour @TITLE@ sur @DOKUWIKIURL@
+
+Utilisateur  : @LOGIN@
+Mot de passe : @PASSWORD@
+
+-- 
+Ce courriel a été envoyé par DokuWiki depuis
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fr/preview.txt b/sources/inc/lang/fr/preview.txt
new file mode 100644
index 0000000..00f09e2
--- /dev/null
+++ b/sources/inc/lang/fr/preview.txt
@@ -0,0 +1,4 @@
+====== Aperçu ======
+
+Ceci est un aperçu de votre document. Attention : il n'est **pas encore enregistré** !
+
diff --git a/sources/inc/lang/fr/pwconfirm.txt b/sources/inc/lang/fr/pwconfirm.txt
new file mode 100644
index 0000000..5cbfb22
--- /dev/null
+++ b/sources/inc/lang/fr/pwconfirm.txt
@@ -0,0 +1,15 @@
+Bonjour @FULLNAME@ !
+
+Quelqu'un a demandé un nouveau mot de passe pour votre identifiant
+@TITLE@ depuis @DOKUWIKIURL@
+
+Si vous n'êtes pas à l'origine de cette requête d'un nouveau mot de
+passe, ignorez simplement ce message.
+
+Pour confirmer que cette requête émane bien de vous, merci de cliquer sur le lien ci-dessous.
+
+@CONFIRM@
+
+-- 
+Ce courriel a été généré par DokuWiki depuis
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fr/read.txt b/sources/inc/lang/fr/read.txt
new file mode 100644
index 0000000..6afb864
--- /dev/null
+++ b/sources/inc/lang/fr/read.txt
@@ -0,0 +1,2 @@
+Cette page est en lecture seule. Vous pouvez afficher le texte source, mais ne pourrez pas le modifier. Contactez votre administrateur si vous pensez qu'il s'agit d'une erreur.
+
diff --git a/sources/inc/lang/fr/recent.txt b/sources/inc/lang/fr/recent.txt
new file mode 100644
index 0000000..b41972f
--- /dev/null
+++ b/sources/inc/lang/fr/recent.txt
@@ -0,0 +1,5 @@
+====== Derniers changements ======
+
+Les pages suivantes ont été modifiées récemment.
+
+
diff --git a/sources/inc/lang/fr/register.txt b/sources/inc/lang/fr/register.txt
new file mode 100644
index 0000000..f983834
--- /dev/null
+++ b/sources/inc/lang/fr/register.txt
@@ -0,0 +1,3 @@
+====== S'enregistrer comme nouvel utilisateur ======
+
+Remplissez toutes les informations ci-dessous pour vous créer un compte sur ce wiki. Assurez-vous de fournir une **adresse de courriel valide** - s'il ne vous est pas demandé de saisir un mot de passe ici, il vous sera expédié par courriel à cette adresse. Le nom d'utilisateur doit être un [[doku>pagename|nom de page]] valide.
diff --git a/sources/inc/lang/fr/registermail.txt b/sources/inc/lang/fr/registermail.txt
new file mode 100644
index 0000000..43d72db
--- /dev/null
+++ b/sources/inc/lang/fr/registermail.txt
@@ -0,0 +1,14 @@
+Un nouvel utilisateur s'est enregistré. Voici les détails :
+
+Utilisateur         : @NEWUSER@
+Nom         : @NEWNAME@
+Courriel : @NEWEMAIL@
+
+Date                : @DATE@
+Navigateur internet         : @BROWSER@
+Adresse IP          : @IPADDRESS@
+Nom d'hôte          : @HOSTNAME@
+
+-- 
+Ce courriel a été généré par DokuWiki depuis
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/fr/resendpwd.txt b/sources/inc/lang/fr/resendpwd.txt
new file mode 100644
index 0000000..91dd924
--- /dev/null
+++ b/sources/inc/lang/fr/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Envoyer un nouveau mot de passe ======
+
+Veuillez compléter les champs ci-dessous pour obtenir un nouveau mot de passe pour votre compte dans ce wiki. Un lien de confirmation vous sera expédié à l'adresse de courriel utilisée lors de votre enregistrement.
+
diff --git a/sources/inc/lang/fr/resetpwd.txt b/sources/inc/lang/fr/resetpwd.txt
new file mode 100644
index 0000000..7b1990c
--- /dev/null
+++ b/sources/inc/lang/fr/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Définir un nouveau mot de passe ======
+
+Merci d'entrer un nouveau mot de passe pour votre compte sur ce wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/fr/revisions.txt b/sources/inc/lang/fr/revisions.txt
new file mode 100644
index 0000000..29c1713
--- /dev/null
+++ b/sources/inc/lang/fr/revisions.txt
@@ -0,0 +1,4 @@
+====== Anciennes révisions ======
+
+Voici les anciennes révisions de la page en cours. Pour revenir à une ancienne révision, sélectionnez-la ci-dessous, cliquez sur le bouton « Modifier cette page » et enregistrez-la.
+
diff --git a/sources/inc/lang/fr/searchpage.txt b/sources/inc/lang/fr/searchpage.txt
new file mode 100644
index 0000000..a9bd916
--- /dev/null
+++ b/sources/inc/lang/fr/searchpage.txt
@@ -0,0 +1,5 @@
+====== Recherche ======
+
+Voici les résultats de votre recherche. Si vous n'avez pas trouvé ce que vous cherchiez, vous pouvez créer ou modifier la page correspondante à votre requête en cliquant sur le bouton approprié.
+
+===== Résultats =====
diff --git a/sources/inc/lang/fr/showrev.txt b/sources/inc/lang/fr/showrev.txt
new file mode 100644
index 0000000..2e36199
--- /dev/null
+++ b/sources/inc/lang/fr/showrev.txt
@@ -0,0 +1,2 @@
+**Ceci est une ancienne révision du document !**
+----
diff --git a/sources/inc/lang/fr/stopwords.txt b/sources/inc/lang/fr/stopwords.txt
new file mode 100644
index 0000000..5f187f7
--- /dev/null
+++ b/sources/inc/lang/fr/stopwords.txt
@@ -0,0 +1,112 @@
+# Cette liste regroupe les mots ignorés par l'indexeur
+# Un seul mot par ligne
+# Les fins de ligne de ce fichier doivent être de type UNIX
+# Les mots de moins de 3 lettres sont ignorés par défaut.
+# Cette liste est basée sur http://www.ranks.nl/stopwords/
+alors
+aucuns
+aussi
+autre
+avant
+avec
+avoir
+bon
+car
+cela
+ces
+ceux
+chaque
+comme
+comment
+dans
+des
+dedans
+dehors
+depuis
+deux
+devrait
+doit
+donc
+dos
+droite
+début
+elle
+elles
+encore
+essai
+est
+fait
+faites
+fois
+font
+force
+haut
+hors
+ici
+ils
+juste
+les
+leur
+là
+maintenant
+mais
+mes
+mine
+moins
+mon
+mot
+même
+nommés
+notre
+nous
+nouveaux
+où
+par
+parce
+parole
+pas
+personnes
+peut
+peu
+pièce
+plupart
+pour
+pourquoi
+quand
+que
+quel
+quelle
+quelles
+quels
+qui
+sans
+ses
+seulement
+sien
+son
+sont
+sous
+soyez
+sujet
+sur
+tandis
+tellement
+tels
+tes
+ton
+tous
+tout
+trop
+très
+valeur
+voie
+voient
+vont
+votre
+vous
+ça
+étaient
+état
+étions
+été
+être
diff --git a/sources/inc/lang/fr/subscr_digest.txt b/sources/inc/lang/fr/subscr_digest.txt
new file mode 100644
index 0000000..7ec75ca
--- /dev/null
+++ b/sources/inc/lang/fr/subscr_digest.txt
@@ -0,0 +1,19 @@
+Bonjour,
+
+La page « @PAGE@ » dans le wiki « @TITLE@ » a été modifiée. Voici les modifications :
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Révision précédente : @OLDPAGE@
+Nouvelle révision : @NEWPAGE@
+
+Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
+@DOKUWIKIURL@ puis visitez
+@SUBSCRIBE@
+et désabonnez-vous de la page ou de la catégorie.
+
+--
+Ce courriel a été généré par DokuWiki depuis
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fr/subscr_form.txt b/sources/inc/lang/fr/subscr_form.txt
new file mode 100644
index 0000000..49c0cf4
--- /dev/null
+++ b/sources/inc/lang/fr/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Gestion de l'abonnement ======
+
+Cette page vous permet de gérer vos abonnements à la page et à la catégorie courantes
\ No newline at end of file
diff --git a/sources/inc/lang/fr/subscr_list.txt b/sources/inc/lang/fr/subscr_list.txt
new file mode 100644
index 0000000..d8c6b68
--- /dev/null
+++ b/sources/inc/lang/fr/subscr_list.txt
@@ -0,0 +1,16 @@
+Bonjour,
+
+Des pages de la catégorie « @PAGE@ » du wiki « @TITLE@ » ont été modifiées. Voici les modifications :
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
+@DOKUWIKIURL@ puis visitez
+@SUBSCRIBE@
+et désabonnez-vous de la page ou de la catégorie.
+
+--
+Ce courriel a été généré par Dokuwiki :
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fr/subscr_single.txt b/sources/inc/lang/fr/subscr_single.txt
new file mode 100644
index 0000000..236d45e
--- /dev/null
+++ b/sources/inc/lang/fr/subscr_single.txt
@@ -0,0 +1,22 @@
+Bonjour,
+
+La page « @PAGE@ » dans le wiki « @TITLE@ » a été modifiée. Voici les modifications :
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Date : @DATE@
+Utilisateur : @USER@
+Résumé : @SUMMARY@
+Révision précédente : @OLDPAGE@
+Nouvelle révision : @NEWPAGE@
+
+Pour annuler les notifications de page, connectez-vous au wiki à l'adresse
+@DOKUWIKIURL@ puis visitez
+@SUBSCRIBE@
+et désabonnez-vous de la page ou de la catégorie.
+
+--
+Ce courriel a été généré par Dokuwiki depuis
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/fr/updateprofile.txt b/sources/inc/lang/fr/updateprofile.txt
new file mode 100644
index 0000000..623d75e
--- /dev/null
+++ b/sources/inc/lang/fr/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Mise à jour de votre profil ======
+
+Ne complétez que les champs que vous souhaitez modifier. Vous ne pouvez pas modifier votre nom d'utilisateur.
+
+
diff --git a/sources/inc/lang/fr/uploadmail.txt b/sources/inc/lang/fr/uploadmail.txt
new file mode 100644
index 0000000..80be0de
--- /dev/null
+++ b/sources/inc/lang/fr/uploadmail.txt
@@ -0,0 +1,14 @@
+Un fichier a été envoyé dans votre wiki. Voici les détails :
+
+Fichier     : @MEDIA@
+Date        : @DATE@
+Navigateur  : @BROWSER@
+Adresse IP  : @IPADDRESS@
+Nom d'hôte  : @HOSTNAME@
+Taille      : @SIZE@
+Type MIME   : @MIME@
+Utilisateur : @USER@
+
+-- 
+Ce message a été généré par DokuWiki depuis
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/gl/admin.txt b/sources/inc/lang/gl/admin.txt
new file mode 100644
index 0000000..eeaed99
--- /dev/null
+++ b/sources/inc/lang/gl/admin.txt
@@ -0,0 +1,4 @@
+====== Administración ======
+
+De seguido podes atopar unha lista de tarefas administrativas dispoñíbeis no DokuWiki.
+
diff --git a/sources/inc/lang/gl/adminplugins.txt b/sources/inc/lang/gl/adminplugins.txt
new file mode 100644
index 0000000..e52172e
--- /dev/null
+++ b/sources/inc/lang/gl/adminplugins.txt
@@ -0,0 +1 @@
+===== Extensións adicionais =====
\ No newline at end of file
diff --git a/sources/inc/lang/gl/backlinks.txt b/sources/inc/lang/gl/backlinks.txt
new file mode 100644
index 0000000..f77b74b
--- /dev/null
+++ b/sources/inc/lang/gl/backlinks.txt
@@ -0,0 +1,4 @@
+====== Ligazóns entrantes ======
+
+Isto é unha listaxe de páxinas que semellan ligar coa páxina actual.
+
diff --git a/sources/inc/lang/gl/conflict.txt b/sources/inc/lang/gl/conflict.txt
new file mode 100644
index 0000000..dcd87c7
--- /dev/null
+++ b/sources/inc/lang/gl/conflict.txt
@@ -0,0 +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.
+
+Examina as diferenzas amosadas embaixo polo miúdo, e logo decide que versión queres manter. Se escolleres ''Gardar'', gardarase a túa versión. Preme en ''Cancelar'' para manteres a versión actual.
+
diff --git a/sources/inc/lang/gl/denied.txt b/sources/inc/lang/gl/denied.txt
new file mode 100644
index 0000000..69408a4
--- /dev/null
+++ b/sources/inc/lang/gl/denied.txt
@@ -0,0 +1,4 @@
+====== Permiso Denegado ======
+
+Sentímolo, mais non tes permisos de abondo para continuares. Pode que esqueceses iniciar a sesión?
+
diff --git a/sources/inc/lang/gl/diff.txt b/sources/inc/lang/gl/diff.txt
new file mode 100644
index 0000000..df87707
--- /dev/null
+++ b/sources/inc/lang/gl/diff.txt
@@ -0,0 +1,4 @@
+====== Diferenzas ======
+
+Isto amosa as diferenzas entre a revisión seleccionada e a versión actual da páxina.
+
diff --git a/sources/inc/lang/gl/draft.txt b/sources/inc/lang/gl/draft.txt
new file mode 100644
index 0000000..ac36dc0
--- /dev/null
+++ b/sources/inc/lang/gl/draft.txt
@@ -0,0 +1,6 @@
+====== Arquivo de rascuño atopado ======
+
+A túa última sesión de edición desta páxina non foi completada de xeito correcto. O DokuWiki gravou automaticamente un rascuño durante o teu traballo que agora podes usar para continuares coa edición. De seguido podes ver os datos que foron gardados da tú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.
+
diff --git a/sources/inc/lang/gl/edit.txt b/sources/inc/lang/gl/edit.txt
new file mode 100644
index 0000000..1cc1243
--- /dev/null
+++ b/sources/inc/lang/gl/edit.txt
@@ -0,0 +1,2 @@
+Edita a páxina e preme en ''Gardar''. Bótalle un ollo á [[wiki:syntax|sintaxe]] para veres a sintaxe do Wiki. Por favor, edita a páxina só se podes **mellorala**. Se quixeres facer probas, aprende como levar a cabo os teus primeiros pasos na [[playground:playground|eira]].
+
diff --git a/sources/inc/lang/gl/editrev.txt b/sources/inc/lang/gl/editrev.txt
new file mode 100644
index 0000000..d6a0490
--- /dev/null
+++ b/sources/inc/lang/gl/editrev.txt
@@ -0,0 +1,2 @@
+**Cargaches unha revisión antiga do documento!** Se o gardares, crearás unha nova versión con estes datos.
+----
diff --git a/sources/inc/lang/gl/index.txt b/sources/inc/lang/gl/index.txt
new file mode 100644
index 0000000..b0b100b
--- /dev/null
+++ b/sources/inc/lang/gl/index.txt
@@ -0,0 +1,4 @@
+====== Índice ======
+
+Isto é un índice de todas as páxinas dispoñíbeis, ordenadas por [[doku>namespaces|nomes de espazo]].
+
diff --git a/sources/inc/lang/gl/install.html b/sources/inc/lang/gl/install.html
new file mode 100644
index 0000000..fdaaa17
--- /dev/null
+++ b/sources/inc/lang/gl/install.html
@@ -0,0 +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
+páxina de documentación.
        
+
+
        O DokuWiki emprega 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 unha hospedaxe, a través do FTP ou do panel de control da túa hospedaxe (p.e.
+o cPanel).
        
+
+
        Este instalador configurará o teu DokuWiki para o uso da
+ACL, o cal permitirá ao administrador
+iniciar sesión e acceder ao menú de administración do DokuWiki para instalar extensións,
+xestionar usuarios e accesos ás páxinas do wiki, ademais de modificar a configuración.
+Non é imprescindíbel para o funcionamento do DokuWiki, porén, 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
+instruccións de instalación
+e á configuración.
        
diff --git a/sources/inc/lang/gl/lang.php b/sources/inc/lang/gl/lang.php
new file mode 100644
index 0000000..65967a3
--- /dev/null
+++ b/sources/inc/lang/gl/lang.php
@@ -0,0 +1,320 @@
+
+ * @author Oscar M. Lage 
+ * @author Rodrigo Rega 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$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_create']            = 'Crear esta páxina';
+$lang['btn_search']            = 'Procurar';
+$lang['btn_save']              = 'Gardar';
+$lang['btn_preview']           = 'Previsualizar';
+$lang['btn_top']               = 'Comezo da páxina';
+$lang['btn_newer']             = '<< máis recente';
+$lang['btn_older']             = 'menos recente >>';
+$lang['btn_revs']              = 'Revisións antigas';
+$lang['btn_recent']            = 'Trocos 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_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_profile']           = 'Actualizar Perfil';
+$lang['btn_reset']             = 'Reiniciar';
+$lang['btn_resendpwd']         = 'Establecer novo contrasinal';
+$lang['btn_draft']             = 'Editar borrador';
+$lang['btn_recover']           = 'Recuperar borrador';
+$lang['btn_draftdel']          = 'Eliminar borrador';
+$lang['btn_revert']            = 'Restaurar';
+$lang['btn_register']          = 'Rexístrate';
+$lang['btn_apply']             = 'Aplicar';
+$lang['btn_media']             = 'Xestor de Arquivos-Media';
+$lang['loggedinas']            = 'Iniciaches sesión como';
+$lang['user']                  = 'Nome de Usuario';
+$lang['pass']                  = 'Contrasinal';
+$lang['newpass']               = 'Novo Contrasinal';
+$lang['oldpass']               = 'Confirmar contrasinal actual';
+$lang['passchk']               = 'de novo';
+$lang['remember']              = 'Lémbrame';
+$lang['fullname']              = 'Nome Completo';
+$lang['email']                 = 'Correo-e';
+$lang['profile']               = 'Perfil de Usuario';
+$lang['badlogin']              = 'Sentímolo, mais 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 entrementres, a información da sección estaba desfasada polo que se cargou a páxina completa no seu lugar.';
+$lang['regmissing']            = 'Sentímolo, mais tes que cubrir todos os campos.';
+$lang['reguexists']            = 'Sentímolo, mais 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, contacta 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['profna']                = 'Este 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? Consegue un novo';
+$lang['resendna']              = 'Este wiki non permite o reenvío de contrasinais.';
+$lang['resendpwd']             = 'Establecer novo contrasinal para';
+$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, mais 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 estás a aceptar o licenciamento do contido baixo da seguinte licenza:';
+$lang['searchmedia']           = 'Procurar nome de arquivo:';
+$lang['searchmedia_in']        = 'Procurar en %s';
+$lang['txt_upload']            = 'Escolle o arquivo para subir';
+$lang['txt_filename']          = 'Subir como (opcional)';
+$lang['txt_overwrt']           = 'Sobrescribir arquivo existente';
+$lang['maxuploadsize']         = 'Subida máxima %s por arquivo.';
+$lang['lockedby']              = 'Bloqueado actualmente por';
+$lang['lockexpire']            = 'O bloqueo remata o';
+$lang['js']['willexpire']      = 'O teu bloqueo para editares esta páxina vai caducar nun minuto.\nPara de evitar conflitos, emprega o botón de previsualización para reiniciares o contador do tempo de bloqueo.';
+$lang['js']['notsavedyet']     = 'Perderanse os trocos non gardados.
+Está certo de quereres continuar?';
+$lang['js']['searchmedia']     = 'Procurar ficheiros';
+$lang['js']['keepopen']        = 'Manter a fiestra aberta na selección';
+$lang['js']['hidedetails']     = 'Agochar Pormenores';
+$lang['js']['mediatitle']      = 'Configuración de ligazón';
+$lang['js']['mediadisplay']    = 'Tipo de ligazón';
+$lang['js']['mediaalign']      = 'Aliñamento';
+$lang['js']['mediasize']       = 'Tamaño de imaxe';
+$lang['js']['mediatarget']     = 'Albo da ligazón';
+$lang['js']['mediaclose']      = 'Fechar';
+$lang['js']['mediainsert']     = 'Inserir';
+$lang['js']['mediadisplayimg'] = 'Amosar a imaxe';
+$lang['js']['mediadisplaylnk'] = 'Amosar só a ligazón';
+$lang['js']['mediasmall']      = 'Versión reducida';
+$lang['js']['mediamedium']     = 'Versión media';
+$lang['js']['medialarge']      = 'Versión grande';
+$lang['js']['mediaoriginal']   = 'Versión orixinal';
+$lang['js']['medialnk']        = 'Ligazón para a páxina de pormenores';
+$lang['js']['mediadirect']     = 'Ligazón directa para o orixinal';
+$lang['js']['medianolnk']      = 'Sen ligazón';
+$lang['js']['medianolink']     = 'Non ligar a imaxe';
+$lang['js']['medialeft']       = 'Aliñar a imaxe á esquerda';
+$lang['js']['mediaright']      = 'Aliñar a imaxe á dereita';
+$lang['js']['mediacenter']     = 'Aliñar a iamxe ao medio';
+$lang['js']['medianoalign']    = 'Non empregar aliñamento';
+$lang['js']['nosmblinks']      = 'A ligazón aos compartidos do Windows só funciona no Microsoft Internet Explorer.
+Sempre podes copiar e colar a ligazón.';
+$lang['js']['linkwiz']         = 'Asistente de ligazóns';
+$lang['js']['linkto']          = 'Ligazón para:';
+$lang['js']['del_confirm']     = 'Estás certo de quereres eliminar os elementos seleccionados?';
+$lang['js']['restore_confirm'] = 'Realmente desexas restaurar esta versión?';
+$lang['js']['media_diff']      = 'Ver as diferencias:';
+$lang['js']['media_diff_both'] = 'Cara a Cara';
+$lang['js']['media_diff_opacity'] = 'Opacidade';
+$lang['js']['media_diff_portions'] = 'Porcións';
+$lang['js']['media_select']    = 'Selecciona arquivos...';
+$lang['js']['media_upload_btn'] = 'Subir';
+$lang['js']['media_done_btn']  = 'Feito';
+$lang['js']['media_drop']      = 'Solta aquí os arquivos a subir';
+$lang['js']['media_cancel']    = 'eliminar';
+$lang['js']['media_overwrt']   = 'Sobreescribir os arquivos existentes';
+$lang['rssfailed']             = 'Houbo un erro ao tentar obter esta corrente RSS: ';
+$lang['nothingfound']          = 'Non se atopou nada.';
+$lang['mediaselect']           = 'Arquivos-Media';
+$lang['fileupload']            = 'Subida de Arquivos-Media';
+$lang['uploadsucc']            = 'Subida correcta';
+$lang['uploadfail']            = 'Erra na subida. Pode que sexa un 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 correo-lixo.';
+$lang['uploadxss']             = 'A subida foi bloqueada por un posíbel contido malicioso.';
+$lang['uploadsize']            = 'O arquivo subido é grande de máis. (máx. %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['namespaces']            = 'Nomes de espazos';
+$lang['mediafiles']            = 'Arquivos dispoñíbeis en';
+$lang['accessdenied']          = 'Non tes permitido ver esta páxina.';
+$lang['mediausage']            = 'Emprega a seguinte sintaxe para inserires unha referencia a este arquivo:';
+$lang['mediaview']             = 'Ver arquivo orixinal';
+$lang['mediaroot']             = 'raigaña';
+$lang['mediaupload']           = 'Sube aquí un arquivo ao nome de espazo actual. Para creares 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['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['quickhits']             = 'Nomes de páxinas coincidentes';
+$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['difflink']              = 'Enlazar a esta vista de comparación';
+$lang['diff_type']             = 'Ver diferenzas:';
+$lang['diff_inline']           = 'Por liña';
+$lang['diff_side']             = 'Cara a Cara';
+$lang['line']                  = 'Liña';
+$lang['breadcrumb']            = 'Trazado';
+$lang['youarehere']            = 'Estás aquí';
+$lang['lastmod']               = 'Última modificación';
+$lang['by']                    = 'por';
+$lang['deleted']               = 'eliminado';
+$lang['created']               = 'creado';
+$lang['restored']              = 'revisión antiga restaurada (%s)';
+$lang['external_edit']         = 'edición externa';
+$lang['summary']               = 'Resumo da edición';
+$lang['noflash']               = 'Precísase o Extensión Adobe Flash para amosar este contido.';
+$lang['download']              = 'Descargar Retallo (Snippet)';
+$lang['tools']                 = 'Ferramentas';
+$lang['user_tools']            = 'Ferramentas de usuario';
+$lang['site_tools']            = 'Ferramentas do sitio';
+$lang['page_tools']            = 'Ferramentas de páxina';
+$lang['skip_to_content']       = 'Pasar ao contido';
+$lang['sidebar']               = 'Barra lateral';
+$lang['mail_newpage']          = 'páxina engadida:';
+$lang['mail_changed']          = 'páxina mudada:';
+$lang['mail_subscribe_list']   = 'páxinas mudadas en nome de espazo:';
+$lang['mail_new_user']         = 'Novo usuario:';
+$lang['mail_upload']           = 'arquivo subido:';
+$lang['changes_type']          = 'Ver cambios';
+$lang['pages_changes']         = 'Páxinas';
+$lang['media_changes']         = 'Arquivos-Media';
+$lang['both_changes']          = 'Ambos, páxinas e arquivos-media';
+$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_h']                  = 'Liña de Cabeceira';
+$lang['qb_hs']                 = 'Escoller Liña de Cabeceira';
+$lang['qb_hplus']              = 'Liña de Cabeceira Máis Alta';
+$lang['qb_hminus']             = 'Liña de Cabeceira Máis Baixa';
+$lang['qb_hequal']             = 'Liña de Cabeceira ao Mesmo Nivel';
+$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['upperns']               = 'choutar ao nome de espazo pai';
+$lang['admin_register']        = 'Engadir novo usuario';
+$lang['metaedit']              = 'Editar Metadatos';
+$lang['metasaveerr']           = 'Non se puideron escribir os metadatos';
+$lang['metasaveok']            = 'Metadatos 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_fsize']             = 'Tamaño';
+$lang['img_artist']            = 'Fotógrafo';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Cámara';
+$lang['img_keywords']          = 'Verbas chave';
+$lang['img_width']             = 'Ancho';
+$lang['img_height']            = 'Alto';
+$lang['img_manager']           = 'Ver no xestor de arquivos-media';
+$lang['subscr_subscribe_success'] = 'Engadido %s á lista de subscrición para %s';
+$lang['subscr_subscribe_error'] = 'Erro ao tentar engadir %s á lista de subscrición para %s';
+$lang['subscr_subscribe_noaddress'] = 'Non hai enderezos asociados co teu inicio de sesión, non é posíbel engadirte á lista de subscrición';
+$lang['subscr_unsubscribe_success'] = 'Eliminado %s da lista de subscrición para %s';
+$lang['subscr_unsubscribe_error'] = 'Erro ao tentar eliminar %s da lista de subscrición para %s';
+$lang['subscr_already_subscribed'] = '%s xa está subscrito a %s';
+$lang['subscr_not_subscribed'] = '%s non está subscrito a %s';
+$lang['subscr_m_not_subscribed'] = 'Agora mesmo non estás subscrito á páxina ou nome de espazo actual';
+$lang['subscr_m_new_header']   = 'Engadir subscrición';
+$lang['subscr_m_current_header'] = 'Subscricións actuais';
+$lang['subscr_m_unsubscribe']  = 'Desubscribir';
+$lang['subscr_m_subscribe']    = 'Subscribir';
+$lang['subscr_m_receive']      = 'Recibir';
+$lang['subscr_style_every']    = 'correo-e en cada troco';
+$lang['authtempfail']          = 'A autenticación de usuario non está dispoñible de xeito temporal. De persistir esta situación, por favor, informa ao Administrador do teu Wiki.';
+$lang['authpwdexpire']         = 'A túa contrasinal expirará en %d días, deberías cambiala pronto.';
+$lang['i_chooselang']          = 'Escolle o teu 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, que se amosan de seguido. Non poderás continuar até que os soluciones.';
+$lang['i_modified']            = 'Por razóns de seguridade este script só funcionará cunha instalación nova e sen modificar do Dokuwiki.
+                         Podes ou ben extraer de novo os arquivos dende 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ñíbel. 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 é escribíbel polo DokuWiki. Debes corrixir a configuración de permisos deste directorio!';
+$lang['i_confexists']          = '%s xa existe';
+$lang['i_writeerr']            = 'Non se puido crear %s. Terás de comprobar os permisos do directorio/arquivo e crear o ficheiro de xeito manual.';
+$lang['i_badhash']             = 'dokuwiki.php irrecoñecíbel ou modificado (hash=%s)';
+$lang['i_badval']              = '%s - ilegal ou valor baleiro';
+$lang['i_success']             = 'A configuración rematou correctamente. Agora podes eliminar 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 poderes empregar o teu 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 arquivos para usuarios rexistrados)';
+$lang['i_pol2']                = 'Wiki Fechado (lectura, escritura, subida de arquivos só para usuarios rexistrados)';
+$lang['i_retry']               = 'Tentar de novo';
+$lang['i_license']             = 'Por favor escolla a licenza para o contido:';
+$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['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';
+$lang['wordblock']             = 'Non se gardaron os cambios porque conteñen texto bloqueado (spam).';
+$lang['media_uploadtab']       = 'Subir';
+$lang['media_searchtab']       = 'Buscar';
+$lang['media_file']            = 'Arquivo';
+$lang['media_viewtab']         = 'Ver';
+$lang['media_edittab']         = 'Editar';
+$lang['media_historytab']      = 'Histórico';
+$lang['media_list_thumbs']     = 'Miniaturas';
+$lang['media_list_rows']       = 'Filas';
+$lang['media_sort_name']       = 'Nome';
+$lang['media_sort_date']       = 'Data';
+$lang['media_namespaces']      = 'Escolla espazo';
+$lang['media_files']           = 'Arquivos en %s';
+$lang['media_upload']          = 'Subir a %s';
+$lang['media_search']          = 'Buscar en %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s en %s';
+$lang['media_edit']            = 'Editar %s';
+$lang['media_history']         = 'Historia de %s';
+$lang['media_meta_edited']     = 'datos meta editados';
+$lang['media_perm_read']       = 'Sentímolo, non tes permisos suficientes para ler arquivos.';
+$lang['media_perm_upload']     = 'Sentímolo, non tes permisos suficientes para subir arquivos.';
+$lang['media_update']          = 'Subir nova versión';
+$lang['media_restore']         = 'Restaurar esta versión';
diff --git a/sources/inc/lang/gl/locked.txt b/sources/inc/lang/gl/locked.txt
new file mode 100644
index 0000000..90f9ab0
--- /dev/null
+++ b/sources/inc/lang/gl/locked.txt
@@ -0,0 +1,3 @@
+====== Páxina bloqueada ======
+
+Esta páxina está actualmente bloqueada para a edición por outro usuario. Terás que agardar até que este usuario remate coa edición ou a que expire o bloqueo.
diff --git a/sources/inc/lang/gl/login.txt b/sources/inc/lang/gl/login.txt
new file mode 100644
index 0000000..506b30c
--- /dev/null
+++ b/sources/inc/lang/gl/login.txt
@@ -0,0 +1,4 @@
+====== Inicio de Sesión ======
+
+Actualmente non iniciaches sesión ningunha! Insire as túas credenciais de identificación para iniciares a sesión. Debes ter as cookies activadas para poderes iniciar unha sesión.
+
diff --git a/sources/inc/lang/gl/mailtext.txt b/sources/inc/lang/gl/mailtext.txt
new file mode 100644
index 0000000..a6799d6
--- /dev/null
+++ b/sources/inc/lang/gl/mailtext.txt
@@ -0,0 +1,17 @@
+Engadiuse ou mudouse unha páxina no teu DokuWiki. Aquí van os pormenores:
+
+Data              : @DATE@
+Navegador         : @BROWSER@
+Enderezo IP       : @IPADDRESS@
+Nome do Host      : @HOSTNAME@
+Revisión Antiga   : @OLDPAGE@
+Revision Nova     : @NEWPAGE@
+Resumo da Edición : @SUMMARY@
+Usuario         : @USER@
+
+@DIFF@
+
+
+-- 
+Este correo foi xerado polo DokuWiki en
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/gl/mailwrap.html b/sources/inc/lang/gl/mailwrap.html
new file mode 100644
index 0000000..19927c1
--- /dev/null
+++ b/sources/inc/lang/gl/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Este correo era xerado por DokuWiki en @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/gl/newpage.txt b/sources/inc/lang/gl/newpage.txt
new file mode 100644
index 0000000..c073f11
--- /dev/null
+++ b/sources/inc/lang/gl/newpage.txt
@@ -0,0 +1,4 @@
+====== 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''.
+
diff --git a/sources/inc/lang/gl/norev.txt b/sources/inc/lang/gl/norev.txt
new file mode 100644
index 0000000..af7383d
--- /dev/null
+++ b/sources/inc/lang/gl/norev.txt
@@ -0,0 +1,4 @@
+======Non hai tal revisión======
+
+A revisión especificada non existe. Utiliza o botón de ''Revisións Antigas'' para obteres unha listaxe das revisións antigas deste documento.
+
diff --git a/sources/inc/lang/gl/password.txt b/sources/inc/lang/gl/password.txt
new file mode 100644
index 0000000..652a558
--- /dev/null
+++ b/sources/inc/lang/gl/password.txt
@@ -0,0 +1,10 @@
+Ola @FULLNAME@!
+
+Aquí tes os teus datos de usuario para @TITLE@ en @DOKUWIKIURL@
+
+Usuario    : @LOGIN@
+Contrasinal : @PASSWORD@
+
+-- 
+Este correo foi xerado polo DokuWiki en
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/gl/preview.txt b/sources/inc/lang/gl/preview.txt
new file mode 100644
index 0000000..e0f749f
--- /dev/null
+++ b/sources/inc/lang/gl/preview.txt
@@ -0,0 +1,4 @@
+====== Previsualización ======
+
+Isto é unha previsualización de como aparecerá o teu texto. Lembra: **Non está gardado** aínda!
+
diff --git a/sources/inc/lang/gl/pwconfirm.txt b/sources/inc/lang/gl/pwconfirm.txt
new file mode 100644
index 0000000..ef20212
--- /dev/null
+++ b/sources/inc/lang/gl/pwconfirm.txt
@@ -0,0 +1,15 @@
+Ola @FULLNAME@!
+
+Alguén solicitou un novo contrasinal para o teu inicio de sesión
+@TITLE@ en @DOKUWIKIURL@
+
+Se non fuches ti quen o fixo podes ignorar este correo-e.
+
+Para confirmares que esta solicitude foi realmente enviada por ti,
+por favor, visita a seguinte ligazón.
+
+@CONFIRM@
+
+--
+Este correo-e foi xerado polo DokuWiki de
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/gl/read.txt b/sources/inc/lang/gl/read.txt
new file mode 100644
index 0000000..28f3e1a
--- /dev/null
+++ b/sources/inc/lang/gl/read.txt
@@ -0,0 +1,2 @@
+Esta páxina é só de lectura. Podes ver o código fonte, mais non podes mudala. Coméntallo ao teu administrador se consideras que é un erro.
+
diff --git a/sources/inc/lang/gl/recent.txt b/sources/inc/lang/gl/recent.txt
new file mode 100644
index 0000000..622e4d9
--- /dev/null
+++ b/sources/inc/lang/gl/recent.txt
@@ -0,0 +1,5 @@
+====== Trocos Recentes ======
+
+As seguintes páxinas foron mudadas recentemente.
+
+
diff --git a/sources/inc/lang/gl/register.txt b/sources/inc/lang/gl/register.txt
new file mode 100644
index 0000000..4f51f38
--- /dev/null
+++ b/sources/inc/lang/gl/register.txt
@@ -0,0 +1,4 @@
+====== Rexistro como novo usuario ======
+
+Cubre toda a información requirida a continuación para creares unha nova conta neste wiki. Asegúrate de forneceres 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.
+
diff --git a/sources/inc/lang/gl/registermail.txt b/sources/inc/lang/gl/registermail.txt
new file mode 100644
index 0000000..7d40174
--- /dev/null
+++ b/sources/inc/lang/gl/registermail.txt
@@ -0,0 +1,14 @@
+Rexistrouse un novo usuario. Aquí van os pormenores:
+
+Nome de usuario   : @NEWUSER@
+Nome completo	  : @NEWNAME@
+Correo-e	      : @NEWEMAIL@
+
+Data	        : @DATE@
+Navegador     	: @BROWSER@
+Enderezo IP		: @IPADDRESS@
+Nome do Host	: @HOSTNAME@
+
+-- 
+Este correo-e foi xerado polo DokuWiki de
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/gl/resendpwd.txt b/sources/inc/lang/gl/resendpwd.txt
new file mode 100644
index 0000000..0ee2d6c
--- /dev/null
+++ b/sources/inc/lang/gl/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Enviar novo contrasinal ======
+
+Insire o teu nome de usuario no seguinte formulario para obteres un novo contrasinal da túa conta neste wiki. Enviarase unha ligazón de confirmación ao teu enderezo rexistrado de correo-e.
diff --git a/sources/inc/lang/gl/resetpwd.txt b/sources/inc/lang/gl/resetpwd.txt
new file mode 100644
index 0000000..d3d64e9
--- /dev/null
+++ b/sources/inc/lang/gl/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Establecer novo contrasinal ======
+
+Por favor introduzca un novo contrasinal para a súa conta neste wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/gl/revisions.txt b/sources/inc/lang/gl/revisions.txt
new file mode 100644
index 0000000..3d5cccd
--- /dev/null
+++ b/sources/inc/lang/gl/revisions.txt
@@ -0,0 +1,4 @@
+======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.
+
diff --git a/sources/inc/lang/gl/searchpage.txt b/sources/inc/lang/gl/searchpage.txt
new file mode 100644
index 0000000..227ca5d
--- /dev/null
+++ b/sources/inc/lang/gl/searchpage.txt
@@ -0,0 +1,5 @@
+====== Procura ======
+
+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 relacionado coa túa procura empregando o botón axeitado.
+
+===== Resultados =====
diff --git a/sources/inc/lang/gl/showrev.txt b/sources/inc/lang/gl/showrev.txt
new file mode 100644
index 0000000..88fb0c3
--- /dev/null
+++ b/sources/inc/lang/gl/showrev.txt
@@ -0,0 +1,2 @@
+**Esta é unha revisión antiga do documento!**
+----
diff --git a/sources/inc/lang/gl/stopwords.txt b/sources/inc/lang/gl/stopwords.txt
new file mode 100644
index 0000000..5520cd2
--- /dev/null
+++ b/sources/inc/lang/gl/stopwords.txt
@@ -0,0 +1,692 @@
+# 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)
+aberto
+abonda
+abrir
+acabo
+acceder
+acceso
+acordo
+actitude
+actividade
+actividades
+actual
+actualización
+actualizar
+actualmente
+ademais
+ademáis
+adiante
+agardar
+agora
+agás
+ainda
+aínda
+aiquí
+algo
+alguen
+algun
+algunha
+algunhas
+alguén
+algún
+algúns
+alta
+amigos
+ando
+anima
+anos
+ante
+anterior
+anteriores
+antes
+aparece
+aparecen
+apartado
+aperta
+apertas
+apoio
+aqui
+aquí
+arquivo
+arquivos
+artigo
+artigos
+asunto
+atención
+atopar
+atopei
+axuda
+axudar
+baixo
+banda
+base
+bastante
+benvido
+boas
+botar
+buscador
+buscar
+cabo
+cada
+cadra
+caixa
+cales
+calidade
+calquer
+calquera
+cambio
+camiño
+campanha
+campaña
+campañas
+campo
+cando
+cantidade
+canto
+cantos
+cara
+carallo
+cartos
+casa
+case
+caso
+casos
+catro
+centro
+certo
+chea
+chega
+chegar
+chisco
+cidade
+civil
+claro
+coas
+coido
+colaboración
+colaborar
+coma
+comentar
+comentario
+comentarios
+comezar
+como
+comunicación
+comunidade
+común
+concreto
+condicións
+conforme
+conseguir
+conta
+contactar
+contacto
+contas
+contido
+contidos
+contra
+contrario
+control
+copia
+correcto
+correio
+correo
+correoe
+correos
+correspondente
+cousa
+cousas
+coñecemento
+coñezo
+crear
+creo
+cuestión
+cuestións
+cunha
+curioso
+dabondo
+dacordo
+dados
+darlle
+data
+datos
+debate
+debe
+debemos
+deben
+deberiamos
+debería
+decidir
+decisión
+defecto
+defensa
+deica
+deixa
+deixar
+deixo
+deles
+demais
+demasiado
+demáis
+dende
+dentro
+dereitos
+desde
+dese
+deseño
+despois
+desta
+deste
+destes
+diante
+dias
+dicir
+diferentes
+difícil
+digo
+dirección
+directamente
+directorio
+discusión
+discutir
+distintas
+distintos
+distribución
+dixen
+dixo
+doado
+dous
+duas
+dunha
+durante
+días
+dúas
+dúbida
+efectivamente
+eiqui
+eiquí
+eles
+eliminar
+email
+empregar
+emprego
+empresa
+empresas
+enderezo
+enderezos
+engadir
+enlace
+enquisa
+enriba
+entendo
+entidades
+entrada
+entrar
+entre
+entón
+enviar
+envio
+eran
+erro
+erros
+esas
+escribir
+eses
+especial
+especialmente
+espero
+esta
+estaba
+estades
+estado
+estamos
+estan
+estar
+estaría
+estas
+este
+estea
+estes
+estilo
+estiven
+esto
+estou
+está
+están
+estás
+evidentemente
+evitar
+exactamente
+exemplo
+existe
+facelo
+facemos
+facendo
+facer
+faga
+fagan
+fago
+fala
+falamos
+falando
+falar
+falla
+falo
+falta
+favor
+fazer
+feita
+feito
+ferreira
+final
+finalmente
+fios
+fixen
+fixo
+fondo
+fora
+forma
+formas
+foro
+foron
+foros
+fose
+fotos
+funciona
+funcionamento
+futuro
+fóra
+gracias
+gran
+grande
+grandes
+grazas
+grupo
+grupos
+gusta
+haber
+haberá
+habería
+había
+haxa
+historia
+home
+hora
+horas
+houbese
+houbo
+hoxe
+idea
+ideas
+ideia
+igual
+imos
+importancia
+importante
+importantes
+inda
+info
+información
+informar
+informe
+inicial
+iniciativa
+inicio
+intención
+interesa
+interesante
+interese
+iste
+isto
+lado
+lembro
+letras
+leva
+levamos
+levar
+libre
+libro
+lista
+listas
+liña
+liñas
+lles
+local
+logo
+longo
+lugar
+lugo
+maior
+maiores
+maioría
+mais
+mandar
+maneira
+manter
+marcha
+material
+mañá
+media
+mediante
+medida
+medio
+mellor
+membros
+menos
+mensaxe
+mensaxes
+mentres
+menú
+mesa
+meses
+mesma
+mesmo
+mesmos
+meter
+meus
+milhor
+millor
+minha
+mirar
+miña
+modificar
+moita
+moitas
+moito
+moitos
+momento
+mudar
+mundo
+máis
+mínimo
+nada
+nbsp
+necesario
+necesidade
+nese
+nesta
+neste
+nestes
+ningunha
+ninguén
+ningún
+noite
+nome
+normal
+nosa
+nosas
+noso
+nosos
+nota
+nova
+novas
+novo
+novos
+nunca
+nunha
+número
+ofrece
+ofrecer
+ollo
+onde
+onte
+oops
+opción
+opcións
+opinión
+orixinal
+outra
+outras
+outro
+outros
+paga
+palabras
+para
+parabens
+parece
+pareceme
+parte
+partes
+participación
+participar
+partido
+paréceme
+pasa
+pasado
+pasar
+paso
+pedir
+pena
+pendente
+pendentes
+pensades
+pensando
+pensar
+penso
+pequena
+pequeno
+perfectamente
+perfecto
+permite
+pero
+persoa
+persoal
+persoas
+pode
+podedes
+podemos
+poden
+poder
+poderiamos
+podería
+poderíamos
+podes
+podo
+poida
+poidan
+pois
+pola
+polas
+polo
+polos
+por
+porque
+porén
+posibel
+posibilidade
+posibilidades
+posible
+posta
+posto
+pouco
+poucos
+poñer
+precisamente
+preciso
+pregos
+pregunta
+presente
+primeira
+primeiro
+principal
+principio
+proba
+probar
+probas
+problema
+problemas
+proceso
+prol
+propia
+propio
+proposta
+propostas
+propoño
+propoñovos
+proxecto
+proxectos
+publicar
+punto
+pódese
+queda
+quedar
+quedou
+queira
+quen
+quere
+queredes
+queremos
+queren
+queres
+quero
+quizáis
+quot
+razón
+real
+realidade
+realmente
+recibir
+referencia
+relación
+rematar
+remate
+respecto
+resposta
+respostar
+respostas
+resto
+resulta
+resultado
+revisar
+revisión
+riba
+sabe
+sabedes
+saber
+sacar
+saúdo
+saúdos
+segue
+seguinte
+seguintes
+seguir
+segunda
+segundo
+seguramente
+seguro
+seica
+semana
+semanas
+semella
+semellante
+sempre
+sendo
+senon
+sentido
+senón
+seria
+serie
+será
+serán
+sería
+seus
+sexa
+sexan
+similar
+simplemente
+sitio
+sitios
+situación
+soamente
+sobre
+solución
+somos
+suas
+superior
+suponho
+suposto
+supoño
+sábado
+súas
+tamen
+tampouco
+tamén
+tanto
+tarde
+tedes
+temos
+tempo
+tempos
+tendo
+tenho
+tentar
+tería
+teña
+teñamos
+teñan
+teñen
+teño
+timos
+tipo
+tiven
+tiña
+toda
+todas
+todo
+todos
+tomar
+total
+totalmente
+trabalho
+traballando
+traballar
+traballo
+traballos
+tras
+trata
+través
+tres
+troco
+trocos
+troques
+tódalas
+tódolos
+última
+último
+últimos
+unha
+unhas
+única
+únicamente
+únicousar
+usuario
+usuarios
+utilizar
+vaia
+vale
+vamos
+varias
+varios
+veces
+verdade
+vexo
+veño
+vida
+vindeiro
+visitantes
+visitas
+vista
+visto
+volta
+vosa
+wink
+xeito
+xeitos
+xente
+xerais
+xeral
+xunto
+zona
diff --git a/sources/inc/lang/gl/subscr_digest.txt b/sources/inc/lang/gl/subscr_digest.txt
new file mode 100644
index 0000000..4ebd14d
--- /dev/null
+++ b/sources/inc/lang/gl/subscr_digest.txt
@@ -0,0 +1,20 @@
+Ola.
+
+Houbo mudanzas na páxina @PAGE@ do wiki @TITLE@.
+Estes son os trocos:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Revisión Antiga: @OLDPAGE@
+Revisión Nova: @NEWPAGE@
+
+Para cancelares as notificacións da páxina inicia sesión no wiki en
+@DOKUWIKIURL@ e logo visita
+@SUBSCRIBE@
+e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo.
+
+--
+Este correo-e foi xerado polo DokuWiki de
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/gl/subscr_form.txt b/sources/inc/lang/gl/subscr_form.txt
new file mode 100644
index 0000000..e8a6fe6
--- /dev/null
+++ b/sources/inc/lang/gl/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Xestión de Subscrición ======
+
+Esta páxina permíteche xestionar as túas subscricións para a páxina e nome de espazo actuais.
\ No newline at end of file
diff --git a/sources/inc/lang/gl/subscr_list.txt b/sources/inc/lang/gl/subscr_list.txt
new file mode 100644
index 0000000..b62aae3
--- /dev/null
+++ b/sources/inc/lang/gl/subscr_list.txt
@@ -0,0 +1,17 @@
+Ola.
+
+Houbo trocos en páxinas do nome de espazo @PAGE@ do wiki @TITLE@.
+Estas son as páxinas que mudaron:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Para cancelares as notificacións da páxina inicia sesión no wiki en
+@DOKUWIKIURL@ e logo visita
+@SUBSCRIBE@
+e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo.
+
+--
+Este correo-e foi xerado polo DokuWiki de
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/gl/subscr_single.txt b/sources/inc/lang/gl/subscr_single.txt
new file mode 100644
index 0000000..77102d4
--- /dev/null
+++ b/sources/inc/lang/gl/subscr_single.txt
@@ -0,0 +1,23 @@
+Ola.
+
+Houbo trocos na páxina @PAGE@ do wiki @TITLE@.
+Estes son os trocos:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Usuario : @USER@
+Resumo do Edición: @SUMMARY@
+Revisión Antiga: @OLDPAGE@
+Revisión Nova: @NEWPAGE@
+
+Para cancelares as notificacións da páxina inicia sesión no wiki en
+@DOKUWIKIURL@ e logo visita
+@SUBSCRIBE@
+e desubscríbete do seguimento dos trocos da páxina e/ou nome de espazo.
+
+--
+Este correo-e foi xerado polo DokuWiki de
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/gl/updateprofile.txt b/sources/inc/lang/gl/updateprofile.txt
new file mode 100644
index 0000000..8620dea
--- /dev/null
+++ b/sources/inc/lang/gl/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Actualizar o perfil da túa conta ======
+
+Só precisas cubrir os campos que desexes mudar.  Non podes mudar o teu nome de usuario.
+
+
diff --git a/sources/inc/lang/gl/uploadmail.txt b/sources/inc/lang/gl/uploadmail.txt
new file mode 100644
index 0000000..2a7c247
--- /dev/null
+++ b/sources/inc/lang/gl/uploadmail.txt
@@ -0,0 +1,14 @@
+Subiuse un arquivo ao teu DokuWiki. Aquí van os pormenores:
+
+Arquivo : @MEDIA@
+Data : @DATE@
+Navegador : @BROWSER@
+Enderezo IP : @IPADDRESS@
+Nome do Host : @HOSTNAME@
+Tamaño : @SIZE@
+Tipo MIME : @MIME@
+Usuario : @USER@
+
+--
+Este correo foi xerado polo DokuWiki en
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/gl/wordblock.txt b/sources/inc/lang/gl/wordblock.txt
new file mode 100644
index 0000000..ec8d67a
--- /dev/null
+++ b/sources/inc/lang/gl/wordblock.txt
@@ -0,0 +1,4 @@
+====== Bloqueo por Correo-lixo ======
+
+Os teus trocos **non** foron gardados porque conteñen unha ou varias verbas bloqueadas. Se tentaches deixar correo-lixo no wiki -- Estívoche ben! Se consideras que é un erro, contacta co administrador deste Wiki.
+
diff --git a/sources/inc/lang/he/admin.txt b/sources/inc/lang/he/admin.txt
new file mode 100644
index 0000000..ada73e5
--- /dev/null
+++ b/sources/inc/lang/he/admin.txt
@@ -0,0 +1,4 @@
+====== ניהול ======
+
+ניתן למצוא מטה רשימה של משימות ניהול זמינות ב-DokuWiki.
+
diff --git a/sources/inc/lang/he/adminplugins.txt b/sources/inc/lang/he/adminplugins.txt
new file mode 100644
index 0000000..a7a6471
--- /dev/null
+++ b/sources/inc/lang/he/adminplugins.txt
@@ -0,0 +1 @@
+===== תוספים נוספים =====
\ No newline at end of file
diff --git a/sources/inc/lang/he/backlinks.txt b/sources/inc/lang/he/backlinks.txt
new file mode 100644
index 0000000..dfcdd22
--- /dev/null
+++ b/sources/inc/lang/he/backlinks.txt
@@ -0,0 +1,3 @@
+====== קישורים לאחור ======
+
+זוהי רשימת דפים אשר נראה כי הם מקשרים לדף ממנו הגעת.
diff --git a/sources/inc/lang/he/conflict.txt b/sources/inc/lang/he/conflict.txt
new file mode 100644
index 0000000..c1cccdf
--- /dev/null
+++ b/sources/inc/lang/he/conflict.txt
@@ -0,0 +1,6 @@
+====== קיימת גרסה עדכנית יותר של הקובץ ======
+
+ישנה גרסה עדכנית יותר של המסמך. מצב כזה קורה כאשר משתמש אחר שינה את המסמך בזמן שערכת אותו.
+
+מומלץ לעיין בהבדלים המופיעים להלן ולאחר מכן להחליט איזו גרסה כדאי לשמור. לחיצה על הכפתור "שמירה" תשמור את הגרסה שערכת. לחיצה על הכפתור "ביטול" תשמור את הגרסה הקיימת.
+
diff --git a/sources/inc/lang/he/denied.txt b/sources/inc/lang/he/denied.txt
new file mode 100644
index 0000000..a366fc1
--- /dev/null
+++ b/sources/inc/lang/he/denied.txt
@@ -0,0 +1,3 @@
+====== הרשאה נדחתה ======
+
+אנו מצטערים אך אין לך הרשאות מתאימות כדי להמשיך. אולי שכחת להיכנס למערכת?
\ No newline at end of file
diff --git a/sources/inc/lang/he/diff.txt b/sources/inc/lang/he/diff.txt
new file mode 100644
index 0000000..f1216bb
--- /dev/null
+++ b/sources/inc/lang/he/diff.txt
@@ -0,0 +1,4 @@
+====== הבדלים ======
+
+כאן מוצגים ההבדלים בין הגרסה שנבחרה והגרסה הנוכחית של הדף.
+
diff --git a/sources/inc/lang/he/draft.txt b/sources/inc/lang/he/draft.txt
new file mode 100644
index 0000000..b999cc1
--- /dev/null
+++ b/sources/inc/lang/he/draft.txt
@@ -0,0 +1,5 @@
+====== נמצא קובץ טיוטה ======
+
+העריכה האחרונה שבוצעה לדף זה לא הושלמה כראוי. DokuWiki שמר באופן אוטומטי טיוטה של העבודה ובאפשרותך להשתמש בה  כדי להמשיך את העריכה. ניתן לראות להלן את הנתונים שנשמרו מהפעם הקודמת.
+
+באפשרותך לבחור ב//שחזור הטיוטה// של אותה עריכה //מחיקת הטיוטה// או //ביטול// העריכה כליל.
\ No newline at end of file
diff --git a/sources/inc/lang/he/edit.txt b/sources/inc/lang/he/edit.txt
new file mode 100644
index 0000000..74b3cef
--- /dev/null
+++ b/sources/inc/lang/he/edit.txt
@@ -0,0 +1 @@
+עריכת הדף ולחיצה על הלחצן "שמירה" תעדכן את תוכנו. מומלץ לעיין בדף ה[[wiki:syntax|תחביר]] כדי להכיר את כללי תחביר הוויקי. נא לערוך את הדף רק אם הדבר נעשה כדי **לשפר** אותו. אם העריכה היא לצורך התנסות מומלץ לבקר ב[[playground:playground|ארגז החול]].
diff --git a/sources/inc/lang/he/editrev.txt b/sources/inc/lang/he/editrev.txt
new file mode 100644
index 0000000..e33001f
--- /dev/null
+++ b/sources/inc/lang/he/editrev.txt
@@ -0,0 +1,2 @@
+**הדף שנפתח הוא גרסה ישנה של המסמך!** לחיצה על הלחצן "שמירה" תשחזר את המסמך לגרסה המוצגת כעת.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/he/index.txt b/sources/inc/lang/he/index.txt
new file mode 100644
index 0000000..4b0623f
--- /dev/null
+++ b/sources/inc/lang/he/index.txt
@@ -0,0 +1,4 @@
+====== מפת אתר ======
+
+זהו קובץ מפת אתר הנמצא מעל לכל הדפים המאורגנים ב[[ויקי:דוקיוויקי]].
+
diff --git a/sources/inc/lang/he/install.html b/sources/inc/lang/he/install.html
new file mode 100644
index 0000000..e2cc179
--- /dev/null
+++ b/sources/inc/lang/he/install.html
@@ -0,0 +1,13 @@
+
        דף זה מסייע בהליכי ההתקנה וההגדרה הראשוניים של
+Dokuwiki. מידע נוסף על תכנית התקנה זו זמין בדף
+התיעוד שלו.
        
+
+
        DokuWiki עושה שימוש בקבצים רגילים לשמירת דפי ויקי ומידע נוסף הקשור לדפים אלו (לדוגמה: תמונות, רשימות חיפוש, גרסאות קודמות וכו׳).
+לצורך תפקוד תקין DokuWiki חייב גישה לכתיבה לתיקיות המכילות קבצים אלו. תכנית התקנה זו אינה יכולה להגדיר הרשאות לתיקיות.
+פעולה זו צריכה בד״כ להתבצע ישירות משורת הפקודה או במקרה שנעשה שימוש בשרת מארח דרך FTP או מנשק הניהול של המארח (cPanell לדוגמה).
        
+
+
        מתקין זה יגדיר את תצורת ה־ACL ב-DokuWiki שלך
+, זה בתורו מאפשר גישת מנהל לתפריט הניהול של DokuWiki כדי להתקין הרחבות, לנהל משתמשים, לנהל גישות לדפי ויקי ושינויים בהגדרות התצורה.
+אין הוא הכרחי לתפקוד DokuWiki אך הוא יהפוך את Dokuwiki לפשוט יותר לניהול.
        
+
+
        על משתמשים מנוסים או כאלו עם דרישות מיוחדות להתקנה להשתמש בקישורים אלו לפרטים בנוגע להוראות התקנה ולהגדרות תצורה.
        
diff --git a/sources/inc/lang/he/lang.php b/sources/inc/lang/he/lang.php
new file mode 100644
index 0000000..2c4d758
--- /dev/null
+++ b/sources/inc/lang/he/lang.php
@@ -0,0 +1,302 @@
+
+ * @author Denis Simakov 
+ * @author Dotan Kamber 
+ * @author Moshe Kaplan 
+ * @author Yaron Yogev 
+ * @author Yaron Shahrabani 
+ * @author Roy Zahor 
+ * @author alex 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'rtl';
+$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_profile']           = 'עדכון הפרופיל';
+$lang['btn_reset']             = 'איפוס';
+$lang['btn_resendpwd']         = 'הגדר סיסמה חדשה';
+$lang['btn_draft']             = 'עריכת טיוטה';
+$lang['btn_recover']           = 'שחזור טיוטה';
+$lang['btn_draftdel']          = 'מחיקת טיוטה';
+$lang['btn_revert']            = 'שחזור';
+$lang['btn_register']          = 'הרשמה';
+$lang['btn_media']             = 'מנהל המדיה';
+$lang['loggedinas']            = 'נכנסת בשם';
+$lang['user']                  = 'שם משתמש';
+$lang['pass']                  = 'ססמה';
+$lang['newpass']               = 'ססמה חדשה';
+$lang['oldpass']               = 'אישור הססמה הנוכחית';
+$lang['passchk']               = 'פעם נוספת';
+$lang['remember']              = 'שמירת הפרטים שלי';
+$lang['fullname']              = 'שם מלא';
+$lang['email']                 = 'דוא״ל';
+$lang['profile']               = 'פרופיל המשתמש';
+$lang['badlogin']              = 'שם המשתמש או הססמה שגויים, עמך הסליחה';
+$lang['badpassconfirm']        = 'מצטערים, הסיסמה שגויה';
+$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['profdeleteuser']        = 'הסר חשבון';
+$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['js']['willexpire']      = 'הנעילה תחלוף עוד זמן קצר. \nלמניעת התנגשויות יש להשתמש בכפתור הרענון מטה כדי לאפס את מד משך הנעילה.';
+$lang['js']['notsavedyet']     = 'שינויים שלא נשמרו ילכו לאיבוד.';
+$lang['js']['searchmedia']     = 'חיפוש אחר קבצים';
+$lang['js']['keepopen']        = 'השארת חלון פתוח על הבחירה';
+$lang['js']['hidedetails']     = 'הסתרת פרטים';
+$lang['js']['mediatitle']      = 'הגדרות הקישור';
+$lang['js']['mediadisplay']    = 'סוג הקישור';
+$lang['js']['mediaalign']      = 'יישור';
+$lang['js']['mediasize']       = 'גודל התמונה';
+$lang['js']['mediatarget']     = 'יעד הקישור';
+$lang['js']['mediaclose']      = 'סגירה';
+$lang['js']['mediainsert']     = 'הוספה';
+$lang['js']['mediadisplayimg'] = 'הצגת התמונה.';
+$lang['js']['mediadisplaylnk'] = 'הצגת הקישור בלבד.';
+$lang['js']['mediasmall']      = 'גרסה קטנה';
+$lang['js']['mediamedium']     = 'גרסה בינונית';
+$lang['js']['medialarge']      = 'גרסה גדולה';
+$lang['js']['mediaoriginal']   = 'הגרסה המקורית';
+$lang['js']['medialnk']        = 'קישור לעמוד הפרטים';
+$lang['js']['mediadirect']     = 'הקישור הישיר למקור';
+$lang['js']['medianolnk']      = 'אין קישור';
+$lang['js']['medianolink']     = 'אין לקשר לתמונה';
+$lang['js']['medialeft']       = 'יישור התמונה לשמאל.';
+$lang['js']['mediaright']      = 'יישור התמונה לימין.';
+$lang['js']['mediacenter']     = 'מרכוז התמונה.';
+$lang['js']['medianoalign']    = 'לא להשתמש ביישור.';
+$lang['js']['nosmblinks']      = 'קישור לכונני שיתוף של Windows עובד רק באמצעות Microsoft Internet Explorer.
+עדיין ניתן להעתיק ולהדביק את הקישור.';
+$lang['js']['linkwiz']         = 'אשף הקישורים';
+$lang['js']['linkto']          = 'קישור אל:';
+$lang['js']['del_confirm']     = 'באמת למחוק?';
+$lang['js']['restore_confirm'] = 'באמת לשחזר את הגירסא הזאת?';
+$lang['js']['media_diff']      = 'הצגת הבדלים:';
+$lang['js']['media_diff_both'] = 'זה לצד זה';
+$lang['js']['media_select']    = 'בחר קבצים...';
+$lang['js']['media_upload_btn'] = 'העלאה';
+$lang['js']['media_done_btn']  = 'בוצע';
+$lang['js']['media_drop']      = 'גרור לכאן קבצים בכדי להעלותם';
+$lang['js']['media_cancel']    = 'הסר';
+$lang['js']['media_overwrt']   = 'שכתב קבצים קיימים';
+$lang['rssfailed']             = 'אירע כשל בעת קבלת הזנה זו:';
+$lang['nothingfound']          = 'לא נמצאו תוצאות.';
+$lang['mediaselect']           = 'קובצי מדיה';
+$lang['fileupload']            = 'העלאת קובצי מדיה';
+$lang['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['accessdenied']          = 'אין לך הרשאה לצפות בדף זה.';
+$lang['mediausage']            = 'יש להשתמש בתחביר הבא כדי להפנות לקובץ זה:';
+$lang['mediaview']             = 'הצגת  הקובץ המקורי';
+$lang['mediaroot']             = 'root';
+$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['difflink']              = 'קישור לתצוגה השוואה זו';
+$lang['diff_type']             = 'הצגת הבדלים:';
+$lang['diff_inline']           = 'באותה השורה';
+$lang['diff_side']             = 'זה לצד זה';
+$lang['line']                  = 'שורה';
+$lang['breadcrumb']            = 'ביקורים אחרונים';
+$lang['youarehere']            = 'זהו מיקומך';
+$lang['lastmod']               = 'מועד השינוי האחרון';
+$lang['by']                    = 'על ידי';
+$lang['deleted']               = 'נמחק';
+$lang['created']               = 'נוצר';
+$lang['restored']              = 'שוחזר (%s)';
+$lang['external_edit']         = 'עריכה חיצונית';
+$lang['summary']               = 'תקציר העריכה';
+$lang['noflash']               = 'תוסף פלאש לדפדפן נדרש כדי להציג תוכן זה.';
+$lang['download']              = 'הורדת מקטע';
+$lang['tools']                 = 'כלים';
+$lang['user_tools']            = 'כלים של משתמש';
+$lang['site_tools']            = 'כלים של אתר';
+$lang['page_tools']            = 'כלים של דף';
+$lang['skip_to_content']       = 'עבור לתוכן';
+$lang['mail_newpage']          = 'דף נוסף:';
+$lang['mail_changed']          = 'דף שונה:';
+$lang['mail_subscribe_list']   = 'דפים שהשתנו במרחב השם:';
+$lang['mail_new_user']         = 'משתמש חדש:';
+$lang['mail_upload']           = 'קובץ הועלה:';
+$lang['pages_changes']         = 'דפים';
+$lang['media_changes']         = 'קבצי מדיה';
+$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['img_width']             = 'רוחב';
+$lang['img_height']            = 'גובה';
+$lang['subscr_subscribe_success'] = '%s נוסף לרשימת המינויים לדף %s';
+$lang['subscr_subscribe_error'] = 'אירעה שגיאה בהוספת %s לרשימת המינויים לדף %s';
+$lang['subscr_subscribe_noaddress'] = 'אין כתובת המשויכת עם הכניסה שלך, נא ניתן להוסיף אותך לרשימת המינויים';
+$lang['subscr_unsubscribe_success'] = 'המשתמש %s הוסר מרשימת המינויים לדף %s';
+$lang['subscr_unsubscribe_error'] = 'אירעה שגיאה בהסרת %s מרשימת המינויים לדף %s';
+$lang['subscr_already_subscribed'] = 'המשתמש %s כבר מנוי לדף %s';
+$lang['subscr_not_subscribed'] = 'המשתמש %s איננו רשום לדף %s';
+$lang['subscr_m_not_subscribed'] = 'המשתמש שלך אינו רשום, נכון לעכשיו, לדף הנוכחי או למרחב השם.';
+$lang['subscr_m_new_header']   = 'הוספת מינוי';
+$lang['subscr_m_current_header'] = 'המינויים הנוכחיים';
+$lang['subscr_m_unsubscribe']  = 'ביטול המינוי';
+$lang['subscr_m_subscribe']    = 'מינוי';
+$lang['subscr_m_receive']      = 'קבלת';
+$lang['subscr_style_every']    = 'דוא״ל עם כל שינוי';
+$lang['subscr_style_digest']   = 'הודעת דוא״ל המציגה את כל השינויים בכל עמוד (בכל %.2f ימים)';
+$lang['subscr_style_list']     = 'רשימת השינויים בדפים מאז הודעת הדוא״ל האחרונה (בכל %.2f ימים)';
+$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 installation instructions';
+$lang['i_funcna']              = 'פונקציית ה-PHP‏ %s אינה זמינה. יתכן כי מארח האתר חסם אותה מסיבה כלשהי?';
+$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']             = 'מספר שגיאות אירעו בעת כתיבת קובצי התצורה. יתכן כי יהיה צורך לתקנם ידנית לפני שניתן יהיה להשתמש ב־DokuWiki החדש שלך.';
+$lang['i_policy']              = 'מדיניות ACL התחלתית';
+$lang['i_pol0']                = 'ויקי פתוח (קריאה, כתיבה והעלאה לכולם)';
+$lang['i_pol1']                = ' ויקי ציבורי (קריאה לכולם, כתיבה והעלאה למשתמשים רשומים)';
+$lang['i_pol2']                = 'ויקי סגור (קריאה, כתיבה והעלאה למשתמשים רשומים בלבד)';
+$lang['i_retry']               = 'ניסיון נוסף';
+$lang['i_license']             = 'נא לבחור את הרישיון שיחול על התוכן שבוויקי שלך:';
+$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 שניות';
+$lang['wordblock']             = 'השינויים שלך לא נשמרו כיוון שהם מכילים טקסט חסום (ספאם).';
+$lang['media_searchtab']       = 'חיפוש';
+$lang['media_file']            = 'קובץ';
+$lang['media_viewtab']         = 'תצוגה';
+$lang['media_edittab']         = 'עריכה';
+$lang['media_historytab']      = 'היסטוריה';
+$lang['media_list_rows']       = 'שורות';
+$lang['media_sort_name']       = 'שם';
+$lang['media_sort_date']       = 'תאריך';
+$lang['media_namespaces']      = 'בחר מרחב שמות';
diff --git a/sources/inc/lang/he/locked.txt b/sources/inc/lang/he/locked.txt
new file mode 100644
index 0000000..307874a
--- /dev/null
+++ b/sources/inc/lang/he/locked.txt
@@ -0,0 +1,3 @@
+====== דף נעול ======
+
+דף זה נעול כרגע לעריכה על ידי משתמש אחר. עליך להמתין עד שהמשתמש יסיים את העריכה או עד שהנעילה תפוג.
diff --git a/sources/inc/lang/he/login.txt b/sources/inc/lang/he/login.txt
new file mode 100644
index 0000000..5a575f1
--- /dev/null
+++ b/sources/inc/lang/he/login.txt
@@ -0,0 +1,3 @@
+====== כניסה ======
+
+אינך ברשומות המערכת כרגע! יש להזין את נתוני ההזדהות מטה לכניסה. יש לאפשר עוגיות (cookies) כדי להכנס.
diff --git a/sources/inc/lang/he/mailtext.txt b/sources/inc/lang/he/mailtext.txt
new file mode 100644
index 0000000..222ee1b
--- /dev/null
+++ b/sources/inc/lang/he/mailtext.txt
@@ -0,0 +1,17 @@
+דף בDokuWiki נוסף או שונה. להלן הפרטים:
+
+תאריך        : @DATE@
+דפדפן     : @BROWSER@
+כתובת ה־IP‏  : @IPADDRESS@
+שם המארח    : @HOSTNAME@
+המהדורה הישנה: @OLDPAGE@
+המהדורה החדשה: @NEWPAGE@
+תקציר העריכה: @SUMMARY@
+משתמש        : @USER@
+
+@DIFF@
+
+-- 
+
+דף זה נוצר ע״י ה־DokuWiki הזמין בכתובת
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/he/newpage.txt b/sources/inc/lang/he/newpage.txt
new file mode 100644
index 0000000..ac6fb73
--- /dev/null
+++ b/sources/inc/lang/he/newpage.txt
@@ -0,0 +1,3 @@
+====== דף זה עדיין לא קיים ======
+
+הדף אליו הגעת עדיין לא קיים. לחיצה על הכפתור "יצירת דף" תצור אותו.
\ No newline at end of file
diff --git a/sources/inc/lang/he/norev.txt b/sources/inc/lang/he/norev.txt
new file mode 100644
index 0000000..3d08e16
--- /dev/null
+++ b/sources/inc/lang/he/norev.txt
@@ -0,0 +1,4 @@
+====== גרסה לא קיימת ======
+
+הגרסה שהוזנה אינה קיימת. נא להשתמש בכפתור ''גרסאות קודמות'' להצגת רשימת הגרסאות של מסמך זה.
+
diff --git a/sources/inc/lang/he/password.txt b/sources/inc/lang/he/password.txt
new file mode 100644
index 0000000..745c5cb
--- /dev/null
+++ b/sources/inc/lang/he/password.txt
@@ -0,0 +1,10 @@
+שלום @FULLNAME@!
+
+הנה נתוני המשתמש שלך עבור @TITLE@ ב־@DOKUWIKIURL@
+
+שם כניסה     : @LOGIN@
+ססמה     : @PASSWORD@
+
+-- 
+מכתב זה נוצר על ידי ה־DokuWiki הזמין בכתובת
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/he/preview.txt b/sources/inc/lang/he/preview.txt
new file mode 100644
index 0000000..1331c23
--- /dev/null
+++ b/sources/inc/lang/he/preview.txt
@@ -0,0 +1,4 @@
+====== תצוגה מקדימה ======
+
+זו תצוגה מקדימה של הדף לעתיד. להזכירך: **הדף עדיין לא נשמר!**
+
diff --git a/sources/inc/lang/he/pwconfirm.txt b/sources/inc/lang/he/pwconfirm.txt
new file mode 100644
index 0000000..7dc46c3
--- /dev/null
+++ b/sources/inc/lang/he/pwconfirm.txt
@@ -0,0 +1,13 @@
+שלום @FULLNAME@!
+
+מישהו ביקש ססמה חדשה עבור שם הכניסה שלך לוויקי @TITLE@ בכתובת @DOKUWIKIURL@
+
+אם לא ביקשת ססמה חדשה באפשרותך פשוט להתעלם מהודעת דוא״ל זו.
+
+כדי לאשר שהבקשה באמת נשלחה על ידך עליך השתמש בקישור הבא.
+
+@CONFIRM@
+
+-- 
+הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki הזמין בכתובת
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/he/read.txt b/sources/inc/lang/he/read.txt
new file mode 100644
index 0000000..18efc5e
--- /dev/null
+++ b/sources/inc/lang/he/read.txt
@@ -0,0 +1,2 @@
+דף זה הוא דף לקריאה בלבד. ניתן לצפות בקוד המקור שלו, אך לא ניתן לערוך אותו. ניתן לפנות למנהל הוויקי אם לדעתך נפלה טעות.
+
diff --git a/sources/inc/lang/he/recent.txt b/sources/inc/lang/he/recent.txt
new file mode 100644
index 0000000..0febd96
--- /dev/null
+++ b/sources/inc/lang/he/recent.txt
@@ -0,0 +1,5 @@
+====== שינויים אחרונים ======
+
+הדפים הבאים עברו שינויים לאחרונה.
+
+
diff --git a/sources/inc/lang/he/register.txt b/sources/inc/lang/he/register.txt
new file mode 100644
index 0000000..c4dfad7
--- /dev/null
+++ b/sources/inc/lang/he/register.txt
@@ -0,0 +1,3 @@
+====== הרשמה כמשתמש חדש ======
+
+יש למלא את כל המידע להלן כדי ליצור חשבון חדש בוויקי זה. עליך לוודא כי הזנת **כתובת דוא״ל תקפה**- ססמתך החדשה תשלח לכתובת זו. על שם המשתמש להיות [[hdoku>ויקי:שם דף|שם דף]] תקף.
diff --git a/sources/inc/lang/he/registermail.txt b/sources/inc/lang/he/registermail.txt
new file mode 100644
index 0000000..3edca3f
--- /dev/null
+++ b/sources/inc/lang/he/registermail.txt
@@ -0,0 +1,14 @@
+משתמש חדש נרשם. להלן הפרטים:
+
+שם משתמש   : @NEWUSER@
+שם מלא     : @NEWNAME@
+דוא״ל      : @NEWEMAIL@
+
+תאריך      : @DATE@
+דפדפן      : @BROWSER@
+כתובת IP‏  : @IPADDRESS@
+שם המארח   : @HOSTNAME@
+
+-- 
+הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki הזמין בכתובת
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/he/resendpwd.txt b/sources/inc/lang/he/resendpwd.txt
new file mode 100644
index 0000000..8ca2720
--- /dev/null
+++ b/sources/inc/lang/he/resendpwd.txt
@@ -0,0 +1,4 @@
+====== שליחת ססמה חדשה ======
+
+יש להזין את שם המשתמש בטופס מטה ולבקש ססמה חדשה לחשבון שלך בוויקי זה. הקישור לאימות יישלח לכתובת הדוא״ל באמצעותה נרשמת.
+
diff --git a/sources/inc/lang/he/revisions.txt b/sources/inc/lang/he/revisions.txt
new file mode 100644
index 0000000..6b23402
--- /dev/null
+++ b/sources/inc/lang/he/revisions.txt
@@ -0,0 +1,4 @@
+====== גרסאות ישנות ======
+
+אלה גרסאות מוקדמות יותר של המסמך הנוכחי. כדי לשחזר גרסה מוקדמת יותר יש ללחוץ על הכפתור ''עריכה'' ולשמור את הדף.
+
diff --git a/sources/inc/lang/he/searchpage.txt b/sources/inc/lang/he/searchpage.txt
new file mode 100644
index 0000000..aed23be
--- /dev/null
+++ b/sources/inc/lang/he/searchpage.txt
@@ -0,0 +1,5 @@
+====== חיפוש ======
+
+ניתן לראות את תוצאות החיפוש למטה. אם לא נמצאו דפים בחיפוש, לחיצה על הכפתור "עריכה" תיצור דף חדש על שם מילת החיפוש שהוזנה.
+
+===== תוצאות =====
\ No newline at end of file
diff --git a/sources/inc/lang/he/showrev.txt b/sources/inc/lang/he/showrev.txt
new file mode 100644
index 0000000..22ca0c3
--- /dev/null
+++ b/sources/inc/lang/he/showrev.txt
@@ -0,0 +1,2 @@
+**זו גרסה ישנה של המסמך!** לחיצה על כותרת המסמך תציג את גרסתו הנוכחית.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/he/stopwords.txt b/sources/inc/lang/he/stopwords.txt
new file mode 100644
index 0000000..ca85eb2
--- /dev/null
+++ b/sources/inc/lang/he/stopwords.txt
@@ -0,0 +1,29 @@
+# זוהי רשימת מילים ממנה מתעלם סורק התוכן, אחת בכל שורה
+# בעורכך קובץ זה עליך לודא כי נעשה שימוש בסימני סוף שורה של UNIX (שורה חדשה ללא החזרת הסמן)
+# אין צורך לכלול מילים בנות פחות משלוש אותיות - אלו נפסחות בכל מקרה
+# רשימה זו מבוססת על אלו הנמצאות ב- http://www.ranks.nl/stopwords
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/he/subscr_digest.txt b/sources/inc/lang/he/subscr_digest.txt
new file mode 100644
index 0000000..af52202
--- /dev/null
+++ b/sources/inc/lang/he/subscr_digest.txt
@@ -0,0 +1,20 @@
+שלום!
+
+הדף @PAGE@ שבאתר הוויקי @TITLE@ השתנה.
+להלן השינויים:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+המהדורה הישנה: @OLDPAGE@
+המהדורה החדשה: @NEWPAGE@
+
+כדי לבטל את ההתרעות לשינויי העמוד, יש להיכנס לאתר הוויקי בכתובת
+@DOKUWIKIURL@ ואז לבקר באגף
+@SUBSCRIBE@
+ולבטל את המינוי לשינויים בדף ו/או במרחב השם.
+
+--
+הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki שבכתובת
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/he/subscr_single.txt b/sources/inc/lang/he/subscr_single.txt
new file mode 100644
index 0000000..78b551e
--- /dev/null
+++ b/sources/inc/lang/he/subscr_single.txt
@@ -0,0 +1,22 @@
+שלום!
+
+הדף @PAGE@ באתר הוויקי @TITLE@ השתנה.
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+תאריך : @DATE@
+משתמש : @USER@
+תקציר העריכה: @SUMMARY@
+המהדורה הישנה: @OLDPAGE@
+המהדורה החדשה: @NEWPAGE@
+
+לביטול התרעות בנוגע לעמוד, יש להיכנס לאתר הוויקי בכתובת
+@DOKUWIKIURL@ ואז לבקר בדף
+@SUBSCRIBE@
+ולבטל את המינוי לקבלת שינויים בדף ו/או במרחב השם.
+
+--
+הודעת דוא״ל זו נוצרה על ידי ה־DokuWiki הזמין בכתובת
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/he/updateprofile.txt b/sources/inc/lang/he/updateprofile.txt
new file mode 100644
index 0000000..494d838
--- /dev/null
+++ b/sources/inc/lang/he/updateprofile.txt
@@ -0,0 +1,5 @@
+====== עידכון פרטי חשבונך ======
+
+אין צורך למלא מעבר לפרטים המיועדים לשינוי. לא ניתן לשנות את שם המשתמש.
+
+
diff --git a/sources/inc/lang/he/uploadmail.txt b/sources/inc/lang/he/uploadmail.txt
new file mode 100644
index 0000000..fd67079
--- /dev/null
+++ b/sources/inc/lang/he/uploadmail.txt
@@ -0,0 +1,14 @@
+קובץ הועלה אל הדוקוויקי שלך. הנה פרטיו:
+
+קובץ : @MEDIA@
+תאריך : @DATE@
+דפדפן : @BROWSER@
+כתובת IP : @IPADDRESS@
+מארח : @HOSTNAME@
+גודל : @SIZE@
+סיווג : @MIME@
+משתמש : @USER@
+
+-- 
+דואר זה נוצר על ידי דוקוויקי בתובת
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/hi/diff.txt b/sources/inc/lang/hi/diff.txt
new file mode 100644
index 0000000..6f88c19
--- /dev/null
+++ b/sources/inc/lang/hi/diff.txt
@@ -0,0 +1,3 @@
+======असमानता======
+
+यह आपको  पृष्ठ के दो संस्करणों के बीच असमानता को दर्शाता है. 
\ No newline at end of file
diff --git a/sources/inc/lang/hi/lang.php b/sources/inc/lang/hi/lang.php
new file mode 100644
index 0000000..184eeed
--- /dev/null
+++ b/sources/inc/lang/hi/lang.php
@@ -0,0 +1,118 @@
+
+ * @author yndesai@gmail.com
+ * @author Santosh Joshi 
+ */
+$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_profile']           = 'परिचय संपादित करें';
+$lang['btn_resendpwd']         = 'नया पासवर्ड सेट करें';
+$lang['btn_draft']             = 'प्रारूप सम्पादित करें';
+$lang['btn_draftdel']          = 'प्रारूप मिटायें';
+$lang['btn_revert']            = 'वापस लौटाएं';
+$lang['btn_apply']             = 'लागू करें';
+$lang['btn_deleteuser']        = 'खाता मिटायें';
+$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['resendpwdmissing']      = 'छमा करें, आपको सारे रिक्त स्थान भरने पड़ेंगे |';
+$lang['resendpwdsuccess']      = 'आपका नवगुप्तशब्द ईमेल द्वारा सम्प्रेषित कर दिया गया है |';
+$lang['txt_upload']            = 'अपलोड करने के लिए फ़ाइल चुनें';
+$lang['txt_filename']          = 'के रूप में अपलोड करें (वैकल्पिक)';
+$lang['txt_overwrt']           = 'अधिलेखित उपस्थित फ़ाइल';
+$lang['lockedby']              = 'इस समय तक बंद';
+$lang['lockexpire']            = 'बंद समाप्त होगा';
+$lang['js']['hidedetails']     = 'विवरण छिपाएँ';
+$lang['nothingfound']          = 'कुच्छ नहीं मिला |';
+$lang['uploadexist']           = 'फ़ाइल पहले से उपस्थित है. कुछ भी नहीं किया |';
+$lang['mediafiles']            = 'उपलब्ध फाइलों में';
+$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['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']               = 'पुनःप्रयास';
diff --git a/sources/inc/lang/hr/admin.txt b/sources/inc/lang/hr/admin.txt
new file mode 100644
index 0000000..15a2a2b
--- /dev/null
+++ b/sources/inc/lang/hr/admin.txt
@@ -0,0 +1,3 @@
+====== Administracija ======
+
+Slijedi spisak svih administracijskih poslova koji su trenutno dostupni.
diff --git a/sources/inc/lang/hr/backlinks.txt b/sources/inc/lang/hr/backlinks.txt
new file mode 100644
index 0000000..e7115a6
--- /dev/null
+++ b/sources/inc/lang/hr/backlinks.txt
@@ -0,0 +1,3 @@
+====== Linkovi na stranicu ======
+
+Slijedi spisak svih dokumenata koji imaju link na trenutni.
diff --git a/sources/inc/lang/hr/conflict.txt b/sources/inc/lang/hr/conflict.txt
new file mode 100644
index 0000000..e33d702
--- /dev/null
+++ b/sources/inc/lang/hr/conflict.txt
@@ -0,0 +1,5 @@
+====== Postoji novija verzija ======
+
+Već postoji novija verzija dokumenta kojeg ste mijenjali. To se dešava jer je neki drugi korisnik snimio dokument za vrijeme dok ste ga Vi mijenjali.
+
+Proučite promjene koje slijede i odaberite koje želite preuzeti. Odaberite ''Snimi'' da biste snimili Vašu verziju ili ''Poništi'' da ostavite sačuvanu trenutnu verziju dokumenta.
diff --git a/sources/inc/lang/hr/denied.txt b/sources/inc/lang/hr/denied.txt
new file mode 100644
index 0000000..216eea5
--- /dev/null
+++ b/sources/inc/lang/hr/denied.txt
@@ -0,0 +1,5 @@
+====== Niste autorizirani ======
+
+Nemate autorizaciju.
+
+Niste li se možda zaboravili prijaviti u aplikaciju?
diff --git a/sources/inc/lang/hr/diff.txt b/sources/inc/lang/hr/diff.txt
new file mode 100644
index 0000000..ce6c8c4
--- /dev/null
+++ b/sources/inc/lang/hr/diff.txt
@@ -0,0 +1,3 @@
+====== Razlike ======
+
+Slijede sve razlike između odabrane i trenutne verzije dokumenta
diff --git a/sources/inc/lang/hr/edit.txt b/sources/inc/lang/hr/edit.txt
new file mode 100644
index 0000000..8cd57d5
--- /dev/null
+++ b/sources/inc/lang/hr/edit.txt
@@ -0,0 +1 @@
+Nakon što ste napravili sve potrebne promjene - odaberite ''Snimi'' za snimanje dokumenta.
diff --git a/sources/inc/lang/hr/editrev.txt b/sources/inc/lang/hr/editrev.txt
new file mode 100644
index 0000000..911855f
--- /dev/null
+++ b/sources/inc/lang/hr/editrev.txt
@@ -0,0 +1,2 @@
+**Učitali ste stariju verziju dokumenta!** Ukoliko je snimite - biti će kreirana nova verzija dokumenta.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/hr/index.txt b/sources/inc/lang/hr/index.txt
new file mode 100644
index 0000000..9c30a80
--- /dev/null
+++ b/sources/inc/lang/hr/index.txt
@@ -0,0 +1 @@
+====== Indeks ======
diff --git a/sources/inc/lang/hr/lang.php b/sources/inc/lang/hr/lang.php
new file mode 100644
index 0000000..f196108
--- /dev/null
+++ b/sources/inc/lang/hr/lang.php
@@ -0,0 +1,265 @@
+
+ * @author Branko Rihtman 
+ * @author Dražen Odobašić 
+ * @author Dejan Igrec dejan.igrec@gmail.com
+ */
+$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']              = 'Spremi';
+$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_profile']           = 'Ažuriraj profil';
+$lang['btn_reset']             = 'Poništi promjene';
+$lang['btn_draft']             = 'Uredi nacrt dokumenta';
+$lang['btn_recover']           = 'Vrati prijašnji nacrt dokumenta';
+$lang['btn_draftdel']          = 'Obriši nacrt dokumenta';
+$lang['btn_revert']            = 'Vrati';
+$lang['btn_register']          = 'Registracija';
+$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['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['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['searchmedia']           = 'Traži naziv datoteke:';
+$lang['searchmedia_in']        = 'Traži u %s';
+$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['js']['willexpire']            = 'Dokument kojeg mijenjate će biti zaključan još 1 minutu.\n Ukoliko želite i dalje raditi izmjene na dokumentu - kliknite na "Pregled".';
+$lang['js']['notsavedyet']     = 'Vaše izmjene će se izgubiti.
+Želite li nastaviti?';
+$lang['js']['searchmedia']     = 'Traži datoteke';
+$lang['js']['keepopen']        = 'Ostavi prozor otvoren nakon izbora';
+$lang['js']['hidedetails']     = 'Sakrij detalje';
+$lang['js']['mediatitle']      = 'Postavke poveznice';
+$lang['js']['mediadisplay']    = 'Vrsta poveznice';
+$lang['js']['mediaalign']      = 'Poravnanje';
+$lang['js']['mediasize']       = 'Veličina slike';
+$lang['js']['mediatarget']     = 'Cilj poveznice';
+$lang['js']['mediaclose']      = 'Zatvori';
+$lang['js']['mediainsert']     = 'Umetni';
+$lang['js']['mediadisplayimg'] = 'Prikaži sliku.';
+$lang['js']['mediadisplaylnk'] = 'Prikaži samo poveznicu.';
+$lang['js']['mediasmall']      = 'Mala verzija.';
+$lang['js']['mediamedium']     = 'Srednja verzija.';
+$lang['js']['medialarge']      = 'Velika verzija.';
+$lang['js']['mediaoriginal']   = 'Originalna verzija.';
+$lang['js']['medialnk']        = 'Poveznica na stranicu s detaljima';
+$lang['js']['mediadirect']     = 'Direktna poveznica na original';
+$lang['js']['medianolnk']      = 'Bez poveznice';
+$lang['js']['medianolink']     = 'Nemoj povezati sliku';
+$lang['js']['medialeft']       = 'Poravnaj sliku lijevo.';
+$lang['js']['mediaright']      = 'Poravnaj sliku desno.';
+$lang['js']['mediacenter']     = 'Poravnaj sliku u sredinu.';
+$lang['js']['medianoalign']    = 'Bez poravnanja.';
+$lang['js']['nosmblinks']      = 'Linkovi na dijeljene Windows mape rade samo s Internet Explorerom. Link je još uvijek moguće kopirati i zalijepiti.';
+$lang['js']['linkwiz']         = 'Čarobnjak za poveznice';
+$lang['js']['linkto']          = 'Poveznica na:';
+$lang['js']['del_confirm']     = 'Zbilja želite obrisati odabrane stavke?';
+$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['accessdenied']          = 'Nemate potrebne dozvole za pregled ove stranice.';
+$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['difflink']              = 'Poveznica na ovaj prikaz usporedbe';
+$lang['diff_type']             = 'Razlike u prikazu:';
+$lang['diff_inline']           = 'U istoj razini';
+$lang['diff_side']             = 'Usporedo';
+$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 (%s)';
+$lang['external_edit']         = 'vanjsko uređivanje';
+$lang['summary']               = 'Sažetak izmjena';
+$lang['noflash']               = 'Za prikazivanje ovog sadržaja potreban je Adobe Flash Plugin';
+$lang['download']              = 'Preuzmi isječak';
+$lang['mail_newpage']          = 'stranica dodana:';
+$lang['mail_changed']          = 'stranica izmjenjena:';
+$lang['mail_subscribe_list']   = 'stranice promijenjene u imenskom prostoru:';
+$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['upperns']               = 'Skoči u nadređeni imenski prostor';
+$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['subscr_subscribe_success'] = 'Dodan %s u listu pretplatnika za %s';
+$lang['subscr_subscribe_error'] = 'Greška kod dodavanja %s u listu pretplatnika za %s';
+$lang['subscr_subscribe_noaddress'] = 'Ne postoji adresa povezana sa vašim podacima za prijavu, stoga ne možete biti dodani u listu pretplatnika';
+$lang['subscr_unsubscribe_success'] = 'Uklonjen %s iz liste pretplatnika za %s';
+$lang['subscr_unsubscribe_error'] = 'Greška prilikom uklanjanja %s iz liste pretplatnika za %s';
+$lang['subscr_already_subscribed'] = '%s je već pretplaćen na %s';
+$lang['subscr_not_subscribed'] = '%s nije pretplaćen na %s';
+$lang['subscr_m_not_subscribed'] = 'Trenutno niste pretplaćeni na trenutnu stranicu ili imenski prostor.';
+$lang['subscr_m_new_header']   = 'Dodaj pretplatu';
+$lang['subscr_m_current_header'] = 'Trenutne pretplate';
+$lang['subscr_m_unsubscribe']  = 'Odjavi pretplatu';
+$lang['subscr_m_subscribe']    = 'Pretplati se';
+$lang['subscr_m_receive']      = 'Primaj';
+$lang['subscr_style_every']    = 'email za svaku promjenu';
+$lang['subscr_style_digest']   = 'email s kratakim prikazom promjena za svaku stranicu (svaka %.2f dana)';
+$lang['subscr_style_list']     = 'listu promijenjenih stranica od zadnjeg primljenog email-a (svaka %.2f dana)';
+$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';
+$lang['i_funcna']              = 'PHP funkcija %s nije dostupna. Možda ju je vaš pružatelj hostinga onemogućio iz nekog razloga?';
+$lang['i_phpver']              = 'Vaša PHP verzija %s je niža od potrebne %s. Trebate nadograditi vašu PHP instalaciju.';
+$lang['i_permfail']            = '%s nema dozvolu pisanja od strane DokuWiki. Trebate podesiti dozvole pristupa tom direktoriju.';
+$lang['i_confexists']          = '%s već postoji';
+$lang['i_writeerr']            = 'Ne može se kreirati %s. Trebate provjeriti dozvole direktorija/datoteke i kreirati dokument ručno.';
+$lang['i_badhash']             = 'neprepoznat ili promijenjen dokuwiki.php (hash=%s)';
+$lang['i_badval']              = '%s - nedozvoljena ili prazna vrijednost';
+$lang['i_success']             = 'Konfiguracija je uspješno završena. Sada možete obrisati install.php datoteku. Nastavite na vaš novi DokuWiki.';
+$lang['i_failure']             = 'Pojavile su se neke greške prilikom pisanja konfiguracijskih datoteka. Morati ćete ih ručno ispraviti da bi mogli koristiti vaš novi DokuWiki.';
+$lang['i_policy']              = 'Inicijalna ACL politika';
+$lang['i_pol0']                = 'Otvoreni Wiki (čitanje, pisanje, učitavanje za sve)';
+$lang['i_pol1']                = 'Javni Wiki (čitanje za sve, pisanje i učitavanje za registrirane korisnike)';
+$lang['i_pol2']                = 'Zatvoreni Wiki (čitanje, pisanje, učitavanje samo za registrirane korisnike)';
+$lang['i_retry']               = 'Pokušaj ponovo';
+$lang['i_license']             = 'Molim odaberite licencu pod kojom želite postavljati vaš sadržaj:';
+$lang['recent_global']         = 'Trenutno gledate promjene unutar %s imenskog prostora. Također možete vidjeti zadnje promjene cijelog wiki-a';
+$lang['years']                 = '%d godina prije';
+$lang['months']                = '%d mjeseci prije';
+$lang['weeks']                 = '%d tjedana prije';
+$lang['days']                  = '%d dana prije';
+$lang['hours']                 = '%d sati prije';
+$lang['minutes']               = '%d minuta prije';
+$lang['seconds']               = '%d sekundi prije';
+$lang['wordblock']             = 'Vaša promjena nije spremljena jer sadrži blokirani tekst (spam).';
diff --git a/sources/inc/lang/hr/locked.txt b/sources/inc/lang/hr/locked.txt
new file mode 100644
index 0000000..ff081aa
--- /dev/null
+++ b/sources/inc/lang/hr/locked.txt
@@ -0,0 +1,3 @@
+====== Dokument zaključan ======
+
+Mijenjanje ovog dokumenta je trenutno onemogućeno jer je otvoren od strane nekog drugog korisnika. Morate pričekati da on završi sa svojim izmjenama.
diff --git a/sources/inc/lang/hr/login.txt b/sources/inc/lang/hr/login.txt
new file mode 100644
index 0000000..216af13
--- /dev/null
+++ b/sources/inc/lang/hr/login.txt
@@ -0,0 +1,3 @@
+====== Prijava ======
+
+Upišite korisničko ime i lozinku da biste se prijavili.
diff --git a/sources/inc/lang/hr/mailtext.txt b/sources/inc/lang/hr/mailtext.txt
new file mode 100644
index 0000000..911f8ea
--- /dev/null
+++ b/sources/inc/lang/hr/mailtext.txt
@@ -0,0 +1,16 @@
+Dokument na Vašem wiki-ju je promijenjen ili dodan:
+
+Datum             : @DATE@
+Preglednik        : @BROWSER@
+IP-Adresa         : @IPADDRESS@
+Host              : @HOSTNAME@
+Prijašnja verzija : @OLDPAGE@
+Nova verzija      : @NEWPAGE@
+Opis izmjene      : @SUMMARY@
+Korisnik          : @USER@
+
+@DIFF@
+
+
+-- 
+Ovaj email je poslan na: @DOKUWIKIURL@
diff --git a/sources/inc/lang/hr/newpage.txt b/sources/inc/lang/hr/newpage.txt
new file mode 100644
index 0000000..3934658
--- /dev/null
+++ b/sources/inc/lang/hr/newpage.txt
@@ -0,0 +1,3 @@
+====== Dokument ne postoji ======
+
+Traženi dokument (još) ne postoji. Ukoliko ga želite otvoriti kliknite na ''Novi dokument''.
diff --git a/sources/inc/lang/hr/norev.txt b/sources/inc/lang/hr/norev.txt
new file mode 100644
index 0000000..231fb5e
--- /dev/null
+++ b/sources/inc/lang/hr/norev.txt
@@ -0,0 +1,3 @@
+====== Nepostojeća verzija ======
+
+Tražena verzija dokumenta ne postoji.
diff --git a/sources/inc/lang/hr/password.txt b/sources/inc/lang/hr/password.txt
new file mode 100644
index 0000000..bb156c2
--- /dev/null
+++ b/sources/inc/lang/hr/password.txt
@@ -0,0 +1,9 @@
+Pozdrav @FULLNAME@!
+
+Slijede podaci za @TITLE@ sa @DOKUWIKIURL@
+
+Korisničko ime : @LOGIN@
+Lozinka        : @PASSWORD@
+
+-- 
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/hr/preview.txt b/sources/inc/lang/hr/preview.txt
new file mode 100644
index 0000000..89ae86a
--- /dev/null
+++ b/sources/inc/lang/hr/preview.txt
@@ -0,0 +1,3 @@
+====== Pregled ======
+
+Ovo je pregled kako će izgledati Vaš dokument nakon što se snimi.
diff --git a/sources/inc/lang/hr/read.txt b/sources/inc/lang/hr/read.txt
new file mode 100644
index 0000000..221f1b2
--- /dev/null
+++ b/sources/inc/lang/hr/read.txt
@@ -0,0 +1 @@
+Ova stranica se može samo čitati. Možete vidjeti kod, ali ga ne možete mijenjati. Javite se vašem administratoru ako se s tim ne slažete.
\ No newline at end of file
diff --git a/sources/inc/lang/hr/recent.txt b/sources/inc/lang/hr/recent.txt
new file mode 100644
index 0000000..4145ca1
--- /dev/null
+++ b/sources/inc/lang/hr/recent.txt
@@ -0,0 +1,3 @@
+====== Nedavne izmjene ======
+
+Stranice koje su nedavno promijenjene.
diff --git a/sources/inc/lang/hr/register.txt b/sources/inc/lang/hr/register.txt
new file mode 100644
index 0000000..32a5489
--- /dev/null
+++ b/sources/inc/lang/hr/register.txt
@@ -0,0 +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.
diff --git a/sources/inc/lang/hr/resendpwd.txt b/sources/inc/lang/hr/resendpwd.txt
new file mode 100644
index 0000000..ed25f98
--- /dev/null
+++ b/sources/inc/lang/hr/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Slanje nove lozinke ======
+
+Ispunite potrebne podatke da biste dobili novu lozinku za Vaš korisnički račun. Link za potvrdu biti će poslan na Vašu email adresu.
diff --git a/sources/inc/lang/hr/revisions.txt b/sources/inc/lang/hr/revisions.txt
new file mode 100644
index 0000000..d224a56
--- /dev/null
+++ b/sources/inc/lang/hr/revisions.txt
@@ -0,0 +1,3 @@
+====== Stare verzije ======
+
+Slijedi spisak starih verzija za traženi dokument.
diff --git a/sources/inc/lang/hr/searchpage.txt b/sources/inc/lang/hr/searchpage.txt
new file mode 100644
index 0000000..91d9f9c
--- /dev/null
+++ b/sources/inc/lang/hr/searchpage.txt
@@ -0,0 +1 @@
+====== Rezultati pretraživanja ======
diff --git a/sources/inc/lang/hr/showrev.txt b/sources/inc/lang/hr/showrev.txt
new file mode 100644
index 0000000..aba2c0d
--- /dev/null
+++ b/sources/inc/lang/hr/showrev.txt
@@ -0,0 +1,2 @@
+**Ovo je stara verzija dokumenta!**
+----
diff --git a/sources/inc/lang/hr/stopwords.txt b/sources/inc/lang/hr/stopwords.txt
new file mode 100644
index 0000000..bc6eb48
--- /dev/null
+++ b/sources/inc/lang/hr/stopwords.txt
@@ -0,0 +1,29 @@
+# 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
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/hr/updateprofile.txt b/sources/inc/lang/hr/updateprofile.txt
new file mode 100644
index 0000000..8eab906
--- /dev/null
+++ b/sources/inc/lang/hr/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Izmjena korisničkog profila ======
+
+Ispunite samo polja koja želite mijenjati. Ne može se mijenjati korisničko ime.
diff --git a/sources/inc/lang/hu/admin.txt b/sources/inc/lang/hu/admin.txt
new file mode 100644
index 0000000..03d2924
--- /dev/null
+++ b/sources/inc/lang/hu/admin.txt
@@ -0,0 +1,3 @@
+===== Adminisztrálás =====
+
+Itt találod a DokuWiki adminisztrálási lehetőségeit.
diff --git a/sources/inc/lang/hu/adminplugins.txt b/sources/inc/lang/hu/adminplugins.txt
new file mode 100644
index 0000000..89fe373
--- /dev/null
+++ b/sources/inc/lang/hu/adminplugins.txt
@@ -0,0 +1 @@
+===== További modulok =====
\ No newline at end of file
diff --git a/sources/inc/lang/hu/backlinks.txt b/sources/inc/lang/hu/backlinks.txt
new file mode 100644
index 0000000..d457ab7
--- /dev/null
+++ b/sources/inc/lang/hu/backlinks.txt
@@ -0,0 +1,5 @@
+====== Hivatkozások ======
+
+Ez azoknak az oldalaknak a listája, amelyek erre az oldalra "visszamutatnak" (hivatkoznak).
+
+
diff --git a/sources/inc/lang/hu/conflict.txt b/sources/inc/lang/hu/conflict.txt
new file mode 100644
index 0000000..b823465
--- /dev/null
+++ b/sources/inc/lang/hu/conflict.txt
@@ -0,0 +1,7 @@
+====== Ú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.
+
+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 --git a/sources/inc/lang/hu/denied.txt b/sources/inc/lang/hu/denied.txt
new file mode 100644
index 0000000..0b06724
--- /dev/null
+++ b/sources/inc/lang/hu/denied.txt
@@ -0,0 +1,4 @@
+====== Hozzáférés megtagadva ======
+
+Sajnáljuk, nincs jogod a folytatáshoz. Esetleg elfelejtettél bejelentkezni?
+
diff --git a/sources/inc/lang/hu/diff.txt b/sources/inc/lang/hu/diff.txt
new file mode 100644
index 0000000..50bd067
--- /dev/null
+++ b/sources/inc/lang/hu/diff.txt
@@ -0,0 +1,4 @@
+====== Különbségek ======
+
+A kiválasztott változat és az aktuális verzió közötti különbségek a következők.
+
diff --git a/sources/inc/lang/hu/draft.txt b/sources/inc/lang/hu/draft.txt
new file mode 100644
index 0000000..cae980a
--- /dev/null
+++ b/sources/inc/lang/hu/draft.txt
@@ -0,0 +1,5 @@
+===== 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.
+
+Válassz a //helyreállítás// vagy a //törlés// opciók közül a piszkozat sorsát illetően vagy //megszakíthatod// a szerkesztési folyamatot.
\ No newline at end of file
diff --git a/sources/inc/lang/hu/edit.txt b/sources/inc/lang/hu/edit.txt
new file mode 100644
index 0000000..0992723
--- /dev/null
+++ b/sources/inc/lang/hu/edit.txt
@@ -0,0 +1 @@
+Szerkeszd az oldalt majd kattints a ''Mentés'' gombra! Lásd a [[wiki:syntax|formázás]] oldalt a formázási lehetőségekért. Kérünk, hogy csak akkor szerkeszd az oldalt ha **javítani** tudsz rajta. Ha ki akarsz próbálni dolgokat, akkor az első lépéseid a [[playground:playground|játszótéren]] tedd.
diff --git a/sources/inc/lang/hu/editrev.txt b/sources/inc/lang/hu/editrev.txt
new file mode 100644
index 0000000..e17662e
--- /dev/null
+++ b/sources/inc/lang/hu/editrev.txt
@@ -0,0 +1,2 @@
+**Egy korábbi változatot töltöttél be!** Ha elmented, akkor egy újabb aktuális verzió jön létre ezzel a tartalommal.
+----
diff --git a/sources/inc/lang/hu/index.txt b/sources/inc/lang/hu/index.txt
new file mode 100644
index 0000000..ebf1514
--- /dev/null
+++ b/sources/inc/lang/hu/index.txt
@@ -0,0 +1,4 @@
+====== Áttekintő (index) ======
+
+Az összes elérhető oldal áttekintése [[doku>namespaces|névterek]] szerint rendezve.
+
diff --git a/sources/inc/lang/hu/install.html b/sources/inc/lang/hu/install.html
new file mode 100644
index 0000000..c037393
--- /dev/null
+++ b/sources/inc/lang/hu/install.html
@@ -0,0 +1,26 @@
+
        Ez az oldal segít a DokuWiki kezdeti
+beállításában és a konfigurálásban. További információ
+ezen az oldalon
+található.
        
+
+
        A DokuWiki hagyományos fájlokat használ a wiki oldalak és a hozzájuk
+kapcsolódó információk (pl. képek, keresési indexek, korábbi változatok stb.)
+tárolásához. Emiatt a sikeres működés érdekében a DokuWikinek írási joggal
+kell rendelkeznie azokon a könyvtárakon, ahová ezek a
+fájlok kerülnek. Ez a Beállító Varázsló nem képes beállítani a könyvtárakhoz
+a szükséges jogosultságokat, azokat közvetlenül parancssorból kell megtenni,
+illetve tárhelyszolgáltatás igénybevétele esetén FTP kliens segítségével,
+vagy a tárhelyszolgáltató által rendelkezésre bocsátott beállítóeszköz
+(pl. cPanel) segítségével.
        
+
+
        A Beállító Varázsló felkészíti ezt a DokuWikit a hozzáférési listák
+(ACL-ek) használatára. Így
+az Adminisztrátor felhasználóval hozzáférünk az admin menühöz, mellyel
+bővítményeket telepíthetünk, felhasználókat és hozzáférési jogokat
+kezelhetünk, valamint változtathatunk a konfigurációs beállításokon.
+Ez tulajdonképpen nem szükséges a DokuWiki működéséhez, de megkönnyíti
+az adminisztrációt.
        
+
+
        Szakértők illetve speciális beállítást igénylő felhasználók további információkat
+találnak a következő oldalakon a telepítéssel
+és konfigurálási lehetőségekkel kapcsolatban.
        
diff --git a/sources/inc/lang/hu/lang.php b/sources/inc/lang/hu/lang.php
new file mode 100644
index 0000000..2622934
--- /dev/null
+++ b/sources/inc/lang/hu/lang.php
@@ -0,0 +1,334 @@
+
+ * @author Sandor TIHANYI 
+ * @author Siaynoq Mage 
+ * @author schilling.janos@gmail.com
+ * @author Szabó Dávid 
+ * @author Sándor TIHANYI 
+ * @author David Szabo 
+ * @author Marton Sebok 
+ * @author Serenity87HUN 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Oldal szerkesztése';
+$lang['btn_source']            = 'Oldalforrás megtekintése';
+$lang['btn_show']              = 'Oldal megtekintése';
+$lang['btn_create']            = 'Oldal létrehozása';
+$lang['btn_search']            = 'Keresés';
+$lang['btn_save']              = 'Mentés';
+$lang['btn_preview']           = 'Előnézet';
+$lang['btn_top']               = 'Vissza a tetejére';
+$lang['btn_newer']             = '<< Újabb változat';
+$lang['btn_older']             = 'Régebbi változat >>';
+$lang['btn_revs']              = 'Korábbi változatok';
+$lang['btn_recent']            = 'Legfrissebb változások';
+$lang['btn_upload']            = 'Feltöltés';
+$lang['btn_cancel']            = 'Mégsem';
+$lang['btn_index']             = 'Áttekintő';
+$lang['btn_secedit']           = 'Szerkesztés';
+$lang['btn_login']             = 'Bejelentkezés';
+$lang['btn_logout']            = 'Kijelentkezés';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Frissítés';
+$lang['btn_delete']            = 'Törlés';
+$lang['btn_back']              = 'Vissza';
+$lang['btn_backlink']          = 'Hivatkozások';
+$lang['btn_backtomedia']       = 'Vissza a médiafájlok kezeléséhez';
+$lang['btn_subscribe']         = 'Feliratkozás az oldalváltozásokra';
+$lang['btn_profile']           = 'Személyes beállítások';
+$lang['btn_reset']             = 'Alaphelyzet';
+$lang['btn_resendpwd']         = 'Jelszóváltoztatás';
+$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['btn_register']          = 'Regisztráció';
+$lang['btn_apply']             = 'Alkalmaz';
+$lang['btn_media']             = 'Médiakezelő';
+$lang['btn_deleteuser']        = 'Felhasználói fiókom eltávolítása';
+$lang['loggedinas']            = 'Belépett felhasználó: ';
+$lang['user']                  = 'Azonosító';
+$lang['pass']                  = 'Jelszó';
+$lang['newpass']               = 'Új jelszó';
+$lang['oldpass']               = 'Régi jelszó';
+$lang['passchk']               = 'még egyszer';
+$lang['remember']              = 'Emlékezz rám';
+$lang['fullname']              = 'Teljes név';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'Személyes beállítások';
+$lang['badlogin']              = 'Sajnáljuk, az azonosító vagy a jelszó nem jó.';
+$lang['badpassconfirm']        = 'Hibás jelszó';
+$lang['minoredit']             = 'Apróbb változások';
+$lang['draftdate']             = 'Piszkozat elmentve:';
+$lang['nosecedit']             = 'Időközben megváltozott az oldal, emiatt a szakasz nem friss. Töltsd újra az egész oldalt!';
+$lang['regmissing']            = 'Sajnáljuk, az összes mezőt ki kell töltened.';
+$lang['reguexists']            = 'Sajnáljuk, ilyen azonosítójú felhasználónk már van.';
+$lang['regsuccess']            = 'A felhasználói azonosítót létrehoztuk. A jelszót postáztuk.';
+$lang['regsuccess2']           = 'A felhasználói azonosítót létrehoztuk.';
+$lang['regmailfail']           = 'Úgy tűnik hiba történt a jelszó postázása során. Kérjük lépj kapcsolatba az Adminisztrátorokkal!';
+$lang['regbadmail']            = 'A megadott e-mail cím érvénytelennek tűnik. Ha úgy gondolod ez hiba, lépj kapcsolatba az Adminisztrátorokkal!';
+$lang['regbadpass']            = 'A két megadott jelszó nem egyezik, próbáld újra!';
+$lang['regpwmail']             = 'A DokuWiki jelszavad';
+$lang['reghere']               = 'Még nincs azonosítód? Itt kérhetsz';
+$lang['profna']                = 'Ez a wiki nem támogatja a személyes beállítások módosítását.';
+$lang['profnochange']          = 'Nem történt változás.';
+$lang['profnoempty']           = 'A név és e-mail mező nem maradhat üresen!';
+$lang['profchanged']           = 'A személyes beállítások változtatása megtörtént.';
+$lang['profnodelete']          = 'Ez a wiki nem támogatja a felhasználói fiókok törlését';
+$lang['profdeleteuser']        = 'Felhasználói fiók törlése';
+$lang['profdeleted']           = 'Felhasználói fiókodat eltávolítottuk erről a wiki-ről.';
+$lang['profconfdelete']        = 'Szeretném eltávolítani a felhasználói fiókomat erről a wikiről. 
         Ez a cselekvés nem visszavonható.';
+$lang['profconfdeletemissing'] = 'A megerősítő négyzet nincs bepipálva';
+$lang['pwdforget']             = 'Elfelejtetted a jelszavad? Itt kérhetsz újat';
+$lang['resendna']              = 'Ez a wiki nem támogatja a jelszó újraküldést.';
+$lang['resendpwd']             = 'Új jelszó beállítása a következőhöz:';
+$lang['resendpwdmissing']      = 'Sajnáljuk, az összes mezőt ki kell töltened.';
+$lang['resendpwdnouser']       = 'Sajnáljuk, ilyen azonosítójú felhasználónk nem létezik.';
+$lang['resendpwdbadauth']      = 'Sajnáljuk, ez a megerősítő kód nem helyes. Biztos, hogy a teljes megerősítő linket pontosan beírtad?';
+$lang['resendpwdconfirm']      = 'A megerősítő linket e-mailben elküldtük.';
+$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';
+$lang['maxuploadsize']         = 'Maximum %s méretű fájlokat tölthetsz fel.';
+$lang['lockedby']              = 'Jelenleg zárolta:';
+$lang['lockexpire']            = 'A zárolás lejár:';
+$lang['js']['willexpire']      = 'Az oldalszerkesztési zárolásod körülbelül egy percen belül lejár.\nAz ütközések elkerülése végett használd az előnézet gombot a zárolásod frissítéséhez.';
+$lang['js']['notsavedyet']     = 'Elmentetlen változások vannak, amelyek el fognak veszni.
+Tényleg ezt akarod?';
+$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']['mediatitle']      = 'Link beállítások';
+$lang['js']['mediadisplay']    = 'Link típusa';
+$lang['js']['mediaalign']      = 'Igazítás';
+$lang['js']['mediasize']       = 'Képméret';
+$lang['js']['mediatarget']     = 'Link célja';
+$lang['js']['mediaclose']      = 'Bezárás';
+$lang['js']['mediainsert']     = 'Beillesztés';
+$lang['js']['mediadisplayimg'] = 'Kép megtekintése.';
+$lang['js']['mediadisplaylnk'] = 'Link megtekintése.';
+$lang['js']['mediasmall']      = 'Kis méret';
+$lang['js']['mediamedium']     = 'Közepes méret';
+$lang['js']['medialarge']      = 'Nagy méret';
+$lang['js']['mediaoriginal']   = 'Eredeti verzió';
+$lang['js']['medialnk']        = 'Link a részletekre';
+$lang['js']['mediadirect']     = 'Közvetlen link az eredetire';
+$lang['js']['medianolnk']      = 'Nincs link';
+$lang['js']['medianolink']     = 'Ne linkelje a képet';
+$lang['js']['medialeft']       = 'Kép igazítása balra.';
+$lang['js']['mediaright']      = 'Kép igazítása jobbra.';
+$lang['js']['mediacenter']     = 'Kép igazítása középre.';
+$lang['js']['medianoalign']    = 'Nem legyen igazítás.';
+$lang['js']['nosmblinks']      = 'A Windows megosztott könyvtárak kereszthivatkozása csak Microsoft Internet Explorerben működik közvetlenül.\nA hivatkozást másolni és beszúrni ettől függetlenül mindig 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']['restore_confirm'] = 'Valóban visszaállítod ezt a verziót?';
+$lang['js']['media_diff']      = 'Különbségek megtekintése:';
+$lang['js']['media_diff_both'] = 'Egymás mellett';
+$lang['js']['media_diff_opacity'] = 'Áttetszően';
+$lang['js']['media_diff_portions'] = 'Húzással';
+$lang['js']['media_select']    = 'Fájlok kiválasztása...';
+$lang['js']['media_upload_btn'] = 'Feltöltés';
+$lang['js']['media_done_btn']  = 'Kész';
+$lang['js']['media_drop']      = 'Húzd ide a fájlokat a feltöltéshez';
+$lang['js']['media_cancel']    = 'eltávolítás';
+$lang['js']['media_overwrt']   = 'Meglévő fájlok felülírása';
+$lang['rssfailed']             = 'Hiba történt a hírfolyam betöltésekor: ';
+$lang['nothingfound']          = 'Üres mappa.';
+$lang['mediaselect']           = 'Médiafájl kiválasztása';
+$lang['fileupload']            = 'Médiafájl feltöltése';
+$lang['uploadsucc']            = 'Sikeres feltöltés';
+$lang['uploadfail']            = 'A feltöltés nem sikerült. Talán rosszak a jogosultságok?';
+$lang['uploadwrong']           = 'A feltöltés megtagadva. Ez a fájlkiterjesztés tiltott.';
+$lang['uploadexist']           = 'A fájl már létezik, nem történt semmi.';
+$lang['uploadbadcontent']      = 'A feltöltött tartalom nem egyezik a %s fájlkiterjesztéssel.';
+$lang['uploadspam']            = 'A feltöltést visszautasítottuk spam-gyanú miatt.';
+$lang['uploadxss']             = 'A feltöltést visszautasítottuk, mert lehetséges, hogy kártékony kódot tartalmaz.';
+$lang['uploadsize']            = 'A feltöltött fájl túl nagy. (max. %s)';
+$lang['deletesucc']            = 'A "%s" fájlt töröltük.';
+$lang['deletefail']            = 'A "%s" fájl nem törölhető - ellenőrizd a jogosultságokat!';
+$lang['mediainuse']            = 'A "%s" fájl nem törlődött - még használat alatt van!';
+$lang['namespaces']            = 'Névterek';
+$lang['mediafiles']            = 'Elérhető fájlok itt:';
+$lang['accessdenied']          = 'Nincs jogod az oldal megtekintésére.';
+$lang['mediausage']            = 'A következő formában hivatkozhatsz erre a fájlra:';
+$lang['mediaview']             = 'Eredeti fájl megtekintése';
+$lang['mediaroot']             = 'kiindulási hely';
+$lang['mediaupload']           = 'Itt tölthetsz fel állományt az aktuális névtérbe. Alnévtér létrehozásához a "Feltöltési név" mezőben kell kettősponttal elválasztva megadnod azt.';
+$lang['mediaextchange']        = 'Az állomány kiterjesztése erről: .%s erre: .%s változott!';
+$lang['reference']             = 'Hivatkozások';
+$lang['ref_inuse']             = 'A fájl nem törölhető, mert a következő oldalakon használják:';
+$lang['ref_hidden']            = 'Van néhány hivatkozás az oldalakon, amelyekhez nincs olvasási jogosultságod';
+$lang['hits']                  = 'Találatok';
+$lang['quickhits']             = 'Illeszkedő oldalnevek';
+$lang['toc']                   = 'Tartalomjegyzék';
+$lang['current']               = 'aktuális';
+$lang['yours']                 = 'A Te változatod';
+$lang['diff']                  = 'Különbségek az aktuális változathoz képest';
+$lang['diff2']                 = 'Különbségek a kiválasztott változatok között';
+$lang['difflink']              = 'Összehasonlító nézet linkje';
+$lang['diff_type']             = 'Összehasonlítás módja:';
+$lang['diff_inline']           = 'Sorok között';
+$lang['diff_side']             = 'Egymás mellett';
+$lang['line']                  = 'Sor';
+$lang['breadcrumb']            = 'Nyomvonal';
+$lang['youarehere']            = 'Itt vagy';
+$lang['lastmod']               = 'Utolsó módosítás';
+$lang['by']                    = 'szerkesztette:';
+$lang['deleted']               = 'eltávolítva';
+$lang['created']               = 'létrehozva';
+$lang['restored']              = 'régebbi változat helyreállítva (%s)';
+$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['tools']                 = 'Eszközök';
+$lang['user_tools']            = 'Felhasználói eszközök';
+$lang['site_tools']            = 'Eszközök a webhelyen';
+$lang['page_tools']            = 'Eszközök az oldalon';
+$lang['skip_to_content']       = 'ugrás a tartalomhoz';
+$lang['sidebar']               = 'Oldalsáv';
+$lang['mail_newpage']          = 'új oldal jött létre:';
+$lang['mail_changed']          = 'oldal megváltozott:';
+$lang['mail_subscribe_list']   = 'oldalak megváltoztak ebben a névtérben:';
+$lang['mail_new_user']         = 'új felhasználó:';
+$lang['mail_upload']           = 'új állományt töltöttek fel:';
+$lang['changes_type']          = 'A következő változásainak megtekintése:';
+$lang['pages_changes']         = 'Oldalak';
+$lang['media_changes']         = 'Médiafájlok';
+$lang['both_changes']          = 'Oldalak és médiafájlok';
+$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';
+$lang['qb_strike']             = 'Áthúzott szöveg';
+$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';
+$lang['qb_ol']                 = 'Sorszámozott lista elem';
+$lang['qb_ul']                 = 'Felsorolásos lista elem';
+$lang['qb_media']              = 'Képek és más fájlok hozzáadása';
+$lang['qb_sig']                = 'Aláírás beszúrása';
+$lang['qb_smileys']            = 'Smiley-k';
+$lang['qb_chars']              = 'Speciális karakterek';
+$lang['upperns']               = 'ugrás a tartalmazó névtérhez';
+$lang['admin_register']        = 'Új felhasználó';
+$lang['metaedit']              = 'Metaadatok szerkesztése';
+$lang['metasaveerr']           = 'A metaadatok írása nem sikerült';
+$lang['metasaveok']            = 'Metaadatok elmentve';
+$lang['img_backto']            = 'Vissza';
+$lang['img_title']             = 'Cím';
+$lang['img_caption']           = 'Képaláírás';
+$lang['img_date']              = 'Dátum';
+$lang['img_fname']             = 'Fájlnév';
+$lang['img_fsize']             = 'Méret';
+$lang['img_artist']            = 'Készítette';
+$lang['img_copyr']             = 'Szerzői jogok';
+$lang['img_format']            = 'Formátum';
+$lang['img_camera']            = 'Fényképezőgép típusa';
+$lang['img_keywords']          = 'Kulcsszavak';
+$lang['img_width']             = 'Szélesség';
+$lang['img_height']            = 'Magasság';
+$lang['img_manager']           = 'Megtekintés a médiakezelőben';
+$lang['subscr_subscribe_success'] = '%s hozzáadva az értesítési listához: %s';
+$lang['subscr_subscribe_error'] = 'Hiba történt %s hozzáadásakor az értesítési listához: %s';
+$lang['subscr_subscribe_noaddress'] = 'Nincs e-mail cím megadva az adataidnál, így a rendszer nem tudott hozzáadni az értesítési listához';
+$lang['subscr_unsubscribe_success'] = '%s eltávolítva az értesítési listából: %s';
+$lang['subscr_unsubscribe_error'] = 'Hiba történt %s eltávolításakor az értesítési listából: %s';
+$lang['subscr_already_subscribed'] = '%s már feliratkozott erre: %s';
+$lang['subscr_not_subscribed'] = '%s nincs feliratkozva erre: %s';
+$lang['subscr_m_not_subscribed'] = 'Jelenleg nem vagy feliratkozva erre az oldalra vagy névtérre';
+$lang['subscr_m_new_header']   = 'Feliratkozás hozzáadása';
+$lang['subscr_m_current_header'] = 'Feliratkozások';
+$lang['subscr_m_unsubscribe']  = 'Leiratkozás';
+$lang['subscr_m_subscribe']    = 'Feliratkozás';
+$lang['subscr_m_receive']      = 'Küldj';
+$lang['subscr_style_every']    = 'e-mailt minden változásról';
+$lang['subscr_style_digest']   = 'összefoglaló e-mailt oldalanként (minden %.2f nap)';
+$lang['subscr_style_list']     = 'egy listát a módosított oldalakról a legutóbbi e-mail óta (minden %.2f nap)';
+$lang['authtempfail']          = 'A felhasználó azonosítás átmenetileg nem működik. Ha sokáig így lenne, légy szíves értesítsd az Adminisztrátorokat!';
+$lang['authpwdexpire']         = 'A jelszavad %d nap múlva lejár, hamarosan meg kell változtatnod.';
+$lang['i_chooselang']          = 'Válassz nyelvet';
+$lang['i_installer']           = 'DokuWiki Beállító Varázsló';
+$lang['i_wikiname']            = 'A Wiki neve';
+$lang['i_enableacl']           = 'Hozzáférési listák engedélyezése (ajánlott)';
+$lang['i_superuser']           = 'Adminisztrátor';
+$lang['i_problems']            = 'A Beállító Varázsló a következő problémák miatt megakadt. Nem tudjuk folytatni, amíg ezek nincsenek elhárítva!';
+$lang['i_modified']            = 'Biztonsági okokból ez a Varázsló csak új és módosítatlan DokuWiki változaton működik.
+Csomagold ki újra a fájlokat a letöltött csomagból, vagy nézd meg a teljes Dokuwiki telepítési útmutatót.';
+$lang['i_funcna']              = 'A %s PHP funkció nem elérhető. Esetleg a tárhelyszolgáltató letiltotta biztonsági okok miatt?';
+$lang['i_phpver']              = 'A PHP %s verziója alacsonyabb, mint ami szükséges lenne: %s. Frissítsd a PHP-det újabb verzióra!';
+$lang['i_permfail']            = 'A DokiWiki nem tudja írni a %s könyvtárat. Be kell állítanod ehhez a könyvtárhoz a megfelelő jogosultságokat!';
+$lang['i_confexists']          = '%s már létezik.';
+$lang['i_writeerr']            = 'Nem tudom ezt létrehozni: %s. Ellenőrizd a könyvtár/fájl jogosultságokat, és hozd létre az állományt kézzel.';
+$lang['i_badhash']             = 'A dokuwiki.php nem felismerhető vagy módosított (hash=%s)';
+$lang['i_badval']              = '%s - nem helyes vagy üres érték';
+$lang['i_success']             = 'A beállítás sikeresen befejeződött. Most már letörölhető az install.php fájl. Látogasd meg az új DokuWikidet!';
+$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 lista házirend';
+$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á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['i_license']             = 'Kérlek, válassz licencet a feltöltött tartalomhoz:';
+$lang['i_license_none']        = 'Ne jelenítsen meg licenc információt';
+$lang['i_pop_field']           = 'Kérjük, segíts a DokuWiki továbbfejlesztésében:';
+$lang['i_pop_label']           = 'Havonta egyszer névtelen üzenet küldése a DokuWiki fejlesztőinek';
+$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';
+$lang['wordblock']             = 'A változásokat nem sikerült menteni, mert tiltott tartalom van benne (spam).';
+$lang['media_uploadtab']       = 'Feltöltés';
+$lang['media_searchtab']       = 'Keresés';
+$lang['media_file']            = 'Fájl';
+$lang['media_viewtab']         = 'Megtekintés';
+$lang['media_edittab']         = 'Szerkesztés';
+$lang['media_historytab']      = 'Korábbi változatok';
+$lang['media_list_thumbs']     = 'Bélyegképek';
+$lang['media_list_rows']       = 'Sorok';
+$lang['media_sort_name']       = 'Név';
+$lang['media_sort_date']       = 'Dátum';
+$lang['media_namespaces']      = 'Névtér kiválasztása';
+$lang['media_files']           = 'Fájlok itt: %s';
+$lang['media_upload']          = 'Feltöltés ide: %s';
+$lang['media_search']          = 'Keresés itt: %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s itt: %s';
+$lang['media_edit']            = '%s szerkesztése';
+$lang['media_history']         = '%s korábbi változatai';
+$lang['media_meta_edited']     = 'metaadatot szerkesztve';
+$lang['media_perm_read']       = 'Sajnáljuk, nincs jogod a fájlok olvasásához.';
+$lang['media_perm_upload']     = 'Sajnáljuk, nincs jogod a feltöltéshez.';
+$lang['media_update']          = 'Új verzió feltöltése';
+$lang['media_restore']         = 'Ezen verzió visszaállítása';
diff --git a/sources/inc/lang/hu/locked.txt b/sources/inc/lang/hu/locked.txt
new file mode 100644
index 0000000..004c461
--- /dev/null
+++ b/sources/inc/lang/hu/locked.txt
@@ -0,0 +1,4 @@
+====== Az oldal zárolva ======
+
+Ezt az oldalt épp szerkeszti egy másik felhasználó. Várnod kell, amíg a másik felhasználó befejezi, vagy amíg a zárolási ideje le nem jár.
+
diff --git a/sources/inc/lang/hu/login.txt b/sources/inc/lang/hu/login.txt
new file mode 100644
index 0000000..3f7e62e
--- /dev/null
+++ b/sources/inc/lang/hu/login.txt
@@ -0,0 +1,5 @@
+====== Belépés ======
+
+Nem vagy bejelentkezve! Add meg az azonosítási adataid a belépéshez lentebb! A böngésződben engedélyezned kell a sütik (cookies) fogadását a belépéshez.
+
+
diff --git a/sources/inc/lang/hu/mailtext.txt b/sources/inc/lang/hu/mailtext.txt
new file mode 100644
index 0000000..9b0c292
--- /dev/null
+++ b/sources/inc/lang/hu/mailtext.txt
@@ -0,0 +1,16 @@
+A DokuWikidben egy oldalt létrejött, vagy megváltozott. A részletek:
+
+Dátum: @DATE@
+Böngésző: @BROWSER@
+IP-cím: @IPADDRESS@
+Gép neve: @HOSTNAME@
+Előző változat: @OLDPAGE@
+Új változat: @NEWPAGE@
+Összefoglaló: @SUMMARY@
+Felhasználó: @USER@
+
+@DIFF@
+
+
+-- 
+Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta.
diff --git a/sources/inc/lang/hu/mailwrap.html b/sources/inc/lang/hu/mailwrap.html
new file mode 100644
index 0000000..50fc497
--- /dev/null
+++ b/sources/inc/lang/hu/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/hu/newpage.txt b/sources/inc/lang/hu/newpage.txt
new file mode 100644
index 0000000..de5a34d
--- /dev/null
+++ b/sources/inc/lang/hu/newpage.txt
@@ -0,0 +1,3 @@
+====== Ilyen oldal még nem létezik ======
+
+Egy nem létező oldalra tévedtél. Létrehozhatod az ''Oldal létrehozása'' gombra kattintva.
\ No newline at end of file
diff --git a/sources/inc/lang/hu/norev.txt b/sources/inc/lang/hu/norev.txt
new file mode 100644
index 0000000..1f4e672
--- /dev/null
+++ b/sources/inc/lang/hu/norev.txt
@@ -0,0 +1,5 @@
+====== Nincs ilyen változat ======
+
+A megadott változat nem létezik. Használd az ''Előző változatok'' gombot az előzmények listájának megtekintéséhez.
+
+
diff --git a/sources/inc/lang/hu/password.txt b/sources/inc/lang/hu/password.txt
new file mode 100644
index 0000000..db24b90
--- /dev/null
+++ b/sources/inc/lang/hu/password.txt
@@ -0,0 +1,10 @@
+Kedves @FULLNAME@!
+
+A felhasználói adataid a @TITLE@ wikihez, a következő helyen:  @DOKUWIKIURL@
+
+Azonosító: @LOGIN@
+Jelszó: @PASSWORD@
+
+-- 
+Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta.
+
diff --git a/sources/inc/lang/hu/preview.txt b/sources/inc/lang/hu/preview.txt
new file mode 100644
index 0000000..e04b2c8
--- /dev/null
+++ b/sources/inc/lang/hu/preview.txt
@@ -0,0 +1,3 @@
+====== Előnézet ======
+
+Ez a szöveged előnézete, így fog kinézni élesben. Viszont ez **még nincs elmentve**!
diff --git a/sources/inc/lang/hu/pwconfirm.txt b/sources/inc/lang/hu/pwconfirm.txt
new file mode 100644
index 0000000..da677d1
--- /dev/null
+++ b/sources/inc/lang/hu/pwconfirm.txt
@@ -0,0 +1,14 @@
+Szia @FULLNAME@!
+
+Te vagy más valaki kért egy új jelszót a @DOKUWIKIURL@
+címen lévő @TITLE@ wiki felhasználódhoz.
+
+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 kattints a
+következő linkre vagy másold a böngésződbe:
+
+@CONFIRM@
+
+-- 
+Ezt a levelet a @DOKUWIKIURL@ címen lévő DokuWiki generálta.
diff --git a/sources/inc/lang/hu/read.txt b/sources/inc/lang/hu/read.txt
new file mode 100644
index 0000000..223a6fe
--- /dev/null
+++ b/sources/inc/lang/hu/read.txt
@@ -0,0 +1 @@
+Ez az oldal csak olvasható. Megtekintheted a forrását, de nem változtathatod meg. Ha úgy gondolod, hogy ez helytelen, kérdezd az Adminisztrátorokat!
diff --git a/sources/inc/lang/hu/recent.txt b/sources/inc/lang/hu/recent.txt
new file mode 100644
index 0000000..4e0c1ec
--- /dev/null
+++ b/sources/inc/lang/hu/recent.txt
@@ -0,0 +1,5 @@
+====== Legutóbbi változások ======
+
+Az alábbi oldalak változtak legutoljára.
+
+
diff --git a/sources/inc/lang/hu/register.txt b/sources/inc/lang/hu/register.txt
new file mode 100644
index 0000000..523b720
--- /dev/null
+++ b/sources/inc/lang/hu/register.txt
@@ -0,0 +1,4 @@
+====== Új felhasználó regisztrálása ======
+
+Töltsd ki az összes alábbi adatot az új Wiki felhasználói azonosítód létrehozásához. Győződj meg róla, hogy **érvényes e-mail címet** adtál meg, mivel az új jelszavad erre a címre küldjük el. Az azonosítód érvényes [[doku>pagename|oldalnév]] kell legyen.
+
diff --git a/sources/inc/lang/hu/registermail.txt b/sources/inc/lang/hu/registermail.txt
new file mode 100644
index 0000000..d45ef0d
--- /dev/null
+++ b/sources/inc/lang/hu/registermail.txt
@@ -0,0 +1,13 @@
+Egy új felhasználó regisztrált a következő adatokkal:
+
+Felhasználói név: @NEWUSER@
+Teljes név: @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Dátum: @DATE@
+Böngésző: @BROWSER@
+IP-cím : @IPADDRESS@
+Gép neve: @HOSTNAME@
+
+-- 
+Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta.
\ No newline at end of file
diff --git a/sources/inc/lang/hu/resendpwd.txt b/sources/inc/lang/hu/resendpwd.txt
new file mode 100644
index 0000000..b73fa42
--- /dev/null
+++ b/sources/inc/lang/hu/resendpwd.txt
@@ -0,0 +1,3 @@
+===== Új jelszó kérése =====
+
+Kérlek, add meg a felhasználói azonosítód az új jelszó elküldéséhez. A jelszó cseréjéhez szükséges megerősítő linket elküldjük a regisztrált e-mail címedre.
\ No newline at end of file
diff --git a/sources/inc/lang/hu/resetpwd.txt b/sources/inc/lang/hu/resetpwd.txt
new file mode 100644
index 0000000..53b28d7
--- /dev/null
+++ b/sources/inc/lang/hu/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Új jelszó beállítása ======
+
+Kérlek, add meg az új jelszót a felhasználódhoz.
\ No newline at end of file
diff --git a/sources/inc/lang/hu/revisions.txt b/sources/inc/lang/hu/revisions.txt
new file mode 100644
index 0000000..3537fd6
--- /dev/null
+++ b/sources/inc/lang/hu/revisions.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/hu/searchpage.txt b/sources/inc/lang/hu/searchpage.txt
new file mode 100644
index 0000000..ffde87b
--- /dev/null
+++ b/sources/inc/lang/hu/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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) =====
\ No newline at end of file
diff --git a/sources/inc/lang/hu/showrev.txt b/sources/inc/lang/hu/showrev.txt
new file mode 100644
index 0000000..2131b4d
--- /dev/null
+++ b/sources/inc/lang/hu/showrev.txt
@@ -0,0 +1,2 @@
+**Ez a dokumentum egy előző változata!**
+----
diff --git a/sources/inc/lang/hu/stopwords.txt b/sources/inc/lang/hu/stopwords.txt
new file mode 100644
index 0000000..a8bd35c
--- /dev/null
+++ b/sources/inc/lang/hu/stopwords.txt
@@ -0,0 +1,39 @@
+# Ez egy szó-lista (soronként egy szóval), amelyeket az index készítésekor nem veszünk figyelembe.
+# Ha szerkeszted ezt a fájlt, győződj meg arról, hogy UNIX sorvég-jeleket használj! (csak NL karakter)
+# Nincs szükség 3 karakternél rövidebb szavak felsorolására, ezeket egyébként sem vesszük figyelembe.
+# Ez a lista a http://www.ranks.nl/stopwords/ oldalon szereplő alapján készült
+a
+az
+egy
+be
+ki
+le
+fel
+meg
+el
+át
+rá
+ide
+oda
+szét
+össze
+vissza
+de
+hát
+és
+vagy
+hogy
+van
+lesz
+volt
+csak
+nem
+igen
+mint
+én
+te
+ő
+mi
+ti
+ők
+ön
diff --git a/sources/inc/lang/hu/subscr_digest.txt b/sources/inc/lang/hu/subscr_digest.txt
new file mode 100644
index 0000000..b00e0bb
--- /dev/null
+++ b/sources/inc/lang/hu/subscr_digest.txt
@@ -0,0 +1,16 @@
+Szia,
+
+A @PAGE@ oldal a @TITLE wikiben megváltozott.
+Itt vannak az eltérések:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Régi verzió: @OLDPAGE@
+Új verzió: @NEWPAGE@
+
+Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @SUBSCRIBE@.
+
+--
+Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta.
\ No newline at end of file
diff --git a/sources/inc/lang/hu/subscr_form.txt b/sources/inc/lang/hu/subscr_form.txt
new file mode 100644
index 0000000..22fa940
--- /dev/null
+++ b/sources/inc/lang/hu/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Feliratkozás kezelés ======
+
+Ezen az oldalon van lehetőséged kezelni a feliratkozásaidat az adott oldalra vagy névtérre.
\ No newline at end of file
diff --git a/sources/inc/lang/hu/subscr_list.txt b/sources/inc/lang/hu/subscr_list.txt
new file mode 100644
index 0000000..13295ff
--- /dev/null
+++ b/sources/inc/lang/hu/subscr_list.txt
@@ -0,0 +1,13 @@
+Szia,
+
+A @PAGE@ névtérhez tartozó oldalak megváltoztak a @TITLE wikiben.
+A módosított oldalak a következők:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @SUBSCRIBE@.
+
+--
+Ezt a levelet a @DOKUWIKIURL@ DokuWiki generálta.
\ No newline at end of file
diff --git a/sources/inc/lang/hu/subscr_single.txt b/sources/inc/lang/hu/subscr_single.txt
new file mode 100644
index 0000000..e28226d
--- /dev/null
+++ b/sources/inc/lang/hu/subscr_single.txt
@@ -0,0 +1,20 @@
+Szia,
+
+A @PAGE@ oldal a @TITLE wikiben megváltozott.
+Az eltérések a következők:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dátum: @DATE@
+Felhasználó: @USER@
+Összefoglaló: @SUMMARY@
+Régi verzió: @OLDPAGE@
+Új verzió: @NEWPAGE@
+
+Ha nem szeretnél értesítéseket kapni, jelentkezz be a wiki-be itt: @DOKUWIKIURL@, majd ezen az oldalon tudsz leiratkozni: @NEWPAGE@.
+
+--
+Ezt a levelet a DokuWiki generálta
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/hu/updateprofile.txt b/sources/inc/lang/hu/updateprofile.txt
new file mode 100644
index 0000000..50df153
--- /dev/null
+++ b/sources/inc/lang/hu/updateprofile.txt
@@ -0,0 +1,3 @@
+===== Felhasználói adatok megváltoztatása =====
+
+Csak azt a mezőt kell kitöltened, amit változtatni szeretnél. A felhasználói nevet nem lehet megváltoztatni.
diff --git a/sources/inc/lang/hu/uploadmail.txt b/sources/inc/lang/hu/uploadmail.txt
new file mode 100644
index 0000000..c772ab2
--- /dev/null
+++ b/sources/inc/lang/hu/uploadmail.txt
@@ -0,0 +1,13 @@
+Fájlfeltöltés történt a DokuWikidben. Részletek:
+
+Állomány: @MEDIA@
+Dátum: @DATE@
+Böngésző: @BROWSER@
+IP-cím: @IPADDRESS@
+Gépnév: @HOSTNAME@
+Méret: @SIZE@
+MIME-típus: @MIME@
+Felhasználó: @USER@
+
+-- 
+Ezt a levelet @DOKUWIKIURL@ DokuWiki generálta.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/admin.txt b/sources/inc/lang/ia/admin.txt
new file mode 100644
index 0000000..f81ff31
--- /dev/null
+++ b/sources/inc/lang/ia/admin.txt
@@ -0,0 +1,3 @@
+====== Administration ======
+
+Hic infra se trova un lista de cargas administrative disponibile in DokuWiki.
diff --git a/sources/inc/lang/ia/adminplugins.txt b/sources/inc/lang/ia/adminplugins.txt
new file mode 100644
index 0000000..ad8f794
--- /dev/null
+++ b/sources/inc/lang/ia/adminplugins.txt
@@ -0,0 +1 @@
+===== Plug-ins additional =====
\ No newline at end of file
diff --git a/sources/inc/lang/ia/backlinks.txt b/sources/inc/lang/ia/backlinks.txt
new file mode 100644
index 0000000..de5d2ac
--- /dev/null
+++ b/sources/inc/lang/ia/backlinks.txt
@@ -0,0 +1,3 @@
+====== Retroligamines ======
+
+Isto es un lista de paginas que contine ligamines de retorno al pagina actual.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/conflict.txt b/sources/inc/lang/ia/conflict.txt
new file mode 100644
index 0000000..576cb7e
--- /dev/null
+++ b/sources/inc/lang/ia/conflict.txt
@@ -0,0 +1,5 @@
+====== Un version plus nove existe ======
+
+Existe un version plus nove del documento que tu ha modificate. Isto occurre si un altere usator cambia le documento durante que tu lo modifica.
+
+Examina minutiosemente le differentias monstrate hic infra, postea decide qual version debe esser conservate. Si tu selige ''salveguardar'', tu version essera salveguardate. Preme ''cancellar'' pro conservar le version actual.
diff --git a/sources/inc/lang/ia/denied.txt b/sources/inc/lang/ia/denied.txt
new file mode 100644
index 0000000..044e153
--- /dev/null
+++ b/sources/inc/lang/ia/denied.txt
@@ -0,0 +1,3 @@
+====== Permission refusate ======
+
+Pardono, tu non ha le derectos requisite pro continuar. Pote esser que tu ha oblidate de aperir un session.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/diff.txt b/sources/inc/lang/ia/diff.txt
new file mode 100644
index 0000000..dbfa70f
--- /dev/null
+++ b/sources/inc/lang/ia/diff.txt
@@ -0,0 +1,3 @@
+====== Differentias ======
+
+Isto te monstra le differentias inter duo versiones del pagina.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/draft.txt b/sources/inc/lang/ia/draft.txt
new file mode 100644
index 0000000..ae8de13
--- /dev/null
+++ b/sources/inc/lang/ia/draft.txt
@@ -0,0 +1,5 @@
+====== Version provisori trovate ======
+
+Tu ultime session de modification in iste pagina non ha essite concludite correctemente. DokuWiki ha automaticamente salveguardate un version provisori durante tu labor. Ora tu pote usar iste version provisori pro continuar le modification. Hic infra tu vide le datos salveguardate de tu ultime session.
+
+Per favor decide si tu vole //recuperar// le session de modification perdite, //deler// le version provisori o //cancellar// le processo de modification.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/edit.txt b/sources/inc/lang/ia/edit.txt
new file mode 100644
index 0000000..5bc5836
--- /dev/null
+++ b/sources/inc/lang/ia/edit.txt
@@ -0,0 +1 @@
+Modifica le pagina e preme "Salveguardar". Vide [[wiki:syntax]] pro le syntaxe wiki. Per favor modifica le paginas solmente si tu pote **meliorar** lo. Si tu vole testar alcun cosas, apprende facer tu prime passos in le [[playground:playground|parco de jocos]].
\ No newline at end of file
diff --git a/sources/inc/lang/ia/editrev.txt b/sources/inc/lang/ia/editrev.txt
new file mode 100644
index 0000000..192381f
--- /dev/null
+++ b/sources/inc/lang/ia/editrev.txt
@@ -0,0 +1,2 @@
+**Tu ha cargate un version ancian del documento!** Si tu lo salveguarda, tu crea un nove version con iste datos.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/ia/index.txt b/sources/inc/lang/ia/index.txt
new file mode 100644
index 0000000..5957cc2
--- /dev/null
+++ b/sources/inc/lang/ia/index.txt
@@ -0,0 +1,3 @@
+====== Indice ======
+
+Isto es un indice super tote le paginas disponibile, ordinate per [[doku>namespaces|spatio de nomines]].
diff --git a/sources/inc/lang/ia/install.html b/sources/inc/lang/ia/install.html
new file mode 100644
index 0000000..3b48bfd
--- /dev/null
+++ b/sources/inc/lang/ia/install.html
@@ -0,0 +1,13 @@
+
        Iste pagina te assiste in le prime installation e configuration de
+Dokuwiki. Ulterior informationes super iste installator es disponibile in le
+pagina de documentation de illo.
        
+
+
        DokuWiki usa files ordinari pro le immagazinage de paginas wiki e altere informationes associate con iste paginas (p.ex. imagines, indices de recerca, versiones ancian, etc). Pro poter functionar, DokuWiki
+debe haber accesso de scriptura al directorios que contine iste files. Iste installator non es capabile de configurar le permissiones de directorios. Isto normalmente debe esser facite directemente con le linea de commandos, o si tu usa un albergo web, via FTP o via le pannello de controlo de tu albergo (p.ex. cPanel).
        
+
+
        Iste installator configurara tu installation de DokuWiki pro
+ACL, lo que permitte crear contos administrator, e forni accesso al menu administrative de DokuWiki pro installar plug-ins, gerer usatores, gerer accesso a paginas wiki e alterar configurationes. Isto non es necessari pro le functionamento de DokuWiki, nonobstante, illo rendera DokuWiki plus facile de administrar.
        
+
+
        Le usatores experte o con exigentias special pro le installation deberea usar iste ligamines pro detalios concernente le
+instructiones de installation
+e configurationes.
        
diff --git a/sources/inc/lang/ia/lang.php b/sources/inc/lang/ia/lang.php
new file mode 100644
index 0000000..144dfe3
--- /dev/null
+++ b/sources/inc/lang/ia/lang.php
@@ -0,0 +1,262 @@
+
+ * @author Martijn Dekker 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Modificar iste pagina';
+$lang['btn_source']            = 'Monstrar codice-fonte';
+$lang['btn_show']              = 'Monstrar pagina';
+$lang['btn_create']            = 'Crear iste pagina';
+$lang['btn_search']            = 'Cercar';
+$lang['btn_save']              = 'Salveguardar';
+$lang['btn_preview']           = 'Previsualisar';
+$lang['btn_top']               = 'Retornar al initio';
+$lang['btn_newer']             = '<< plus recente';
+$lang['btn_older']             = 'minus recente >>';
+$lang['btn_revs']              = 'Versiones ancian';
+$lang['btn_recent']            = 'Modificationes recente';
+$lang['btn_upload']            = 'Incargar';
+$lang['btn_cancel']            = 'Cancellar';
+$lang['btn_index']             = 'Indice';
+$lang['btn_secedit']           = 'Modificar';
+$lang['btn_login']             = 'Aperir session';
+$lang['btn_logout']            = 'Clauder session';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Actualisar';
+$lang['btn_delete']            = 'Deler';
+$lang['btn_back']              = 'Retornar';
+$lang['btn_backlink']          = 'Retroligamines';
+$lang['btn_backtomedia']       = 'Retornar al selection de files multimedia';
+$lang['btn_subscribe']         = 'Gerer subscriptiones';
+$lang['btn_profile']           = 'Actualisar profilo';
+$lang['btn_reset']             = 'Reinitialisar';
+$lang['btn_draft']             = 'Modificar version provisori';
+$lang['btn_recover']           = 'Recuperar version provisori';
+$lang['btn_draftdel']          = 'Deler version provisori';
+$lang['btn_revert']            = 'Restaurar';
+$lang['btn_register']          = 'Crear conto';
+$lang['loggedinas']            = 'Session aperite como';
+$lang['user']                  = 'Nomine de usator';
+$lang['pass']                  = 'Contrasigno';
+$lang['newpass']               = 'Nove contrasigno';
+$lang['oldpass']               = 'Confirmar contrasigno actual';
+$lang['passchk']               = 'un altere vice';
+$lang['remember']              = 'Memorar me';
+$lang['fullname']              = 'Nomine real';
+$lang['email']                 = 'E-mail';
+$lang['profile']               = 'Profilo de usator';
+$lang['badlogin']              = 'Le nomine de usator o le contrasigno es incorrecte.';
+$lang['minoredit']             = 'Modificationes minor';
+$lang['draftdate']             = 'Version provisori automaticamente salveguardate le';
+$lang['nosecedit']             = 'Le pagina ha essite modificate intertanto. Le informationes del section es ora obsolete, dunque le pagina complete ha essite cargate in su loco.';
+$lang['regmissing']            = 'Es necessari completar tote le campos.';
+$lang['reguexists']            = 'Regrettabilemente, un usator con iste nomine ja existe.';
+$lang['regsuccess']            = 'Le conto ha essite create e le contrasigno ha essite inviate per e-mail.';
+$lang['regsuccess2']           = 'Le conto ha essite create.';
+$lang['regmailfail']           = 'Il pare que un error occurreva durante le invio del message con le contrasigno. Per favor contacta le administrator!';
+$lang['regbadmail']            = 'Le adresse de e-mail date pare esser invalide. Si tu pensa que isto es un error, contacta le administrator.';
+$lang['regbadpass']            = 'Le duo contrasignos date non es identic. Per favor reproba.';
+$lang['regpwmail']             = 'Tu contrasigno de DokuWiki';
+$lang['reghere']               = 'Tu non ha ancora un conto? Crea un, simplemente.';
+$lang['profna']                = 'Iste wiki non supporta le modification de profilos.';
+$lang['profnochange']          = 'Nulle modification, nihil a facer.';
+$lang['profnoempty']           = 'Un nomine o adresse de e-mail vacue non es permittite.';
+$lang['profchanged']           = 'Actualisation del profilo de usator succedite.';
+$lang['pwdforget']             = 'Contrasigno oblidate? Obtene un altere';
+$lang['resendna']              = 'Iste wiki non supporta le invio de un nove contrasigno.';
+$lang['resendpwdmissing']      = 'Es necessari completar tote le campos.';
+$lang['resendpwdnouser']       = 'Iste usator non ha essite trovate in le base de datos.';
+$lang['resendpwdbadauth']      = 'Iste codice de authentication non es valide. Assecura te que tu ha usate le ligamine de confirmation complete.';
+$lang['resendpwdconfirm']      = 'Un ligamine de confirmation ha essite inviate per e-mail.';
+$lang['resendpwdsuccess']      = 'Tu nove contrasigno ha essite inviate per e-mail.';
+$lang['license']               = 'Excepte ubi indicate alteremente, le contento in iste wiki es disponibile sub le licentia sequente:';
+$lang['licenseok']             = 'Nota ben! Per modificar iste pagina tu accepta que tu contento essera publicate sub le conditiones del licentia sequente:';
+$lang['searchmedia']           = 'Cercar file con nomine:';
+$lang['searchmedia_in']        = 'Cercar in %s';
+$lang['txt_upload']            = 'Selige le file a incargar';
+$lang['txt_filename']          = 'Incargar como (optional)';
+$lang['txt_overwrt']           = 'Reimplaciar le file existente';
+$lang['lockedby']              = 'Actualmente serrate per';
+$lang['lockexpire']            = 'Serratura expira le';
+$lang['js']['willexpire']            = 'Tu serratura super le modification de iste pagina expirara post un minuta.\nPro evitar conflictos, usa le button Previsualisar pro reinitialisar le timer del serratura.';
+$lang['js']['notsavedyet']     = 'Le modificationes non salveguardate essera perdite.\nRealmente continuar?';
+$lang['rssfailed']             = 'Un error occurreva durante le obtention de iste syndication:';
+$lang['nothingfound']          = 'Nihil ha essite trovate.';
+$lang['mediaselect']           = 'Files multimedia';
+$lang['fileupload']            = 'Incargar file multimedia';
+$lang['uploadsucc']            = 'Incargamento succedite';
+$lang['uploadfail']            = 'Incargamento fallite. Pote esser que le permissiones es incorrecte.';
+$lang['uploadwrong']           = 'Incargamento refusate. Iste typo de file es prohibite!';
+$lang['uploadexist']           = 'File ja existe. Nihil facite.';
+$lang['uploadbadcontent']      = 'Le typo del contento incargate non corresponde al extension del nomine de file "%s".';
+$lang['uploadspam']            = 'Le incargamento ha essite blocate per le lista nigre anti-spam.';
+$lang['uploadxss']             = 'Le incargamento ha essite blocate a causa de contento possibilemente malitiose.';
+$lang['uploadsize']            = 'Le file incargate es troppo grande. (Max. %s)';
+$lang['deletesucc']            = 'Le file "%s" ha essite delite.';
+$lang['deletefail']            = '"%s" non poteva esser delite. Verifica le permissiones.';
+$lang['mediainuse']            = 'Le file "%s" non ha essite delite proque illo es ancora in uso.';
+$lang['namespaces']            = 'Spatios de nomines';
+$lang['mediafiles']            = 'Files disponibile in';
+$lang['js']['searchmedia']     = 'Cercar files';
+$lang['js']['keepopen']        = 'Mantener fenestra aperte post selection';
+$lang['js']['hidedetails']     = 'Celar detalios';
+$lang['js']['mediatitle']      = 'Configuration del ligamine';
+$lang['js']['mediadisplay']    = 'Typo de ligamine';
+$lang['js']['mediaalign']      = 'Alineamento';
+$lang['js']['mediasize']       = 'Dimension del imagine';
+$lang['js']['mediatarget']     = 'Destination del ligamine';
+$lang['js']['mediaclose']      = 'Clauder';
+$lang['js']['mediainsert']     = 'Inserer';
+$lang['js']['mediadisplayimg'] = 'Monstrar le imagine.';
+$lang['js']['mediadisplaylnk'] = 'Monstrar solmente le imagine.';
+$lang['js']['mediasmall']      = 'Version parve';
+$lang['js']['mediamedium']     = 'Version medie';
+$lang['js']['medialarge']      = 'Version grande';
+$lang['js']['mediaoriginal']   = 'Version original';
+$lang['js']['medialnk']        = 'Ligamine al pagina de detalios';
+$lang['js']['mediadirect']     = 'Ligamine directe verso le original';
+$lang['js']['medianolnk']      = 'Nulle ligamine';
+$lang['js']['medianolink']     = 'Non ligar verso le imagine';
+$lang['js']['medialeft']       = 'Alinear le imagine verso le sinistra.';
+$lang['js']['mediaright']      = 'Alinear le imagine verso le dextra.';
+$lang['js']['mediacenter']     = 'Alinear le imagine in le medio.';
+$lang['js']['medianoalign']    = 'Non alinear.';
+$lang['js']['nosmblinks']      = 'Le ligamines a ressources de Windows functiona solmente in Microsoft Internet Explorer.
+Tu pote nonobstante copiar e collar le ligamine.';
+$lang['js']['linkwiz']         = 'Assistente pro ligamines';
+$lang['js']['linkto']          = 'Ligar verso:';
+$lang['js']['del_confirm']     = 'Realmente deler le entrata(s) seligite?';
+$lang['mediausage']            = 'Usa le syntaxe sequente pro referer a iste file:';
+$lang['mediaview']             = 'Vider file original';
+$lang['mediaroot']             = 'radice';
+$lang['mediaupload']           = 'Incarga hic un file in le spatio de nomines actual. Pro crear subspatios de nomines, antepone los al nomine de file "Incargar como", separate per signos de duo punctos (":").';
+$lang['mediaextchange']        = 'Extension del file cambiate de .%s a .%s!';
+$lang['reference']             = 'Referentias pro';
+$lang['ref_inuse']             = 'Le file non pote esser delite proque illo es ancora in uso per le sequente paginas:';
+$lang['ref_hidden']            = 'Alcun referentias es in paginas pro le quales tu non ha le permission de lectura';
+$lang['hits']                  = 'Resultatos';
+$lang['quickhits']             = 'Nomines de pagina correspondente';
+$lang['toc']                   = 'Tabula de contento';
+$lang['current']               = 'actual';
+$lang['yours']                 = 'Tu version';
+$lang['diff']                  = 'Monstrar differentias con versiones actual';
+$lang['diff2']                 = 'Monstrar differentias inter le versiones seligite';
+$lang['line']                  = 'Linea';
+$lang['breadcrumb']            = 'Tracia';
+$lang['youarehere']            = 'Tu es hic';
+$lang['lastmod']               = 'Ultime modification';
+$lang['by']                    = 'per';
+$lang['deleted']               = 'removite';
+$lang['created']               = 'create';
+$lang['restored']              = 'ancian version restaurate (%s)';
+$lang['external_edit']         = 'modification externe';
+$lang['summary']               = 'Modificar summario';
+$lang['noflash']               = 'Le plug-in Flash de Adobe es necessari pro monstrar iste contento.';
+$lang['download']              = 'Discargar fragmento';
+$lang['mail_newpage']          = 'pagina addite:';
+$lang['mail_changed']          = 'pagina modificate:';
+$lang['mail_subscribe_list']   = 'paginas modificate in spatio de nomines:';
+$lang['mail_new_user']         = 'nove usator:';
+$lang['mail_upload']           = 'file incargate:';
+$lang['qb_bold']               = 'Texto grasse';
+$lang['qb_italic']             = 'Texto italic';
+$lang['qb_underl']             = 'Texto sublineate';
+$lang['qb_code']               = 'Texto de codice';
+$lang['qb_strike']             = 'Texto cancellate';
+$lang['qb_h1']                 = 'Titulo a nivello 1';
+$lang['qb_h2']                 = 'Titulo a nivello 2';
+$lang['qb_h3']                 = 'Titulo a nivello 3';
+$lang['qb_h4']                 = 'Titulo a nivello 4';
+$lang['qb_h5']                 = 'Titulo a nivello 5';
+$lang['qb_h']                  = 'Titulo';
+$lang['qb_hs']                 = 'Seliger titulo';
+$lang['qb_hplus']              = 'Titulo superior';
+$lang['qb_hminus']             = 'Titulo inferior';
+$lang['qb_hequal']             = 'Titulo al mesme nivello';
+$lang['qb_link']               = 'Ligamine interne';
+$lang['qb_extlink']            = 'Ligamine externe';
+$lang['qb_hr']                 = 'Linea horizontal';
+$lang['qb_ol']                 = 'Elemento de lista ordinate';
+$lang['qb_ul']                 = 'Elemento de lista non ordinate';
+$lang['qb_media']              = 'Adder imagines e altere files';
+$lang['qb_sig']                = 'Inserer signatura';
+$lang['qb_smileys']            = 'Emoticones     ';
+$lang['qb_chars']              = 'Characteres special';
+$lang['upperns']               = 'Saltar al spatio de nomines superior';
+$lang['admin_register']        = 'Adder nove usator';
+$lang['metaedit']              = 'Modificar metadatos';
+$lang['metasaveerr']           = 'Scriptura de metadatos fallite';
+$lang['metasaveok']            = 'Metadatos salveguardate';
+$lang['img_backto']            = 'Retornar a';
+$lang['img_title']             = 'Titulo';
+$lang['img_caption']           = 'Legenda';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nomine de file';
+$lang['img_fsize']             = 'Dimension';
+$lang['img_artist']            = 'Photographo';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Parolas-clave';
+$lang['subscr_subscribe_success'] = '%s addite al lista de subscription de %s';
+$lang['subscr_subscribe_error'] = 'Error durante le addition de %s al lista de subscription de %s';
+$lang['subscr_subscribe_noaddress'] = 'Il non ha un adresse associate con tu conto. Tu non pote esser addite al lista de subscription.';
+$lang['subscr_unsubscribe_success'] = '%s removite del lista de subscription de %s';
+$lang['subscr_unsubscribe_error'] = 'Error durante le remotion de %s del lista de subscription de %s';
+$lang['subscr_already_subscribed'] = '%s es ja subscribite a %s';
+$lang['subscr_not_subscribed'] = '%s non es subscribite a %s';
+$lang['subscr_m_not_subscribed'] = 'Tu non es actualmente subscribite al pagina o spatio de nomines actual.';
+$lang['subscr_m_new_header']   = 'Adder subscription';
+$lang['subscr_m_current_header'] = 'Subscriptiones actual';
+$lang['subscr_m_unsubscribe']  = 'Cancellar subscription';
+$lang['subscr_m_subscribe']    = 'Subscriber';
+$lang['subscr_m_receive']      = 'Reciper';
+$lang['subscr_style_every']    = 'un message pro cata modification';
+$lang['authtempfail']          = 'Le authentication de usator temporarimente non es disponibile. Si iste situation persiste, per favor informa le administrator de tu wiki.';
+$lang['i_chooselang']          = 'Selige tu lingua';
+$lang['i_installer']           = 'Installator de DokuWiki';
+$lang['i_wikiname']            = 'Nomine del wiki';
+$lang['i_enableacl']           = 'Activar ACL (recommendate)';
+$lang['i_superuser']           = 'Superusator';
+$lang['i_problems']            = 'Le installator ha trovate alcun problemas, indicate hic infra. Tu debe resolver iste problemas pro poter continuar.';
+$lang['i_modified']            = 'Pro motivos de securitate, iste script functiona solmente con un installation de DokuWiki nove e non modificate.
+Tu debe re-extraher le files del pacchetto discargate, o consultar le instructiones de installation complete pro altere optiones.';
+$lang['i_funcna']              = 'Le function PHP %s non es disponibile. Pote esser que tu albergo web lo ha disactivate pro un ration o altere.';
+$lang['i_phpver']              = 'Le version de PHP %s es plus ancian que le version requisite %s. Es necessari actualisar le installation de PHP.';
+$lang['i_permfail']            = '%s non permitte le accesso de scriptura a DokuWiki. Tu debe reparar le permissiones de iste directorio!';
+$lang['i_confexists']          = '%s ja existe';
+$lang['i_writeerr']            = 'Impossibile crear %s. Tu debe verificar le permissiones de directorios/files e crear iste file manualmente.';
+$lang['i_badhash']             = 'dokuwiki.php non recognoscite o modificate (hash=%s)';
+$lang['i_badval']              = '%s - valor vacue o invalide';
+$lang['i_success']             = 'Le configuration ha succedite. Tu pote ora deler le file install.php. Continua a
+tu nove DokuWiki.';
+$lang['i_failure']             = 'Alcun errores occurreva durante le scriptura del files de configuration. Es possibile que tu debe remediar iste errores manualmente ante que
+tu pote usar tu nove DokuWiki.';
+$lang['i_policy']              = 'Politica de ACL interne';
+$lang['i_pol0']                = 'Wiki aperte (lectura, scriptura, incargamento pro omnes)';
+$lang['i_pol1']                = 'Wiki public (lectura pro omnes, scriptura e incargamento pro usatores registrate)';
+$lang['i_pol2']                = 'Wiki claudite (lectura, scriptura e incargamento solmente pro usatores registrate)';
+$lang['i_retry']               = 'Reprobar';
+$lang['recent_global']         = 'Tu observa actualmente le modificationes intra le spatio de nomines %s. Tu pote etiam vider le modificationes recente de tote le wiki.';
+$lang['years']                 = '%d annos retro';
+$lang['months']                = '%d menses retro';
+$lang['weeks']                 = '%d septimanas retro';
+$lang['days']                  = '%d dies retro';
+$lang['hours']                 = '%d horas retro';
+$lang['minutes']               = '%d minutas retro';
+$lang['seconds']               = '%d secundas retro';
diff --git a/sources/inc/lang/ia/locked.txt b/sources/inc/lang/ia/locked.txt
new file mode 100644
index 0000000..726aabb
--- /dev/null
+++ b/sources/inc/lang/ia/locked.txt
@@ -0,0 +1,3 @@
+====== Pagina serrate ======
+
+Iste pagina es actualmente serrate proque un altere usator lo modifica in iste momento. Tu debe attender usque iste usator fini le modification o usque al expiration del serratura.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/login.txt b/sources/inc/lang/ia/login.txt
new file mode 100644
index 0000000..4c428f3
--- /dev/null
+++ b/sources/inc/lang/ia/login.txt
@@ -0,0 +1,3 @@
+====== Aperir session ======
+
+Tu non es identificate! Entra tu credentiales de authentication pro aperir un session. Tu debe haber activate le cookies pro aperir un session.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/mailtext.txt b/sources/inc/lang/ia/mailtext.txt
new file mode 100644
index 0000000..14c1a3a
--- /dev/null
+++ b/sources/inc/lang/ia/mailtext.txt
@@ -0,0 +1,17 @@
+Un pagina in tu DokuWiki ha essite addite o modificate. Ecce le detalios:
+
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
+Nomine host : @HOSTNAME@
+Version ancian: @OLDPAGE@
+Version nove: @NEWPAGE@
+Summario: @SUMMARY@
+Usator : @USER@
+
+@DIFF@
+
+
+-- 
+Iste e-mail ha essite generate per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ia/newpage.txt b/sources/inc/lang/ia/newpage.txt
new file mode 100644
index 0000000..8db7aa7
--- /dev/null
+++ b/sources/inc/lang/ia/newpage.txt
@@ -0,0 +1,3 @@
+====== Iste topico non existe ancora ======
+
+Tu ha sequite un ligamine verso un topico que non existe ancora. Si tu ha le permission requisite, tu pote crear lo con le button "Crear iste pagina".
\ No newline at end of file
diff --git a/sources/inc/lang/ia/norev.txt b/sources/inc/lang/ia/norev.txt
new file mode 100644
index 0000000..75e44b9
--- /dev/null
+++ b/sources/inc/lang/ia/norev.txt
@@ -0,0 +1,3 @@
+====== Version non existe ======
+
+Le version specificate non existe. Usa le button "Versiones ancian" pro un lista de versiones ancian de iste documento.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/password.txt b/sources/inc/lang/ia/password.txt
new file mode 100644
index 0000000..9ad93d6
--- /dev/null
+++ b/sources/inc/lang/ia/password.txt
@@ -0,0 +1,10 @@
+Salute @FULLNAME@!
+
+Ecce tu datos de usator pro @TITLE@ a @DOKUWIKIURL@
+
+Nomine de usator : @LOGIN@
+Contrasigno : @PASSWORD@
+
+-- 
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ia/preview.txt b/sources/inc/lang/ia/preview.txt
new file mode 100644
index 0000000..22b958b
--- /dev/null
+++ b/sources/inc/lang/ia/preview.txt
@@ -0,0 +1,3 @@
+====== Previsualisation ======
+
+Isto es un previsualisation de tu texto. Memora: le pagina **non** ha ancora essite salveguardate!
\ No newline at end of file
diff --git a/sources/inc/lang/ia/pwconfirm.txt b/sources/inc/lang/ia/pwconfirm.txt
new file mode 100644
index 0000000..a490f79
--- /dev/null
+++ b/sources/inc/lang/ia/pwconfirm.txt
@@ -0,0 +1,14 @@
+Salute @FULLNAME@!
+
+Alcuno ha requestate un nove contrasigno pro tu conto de @TITLE@
+a @DOKUWIKIURL@
+
+Si tu non ha requestate un nove contrasigno, alora simplemente ignora iste message.
+
+Pro confirmar que le requesta realmente ha essite inviate per te, per favor usa le ligamine sequente.
+
+@CONFIRM@
+
+-- 
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ia/read.txt b/sources/inc/lang/ia/read.txt
new file mode 100644
index 0000000..e7e80db
--- /dev/null
+++ b/sources/inc/lang/ia/read.txt
@@ -0,0 +1 @@
+Iste pagina es pro lectura solmente. Tu pote vider le codice-fonte, ma non modificar lo. Contacta tu administrator si tu pensa que isto es errate.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/recent.txt b/sources/inc/lang/ia/recent.txt
new file mode 100644
index 0000000..ba39c3f
--- /dev/null
+++ b/sources/inc/lang/ia/recent.txt
@@ -0,0 +1,3 @@
+====== Modificationes recente ======
+
+Le sequente paginas ha essite modificate recentemente.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/register.txt b/sources/inc/lang/ia/register.txt
new file mode 100644
index 0000000..22c4e4a
--- /dev/null
+++ b/sources/inc/lang/ia/register.txt
@@ -0,0 +1,3 @@
+====== Crear un nove conto de usator ======
+
+Completa tote le informationes hic infra pro crear un nove conto in iste wiki. Assecura te de fornir un **adresse de e-mail valide!** Si le systema non te demanda de entrar un contrasigno hic, un nove contrasigno essera inviate a iste adresse. Le nomine de usator debe esser un [[doku>pagename|nomine de pagina]] valide.
diff --git a/sources/inc/lang/ia/registermail.txt b/sources/inc/lang/ia/registermail.txt
new file mode 100644
index 0000000..c4e9d56
--- /dev/null
+++ b/sources/inc/lang/ia/registermail.txt
@@ -0,0 +1,14 @@
+Un nove conto de usator ha essite create. Ecce le detalios:
+
+Nomine de usator : @NEWUSER@
+Nomine complete : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
+Nomine host : @HOSTNAME@
+
+-- 
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ia/resendpwd.txt b/sources/inc/lang/ia/resendpwd.txt
new file mode 100644
index 0000000..97bcac0
--- /dev/null
+++ b/sources/inc/lang/ia/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Inviar nove contrasigno ======
+
+Per favor entra tu nomine de usator in le formulario hic infra pro requestar un nove contrasigno pro tu conto in iste wiki. Un ligamine de confirmation essera inviate a tu adresse de e-mail registrate.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/revisions.txt b/sources/inc/lang/ia/revisions.txt
new file mode 100644
index 0000000..e914edb
--- /dev/null
+++ b/sources/inc/lang/ia/revisions.txt
@@ -0,0 +1,3 @@
+====== Versiones ancian ======
+
+Ecce le versiones ancian del documento presente. Pro reverter lo a un version ancian, selige un version del lista in basso, clicca "Modificar iste pagina" e salveguarda lo.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/searchpage.txt b/sources/inc/lang/ia/searchpage.txt
new file mode 100644
index 0000000..c536833
--- /dev/null
+++ b/sources/inc/lang/ia/searchpage.txt
@@ -0,0 +1,5 @@
+====== Recerca ======
+
+Le resultatos de tu recerca se trova hic infra. Si tu non ha trovate lo que tu cerca, tu pote crear o modificar le pagina nominate secundo tu consulta con le button appropriate.
+
+===== Resultatos =====
\ No newline at end of file
diff --git a/sources/inc/lang/ia/showrev.txt b/sources/inc/lang/ia/showrev.txt
new file mode 100644
index 0000000..60ee2a7
--- /dev/null
+++ b/sources/inc/lang/ia/showrev.txt
@@ -0,0 +1,2 @@
+**Isto es un version ancian del documento!**
+----
\ No newline at end of file
diff --git a/sources/inc/lang/ia/stopwords.txt b/sources/inc/lang/ia/stopwords.txt
new file mode 100644
index 0000000..e3e5135
--- /dev/null
+++ b/sources/inc/lang/ia/stopwords.txt
@@ -0,0 +1,38 @@
+# Isto es un lista de parolas que le generator de indices ignora, un parola per linea.
+# Si tu modifica iste file, assecura te de usar le fines de linea UNIX (newline singule).
+# Non es necessari includer parolas plus curte que 3 characteres - istes es ignorate in omne caso.
+a
+ab
+circa
+com
+como
+como
+con
+de
+e
+es
+essera
+esserea
+esseva
+essite
+ex
+illo
+in
+iste
+istes
+le
+le
+les
+lo
+lor
+o
+pro
+quando
+que
+qui
+super
+sur
+tu
+ubi
+un
+www
diff --git a/sources/inc/lang/ia/subscr_digest.txt b/sources/inc/lang/ia/subscr_digest.txt
new file mode 100644
index 0000000..ba7b92d
--- /dev/null
+++ b/sources/inc/lang/ia/subscr_digest.txt
@@ -0,0 +1,20 @@
+Salute!
+
+Le pagina @PAGE@ in le wiki @TITLE@ ha cambiate.
+Ecce le modificationes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Version ancian: @OLDPAGE@
+Version nove: @NEWPAGE@
+
+Pro cancellar le notificationes de paginas, aperi un session al wiki a
+@DOKUWIKIURL@ postea visita
+@SUBSCRIBE@
+e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ia/subscr_form.txt b/sources/inc/lang/ia/subscr_form.txt
new file mode 100644
index 0000000..f63a30d
--- /dev/null
+++ b/sources/inc/lang/ia/subscr_form.txt
@@ -0,0 +1,4 @@
+====== Gestion de subscriptiones ======
+
+Iste pagina permitte gerer tu subscriptiones pro le pagina e spatio de nomines actual.
+	
\ No newline at end of file
diff --git a/sources/inc/lang/ia/subscr_list.txt b/sources/inc/lang/ia/subscr_list.txt
new file mode 100644
index 0000000..9f93db2
--- /dev/null
+++ b/sources/inc/lang/ia/subscr_list.txt
@@ -0,0 +1,17 @@
+Salute!
+
+Alcun paginas in le spatio de nomines @PAGE@ del wiki @TITLE@ ha cambiate.
+Ecce le paginas con modiicationes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pro cancellar le notificationes de paginas, aperi un session al wiki a
+@DOKUWIKIURL@ postea visita
+@SUBSCRIBE@
+e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ia/subscr_single.txt b/sources/inc/lang/ia/subscr_single.txt
new file mode 100644
index 0000000..445df19
--- /dev/null
+++ b/sources/inc/lang/ia/subscr_single.txt
@@ -0,0 +1,26 @@
+Salute!
+
+Le pagina @PAGE@ in le wiki @TITLE@ ha cambiate.
+Ecce le modificationes:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Usator : @USER@
+Summario: @SUMMARY@
+Version ancian: @OLDPAGE@
+Version nove: @NEWPAGE@
+
+Pro cancellar le notificationes de paginas, aperi un session al wiki a
+@DOKUWIKIURL@ postea visita
+@SUBSCRIBE@
+e cancella tu subscription al modificationes in paginas e/o spatios de nomines.
+
+--
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@
+--
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ia/updateprofile.txt b/sources/inc/lang/ia/updateprofile.txt
new file mode 100644
index 0000000..3968d3c
--- /dev/null
+++ b/sources/inc/lang/ia/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Actualisa le profilo de tu conto ======
+
+Solmente es necessari completar le campos que tu vole cambiar. Non es possibile cambiar tu nomine de usator.
\ No newline at end of file
diff --git a/sources/inc/lang/ia/uploadmail.txt b/sources/inc/lang/ia/uploadmail.txt
new file mode 100644
index 0000000..8f120f2
--- /dev/null
+++ b/sources/inc/lang/ia/uploadmail.txt
@@ -0,0 +1,14 @@
+Un file ha essite incargate in tu DokuWiki. Ecce le detalios:
+
+File : @MEDIA@
+Data : @DATE@
+Navigator : @BROWSER@
+Adresse IP : @IPADDRESS@
+Nomine host: @HOSTNAME@
+Dimension : @SIZE@
+Typo MIME : @MIME@
+Usator : @USER@
+
+-- 
+Iste message ha essite generate per DokuWiki a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/id-ni/lang.php b/sources/inc/lang/id-ni/lang.php
new file mode 100644
index 0000000..7a11793
--- /dev/null
+++ b/sources/inc/lang/id-ni/lang.php
@@ -0,0 +1,77 @@
+
+ * @author Yustinus Waruwu 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Haogö nga\'örö da\'a';
+$lang['btn_source']            = 'Oroma\'ö nga\'örö sindruhu';
+$lang['btn_show']              = 'Foroma\'ö nga\'örö';
+$lang['btn_create']            = 'Fazökhi nga\'öro';
+$lang['btn_search']            = 'Alui';
+$lang['btn_save']              = 'Irö\'ö';
+$lang['btn_preview']           = 'Foroma\'ö zikhala';
+$lang['btn_top']               = 'Angawuli ba mböröta';
+$lang['btn_newer']             = '<< sibohou';
+$lang['btn_older']             = 'si no ara >>';
+$lang['btn_revs']              = 'nifawu\'a si\'oföna';
+$lang['btn_recent']            = 'Lahe nibohouni';
+$lang['btn_upload']            = 'Fa\'oeh\'ö';
+$lang['btn_cancel']            = 'Lö alua';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Ehaogö';
+$lang['btn_login']             = 'Felalö bakha';
+$lang['btn_logout']            = 'Möi baero';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Bohouni';
+$lang['btn_delete']            = 'Heta';
+$lang['btn_back']              = 'Fulifuri';
+$lang['btn_backlink']          = 'Link fangawuli';
+$lang['btn_backtomedia']       = 'Angawuli ba filianö Mediafile';
+$lang['btn_profile']           = 'Famohouni pörofile';
+$lang['btn_reset']             = 'Fawu\'a';
+$lang['btn_draft']             = 'Fawu\'a wanura';
+$lang['btn_draftdel']          = 'Heta zura';
+$lang['btn_register']          = 'Fasura\'ö';
+$lang['loggedinas']            = 'Möi bakha zotöi';
+$lang['user']                  = 'Töi';
+$lang['pass']                  = 'Kode';
+$lang['newpass']               = 'Kode sibohou';
+$lang['oldpass']               = 'Faduhu\'ö kode';
+$lang['passchk']               = 'Sura sakalitö';
+$lang['remember']              = 'Töngöni ndra\'o';
+$lang['fullname']              = 'Töi safönu';
+$lang['email']                 = 'Imele';
+$lang['profile']               = 'Töi pörofile';
+$lang['badlogin']              = 'Bologö dödöu, fasala döi faoma kode.';
+$lang['minoredit']             = 'Famawu\'a ma\'ifu';
+$lang['regmissing']            = 'Bologö dödöu, si lö tola lö\'ö öfo\'ösi fefu nahia si tohöna.';
+$lang['reguexists']            = 'Bologö dödöu, no so zangoguna\'ö töi da\'a.';
+$lang['regsuccess']            = 'No tefazökhi akunö ba tefa\'ohe\'ö kode ba imele.';
+$lang['regsuccess2']           = 'No tefazökhi akunö';
+$lang['regmailfail']           = 'Oroma wa so ma\'ifu zifawuka ba wama\'ohe\'ö imele kode. Fuli sofu khö admin!';
+$lang['regbadmail']            = 'Imele nibe\'emö lö atulö - na ö\'ila wa fasala da\'a, sofu khö admin';
+$lang['regbadpass']            = 'Dombuadombua kode nibe\'emö lö fagölö, fuli sura.';
+$lang['regpwmail']             = 'Kode DokuWiki';
+$lang['reghere']               = 'Hadia no so akunömö? Na lö\'ö, fazökhi sambua.';
+$lang['profna']                = 'Lö tetehegö ba wiki da\'a ba wamawu\'a pörofile';
+$lang['profnochange']          = 'Lö hadöi nifawu\'ö, lö hadöi ni\'ohalöwögöi';
+$lang['profnoempty']           = 'Lö tetehegö na lö hadöi töi ma imele.';
+$lang['profchanged']           = 'Pörofile zangoguna\'ö no tebohouni.';
+$lang['pwdforget']             = 'Hadia olifu\'ö kode? Fuli halö kode';
+$lang['resendna']              = 'Lö tetehegi ba wiki da\'a wama\'ohe\'ö kode dua kali.';
+$lang['resendpwdmissing']      = 'Bologö dödöu, si lö tola lö\'ö öfo\'ösi fefu nahia si tohöna.';
+$lang['resendpwdnouser']       = 'Bologö dödöu, lö masöndra zangoguna da\'a ba database.';
+$lang['resendpwdconfirm']      = 'No tefaohe\'ö link famaduhu\'ö ba imele.';
+$lang['resendpwdsuccess']      = 'No tefa\'ohe\'ö kode sibohou ba imele.';
+$lang['txt_upload']            = 'Fili file ni fa\'ohe\'ö';
+$lang['js']['notsavedyet']     = 'Famawu\'a si lö mu\'irö\'ö taya. \nSinduhu ötohugö?';
+$lang['mediaselect']           = 'Media file';
diff --git a/sources/inc/lang/id/admin.txt b/sources/inc/lang/id/admin.txt
new file mode 100644
index 0000000..8cb25ed
--- /dev/null
+++ b/sources/inc/lang/id/admin.txt
@@ -0,0 +1,4 @@
+====== Administrasi ======
+
+Berikut ini adalah daftar pekerjaan administratif yang dapat Anda temukan di DokuWiki.
+
diff --git a/sources/inc/lang/id/backlinks.txt b/sources/inc/lang/id/backlinks.txt
new file mode 100644
index 0000000..79c70f3
--- /dev/null
+++ b/sources/inc/lang/id/backlinks.txt
@@ -0,0 +1,3 @@
+====== Backlinks ======
+
+Daftar dibawah ini adalah halaman-halaman (lain) yang terhubung ke halaman ini.
diff --git a/sources/inc/lang/id/conflict.txt b/sources/inc/lang/id/conflict.txt
new file mode 100644
index 0000000..236e8b6
--- /dev/null
+++ b/sources/inc/lang/id/conflict.txt
@@ -0,0 +1,6 @@
+====== Versi terbaru telah Ada ======
+
+Versi terbaru dari dokumen yang baru saja Anda Edit telah ada. Ini terjadi ketika user lain telah selesai mengubah halaman, saat Anda sedang meng-edit.
+
+Pertimbangkan perbedaan yang ditampilkan dibawah ini, kemudian putuskan versi mana yang harus disimpan. Jika Anda memilih "Simpan", versi (tulisan terbaru) Andalah yang akan disimpan. Tekan "Batal" to menggunakan versi tulisan yang telah ada.
+
diff --git a/sources/inc/lang/id/denied.txt b/sources/inc/lang/id/denied.txt
new file mode 100644
index 0000000..bad8f24
--- /dev/null
+++ b/sources/inc/lang/id/denied.txt
@@ -0,0 +1,4 @@
+====== Akses Ditolak ======
+
+Maaf, Anda tidak mempunyai hak akses untuk melanjutkan. Apakah Anda belum login?
+
diff --git a/sources/inc/lang/id/diff.txt b/sources/inc/lang/id/diff.txt
new file mode 100644
index 0000000..eee1e5a
--- /dev/null
+++ b/sources/inc/lang/id/diff.txt
@@ -0,0 +1,4 @@
+====== Perbedaan ======
+
+Ini menunjukkan perbedaan antara versi yang terpilih dengan versi yang sedang aktif.
+
diff --git a/sources/inc/lang/id/draft.txt b/sources/inc/lang/id/draft.txt
new file mode 100644
index 0000000..d7de145
--- /dev/null
+++ b/sources/inc/lang/id/draft.txt
@@ -0,0 +1,5 @@
+====== File Draft ditemukan ======
+
+Proses pengeditan Anda sebelumnya tidak selesai dengan sempurna. DokuWiki secara otomatis meyimpan draft yang dapat Anda pakai untuk melanjutkan pengeditan. Dibawah ini Anda dapat melihat data yang disimpan pada sesi sebelumnya.
+
+Silahkan pilih jika Anda ingin //recover// sesi pengeditan terakhir atau //hapus// draft, atau //batalkan// proses pengeditan.
diff --git a/sources/inc/lang/id/edit.txt b/sources/inc/lang/id/edit.txt
new file mode 100644
index 0000000..a32803c
--- /dev/null
+++ b/sources/inc/lang/id/edit.txt
@@ -0,0 +1,2 @@
+Ubah isi halaman kemudian tekan "Simpan". Lihat [[wiki:syntax]] untuk sintaks-sintaks Wiki. Mohon edit/ubah halaman sesuai dengan judul halamannya. Bila Anda masih ragu untuk menulis di halaman ini, silahkan bermain-main di [[playground:playground|tamanbermain]].
+
diff --git a/sources/inc/lang/id/editrev.txt b/sources/inc/lang/id/editrev.txt
new file mode 100644
index 0000000..e6d247c
--- /dev/null
+++ b/sources/inc/lang/id/editrev.txt
@@ -0,0 +1,2 @@
+**Anda telah membuka dokumen versi lama!** Jika menyimpannya, berarti Anda akan membuat versi baru dari data ini.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/id/index.txt b/sources/inc/lang/id/index.txt
new file mode 100644
index 0000000..88bbb12
--- /dev/null
+++ b/sources/inc/lang/id/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Berikut ini adalah index dari keseluruhan halaman yang ada, diurutkan berdasar [[doku>namespaces|namespaces]].
+
diff --git a/sources/inc/lang/id/install.html b/sources/inc/lang/id/install.html
new file mode 100644
index 0000000..4e288b3
--- /dev/null
+++ b/sources/inc/lang/id/install.html
@@ -0,0 +1,25 @@
+
        Halaman ini membatu Anda dalam proses instalasi dan konfigurasi pertama kali
+untuk Dokuwiki. Informasi lebih lanjut
+tentang alat instalasi ini tersedia dalam
+halaman dokumentasi sendiri.
        
+
+
        DokuWIki menggunakan berkas biasa sebagai media penyimpanan halaman wiki
+dan informasi lainnya yang berhubungan dengan halaman tersebut (contoh: gambar,
+indeks pencarian, revisi lama, dll). Agar bisa menggunakannya DokuWiki
+harus memiliki hak akses tulis pada direktori yang menyimpan
+berkas-berkas tersebut. Alat instalasi ini tidak dapat melakukan perubahan
+konfigurasi hak akses pada direktori. Biasanya harus menggunakan command shell
+atau jika Anda pengguna layanan hosting, melalui FTP atau control panel layanan
+hosting Anda (misalnya: cPanel). 
        
+
+
        Alat instalasi ini akan mengatur konfigurasi DokuWiki Anda untuk
+ACL, yang selanjutnya akan
+memperbolehkan administrator untuk login dan mengakses menu Admin DokuWiki
+untuk menginstal plugin, mengatur pengguna (user), mengatur hak akses ke
+halaman wiki dan perubahan konfigurasi. Ini tidak diawajibkan dalam pengoperasian
+DokuWiki, tetapi dapat membuat DokuWiki lebih mudah untuk dipelihara.
        
+
+
        Pengguna berpengalaman atau pengguna dengan kebutuhan instalasi khusus silahkan
+melihat link Panduan Instalasi
+and Konfigurasi WIki.
+untuk hal-hal yang berhubungan dengan instalasi dan konfigurasi.
        
diff --git a/sources/inc/lang/id/lang.php b/sources/inc/lang/id/lang.php
new file mode 100644
index 0000000..3d99c9a
--- /dev/null
+++ b/sources/inc/lang/id/lang.php
@@ -0,0 +1,192 @@
+
+ * @author Irwan Butar Butar 
+ * @author Yustinus Waruwu 
+ * @author zamroni 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '"';
+$lang['doublequoteclosing']    = '"';
+$lang['singlequoteopening']    = '\'';
+$lang['singlequoteclosing']    = '\'';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Edit halaman ini';
+$lang['btn_source']            = 'Lihat sumber halaman';
+$lang['btn_show']              = 'Tampilkan halaman';
+$lang['btn_create']            = 'Buat halaman baru';
+$lang['btn_search']            = 'Cari';
+$lang['btn_save']              = 'Simpan';
+$lang['btn_preview']           = 'Preview';
+$lang['btn_top']               = 'kembali ke atas';
+$lang['btn_newer']             = '<< lebih lanjut';
+$lang['btn_older']             = 'sebelumnya >>';
+$lang['btn_revs']              = 'Revisi-revisi lama';
+$lang['btn_recent']            = 'Perubahan terbaru';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Batal';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Edit';
+$lang['btn_login']             = 'Login';
+$lang['btn_logout']            = 'Keluar';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Ubah';
+$lang['btn_delete']            = 'Hapus';
+$lang['btn_back']              = 'Kembali';
+$lang['btn_backlink']          = 'Backlinks';
+$lang['btn_backtomedia']       = 'Kembali ke Pilihan Mediafile';
+$lang['btn_subscribe']         = 'Ikuti Perubahan';
+$lang['btn_profile']           = 'Ubah Profil';
+$lang['btn_reset']             = 'Reset';
+$lang['btn_draft']             = 'Edit draft';
+$lang['btn_draftdel']          = 'Hapus draft';
+$lang['btn_register']          = 'Daftar';
+$lang['loggedinas']            = 'Login sebagai ';
+$lang['user']                  = 'Username';
+$lang['pass']                  = 'Password';
+$lang['newpass']               = 'Password baru';
+$lang['oldpass']               = 'Konfirmasi password';
+$lang['passchk']               = 'sekali lagi';
+$lang['remember']              = 'Ingat saya';
+$lang['fullname']              = 'Nama lengkap';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'Profil User';
+$lang['badlogin']              = 'Maaf, username atau password salah.';
+$lang['minoredit']             = 'Perubahan Minor';
+$lang['draftdate']             = 'Simpan draft secara otomatis';
+$lang['regmissing']            = 'Maaf, Anda harus mengisi semua field.';
+$lang['reguexists']            = 'Maaf, user dengan user login ini telah ada.';
+$lang['regsuccess']            = 'User telah didaftarkan dan password telah dikirim ke email Anda.';
+$lang['regsuccess2']           = 'User telah dibuatkan.';
+$lang['regmailfail']           = 'Kami menemukan kesalahan saat mengirimkan password ke alamat email Anda. Mohon hubungi administrator.';
+$lang['regbadmail']            = 'Alamat email yang Anda masukkan tidak valid - jika menurut Anda hal ini adalah kesalahan sistem, mohon hubungi admin.';
+$lang['regbadpass']            = 'Passwod yang dimasukkan tidak sama. Silahkan ulangi lagi.';
+$lang['regpwmail']             = 'Password DokuWiki Anda';
+$lang['reghere']               = 'Anda belum mempunyai account? silahkan ';
+$lang['profna']                = 'Wiki ini tidak mengijinkan perubahan profil.';
+$lang['profnochange']          = 'Tidak ada perubahan.';
+$lang['profnoempty']           = 'Mohon mengisikan nama atau alamat email.';
+$lang['profchanged']           = 'Profil User berhasil diubah.';
+$lang['pwdforget']             = 'Lupa Password? Dapatkan yang baru';
+$lang['resendna']              = 'Wiki ini tidak mendukung pengiriman ulang password.';
+$lang['resendpwdmissing']      = 'Maaf, Anda harus mengisikan semua field.';
+$lang['resendpwdnouser']       = 'Maaf, user ini tidak ditemukan.';
+$lang['resendpwdbadauth']      = 'Maaf, kode autentikasi tidak valid. Pastikan Anda menggunakan keseluruhan link konfirmasi.';
+$lang['resendpwdconfirm']      = 'Link konfirmasi telah dikirim melalui email.';
+$lang['resendpwdsuccess']      = 'Password baru Anda telah dikirim melalui email.';
+$lang['txt_upload']            = 'File yang akan diupload';
+$lang['txt_filename']          = 'Masukkan nama wiki (opsional)';
+$lang['txt_overwrt']           = 'File yang telah ada akan ditindih';
+$lang['lockedby']              = 'Sedang dikunci oleh';
+$lang['lockexpire']            = 'Penguncian artikel sampai dengan';
+$lang['js']['willexpire']      = 'Halaman yang sedang Anda kunci akan berakhir dalam waktu kurang lebih satu menit.\nUntuk menghindari konflik, gunakan tombol Preview untuk me-reset timer pengunci.';
+$lang['js']['notsavedyet']     = 'Perubahan yang belum disimpan akan hilang.\nYakin akan dilanjutkan?';
+$lang['js']['keepopen']        = 'Biarkan window terbuka dalam pemilihan';
+$lang['js']['hidedetails']     = 'Sembunyikan detil';
+$lang['js']['nosmblinks']      = 'Link ke share Windows hanya bekerja di Microsoft Internet Explorer.
+Anda masih dapat mengcopy and paste linknya.';
+$lang['js']['del_confirm']     = 'Hapus tulisan ini?';
+$lang['rssfailed']             = 'Error terjadi saat mengambil feed: ';
+$lang['nothingfound']          = 'Tidak menemukan samasekali.';
+$lang['mediaselect']           = 'Pilihan Mediafile';
+$lang['fileupload']            = 'Mediafile Upload';
+$lang['uploadsucc']            = 'Upload sukses';
+$lang['uploadfail']            = 'Upload gagal. Apakah hak ijinnya salah?';
+$lang['uploadwrong']           = 'Upload ditolak. Ekstensi file ini tidak diperbolehkan!';
+$lang['uploadexist']           = 'File telah ada. Tidak mengerjakan apa-apa.';
+$lang['uploadbadcontent']      = 'Isi file yang diupload tidak cocok dengan ekstensi file %s.';
+$lang['uploadspam']            = 'File yang diupload diblok oleh spam blacklist.';
+$lang['uploadxss']             = 'File yang diupload diblok karena kemungkinan isi yang berbahaya.';
+$lang['deletesucc']            = 'File "%s" telah dihapus.';
+$lang['deletefail']            = '"%s" tidak dapat dihapus - cek hak aksesnya.';
+$lang['mediainuse']            = 'File "%s" belum dihapus - file ini sedang digunakan.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'File tersedia didalam';
+$lang['mediausage']            = 'Gunakan sintaks berikut untuk me-refer ke file ini';
+$lang['mediaview']             = 'Tampilkan file asli';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Upload file ke namespace ini. Untuk menbuat namespace baru, tambahkan namanya didepanpada nama file "Upload as" dipisahkan dengan titik dua (:).';
+$lang['mediaextchange']        = 'Ektensi file berubah dari .%s ke .%s';
+$lang['reference']             = 'Referensi untuk';
+$lang['ref_inuse']             = 'File tidak dapat dihapus karena sedang digunakan oleh halaman:';
+$lang['ref_hidden']            = 'Beberapa referensi ada didalam halaman yang tidak diijinkan untuk Anda baca.';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Matching pagenames';
+$lang['toc']                   = 'Daftar isi';
+$lang['current']               = 'sekarang';
+$lang['yours']                 = 'Versi Anda';
+$lang['diff']                  = 'Tampilkan perbedaan dengan versi sekarang';
+$lang['diff2']                 = 'Tampilkan perbedaan diantara revisi terpilih';
+$lang['line']                  = 'Baris';
+$lang['breadcrumb']            = 'Jejak';
+$lang['youarehere']            = 'Anda disini';
+$lang['lastmod']               = 'Terakhir diubah';
+$lang['by']                    = 'oleh';
+$lang['deleted']               = 'terhapus';
+$lang['created']               = 'dibuat';
+$lang['restored']              = 'revisi lama ditampilkan kembali (%s)';
+$lang['external_edit']         = 'Perubahan eksternal';
+$lang['summary']               = 'Edit summary';
+$lang['mail_newpage']          = 'Halaman ditambahkan:';
+$lang['mail_changed']          = 'Halaman diubah:';
+$lang['mail_new_user']         = 'User baru:';
+$lang['mail_upload']           = 'Berkas di-upload:';
+$lang['qb_bold']               = 'Tebal';
+$lang['qb_italic']             = 'Miring';
+$lang['qb_underl']             = 'Garis Bawah';
+$lang['qb_code']               = 'Kode';
+$lang['qb_strike']             = 'Text Tercoret';
+$lang['qb_h1']                 = 'Level 1 Headline';
+$lang['qb_h2']                 = 'Level 2 Headline';
+$lang['qb_h3']                 = 'Level 3 Headline';
+$lang['qb_h4']                 = 'Level 4 Headline';
+$lang['qb_h5']                 = 'Level 5 Headline';
+$lang['qb_link']               = 'Link Internal';
+$lang['qb_extlink']            = 'Link External';
+$lang['qb_hr']                 = 'Garis Horisontal';
+$lang['qb_ol']                 = 'Item Berurutan';
+$lang['qb_ul']                 = 'Item Tidak Berurutan';
+$lang['qb_media']              = 'Tambahkan gambar atau file lain';
+$lang['qb_sig']                = 'Sisipkan tanda tangan';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Karakter Khusus';
+$lang['admin_register']        = 'Tambah user baru';
+$lang['metaedit']              = 'Edit Metadata';
+$lang['metasaveerr']           = 'Gagal menulis metadata';
+$lang['metasaveok']            = 'Metadata tersimpan';
+$lang['img_backto']            = 'Kembali ke';
+$lang['img_title']             = 'Judul';
+$lang['img_caption']           = 'Label';
+$lang['img_date']              = 'Tanggal';
+$lang['img_fname']             = 'Nama file';
+$lang['img_fsize']             = 'Ukuran';
+$lang['img_artist']            = 'Tukang foto';
+$lang['img_copyr']             = 'Hakcipta';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Katakunci';
+$lang['authtempfail']          = 'Autentikasi user saat ini sedang tidak dapat digunakan. Jika kejadian ini berlanjut, Harap informasikan admin Wiki Anda.';
+$lang['i_chooselang']          = 'Pilih bahasa';
+$lang['i_installer']           = 'Instalasi DokuWiki';
+$lang['i_wikiname']            = 'Nama Wiki';
+$lang['i_enableacl']           = 'Aktifkan ACL (disarankan)';
+$lang['i_problems']            = 'Terdapat beberapa kesalahan seperti berikut. Anda tidak dapat melanjutkan sampai kesalahan tersebut diperbaiki.';
+$lang['i_modified']            = 'Untuk alasan keamanan, skrip ini hanya dapat dijalankan pada instalasi DikuWiki baru dan belum di modifikasi. Silahkan meng-ekstrak kembali berkasi dari halaman dowload, atau lihat   Dokuwiki installation instructions ';
+$lang['i_funcna']              = 'Fungsi PHP %s tidak tersedia. Mungkin dinonaktifkan oleh layanan hosting Anda?';
+$lang['i_phpver']              = 'Versi PHP Anda %s lebih rendah dari yang dibutuhkan %s. Mohon melakukan upgrade.';
+$lang['i_permfail']            = '%s tidak dapat ditulis oleh DokuWiki. Anda harus memperbaiki konfigurasi hak akses untuk direktori tersebut.';
+$lang['i_confexists']          = '%s sudah ada';
+$lang['i_writeerr']            = 'Tidak dapat membuat %s. Anda harus memeriksa konfigurasi hak akses direktori/berkas dan membuatnya secara manual.';
+$lang['i_badhash']             = 'dokuwiki.php tidak dikenal atau sudah diubah (hash=%s)';
+$lang['i_badval']              = '%s - tidak valid atau belum diisi';
+$lang['i_success']             = 'Konfigurasi telah berhasil. Anda boleh menghapus berkas install.php sekarang. Lanjutkan ke DokuWiki baru Anda.';
+$lang['i_failure']             = 'Terdapat beberapa kesalahan dalam menulis berkas konfigurasi. Anda harus memperbaikinnya sendiri sebelum dapat menggunakan DokuWiki baru Anda.';
+$lang['i_policy']              = 'Policy ACL awal';
+$lang['i_pol0']                = 'Wiki Terbuka (baca, tulis, upload untuk semua orang)';
+$lang['i_pol1']                = 'Wiki Publik (baca untuk semua orang, tulis dan upload untuk pengguna terdaftar)';
+$lang['i_pol2']                = 'Wiki Privat (baca, tulis dan upload hanya untuk pengguna terdaftar)';
+$lang['i_retry']               = 'Coba Lagi';
diff --git a/sources/inc/lang/id/locked.txt b/sources/inc/lang/id/locked.txt
new file mode 100644
index 0000000..8147717
--- /dev/null
+++ b/sources/inc/lang/id/locked.txt
@@ -0,0 +1,3 @@
+====== Halaman Terkunci ======
+
+Halaman ini tertutup (terkunci) untuk diedit oleh user lain. Anda harus menunggu sampai user ini menyelesaikan pengeditan, atau masa berlaku penguncian telah berakhir.
diff --git a/sources/inc/lang/id/login.txt b/sources/inc/lang/id/login.txt
new file mode 100644
index 0000000..f736e88
--- /dev/null
+++ b/sources/inc/lang/id/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Anda belum login! Masukkan data autentifikasi dibawah ini untuk masuk log (login). Cookies harus diaktifkan agar bisa login.
+
diff --git a/sources/inc/lang/id/mailtext.txt b/sources/inc/lang/id/mailtext.txt
new file mode 100644
index 0000000..7eede9b
--- /dev/null
+++ b/sources/inc/lang/id/mailtext.txt
@@ -0,0 +1,17 @@
+Halaman di DokuWiki Anda telah bertamah atau berubah, dengan detil sebagai berikut:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+
+-- 
+Email ini digenerate oleh DokuWiki di
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/id/newpage.txt b/sources/inc/lang/id/newpage.txt
new file mode 100644
index 0000000..8d3f99d
--- /dev/null
+++ b/sources/inc/lang/id/newpage.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/id/norev.txt b/sources/inc/lang/id/norev.txt
new file mode 100644
index 0000000..5244f83
--- /dev/null
+++ b/sources/inc/lang/id/norev.txt
@@ -0,0 +1,4 @@
+====== Revisi tidak tersedia ======
+
+Revisi yang diinginkan tidak ada. Gunakan tombol ''Revisi Lama'' untuk menampilkan daftar revisi lama dari dokumen ini.
+
diff --git a/sources/inc/lang/id/password.txt b/sources/inc/lang/id/password.txt
new file mode 100644
index 0000000..2e64b8d
--- /dev/null
+++ b/sources/inc/lang/id/password.txt
@@ -0,0 +1,10 @@
+Hi @FULLNAME@!
+
+Berikut data Anda untuk @TITLE@ di @DOKUWIKIURL@
+
+Login    : @LOGIN@
+Password : @PASSWORD@
+
+-- 
+Email ini dibuat otomatis oleh DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/id/preview.txt b/sources/inc/lang/id/preview.txt
new file mode 100644
index 0000000..1621946
--- /dev/null
+++ b/sources/inc/lang/id/preview.txt
@@ -0,0 +1,4 @@
+====== Preview ======
+
+Ini adalah preview tentang bagimana tulisan Anda akan ditampilkan. Ingat: tulisan ini **belum disimpan**!
+
diff --git a/sources/inc/lang/id/pwconfirm.txt b/sources/inc/lang/id/pwconfirm.txt
new file mode 100644
index 0000000..19131ee
--- /dev/null
+++ b/sources/inc/lang/id/pwconfirm.txt
@@ -0,0 +1,13 @@
+Hai @FULLNAME@!
+
+Seseorang telah meminta password baru untuk @TITLE@ Anda login ke @DOKUWIKIURL@
+
+Jika Anda tidak meminta password baru, mohon mengacuhkan email ini.
+
+Untuk mengkonfirmasi bahwa permintaan tersebut adalah benar dari Anda, silahkan gunakan link dibawah.
+
+@CONFIRM@
+
+-- 
+Email ini dibuat otomatis  oleh DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/id/read.txt b/sources/inc/lang/id/read.txt
new file mode 100644
index 0000000..f78c0eb
--- /dev/null
+++ b/sources/inc/lang/id/read.txt
@@ -0,0 +1,2 @@
+Halaman ini hanya bisa dibaca. Anda bisa melihat sumbernya, tetapi tidak diperkenankan untuk mengubah. Hubungi administrator jika menemukan kesalahan pada halaman ini.
+
diff --git a/sources/inc/lang/id/recent.txt b/sources/inc/lang/id/recent.txt
new file mode 100644
index 0000000..f7cf244
--- /dev/null
+++ b/sources/inc/lang/id/recent.txt
@@ -0,0 +1,5 @@
+====== Perubahan ======
+
+Berikut ini adalah halaman-halaman yang baru saja diubah.
+
+
diff --git a/sources/inc/lang/id/register.txt b/sources/inc/lang/id/register.txt
new file mode 100644
index 0000000..dd8c578
--- /dev/null
+++ b/sources/inc/lang/id/register.txt
@@ -0,0 +1,4 @@
+====== Mendaftar sebagai anggota baru ======
+
+Isikan semua informasi dibawah ini untuk membuat account baru di wiki ini. Pastikan Anda telah mengisikan **alamat email yang valid**, karena password akan dikirim melalui email ini. Nama login harus sesuai dengan aturan [[doku>pagename|pagename]].
+
diff --git a/sources/inc/lang/id/registermail.txt b/sources/inc/lang/id/registermail.txt
new file mode 100644
index 0000000..ed8c97c
--- /dev/null
+++ b/sources/inc/lang/id/registermail.txt
@@ -0,0 +1,14 @@
+User baru telah mendaftar. Berikut detailnya:
+
+User name : @NEWUSER@
+Full name : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Date : @DATE@
+Browser : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+-- 
+Email ini dibuat otomatis oleh DokuWIki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/id/resendpwd.txt b/sources/inc/lang/id/resendpwd.txt
new file mode 100644
index 0000000..276b292
--- /dev/null
+++ b/sources/inc/lang/id/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Kirim Password Baru ======
+
+Masukkan nama user Anda pada form dibawah untuk permintaan perubahan password account Anda di Wiki ini. Link konfirmasi akan dikirimkan melalui alamat email Anda sewaktu registrasi.
diff --git a/sources/inc/lang/id/revisions.txt b/sources/inc/lang/id/revisions.txt
new file mode 100644
index 0000000..d82b273
--- /dev/null
+++ b/sources/inc/lang/id/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/id/searchpage.txt b/sources/inc/lang/id/searchpage.txt
new file mode 100644
index 0000000..c47bed7
--- /dev/null
+++ b/sources/inc/lang/id/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
\ No newline at end of file
diff --git a/sources/inc/lang/id/showrev.txt b/sources/inc/lang/id/showrev.txt
new file mode 100644
index 0000000..27f0c64
--- /dev/null
+++ b/sources/inc/lang/id/showrev.txt
@@ -0,0 +1,2 @@
+**Ini adalah dokumen versi lama!**
+----
diff --git a/sources/inc/lang/id/stopwords.txt b/sources/inc/lang/id/stopwords.txt
new file mode 100644
index 0000000..73713c8
--- /dev/null
+++ b/sources/inc/lang/id/stopwords.txt
@@ -0,0 +1,37 @@
+# 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
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
+yang
+dan
+adalah
+untuk
+lalu
+maka
+kemudian
+jika
diff --git a/sources/inc/lang/id/updateprofile.txt b/sources/inc/lang/id/updateprofile.txt
new file mode 100644
index 0000000..b7f71a1
--- /dev/null
+++ b/sources/inc/lang/id/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Ubah Profil Account Anda ======
+
+Anda hanya perlu mengisikan field yang ingin Anda ubah. Anda tidak dapat mengubah username Anda.
diff --git a/sources/inc/lang/id/uploadmail.txt b/sources/inc/lang/id/uploadmail.txt
new file mode 100644
index 0000000..dc628fc
--- /dev/null
+++ b/sources/inc/lang/id/uploadmail.txt
@@ -0,0 +1,14 @@
+Sebuah file telah diupload di DokuWiki Anda. Berikut detailnya:
+
+File : @MEDIA@
+Date : @DATE@
+Browser : @BROWSER@
+IP-Address : @IPADDRESS@
+Hostname : @HOSTNAME@
+Size : @SIZE@
+MIME Type : @MIME@
+User : @USER@
+
+-- 
+Email ini dibuat otomatis oleh DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/is/adminplugins.txt b/sources/inc/lang/is/adminplugins.txt
new file mode 100644
index 0000000..ce7b9d3
--- /dev/null
+++ b/sources/inc/lang/is/adminplugins.txt
@@ -0,0 +1 @@
+===== Aðrar viðbætur =====
\ No newline at end of file
diff --git a/sources/inc/lang/is/diff.txt b/sources/inc/lang/is/diff.txt
new file mode 100644
index 0000000..a6d246a
--- /dev/null
+++ b/sources/inc/lang/is/diff.txt
@@ -0,0 +1,3 @@
+===== Breytingar =====
+
+Hér sést hvað hefur breyst á milli útgáfna.
\ No newline at end of file
diff --git a/sources/inc/lang/is/lang.php b/sources/inc/lang/is/lang.php
new file mode 100644
index 0000000..fbc7e90
--- /dev/null
+++ b/sources/inc/lang/is/lang.php
@@ -0,0 +1,184 @@
+
+ * @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_profile']           = 'Uppfæra notanda';
+$lang['btn_reset']             = 'Endurstilla';
+$lang['btn_draft']             = 'Breyta uppkasti';
+$lang['btn_recover']           = 'Endurheimta uppkast';
+$lang['btn_draftdel']          = 'Eyða uppkasti';
+$lang['btn_revert']            = 'Endurheimta';
+$lang['btn_register']          = 'Skráning';
+$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['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['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 (%s)';
+$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';
diff --git a/sources/inc/lang/is/login.txt b/sources/inc/lang/is/login.txt
new file mode 100644
index 0000000..81e7e5e
--- /dev/null
+++ b/sources/inc/lang/is/login.txt
@@ -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.
\ No newline at end of file
diff --git a/sources/inc/lang/is/recent.txt b/sources/inc/lang/is/recent.txt
new file mode 100644
index 0000000..7d3cf57
--- /dev/null
+++ b/sources/inc/lang/is/recent.txt
@@ -0,0 +1,3 @@
+===== Nýlegar Breytingar =====
+
+Eftirfarandi síðum hefur nýlega verið breytt.
\ No newline at end of file
diff --git a/sources/inc/lang/is/resendpwd.txt b/sources/inc/lang/is/resendpwd.txt
new file mode 100644
index 0000000..b847b1d
--- /dev/null
+++ b/sources/inc/lang/is/resendpwd.txt
@@ -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.
\ No newline at end of file
diff --git a/sources/inc/lang/it/admin.txt b/sources/inc/lang/it/admin.txt
new file mode 100644
index 0000000..95a611e
--- /dev/null
+++ b/sources/inc/lang/it/admin.txt
@@ -0,0 +1,4 @@
+====== Amministrazione ======
+
+Qui sotto puoi trovare una lista delle possibili azioni amministrative attualmente disponibili in Dokuwiki.
+
diff --git a/sources/inc/lang/it/adminplugins.txt b/sources/inc/lang/it/adminplugins.txt
new file mode 100644
index 0000000..4f17d6d
--- /dev/null
+++ b/sources/inc/lang/it/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugin aggiuntivi =====
\ No newline at end of file
diff --git a/sources/inc/lang/it/backlinks.txt b/sources/inc/lang/it/backlinks.txt
new file mode 100644
index 0000000..ad5a9c2
--- /dev/null
+++ b/sources/inc/lang/it/backlinks.txt
@@ -0,0 +1,4 @@
+====== Puntano qui ======
+
+Questa è una lista delle pagine che sembrano avere un collegamento alla pagina attuale.
+
diff --git a/sources/inc/lang/it/conflict.txt b/sources/inc/lang/it/conflict.txt
new file mode 100644
index 0000000..bcb90d2
--- /dev/null
+++ b/sources/inc/lang/it/conflict.txt
@@ -0,0 +1,6 @@
+====== Esiste una versione più recente ======
+
+Esiste una versione più recente del documento che hai modificato. Questo può accadere quando un altro utente ha già modificato il documento durante le tue modifiche.
+
+Esamina le differenze mostrate di seguito, quindi decidi quale versione mantenere. Se scegli ''Salva'', la tua versione verrà salvata. Clicca su ''Annulla'' per mantenere la versione attuale.
+
diff --git a/sources/inc/lang/it/denied.txt b/sources/inc/lang/it/denied.txt
new file mode 100644
index 0000000..d21956a
--- /dev/null
+++ b/sources/inc/lang/it/denied.txt
@@ -0,0 +1,5 @@
+====== Accesso negato ======
+
+Non hai i diritti per continuare. Forse hai dimenticato di effettuare l'accesso?
+
+
diff --git a/sources/inc/lang/it/diff.txt b/sources/inc/lang/it/diff.txt
new file mode 100644
index 0000000..5a41eaa
--- /dev/null
+++ b/sources/inc/lang/it/diff.txt
@@ -0,0 +1,4 @@
+====== Differenze ======
+
+Queste sono le differenze tra la revisione selezionata e la versione attuale della pagina.
+
diff --git a/sources/inc/lang/it/draft.txt b/sources/inc/lang/it/draft.txt
new file mode 100644
index 0000000..479d0fa
--- /dev/null
+++ b/sources/inc/lang/it/draft.txt
@@ -0,0 +1,6 @@
+====== Trovata Bozza ======
+
+La tua ultima sessione di modifica su questa pagina non è stata completata correttamente. DokuWiki ha salvato in automatico una bozza durante il tuo lavoro, che puoi ora utilizzare per continuare le tue modifiche. Di seguito puoi trovare i dati che sono stati salvati dalla tua ultima sessione.
+
+Decidi se vuoi //recuperare// la sessione di modifica, //eliminare// la bozza salavata in automatico oppure //annullare// le modifiche.
+
diff --git a/sources/inc/lang/it/edit.txt b/sources/inc/lang/it/edit.txt
new file mode 100644
index 0000000..8f2ba97
--- /dev/null
+++ b/sources/inc/lang/it/edit.txt
@@ -0,0 +1,2 @@
+Modifica la pagina e clicca su ''Salva''. Vedi [[wiki:syntax]] per la sintassi riconosciuta dal Wiki. Modifica questa pagina solo se puoi **apportare dei miglioramenti**. Se vuoi solo fare degli esperimenti ed imparare come fare i primi passi usa [[playground:playground]].
+
diff --git a/sources/inc/lang/it/editrev.txt b/sources/inc/lang/it/editrev.txt
new file mode 100644
index 0000000..5023200
--- /dev/null
+++ b/sources/inc/lang/it/editrev.txt
@@ -0,0 +1,2 @@
+**Hai caricato una revisione precedente del documento!** Se salvi questa pagina creerai una nuova versione con questi dati.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/it/index.txt b/sources/inc/lang/it/index.txt
new file mode 100644
index 0000000..52c6fbc
--- /dev/null
+++ b/sources/inc/lang/it/index.txt
@@ -0,0 +1,4 @@
+====== Indice ======
+
+Questo è un indice di tutte le pagine disponibili ordinate per [[doku>namespaces|categorie]].
+
diff --git a/sources/inc/lang/it/install.html b/sources/inc/lang/it/install.html
new file mode 100644
index 0000000..9d0e57f
--- /dev/null
+++ b/sources/inc/lang/it/install.html
@@ -0,0 +1,24 @@
+
        Questa pagina ti assisterà durante l'installazione e la prima configurazione di
+Dokuwiki. Ulteriori informazioni sulla
+procedura di installazione sono reperibili nella
+pagina di documentazione.
        
+
+
        DokuWiki utilizza dei normali file per la memorizzazione delle pagine del wiki e
+delle altre informazioni associate a tali pagine (es. immagini, indici per la ricerca, vecchie
+revisioni, ecc.).  Per poter operare correttamente DokuWiki
+deve accedere in scrittura alle directory che contengono tali
+file.  La procedura di installazione non è in grado di impostare i permessi sulle directory. Questo
+deve normalmente essere fatto direttamente da linea di comando oppure, se stai usando un servizio di hosting,
+attraverso FTP o dal pannello di controllo del servizio di hosting (es. cPanel).
        
+
+
        Questa procedura di installazione imposterà la configurazione di DokuWiki per l'uso di
+ACL, che consente all'amministratore di
+collegarsi e accedere al menu di amministrazione di DokuWiki per installare plugin, gestire
+utenti, gestire gli accessi alle pagine wiki e modificare le impostazioni del wiki.
+Non è necessario per il funzionamento di DokuWiki, ma renderà Dokuwiki più facile
+da amministrare.
        
+
+
        Gli utenti esperti o con particolari esigenze di installazione dovrebbero far riferimento ai
+seguenti link per dettagli sulle
+istruzioni per l'installazione
+e sui parametri di configurazione.
        
diff --git a/sources/inc/lang/it/lang.php b/sources/inc/lang/it/lang.php
new file mode 100644
index 0000000..a2bde3b
--- /dev/null
+++ b/sources/inc/lang/it/lang.php
@@ -0,0 +1,340 @@
+
+ * @author Roberto Bolli [http://www.rbnet.it/]
+ * @author Silvia Sargentoni 
+ * @author Diego Pierotto 
+ * @author Lorenzo Breda 
+ * @author snarchio@alice.it
+ * @author robocap 
+ * @author Matteo Carnevali 
+ * @author Osman Tekin 
+ * @author Jacopo Corbetta 
+ * @author Matteo Pasotti 
+ * @author snarchio@gmail.com
+ * @author Edmondo Di Tucci 
+ * @author Claudio Lanconelli 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Modifica questa pagina';
+$lang['btn_source']            = 'Mostra sorgente';
+$lang['btn_show']              = 'Mostra pagina';
+$lang['btn_create']            = 'Crea questa pagina';
+$lang['btn_search']            = 'Cerca';
+$lang['btn_save']              = 'Salva';
+$lang['btn_preview']           = 'Anteprima';
+$lang['btn_top']               = 'Torna su';
+$lang['btn_newer']             = '<< più recenti';
+$lang['btn_older']             = 'meno recenti >>';
+$lang['btn_revs']              = 'Revisioni precedenti';
+$lang['btn_recent']            = 'Ultime modifiche';
+$lang['btn_upload']            = 'Invia file';
+$lang['btn_cancel']            = 'Annulla';
+$lang['btn_index']             = 'Indice';
+$lang['btn_secedit']           = 'Modifica';
+$lang['btn_login']             = 'Entra';
+$lang['btn_logout']            = 'Esci';
+$lang['btn_admin']             = 'Amministrazione';
+$lang['btn_update']            = 'Aggiorna';
+$lang['btn_delete']            = 'Elimina';
+$lang['btn_back']              = 'Indietro';
+$lang['btn_backlink']          = 'Puntano qui';
+$lang['btn_backtomedia']       = 'Torna alla selezione file';
+$lang['btn_subscribe']         = 'Sottoscrivi modifiche';
+$lang['btn_profile']           = 'Aggiorna profilo';
+$lang['btn_reset']             = 'Annulla';
+$lang['btn_resendpwd']         = 'Imposta nuova password';
+$lang['btn_draft']             = 'Modifica bozza';
+$lang['btn_recover']           = 'Ripristina bozza';
+$lang['btn_draftdel']          = 'Elimina bozza';
+$lang['btn_revert']            = 'Ripristina';
+$lang['btn_register']          = 'Registrazione';
+$lang['btn_apply']             = 'Applica';
+$lang['btn_media']             = 'Gestore Media';
+$lang['btn_deleteuser']        = 'Rimuovi il mio account';
+$lang['loggedinas']            = 'Collegato come';
+$lang['user']                  = 'Nome utente';
+$lang['pass']                  = 'Password';
+$lang['newpass']               = 'Nuova password';
+$lang['oldpass']               = 'Conferma password attuale';
+$lang['passchk']               = 'Ripeti password';
+$lang['remember']              = 'Memorizza nome utente e password';
+$lang['fullname']              = 'Nome completo';
+$lang['email']                 = 'Email';
+$lang['profile']               = 'Profilo utente';
+$lang['badlogin']              = 'Il nome utente o la password non sono validi.';
+$lang['badpassconfirm']        = 'La password è errata';
+$lang['minoredit']             = 'Modifiche minori';
+$lang['draftdate']             = 'Bozza salvata in automatico il';
+$lang['nosecedit']             = 'La pagina è stata modificata nel frattempo; è impossibile modificare solo la sezione scelta, quindi è stata caricata la pagina intera.';
+$lang['regmissing']            = 'Devi riempire tutti i campi.';
+$lang['reguexists']            = 'Il nome utente inserito esiste già.';
+$lang['regsuccess']            = 'L\'utente è stato creato. La password è stata spedita via email.';
+$lang['regsuccess2']           = 'L\'utente è stato creato.';
+$lang['regmailfail']           = 'Sembra che ci sia stato un errore nell\'invio della email. Contatta l\'amministratore!';
+$lang['regbadmail']            = 'L\'indirizzo email fornito sembra essere non valido - se pensi che ci sia un errore contatta l\'amministratore';
+$lang['regbadpass']            = 'Le due password inserite non coincidono, prova di nuovo.';
+$lang['regpwmail']             = 'La tua password per DokuWiki';
+$lang['reghere']               = 'Non sei ancora registrato? Registrati qui.';
+$lang['profna']                = 'Questo wiki non supporta modifiche al profilo';
+$lang['profnochange']          = 'Nessuna modifica, niente da aggiornare.';
+$lang['profnoempty']           = 'Nome o indirizzo email vuoti non sono consentiti.';
+$lang['profchanged']           = 'Aggiornamento del profilo utente riuscito.';
+$lang['profnodelete']          = 'Questa wiki non supporta la cancellazione degli utenti';
+$lang['profdeleteuser']        = 'Elimina account';
+$lang['profdeleted']           = 'Il tuo account utente è stato rimosso da questa wiki';
+$lang['profconfdelete']        = 'Voglio rimuovere il mio account da questa wiki. 
         Questa operazione non può essere annullata.';
+$lang['profconfdeletemissing'] = 'La check box di conferma non è selezionata';
+$lang['pwdforget']             = 'Hai dimenticato la password? Richiedine una nuova';
+$lang['resendna']              = 'Questo wiki non supporta l\'invio di nuove password.';
+$lang['resendpwd']             = 'Imposta nuova password per';
+$lang['resendpwdmissing']      = 'Devi riempire tutti i campi.';
+$lang['resendpwdnouser']       = 'Impossibile trovare questo utente nel database.';
+$lang['resendpwdbadauth']      = 'Spiacenti, questo codice di autorizzazione non è valido. Assicurati di aver usato il link completo di conferma.';
+$lang['resendpwdconfirm']      = 'Un link di conferma è stato spedito via email.';
+$lang['resendpwdsuccess']      = 'La nuova password è stata spedita via email.';
+$lang['license']               = 'Ad eccezione da dove è diversamente indicato, il contenuto di questo wiki è soggetto alla seguente licenza:';
+$lang['licenseok']             = 'Nota: modificando questa pagina accetti di rilasciare il contenuto sotto la seguente licenza:';
+$lang['searchmedia']           = 'Cerca file di nome:';
+$lang['searchmedia_in']        = 'Cerca in %s';
+$lang['txt_upload']            = 'Seleziona un file da caricare';
+$lang['txt_filename']          = 'Carica come (opzionale)';
+$lang['txt_overwrt']           = 'Sovrascrivi file esistente';
+$lang['maxuploadsize']         = 'Upload max. %s per ogni file.';
+$lang['lockedby']              = 'Attualmente bloccato da';
+$lang['lockexpire']            = 'Il blocco scade alle';
+$lang['js']['willexpire']      = 'Il tuo blocco su questa pagina scadrà tra circa un minuto.\nPer evitare incongruenze usa il pulsante di anteprima per prolungare il periodo di blocco.';
+$lang['js']['notsavedyet']     = 'Le modifiche non salvate andranno perse.';
+$lang['js']['searchmedia']     = 'Cerca file';
+$lang['js']['keepopen']        = 'Tieni la finestra aperta durante la selezione';
+$lang['js']['hidedetails']     = 'Nascondi Dettagli';
+$lang['js']['mediatitle']      = 'Impostazioni link';
+$lang['js']['mediadisplay']    = 'Tipo link';
+$lang['js']['mediaalign']      = 'Allineamento';
+$lang['js']['mediasize']       = 'Dimensioni immagine';
+$lang['js']['mediatarget']     = 'Target del link';
+$lang['js']['mediaclose']      = 'Chiudi';
+$lang['js']['mediainsert']     = 'Inserisci';
+$lang['js']['mediadisplayimg'] = 'Mostra l\'immagine.';
+$lang['js']['mediadisplaylnk'] = 'Mostra solo il link.';
+$lang['js']['mediasmall']      = 'Versione piccola';
+$lang['js']['mediamedium']     = 'Versione media';
+$lang['js']['medialarge']      = 'Versione grande';
+$lang['js']['mediaoriginal']   = 'Versione originale';
+$lang['js']['medialnk']        = 'Link alla pagina dei dettagli';
+$lang['js']['mediadirect']     = 'Link all\'originale';
+$lang['js']['medianolnk']      = 'No link';
+$lang['js']['medianolink']     = 'Non linkare l\'immagine.';
+$lang['js']['medialeft']       = 'Allinea l\'immagine a sinistra.';
+$lang['js']['mediaright']      = 'Allinea l\'immagine a destra.';
+$lang['js']['mediacenter']     = 'Allinea l\'immagine al centro.';
+$lang['js']['medianoalign']    = 'Non allineare.';
+$lang['js']['nosmblinks']      = 'I collegamenti con le risorse condivise di Windows funzionano solo con Microsoft Internet Explorer.
+È comunque possibile copiare e incollare il collegamento.';
+$lang['js']['linkwiz']         = 'Collegamento guidato';
+$lang['js']['linkto']          = 'Collega a:';
+$lang['js']['del_confirm']     = 'Eliminare veramente questa voce?';
+$lang['js']['restore_confirm'] = 'Vuoi davvero ripristinare questa versione?';
+$lang['js']['media_diff']      = 'Guarda le differenze:';
+$lang['js']['media_diff_both'] = 'Fianco a Fianco';
+$lang['js']['media_select']    = 'Seleziona files..';
+$lang['js']['media_upload_btn'] = 'Upload';
+$lang['js']['media_done_btn']  = 'Fatto';
+$lang['js']['media_drop']      = 'Sgancia i files qui per caricarli';
+$lang['js']['media_cancel']    = 'rimuovi';
+$lang['js']['media_overwrt']   = 'Sovrascrivi i file esistenti';
+$lang['rssfailed']             = 'Si è verificato un errore cercando questo feed: ';
+$lang['nothingfound']          = 'Nessun risultato trovato.';
+$lang['mediaselect']           = 'Selezione dei file';
+$lang['fileupload']            = 'File caricato';
+$lang['uploadsucc']            = 'Invio riuscito';
+$lang['uploadfail']            = 'Invio fallito. È possibile che si tratti di un problema di permessi.';
+$lang['uploadwrong']           = 'Invio rifiutato. Questa estensione di file non è ammessa';
+$lang['uploadexist']           = 'Il file esiste già. Invio annullato.';
+$lang['uploadbadcontent']      = 'Il tipo di contenuto caricato non corrisponde all\'estensione del file %s.';
+$lang['uploadspam']            = 'Il caricamento è stato bloccato come spam perché presente nella lista nera.';
+$lang['uploadxss']             = 'Il caricamento è stato bloccato perchè il contenuto potrebbe essere un virus o presentare problemi di sicurezza.';
+$lang['uploadsize']            = 'Il file caricato è troppo grande. (massimo %s)';
+$lang['deletesucc']            = 'Il file "%s" è stato eliminato.';
+$lang['deletefail']            = '"%s" non può essere eliminato - verifica i permessi.';
+$lang['mediainuse']            = 'Il file "%s" non è stato eliminato - è ancora in uso.';
+$lang['namespaces']            = 'Categorie';
+$lang['mediafiles']            = 'File disponibili in';
+$lang['accessdenied']          = 'Non sei autorizzato a vedere questa pagina.';
+$lang['mediausage']            = 'Usa la seguente sintassi per riferirti a questo file:';
+$lang['mediaview']             = 'Mostra file originale';
+$lang['mediaroot']             = 'directory principale';
+$lang['mediaupload']           = 'Carica un file nella categoria attuale. Per creare sottocategorie, falle precedere dal nome del file nella casella "Carica come", separandole da due punti (:).';
+$lang['mediaextchange']        = 'Estensione del file modificata da .%s a .%s!';
+$lang['reference']             = 'Riferimenti a';
+$lang['ref_inuse']             = 'Il file non può essere eliminato in quanto è ancora utilizzato dalle seguenti pagine:';
+$lang['ref_hidden']            = 'Sono presenti alcuni riferimenti a pagine per le quali non hai i permessi di lettura';
+$lang['hits']                  = 'Occorrenze trovate';
+$lang['quickhits']             = 'Pagine trovate';
+$lang['toc']                   = 'Indice';
+$lang['current']               = 'versione attuale';
+$lang['yours']                 = 'la tua versione';
+$lang['diff']                  = 'differenze con la versione attuale';
+$lang['diff2']                 = 'differenze tra le versioni selezionate';
+$lang['difflink']              = 'Link a questa pagina di confronto';
+$lang['diff_type']             = 'Guarda le differenze:';
+$lang['diff_inline']           = 'In linea';
+$lang['diff_side']             = 'Fianco a Fianco';
+$lang['line']                  = 'Linea';
+$lang['breadcrumb']            = 'Traccia';
+$lang['youarehere']            = 'Ti trovi qui';
+$lang['lastmod']               = 'Ultima modifica';
+$lang['by']                    = 'da';
+$lang['deleted']               = 'eliminata';
+$lang['created']               = 'creata';
+$lang['restored']              = 'versione precedente ripristinata (%s)';
+$lang['external_edit']         = 'modifica esterna';
+$lang['summary']               = 'Oggetto della modifica';
+$lang['noflash']               = 'E\' necessario il plugin Adobe Flash per visualizzare questo contenuto.';
+$lang['download']              = 'Scarica lo "snippet"';
+$lang['tools']                 = 'Strumenti';
+$lang['user_tools']            = 'Strumenti Utente';
+$lang['site_tools']            = 'Strumenti Sito';
+$lang['page_tools']            = 'Strumenti Pagina';
+$lang['skip_to_content']       = 'salta al contenuto';
+$lang['sidebar']               = 'Barra laterale';
+$lang['mail_newpage']          = 'pagina aggiunta:';
+$lang['mail_changed']          = 'pagina modificata:';
+$lang['mail_subscribe_list']   = 'pagine modificate nella categoria:';
+$lang['mail_new_user']         = 'nuovo utente:';
+$lang['mail_upload']           = 'file caricato:';
+$lang['changes_type']          = 'Guarda cambiamenti di';
+$lang['pages_changes']         = 'Pagine';
+$lang['media_changes']         = 'File multimediali';
+$lang['both_changes']          = 'Sia pagine che media files';
+$lang['qb_bold']               = 'Grassetto';
+$lang['qb_italic']             = 'Corsivo';
+$lang['qb_underl']             = 'Sottolineato';
+$lang['qb_code']               = 'Codice';
+$lang['qb_strike']             = 'Barrato';
+$lang['qb_h1']                 = 'Intestazione di livello 1';
+$lang['qb_h2']                 = 'Intestazione di livello 2';
+$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';
+$lang['qb_ol']                 = 'Elenco numerato';
+$lang['qb_ul']                 = 'Elenco puntato';
+$lang['qb_media']              = 'Inserisci immagini o altri file';
+$lang['qb_sig']                = 'Inserisci la firma';
+$lang['qb_smileys']            = 'Smiley';
+$lang['qb_chars']              = 'Caratteri speciali';
+$lang['upperns']               = 'vai alla categoria principale';
+$lang['admin_register']        = 'Aggiungi un nuovo utente';
+$lang['metaedit']              = 'Modifica metadati';
+$lang['metasaveerr']           = 'Scrittura metadati fallita';
+$lang['metasaveok']            = 'Metadati salvati';
+$lang['img_backto']            = 'Torna a';
+$lang['img_title']             = 'Titolo';
+$lang['img_caption']           = 'Descrizione';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nome File';
+$lang['img_fsize']             = 'Dimensione';
+$lang['img_artist']            = 'Autore';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Parole chiave';
+$lang['img_width']             = 'Larghezza';
+$lang['img_height']            = 'Altezza';
+$lang['img_manager']           = 'Guarda nel gestore media';
+$lang['subscr_subscribe_success'] = 'Aggiunto %s alla lista di sottoscrizioni %s';
+$lang['subscr_subscribe_error'] = 'Impossibile aggiungere %s alla lista di sottoscrizioni %s';
+$lang['subscr_subscribe_noaddress'] = 'Non esiste alcun indirizzo associato al tuo account, non puoi essere aggiunto alla lista di sottoscrizioni';
+$lang['subscr_unsubscribe_success'] = 'Rimosso %s dalla lista di sottoscrizioni %s';
+$lang['subscr_unsubscribe_error'] = 'Impossibile rimuovere %s dalla lista di sottoscrizioni %s';
+$lang['subscr_already_subscribed'] = '%s è già iscritto a %s';
+$lang['subscr_not_subscribed'] = '%s non è iscritto a %s';
+$lang['subscr_m_not_subscribed'] = 'Attualmente non sei iscritto alla pagina o categoria corrente';
+$lang['subscr_m_new_header']   = 'Aggiungi sottoscrizione';
+$lang['subscr_m_current_header'] = 'Sottoscrizioni attuali';
+$lang['subscr_m_unsubscribe']  = 'Rimuovi sottoscrizione';
+$lang['subscr_m_subscribe']    = 'Sottoscrivi';
+$lang['subscr_m_receive']      = 'Ricevi';
+$lang['subscr_style_every']    = 'email per ogni modifica';
+$lang['subscr_style_digest']   = 'email di riassunto dei cambiamenti per ogni pagina (ogni %.2f giorni)';
+$lang['subscr_style_list']     = 'lista delle pagine cambiate dall\'ultima email (ogni %.2f giorni)';
+$lang['authtempfail']          = 'L\'autenticazione è temporaneamente non disponibile. Se questa situazione persiste, informa l\'amministratore di questo wiki.';
+$lang['authpwdexpire']         = 'La tua password scadrà in %d giorni, dovresti cambiarla quanto prima.';
+$lang['i_chooselang']          = 'Scegli la lingua';
+$lang['i_installer']           = 'Installazione di DokuWiki';
+$lang['i_wikiname']            = 'Nome Wiki';
+$lang['i_enableacl']           = 'Abilita ACL (consigliato)';
+$lang['i_superuser']           = 'Amministratore';
+$lang['i_problems']            = 'Si sono verificati problemi durante l\'installazione, indicati di seguito. Non è possibile continuare finché non saranno risolti.';
+$lang['i_modified']            = 'Per motivi di sicurezza questa procedura funziona solamente con un\'installazione Dokuwiki nuova e non modificata.
+Prova a estrarre di nuovo i file dal pacchetto scaricato oppure consulta le
+istruzioni per l\'installazione di Dokuwiki';
+$lang['i_funcna']              = 'La funzione PHP %s non è disponibile. Forse è stata disabilitata dal tuo provider per qualche motivo?';
+$lang['i_phpver']              = 'La versione di PHP %s è inferiore a quella richiesta %s. Devi aggiornare l\'installazione di PHP.';
+$lang['i_permfail']            = 'DokuWiki non può scrivere %s. E\' necessario correggere i permessi per questa directory!';
+$lang['i_confexists']          = '%s esiste già';
+$lang['i_writeerr']            = 'Impossibile creare %s. E\' necessario verificare i permessi della directory o del file oppure creare il file manualmente.';
+$lang['i_badhash']             = 'dokuwiki.php (hash=%s) non riconosciuto o modificato';
+$lang['i_badval']              = '%s - valore vuoto o non valido';
+$lang['i_success']             = 'La configurazione è stata completata correttamente. Ora è possibile eliminare il file install.php. Poi, visita il tuo nuovo DokuWiki.';
+$lang['i_failure']             = 'Si sono verificati errori durante la scrittura dei file di configurazione. Potrebbe essere necessario correggerli manualmente prima di poter utilizzare il tuo nuovo DokuWiki.';
+$lang['i_policy']              = 'Regole di accesso iniziali';
+$lang['i_pol0']                = 'Wiki Aperto (lettura, scrittura, caricamento file per tutti)';
+$lang['i_pol1']                = 'Wiki Pubblico (lettura per tutti, scrittura e caricamento file per gli utenti registrati)';
+$lang['i_pol2']                = 'Wiki Chiuso (lettura, scrittura, caricamento file solamente per gli utenti registrati)';
+$lang['i_allowreg']            = 'Permetti agli utenti di registrarsi';
+$lang['i_retry']               = 'Riprova';
+$lang['i_license']             = 'Per favore scegli la licenza sotto cui vuoi rilasciare il contenuto:';
+$lang['i_license_none']        = 'Non mostrare informazioni sulla licenza';
+$lang['i_pop_field']           = 'Per favore, aiutaci ad incrementare la conoscenza di DokuWiki:';
+$lang['i_pop_label']           = 'Mensilmente invia una statistica d\'uso anonima di DokuWiki agli sviluppatori';
+$lang['recent_global']         = 'Stai attualmente vedendo le modifiche effettuate nell\'area %s. Puoi anche vedere le modifiche recenti dell\'intero wiki.';
+$lang['years']                 = '%d anni fa';
+$lang['months']                = '%d mesi fa';
+$lang['weeks']                 = '%d settimane fa';
+$lang['days']                  = '%d giorni fa';
+$lang['hours']                 = '%d ore fa';
+$lang['minutes']               = '%d minuti fa';
+$lang['seconds']               = '%d secondi fa';
+$lang['wordblock']             = 'La modifica non è stata salvata perché contiene testo bloccato (spam).';
+$lang['media_uploadtab']       = 'Upload';
+$lang['media_searchtab']       = 'Cerca';
+$lang['media_file']            = 'File';
+$lang['media_viewtab']         = 'Guarda';
+$lang['media_edittab']         = 'Modifica';
+$lang['media_historytab']      = 'Storia';
+$lang['media_list_thumbs']     = 'Miniatura';
+$lang['media_list_rows']       = 'Righe';
+$lang['media_sort_name']       = 'Nome';
+$lang['media_sort_date']       = 'Data';
+$lang['media_namespaces']      = 'Scegli il namespace';
+$lang['media_files']           = 'File in %s';
+$lang['media_upload']          = 'Upload al %s';
+$lang['media_search']          = 'Cerca in %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s a %s';
+$lang['media_edit']            = 'Modifica %s';
+$lang['media_history']         = 'Storia di %s';
+$lang['media_meta_edited']     = 'metadata modificati';
+$lang['media_perm_read']       = 'Spiacente, non hai abbastanza privilegi per leggere i files.';
+$lang['media_perm_upload']     = 'Spiacente, non hai abbastanza privilegi per caricare files.';
+$lang['media_update']          = 'Carica nuova versione';
+$lang['media_restore']         = 'Ripristina questa versione';
+$lang['searchresult']          = 'Risultati della ricerca';
diff --git a/sources/inc/lang/it/locked.txt b/sources/inc/lang/it/locked.txt
new file mode 100644
index 0000000..a655ffc
--- /dev/null
+++ b/sources/inc/lang/it/locked.txt
@@ -0,0 +1,3 @@
+====== Pagina bloccata ======
+
+Questa pagina è attualmente bloccata poiché un altro utente sta effettuando delle modifiche. Devi attendere che l'utente concluda le modifiche o che il blocco scada.
diff --git a/sources/inc/lang/it/login.txt b/sources/inc/lang/it/login.txt
new file mode 100644
index 0000000..c6fd97b
--- /dev/null
+++ b/sources/inc/lang/it/login.txt
@@ -0,0 +1,4 @@
+====== Accesso ======
+
+Non sei ancora collegato! Inserisci il tuo nome utente e la tua password per autenticarti. E' necessario che il tuo browser abbia i cookie abilitati.
+
diff --git a/sources/inc/lang/it/mailtext.txt b/sources/inc/lang/it/mailtext.txt
new file mode 100644
index 0000000..3a32696
--- /dev/null
+++ b/sources/inc/lang/it/mailtext.txt
@@ -0,0 +1,17 @@
+Una pagina su DokuWiki è stata aggiunta o modificata. Questi sono i dettagli:
+
+Data : @DATE@
+Browser : @BROWSER@
+Indirizzo IP : @IPADDRESS@
+Nome host : @HOSTNAME@
+Vecchia revisione : @OLDPAGE@
+Nuova revisione : @NEWPAGE@
+Oggetto della modifica : @SUMMARY@
+Utente : @USER@
+
+@DIFF@
+
+
+-- 
+Questa email è stata generata dal DokuWiki all'indirizzo
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/it/mailwrap.html b/sources/inc/lang/it/mailwrap.html
new file mode 100644
index 0000000..24a2bc8
--- /dev/null
+++ b/sources/inc/lang/it/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Questa email è stata generata da DokuWiki presso @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/it/newpage.txt b/sources/inc/lang/it/newpage.txt
new file mode 100644
index 0000000..d41601c
--- /dev/null
+++ b/sources/inc/lang/it/newpage.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/it/norev.txt b/sources/inc/lang/it/norev.txt
new file mode 100644
index 0000000..91ef751
--- /dev/null
+++ b/sources/inc/lang/it/norev.txt
@@ -0,0 +1,3 @@
+====== Revisione inesistente ======
+
+La revisione richiesta non esiste. Usa il pulsante ''Revisioni precedenti'' per ottenere una lista di revisioni precedenti di questo documento.
diff --git a/sources/inc/lang/it/password.txt b/sources/inc/lang/it/password.txt
new file mode 100644
index 0000000..670d5ae
--- /dev/null
+++ b/sources/inc/lang/it/password.txt
@@ -0,0 +1,10 @@
+Ciao @FULLNAME@!
+
+Questi sono i tuoi dati di accesso per @TITLE@ su @DOKUWIKIURL@
+
+Nome utente : @LOGIN@
+Password    : @PASSWORD@
+
+-- 
+Questa email è stata generata dal DokuWiki all'indirizzo
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/it/preview.txt b/sources/inc/lang/it/preview.txt
new file mode 100644
index 0000000..c3cf352
--- /dev/null
+++ b/sources/inc/lang/it/preview.txt
@@ -0,0 +1,5 @@
+====== Anteprima ======
+
+Questa è un'anteprima di come apparirà il tuo testo. Attenzione: **la pagina non è ancora stata salvata**!.
+
+
diff --git a/sources/inc/lang/it/pwconfirm.txt b/sources/inc/lang/it/pwconfirm.txt
new file mode 100644
index 0000000..8a594de
--- /dev/null
+++ b/sources/inc/lang/it/pwconfirm.txt
@@ -0,0 +1,15 @@
+Ciao @FULLNAME@!
+
+Qualcuno ha richiesto una nuova password per il tuo accesso
+@TITLE@ a @DOKUWIKIURL@
+
+Se non hai richiesto tu la nuova password ignora questa email.
+
+Per confermare che la richiesta è stata realmente inviata da te usa il
+seguente collegamento.
+
+@CONFIRM@
+
+-- 
+Questa email è stata generata dal DokuWiki all'indirizzo
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/it/read.txt b/sources/inc/lang/it/read.txt
new file mode 100644
index 0000000..0a72454
--- /dev/null
+++ b/sources/inc/lang/it/read.txt
@@ -0,0 +1 @@
+Questa pagina è in sola lettura. Puoi visualizzare il sorgente, ma non puoi modificarlo. Contatta l'amministratore se pensi che ci sia un errore.
diff --git a/sources/inc/lang/it/recent.txt b/sources/inc/lang/it/recent.txt
new file mode 100644
index 0000000..4c29a9d
--- /dev/null
+++ b/sources/inc/lang/it/recent.txt
@@ -0,0 +1,4 @@
+====== Ultime modifiche ======
+
+Queste sono le ultime pagine modificate.
+
diff --git a/sources/inc/lang/it/register.txt b/sources/inc/lang/it/register.txt
new file mode 100644
index 0000000..5a336a9
--- /dev/null
+++ b/sources/inc/lang/it/register.txt
@@ -0,0 +1,3 @@
+====== Registrazione nuovo utente ======
+
+Riempi tutte le informazioni seguenti per creare un nuovo account in questo wiki.  Assicurati di inserire un **indirizzo email valido** - a meno che tu non l'abbia già inserita qui, la password ti sarà inviata con un messaggio di posta elettronica. Il nome utente deve soddisfare i criteri per i [[doku>pagename|nomi delle pagine]].
\ No newline at end of file
diff --git a/sources/inc/lang/it/registermail.txt b/sources/inc/lang/it/registermail.txt
new file mode 100644
index 0000000..30a6fed
--- /dev/null
+++ b/sources/inc/lang/it/registermail.txt
@@ -0,0 +1,14 @@
+Un nuovo utente è stato registrato. Ecco i dettagli:
+
+Nome utente   : @NEWUSER@
+Nome completo : @NEWNAME@
+EMail        : @NEWEMAIL@
+
+Data : @DATE@
+Browser : @BROWSER@
+Indirizzo IP : @IPADDRESS@
+Nome host : @HOSTNAME@
+
+-- 
+Questa email è stata generata dal DokuWiki all'indirizzo
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/it/resendpwd.txt b/sources/inc/lang/it/resendpwd.txt
new file mode 100644
index 0000000..54604d7
--- /dev/null
+++ b/sources/inc/lang/it/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Invia nuova password ======
+
+Inserisci tutte le informazioni per ottenere una nuova password per il tuo account su questo wiki. La nuova password sarà inviata al tuo indirizzo di posta elettronica registrato. Il nome utente deve essere il tuo nome utente in questo wiki.
diff --git a/sources/inc/lang/it/resetpwd.txt b/sources/inc/lang/it/resetpwd.txt
new file mode 100644
index 0000000..450dd83
--- /dev/null
+++ b/sources/inc/lang/it/resetpwd.txt
@@ -0,0 +1 @@
+Inserisci perfavore una nuova password per il tuo account su questo wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/it/revisions.txt b/sources/inc/lang/it/revisions.txt
new file mode 100644
index 0000000..19c501b
--- /dev/null
+++ b/sources/inc/lang/it/revisions.txt
@@ -0,0 +1,3 @@
+====== Versione precedente ======
+
+Queste sono le versioni precedenti del documento attuale. Per ripristinare una versione precedente, seleziona la versione, modificala usando il pulsante ''Modifica questa pagina'' e salvala.
diff --git a/sources/inc/lang/it/searchpage.txt b/sources/inc/lang/it/searchpage.txt
new file mode 100644
index 0000000..60a019c
--- /dev/null
+++ b/sources/inc/lang/it/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
diff --git a/sources/inc/lang/it/showrev.txt b/sources/inc/lang/it/showrev.txt
new file mode 100644
index 0000000..7c184f2
--- /dev/null
+++ b/sources/inc/lang/it/showrev.txt
@@ -0,0 +1,2 @@
+**Questa è una vecchia versione del documento!**
+----
diff --git a/sources/inc/lang/it/stopwords.txt b/sources/inc/lang/it/stopwords.txt
new file mode 100644
index 0000000..e91aa3b
--- /dev/null
+++ b/sources/inc/lang/it/stopwords.txt
@@ -0,0 +1,119 @@
+# Questo è un elenco di parole che l'indicizzatore ignora, una parola per riga
+# Quando modifichi questo file fai attenzione ad usare la chiusura della riga in stile UNIX (nuova linea singola)
+# Non è necessario includere parole più brevi di 3 caratteri - queste vengono in ogni caso ignorate
+# Questo elenco è basato su quello trovato in http://www.ranks.nl/stopwords/
+adesso
+alla
+allo
+allora
+altre
+altri
+altro
+anche
+ancora
+avere
+aveva
+avevano
+ben
+buono
+che
+chi
+cinque
+comprare
+con
+consecutivi
+consecutivo
+cosa
+cui
+del
+della
+dello
+dentro
+deve
+devo
+doppio
+due
+ecco
+fare
+fine
+fino
+fra
+gente
+giu
+hai
+hanno
+indietro
+invece
+lavoro
+lei
+loro
+lui
+lungo
+meglio
+molta
+molti
+molto
+nei
+nella
+noi
+nome
+nostro
+nove
+nuovi
+nuovo
+oltre
+ora
+otto
+peggio
+pero
+persone
+piu
+poco
+primo
+promesso
+qua
+quarto
+quasi
+quattro
+quello
+questo
+qui
+quindi
+quinto
+rispetto
+sara
+secondo
+sei
+sembra
+sembrava
+senza
+sette
+sia
+siamo
+siete
+solo
+sono
+sopra
+soprattutto
+sotto
+stati
+stato
+stesso
+su
+subito
+sul
+sulla
+tanto
+tempo
+terzo
+tra
+tre
+triplo
+ultimo
+una
+uno
+va
+vai
+voi
+volte
+vostro
diff --git a/sources/inc/lang/it/subscr_digest.txt b/sources/inc/lang/it/subscr_digest.txt
new file mode 100644
index 0000000..a191287
--- /dev/null
+++ b/sources/inc/lang/it/subscr_digest.txt
@@ -0,0 +1,20 @@
+Ciao!
+
+La pagina @PAGE@ nel wiki @TITLE@ è cambiata.
+Queste sono le modifiche:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vecchia revisione: @OLDPAGE@
+Nuova revisione: @NEWPAGE@
+
+Per non ricevere più queste notifiche collegati al 
+wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@
+e rimuovi la sottoscrizione alle modifiche delle 
+pagine e/o categorie.
+
+--
+Questa email è stata generata dal DokuWiki all'indirizzo
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/it/subscr_form.txt b/sources/inc/lang/it/subscr_form.txt
new file mode 100644
index 0000000..54f66e4
--- /dev/null
+++ b/sources/inc/lang/it/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Gestione iscrizioni ======
+
+Questa pagina permette di gestire le tue iscrizioni alla pagina e catogoria attuale.
\ No newline at end of file
diff --git a/sources/inc/lang/it/subscr_list.txt b/sources/inc/lang/it/subscr_list.txt
new file mode 100644
index 0000000..8eb7acd
--- /dev/null
+++ b/sources/inc/lang/it/subscr_list.txt
@@ -0,0 +1,18 @@
+Ciao!
+
+Le pagine nella categoria @PAGE@ del wiki @TITLE@ sono
+cambiate.
+Queste sono le pagine modificate:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Per non ricevere più queste notifiche collegati al 
+wiki @DOKUWIKIURL@ e poi visita @SUBSCRIBE@
+e rimuovi la sottoscrizione alle modifiche delle 
+pagine e/o categorie.
+
+--
+Questa email è stata generata dal DokuWiki all'indirizzo
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/it/subscr_single.txt b/sources/inc/lang/it/subscr_single.txt
new file mode 100644
index 0000000..a8649a4
--- /dev/null
+++ b/sources/inc/lang/it/subscr_single.txt
@@ -0,0 +1,24 @@
+Ciao!
+
+La pagina @PAGE@ nel wiki @TITLE@ è cambiata.
+Queste sono le modifiche:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Utente : @USER@
+Sommario modifica: @SUMMARY@
+Vecchia revisione: @OLDPAGE@
+Nuova revisione: @NEWPAGE@
+
+Per non ricevere più queste notifiche, collegati al 
+wiki all'indirizzo @DOKUWIKIURL@ e poi visita
+@SUBSCRIBE@
+e rimuovi la sottoscrizione alle modifiche della 
+pagina o categoria.
+
+--
+Questa email è stata generata dal DokuWiki all'indirizzo
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/it/updateprofile.txt b/sources/inc/lang/it/updateprofile.txt
new file mode 100644
index 0000000..71157a2
--- /dev/null
+++ b/sources/inc/lang/it/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Aggiorna il profilo del tuo account ======
+
+E' necessario compilare solo i campi che desideri modificare. Non puoi cambiare il tuo nome utente.
diff --git a/sources/inc/lang/it/uploadmail.txt b/sources/inc/lang/it/uploadmail.txt
new file mode 100644
index 0000000..da3dacd
--- /dev/null
+++ b/sources/inc/lang/it/uploadmail.txt
@@ -0,0 +1,14 @@
+Un file è stato caricato sul tuo DokuWiki. Seguono i dettagli:
+
+File : @MEDIA@
+Data : @DATE@
+Browser : @BROWSER@
+Indirizzo IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Dimensione : @SIZE@
+Tipo MIME : @MIME@
+Utente : @USER@
+
+-- 
+Questa email è stata generata dal DokuWiki all'indirizzo
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ja/admin.txt b/sources/inc/lang/ja/admin.txt
new file mode 100644
index 0000000..b0c6d34
--- /dev/null
+++ b/sources/inc/lang/ja/admin.txt
@@ -0,0 +1,4 @@
+====== 管理者メニュー ======
+
+DokuWikiで管理できるタスクの一覧です
+
diff --git a/sources/inc/lang/ja/adminplugins.txt b/sources/inc/lang/ja/adminplugins.txt
new file mode 100644
index 0000000..1708bbb
--- /dev/null
+++ b/sources/inc/lang/ja/adminplugins.txt
@@ -0,0 +1 @@
+===== 追加プラグイン =====
\ No newline at end of file
diff --git a/sources/inc/lang/ja/backlinks.txt b/sources/inc/lang/ja/backlinks.txt
new file mode 100644
index 0000000..69644b7
--- /dev/null
+++ b/sources/inc/lang/ja/backlinks.txt
@@ -0,0 +1,4 @@
+====== バックリンク ======
+
+先ほどの文書にリンクしている文書のリストです。
+
diff --git a/sources/inc/lang/ja/conflict.txt b/sources/inc/lang/ja/conflict.txt
new file mode 100644
index 0000000..099b598
--- /dev/null
+++ b/sources/inc/lang/ja/conflict.txt
@@ -0,0 +1,6 @@
+====== 新しいバージョンが存在します ======
+
+編集中に他のユーザーがこの文書を更新したため、新しいバージョンの文書が存在します。
+
+以下に文書間の差分を表示するので、どちらかの文書を選択してください。''保存'' を選択すると現在編集中の文書が保存されます。''キャンセル'' は編集中の文書が破棄されます。
+
diff --git a/sources/inc/lang/ja/denied.txt b/sources/inc/lang/ja/denied.txt
new file mode 100644
index 0000000..d170aeb
--- /dev/null
+++ b/sources/inc/lang/ja/denied.txt
@@ -0,0 +1,4 @@
+====== アクセスが拒否されました ======
+
+実行する権限がありません。ログインされているか確認してください。
+
diff --git a/sources/inc/lang/ja/diff.txt b/sources/inc/lang/ja/diff.txt
new file mode 100644
index 0000000..fe5f6b1
--- /dev/null
+++ b/sources/inc/lang/ja/diff.txt
@@ -0,0 +1,4 @@
+====== 差分 ======
+
+この文書の現在のバージョンと選択したバージョンの差分を表示します。
+
diff --git a/sources/inc/lang/ja/draft.txt b/sources/inc/lang/ja/draft.txt
new file mode 100644
index 0000000..af3160b
--- /dev/null
+++ b/sources/inc/lang/ja/draft.txt
@@ -0,0 +1,6 @@
+====== ドラフトファイルが存在します ======
+
+このページに対する最後の編集は正しく終了されませんでした。 その編集作業を引き続き行えるよう、以下に示す内容が自動的に保存されています。
+
+この自動的に保存された編集内容に対して、//復元する//、//削除する//、 もしくはこのページの編集を//キャンセル//して下さい。
+
diff --git a/sources/inc/lang/ja/edit.txt b/sources/inc/lang/ja/edit.txt
new file mode 100644
index 0000000..e7a8f97
--- /dev/null
+++ b/sources/inc/lang/ja/edit.txt
@@ -0,0 +1,4 @@
+編集して''保存''をクリックしてください。Wikiの構文については [[wiki:syntax]] を参考にしてください
+
+当然のことですが、この文書の質を **向上** させる場合のみ編集してください。もし編集方法や構文を練習したいのであれば [[playground:playground]] を利用してください。
+
diff --git a/sources/inc/lang/ja/editrev.txt b/sources/inc/lang/ja/editrev.txt
new file mode 100644
index 0000000..7c98413
--- /dev/null
+++ b/sources/inc/lang/ja/editrev.txt
@@ -0,0 +1,2 @@
+**古いリビジョンの文書を開いています** もしこのまま保存すると、この文書が最新となります。
+----
diff --git a/sources/inc/lang/ja/index.txt b/sources/inc/lang/ja/index.txt
new file mode 100644
index 0000000..b044789
--- /dev/null
+++ b/sources/inc/lang/ja/index.txt
@@ -0,0 +1,4 @@
+====== サイトマップ ======
+
+[[doku>namespaces|名前空間]] に基づく、全ての文書の索引です。
+
diff --git a/sources/inc/lang/ja/install.html b/sources/inc/lang/ja/install.html
new file mode 100644
index 0000000..3a1d0d4
--- /dev/null
+++ b/sources/inc/lang/ja/install.html
@@ -0,0 +1,14 @@
+
        このページは、Dokuwikiのインストールと初期設定をサポートします。
+このインストーラーに関する詳細は documentation page を参考にしてください。
        
+
+
        DokuWikiは、通常のファイルにWikiページの内容と関連する情報（例えば、画像、検索インデックス、古いリビジョンなど）を保存します。
+そのため、DokuWikiを使用するためには、それらのファイルを保存するディレクトリに書き込みの権限が必ず必要となります。
+このインストーラーではディレクトリの権限の変更は行えないため、コマンドシェルで権限の変更を直接行うか、
+ホスティングサービスを利用している場合はそのコントロールパネルもしくはFTPを通して、権限の変更を行ってください。
        
+
+
        DokuWikiは、プラグイン、ユーザー、Wikiページへのアクセス制限、設定の変更を管理する機能を有しており、
+その機能を有効にするために必要な ACL の設定が、このインストーラーによって行われます。
+この管理機能は、DokuWikiを使用する上で必要ではありませんが、DokuWikiの管理を簡単にしてくれます。
        
+
+
        従来のバージョンを使用しているユーザーや特別なセットアップが必要な場合は、次のリンク先を参考にして下さい
+（installation instructions, configuration settings）。
        
diff --git a/sources/inc/lang/ja/lang.php b/sources/inc/lang/ja/lang.php
new file mode 100644
index 0000000..1f53b0a
--- /dev/null
+++ b/sources/inc/lang/ja/lang.php
@@ -0,0 +1,338 @@
+
+ * @author Ikuo Obataya 
+ * @author Daniel Dupriest 
+ * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
+ * @author Satoshi Sahara 
+ * @author Hideaki SAWADA 
+ * @author Hideaki SAWADA 
+ */
+$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_profile']           = 'ユーザー情報の更新';
+$lang['btn_reset']             = 'リセット';
+$lang['btn_resendpwd']         = '新しいパスワードをセット';
+$lang['btn_draft']             = 'ドラフトを編集';
+$lang['btn_recover']           = 'ドラフトを復元';
+$lang['btn_draftdel']          = 'ドラフトを削除';
+$lang['btn_revert']            = '元に戻す';
+$lang['btn_register']          = 'ユーザー登録';
+$lang['btn_apply']             = '適用';
+$lang['btn_media']             = 'メディアマネージャー';
+$lang['btn_deleteuser']        = '自分のアカウントの抹消';
+$lang['loggedinas']            = 'ようこそ';
+$lang['user']                  = 'ユーザー名';
+$lang['pass']                  = 'パスワード';
+$lang['newpass']               = '新しいパスワード';
+$lang['oldpass']               = '現在のパスワード';
+$lang['passchk']               = '確認';
+$lang['remember']              = 'ユーザー名とパスワードを記憶する';
+$lang['fullname']              = 'フルネーム';
+$lang['email']                 = 'メールアドレス';
+$lang['profile']               = 'ユーザー情報';
+$lang['badlogin']              = 'ユーザー名かパスワードが違います。';
+$lang['badpassconfirm']        = 'パスワードが間違っています。';
+$lang['minoredit']             = '小変更';
+$lang['draftdate']             = 'ドラフト保存日時：';
+$lang['nosecedit']             = 'ページ内容が変更されていますがセクション情報が古いため、代わりにページ全体をロードしました。';
+$lang['regmissing']            = '全ての項目を入力してください。';
+$lang['reguexists']            = 'このユーザー名は既に存在しています。';
+$lang['regsuccess']            = '新しいユーザーが作成されました。パスワードは登録したメールアドレス宛てに送付されます。';
+$lang['regsuccess2']           = '新しいユーザーが作成されました。';
+$lang['regmailfail']           = 'パスワードのメール送信に失敗しました。お手数ですが管理者まで連絡をお願いします。';
+$lang['regbadmail']            = 'メールアドレスが有効ではありません。';
+$lang['regbadpass']            = '確認用のパスワードが正しくありません。';
+$lang['regpwmail']             = 'あなたの DokuWiki パスワード';
+$lang['reghere']               = 'ご自分用のアカウントを取ってみては如何ですか？';
+$lang['profna']                = 'ユーザー情報の変更は出来ません';
+$lang['profnochange']          = '変更点はありませんでした。';
+$lang['profnoempty']           = 'ユーザー名とメールアドレスを入力して下さい。';
+$lang['profchanged']           = 'ユーザー情報は更新されました。';
+$lang['profnodelete']          = 'この wiki はユーザーを削除できない。';
+$lang['profdeleteuser']        = 'アカウントの削除';
+$lang['profdeleted']           = 'このwikiからあなたのユーザーアカウントは削除済です。';
+$lang['profconfdelete']        = 'このwikiから自分のアカウント抹消を希望します。
         この操作は取消すことができません。';
+$lang['profconfdeletemissing'] = '確認のチェックボックスがチェックされていません。';
+$lang['pwdforget']             = 'パスワードをお忘れですか？パスワード再発行';
+$lang['resendna']              = 'パスワードの再発行は出来ません。';
+$lang['resendpwd']             = '新しいパスワードをセット';
+$lang['resendpwdmissing']      = '全ての項目を入力して下さい。';
+$lang['resendpwdnouser']       = '入力されたユーザーが見つかりませんでした。';
+$lang['resendpwdbadauth']      = '申し訳ありません。この確認コードは有効ではありません。メール内に記載されたリンクを確認してください。';
+$lang['resendpwdconfirm']      = '確認用のリンクを含んだメールを送信しました。';
+$lang['resendpwdsuccess']      = '新しいパスワードがメールで送信されました。';
+$lang['license']               = '特に明示されていない限り、本Wikiの内容は次のライセンスに従います：';
+$lang['licenseok']             = '注意： 本ページを編集することは、あなたの編集した内容が次のライセンスに従うことに同意したものとみなします：';
+$lang['searchmedia']           = '検索ファイル名：';
+$lang['searchmedia_in']        = '%s 内を検索';
+$lang['txt_upload']            = 'アップロードするファイルを選んでください。';
+$lang['txt_filename']          = '名前を変更してアップロード（オプション）';
+$lang['txt_overwrt']           = '既存のファイルを上書き';
+$lang['maxuploadsize']         = 'アップロード上限サイズ %s /ファイル';
+$lang['lockedby']              = 'この文書は次のユーザーによってロックされています';
+$lang['lockexpire']            = 'ロック期限：';
+$lang['js']['willexpire']      = '編集中の文書はロック期限を過ぎようとしています。このままロックする場合は、一度文書の確認を行って期限をリセットしてください。';
+$lang['js']['notsavedyet']     = '変更は保存されません。このまま処理を続けてよろしいですか？';
+$lang['js']['searchmedia']     = 'ファイル検索';
+$lang['js']['keepopen']        = '選択中はウィンドウを閉じない';
+$lang['js']['hidedetails']     = '詳細を非表示';
+$lang['js']['mediatitle']      = 'リンク設定';
+$lang['js']['mediadisplay']    = 'リンクタイプ';
+$lang['js']['mediaalign']      = '位置';
+$lang['js']['mediasize']       = 'イメージサイズ';
+$lang['js']['mediatarget']     = 'リンク先';
+$lang['js']['mediaclose']      = '閉じる';
+$lang['js']['mediainsert']     = '挿入';
+$lang['js']['mediadisplayimg'] = 'イメージを表示';
+$lang['js']['mediadisplaylnk'] = 'リンクのみ表示';
+$lang['js']['mediasmall']      = '小さいサイズ';
+$lang['js']['mediamedium']     = '通常サイズ';
+$lang['js']['medialarge']      = '大きいサイズ';
+$lang['js']['mediaoriginal']   = 'オリジナルのサイズ';
+$lang['js']['medialnk']        = '詳細ページへのリンク';
+$lang['js']['mediadirect']     = 'オリジナルへの直リンク';
+$lang['js']['medianolnk']      = 'リンク無し';
+$lang['js']['medianolink']     = 'イメージをリンクしない';
+$lang['js']['medialeft']       = 'イメージを左に寄せる';
+$lang['js']['mediaright']      = 'イメージを右に寄せる';
+$lang['js']['mediacenter']     = 'イメージを中央に寄せる';
+$lang['js']['medianoalign']    = '位置を設定しない';
+$lang['js']['nosmblinks']      = 'ウィンドウズの共有フォルダへリンクは Microsoft Internet Explorer でしか機能しませんが、リンクをコピーして貼り付けることは可能です。';
+$lang['js']['linkwiz']         = 'リンクウィザード';
+$lang['js']['linkto']          = 'リンク先：';
+$lang['js']['del_confirm']     = '選択した項目を本当に削除しますか？';
+$lang['js']['restore_confirm'] = '本当にこのバージョンを復元しますか?';
+$lang['js']['media_diff']      = '差分の表示方法:';
+$lang['js']['media_diff_both'] = '並べて表示';
+$lang['js']['media_diff_opacity'] = '重ねて透過表示';
+$lang['js']['media_diff_portions'] = '重ねて切替表示';
+$lang['js']['media_select']    = 'ファイルを選択...';
+$lang['js']['media_upload_btn'] = 'アップロード';
+$lang['js']['media_done_btn']  = '完了';
+$lang['js']['media_drop']      = 'ここにファイルをドロップするとアップロードします';
+$lang['js']['media_cancel']    = '削除';
+$lang['js']['media_overwrt']   = '既存のファイルを上書きする';
+$lang['rssfailed']             = 'RSSの取得に失敗しました：';
+$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['accessdenied']          = 'このページを閲覧する権限がありません。';
+$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['difflink']              = 'この比較画面にリンクする';
+$lang['diff_type']             = '差分の表示方法：';
+$lang['diff_inline']           = 'インライン';
+$lang['diff_side']             = '横に並べる';
+$lang['line']                  = 'ライン';
+$lang['breadcrumb']            = 'トレース';
+$lang['youarehere']            = '現在位置';
+$lang['lastmod']               = '最終更新';
+$lang['by']                    = 'by';
+$lang['deleted']               = '削除';
+$lang['created']               = '作成';
+$lang['restored']              = '以前のリビジョンを復元 (%s)';
+$lang['external_edit']         = '外部編集';
+$lang['summary']               = '編集の概要';
+$lang['noflash']               = 'この内容を表示するためには Adobe Flash Plugin が必要です。';
+$lang['download']              = 'この部分をダウンロード';
+$lang['tools']                 = 'ツール';
+$lang['user_tools']            = 'ユーザ用ツール';
+$lang['site_tools']            = 'サイト用ツール';
+$lang['page_tools']            = 'ページ用ツール';
+$lang['skip_to_content']       = '内容へ移動';
+$lang['sidebar']               = 'サイドバー';
+$lang['mail_newpage']          = '文書の追加：';
+$lang['mail_changed']          = '文書の変更：';
+$lang['mail_subscribe_list']   = '名前空間内でページが変更：';
+$lang['mail_new_user']         = '新規ユーザー：';
+$lang['mail_upload']           = 'ファイルのアップロード：';
+$lang['changes_type']          = '表示する変更のタイプ:';
+$lang['pages_changes']         = 'ページの変更';
+$lang['media_changes']         = 'メディアファイルの変更';
+$lang['both_changes']          = 'ページとメディアファイルの変更';
+$lang['qb_bold']               = '太字';
+$lang['qb_italic']             = '斜体';
+$lang['qb_underl']             = '下線';
+$lang['qb_code']               = 'コード';
+$lang['qb_strike']             = '打消線';
+$lang['qb_h1']                 = '第一見出し';
+$lang['qb_h2']                 = '第二見出し';
+$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']                 = '横罫線';
+$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['img_width']             = '幅';
+$lang['img_height']            = '高さ';
+$lang['img_manager']           = 'メディアマネージャーで閲覧';
+$lang['subscr_subscribe_success'] = '%sが%sの購読リストに登録されました。';
+$lang['subscr_subscribe_error'] = '%sを%sの購読リストへの追加に失敗しました。';
+$lang['subscr_subscribe_noaddress'] = 'あなたのログインに対応するアドレスがないため、購読リストへ追加することができません。';
+$lang['subscr_unsubscribe_success'] = '%sを%sの購読リストから削除しました。';
+$lang['subscr_unsubscribe_error'] = '%sを%sの購読リストからの削除に失敗しました。';
+$lang['subscr_already_subscribed'] = '%sは既に%sに登録されています。';
+$lang['subscr_not_subscribed'] = '%sは%sに登録されていません。';
+$lang['subscr_m_not_subscribed'] = '現在のページ、もしくは名前空間にあなたは登録されていません。';
+$lang['subscr_m_new_header']   = '購読を追加';
+$lang['subscr_m_current_header'] = '現在の購読リスト';
+$lang['subscr_m_unsubscribe']  = '購読を解除';
+$lang['subscr_m_subscribe']    = '購読';
+$lang['subscr_m_receive']      = '受信';
+$lang['subscr_style_every']    = '全ての変更にメールを送信';
+$lang['subscr_style_digest']   = 'それぞれのページへの変更の要約をメールする（%.2f 日毎）';
+$lang['subscr_style_list']     = '前回のメールから変更されたページをリスト（%.2f 日毎）';
+$lang['authtempfail']          = 'ユーザー認証が一時的に使用できなくなっています。この状態が続いているようであれば、Wikiの管理者に連絡して下さい。';
+$lang['authpwdexpire']         = 'あなたのパスワードは、あと%d日で有効期限が切れます。パスワードを変更してください。';
+$lang['i_chooselang']          = '使用言語を選択してください';
+$lang['i_installer']           = 'DokuWiki インストーラー';
+$lang['i_wikiname']            = 'Wiki名';
+$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 に書き込みできません。このディレクトリの権限を確認して下さい。';
+$lang['i_confexists']          = '%s は既に存在します';
+$lang['i_writeerr']            = '%s を作成できません。ディレクトリとファイルの権限を確認し、それらを手動で作成する必要があります。';
+$lang['i_badhash']             = 'dokuwiki.php が認識できないか、編集されています（hash=%s）';
+$lang['i_badval']              = '%s - 正しくない、もしくは値が空です';
+$lang['i_success']             = '設定ファイルは正しく作成されました。作成した DokuWikiを使用するには install.php を削除してください。';
+$lang['i_failure']             = '設定ファイルの作成中にエラーが発生しました。作成した DokuWikiを使用する前に、それらの問題を手動で修正する必要があります。';
+$lang['i_policy']              = 'ACL初期設定';
+$lang['i_pol0']                = 'オープン Wiki（全ての人に、閲覧・書き込み・アップロードを許可）';
+$lang['i_pol1']                = 'パブリック Wiki（閲覧は全ての人が可能、書き込み・アップロードは登録ユーザーのみ）';
+$lang['i_pol2']                = 'クローズド Wiki (登録ユーザーにのみ使用を許可)';
+$lang['i_allowreg']            = 'ユーザ自身で登録可能';
+$lang['i_retry']               = '再試行';
+$lang['i_license']             = 'あなたが作成したコンテンツが属するライセンスを選択してください：';
+$lang['i_license_none']        = 'ライセンス情報を表示しません。';
+$lang['i_pop_field']           = 'Dokuwiki の内容の向上に協力して下さい：';
+$lang['i_pop_label']           = '月に一回、DokuWikiの開発者に匿名の使用データを送信します。';
+$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秒前';
+$lang['wordblock']             = 'スパムと認識されるテキストが含まれているため、変更は保存されませんでした。';
+$lang['media_uploadtab']       = 'アップロード';
+$lang['media_searchtab']       = '検索';
+$lang['media_file']            = 'ファイル';
+$lang['media_viewtab']         = '詳細';
+$lang['media_edittab']         = '編集';
+$lang['media_historytab']      = '履歴';
+$lang['media_list_thumbs']     = 'サムネイル';
+$lang['media_list_rows']       = '行';
+$lang['media_sort_name']       = '名前';
+$lang['media_sort_date']       = '日付';
+$lang['media_namespaces']      = '名前空間を選択';
+$lang['media_files']           = '%s 内のファイル';
+$lang['media_upload']          = '%s にアップロード';
+$lang['media_search']          = '%s 内で検索';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s at %s';
+$lang['media_edit']            = '%s を編集';
+$lang['media_history']         = '%s の履歴';
+$lang['media_meta_edited']     = 'メタデータが編集されました';
+$lang['media_perm_read']       = 'ファイルを閲覧する権限がありません。';
+$lang['media_perm_upload']     = 'ファイルをアップロードする権限がありません。';
+$lang['media_update']          = '新しいバージョンをアップロード';
+$lang['media_restore']         = 'このバージョンを復元';
+$lang['currentns']             = '現在の名前空間';
+$lang['searchresult']          = '検索結果';
+$lang['plainhtml']             = 'プレーンHTML';
+$lang['wikimarkup']            = 'Wikiマークアップ';
diff --git a/sources/inc/lang/ja/locked.txt b/sources/inc/lang/ja/locked.txt
new file mode 100644
index 0000000..1c37c93
--- /dev/null
+++ b/sources/inc/lang/ja/locked.txt
@@ -0,0 +1,3 @@
+====== 文書ロック中 ======
+
+この文書は他のユーザーによってロックされています。編集が完了するか、ロックの期限が切れるのを待って下さい。
diff --git a/sources/inc/lang/ja/login.txt b/sources/inc/lang/ja/login.txt
new file mode 100644
index 0000000..ef18d37
--- /dev/null
+++ b/sources/inc/lang/ja/login.txt
@@ -0,0 +1,4 @@
+====== ログイン ======
+
+ユーザー名とパスワードを入力してログインしてください（クッキーを有効にする必要があります）。
+
diff --git a/sources/inc/lang/ja/mailtext.txt b/sources/inc/lang/ja/mailtext.txt
new file mode 100644
index 0000000..09688cb
--- /dev/null
+++ b/sources/inc/lang/ja/mailtext.txt
@@ -0,0 +1,17 @@
+DokuWiki 内の文書が追加もしくは変更されました。詳細は以下の通りです。
+
+日付        : @DATE@
+ブラウザ    : @BROWSER@
+IPアドレス  : @IPADDRESS@
+ホスト名    : @HOSTNAME@
+前リビジョン: @OLDPAGE@
+新リビジョン: @NEWPAGE@
+編集のサマリ: @SUMMARY@
+ユーザー名  : @USER@
+
+@DIFF@
+
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ja/mailwrap.html b/sources/inc/lang/ja/mailwrap.html
new file mode 100644
index 0000000..a9dd414
--- /dev/null
+++ b/sources/inc/lang/ja/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+このメールは次の DokuWiki によって生成されました： 
         @DOKUWIKIURL@.        
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/ja/newpage.txt b/sources/inc/lang/ja/newpage.txt
new file mode 100644
index 0000000..d03169f
--- /dev/null
+++ b/sources/inc/lang/ja/newpage.txt
@@ -0,0 +1,4 @@
+====== このトピックには文書が存在しません ======
+
+このトピックに文書が作成されていません。 もし、文書作成の権限がある場合は、''文書の作成''をクリックして 最初の文書を作成することができます。
+
diff --git a/sources/inc/lang/ja/norev.txt b/sources/inc/lang/ja/norev.txt
new file mode 100644
index 0000000..48ccde7
--- /dev/null
+++ b/sources/inc/lang/ja/norev.txt
@@ -0,0 +1,4 @@
+====== リビジョンが存在しません ======
+
+指定されたリビジョン存在しません。''以前のリビジョン''をクリックして確認してください。
+
diff --git a/sources/inc/lang/ja/password.txt b/sources/inc/lang/ja/password.txt
new file mode 100644
index 0000000..c00fe0b
--- /dev/null
+++ b/sources/inc/lang/ja/password.txt
@@ -0,0 +1,10 @@
+こんにちは @FULLNAME@! さん
+
+@TITLE@（@DOKUWIKIURL@）に登録されたユーザー情報は以下の通りです。
+
+ユーザー名 : @LOGIN@
+パスワード : @PASSWORD@
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ja/preview.txt b/sources/inc/lang/ja/preview.txt
new file mode 100644
index 0000000..ee839cd
--- /dev/null
+++ b/sources/inc/lang/ja/preview.txt
@@ -0,0 +1,4 @@
+====== プレビュー ======
+
+編集中の文書のプレビューです。確認用なので**保存されていない**ことに注意してください。
+
diff --git a/sources/inc/lang/ja/pwconfirm.txt b/sources/inc/lang/ja/pwconfirm.txt
new file mode 100644
index 0000000..98ccfcd
--- /dev/null
+++ b/sources/inc/lang/ja/pwconfirm.txt
@@ -0,0 +1,13 @@
+こんにちは @FULLNAME@ さん
+
+@TITLE@（@DOKUWIKIURL@）に新規パスワード発行のリクエストがありました。
+
+もしこのリクエストに覚えが無ければ、このメールは無視してください。
+
+このリクエストを行った本人であれば、以下のリンクから作業を完了させてください。
+
+@CONFIRM@
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ja/read.txt b/sources/inc/lang/ja/read.txt
new file mode 100644
index 0000000..14137cc
--- /dev/null
+++ b/sources/inc/lang/ja/read.txt
@@ -0,0 +1,2 @@
+この文書は読取専用です。文書のソースを閲覧することは可能ですが、変更はできません。もし変更したい場合は管理者に連絡してください。
+
diff --git a/sources/inc/lang/ja/recent.txt b/sources/inc/lang/ja/recent.txt
new file mode 100644
index 0000000..d18fd1b
--- /dev/null
+++ b/sources/inc/lang/ja/recent.txt
@@ -0,0 +1,5 @@
+====== 最近の変更 ======
+
+以下の文書は最近更新されたものです。
+
+
diff --git a/sources/inc/lang/ja/register.txt b/sources/inc/lang/ja/register.txt
new file mode 100644
index 0000000..b242d1e
--- /dev/null
+++ b/sources/inc/lang/ja/register.txt
@@ -0,0 +1,4 @@
+====== 新規ユーザー登録 ======
+
+このWikiのユーザー登録を行うためには、以下の情報を全て入力して下さい。 もし以下の項目にパスワードが存在しない場合、パスワードはメールにて送信されますので、 必ず**有効な**メールアドレスを入力してください。 また、ログイン名は [[doku>pagename|pagename]] に準拠していなければなりません。
+
diff --git a/sources/inc/lang/ja/registermail.txt b/sources/inc/lang/ja/registermail.txt
new file mode 100644
index 0000000..2b272de
--- /dev/null
+++ b/sources/inc/lang/ja/registermail.txt
@@ -0,0 +1,14 @@
+新しいユーザーが登録されました。ユーザー情報は以下の通りです。
+
+ユーザー名     : @NEWUSER@
+フルネーム     : @NEWNAME@
+メールアドレス : @NEWEMAIL@
+
+登録日         : @DATE@
+ブラウザ       : @BROWSER@
+IPアドレス     : @IPADDRESS@
+ホスト名       : @HOSTNAME@
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ja/resendpwd.txt b/sources/inc/lang/ja/resendpwd.txt
new file mode 100644
index 0000000..23dd6ff
--- /dev/null
+++ b/sources/inc/lang/ja/resendpwd.txt
@@ -0,0 +1,4 @@
+====== パスワード再発行 ======
+
+このWikiで使用する新しいパスワードをリクエストするために、ユーザー名を入力して下さい。 新パスワード発行リクエストの確認メールが、登録されているメールアドレスに送信されます。
+
diff --git a/sources/inc/lang/ja/resetpwd.txt b/sources/inc/lang/ja/resetpwd.txt
new file mode 100644
index 0000000..a414af9
--- /dev/null
+++ b/sources/inc/lang/ja/resetpwd.txt
@@ -0,0 +1,3 @@
+====== 新しいパスワードをセット ======
+
+このWikiでの、あなたのアカウント用の新しいパスワードを入力して下さい
\ No newline at end of file
diff --git a/sources/inc/lang/ja/revisions.txt b/sources/inc/lang/ja/revisions.txt
new file mode 100644
index 0000000..e43731c
--- /dev/null
+++ b/sources/inc/lang/ja/revisions.txt
@@ -0,0 +1,4 @@
+====== 以前のリビジョン ======
+
+以下はこの文書の以前のリビジョンです。復元するには''文書の編集''をクリック、その後保存してください。
+
diff --git a/sources/inc/lang/ja/searchpage.txt b/sources/inc/lang/ja/searchpage.txt
new file mode 100644
index 0000000..af31272
--- /dev/null
+++ b/sources/inc/lang/ja/searchpage.txt
@@ -0,0 +1,5 @@
+====== 検索 ======
+
+以下に検索結果を表示します。もし、探しているものが見つからない場合、 検索キーワードにちなんだ名前の文書を作成もしくは編集を行ってください。
+
+===== 結果 =====
diff --git a/sources/inc/lang/ja/showrev.txt b/sources/inc/lang/ja/showrev.txt
new file mode 100644
index 0000000..d8ce478
--- /dev/null
+++ b/sources/inc/lang/ja/showrev.txt
@@ -0,0 +1,2 @@
+**以前のリビジョンの文書です**
+----
diff --git a/sources/inc/lang/ja/stopwords.txt b/sources/inc/lang/ja/stopwords.txt
new file mode 100644
index 0000000..628e46e
--- /dev/null
+++ b/sources/inc/lang/ja/stopwords.txt
@@ -0,0 +1,29 @@
+# 以下は、インデックス作成時に無視する語句のリストです。一行に一単語ずつ記入してください。
+# UNIXで用いられる改行コード（LF）を使用してください
+# 3文字より短い語句は自動的に無視されるので、リストに加える必要はありません。
+# このリストは次のサイトをもとに作成されています（http://www.ranks.nl/stopwords/）
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/ja/subscr_digest.txt b/sources/inc/lang/ja/subscr_digest.txt
new file mode 100644
index 0000000..b6c91a3
--- /dev/null
+++ b/sources/inc/lang/ja/subscr_digest.txt
@@ -0,0 +1,21 @@
+こんにちは。
+
+@TITLE@ 内のページ @PAGE@ は変更されました。
+変更点は以下の通りです：
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+古いリビジョン: @OLDPAGE@
+新しいリビジョン: @NEWPAGE@
+
+この通知を解除するには次のウィキへログインし
+@DOKUWIKIURL@
+その後、
+@SUBSCRIBE@
+ページと名前空間の変更に対する購読を解除してください。
+
+-- 
+このメールは次の DokuWiki によって生成されました：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ja/subscr_form.txt b/sources/inc/lang/ja/subscr_form.txt
new file mode 100644
index 0000000..5767189
--- /dev/null
+++ b/sources/inc/lang/ja/subscr_form.txt
@@ -0,0 +1,3 @@
+====== 購読管理 ======
+
+このページで、現在のページと名前空間に対する購読を管理することができます。
\ No newline at end of file
diff --git a/sources/inc/lang/ja/subscr_list.txt b/sources/inc/lang/ja/subscr_list.txt
new file mode 100644
index 0000000..9869fb8
--- /dev/null
+++ b/sources/inc/lang/ja/subscr_list.txt
@@ -0,0 +1,19 @@
+こんにちは。
+
+@TITLE@ の 名前空間 @PAGE@ にあるページが変更されました。
+変更点は以下の通りです:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+
+この通知を解除するには次のウィキへログインし
+@DOKUWIKIURL@
+その後、
+@SUBSCRIBE@
+ページと名前空間の変更に対する購読を解除してください。
+
+-- 
+このメールは次の DokuWiki によって生成されました：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ja/subscr_single.txt b/sources/inc/lang/ja/subscr_single.txt
new file mode 100644
index 0000000..4620f73
--- /dev/null
+++ b/sources/inc/lang/ja/subscr_single.txt
@@ -0,0 +1,24 @@
+こんにちは。
+
+@TITLE@ のウィキにあるページ @PAGE@ が変更されました。
+変更点は以下の通りです:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+日付 : @DATE@
+ユーザー : @USER@
+変更概要: @SUMMARY@
+古いリビジョン: @OLDPAGE@
+新しいリビジョン: @NEWPAGE@
+
+この通知を解除するには次のウィキへログインし
+@DOKUWIKIURL@
+その後、
+@SUBSCRIBE@
+ページと名前空間の変更に対する購読を解除してください。
+
+-- 
+このメールは次の DokuWiki によって生成されました：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ja/updateprofile.txt b/sources/inc/lang/ja/updateprofile.txt
new file mode 100644
index 0000000..e83d929
--- /dev/null
+++ b/sources/inc/lang/ja/updateprofile.txt
@@ -0,0 +1,5 @@
+====== アカウント情報更新 ======
+
+変更したい項目を入力して下さい。ユーザー名は変更できません。
+
+
diff --git a/sources/inc/lang/ja/uploadmail.txt b/sources/inc/lang/ja/uploadmail.txt
new file mode 100644
index 0000000..53f30db
--- /dev/null
+++ b/sources/inc/lang/ja/uploadmail.txt
@@ -0,0 +1,14 @@
+お使いのDokuWikiにファイルがアップロードされました。詳細は以下の通りです。
+
+ファイル    : @MEDIA@
+日付        : @DATE@
+ブラウザ    : @BROWSER@
+IPアドレス  : @IPADDRESS@
+ホスト名    : @HOSTNAME@
+サイズ      : @SIZE@
+MIMEタイプ  : @MIME@
+ユーザー名  : @USER@
+
+-- 
+このメールは次のDokuWikiより自動的に送信されています。
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/kk/lang.php b/sources/inc/lang/kk/lang.php
new file mode 100644
index 0000000..37b0f46
--- /dev/null
+++ b/sources/inc/lang/kk/lang.php
@@ -0,0 +1,130 @@
+>';
+$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_profile']           = 'Профильді жаңарту';
+$lang['btn_reset']             = 'Түсіру';
+$lang['btn_resendpwd']         = 'Шартты белгінi Өзгерту';
+$lang['btn_draft']             = 'Шимайды өңдеу';
+$lang['btn_recover']           = 'Шимайды қайтару';
+$lang['btn_draftdel']          = 'Шимайды өшіру';
+$lang['btn_revert']            = 'Қалпына келтіру';
+$lang['btn_register']          = 'Тіркеу';
+$lang['btn_apply']             = 'Қолдану/Енгізу';
+$lang['loggedinas']            = 'түпнұсқамен кірген';
+$lang['user']                  = 'Түпнұсқа';
+$lang['pass']                  = 'Құпиясөз';
+$lang['newpass']               = 'Жаңа құпиясөз';
+$lang['oldpass']               = 'Ағымдағы құпиясөзді растау';
+$lang['passchk']               = 'Тағы бір рет';
+$lang['remember']              = 'Мені сақтау';
+$lang['fullname']              = 'Шын аты';
+$lang['email']                 = 'Е-пошта';
+$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']             = 'Сіздің DokuWiki құпиясөзіңіз';
+$lang['reghere']               = 'Есебіңіз әлі жоқ па? Біреуін оңай ашыңыз';
+$lang['profna']                = 'Бұл wiki профиль өзертуді қолдамайды';
+$lang['profnochange']          = 'Өзгеріс жоқ, істейтін ештеңе жоқ.';
+$lang['profnoempty']           = 'Бос есім не email рұқсат етілмейді.';
+$lang['profchanged']           = 'Пайдаланушы профилі сәтті жаңартылған.';
+$lang['pwdforget']             = 'Құпиясөзіңізді ұмыттыңызба? Жаңадан біреуін алыңыз';
+$lang['resendna']              = 'Бұл wiki құпиясөзді қайта жіберуді қолдамайды.';
+$lang['resendpwdmissing']      = 'Кешіріңіз, барлық тармақтары толтыруыңыз керек.';
+$lang['resendpwdnouser']       = 'Кешіріңіз, бұл пайдаланушыны дерекқорымызда тапқан жоқпыз.';
+$lang['resendpwdbadauth']      = 'Кешіріңіз, бұл түпнұсқалық коды бұрыс. Толық растау сілтемені пайдалануыңызды тексеріңіз.';
+$lang['resendpwdconfirm']      = 'Растау сілтеме email арқылы жіберілді.';
+$lang['resendpwdsuccess']      = 'Сіздің жаңа құпиясөзіңіз email арқылы жіберілді.';
+$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['js']['willexpire']      = 'Бұл бетті түзеу тойтаруыңыз бір минутта бітеді. Қақтығыс болмау және тойтару таймерді түсіру үшін қарап шығу пернені басыңыз.';
+$lang['js']['notsavedyet']     = 'Сақталмаған өзгерістер жоғалатын болады.';
+$lang['js']['searchmedia']     = 'Файлдарды іздеу';
+$lang['js']['keepopen']        = 'Таңдаған соң терезе жаппаңыз';
+$lang['js']['hidedetails']     = 'Ұсақтарды жасыру';
+$lang['js']['mediatitle']      = 'Султеме теңшелімдері';
+$lang['js']['mediadisplay']    = 'Сілтеме түрі';
+$lang['js']['mediaalign']      = 'Тегістеуі';
+$lang['js']['mediasize']       = 'Сүреттің өлшемі';
+$lang['js']['mediatarget']     = 'Сілтеме нысанасы';
+$lang['js']['mediaclose']      = 'Жабу';
+$lang['js']['mediainsert']     = 'Еңгізу';
+$lang['js']['mediadisplayimg'] = 'Бұл сүретті көрсету';
+$lang['js']['mediadisplaylnk'] = 'Бұл сілтемені ғана көрсету,';
+$lang['js']['mediasmall']      = 'Шағын нұсқасы';
+$lang['js']['mediamedium']     = 'Орташа нұсқасы';
+$lang['js']['medialarge']      = 'Үлкен нұсқасы';
+$lang['js']['mediaoriginal']   = 'Түпнұсқалық нұсқасы';
+$lang['js']['medialnk']        = 'Толық бетке сілтеме';
+$lang['js']['mediadirect']     = 'Түпнұсқалыққа тұра сілтемесі';
+$lang['js']['medianolnk']      = 'Сілтеме жоқ';
+$lang['js']['medianolink']     = 'Суретті сілтетпеу';
+$lang['js']['medialeft']       = 'Сүретті сол жаққа тегістеу';
+$lang['js']['mediaright']      = 'Сүретті оң жаққа тегістеу';
+$lang['js']['mediacenter']     = 'Сүретті ортаға тегістеу';
+$lang['js']['medianoalign']    = 'Тегістеусіз';
+$lang['js']['linkwiz']         = 'Сілтеме көмекшіci';
+$lang['js']['media_diff']      = 'Өзгеліктердi Көрсету';
+$lang['js']['media_select']    = 'Файлды тандау';
+$lang['mediaselect']           = 'Медиа файлдар';
+$lang['mediaroot']             = 'root';
+$lang['yours']                 = 'Сендердің болжамыңыз';
+$lang['created']               = 'ЖасалFан';
+$lang['mail_new_user']         = 'Жаңа пайдаланушы';
+$lang['qb_chars']              = 'Арнайы белгiлер';
+$lang['img_backto']            = 'Қайта оралу';
+$lang['img_format']            = 'Формат';
+$lang['img_camera']            = 'Камера';
+$lang['i_chooselang']          = 'Тіл таңдау';
+$lang['i_retry']               = 'Қайталау';
diff --git a/sources/inc/lang/km/admin.txt b/sources/inc/lang/km/admin.txt
new file mode 100644
index 0000000..29338b2
--- /dev/null
+++ b/sources/inc/lang/km/admin.txt
@@ -0,0 +1,3 @@
+====== អ្នកគ្រោង ======
+ខាងក្រោមជាប្រដបប្រដារបស់អ្នកគ្រោង ឌោគូវីគី។
+
diff --git a/sources/inc/lang/km/backlinks.txt b/sources/inc/lang/km/backlinks.txt
new file mode 100644
index 0000000..f28068a
--- /dev/null
+++ b/sources/inc/lang/km/backlinks.txt
@@ -0,0 +1,5 @@
+====== ខ្សែដំណរក្រោយ ======
+នេះជាទំព័រដែលមានដំណរបណ្តពីទំព័រឥឡូវ។
+====== Backlinks ======
+This is a list of pages that seem to link back to the current page.
+
diff --git a/sources/inc/lang/km/conflict.txt b/sources/inc/lang/km/conflict.txt
new file mode 100644
index 0000000..7b95fda
--- /dev/null
+++ b/sources/inc/lang/km/conflict.txt
@@ -0,0 +1,3 @@
+====== មានបុនរាព្រឹត្តិថ្មីៗ ======
+មានបុនរាព្រឹត្តិថ្មី
+
diff --git a/sources/inc/lang/km/denied.txt b/sources/inc/lang/km/denied.txt
new file mode 100644
index 0000000..58b10ee
--- /dev/null
+++ b/sources/inc/lang/km/denied.txt
@@ -0,0 +1,3 @@
+====== បដិសេធអនុញ្ញាត ======
+សូមទុស អ្នកគ្មានអនុញ្ញាតទៅបណ្តទេ។
+
diff --git a/sources/inc/lang/km/edit.txt b/sources/inc/lang/km/edit.txt
new file mode 100644
index 0000000..516ea37
--- /dev/null
+++ b/sources/inc/lang/km/edit.txt
@@ -0,0 +1,3 @@
+កែតម្រូវទំព័រនេះហើយ ចុច«រក្សាតុក»។  មើល [[wiki:syntax|វាក្យ​សម្ពន្ធ]] ជាកម្នូវីគី។
+សំកែសម្រួលបើអ្នកអាច**ច្នៃចរើន**វា។  បើអ្នកចង់សាកពិសោតអ្វីមួយ សំរៀននៅក្នុង
+[[playground:playground|playground]]។
diff --git a/sources/inc/lang/km/editrev.txt b/sources/inc/lang/km/editrev.txt
new file mode 100644
index 0000000..097c1da
--- /dev/null
+++ b/sources/inc/lang/km/editrev.txt
@@ -0,0 +1,2 @@
+**អ្នក ឯក្សារចាស់!**  បើអ្នករក្សាវា អ្នកគុង់តែបង្កើត ថ្មីជាមួយទិន្នន័យនេះ។
+----
diff --git a/sources/inc/lang/km/index.txt b/sources/inc/lang/km/index.txt
new file mode 100644
index 0000000..3500508
--- /dev/null
+++ b/sources/inc/lang/km/index.txt
@@ -0,0 +1,2 @@
+====== លិបិក្រម ======
+នេះជាលិបិក្រមទំព័រទាំងឡាយបញ្ជាដោយ [[doku>wiki:namespaces|នាមថាន]]។
diff --git a/sources/inc/lang/km/lang.php b/sources/inc/lang/km/lang.php
new file mode 100644
index 0000000..4800b6c
--- /dev/null
+++ b/sources/inc/lang/km/lang.php
@@ -0,0 +1,206 @@
+
+ */
+$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_profile']     = 'កែប្រវត្តិរូប';
+$lang['btn_reset']       = 'កមណត់ឡើងរិញ';
+$lang['btn_draft']    = 'កែគំរោង';
+$lang['btn_recover']  = 'ស្រោះគំរោងឡើង';
+$lang['btn_draftdel'] = 'លុបគំរោង';
+$lang['btn_register'] = 'ចុះឈ្មោះ';//'Register';
+
+$lang['loggedinas'] = 'អ្នកប្រើ';
+$lang['user']       = 'នាមបម្រើ';
+$lang['pass']       = 'ពាក្សសម្ងត់';
+$lang['newpass']    = 'ពាក្សសម្ងាត់ថ្មី';
+$lang['oldpass']    = 'បន្ជាកពាក្សសម្ងាត់';
+$lang['passchk']    = 'ម្ដងទាត';
+$lang['remember']   = 'ចំណាំខ្ញុំ';
+$lang['fullname']   = 'នាមត្រគោល';
+$lang['email']      = 'អ៊ីមែល';
+$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['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['js']['willexpire']   = 'សោអ្នកចំពោះកែតម្រូវទំព័រនេះ ហួសពែលក្នុងមួយនាទី។\nកុំឲ្យមានជម្លោះ ប្រើ «បង្ហាញ»​ ទៅកំណត់​ឡើង​វិញ។';
+
+$lang['js']['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['external_edit'] = 'កំរេពីក្រៅ';
+$lang['summary']    = 'កែតម្រា';
+
+$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']      = 'និវេទន៍ទី១';
+$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['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';
+
+/* auth.class language support */
+$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_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 :
diff --git a/sources/inc/lang/km/login.txt b/sources/inc/lang/km/login.txt
new file mode 100644
index 0000000..2149d9c
--- /dev/null
+++ b/sources/inc/lang/km/login.txt
@@ -0,0 +1,5 @@
+====== កត់ចូល ======
+
+អ្នកមិនទាន់។
+អ្នកត្រូវការអនុញ្ញាឲ្យកត់តនំបានចូល។
+
diff --git a/sources/inc/lang/km/newpage.txt b/sources/inc/lang/km/newpage.txt
new file mode 100644
index 0000000..4b2b4e2
--- /dev/null
+++ b/sources/inc/lang/km/newpage.txt
@@ -0,0 +1,4 @@
+====== ឥតទានមានទេ ======
+អ្នកតាមត្រសៃខ្សែដែលគ្មានទំព័រ។
+បើ
+
diff --git a/sources/inc/lang/km/norev.txt b/sources/inc/lang/km/norev.txt
new file mode 100644
index 0000000..7ca1189
--- /dev/null
+++ b/sources/inc/lang/km/norev.txt
@@ -0,0 +1,2 @@
+====== ឥតមានបុនរាព្រឹត្តិទេ ======
+បុនរាព្រឹត្តិពុំមានទេ។ សុំប្រើ «ទំព័រចាស់ៗ» ទៅមើលបញ្ជីប្រវត្តទំព័រចាស់រូបស់អត្ថបទនេះ។
diff --git a/sources/inc/lang/km/password.txt b/sources/inc/lang/km/password.txt
new file mode 100644
index 0000000..a3495e7
--- /dev/null
+++ b/sources/inc/lang/km/password.txt
@@ -0,0 +1,10 @@
+សួរស្ដី @FULLNAME@!
+
+នេះជាបញ្ជីប្រើប្រះរុបស @TITLE@ នៅ @DOKUWIKIURL@
+
+នាមបង្រើ៖  @LOGIN@
+ពាក្សសម្ងាត៖ @PASSWORD@
+
+-- 
+អ៊ីមេលនេះបន្ចេអពីឌោគូវីគីនៅ
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/km/pwconfirm.txt b/sources/inc/lang/km/pwconfirm.txt
new file mode 100644
index 0000000..7c6a3ac
--- /dev/null
+++ b/sources/inc/lang/km/pwconfirm.txt
@@ -0,0 +1,13 @@
+សួស្ដី @FULLNAME@!
+
+មានគេសុមស្នើពាក្យ​សម្ងាត់​រុបសឲ្យ@TITLE@ នៅ @DOKUWIKIURL@។
+បើអ្នកមិនជាអ្នកសុមពាក្យ​សម្ងាត់ទេ សុំបស់ចល់អ៊ីមេលនេះ។
+
+
+សុំអះអាងដែលសំណើនេះដោយទៅតាមខ្សែ
+
+@CONFIRM@
+
+-- 
+អ៊ីមេលនេះបង្កើតពីឌក្គូវីគីនៅ
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/km/recent.txt b/sources/inc/lang/km/recent.txt
new file mode 100644
index 0000000..14449ea
--- /dev/null
+++ b/sources/inc/lang/km/recent.txt
@@ -0,0 +1,3 @@
+====== ប្រវត្តិទំព័របច្ចុប្បន្ន ======
+ទំព័រទាំងនេះគឺទំព័រកែប្រែ
+
diff --git a/sources/inc/lang/km/register.txt b/sources/inc/lang/km/register.txt
new file mode 100644
index 0000000..b850c2e
--- /dev/null
+++ b/sources/inc/lang/km/register.txt
@@ -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 --git a/sources/inc/lang/km/revisions.txt b/sources/inc/lang/km/revisions.txt
new file mode 100644
index 0000000..a15186d
--- /dev/null
+++ b/sources/inc/lang/km/revisions.txt
@@ -0,0 +1,4 @@
+====== ប្រវត្តិទំព័រចាស់ ======
+ទាំងនេះគឺប្រវត្តិទំព័រចាស់រុបសអត្ថបទនេះ។
+ជ្រើសខ្សែទំព័រពីខាងក្រោមហើយ ចុត «កែទំព័រនេះ» រួចហើយរក្សាវាទុក។
+
diff --git a/sources/inc/lang/ko/admin.txt b/sources/inc/lang/ko/admin.txt
new file mode 100644
index 0000000..2f81e89
--- /dev/null
+++ b/sources/inc/lang/ko/admin.txt
@@ -0,0 +1,3 @@
+====== 관리 ======
+
+도쿠위키에서 사용할 수 있는 관리 작업 목록을 아래에서 찾을 수 있습니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/adminplugins.txt b/sources/inc/lang/ko/adminplugins.txt
new file mode 100644
index 0000000..2c436d6
--- /dev/null
+++ b/sources/inc/lang/ko/adminplugins.txt
@@ -0,0 +1 @@
+===== 추가적인 플러그인 =====
\ No newline at end of file
diff --git a/sources/inc/lang/ko/backlinks.txt b/sources/inc/lang/ko/backlinks.txt
new file mode 100644
index 0000000..6a6ad48
--- /dev/null
+++ b/sources/inc/lang/ko/backlinks.txt
@@ -0,0 +1,3 @@
+====== 백링크 ======
+
+현재 문서를 가리키는 링크가 있는 문서 목록입니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/conflict.txt b/sources/inc/lang/ko/conflict.txt
new file mode 100644
index 0000000..b542033
--- /dev/null
+++ b/sources/inc/lang/ko/conflict.txt
@@ -0,0 +1,5 @@
+====== 새 판 있음 ======
+
+편집한 문서의 새 판이 있습니다. 당신이 편집하고 있는 동안 다른 사용자가 문서를 바꾸면 이런 일이 생길 수 있습니다.
+
+아래의 차이를 철저하게 검토하고 어떤 판을 저장하실지 결정하세요. ''저장''을 선택하면 당신의 판이 저장됩니다. ''취소''를 선택하면 현재 판이 유지됩니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/denied.txt b/sources/inc/lang/ko/denied.txt
new file mode 100644
index 0000000..cf0b294
--- /dev/null
+++ b/sources/inc/lang/ko/denied.txt
@@ -0,0 +1,3 @@
+====== 권한 거절 ======
+
+죄송하지만 계속할 수 있는 권한이 없습니다. 로그인을 잊으셨나요?
\ No newline at end of file
diff --git a/sources/inc/lang/ko/diff.txt b/sources/inc/lang/ko/diff.txt
new file mode 100644
index 0000000..3fef832
--- /dev/null
+++ b/sources/inc/lang/ko/diff.txt
@@ -0,0 +1,3 @@
+====== 차이 ======
+
+문서의 선택한 두 판 사이의 차이를 보여줍니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/draft.txt b/sources/inc/lang/ko/draft.txt
new file mode 100644
index 0000000..7e700f7
--- /dev/null
+++ b/sources/inc/lang/ko/draft.txt
@@ -0,0 +1,5 @@
+====== 문서 초안 있음 ======
+
+이 문서의 마지막 편집 세션은 올바르게 끝나지 않았습니다. 도쿠위키는 작업 도중 자동으로 저장된 초안을 사용해 편집을 계속 할 수 있습니다. 마지막 세션 동안 저장된 초안을 아래에서 볼 수 있습니다.
+
+비정상적으로 끝난 편집 세션을 **되돌릴**지 여부를 결정하고, 자동으로 저장되었던 초안을 **삭제**하거나 편집 과정을 **취소**하세요.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/edit.txt b/sources/inc/lang/ko/edit.txt
new file mode 100644
index 0000000..8da9026
--- /dev/null
+++ b/sources/inc/lang/ko/edit.txt
@@ -0,0 +1 @@
+문서를 편집하고 ''저장''을 누르세요. 위키 구문은 [[wiki:syntax]]를 참고하세요. 문서를 **더 좋게 만들 자신이 있을 때**에만 편집하세요. 연습을 하고 싶다면 먼저 [[playground:playground|연습장]]에 가서 연습하세요.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/editrev.txt b/sources/inc/lang/ko/editrev.txt
new file mode 100644
index 0000000..530b38d
--- /dev/null
+++ b/sources/inc/lang/ko/editrev.txt
@@ -0,0 +1,2 @@
+**문서의 이전 판을 선택했습니다!** 저장하면 이 자료로 새 판을 만듭니다.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/ko/index.txt b/sources/inc/lang/ko/index.txt
new file mode 100644
index 0000000..ce94e09
--- /dev/null
+++ b/sources/inc/lang/ko/index.txt
@@ -0,0 +1,3 @@
+====== 사이트맵 ======
+
+[[doku>ko:namespaces|이름공간]] 순으로 정렬한 모든 문서의 사이트맵입니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/install.html b/sources/inc/lang/ko/install.html
new file mode 100644
index 0000000..886ed2d
--- /dev/null
+++ b/sources/inc/lang/ko/install.html
@@ -0,0 +1,10 @@
+
        이 페이지는 Dokuwiki 설치와 환경 설정을 도와줍니다.
+설치 과정에 대한 더 자세한 정보는 관련 문서를 참고하시기 바랍니다.
        
+
+
        DokuWiki는 위키 문서와 문서와 관련된 정보(예를 들어 그림, 검색 색인, 이전 판 문서)를 저장하기 위해 일반적인 텍스트 파일을 사용합니다. 정상적으로 DokuWiki를 사용하려면 이 파일을 담고 있는 디렉토리에 대한 쓰기 권한을 가지고 있어야 합니다.
+현재 설치 과정 중에는 디렉토리 권한 설정이 불가능합니다. 보통 직접 셸 명령어를 사용하거나, 호스팅을 사용한다면 FTP나 호스팅 제어판(예를 들어 CPanel)을 사용해서 설정해야 합니다.
        
+
+
        현재 설치 과정중에 관리자로 로그인 후 DokuWiki의 관리 메뉴(플러그인 설치, 사용자 관리, 위키 문서 접근 권한 관리, 옵션 설정)를 가능하게 ACL에 대한 환경 설정을 수행합니다.
+DokuWiki가 동작하는데 필요한 사항은 아니지만, 어쨌든 더 쉽게 관리자가 관리할 수 있도록 해줍니다.
        
+
+
        숙련된 사용자나 특별한 설치 과정이 필요한 경우에는 설치 과정과 환경 설정 링크를 참고하시기 바랍니다.
        
\ No newline at end of file
diff --git a/sources/inc/lang/ko/lang.php b/sources/inc/lang/ko/lang.php
new file mode 100644
index 0000000..266ff01
--- /dev/null
+++ b/sources/inc/lang/ko/lang.php
@@ -0,0 +1,338 @@
+
+ * @author jk Lee
+ * @author dongnak@gmail.com
+ * @author Song Younghwan 
+ * @author Seung-Chul Yoo 
+ * @author erial2@gmail.com
+ * @author Myeongjin 
+ * @author Gerrit Uitslag 
+ * @author Garam 
+ */
+$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_profile']           = '개인 정보 바꾸기';
+$lang['btn_reset']             = '재설정';
+$lang['btn_resendpwd']         = '새 비밀번호 설정';
+$lang['btn_draft']             = '초안 편집';
+$lang['btn_recover']           = '초안 되돌리기';
+$lang['btn_draftdel']          = '초안 삭제';
+$lang['btn_revert']            = '되돌리기';
+$lang['btn_register']          = '등록';
+$lang['btn_apply']             = '적용';
+$lang['btn_media']             = '미디어 관리';
+$lang['btn_deleteuser']        = '내 계정 제거';
+$lang['loggedinas']            = '로그인한 사용자';
+$lang['user']                  = '사용자 이름';
+$lang['pass']                  = '비밀번호';
+$lang['newpass']               = '새 비밀번호';
+$lang['oldpass']               = '현재 비밀번호 확인';
+$lang['passchk']               = '비밀번호 다시 확인';
+$lang['remember']              = '기억하기';
+$lang['fullname']              = '실명';
+$lang['email']                 = '이메일';
+$lang['profile']               = '개인 정보';
+$lang['badlogin']              = '죄송하지만 사용자 이름이나 비밀번호가 잘못되었습니다.';
+$lang['badpassconfirm']        = '죄송하지만 비밀번호가 잘못되었습니다';
+$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['profnodelete']          = '이 위키는 사용자 삭제를 지원하지 않습니다';
+$lang['profdeleteuser']        = '계정 삭제';
+$lang['profdeleted']           = '당신의 사용자 계정이 이 위키에서 삭제되었습니다';
+$lang['profconfdelete']        = '이 위키에서 내 계정을 제거하고 싶습니다. 
         이 행동은 되돌릴 수 없습니다.';
+$lang['profconfdeletemissing'] = '선택하지 않은 확인 상자를 확인';
+$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['maxuploadsize']         = '최대 올리기 용량. 파일당 %s입니다.';
+$lang['lockedby']              = '현재 잠겨진 사용자';
+$lang['lockexpire']            = '잠금 해제 시간';
+$lang['js']['willexpire']      = '잠시 후 편집 잠금이 해제됩니다.\n편집 충돌을 피하려면 미리 보기를 눌러 잠금 시간을 다시 설정하세요.';
+$lang['js']['notsavedyet']     = '저장하지 않은 바뀜이 사라집니다.';
+$lang['js']['searchmedia']     = '파일 검색';
+$lang['js']['keepopen']        = '선택할 때 창을 열어 놓기';
+$lang['js']['hidedetails']     = '자세한 정보 숨기기';
+$lang['js']['mediatitle']      = '링크 설정';
+$lang['js']['mediadisplay']    = '링크 형태';
+$lang['js']['mediaalign']      = '배치';
+$lang['js']['mediasize']       = '그림 크기';
+$lang['js']['mediatarget']     = '링크 목표';
+$lang['js']['mediaclose']      = '닫기';
+$lang['js']['mediainsert']     = '넣기';
+$lang['js']['mediadisplayimg'] = '그림을 보여줍니다.';
+$lang['js']['mediadisplaylnk'] = '링크만 보여줍니다.';
+$lang['js']['mediasmall']      = '작게';
+$lang['js']['mediamedium']     = '중간';
+$lang['js']['medialarge']      = '크게';
+$lang['js']['mediaoriginal']   = '원본';
+$lang['js']['medialnk']        = '자세한 정보 문서로 링크';
+$lang['js']['mediadirect']     = '원본으로 직접 링크';
+$lang['js']['medianolnk']      = '링크 없음';
+$lang['js']['medianolink']     = '그림을 링크하지 않음';
+$lang['js']['medialeft']       = '왼쪽으로 그림 배치';
+$lang['js']['mediaright']      = '오른쪽으로 그림 배치';
+$lang['js']['mediacenter']     = '가운데으로 그림 배치';
+$lang['js']['medianoalign']    = '배치하지 않음';
+$lang['js']['nosmblinks']      = '윈도우 공유 파일과의 연결은 마이크로소프트 인터넷 익스플로러에서만 동작합니다.\n그러나 링크를 복사하거나 붙여넣기를 할 수 있습니다.';
+$lang['js']['linkwiz']         = '링크 마법사';
+$lang['js']['linkto']          = '다음으로 연결:';
+$lang['js']['del_confirm']     = '정말 선택된 항목을 삭제하겠습니까?';
+$lang['js']['restore_confirm'] = '정말 이 판으로 되돌리겠습니까?';
+$lang['js']['media_diff']      = '차이 보기:';
+$lang['js']['media_diff_both'] = '나란히 보기';
+$lang['js']['media_diff_opacity'] = '겹쳐 보기';
+$lang['js']['media_diff_portions'] = '쪼개 보기';
+$lang['js']['media_select']    = '파일 선택…';
+$lang['js']['media_upload_btn'] = '올리기';
+$lang['js']['media_done_btn']  = '완료';
+$lang['js']['media_drop']      = '올릴 파일을 여기에 끌어넣으세요';
+$lang['js']['media_cancel']    = '제거';
+$lang['js']['media_overwrt']   = '기존 파일에 덮어쓰기';
+$lang['rssfailed']             = '이 피드를 가져오는 동안 오류가 발생했습니다:';
+$lang['nothingfound']          = '아무 것도 없습니다.';
+$lang['mediaselect']           = '미디어 파일';
+$lang['fileupload']            = '미디어 파일 올리기';
+$lang['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['accessdenied']          = '이 문서를 볼 권한이 없습니다.';
+$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['difflink']              = '차이 보기로 링크';
+$lang['diff_type']             = '차이 보기:';
+$lang['diff_inline']           = '직렬 방식';
+$lang['diff_side']             = '다중 창 방식';
+$lang['line']                  = '줄';
+$lang['breadcrumb']            = '추적';
+$lang['youarehere']            = '현재 위치';
+$lang['lastmod']               = '마지막으로 수정됨';
+$lang['by']                    = '저자';
+$lang['deleted']               = '제거됨';
+$lang['created']               = '새로 만듦';
+$lang['restored']              = '이전 판으로 되돌림 (%s)';
+$lang['external_edit']         = '바깥 편집';
+$lang['summary']               = '편집 요약';
+$lang['noflash']               = '이 내용을 표시하기 위해서 Adobe 플래시 플러그인이 필요합니다.';
+$lang['download']              = '조각 다운로드';
+$lang['tools']                 = '도구';
+$lang['user_tools']            = '사용자 도구';
+$lang['site_tools']            = '사이트 도구';
+$lang['page_tools']            = '문서 도구';
+$lang['skip_to_content']       = '내용으로 건너뛰기';
+$lang['sidebar']               = '사이드바';
+$lang['mail_newpage']          = '문서 추가됨:';
+$lang['mail_changed']          = '문서 바뀜:';
+$lang['mail_subscribe_list']   = '이름공간에서 바뀐 문서:';
+$lang['mail_new_user']         = '새 사용자:';
+$lang['mail_upload']           = '파일 올림:';
+$lang['changes_type']          = '차이 보기';
+$lang['pages_changes']         = '문서';
+$lang['media_changes']         = '미디어 파일';
+$lang['both_changes']          = '문서와 미디어 파일 모두';
+$lang['qb_bold']               = '굵은 글씨';
+$lang['qb_italic']             = '기울인 글씨';
+$lang['qb_underl']             = '밑줄 글씨';
+$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['img_width']             = '너비';
+$lang['img_height']            = '높이';
+$lang['img_manager']           = '미디어 관리자에서 보기';
+$lang['subscr_subscribe_success'] = '%s 사용자가 %s 구독 목록에 추가했습니다';
+$lang['subscr_subscribe_error'] = '%s 사용자가 %s 구독 목록에 추가하는데 실패했습니다';
+$lang['subscr_subscribe_noaddress'] = '로그인으로 연결된 주소가 없기 때문에 구독 목록에 추가할 수 없습니다';
+$lang['subscr_unsubscribe_success'] = '%s 사용자가 %s 구독 목록에서 제거했습니다';
+$lang['subscr_unsubscribe_error'] = '%s 사용자가 %s 구독 목록에서 삭제하는데 실패했습니다';
+$lang['subscr_already_subscribed'] = '%s 사용자가 이미 %s에 구독하고 있습니다';
+$lang['subscr_not_subscribed'] = '%s 사용자가 %s에 구독하고 있지 않습니다';
+$lang['subscr_m_not_subscribed'] = '문서나 이름공간에 현재 구독하고 있지 않습니다.';
+$lang['subscr_m_new_header']   = '구독 추가';
+$lang['subscr_m_current_header'] = '현재 구독 중인 문서';
+$lang['subscr_m_unsubscribe']  = '구독 취소';
+$lang['subscr_m_subscribe']    = '구독';
+$lang['subscr_m_receive']      = '받기';
+$lang['subscr_style_every']    = '모든 바뀜을 이메일로 받기';
+$lang['subscr_style_digest']   = '각 문서의 바뀜을 요약 (매 %.2f일 마다)';
+$lang['subscr_style_list']     = '마지막 이메일 이후 바뀐 문서의 목록 (매 %.2f일 마다)';
+$lang['authtempfail']          = '사용자 인증을 일시적으로 사용할 수 없습니다. 만약 계속해서 문제가 발생한다면 위키 관리자에게 문의하시기 바랍니다.';
+$lang['authpwdexpire']         = '비밀번호를 바꾼지 %d일이 지났으며, 비밀번호를 곧 바꿔야 합니다.';
+$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']              = '%s PHP 함수를 사용할 수 없습니다. 호스트 제공자가 어떤 이유에서인지 막아 놓았을지 모릅니다.';
+$lang['i_phpver']              = 'PHP %s 버전은 필요한 %s 버전보다 오래되었습니다. PHP를 업그레이드할 필요가 있습니다.';
+$lang['i_permfail']            = '%s는 도쿠위키가 쓰기 가능 권한이 없습니다. 먼저 이 디렉터리에 쓰기 권한이 설정되어야 합니다!';
+$lang['i_confexists']          = '%s(은)는 이미 존재합니다';
+$lang['i_writeerr']            = '%s(을)를 만들 수 없습니다. 먼저 디렉터리/파일 권한을 확인하고 파일을 수동으로 만드세요.';
+$lang['i_badhash']             = 'dokuwiki.php를 인식할 수 없거나 원본 파일이 아닙니다 (해시=%s)';
+$lang['i_badval']              = '%s - 잘못되었거나 빈 값입니다';
+$lang['i_success']             = '환경 설정이 성공적으로 끝났습니다. 지금 install.php를 지워도 상관없습니다. 새 도쿠위키로 들어가세요.';
+$lang['i_failure']             = '환경 설정 파일에 쓰는 도중에 오류가 발생했습니다. 새 도쿠위키를 사용하기 전에 수동으로 문제를 해결해야 합니다.';
+$lang['i_policy']              = '초기 ACL 정책';
+$lang['i_pol0']                = '열린 위키 (누구나 읽기, 쓰기, 올리기가 가능합니다)';
+$lang['i_pol1']                = '공개 위키 (누구나 읽을 수 있지만, 등록된 사용자만 쓰기와 올리기가 가능합니다)';
+$lang['i_pol2']                = '닫힌 위키 (등록된 사용자만 읽기, 쓰기, 올리기가 가능합니다)';
+$lang['i_allowreg']            = '사용자 자신이 등록할 수 있음';
+$lang['i_retry']               = '다시 시도';
+$lang['i_license']             = '내용을 배포하기 위한 라이선스를 선택하세요:';
+$lang['i_license_none']        = '라이선스 정보를 보여주지 않습니다';
+$lang['i_pop_field']           = '도쿠위키 경험을 개선하는 데 도움을 주세요:';
+$lang['i_pop_label']           = '한 달에 한 번씩, 도쿠위키 개발자에게 익명의 사용 데이터를 보냅니다';
+$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초 전';
+$lang['wordblock']             = '차단 문구(스팸)를 포함하고 있어서 바뀜을 저장하지 않았습니다.';
+$lang['media_uploadtab']       = '올리기';
+$lang['media_searchtab']       = '검색';
+$lang['media_file']            = '파일';
+$lang['media_viewtab']         = '보기';
+$lang['media_edittab']         = '편집';
+$lang['media_historytab']      = '역사';
+$lang['media_list_thumbs']     = '섬네일';
+$lang['media_list_rows']       = '목록';
+$lang['media_sort_name']       = '이름';
+$lang['media_sort_date']       = '날짜';
+$lang['media_namespaces']      = '이름공간 선택';
+$lang['media_files']           = '%s에 있는 파일';
+$lang['media_upload']          = '%s에 올리기';
+$lang['media_search']          = '%s에서 검색';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s (%s에 있음)';
+$lang['media_edit']            = '%s 편집';
+$lang['media_history']         = '%s의 역사';
+$lang['media_meta_edited']     = '메타데이터 편집됨';
+$lang['media_perm_read']       = '죄송하지만 파일을 읽을 권한이 없습니다.';
+$lang['media_perm_upload']     = '죄송하지만 파일을 올릴 권한이 없습니다.';
+$lang['media_update']          = '새 판 올리기';
+$lang['media_restore']         = '이 판으로 되돌리기';
+$lang['currentns']             = '현재 이름공간';
+$lang['searchresult']          = '검색 결과';
+$lang['plainhtml']             = '일반 HTML';
+$lang['wikimarkup']            = '위키 문법';
diff --git a/sources/inc/lang/ko/locked.txt b/sources/inc/lang/ko/locked.txt
new file mode 100644
index 0000000..38832d0
--- /dev/null
+++ b/sources/inc/lang/ko/locked.txt
@@ -0,0 +1,3 @@
+====== 문서 잠김 ======
+
+이 문서는 다른 사용자가 편집하기 위해 현재 잠겨있습니다. 해당 사용자가 편집을 끝내거나 잠금이 만료될 때까지 기다리세요.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/login.txt b/sources/inc/lang/ko/login.txt
new file mode 100644
index 0000000..f8af410
--- /dev/null
+++ b/sources/inc/lang/ko/login.txt
@@ -0,0 +1,3 @@
+====== 로그인 ======
+
+로그인하지 않았습니다! 아래에서 로그인하세요. 로그인하려면 쿠키를 활성화해야 합니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/mailtext.txt b/sources/inc/lang/ko/mailtext.txt
new file mode 100644
index 0000000..c97f446
--- /dev/null
+++ b/sources/inc/lang/ko/mailtext.txt
@@ -0,0 +1,16 @@
+도쿠위키 문서가 추가되거나 바뀌었습니다. 자세한 내용은 다음과 같습니다:
+
+날짜: @DATE@
+브라우저: @BROWSER@
+IP 주소: @IPADDRESS@
+호스트 이름: @HOSTNAME@
+이전 판: @OLDPAGE@
+새 판: @NEWPAGE@
+편집 요약: @SUMMARY@
+사용자: @USER@
+
+@DIFF@
+
+
+-- 
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/sources/inc/lang/ko/mailwrap.html b/sources/inc/lang/ko/mailwrap.html
new file mode 100644
index 0000000..ef061f1
--- /dev/null
+++ b/sources/inc/lang/ko/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+    @TITLE@
+    
+
+
+
+@HTMLBODY@
+
+
        
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다.
+
+
diff --git a/sources/inc/lang/ko/newpage.txt b/sources/inc/lang/ko/newpage.txt
new file mode 100644
index 0000000..a553cf9
--- /dev/null
+++ b/sources/inc/lang/ko/newpage.txt
@@ -0,0 +1,3 @@
+====== 이 주제는 아직 없습니다 ======
+
+아직 없는 주제에 대한 링크를 따라왔습니다. "문서 만들기"를 클릭해 새로 만들 수 있습니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/norev.txt b/sources/inc/lang/ko/norev.txt
new file mode 100644
index 0000000..5cb7360
--- /dev/null
+++ b/sources/inc/lang/ko/norev.txt
@@ -0,0 +1,3 @@
+====== 지정한 판 없음 ======
+
+지정한 판이 존재하지 않습니다. 이 문서의 이전 판 목록을 보려면 "이전 판"을 클릭하세요.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/password.txt b/sources/inc/lang/ko/password.txt
new file mode 100644
index 0000000..a60801a
--- /dev/null
+++ b/sources/inc/lang/ko/password.txt
@@ -0,0 +1,9 @@
+@FULLNAME@님 안녕하세요!
+
+여기에 @DOKUWIKIURL@에서 @TITLE@의 사용자 정보가 있습니다.
+
+로그인: @LOGIN@
+비밀번호: @PASSWORD@
+
+-- 
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/sources/inc/lang/ko/preview.txt b/sources/inc/lang/ko/preview.txt
new file mode 100644
index 0000000..eed2b21
--- /dev/null
+++ b/sources/inc/lang/ko/preview.txt
@@ -0,0 +1,3 @@
+====== 미리 보기 ======
+
+입력한 내용이 어떻게 보일지 미리 보여줍니다. 아직 **저장되지 않았다**는 점을 기억해두세요!
\ No newline at end of file
diff --git a/sources/inc/lang/ko/pwconfirm.txt b/sources/inc/lang/ko/pwconfirm.txt
new file mode 100644
index 0000000..d820664
--- /dev/null
+++ b/sources/inc/lang/ko/pwconfirm.txt
@@ -0,0 +1,13 @@
+@FULLNAME@님 안녕하세요!
+
+누군가가 @DOKUWIKIURL@에 @TITLE@에 대해
+새 비밀번호가 필요하다고 요청했습니다.
+
+새 비밀번호를 요청하지 않았다면 이 이메일을 무시해버리세요.
+
+정말로 당신이 요청을 해서 보내졌는지 확인하려면 다음 링크를 사용하세요.
+
+@CONFIRM@
+
+-- 
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/sources/inc/lang/ko/read.txt b/sources/inc/lang/ko/read.txt
new file mode 100644
index 0000000..079b8e1
--- /dev/null
+++ b/sources/inc/lang/ko/read.txt
@@ -0,0 +1 @@
+이 문서는 읽기 전용입니다. 원본을 볼 수는 있지만 바꿀 수는 없습니다. 문제가 있다고 생각하면 관리자에게 문의하세요.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/recent.txt b/sources/inc/lang/ko/recent.txt
new file mode 100644
index 0000000..4dd1964
--- /dev/null
+++ b/sources/inc/lang/ko/recent.txt
@@ -0,0 +1,3 @@
+====== 최근 바뀜 ======
+
+다음 문서는 최근에 바뀌었습니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/register.txt b/sources/inc/lang/ko/register.txt
new file mode 100644
index 0000000..4d3df29
--- /dev/null
+++ b/sources/inc/lang/ko/register.txt
@@ -0,0 +1,3 @@
+====== 새 사용자 등록 ======
+
+이 위키에 새 계정을 만드려면 아래의 모든 내용을 입력하세요. **올바른 이메일 주소**를 사용하세요. 비밀번호를 입력하는 곳이 없다면, 새 비밀번호는 해당 주소로 보내집니다. 사용자 이름은 올바른 [[doku>ko:pagename|문서 이름]]이어야 합니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/registermail.txt b/sources/inc/lang/ko/registermail.txt
new file mode 100644
index 0000000..afa6668
--- /dev/null
+++ b/sources/inc/lang/ko/registermail.txt
@@ -0,0 +1,13 @@
+새 사용자가 등록되었습니다. 자세한 내용은 다음과 같습니다:
+
+사용자 이름: @NEWUSER@
+실명: @NEWNAME@
+이메일: @NEWEMAIL@
+
+날짜: @DATE@
+브라우저: @BROWSER@
+IP 주소: @IPADDRESS@
+호스트 이름: @HOSTNAME@
+
+-- 
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/sources/inc/lang/ko/resendpwd.txt b/sources/inc/lang/ko/resendpwd.txt
new file mode 100644
index 0000000..44cd5ad
--- /dev/null
+++ b/sources/inc/lang/ko/resendpwd.txt
@@ -0,0 +1,3 @@
+====== 새 비밀번호 보내기 ======
+
+이 위키 계정에 대한 새 비밀번호를 요청하기 위해 아래 양식에서 사용자 이름을 입력하세요. 확인 링크는 새로 등록한 이메일 주소로 보냅니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/resetpwd.txt b/sources/inc/lang/ko/resetpwd.txt
new file mode 100644
index 0000000..cc2ec6a
--- /dev/null
+++ b/sources/inc/lang/ko/resetpwd.txt
@@ -0,0 +1,3 @@
+====== 새 비밀번호 설정 ======
+
+이 위키에 있는 계정의 새 비밀번호를 입력하세요.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/revisions.txt b/sources/inc/lang/ko/revisions.txt
new file mode 100644
index 0000000..ed80dbc
--- /dev/null
+++ b/sources/inc/lang/ko/revisions.txt
@@ -0,0 +1,3 @@
+====== 이전 판 ======
+
+이 문서의 이전 판은 다음과 같습니다. 이전 판으로 되돌리려면, 아래에서 선택한 다음 ''문서 편집''을 클릭하고 나서 저장하세요.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/searchpage.txt b/sources/inc/lang/ko/searchpage.txt
new file mode 100644
index 0000000..2313f0b
--- /dev/null
+++ b/sources/inc/lang/ko/searchpage.txt
@@ -0,0 +1,5 @@
+====== 검색 ======
+
+아래에서 검색 결과를 찾을 수 있습니다. 만약 원하는 문서를 찾지 못했다면, "문서 만들기"나 "문서 편집"을 사용해 검색어와 같은 이름의 문서를 만들거나 편집할 수 있습니다.
+
+===== 결과 =====
\ No newline at end of file
diff --git a/sources/inc/lang/ko/showrev.txt b/sources/inc/lang/ko/showrev.txt
new file mode 100644
index 0000000..91be367
--- /dev/null
+++ b/sources/inc/lang/ko/showrev.txt
@@ -0,0 +1,2 @@
+**문서의 이전 판입니다!**
+----
\ No newline at end of file
diff --git a/sources/inc/lang/ko/stopwords.txt b/sources/inc/lang/ko/stopwords.txt
new file mode 100644
index 0000000..b0be851
--- /dev/null
+++ b/sources/inc/lang/ko/stopwords.txt
@@ -0,0 +1,39 @@
+# 색인이 만들어지지 않는 단어 목록입니다. (한 줄에 한 단어)
+# 이 파일을 편집할 때 UNIX 줄 종료 문자를 사용해야 합니다.(단일 개행 문자)
+# 3문자 이하 단어는 자동으로 무시되므로 3문자보다 짧은 단어는 포함시킬 필요가 없습니다.
+# 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
\ No newline at end of file
diff --git a/sources/inc/lang/ko/subscr_digest.txt b/sources/inc/lang/ko/subscr_digest.txt
new file mode 100644
index 0000000..0f03e51
--- /dev/null
+++ b/sources/inc/lang/ko/subscr_digest.txt
@@ -0,0 +1,18 @@
+안녕하세요!
+
+@TITLE@ 위키의 @PAGE@ 문서가 바뀌었습니다.
+바뀜은 다음과 같습니다:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+이전 판: @OLDPAGE@
+새 판: @NEWPAGE@
+
+
+문서의 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
+@SUBSCRIBE@ 문서를 방문해 문서나 이름공간의 구독을 취소하세요.
+
+-- 
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/sources/inc/lang/ko/subscr_form.txt b/sources/inc/lang/ko/subscr_form.txt
new file mode 100644
index 0000000..ed380cc
--- /dev/null
+++ b/sources/inc/lang/ko/subscr_form.txt
@@ -0,0 +1,3 @@
+====== 구독 관리 ======
+
+이 페이지는 현재의 문서와 이름공간의 구독을 관리할 수 있도록 해줍니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/subscr_list.txt b/sources/inc/lang/ko/subscr_list.txt
new file mode 100644
index 0000000..95133bb
--- /dev/null
+++ b/sources/inc/lang/ko/subscr_list.txt
@@ -0,0 +1,14 @@
+안녕하세요!
+
+@TITLE@ 위키의 @PAGE@ 문서가 바뀌었습니다.
+문서의 바뀜은 다음과 같습니다:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+문서의 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
+@SUBSCRIBE@ 문서를 방문해 문서나 이름공간의 구독을 취소하세요.
+
+-- 
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/sources/inc/lang/ko/subscr_single.txt b/sources/inc/lang/ko/subscr_single.txt
new file mode 100644
index 0000000..1c7e551
--- /dev/null
+++ b/sources/inc/lang/ko/subscr_single.txt
@@ -0,0 +1,20 @@
+안녕하세요!
+
+@TITLE@ 위키의 @PAGE@ 문서가 바뀌었습니다.
+바뀜은 다음과 같습니다:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+날짜: @DATE@
+사용자: @USER@
+편집 요약: @SUMMARY@
+이전 판: @OLDPAGE@
+새 판: @NEWPAGE@
+
+문서의 알림을 취소하려면, @DOKUWIKIURL@에 로그인한 뒤
+@SUBSCRIBE@ 문서를 방문해 문서나 이름공간의 구독을 취소하세요.
+
+-- 
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/sources/inc/lang/ko/updateprofile.txt b/sources/inc/lang/ko/updateprofile.txt
new file mode 100644
index 0000000..80545e9
--- /dev/null
+++ b/sources/inc/lang/ko/updateprofile.txt
@@ -0,0 +1,3 @@
+====== 개인 정보 바꾸기 ======
+
+바꾸고 싶은 항목을 입력하세요. 사용자 이름은 바꿀 수 없습니다.
\ No newline at end of file
diff --git a/sources/inc/lang/ko/uploadmail.txt b/sources/inc/lang/ko/uploadmail.txt
new file mode 100644
index 0000000..430a843
--- /dev/null
+++ b/sources/inc/lang/ko/uploadmail.txt
@@ -0,0 +1,14 @@
+도쿠위키가 파일을 올렸습니다. 자세한 정보는 다음과 같습니다:
+
+파일: @MEDIA@
+이전 판: @OLD@
+날짜: @DATE@
+브라우저: @BROWSER@
+IP 주소: @IPADDRESS@
+호스트 이름: @HOSTNAME@
+크기: @SIZE@
+MIME 유형: @MIME@
+사용자: @USER@
+
+-- 
+이 메일은 @DOKUWIKIURL@에서 도쿠위키가 생성했습니다
\ No newline at end of file
diff --git a/sources/inc/lang/ku/admin.txt b/sources/inc/lang/ku/admin.txt
new file mode 100644
index 0000000..cfd21b2
--- /dev/null
+++ b/sources/inc/lang/ku/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Below you can find a list of administrative tasks available in DokuWiki.
+
diff --git a/sources/inc/lang/ku/backlinks.txt b/sources/inc/lang/ku/backlinks.txt
new file mode 100644
index 0000000..5fa2ddf
--- /dev/null
+++ b/sources/inc/lang/ku/backlinks.txt
@@ -0,0 +1,4 @@
+====== Girêdanên paş ======
+
+Di rûpelên di vê lîsteyê de girêdanên ji vê rûpelê re hene.
+
diff --git a/sources/inc/lang/ku/conflict.txt b/sources/inc/lang/ku/conflict.txt
new file mode 100644
index 0000000..e139dce
--- /dev/null
+++ b/sources/inc/lang/ku/conflict.txt
@@ -0,0 +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.
+
+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 --git a/sources/inc/lang/ku/denied.txt b/sources/inc/lang/ku/denied.txt
new file mode 100644
index 0000000..3ac7282
--- /dev/null
+++ b/sources/inc/lang/ku/denied.txt
@@ -0,0 +1,4 @@
+====== Permission Denied ======
+
+Sorry, you don't have enough rights to continue. Perhaps you forgot to login?
+
diff --git a/sources/inc/lang/ku/diff.txt b/sources/inc/lang/ku/diff.txt
new file mode 100644
index 0000000..934ffb6
--- /dev/null
+++ b/sources/inc/lang/ku/diff.txt
@@ -0,0 +1,4 @@
+====== Cuyawazî ======
+
+Li vê derê cuyawaziyên nav revîziyona hilbijartî û verziyona aniha tên nîşan dan.
+
diff --git a/sources/inc/lang/ku/edit.txt b/sources/inc/lang/ku/edit.txt
new file mode 100644
index 0000000..3a259dc
--- /dev/null
+++ b/sources/inc/lang/ku/edit.txt
@@ -0,0 +1,2 @@
+Rûpelê biguherîne û ''Tomar bike'' bitikîne. Ji bo sîntaksa wîkiyê binihêre [[wiki:syntax]]. Ji kerema xwe rûpelê bi tenê biguherîne, heke tû dikarî **baştir** bikî.  Heke tu dixwazî çend tiştan biceribînî, biçe [[wiki:playground]]. Li vê derê tu dikarî her tiştî biceribînî.
+
diff --git a/sources/inc/lang/ku/editrev.txt b/sources/inc/lang/ku/editrev.txt
new file mode 100644
index 0000000..e699571
--- /dev/null
+++ b/sources/inc/lang/ku/editrev.txt
@@ -0,0 +1,2 @@
+**You've loaded an old revision of the document!** If you save it, you will create a new version with this data.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/ku/index.txt b/sources/inc/lang/ku/index.txt
new file mode 100644
index 0000000..4014044
--- /dev/null
+++ b/sources/inc/lang/ku/index.txt
@@ -0,0 +1,3 @@
+====== Îndeks ======
+
+Ev îndeksa hemû rûpelên heyî ye. Rûpel li gora [[doku>namespaces|namespace]] hatin birêzkirin.
\ No newline at end of file
diff --git a/sources/inc/lang/ku/lang.php b/sources/inc/lang/ku/lang.php
new file mode 100644
index 0000000..b628780
--- /dev/null
+++ b/sources/inc/lang/ku/lang.php
@@ -0,0 +1,142 @@
+
+ */
+$lang['encoding']   = 'utf-8';
+$lang['direction']  = 'ltr';
+
+$lang['btn_edit']   = 'Vê rûpelê biguherîne';
+$lang['btn_source'] = 'Çavkaniya rûpelê nîşan bide';
+$lang['btn_show']   = 'Rûpelê nîşan bide';
+$lang['btn_create'] = 'Vê rûpelê biafirîne';
+$lang['btn_search'] = 'Lêbigere';
+$lang['btn_save']   = 'Tomar bike';
+$lang['btn_preview']= 'Pêşdîtin';
+$lang['btn_top']    = 'Biçe ser';
+$lang['btn_newer']  = '<< nûtir';
+$lang['btn_older']  = 'kevntir >>';
+$lang['btn_revs']   = 'Revîziyonên kevn';
+$lang['btn_recent'] = 'Guherandinên dawî';
+$lang['btn_upload'] = 'Bar bike';
+$lang['btn_cancel'] = 'Betal';
+$lang['btn_index']  = 'Îndeks';
+$lang['btn_secedit']= 'Biguherîne';
+$lang['btn_login']  = 'Têkeve';
+$lang['btn_logout'] = 'Derkeve';
+$lang['btn_admin']  = 'Admin';
+$lang['btn_update'] = 'Rojanekirin';
+$lang['btn_delete'] = 'Jê bibe';
+$lang['btn_back']   = 'Paş';
+$lang['btn_backlink']    = 'Girêdanên paş';
+$lang['btn_backtomedia'] = 'Back to Mediafile Selection';
+$lang['btn_subscribe']   = 'Subscribe Changes';
+$lang['btn_register'] = 'Register';
+
+$lang['loggedinas'] = 'Logged in as';
+$lang['user']       = 'Username';
+$lang['pass']       = 'Password';
+$lang['passchk']    = 'once again';
+$lang['remember']   = 'Remember me';
+$lang['fullname']   = 'Full name';
+$lang['email']      = 'E-Mail';
+$lang['badlogin']   = 'Sorry, username or password was wrong.';
+
+$lang['regmissing'] = 'Sorry, you must fill in all fields.';
+$lang['reguexists'] = 'Sorry, a user with this login already exists.';
+$lang['regsuccess'] = 'The user has been created and the password was sent by email.';
+$lang['regsuccess2']= 'The user has been created.';
+$lang['regmailfail']= 'Looks like there was an error on sending the password mail. Please contact the admin!';
+$lang['regbadmail'] = 'The given email address looks invalid - if you think this is an error, contact the admin';
+$lang['regbadpass'] = 'The two given passwords are not identically, please try again.';
+$lang['regpwmail']  = 'Your DokuWiki password';
+$lang['reghere']    = 'You don\'t have an account yet? Just get one';
+
+$lang['txt_upload']   = 'Select file to upload';
+$lang['txt_filename'] = 'Enter wikiname (optional)';
+$lang['txt_overwrt']  = 'Overwrite existing file';
+$lang['lockedby']     = 'Currently locked by';
+$lang['lockexpire']   = 'Lock expires at';
+$lang['js']['willexpire']   = 'Your lock for editing this page is about to expire in a minute.\nTo avoid conflicts use the preview button to reset the locktimer.';
+
+$lang['js']['notsavedyet'] = 'Unsaved changes will be lost.\nReally continue?';
+
+$lang['rssfailed']   = 'An error occured while fetching this feed: ';
+$lang['nothingfound']= 'Tiştek nehat dîtin.';
+
+$lang['mediaselect'] = 'Mediafile Selection';
+$lang['fileupload']  = 'Mediafile Upload';
+$lang['uploadsucc']  = 'Upload successful';
+$lang['uploadfail']  = 'Upload failed. Maybe wrong permissions?';
+$lang['uploadwrong'] = 'Upload denied. This file extension is forbidden!';
+$lang['uploadexist'] = 'File already exists. Nothing done.';
+$lang['deletesucc']  = 'The file "%s" has been deleted.';
+$lang['deletefail']  = '"%s" couldn\'t be deleted - check permissions.';
+$lang['mediainuse']  = 'The file "%s" hasn\'t been deleted - it is still in use.';
+$lang['namespaces']  = 'Namespace';
+$lang['mediafiles']  = 'Available files in';
+
+$lang['reference']   = 'Referansa';
+$lang['ref_inuse']   = 'The file can\'t be deleted, because it\'s still used by the following pages:';
+$lang['ref_hidden']  = 'Some references  are on pages you don\'t have permission to read';
+
+$lang['hits']       = 'Hits';
+$lang['quickhits']  = 'Matching pagenames';
+$lang['toc']        = 'Tabloya Navêrokê';
+$lang['current']    = 'current';
+$lang['yours']      = 'Your Version';
+$lang['diff']       = 'show differences to current version';
+$lang['line']       = 'Rêz';
+$lang['breadcrumb'] = 'Şop';
+$lang['lastmod']    = 'Guherandina dawî';
+$lang['by']         = 'by';
+$lang['deleted']    = 'hat jê birin';
+$lang['created']    = 'hat afirandin';
+$lang['restored']   = 'old revision restored (%s)';
+$lang['summary']    = 'Kurteya guhartinê';
+
+$lang['mail_newpage'] = 'page added:';
+$lang['mail_changed'] = 'page changed:';
+
+$lang['js']['nosmblinks'] = 'Linking to Windows shares only works in Microsoft Internet Explorer.\nYou still can copy and paste the link.';
+
+$lang['qb_bold']    = 'Bold Text';
+$lang['qb_italic']  = 'Italic Text';
+$lang['qb_underl']  = 'Underlined Text';
+$lang['qb_code']    = 'Code Text';
+$lang['qb_strike']  = 'Strike-through Text';
+$lang['qb_h1']      = 'Level 1 Headline';
+$lang['qb_h2']      = 'Level 2 Headline';
+$lang['qb_h3']      = 'Level 3 Headline';
+$lang['qb_h4']      = 'Level 4 Headline';
+$lang['qb_h5']      = 'Level 5 Headline';
+$lang['qb_link']    = 'Internal Link';
+$lang['qb_extlink'] = 'External Link';
+$lang['qb_hr']      = 'Horizontal Rule';
+$lang['qb_ol']      = 'Ordered List Item';
+$lang['qb_ul']      = 'Unordered List Item';
+$lang['qb_media']   = 'Add Images and other files';
+$lang['qb_sig']     = 'Insert Signature';
+
+$lang['js']['del_confirm']= 'Delete this entry?';
+
+$lang['admin_register']= 'Add new user...';
+
+$lang['metaedit']    = 'Edit Metadata';
+$lang['metasaveerr'] = 'Writing metadata failed';
+$lang['metasaveok']  = 'Metadata saved';
+$lang['img_backto']  = 'Back to';
+$lang['img_title']   = 'Title';
+$lang['img_caption'] = 'Caption';
+$lang['img_date']    = 'Date';
+$lang['img_fname']   = 'Filename';
+$lang['img_fsize']   = 'Size';
+$lang['img_artist']  = 'Photographer';
+$lang['img_copyr']   = 'Copyright';
+$lang['img_format']  = 'Format';
+$lang['img_camera']  = 'Camera';
+$lang['img_keywords']= 'Keywords';
+
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/inc/lang/ku/locked.txt b/sources/inc/lang/ku/locked.txt
new file mode 100644
index 0000000..af6347a
--- /dev/null
+++ b/sources/inc/lang/ku/locked.txt
@@ -0,0 +1,3 @@
+====== Page locked ======
+
+This page is currently locked for editing by another user. You have to wait until this user finishes editing or the lock expires.
diff --git a/sources/inc/lang/ku/login.txt b/sources/inc/lang/ku/login.txt
new file mode 100644
index 0000000..2004ea1
--- /dev/null
+++ b/sources/inc/lang/ku/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+You are currently not logged in! Enter your authentication credentials below to log in. You need to have cookies enabled to log in.
+
diff --git a/sources/inc/lang/ku/mailtext.txt b/sources/inc/lang/ku/mailtext.txt
new file mode 100644
index 0000000..44a3f65
--- /dev/null
+++ b/sources/inc/lang/ku/mailtext.txt
@@ -0,0 +1,17 @@
+A page in your DokuWiki was added or changed. Here are the details:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ku/newpage.txt b/sources/inc/lang/ku/newpage.txt
new file mode 100644
index 0000000..6d256f0
--- /dev/null
+++ b/sources/inc/lang/ku/newpage.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/ku/norev.txt b/sources/inc/lang/ku/norev.txt
new file mode 100644
index 0000000..0b21bf3
--- /dev/null
+++ b/sources/inc/lang/ku/norev.txt
@@ -0,0 +1,4 @@
+====== No such revision ======
+
+The specified revision doesn't exist. Use the ''Old revisions'' button for a list of old revisions of this document.
+
diff --git a/sources/inc/lang/ku/password.txt b/sources/inc/lang/ku/password.txt
new file mode 100644
index 0000000..6d5cbe6
--- /dev/null
+++ b/sources/inc/lang/ku/password.txt
@@ -0,0 +1,10 @@
+Hi @FULLNAME@!
+
+Here is your userdata for @TITLE@ at @DOKUWIKIURL@
+
+Login    : @LOGIN@
+Password : @PASSWORD@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ku/preview.txt b/sources/inc/lang/ku/preview.txt
new file mode 100644
index 0000000..da8f4cb
--- /dev/null
+++ b/sources/inc/lang/ku/preview.txt
@@ -0,0 +1,3 @@
+====== 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**!
\ No newline at end of file
diff --git a/sources/inc/lang/ku/read.txt b/sources/inc/lang/ku/read.txt
new file mode 100644
index 0000000..9f56d81
--- /dev/null
+++ b/sources/inc/lang/ku/read.txt
@@ -0,0 +1,2 @@
+This page is read only. You can view the source, but not change it. Ask your administrator if you think this is wrong.
+
diff --git a/sources/inc/lang/ku/recent.txt b/sources/inc/lang/ku/recent.txt
new file mode 100644
index 0000000..268c89a
--- /dev/null
+++ b/sources/inc/lang/ku/recent.txt
@@ -0,0 +1,3 @@
+====== Guherandinên dawî ======
+
+Ev rûpel di dema nêzîk de hatin guherandin.
diff --git a/sources/inc/lang/ku/register.txt b/sources/inc/lang/ku/register.txt
new file mode 100644
index 0000000..b65683b
--- /dev/null
+++ b/sources/inc/lang/ku/register.txt
@@ -0,0 +1,4 @@
+====== Register as new user ======
+
+Fill in all the information below to create a new account in this wiki. Make sure you supply a **valid e-mail address** - your new password will be sent to it. The login name should be a valid [[doku>pagename|pagename]].
+
diff --git a/sources/inc/lang/ku/revisions.txt b/sources/inc/lang/ku/revisions.txt
new file mode 100644
index 0000000..dd5f35b
--- /dev/null
+++ b/sources/inc/lang/ku/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/ku/searchpage.txt b/sources/inc/lang/ku/searchpage.txt
new file mode 100644
index 0000000..6646228
--- /dev/null
+++ b/sources/inc/lang/ku/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
\ No newline at end of file
diff --git a/sources/inc/lang/ku/showrev.txt b/sources/inc/lang/ku/showrev.txt
new file mode 100644
index 0000000..3608de3
--- /dev/null
+++ b/sources/inc/lang/ku/showrev.txt
@@ -0,0 +1,2 @@
+**This is an old revision of the document!**
+----
diff --git a/sources/inc/lang/ku/stopwords.txt b/sources/inc/lang/ku/stopwords.txt
new file mode 100644
index 0000000..bc6eb48
--- /dev/null
+++ b/sources/inc/lang/ku/stopwords.txt
@@ -0,0 +1,29 @@
+# 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
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/la/admin.txt b/sources/inc/lang/la/admin.txt
new file mode 100644
index 0000000..a8e3802
--- /dev/null
+++ b/sources/inc/lang/la/admin.txt
@@ -0,0 +1,3 @@
+====== Administratio ======
+
+In hac pagina administratio uicis est.
\ No newline at end of file
diff --git a/sources/inc/lang/la/adminplugins.txt b/sources/inc/lang/la/adminplugins.txt
new file mode 100644
index 0000000..9f2ec47
--- /dev/null
+++ b/sources/inc/lang/la/adminplugins.txt
@@ -0,0 +1 @@
+===== Addenda alia =====
\ No newline at end of file
diff --git a/sources/inc/lang/la/backlinks.txt b/sources/inc/lang/la/backlinks.txt
new file mode 100644
index 0000000..b3c0d13
--- /dev/null
+++ b/sources/inc/lang/la/backlinks.txt
@@ -0,0 +1,3 @@
+====== Nexa ======
+
+Index paginarum, quae ad hanc paginam connexae sunt.
diff --git a/sources/inc/lang/la/conflict.txt b/sources/inc/lang/la/conflict.txt
new file mode 100644
index 0000000..aebc38b
--- /dev/null
+++ b/sources/inc/lang/la/conflict.txt
@@ -0,0 +1,5 @@
+====== Recentior forma est ======
+
+Recentior forma est: nam dum hanc paginam recensibas, aliquis paginam mutauit.
+
+Discrimina uides et formam seruandam eligis. Alia forma delebitur.
\ No newline at end of file
diff --git a/sources/inc/lang/la/denied.txt b/sources/inc/lang/la/denied.txt
new file mode 100644
index 0000000..fdb62f5
--- /dev/null
+++ b/sources/inc/lang/la/denied.txt
@@ -0,0 +1,3 @@
+====== Ad hanc paginam accedere non potes ======
+
+Ad hanc paginam accedere non potes: antea in conuentum ineas, deinde rursum temptas
\ No newline at end of file
diff --git a/sources/inc/lang/la/diff.txt b/sources/inc/lang/la/diff.txt
new file mode 100644
index 0000000..ead3827
--- /dev/null
+++ b/sources/inc/lang/la/diff.txt
@@ -0,0 +1,3 @@
+====== Discrimina ======
+
+Discrimina inter duas paginas ostendere
\ No newline at end of file
diff --git a/sources/inc/lang/la/draft.txt b/sources/inc/lang/la/draft.txt
new file mode 100644
index 0000000..23bb20f
--- /dev/null
+++ b/sources/inc/lang/la/draft.txt
@@ -0,0 +1,5 @@
+====== Propositum inuentum ======
+
+Tua extrema recensio non perfecta est. Vicis propositum in itinere seruauit, sic his seruatis uteris.
+
+Statuas si //restituere// uis, //delere// seruata aut //delere// omnes.
\ No newline at end of file
diff --git a/sources/inc/lang/la/edit.txt b/sources/inc/lang/la/edit.txt
new file mode 100644
index 0000000..342b307
--- /dev/null
+++ b/sources/inc/lang/la/edit.txt
@@ -0,0 +1 @@
+Paginam recensere et "Serua" premere. Vide [[wiki:syntax]] ut uicis stilus uidere possis. Hanc paginam recenses, solum si hanc auges. Prima uestigia apud hunc nexum [[playground:playground|playground]] uidere possis.
\ No newline at end of file
diff --git a/sources/inc/lang/la/editrev.txt b/sources/inc/lang/la/editrev.txt
new file mode 100644
index 0000000..6a4d082
--- /dev/null
+++ b/sources/inc/lang/la/editrev.txt
@@ -0,0 +1,2 @@
+**Vetus forma a te restituta est** Si hanc formam seruabis, nouam creabis.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/la/index.txt b/sources/inc/lang/la/index.txt
new file mode 100644
index 0000000..cd65dbb
--- /dev/null
+++ b/sources/inc/lang/la/index.txt
@@ -0,0 +1,3 @@
+====== Forma Situs ======
+
+Haec forma situs ordinata [[doku>namespaces|generatim]].
\ No newline at end of file
diff --git a/sources/inc/lang/la/install.html b/sources/inc/lang/la/install.html
new file mode 100644
index 0000000..e041df9
--- /dev/null
+++ b/sources/inc/lang/la/install.html
@@ -0,0 +1,8 @@
+
        Haec pagina te adiuuat in Dokuuiki conformando. Maiores res in
+hac pagina sunt.
        
+
+
        DokuWiki documenta ut omnes paginas uicis et omnia (ut imagines, indices, ueteres formas) quae ad easdem pertinent colligat. Vt bene operet DokuWiki omnes facultates scrini habere debes. Hoc instrumentum facultates eligere  non potest, his facultatibus locatori spati interretis quaeras uel FTP intrumento uel aliis rebus (ut cPanel) uteraris.
        
+
+
        Hoc intrumentum optiones primae DokuWiki ICA, quos rectori situs inire et indicem, ut addenda optiones uicis et alia administrare possit uidere licet. Hoc instrumentum non necessarium DokuWiki ut feliciter operet, sed melius administrare adiuuat.
        
+
+
        Periti uel qui certa quaesita habet paginas rationis conformandum uicem et optionum conformationis uidere possunt.
        
\ No newline at end of file
diff --git a/sources/inc/lang/la/lang.php b/sources/inc/lang/la/lang.php
new file mode 100644
index 0000000..c71a71b
--- /dev/null
+++ b/sources/inc/lang/la/lang.php
@@ -0,0 +1,262 @@
+
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '"';
+$lang['doublequoteclosing']    = '"';
+$lang['singlequoteopening']    = '`';
+$lang['singlequoteclosing']    = '\'';
+$lang['apostrophe']            = '´';
+$lang['btn_edit']              = 'Recensere hanc paginam';
+$lang['btn_source']            = 'Fontem uidere';
+$lang['btn_show']              = 'Ostendere paginam';
+$lang['btn_create']            = 'Creare paginam';
+$lang['btn_search']            = 'Quaerere';
+$lang['btn_save']              = 'Seruare';
+$lang['btn_preview']           = 'Praeuidere';
+$lang['btn_top']               = 'I ad summa';
+$lang['btn_newer']             = '<< recentiores';
+$lang['btn_older']             = 'minus recentiores >>';
+$lang['btn_revs']              = 'Veteres renouationes';
+$lang['btn_recent']            = 'Nuper mutata';
+$lang['btn_upload']            = 'Onerare';
+$lang['btn_cancel']            = 'Abrogare';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Recensere';
+$lang['btn_login']             = 'Conuentum aperire';
+$lang['btn_logout']            = 'Conuentum concludere';
+$lang['btn_admin']             = 'Rector';
+$lang['btn_update']            = 'Nouare';
+$lang['btn_delete']            = 'Delere';
+$lang['btn_back']              = 'Redire';
+$lang['btn_backlink']          = 'Nexus ad paginam';
+$lang['btn_backtomedia']       = 'Ad media redire';
+$lang['btn_subscribe']         = 'Custodire';
+$lang['btn_profile']           = 'Tabellam nouare';
+$lang['btn_reset']             = 'Abrogare';
+$lang['btn_draft']             = 'Propositum recensere';
+$lang['btn_recover']           = 'Propositum reficere';
+$lang['btn_draftdel']          = 'Propositum delere';
+$lang['btn_revert']            = 'Reficere';
+$lang['btn_register']          = 'Te adscribere';
+$lang['loggedinas']            = 'Nomen sodalis:';
+$lang['user']                  = 'Nomen sodalis:';
+$lang['pass']                  = 'Tessera tua';
+$lang['newpass']               = 'Tessera noua';
+$lang['oldpass']               = 'Tessera uetus:';
+$lang['passchk']               = 'Tesseram tuam adfirmare';
+$lang['remember']              = 'Tesseram meam sodalitatis memento';
+$lang['fullname']              = 'Nomen tuom uerum:';
+$lang['email']                 = 'Cursus interretialis:';
+$lang['profile']               = 'Tabella Sodalis';
+$lang['badlogin']              = 'Error in ineundo est, rectum nomen uel tessera cedo.';
+$lang['minoredit']             = 'Recensio minor';
+$lang['draftdate']             = 'Propositum seruatur die:';
+$lang['nosecedit']             = 'Pagina interea mutatur, pars rerum exiit, in loco eius tota pagina reclamata est.';
+$lang['regmissing']            = 'Omnes campi complendi sunt.';
+$lang['reguexists']            = 'Nomen Sodalis ab aliquo iam elegitur.';
+$lang['regsuccess']            = 'Adscriptio feliciter perficitur et tessera cursu interretiali mittitur';
+$lang['regsuccess2']           = 'Adscriptio perficitur';
+$lang['regmailfail']           = 'Error in litteras mittendo est. Rectorem conueni!';
+$lang['regbadmail']            = 'Cursus interretialis non legitimus: si errorem putes, Rectorem conueni.';
+$lang['regbadpass']            = 'Tesserae quas scripsisti inter se non congruont.';
+$lang['regpwmail']             = 'Tessera Dokuuicis tuam';
+$lang['reghere']               = 'Non iam adscriptus\a esne? Te adscribe';
+$lang['profna']                = 'Tabellam tuam mutare non potes.';
+$lang['profnochange']          = 'Si res non mutare uis, nihil agere';
+$lang['profnoempty']           = 'Omnes campi complendi sunt.';
+$lang['profchanged']           = 'Tabella Sodalis feliciter nouatur';
+$lang['pwdforget']             = 'Tesseram amisistine? Nouam petere';
+$lang['resendna']              = 'Tesseram non mutare potest.';
+$lang['resendpwdmissing']      = 'Omnes campi complendi sunt.';
+$lang['resendpwdnouser']       = 'In tabellis Sodalium nomen non inuentum est.';
+$lang['resendpwdbadauth']      = 'Tesseram non legitima est.';
+$lang['resendpwdconfirm']      = 'Confirmatio cursu interretiali mittitur.';
+$lang['resendpwdsuccess']      = 'Tessera noua cursu interretiali mittitur.';
+$lang['license']               = 'Praeter ubi adnotatum, omnia scripta Corporis Gentis Latinae cum his facultatibus:';
+$lang['licenseok']             = 'Caue: si paginam recenseas, has facultates confirmas:';
+$lang['searchmedia']           = 'Quaere titulum:';
+$lang['searchmedia_in']        = 'Quaere "%s":';
+$lang['txt_upload']            = 'Eligere documenta oneranda:';
+$lang['txt_filename']          = 'Onerare (optio):';
+$lang['txt_overwrt']           = 'Documento ueteri imponere:';
+$lang['lockedby']              = 'Nunc hoc intercludit';
+$lang['lockexpire']            = 'Hoc apertum';
+$lang['js']['willexpire']            = 'Interclusio paginae recensendae uno minuto finita est.\nUt errores uites, \'praeuisio\' preme ut interclusionem ripristines.';
+$lang['js']['notsavedyet']     = 'Res non seruatae amissurae sunt.';
+$lang['js']['searchmedia']     = 'Quaere inter documenta';
+$lang['js']['keepopen']        = 'Fenestram apertam tene';
+$lang['js']['hidedetails']     = 'Singulas res abscondere';
+$lang['js']['mediatitle']      = 'Optiones nexorum';
+$lang['js']['mediadisplay']    = 'Genus nexi';
+$lang['js']['mediaalign']      = 'Collocatio';
+$lang['js']['mediasize']       = 'Amplitudo imaginis';
+$lang['js']['mediatarget']     = 'Cui nexum est';
+$lang['js']['mediaclose']      = 'Claudere';
+$lang['js']['mediainsert']     = 'Insere';
+$lang['js']['mediadisplayimg'] = 'Imaginem ostendere';
+$lang['js']['mediadisplaylnk'] = 'Solum nexum ostendere';
+$lang['js']['mediasmall']      = 'Forma minor';
+$lang['js']['mediamedium']     = 'Forma media';
+$lang['js']['medialarge']      = 'Forma maior';
+$lang['js']['mediaoriginal']   = 'Forma primigenia';
+$lang['js']['medialnk']        = 'Singulis rebus paginae nexum';
+$lang['js']['mediadirect']     = 'Primigeniae formae nexum';
+$lang['js']['medianolnk']      = 'Connectio deest';
+$lang['js']['medianolink']     = 'Imaginem non connectere';
+$lang['js']['medialeft']       = 'Imaginem ad sinistram collocare';
+$lang['js']['mediaright']      = 'Imaginem ad dextram collocare';
+$lang['js']['mediacenter']     = 'Imaginem in mediam collocare';
+$lang['js']['medianoalign']    = 'Collocationem remouere';
+$lang['js']['nosmblinks']      = 'Windows nexa solum cum Microsoft Internet Explorer ostendi possunt.
+Adhuc transcribere nexum potes.';
+$lang['js']['linkwiz']         = 'Connectendi ductor';
+$lang['js']['linkto']          = 'Nexum ad:';
+$lang['js']['del_confirm']     = 'Delere electas res uin?';
+$lang['rssfailed']             = 'Error in restituendo ';
+$lang['nothingfound']          = 'Nihil inuentum est.';
+$lang['mediaselect']           = 'Documenta uisiua:';
+$lang['fileupload']            = 'Documentum uisiuom onerare';
+$lang['uploadsucc']            = 'Oneratum perfectum';
+$lang['uploadfail']            = 'Error onerandi.';
+$lang['uploadwrong']           = 'Onerare non potest. Genus documenti non legitimum!';
+$lang['uploadexist']           = 'Documentum iam est.';
+$lang['uploadspam']            = 'Onerare non potest: nam in indice perscriptionis documentum est.';
+$lang['uploadxss']             = 'Onerare non potest: nam forsitan malum scriptum in documento est.';
+$lang['uploadsize']            = 'Documentum onerandum ponderosius est. (Maxime "%s")';
+$lang['deletesucc']            = 'Documentum "%s" deletum est.';
+$lang['deletefail']            = '"%s" non deletur: uide facultates.';
+$lang['mediainuse']            = 'documentum "%s" non deletur, nam aliquis hoc utitur.';
+$lang['namespaces']            = 'Genus';
+$lang['mediafiles']            = 'Documentum liberum in:';
+$lang['accessdenied']          = 'Non uidere documentum potes.';
+$lang['mediausage']            = 'Hac forma uteris ut documentum referas:';
+$lang['mediaview']             = 'Vide documentum primigenium';
+$lang['mediaroot']             = 'scrinium';
+$lang['mediaupload']           = 'Hic genus oneras. Si nouom genus creare uis, ante "Onerare ut" nomen documenti diuisum a duabus punctis ponas.';
+$lang['mediaextchange']        = 'Genus documenti mutatum a(b) ".%s" ad ".%s"!';
+$lang['reference']             = 'Referre:';
+$lang['ref_inuse']             = 'Documentum non deleri potest, nam in his paginis apertum est:';
+$lang['ref_hidden']            = 'Aliquae mentiones ad paginas, ad quas ire non potes, habent';
+$lang['hits']                  = 'Ictus';
+$lang['quickhits']             = 'Spatium nominis conguens';
+$lang['toc']                   = 'Index';
+$lang['current']               = 'nouos\a\um';
+$lang['yours']                 = 'Tua forma';
+$lang['diff']                  = 'Discrimina inter formas ostendere';
+$lang['diff2']                 = 'Discrimina inter electas recensiones ostendere';
+$lang['difflink']              = 'Nexum ad comparandum';
+$lang['line']                  = 'Linea';
+$lang['breadcrumb']            = 'Vestigium';
+$lang['youarehere']            = 'Hic es';
+$lang['lastmod']               = 'Extrema mutatio';
+$lang['by']                    = 'a(b)';
+$lang['deleted']               = 'deletur';
+$lang['created']               = 'creatur';
+$lang['restored']              = 'Recensio uetus restituta (%s)';
+$lang['external_edit']         = 'Externe recensere';
+$lang['summary']               = 'Indicem recensere';
+$lang['noflash']               = 'Adobe Flash Plugin necessarium est.';
+$lang['download']              = 'Snippet capere';
+$lang['mail_newpage']          = 'Pagina addita:';
+$lang['mail_changed']          = 'Pagina mutata:';
+$lang['mail_subscribe_list']   = 'Paginae in genere mutatae:';
+$lang['mail_new_user']         = 'Nouos Sodalis:';
+$lang['mail_upload']           = 'Documentum oneratum:';
+$lang['qb_bold']               = 'Litterae pingues';
+$lang['qb_italic']             = 'Litterae italicae';
+$lang['qb_underl']             = 'Litterae sullineatae';
+$lang['qb_code']               = 'Codex scripti';
+$lang['qb_strike']             = 'Litterae illineatae';
+$lang['qb_h1']                 = 'Caput I';
+$lang['qb_h2']                 = 'Caput II';
+$lang['qb_h3']                 = 'Caput III';
+$lang['qb_h4']                 = 'Caput IV';
+$lang['qb_h5']                 = 'Caput V';
+$lang['qb_h']                  = 'Caput';
+$lang['qb_hs']                 = 'Caput eligere';
+$lang['qb_hplus']              = 'Caput maius';
+$lang['qb_hminus']             = 'Caput minus';
+$lang['qb_hequal']             = 'Caput eiusdem gradus';
+$lang['qb_link']               = 'Nexus internus';
+$lang['qb_extlink']            = 'Nexus externus (memento praefigere http://)';
+$lang['qb_hr']                 = 'Linea directa (noli saepe uti)';
+$lang['qb_ol']                 = 'Index ordinatus rerum';
+$lang['qb_ul']                 = 'Index non ordinatus rerum';
+$lang['qb_media']              = 'Imagines et documenta addere';
+$lang['qb_sig']                = 'Subscriptio tua cum indicatione temporis';
+$lang['qb_smileys']            = 'Pupuli';
+$lang['qb_chars']              = 'Signa singularia';
+$lang['upperns']               = 'I ad anterius genus';
+$lang['admin_register']        = 'Nouom Sodalem creare';
+$lang['metaedit']              = 'Res codicis mutare';
+$lang['metasaveerr']           = 'Res codicis non scribitur.';
+$lang['metasaveok']            = 'Res codicis seruatae.';
+$lang['img_backto']            = 'Redere ad';
+$lang['img_title']             = 'Titulus';
+$lang['img_caption']           = 'Descriptio';
+$lang['img_date']              = 'Dies';
+$lang['img_fname']             = 'Titulus documenti';
+$lang['img_fsize']             = 'Pondus';
+$lang['img_artist']            = 'Imaginum exprimitor\trix';
+$lang['img_copyr']             = 'Iura exemplarium';
+$lang['img_format']            = 'Forma';
+$lang['img_camera']            = 'Cella';
+$lang['img_keywords']          = 'Verba claues';
+$lang['subscr_subscribe_success'] = '%s additur indici subscriptionis quod %s';
+$lang['subscr_subscribe_error'] = '%s non additur indici subscriptionis quod %s';
+$lang['subscr_subscribe_noaddress'] = 'Cursus interretialis tuus deest, sic in indice subscriptionis non scribi potes';
+$lang['subscr_unsubscribe_success'] = 'A subscriptione %s deletur quod %s';
+$lang['subscr_unsubscribe_error'] = 'Error delendi %s a subscriptione quod %s';
+$lang['subscr_already_subscribed'] = '%s iam subscriptus\a est in %s';
+$lang['subscr_not_subscribed'] = '%s non subscriptus\a est in %s';
+$lang['subscr_m_not_subscribed'] = 'Non hanc paginam uel genus subscribere potes.';
+$lang['subscr_m_new_header']   = 'Subscriptionem addere';
+$lang['subscr_m_current_header'] = 'haec subscriptio:';
+$lang['subscr_m_unsubscribe']  = 'Delere';
+$lang['subscr_m_subscribe']    = 'Subscribere';
+$lang['subscr_m_receive']      = 'Accipere';
+$lang['subscr_style_every']    = 'Cursus mutationibus omnibus';
+$lang['subscr_style_digest']   = 'Accipere litteras in mutando paginam (%.2f dies)';
+$lang['subscr_style_list']     = 'Index mutatarum paginarum ab extremis litteris (%.2f dies)';
+$lang['authtempfail']          = 'Confirmare non potes. Rectorem conuenis.';
+$lang['i_chooselang']          = 'Linguam eligere';
+$lang['i_installer']           = 'Docuuicis creator';
+$lang['i_wikiname']            = 'Nomen Vicis';
+$lang['i_enableacl']           = 'ICA aptum facias (consulatum est)';
+$lang['i_superuser']           = 'Magister\stra';
+$lang['i_problems']            = 'Creator hos errores habes. Continuare potes postquam omnia soluentur.';
+$lang['i_modified']            = 'Hoc scriptum solum cum noua forma Dokuuicis est. Hoc rursum capere in pagina, in qua haec machina capta est, potes aut i ad Dokuuicis installation instructions';
+$lang['i_funcna']              = 'PHP functio %s inepta est.';
+$lang['i_phpver']              = 'Forma tua PHP %s minor quam illa necessaria %s.';
+$lang['i_permfail']            = '%s non a uice scribitur. Facultates inspicere.';
+$lang['i_confexists']          = '%s iam est.';
+$lang['i_writeerr']            = '%s non creari potest. Manu illum creas.';
+$lang['i_badhash']             = 'Ignotum uel mutatum dokuwiki.php (%s)';
+$lang['i_badval']              = '%s non legitimum uel uacuom';
+$lang['i_success']             = 'Administratio feliciter perficitur. Delere install.php documentum potes. I ad hanc paginam ut continues.';
+$lang['i_failure']             = 'Aliqui errores dum documenta administrantur sunt. Manu onerare omnes potes priusquam tuo nouo uice uteris.';
+$lang['i_policy']              = 'ICA ratio prima';
+$lang['i_pol0']                = 'Vicem aperire (omnes legere, scribere, onerare possunt)';
+$lang['i_pol1']                = 'Publicus uicis (omnes legere, Sodales scribere et onerare possunt)';
+$lang['i_pol2']                = 'Clausus uicis (Soli Sodales legere scribere et onerare poccunt)';
+$lang['i_retry']               = 'Rursum temptas';
+$lang['i_license']             = 'Elige facultatem sub qua tuus uicis est:';
+$lang['years']                 = 'ab annis %d';
+$lang['months']                = 'a mensibus %d';
+$lang['weeks']                 = 'a septimanis %d';
+$lang['days']                  = 'a diebus %d';
+$lang['hours']                 = 'a horis %d';
+$lang['minutes']               = 'a minutis %d';
+$lang['seconds']               = 'a secundis %d';
+$lang['wordblock']             = 'Mutationes non seruantur, eo quod mala uerba contenit';
diff --git a/sources/inc/lang/la/locked.txt b/sources/inc/lang/la/locked.txt
new file mode 100644
index 0000000..65446df
--- /dev/null
+++ b/sources/inc/lang/la/locked.txt
@@ -0,0 +1,3 @@
+====== Pagina inclusa ======
+
+Haec pagina inclusa est: nullam mutationem facere potest.
\ No newline at end of file
diff --git a/sources/inc/lang/la/login.txt b/sources/inc/lang/la/login.txt
new file mode 100644
index 0000000..25d4cd1
--- /dev/null
+++ b/sources/inc/lang/la/login.txt
@@ -0,0 +1,3 @@
+====== Aditus ======
+
+Nomen Sodalis et tesseram scribere debes ut in conuentum inire uelis.
\ No newline at end of file
diff --git a/sources/inc/lang/la/mailtext.txt b/sources/inc/lang/la/mailtext.txt
new file mode 100644
index 0000000..2d2504c
--- /dev/null
+++ b/sources/inc/lang/la/mailtext.txt
@@ -0,0 +1,16 @@
+Pagina in uice addita uel mutata. Hae singulae res sunt:
+
+Dies : @DATE@
+IP-Numerus : @IPADDRESS@
+Hospes situs : @HOSTNAME@
+Vetus recensio: @OLDPAGE@
+Noua recensio: @NEWPAGE@
+Summa recensere: @SUMMARY@
+Sodalis : @USER@
+
+@DIFF@
+
+
+-- 
+Hic cursus generatus a(b)
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/la/newpage.txt b/sources/inc/lang/la/newpage.txt
new file mode 100644
index 0000000..13cfff7
--- /dev/null
+++ b/sources/inc/lang/la/newpage.txt
@@ -0,0 +1,3 @@
+====== Hoc argumentum deest ======
+
+Nexum, quod pressisti, ad argumentum nullum fert. Si facultatem habes, creare nouam paginam potes.
\ No newline at end of file
diff --git a/sources/inc/lang/la/norev.txt b/sources/inc/lang/la/norev.txt
new file mode 100644
index 0000000..19b60fe
--- /dev/null
+++ b/sources/inc/lang/la/norev.txt
@@ -0,0 +1,3 @@
+====== Forma non reperta ======
+
+Haec forma non reperta est. Aliam formam quaeris.
\ No newline at end of file
diff --git a/sources/inc/lang/la/password.txt b/sources/inc/lang/la/password.txt
new file mode 100644
index 0000000..f49f4b8
--- /dev/null
+++ b/sources/inc/lang/la/password.txt
@@ -0,0 +1,10 @@
+Aue @FULLNAME@!
+
+Hae res @TITLE@, i ad paginam: @DOKUWIKIURL@
+
+Sodalis nomen : @LOGIN@
+Tessera : @PASSWORD@
+
+-- 
+Hic cursus generatus a(b)
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/la/preview.txt b/sources/inc/lang/la/preview.txt
new file mode 100644
index 0000000..7e5a137
--- /dev/null
+++ b/sources/inc/lang/la/preview.txt
@@ -0,0 +1,3 @@
+====== Praeuisio ======
+
+In hac pagina scriptum praeuidere potes. Memento hunc non seruatum iam esse.
\ No newline at end of file
diff --git a/sources/inc/lang/la/pwconfirm.txt b/sources/inc/lang/la/pwconfirm.txt
new file mode 100644
index 0000000..32e351a
--- /dev/null
+++ b/sources/inc/lang/la/pwconfirm.txt
@@ -0,0 +1,14 @@
+Aue, @FULLNAME@!
+
+Aliquis tesseram nouam @TITLE@
+ut ineas in @DOKUWIKIURL@
+
+Si nouam tesseram non petiuisti, hoc nuntium ignorat.
+
+Ut hoc nuntium petiuisti, premendo hunc nexum confirmas.
+
+@CONFIRM@
+
+-- 
+Hic cursus generatus a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/la/read.txt b/sources/inc/lang/la/read.txt
new file mode 100644
index 0000000..b1710f2
--- /dev/null
+++ b/sources/inc/lang/la/read.txt
@@ -0,0 +1 @@
+Hanc paginam solum legere potes. Fontem uidere, sed non mutare potes.
\ No newline at end of file
diff --git a/sources/inc/lang/la/recent.txt b/sources/inc/lang/la/recent.txt
new file mode 100644
index 0000000..d8e721c
--- /dev/null
+++ b/sources/inc/lang/la/recent.txt
@@ -0,0 +1,3 @@
+====== Recentes Mutationes ======
+
+Hae paginae mutatae sunt in recentibus temporibus
\ No newline at end of file
diff --git a/sources/inc/lang/la/register.txt b/sources/inc/lang/la/register.txt
new file mode 100644
index 0000000..71ca8dd
--- /dev/null
+++ b/sources/inc/lang/la/register.txt
@@ -0,0 +1,3 @@
+====== Nouom\am Sodalem Adscribere ======
+
+Nomen Sodalis legitimus esse debes: [[doku>pagename|pagename]].
\ No newline at end of file
diff --git a/sources/inc/lang/la/registermail.txt b/sources/inc/lang/la/registermail.txt
new file mode 100644
index 0000000..7390195
--- /dev/null
+++ b/sources/inc/lang/la/registermail.txt
@@ -0,0 +1,14 @@
+Nouos\a Sodalis est. Hae suae res:
+
+Sodalis nomen : @NEWUSER@
+Nomen uerum : @NEWNAME@
+Cursus interretialis : @NEWEMAIL@
+
+Dies : @DATE@
+Machina interretis : @BROWSER@
+IP-numerus : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+-- 
+Hic cursus generatus a
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/la/resendpwd.txt b/sources/inc/lang/la/resendpwd.txt
new file mode 100644
index 0000000..5a4972f
--- /dev/null
+++ b/sources/inc/lang/la/resendpwd.txt
@@ -0,0 +1,3 @@
+====== ouam Tesseram mittere ======
+
+Inserere nomen Sodalis priusquam tesseram petere. Confirmatio mittibitur.
\ No newline at end of file
diff --git a/sources/inc/lang/la/revisions.txt b/sources/inc/lang/la/revisions.txt
new file mode 100644
index 0000000..38b9bae
--- /dev/null
+++ b/sources/inc/lang/la/revisions.txt
@@ -0,0 +1,3 @@
+====== Veteres recensiones ======
+
+In hac pagina ueteres recensiones paginae sunt: ut unam ex his restituas, illam eligis et deinde "Recensere paginam" premis et serua.
\ No newline at end of file
diff --git a/sources/inc/lang/la/searchpage.txt b/sources/inc/lang/la/searchpage.txt
new file mode 100644
index 0000000..8e92911
--- /dev/null
+++ b/sources/inc/lang/la/searchpage.txt
@@ -0,0 +1,5 @@
+====== Quaerere ======
+
+Responsiones in hac pagina uidere potes.
+
+===== Responsiones =====
\ No newline at end of file
diff --git a/sources/inc/lang/la/showrev.txt b/sources/inc/lang/la/showrev.txt
new file mode 100644
index 0000000..b95e682
--- /dev/null
+++ b/sources/inc/lang/la/showrev.txt
@@ -0,0 +1,2 @@
+**Haec uetus forma documenti est!**
+----
\ No newline at end of file
diff --git a/sources/inc/lang/la/stopwords.txt b/sources/inc/lang/la/stopwords.txt
new file mode 100644
index 0000000..f063ba7
--- /dev/null
+++ b/sources/inc/lang/la/stopwords.txt
@@ -0,0 +1,37 @@
+apud
+sunt
+etsi
+atque
+et
+tu
+tuus
+eius
+eorum
+infra
+ad
+in
+inter
+si
+in
+a
+ab
+de
+ut
+super
+aut
+uel
+illud
+illa
+ille
+ad
+fuit
+quid
+quod
+ubi
+hoc
+ex
+e
+cum
+haec
+hic
+www
\ No newline at end of file
diff --git a/sources/inc/lang/la/subscr_digest.txt b/sources/inc/lang/la/subscr_digest.txt
new file mode 100644
index 0000000..32d378a
--- /dev/null
+++ b/sources/inc/lang/la/subscr_digest.txt
@@ -0,0 +1,20 @@
+Aue!
+
+Pagina @PAGE@ in @TITLE@ uici mutata.
+Haec mutationes sunt:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vetus recensio: @OLDPAGE@
+Noua recensio: @NEWPAGE@
+
+Ut paginae adnotationes deleas, in uicem ineas in
+@DOKUWIKIURL@, deinde uideas
+@SUBSCRIBE@
+et paginarum generum optiones mutes.
+
+--
+Hic cursus a uicis generatus
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/la/subscr_form.txt b/sources/inc/lang/la/subscr_form.txt
new file mode 100644
index 0000000..23000b3
--- /dev/null
+++ b/sources/inc/lang/la/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Inscriptionis Administratio ======
+
+In hac pagina inscriptiones huius paginae et generis sunt.
\ No newline at end of file
diff --git a/sources/inc/lang/la/subscr_list.txt b/sources/inc/lang/la/subscr_list.txt
new file mode 100644
index 0000000..e6ff8d8
--- /dev/null
+++ b/sources/inc/lang/la/subscr_list.txt
@@ -0,0 +1,17 @@
+Aue!
+
+Paginae in spatio nominis @PAGE@  @TITLE@ uicis mutatae.
+Hae mutationes sunt:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Ut adnotationes deleas, preme hic
+@DOKUWIKIURL@ then visit
+@SUBSCRIBE@
+et paginarum et\aut generum mutationes tollis.
+
+--
+Hic cursus generatus a(b)
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/la/subscr_single.txt b/sources/inc/lang/la/subscr_single.txt
new file mode 100644
index 0000000..1428501
--- /dev/null
+++ b/sources/inc/lang/la/subscr_single.txt
@@ -0,0 +1,23 @@
+Aue!
+
+Pagina "@PAGE@" in titulo "@TITlE@" mutata.
+Hae mutationes sunt:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dies : @DATE@
+Sodalis : @USER@
+Summa recensita: @SUMMARY@
+Vetus recensio: @OLDPAGE@
+Noua recensio: @NEWPAGE@
+
+Ut paginae adnotationes deleas, in uicem ineas in
+@DOKUWIKIURL@, deinde uideas
+@SUBSCRIBE@
+et paginarum et\aut generum optiones mutasa.
+
+--
+Hic cursus a uicis generatus
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/la/updateprofile.txt b/sources/inc/lang/la/updateprofile.txt
new file mode 100644
index 0000000..565f81a
--- /dev/null
+++ b/sources/inc/lang/la/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Nouare Sodalis tabellas ======
+
+Solum in campis, quos mutare uis, scribis. Nomen Sodalis non mutare potes.
\ No newline at end of file
diff --git a/sources/inc/lang/la/uploadmail.txt b/sources/inc/lang/la/uploadmail.txt
new file mode 100644
index 0000000..0442979
--- /dev/null
+++ b/sources/inc/lang/la/uploadmail.txt
@@ -0,0 +1,14 @@
+Documentum nouatum est. Hae mutatione sunt:
+
+Documentum : @MEDIA@
+Dies : @DATE@
+Machina interretis : @BROWSER@
+IP-Numerus : @IPADDRESS@
+Hospes situs : @HOSTNAME@
+Pondus : @SIZE@
+MIME Genus : @MIME@
+Sodalis : @USER@
+
+-- 
+Hic cursu generatus a(b)
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/lb/admin.txt b/sources/inc/lang/lb/admin.txt
new file mode 100644
index 0000000..08f8b2f
--- /dev/null
+++ b/sources/inc/lang/lb/admin.txt
@@ -0,0 +1,3 @@
+====== Administratioun ======
+
+Hei ënnendrënner fënns de eng Lëscht mat administrativen Aufgaben déi am Dokuwiki zuer Verfügung stinn.
diff --git a/sources/inc/lang/lb/adminplugins.txt b/sources/inc/lang/lb/adminplugins.txt
new file mode 100644
index 0000000..9581400
--- /dev/null
+++ b/sources/inc/lang/lb/adminplugins.txt
@@ -0,0 +1 @@
+===== Zousätzlech Pluginen =====
\ No newline at end of file
diff --git a/sources/inc/lang/lb/backlinks.txt b/sources/inc/lang/lb/backlinks.txt
new file mode 100644
index 0000000..8b8fbd4
--- /dev/null
+++ b/sources/inc/lang/lb/backlinks.txt
@@ -0,0 +1,3 @@
+====== Linken zeréck ======
+
+Dëst ass eng Lëscht mat Säiten déi schéngen op déi aktuell Säit zeréck ze verlinken.
diff --git a/sources/inc/lang/lb/conflict.txt b/sources/inc/lang/lb/conflict.txt
new file mode 100644
index 0000000..3a84e72
--- /dev/null
+++ b/sources/inc/lang/lb/conflict.txt
@@ -0,0 +1,5 @@
+====== Et gëtt méi eng nei Versioun ======
+
+Et gëtt méi eng nei Versioun vum Dokument wats de g'ännert hues. Dat geschitt wann en anere Benotzer dat selwecht Dokument ännert wärenddeems du et änners. 
+
+Ënnersich d'Ënnerscheeder déi hei ënnendrënner ugewise gi grëndlech. Wanns de  ''Späicheren'' auswiels, da gëtt deng Version gespäicher. Dréck op ''Ofbriechen'' fir déi aktuell Versioun ze halen.
diff --git a/sources/inc/lang/lb/denied.txt b/sources/inc/lang/lb/denied.txt
new file mode 100644
index 0000000..487bf21
--- /dev/null
+++ b/sources/inc/lang/lb/denied.txt
@@ -0,0 +1,3 @@
+======Erlaabnis verweigert======
+
+Et deet mer leed, du hues net genuch Rechter fir weiderzefueren. Hues de vläicht vergiess dech anzeloggen?
diff --git a/sources/inc/lang/lb/diff.txt b/sources/inc/lang/lb/diff.txt
new file mode 100644
index 0000000..7838b98
--- /dev/null
+++ b/sources/inc/lang/lb/diff.txt
@@ -0,0 +1,3 @@
+====== Ënnerscheeder ======
+
+Hei sinn d'Ënnerscheeder zwëscht 2 Versiounen vun der Säit.
diff --git a/sources/inc/lang/lb/draft.txt b/sources/inc/lang/lb/draft.txt
new file mode 100644
index 0000000..2e2fc9d
--- /dev/null
+++ b/sources/inc/lang/lb/draft.txt
@@ -0,0 +1,5 @@
+====== Entworf fond ======
+
+Deng lescht Ännersessioun op dëser Säit gouf net richteg ofgeschloss. DokuWiki huet automatesch en Entworf wärend denger Aarbecht gespäichert deens de elo kanns benotzen fir mat dengen Ännerunge weiderzefueren. Hei ënnendrënner gesäiss de wat vun denger leschter Sessioun gespäichert gouf.
+
+Decidéier w.e.g. obs de deng verlueren Ännerungssessioun //zeréckhuelen//, den Entworf //läschen// oder d'Änneren //ofbrieche// wëlls.
diff --git a/sources/inc/lang/lb/edit.txt b/sources/inc/lang/lb/edit.txt
new file mode 100644
index 0000000..ca039d1
--- /dev/null
+++ b/sources/inc/lang/lb/edit.txt
@@ -0,0 +1 @@
+Änner d'Säit an dréck ''Späicheren''. Kuck [[wiki:syntax]] fir d'Wiki-Syntax. Änner d'Säit w.e.g. nëmme wanns de se **verbessere** kanns. Wanns de Saache probéiere wëlls, da léier deng éischt Schréck an der [[playground:playground|Sandkaul]].
diff --git a/sources/inc/lang/lb/editrev.txt b/sources/inc/lang/lb/editrev.txt
new file mode 100644
index 0000000..6d7a129
--- /dev/null
+++ b/sources/inc/lang/lb/editrev.txt
@@ -0,0 +1,2 @@
+**Du hues eng al Versioun vum Dokument gelueden!** Wanns de se änners, mëss de eng nei Versioun mat dësen Daten.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/lb/index.txt b/sources/inc/lang/lb/index.txt
new file mode 100644
index 0000000..183e07a
--- /dev/null
+++ b/sources/inc/lang/lb/index.txt
@@ -0,0 +1,3 @@
+====== Index ======
+
+Dëst ass em Index vun all de Säiten gesënnert no [[doku>namespaces|namespaces]].
diff --git a/sources/inc/lang/lb/lang.php b/sources/inc/lang/lb/lang.php
new file mode 100644
index 0000000..5511374
--- /dev/null
+++ b/sources/inc/lang/lb/lang.php
@@ -0,0 +1,196 @@
+>';
+$lang['btn_revs']              = 'Al Versiounen';
+$lang['btn_recent']            = 'Kierzlech Ännerungen';
+$lang['btn_upload']            = 'Eroplueden';
+$lang['btn_cancel']            = 'Ofbriechen';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Änneren';
+$lang['btn_login']             = 'Login';
+$lang['btn_logout']            = 'Logout';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Update';
+$lang['btn_delete']            = 'Läschen';
+$lang['btn_back']              = 'Zeréck';
+$lang['btn_backlink']          = 'Linker zeréck';
+$lang['btn_backtomedia']       = 'Zeréck bei d\'Auswiel vun de Mediadateien';
+$lang['btn_profile']           = 'Profil aktualiséieren';
+$lang['btn_reset']             = 'Zerécksetzen';
+$lang['btn_draft']             = 'Entworf änneren';
+$lang['btn_recover']           = 'Entworf zeréckhuelen';
+$lang['btn_draftdel']          = 'Entworf läschen';
+$lang['btn_register']          = 'Registréieren';
+$lang['loggedinas']            = 'Ageloggt als';
+$lang['user']                  = 'Benotzernumm';
+$lang['pass']                  = 'Passwuert';
+$lang['newpass']               = 'Nei Passwuert';
+$lang['oldpass']               = 'Aktuell Passwuert confirméieren';
+$lang['passchk']               = 'nach eng Kéier';
+$lang['remember']              = 'Verhal mech';
+$lang['fullname']              = 'Richtegen Numm';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'Benotzerprofil';
+$lang['badlogin']              = 'Entschëllegt, de Benotzernumm oder d\'Passwuert war falsch';
+$lang['minoredit']             = 'Kleng Ännerungen';
+$lang['draftdate']             = 'Entworf automatesch gespäichert den';
+$lang['nosecedit']             = 'D\'Säit gouf an Zwëschenzäit g\'ännert, Sektiounsinfo veralt. Ganz Säit gouf aplaz gelueden.';
+$lang['regmissing']            = 'Du muss all d\'Felder ausfëllen.';
+$lang['reguexists']            = 'Et get schonn e Benotzer mat deem Numm.';
+$lang['regsuccess']            = 'De Benotzer gouf erstallt an d\'Passwuert via Email geschéckt.';
+$lang['regsuccess2']           = 'De Benotzer gouf erstallt.';
+$lang['regmailfail']           = 'Et gesäit aus wéi wann e Feeler beim schécke vun der Passwuertmail virkomm wier. Kontaktéier den Admin w.e.g.!';
+$lang['regbadmail']            = 'Déi Emailadress gesäit ongëlteg aus - wanns de mengs dat wier e Feeler, da kontaktéier den Admin w.e.g.';
+$lang['regbadpass']            = 'Déi 2 Passwieder si net t\'selwecht. Probéier nach eng Kéier w.e.g.';
+$lang['regpwmail']             = 'Däin DokuWiki Passwuert';
+$lang['reghere']               = 'Hues du nach keen Account? Da maach der een';
+$lang['profna']                = 'Dëse Wiki ënnestëtzt keng Ännerunge vum Profil';
+$lang['profnochange']          = 'Keng Ännerungen. Näischt ze man.';
+$lang['profnoempty']           = 'En eidele Numm oder Emailadress ass net erlaabt.';
+$lang['profchanged']           = 'Benotzerprofil erfollegräicht aktualiséiert.';
+$lang['pwdforget']             = 'Passwuert vergiess? Fro der e Neit';
+$lang['resendna']              = 'Dëse Wiki ënnerstëtzt net d\'Neiverschécke vu Passwieder.';
+$lang['resendpwdmissing']      = 'Du muss all Felder ausfëllen.';
+$lang['resendpwdnouser']       = 'Kann dëse Benotzer net an der Datebank fannen.';
+$lang['resendpwdbadauth']      = 'Den "Auth"-Code ass ongëlteg. Kuck no obs de dee ganze Konfirmationslink benotzt hues.';
+$lang['resendpwdconfirm']      = 'De Konfirmatiounslink gouf iwwer Email geschéckt.';
+$lang['resendpwdsuccess']      = 'Däi nei Passwuert gouf iwwer Email geschéckt.';
+$lang['license']               = 'Wann näischt anescht do steet, ass den Inhalt vun dësem Wiki ënner folgender Lizenz:';
+$lang['licenseok']             = 'Pass op: Wanns de dës Säit änners, bass de dermat averstan dass den Inhalt ënner folgender Lizenz lizenzéiert gëtt:';
+$lang['txt_upload']            = 'Wiel eng Datei fir eropzelueden';
+$lang['txt_filename']          = 'Eroplueden als (optional)';
+$lang['txt_overwrt']           = 'Bestehend Datei iwwerschreiwen';
+$lang['lockedby']              = 'Am Moment gespaart vun';
+$lang['lockexpire']            = 'D\'Spär leeft of ëm';
+$lang['js']['willexpire']            = 'Deng Spär fir d\'Säit ze änneren leeft an enger Minutt of.\nFir Konflikter ze verhënneren, dréck op Kucken ouni ofzespäicheren.';
+$lang['js']['notsavedyet']     = 'Net gespäicher Ännerunge gi verluer.\nWierklech weiderfueren?';
+$lang['rssfailed']             = 'Et ass e Feeler virkomm beim erofluede vun dësem Feed: ';
+$lang['nothingfound']          = 'Näischt fond.';
+$lang['mediaselect']           = 'Mediadateien';
+$lang['fileupload']            = 'Mediadateien eroplueden';
+$lang['uploadsucc']            = 'Upload erfollegräich';
+$lang['uploadfail']            = 'Feeler beim Upload. Vläicht falsch Rechter?';
+$lang['uploadwrong']           = 'Eroplueden net erlaabt. Dës Dateiendung ass verbueden!';
+$lang['uploadexist']           = 'Datei gët et schonn. Näischt gemaach.';
+$lang['uploadbadcontent']      = 'Den eropgeluedenen Inhalt stëmmt net mat der Dateiendung %s iwwereneen.';
+$lang['uploadspam']            = 'D\'Eropluede gouf duerch d\'Schwaarz Spamlëscht blockéiert.';
+$lang['uploadxss']             = 'D\'Eropluede gouf wéinst méiglechem béisaartegem Inhalt blockéiert.';
+$lang['uploadsize']            = 'Déi eropgelueden Datei war ze grouss. (max. %s)';
+$lang['deletesucc']            = 'D\'Datei "%s" gouf geläscht.';
+$lang['deletefail']            = '"%s" konnt net geläscht ginn. Kontroléier d\'Rechter.';
+$lang['mediainuse']            = 'D\'Datei "%s" gouf net geläscht - se ass nach am Gebrauch.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'Verfügbar Dateien am';
+$lang['js']['keepopen']        = 'Fënster beim Auswielen oploossen';
+$lang['js']['hidedetails']     = 'Deteiler verstoppen';
+$lang['mediausage']            = 'Benotz folgend Syntax fir dës Datei ze referenzéieren:';
+$lang['mediaview']             = 'Originaldatei weisen';
+$lang['mediaroot']             = 'root';
+$lang['mediaextchange']        = 'Dateiendung vun .%s op .%s g\'ännert!';
+$lang['reference']             = 'Referenzen fir';
+$lang['ref_inuse']             = 'D\'Datei ka net geläscht ginn wëll se nach ëmmer vu folgende Säite gebraucht gëtt:';
+$lang['ref_hidden']            = 'Verschidde Referenze sinn op Säiten wous de keng Rechter hues fir se ze kucken';
+$lang['hits']                  = 'Treffer';
+$lang['quickhits']             = 'Säitenimm déi iwwereneestëmmen';
+$lang['toc']                   = 'Inhaltsverzeechnes';
+$lang['current']               = 'aktuell';
+$lang['yours']                 = 'Deng Versioun';
+$lang['diff']                  = 'Weis d\'Ënnerscheeder zuer aktueller Versioun';
+$lang['diff2']                 = 'Weis d\'Ënnerscheeder zwescht den ausgewielte Versiounen';
+$lang['line']                  = 'Linn';
+$lang['breadcrumb']            = 'Spuer';
+$lang['youarehere']            = 'Du bass hei';
+$lang['lastmod']               = 'Fir d\'lescht g\'ännert';
+$lang['by']                    = 'vun';
+$lang['deleted']               = 'geläscht';
+$lang['created']               = 'erstallt';
+$lang['restored']              = 'al Versioun zeréckgeholl (%s)';
+$lang['external_edit']         = 'extern Ännerung';
+$lang['summary']               = 'Resumé vun den Ännerungen';
+$lang['noflash']               = 'Den Adobe Flash Plugin get gebraucht fir dësen Inhalt unzeweisen.';
+$lang['mail_newpage']          = 'Säit bäigesat:';
+$lang['mail_changed']          = 'Säit geännert:';
+$lang['mail_subscribe_list']   = 'g\'ännert Säiten am Namespace:';
+$lang['mail_new_user']         = 'Neie Benotzer:';
+$lang['mail_upload']           = 'Datei eropgelueden:';
+$lang['qb_bold']               = 'Fetten Text';
+$lang['qb_italic']             = 'Schiefen Text';
+$lang['qb_underl']             = 'Ënnerstrachenen Text';
+$lang['qb_code']               = 'Code Text';
+$lang['qb_strike']             = 'Duerchgestrachenen Text';
+$lang['qb_h1']                 = 'Iwwerschrëft vum 1. Niveau';
+$lang['qb_h2']                 = 'Iwwerschrëft vum 2. Niveau';
+$lang['qb_h3']                 = 'Iwwerschrëft vum 3. Niveau';
+$lang['qb_h4']                 = 'Iwwerschrëft vum 4. Niveau';
+$lang['qb_h5']                 = 'Iwwerschrëft vum 5. Niveau';
+$lang['qb_h']                  = 'Iwwerschrëft';
+$lang['qb_hs']                 = 'Iwwerschrëft auswielen';
+$lang['qb_hplus']              = 'Méi grouss Iwwerschrëft';
+$lang['qb_hminus']             = 'Méi kleng Iwwerschrëft';
+$lang['qb_hequal']             = 'Iwwerschrëft vum selwechte Niveau';
+$lang['qb_link']               = 'Interne Link';
+$lang['qb_extlink']            = 'Externe Link';
+$lang['qb_hr']                 = 'Horizontale Stréch';
+$lang['qb_ol']                 = 'Nummeréiert Lëscht';
+$lang['qb_ul']                 = 'Onnummeréiert Lëscht';
+$lang['qb_media']              = 'Biller an aner Dateie bäisetzen';
+$lang['qb_sig']                = 'Ënnerschrëft afügen';
+$lang['qb_smileys']            = 'Smilien';
+$lang['qb_chars']              = 'Spezialzeechen';
+$lang['upperns']               = 'An de Namespace uewendriwwer sprangen';
+$lang['admin_register']        = 'Neie Benotzer bäisetzen';
+$lang['metaedit']              = 'Metadaten änneren';
+$lang['metasaveerr']           = 'Feeler beim Schreiwe vun de Metadaten';
+$lang['metasaveok']            = 'Metadate gespäichert';
+$lang['img_backto']            = 'Zeréck op';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Beschreiwung';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Dateinumm';
+$lang['img_fsize']             = 'Gréisst';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Schlësselwieder';
+$lang['authtempfail']          = 'D\'Benotzerautentifikatioun ass de Moment net verfügbar. Wann dës Situatioun unhält, dann informéier w.e.g. de Wiki Admin.';
+$lang['i_chooselang']          = 'Wiel deng Sprooch';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Numm vum Wiki';
+$lang['i_enableacl']           = 'ACL uschalten (rekommandéiert)';
+$lang['i_problems']            = 'Den Installer huet Problemer fond. Se stinn hei ënnendrënner. Du kanns net weiderfueren bis de se behuewen hues.';
+$lang['i_modified']            = 'Aus Sécherheetsgrënn funktionnéiert dëse Script nëmme mat enger neier an onverännerter Dokuwiki Installatioun. Entweder muss de d\'Dateie frësch extrahéieren oder kuck d\'komplett Dokuwiki Installatiounsinstruktiounen';
+$lang['i_funcna']              = 'PHP-Funktioun %s ass net verfügbar. Vläicht huet däi Provider se aus iergend engem Grond ausgeschalt.';
+$lang['i_phpver']              = 'Deng PHP-Versioun %s ass méi kleng wéi déi gebrauchte Versioun %s. Du muss deng PHP-Installatioun aktualiséieren. ';
+$lang['i_pol0']                = 'Oppene Wiki (liese, schreiwen an eroplueden fir jidfereen)';
+$lang['i_pol1']                = 'Ëffentleche Wiki (liesen fir jidfereen, schreiwen an eroplueden fir registréiert Benotzer)';
+$lang['i_pol2']                = 'Zouene Wiki (liesen, schreiwen, eroplueden nëmme fir registréiert Benotzer)';
+$lang['i_retry']               = 'Nach eng Kéier probéieren';
+$lang['recent_global']         = 'Du kucks am Moment d\'Ännerungen innerhalb vum %s Namespace. Du kanns och d\'Kierzilech Ännerungen vum ganze Wiki kucken.';
+$lang['years']                 = 'virun %d Joer';
+$lang['months']                = 'virun %d Méint';
+$lang['weeks']                 = 'virun %d Wochen';
+$lang['days']                  = 'virun %d Deeg';
+$lang['hours']                 = 'virun %d Stonnen';
+$lang['minutes']               = 'virun %d Minutten';
+$lang['seconds']               = 'virun %d Sekonnen';
diff --git a/sources/inc/lang/lb/locked.txt b/sources/inc/lang/lb/locked.txt
new file mode 100644
index 0000000..944efb2
--- /dev/null
+++ b/sources/inc/lang/lb/locked.txt
@@ -0,0 +1,3 @@
+====== Säit gespaart ======
+
+Dës Säit ass am Moment duerch en anere Benotzer fir Ännerunge gespart. Du muss waarde bis e mat sengen Ännerunge fäerdeg ass oder d'Spär ofleeft.
\ No newline at end of file
diff --git a/sources/inc/lang/lb/login.txt b/sources/inc/lang/lb/login.txt
new file mode 100644
index 0000000..7d0548e
--- /dev/null
+++ b/sources/inc/lang/lb/login.txt
@@ -0,0 +1,3 @@
+====== Aloggen ======
+
+Du bass am Moment net ageloggt! Gëff deng Autoriséierungsinformatiounen hei ënnendrënner an. Du muss d'Cookien erlaabt hunn fir dech kënnen anzeloggen.
diff --git a/sources/inc/lang/lb/mailtext.txt b/sources/inc/lang/lb/mailtext.txt
new file mode 100644
index 0000000..520cd84
--- /dev/null
+++ b/sources/inc/lang/lb/mailtext.txt
@@ -0,0 +1,17 @@
+Et gouf eng Säit an dengem DokuWiki g'ännert oder nei erstallt. Hei sinn d'Detailer:
+
+Datum          : @DATE@
+Browser        : @BROWSER@
+IP-Address     : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Al Versioun    : @OLDPAGE@
+Nei Versioun   : @NEWPAGE@
+Zesummefaassung: @SUMMARY@
+Benotzer       : @USER@
+
+@DIFF@
+
+
+-- 
+Dës Mail gouf generéiert vum DokuWiki op
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/lb/newpage.txt b/sources/inc/lang/lb/newpage.txt
new file mode 100644
index 0000000..9391761
--- /dev/null
+++ b/sources/inc/lang/lb/newpage.txt
@@ -0,0 +1,4 @@
+======Dësen Thema gëtt et nach net======
+
+Du hues op e Link vun enger Säit geklickt, déi et nach net gëtt. Wanns de déi néideg Rechter hues, da kanns de dës Säit uleeën andeems de op ''Dës Säit uleeën'' klicks.
+
diff --git a/sources/inc/lang/lb/norev.txt b/sources/inc/lang/lb/norev.txt
new file mode 100644
index 0000000..45a36ee
--- /dev/null
+++ b/sources/inc/lang/lb/norev.txt
@@ -0,0 +1,3 @@
+====== Keng sou Versioun ======
+
+Déi Versioun gëtt et net. Benotz de Kneppchen ''Al Versiounen'' fir eng Lëscht vun ale Versiounen vun dësem Dokument.
diff --git a/sources/inc/lang/lb/password.txt b/sources/inc/lang/lb/password.txt
new file mode 100644
index 0000000..bd8062e
--- /dev/null
+++ b/sources/inc/lang/lb/password.txt
@@ -0,0 +1,10 @@
+Moien @FULLNAME@!
+
+Hei sinn deng Benotzerdaten fir @TITLE@ op @DOKUWIKIURL@
+
+Benotzernumm : @LOGIN@
+Passwuert    : @PASSWORD@
+
+-- 
+Dës Mail gouf generéiert vun DokuWiki op
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/lb/preview.txt b/sources/inc/lang/lb/preview.txt
new file mode 100644
index 0000000..f131cda
--- /dev/null
+++ b/sources/inc/lang/lb/preview.txt
@@ -0,0 +1,3 @@
+======Net gespäichert Versioun======
+
+Dëst ass nëmmen eng net gespäichert Versioun; d'Ännerunge sinn nach **net** gespäichert!
diff --git a/sources/inc/lang/lb/pwconfirm.txt b/sources/inc/lang/lb/pwconfirm.txt
new file mode 100644
index 0000000..1124657
--- /dev/null
+++ b/sources/inc/lang/lb/pwconfirm.txt
@@ -0,0 +1,15 @@
+Moien @FULLNAME@!
+
+Iergendeen huet e neit Passwuert fir däin @TITLE@ 
+login op @DOKUWIKIURL@ gefrot
+
+Wanns de kee nei Passwuert gefrot hues, dann ignoréier dës Mail.
+
+Fir ze konfirméieren dass du wierklech en neit Passwuert gefrot hues,
+klick op folgende Link.
+
+@CONFIRM@
+
+-- 
+Des Mail gouf generéiert vun DokuWiki op
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/lb/read.txt b/sources/inc/lang/lb/read.txt
new file mode 100644
index 0000000..3f52bd6
--- /dev/null
+++ b/sources/inc/lang/lb/read.txt
@@ -0,0 +1 @@
+Dës Säit ass nëmme fir ze kucken. Du kanns d'Quell kucken, mee net änneren. Fro däin Administrator wanns de mengs dat wier falsch.
diff --git a/sources/inc/lang/lb/recent.txt b/sources/inc/lang/lb/recent.txt
new file mode 100644
index 0000000..c7359e2
--- /dev/null
+++ b/sources/inc/lang/lb/recent.txt
@@ -0,0 +1,4 @@
+====== Rezent Ännerungen ======
+
+Folgend Säite goufen an der lescht g'ännert.
+
diff --git a/sources/inc/lang/lb/register.txt b/sources/inc/lang/lb/register.txt
new file mode 100644
index 0000000..1e017e9
--- /dev/null
+++ b/sources/inc/lang/lb/register.txt
@@ -0,0 +1,4 @@
+====== Als neie Benotzer registréieren ======
+
+Fëll alles hei ënnendrënner aus fir en neie Kont op dësem Wiki unzeleeën. Pass op dass de eng **gëlteg Emailadress** ugëss - wanns de net gefrot gëss hei e Passwuert anzeginn, da kriss de e neit op déi Adress geschéckt. De Benotzernumm soll e gëltege [[doku>pagename|Säitenumm]] sinn.
+
diff --git a/sources/inc/lang/lb/registermail.txt b/sources/inc/lang/lb/registermail.txt
new file mode 100644
index 0000000..0f4fee8
--- /dev/null
+++ b/sources/inc/lang/lb/registermail.txt
@@ -0,0 +1,14 @@
+Et huet sech e neie Benotzer registréiert. Hei sinn d'Deteiler:
+
+Benotzernumm: @NEWUSER@
+Ganze Numm  : @NEWNAME@
+Email       : @NEWEMAIL@
+
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adress   : @IPADDRESS@
+Hostnumm    : @HOSTNAME@
+
+-- 
+Des Mail gouf generéiert vun DokuWiki op
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/lb/resendpwd.txt b/sources/inc/lang/lb/resendpwd.txt
new file mode 100644
index 0000000..6ca4518
--- /dev/null
+++ b/sources/inc/lang/lb/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Nei Passwuert schécken ======
+
+Gëff w.e.g. däi Benotzernumm an de Formulär hei ënnendrënner an fir e neit Passwuert fir dëse Wiki unzefroen. E Konfirmatiounslink gëtt dann op deng registréiert Emailadress geschéckt.
diff --git a/sources/inc/lang/lb/revisions.txt b/sources/inc/lang/lb/revisions.txt
new file mode 100644
index 0000000..7dec327
--- /dev/null
+++ b/sources/inc/lang/lb/revisions.txt
@@ -0,0 +1,3 @@
+====== Al Versiounen ======
+
+Hei sinn déi al Versiounen vun dësem Dokument. Fir op eng al Versioun zeréckzegoen, wiel se hei ënnendrënner eraus, klick ''Dës Säit änneren'' a späicher se.
diff --git a/sources/inc/lang/lb/searchpage.txt b/sources/inc/lang/lb/searchpage.txt
new file mode 100644
index 0000000..5e15a2c
--- /dev/null
+++ b/sources/inc/lang/lb/searchpage.txt
@@ -0,0 +1,5 @@
+======Sich======
+
+Hei ënnendrënner sinn d'Resultater vun der Sich. Wanns de net fënns wats de gesicht hues kanns de eng nei Säit mam Numm vun denger Sich uleeën.
+
+=====Resultater=====
\ No newline at end of file
diff --git a/sources/inc/lang/lb/showrev.txt b/sources/inc/lang/lb/showrev.txt
new file mode 100644
index 0000000..f6e2dee
--- /dev/null
+++ b/sources/inc/lang/lb/showrev.txt
@@ -0,0 +1,2 @@
+**Dat hei ass eng al Versioun vum Document!**
+----
\ No newline at end of file
diff --git a/sources/inc/lang/lb/updateprofile.txt b/sources/inc/lang/lb/updateprofile.txt
new file mode 100644
index 0000000..326d622
--- /dev/null
+++ b/sources/inc/lang/lb/updateprofile.txt
@@ -0,0 +1,4 @@
+====== Profil aktualiséieren ======
+
+Du brauchs just d'Felder auszefëllen déis de wëlls änneren. Du kanns däi Benotzernumm net änneren.
+
diff --git a/sources/inc/lang/lb/uploadmail.txt b/sources/inc/lang/lb/uploadmail.txt
new file mode 100644
index 0000000..3c2587c
--- /dev/null
+++ b/sources/inc/lang/lb/uploadmail.txt
@@ -0,0 +1,14 @@
+Eng Datei gouf op däin DokuWiki eropgelueden. Hei sinn d'Deteiler:
+
+Datei       : @MEDIA@
+Datum       : @DATE@
+Browser     : @BROWSER@
+IP-Adress   : @IPADDRESS@
+Hostnumm    : @HOSTNAME@
+Gréisst     : @SIZE@
+MIME Typ    : @MIME@
+Benotzer    : @USER@
+
+-- 
+Dës Mail gouf generéiert vun DokuWiki op
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/lt/admin.txt b/sources/inc/lang/lt/admin.txt
new file mode 100644
index 0000000..fd9ae9a
--- /dev/null
+++ b/sources/inc/lang/lt/admin.txt
@@ -0,0 +1,4 @@
+====== Administracija ======
+
+Žemiau matote veiksmų, kuriuos gali atlikti administratorius, sąrašą.
+
diff --git a/sources/inc/lang/lt/backlinks.txt b/sources/inc/lang/lt/backlinks.txt
new file mode 100644
index 0000000..ad0d5b8
--- /dev/null
+++ b/sources/inc/lang/lt/backlinks.txt
@@ -0,0 +1,4 @@
+====== Atgalinės nuorodos ======
+
+Čia matote sąrašą puslapių, kuriuose yra nuorodos į esamą puslapį.
+
diff --git a/sources/inc/lang/lt/conflict.txt b/sources/inc/lang/lt/conflict.txt
new file mode 100644
index 0000000..be0c5ff
--- /dev/null
+++ b/sources/inc/lang/lt/conflict.txt
@@ -0,0 +1,6 @@
+====== Egzistuoja naujesnė versija ======
+
+Rasta naujesnė dokumento, kurį redagavote, versija. Tai atsitinka tada, kai kitas vartotojas modifikuoja dokumentą tuo metu, kai jūs jį redaguojate.
+
+Atidžiai peržvelkite žemiau esančius skirtumus ir nuspręskite, kurią versiją išsaugoti. Paspausdami ''Išsaugoti'' išsaugosite saviškę versiją. Paspausdami ''Atšaukti'' išsaugosite esamą versiją.
+
diff --git a/sources/inc/lang/lt/denied.txt b/sources/inc/lang/lt/denied.txt
new file mode 100644
index 0000000..c25fb5f
--- /dev/null
+++ b/sources/inc/lang/lt/denied.txt
@@ -0,0 +1,4 @@
+====== Priėjimas uždraustas ======
+
+Jūs neturite reikiamų teisių, kad galėtumėte tęsti. Turbūt pamiršote prisijungti :-).
+
diff --git a/sources/inc/lang/lt/diff.txt b/sources/inc/lang/lt/diff.txt
new file mode 100644
index 0000000..dc5e59f
--- /dev/null
+++ b/sources/inc/lang/lt/diff.txt
@@ -0,0 +1,4 @@
+====== Skirtumai ======
+
+Čia matote skirtumus tarp pasirinktos versijos ir esamo dokumento.
+
diff --git a/sources/inc/lang/lt/edit.txt b/sources/inc/lang/lt/edit.txt
new file mode 100644
index 0000000..8fadf97
--- /dev/null
+++ b/sources/inc/lang/lt/edit.txt
@@ -0,0 +1,2 @@
+Modifikuokite šį puslapį ir paspauskite ''Išsaugoti''. Apie wiki sintaksę galite paskaityti [[wiki:syntax|čia]]. Prašome redaguoti šį puslapį tik tada, kai galite jį **patobulinti**. Jei tik norite išbandyti wiki galimybes, prašytume tai daryti [[playground:playground|čia]].
+
diff --git a/sources/inc/lang/lt/editrev.txt b/sources/inc/lang/lt/editrev.txt
new file mode 100644
index 0000000..9e5eaee
--- /dev/null
+++ b/sources/inc/lang/lt/editrev.txt
@@ -0,0 +1,2 @@
+**Jūs naudojate seną šio dokumento versiją!** jei ją išsaugosite, su šiais duomenimis sukursite naują versiją.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/lt/index.txt b/sources/inc/lang/lt/index.txt
new file mode 100644
index 0000000..d13683c
--- /dev/null
+++ b/sources/inc/lang/lt/index.txt
@@ -0,0 +1,4 @@
+====== Indeksas ======
+
+Čia matote visų šiuo metu egzistuojančių puslapių sąrašą. Jie išrūšiuoti pagal [[doku>namespaces|pavadinimą]].
+
diff --git a/sources/inc/lang/lt/lang.php b/sources/inc/lang/lt/lang.php
new file mode 100644
index 0000000..c38ea88
--- /dev/null
+++ b/sources/inc/lang/lt/lang.php
@@ -0,0 +1,183 @@
+
+ * @author Edmondas Girkantas 
+ * @author Arūnas Vaitekūnas 
+ * @author audrius.klevas@gmail.com
+ */
+$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_profile']           = 'Atnaujinti profilį';
+$lang['btn_reset']             = 'Atstata';
+$lang['btn_draft']             = 'Redaguoti juodraštį';
+$lang['btn_recover']           = 'Atkurti juodraštį';
+$lang['btn_draftdel']          = 'Šalinti juodraštį';
+$lang['btn_register']          = 'Registruotis';
+$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['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['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['js']['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['js']['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['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 (%s)';
+$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['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.';
diff --git a/sources/inc/lang/lt/locked.txt b/sources/inc/lang/lt/locked.txt
new file mode 100644
index 0000000..3f6d000
--- /dev/null
+++ b/sources/inc/lang/lt/locked.txt
@@ -0,0 +1,3 @@
+====== Puslapis užrakintas ======
+
+Šis puslapis yra apsaugotas (užrakintas) nuo kitų vartotojų pakeitimų. Norėdami redaguoti puslapį, turėsite palaukti, kol kitas vartotojas baigs tai daryti arba „užrakto“ galiojimo laikas pasibaigs.
diff --git a/sources/inc/lang/lt/login.txt b/sources/inc/lang/lt/login.txt
new file mode 100644
index 0000000..2a6e21d
--- /dev/null
+++ b/sources/inc/lang/lt/login.txt
@@ -0,0 +1,5 @@
+====== Prisijungimas ======
+
+Šiuo metu jūs nesate prisijungęs. Įveskite savo prisijungimo duomenis žemiau. „Cookies“ palaikymas jūsų naršyklėje turi būti įjungtas.
+
+
diff --git a/sources/inc/lang/lt/mailtext.txt b/sources/inc/lang/lt/mailtext.txt
new file mode 100644
index 0000000..63b2f59
--- /dev/null
+++ b/sources/inc/lang/lt/mailtext.txt
@@ -0,0 +1,18 @@
+Jūsų DokuWiki buvo sukurtas arba pakeistas puslapis. Detalės:
+
+Data        : @DATE@
+Naršyklė     : @BROWSER@
+IP adresas  : @IPADDRESS@
+Host'as    : @HOSTNAME@
+Sena versija: @OLDPAGE@
+Nauja versija: @NEWPAGE@
+Redagavimo aprašas: @SUMMARY@
+Vartotojas        : @USER@
+
+Pakeitimo diff'as:
+
+@DIFF@
+
+
+-- 
+Šis laiškas buvo sugeneruotas DokuWiki (@DOKUWIKIURL@).
diff --git a/sources/inc/lang/lt/newpage.txt b/sources/inc/lang/lt/newpage.txt
new file mode 100644
index 0000000..c28e30b
--- /dev/null
+++ b/sources/inc/lang/lt/newpage.txt
@@ -0,0 +1,4 @@
+====== Šis puslapis dar neegzistuoja ======
+
+Nuoroda, kurią jūs paspaudėte, atvedė į dar neegzistuojantį puslapį. Jūs galite jį sukurti paspausdami ''Sukurti šį puslapį'' mygtuką.
+
diff --git a/sources/inc/lang/lt/norev.txt b/sources/inc/lang/lt/norev.txt
new file mode 100644
index 0000000..028ebe7
--- /dev/null
+++ b/sources/inc/lang/lt/norev.txt
@@ -0,0 +1,5 @@
+====== Tokios versijos nėra ======
+
+Nurodyta versija neegzistuoja. Norėdami pamatyti visas dokumento versijas, paspauskite ''Senos versijos'' mygtuką
+
+
diff --git a/sources/inc/lang/lt/password.txt b/sources/inc/lang/lt/password.txt
new file mode 100644
index 0000000..8c65cf8
--- /dev/null
+++ b/sources/inc/lang/lt/password.txt
@@ -0,0 +1,9 @@
+Labas, @FULLNAME@!
+
+Čia yra jūsų prisijungimo duomenys prie tinklalapio @TITLE@ (@DOKUWIKIURL@):
+
+Prisijungimo vardas:  @LOGIN@
+Slaptažodis:          @PASSWORD@
+
+-- 
+Šis laiškas sugeneruotas DokuWiki sistemos (@DOKUWIKIURL@).
diff --git a/sources/inc/lang/lt/preview.txt b/sources/inc/lang/lt/preview.txt
new file mode 100644
index 0000000..2d24e21
--- /dev/null
+++ b/sources/inc/lang/lt/preview.txt
@@ -0,0 +1,5 @@
+====== Peržiūra ======
+
+Čia matote, kaip atrodo jūsų pakeitimai. **Pakeitimai dar nėra išsaugoti!**
+
+
diff --git a/sources/inc/lang/lt/read.txt b/sources/inc/lang/lt/read.txt
new file mode 100644
index 0000000..91ea7e6
--- /dev/null
+++ b/sources/inc/lang/lt/read.txt
@@ -0,0 +1,3 @@
+Šį puslapį galima tik skaityti. Jūs galite peržvelgti jo kodą (source), bet negalite jo keisti. Jei manote, kad tai klaida - susisiekite su administratoriumi.
+
+
diff --git a/sources/inc/lang/lt/recent.txt b/sources/inc/lang/lt/recent.txt
new file mode 100644
index 0000000..5065386
--- /dev/null
+++ b/sources/inc/lang/lt/recent.txt
@@ -0,0 +1,5 @@
+====== Naujausi keitimai ======
+
+Šie puslapiai buvo neseniai pakeisti.
+
+
diff --git a/sources/inc/lang/lt/register.txt b/sources/inc/lang/lt/register.txt
new file mode 100644
index 0000000..f595826
--- /dev/null
+++ b/sources/inc/lang/lt/register.txt
@@ -0,0 +1,4 @@
+====== Naujo vartotojo registracija ======
+
+Norėdami tapti nauju registruotu šio tinklalapio vartotoju, užpildykite žemiau esančią formą. Būtinai turite nurodyti **veikiantį el. pašto adresą**, nes jūsų slaptažodis bus išsiųstas pastaruoju adresu. Prisijungimo vardas turėtų būti sukurtas pagal [[doku>pagename|puslapio pavadinimo]] taisykles.
+
diff --git a/sources/inc/lang/lt/resendpwd.txt b/sources/inc/lang/lt/resendpwd.txt
new file mode 100644
index 0000000..7538271
--- /dev/null
+++ b/sources/inc/lang/lt/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Siųsti naują slaptažodį ======
+
+Naujo slaptažodžio gavimui, užpildykite visus žemiau esančius laukus. Naujas slaptažodis bus atsiųstas į jūsų užregistruotą el. pašto adresą. Vartotojo vardas turi būti toks pat kaip ir wiki sistemoje.
diff --git a/sources/inc/lang/lt/revisions.txt b/sources/inc/lang/lt/revisions.txt
new file mode 100644
index 0000000..9999767
--- /dev/null
+++ b/sources/inc/lang/lt/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/lt/searchpage.txt b/sources/inc/lang/lt/searchpage.txt
new file mode 100644
index 0000000..a83a6a5
--- /dev/null
+++ b/sources/inc/lang/lt/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
\ No newline at end of file
diff --git a/sources/inc/lang/lt/showrev.txt b/sources/inc/lang/lt/showrev.txt
new file mode 100644
index 0000000..ed77424
--- /dev/null
+++ b/sources/inc/lang/lt/showrev.txt
@@ -0,0 +1,2 @@
+**Čia yra sena dokumento versija!**
+----
diff --git a/sources/inc/lang/lt/updateprofile.txt b/sources/inc/lang/lt/updateprofile.txt
new file mode 100644
index 0000000..7ede1a0
--- /dev/null
+++ b/sources/inc/lang/lt/updateprofile.txt
@@ -0,0 +1,4 @@
+====== Redaguoti savo profilį ======
+
+Užpildykite tik tuos laukus, kuriuos norite pakeisti. Vartotojo vardo keisti nebūtina.
+
diff --git a/sources/inc/lang/lv/admin.txt b/sources/inc/lang/lv/admin.txt
new file mode 100644
index 0000000..3b37fa3
--- /dev/null
+++ b/sources/inc/lang/lv/admin.txt
@@ -0,0 +1,6 @@
+====== Administrēšana ======
+
+DokuWiki pieejamas šādas administrēšanas iespējas:
+
+
+
diff --git a/sources/inc/lang/lv/adminplugins.txt b/sources/inc/lang/lv/adminplugins.txt
new file mode 100644
index 0000000..e8d208d
--- /dev/null
+++ b/sources/inc/lang/lv/adminplugins.txt
@@ -0,0 +1 @@
+===== Papildu moduļi =====
\ No newline at end of file
diff --git a/sources/inc/lang/lv/backlinks.txt b/sources/inc/lang/lv/backlinks.txt
new file mode 100644
index 0000000..19bebf7
--- /dev/null
+++ b/sources/inc/lang/lv/backlinks.txt
@@ -0,0 +1,5 @@
+====== Saistītās lapas ======
+
+Norāde uz šo lapu ir atrodama dokumentos:
+
+
diff --git a/sources/inc/lang/lv/conflict.txt b/sources/inc/lang/lv/conflict.txt
new file mode 100644
index 0000000..5aa6442
--- /dev/null
+++ b/sources/inc/lang/lv/conflict.txt
@@ -0,0 +1,8 @@
+====== Ir jaunāka versija ======
+
+Tevis labotajam dokumentam jau ir jaunāka versija. Tā gadās, ja cits lietotājs tavas labošanas laikā ir paguvis veikt savus labojumus.
+
+Rūpīgi pārlūko šeit parādītās atšķirības un tad izlem, kuru variantu paturēt. Ja nospiedīsi  ''Saglabāt'', saglabāsies tavs teksts. Ja nospiedīsi ''Atlikt'' paliks pašreizējais variants.
+
+
+
diff --git a/sources/inc/lang/lv/denied.txt b/sources/inc/lang/lv/denied.txt
new file mode 100644
index 0000000..c7df462
--- /dev/null
+++ b/sources/inc/lang/lv/denied.txt
@@ -0,0 +1,6 @@
+====== Piekļuve aizliegta ======
+
+Atvaino, tev nav tiesību turpināt. Varbūt aizmirsi ielogoties?
+
+
+
diff --git a/sources/inc/lang/lv/diff.txt b/sources/inc/lang/lv/diff.txt
new file mode 100644
index 0000000..40e1b54
--- /dev/null
+++ b/sources/inc/lang/lv/diff.txt
@@ -0,0 +1,7 @@
+====== Atšķirības ======
+
+Norādītais vecais variants no patreizējās lapas atšķiras ar:
+
+
+
+
diff --git a/sources/inc/lang/lv/draft.txt b/sources/inc/lang/lv/draft.txt
new file mode 100644
index 0000000..525f7cb
--- /dev/null
+++ b/sources/inc/lang/lv/draft.txt
@@ -0,0 +1,5 @@
+====== Atrasts melnraksta fails ======
+
+Iepriekšējā šīs lapas labošana nav pabeigta. DokuWiki darba laikā automātiski saglabāja melnrakstu, kuru tagad var labot tālāk. Zemāk redzami iepriekšējās labošanas dati.
+
+Nolem, vai vajag //atjaunot// zudušos labojumus, //dzēst// saglabāto melnrakstu vai //atlikt// labošanu.
diff --git a/sources/inc/lang/lv/edit.txt b/sources/inc/lang/lv/edit.txt
new file mode 100644
index 0000000..9da6f2d
--- /dev/null
+++ b/sources/inc/lang/lv/edit.txt
@@ -0,0 +1,2 @@
+Labo lapu un uzklikšķini uz ''Saglabāt''. Par lietojamo sintaksi skaties rakstu  [[wiki:syntax]]. Lūdzu labo tika tad, ja vari lapu **uzlabot**. Ja gribi tikai kaut ko izmēģināt, izmanto [[wiki:playground|smilšukasti]].
+
diff --git a/sources/inc/lang/lv/editrev.txt b/sources/inc/lang/lv/editrev.txt
new file mode 100644
index 0000000..6fa7a4c
--- /dev/null
+++ b/sources/inc/lang/lv/editrev.txt
@@ -0,0 +1 @@
+---- **Tu skaties vecu dokumenta versiju!** Ja to saglabāsi, tad izveidosies jauns dokuments ar šo veco saturu. ----
diff --git a/sources/inc/lang/lv/index.txt b/sources/inc/lang/lv/index.txt
new file mode 100644
index 0000000..6baa2a3
--- /dev/null
+++ b/sources/inc/lang/lv/index.txt
@@ -0,0 +1,4 @@
+====== Rādītājs ======
+
+Visu pieejamo lapu rādītājs. Sakārtots pēc [[doku>namespaces|sadaļām]].
+
diff --git a/sources/inc/lang/lv/install.html b/sources/inc/lang/lv/install.html
new file mode 100644
index 0000000..26dd8d7
--- /dev/null
+++ b/sources/inc/lang/lv/install.html
@@ -0,0 +1,12 @@
+
        Šī lapa palīdz Dokuwikipirmajā instalācijā un konfigurēšanā.
+Vairāk par instalatoru var lasīt tā
+documentācijas lapā.
        
+
+
        DokuWiki lapu un ar to saistīto datu (piem.: attēlu, meklēšanas indeksu, veco versiju utt.) glabāšanai lieto parastus failus.  Lai Dokuwiki veiksmīgi darbotos vajag rakstīšanas tiesības direktorijās, kur šie faili glabājas. Instalators tiesības nomainīt nespēj. Tas parasti jums jāizdara komandrindā vai ar FTP vadības paneli (piem. cPanel).
        
+
+
        Instalators konfigurēs DokuWiki ACL lietošanai, kas ļauj administratoram ielogoties un piekļūt DokuWiki administrēšanas izvēlnei, lai instalētu moduļus, pārvaldītu lietotājus, notiektu piekļuves tiesības Wiki lapām un mainītu DokuWiki konfigurāciju.
+Tas nav vajadzīgs, lai DokuWiki darbotos, bet ar to var vieglāk administrēt.
        
+
+
        Pieredzējušiem lietotājiem ar īpašām prasībām  jāmeklē sīkākas ziņas
+uzstādīšanas instrukcijā
+un konfigurēšanas padomos.
        
\ No newline at end of file
diff --git a/sources/inc/lang/lv/lang.php b/sources/inc/lang/lv/lang.php
new file mode 100644
index 0000000..898125d
--- /dev/null
+++ b/sources/inc/lang/lv/lang.php
@@ -0,0 +1,320 @@
+
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Labot lapu';
+$lang['btn_source']            = 'Parādīt lapas kodu';
+$lang['btn_show']              = 'Parādīt lapu';
+$lang['btn_create']            = 'Izveidot lapu';
+$lang['btn_search']            = 'Meklēt';
+$lang['btn_save']              = 'Saglabāt';
+$lang['btn_preview']           = 'Priekšskats';
+$lang['btn_top']               = 'Atpakaļ uz sākumu';
+$lang['btn_newer']             = '<< jaunāki';
+$lang['btn_older']             = 'vecāki >>';
+$lang['btn_revs']              = 'Vecās versijas';
+$lang['btn_recent']            = 'Jaunākie grozījumi';
+$lang['btn_upload']            = 'Augšupielādēt';
+$lang['btn_cancel']            = 'Atlikt';
+$lang['btn_index']             = 'Rādītājs';
+$lang['btn_secedit']           = 'Labot';
+$lang['btn_login']             = 'Ieiet';
+$lang['btn_logout']            = 'Iziet';
+$lang['btn_admin']             = 'Administrēt';
+$lang['btn_update']            = 'Atjaunot';
+$lang['btn_delete']            = 'Dzēst';
+$lang['btn_back']              = 'Atpakaļ';
+$lang['btn_backlink']          = 'Norādes uz lapu';
+$lang['btn_backtomedia']       = 'Atpakaļ uz mēdiju failu izvēli';
+$lang['btn_subscribe']         = 'Abonēt izmaiņu paziņojumus';
+$lang['btn_profile']           = 'Labot savu profilu';
+$lang['btn_reset']             = 'Atsaukt izmaiņas';
+$lang['btn_resendpwd']         = 'Uzstādīt jaunu paroli';
+$lang['btn_draft']             = 'Labot melnrakstu';
+$lang['btn_recover']           = 'Atjaunot melnrakstu';
+$lang['btn_draftdel']          = 'Dzēst melnrakstu';
+$lang['btn_revert']            = 'Atjaunot';
+$lang['btn_register']          = 'Reģistrēties';
+$lang['btn_apply']             = 'Labi';
+$lang['btn_media']             = 'Mēdiju pārvaldnieks';
+$lang['loggedinas']            = 'Pieteicies kā';
+$lang['user']                  = 'Lietotājvārds';
+$lang['pass']                  = 'Parole';
+$lang['newpass']               = 'Jaunā parole';
+$lang['oldpass']               = 'Atkārto patreizējo paroli';
+$lang['passchk']               = 'vēlreiz';
+$lang['remember']              = 'Atceries mani';
+$lang['fullname']              = 'Pilns vārds';
+$lang['email']                 = 'E-pasts';
+$lang['profile']               = 'Lietotāja vārds';
+$lang['badlogin']              = 'Atvaino, lietotājvārds vai parole aplama.';
+$lang['minoredit']             = 'Sīki labojumi';
+$lang['draftdate']             = 'Melnraksts automātiski saglabāts';
+$lang['nosecedit']             = 'Lapa pa šo laiku ir mainījusies, sekcijas informācija novecojusi. Ielādēta lapas  pilnās versija.';
+$lang['regmissing']            = 'Atvaino, jāaizpilda visas ailes.';
+$lang['reguexists']            = 'Atvaino, tāds lietotājs jau ir.';
+$lang['regsuccess']            = 'Lietotājs izveidots. Parole nosūtīta pa pastu.';
+$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ūdzu atkārto.';
+$lang['regpwmail']             = 'Tava DokuWiki parole';
+$lang['reghere']               = 'Tev vēl nav sava konta? Izveido!';
+$lang['profna']                = 'Labot profilu nav iespējams';
+$lang['profnochange']          = 'Izmaiņu nav. Nav, ko darīt.';
+$lang['profnoempty']           = 'Bez vārda vai e-pasta adreses nevar.';
+$lang['profchanged']           = 'Profils veiksmīgi izlabots.';
+$lang['pwdforget']             = 'Aizmirsi paroli? Saņem jaunu';
+$lang['resendna']              = 'Paroļu izsūtīšanu nepiedāvāju.';
+$lang['resendpwd']             = 'Uzstādīt jaunu paroli lietotājam';
+$lang['resendpwdmissing']      = 'Atvaino, jāizpilda visas ailes.';
+$lang['resendpwdnouser']       = 'Atvaino, tāda lietotāja nav.';
+$lang['resendpwdbadauth']      = 'Atvaino, šis autorizācijas kods nav derīgs. Pārliecinies, ka lietoji pilnu apstiprināšanas adresi.';
+$lang['resendpwdconfirm']      = 'Apstiprināšanas adrese nosūtīta pa epastu.';
+$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 vikivārdu (nav obligāts)';
+$lang['txt_overwrt']           = 'Aizstāt esošo failu';
+$lang['maxuploadsize']         = 'Augšuplādējamā faila ierobežojums: %s.';
+$lang['lockedby']              = 'Patlaban bloķējis ';
+$lang['lockexpire']            = 'Bloķējums beigsies ';
+$lang['js']['willexpire']      = 'Tavs bloķējums uz šo lapu pēc minūtes beigsies.\nLai izvairītos no konflikta, nospied Iepriekšapskata pogu\n un bloķējuma laiku sāks skaitīt no jauna.';
+$lang['js']['notsavedyet']     = 'Veiktas bet nav saglabātas izmaiņas.
+Vai tiešām tās nevajag?';
+$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']['mediatitle']      = 'Saites īpašības';
+$lang['js']['mediadisplay']    = 'Saites tips';
+$lang['js']['mediaalign']      = 'Slēgums';
+$lang['js']['mediasize']       = 'Attēla izmērs';
+$lang['js']['mediatarget']     = 'Saite ved uz ';
+$lang['js']['mediaclose']      = 'Aizvērt';
+$lang['js']['mediainsert']     = 'Ievietot';
+$lang['js']['mediadisplayimg'] = 'Rādīt attēlu';
+$lang['js']['mediadisplaylnk'] = 'Rādīt tikai saiti';
+$lang['js']['mediasmall']      = 'Mazs';
+$lang['js']['mediamedium']     = 'Vidējs';
+$lang['js']['medialarge']      = 'Liels';
+$lang['js']['mediaoriginal']   = 'Oriģināls';
+$lang['js']['medialnk']        = 'Saite uz detaļām';
+$lang['js']['mediadirect']     = 'Tieša saite uz oriģinālu';
+$lang['js']['medianolnk']      = 'Bez saites';
+$lang['js']['medianolink']     = 'Bez saites uz attēlu';
+$lang['js']['medialeft']       = 'kreisais';
+$lang['js']['mediaright']      = 'labais';
+$lang['js']['mediacenter']     = 'centra';
+$lang['js']['medianoalign']    = 'neizlīdzināt';
+$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']['restore_confirm'] = 'Tiešām atjaunot šo versiju';
+$lang['js']['media_diff']      = 'Skatīt atšķirību';
+$lang['js']['media_diff_both'] = 'Blakus';
+$lang['js']['media_diff_opacity'] = 'Pārklāti';
+$lang['js']['media_diff_portions'] = 'Pa daļām';
+$lang['js']['media_select']    = 'Norādīt failus...';
+$lang['js']['media_upload_btn'] = 'Augšuplādēt';
+$lang['js']['media_done_btn']  = 'Gatavs';
+$lang['js']['media_drop']      = 'Nomet te augšuplādējamos failus';
+$lang['js']['media_cancel']    = 'atlikt';
+$lang['js']['media_overwrt']   = 'Rakstīt pāri esošajiem failiem';
+$lang['rssfailed']             = 'Kļūda saņemot saturu no ';
+$lang['nothingfound']          = 'Nekas nav atrasts.';
+$lang['mediaselect']           = 'Mēdiju faila izvēle';
+$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 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.';
+$lang['uploadxss']             = 'Augšupielāde bloķēta iespējama slikta satura dēļ.';
+$lang['uploadsize']            = 'Augšup lādētais fails pārāk liels. Maksimums ir  %s.';
+$lang['deletesucc']            = 'Fails "%s" dzēsts.';
+$lang['deletefail']            = 'Nevar dzēst "%s". Pārbaudi tiesības.';
+$lang['mediainuse']            = 'Fails "%s" nav izdzēsts, to lieto.';
+$lang['namespaces']            = 'Nodaļas';
+$lang['mediafiles']            = 'Pieejamie faili';
+$lang['accessdenied']          = 'Šo lapu nav atļauts skatīt.';
+$lang['mediausage']            = 'Atsaucei uz failu lietot šādu sintaksi:';
+$lang['mediaview']             = 'Skatīt oriģinālo failu';
+$lang['mediaroot']             = 'sakne';
+$lang['mediaupload']           = 'Augšupielādēt failu patreizējā nodaļā. Lai izveidotu apakšnodaļu, pieraksti to, atdalot ar kolu, pirms augšupielādējamā faila vārda.';
+$lang['mediaextchange']        = 'Faila paplašinājums mainīts no .%s uz .%s!';
+$lang['reference']             = 'Norādes uz failu';
+$lang['ref_inuse']             = 'Failu nevar dzēst, jo izmanto šādas lapas:';
+$lang['ref_hidden']            = 'Dažas norādes ir lapās, ko nav tiesību skatīt';
+$lang['hits']                  = 'Apmeklējumi';
+$lang['quickhits']             = 'Atbilstošās lapas';
+$lang['toc']                   = 'Satura rādītājs';
+$lang['current']               = 'patlaban';
+$lang['yours']                 = 'Tava versija';
+$lang['diff']                  = 'atšķirības no patreizējas versijas';
+$lang['diff2']                 = 'norādīto versiju atšķirības';
+$lang['difflink']              = 'Saite uz salīdzināšanas skatu.';
+$lang['diff_type']             = 'Skatīt atšķirības:';
+$lang['diff_inline']           = 'Iekļauti';
+$lang['diff_side']             = 'Blakus';
+$lang['line']                  = 'Rinda';
+$lang['breadcrumb']            = 'Apmeklēts';
+$lang['youarehere']            = 'Tu atrodies šeit';
+$lang['lastmod']               = 'Labota';
+$lang['by']                    = ', labojis';
+$lang['deleted']               = 'dzēsts';
+$lang['created']               = 'izveidots';
+$lang['restored']              = 'vecā versija atjaunota (%s)';
+$lang['external_edit']         = 'ārpussistēmas labojums';
+$lang['summary']               = 'Anotācija';
+$lang['noflash']               = 'Lai attēlotu lapas saturu, vajag Adobe Flash Plugin.';
+$lang['download']              = 'Lejuplādēt «kodiņu»((snippet))';
+$lang['tools']                 = 'Rīki';
+$lang['user_tools']            = 'Lietotāja rīki';
+$lang['site_tools']            = 'Vietnes rīki';
+$lang['page_tools']            = 'Lapas rīki';
+$lang['skip_to_content']       = 'uz rakstu';
+$lang['sidebar']               = 'Izvēlne';
+$lang['mail_newpage']          = 'lapa pievienota:';
+$lang['mail_changed']          = 'lapa mainīta:';
+$lang['mail_subscribe_list']   = 'Nodaļā mainītās lapas:';
+$lang['mail_new_user']         = 'Jauns lietotājs:';
+$lang['mail_upload']           = 'augšupielādētais fails:';
+$lang['changes_type']          = 'Skatīt izmaiņas';
+$lang['pages_changes']         = 'Lapās';
+$lang['media_changes']         = 'Mēdiju failos';
+$lang['both_changes']          = 'Gan lapās, gan mēdiju failos';
+$lang['qb_bold']               = 'Trekninājums';
+$lang['qb_italic']             = 'Kursīvs';
+$lang['qb_underl']             = 'Pasvītrojums';
+$lang['qb_code']               = 'Vienplatuma burti';
+$lang['qb_strike']             = 'Pārsvītrots teksts';
+$lang['qb_h1']                 = '1. līmeņa virsraksts';
+$lang['qb_h2']                 = '2. līmeņa virsraksts';
+$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';
+$lang['qb_ol']                 = 'Numurēts saraksts';
+$lang['qb_ul']                 = 'Nenumurēts saraksts';
+$lang['qb_media']              = 'Pielikt attēlus un citus failus.';
+$lang['qb_sig']                = 'Ievietot parakstu';
+$lang['qb_smileys']            = 'Emotikoni';
+$lang['qb_chars']              = 'Īpašās zīmes';
+$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';
+$lang['metasaveok']            = 'Metadati saglabāti';
+$lang['img_backto']            = 'Atpakaļ uz';
+$lang['img_title']             = 'Virsraksts';
+$lang['img_caption']           = 'Apraksts';
+$lang['img_date']              = 'Datums';
+$lang['img_fname']             = 'Faila vārds';
+$lang['img_fsize']             = 'Izmērs';
+$lang['img_artist']            = 'Fotogrāfs';
+$lang['img_copyr']             = 'Autortiesības';
+$lang['img_format']            = 'Formāts';
+$lang['img_camera']            = 'Fotoaparāts';
+$lang['img_keywords']          = 'Atslēgvārdi';
+$lang['img_width']             = 'Platums';
+$lang['img_height']            = 'Augstums';
+$lang['img_manager']           = 'Skatīt mēdiju pārvaldniekā';
+$lang['subscr_subscribe_success'] = '%s pievienots %s abonēšanas sarakstam';
+$lang['subscr_subscribe_error'] = 'Kļūme pievienojot %s %s abonēšanas sarakstam.';
+$lang['subscr_subscribe_noaddress'] = 'Nav zināma jūsu e-pasta adrese, tāpēc nevarat abonēt.';
+$lang['subscr_unsubscribe_success'] = '%s abonements uz %s atsaukts';
+$lang['subscr_unsubscribe_error'] = 'Kļūme svītrojot %s no %s abonēšanas saraksta';
+$lang['subscr_already_subscribed'] = '%s jau abonē %s';
+$lang['subscr_not_subscribed'] = '%s neabonē %s';
+$lang['subscr_m_not_subscribed'] = 'Šī lapa vai nodaļa nav abonēta';
+$lang['subscr_m_new_header']   = 'Pievienot abonementu';
+$lang['subscr_m_current_header'] = 'Patlaban ir abonēts';
+$lang['subscr_m_unsubscribe']  = 'Atteikties no abonēšanas';
+$lang['subscr_m_subscribe']    = 'Abonēt';
+$lang['subscr_m_receive']      = 'Saņemt';
+$lang['subscr_style_every']    = 'vēstuli par katru izmaiņu';
+$lang['subscr_style_digest']   = 'kopsavilkumu par katru lapu (reizi %.2f dienās)';
+$lang['subscr_style_list']     = 'kopš pēdējās vēstules notikušo labojumu sarakstu (reizi %.2f dienās)';
+$lang['authtempfail']          = 'Lietotāju autentifikācija pašlaik nedarbojas. Ja tas turpinās ilgstoši, lūduz ziņo Wiki administratoram.';
+$lang['authpwdexpire']         = 'Tavai parolei pēc %d dienām biegsies termiņš, tā drīzumā jānomaina.';
+$lang['i_chooselang']          = 'Izvēlies valodu';
+$lang['i_installer']           = 'DokuWiki instalētājs';
+$lang['i_wikiname']            = 'Wiki vārds';
+$lang['i_enableacl']           = 'Lietot ACL (ieteikts)';
+$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ā ';
+$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 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_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)';
+$lang['i_pol2']                = 'Slēgts Wiki (raksta, lasa un augšupielādē tikai reģistrēti lietotāji)';
+$lang['i_retry']               = 'Atkārtot';
+$lang['i_license']             = 'Ar kādu licenci saturs tiks publicēts:';
+$lang['i_license_none']        = 'Nerādīt nekādu licences informāciju';
+$lang['i_pop_field']           = 'Lūdzu palīdziet uzlabot DokuWiki';
+$lang['i_pop_label']           = 'Rezi mēnesī nosūtīt DokuWiki izstrādātājiem anonīmus lietošanas datus.';
+$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 %d nedēļām';
+$lang['days']                  = 'pirms %d  dienām';
+$lang['hours']                 = 'pirms %d stundām';
+$lang['minutes']               = 'pirms %d minūtēm';
+$lang['seconds']               = 'pirms %d sekundēm';
+$lang['wordblock']             = 'Grozījumus nevarēju saglabāt, jo tie satur aizliegto vārdu (spamu).';
+$lang['media_uploadtab']       = 'Augšuplādēt';
+$lang['media_searchtab']       = 'Meklēt';
+$lang['media_file']            = 'Fails';
+$lang['media_viewtab']         = 'Skatīt';
+$lang['media_edittab']         = 'Labot';
+$lang['media_historytab']      = 'Vēsture';
+$lang['media_list_thumbs']     = 'Sīktēli';
+$lang['media_list_rows']       = 'Rindas';
+$lang['media_sort_name']       = 'Nosaukums';
+$lang['media_sort_date']       = 'Datums';
+$lang['media_namespaces']      = 'Norādīt nodaļu';
+$lang['media_files']           = 'Faili nodaļā %s';
+$lang['media_upload']          = 'Augšuplādēt nodaļā %s';
+$lang['media_search']          = 'Meklēt nodaļā %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s nodaļā %s';
+$lang['media_edit']            = 'Labot %s';
+$lang['media_history']         = '%s vēsture';
+$lang['media_meta_edited']     = 'metadati laboti';
+$lang['media_perm_read']       = 'Atvainojiet, jums nav tiesību skatīt failus. ';
+$lang['media_perm_upload']     = 'Atvainojiet, jums nav tiesību augšupielādēt. ';
+$lang['media_update']          = 'Augšupielādēt jaunu versiju';
+$lang['media_restore']         = 'Atjaunot šo versiju';
diff --git a/sources/inc/lang/lv/locked.txt b/sources/inc/lang/lv/locked.txt
new file mode 100644
index 0000000..7d57ce9
--- /dev/null
+++ b/sources/inc/lang/lv/locked.txt
@@ -0,0 +1,5 @@
+====== Lapa aizņemta ======
+
+Lapa aizņemta, to patlaban labo cits lietotājs. Tev ir jāgaida, kamēr to pabeigs labot vai arī iztecēs labotājam atvēlētais laiks.
+
+
diff --git a/sources/inc/lang/lv/login.txt b/sources/inc/lang/lv/login.txt
new file mode 100644
index 0000000..a98d21d
--- /dev/null
+++ b/sources/inc/lang/lv/login.txt
@@ -0,0 +1,3 @@
+====== Login ======
+Tu neesi ielogojies! Ievadi savu lietotājvārdu un paroli. Pārlūkprogrammai jāpieņem //cookies//.
+
diff --git a/sources/inc/lang/lv/mailtext.txt b/sources/inc/lang/lv/mailtext.txt
new file mode 100644
index 0000000..cd4a5d6
--- /dev/null
+++ b/sources/inc/lang/lv/mailtext.txt
@@ -0,0 +1,18 @@
+Tavā DokuWiki pievienota vai labota lapa. Šeit ir sīkākas ziņas:
+
+Datums       : @DATE@
+Pārlūks      : @BROWSER@
+IP adrese    : @IPADDRESS@
+Dators       : @HOSTNAME@
+Vecā versija : @OLDPAGE@
+Jaunā versija: @NEWPAGE@
+Anotācija    : @SUMMARY@
+Lietotājs    : @USER@
+
+@DIFF@
+
+
+-- 
+Vēstuli nosūtījusi DokuWiki programma no
+@DOKUWIKIURL@ datora
+
diff --git a/sources/inc/lang/lv/mailwrap.html b/sources/inc/lang/lv/mailwrap.html
new file mode 100644
index 0000000..34b7239
--- /dev/null
+++ b/sources/inc/lang/lv/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Šo vēstuli nosūtījusi programma DokuWiki no vietnes @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/lv/newpage.txt b/sources/inc/lang/lv/newpage.txt
new file mode 100644
index 0000000..a4a05fd
--- /dev/null
+++ b/sources/inc/lang/lv/newpage.txt
@@ -0,0 +1,5 @@
+====== Šķ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''.
+
+
diff --git a/sources/inc/lang/lv/norev.txt b/sources/inc/lang/lv/norev.txt
new file mode 100644
index 0000000..b7c4624
--- /dev/null
+++ b/sources/inc/lang/lv/norev.txt
@@ -0,0 +1,5 @@
+====== Nav šādas versijas ======
+
+Norādītās lapas versijas nav. Lieto pogu ''Vecās versijas'', lai redzētu dokumenta veco versiju sarakstu.
+
+
diff --git a/sources/inc/lang/lv/password.txt b/sources/inc/lang/lv/password.txt
new file mode 100644
index 0000000..be5e7e2
--- /dev/null
+++ b/sources/inc/lang/lv/password.txt
@@ -0,0 +1,9 @@
+Sveiki, @FULLNAME@!
+
+Tavi  dati @TITLE@ lapām uz servera @DOKUWIKIURL@ ir
+
+Lietotājvārds:  @LOGIN@
+Parole:  @PASSWORD@
+
+-- 
+Šo dokumentu izveidojusi DokuWiki programma uz servera @DOKUWIKIURL@
diff --git a/sources/inc/lang/lv/preview.txt b/sources/inc/lang/lv/preview.txt
new file mode 100644
index 0000000..c3d618a
--- /dev/null
+++ b/sources/inc/lang/lv/preview.txt
@@ -0,0 +1,5 @@
+====== Priekšskats ======
+
+Tavs teksts izskatīsies šādi. Ievēro, tas vēl **nav saglabāts** !
+
+
diff --git a/sources/inc/lang/lv/pwconfirm.txt b/sources/inc/lang/lv/pwconfirm.txt
new file mode 100644
index 0000000..308ca29
--- /dev/null
+++ b/sources/inc/lang/lv/pwconfirm.txt
@@ -0,0 +1,14 @@
+Sveiki, @FULLNAME@!
+
+Kāds pieprasījis jaunu paroli tavam @TITLE@ kontam
+@DOKUWIKIURL@ sistēmā.
+
+Ja paroli neesi prasījis, ignorē šo vēstuli.
+
+Lai apstiprinātu, ka esi paroli pieprasījis  lieto norādīto saiti.
+
+@CONFIRM@
+
+-- 
+Šo vēstuli ģenerējusi DokuWiki no
+@DOKUWIKIURL
\ No newline at end of file
diff --git a/sources/inc/lang/lv/read.txt b/sources/inc/lang/lv/read.txt
new file mode 100644
index 0000000..876e53c
--- /dev/null
+++ b/sources/inc/lang/lv/read.txt
@@ -0,0 +1,4 @@
+Šī lapa ir tikai lasāma. Vari apskatīt izejas kodu, bet nevari to mainīt. Ja domā, ka tas nav pareizi, vaicā administratoram.
+
+
+
diff --git a/sources/inc/lang/lv/recent.txt b/sources/inc/lang/lv/recent.txt
new file mode 100644
index 0000000..70cf1aa
--- /dev/null
+++ b/sources/inc/lang/lv/recent.txt
@@ -0,0 +1,8 @@
+====== Jaunākie grozījumi ======
+
+Jaunākie labojumi ir:
+
+
+
+
+
diff --git a/sources/inc/lang/lv/register.txt b/sources/inc/lang/lv/register.txt
new file mode 100644
index 0000000..5e6477d
--- /dev/null
+++ b/sources/inc/lang/lv/register.txt
@@ -0,0 +1,4 @@
+====== Jauna lietotāja reģistrācija ======
+
+Lai izveidotu jaunu kontu, aizpildi visas prasītās ailes. Pārliecinies, ka uzdod **derīgu pasta adresi**, jo jauno paroli tev nosūtīs pa pastu. Lietotājvārdam jāatbilst [[doku>pagename|wiki vārdu nosacījumiem]].
+
diff --git a/sources/inc/lang/lv/registermail.txt b/sources/inc/lang/lv/registermail.txt
new file mode 100644
index 0000000..50fd8a9
--- /dev/null
+++ b/sources/inc/lang/lv/registermail.txt
@@ -0,0 +1,14 @@
+Reģistrēts jauns lietotājs. Tā dati:
+
+Lietotājvārds : @NEWUSER@
+Pilns vārds   : @NEWNAME@
+E-pasts       : @NEWEMAIL@
+
+Datums      : @DATE@
+Pārlūks     : @BROWSER@
+IP aderese  : @IPADDRESS@
+Datora vārds: @HOSTNAME@
+
+-- 
+Šo vēstuli ģenerējis DokuWiki no
+@DOKUWIKIURL
\ No newline at end of file
diff --git a/sources/inc/lang/lv/resendpwd.txt b/sources/inc/lang/lv/resendpwd.txt
new file mode 100644
index 0000000..3f4597a
--- /dev/null
+++ b/sources/inc/lang/lv/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Nosūtīt jaunu paroli ======
+
+Azipildi zemāk prasīto, lai saņemtu savam kontam jaunu paroli. Jauno paroli nosūtīs uz reģistrēto e-pasta adresi. Lietotāja vārdam jābūt tavam //wiki sistēmas// lietotājavārdam.
diff --git a/sources/inc/lang/lv/resetpwd.txt b/sources/inc/lang/lv/resetpwd.txt
new file mode 100644
index 0000000..757f34c
--- /dev/null
+++ b/sources/inc/lang/lv/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Uzstādīt jaunu paroli ======
+
+Lūdzu izvēlies savam kontam jaunu paroli.
\ No newline at end of file
diff --git a/sources/inc/lang/lv/revisions.txt b/sources/inc/lang/lv/revisions.txt
new file mode 100644
index 0000000..51ad849
--- /dev/null
+++ b/sources/inc/lang/lv/revisions.txt
@@ -0,0 +1,5 @@
+====== 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 --git a/sources/inc/lang/lv/searchpage.txt b/sources/inc/lang/lv/searchpage.txt
new file mode 100644
index 0000000..22eb55f
--- /dev/null
+++ b/sources/inc/lang/lv/searchpage.txt
@@ -0,0 +1,4 @@
+====== 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 =====
diff --git a/sources/inc/lang/lv/showrev.txt b/sources/inc/lang/lv/showrev.txt
new file mode 100644
index 0000000..7d5c0fa
--- /dev/null
+++ b/sources/inc/lang/lv/showrev.txt
@@ -0,0 +1,2 @@
+**Šī ir veca dokumenta versija!**
+----
diff --git a/sources/inc/lang/lv/stopwords.txt b/sources/inc/lang/lv/stopwords.txt
new file mode 100644
index 0000000..846c869
--- /dev/null
+++ b/sources/inc/lang/lv/stopwords.txt
@@ -0,0 +1,48 @@
+# Šis ir to vārdu sarakstus, kurus indeksētājs neņem vērā. Katru vārdu savā rindā!
+# 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
+par
+pār
+pret
+starp
+caur
+uz
+aiz
+apakš
+bez
+iz
+kopš
+no
+pēc
+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 --git a/sources/inc/lang/lv/subscr_digest.txt b/sources/inc/lang/lv/subscr_digest.txt
new file mode 100644
index 0000000..9878405
--- /dev/null
+++ b/sources/inc/lang/lv/subscr_digest.txt
@@ -0,0 +1,19 @@
+Labdien!
+
+@TITLE@ viki nodaļā @PAGE@ ir mainījušās šadas lapas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vecā versija: @OLDPAGE@
+Jaunā versija: @NEWPAGE@
+
+Lai atceltu izmaiņu paziņošanu, ielogojieties 
+@DOKUWIKIURL@, apmeklējiet 
+@SUBSCRIBE@
+un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
+
+--
+Šo vēstuli izveidoja DokuWiki no 
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/lv/subscr_form.txt b/sources/inc/lang/lv/subscr_form.txt
new file mode 100644
index 0000000..9e3145f
--- /dev/null
+++ b/sources/inc/lang/lv/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Abonementu pārvaldnieks ======
+
+Te varat mainīt savu lapas vai nodaļas abonementu.
\ No newline at end of file
diff --git a/sources/inc/lang/lv/subscr_list.txt b/sources/inc/lang/lv/subscr_list.txt
new file mode 100644
index 0000000..986b378
--- /dev/null
+++ b/sources/inc/lang/lv/subscr_list.txt
@@ -0,0 +1,16 @@
+Labdien!
+
+@TITLE@ viki nodaļā @PAGE@ ir mainījušās šadas lapas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Lai atceltu izmaiņu paziņošanu, ielogojieties 
+@DOKUWIKIURL@, apmeklējiet 
+@SUBSCRIBE@
+un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
+
+--
+Šo vēstuli izveidoja DokuWiki no 
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/lv/subscr_single.txt b/sources/inc/lang/lv/subscr_single.txt
new file mode 100644
index 0000000..ca61778
--- /dev/null
+++ b/sources/inc/lang/lv/subscr_single.txt
@@ -0,0 +1,23 @@
+Labdien!
+
+@TITLE@ viki nodaļā @PAGE@ ir mainījušās šadas lapas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datums : @DATE@
+Lietotājs : @USER@
+Izmaiņu anotācija: @SUMMARY@
+Vecā versija: @OLDPAGE@
+Jaunā versija: @NEWPAGE@
+
+
+Lai atceltu izmaiņu paziņošanu, ielogojieties 
+@DOKUWIKIURL@, apmeklējiet 
+@SUBSCRIBE@
+un atsakieties no lapas vai nodaļas izmaiņu paziņojumiem .
+
+--
+Šo vēstuli izveidoja DokuWiki no 
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/lv/updateprofile.txt b/sources/inc/lang/lv/updateprofile.txt
new file mode 100644
index 0000000..12fbd8d
--- /dev/null
+++ b/sources/inc/lang/lv/updateprofile.txt
@@ -0,0 +1,8 @@
+====== Atjaunot sava konta datus ======
+
+Jāaizpilda tikai tie lauki, kuru saturu vēlies mainīt.  Nav iespējams mainīt savu lietotājvārdu.
+
+
+
+
+
diff --git a/sources/inc/lang/lv/uploadmail.txt b/sources/inc/lang/lv/uploadmail.txt
new file mode 100644
index 0000000..5975d5b
--- /dev/null
+++ b/sources/inc/lang/lv/uploadmail.txt
@@ -0,0 +1,14 @@
+Fails augšupielādēts DokuWiki. Sīkākas ziņas:
+
+Fails         : @MEDIA@
+Datums        : @DATE@
+Pārlūks       : @BROWSER@
+IP adrese     : @IPADDRESS@
+Datora vārds  : @HOSTNAME@
+Izmērs        : @SIZE@
+MIME tips     : @MIME@
+Lietotājs     : @USER@
+
+-- 
+Vēstuli nosūtījusi DokuWiki programma no
+@DOKUWIKIURL@ datora.
\ No newline at end of file
diff --git a/sources/inc/lang/mg/admin.txt b/sources/inc/lang/mg/admin.txt
new file mode 100644
index 0000000..2c4fc3f
--- /dev/null
+++ b/sources/inc/lang/mg/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Hitanao eo ambany lisitry ny asa fanaovana admin misy amin'ny DokuWiki.
+
diff --git a/sources/inc/lang/mg/backlinks.txt b/sources/inc/lang/mg/backlinks.txt
new file mode 100644
index 0000000..c625e65
--- /dev/null
+++ b/sources/inc/lang/mg/backlinks.txt
@@ -0,0 +1,5 @@
+====== Verindrohy ======
+
+Lisitr'ireo pejy misy rohy manondro amin'ity pejy ity.
+
+
diff --git a/sources/inc/lang/mg/conflict.txt b/sources/inc/lang/mg/conflict.txt
new file mode 100644
index 0000000..96b369e
--- /dev/null
+++ b/sources/inc/lang/mg/conflict.txt
@@ -0,0 +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.
+
diff --git a/sources/inc/lang/mg/denied.txt b/sources/inc/lang/mg/denied.txt
new file mode 100644
index 0000000..edf20f1
--- /dev/null
+++ b/sources/inc/lang/mg/denied.txt
@@ -0,0 +1,4 @@
+====== Tsy tafiditra ======
+
+Miala tsiny fa tsy manana alalana hanohizana mankany ianao. Angamba hadinonao ny niditra.
+
diff --git a/sources/inc/lang/mg/diff.txt b/sources/inc/lang/mg/diff.txt
new file mode 100644
index 0000000..8d7d69b
--- /dev/null
+++ b/sources/inc/lang/mg/diff.txt
@@ -0,0 +1,4 @@
+====== Tsy fitoviana ======
+
+Ireto ny maha-samihafa ny kinova nosafidiana sy ny kinovan'ny pejy amin'izao.
+
diff --git a/sources/inc/lang/mg/edit.txt b/sources/inc/lang/mg/edit.txt
new file mode 100644
index 0000000..2cde9de
--- /dev/null
+++ b/sources/inc/lang/mg/edit.txt
@@ -0,0 +1,2 @@
+Rehefa avy manova ny pejy dia tsindrio ny bokotra ''Raketo''. Jereo ny [[wiki:syntax]] misy ny fomba fanoratana. Raha misy zavatra tianao handramana dia ianaro ao amin'ny [[wiki:playground]].
+
diff --git a/sources/inc/lang/mg/editrev.txt b/sources/inc/lang/mg/editrev.txt
new file mode 100644
index 0000000..a6ff5ba
--- /dev/null
+++ b/sources/inc/lang/mg/editrev.txt
@@ -0,0 +1,2 @@
+**Kinovan'ny pejy taloha no nosokafanao!** Raha raketinao io, dia hanamboatra kinova vaovao miaraka amin'io ianao.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/mg/index.txt b/sources/inc/lang/mg/index.txt
new file mode 100644
index 0000000..614fd64
--- /dev/null
+++ b/sources/inc/lang/mg/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Ity misy index mahasarona ireo pejy misy milahatra arakaraka ny [[doku>namespaces|namespaces]].
+
diff --git a/sources/inc/lang/mg/lang.php b/sources/inc/lang/mg/lang.php
new file mode 100644
index 0000000..c5ed669
--- /dev/null
+++ b/sources/inc/lang/mg/lang.php
@@ -0,0 +1,121 @@
+>';
+$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['btn_register'] = 'Hisoratra';
+
+$lang['loggedinas'] = 'Anaranao:';
+$lang['user']       = 'Anarana';
+$lang['pass']       = 'Alahidy';
+$lang['passchk']    = 'Ataovy indray';
+$lang['remember']   = 'Tsarovy';
+$lang['fullname']   = 'Anarana feno';
+$lang['email']      = 'Imailaka';
+$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['js']['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['js']['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 (%s)';
+$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_register']= 'Ampio mpampiasa vaovao...';
+
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/inc/lang/mg/locked.txt b/sources/inc/lang/mg/locked.txt
new file mode 100644
index 0000000..5705659
--- /dev/null
+++ b/sources/inc/lang/mg/locked.txt
@@ -0,0 +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.
+
diff --git a/sources/inc/lang/mg/login.txt b/sources/inc/lang/mg/login.txt
new file mode 100644
index 0000000..1ea3fac
--- /dev/null
+++ b/sources/inc/lang/mg/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Mbola tsy niditra ianao izao! Ampidiro eto ambany ny anarana sy ny alahidy. Ilaina manaiky cookies ny navigateur-nao raha hiditra.
+
diff --git a/sources/inc/lang/mg/mailtext.txt b/sources/inc/lang/mg/mailtext.txt
new file mode 100644
index 0000000..ca91934
--- /dev/null
+++ b/sources/inc/lang/mg/mailtext.txt
@@ -0,0 +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@
diff --git a/sources/inc/lang/mg/newpage.txt b/sources/inc/lang/mg/newpage.txt
new file mode 100644
index 0000000..a998caf
--- /dev/null
+++ b/sources/inc/lang/mg/newpage.txt
@@ -0,0 +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''
diff --git a/sources/inc/lang/mg/norev.txt b/sources/inc/lang/mg/norev.txt
new file mode 100644
index 0000000..71ecb9b
--- /dev/null
+++ b/sources/inc/lang/mg/norev.txt
@@ -0,0 +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.
+
diff --git a/sources/inc/lang/mg/password.txt b/sources/inc/lang/mg/password.txt
new file mode 100644
index 0000000..000bd91
--- /dev/null
+++ b/sources/inc/lang/mg/password.txt
@@ -0,0 +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@
+
diff --git a/sources/inc/lang/mg/preview.txt b/sources/inc/lang/mg/preview.txt
new file mode 100644
index 0000000..52019cd
--- /dev/null
+++ b/sources/inc/lang/mg/preview.txt
@@ -0,0 +1,5 @@
+====== Topi-maso ======
+
+Topi-maso ahafahanao mijery ny fivoakan'ny soratra nataonao ity. Tandremo: Mbola **tsy voarakitra** io!
+
+
diff --git a/sources/inc/lang/mg/read.txt b/sources/inc/lang/mg/read.txt
new file mode 100644
index 0000000..0fe51f4
--- /dev/null
+++ b/sources/inc/lang/mg/read.txt
@@ -0,0 +1,3 @@
+Vakiana fotsiny ity pejy ity. Afaka jerenao ny source, saingy tsy afaka ovainao. Anontanio ny admin raha heverinao fa tsy mety izany.
+
+
diff --git a/sources/inc/lang/mg/recent.txt b/sources/inc/lang/mg/recent.txt
new file mode 100644
index 0000000..4bc8245
--- /dev/null
+++ b/sources/inc/lang/mg/recent.txt
@@ -0,0 +1,5 @@
+====== Fiovana farany ======
+
+Ireto pejy ireto no niova vao haingana.
+
+
diff --git a/sources/inc/lang/mg/register.txt b/sources/inc/lang/mg/register.txt
new file mode 100644
index 0000000..618c1f9
--- /dev/null
+++ b/sources/inc/lang/mg/register.txt
@@ -0,0 +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]].
+
+
diff --git a/sources/inc/lang/mg/revisions.txt b/sources/inc/lang/mg/revisions.txt
new file mode 100644
index 0000000..7270458
--- /dev/null
+++ b/sources/inc/lang/mg/revisions.txt
@@ -0,0 +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''.
+
+
diff --git a/sources/inc/lang/mg/searchpage.txt b/sources/inc/lang/mg/searchpage.txt
new file mode 100644
index 0000000..68c6271
--- /dev/null
+++ b/sources/inc/lang/mg/searchpage.txt
@@ -0,0 +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 =====
\ No newline at end of file
diff --git a/sources/inc/lang/mg/showrev.txt b/sources/inc/lang/mg/showrev.txt
new file mode 100644
index 0000000..92690f4
--- /dev/null
+++ b/sources/inc/lang/mg/showrev.txt
@@ -0,0 +1,2 @@
+**Ity dia kinovan'ny pejy taloha!**
+----
diff --git a/sources/inc/lang/mk/adminplugins.txt b/sources/inc/lang/mk/adminplugins.txt
new file mode 100644
index 0000000..28e2cc1
--- /dev/null
+++ b/sources/inc/lang/mk/adminplugins.txt
@@ -0,0 +1 @@
+===== Додатни приклучоци =====
\ No newline at end of file
diff --git a/sources/inc/lang/mk/lang.php b/sources/inc/lang/mk/lang.php
new file mode 100644
index 0000000..2b2c9fb
--- /dev/null
+++ b/sources/inc/lang/mk/lang.php
@@ -0,0 +1,227 @@
+
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$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_profile']           = 'Ажурирај профил';
+$lang['btn_reset']             = 'Ресет';
+$lang['btn_draft']             = 'Уреди скица';
+$lang['btn_recover']           = 'Поврати скица';
+$lang['btn_draftdel']          = 'Избриши скица';
+$lang['btn_revert']            = 'Обнови';
+$lang['btn_register']          = 'Регистрирај се';
+$lang['loggedinas']            = 'Најавен/а како';
+$lang['user']                  = 'Корисничко име';
+$lang['pass']                  = 'Лозинка';
+$lang['newpass']               = 'Нова лозинка';
+$lang['oldpass']               = 'Потврдете ја сегашната лозинка';
+$lang['passchk']               = 'уште еднаш';
+$lang['remember']              = 'Запомни ме';
+$lang['fullname']              = 'Вистинско име';
+$lang['email']                 = 'Е-пошта';
+$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']             = 'Вашата DokuWiki лозинка';
+$lang['reghere']               = 'Се уште немаш сметка? Направи веќе една';
+$lang['profna']                = 'Ова вики не поддржува измена на профилот';
+$lang['profnochange']          = 'Нема промени, ништо за правење.';
+$lang['profnoempty']           = 'Празно име или адреса за е-пошта не е дозволено.';
+$lang['profchanged']           = 'Корисничкиот профил е успешно ажуриран.';
+$lang['pwdforget']             = 'Ја заборавивте лозинката? Добијте нова';
+$lang['resendna']              = 'Ова вики не поддржува повторно испраќање на лозинка.';
+$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['js']['willexpire']            = 'Вашиот клуч за уредување на оваа страница ќе истече за една минута.\nЗа да избегнете конфликти и да го ресетирате бројачот за време, искористете го копчето за преглед.';
+$lang['js']['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['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['mediausage']            = 'Користете ја следнава синтакса за референцирање кон оваа датотека:';
+$lang['mediaview']             = 'Види ја оригиналната датотека';
+$lang['mediaroot']             = 'root';
+$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']              = 'обновена е стара ревизија (%s)';
+$lang['external_edit']         = 'надворешно уредување';
+$lang['summary']               = 'Уреди го изводот';
+$lang['noflash']               = 'Adobe Flash приклучокот е потребен за да се прикаже оваа содржина.';
+$lang['download']              = 'Симни Snippe';
+$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']            = 'Надворешна врска';
+$lang['qb_hr']                 = 'Хоризонтален линијар';
+$lang['qb_media']              = 'Додај слики и други датотеки';
+$lang['qb_sig']                = 'Внеси потпис';
+$lang['qb_smileys']            = 'Смајлиња';
+$lang['qb_chars']              = 'Специјални знаци';
+$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['subscr_subscribe_success'] = 'Додаден/а е %s во претплатничката листа за %s';
+$lang['subscr_subscribe_error'] = 'Грешка при додавањето на %s во претплатничката листа за %s';
+$lang['subscr_subscribe_noaddress'] = 'Нема адреса за е-пошта поврзана со Вашата најава, не може да бидете додадени на претплатничката листа';
+$lang['subscr_unsubscribe_success'] = 'Отстранет/а е %s од претплатничката листа за %s';
+$lang['subscr_unsubscribe_error'] = 'Грешка при отстранувањето на %s од претплатничката листа за %s';
+$lang['subscr_already_subscribed'] = '%s е веќе претплатен/а на %s';
+$lang['subscr_not_subscribed'] = '%s е не претплатен/а на %s';
+$lang['subscr_m_not_subscribed'] = 'Моментално не сте пријавени на сегашната страница или ';
+$lang['subscr_m_new_header']   = 'Додај претплата';
+$lang['subscr_m_current_header'] = 'Моментални претплати';
+$lang['subscr_m_unsubscribe']  = 'Отплатување';
+$lang['subscr_m_subscribe']    = 'Претплата';
+$lang['subscr_m_receive']      = 'Прими';
+$lang['subscr_style_every']    = 'е-пошта за секоја промена';
+$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. Продолжете до вашето ново DokuWiki.';
+$lang['i_failure']             = 'Се појавија некои грешки при запишувањето на конфигурациските датотеки. Можеби треба да ги поравите рачно пред да можете да го користите вашето ново DokuWiki.';
+$lang['i_policy']              = 'Почетна ACL политика';
+$lang['i_pol0']                = 'Отвори вики (читај, запиши, качи за сите)';
+$lang['i_pol1']                = 'Јавно вики (читај за сите, запиши и качи за регистрирани корисници)';
+$lang['i_pol2']                = 'Затворено вики (читај, запиши, качи само за регистрирани корисници)';
+$lang['i_retry']               = 'Пробај повторно';
+$lang['years']                 = 'пред %d години';
+$lang['months']                = 'пред %d месеци';
+$lang['weeks']                 = 'пред %d недели';
+$lang['days']                  = 'пред %d денови';
+$lang['hours']                 = 'пред %d часа';
+$lang['minutes']               = 'пред %d минути';
+$lang['seconds']               = 'пред %d секунди';
diff --git a/sources/inc/lang/mk/read.txt b/sources/inc/lang/mk/read.txt
new file mode 100644
index 0000000..8c8726e
--- /dev/null
+++ b/sources/inc/lang/mk/read.txt
@@ -0,0 +1 @@
+Оваа страница е само за читање. Можете да го гледате изворот, но не можете да ја менувате. Ако мислите дека ова е погрешно, контактирајте го администраторот.
\ No newline at end of file
diff --git a/sources/inc/lang/mk/recent.txt b/sources/inc/lang/mk/recent.txt
new file mode 100644
index 0000000..cfbba4a
--- /dev/null
+++ b/sources/inc/lang/mk/recent.txt
@@ -0,0 +1,3 @@
+====== Скорешни промени ======
+
+Следниве страници беа скорешно променети.
\ No newline at end of file
diff --git a/sources/inc/lang/mk/showrev.txt b/sources/inc/lang/mk/showrev.txt
new file mode 100644
index 0000000..a0ca735
--- /dev/null
+++ b/sources/inc/lang/mk/showrev.txt
@@ -0,0 +1,2 @@
+**Ова е стара ревизија од документото!**
+----
\ No newline at end of file
diff --git a/sources/inc/lang/mr/admin.txt b/sources/inc/lang/mr/admin.txt
new file mode 100644
index 0000000..6f54384
--- /dev/null
+++ b/sources/inc/lang/mr/admin.txt
@@ -0,0 +1,3 @@
+====== व्यवस्थापन ======
+
+खाली तुम्हाला डॉक्युविकि मधे उपलब्ध असलेल्या व्यवस्थापनाच्या क्रियांची सूची दिली आहे.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/backlinks.txt b/sources/inc/lang/mr/backlinks.txt
new file mode 100644
index 0000000..997fa68
--- /dev/null
+++ b/sources/inc/lang/mr/backlinks.txt
@@ -0,0 +1,3 @@
+====== प्रतिलिंक ======
+
+ही त्या सर्व प्रृष्ठांची सूची आहे जी या पृष्ठाला परत लिंक करतात.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/conflict.txt b/sources/inc/lang/mr/conflict.txt
new file mode 100644
index 0000000..2b1bb64
--- /dev/null
+++ b/sources/inc/lang/mr/conflict.txt
@@ -0,0 +1,5 @@
+====== नवीन आवृत्ती उपलब्ध आहे ======
+
+तुम्ही संपादित केलेल्या दस्तावेजाची नवीन आवृत्ती उपलब्ध आहे. तुम्ही संपादित करत असलेल्या दस्तावेजामधे त्याच वेळी इतर यूजरने बदल केल्यास असे घडते.
+
+खाली दर्शाविलेले फरक नीट तपासा आणि त्यापैकी कुठले ठेवायचे ते ठरवा. जर तुम्ही 'सुरक्षित' केलं तर तुमचे बदल सुरक्षित होतील. सध्याची आवृत्ति ठेवण्यासाठी 'कॅन्सल' वर क्लिक करा.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/denied.txt b/sources/inc/lang/mr/denied.txt
new file mode 100644
index 0000000..1b499f5
--- /dev/null
+++ b/sources/inc/lang/mr/denied.txt
@@ -0,0 +1,3 @@
+====== परवानगी नाकारली ======
+
+क्षमा करा, पण तुम्हाला यापुढे जाण्याचे हक्क नाहीत. कदाचित तुम्ही लॉगिन करायला विसरला आहात ? 
\ No newline at end of file
diff --git a/sources/inc/lang/mr/diff.txt b/sources/inc/lang/mr/diff.txt
new file mode 100644
index 0000000..f0a8450
--- /dev/null
+++ b/sources/inc/lang/mr/diff.txt
@@ -0,0 +1,3 @@
+====== फरक ======
+
+या पानावर तुम्हाला निवडलेली आवृत्ती व सध्याच्या आवृत्ती मधले फरक दाखवले आहेत.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/draft.txt b/sources/inc/lang/mr/draft.txt
new file mode 100644
index 0000000..aa74475
--- /dev/null
+++ b/sources/inc/lang/mr/draft.txt
@@ -0,0 +1,5 @@
+====== मसुद्याची फाइल मिळाली ======
+
+तुमचा मागचा संपादानाचा सेशन नीट पूर्ण झाला नव्हता. डॉक्युविकिने तुमच्या कामाचा मसुदा आपोआप सुरक्षित केला होता , जो वापरून तुमची संपादन परत चालू करू शकता. खाली तुमच्या मागच्या सेशन मधला सुरक्षित केलेला डेटा दाखवला आहे.
+
+कृपया आता हे ठरवा की तुमच्या संपादन सेशनचे //पुनर्स्थापन// करायचे, सुरक्षित केलेला मसुदा //रद्द// करायचा  का संपादनच //कॅन्सल// करायचं.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/edit.txt b/sources/inc/lang/mr/edit.txt
new file mode 100644
index 0000000..6c6347e
--- /dev/null
+++ b/sources/inc/lang/mr/edit.txt
@@ -0,0 +1 @@
+पान संपादित करा आणि 'सुरक्षित' वर क्लिक करा. विकी सिन्टॅक्स साठी [[wiki:syntax]] पहा.कृपया तुम्ही जर एखादे पान **सुधारित** करू शकत असाल तरच ते संपादित करा. अन्यथा जर तुम्हाला फ़क्त काही गोष्टी ट्राय करून बघायच्या असतील तर [[playground:playground|प्लेग्राऊण्ड]] मधे आपले धडे गिरवा!
\ No newline at end of file
diff --git a/sources/inc/lang/mr/editrev.txt b/sources/inc/lang/mr/editrev.txt
new file mode 100644
index 0000000..d58c8ab
--- /dev/null
+++ b/sources/inc/lang/mr/editrev.txt
@@ -0,0 +1,2 @@
+**तुमची या पानाची जुनी आवृत्ती लोड केलि आहे!** जर तुमची ती सुरक्षित केली तर तुमची त्याची एक नवीन आवृत्ती तयार कराल.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/mr/index.txt b/sources/inc/lang/mr/index.txt
new file mode 100644
index 0000000..489b204
--- /dev/null
+++ b/sources/inc/lang/mr/index.txt
@@ -0,0 +1,3 @@
+====== सूची ======
+
+ही सर्व उपलब्ध पानांची [[doku>namespaces|नेमस्पेस]] अनुसार तयार केलेली सूची आहे. 
\ No newline at end of file
diff --git a/sources/inc/lang/mr/install.html b/sources/inc/lang/mr/install.html
new file mode 100644
index 0000000..9696c78
--- /dev/null
+++ b/sources/inc/lang/mr/install.html
@@ -0,0 +1,10 @@
+
        हे पान डॉक्युविकि च्या पहिल्या इन्स्टॉलेशन आणि कॉन्फिगरेशन साठी मदत करतं. या इंस्टॉलर  विषयी जास्ती माहिती त्याच्या
+माहितीसंग्रह पानावर उपलब्ध आहे.
        
+
+
         डॉक्युविकि विकी पाने व सम्बंधित माहिती ( उदा. फोटो , शोध सूची, जुन्या आवृत्ती ई.) साठवण्यासाठी सामान्य फाइलचा उपयोग करतं. डॉक्युविकिने नीट काम करण्यासाठी डॉक्युविकिला या फाइल जिथे साठवल्या आहेत त्या डिरेक्टरीमधे लेखनाचे हक्क ( write access ) असणे अत्यावश्यक आहे. या इंस्टॉलरला डिरेक्टरीचे हक्क सेट करता येत नाहीत. ते थेट तुमच्या शेल मधून सेट करावे लागतात, किंवा तुम्ही व्यावसायिक होस्टिंग वापरत असाल तर FTP वापरून अथवा तुमच्या होस्टिंग कंट्रोल पॅनल ( उदा. cPanel  वगैरे ) मधून सेट करावे लागतात.
        
+
+
        हा इंस्टॉलर तुमच्या डॉक्युविकिचे ACL कॉन्फिगरेशन ठरवेल, ज्याद्वारे तुम्हाला व्यवस्थापकीय लॉगिन, डॉक्युविकिच्या व्यवस्थापन मेनू मधे प्लगिनचे इन्स्टॉलेशन, सदस्यांची व्यवस्था, विकी पानांवरील हक्क, कॉन्फिगरेशन बदलणे ई. साठी प्रवेशाचे हक्क वगैरे बदल करता येतील. ही व्यवस्था डॉक्युविकि वापरण्यासाठी आवश्यक नाही पण वापरल्यास डॉक्युविकिचे व्यवस्थापन अधिक सुरळित होइल.
        
+
+
        अनुभवी सदस्य किंवा ज्याना काही ख़ास गरजा असतील त्यानी खालील लिंक्स वापराव्यात :
+इन्स्टॉलेशनविषयी सूचना
+and कॉन्फिगरेशनची सेटिंग
        
\ No newline at end of file
diff --git a/sources/inc/lang/mr/lang.php b/sources/inc/lang/mr/lang.php
new file mode 100644
index 0000000..54b6997
--- /dev/null
+++ b/sources/inc/lang/mr/lang.php
@@ -0,0 +1,266 @@
+
+ * @author shantanoo@gmail.com
+ */
+$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_profile']           = 'प्रोफाइल अद्ययावत करा';
+$lang['btn_reset']             = 'रिसेट';
+$lang['btn_resendpwd']         = 'नवीन पासवर्ड';
+$lang['btn_draft']             = 'प्रत संपादन';
+$lang['btn_recover']           = 'प्रत परत मिळवा';
+$lang['btn_draftdel']          = 'प्रत रद्द';
+$lang['btn_revert']            = 'पुनर्स्थापन';
+$lang['btn_register']          = 'नोंदणी';
+$lang['btn_apply']             = 'लागू';
+$lang['btn_media']             = 'मिडिया व्यवस्थापक';
+$lang['loggedinas']            = 'लॉगिन नाव';
+$lang['user']                  = 'वापरकर्ता';
+$lang['pass']                  = 'परवलीचा शब्द';
+$lang['newpass']               = 'नवीन परवलीचा शब्द';
+$lang['oldpass']               = 'सध्याचा परवलीचा शब्द नक्की करा';
+$lang['passchk']               = 'परत एकदा';
+$lang['remember']              = 'लक्षात ठेवा';
+$lang['fullname']              = 'पूर्ण नावं';
+$lang['email']                 = 'इमेल';
+$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['js']['willexpire']      = 'हे पृष्ठ संपादित करण्यासाठी मिळालेले लॉक एखाद्या मिनिटात संपणार आहे.\n चुका होऊ नयेत म्हणुन कृपया प्रीव्यू बटन दाबुन लॉक ची वेळ पुन्हा चालू करा.';
+$lang['js']['notsavedyet']     = 'सुरक्षित न केलेले बदल नष्ट होतील. नक्की करू का ?';
+$lang['js']['searchmedia']     = 'फाईल्ससाठी शोधा';
+$lang['js']['keepopen']        = 'निवड केल्यावर विण्डो उघडी ठेवा';
+$lang['js']['hidedetails']     = 'सविस्तर मजकूर लपवा';
+$lang['js']['mediatitle']      = 'लिंक सेटिंग';
+$lang['js']['mediadisplay']    = 'लिंकचा प्रकार';
+$lang['js']['mediaalign']      = 'जुळवणी';
+$lang['js']['mediasize']       = 'प्रतिमेचा आकार';
+$lang['js']['mediatarget']     = 'लिंकचे लक्ष्य';
+$lang['js']['mediaclose']      = 'बंद';
+$lang['js']['mediadisplayimg'] = 'प्रतिमा दाखवा.';
+$lang['js']['mediadisplaylnk'] = 'फक्त लिंक दाखवा.';
+$lang['js']['mediasmall']      = 'लहान आवृत्ती';
+$lang['js']['mediamedium']     = 'माध्यम आवृत्ती';
+$lang['js']['medialarge']      = 'मोठी आवृत्ती';
+$lang['js']['mediaoriginal']   = 'मूळ आवृत्ती';
+$lang['js']['medialnk']        = 'सविस्तर माहितीकडेची लिंक';
+$lang['js']['mediadirect']     = 'मूळ मजकुराकडे थेट लिंक';
+$lang['js']['medianolnk']      = 'लिंक नको';
+$lang['js']['medianolink']     = 'प्रतिमा लिंक करू नका';
+$lang['js']['medialeft']       = 'प्रतिमा डाव्या बाजूला जुळवून घ्या.';
+$lang['js']['mediaright']      = 'प्रतिमा उजव्या बाजूला जुळवून घ्या.';
+$lang['js']['mediacenter']     = 'प्रतिमा मध्यभागी जुळवून घ्या.';
+$lang['js']['medianoalign']    = 'जुळवाजुळव वापरू नका.';
+$lang['js']['nosmblinks']      = 'विन्डोज़ शेअर ला लिंक केल्यास ते फक्त मायक्रोसॉफ़्ट इन्टरनेट एक्स्प्लोरर वरच चालते. तरी तुम्ही लिंक कॉपी करू शकता.';
+$lang['js']['linkwiz']         = 'लिंक जादूगार';
+$lang['js']['linkto']          = 'याला लिंक करा:';
+$lang['js']['del_confirm']     = 'निवडलेल्या गोष्टी नक्की नष्ट करू का ?';
+$lang['js']['restore_confirm'] = 'हि आवृत्ती खरोखर पुनर्स्थापित करू का?';
+$lang['js']['media_diff']      = 'फरक बघू:';
+$lang['js']['media_diff_both'] = 'बाजूबाजूला';
+$lang['js']['media_diff_portions'] = 'स्वाईप';
+$lang['js']['media_select']    = 'फाईल निवड...';
+$lang['js']['media_upload_btn'] = 'अपलोड';
+$lang['js']['media_done_btn']  = 'झालं';
+$lang['js']['media_drop']      = 'अपलोड करण्यासाठी इथे फाईल टाका';
+$lang['js']['media_cancel']    = 'काढा';
+$lang['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['accessdenied']          = 'तुम्हाला हे पान बघायची परवानगी नाही.';
+$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['difflink']              = 'ह्या तुलना दृष्टीकोनाला लिंक करा';
+$lang['diff_type']             = 'फरक बघू:';
+$lang['diff_inline']           = 'एका ओळीत';
+$lang['diff_side']             = 'बाजूबाजूला';
+$lang['line']                  = 'ओळ';
+$lang['breadcrumb']            = 'मागमूस';
+$lang['youarehere']            = 'तुम्ही इथे आहात';
+$lang['lastmod']               = 'सर्वात शेवटचा बदल';
+$lang['by']                    = 'द्वारा';
+$lang['deleted']               = 'काढून टाकले';
+$lang['created']               = 'निर्माण केले';
+$lang['external_edit']         = 'बाहेरून संपादित';
+$lang['summary']               = 'सारांश बदला';
+$lang['noflash']               = 'ही माहिती दाखवण्यासाठी अडोब फ्लॅश प्लेअर ची गरज आहे.';
+$lang['download']              = 'तुकडा डाउनलोड करा';
+$lang['tools']                 = 'साधने';
+$lang['user_tools']            = 'युजरची साधने';
+$lang['site_tools']            = 'साईटची साधने';
+$lang['page_tools']            = 'पानाची साधने';
+$lang['skip_to_content']       = 'सरळ मजकुराकडे ';
+$lang['mail_newpage']          = 'पृष्ठ जोडले : ';
+$lang['mail_changed']          = 'पृष्ठ बदलले : ';
+$lang['mail_subscribe_list']   = 'ह्या नेमस्पेस नाढे बदललेली पाने:';
+$lang['mail_new_user']         = 'नवीन सदस्य : ';
+$lang['mail_upload']           = 'फाइल अपलोड केली : ';
+$lang['changes_type']          = 'ह्याचे बदल बघू';
+$lang['pages_changes']         = 'पाने';
+$lang['media_changes']         = 'मिडिया फाईल';
+$lang['both_changes']          = 'पाने आणि मिडिया फाईल दोन्ही';
+$lang['qb_bold']               = 'ठळक मजकूर';
+$lang['qb_italic']             = 'तिरका मजकूर';
+$lang['qb_underl']             = 'अधोरेखित मजकूर';
+$lang['qb_code']               = 'कोड मजकूर';
+$lang['qb_strike']             = 'रद्द मजकूर';
+$lang['qb_h1']                 = 'पहिल्या पातळीचे शीर्षक';
+$lang['qb_h2']                 = 'दुसर्या पातळीचे शीर्षक';
+$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']                 = 'आडवी पट्टी';
+$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['img_width']             = 'रुंदी';
+$lang['img_height']            = 'उंची';
+$lang['img_manager']           = 'मिडिया व्यवस्थापकात बघू';
+$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_confexists']          = '%s आधीच अस्तित्वात आहे.';
+$lang['i_writeerr']            = '%s निर्माण करू शकलो नाही. तुम्हाला डिरेक्टरी / फाइल च्या परवानग्या तपासून स्वतःच ही फाइल बनवावी लागेल.';
+$lang['i_badhash']             = 'अनाकलनीय किंवा बदललेले dokuwiki.php (hash=%s)';
+$lang['i_badval']              = 'code>%s - अवैध किंवा रिकामा मजकूर.';
+$lang['i_success']             = 'व्यवस्था लावण्याचे काम यशस्वीरीत्या पार पडले. आता तुम्ही install.php डिलीट करू शकता. तुमच्या नविन डॉक्युविकि  वर जा.';
+$lang['i_failure']             = 'कॉन्फिगुरेशनच्या फाइल सुरक्षित करताना काही अडचणी आल्या आहेत. तुमची नवीन डॉक्युविकि  वापरण्याआधी तुम्हाला ह्या फाइल स्वतः ठीक कराव्या लागतील.';
+$lang['i_policy']              = 'आरंभीची ACL पॉलिसी';
+$lang['i_pol0']                = 'मुक्त विकी ( सर्वांना वाचन, लेखन व अपलोड करण्याची परवानगी )';
+$lang['i_pol1']                = 'सार्वजनिक विकी ( सर्वांना वाचण्याची मुभा , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना )';
+$lang['i_pol2']                = 'बंदिस्त विकी ( वाचन , लेखन व अपलोडची परवानगी फक्त नोंदणीकृत सदस्यांना ) ';
+$lang['i_retry']               = 'पुन्हा प्रयत्न';
+$lang['recent_global']         = 'तुम्ही सध्या %s या नेमस्पेस मधील बदल पाहात आहात.तुम्ही पूर्ण विकी मधले बदल  सुद्धा पाहू शकता.';
diff --git a/sources/inc/lang/mr/locked.txt b/sources/inc/lang/mr/locked.txt
new file mode 100644
index 0000000..dae909c
--- /dev/null
+++ b/sources/inc/lang/mr/locked.txt
@@ -0,0 +1,3 @@
+====== पान लॉक आहे ======
+
+हे पान सध्या दुसर्या सदस्याने संपादनासाठी लॉक केले आहे. तुम्हाला त्याचे संपादन करून होईपर्यंत किंवा लॉक संपेपर्यंत थांबावे लागेल.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/login.txt b/sources/inc/lang/mr/login.txt
new file mode 100644
index 0000000..f2fef4c
--- /dev/null
+++ b/sources/inc/lang/mr/login.txt
@@ -0,0 +1,3 @@
+====== लॉगिन ======
+
+तुम्ही सध्या लॉगिन केलेले नाही! तुमचे नाव-पासवर्ड देऊन खाली लॉगिन करा. लॉगिन करण्यासाठी तुमच्या ब्राउजरमधे कुकीज चालू असल्या पाहिजेत.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/mailtext.txt b/sources/inc/lang/mr/mailtext.txt
new file mode 100644
index 0000000..18fa238
--- /dev/null
+++ b/sources/inc/lang/mr/mailtext.txt
@@ -0,0 +1,15 @@
+तुमच्या डॉक्युविकिमधील एक पान बदलले किंवा नवीन टाकले गेले आहे. त्याची माहिती पुढील प्रमाणे :
+
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+मशिनचे नाव ( Host name ) : @HOSTNAME@
+जुनी आवृत्ती : @OLDPAGE@
+नवी आवृत्ती : @NEWPAGE@
+संपादन सारांश : @SUMMARY@
+सदस्य : @USER@
+
+@DIFF@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/newpage.txt b/sources/inc/lang/mr/newpage.txt
new file mode 100644
index 0000000..00a1c6b
--- /dev/null
+++ b/sources/inc/lang/mr/newpage.txt
@@ -0,0 +1,3 @@
+====== हा मुद्दा अजून अस्तित्त्वात नाही ======
+
+तुमची अशा एखाद्या मुद्द्याच्या लिंक वरून इथे आला आहात जो अजून अस्तित्त्वात नाही. जर तुम्हाला परवानगी असेल तर तुमची त्या मुद्द्यावर "हे पान नवीन तयार करा" हे बटण क्लिक करून स्वतः एक पान तयार करू शकता.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/norev.txt b/sources/inc/lang/mr/norev.txt
new file mode 100644
index 0000000..180b031
--- /dev/null
+++ b/sources/inc/lang/mr/norev.txt
@@ -0,0 +1,3 @@
+====== अशी कुठली आवृत्ती नाही ======
+
+ही आवृत्ती अस्तित्त्वात नाही. "जुन्या आवृत्त्या" बटण वापरून या दस्तावेजाच्या सर्व जुन्या आवृत्त्या तुमची पाहू शकता.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/password.txt b/sources/inc/lang/mr/password.txt
new file mode 100644
index 0000000..090c01d
--- /dev/null
+++ b/sources/inc/lang/mr/password.txt
@@ -0,0 +1,9 @@
+नमस्कार @FULLNAME@!
+
+खाली तुमच्या @DOKUWIKIURL@ येथील @TITLE@ साठी सदस्य माहिती दिली आहे.
+
+लॉगिन :  @LOGIN@
+पासवर्ड : @PASSWORD@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/preview.txt b/sources/inc/lang/mr/preview.txt
new file mode 100644
index 0000000..8277398
--- /dev/null
+++ b/sources/inc/lang/mr/preview.txt
@@ -0,0 +1,3 @@
+====== झलक ======
+
+ही तुमचा मजकूर कसा दिसेल त्याची एक झलक आहे. लक्षात ठेवा : हा मजकूर अजुन **सुरक्षित केलेला नाही** !
\ No newline at end of file
diff --git a/sources/inc/lang/mr/pwconfirm.txt b/sources/inc/lang/mr/pwconfirm.txt
new file mode 100644
index 0000000..ec0b707
--- /dev/null
+++ b/sources/inc/lang/mr/pwconfirm.txt
@@ -0,0 +1,11 @@
+नमस्कार @FULLNAME@!
+
+कोणीतरी तुमच्या @TITLE@ या @DOKUWIKIURL@ येथील लॉगिनसाठी नवीन पासवर्ड मागवला आहे.
+जर तुम्ही हा पासवर्ड मागवला नसेल तर कृपया ह्या ईमेलकड़े दुर्लक्ष करा.
+
+जर नक्की तुम्हीच हा पासवर्ड मागवला असेल तर खालील लिंकवर क्लिक करून ते नक्की करा.
+
+@CONFIRM@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/read.txt b/sources/inc/lang/mr/read.txt
new file mode 100644
index 0000000..b834dd7
--- /dev/null
+++ b/sources/inc/lang/mr/read.txt
@@ -0,0 +1 @@
+हे पान फक्त वाचता येऊ शकतं. तुम्ही त्याचा मूळ विकी मजकूर पाहू शकता पण तो बदलू शकत नाही. जर हे चुकीचं असेल तर तुमच्या विकी व्यवस्थापकाशी संपर्क साधा.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/recent.txt b/sources/inc/lang/mr/recent.txt
new file mode 100644
index 0000000..9a6d6f1
--- /dev/null
+++ b/sources/inc/lang/mr/recent.txt
@@ -0,0 +1,3 @@
+====== अलीकडील बदल ======
+
+खालील पाने हल्लीच बदलली आहेत
\ No newline at end of file
diff --git a/sources/inc/lang/mr/register.txt b/sources/inc/lang/mr/register.txt
new file mode 100644
index 0000000..3aca312
--- /dev/null
+++ b/sources/inc/lang/mr/register.txt
@@ -0,0 +1,3 @@
+====== नवीन सदस्य म्हणुन नोंदणी करा ======
+
+खाली तुमची माहिती भरून या विकी वर नवीन खातं उघडा. कृपया आपण देत असलेला ईमेल चालू असल्याची खात्री करा - जर तुम्हाला इथे पासवर्ड टाकायला सांगितला नाही तयार एक नवीन पासवर्ड तुम्हाला त्या ईमेल वर पाठवला जाइल. तुमचं लॉगिन नाम एक वैध [[doku>pagename|पेजनेम]] असले पाहिजे.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/registermail.txt b/sources/inc/lang/mr/registermail.txt
new file mode 100644
index 0000000..a6fea4d
--- /dev/null
+++ b/sources/inc/lang/mr/registermail.txt
@@ -0,0 +1,13 @@
+एक नवीन सदस्याची नोंदणी झाली आहे. त्याची माहीत पुढीलप्रमाणे :
+
+सदस्य नाम :  @NEWUSER@
+पूर्ण नाव : @NEWNAME@
+ईमेल : @NEWEMAIL@
+
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+होस्ट नाम : @HOSTNAME@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/resendpwd.txt b/sources/inc/lang/mr/resendpwd.txt
new file mode 100644
index 0000000..64b95a4
--- /dev/null
+++ b/sources/inc/lang/mr/resendpwd.txt
@@ -0,0 +1,3 @@
+====== नवीन पासवर्ड पाठव ======
+
+या विकिवरील तुमच्या अकाउंटसाठी नवीन पासवर्ड मिळवण्यासाठी कृपया तुमचे सदस्य नाम खालच्या फॉर्म मधे टाका. ही पासवर्डची मागणी नक्की करण्यासाठी तुम्ही नोंदणी करताना दिलेल्या ईमेल पत्त्यावर एक लिंक पाठवली जाइल.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/revisions.txt b/sources/inc/lang/mr/revisions.txt
new file mode 100644
index 0000000..fb842c7
--- /dev/null
+++ b/sources/inc/lang/mr/revisions.txt
@@ -0,0 +1,3 @@
+====== जुन्या आवृत्त्या ======
+
+ह्या सद्य दस्तावेजच्या जुन्या आवृत्त्या आहेत. एखाद्या जुन्या आवृत्तीवर परत जाण्यासाठी टी खालून निवडा, "हे पान संपादित करा" वर क्लिक करा आणि ते सुरक्षित करा.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/searchpage.txt b/sources/inc/lang/mr/searchpage.txt
new file mode 100644
index 0000000..23e10b1
--- /dev/null
+++ b/sources/inc/lang/mr/searchpage.txt
@@ -0,0 +1,5 @@
+====== शोध ======
+
+तुम्हाला खाली तुमच्या शोधाचे फलित दिसतील. जर तुमची शोधत असलेली गोष्ट तुम्हाला सापडली नाही, तर योग्य बटण वापरून तुम्ही शोधत असलेल्या गोष्टीविषयी तुम्ही एखादे पान निर्माण किंवा संपादित करू शकता.
+
+====== फलित ======
\ No newline at end of file
diff --git a/sources/inc/lang/mr/showrev.txt b/sources/inc/lang/mr/showrev.txt
new file mode 100644
index 0000000..aeaeee5
--- /dev/null
+++ b/sources/inc/lang/mr/showrev.txt
@@ -0,0 +1,2 @@
+** ही ह्या दस्तावेजची जुनी आवृत्ती आहे. **
+--
\ No newline at end of file
diff --git a/sources/inc/lang/mr/stopwords.txt b/sources/inc/lang/mr/stopwords.txt
new file mode 100644
index 0000000..2b413a9
--- /dev/null
+++ b/sources/inc/lang/mr/stopwords.txt
@@ -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
\ No newline at end of file
diff --git a/sources/inc/lang/mr/updateprofile.txt b/sources/inc/lang/mr/updateprofile.txt
new file mode 100644
index 0000000..c08810f
--- /dev/null
+++ b/sources/inc/lang/mr/updateprofile.txt
@@ -0,0 +1,3 @@
+====== तुमची सदस्य माहिती अद्ययावत करा ======
+
+फ़क्त तुम्हाला बदल करायचा असेल तेच रकाने परत भरा. तुमची तुमचे सदस्य नाम बदलू शकत नाही.
\ No newline at end of file
diff --git a/sources/inc/lang/mr/uploadmail.txt b/sources/inc/lang/mr/uploadmail.txt
new file mode 100644
index 0000000..66e7365
--- /dev/null
+++ b/sources/inc/lang/mr/uploadmail.txt
@@ -0,0 +1,13 @@
+एक फाइल तुमच्या डॉक्युविकिवर अपलोड केली गेली आहे. त्याची माहिती याप्रमाणे :
+
+फाइल : @MEDIA@
+दिनांक : @DATE@
+ब्राउजर : @BROWSER@
+IP-पत्ता : @IPADDRESS@
+होस्टनाम : @HOSTNAME@
+साइज़ : @SIZE@
+MIME टाइप : @MIME@
+सदस्य : @USER@
+
+-- 
+हा ईमेल @DOKUWIKIURL@ येथील डॉक्युविकिद्वारा आपोआप तयार केला गेला आहे.
\ No newline at end of file
diff --git a/sources/inc/lang/ms/lang.php b/sources/inc/lang/ms/lang.php
new file mode 100644
index 0000000..02c0e2c
--- /dev/null
+++ b/sources/inc/lang/ms/lang.php
@@ -0,0 +1,97 @@
+>';
+$lang['btn_revs']              = 'Sejarah';
+$lang['btn_recent']            = 'Perubahan Terkini';
+$lang['btn_upload']            = 'Unggah (upload)';
+$lang['btn_cancel']            = 'Batal';
+$lang['btn_secedit']           = 'Sunting';
+$lang['btn_login']             = 'Masuk';
+$lang['btn_logout']            = 'Keluar';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Kemaskini';
+$lang['btn_delete']            = 'Hapus';
+$lang['btn_back']              = 'Balik';
+$lang['btn_backlink']          = 'Pautan ke halaman ini';
+$lang['btn_backtomedia']       = 'Balik ke rangkaian pilihan fail media';
+$lang['btn_subscribe']         = 'Pantau';
+$lang['btn_profile']           = 'Kemaskinikan profil';
+$lang['btn_reset']             = 'Batalkan suntingan';
+$lang['btn_resendpwd']         = 'Emel kata laluan baru';
+$lang['btn_draft']             = 'Sunting draf';
+$lang['btn_recover']           = 'Pulihkan draf';
+$lang['btn_draftdel']          = 'Hapuskan draf';
+$lang['btn_revert']            = 'Pulihkan';
+$lang['btn_register']          = 'Daftaran';
+$lang['btn_apply']             = 'Simpan';
+$lang['btn_media']             = 'Manager media';
+$lang['loggedinas']            = 'Log masuk sebagai';
+$lang['user']                  = 'Nama pengguna';
+$lang['pass']                  = 'Kata laluan';
+$lang['newpass']               = 'Kata laluan baru';
+$lang['oldpass']               = 'Kata laluan lama';
+$lang['passchk']               = 'sekali lagi';
+$lang['remember']              = 'Sentiasa ingati kata laluan saya.';
+$lang['fullname']              = 'Nama sebenar';
+$lang['email']                 = 'E-mel';
+$lang['profile']               = 'Profil pengguna';
+$lang['badlogin']              = 'Maaf, ralat log masuk. Nama pengguna atau kata laluan salah.';
+$lang['minoredit']             = 'Suntingan Kecil';
+$lang['draftdate']             = 'Draf automatik disimpan pada';
+$lang['nosecedit']             = 'Halaman ini telah bertukar pada waktu sementara dan info bahagian ini telah luput. Seluruh halaman telah disarat.';
+$lang['regmissing']            = 'Maaf, semua medan mesti diisi';
+$lang['reguexists']            = 'Maaf, nama pengguna yang dimasukkan telah diguna. Sila pilih nama yang lain.';
+$lang['regsuccess']            = 'Akaun pengguna telah dicipta dan kata laluan telah dikirim kepada e-mel anda.';
+$lang['regsuccess2']           = 'Akaun pegguna telah dicipta.';
+$lang['regbadmail']            = 'Format alamat e-mel tidak sah. Sila masukkan semula ataupun kosongkan sahaja medan tersebut.';
+$lang['regbadpass']            = 'Kedua-dua kata laluan tidak sama. Sila masukkan semula.';
+$lang['regpwmail']             = 'Kata laluan Dokuwiki anda';
+$lang['reghere']               = 'Belum mendaftar akaun? Dapat akaun baru';
+$lang['profna']                = 'Wiki ini tidak menyokong modifikasi profil';
+$lang['profnoempty']           = 'Medan nama pengguna atau e-mel yang kosong tidak dibenarkan.';
+$lang['profchanged']           = 'Profil pengguna telah dikemaskini.';
+$lang['pwdforget']             = 'Terlupa kata laluan? Dapatkan yang baru';
+$lang['resendpwd']             = 'Kirimkan kata laluan baru untuk';
+$lang['resendpwdmissing']      = 'Maaf, semua medan perlu diisi.';
+$lang['resendpwdnouser']       = 'Maaf, nama pengguna ini tidak dapat dicari dalam database kami.';
+$lang['resendpwdbadauth']      = 'Maaf, kod authorasi ini tidak sah. Semak bahawa anda telah menggunakan seluruh pautan pengesahan yang dikirim.';
+$lang['resendpwdconfirm']      = 'Pautan pengesahan telah dikirimkan ke e-mel anda.';
+$lang['resendpwdsuccess']      = 'Kata laluan baru telah dikirimkan ke e-mel anda.';
+$lang['license']               = 'Selain daripada yang dinyata, isi wiki ini disediakan dengan lesen berikut:';
+$lang['licenseok']             = 'Perhatian: Dengan menyunting halaman ini, anda setuju untuk isi-isi anda dilesen menggunakan lesen berikut:';
+$lang['searchmedia']           = 'Cari nama fail:';
+$lang['searchmedia_in']        = 'Cari di %s';
+$lang['txt_upload']            = 'Pilih fail untuk diunggah';
+$lang['txt_filename']          = 'Unggah fail dengan nama (tidak wajib)';
+$lang['txt_overwrt']           = 'Timpa fail sekarang';
+$lang['lockedby']              = 'Halaman ini telah di';
+$lang['fileupload']            = 'Muat naik fail';
+$lang['uploadsucc']            = 'Pemuatan naik berjaya';
+$lang['uploadfail']            = 'Ralat muat naik';
+$lang['uploadxss']             = 'Fail ini mengandungi kod HTML atau kod skrip yang mungkin boleh disalah tafsir oleh pelayar web.';
+$lang['toc']                   = 'Jadual Kandungan';
+$lang['current']               = 'kini';
+$lang['restored']              = 'Telah dikembalikan ke semakan sebelumnya (%s)';
+$lang['summary']               = 'Paparan';
diff --git a/sources/inc/lang/ne/admin.txt b/sources/inc/lang/ne/admin.txt
new file mode 100644
index 0000000..7a829db
--- /dev/null
+++ b/sources/inc/lang/ne/admin.txt
@@ -0,0 +1,2 @@
+====== व्यवस्थापन ======
+तल तपाईले  DokuWikiमा  उपलव्ध व्यवस्थापकिय कार्यहरुको सुची पाउन सक्नुहुन्छ ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/backlinks.txt b/sources/inc/lang/ne/backlinks.txt
new file mode 100644
index 0000000..51b9573
--- /dev/null
+++ b/sources/inc/lang/ne/backlinks.txt
@@ -0,0 +1,2 @@
+====== पछाडि लिङ्क ======
+यो पृष्ठहरुको सुचीहरुले पछाडि लिङ्क स्वयंलाई नै गरेको छ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/conflict.txt b/sources/inc/lang/ne/conflict.txt
new file mode 100644
index 0000000..457e108
--- /dev/null
+++ b/sources/inc/lang/ne/conflict.txt
@@ -0,0 +1,5 @@
+====== नयाँ संस्करण उपलब्ध छ ======
+
+तपाईले सम्पादन गर्नुभएको पाठको नयाँ सस्करण उपलब्ध छ। तपाईले सम्पादन गरिरहनु भएको समयमा अर्को प्रयोगकर्ताले यो पाठ परिवर्तन गरेकोले यस्तो भएको हो ।
+
+दुबैका फरक दाज्नुहोस् र दुईमा कुन राख्नेहो  निश्चित गर्नुहोस् ।तपाईले "वचत गर्नुहोस् " छान्नु भयो भने तपाईको संस्करण वचत हुनेछ। "रद्द गर्नुहोस्" छान्नु भयो भने अहिलेको संस्करण वचत हुनेछ । 
\ No newline at end of file
diff --git a/sources/inc/lang/ne/denied.txt b/sources/inc/lang/ne/denied.txt
new file mode 100644
index 0000000..ab4bcf2
--- /dev/null
+++ b/sources/inc/lang/ne/denied.txt
@@ -0,0 +1,3 @@
+====== अनुमति अमान्य ======
+
+माफ गर्नुहोला तपाईलाई अगाडि बढ्न अनुमति छैन। सम्भवत: तपाईले प्रवेश गर्न भुल्नु भयो।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/diff.txt b/sources/inc/lang/ne/diff.txt
new file mode 100644
index 0000000..76d75fb
--- /dev/null
+++ b/sources/inc/lang/ne/diff.txt
@@ -0,0 +1,3 @@
+====== भिन्नताहरु ======
+
+यसले यो पृष्ठको  छानिएको संस्करण र हालको संकरण बीच भिन्नताहरु देखाउँछ ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/draft.txt b/sources/inc/lang/ne/draft.txt
new file mode 100644
index 0000000..88630c9
--- /dev/null
+++ b/sources/inc/lang/ne/draft.txt
@@ -0,0 +1,5 @@
+====== ड्राफ्ट फाइल भेटियो ======
+
+तपाईको यो पृष्ठको गत सम्पादन सफलतापूर्वक सम्पन्न भएको थिएन ।DokuWiki ले स्वचालितरुपमा ड्राफ्ट वचतगरेको छ त्यस देखि तपाईले आफ्नो सम्पादन कार्यमा निरन्तरता दिन सक्नुहुन्छ। तल तपाईले गत सत्रमा बचत गरिएको सामग्री देख्न सक्नुहुन्छ ।
+
+कृपया निर्णय दिनुहोस्  कि तपाई गत सत्रमा बचत गरिएको सत्रको सम्पादनकार्य  //recover// , //delete// वा  //cancel//  के गर्न चाहनुहुन्छ भनेर।
diff --git a/sources/inc/lang/ne/edit.txt b/sources/inc/lang/ne/edit.txt
new file mode 100644
index 0000000..be498a6
--- /dev/null
+++ b/sources/inc/lang/ne/edit.txt
@@ -0,0 +1 @@
+पृष्ठ सम्पादन गर्नुहोस र "बचत" मा थिच्नुहोस् । सिन्टेक्सको लागि  [[wiki:syntax]] हेर्नुहोस् । यो पृष्ठलाई **सुधार्न** सक्नुहुन्छ भने मात्र सम्पादन गर्नुहोस् ।यदि कुनै प्रयोग गर्न या , जान्न चाहनुहुन्छ भने [[playground:playground|playground]] को प्रयोग गर्नुहोस् ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/editrev.txt b/sources/inc/lang/ne/editrev.txt
new file mode 100644
index 0000000..0db67c2
--- /dev/null
+++ b/sources/inc/lang/ne/editrev.txt
@@ -0,0 +1,2 @@
+** तपाईले यस कागजातको पुरानो संस्करण खोल्नु भएको छ ।** यदि यसलाई वचत गर्नुभयो भने यसैसामग्रीबाट नयाँ संस्करणको निर्माण हुनेछ ।
+----
\ No newline at end of file
diff --git a/sources/inc/lang/ne/index.txt b/sources/inc/lang/ne/index.txt
new file mode 100644
index 0000000..cb06f03
--- /dev/null
+++ b/sources/inc/lang/ne/index.txt
@@ -0,0 +1,3 @@
+====== सुची ======
+
+यो सबै उपलाब्ध पृष्ठहरुको [[doku>namespaces|namespaces]] का आधारमा मिलाइएको सुची हो ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/lang.php b/sources/inc/lang/ne/lang.php
new file mode 100644
index 0000000..7fd14d2
--- /dev/null
+++ b/sources/inc/lang/ne/lang.php
@@ -0,0 +1,194 @@
+
+ * @author Saroj Kumar Dhakal 
+ */
+$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_profile']           = 'प्रोफाइल अध्यावधिक गर्नुहोस् ';
+$lang['btn_reset']             = 'पूर्वरुपमा फर्काउनुहोस';
+$lang['btn_draft']             = ' ड्राफ्ट सम्पादन गर्नुहोस् ';
+$lang['btn_recover']           = 'पहिलेको ड्राफ्ट हासिल गर्नुहोस ';
+$lang['btn_draftdel']          = ' ड्राफ्ट मेटाउनुहोस् ';
+$lang['btn_register']          = 'दर्ता  गर्नुहोस्';
+$lang['loggedinas']            = 'प्रवेश गर्नुहोस् ';
+$lang['user']                  = 'प्रयोगकर्ता ';
+$lang['pass']                  = 'प्रवेशशव्द';
+$lang['newpass']               = 'नयाँ प्रवेशशव्द';
+$lang['oldpass']               = 'नयाँ प्रवेशशव्द निश्चित गर्नुहोस ';
+$lang['passchk']               = 'एकपटक पुन:';
+$lang['remember']              = 'मलाई सम्झनु';
+$lang['fullname']              = 'पूरा नाम';
+$lang['email']                 = 'इमेल';
+$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']             = 'तपाईको DokuWiki प्रवेशशब्द ';
+$lang['reghere']               = 'तपाईको आफ्नै खाता छैन ? अहिल्यै एउटा बनाउनुहोस् ';
+$lang['profna']                = 'यो विकिले यो प्रोफाइल परिवर्तन समर्थन गर्दैन ।';
+$lang['profnochange']          = 'केहि  परिवर्तन छैन , केहि गर्नु छैन ।';
+$lang['profnoempty']           = 'खाली नाम वा इमेल ठेगानालाई अनुमति छैन ।';
+$lang['profchanged']           = 'प्रयोगकर्ताको प्रफाइल सफलरुपमा परिवर्तन भयो ।';
+$lang['pwdforget']             = 'आफ्नो पासवर्ड भुल्नु भयो ? नयाँ हासिल गर्नुहोस् ';
+$lang['resendna']              = 'यो विकिबाट प्रवेशशव्द पठाउन समर्थित छैन ।';
+$lang['resendpwd']             = 'नयाँ  प्रवेशशव्द पठाउनुहोस् ';
+$lang['resendpwdnouser']       = 'माफ गर्नुहोस्,  हाम्रो डेटावेसमा यो प्रयोगकर्ता भेटिएन ।';
+$lang['resendpwdbadauth']      = 'माफ गर्नुहोस् , यो अनुमति चिन्ह गलत छ। तपाईले पूरै जानकारी लिङ्क प्रयोग गर्नु पर्नेछ। ';
+$lang['resendpwdconfirm']      = 'तपाईको इमेलमा कन्फरमेशन लिङ्क पठाइएको छ। ';
+$lang['resendpwdsuccess']      = 'तपाईको प्रवेशशव्द इमेलबाट पठाइएको छ। ';
+$lang['license']               = 'खुलाइएको बाहेक, यस विकिका विषयवस्तुहरु निम्त प्रमाण द्वारा प्रमाणिक गरिएको छ।';
+$lang['licenseok']             = 'नोट: यस पृष्ठ सम्पादन गरी तपाईले आफ्नो विषयवस्तु तलको प्रमाण पत्र अन्तर्गत प्रमाणिक गर्न राजी हुनु हुनेछ ।';
+$lang['txt_upload']            = 'अपलोड गर्नलाई फाइल छा्न्नुहो्स्';
+$lang['txt_filename']          = 'अर्को रुपमा अपलोड गर्नुहोस् (ऐच्छिक)';
+$lang['txt_overwrt']           = 'रहेको उहि नामको फाइललाई मेटाउने';
+$lang['lockedby']              = 'अहिले ताल्चा लगाइएको';
+$lang['lockexpire']            = 'ताल्चा अवधि सकिने :';
+$lang['js']['willexpire']      = 'तपाईलले यो पृष्ठ सम्पादन गर्न लगाउनु भएको ताल्चाको अवधि एक मिनेट भित्र सकिदै छ। \n द्वन्द हुन नदिन  पूर्वरुप वा ताल्चा समय परिवर्तन गर्नुहोस् ।';
+$lang['js']['notsavedyet']     = 'तपाईले वचन गर्नु नभएको परिवर्रन हराउने छ। \n साच्चै जारी गर्नुहुन्छ ।';
+$lang['js']['keepopen']        = 'छनौटमा विन्डो खुला राख्नुहोस् ';
+$lang['js']['hidedetails']     = 'जानकारी लुकाउनु होस् ';
+$lang['js']['nosmblinks']      = 'विन्डोहरु लिङ्क गर्दा माइक्रो सफ्ट एक्सप्लोररमामात्र  काम साझा हुन्छ । तर कपि गर्न र टास्न मिल्छ।   ';
+$lang['js']['del_confirm']     = 'साच्चै छानिएका वस्तुहरु मेट्ने हो ?';
+$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"  मेट्न सकिएन - अनुमति हेर्नुहोस् ।';
+$lang['mediainuse']            = 'फाइल "%s" मेटिएको छैन - प्रयोगमा छ।';
+$lang['namespaces']            = 'नेमस्पेसहरु ';
+$lang['mediafiles']            = ' उपलब्ध फाइलहरु ';
+$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['external_edit']         = 'बाह्य सम्पादन';
+$lang['summary']               = 'सम्पादनको बारेमा';
+$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']                 = 'पहिलो स्तरको शिर्षक(लेभल १ हेडलाइन)';
+$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['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['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 function %s उपलव्ध छैन । हुनसक्छ तपाईको होस्टिङ्ग प्रदायकले कुनै कारण वश यसलाई वन्द गरिदिएका हुनसक्छन् । ';
+$lang['i_phpver']              = 'तपाईको PHP संस्करण %s चाहिएको %s भन्दा कम छ। तपाईले आफ्नो PHP स्थापना अध्यावधिक गर्नुपर्छ ।';
+$lang['i_permfail']            = '%s DokuWiki द्वारा लेख्य छैन । तपाईले डाइरेक्टरीको अनुमति परिवर्तन गर्नुपर्छ !';
+$lang['i_confexists']          = '%s पहिले देखि नै रहेको छ।';
+$lang['i_writeerr']            = '%s बनाउन असमर्थ । तपाईले डाइरेक्टरी / फाइल अनुमति जाच्नु पर्छ र फाइल आफैले बनाउनु पर्छ ।';
+$lang['i_badhash']             = 'पहिचान हुन नसकेको वा परिवर्तित  okuwiki.php (hash=code>%s)';
+$lang['i_badval']              = '%s - अवैध वा रित्तो मान ';
+$lang['i_success']             = 'स्थापना सफलरुपमा समाप्त भयो ।तपाई install.php मेट्न सक्नुहु्न्छ । तपाईको नयाँ DokuWiki निरन्तर गर्न सक्नुहुन्छ ।';
+$lang['i_failure']             = 'स्थापना समयमा केहि त्रुटि फेला पर्यो ।तपाईले आफैले यसलाई तपाईको नयाँ DokuWiki प्रयोग गर्नु अगि	सच्याउनुपर्ने  हुन्छ ।';
+$lang['i_policy']              = 'सुरुको ACL निति';
+$lang['i_pol0']                = 'खुल्ला विकि (पठन, लेखन , अपलोड ) सबैका लागि';
+$lang['i_pol1']                = 'Public विकि (पठन सवैका लागि,लेखन र अपलोड दर्ता गरिएका प्रयपगकर्ताका लागि ) ';
+$lang['i_pol2']                = 'बन्द विकि (पठन , लेखन, अपलोड ) दर्ता भएका प्रयोगकर्ताका लागि मात्र ।';
+$lang['i_retry']               = 'पुन: प्रयास गर्नुहोस् ';
+$lang['recent_global']         = 'तपाई अहिले %s नेमस्पेस भित्र भएका परिवर्तन हेर्दैहुनुहुन्छ। तपाई पुरै विकिमा भएको परिवर्तन हेर्न सक्नुहुन्छ.';
diff --git a/sources/inc/lang/ne/locked.txt b/sources/inc/lang/ne/locked.txt
new file mode 100644
index 0000000..85f5390
--- /dev/null
+++ b/sources/inc/lang/ne/locked.txt
@@ -0,0 +1,3 @@
+====== पृष्ठमा ताला लगाएको छ ======
+
+यो पृष्ठ अर्को प्रयोगकर्ताद्वारा सम्पादनका लागि ताला लगाइएको छ । तपाईले सम्पादन समाप्त नहुन्जेल या तालाको समय समाप्त नहुन्जेल सम्म प्रतिक्षागर्नु पर्छ ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/norev.txt b/sources/inc/lang/ne/norev.txt
new file mode 100644
index 0000000..28c4efb
--- /dev/null
+++ b/sources/inc/lang/ne/norev.txt
@@ -0,0 +1,2 @@
+====== कुनै त्यस्तो पुन:संस्करण भेटिएन ======
+खुलाइएको पुन:संस्करण अस्तित्वमा छैन ।यस कागजातको सम्पूर्ण संस्करणको  सुचीको लागि  "पुरानो पुन:संस्करण" बटन प्रयोग  गर्नुहोस् ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/pwconfirm.txt b/sources/inc/lang/ne/pwconfirm.txt
new file mode 100644
index 0000000..1d8cd9f
--- /dev/null
+++ b/sources/inc/lang/ne/pwconfirm.txt
@@ -0,0 +1,12 @@
+नमस्कार @FULLNAME@!
+
+कसैद्वारा तपाईको @TITLE@ को लागि नयाँ प्रवेशशब्द माग भएको छ ।@DOKUWIKIURL@मा प्रवेश  ।
+
+यदि तपाईले नयाँ प्रवेशशब्दको माग गर्नुभएको हैन भने यस इमेललाई वेवास्ता गर्न सक्नुहुन्छ ।
+
+कृपया तपाईको माग साच्चै पठाइएको थियो भन्ने   यकिन गराउनाको लागि तलाको लिङ्कमा प्रयोग गर्नुहोस्  ।
+
+@CONFIRM@
+
+-- 
+यो पत्र DokuWiki ले  @DOKUWIKIURL@ मा तयार पारेको हो ।
diff --git a/sources/inc/lang/ne/read.txt b/sources/inc/lang/ne/read.txt
new file mode 100644
index 0000000..e004cd3
--- /dev/null
+++ b/sources/inc/lang/ne/read.txt
@@ -0,0 +1 @@
+यो पृष्ठ पढ्नको लागि मात्र हो । तपाई स्रोतहेर्न सक्नुहुन्छ ,तर सम्पादन भने गर्न सक्नुहुन्न । तपाईको व्यवस्थापक(administrator) सँग के समस्या छ भनेर सोध्नु होला ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/recent.txt b/sources/inc/lang/ne/recent.txt
new file mode 100644
index 0000000..239903f
--- /dev/null
+++ b/sources/inc/lang/ne/recent.txt
@@ -0,0 +1,2 @@
+====== हालैको परिवर्तन ======
+निम्न पृष्ठहरु हालै परिवर्तन गरिएका छन् ।
\ No newline at end of file
diff --git a/sources/inc/lang/ne/resendpwd.txt b/sources/inc/lang/ne/resendpwd.txt
new file mode 100644
index 0000000..aec9dfb
--- /dev/null
+++ b/sources/inc/lang/ne/resendpwd.txt
@@ -0,0 +1,3 @@
+====== नयाँ प्रवेशशब्द पठाउनुहोस् ======
+
+कृपया तपाईको यस विकीमा रहेको खाताको लाहि नयाँ प्रवेशशव्द अनुरोध गर्न तपाईँको नाम निम्न फर्ममा प्रविष्ट गर्नुहोस । एउटा किटानी लिङ्क तपाईले दर्ता गर्नु भएको इमेल ठेगानामा पठाइने छ ।  
\ No newline at end of file
diff --git a/sources/inc/lang/ne/searchpage.txt b/sources/inc/lang/ne/searchpage.txt
new file mode 100644
index 0000000..a8139f0
--- /dev/null
+++ b/sources/inc/lang/ne/searchpage.txt
@@ -0,0 +1,3 @@
+====== खोज ======
+तपाईले आफ्नो खोजको निम्न नतिजा  पाउन सक्नुहुन्छ। यदि तपाईले आफुले खोजेको पाउनुभएन भने, तपाईलेको उपयुक्त बटन प्रयोग गरी खोज सँग सम्बन्धित शिर्षकहरु भएका पृष्ठ सृजना या सम्पादन गर्न सक्नुहुन्छ ।
+===== नतिजा =====
\ No newline at end of file
diff --git a/sources/inc/lang/ne/showrev.txt b/sources/inc/lang/ne/showrev.txt
new file mode 100644
index 0000000..5b22e97
--- /dev/null
+++ b/sources/inc/lang/ne/showrev.txt
@@ -0,0 +1,2 @@
+** यो कागजातको पुरानो पुन:संस्करण हो !**
+---
\ No newline at end of file
diff --git a/sources/inc/lang/ne/updateprofile.txt b/sources/inc/lang/ne/updateprofile.txt
new file mode 100644
index 0000000..e3027e4
--- /dev/null
+++ b/sources/inc/lang/ne/updateprofile.txt
@@ -0,0 +1,3 @@
+‌‌‍‍‍======तपाईँको खाताको जानकारी अद्यावधिक गर्नुहोस्======
+
+तपाईँले आफूले परिवर्तन गर्न चाहेको फिल्ड मात्र परिवर्तन गरे पुग्छ । तपाईँले आफ्नो प्रयोगकर्ता नाम परिवर्तन गर्न पाउनुहुने छैन ।
diff --git a/sources/inc/lang/ne/uploadmail.txt b/sources/inc/lang/ne/uploadmail.txt
new file mode 100644
index 0000000..74ea464
--- /dev/null
+++ b/sources/inc/lang/ne/uploadmail.txt
@@ -0,0 +1,13 @@
+एउटा फाइल तपाईको DokuWiki मा भरण गरिएको छ। थप जानकारी निम्न रहेका छन् :
+फाइल : @MEDIA@
+मिति : @DATE@
+ब्राउजर : @BROWSER@
+आइपि ठगाना  : @IPADDRESS@
+होस्टनाम : @HOSTNAME@
+आकार : @SIZE@
+MIME प्रकार : @MIME@
+प्रयोगकर्ता : @USER@
+
+-- 
+यो पत्र  DokuWiki  ले
+@DOKUWIKIURL@मा स्वत: तयार पारेको हो।
\ No newline at end of file
diff --git a/sources/inc/lang/nl/admin.txt b/sources/inc/lang/nl/admin.txt
new file mode 100644
index 0000000..7138456
--- /dev/null
+++ b/sources/inc/lang/nl/admin.txt
@@ -0,0 +1,3 @@
+====== Beheer ======
+
+Hieronder zie je een lijst van beheertaken beschikbaar in DokuWiki.
diff --git a/sources/inc/lang/nl/adminplugins.txt b/sources/inc/lang/nl/adminplugins.txt
new file mode 100644
index 0000000..916a9ca
--- /dev/null
+++ b/sources/inc/lang/nl/adminplugins.txt
@@ -0,0 +1 @@
+===== Additionele plugins =====
\ No newline at end of file
diff --git a/sources/inc/lang/nl/backlinks.txt b/sources/inc/lang/nl/backlinks.txt
new file mode 100644
index 0000000..6edbf40
--- /dev/null
+++ b/sources/inc/lang/nl/backlinks.txt
@@ -0,0 +1,4 @@
+====== Backlinks ======
+
+Dit is een lijst van pagina's die terug lijken te wijzen naar de huidige pagina.
+
diff --git a/sources/inc/lang/nl/conflict.txt b/sources/inc/lang/nl/conflict.txt
new file mode 100644
index 0000000..9262145
--- /dev/null
+++ b/sources/inc/lang/nl/conflict.txt
@@ -0,0 +1,5 @@
+====== Er bestaat een nieuwere versie ======
+
+Er bestaat een nieuwere versie van het document dat aangepast wordt. Dit komt voor als een andere gebruiker dit document tegelijk met jou wijzigt.
+
+Bekijk de verschillen die beneden weergegeven worden uitvoerig, beslis dan welke versie de beste is en dus bewaard moet worden. Klik op ''opslaan'' om de eigen versie te bewaren. Klik op ''annuleren'' om de huidige versie te bewaren.
diff --git a/sources/inc/lang/nl/denied.txt b/sources/inc/lang/nl/denied.txt
new file mode 100644
index 0000000..6a8bf77
--- /dev/null
+++ b/sources/inc/lang/nl/denied.txt
@@ -0,0 +1,3 @@
+====== Toegang geweigerd ======
+
+Sorry: je hebt niet voldoende rechten om verder te gaan. Misschien ben je vergeten in te loggen?
diff --git a/sources/inc/lang/nl/diff.txt b/sources/inc/lang/nl/diff.txt
new file mode 100644
index 0000000..ef5a1b1
--- /dev/null
+++ b/sources/inc/lang/nl/diff.txt
@@ -0,0 +1,3 @@
+====== Verschillen ======
+
+Dit geeft de verschillen weer tussen de geselecteerde revisie en de huidige revisie van de pagina.
diff --git a/sources/inc/lang/nl/draft.txt b/sources/inc/lang/nl/draft.txt
new file mode 100644
index 0000000..a6bf527
--- /dev/null
+++ b/sources/inc/lang/nl/draft.txt
@@ -0,0 +1,5 @@
+===== Conceptbestand gevonden =====
+
+Je laatste bewerking op deze pagina is niet volledig afgerond. DokuWiki heeft automatisch een concept van je werk opgeslagen waarmee je nu verder kunt gaan. Hieronder tref je het concept aan.
+
+Beslis of je het concept wilt //herstellen//, //verwijderen// of het bewerken wilt //annuleren//.
diff --git a/sources/inc/lang/nl/edit.txt b/sources/inc/lang/nl/edit.txt
new file mode 100644
index 0000000..9718d09
--- /dev/null
+++ b/sources/inc/lang/nl/edit.txt
@@ -0,0 +1 @@
+Pas de pagina aan en klik op ''Opslaan''. Zie [[wiki:syntax]] voor de Wiki-syntax. Pas  de pagina allen aan als hij **verbeterd** kan worden. Als je iets wilt uitproberen kun je spelen in de  [[playground:playground|zandbak]].
diff --git a/sources/inc/lang/nl/editrev.txt b/sources/inc/lang/nl/editrev.txt
new file mode 100644
index 0000000..1b2d130
--- /dev/null
+++ b/sources/inc/lang/nl/editrev.txt
@@ -0,0 +1,2 @@
+**Er is een oude revisie van het document geladen!** Als je nu opslaat bewaar je een nieuwe versie met deze inhoud.
+----
diff --git a/sources/inc/lang/nl/index.txt b/sources/inc/lang/nl/index.txt
new file mode 100644
index 0000000..ad7122b
--- /dev/null
+++ b/sources/inc/lang/nl/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Dit is een index van alle beschikbare pagina's gesorteerd op [[doku>namespaces|namespaces]].
+
diff --git a/sources/inc/lang/nl/install.html b/sources/inc/lang/nl/install.html
new file mode 100644
index 0000000..a653258
--- /dev/null
+++ b/sources/inc/lang/nl/install.html
@@ -0,0 +1,14 @@
+
        Deze pagina helpt u bij de eerste installatie en configuratie van Dokuwiki.
+Meer informatie over deze installer is beschikbaar op zijn eigen documentatiepagina.
        
+
+
        DokuWiki gebruikt platte tekstbestanden voor het opslaan van wikipagina's en andere informatie die bij deze pagina's horen (bijvoorbeeld plaatjes, zoek-indexen, oude revisies enz.). Om goed te kunnen functioneren, moet
+DokuWiki schrijftoegang hebben tot de directories die deze bestanden bevatten.
+De installer kan zelf deze toegangspermissies niet regelen. Dit moet normaal gesproken direct in de command shell worden ingevoerd, of in het geval van hosting via FTP of via uw hosting control panel (bijvoorbeeld cPanel).
        
+
+
        Deze installer zal uw DokuWiki configureren voor ACL,
+wat de beheerder in staat stelt in te loggen en toegang te verkrijgen tot het beheersdeel van de DokuWiki voor het installeren van plugins, beheren van gebruikers, toegangsrechten tot wiki pagina's en veranderen van configuratie-instellingen.
+Het is niet noodzakelijk voor DokuWiki om te functioneren maar het maakt het een stuk makkelijker om Dokuwiki te beheren.
        
+
+
        Ervaren gebruikers of gebruikers die een aangepaste configuratie nodig hebben kunnen voor details terecht op de volgende pagina's:
+installatie-instructies
+en configuratie-instellingen.
        
diff --git a/sources/inc/lang/nl/lang.php b/sources/inc/lang/nl/lang.php
new file mode 100644
index 0000000..227448c
--- /dev/null
+++ b/sources/inc/lang/nl/lang.php
@@ -0,0 +1,348 @@
+
+ * @author Jack van Klaren 
+ * @author Riny Heijdendael 
+ * @author Koen Huybrechts 
+ * @author Wouter Schoot 
+ * @author John de Graaff 
+ * @author Dion Nicolaas 
+ * @author Danny Rotsaert 
+ * @author Matthias Carchon 
+ * @author Marijn Hofstra 
+ * @author Timon Van Overveldt 
+ * @author Jeroen
+ * @author Ricardo Guijt 
+ * @author Gerrit 
+ * @author mprins 
+ * @author Gerrit Uitslag 
+ * @author Klap-in 
+ * @author Remon 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Pagina aanpassen';
+$lang['btn_source']            = 'Toon broncode';
+$lang['btn_show']              = 'Toon pagina';
+$lang['btn_create']            = 'Maak deze pagina aan';
+$lang['btn_search']            = 'Zoeken';
+$lang['btn_save']              = 'Opslaan';
+$lang['btn_preview']           = 'Voorbeeld';
+$lang['btn_top']               = 'Terug naar boven';
+$lang['btn_newer']             = '<< recenter';
+$lang['btn_older']             = 'ouder >>';
+$lang['btn_revs']              = 'Oude revisies';
+$lang['btn_recent']            = 'Recente aanpassingen';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Annuleren';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Aanpassen';
+$lang['btn_login']             = 'Inloggen';
+$lang['btn_logout']            = 'Uitloggen';
+$lang['btn_admin']             = 'Beheer';
+$lang['btn_update']            = 'Bijwerken';
+$lang['btn_delete']            = 'Verwijder';
+$lang['btn_back']              = 'Terug';
+$lang['btn_backlink']          = 'Referenties';
+$lang['btn_backtomedia']       = 'Terug naar Bestandsselectie';
+$lang['btn_subscribe']         = 'Inschrijven wijzigingen';
+$lang['btn_profile']           = 'Profiel aanpassen';
+$lang['btn_reset']             = 'Wissen';
+$lang['btn_resendpwd']         = 'Nieuw wachtwoord bepalen';
+$lang['btn_draft']             = 'Bewerk concept';
+$lang['btn_recover']           = 'Herstel concept';
+$lang['btn_draftdel']          = 'Verwijder concept';
+$lang['btn_revert']            = 'Herstellen';
+$lang['btn_register']          = 'Registreren';
+$lang['btn_apply']             = 'Toepassen';
+$lang['btn_media']             = 'Mediabeheerder';
+$lang['btn_deleteuser']        = 'Verwijder mijn account';
+$lang['loggedinas']            = 'Ingelogd als';
+$lang['user']                  = 'Gebruikersnaam';
+$lang['pass']                  = 'Wachtwoord';
+$lang['newpass']               = 'Nieuw wachtwoord';
+$lang['oldpass']               = 'Bevestig huidig wachtwoord';
+$lang['passchk']               = 'nogmaals';
+$lang['remember']              = 'Bewaar';
+$lang['fullname']              = 'Volledige naam';
+$lang['email']                 = 'E-mail';
+$lang['profile']               = 'Gebruikersprofiel';
+$lang['badlogin']              = 'Sorry, gebruikersnaam of wachtwoord onjuist';
+$lang['badpassconfirm']        = 'Sorry, het wachtwoord was 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['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.';
+$lang['regsuccess2']           = 'De gebruiker is aangemaakt.';
+$lang['regmailfail']           = 'Het lijkt erop dat het sturen van de wachtwoordmail mislukt is. Neem contact op met de beheerder!';
+$lang['regbadmail']            = 'Het opgegeven e-mailadres lijkt ongeldig - als je denkt dat dit niet klopt neem dan contact op met de beheerder.';
+$lang['regbadpass']            = 'De twee ingevoerde wachtwoorden zijn niet identiek. Probeer het nog eens.';
+$lang['regpwmail']             = 'Je DokuWiki wachtwoord';
+$lang['reghere']               = 'Je hebt nog geen account? Vraag er eentje aan';
+$lang['profna']                = 'Deze wiki ondersteunt geen profielwijzigingen';
+$lang['profnochange']          = 'Geen wijzigingen, niets gedaan';
+$lang['profnoempty']           = 'Een lege gebruikersnaam of e-mailadres is niet toegestaan';
+$lang['profchanged']           = 'Gebruikersprofiel succesvol aangepast';
+$lang['profnodelete']          = 'Deze wiki heeft biedt geen ondersteuning voor verwijdering van gebruikers';
+$lang['profdeleteuser']        = 'Verwijder gebruiker';
+$lang['profdeleted']           = 'Uw gebruikersaccount is verwijderd van deze wiki';
+$lang['profconfdelete']        = 'Ik wil mijn gebruikersaccount verwijderen van deze wiki. 
         Deze actie kan niet ongedaan gemaakt worden.';
+$lang['profconfdeletemissing'] = 'Bevestigingsvinkje niet gezet';
+$lang['pwdforget']             = 'Je wachtwoord vergeten? Vraag een nieuw wachtwoord aan';
+$lang['resendna']              = 'Deze wiki ondersteunt het verzenden van wachtwoorden niet';
+$lang['resendpwd']             = 'Nieuw wachtwoord bepalen voor';
+$lang['resendpwdmissing']      = 'Sorry, je moet alle velden invullen.';
+$lang['resendpwdnouser']       = 'Sorry, we kunnen deze gebruikersnaam niet vinden in onze database.';
+$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 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';
+$lang['maxuploadsize']         = 'Max %s per bestand';
+$lang['lockedby']              = 'Momenteel in gebruik door';
+$lang['lockexpire']            = 'Exclusief gebruiksrecht vervalt op';
+$lang['js']['willexpire']      = 'Je exclusieve gebruiksrecht voor het aanpassen van deze pagina verloopt over een minuut.\nKlik op de Voorbeeld-knop om het exclusieve gebruiksrecht te verlengen.';
+$lang['js']['notsavedyet']     = 'Nog niet bewaarde wijzigingen zullen verloren gaan.
+Weet je zeker dat je wilt doorgaan?';
+$lang['js']['searchmedia']     = 'Zoek naar bestanden';
+$lang['js']['keepopen']        = 'Houd scherm open bij selectie';
+$lang['js']['hidedetails']     = 'Verberg details';
+$lang['js']['mediatitle']      = 'Linkinstellingen';
+$lang['js']['mediadisplay']    = 'Linktype';
+$lang['js']['mediaalign']      = 'Uitlijning';
+$lang['js']['mediasize']       = 'Afbeeldingsomvang';
+$lang['js']['mediatarget']     = 'Linkdoel';
+$lang['js']['mediaclose']      = 'Sluiten';
+$lang['js']['mediainsert']     = 'Invoegen';
+$lang['js']['mediadisplayimg'] = 'De afbeelding weergeven';
+$lang['js']['mediadisplaylnk'] = 'Alleen de link weergeven';
+$lang['js']['mediasmall']      = 'Kleine versie';
+$lang['js']['mediamedium']     = 'Middelgrote versie';
+$lang['js']['medialarge']      = 'Grote versie';
+$lang['js']['mediaoriginal']   = 'Originele versie';
+$lang['js']['medialnk']        = 'Link naar detailpagina';
+$lang['js']['mediadirect']     = 'Directe link naar origineel';
+$lang['js']['medianolnk']      = 'Geen link';
+$lang['js']['medianolink']     = 'Link niet naar de afbeelding';
+$lang['js']['medialeft']       = 'Afbeelding links uitlijnen';
+$lang['js']['mediaright']      = 'Afbeelding rechts uitlijnen';
+$lang['js']['mediacenter']     = 'Afbeelding centreren';
+$lang['js']['medianoalign']    = 'Geen uitlijning gebruiken';
+$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']['restore_confirm'] = 'Werkelijk deze versie terugzetten?';
+$lang['js']['media_diff']      = 'Verschillen bekijken:';
+$lang['js']['media_diff_both'] = 'Naast elkaar';
+$lang['js']['media_diff_opacity'] = 'Doorschijnend';
+$lang['js']['media_diff_portions'] = 'Swipe';
+$lang['js']['media_select']    = 'Selecteer bestanden';
+$lang['js']['media_upload_btn'] = 'Uploaden';
+$lang['js']['media_done_btn']  = 'Klaar';
+$lang['js']['media_drop']      = 'Sleep bestanden hierheen om ze te uploaden';
+$lang['js']['media_cancel']    = 'Verwijderen';
+$lang['js']['media_overwrt']   = 'Bestaande bestanden overschrijven';
+$lang['rssfailed']             = 'Er is een fout opgetreden bij het ophalen van de feed: ';
+$lang['nothingfound']          = 'Er werd niets gevonden.';
+$lang['mediaselect']           = 'Bestandsselectie';
+$lang['fileupload']            = 'Bestandsupload';
+$lang['uploadsucc']            = 'Upload geslaagd';
+$lang['uploadfail']            = 'Upload mislukt. Misschien verkeerde permissies?';
+$lang['uploadwrong']           = 'Upload mislukt. Deze bestandsextensie is verboden!';
+$lang['uploadexist']           = 'Bestand bestaat reeds. Er is niets gewijzigd.';
+$lang['uploadbadcontent']      = 'Het geüploade bestand heeft niet de bestandsextensie %s.';
+$lang['uploadspam']            = 'De upload is geblokkeerd door de spam blacklist.';
+$lang['uploadxss']             = 'De upload is geblokkeerd wegens mogelijk onveilige inhoud.';
+$lang['uploadsize']            = 'Het geüploade bestand is te groot. (max. %s)';
+$lang['deletesucc']            = 'Het bestand "%s" is verwijderd.';
+$lang['deletefail']            = '"%s" kan niet worden verwijderd - controleer permissies.';
+$lang['mediainuse']            = 'Het bestand "%s" is niet verwijderd - het is nog in gebruik.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'Beschikbare bestanden in';
+$lang['accessdenied']          = 'U heeft geen toegang tot deze pagina.';
+$lang['mediausage']            = 'Gebruik de volgende syntax om aan het bestand te refereren:';
+$lang['mediaview']             = 'Bekijk het orginele bestand';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Upload een bestand naar de huidige namespace. Om een subnamespace aan te maken, laat je die voorafgaan aan de bestandsnaam bij "Upload als", gescheiden door een dubbele punt.';
+$lang['mediaextchange']        = 'Bestandsextensie veranderd van .%s naar .%s!';
+$lang['reference']             = 'Referenties voor';
+$lang['ref_inuse']             = 'Het bestand kan niet worden verwijderd omdat het nog in gebruik is op de volgende pagina\'s:';
+$lang['ref_hidden']            = 'Enkele referenties staan op pagina\'s waarvoor je geen leesrechten hebt';
+$lang['hits']                  = 'Hits';
+$lang['quickhits']             = 'Overeenkomende paginanamen';
+$lang['toc']                   = 'Inhoud';
+$lang['current']               = 'huidige';
+$lang['yours']                 = 'Jouw versie';
+$lang['diff']                  = 'Toon verschillen met huidige revisie';
+$lang['diff2']                 = 'Toon verschillen tussen geselecteerde revisies';
+$lang['difflink']              = 'Link naar deze vergelijking';
+$lang['diff_type']             = 'Bekijk verschillen:';
+$lang['diff_inline']           = 'Inline';
+$lang['diff_side']             = 'Zij aan zij';
+$lang['line']                  = 'Regel';
+$lang['breadcrumb']            = 'Spoor';
+$lang['youarehere']            = 'Je bent hier';
+$lang['lastmod']               = 'Laatst gewijzigd';
+$lang['by']                    = 'door';
+$lang['deleted']               = 'verwijderd';
+$lang['created']               = 'aangemaakt';
+$lang['restored']              = 'oude revisie hersteld (%s)';
+$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['tools']                 = 'Hulpmiddelen';
+$lang['user_tools']            = 'Gebruikershulpmiddelen';
+$lang['site_tools']            = 'Site-hulpmiddelen';
+$lang['page_tools']            = 'Paginahulpmiddelen';
+$lang['skip_to_content']       = 'spring naar tekst';
+$lang['sidebar']               = 'Zijbalk';
+$lang['mail_newpage']          = 'pagina toegevoegd:';
+$lang['mail_changed']          = 'pagina aangepast:';
+$lang['mail_subscribe_list']   = 'Pagina\'s veranderd in namespace:';
+$lang['mail_new_user']         = 'nieuwe gebruiker:';
+$lang['mail_upload']           = 'bestand geüpload:';
+$lang['changes_type']          = 'Bekijk wijzigingen van';
+$lang['pages_changes']         = 'Pagina\'s';
+$lang['media_changes']         = 'Mediabestanden';
+$lang['both_changes']          = 'Zowel pagina\'s als mediabestanden';
+$lang['qb_bold']               = 'Vetgedrukte tekst';
+$lang['qb_italic']             = 'Cursieve tekst';
+$lang['qb_underl']             = 'Onderstreepte tekst';
+$lang['qb_code']               = 'Code tekst';
+$lang['qb_strike']             = 'Doorgestreepte tekst';
+$lang['qb_h1']                 = 'Niveau 1 kop';
+$lang['qb_h2']                 = 'Niveau 2 kop';
+$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';
+$lang['qb_ol']                 = 'Geordende lijst';
+$lang['qb_ul']                 = 'Ongeordende lijst';
+$lang['qb_media']              = 'Voeg plaatjes en andere bestanden toe';
+$lang['qb_sig']                = 'Handtekening invoegen';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Speciale tekens';
+$lang['upperns']               = 'Spring naar bovenliggende namespace';
+$lang['admin_register']        = 'Nieuwe gebruiker toevoegen';
+$lang['metaedit']              = 'Metadata wijzigen';
+$lang['metasaveerr']           = 'Schrijven van metadata mislukt';
+$lang['metasaveok']            = 'Metadata bewaard';
+$lang['img_backto']            = 'Terug naar';
+$lang['img_title']             = 'Titel';
+$lang['img_caption']           = 'Bijschrift';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Bestandsnaam';
+$lang['img_fsize']             = 'Grootte';
+$lang['img_artist']            = 'Fotograaf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formaat';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Trefwoorden';
+$lang['img_width']             = 'Breedte';
+$lang['img_height']            = 'Hoogte';
+$lang['img_manager']           = 'In mediabeheerder bekijken';
+$lang['subscr_subscribe_success'] = '%s is ingeschreven voor %s';
+$lang['subscr_subscribe_error'] = 'Fout bij inschrijven van %s voor %s';
+$lang['subscr_subscribe_noaddress'] = 'Er is geen e-mailadres gekoppeld aan uw account, u kunt daardoor niet worden ingeschreven.';
+$lang['subscr_unsubscribe_success'] = '%s is nu uitgeschreven bij %s.';
+$lang['subscr_unsubscribe_error'] = 'Fout bij uitschrijven van %s bij %s.';
+$lang['subscr_already_subscribed'] = '%s is reeds ingeschreven bij %s.';
+$lang['subscr_not_subscribed'] = '%s is niet ingeschreven bij %s.';
+$lang['subscr_m_not_subscribed'] = 'Je bent momenteel niet ingeschreven bij de huidige pagina of namespace.';
+$lang['subscr_m_new_header']   = 'Inschrijving toevoegen';
+$lang['subscr_m_current_header'] = 'Huidige inschrijvingen';
+$lang['subscr_m_unsubscribe']  = 'Uitschrijven';
+$lang['subscr_m_subscribe']    = 'Inschrijven';
+$lang['subscr_m_receive']      = 'Ontvang';
+$lang['subscr_style_every']    = 'Email bij iedere wijziging';
+$lang['subscr_style_digest']   = 'Samenvattings-email met wijzigingen per pagina (elke %.2f dagen)';
+$lang['subscr_style_list']     = 'Lijst van veranderde pagina\'s sinds laatste email (elke %.2f dagen)';
+$lang['authtempfail']          = 'Gebruikersauthenticatie is tijdelijk niet beschikbaar. Als deze situatie zich blijft voordoen, informeer dan de wikibeheerder.';
+$lang['authpwdexpire']         = 'Je wachtwoord verloopt in %d dagen, je moet het binnenkort veranderen';
+$lang['i_chooselang']          = 'Kies je taal';
+$lang['i_installer']           = 'DokuWiki Installer';
+$lang['i_wikiname']            = 'Wikinaam';
+$lang['i_enableacl']           = 'ACLs inschakelen (aanbevolen)';
+$lang['i_superuser']           = 'Superuser';
+$lang['i_problems']            = 'De installer vond problemen, hieronder aangegeven. Verhelp deze voor je doorgaat.';
+$lang['i_modified']            = 'Uit veiligheidsoverwegingen werkt dit script alleen met nieuwe en onveranderde DokuWiki-installaties. Pak de bestanden opnieuw uit of raadpleeg de Dokuwiki installatie-instructies';
+$lang['i_funcna']              = 'PHP functie %s is niet beschikbaar. Wellicht heeft je hosting provider deze uitgeschakeld?';
+$lang['i_phpver']              = 'PHP-versie %s is lager dan de vereiste %s. Upgrade PHP.';
+$lang['i_permfail']            = '%s is niet schrijfbaar voor DokuWiki. Pas de permissie-instellingen van deze directory aan.';
+$lang['i_confexists']          = '%s bestaat reeds';
+$lang['i_writeerr']            = 'Niet mogelijk om %s aan te maken. Controleer de directory/bestandspermissies en maak het bestand handmatig aan.';
+$lang['i_badhash']             = 'Onbekende of aangepaste dokuwiki.php (hash=%s)';
+$lang['i_badval']              = '%s - onjuiste of lege waarde';
+$lang['i_success']             = 'De configuratie is succesvol afgerond. Je kunt nu het bestand install.php verwijderen. Ga naar je nieuwe DokuWiki.';
+$lang['i_failure']             = 'Fouten deden zich voor tijdens het schrijven naar de configuratiebestanden. Pas deze aan voor je gebruik kunt maken van je nieuwe DokuWiki.';
+$lang['i_policy']              = 'Initieel ACL-beleid';
+$lang['i_pol0']                = 'Open wiki (lezen, schrijven, uploaden voor iedereen)';
+$lang['i_pol1']                = 'Publieke wiki (lezen voor iedereen, schrijven en uploaden voor geregistreerde gebruikers)';
+$lang['i_pol2']                = 'Besloten wiki (lezen, schrijven en uploaden alleen voor geregistreerde gebruikers)';
+$lang['i_allowreg']            = 'Toestaan dat gebruikers zichzelf registeren';
+$lang['i_retry']               = 'Opnieuw';
+$lang['i_license']             = 'Kies a.u.b. een licentie die u voor uw inhoud wilt gebruiken:';
+$lang['i_license_none']        = 'Toon geen licentie informatie';
+$lang['i_pop_field']           = 'Help ons om je DokuWiki ervaring te verbeteren';
+$lang['i_pop_label']           = 'Stuur eens per maand geanonimiseerde gebruiksstatistieken naar de Dokuwiki ontwikkelaars';
+$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';
+$lang['wordblock']             = 'Uw wijziging is niet opgeslagen omdat deze niet-toegestane tekst bevat (spam).';
+$lang['media_uploadtab']       = 'Uploaden';
+$lang['media_searchtab']       = 'Zoeken';
+$lang['media_file']            = 'Bestand';
+$lang['media_viewtab']         = 'Beeld';
+$lang['media_edittab']         = 'Bewerken';
+$lang['media_historytab']      = 'Geschiedenis';
+$lang['media_list_thumbs']     = 'Miniatuurweergaven';
+$lang['media_list_rows']       = 'Regels';
+$lang['media_sort_name']       = 'Naam';
+$lang['media_sort_date']       = 'Datum';
+$lang['media_namespaces']      = 'Kies namespace';
+$lang['media_files']           = 'Bestanden in %s';
+$lang['media_upload']          = 'Upload naar %s';
+$lang['media_search']          = 'Zoeken in %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s bij %s';
+$lang['media_edit']            = '%s bewerken';
+$lang['media_history']         = 'Geschiedenis van %s';
+$lang['media_meta_edited']     = 'Metagegevens bewerkt';
+$lang['media_perm_read']       = 'Sorry, u heeft niet voldoende rechten om bestanden te lezen.';
+$lang['media_perm_upload']     = 'Sorry, u heeft niet voldoende rechten om bestanden te uploaden.';
+$lang['media_update']          = 'Upload nieuwe versie';
+$lang['media_restore']         = 'Deze versie terugzetten';
+$lang['currentns']             = 'Huidige namespace';
+$lang['searchresult']          = 'Zoekresultaat';
+$lang['plainhtml']             = 'Alleen HTML';
+$lang['wikimarkup']            = 'Wiki Opmaak';
diff --git a/sources/inc/lang/nl/locked.txt b/sources/inc/lang/nl/locked.txt
new file mode 100644
index 0000000..878fb37
--- /dev/null
+++ b/sources/inc/lang/nl/locked.txt
@@ -0,0 +1,3 @@
+====== Pagina in exclusief gebruik ======
+
+Deze pagina wordt momenteel aangepast door een andere gebruiker. Wacht tot deze gebruiker klaar is met aanpassen of totdat het gebruiksrecht vervalt.
diff --git a/sources/inc/lang/nl/login.txt b/sources/inc/lang/nl/login.txt
new file mode 100644
index 0000000..699cbf8
--- /dev/null
+++ b/sources/inc/lang/nl/login.txt
@@ -0,0 +1,3 @@
+====== Login ======
+
+Je bent op dit moment niet ingelogd! Voer je login-gegevens hieronder in om in te loggen. Je browser moet cookies accepteren om in te kunnen loggen.
diff --git a/sources/inc/lang/nl/mailtext.txt b/sources/inc/lang/nl/mailtext.txt
new file mode 100644
index 0000000..d12093a
--- /dev/null
+++ b/sources/inc/lang/nl/mailtext.txt
@@ -0,0 +1,17 @@
+Er is een pagina in je DokuWiki toegevoegd of gewijzigd. Hier zijn de details:
+
+Datum         : @DATE@
+Browser       : @BROWSER@
+IP-Adres      : @IPADDRESS@
+Hostnaam      : @HOSTNAME@
+Oude revisie  : @OLDPAGE@
+Nieuwe revisie: @NEWPAGE@
+Samenvatting  : @SUMMARY@
+User          : @USER@
+
+@DIFF@
+
+
+-- 
+Deze mail werd gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/nl/mailwrap.html b/sources/inc/lang/nl/mailwrap.html
new file mode 100644
index 0000000..2ffe19a
--- /dev/null
+++ b/sources/inc/lang/nl/mailwrap.html
@@ -0,0 +1,13 @@
+
+ 
+ @TITLE@
+ 
+ 
+ 
+
+ @HTMLBODY@
+
+ 
        
+ Deze mail is gegenereerd door DokuWiki op @DOKUWIKIURL@.
+ 
+ 
\ No newline at end of file
diff --git a/sources/inc/lang/nl/newpage.txt b/sources/inc/lang/nl/newpage.txt
new file mode 100644
index 0000000..0e4b95e
--- /dev/null
+++ b/sources/inc/lang/nl/newpage.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/nl/norev.txt b/sources/inc/lang/nl/norev.txt
new file mode 100644
index 0000000..849fc51
--- /dev/null
+++ b/sources/inc/lang/nl/norev.txt
@@ -0,0 +1,4 @@
+====== Revisie bestaat niet ======
+
+De opgegeven revisie bestaat niet. Klik op ''Oude revisies'' voor een lijst van oude revisies van dit document.
+
diff --git a/sources/inc/lang/nl/password.txt b/sources/inc/lang/nl/password.txt
new file mode 100644
index 0000000..5041322
--- /dev/null
+++ b/sources/inc/lang/nl/password.txt
@@ -0,0 +1,10 @@
+Beste @FULLNAME@!
+
+Hier is je gebruikersinformatie voor @TITLE@ op @DOKUWIKIURL@
+
+Gebruikersnaam: @LOGIN@
+Wachtwoord    : @PASSWORD@
+
+-- 
+Deze mail werd gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/nl/preview.txt b/sources/inc/lang/nl/preview.txt
new file mode 100644
index 0000000..4d2927a
--- /dev/null
+++ b/sources/inc/lang/nl/preview.txt
@@ -0,0 +1,4 @@
+====== Preview ======
+
+Dit is een preview van de tekst zoals hij er uit komt te zien. Let op: het is nog **niet opgeslagen!**
+
diff --git a/sources/inc/lang/nl/pwconfirm.txt b/sources/inc/lang/nl/pwconfirm.txt
new file mode 100644
index 0000000..ab72ae7
--- /dev/null
+++ b/sources/inc/lang/nl/pwconfirm.txt
@@ -0,0 +1,13 @@
+Beste @FULLNAME@!
+
+Iemand heeft een nieuw wachtwoord aangevraagd voor je @TITLE@ login op @DOKUWIKIURL@
+
+Als je geen nieuw wachtwoord hebt aangevraagd kun je deze e-mail negeren.
+
+Volg de volgende link om te bevestigen dat je inderdaad een nieuw wachtwoord wilt:
+
+@CONFIRM@
+
+-- 
+Deze mail werd gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/nl/read.txt b/sources/inc/lang/nl/read.txt
new file mode 100644
index 0000000..2a9bb9a
--- /dev/null
+++ b/sources/inc/lang/nl/read.txt
@@ -0,0 +1,2 @@
+Deze pagina is alleen-lezen. Je kan de broncode bekijken maar niet veranderen. Neem contact op met de beheerder als je denkt dat dit niet klopt.
+
diff --git a/sources/inc/lang/nl/recent.txt b/sources/inc/lang/nl/recent.txt
new file mode 100644
index 0000000..4b507f2
--- /dev/null
+++ b/sources/inc/lang/nl/recent.txt
@@ -0,0 +1,3 @@
+====== Recente wijzigingen ======
+
+De volgende pagina's zijn recent aangepast.
diff --git a/sources/inc/lang/nl/register.txt b/sources/inc/lang/nl/register.txt
new file mode 100644
index 0000000..fc31860
--- /dev/null
+++ b/sources/inc/lang/nl/register.txt
@@ -0,0 +1,4 @@
+====== Registreer als nieuwe gebruiker ======
+
+Vul alle informatie hieronder in om een nieuw account voor deze wiki aan te maken. Zorg dat je een **geldig e-mailadres** opgeeft - als je je wachtwoord hier niet in kunt vullen wordt het naar dit adres verzonden. De gebruikersnaam moet een geldige [[doku>pagename|paginanaam]] zijn.
+
diff --git a/sources/inc/lang/nl/registermail.txt b/sources/inc/lang/nl/registermail.txt
new file mode 100644
index 0000000..5efb251
--- /dev/null
+++ b/sources/inc/lang/nl/registermail.txt
@@ -0,0 +1,14 @@
+Een nieuwe gebruiker heeft zich geregistreerd. Dit zijn de details:
+
+Gebruikersnaam: @NEWUSER@
+Volledige naam: @NEWNAME@
+E-mail        : @NEWEMAIL@
+
+Datum         : @DATE@
+Browser       : @BROWSER@
+IP-adres      : @IPADDRESS@
+Hostname      : @HOSTNAME@
+
+-- 
+Dit bericht is gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/nl/resendpwd.txt b/sources/inc/lang/nl/resendpwd.txt
new file mode 100644
index 0000000..3a67587
--- /dev/null
+++ b/sources/inc/lang/nl/resendpwd.txt
@@ -0,0 +1,3 @@
+==== Verstuur een nieuw wachtwoord ====
+
+Voer je 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 --git a/sources/inc/lang/nl/resetpwd.txt b/sources/inc/lang/nl/resetpwd.txt
new file mode 100644
index 0000000..345e307
--- /dev/null
+++ b/sources/inc/lang/nl/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Een nieuw wachtwoord instellen ======
+
+Vul alstublieft een nieuw wachtwoord in voor jouw account in deze wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/nl/revisions.txt b/sources/inc/lang/nl/revisions.txt
new file mode 100644
index 0000000..7a78917
--- /dev/null
+++ b/sources/inc/lang/nl/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/nl/searchpage.txt b/sources/inc/lang/nl/searchpage.txt
new file mode 100644
index 0000000..3ace704
--- /dev/null
+++ b/sources/inc/lang/nl/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
diff --git a/sources/inc/lang/nl/showrev.txt b/sources/inc/lang/nl/showrev.txt
new file mode 100644
index 0000000..c1bfa4e
--- /dev/null
+++ b/sources/inc/lang/nl/showrev.txt
@@ -0,0 +1,2 @@
+**Dit is een oude revisie van het document!**
+----
diff --git a/sources/inc/lang/nl/stopwords.txt b/sources/inc/lang/nl/stopwords.txt
new file mode 100644
index 0000000..3056c4a
--- /dev/null
+++ b/sources/inc/lang/nl/stopwords.txt
@@ -0,0 +1,37 @@
+# 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/
+aan
+als
+bij
+dan
+dat
+die
+dit
+een
+had
+heb
+hem
+het
+hij
+hoe
+hun
+kan
+men
+met
+mij
+nog
+ons
+ook
+tot
+uit
+van
+was
+wat
+wel
+wij
+zal
+zei
+zij
+zou
diff --git a/sources/inc/lang/nl/subscr_digest.txt b/sources/inc/lang/nl/subscr_digest.txt
new file mode 100644
index 0000000..9f0fe87
--- /dev/null
+++ b/sources/inc/lang/nl/subscr_digest.txt
@@ -0,0 +1,15 @@
+Halllo!
+
+De pagina @PAGE@ in de @TITLE@ wiki is veranderd. Hier zijn de wijzigingen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vorige revisie: @OLDPAGE@
+Nieuwe revisie: @NEWPAGE@
+
+Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op de wiki op @DOKUWIKIURL@ en bezoekt u @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven.
+
+--
+Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/nl/subscr_form.txt b/sources/inc/lang/nl/subscr_form.txt
new file mode 100644
index 0000000..0f9f2d0
--- /dev/null
+++ b/sources/inc/lang/nl/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Beheer inschrijvingen ======
+
+Deze pagina stelt u in staat uw abonnementen voor de huidige pagina en namespace te configureren.
\ No newline at end of file
diff --git a/sources/inc/lang/nl/subscr_list.txt b/sources/inc/lang/nl/subscr_list.txt
new file mode 100644
index 0000000..7cde712
--- /dev/null
+++ b/sources/inc/lang/nl/subscr_list.txt
@@ -0,0 +1,12 @@
+Halllo!
+
+Pagina's in de namespace @PAGE@ van de @TITLE@ wiki zijn veranderd. Hier zijn de veranderde pagina's:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @SUBSCRIBE@. Vervolgens kunt u zich voor elke gewenste pagina of namespace uitschrijven.
+
+--
+Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/nl/subscr_single.txt b/sources/inc/lang/nl/subscr_single.txt
new file mode 100644
index 0000000..1cd0c85
--- /dev/null
+++ b/sources/inc/lang/nl/subscr_single.txt
@@ -0,0 +1,19 @@
+Halllo!
+
+De pagina @PAGE@ in de @TITLE@ wiki is veranderd. 
+Hier zijn de wijzigingen:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum: @DATE@
+Gebruiker: @USER@
+Wijzigingssamenvatting: @SUMMARY@
+Vorige revisie: @OLDPAGE@
+Nieuwe revisie: @NEWPAGE@
+
+Om het verzenden van deze wijzigingsberichten te stoppen, logt u in op het wiki op @DOKUWIKIURL@ en navigeert u naar @NEWPAGE@. Vervolgens kunt u "Inschrijvingen wijzigen" gebruiken om inschrijvingen te stoppen.
+
+--
+Deze email is gegenereerd door DokuWiki op @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/nl/updateprofile.txt b/sources/inc/lang/nl/updateprofile.txt
new file mode 100644
index 0000000..2368a09
--- /dev/null
+++ b/sources/inc/lang/nl/updateprofile.txt
@@ -0,0 +1,3 @@
+===== Wijzig uw gebruikersprofiel =====
+
+Je hoeft alleen de velden aan te passen die je wilt wijzigen. Je gebruikersnaam is niet aan te passen.
diff --git a/sources/inc/lang/nl/uploadmail.txt b/sources/inc/lang/nl/uploadmail.txt
new file mode 100644
index 0000000..59920ae
--- /dev/null
+++ b/sources/inc/lang/nl/uploadmail.txt
@@ -0,0 +1,15 @@
+Er is een bestand geüpload naar uw DokuWiki. Hier zijn de details;
+
+Bestand  : @MEDIA@
+Oude revisie: @OLD@
+Datum    : @DATE@
+Browser  : @BROWSER@
+IP-adres : @IPADDRESS@
+Hostname : @HOSTNAME@
+Grootte  : @SIZE@
+MIME type: @MIME@
+Gebruiker: @USER@
+
+-- 
+Dit bericht is gegenereerd door DokuWiki op
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/no/admin.txt b/sources/inc/lang/no/admin.txt
new file mode 100644
index 0000000..765177f
--- /dev/null
+++ b/sources/inc/lang/no/admin.txt
@@ -0,0 +1,3 @@
+====== Administrasjon ======
+
+Nedenfor finner du en liste over administrative oppgaver i DokuWiki.
diff --git a/sources/inc/lang/no/adminplugins.txt b/sources/inc/lang/no/adminplugins.txt
new file mode 100644
index 0000000..df78672
--- /dev/null
+++ b/sources/inc/lang/no/adminplugins.txt
@@ -0,0 +1 @@
+====== Ekstra programtillegg ======
\ No newline at end of file
diff --git a/sources/inc/lang/no/backlinks.txt b/sources/inc/lang/no/backlinks.txt
new file mode 100644
index 0000000..9fe7206
--- /dev/null
+++ b/sources/inc/lang/no/backlinks.txt
@@ -0,0 +1,3 @@
+====== Tilbakelinker ======
+
+Dette er en liste over sider som ser ut til å linke tilbake til den aktuelle siden.
\ No newline at end of file
diff --git a/sources/inc/lang/no/conflict.txt b/sources/inc/lang/no/conflict.txt
new file mode 100644
index 0000000..49961d0
--- /dev/null
+++ b/sources/inc/lang/no/conflict.txt
@@ -0,0 +1,6 @@
+====== Det finnes en nyere versjon ======
+
+Det fins en nyere utgave av dokumentet du har redigert. Dette kan skje når en annen bruker redigerer dokumentet samtidig med deg.
+
+Legg nøye merke til forskjellene som vises under, og velg deretter hvilken versjon du vil beholde. Om du velger ''**Lagre**'', så kommer din versjon til å lagres. Velg ''**Avbryt**'' for å beholde den nyeste versjonen (ikke din).
+
diff --git a/sources/inc/lang/no/denied.txt b/sources/inc/lang/no/denied.txt
new file mode 100644
index 0000000..6e7f1f2
--- /dev/null
+++ b/sources/inc/lang/no/denied.txt
@@ -0,0 +1,3 @@
+====== Adgang forbudt ======
+
+Beklager, men du har ikke rettigheter til dette. Kanskje du har glemt å logge inn?
diff --git a/sources/inc/lang/no/diff.txt b/sources/inc/lang/no/diff.txt
new file mode 100644
index 0000000..e4c2eb0
--- /dev/null
+++ b/sources/inc/lang/no/diff.txt
@@ -0,0 +1,4 @@
+====== Forskjeller ======
+
+Her vises forskjeller mellom den valgte versjonen og den nåværende versjonen av dokumentet.
+
diff --git a/sources/inc/lang/no/draft.txt b/sources/inc/lang/no/draft.txt
new file mode 100644
index 0000000..8bcea65
--- /dev/null
+++ b/sources/inc/lang/no/draft.txt
@@ -0,0 +1,6 @@
+====== Kladdfil funnet ======
+
+Din siste endring av denne siden ble ikke avsluttet riktig. DokuWiki lagret automatisk en kladd under ditt arbeid som du nå kan bruke for å fortsette redigeringen. Nedenfor kan du se de lagrede data.
+
+Vennligst avgjør om du vil //gjennopprette// din tapte sesjon, //slette// kladden eller //avbryte// redigeringen.
+
diff --git a/sources/inc/lang/no/edit.txt b/sources/inc/lang/no/edit.txt
new file mode 100644
index 0000000..bdb3bc8
--- /dev/null
+++ b/sources/inc/lang/no/edit.txt
@@ -0,0 +1,2 @@
+Rediger siden og klikk på ''**Lagre**''. Se [[wiki:syntax]] for Wikisyntaks. Rediger siden bare hvis du kan **forbedre** sidens innhold. Hvis du vil teste ut hvordan saker og ting fungerer, kan du gjøre det på [[playground:playground|lekeplassen]].
+
diff --git a/sources/inc/lang/no/editrev.txt b/sources/inc/lang/no/editrev.txt
new file mode 100644
index 0000000..652a84c
--- /dev/null
+++ b/sources/inc/lang/no/editrev.txt
@@ -0,0 +1,2 @@
+**Du har hentet en tidligere versjon av dokumentet!** Hvis du lagrer den tidligere versjonen så kommer du til å lage en ny og aktiv versjon med dette innholdet.
+----
diff --git a/sources/inc/lang/no/index.txt b/sources/inc/lang/no/index.txt
new file mode 100644
index 0000000..e2ea959
--- /dev/null
+++ b/sources/inc/lang/no/index.txt
@@ -0,0 +1,4 @@
+====== Indeks ======
+
+Dette er en fortegnelse over alle tilgjengelige sider, sortert etter [[doku>namespaces|navnerom]].
+
diff --git a/sources/inc/lang/no/install.html b/sources/inc/lang/no/install.html
new file mode 100644
index 0000000..ef3ee2e
--- /dev/null
+++ b/sources/inc/lang/no/install.html
@@ -0,0 +1,24 @@
+
        Denne siden assisterer under førstegangs installasjon og konfigurasjon av
+Dokuwiki. Mer informasjon for denne
+installasjonen er tilgjengelig på
+dokumentasjonssiden.
        
+
+
        DokuWiki bruker vanlige filer for lagring av wikisider og annen
+informasjon assosiert med disse sidene (f.eks. bilder, søkeindekser, eldre
+revisjoner osv.). For å kunne virke må DokuWiki
+ha skrivetilgang til de mapper som lagrer disse filene.
+Denne installasjonen kan ikke sette opp mapperettigheter. Det må normalt
+gjøres direkte fra et kommandoskall, eller om du bruker en leverandør,
+via FTP eller ditt kontrollpanel på tjener (f.eks. cPanel).
        
+
+
        Denne installasjonen vil sette opp din DokuWiki-konfigurasjon for
+ACL, som igjen tillater administrator
+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.
        
+
+
        Erfarne brukere eller brukere med spessielle oppsettingskrav bør se på disse lenkene
+for detaljer rundt
+installasjonsinstrukser
+og konfigurasjonsinnstillinger.
        
diff --git a/sources/inc/lang/no/lang.php b/sources/inc/lang/no/lang.php
new file mode 100644
index 0000000..3f31f6c
--- /dev/null
+++ b/sources/inc/lang/no/lang.php
@@ -0,0 +1,350 @@
+
+ * @author Jorge Barrera Grandon 
+ * @author Rune Rasmussen [http://www.syntaxerror.no/]
+ * @author Thomas Nygreen 
+ * @author Arild Burud 
+ * @author Torkill Bruland 
+ * @author Rune M. Andersen 
+ * @author Jakob Vad Nielsen 
+ * @author Kjell Tore Næsgaard 
+ * @author Knut Staring 
+ * @author Lisa Ditlefsen 
+ * @author Erik Pedersen 
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Jon Bøe 
+ * @author Egil Hansen 
+ * @author Thomas Juberg 
+ * @author Boris 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '«';
+$lang['doublequoteclosing']    = '»';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Rediger denne siden';
+$lang['btn_source']            = 'Vis kildekode';
+$lang['btn_show']              = 'Vis siden';
+$lang['btn_create']            = 'Lag denne siden';
+$lang['btn_search']            = 'Søk';
+$lang['btn_save']              = 'Lagre';
+$lang['btn_preview']           = 'Forhåndsvis';
+$lang['btn_top']               = 'Til toppen av siden';
+$lang['btn_newer']             = '<< nyere';
+$lang['btn_older']             = 'eldre >>';
+$lang['btn_revs']              = 'Historikk';
+$lang['btn_recent']            = 'Siste endringer';
+$lang['btn_upload']            = 'Last opp';
+$lang['btn_cancel']            = 'Avbryt';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Rediger';
+$lang['btn_login']             = 'Logg inn';
+$lang['btn_logout']            = 'Logg ut';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Oppdater';
+$lang['btn_delete']            = 'Slett';
+$lang['btn_back']              = 'Tilbake';
+$lang['btn_backlink']          = 'Tilbakelenker';
+$lang['btn_backtomedia']       = 'Tilbake til valg av mediafil';
+$lang['btn_subscribe']         = 'Abonnér på endringer';
+$lang['btn_profile']           = 'Oppdater profil';
+$lang['btn_reset']             = 'Tilbakestill';
+$lang['btn_resendpwd']         = 'Sett nytt passord';
+$lang['btn_draft']             = 'Rediger kladd';
+$lang['btn_recover']           = 'Gjennvinn kladd';
+$lang['btn_draftdel']          = 'Slett kladd';
+$lang['btn_revert']            = 'Gjenopprette';
+$lang['btn_register']          = 'Registrer deg';
+$lang['btn_apply']             = 'Bruk';
+$lang['btn_media']             = 'Mediefiler';
+$lang['btn_deleteuser']        = 'Fjern min konto';
+$lang['loggedinas']            = 'Innlogget som';
+$lang['user']                  = 'Brukernavn';
+$lang['pass']                  = 'Passord';
+$lang['newpass']               = 'Nytt passord';
+$lang['oldpass']               = 'Bekreft gjeldende passord';
+$lang['passchk']               = 'Bekreft passord';
+$lang['remember']              = 'Husk meg';
+$lang['fullname']              = 'Fullt navn';
+$lang['email']                 = 'E-post';
+$lang['profile']               = 'Brukerprofil';
+$lang['badlogin']              = 'Ugyldig brukernavn og/eller passord.';
+$lang['badpassconfirm']        = 'Beklager, passordet var feil';
+$lang['minoredit']             = 'Mindre endringer';
+$lang['draftdate']             = 'Kladd autolagret';
+$lang['nosecedit']             = 'Siden ble endret i mellomtiden, seksjonsinfo har blitt foreldet - lastet full side istedet.';
+$lang['regmissing']            = 'Vennligst fyll ut alle felt.';
+$lang['reguexists']            = 'Det finnes allerede en konto med dette brukernavnet.';
+$lang['regsuccess']            = 'Brukerkonto har blitt laget og passord har blitt sendt via e-post.';
+$lang['regsuccess2']           = 'Brukeren har blitt laget.';
+$lang['regmailfail']           = 'En feil oppstod da passordet ditt skulle sendes via e-post. Vennligst kontakt administratoren!';
+$lang['regbadmail']            = 'Den angitte e-post adressen ser ut til å være ugyldig. Vennligst kontakt administratoren om du anser dette som feilaktig.';
+$lang['regbadpass']            = 'De to angitte passordene er ikke like, vennligst forsøk igjen.';
+$lang['regpwmail']             = 'Ditt DokuWiki passord';
+$lang['reghere']               = 'Har du ikke en konto ennå? Lag deg en';
+$lang['profna']                = 'Denne wikien støtter ikke profilendringer';
+$lang['profnochange']          = 'Ingen endringer, ingenting å gjøre.';
+$lang['profnoempty']           = 'Tomt navn- eller e-postfelt er ikke tillatt.';
+$lang['profchanged']           = 'Brukerprofilen ble vellykket oppdatert.';
+$lang['profnodelete']          = 'Denne wikien støtter ikke sletting av brukere';
+$lang['profdeleteuser']        = 'Slett konto';
+$lang['profdeleted']           = 'Din brukerkonto har blitt slettet fra denne wikien';
+$lang['profconfdelete']        = 'Jeg ønsker å fjerne min konto fra denne wikien. 
         Denne handlingen kan ikke omgjøres.';
+$lang['profconfdeletemissing'] = 'Boks for bekreftelse ikke avkrysset';
+$lang['pwdforget']             = 'Glemt passordet ditt? Få deg et nytt';
+$lang['resendna']              = 'Denne wikien støtter ikke nyutsending av passord.';
+$lang['resendpwd']             = 'Sett nytt passord for';
+$lang['resendpwdmissing']      = 'Beklager, du må fylle inn alle felt.';
+$lang['resendpwdnouser']       = 'Beklager, vi kan ikke finne denne brukeren i vår database.';
+$lang['resendpwdbadauth']      = 'Beklager, denne autorisasjonskoden er ikke gyldig. Sjekk at du brukte hele bekreftelseslenken.';
+$lang['resendpwdconfirm']      = 'En bekreftelseslenke er blitt sendt på e-post.';
+$lang['resendpwdsuccess']      = 'Ditt nye passord er blitt sendt på e-post.';
+$lang['license']               = 'Der annet ikke er angitt, er innholdet på denne wiki utgitt under følgende lisens:';
+$lang['licenseok']             = 'Merk: Ved å endre på denne siden godtar du at ditt innhold utgis under 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';
+$lang['maxuploadsize']         = 'Opplast maks % per fil.';
+$lang['lockedby']              = 'Låst av';
+$lang['lockexpire']            = 'Låsingen utløper';
+$lang['js']['willexpire']      = 'Din redigeringslås for dette dokumentet kommer snart til å utløpe.\nFor å unngå versjonskonflikter bør du forhåndsvise dokumentet ditt for å forlenge redigeringslåsen.';
+$lang['js']['notsavedyet']     = 'Ulagrede endringer vil gå tapt!
+Vil du fortsette?';
+$lang['js']['searchmedia']     = 'Søk etter filer';
+$lang['js']['keepopen']        = 'Hold vindu åpent ved valg';
+$lang['js']['hidedetails']     = 'Skjul detaljer';
+$lang['js']['mediatitle']      = 'Lenkeinnstillinger';
+$lang['js']['mediadisplay']    = 'Lenketype';
+$lang['js']['mediaalign']      = 'Justering';
+$lang['js']['mediasize']       = 'Bildestørrelse';
+$lang['js']['mediatarget']     = 'Lenkemål';
+$lang['js']['mediaclose']      = 'Lukk';
+$lang['js']['mediainsert']     = 'Sett inn';
+$lang['js']['mediadisplayimg'] = 'Vis bilde.';
+$lang['js']['mediadisplaylnk'] = 'Vis bare lenken.';
+$lang['js']['mediasmall']      = 'Liten versjon';
+$lang['js']['mediamedium']     = 'Medium versjon';
+$lang['js']['medialarge']      = 'Stor versjon';
+$lang['js']['mediaoriginal']   = 'Original versjon';
+$lang['js']['medialnk']        = 'Lenke til detaljside';
+$lang['js']['mediadirect']     = 'Direktelenke til original';
+$lang['js']['medianolnk']      = 'Ingen lenke';
+$lang['js']['medianolink']     = 'Ikke lenk bildet';
+$lang['js']['medialeft']       = 'Venstrejuster bilde';
+$lang['js']['mediaright']      = 'Høyrejuster bilde';
+$lang['js']['mediacenter']     = 'Midtstill bilde';
+$lang['js']['medianoalign']    = 'Ingen justering';
+$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']['restore_confirm'] = 'Er du sikker på at du vil gjenopprette denne versjonen?';
+$lang['js']['media_diff']      = 'Vis forskjeller:';
+$lang['js']['media_diff_both'] = 'Side ved side';
+$lang['js']['media_diff_opacity'] = 'Gjennomskinnelighet';
+$lang['js']['media_diff_portions'] = 'Glidebryter';
+$lang['js']['media_select']    = 'Velg filer…';
+$lang['js']['media_upload_btn'] = 'Last opp';
+$lang['js']['media_done_btn']  = 'Ferdig';
+$lang['js']['media_drop']      = 'Dra filer hit for å laste dem opp';
+$lang['js']['media_cancel']    = 'fjern';
+$lang['js']['media_overwrt']   = 'Erstatt eksisterende filer';
+$lang['rssfailed']             = 'En feil oppstod da denne kilden skulle hentes:';
+$lang['nothingfound']          = 'Ingen data funnet.';
+$lang['mediaselect']           = 'Valg av mediafil';
+$lang['fileupload']            = 'Mediafil Opplasting';
+$lang['uploadsucc']            = 'Opplastingen var vellykket';
+$lang['uploadfail']            = 'Opplastingen var mislykket. Kanskje feil rettigheter?';
+$lang['uploadwrong']           = 'Opplastingen ble nektet. Denne filendelsen er ikke tillatt!';
+$lang['uploadexist']           = 'Filen eksisterer. Ingenting har blitt gjort.';
+$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['accessdenied']          = 'Du har ikke tilgang til å se denne siden';
+$lang['mediausage']            = 'Bruk følgende syntaks til å referere til denne filen:';
+$lang['mediaview']             = 'Vis original fil';
+$lang['mediaroot']             = 'rot';
+$lang['mediaupload']           = 'Last opp en fil til gjeldende navnerom her. For å opprette undernavnerom, før dem opp før filnavn i "Last opp som" adskilt med kolon.';
+$lang['mediaextchange']        = 'Filendelse endret fra .%s til .%s!';
+$lang['reference']             = 'Referanser for';
+$lang['ref_inuse']             = 'Denne filen kan ikke slettes fordi den er fortsatt i bruk på følgende sider:';
+$lang['ref_hidden']            = 'Noen referanser er på sider du ikke har tilgang til å lese';
+$lang['hits']                  = 'Treff';
+$lang['quickhits']             = 'Matchende wikinavn';
+$lang['toc']                   = 'Innholdsfortegnelse';
+$lang['current']               = 'nåværende versjon';
+$lang['yours']                 = 'Din versjon';
+$lang['diff']                  = 'Vis forskjeller mot nåværende versjon';
+$lang['diff2']                 = 'Vis forskjeller mellom valgte versjoner';
+$lang['difflink']              = 'Lenk til denne sammenligningen';
+$lang['diff_type']             = 'Vis forskjeller:';
+$lang['diff_inline']           = 'I teksten';
+$lang['diff_side']             = 'Side ved side';
+$lang['line']                  = 'Linje';
+$lang['breadcrumb']            = 'Spor';
+$lang['youarehere']            = 'Du er her';
+$lang['lastmod']               = 'Sist endret';
+$lang['by']                    = 'av';
+$lang['deleted']               = 'fjernet';
+$lang['created']               = 'opprettet';
+$lang['restored']              = 'gjenopprettet til en tidligere versjon (%s)';
+$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['tools']                 = 'Verktøy';
+$lang['user_tools']            = 'Brukerverktøy';
+$lang['site_tools']            = 'Nettstedverktøy';
+$lang['page_tools']            = 'Sideverktøy';
+$lang['skip_to_content']       = 'Hopp til innhold';
+$lang['sidebar']               = 'Sidefelt';
+$lang['mail_newpage']          = 'side lagt til:';
+$lang['mail_changed']          = 'side endret:';
+$lang['mail_subscribe_list']   = 'side endret i \'namespace\':';
+$lang['mail_new_user']         = 'ny bruker:';
+$lang['mail_upload']           = 'fil opplastet:';
+$lang['changes_type']          = 'Vis endringer av';
+$lang['pages_changes']         = 'Sider';
+$lang['media_changes']         = 'Mediefiler';
+$lang['both_changes']          = 'Både sider og mediefiler';
+$lang['qb_bold']               = 'Fet tekst';
+$lang['qb_italic']             = 'Kursiv tekst';
+$lang['qb_underl']             = 'Understreket tekst';
+$lang['qb_code']               = 'Kodetekst';
+$lang['qb_strike']             = 'Gjennomstreket tekst';
+$lang['qb_h1']                 = 'Overskrift nivå 1';
+$lang['qb_h2']                 = 'Overskrift nivå 2';
+$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';
+$lang['qb_ol']                 = 'Sortert listepunkt';
+$lang['qb_ul']                 = 'Usortert listepunkt';
+$lang['qb_media']              = 'Legg til bilder og andre filer';
+$lang['qb_sig']                = 'Føy til signatur';
+$lang['qb_smileys']            = 'Smilefjes';
+$lang['qb_chars']              = 'Spesialtegn';
+$lang['upperns']               = 'gå til overordnet navnerom';
+$lang['admin_register']        = 'Legg til ny bruker';
+$lang['metaedit']              = 'Rediger metadata';
+$lang['metasaveerr']           = 'Skriving av metadata feilet';
+$lang['metasaveok']            = 'Metadata lagret';
+$lang['img_backto']            = 'Tilbake til';
+$lang['img_title']             = 'Tittel';
+$lang['img_caption']           = 'Bildetekst';
+$lang['img_date']              = 'Dato';
+$lang['img_fname']             = 'Filnavn';
+$lang['img_fsize']             = 'Størrelse';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Opphavsrett';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Nøkkelord';
+$lang['img_width']             = 'Bredde';
+$lang['img_height']            = 'Høyde';
+$lang['img_manager']           = 'Vis i mediefilbehandler';
+$lang['subscr_subscribe_success'] = 'La til %s som abonnent på %s';
+$lang['subscr_subscribe_error'] = 'Klarte ikke å legge til %s som abonnent på %s';
+$lang['subscr_subscribe_noaddress'] = 'Brukeren din er ikke registrert med noen adresse. Du kan derfor ikke legges til som abonnent.';
+$lang['subscr_unsubscribe_success'] = 'Avsluttet %s sitt abonnement på %s';
+$lang['subscr_unsubscribe_error'] = 'Klarte ikke å avslutte %s sitt abonnement på %s';
+$lang['subscr_already_subscribed'] = '%s abonnerer allerede på %s';
+$lang['subscr_not_subscribed'] = '%s abonnerer ikke på %s';
+$lang['subscr_m_not_subscribed'] = 'Du abonnerer ikke på denne sida eller dette navnerommet';
+$lang['subscr_m_new_header']   = 'Legg til abonnement';
+$lang['subscr_m_current_header'] = 'Gjeldende abonnementer';
+$lang['subscr_m_unsubscribe']  = 'Stoppe abonnement';
+$lang['subscr_m_subscribe']    = 'Abonnere på';
+$lang['subscr_m_receive']      = 'Motta';
+$lang['subscr_style_every']    = 'e-post for alle endringer';
+$lang['subscr_style_digest']   = 'e-post med sammendrag av endringer for hver side (%.2f dager mellom hver)';
+$lang['subscr_style_list']     = 'liste med sider som er endra siden forrige e-post (%.2f dager mellom hver)';
+$lang['authtempfail']          = 'Brukerautorisasjon er midlertidig utilgjengelig. Om dette vedvarer, vennligst informer Wiki-admin.';
+$lang['authpwdexpire']         = 'Ditt passord går ut om %d dager, du bør endre det snarest.';
+$lang['i_chooselang']          = 'Velg språk';
+$lang['i_installer']           = 'DokuWiki-installasjon';
+$lang['i_wikiname']            = 'Wikinavn';
+$lang['i_enableacl']           = 'Aktiver ACL (anbefalt)';
+$lang['i_superuser']           = 'Superbruker';
+$lang['i_problems']            = 'Installasjonen oppdaget noen problemer, disse listes nedenfor. Du kan ikke fortsett før du har løst disse.';
+$lang['i_modified']            = 'For sikkerhets skyld vil dette skriptet bare virke med en ny og uendret Dokuwiki-installsjon.
+                         Du bør enten pakke ut filene på nytt fra den nedlastede pakken, eller konsultere den komplette
+                         Dokuwiki-installasjonsinstruksen';
+$lang['i_funcna']              = 'PHP-funksjonen %s er ikke tilgjengelig. Kanskje din leverandør har deaktivert den av noen grunn?';
+$lang['i_phpver']              = 'Din PHP versjon %s er lavere enn kravet %s. Du må oppgradere PHP installasjonen. ';
+$lang['i_permfail']            = '%s er ikke skrivbar for DokuWiki. Du må fikse rettighetene for denne mappen!';
+$lang['i_confexists']          = '%s eksisterer allerede';
+$lang['i_writeerr']            = 'Kunne ikke opprette %s. Du må sjekke mappe-/filrettigheter og opprette filen manuelt.';
+$lang['i_badhash']             = 'ikke gjenkjent eller modifisert dokuwiki.php (hash=%s)';
+$lang['i_badval']              = '%s - ugyldig eller tom verdi';
+$lang['i_success']             = 'Konfigurasjonen ble vellykket fullført. Du kan slette install.php filen nå. Fortsett til
+                        din nye DokuWiki.';
+$lang['i_failure']             = 'En eller flere feil oppstod ved skriving til konfigurasjonsfilene. Du må kanskje fikse dem manuelt før
+                         du kan bruke din nye DokuWiki.';
+$lang['i_policy']              = 'Innledende ACL-politikk';
+$lang['i_pol0']                = 'Åpen Wiki (les, skriv og opplasting for alle)';
+$lang['i_pol1']                = 'Offentlig Wiki (les for alle, skriving og opplasting bare for registrerte brukere)';
+$lang['i_pol2']                = 'Lukket Wiki (les, skriv og opplasting bare for registrerte brukere)';
+$lang['i_allowreg']            = 'Tillat at brukere registrerer seg selv';
+$lang['i_retry']               = 'Prøv igjen';
+$lang['i_license']             = 'Velg lisens som du vil legge ut innholdet under:';
+$lang['i_license_none']        = 'Ikke vis noen lisensinformasjon';
+$lang['i_pop_field']           = 'Venligst hejlp oss å forbedre Dokuwiki-opplevelsen:';
+$lang['i_pop_label']           = 'Sand annonyme bruksdata til Dokuwiki-utviklerene, en gang i måneden';
+$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';
+$lang['wordblock']             = 'Din endring ble ikke lagret ettersom den inneholder blokkert tekst (søppel).';
+$lang['media_uploadtab']       = 'Last opp';
+$lang['media_searchtab']       = 'Søk';
+$lang['media_file']            = 'Fil';
+$lang['media_viewtab']         = 'Vis';
+$lang['media_edittab']         = 'Rediger';
+$lang['media_historytab']      = 'Historikk';
+$lang['media_list_thumbs']     = 'Miniatyrbilder';
+$lang['media_list_rows']       = 'Rader';
+$lang['media_sort_name']       = 'etter navn';
+$lang['media_sort_date']       = 'etter dato';
+$lang['media_namespaces']      = 'Velg navnerom';
+$lang['media_files']           = 'Filer i %s';
+$lang['media_upload']          = 'Last opp til navnerommet %s.';
+$lang['media_search']          = 'Søk i navnerommet %s.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s på %s';
+$lang['media_edit']            = 'Rediger %s';
+$lang['media_history']         = '%vis historikk';
+$lang['media_meta_edited']     = 'metadata er endra';
+$lang['media_perm_read']       = 'Beklager, du har ikke tilgang til å lese filer.';
+$lang['media_perm_upload']     = 'Beklager, du har ikke tilgang til å laste opp filer.';
+$lang['media_update']          = 'Last opp ny versjon';
+$lang['media_restore']         = 'Gjenopprett denne versjonen';
+$lang['currentns']             = 'gjeldende navnemellomrom';
+$lang['searchresult']          = 'Søk i resultat';
+$lang['plainhtml']             = 'Enkel HTML';
diff --git a/sources/inc/lang/no/locked.txt b/sources/inc/lang/no/locked.txt
new file mode 100644
index 0000000..cb14c89
--- /dev/null
+++ b/sources/inc/lang/no/locked.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/no/login.txt b/sources/inc/lang/no/login.txt
new file mode 100644
index 0000000..149cf00
--- /dev/null
+++ b/sources/inc/lang/no/login.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/no/mailtext.txt b/sources/inc/lang/no/mailtext.txt
new file mode 100644
index 0000000..9c0714c
--- /dev/null
+++ b/sources/inc/lang/no/mailtext.txt
@@ -0,0 +1,17 @@
+En side i din DokuWiki har blitt lagt til eller blitt endret. Informasjon om endringen:
+
+Dato                 : @DATE@
+Nettleser            : @BROWSER@
+IP-adresse           : @IPADDRESS@
+Vertsnavn            : @HOSTNAME@
+Tidligere versjon    : @OLDPAGE@
+Aktuell versjon      : @NEWPAGE@
+Redigeringskommentar : @SUMMARY@
+Bruker               : @USER@
+
+@DIFF@
+
+
+-- 
+Denne meldingen ble laget av DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/no/newpage.txt b/sources/inc/lang/no/newpage.txt
new file mode 100644
index 0000000..86cad00
--- /dev/null
+++ b/sources/inc/lang/no/newpage.txt
@@ -0,0 +1,3 @@
+====== Dette emnet har ikke noe innhold ======
+
+Du har klikket på en lenke til et emne som ikke finnes ennå. Du kan opprette det ved å klikke på ''**Lag denne siden**''.
diff --git a/sources/inc/lang/no/norev.txt b/sources/inc/lang/no/norev.txt
new file mode 100644
index 0000000..cc58c99
--- /dev/null
+++ b/sources/inc/lang/no/norev.txt
@@ -0,0 +1,4 @@
+====== Versjonen finnes ikke ======
+
+Den angitte versjonen finnes ikke. Bruk ''**Historikk**'' for en oversikt over de versjoner som finnes av dette dokumentet.
+
diff --git a/sources/inc/lang/no/password.txt b/sources/inc/lang/no/password.txt
new file mode 100644
index 0000000..bc4e89f
--- /dev/null
+++ b/sources/inc/lang/no/password.txt
@@ -0,0 +1,10 @@
+Hei @FULLNAME@!
+
+Her er dine brukeropplysninger for @TITLE@ på @DOKUWIKIURL@
+
+Brukernavn : @LOGIN@
+Passord : @PASSWORD@
+
+-- 
+Denne meldingen ble laget av DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/no/preview.txt b/sources/inc/lang/no/preview.txt
new file mode 100644
index 0000000..2bed20e
--- /dev/null
+++ b/sources/inc/lang/no/preview.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/no/pwconfirm.txt b/sources/inc/lang/no/pwconfirm.txt
new file mode 100644
index 0000000..36163c6
--- /dev/null
+++ b/sources/inc/lang/no/pwconfirm.txt
@@ -0,0 +1,15 @@
+Hei @FULLNAME@!
+
+Noen har bedt om nytt passord for din @TITLE@ innlogging
+på @DOKUWIKIURL@
+
+Om du ikke ba om nytt passord kan du bare overse denne e-posten.
+
+For å bekrefte at forespørselen virkelig kom fra deg kan du bruke
+følgende lenke:
+
+@CONFIRM@
+
+-- 
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/no/read.txt b/sources/inc/lang/no/read.txt
new file mode 100644
index 0000000..27fcb51
--- /dev/null
+++ b/sources/inc/lang/no/read.txt
@@ -0,0 +1,2 @@
+Denne siden er skrivebeskyttet. Du kan se på den, men ikke endre den. Kontakt administratoren hvis du mener at du bør kunne endre siden.
+
diff --git a/sources/inc/lang/no/recent.txt b/sources/inc/lang/no/recent.txt
new file mode 100644
index 0000000..857013c
--- /dev/null
+++ b/sources/inc/lang/no/recent.txt
@@ -0,0 +1,5 @@
+====== Siste nytt ======
+
+Følgende sider har nylig blitt oppdatert.
+
+
diff --git a/sources/inc/lang/no/register.txt b/sources/inc/lang/no/register.txt
new file mode 100644
index 0000000..160e473
--- /dev/null
+++ b/sources/inc/lang/no/register.txt
@@ -0,0 +1,4 @@
+====== Registrer deg som bruker ======
+
+Angi all informasjon som det blir spurt om nedenfor for å lage en ny brukerkonto for denne wikien. 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 --git a/sources/inc/lang/no/registermail.txt b/sources/inc/lang/no/registermail.txt
new file mode 100644
index 0000000..35ed253
--- /dev/null
+++ b/sources/inc/lang/no/registermail.txt
@@ -0,0 +1,14 @@
+En ny bruker har registrert seg, her er detaljene:
+
+Brukernavn  : @NEWUSER@
+Fult navn   : @NEWNAME@
+E-post      : @NEWEMAIL@
+
+Dato        : @DATE@
+Nettleser   : @BROWSER@
+IP-adresse  : @IPADDRESS@
+Tjener      : @HOSTNAME@
+
+-- 
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/no/resendpwd.txt b/sources/inc/lang/no/resendpwd.txt
new file mode 100644
index 0000000..21625d3
--- /dev/null
+++ b/sources/inc/lang/no/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Send nytt passord ======
+
+Fyll inn ditt brukernavn i skjema nedenfor for å be om nytt passord for din konto i denne wiki. En bekreftelseslenke vil bli sent til din e-postadresse.
+
diff --git a/sources/inc/lang/no/revisions.txt b/sources/inc/lang/no/revisions.txt
new file mode 100644
index 0000000..023fd8d
--- /dev/null
+++ b/sources/inc/lang/no/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/no/searchpage.txt b/sources/inc/lang/no/searchpage.txt
new file mode 100644
index 0000000..e94e789
--- /dev/null
+++ b/sources/inc/lang/no/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
diff --git a/sources/inc/lang/no/showrev.txt b/sources/inc/lang/no/showrev.txt
new file mode 100644
index 0000000..06514f2
--- /dev/null
+++ b/sources/inc/lang/no/showrev.txt
@@ -0,0 +1,2 @@
+**Dette er en gammel utgave av dokumentet!**
+----
diff --git a/sources/inc/lang/no/stopwords.txt b/sources/inc/lang/no/stopwords.txt
new file mode 100644
index 0000000..9a4c302
--- /dev/null
+++ b/sources/inc/lang/no/stopwords.txt
@@ -0,0 +1,68 @@
+# Dette er en liste med ord som indeksereren ignorerer, ett ord per linje.
+# Når du redigerer siden, pass på å bruke UNIX linjeslutt (enkel ny linje).
+# Ord kortere enn 3 bokstaver er automatisk ignorert.
+# Listen er basert på http://helmer.aksis.uib.no/nta/ord10000.txt
+i
+og
+det
+er
+på
+til
+som
+en
+å
+for
+av
+at
+har
+med
+de
+ikke
+den
+han
+om
+et
+fra
+men
+vi
+var
+jeg
+seg
+sier
+vil
+kan
+ble
+skal
+etter
+også
+så
+ut
+år
+nå
+da
+dette
+blir
+ved
+mot
+hadde
+to
+hun
+over
+være
+ha
+må
+går
+opp
+få
+andre
+eller
+bare
+sin
+mer
+inn
+før
+bli
+vært
+enn
+alle
+www
\ No newline at end of file
diff --git a/sources/inc/lang/no/subscr_digest.txt b/sources/inc/lang/no/subscr_digest.txt
new file mode 100644
index 0000000..670d39d
--- /dev/null
+++ b/sources/inc/lang/no/subscr_digest.txt
@@ -0,0 +1,20 @@
+Hei!
+
+Siden @PAGE@ på wikien @TITLE@ har blitt endret.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Gammel versjon : @OLDPAGE@
+Ny versjon: @NEWPAGE@
+
+For å avslutte varslingen, logg inn på
+@DOKUWIKIURL@ og gå til 
+@SUBSCRIBE@
+og avslutt abonnementet på endringer av siden eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/no/subscr_form.txt b/sources/inc/lang/no/subscr_form.txt
new file mode 100644
index 0000000..f62b25b
--- /dev/null
+++ b/sources/inc/lang/no/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Administrere abonnement ======
+
+Denne siden lar deg administrere abonnementene dine for denne siden og dette navnerommet.
\ No newline at end of file
diff --git a/sources/inc/lang/no/subscr_list.txt b/sources/inc/lang/no/subscr_list.txt
new file mode 100644
index 0000000..860d88d
--- /dev/null
+++ b/sources/inc/lang/no/subscr_list.txt
@@ -0,0 +1,17 @@
+Hei!
+
+Sider i navnerommet @PAGE@ på wikien @TITLE@ har blitt endra.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+For å avslutte varslinga, logg inn på
+@DOKUWIKIURL@ og gå til 
+@SUBSCRIBE@
+og avslutt abonnementet på endringer av sida eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/no/subscr_single.txt b/sources/inc/lang/no/subscr_single.txt
new file mode 100644
index 0000000..b26b3a8
--- /dev/null
+++ b/sources/inc/lang/no/subscr_single.txt
@@ -0,0 +1,23 @@
+Hei!
+
+Siden @PAGE@ på wikien @TITLE@ har blitt endret.
+Her er endringene:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dato : @DATE@
+Bruker : @USER@
+Sammendrag: @SUMMARY@
+Gammel versjon : @OLDPAGE@
+Ny versjon: @NEWPAGE@
+
+For å avslutte varslingen, logg inn på
+@DOKUWIKIURL@, gå til 
+@SUBSCRIBE@
+og avslutt abonnementet på endringer av siden eller i navnerommet.
+
+--
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/no/updateprofile.txt b/sources/inc/lang/no/updateprofile.txt
new file mode 100644
index 0000000..b2e37e7
--- /dev/null
+++ b/sources/inc/lang/no/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Oppdater din brukerprofil ======
+
+Du behøver bare fylle ut de felter du ønsker å endre. Du kan ikke endre brukernavnet ditt.
+
+
diff --git a/sources/inc/lang/no/uploadmail.txt b/sources/inc/lang/no/uploadmail.txt
new file mode 100644
index 0000000..2890d96
--- /dev/null
+++ b/sources/inc/lang/no/uploadmail.txt
@@ -0,0 +1,15 @@
+En fil ble lastet opp på din DokuWiki. Her er detaljene:
+
+Fil : @MEDIA@
+Gammel versjon: @OLD@
+Dato : @DATE@
+Nettleser : @BROWSER@
+IP-adresse : @IPADDRESS@
+Vertnavn : @HOSTNAME@
+Størrelse : @SIZE@
+MIME-type : @MIME@
+Bruker : @USER@
+
+-- 
+Denne e-posten ble generert av DokuWiki på
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pl/admin.txt b/sources/inc/lang/pl/admin.txt
new file mode 100644
index 0000000..cea45f9
--- /dev/null
+++ b/sources/inc/lang/pl/admin.txt
@@ -0,0 +1,4 @@
+====== Administracja ======
+
+Czynności administracyjne DokuWiki.
+
diff --git a/sources/inc/lang/pl/adminplugins.txt b/sources/inc/lang/pl/adminplugins.txt
new file mode 100644
index 0000000..0fb0399
--- /dev/null
+++ b/sources/inc/lang/pl/adminplugins.txt
@@ -0,0 +1 @@
+===== Dodatkowe Wtyczki =====
\ No newline at end of file
diff --git a/sources/inc/lang/pl/backlinks.txt b/sources/inc/lang/pl/backlinks.txt
new file mode 100644
index 0000000..4edccb0
--- /dev/null
+++ b/sources/inc/lang/pl/backlinks.txt
@@ -0,0 +1,4 @@
+====== Odnośnik z innych stron ======
+
+Strony zawierające odnośniki do aktualnej strony.
+
diff --git a/sources/inc/lang/pl/conflict.txt b/sources/inc/lang/pl/conflict.txt
new file mode 100644
index 0000000..da6f952
--- /dev/null
+++ b/sources/inc/lang/pl/conflict.txt
@@ -0,0 +1,6 @@
+====== Istnieje nowsza wersja strony ======
+
+Istnieje nowsza wersja edytowanej strony. Prawdopodobnie ktoś zmienił tę stronę w trakcie Twojej pracy.
+
+Przeglądnij dokładnie poniższe różnice i zdecyduj, którą wersję zatrzymać. Jeśli naciśniesz ''zapisz'' to Twoja wersja zostanie zapisana. Jeśli naciśniesz ''anuluj'' to zostanie wybrana aktualna wersja strony.
+
diff --git a/sources/inc/lang/pl/denied.txt b/sources/inc/lang/pl/denied.txt
new file mode 100644
index 0000000..d402463
--- /dev/null
+++ b/sources/inc/lang/pl/denied.txt
@@ -0,0 +1,4 @@
+====== Brak dostępu ======
+
+Nie masz wystarczających uprawnień. Zaloguj się!
+
diff --git a/sources/inc/lang/pl/diff.txt b/sources/inc/lang/pl/diff.txt
new file mode 100644
index 0000000..2c896dd
--- /dev/null
+++ b/sources/inc/lang/pl/diff.txt
@@ -0,0 +1,4 @@
+====== Różnice ======
+
+Różnice między wybraną wersją a wersją aktualną.
+
diff --git a/sources/inc/lang/pl/draft.txt b/sources/inc/lang/pl/draft.txt
new file mode 100644
index 0000000..4036c30
--- /dev/null
+++ b/sources/inc/lang/pl/draft.txt
@@ -0,0 +1,6 @@
+====== Znaleziono szkic strony ======
+
+Twoja ostatnia sesja edycji nie została poprawnie zakończona. DokuWiki automatycznie zachowało szkic strony podczas Twojej pracy abyś mógł (mogła) ją dokończyć. Poniżej możesz zobaczyć co zostało zapisane w czasie ostatnie sesji.
+
+Zdecyduj czy chcesz //przywrócić// ostatnią sesję, //usunąć// ją lub //anulować//.
+
diff --git a/sources/inc/lang/pl/edit.txt b/sources/inc/lang/pl/edit.txt
new file mode 100644
index 0000000..abb20ae
--- /dev/null
+++ b/sources/inc/lang/pl/edit.txt
@@ -0,0 +1,4 @@
+Zredaguj tę stronę i naciśnij ''zapisz''.
+
+Na stronie ze [[wiki:syntax|składnią]] znajdziesz opis znaczników wiki. Jeśli chcesz poćwiczyć zajrzyj do [[playground:playground|piaskownicy]].
+
diff --git a/sources/inc/lang/pl/editrev.txt b/sources/inc/lang/pl/editrev.txt
new file mode 100644
index 0000000..1528cac
--- /dev/null
+++ b/sources/inc/lang/pl/editrev.txt
@@ -0,0 +1,2 @@
+**Edytujesz nieaktualną wersję strony!** Jeśli ją zapiszesz to stanie się ona wersją aktualną.
+----
diff --git a/sources/inc/lang/pl/index.txt b/sources/inc/lang/pl/index.txt
new file mode 100644
index 0000000..1d3fd27
--- /dev/null
+++ b/sources/inc/lang/pl/index.txt
@@ -0,0 +1,4 @@
+====== Indeks ======
+
+Indeks wszystkich dostępnych stron pogrupowany według [[doku>namespaces|katalogów]].
+
diff --git a/sources/inc/lang/pl/install.html b/sources/inc/lang/pl/install.html
new file mode 100644
index 0000000..01405e6
--- /dev/null
+++ b/sources/inc/lang/pl/install.html
@@ -0,0 +1,23 @@
+
        Ta strona ma na celu pomóc Ci w instalacji i konfiguracji
+Dokuwiki.
+Więcej informacji o instalatorze znajdziesz w
+dokumentacji instalatora.
        
+
+
        DokuWiki używa zwykłych plików do przechowywania zawartości stron oraz wszelkich
+innych informacji takich jak obrazki, poprzednie wersje strony, itp.
+Żeby DokuWiki mogło poprawnie działać musisz
+nadać prawo zapisu do katalogu zawierającego te pliki. Instalator nie może wykonać
+tych czynności. Musisz zrobić to za pomocą polecenia powłoki, klienta FTP
+lub panelu kontrolnego Twojego dostawcy usług serwerowych.
        
+
+
        Instalator pomoże Ci w konfiguracji uprawnień
+ACL,
+które z kolei umożliwią Ci założenie konta administratora oraz umożliwią dostęp
+do czynności administracyjnych takich jak instalowanie wtyczek, zarządzanie kontami,
+zarządzania uprawnieniami do stron oraz konfiguracji wiki. Użycie tego instalatora
+nie jest konieczne, jego celem jest tylko ułatwienie administracji DokuWiki.
        
+
+
        Zaawansowani użytkownicy lub użytkownicy mający specjalne wymagania powinni
+zapoznać się z
+instrukcją instalacji
+oraz instrukcją konfiguracji.
        
diff --git a/sources/inc/lang/pl/lang.php b/sources/inc/lang/pl/lang.php
new file mode 100644
index 0000000..142dd3b
--- /dev/null
+++ b/sources/inc/lang/pl/lang.php
@@ -0,0 +1,342 @@
+
+ * @author Mariusz Kujawski 
+ * @author Maciej Kurczewski 
+ * @author Sławomir Boczek 
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski 
+ * @author maros 
+ * @author Grzegorz Widła 
+ * @author Łukasz Chmaj 
+ * @author Begina Felicysym 
+ * @author Aoi Karasu 
+ * @author Tomasz Bosak 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Edytuj stronę';
+$lang['btn_source']            = 'Pokaż źródło strony';
+$lang['btn_show']              = 'Pokaż stronę';
+$lang['btn_create']            = 'Utwórz stronę';
+$lang['btn_search']            = 'Szukaj';
+$lang['btn_save']              = 'Zapisz';
+$lang['btn_preview']           = 'Podgląd';
+$lang['btn_top']               = 'Do góry';
+$lang['btn_newer']             = '<< nowsze';
+$lang['btn_older']             = 'starsze >>';
+$lang['btn_revs']              = 'Poprzednie wersje';
+$lang['btn_recent']            = 'Ostatnie zmiany';
+$lang['btn_upload']            = 'Wyślij';
+$lang['btn_cancel']            = 'Anuluj';
+$lang['btn_index']             = 'Indeks';
+$lang['btn_secedit']           = 'Edytuj';
+$lang['btn_login']             = 'Zaloguj';
+$lang['btn_logout']            = 'Wyloguj';
+$lang['btn_admin']             = 'Administracja';
+$lang['btn_update']            = 'Aktualizuj';
+$lang['btn_delete']            = 'Usuń';
+$lang['btn_back']              = 'Wstecz';
+$lang['btn_backlink']          = 'Odnośniki';
+$lang['btn_backtomedia']       = 'Powrót do wyboru pliku';
+$lang['btn_subscribe']         = 'Subskrybuj zmiany';
+$lang['btn_profile']           = 'Aktualizuj profil';
+$lang['btn_reset']             = 'Resetuj';
+$lang['btn_resendpwd']         = 'Podaj nowe hasło';
+$lang['btn_draft']             = 'Edytuj szkic';
+$lang['btn_recover']           = 'Przywróć szkic';
+$lang['btn_draftdel']          = 'Usuń szkic';
+$lang['btn_revert']            = 'Przywróć';
+$lang['btn_register']          = 'Zarejestruj się!';
+$lang['btn_apply']             = 'Zastosuj';
+$lang['btn_media']             = 'Menadżer multimediów';
+$lang['btn_deleteuser']        = 'Usuń moje konto';
+$lang['loggedinas']            = 'Zalogowany jako';
+$lang['user']                  = 'Użytkownik';
+$lang['pass']                  = 'Hasło';
+$lang['newpass']               = 'Nowe hasło';
+$lang['oldpass']               = 'Potwierdź aktualne hasło';
+$lang['passchk']               = 'Powtórz hasło';
+$lang['remember']              = 'Zapamiętaj';
+$lang['fullname']              = 'Imię i nazwisko';
+$lang['email']                 = 'E-mail';
+$lang['profile']               = 'Profil użytkownika';
+$lang['badlogin']              = 'Nazwa użytkownika lub hasło są nieprawidłowe.';
+$lang['badpassconfirm']        = 'Niestety, hasło jest niepoprawne.';
+$lang['minoredit']             = 'Mniejsze zmiany';
+$lang['draftdate']             = 'Czas zachowania szkicu';
+$lang['nosecedit']             = 'Strona została zmodyfikowana, sekcje zostały zmienione. Załadowano całą stronę.';
+$lang['regmissing']            = 'Wypełnij wszystkie pola.';
+$lang['reguexists']            = 'Użytkownik o tej nazwie już istnieje.';
+$lang['regsuccess']            = 'Utworzono użytkownika. Hasło zostało przesłane pocztą.';
+$lang['regsuccess2']           = 'Utworzono użytkownika.';
+$lang['regmailfail']           = 'Wystąpił błąd przy wysyłaniu hasła pocztą!';
+$lang['regbadmail']            = 'Adres e-mail jest nieprawidłowy!';
+$lang['regbadpass']            = 'Hasła nie są identyczne, spróbuj ponownie.';
+$lang['regpwmail']             = 'Twoje hasło do DokuWiki';
+$lang['reghere']               = 'Nie masz jeszcze konta? Zdobądź je';
+$lang['profna']                = 'To wiki nie pozwala na zmianę profilu.';
+$lang['profnochange']          = 'Żadnych zmian, nic do zrobienia.';
+$lang['profnoempty']           = 'Pusta nazwa lub adres e-mail nie dozwolone.';
+$lang['profchanged']           = 'Zaktualizowano profil użytkownika.';
+$lang['profnodelete']          = 'Ta wiki nie umożliwia usuwania użytkowników';
+$lang['profdeleteuser']        = 'Usuń konto';
+$lang['profdeleted']           = 'Twoje konto zostało usunięte z tej wiki';
+$lang['profconfdelete']        = 'Chcę usunąć moje konto z tej wiki. 
         Decyzja nie może być cofnięta.';
+$lang['profconfdeletemissing'] = 'Pole potwierdzenia nie zostało zaznaczone';
+$lang['pwdforget']             = 'Nie pamiętasz hasła? Zdobądź nowe!';
+$lang['resendna']              = 'To wiki nie pozwala na powtórne przesyłanie hasła.';
+$lang['resendpwd']             = 'Podaj nowe hasło dla';
+$lang['resendpwdmissing']      = 'Wypełnij wszystkie pola.';
+$lang['resendpwdnouser']       = 'Nie można znaleźć tego użytkownika w bazie danych.';
+$lang['resendpwdbadauth']      = 'Błędny kod autoryzacji! Upewnij się, że użyłeś(aś) właściwego odnośnika.';
+$lang['resendpwdconfirm']      = 'Prośba o potwierdzenie została przesłana pocztą.';
+$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?';
+$lang['maxuploadsize']         = 'Maksymalny rozmiar wysyłanych danych wynosi %s dla jednego pliku.';
+$lang['lockedby']              = 'Aktualnie zablokowane przez';
+$lang['lockexpire']            = 'Blokada wygasa';
+$lang['js']['willexpire']      = 'Twoja blokada edycji tej strony wygaśnie w ciągu minuty. \nW celu uniknięcia konfliktów użyj przycisku podglądu aby odnowić blokadę.';
+$lang['js']['notsavedyet']     = 'Nie zapisane zmiany zostaną utracone.
+Czy na pewno kontynuować?';
+$lang['js']['searchmedia']     = 'Szukaj plików';
+$lang['js']['keepopen']        = 'Nie zamykaj okna po wyborze';
+$lang['js']['hidedetails']     = 'Ukryj szczegóły';
+$lang['js']['mediatitle']      = 'Ustawienia odnośników';
+$lang['js']['mediadisplay']    = 'Typ odnośnika';
+$lang['js']['mediaalign']      = 'Położenie';
+$lang['js']['mediasize']       = 'Rozmiar grafiki';
+$lang['js']['mediatarget']     = 'Cel odnośnika';
+$lang['js']['mediaclose']      = 'Zamknij';
+$lang['js']['mediainsert']     = 'Wstaw';
+$lang['js']['mediadisplayimg'] = 'Pokaż grafikę';
+$lang['js']['mediadisplaylnk'] = 'Pokaż tylko odnośnik.';
+$lang['js']['mediasmall']      = 'Mały rozmiar';
+$lang['js']['mediamedium']     = 'Średni rozmiar';
+$lang['js']['medialarge']      = 'Duży rozmiar';
+$lang['js']['mediaoriginal']   = 'Wersja oryginalna';
+$lang['js']['medialnk']        = 'Odnośnik do strony ze szczegółami';
+$lang['js']['mediadirect']     = 'Bezpośredni odnośnik do oryginału';
+$lang['js']['medianolnk']      = 'Bez odnośnika';
+$lang['js']['medianolink']     = 'Nie ustawiaj odnośnika do grafiki';
+$lang['js']['medialeft']       = 'Ustaw położenie po lewej stronie.';
+$lang['js']['mediaright']      = 'Ustaw położenie po prawej stronie.';
+$lang['js']['mediacenter']     = 'Ustaw położenie po środku.';
+$lang['js']['medianoalign']    = 'Nie ustawiaj położenia.';
+$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']['restore_confirm'] = 'Naprawdę przywrócić tą wersję?';
+$lang['js']['media_diff']      = 'Pokaż różnice:';
+$lang['js']['media_diff_both'] = 'Obok siebie';
+$lang['js']['media_diff_opacity'] = 'Przezroczystość';
+$lang['js']['media_diff_portions'] = 'Przesunięcie';
+$lang['js']['media_select']    = 'Wybierz pliki...';
+$lang['js']['media_upload_btn'] = 'Przesłanie plików';
+$lang['js']['media_done_btn']  = 'Zrobione';
+$lang['js']['media_drop']      = 'Upuść tutaj pliki do przesłania';
+$lang['js']['media_cancel']    = 'usuń';
+$lang['js']['media_overwrt']   = 'Nadpisz istniejące pliki';
+$lang['rssfailed']             = 'Wystąpił błąd przy pobieraniu tych danych: ';
+$lang['nothingfound']          = 'Nic nie znaleziono.';
+$lang['mediaselect']           = 'Wysyłanie pliku';
+$lang['fileupload']            = 'Wysyłanie pliku';
+$lang['uploadsucc']            = 'Wysyłanie powiodło się!';
+$lang['uploadfail']            = 'Błąd wysyłania pliku. Czy prawa do katalogów są poprawne?';
+$lang['uploadwrong']           = 'Wysyłanie zabronione. Nie można wysłać plików z takim rozszerzeniem';
+$lang['uploadexist']           = 'Plik już istnieje, nie wykonano operacji.';
+$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['accessdenied']          = 'Nie masz uprawnień, żeby wyświetlić tę stronę.';
+$lang['mediausage']            = 'Użyj następującej składni w odnośniku do tego pliku:';
+$lang['mediaview']             = 'Pokaż oryginalny plik';
+$lang['mediaroot']             = 'główny';
+$lang['mediaupload']           = 'Umieść plik w aktualnym katalogu. Aby utworzyć podkatalogi, poprzedź nazwę pliku nazwami katalogów oddzielonymi dwukropkami.';
+$lang['mediaextchange']        = 'Rozszerzenie pliku zmieniono z .%s na .%s!';
+$lang['reference']             = 'Odnośniki do';
+$lang['ref_inuse']             = 'Ten plik nie może być usunięty, ponieważ jest używany na następujących stronach:';
+$lang['ref_hidden']            = 'Odnośniki mogą znajdować się na stronach, do których nie masz uprawnień.';
+$lang['hits']                  = 'trafień';
+$lang['quickhits']             = 'Pasujące hasła';
+$lang['toc']                   = 'Spis treści';
+$lang['current']               = 'aktualna';
+$lang['yours']                 = 'Twoja wersja';
+$lang['diff']                  = 'Pokaż różnice między wersjami';
+$lang['diff2']                 = 'Pokaż różnice między zaznaczonymi wersjami';
+$lang['difflink']              = 'Odnośnik do tego porównania';
+$lang['diff_type']             = 'Zobacz różnice:';
+$lang['diff_inline']           = 'W linii';
+$lang['diff_side']             = 'Jeden obok drugiego';
+$lang['line']                  = 'Linia';
+$lang['breadcrumb']            = 'Ślad';
+$lang['youarehere']            = 'Jesteś tutaj';
+$lang['lastmod']               = 'ostatnio zmienione';
+$lang['by']                    = 'przez';
+$lang['deleted']               = 'usunięto';
+$lang['created']               = 'utworzono';
+$lang['restored']              = 'przywrócono poprzednią wersję (%s)';
+$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['tools']                 = 'Narzędzia';
+$lang['user_tools']            = 'Narzędzia użytkownika';
+$lang['site_tools']            = 'Narzędzia witryny';
+$lang['page_tools']            = 'Narzędzia strony';
+$lang['skip_to_content']       = 'przejście do zawartości';
+$lang['sidebar']               = 'Pasek boczny';
+$lang['mail_newpage']          = 'Strona dodana:';
+$lang['mail_changed']          = 'Strona zmieniona:';
+$lang['mail_subscribe_list']   = 'Zmienione strony w katalogu:';
+$lang['mail_new_user']         = 'Nowy użytkownik:';
+$lang['mail_upload']           = 'Umieszczono plik:';
+$lang['changes_type']          = 'Zobacz zmiany';
+$lang['pages_changes']         = 'Strony';
+$lang['media_changes']         = 'Pliki multimediów';
+$lang['both_changes']          = 'Zarówno strony jak i pliki multimediów';
+$lang['qb_bold']               = 'Pogrubienie';
+$lang['qb_italic']             = 'Pochylenie';
+$lang['qb_underl']             = 'Podkreślenie';
+$lang['qb_code']               = 'Kod źródłowy';
+$lang['qb_strike']             = 'Przekreślenie';
+$lang['qb_h1']                 = 'Nagłówek 1 stopnia';
+$lang['qb_h2']                 = 'Nagłówek 2 stopnia';
+$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';
+$lang['qb_ol']                 = 'Numeracja';
+$lang['qb_ul']                 = 'Wypunktowanie';
+$lang['qb_media']              = 'Dodaj obrazek lub inny plik';
+$lang['qb_sig']                = 'Wstaw podpis';
+$lang['qb_smileys']            = 'Emotikony';
+$lang['qb_chars']              = 'Znaki specjalne';
+$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ę';
+$lang['metasaveok']            = 'Metadane zapisano';
+$lang['img_backto']            = 'Wróć do';
+$lang['img_title']             = 'Tytuł';
+$lang['img_caption']           = 'Nagłówek';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nazwa pliku';
+$lang['img_fsize']             = 'Rozmiar';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Prawa autorskie';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Aparat';
+$lang['img_keywords']          = 'Słowa kluczowe';
+$lang['img_width']             = 'Szerokość';
+$lang['img_height']            = 'Wysokość';
+$lang['img_manager']           = 'Zobacz w menadżerze multimediów';
+$lang['subscr_subscribe_success'] = 'Dodano %s do listy subskrypcji %s';
+$lang['subscr_subscribe_error'] = 'Błąd podczas dodawania %s do listy subskrypcji %s';
+$lang['subscr_subscribe_noaddress'] = 'Brak adresu skojarzonego z twoim loginem, nie możesz zostać dodany(a) do listy subskrypcji';
+$lang['subscr_unsubscribe_success'] = 'Usunięto %s z listy subskrypcji %s';
+$lang['subscr_unsubscribe_error'] = 'Błąd podczas usuwania %s z listy subskrypcji %s';
+$lang['subscr_already_subscribed'] = '%s jest już subskrybowany(a) przez %s';
+$lang['subscr_not_subscribed'] = '%s nie jest subskrybowany(a) przez %s';
+$lang['subscr_m_not_subscribed'] = 'Obecnie nie subskrybujesz bieżącej strony lub katalogu.';
+$lang['subscr_m_new_header']   = 'Dodaj subskrypcję';
+$lang['subscr_m_current_header'] = 'Aktualne subskrypcje';
+$lang['subscr_m_unsubscribe']  = 'Zrezygnuj z subskrypcji';
+$lang['subscr_m_subscribe']    = 'Subskrybuj';
+$lang['subscr_m_receive']      = 'Otrzymuj';
+$lang['subscr_style_every']    = 'email przy każdej zmianie';
+$lang['subscr_style_digest']   = 'e-mailowy wyciąg zmian dla każdej strony (co %.2f dni)';
+$lang['subscr_style_list']     = 'lista zmienionych stron od ostatniego e-maila (co %.2f dni)';
+$lang['authtempfail']          = 'Uwierzytelnienie użytkownika jest w tej chwili niemożliwe. Jeśli ta sytuacja się powtórzy, powiadom administratora tego wiki.';
+$lang['authpwdexpire']         = 'Twoje hasło wygaśnie za %d dni. Należy je zmienić w krótkim czasie.';
+$lang['i_chooselang']          = 'Wybierz język';
+$lang['i_installer']           = 'Instalator DokuWiki';
+$lang['i_wikiname']            = 'Nazwa Wiki';
+$lang['i_enableacl']           = 'Włącz mechanizm uprawnień ACL (zalecane)';
+$lang['i_superuser']           = 'Administrator';
+$lang['i_problems']            = 'Instalator napotkał poniższe problemy. Nie można kontynuować póki nie zostaną usunięte.';
+$lang['i_modified']            = 'Ze względów bezpieczeństwa, ten skrypt działa tylko z nową i niezmodyfikowaną instalacją DokuWiki.
+Aby uruchomić instalator ponownie, rozpakuj archiwum DokuWiki lub zapoznaj się z instrukcją instalacji Dokuwiki';
+$lang['i_funcna']              = 'Funkcja PHP %s jest niedostępna.';
+$lang['i_phpver']              = 'Wersja PHP %s jest niższa od wymaganej %s. Zaktualizuj instalację PHP.';
+$lang['i_permfail']            = 'DokuWiki nie ma prawa zapisu w katalogu %s. Zmień uprawnienia zapisu dla tego katalogu!';
+$lang['i_confexists']          = '%s już istnieje';
+$lang['i_writeerr']            = 'Nie można utworzyć %s. Sprawdź uprawnienia do katalogu lub pliku i stwórz plik ręcznie.';
+$lang['i_badhash']             = 'nierozpoznany lub zmodyfikowany plik dokuwiki.php (skrót=%s)';
+$lang['i_badval']              = '%s - nieprawidłowa wartość lub jej brak';
+$lang['i_success']             = 'Konfiguracja pomyślnie zakończona. Możesz teraz usunąć plik install.php. Przejdź do Twojego nowego DokuWiki.';
+$lang['i_failure']             = 'Podczas zapisu plików konfiguracyjnych wystąpiły błędy. Musisz usunąć wszystkie problemy, zanim zaczniesz korzystać z Twojego nowego DokuWiki.';
+$lang['i_policy']              = 'Wstępna polityka uprawnień ACL';
+$lang['i_pol0']                = 'Otwarte Wiki (odczyt, zapis i dodawanie plików dla wszystkich)';
+$lang['i_pol1']                = 'Publiczne Wiki (odczyt dla wszystkich, zapis i dodawanie plików tylko dla zarejestrowanych użytkowników)';
+$lang['i_pol2']                = 'Zamknięte Wiki (odczyt, zapis i dodawanie plików tylko dla zarejestrowanych użytkowników)';
+$lang['i_allowreg']            = 'Pozwól użytkownikom rejestrować się.';
+$lang['i_retry']               = 'Spróbuj ponownie';
+$lang['i_license']             = 'Wybierz licencję, na warunkach której chcesz udostępniać treści:';
+$lang['i_license_none']        = 'Nie pokazuj żadnych informacji o licencji.';
+$lang['i_pop_field']           = 'Proszę, pomóż nam ulepszyć doświadczenia z DokuWiki:';
+$lang['i_pop_label']           = 'Raz na miesiąc, wysyłaj anonimowe statystyki do deweloperów DokuWiki';
+$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';
+$lang['wordblock']             = 'Twoje ustawienia nie zostały zapisane ponieważ zawierają niedozwoloną treść (spam).';
+$lang['media_uploadtab']       = 'Przesyłanie plików';
+$lang['media_searchtab']       = 'Szukaj';
+$lang['media_file']            = 'Plik';
+$lang['media_viewtab']         = 'Widok';
+$lang['media_edittab']         = 'Zmiana';
+$lang['media_historytab']      = 'Historia';
+$lang['media_list_thumbs']     = 'Miniatury';
+$lang['media_list_rows']       = 'Wiersze';
+$lang['media_sort_name']       = 'Nazwa';
+$lang['media_sort_date']       = 'Data';
+$lang['media_namespaces']      = 'Wybierz przestrzeń nazw';
+$lang['media_files']           = 'Pliki w %s';
+$lang['media_upload']          = 'Przesyłanie plików na %s';
+$lang['media_search']          = 'Znajdź w %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s na %s';
+$lang['media_edit']            = 'Zmień %s';
+$lang['media_history']         = 'Historia dla %s';
+$lang['media_meta_edited']     = 'zmienione metadane';
+$lang['media_perm_read']       = 'Przepraszamy, nie masz wystarczających uprawnień do odczytu plików.';
+$lang['media_perm_upload']     = 'Przepraszamy, nie masz wystarczających uprawnień do przesyłania plików.';
+$lang['media_update']          = 'Prześlij nową wersję';
+$lang['media_restore']         = 'Odtwórz tą wersję';
+$lang['currentns']             = 'Obecna przestrzeń nazw.';
+$lang['searchresult']          = 'Wyniki wyszukiwania';
+$lang['plainhtml']             = 'Czysty HTML';
diff --git a/sources/inc/lang/pl/locked.txt b/sources/inc/lang/pl/locked.txt
new file mode 100644
index 0000000..e3e05fe
--- /dev/null
+++ b/sources/inc/lang/pl/locked.txt
@@ -0,0 +1,3 @@
+====== Strona zablokowana ======
+
+Ta strona jest zablokowana do edycji przez innego użytkownika. Musisz zaczekać aż użytkownik zakończy redagowanie lub jego blokada wygaśnie.
diff --git a/sources/inc/lang/pl/login.txt b/sources/inc/lang/pl/login.txt
new file mode 100644
index 0000000..b60427f
--- /dev/null
+++ b/sources/inc/lang/pl/login.txt
@@ -0,0 +1,4 @@
+====== Logowanie ======
+
+Wprowadź nazwę użytkownika i hasło aby się zalogować. Twoja przeglądarka musi mieć włączoną obsługę ciasteczek (cookies).
+
diff --git a/sources/inc/lang/pl/mailtext.txt b/sources/inc/lang/pl/mailtext.txt
new file mode 100644
index 0000000..1180966
--- /dev/null
+++ b/sources/inc/lang/pl/mailtext.txt
@@ -0,0 +1,18 @@
+Strona w Twoim DokuWiki została dodana lub zmieniona.
+Szczegółowe informacje:
+
+Data         : @DATE@
+Przeglądarka : @BROWSER@
+Adres IP     : @IPADDRESS@
+Nazwa DNS    : @HOSTNAME@
+Stara wersja : @OLDPAGE@
+Nowa wersja  : @NEWPAGE@
+Opis zmian   : @SUMMARY@
+Użytkownik   : @USER@
+
+@DIFF@
+
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/pl/mailwrap.html b/sources/inc/lang/pl/mailwrap.html
new file mode 100644
index 0000000..6177286
--- /dev/null
+++ b/sources/inc/lang/pl/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Ta wiadomość została wygenerowana przez DokuWiki na @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/pl/newpage.txt b/sources/inc/lang/pl/newpage.txt
new file mode 100644
index 0000000..532d3f4
--- /dev/null
+++ b/sources/inc/lang/pl/newpage.txt
@@ -0,0 +1,4 @@
+====== Ta strona jeszcze nie istnieje ======
+
+Jesteś na stronie, która jeszcze nie istnieje. Jeśli masz wystarczające uprawnienia, możesz utworzyć tę stronę klikając ''utwórz stronę''.
+
diff --git a/sources/inc/lang/pl/norev.txt b/sources/inc/lang/pl/norev.txt
new file mode 100644
index 0000000..858e4a8
--- /dev/null
+++ b/sources/inc/lang/pl/norev.txt
@@ -0,0 +1,4 @@
+====== Nie ma takiej wersji ======
+
+Nie ma takiej wersji. Kliknij przycisk ''poprzednie wersje'', aby wyświetlić listę wszystkich wersji tej strony.
+
diff --git a/sources/inc/lang/pl/password.txt b/sources/inc/lang/pl/password.txt
new file mode 100644
index 0000000..948472f
--- /dev/null
+++ b/sources/inc/lang/pl/password.txt
@@ -0,0 +1,10 @@
+Witaj @FULLNAME@!
+
+Dane użytkownika @TITLE@ pod adresem @DOKUWIKIURL@
+
+Użytkownik : @LOGIN@
+Hasło      : @PASSWORD@
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/pl/preview.txt b/sources/inc/lang/pl/preview.txt
new file mode 100644
index 0000000..41a123c
--- /dev/null
+++ b/sources/inc/lang/pl/preview.txt
@@ -0,0 +1,4 @@
+====== Podgląd ======
+
+To jest podgląd edytowanej strony. Pamiętaj, że ta strona **nie** jest jeszcze zapisana!
+
diff --git a/sources/inc/lang/pl/pwconfirm.txt b/sources/inc/lang/pl/pwconfirm.txt
new file mode 100644
index 0000000..f6ccca4
--- /dev/null
+++ b/sources/inc/lang/pl/pwconfirm.txt
@@ -0,0 +1,13 @@
+Witaj @FULLNAME@!
+
+Potwierdzenie prośby o nowe hasło dla konta @TITLE@ w wiki @DOKUWIKIURL@
+
+Jeśli to nie Ty prosiłeś(aś) o nowe hasło, zignoruj ten list.
+
+Aby potwierdzić prośbę o hasło, przejdź na następującą stronę.
+
+@CONFIRM@
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/pl/read.txt b/sources/inc/lang/pl/read.txt
new file mode 100644
index 0000000..5f89fd9
--- /dev/null
+++ b/sources/inc/lang/pl/read.txt
@@ -0,0 +1,2 @@
+Ta strona jest tylko do odczytu. Możesz wyświetlić źródła tej strony ale nie możesz ich zmienić.
+
diff --git a/sources/inc/lang/pl/recent.txt b/sources/inc/lang/pl/recent.txt
new file mode 100644
index 0000000..65a776c
--- /dev/null
+++ b/sources/inc/lang/pl/recent.txt
@@ -0,0 +1,5 @@
+====== Ostatnie zmiany ======
+
+Ostatnio zmienione strony.
+
+
diff --git a/sources/inc/lang/pl/register.txt b/sources/inc/lang/pl/register.txt
new file mode 100644
index 0000000..91b761d
--- /dev/null
+++ b/sources/inc/lang/pl/register.txt
@@ -0,0 +1,4 @@
+====== Rejestracja nowego użytkownika ======
+
+Wypełnij wszystkie pola formularza aby utworzyć nowe konto w tym wiki. Pamiętaj, żeby podać **poprawny adres e-mail**, ponieważ nowe hasło może zostać do Ciebie przesłane pocztą. Nazwa użytkownika powinna być zgodna z formatem [[doku>pagename|nazw stron]].
+
diff --git a/sources/inc/lang/pl/registermail.txt b/sources/inc/lang/pl/registermail.txt
new file mode 100644
index 0000000..18437fa
--- /dev/null
+++ b/sources/inc/lang/pl/registermail.txt
@@ -0,0 +1,15 @@
+Zarejestrował się nowy użytkownik.
+Szczegółowe informacje:
+
+Użytkownik      : @NEWUSER@
+Imię i nazwisko : @NEWNAME@
+E-mail          : @NEWEMAIL@
+
+Data            : @DATE@
+Przeglądarka    : @BROWSER@
+Adres IP        : @IPADDRESS@
+Nazwa DNS       : @HOSTNAME@
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/pl/resendpwd.txt b/sources/inc/lang/pl/resendpwd.txt
new file mode 100644
index 0000000..a7cac74
--- /dev/null
+++ b/sources/inc/lang/pl/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Przesyłanie nowego hasła ======
+
+Aby otrzymać nowe hasło, podaj nazwę Twojego konta w tym wiki. Prośba o potwierdzenie w postaci odnośnika zostanie Ci przesłana pocztą elektroniczną.
+
diff --git a/sources/inc/lang/pl/resetpwd.txt b/sources/inc/lang/pl/resetpwd.txt
new file mode 100644
index 0000000..64d2d7d
--- /dev/null
+++ b/sources/inc/lang/pl/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Ustalenie nowego hasła ======
+
+Podaj, proszę, nowe hasło do Twojego konta w tym wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/pl/revisions.txt b/sources/inc/lang/pl/revisions.txt
new file mode 100644
index 0000000..afe2b64
--- /dev/null
+++ b/sources/inc/lang/pl/revisions.txt
@@ -0,0 +1,4 @@
+====== Poprzednie wersje ======
+
+Poprzednie wersje tej strony. Aby przywrócić poprzednią wersję wybierz ją, rozpocznij edycję a potem zapisz.
+
diff --git a/sources/inc/lang/pl/searchpage.txt b/sources/inc/lang/pl/searchpage.txt
new file mode 100644
index 0000000..61b9ffb
--- /dev/null
+++ b/sources/inc/lang/pl/searchpage.txt
@@ -0,0 +1,5 @@
+====== Wyszukiwanie ======
+
+Wyniki wyszukiwania. Jeśli nie znaleziono szukanego hasła, możesz utworzyć nową stronę, której tytułem będzie poszukiwane hasło.
+
+===== Wyniki =====
diff --git a/sources/inc/lang/pl/showrev.txt b/sources/inc/lang/pl/showrev.txt
new file mode 100644
index 0000000..43e826e
--- /dev/null
+++ b/sources/inc/lang/pl/showrev.txt
@@ -0,0 +1,2 @@
+**To jest stara wersja strony!**
+----
diff --git a/sources/inc/lang/pl/stopwords.txt b/sources/inc/lang/pl/stopwords.txt
new file mode 100644
index 0000000..f1d244a
--- /dev/null
+++ b/sources/inc/lang/pl/stopwords.txt
@@ -0,0 +1,89 @@
+# Lista słów ignorowanych przy indeksowaniu treści.
+# W jednej linii powinno znajdować się tylko jedno słowo.
+# Przy edycji tego pliku pamiętaj o używaniu uniksowego końca linii (LF).
+# Nie ma potrzeby wpisywania słów krótszych niż 3 znaki, ponieważ one są zawsze ignorowane.
+# Lista oparta na danych ze strony http://www.ranks.nl/stopwords/
+aby
+ale
+bardziej
+bardzo
+bez
+bowiem
+był
+była
+było
+były
+będzie
+czy
+czyli
+dla
+dlatego
+gdy
+gdzie
+ich
+innych
+jak
+jako
+jednak
+jego
+jej
+jest
+jeszcze
+jeśli
+już
+kiedy
+kilka
+która
+które
+którego
+której
+który
+których
+którym
+którzy
+lub
+między
+mnie
+mogą
+może
+można
+nad
+nam
+nas
+naszego
+naszych
+nawet
+nich
+nie
+nim
+niż
+oraz
+pod
+poza
+przed
+przede
+przez
+przy
+również
+się
+sobie
+swoje
+tak
+takie
+także
+tam
+tego
+tej
+ten
+też
+tych
+tylko
+tym
+wiele
+wielu
+więc
+wszystkich
+wszystkim
+wszystko
+właśnie
+zawsze
diff --git a/sources/inc/lang/pl/subscr_digest.txt b/sources/inc/lang/pl/subscr_digest.txt
new file mode 100644
index 0000000..2b1f63c
--- /dev/null
+++ b/sources/inc/lang/pl/subscr_digest.txt
@@ -0,0 +1,21 @@
+Witaj!
+
+Treść strony @PAGE@ na wiki @TITLE@ uległa
+następującym zmianom:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Stara wersja: @OLDPAGE@
+Nowa wersja: @NEWPAGE@
+
+Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
+@DOKUWIKIURL@, a następnie odwiedź
+@SUBSCRIBE@
+i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
+katalogach.
+
+--
+Ta wiadomość została wygenerowana przez DokuWiki na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pl/subscr_form.txt b/sources/inc/lang/pl/subscr_form.txt
new file mode 100644
index 0000000..59fdbdb
--- /dev/null
+++ b/sources/inc/lang/pl/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Zarządzanie Subskrypcją  ======
+
+Ta strona pozwala Tobie na zarządzanie Twoimi subskrypcjami dla obecnej strony i katalogu.
\ No newline at end of file
diff --git a/sources/inc/lang/pl/subscr_list.txt b/sources/inc/lang/pl/subscr_list.txt
new file mode 100644
index 0000000..9a74d75
--- /dev/null
+++ b/sources/inc/lang/pl/subscr_list.txt
@@ -0,0 +1,18 @@
+Witaj!
+
+Strony w katalogu @PAGE@ na wiki @TITLE@ uległy
+następującym zmianom:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
+@DOKUWIKIURL@, a następnie odwiedź
+@SUBSCRIBE@
+i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
+katalogach.
+
+--
+Ta wiadomość została wygenerowana przez DokuWiki na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pl/subscr_single.txt b/sources/inc/lang/pl/subscr_single.txt
new file mode 100644
index 0000000..3f4bc73
--- /dev/null
+++ b/sources/inc/lang/pl/subscr_single.txt
@@ -0,0 +1,24 @@
+Witaj!
+
+Treść strony @PAGE@ na wiki @TITLE@ uległa
+następującym zmianom:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data: @DATE@
+Użytkownik: @USER@
+Podsumowanie zmian: @SUMMARY@
+Stara wersja: @OLDPAGE@
+Nowa wersja: @NEWPAGE@
+
+Aby zrezygnować z powiadomień o zmianach zaloguj się do wiki na
+@DOKUWIKIURL@, a następnie odwiedź
+@SUBSCRIBE@
+i anuluj otrzymywanie powiadomień o zmianach na stronach i/lub
+katalogach.
+
+--
+Ta wiadomość została wygenerowana przez DokuWiki na
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pl/updateprofile.txt b/sources/inc/lang/pl/updateprofile.txt
new file mode 100644
index 0000000..aa80f4c
--- /dev/null
+++ b/sources/inc/lang/pl/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Aktualizacja profilu użytkownika ======
+
+Wystarczy, że wypełnisz tylko te pola, które chcesz zmienić. Nie możesz zmienić nazwy użytkownika.
+
+
diff --git a/sources/inc/lang/pl/uploadmail.txt b/sources/inc/lang/pl/uploadmail.txt
new file mode 100644
index 0000000..e76ec80
--- /dev/null
+++ b/sources/inc/lang/pl/uploadmail.txt
@@ -0,0 +1,16 @@
+Umieszczono nowy plik.
+
+Szczegóły:
+
+Plik         : @MEDIA@
+Data         : @DATE@
+Przeglądarka : @BROWSER@
+Adres IP     : @IPADDRESS@
+Nazwa DNS    : @HOSTNAME@
+Rozmiar      : @SIZE@
+Typ MIME     : @MIME@
+Użytkownik   : @USER@
+
+-- 
+List został wygenerowany przez DokuWiki pod adresem
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/pt-br/admin.txt b/sources/inc/lang/pt-br/admin.txt
new file mode 100644
index 0000000..f8be56e
--- /dev/null
+++ b/sources/inc/lang/pt-br/admin.txt
@@ -0,0 +1,4 @@
+====== Administração ======
+
+Abaixo você encontra uma lista das tarefas administrativas disponíveis no DokuWiki.
+
diff --git a/sources/inc/lang/pt-br/adminplugins.txt b/sources/inc/lang/pt-br/adminplugins.txt
new file mode 100644
index 0000000..3eac7af
--- /dev/null
+++ b/sources/inc/lang/pt-br/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugins Adicionais =====
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/backlinks.txt b/sources/inc/lang/pt-br/backlinks.txt
new file mode 100644
index 0000000..fce9dba
--- /dev/null
+++ b/sources/inc/lang/pt-br/backlinks.txt
@@ -0,0 +1,4 @@
+====== Links reversos ======
+
+Esta é uma lista de todas as páginas que apresentam links para a página atual.
+
diff --git a/sources/inc/lang/pt-br/conflict.txt b/sources/inc/lang/pt-br/conflict.txt
new file mode 100644
index 0000000..53d9afa
--- /dev/null
+++ b/sources/inc/lang/pt-br/conflict.txt
@@ -0,0 +1,5 @@
+====== Existe uma nova versão ======
+
+Existe uma versão mais nova do documento que você editou. Isso acontece quando outro usuário modifica o documento enquanto você o está editando.
+
+Examine as diferenças mostradas abaixo atentamente e então decida qual versão deve permanecer. Se você selecionar ''Salvar'', sua versão será salva. Pressione ''Cancelar'' para manter a versão atual.
diff --git a/sources/inc/lang/pt-br/denied.txt b/sources/inc/lang/pt-br/denied.txt
new file mode 100644
index 0000000..d7e423f
--- /dev/null
+++ b/sources/inc/lang/pt-br/denied.txt
@@ -0,0 +1,3 @@
+====== Permissão Negada ======
+
+Desculpe, você não tem permissões suficientes para continuar. Por acaso esqueceu de autenticar-se?
diff --git a/sources/inc/lang/pt-br/diff.txt b/sources/inc/lang/pt-br/diff.txt
new file mode 100644
index 0000000..517d9f2
--- /dev/null
+++ b/sources/inc/lang/pt-br/diff.txt
@@ -0,0 +1,3 @@
+====== Diferenças ======
+
+Aqui você vê as diferenças entre duas revisões dessa página.
diff --git a/sources/inc/lang/pt-br/draft.txt b/sources/inc/lang/pt-br/draft.txt
new file mode 100644
index 0000000..b3d345c
--- /dev/null
+++ b/sources/inc/lang/pt-br/draft.txt
@@ -0,0 +1,5 @@
+====== Rascunho encontrado ======
+
+A sua última sessão de edição não foi concluída corretamente. O DokuWiki automaticamente salvou um rascunho durante o seu trabalho, que você pode usar agora para continuar a sua edição. Abaixo você pode ver os dados que foram salvos na sua última sessão.
+
+Por favor, escolha se você quer //recuperar// sua sessão de edição perdida, //excluir// o rascunho salvo automaticamente ou //cancelar// o processo de edição.
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/edit.txt b/sources/inc/lang/pt-br/edit.txt
new file mode 100644
index 0000000..113fb8e
--- /dev/null
+++ b/sources/inc/lang/pt-br/edit.txt
@@ -0,0 +1,2 @@
+Edite a página e clique em ''Salvar''. Veja [[wiki:syntax|aqui]] a sintaxe do Wiki. Por favor, edite a página apenas se você puder **aprimorá-la**. Se você deseja testar alguma coisa, faça-o no [[playground:playground|playground]].
+
diff --git a/sources/inc/lang/pt-br/editrev.txt b/sources/inc/lang/pt-br/editrev.txt
new file mode 100644
index 0000000..df64135
--- /dev/null
+++ b/sources/inc/lang/pt-br/editrev.txt
@@ -0,0 +1,4 @@
+**Você carregou uma revisão antiga desse documento!** Se você salvá-la, irá criar uma nova versão com esses dados.
+----
+
+
diff --git a/sources/inc/lang/pt-br/index.txt b/sources/inc/lang/pt-br/index.txt
new file mode 100644
index 0000000..816a499
--- /dev/null
+++ b/sources/inc/lang/pt-br/index.txt
@@ -0,0 +1,3 @@
+====== Índice ======
+
+Esse é um índice de todas as páginas disponíveis, ordenadas por [[doku>namespaces|domínios]].
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/install.html b/sources/inc/lang/pt-br/install.html
new file mode 100644
index 0000000..d1b7869
--- /dev/null
+++ b/sources/inc/lang/pt-br/install.html
@@ -0,0 +1,7 @@
+
        Essa página irá auxiliá-lo na instalação e configuração do DokuWiki. Você encontra mais informações sobre esse instalador na sua página de documentação.
        
+
+
        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 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.
        
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/lang.php b/sources/inc/lang/pt-br/lang.php
new file mode 100644
index 0000000..6845e79
--- /dev/null
+++ b/sources/inc/lang/pt-br/lang.php
@@ -0,0 +1,351 @@
+
+ * @author Alauton/Loug
+ * @author Frederico Gonçalves Guimarães 
+ * @author Felipe Castro 
+ * @author Lucien Raven 
+ * @author Enrico Nicoletto 
+ * @author Flávio Veras 
+ * @author Jeferson Propheta 
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas 
+ * @author Luis Dantas 
+ * @author Jair Henrique 
+ * @author Sergio Motta 
+ * @author Isaias Masiero Filho 
+ * @author Frederico Guimarães 
+ * @author Balaco Baco 
+ * @author Victor Westmann 
+ * @author Leone Lisboa Magevski 
+ * @author Dário Estevão 
+ * @author Juliano Marconi Lanigra 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Editar esta página';
+$lang['btn_source']            = 'Mostrar código fonte';
+$lang['btn_show']              = 'Mostrar página';
+$lang['btn_create']            = 'Criar esta página';
+$lang['btn_search']            = 'Pesquisar';
+$lang['btn_save']              = 'Salvar';
+$lang['btn_preview']           = 'Visualizar';
+$lang['btn_top']               = 'Voltar ao topo';
+$lang['btn_newer']             = '<< mais recente';
+$lang['btn_older']             = 'menos recente >>';
+$lang['btn_revs']              = 'Revisões anteriores';
+$lang['btn_recent']            = 'Alterações recentes';
+$lang['btn_upload']            = 'Enviar';
+$lang['btn_cancel']            = 'Cancelar';
+$lang['btn_index']             = 'Índice';
+$lang['btn_secedit']           = 'Editar';
+$lang['btn_login']             = 'Entrar';
+$lang['btn_logout']            = 'Sair';
+$lang['btn_admin']             = 'Administrar';
+$lang['btn_update']            = 'Atualizar';
+$lang['btn_delete']            = 'Excluir';
+$lang['btn_back']              = 'Voltar';
+$lang['btn_backlink']          = 'Links reversos';
+$lang['btn_backtomedia']       = 'Voltar à seleção do arquivo de mídia';
+$lang['btn_subscribe']         = 'Monitorar alterações';
+$lang['btn_profile']           = 'Atualizar o perfil';
+$lang['btn_reset']             = 'Limpar';
+$lang['btn_resendpwd']         = 'Definir a nova senha';
+$lang['btn_draft']             = 'Editar o rascunho';
+$lang['btn_recover']           = 'Recuperar o rascunho';
+$lang['btn_draftdel']          = 'Excluir o rascunho';
+$lang['btn_revert']            = 'Restaurar';
+$lang['btn_register']          = 'Cadastre-se';
+$lang['btn_apply']             = 'Aplicar';
+$lang['btn_media']             = 'Gerenciador de mídias';
+$lang['btn_deleteuser']        = 'Remover minha conta';
+$lang['loggedinas']            = 'Identificado(a) como';
+$lang['user']                  = 'Nome de usuário';
+$lang['pass']                  = 'Senha';
+$lang['newpass']               = 'Nova senha';
+$lang['oldpass']               = 'Confirme a senha atual';
+$lang['passchk']               = 'Outra vez';
+$lang['remember']              = 'Lembre-se de mim';
+$lang['fullname']              = 'Nome completo';
+$lang['email']                 = 'E-mail';
+$lang['profile']               = 'Perfil do usuário';
+$lang['badlogin']              = 'Desculpe, mas o nome de usuário ou a senha estão incorretos.';
+$lang['badpassconfirm']        = 'Desculpe, mas a senha está errada ';
+$lang['minoredit']             = 'Alterações mínimas';
+$lang['draftdate']             = 'O rascunho foi salvo automaticamente em';
+$lang['nosecedit']             = 'A página foi modificada nesse intervalo de tempo. Como a informação da seção estava desatualizada, foi carregada a página inteira.';
+$lang['regmissing']            = 'Desculpe, mas você precisa preencher todos os campos.';
+$lang['reguexists']            = 'Desculpe, mas já existe um usuário com esse nome.';
+$lang['regsuccess']            = 'O usuário foi criado e a senha enviada para seu e-mail.';
+$lang['regsuccess2']           = 'O usuário foi criado.';
+$lang['regmailfail']           = 'Aparentemente ocorreu um erro no envio da senha. Por favor, entre em contato com o administrador!';
+$lang['regbadmail']            = 'O endereço de e-mail fornecido é, aparentemente, inválido - se você acha que isso é um erro, entre em contato com o administrador';
+$lang['regbadpass']            = 'As senhas digitadas não são idênticas. Por favor, tente novamente.';
+$lang['regpwmail']             = 'A sua senha do DokuWiki';
+$lang['reghere']               = 'Ainda não tem uma conta? Crie uma';
+$lang['profna']                = 'Esse wiki não suporta modificações do perfil.';
+$lang['profnochange']          = 'Sem alterações, nada para fazer.';
+$lang['profnoempty']           = 'Não são permitidos nomes ou endereços de e-mail em branco.';
+$lang['profchanged']           = 'O perfil do usuário foi atualizado com sucesso.';
+$lang['profnodelete']          = 'Esse wiki não suporta a exclusão de usuários ';
+$lang['profdeleteuser']        = 'Excluir a conta';
+$lang['profdeleted']           = 'Sua conta de usuário foi excluída desse wiki';
+$lang['profconfdelete']        = 'Eu desejo remover minha conta dessa wiki. 
         Essa ação não pode ser desfeita.';
+$lang['profconfdeletemissing'] = 'Caixa de confirmação não marcada';
+$lang['pwdforget']             = 'Esqueceu sua senha? Solicite outra';
+$lang['resendna']              = 'Esse wiki não tem suporte para o reenvio de senhas.';
+$lang['resendpwd']             = 'Definir a nova senha para';
+$lang['resendpwdmissing']      = 'Desculpe, você deve preencher todos os campos.';
+$lang['resendpwdnouser']       = 'Desculpe, não foi possível encontrar esse usuário no nosso banco de dados.';
+$lang['resendpwdbadauth']      = 'Desculpe, esse código de autorização é inválido. Certifique-se de que você usou o link de confirmação inteiro.';
+$lang['resendpwdconfirm']      = 'Um link de confirmação foi enviado por e-mail.';
+$lang['resendpwdsuccess']      = 'Sua nova senha foi enviada por e-mail.';
+$lang['license']               = 'Exceto onde for informado ao contrário, o conteúdo neste wiki está sob a seguinte licença:';
+$lang['licenseok']             = 'Observe: editando esta página você aceita disponibilizar o seu conteúdo sob a seguinte licença:';
+$lang['searchmedia']           = 'Buscar arquivo:';
+$lang['searchmedia_in']        = 'Buscar em %s';
+$lang['txt_upload']            = 'Selecione o arquivo a ser enviado';
+$lang['txt_filename']          = 'Enviar como (opcional)';
+$lang['txt_overwrt']           = 'Substituir o arquivo existente';
+$lang['maxuploadsize']         = 'Tamanho máximo de %s por arquivo.';
+$lang['lockedby']              = 'Atualmente bloqueada por';
+$lang['lockexpire']            = 'O bloqueio expira em';
+$lang['js']['willexpire']      = 'O seu bloqueio de edição deste página irá expirar em um minuto.\nPara evitar conflitos de edição, clique no botão de visualização para reiniciar o temporizador de bloqueio.';
+$lang['js']['notsavedyet']     = 'As alterações não salvas serão perdidas.
+Deseja realmente continuar?';
+$lang['js']['searchmedia']     = 'Buscar por arquivos';
+$lang['js']['keepopen']        = 'Manter a janela aberta na seleção';
+$lang['js']['hidedetails']     = 'Esconder detalhes';
+$lang['js']['mediatitle']      = 'Configurações do Link';
+$lang['js']['mediadisplay']    = 'Tipo de Link';
+$lang['js']['mediaalign']      = 'Alinhamento';
+$lang['js']['mediasize']       = 'Tamanho da Imagem';
+$lang['js']['mediatarget']     = 'Alvo do Link';
+$lang['js']['mediaclose']      = 'Fechar';
+$lang['js']['mediainsert']     = 'Inserir';
+$lang['js']['mediadisplayimg'] = 'Mostrar Imagem.';
+$lang['js']['mediadisplaylnk'] = 'Mostrar apenas Link.';
+$lang['js']['mediasmall']      = 'Versão Pequena';
+$lang['js']['mediamedium']     = 'Versão Média';
+$lang['js']['medialarge']      = 'Versão Grande';
+$lang['js']['mediaoriginal']   = 'Versão Original';
+$lang['js']['medialnk']        = 'Link para página de detalhes';
+$lang['js']['mediadirect']     = 'Link direto para original';
+$lang['js']['medianolnk']      = 'Sem Link';
+$lang['js']['medianolink']     = 'Sem link na imagem';
+$lang['js']['medialeft']       = 'Alinhamento de imagem a esquerda';
+$lang['js']['mediaright']      = 'Alinhamento de imagem a direita';
+$lang['js']['mediacenter']     = 'Alinhamento de imagem ao centro';
+$lang['js']['medianoalign']    = 'Sem alinhamento';
+$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']['linkwiz']         = 'Link Wizard';
+$lang['js']['linkto']          = 'Link para:';
+$lang['js']['del_confirm']     = 'Deseja realmente excluir o(s) item(ns) selecionado(s)?';
+$lang['js']['restore_confirm'] = 'Deseja realmente restaurar essa versão?';
+$lang['js']['media_diff']      = 'Ver as diferenças:';
+$lang['js']['media_diff_both'] = 'Lado a lado';
+$lang['js']['media_diff_opacity'] = 'Sobreposição';
+$lang['js']['media_diff_portions'] = 'Deslizamento';
+$lang['js']['media_select']    = 'Selecione os arquivos...';
+$lang['js']['media_upload_btn'] = 'Enviar';
+$lang['js']['media_done_btn']  = 'Concluído';
+$lang['js']['media_drop']      = 'Arraste os arquivos até aqui para enviar';
+$lang['js']['media_cancel']    = 'remover';
+$lang['js']['media_overwrt']   = 'Sobrescrever arquivos existentes';
+$lang['rssfailed']             = 'Ocorreu um erro durante a atualização dessa fonte: ';
+$lang['nothingfound']          = 'Não foi encontrado nada.';
+$lang['mediaselect']           = 'Arquivos de mídia';
+$lang['fileupload']            = 'Envio de arquivo de mídia';
+$lang['uploadsucc']            = 'O envio foi efetuado com sucesso';
+$lang['uploadfail']            = 'Não foi possível enviar o arquivo. Será algum problema com as permissões?';
+$lang['uploadwrong']           = 'O envio foi bloqueado. Essa extensão de arquivo é proibida!';
+$lang['uploadexist']           = 'O arquivo já existe. Não foi feito nada.';
+$lang['uploadbadcontent']      = 'O conteúdo enviado não corresponde à extensão do arquivo %s.';
+$lang['uploadspam']            = 'O envio foi bloqueado pela lista negra de spams.';
+$lang['uploadxss']             = 'O envio foi bloqueado devido à possibilidade do seu conteúdo ser malicioso.';
+$lang['uploadsize']            = 'O arquivo transmitido era grande demais. (max. %s)';
+$lang['deletesucc']            = 'O arquivo "%s" foi excluído.';
+$lang['deletefail']            = 'Não foi possível excluir "%s" - verifique as permissões.';
+$lang['mediainuse']            = 'O arquivo "%s" não foi excluído - ele ainda está em uso.';
+$lang['namespaces']            = 'Espaços de nomes';
+$lang['mediafiles']            = 'Arquivos disponíveis em';
+$lang['accessdenied']          = 'Você não tem permissão para visualizar esta página.';
+$lang['mediausage']            = 'Use a seguinte sintaxe para referenciar esse arquivo:';
+$lang['mediaview']             = 'Ver o arquivo original';
+$lang['mediaroot']             = 'raiz';
+$lang['mediaupload']           = 'Envie um arquivo para o espaço de nomes atual aqui. Para criar subespaços de nomes, preponha-os ao nome do arquivo no parâmetro "Enviar como", separados por vírgulas.';
+$lang['mediaextchange']        = 'A extensão do arquivo mudou de .%s para .%s!';
+$lang['reference']             = 'Referências para';
+$lang['ref_inuse']             = 'O arquivo não pode ser excluído, porque ele ainda está sendo utilizado nas seguintes páginas:';
+$lang['ref_hidden']            = 'Algumas referências estão em páginas que você não tem permissão para ler';
+$lang['hits']                  = 'Resultados';
+$lang['quickhits']             = 'Nomes de páginas coincidentes';
+$lang['toc']                   = 'Tabela de conteúdos';
+$lang['current']               = 'atual';
+$lang['yours']                 = 'Sua versão';
+$lang['diff']                  = 'Mostrar diferenças com a revisão atual';
+$lang['diff2']                 = 'Mostrar diferenças entre as revisões selecionadas';
+$lang['difflink']              = 'Link para esta página de comparações';
+$lang['diff_type']             = 'Ver as diferenças:';
+$lang['diff_inline']           = 'Mescladas';
+$lang['diff_side']             = 'Lado a lado';
+$lang['line']                  = 'Linha';
+$lang['breadcrumb']            = 'Visitou';
+$lang['youarehere']            = 'Você está aqui';
+$lang['lastmod']               = 'Última modificação';
+$lang['by']                    = 'por';
+$lang['deleted']               = 'removida';
+$lang['created']               = 'criada';
+$lang['restored']              = 'a revisão anterior foi restaurada (%s)';
+$lang['external_edit']         = 'edição externa';
+$lang['summary']               = 'Resumo da edição';
+$lang['noflash']               = 'O plug-in Adobe Flash é necessário para exibir este conteúdo.';
+$lang['download']              = 'Baixar o snippet';
+$lang['tools']                 = 'Ferramentas';
+$lang['user_tools']            = 'Ferramentas do usuário';
+$lang['site_tools']            = 'Ferramentas do site';
+$lang['page_tools']            = 'Ferramentas da página';
+$lang['skip_to_content']       = 'ir para o conteúdo';
+$lang['sidebar']               = 'Barra lateral';
+$lang['mail_newpage']          = 'página adicionada:';
+$lang['mail_changed']          = 'página modificada:';
+$lang['mail_subscribe_list']   = 'páginas alteradas no espaço de nomes:';
+$lang['mail_new_user']         = 'novo usuário:';
+$lang['mail_upload']           = 'arquivo enviado:';
+$lang['changes_type']          = 'Ver as mudanças de';
+$lang['pages_changes']         = 'Páginas';
+$lang['media_changes']         = 'Arquivos de mídia';
+$lang['both_changes']          = 'Páginas e arquivos de mídia';
+$lang['qb_bold']               = 'Texto em negrito';
+$lang['qb_italic']             = 'Texto em itálico';
+$lang['qb_underl']             = 'Texto sublinhado';
+$lang['qb_code']               = 'Texto de código';
+$lang['qb_strike']             = 'Texto tachado';
+$lang['qb_h1']                 = 'Cabeçalho de nível 1';
+$lang['qb_h2']                 = 'Cabeçalho de nível 2';
+$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_hs']                 = 'Escolha o cabeçalho';
+$lang['qb_hplus']              = 'Cabeçalho de nível mais alto';
+$lang['qb_hminus']             = 'Cabeçalho de nível mais baixo';
+$lang['qb_hequal']             = 'Cabeçalho de mesmo nível';
+$lang['qb_link']               = 'Link interno';
+$lang['qb_extlink']            = 'Link externo';
+$lang['qb_hr']                 = 'Linha horizontal';
+$lang['qb_ol']                 = 'Item de lista ordenada';
+$lang['qb_ul']                 = 'Item de lista não ordenada';
+$lang['qb_media']              = 'Adicionar imagens e/ou outros arquivos';
+$lang['qb_sig']                = 'Inserir assinatura';
+$lang['qb_smileys']            = 'Carinhas';
+$lang['qb_chars']              = 'Caracteres especiais';
+$lang['upperns']               = 'Pular para espaço de nomes acima';
+$lang['admin_register']        = 'Adicionar novo usuário';
+$lang['metaedit']              = 'Editar metadados';
+$lang['metasaveerr']           = 'Não foi possível escrever os metadados';
+$lang['metasaveok']            = 'Os metadados foram salvos';
+$lang['img_backto']            = 'Voltar para';
+$lang['img_title']             = 'Título';
+$lang['img_caption']           = 'Descrição';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Nome do arquivo';
+$lang['img_fsize']             = 'Tamanho';
+$lang['img_artist']            = 'Fotógrafo';
+$lang['img_copyr']             = 'Direitos autorais';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Câmera';
+$lang['img_keywords']          = 'Palavras-chave';
+$lang['img_width']             = 'Largura';
+$lang['img_height']            = 'Altura';
+$lang['img_manager']           = 'Ver no gerenciador de mídias';
+$lang['subscr_subscribe_success'] = 'Adicionado %s à lista de monitoramentos de %s';
+$lang['subscr_subscribe_error'] = 'Ocorreu um erro na adição de %s à lista de monitoramentos de %s';
+$lang['subscr_subscribe_noaddress'] = 'Como não há nenhum endereço associado ao seu usuário, você não pode ser adicionado à lista de monitoramento';
+$lang['subscr_unsubscribe_success'] = '%s foi removido da lista de monitoramento de %s';
+$lang['subscr_unsubscribe_error'] = 'Ocorreu um erro na remoção de %s da lista de monitoramentos de %s';
+$lang['subscr_already_subscribed'] = '%s já está monitorando %s';
+$lang['subscr_not_subscribed'] = '%s não está monitorando %s';
+$lang['subscr_m_not_subscribed'] = 'Você não está monitorando nem a página atual nem o espaço de nomes.';
+$lang['subscr_m_new_header']   = 'Adicionar monitoramento';
+$lang['subscr_m_current_header'] = 'Monitoramentos atuais';
+$lang['subscr_m_unsubscribe']  = 'Cancelar monitoramento';
+$lang['subscr_m_subscribe']    = 'Monitorar';
+$lang['subscr_m_receive']      = 'Receber';
+$lang['subscr_style_every']    = 'um e-mail a cada modificação';
+$lang['subscr_style_digest']   = 'um agrupamento de e-mails com as mudanças para cada página (a cada %.2f dias)';
+$lang['subscr_style_list']     = 'uma lista de páginas modificadas desde o último e-mail (a cada %.2f dias)';
+$lang['authtempfail']          = 'A autenticação de usuários está temporariamente desabilitada. Se essa situação persistir, por favor, informe ao administrador do Wiki.';
+$lang['authpwdexpire']         = 'Sua senha vai expirar em %d dias. Você deve mudá-la assim que for possível.';
+$lang['i_chooselang']          = 'Selecione o seu idioma';
+$lang['i_installer']           = 'Instalador do DokuWiki';
+$lang['i_wikiname']            = 'Nome do Wiki';
+$lang['i_enableacl']           = 'Habilitar Lista de Controle de Acessos (recomendado)';
+$lang['i_superuser']           = 'Superusuário';
+$lang['i_problems']            = 'O instalador encontrou alguns problemas, indicados abaixo. Você não pode continuar até corrigi-los.';
+$lang['i_modified']            = 'Por questões de segurança, esse script funcionará apenas em uma instalação nova e não modificada do DokuWiki.
+Você pode extrair novamente os arquivos do pacote original ou consultar as instruções de instalação do DokuWiki.';
+$lang['i_funcna']              = 'A função PHP %s não está disponível. O seu host a mantém desabilitada por algum motivo?';
+$lang['i_phpver']              = 'A sua versão do PHP (%s) é inferior à necessária (%s). Você precisa atualizar a sua instalação do PHP.';
+$lang['i_permfail']            = 'O DokuWiki não tem permissão de escrita em %s. Você precisa corrigir as configurações de permissão nesse diretório!';
+$lang['i_confexists']          = '%s já existe';
+$lang['i_writeerr']            = 'Não foi possível criar %s. É necessário checar as permissões de arquivos/diretórios e criar o arquivo manualmente.';
+$lang['i_badhash']             = 'dokuwiki.php não reconhecido ou modificado (hash=%s)';
+$lang['i_badval']              = '%s - valor ilegal ou em branco';
+$lang['i_success']             = 'A configuração terminou com sucesso. Agora você deve excluir o arquivo install.php. Conheça o seu novo DokuWiki!';
+$lang['i_failure']             = 'Ocorreram alguns erros durante a escrita dos arquivos de configuração. É necessário corrigi-los manualmente antes de usar seu novo DokuWiki';
+$lang['i_policy']              = 'Política inicial de permissões';
+$lang['i_pol0']                = 'Wiki aberto (leitura, escrita e envio de arquivos por todos)';
+$lang['i_pol1']                = 'Wiki público (leitura por todos, escrita e envio de arquivos por usuários registrados)';
+$lang['i_pol2']                = 'Wiki fechado (leitura, escrita e envio de arquivos somente por usuários registrados)';
+$lang['i_allowreg']            = 'Permite usuários se registrarem';
+$lang['i_retry']               = 'Tentar novamente';
+$lang['i_license']             = 'Por favor escolha a licença que voce deseja utilizar para seu conteúdo:';
+$lang['i_license_none']        = 'Não mostrar nenhuma informação da licença';
+$lang['i_pop_field']           = 'Por favor, nos ajude a melhorar sua experiência com DokuWiki:';
+$lang['i_pop_label']           = 'Uma vez por mês, enviar anonimamente informações de uso de dados para os desenvolvedores DokuWiki';
+$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';
+$lang['wordblock']             = 'Suas mudanças não foram salvas pois contem texto bloqueados (spam)';
+$lang['media_uploadtab']       = 'Enviar';
+$lang['media_searchtab']       = 'Pesquisar';
+$lang['media_file']            = 'Arquivo';
+$lang['media_viewtab']         = 'Ver';
+$lang['media_edittab']         = 'Editar';
+$lang['media_historytab']      = 'Histórico';
+$lang['media_list_thumbs']     = 'Miniaturas';
+$lang['media_list_rows']       = 'Linhas';
+$lang['media_sort_name']       = 'Nome';
+$lang['media_sort_date']       = 'Data';
+$lang['media_namespaces']      = 'Selecione o espaço de nomes';
+$lang['media_files']           = 'Arquivos em %s';
+$lang['media_upload']          = 'Enviar para %s';
+$lang['media_search']          = 'Pesquisar em %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s em %s';
+$lang['media_edit']            = 'Editar %s';
+$lang['media_history']         = 'Histórico de %s';
+$lang['media_meta_edited']     = 'o metadado foi editado';
+$lang['media_perm_read']       = 'Desculpe, mas você não tem privilégios suficientes para ler arquivos.';
+$lang['media_perm_upload']     = 'Desculpe, mas você não tem privilégios suficientes para enviar arquivos.';
+$lang['media_update']          = 'Enviar uma nova versão';
+$lang['media_restore']         = 'Restaurar esta versão';
+$lang['currentns']             = 'Domínio atual';
+$lang['searchresult']          = 'Resultado da Busca';
+$lang['plainhtml']             = 'HTML simples';
+$lang['wikimarkup']            = 'Marcação wiki';
diff --git a/sources/inc/lang/pt-br/locked.txt b/sources/inc/lang/pt-br/locked.txt
new file mode 100644
index 0000000..70658cb
--- /dev/null
+++ b/sources/inc/lang/pt-br/locked.txt
@@ -0,0 +1,3 @@
+====== Página bloqueada ======
+
+Essa página está bloqueada para edição por outro usuário. Você tem que esperar até que esse usuário termine a edição ou que o bloqueio expire.
diff --git a/sources/inc/lang/pt-br/login.txt b/sources/inc/lang/pt-br/login.txt
new file mode 100644
index 0000000..23215e1
--- /dev/null
+++ b/sources/inc/lang/pt-br/login.txt
@@ -0,0 +1,3 @@
+====== Autenticação ======
+
+Você não está autenticado. Digite as seus dados de usuário abaixo para entrar no sistema. É necessário habilitar os //cookies// no seu navegador para que isso funcione.
diff --git a/sources/inc/lang/pt-br/mailtext.txt b/sources/inc/lang/pt-br/mailtext.txt
new file mode 100644
index 0000000..e52535b
--- /dev/null
+++ b/sources/inc/lang/pt-br/mailtext.txt
@@ -0,0 +1,17 @@
+Uma página em seu DokuWiki foi adicionada ou alterada. Aqui estão os detalhes:
+
+Data: @DATE@
+Navegador: @BROWSER@
+Endereço IP: @IPADDRESS@
+Nome do host: @HOSTNAME@
+Revisão antiga: @OLDPAGE@
+Nova revisão: @NEWPAGE@
+Resumo da edição: @SUMMARY@
+Usuário: @USER@
+
+@DIFF@
+
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/mailwrap.html b/sources/inc/lang/pt-br/mailwrap.html
new file mode 100644
index 0000000..80bea7a
--- /dev/null
+++ b/sources/inc/lang/pt-br/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/newpage.txt b/sources/inc/lang/pt-br/newpage.txt
new file mode 100644
index 0000000..77ba49f
--- /dev/null
+++ b/sources/inc/lang/pt-br/newpage.txt
@@ -0,0 +1,3 @@
+====== Esse tópico ainda não existe ======
+
+Você clicou em um link para um tópico que ainda não existe. Se for permitido, você poderá criá-lo usando o botão ''Criar essa página''.
diff --git a/sources/inc/lang/pt-br/norev.txt b/sources/inc/lang/pt-br/norev.txt
new file mode 100644
index 0000000..19024dc
--- /dev/null
+++ b/sources/inc/lang/pt-br/norev.txt
@@ -0,0 +1,3 @@
+====== Essa revisão não existe ======
+
+A revisão especificada não existe. Utilize o botão ''Revisões anteriores'' para uma listagem das revisões anteriores deste documento.
diff --git a/sources/inc/lang/pt-br/password.txt b/sources/inc/lang/pt-br/password.txt
new file mode 100644
index 0000000..199d6e1
--- /dev/null
+++ b/sources/inc/lang/pt-br/password.txt
@@ -0,0 +1,10 @@
+Olá @FULLNAME@!
+
+Aqui estão os seus dados de usuário para @TITLE@ em @DOKUWIKIURL@
+
+Usuário  : @LOGIN@
+Senha    : @PASSWORD@
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/pt-br/preview.txt b/sources/inc/lang/pt-br/preview.txt
new file mode 100644
index 0000000..efdc8f7
--- /dev/null
+++ b/sources/inc/lang/pt-br/preview.txt
@@ -0,0 +1,3 @@
+====== Visualização ======
+
+Essa é uma visualização de como será a aparência do seu texto. Lembre-se: ele ainda **não foi gravado**!
diff --git a/sources/inc/lang/pt-br/pwconfirm.txt b/sources/inc/lang/pt-br/pwconfirm.txt
new file mode 100644
index 0000000..2a7c885
--- /dev/null
+++ b/sources/inc/lang/pt-br/pwconfirm.txt
@@ -0,0 +1,13 @@
+Olá @FULLNAME@!
+
+Alguém requisitou um nova senha para o seu usuário @TITLE@ em @DOKUWIKIURL@.
+
+Se não foi você quem fez essa requisição, simplesmente ignore essa mensagem.
+
+Se você realmente deseja receber uma nova senha, por favor, utilize o link abaixo, para confirmar sua requisição.
+
+@CONFIRM@
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/read.txt b/sources/inc/lang/pt-br/read.txt
new file mode 100644
index 0000000..897155e
--- /dev/null
+++ b/sources/inc/lang/pt-br/read.txt
@@ -0,0 +1 @@
+Essa página está em modo somente de leitura. Você pode visualizar a fonte, mas não alterá-la. Informe-se com o administrador do Wiki, caso você ache que isso está incorreto.
diff --git a/sources/inc/lang/pt-br/recent.txt b/sources/inc/lang/pt-br/recent.txt
new file mode 100644
index 0000000..988f235
--- /dev/null
+++ b/sources/inc/lang/pt-br/recent.txt
@@ -0,0 +1,4 @@
+====== Alterações Recentes ======
+
+As seguintes páginas foram alteradas recentemente.
+
diff --git a/sources/inc/lang/pt-br/register.txt b/sources/inc/lang/pt-br/register.txt
new file mode 100644
index 0000000..431feca
--- /dev/null
+++ b/sources/inc/lang/pt-br/register.txt
@@ -0,0 +1,4 @@
+====== Registre-se como um novo usuário ======
+
+Preencha todas as informações abaixo para criar uma nova conta nesse Wiki. Certifique-se de que você forneceu um **endereço de e-mail válido** - se não for pedido que você entre com uma senha aqui, ela será enviada para esse endereço. O nome de usuário deve ser um [[doku>pagename|nome de página]] válido.
+
diff --git a/sources/inc/lang/pt-br/registermail.txt b/sources/inc/lang/pt-br/registermail.txt
new file mode 100644
index 0000000..9bb6a00
--- /dev/null
+++ b/sources/inc/lang/pt-br/registermail.txt
@@ -0,0 +1,14 @@
+Foi registrado um novo usuário. Seus detalhes são:
+
+Nome de usuário: @NEWUSER@
+Nome completo: @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Data: @DATE@
+Navegador: @BROWSER@
+Endereço IP: @IPADDRESS@
+Nome do host: @HOSTNAME@
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/resendpwd.txt b/sources/inc/lang/pt-br/resendpwd.txt
new file mode 100644
index 0000000..b74713f
--- /dev/null
+++ b/sources/inc/lang/pt-br/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Enviar nova senha ======
+
+Por favor, digite o seu nome de usuário no formulário abaixo para requisitar uma nova senha para a sua conta nesse wiki. O link de confirmação será enviado para o endereço de e-mail que você forneceu.
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/resetpwd.txt b/sources/inc/lang/pt-br/resetpwd.txt
new file mode 100644
index 0000000..febb1d6
--- /dev/null
+++ b/sources/inc/lang/pt-br/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Definir uma nova senha ======
+
+Por favor, digite uma nova senha para sua conta neste wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/revisions.txt b/sources/inc/lang/pt-br/revisions.txt
new file mode 100644
index 0000000..1c174dc
--- /dev/null
+++ b/sources/inc/lang/pt-br/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/pt-br/searchpage.txt b/sources/inc/lang/pt-br/searchpage.txt
new file mode 100644
index 0000000..2fba3af
--- /dev/null
+++ b/sources/inc/lang/pt-br/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
diff --git a/sources/inc/lang/pt-br/showrev.txt b/sources/inc/lang/pt-br/showrev.txt
new file mode 100644
index 0000000..89d9cad
--- /dev/null
+++ b/sources/inc/lang/pt-br/showrev.txt
@@ -0,0 +1,2 @@
+**Essa é uma revisão anterior do documento!**
+----
diff --git a/sources/inc/lang/pt-br/stopwords.txt b/sources/inc/lang/pt-br/stopwords.txt
new file mode 100644
index 0000000..c781ffb
--- /dev/null
+++ b/sources/inc/lang/pt-br/stopwords.txt
@@ -0,0 +1,55 @@
+# Essa é uma lista de palavras que o indexador ignora, uma palavra por linha
+# Ao editar esse arquivo, certifique-se de usar terminações de linha UNIX (newline simples)
+# Não há necessidade de incluir palavras menores que 3 caracteres - elas já são ignoradas por padrão
+# Essa lista é baseada na encontrada em http://www.ranks.nl/stopwords/portugese.html
+acerca
+algum
+alguma
+algumas
+alguns
+ambos
+antes
+após
+aquela
+aquelas
+aquele
+aqueles
+até
+bem
+bom
+cada
+com
+como
+das
+desde
+dos
+enquanto
+então
+esta
+este
+estas
+estes
+essa
+essas
+esse
+esses
+isso
+isto
+mas
+mesmo
+onde
+para
+pelo
+por
+qual
+quando
+que
+quem
+sem
+somente
+tal
+também
+uma
+umas
+uns
+www
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/subscr_digest.txt b/sources/inc/lang/pt-br/subscr_digest.txt
new file mode 100644
index 0000000..77f76e1
--- /dev/null
+++ b/sources/inc/lang/pt-br/subscr_digest.txt
@@ -0,0 +1,20 @@
+Olá!
+
+A página @PAGE@ na wiki @TITLE@ foi modificada.
+Estas foram as mudanças:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Revisão antiga:@OLDPAGE@
+Nova Revisão:@NEWPAGE@
+
+Para cancelar as notificações de mudanças, entre em
+@DOKUWIKIURL@, vá até @SUBSCRIBE@
+e cancele o monitoramento da página e/ou do espaço de
+nomes.
+
+--
+Este e-mail foi gerado pelo DokuWiki em
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/pt-br/subscr_form.txt b/sources/inc/lang/pt-br/subscr_form.txt
new file mode 100644
index 0000000..1611ea9
--- /dev/null
+++ b/sources/inc/lang/pt-br/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Gerenciamento de inscrição ======
+
+Esta página permite voce gerencias as inscrições para a página e namespace corrente.
diff --git a/sources/inc/lang/pt-br/subscr_list.txt b/sources/inc/lang/pt-br/subscr_list.txt
new file mode 100644
index 0000000..c6011d0
--- /dev/null
+++ b/sources/inc/lang/pt-br/subscr_list.txt
@@ -0,0 +1,28 @@
+Olá!
+
+Páginas no espaço de nomes @PAGE@ na wiki
+@TITLE@ foram modificadas.
+Estas são as páginas modificadas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Para cancelar as notificações de alterações, entre em
+@DOKUWIKIURL@, vá até @SUBSCRIBE@
+e cancele o monitoramento da página e/ou do espaço de
+nomes.
+
+
+Para cancelar as notificações de páginas, entre na wiki @DOKUWIKIURL@
+e então visite @SUBSCRIBE@ e cancele a inscrição de edição da página ou namespace.
+
+
+Para cancelar a página de notificações, entre na wiki @DOKUWIKIURL@,
+visite a página de @SUBSCRIBE@ e cancele a inscrição de edição da página ou namespace.
+--
+Este e-mail foi gerado pelo DokuWiki em
+@DOKUWIKIURL@
+
+  
+preview.txt ====== Preview ====== 
diff --git a/sources/inc/lang/pt-br/subscr_single.txt b/sources/inc/lang/pt-br/subscr_single.txt
new file mode 100644
index 0000000..b1c052e
--- /dev/null
+++ b/sources/inc/lang/pt-br/subscr_single.txt
@@ -0,0 +1,22 @@
+Olá!
+
+A página @PAGE@ na wiki @TITLE@ foi alterada.
+Estas foram as mudanças:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Usuário : @USER@
+Sumário : @SUMMARY@
+Revisão antiga:@OLDPAGE@
+Nova Revisão:@NEWPAGE@
+
+Para cancelar as notificações de mudanças, entre em
+@DOKUWIKIURL@, vá até @NEWPAGE@
+e cancele o monitoramento da página e/ou do espaço de
+nomes.
+--
+Este e-mail foi gerado pelo DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt-br/updateprofile.txt b/sources/inc/lang/pt-br/updateprofile.txt
new file mode 100644
index 0000000..b3f62f3
--- /dev/null
+++ b/sources/inc/lang/pt-br/updateprofile.txt
@@ -0,0 +1,5 @@
+====== 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 --git a/sources/inc/lang/pt-br/uploadmail.txt b/sources/inc/lang/pt-br/uploadmail.txt
new file mode 100644
index 0000000..a3ac9ba
--- /dev/null
+++ b/sources/inc/lang/pt-br/uploadmail.txt
@@ -0,0 +1,14 @@
+Um arquivo foi enviado para o seu DokuWiki. Os detalhes são:
+
+Arquivo: @MEDIA@
+Data: @DATE@
+Navegador: @BROWSER@
+Endereço IP: @IPADDRESS@
+Nome do host: @HOSTNAME@
+Tamanho: @SIZE@
+Tipo MIME: @MIME@
+Usuário: @USER@
+
+-- 
+Essa mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt/admin.txt b/sources/inc/lang/pt/admin.txt
new file mode 100644
index 0000000..366792a
--- /dev/null
+++ b/sources/inc/lang/pt/admin.txt
@@ -0,0 +1,3 @@
+====== Administração ======
+
+Abaixo pode encontrar uma lista de tarefas de administrativas permitidas pelo DokuWiki.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/adminplugins.txt b/sources/inc/lang/pt/adminplugins.txt
new file mode 100644
index 0000000..3eac7af
--- /dev/null
+++ b/sources/inc/lang/pt/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugins Adicionais =====
\ No newline at end of file
diff --git a/sources/inc/lang/pt/backlinks.txt b/sources/inc/lang/pt/backlinks.txt
new file mode 100644
index 0000000..e78ddf8
--- /dev/null
+++ b/sources/inc/lang/pt/backlinks.txt
@@ -0,0 +1,4 @@
+====== Backlinks ======
+
+Esta é uma lista de todos os documentos que apresentam ligações ao documento corrente.
+
diff --git a/sources/inc/lang/pt/conflict.txt b/sources/inc/lang/pt/conflict.txt
new file mode 100644
index 0000000..d2af1fe
--- /dev/null
+++ b/sources/inc/lang/pt/conflict.txt
@@ -0,0 +1,9 @@
+====== Conflito de Edição ======
+
+**Atenção**: Existe uma versão mais recente do que a versão usada no começo da sua edição. Isto acontece quando outra pessoa editou este documento entretanto e já gravou as alterações efectuadas.
+
+Por favor, examine todas as diferenças mostradas abaixo com atenção, e decida qual a versão que deverá ser tornada a mais actual:   * Se escolher  a sua versão será sobreposta à versão editada pela outra pessoa, que será perdida.   * Se escolher  a versão editada pela outra pessoa será a versão final, e a sua será perdida.
+
+**Nota**: Sem que efectue a consolidação das alterações de ambas as revisões ao documento irá sempre perder uma das versões.
+
+----
diff --git a/sources/inc/lang/pt/denied.txt b/sources/inc/lang/pt/denied.txt
new file mode 100644
index 0000000..eb26143
--- /dev/null
+++ b/sources/inc/lang/pt/denied.txt
@@ -0,0 +1,3 @@
+====== Permissão Negada ======
+
+Não possui direitos e permissões suficientes para continuar. Talvez se tenha esquecido de iniciar sessão?
\ No newline at end of file
diff --git a/sources/inc/lang/pt/diff.txt b/sources/inc/lang/pt/diff.txt
new file mode 100644
index 0000000..e27640a
--- /dev/null
+++ b/sources/inc/lang/pt/diff.txt
@@ -0,0 +1,5 @@
+====== Diferenças ======
+
+Esta página mostra as diferenças entre a revisão do documento que escolheu e a versão actual.
+
+----
diff --git a/sources/inc/lang/pt/draft.txt b/sources/inc/lang/pt/draft.txt
new file mode 100644
index 0000000..1baf95c
--- /dev/null
+++ b/sources/inc/lang/pt/draft.txt
@@ -0,0 +1,7 @@
+====== Rascunho encontrado ======
+
+A sessão referente à última edição desta página não terminou correctamente. Foi guardado automaticamente um rascunho durante a edição que pode ou não usar para continuar a edição. Abaixo pode ver os dados guardados da última sessão.
+
+Por favor, decida se quer **recuperar** os dados guardados, **remover** o rascunho** ou **cancelar** o processo de edição corrente.
+
+----
diff --git a/sources/inc/lang/pt/edit.txt b/sources/inc/lang/pt/edit.txt
new file mode 100644
index 0000000..2fa596e
--- /dev/null
+++ b/sources/inc/lang/pt/edit.txt
@@ -0,0 +1,4 @@
+Edite o documento e clique no botão . Reveja a [[wiki:syntax|sintaxe]] das regras de formatação do texto.
+
+Por favor, altere o conteúdo deste documento apenas quando puder **melhorá-lo**.\\ Se pretende testar os seus conhecimentos no uso deste motor Wiki, realize os seus testes no [[playground:playground | Recreio]].
+
diff --git a/sources/inc/lang/pt/editrev.txt b/sources/inc/lang/pt/editrev.txt
new file mode 100644
index 0000000..2c7697b
--- /dev/null
+++ b/sources/inc/lang/pt/editrev.txt
@@ -0,0 +1 @@
+**Carregou uma revisão antiga do documento!** Se a gravar irá criar uma nova versão do documento com este conteúdo, que substituirá a versão actual.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/index.txt b/sources/inc/lang/pt/index.txt
new file mode 100644
index 0000000..46a807d
--- /dev/null
+++ b/sources/inc/lang/pt/index.txt
@@ -0,0 +1,3 @@
+====== Índice ======
+
+Este índice mostra todas as páginas disponíveis, agrupadas por [[doku>namespaces|espaço de nome]].
\ No newline at end of file
diff --git a/sources/inc/lang/pt/install.html b/sources/inc/lang/pt/install.html
new file mode 100644
index 0000000..69227bd
--- /dev/null
+++ b/sources/inc/lang/pt/install.html
@@ -0,0 +1,8 @@
+
        Esta página serve de "assistente" para a primeira instalação e configuração do Dokuwiki. Está disponível mais informação sobre este "assistente" na sua página de documentação.
        
+
+
        O DokuWiki usa ficheiros normais para armazenar as páginas Wiki e outras informações associadas a essas páginas (i.e. imagens, índices de pesquisa, revisões antigas, etc.). O DokuWiki para poder funcionar correctamente requer permissões de escrita às pastas que contêm esses ficheiros. Este "assistente" não é capaz de configurar essas permissões. Isso tem que ser feito via linha de comandos, FTP ou Painel de Controlo do serviço de alojamento (i.e. cPanel).
        
+
+
        Este "assistente" vai configurar o DokuWiki com
+ACL, que por sua vez permite ao administrador entrar em sessão e aceder ao menu de Administração do DokuWiki para poder instalar plugins, gerir utilizadores e seus perfis, gerir acesso às páginas e à própria configuração do DokuWiki. Não é necessário para que o DokuWiki funcione, mas facilita a sua administração.
        
+
+
        Utilizadores experiente ou com requisitos especiais devem seguir estes links, que detalham mais em pormenor ainstalação e configuração do DokuWiki.
        
\ No newline at end of file
diff --git a/sources/inc/lang/pt/lang.php b/sources/inc/lang/pt/lang.php
new file mode 100644
index 0000000..46405c4
--- /dev/null
+++ b/sources/inc/lang/pt/lang.php
@@ -0,0 +1,321 @@
+
+ * @author José Monteiro 
+ * @author Enrico Nicoletto 
+ * @author Fil 
+ * @author André Neves 
+ * @author José Campos zecarlosdecampos@gmail.com
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Editar página';
+$lang['btn_source']            = 'Ver fonte';
+$lang['btn_show']              = 'Ver página';
+$lang['btn_create']            = 'Criar página';
+$lang['btn_search']            = 'Pesquisar';
+$lang['btn_save']              = 'Gravar';
+$lang['btn_preview']           = 'Prever';
+$lang['btn_top']               = 'Voltar ao topo';
+$lang['btn_newer']             = '<< mais recente';
+$lang['btn_older']             = 'menos recente >>';
+$lang['btn_revs']              = 'Revisões';
+$lang['btn_recent']            = 'Alt. Recentes';
+$lang['btn_upload']            = 'Carregar';
+$lang['btn_cancel']            = 'Cancelar';
+$lang['btn_index']             = 'Índice';
+$lang['btn_secedit']           = 'Editar';
+$lang['btn_login']             = 'Entrar';
+$lang['btn_logout']            = 'Sair';
+$lang['btn_admin']             = 'Administrar';
+$lang['btn_update']            = 'Actualizar';
+$lang['btn_delete']            = 'Apagar';
+$lang['btn_back']              = 'Voltar';
+$lang['btn_backlink']          = 'Backlinks';
+$lang['btn_backtomedia']       = 'Voltar à Selecção de Media';
+$lang['btn_subscribe']         = 'Subscrever Alterações';
+$lang['btn_profile']           = 'Actualizar Perfil';
+$lang['btn_reset']             = 'Limpar';
+$lang['btn_draft']             = 'Editar rascunho';
+$lang['btn_recover']           = 'Recuperar rascunho';
+$lang['btn_draftdel']          = 'Apagar rascunho';
+$lang['btn_revert']            = 'Restaurar';
+$lang['btn_register']          = 'Registar';
+$lang['btn_apply']             = 'Aplicar';
+$lang['btn_media']             = 'Gestor de Media';
+$lang['btn_deleteuser']        = 'Remover a Minha Conta';
+$lang['loggedinas']            = 'Está em sessão como';
+$lang['user']                  = 'Utilizador';
+$lang['pass']                  = 'Senha';
+$lang['newpass']               = 'Nova senha';
+$lang['oldpass']               = 'Confirme senha actual';
+$lang['passchk']               = 'Confirmar novamente';
+$lang['remember']              = 'Memorizar?';
+$lang['fullname']              = 'Nome completo';
+$lang['email']                 = 'Email';
+$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.';
+$lang['regsuccess2']           = 'O utilizador foi criado.';
+$lang['regmailfail']           = 'Houve um erro no envio da senha por e-mail. Por favor, contacte o administrador!';
+$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 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['profnodelete']          = 'Esta wiki não suporta remoção de utilizadores';
+$lang['profdeleteuser']        = 'Apagar Conta';
+$lang['profdeleted']           = 'A sua conta de utilizador foi removida desta wiki';
+$lang['pwdforget']             = 'Esqueceu a sua senha? Pedir nova senha';
+$lang['resendna']              = 'Este wiki não suporta reenvio de senhas.';
+$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['searchmedia']           = 'Procurar nome de ficheiro:';
+$lang['searchmedia_in']        = 'Procurar em %s';
+$lang['txt_upload']            = 'Escolha ficheiro para carregar';
+$lang['txt_filename']          = 'Carregar como (opcional)';
+$lang['txt_overwrt']           = 'Escrever por cima do ficheiro já existente';
+$lang['lockedby']              = 'Bloqueado por';
+$lang['lockexpire']            = 'Expira em';
+$lang['js']['willexpire']      = 'O bloqueio de edição para este documento irá expirar num minuto.\nPara evitar conflitos use o botão Prever para re-iniciar o temporizador de bloqueio.';
+$lang['js']['notsavedyet']     = 'Alterações não gravadas serão perdidas.';
+$lang['js']['searchmedia']     = 'Procurar por ficheiros';
+$lang['js']['keepopen']        = 'Mantenha a janela aberta durante a selecção';
+$lang['js']['hidedetails']     = 'Esconder Detalhes';
+$lang['js']['mediatitle']      = 'Propriedades de ligação';
+$lang['js']['mediadisplay']    = 'Tipo de ligação';
+$lang['js']['mediaalign']      = 'Alinhamento';
+$lang['js']['mediasize']       = 'Tamanho da imagem';
+$lang['js']['mediatarget']     = 'Alvo da ligação';
+$lang['js']['mediaclose']      = 'Fechar';
+$lang['js']['mediainsert']     = 'Inserir';
+$lang['js']['mediadisplayimg'] = 'Mostrar a imagem';
+$lang['js']['mediadisplaylnk'] = 'Mostrar apenas a ligação';
+$lang['js']['mediasmall']      = 'Versão pequena';
+$lang['js']['mediamedium']     = 'Versão média';
+$lang['js']['medialarge']      = 'Versão grande';
+$lang['js']['mediaoriginal']   = 'Versão original';
+$lang['js']['medialnk']        = 'Ligação para a página de detalhe';
+$lang['js']['mediadirect']     = 'Ligação directa para o original';
+$lang['js']['medianolnk']      = 'Nenhuma ligação';
+$lang['js']['medianolink']     = 'Não ligar à imagem';
+$lang['js']['medialeft']       = 'Alinhar a imagem à esquerda.';
+$lang['js']['mediaright']      = 'Alinhar a imagem à direita.';
+$lang['js']['mediacenter']     = 'Alinhar a imagem ao centro.';
+$lang['js']['medianoalign']    = 'Não usar alinhamento algum.';
+$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 o(s) item(s) selecionados?';
+$lang['js']['restore_confirm'] = 'Restaurar esta versão?';
+$lang['js']['media_diff']      = 'Ver diferenças:';
+$lang['js']['media_diff_both'] = 'Lado a Lado';
+$lang['js']['media_diff_opacity'] = 'Sobreposição';
+$lang['js']['media_diff_portions'] = 'Slider';
+$lang['js']['media_select']    = 'Selecione ficheiros…';
+$lang['js']['media_upload_btn'] = 'Enviar';
+$lang['js']['media_done_btn']  = 'Feito';
+$lang['js']['media_drop']      = 'Largue ficheiros aqui para enviar';
+$lang['js']['media_cancel']    = 'remover';
+$lang['js']['media_overwrt']   = 'Escrever por cima de ficheiros existentes';
+$lang['rssfailed']             = 'Ocorreu um erro neste canal RSS: ';
+$lang['nothingfound']          = 'Nada foi encontrado.';
+$lang['mediaselect']           = 'Selecção de ficheiros';
+$lang['fileupload']            = 'Carregamento de ficheiros';
+$lang['uploadsucc']            = 'Carregamento com sucesso';
+$lang['uploadfail']            = 'Falhou o carregamento. Talvez por não ter permissões?';
+$lang['uploadwrong']           = 'Carregamento negado. Esta extensão está proibida.';
+$lang['uploadexist']           = 'O ficheiro já existe. Não pode ser carregado.';
+$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.';
+$lang['namespaces']            = 'Grupos';
+$lang['mediafiles']            = 'Ficheiros disponíveis em';
+$lang['accessdenied']          = 'Não tem permissão para ver esta página.';
+$lang['mediausage']            = 'Use a seguinte sintaxe para referenciar este ficheiro:';
+$lang['mediaview']             = 'Ver ficheiro original';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Carregar ficheiros para o grupo actual aqui. Para criar sub-grupos: escrever o nome do sub-grupo seguido de : antes do nome do ficheiro no campo "Carregar como".';
+$lang['mediaextchange']        = 'Extensão alterada de .%s para .%s!';
+$lang['reference']             = 'Referências para';
+$lang['ref_inuse']             = 'O ficheiro não pode ser removido, porque está ainda a ser usado nestes documentos:';
+$lang['ref_hidden']            = 'Algumas referências estão em documentos para os quais não tem permissão para ler';
+$lang['hits']                  = 'Resultados';
+$lang['quickhits']             = 'Documentos encontrados';
+$lang['toc']                   = 'Tabela de Conteúdos';
+$lang['current']               = 'Actual';
+$lang['yours']                 = 'A sua versão';
+$lang['diff']                  = 'mostrar diferenças com a versão actual';
+$lang['diff2']                 = 'mostrar diferenças entre versões escolhidas';
+$lang['difflink']              = 'Ligação para esta vista de comparação';
+$lang['diff_type']             = 'Ver diferenças';
+$lang['diff_inline']           = 'Embutido';
+$lang['diff_side']             = 'Lado a lado';
+$lang['line']                  = 'Linha';
+$lang['breadcrumb']            = 'Está em';
+$lang['youarehere']            = 'Está aqui';
+$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 (%s)';
+$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['tools']                 = 'Ferramentas';
+$lang['user_tools']            = 'Ferramentas de Utilizador';
+$lang['site_tools']            = 'Ferramentas de Site';
+$lang['page_tools']            = 'Ferramentas de Página';
+$lang['skip_to_content']       = 'saltar para conteúdo';
+$lang['sidebar']               = 'Barra Lateral';
+$lang['mail_newpage']          = 'documento adicionado:';
+$lang['mail_changed']          = 'documento modificado:';
+$lang['mail_subscribe_list']   = 'páginas alteradas no espaço de nome:';
+$lang['mail_new_user']         = 'Novo utilizador:';
+$lang['mail_upload']           = 'Ficheiro carregado:';
+$lang['changes_type']          = 'Ver alterações de';
+$lang['pages_changes']         = 'Páginas';
+$lang['media_changes']         = 'Ficheiros Media';
+$lang['both_changes']          = 'Tanto páginas como ficheiros media';
+$lang['qb_bold']               = 'Texto com Ênfase';
+$lang['qb_italic']             = 'Texto Itálico';
+$lang['qb_underl']             = 'Texto Sublinhado';
+$lang['qb_code']               = 'Texto Código';
+$lang['qb_strike']             = 'Texto Riscado';
+$lang['qb_h1']                 = 'Cabeçalho Nível 1';
+$lang['qb_h2']                 = 'Cabeçalho Nível 2';
+$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';
+$lang['qb_ol']                 = 'Item numa Lista Ordenada';
+$lang['qb_ul']                 = 'Item numa Lista Não Ordenada';
+$lang['qb_media']              = 'Incluir imagens e outros ficheiros';
+$lang['qb_sig']                = 'Inserir Assinatura';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Caracteres Especiais';
+$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ítulo';
+$lang['img_caption']           = 'Legenda';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Ficheiro';
+$lang['img_fsize']             = 'Tamanho';
+$lang['img_artist']            = 'Fotógrafo';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Formato';
+$lang['img_camera']            = 'Câmara';
+$lang['img_keywords']          = 'Palavras-Chave';
+$lang['img_width']             = 'Largura';
+$lang['img_height']            = 'Altura';
+$lang['img_manager']           = 'Ver em gestor de media';
+$lang['subscr_subscribe_success'] = 'Adicionado %s à lista de subscrição para %s';
+$lang['subscr_subscribe_error'] = 'Erro ao adicionar %s à lista de subscrição para %s';
+$lang['subscr_subscribe_noaddress'] = 'Não existe endereço algum associado com o seu nome de utilizador, não pode ser adicionado à lista de subscrição';
+$lang['subscr_unsubscribe_success'] = 'Removido %s da lista de subscrição para %s';
+$lang['subscr_unsubscribe_error'] = 'Erro ao remover %s da lista de subscrição para %s';
+$lang['subscr_already_subscribed'] = '%s já está subscrito em %s';
+$lang['subscr_not_subscribed'] = '%s não está subscrito em %s';
+$lang['subscr_m_not_subscribed'] = 'Não está subscrito à página ou espaço de nome corrente.';
+$lang['subscr_m_new_header']   = 'Adicionar subscrição';
+$lang['subscr_m_current_header'] = 'Subscrições correntes';
+$lang['subscr_m_unsubscribe']  = 'Des-subscrever';
+$lang['subscr_m_subscribe']    = 'Subscrever';
+$lang['subscr_m_receive']      = 'Receber';
+$lang['subscr_style_every']    = 'email em qualquer alteração';
+$lang['subscr_style_digest']   = '"digest email" de alterações em cada página (cada %.2f dias)';
+$lang['subscr_style_list']     = 'lista de páginas alteradas desde o último email (cada %.2f dias)';
+$lang['authtempfail']          = 'Autenticação temporariamente indisponível. Se a situação persistir, por favor informe o Wiki Admin.';
+$lang['authpwdexpire']         = 'A sua senha expirará dentro de %d dias, deve mudá-la em breve.';
+$lang['i_chooselang']          = 'Escolha a linguagem';
+$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 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.';
+$lang['i_permfail']            = '%s não permite que o DokuWiki escreva nela. É preciso corrigir as permissões desta pasta!';
+$lang['i_confexists']          = '%s já existe';
+$lang['i_writeerr']            = 'Não foi possível criar %s. É preciso verificar as permissões e criar o ficheiro manualmente.';
+$lang['i_badhash']             = 'dokuwiki.php não é o original ou não é reconhecido (hash=%s)';
+$lang['i_badval']              = '%s - valor ilegal ou vazio';
+$lang['i_success']             = 'A instalação e configuração inicial foram bem sucedidas. Pode remover o install.php. Aceda ao seu novo Wiki a correr o DokuWiki.';
+$lang['i_failure']             = 'Ocorreram alguns erros durante a escrita nos ficheiros de configuração. Poderá ser preciso corrigi-los manualmente antes de poder aceder ao seu novo Wiki a correr o DokuWiki.';
+$lang['i_policy']              = 'Politica ACL inicial';
+$lang['i_pol0']                = 'Wiki Aberto (ler, escrever e carregar para todos)';
+$lang['i_pol1']                = 'Wiki Público (ler para todos, escrever e carregar para utilizadores inscritos)';
+$lang['i_pol2']                = 'Wiki Fechado (ler, escrever e carregar somente para utilizadores inscritos)';
+$lang['i_retry']               = 'Repetir';
+$lang['i_license']             = 'Por favor escolha a licença sob a qual quer colocar o seu conteúdo:';
+$lang['i_license_none']        = 'Não mostrar nenhuma informação de licença';
+$lang['i_pop_field']           = 'Por favor ajude-nos a melhorar a experiência Dokuwiki:';
+$lang['i_pop_label']           = 'Uma vez por mês, enviar dados anónimos de uso para os desenvolvedores DokuWiki';
+$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.';
+$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';
+$lang['wordblock']             = 'A sua alteração não foi guardada porque contém texto bloqueado (spam).';
+$lang['media_uploadtab']       = 'Enviar';
+$lang['media_searchtab']       = 'Procurar';
+$lang['media_file']            = 'Ficheiro';
+$lang['media_viewtab']         = 'Ver';
+$lang['media_edittab']         = 'Editar';
+$lang['media_historytab']      = 'Histórico';
+$lang['media_list_rows']       = 'Linhas';
+$lang['media_sort_name']       = 'Ordenar por nome';
+$lang['media_sort_date']       = 'Ordenar por data';
+$lang['media_files']           = 'Ficheiros em %s';
+$lang['media_upload']          = 'Enviar para o grupo %s.';
+$lang['media_search']          = 'Procurar no grupo %s.';
+$lang['media_view']            = '%s';
+$lang['media_edit']            = 'Editar %s';
+$lang['media_history']         = 'Histórico do %s';
+$lang['media_meta_edited']     = 'metadata editada';
+$lang['media_perm_read']       = 'Perdão, não tem permissão para ler ficheiros.';
+$lang['media_perm_upload']     = 'Perdão, não tem permissão para enviar ficheiros.';
+$lang['media_update']          = 'enviar nova versão';
+$lang['media_restore']         = 'Restaurar esta versão';
diff --git a/sources/inc/lang/pt/locked.txt b/sources/inc/lang/pt/locked.txt
new file mode 100644
index 0000000..a4bb4d6
--- /dev/null
+++ b/sources/inc/lang/pt/locked.txt
@@ -0,0 +1,3 @@
+====== Página em Edição ======
+
+Esta página está bloqueada por outro utilizador, que se encontra a editá-la neste momento. Terá que aguardar que o utilizador termine a edição ou que o bloqueio expire.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/login.txt b/sources/inc/lang/pt/login.txt
new file mode 100644
index 0000000..42c2a98
--- /dev/null
+++ b/sources/inc/lang/pt/login.txt
@@ -0,0 +1,3 @@
+====== Entrar ======
+
+Não está actualmente em sessão! Introduza as suas credenciais de autenticação abaixo para para entrar em sessão. Precisa de ter cookies activos no seu navegador.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/mailtext.txt b/sources/inc/lang/pt/mailtext.txt
new file mode 100644
index 0000000..915a147
--- /dev/null
+++ b/sources/inc/lang/pt/mailtext.txt
@@ -0,0 +1,20 @@
+Um documento no site Wiki @DOKUWIKIURL@ foi criado ou modificado.
+
+Aqui estão os detalhes:
+
+Data          : @DATE@
+Browser       : @BROWSER@
+Endereço IP   : @IPADDRESS@
+Hostname      : @HOSTNAME@
+Documento Ant.: @OLDPAGE@
+Documento Novo: @NEWPAGE@
+Edit Summary  : @SUMMARY@
+User          : @USER@
+
+@DIFF@
+
+
+
+----
+
+Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@
diff --git a/sources/inc/lang/pt/newpage.txt b/sources/inc/lang/pt/newpage.txt
new file mode 100644
index 0000000..2d9c955
--- /dev/null
+++ b/sources/inc/lang/pt/newpage.txt
@@ -0,0 +1,3 @@
+====== Documento Inexistente ======
+
+Seguiu uma ligação para um documento que ainda não existe. Pode criá-lo usando o botão "Criar página", se as permissões lho permitirem.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/norev.txt b/sources/inc/lang/pt/norev.txt
new file mode 100644
index 0000000..6dd8dfb
--- /dev/null
+++ b/sources/inc/lang/pt/norev.txt
@@ -0,0 +1,7 @@
+====== Revisão Inexistente ======
+
+A revisão especificada não existe.
+
+Clique no botão  para aceder à lista de revisões deste documento.
+
+----
diff --git a/sources/inc/lang/pt/password.txt b/sources/inc/lang/pt/password.txt
new file mode 100644
index 0000000..70ecf91
--- /dev/null
+++ b/sources/inc/lang/pt/password.txt
@@ -0,0 +1,10 @@
+Olá, @FULLNAME@!
+
+Aqui estão as suas credenciais de autenticação para @TITLE@, em @DOKUWIKIURL@
+
+Utilizador : @LOGIN@
+Senha      : @PASSWORD@
+
+----
+Esta mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt/preview.txt b/sources/inc/lang/pt/preview.txt
new file mode 100644
index 0000000..1a8dab0
--- /dev/null
+++ b/sources/inc/lang/pt/preview.txt
@@ -0,0 +1,3 @@
+====== Previsão ======
+
+Esta é uma previsão de como ficará o conteúdo. Lembre-se: ainda **não está gravado**!
\ No newline at end of file
diff --git a/sources/inc/lang/pt/pwconfirm.txt b/sources/inc/lang/pt/pwconfirm.txt
new file mode 100644
index 0000000..2848a11
--- /dev/null
+++ b/sources/inc/lang/pt/pwconfirm.txt
@@ -0,0 +1,13 @@
+Olá @FULLNAME@!
+
+Alguém efectuou um pedido para uma nova senha para o seu perfil @TITLE@ em @DOKUWIKIURL@
+
+Se não foi você que efectuou o pedido então por favor ignore esta mensagem.
+
+Senão, para confirmar o pedido, por favor siga este link:
+
+@CONFIRM@
+
+-- 
+
+Esta mensagem foi gerada automaticamente pelo motor DokuWiki em @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt/read.txt b/sources/inc/lang/pt/read.txt
new file mode 100644
index 0000000..177b1e8
--- /dev/null
+++ b/sources/inc/lang/pt/read.txt
@@ -0,0 +1 @@
+Esta página é apenas de leitura. Pode ver a fonte, mas não alterá-la. Informe-se com o administrador deste Wiki se achar que isto não está correcto.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/recent.txt b/sources/inc/lang/pt/recent.txt
new file mode 100644
index 0000000..3957df4
--- /dev/null
+++ b/sources/inc/lang/pt/recent.txt
@@ -0,0 +1,3 @@
+====== Alterações Recentes ======
+
+Os seguintes documentos foram alterados recentemente.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/register.txt b/sources/inc/lang/pt/register.txt
new file mode 100644
index 0000000..228cb99
--- /dev/null
+++ b/sources/inc/lang/pt/register.txt
@@ -0,0 +1,3 @@
+====== Inscrição como novo utilizador ======
+
+Preencha toda a informação abaixo para criar uma nova conta nesta wiki. Assegure que providencia um **endereço de email válido** - se não lhe for pedido que introduza uma nova palavra chave aqui, ser-lhe-á enviada uma para esse endereço. O nome de utilizador deve ser um [[doku>pagename|nome de página]] válido.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/registermail.txt b/sources/inc/lang/pt/registermail.txt
new file mode 100644
index 0000000..b9c1f16
--- /dev/null
+++ b/sources/inc/lang/pt/registermail.txt
@@ -0,0 +1,14 @@
+Inscrição de um novo utilizador. Aqui estão os detalhes:
+
+Username : @NEWUSER@
+Nome Completo : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Data : @DATE@
+Browser : @BROWSER@
+Endereço IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+----
+
+Esta mensagem foi gerada pelo DokuWiki em @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt/resendpwd.txt b/sources/inc/lang/pt/resendpwd.txt
new file mode 100644
index 0000000..9a54ace
--- /dev/null
+++ b/sources/inc/lang/pt/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Enviar nova senha ======
+
+Por favor, insira o seu nome de utilizador neste formulário para requerer uma nova senha para esta conta/perfil. Um link de confirmação será enviado para o endereço de e-mail associado.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/revisions.txt b/sources/inc/lang/pt/revisions.txt
new file mode 100644
index 0000000..0a0d359
--- /dev/null
+++ b/sources/inc/lang/pt/revisions.txt
@@ -0,0 +1,3 @@
+====== Revisões antigas ======
+
+Estas são as revisões antigas do documento corrente. Para reverter para uma destas revisões, escolha-a abaixo, clique no botão "Editar página" e grave.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/searchpage.txt b/sources/inc/lang/pt/searchpage.txt
new file mode 100644
index 0000000..2239330
--- /dev/null
+++ b/sources/inc/lang/pt/searchpage.txt
@@ -0,0 +1,5 @@
+====== Pesquisa ======
+
+Pode encontrar os resultados da sua pesquisa abaixo. Se não encontrou o que procurava pode criar uma nova página com o nome da sua pesquisa, usando o botão apropriado.
+
+===== Resultados =====
diff --git a/sources/inc/lang/pt/showrev.txt b/sources/inc/lang/pt/showrev.txt
new file mode 100644
index 0000000..25d617f
--- /dev/null
+++ b/sources/inc/lang/pt/showrev.txt
@@ -0,0 +1 @@
+**Esta é uma versão antiga do documento!**
\ No newline at end of file
diff --git a/sources/inc/lang/pt/stopwords.txt b/sources/inc/lang/pt/stopwords.txt
new file mode 100644
index 0000000..373e6ee
--- /dev/null
+++ b/sources/inc/lang/pt/stopwords.txt
@@ -0,0 +1,141 @@
+# 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
+algmas
+alguns
+ali
+ambos
+antes
+apontar
+aquela
+aquelas
+aquele
+aqueles
+aqui
+atrás
+bem
+bom
+cada
+caminho
+cima
+com
+como
+comprido
+conhecido
+corrente
+das
+debaixo
+dentro
+desde
+desligado
+deve
+devem
+deverá
+direita
+diz
+dizer
+dois
+dos
+ela
+ele
+eles
+enquanto
+então
+está
+estão
+estado
+estar
+estará
+este
+estes
+esteve
+estive
+estivemos
+estiveram
+fará
+faz
+fazer
+fazia
+fez
+fim
+foi
+fora
+horas
+iniciar
+inicio
+irá
+ista
+iste
+isto
+ligado
+maioria
+maiorias
+mais
+mas
+mesmo
+meu
+muito
+muitos
+nós
+não
+nome
+nosso
+novo
+onde
+outro
+para
+parte
+pegar
+pelo
+pessoas
+pode
+poderá
+podia
+por
+porque
+povo
+promeiro
+quê
+qual
+qualquer
+quando
+quem
+quieto
+são
+saber
+sem
+ser
+seu
+somente
+têm
+tal
+também
+tem
+tempo
+tenho
+tentar
+tentaram
+tente
+tentei
+teu
+teve
+tipo
+tive
+todos
+trabalhar
+trabalho
+uma
+umas
+uns
+usa
+usar
+valor
+veja
+ver
+verdade
+verdadeiro
+você
diff --git a/sources/inc/lang/pt/subscr_digest.txt b/sources/inc/lang/pt/subscr_digest.txt
new file mode 100644
index 0000000..3f8a814
--- /dev/null
+++ b/sources/inc/lang/pt/subscr_digest.txt
@@ -0,0 +1,20 @@
+Olá!
+
+A página @PAGE@ na wiki @TITLE@ mudou.
+Eis as mudanças:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Revisão Antiga: @OLDPAGE@
+Revisão Nova: @NEWPAGE@
+
+Para cancelar as notificações de página, inicie sessão na wiki em
+@DOKUWIKIURL@, visite
+@SUBSCRIBE@
+e des-subscreva as alterações à página e/ou nome espaço de nome.
+
+--
+Este email foi gerado por DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt/subscr_form.txt b/sources/inc/lang/pt/subscr_form.txt
new file mode 100644
index 0000000..9bb7b6b
--- /dev/null
+++ b/sources/inc/lang/pt/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Gestão de Subscrição ======
+
+Esta página permite-lhe gerir as suas subscrições para a página e espaço de nomes correntes.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/subscr_list.txt b/sources/inc/lang/pt/subscr_list.txt
new file mode 100644
index 0000000..65325b9
--- /dev/null
+++ b/sources/inc/lang/pt/subscr_list.txt
@@ -0,0 +1,17 @@
+Olá!
+
+Páginas no espaço de nome  @PAGE@ da wiki @TITLE@ mudaram.
+Eis as páginas alteradas:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Para cancelar as notificações de páginas, inicie sessão na wiki em 
+@DOKUWIKIURL@, visite
+@SUBSCRIBE@
+e des-subscreva às alterações da página e/ou espaço de nome.
+
+--
+Este email foi gerado por DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt/subscr_single.txt b/sources/inc/lang/pt/subscr_single.txt
new file mode 100644
index 0000000..469c6bf
--- /dev/null
+++ b/sources/inc/lang/pt/subscr_single.txt
@@ -0,0 +1,23 @@
+Olá!
+
+A página @PAGE@ no wiki @TITLE@ mudou.
+Eis as alterações:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Utilizador : @USER@
+Sumário de Edição: @SUMMARY@
+Revisão Antiga: @OLDPAGE@
+Revisão Nova: @NEWPAGE@
+
+Para cancelar as notificações de página, inicie sessão no wiki em
+@DOKUWIKIURL@, visite
+@SUBSCRIBE@
+e des-subscreva às alterações de página e/ou espaço de nome.
+
+--
+Este email foi gerado automaticamente por DokuWiki em
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/pt/updateprofile.txt b/sources/inc/lang/pt/updateprofile.txt
new file mode 100644
index 0000000..efacfe4
--- /dev/null
+++ b/sources/inc/lang/pt/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Actualize o seu perfil ======
+
+Apenas precisa de completar os campos que pretende alterar. Não é possível alterar o seu nome de utilizador.
\ No newline at end of file
diff --git a/sources/inc/lang/pt/uploadmail.txt b/sources/inc/lang/pt/uploadmail.txt
new file mode 100644
index 0000000..bb571ff
--- /dev/null
+++ b/sources/inc/lang/pt/uploadmail.txt
@@ -0,0 +1,15 @@
+Um ficheiro foi carregado. Aqui estão os detalhes:
+
+Ficheiro       : @MEDIA@
+Revisão antiga : @OLD@
+Data           : @DATE@
+Navegador      : @BROWSER@
+Endereço IP    : @IPADDRESS@
+Hostname       : @HOSTNAME@
+Tamanho        : @SIZE@
+MIME Type      : @MIME@
+Utilizador     : @USER@
+
+-- 
+Esta mensagem foi gerada pelo DokuWiki em
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ro/admin.txt b/sources/inc/lang/ro/admin.txt
new file mode 100644
index 0000000..b19a4d8
--- /dev/null
+++ b/sources/inc/lang/ro/admin.txt
@@ -0,0 +1,3 @@
+====== Administrare ======
+
+Puteți vedea mai jos o listă cu activitățile administrative disponibile în DokuWiki.
\ No newline at end of file
diff --git a/sources/inc/lang/ro/adminplugins.txt b/sources/inc/lang/ro/adminplugins.txt
new file mode 100644
index 0000000..6712d82
--- /dev/null
+++ b/sources/inc/lang/ro/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugin-uri Adiționale =====
\ No newline at end of file
diff --git a/sources/inc/lang/ro/backlinks.txt b/sources/inc/lang/ro/backlinks.txt
new file mode 100644
index 0000000..3fd5e34
--- /dev/null
+++ b/sources/inc/lang/ro/backlinks.txt
@@ -0,0 +1,4 @@
+====== Legături înapoi ======
+
+Aceasta e o listă de pagini care au legături către pagina curentă.
+
diff --git a/sources/inc/lang/ro/conflict.txt b/sources/inc/lang/ro/conflict.txt
new file mode 100644
index 0000000..072f574
--- /dev/null
+++ b/sources/inc/lang/ro/conflict.txt
@@ -0,0 +1,6 @@
+====== Există o nouă versiune ======
+
+Există o versiune nouă a documentului editat. Aceasta se întîmplă cînd un alt utilizator a schimbat documentul în timp ce îl editezi.
+
+Examinează diferențele arătate mai jos, apoi ia decizia care versiune o reții. Dacă alegi ''Salvează'', versiunea documentului va fi salvată. Apăsați ''Renunțare'' pentru a menține versiunea curentă.
+
diff --git a/sources/inc/lang/ro/denied.txt b/sources/inc/lang/ro/denied.txt
new file mode 100644
index 0000000..430db76
--- /dev/null
+++ b/sources/inc/lang/ro/denied.txt
@@ -0,0 +1,4 @@
+====== Acces Interzis ======
+
+Din păcate nu aveți destule drepturi pentru a continua. Poate ați uitat să vă logați?
+
diff --git a/sources/inc/lang/ro/diff.txt b/sources/inc/lang/ro/diff.txt
new file mode 100644
index 0000000..1972444
--- /dev/null
+++ b/sources/inc/lang/ro/diff.txt
@@ -0,0 +1,4 @@
+====== Diferențe ======
+
+Aceasta arată diferențele dintre revziile selectate și versiunea curentă a paginii.
+
diff --git a/sources/inc/lang/ro/draft.txt b/sources/inc/lang/ro/draft.txt
new file mode 100644
index 0000000..74badee
--- /dev/null
+++ b/sources/inc/lang/ro/draft.txt
@@ -0,0 +1,5 @@
+====== Fișierul schiță nu a fost găsit ======
+
+Ultima dvs. sesiune de editare nu s-a finalizat corect. În timpul lucrului, DocuWiki a salvat automat o schiță, pe care o puteți utiliza acum pentru a continua editarea. Mai jos puteți vedea informațiile care s-au salvat de la ultima dvs. sesiune.
+
+Decideți dacă vreți să //recuperați// sesiunea de editare pierdută, //ștergeți// schița salvată automat sau să //anulați// procesul de editare.
\ No newline at end of file
diff --git a/sources/inc/lang/ro/edit.txt b/sources/inc/lang/ro/edit.txt
new file mode 100644
index 0000000..78761b9
--- /dev/null
+++ b/sources/inc/lang/ro/edit.txt
@@ -0,0 +1,2 @@
+Editează pagina și apasă ''Salvează''. Vezi [[wiki:syntax]] pentru sintaxă. Te rog editează pagina doar pentru a o **îmbunătați**. Dacă vrei să testezi cîteva lucruri, învață sa faci primii pași în [[playground:playground]].
+
diff --git a/sources/inc/lang/ro/editrev.txt b/sources/inc/lang/ro/editrev.txt
new file mode 100644
index 0000000..290dca4
--- /dev/null
+++ b/sources/inc/lang/ro/editrev.txt
@@ -0,0 +1,2 @@
+**Ai încărcat o versuine veche a documentului!** Dacă ai salvat-o, vei crea o versiune nouă cu această dată.
+----
diff --git a/sources/inc/lang/ro/index.txt b/sources/inc/lang/ro/index.txt
new file mode 100644
index 0000000..5b88cc0
--- /dev/null
+++ b/sources/inc/lang/ro/index.txt
@@ -0,0 +1,4 @@
+====== Index ======
+
+Acesta e un index al tuturor paginilor ordonat după [[doku>namespaces|namespaces]].
+
diff --git a/sources/inc/lang/ro/install.html b/sources/inc/lang/ro/install.html
new file mode 100644
index 0000000..7fdc8fc
--- /dev/null
+++ b/sources/inc/lang/ro/install.html
@@ -0,0 +1,10 @@
+
        Această pagină oferă asistență la instalarea pentru prima dată a Dokuwiki. Mai multe informații privind această instalare găsiți pe pagina de documentație.
        
+
+
        DokuWiki folosește fișiere obișnuite pentru stocarea paginilor wiki și a informaților asociate acestor pagini (de ex. imagini, indecși de căutare, versiuni vechi, etc). Pentru a lucra cu succes, DokuWiki trebuie să aibă drepturi de scriere în directoarele ce conțin aceste fișiere.
+Acest script de instalare nu poate seta drepturile directoarelor. De regulă, aceasta se face direct, în linie de comandă, sau în cazul găzduirii, prin FTP sau prin panoul de control al gazdei (de ex. cPanel).
        
+
+
        Acest script de instalare va configura DokuWiki pentru ACL, care permite logarea administratorului și accesul la meniul de administrare pentru instalarea plugin-urilor, gestiunea utilizatorilor, a accesului la paginile wiki și modificarea setărilor de configurare.
+Nu este necesar pentru ca DokuWiki să funcționeze, însă face mai ușoară administrarea DokuWiki.
        
+
+
        Utilizatorii experimentați sau utilizatorii ce au nevoie de setări speciale ar putea folosi această legătură privindinstrucțiunile de instalare și setările de configurare.
        
+
diff --git a/sources/inc/lang/ro/lang.php b/sources/inc/lang/ro/lang.php
new file mode 100644
index 0000000..028c55a
--- /dev/null
+++ b/sources/inc/lang/ro/lang.php
@@ -0,0 +1,321 @@
+
+ * @author Sergiu Baltariu 
+ * @author Emanuel-Emeric Andrași 
+ * @author Emanuel-Emeric Andrași 
+ * @author Marius OLAR 
+ * @author Marius Olar 
+ * @author Emanuel-Emeric Andrași 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Editează această pagină';
+$lang['btn_source']            = 'Arată sursa paginii';
+$lang['btn_show']              = 'Arată pagina';
+$lang['btn_create']            = 'Creează această pagină';
+$lang['btn_search']            = 'Caută';
+$lang['btn_save']              = 'Salvează';
+$lang['btn_preview']           = 'Previzualizează';
+$lang['btn_top']               = 'La început';
+$lang['btn_newer']             = '<< mai recent';
+$lang['btn_older']             = 'mai vechi>>';
+$lang['btn_revs']              = 'Versiuni vechi';
+$lang['btn_recent']            = 'Modificări recente';
+$lang['btn_upload']            = 'Upload';
+$lang['btn_cancel']            = 'Renunțare';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Editează';
+$lang['btn_login']             = 'Autentificare';
+$lang['btn_logout']            = 'Deconectare';
+$lang['btn_admin']             = 'Administrativ';
+$lang['btn_update']            = 'Actualizează';
+$lang['btn_delete']            = 'Șterge';
+$lang['btn_back']              = 'Înapoi';
+$lang['btn_backlink']          = 'Legătură anterioară';
+$lang['btn_backtomedia']       = 'Înapoi la selecția mediafile';
+$lang['btn_subscribe']         = 'Subscrie modificarea paginii';
+$lang['btn_profile']           = 'Actualizează profil';
+$lang['btn_reset']             = 'Resetează';
+$lang['btn_resendpwd']         = 'Configurează o parolă nouă';
+$lang['btn_draft']             = 'Editează schiță';
+$lang['btn_recover']           = 'Recuperează schiță';
+$lang['btn_draftdel']          = 'Șterge schiță';
+$lang['btn_revert']            = 'Revenire';
+$lang['btn_register']          = 'Înregistrează';
+$lang['btn_apply']             = 'Aplică';
+$lang['btn_media']             = 'Administrare media';
+$lang['loggedinas']            = 'Logat ca și';
+$lang['user']                  = 'Utilizator';
+$lang['pass']                  = 'Parola';
+$lang['newpass']               = 'Parola nouă';
+$lang['oldpass']               = 'Confirmă parola curentă';
+$lang['passchk']               = 'Încă o dată';
+$lang['remember']              = 'Ține-mă minte';
+$lang['fullname']              = 'Nume complet';
+$lang['email']                 = 'E-mail';
+$lang['profile']               = 'Profil utilizator';
+$lang['badlogin']              = 'Ne pare rău, utilizatorul și/sau parola au fost greșite.';
+$lang['minoredit']             = 'Modificare minoră';
+$lang['draftdate']             = 'Schiță salvată automat la';
+$lang['nosecedit']             = 'Pagina s-a modificat între timp, secțiunea info a expirat, s-a încărcat pagina întreagă în loc.';
+$lang['regmissing']            = 'Ne pare rău, trebuie să completezi toate cîmpurile.';
+$lang['reguexists']            = 'Ne pare rău, un utilizator cu acest nume este deja autentificat.';
+$lang['regsuccess']            = 'Utilizatorul a fost creat. Parola a fost trimisă prin e-mail.';
+$lang['regsuccess2']           = 'Utilizatorul a fost creat.';
+$lang['regmailfail']           = 'Se pare că a fost o eroare la trimiterea parolei prin e-mail. Contactează administratorul!';
+$lang['regbadmail']            = 'Adresa de e-mail este nevalidă - dacă sunteți de părere că este o eroare contactează administratorul.';
+$lang['regbadpass']            = 'Cele două parole furnizate nu sunt identice; încercați din nou.';
+$lang['regpwmail']             = 'Parola ta DokuWiki';
+$lang['reghere']               = 'Înca nu ai un cont? Fă-ți unul!';
+$lang['profna']                = 'Acest wiki nu permite modificarea profilului';
+$lang['profnochange']          = 'Nici o modificare; nimic de făcut.';
+$lang['profnoempty']           = 'Nu sunt admise numele sau adresa de e-mail necompletate.';
+$lang['profchanged']           = 'Profilul de utilizator a fost actualizat cu succes.';
+$lang['pwdforget']             = 'Parola uitată? Obține una nouă!';
+$lang['resendna']              = 'Acest wiki nu permite retrimiterea parolei.';
+$lang['resendpwd']             = 'Configurează o parolă nouă pentru';
+$lang['resendpwdmissing']      = 'Ne pare rău, trebuie completate toate câmpurile.';
+$lang['resendpwdnouser']       = 'Ne pare rău, acest utilizator nu poate fi găsit în baza de date.';
+$lang['resendpwdbadauth']      = 'Ne pare rău, acest cod de autorizare nu este corect. Verifică dacă ai folosit întreg link-ul de confirmare.';
+$lang['resendpwdconfirm']      = 'Un link de confirmare a fost trimis prin e-mail.';
+$lang['resendpwdsuccess']      = 'Noua parolă a fost trimisă prin e-mail.';
+$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 ești de acord să publici conțintul sub următoarea licență:';
+$lang['searchmedia']           = 'Caută numele fișierului:';
+$lang['searchmedia_in']        = 'Caută în %s';
+$lang['txt_upload']            = 'Selectează fișierul de încărcat';
+$lang['txt_filename']          = 'Încarcă fișierul ca (opțional)';
+$lang['txt_overwrt']           = 'Suprascrie fișierul existent';
+$lang['lockedby']              = 'Momentan blocat de';
+$lang['lockexpire']            = 'Blocarea expiră la';
+$lang['js']['willexpire']      = 'Blocarea pentru editarea paginii expiră intr-un minut.\nPentru a preveni conflictele folosește butonul de previzualizare pentru resetarea blocării.';
+$lang['js']['notsavedyet']     = 'Există modificări nesalvate care se vor pierde.
+Dorești să continui?';
+$lang['js']['searchmedia']     = 'Caută fișiere';
+$lang['js']['keepopen']        = 'Menține fereastra deschisă la selecție';
+$lang['js']['hidedetails']     = 'Ascunde detalii';
+$lang['js']['mediatitle']      = 'Setări link';
+$lang['js']['mediadisplay']    = 'Tip link';
+$lang['js']['mediaalign']      = 'Aliniere';
+$lang['js']['mediasize']       = 'Mărime imagine';
+$lang['js']['mediatarget']     = 'Țintă link';
+$lang['js']['mediaclose']      = 'Închide';
+$lang['js']['mediainsert']     = 'Inserează';
+$lang['js']['mediadisplayimg'] = 'Afișează imaginea';
+$lang['js']['mediadisplaylnk'] = 'Afișează doar linkul';
+$lang['js']['mediasmall']      = 'Versiune mică';
+$lang['js']['mediamedium']     = 'Versiune medie';
+$lang['js']['medialarge']      = 'Versiune mare';
+$lang['js']['mediaoriginal']   = 'Versiune inițială';
+$lang['js']['medialnk']        = 'Link către pagina detaliilor';
+$lang['js']['mediadirect']     = 'Link direct către versiunea inițială';
+$lang['js']['medianolnk']      = 'Fără link';
+$lang['js']['medianolink']     = 'Nu crea link către imagine';
+$lang['js']['medialeft']       = 'Aliniază imaginea la stânga';
+$lang['js']['mediaright']      = 'Aliniază imaginea la dreapta';
+$lang['js']['mediacenter']     = 'Aliniază imaginea la centru';
+$lang['js']['medianoalign']    = 'Nu utiliza aliniere';
+$lang['js']['nosmblinks']      = 'Link-urile către sharing-uri Windows funcționeaza numai în Microsoft Internet Explorer.
+Poți însă copia și insera link-ul.';
+$lang['js']['linkwiz']         = 'Asistent legătură';
+$lang['js']['linkto']          = 'Legătură la:';
+$lang['js']['del_confirm']     = 'Ești sigur de ștergerea elementele selectate?';
+$lang['js']['restore_confirm'] = 'Ești sigur de restaurarea acestei versiuni?';
+$lang['js']['media_diff']      = 'Arată diferențele:';
+$lang['js']['media_diff_both'] = 'Unul lângă altul';
+$lang['js']['media_diff_opacity'] = 'Străveziu';
+$lang['js']['media_diff_portions'] = 'Lovește cu putere';
+$lang['js']['media_select']    = 'Selectează fișierele...';
+$lang['js']['media_upload_btn'] = 'Încarcă';
+$lang['js']['media_done_btn']  = 'Gata';
+$lang['js']['media_drop']      = 'Lasă fișierele aici pentru încărcarea lor';
+$lang['js']['media_cancel']    = 'Înlătură';
+$lang['js']['media_overwrt']   = 'Suprascrie fișierele deja existente';
+$lang['rssfailed']             = 'A apărut o eroare in timpul descărcării acestui câmp: ';
+$lang['nothingfound']          = 'Nu am găsit nimic.';
+$lang['mediaselect']           = 'Fișiere media';
+$lang['fileupload']            = 'Încarcare fișier media';
+$lang['uploadsucc']            = 'Încărcare reușită';
+$lang['uploadfail']            = 'Încărcare eșuată. Poate din cauza permisiunilor?';
+$lang['uploadwrong']           = 'Încărcare nepermisă. Extensia fișierului e nepermisă';
+$lang['uploadexist']           = 'Fișierul există deja. Nimic nu a fost făcut.';
+$lang['uploadbadcontent']      = 'Conținutul încărcat nu corespunde extensiei fișierului %s.';
+$lang['uploadspam']            = 'Încărcarea a fost blocată din cauza listei negre de spam.';
+$lang['uploadxss']             = 'Încărcarea a fost blocată din cauza unui posibil conținut dăunător.';
+$lang['uploadsize']            = 'Fișierul uploadat a fost prea mare. (max %s)';
+$lang['deletesucc']            = 'Fișierul "%s" a fost șters.';
+$lang['deletefail']            = '"%s" nu a putut fi șters - verifică permisiunile.';
+$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['accessdenied']          = 'Nu îți este permis să vizualizezi această pagină.';
+$lang['mediausage']            = 'Folosește următoarea sintaxă pentru a face referință la acest fișier:';
+$lang['mediaview']             = 'Vizualizează fișierul inițial';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Încarcă un fișier in acest spațiu de nume. Pentru a crea sub-spații de nume, adaugă-le la fișierul de încărcat, separate de doua puncte (:).';
+$lang['mediaextchange']        = 'Extensia fișierului a fost modificată din .%s în .%s.';
+$lang['reference']             = 'Referință pentru';
+$lang['ref_inuse']             = 'Fișierul nu a putut fi șters întrucât este folosit de următoarele pagini:';
+$lang['ref_hidden']            = 'Nu ai permisiunea să citești o parte din referințele din pagină.';
+$lang['hits']                  = 'Accese';
+$lang['quickhits']             = 'Nume de pagini potrivite';
+$lang['toc']                   = 'Cuprins';
+$lang['current']               = 'curent';
+$lang['yours']                 = 'Versiunea ta';
+$lang['diff']                  = 'Arată diferențele față de versiunea curentă';
+$lang['diff2']                 = 'Arată diferențele dintre versiunile selectate';
+$lang['difflink']              = 'Link către această vizualizare comparativă';
+$lang['diff_type']             = 'Vezi diferențe:';
+$lang['diff_inline']           = 'Succesiv';
+$lang['diff_side']             = 'Alăturate';
+$lang['line']                  = 'Linia';
+$lang['breadcrumb']            = 'Traseu';
+$lang['youarehere']            = 'Ești aici';
+$lang['lastmod']               = 'Ultima modificare';
+$lang['by']                    = 'de către';
+$lang['deleted']               = 'șters';
+$lang['created']               = 'creat';
+$lang['restored']              = 'versiune veche restaurată (%s)';
+$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['tools']                 = 'Unelte';
+$lang['user_tools']            = 'Unelte utilizator';
+$lang['site_tools']            = 'Unelte site';
+$lang['page_tools']            = 'Unelte pagină';
+$lang['skip_to_content']       = 'mergi la conținut';
+$lang['mail_newpage']          = 'pagină adăugată:';
+$lang['mail_changed']          = 'pagină schimbată:';
+$lang['mail_subscribe_list']   = 'pagini modificate în spațiul de nume:';
+$lang['mail_new_user']         = 'utilizator nou';
+$lang['mail_upload']           = 'fișier încărcat:';
+$lang['changes_type']          = 'Vizualizare modificări';
+$lang['pages_changes']         = 'Pagini';
+$lang['media_changes']         = 'Fișiere media';
+$lang['both_changes']          = 'Ambele pagini și fișiere media';
+$lang['qb_bold']               = 'Text aldin';
+$lang['qb_italic']             = 'Text cursiv';
+$lang['qb_underl']             = 'Text subliniat';
+$lang['qb_code']               = 'Text cod';
+$lang['qb_strike']             = 'Text tăiat';
+$lang['qb_h1']                 = 'Titlu de nivel 1';
+$lang['qb_h2']                 = 'Titlu de nivel 2';
+$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']                 = 'Selectează titlul';
+$lang['qb_hplus']              = 'Titlu mai mare';
+$lang['qb_hminus']             = 'Titlu mai mic';
+$lang['qb_hequal']             = 'Titlu de același nivel';
+$lang['qb_link']               = 'Link intern';
+$lang['qb_extlink']            = 'Link extern';
+$lang['qb_hr']                 = 'Linie orizontală';
+$lang['qb_ol']                 = 'Listă ordonată';
+$lang['qb_ul']                 = 'Listă neordoată';
+$lang['qb_media']              = 'Adaugă imagini și alte fișiere';
+$lang['qb_sig']                = 'Inserează semnătură';
+$lang['qb_smileys']            = 'Smiley-uri';
+$lang['qb_chars']              = 'Caractere speciale';
+$lang['upperns']               = 'Accesează spațiul de nume părinte';
+$lang['admin_register']        = 'Adaugă utilizator nou';
+$lang['metaedit']              = 'Editează metadata';
+$lang['metasaveerr']           = 'Scrierea metadatelor a eșuat';
+$lang['metasaveok']            = 'Metadatele au fost salvate';
+$lang['img_backto']            = 'Înapoi la';
+$lang['img_title']             = 'Titlu';
+$lang['img_caption']           = 'Legendă';
+$lang['img_date']              = 'Dată';
+$lang['img_fname']             = 'Nume fișier';
+$lang['img_fsize']             = 'Dimensiune';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Drept de autor';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Cuvinte cheie';
+$lang['img_width']             = 'Lățime';
+$lang['img_height']            = 'Înălțime';
+$lang['img_manager']           = 'Vizualizează în administratorul media';
+$lang['subscr_subscribe_success'] = 'Adăugat %s la lista de abonare pentru %s';
+$lang['subscr_subscribe_error'] = 'Eroare la adăugarea %s la lista de abonare pentru %s';
+$lang['subscr_subscribe_noaddress'] = 'Nu există adresă de e-mail asociată autentificării curente, nu poți fi adăugat la lista de abonare';
+$lang['subscr_unsubscribe_success'] = 'Șters %s din lista de abonare pentru %s';
+$lang['subscr_unsubscribe_error'] = 'Eroare la ștergerea %s din lista de abonare pentru %s';
+$lang['subscr_already_subscribed'] = '%s este deja abonat la %s';
+$lang['subscr_not_subscribed'] = '%s nu este abonat la %s';
+$lang['subscr_m_not_subscribed'] = 'Momentan nu ești abonat la pagina curentă sau la spațiul de nume.';
+$lang['subscr_m_new_header']   = 'Adaugă abonare';
+$lang['subscr_m_current_header'] = 'Abonări curente';
+$lang['subscr_m_unsubscribe']  = 'Dezabonează-te';
+$lang['subscr_m_subscribe']    = 'Abonează-te';
+$lang['subscr_m_receive']      = 'Primește';
+$lang['subscr_style_every']    = 'e-mail la ficare schimbare';
+$lang['subscr_style_digest']   = 'e-mail cu sumar al modificărilor pentru fiecare pagină (la fiecare %.2f zile)';
+$lang['subscr_style_list']     = 'lista paginilor modificate de la ultimul e-mail (la fiecare %.2f zile)';
+$lang['authtempfail']          = 'Autentificarea utilizatorului este temporar indisponibilă. Contactează administratorul.';
+$lang['authpwdexpire']         = 'Parola va expira în %d zile, ar trebui să o schimbi în curând.';
+$lang['i_chooselang']          = 'Alege limba';
+$lang['i_installer']           = 'Installer DokuWiki';
+$lang['i_wikiname']            = 'Numele acestui wiki';
+$lang['i_enableacl']           = 'Activează ACL (liste de control a accesului) (recomandat)';
+$lang['i_superuser']           = 'Utilizator privilegiat';
+$lang['i_problems']            = 'Programul de instalare a găsit câteva probleme, indicate mai jos. Nu poți continua până nu le rezolvi.';
+$lang['i_modified']            = 'Din motive de securitate, acest script va funcționa doar cu o instalare nouă și nemodificată a DokuWiki.
+Poți fie să extragi din nou fișierele din arhiva descărcată fie să consulți instrucțiunile de instalare DokuWiki la ';
+$lang['i_funcna']              = 'Funcția PHP %s nu este disponibilă. Probabil provider-ul tău a dezactivat-o pentru un motiv anume.';
+$lang['i_phpver']              = 'Versiunea ta de PHP %s este mai veche decât cea necesară (%s). Trebuie să îți actualizezi instalarea PHP.';
+$lang['i_permfail']            = '%s nu poate fi scris de către DokuWiki. Trebuie să modifici permisiunile pe acest director.';
+$lang['i_confexists']          = '%s există deja';
+$lang['i_writeerr']            = 'Nu s-a putut crea %s. Trebuie să verifici permisiunile directorului/fișierului și să creezi fișierul manual.';
+$lang['i_badhash']             = 'dokuwiki.php nu a fost recunoscut sau a fost modificat (hash=%s)';
+$lang['i_badval']              = '%s - valoare nepemisă sau neintrodusă';
+$lang['i_success']             = 'Configurarea a fost finalizată cu succes. Acum poți sterge fișierul install.php. Poți accesa noua ta instanță DokuWiki.';
+$lang['i_failure']             = 'Au apărut erori la scrierea fișierelor de configurare. Va trebui să le corectezi manual înainte de a putea folosi noua ta instanță DokuWiki.';
+$lang['i_policy']              = 'Politica ACL (liste de control a accesului) inițială';
+$lang['i_pol0']                = 'Wiki deschis (oricine poate citi, scrie și încărca fișiere)';
+$lang['i_pol1']                = 'Wiki public (oricine poate citi, utilizatorii înregistrați pot scrie și încărca fișiere';
+$lang['i_pol2']                = 'Wiki închis (doar utilizatorii înregistrați pot citi, scrie și încărca fișiere)';
+$lang['i_retry']               = 'Încearcă din nou';
+$lang['i_license']             = 'Te rugăm să alegi licența sub care dorești să publici conținutul:';
+$lang['recent_global']         = 'În acest moment vizualizezi modificările în interiorul spațiului de nume %s. De asemenea poți vizualiza modificările recente în întregului wiki-ul.';
+$lang['years']                 = 'acum %d ani';
+$lang['months']                = 'acum %d luni';
+$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';
+$lang['wordblock']             = 'Modificarea ta nu a fost salvată deoarece conține text blocat (spam).';
+$lang['media_uploadtab']       = 'Încărcare fișier';
+$lang['media_searchtab']       = 'Căutare';
+$lang['media_file']            = 'Fișier';
+$lang['media_viewtab']         = 'Vizualizare';
+$lang['media_edittab']         = 'Editare';
+$lang['media_historytab']      = 'Istoric';
+$lang['media_list_thumbs']     = 'Miniaturi';
+$lang['media_list_rows']       = 'Linii';
+$lang['media_sort_name']       = 'Nume';
+$lang['media_sort_date']       = 'Dată';
+$lang['media_namespaces']      = 'Alege spațiul de nume';
+$lang['media_files']           = 'Fișiere în %s';
+$lang['media_upload']          = 'Încărcare în %s';
+$lang['media_search']          = 'Cautare în %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s în %s';
+$lang['media_edit']            = 'Editare %s';
+$lang['media_history']         = 'Istoricul pentru %s';
+$lang['media_meta_edited']     = 'metadate editate';
+$lang['media_perm_read']       = 'Ne pare rău, dar nu ai suficiente permisiuni pentru a putea citi fișiere.';
+$lang['media_perm_upload']     = 'Ne pare rău, dar nu ai suficiente permisiuni pentru a putea încărca fișiere.';
+$lang['media_update']          = 'Încarcă noua versiune';
+$lang['media_restore']         = 'Restaurează această versiune';
diff --git a/sources/inc/lang/ro/locked.txt b/sources/inc/lang/ro/locked.txt
new file mode 100644
index 0000000..8708157
--- /dev/null
+++ b/sources/inc/lang/ro/locked.txt
@@ -0,0 +1,3 @@
+====== Pagină blocată ======
+
+Pagina este momentan blocată de alt utilizator. Trebuie să aștepți pînă cînd acest utilizator termină editarea ori expiră blocarea.
diff --git a/sources/inc/lang/ro/login.txt b/sources/inc/lang/ro/login.txt
new file mode 100644
index 0000000..81bca62
--- /dev/null
+++ b/sources/inc/lang/ro/login.txt
@@ -0,0 +1,4 @@
+====== Login ======
+
+Nu sînteți logat! Introduceți datele de autentificare pentru logare. Trebuie să permiteți cookie-uri pentru logare.
+
diff --git a/sources/inc/lang/ro/mailtext.txt b/sources/inc/lang/ro/mailtext.txt
new file mode 100644
index 0000000..77aca8c
--- /dev/null
+++ b/sources/inc/lang/ro/mailtext.txt
@@ -0,0 +1,16 @@
+A fost adăugată sau schimbată o pagină. Aici sînt detaliile:
+
+Data        : @DATE@
+Navigator   : @BROWSER@
+Adresa-IP   : @IPADDRESS@
+Nume gazdă  : @HOSTNAME@
+Versiune veche : @OLDPAGE@
+Versiune nouă  : @NEWPAGE@
+Rezumat editare: @SUMMARY@
+
+@DIFF@
+
+
+-- 
+Mailul a fost generat de DokuWiki la
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ro/newpage.txt b/sources/inc/lang/ro/newpage.txt
new file mode 100644
index 0000000..8862586
--- /dev/null
+++ b/sources/inc/lang/ro/newpage.txt
@@ -0,0 +1,3 @@
+====== 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 --git a/sources/inc/lang/ro/norev.txt b/sources/inc/lang/ro/norev.txt
new file mode 100644
index 0000000..4a21abc
--- /dev/null
+++ b/sources/inc/lang/ro/norev.txt
@@ -0,0 +1,4 @@
+====== Nu există versiunea ======
+
+Versiunea specificată nu există. Folosește butonul ''Versiuni vechi'' pentru o listă a versiunilor acestui document.
+
diff --git a/sources/inc/lang/ro/password.txt b/sources/inc/lang/ro/password.txt
new file mode 100644
index 0000000..a7eb12d
--- /dev/null
+++ b/sources/inc/lang/ro/password.txt
@@ -0,0 +1,10 @@
+Salut @FULLNAME@!
+
+Aici sînt datele utilizator pentru @TITLE@ la @DOKUWIKIURL@
+
+Login    : @LOGIN@
+Parola   : @PASSWORD@
+
+-- 
+Mesajul a fost generat de către DokuWiki la
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ro/preview.txt b/sources/inc/lang/ro/preview.txt
new file mode 100644
index 0000000..1964d74
--- /dev/null
+++ b/sources/inc/lang/ro/preview.txt
@@ -0,0 +1,4 @@
+====== Previzualizare ======
+
+Acesta este modul în care va arăta textul. Nu uita: **Nu** e încă **salvat**!
+
diff --git a/sources/inc/lang/ro/pwconfirm.txt b/sources/inc/lang/ro/pwconfirm.txt
new file mode 100644
index 0000000..ae2d9f9
--- /dev/null
+++ b/sources/inc/lang/ro/pwconfirm.txt
@@ -0,0 +1,13 @@
+Salut @FULLNAME@!
+
+Cineva a cerut o parolă nouă pentru @TITLE@ pentru conectarea la @DOKUWIKIURL@
+
+Dacă nu ați solicitat o parolă nouă, ignorați acest email.
+
+Pentru a confirma că cererea a fost într-adevăr trimisă de dumneavoastră, folosiți link-ul de mai jos.
+
+@CONFIRM@
+
+-- 
+Acest mail a fost generat de DocuWiki la
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ro/read.txt b/sources/inc/lang/ro/read.txt
new file mode 100644
index 0000000..72c33c0
--- /dev/null
+++ b/sources/inc/lang/ro/read.txt
@@ -0,0 +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ă.
+
diff --git a/sources/inc/lang/ro/recent.txt b/sources/inc/lang/ro/recent.txt
new file mode 100644
index 0000000..8d4aa04
--- /dev/null
+++ b/sources/inc/lang/ro/recent.txt
@@ -0,0 +1,5 @@
+====== Schimbări recente ======
+
+Următoarele pagini au fost schimbate recent.
+
+
diff --git a/sources/inc/lang/ro/register.txt b/sources/inc/lang/ro/register.txt
new file mode 100644
index 0000000..e062a46
--- /dev/null
+++ b/sources/inc/lang/ro/register.txt
@@ -0,0 +1,3 @@
+====== Înregistrează-te ca utilizator nou ======
+Pentru a crea un wiki nou completează mai jos toate informațiile. Asigură-te că ai introdus o adresă de **e-mail validă** unde va fi trimisă noua parolă. Numele de utilizator trebuie de asemenea să fie valid [[doku>pagename|pagename]].
+
diff --git a/sources/inc/lang/ro/registermail.txt b/sources/inc/lang/ro/registermail.txt
new file mode 100644
index 0000000..fb754af
--- /dev/null
+++ b/sources/inc/lang/ro/registermail.txt
@@ -0,0 +1,14 @@
+Un nou utilizator s-a înregsitrat. Iată detaliile:
+
+Nume utilizator : @NEWUSER@
+Nume complet : @NEWNAME@
+E-mail : @NEWEMAIL@
+
+Data : @DATE@
+Browser : @BROWSER@
+Adresă IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+
+-- 
+Acest mail a fost generat automat de către DokuWiki la
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ro/resendpwd.txt b/sources/inc/lang/ro/resendpwd.txt
new file mode 100644
index 0000000..4a67f9e
--- /dev/null
+++ b/sources/inc/lang/ro/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Trimite parolă nouă ======
+
+Introduceți numele de utilizator în formularul de mai jos pentru a solicita o nouă parolă pentru această wiki. Un link de confirmare va fi trimis la adresa de email înregistrată.
\ No newline at end of file
diff --git a/sources/inc/lang/ro/resetpwd.txt b/sources/inc/lang/ro/resetpwd.txt
new file mode 100644
index 0000000..2eb8052
--- /dev/null
+++ b/sources/inc/lang/ro/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Setează parolă nouă ======
+
+Vă rugăm să introduceți o nouă parolă pentru contul dvs. pe acest wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/ro/revisions.txt b/sources/inc/lang/ro/revisions.txt
new file mode 100644
index 0000000..d42134c
--- /dev/null
+++ b/sources/inc/lang/ro/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/ro/searchpage.txt b/sources/inc/lang/ro/searchpage.txt
new file mode 100644
index 0000000..8c78c68
--- /dev/null
+++ b/sources/inc/lang/ro/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
diff --git a/sources/inc/lang/ro/showrev.txt b/sources/inc/lang/ro/showrev.txt
new file mode 100644
index 0000000..c1d5e54
--- /dev/null
+++ b/sources/inc/lang/ro/showrev.txt
@@ -0,0 +1,2 @@
+**Aceasta e o versiune veche a documentului!**
+----
diff --git a/sources/inc/lang/ro/stopwords.txt b/sources/inc/lang/ro/stopwords.txt
new file mode 100644
index 0000000..1f0d953
--- /dev/null
+++ b/sources/inc/lang/ro/stopwords.txt
@@ -0,0 +1,29 @@
+# Aceasta este o listă de cuvinte ignorate la indexare, câte un cuvânt pe linie
+# Când editați acest fișier, asigurați-vă că folosiți sfârșituri de linie UNIX (o singură linie nouă)
+# Nu e nevoie să includeți cuvinte mai scurte de 3 caractere - acestea sunt, oricum, ignorate
+# Această listă se bazează pe cele ce pot fi găsite la http://www.ranks.nl/stopwords/
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/ro/subscr_digest.txt b/sources/inc/lang/ro/subscr_digest.txt
new file mode 100644
index 0000000..ad0a307
--- /dev/null
+++ b/sources/inc/lang/ro/subscr_digest.txt
@@ -0,0 +1,20 @@
+Buna ziua!
+
+Pagina @PAGE@ în @TITLE@ wiki s-a modificat.
+Acestea sunt modificările:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Vechea revizie: @OLDPAGE@
+Noua revizie: @NEWPAGE@
+
+Pentru a anula notificarea paginii, logați-vă pe wiki la
+@DOKUWIKIURL@ apoi navigați la
+@SUBSCRIBE@
+și dezabonați-vă de la pagină și/sau modificările numelui de spațiu.
+
+--
+Acest mail a fost generat de DokuWiki la
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ro/subscr_form.txt b/sources/inc/lang/ro/subscr_form.txt
new file mode 100644
index 0000000..e55dfe6
--- /dev/null
+++ b/sources/inc/lang/ro/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Administrarea abonărilor ======
+
+Această pagină vă permite să vă administrați abonările pentru pagina curentă și numele de spațiu.
\ No newline at end of file
diff --git a/sources/inc/lang/ro/subscr_list.txt b/sources/inc/lang/ro/subscr_list.txt
new file mode 100644
index 0000000..1b55ea9
--- /dev/null
+++ b/sources/inc/lang/ro/subscr_list.txt
@@ -0,0 +1,17 @@
+Bună ziua!
+
+Paginile din numele de spațiu @PAGE@ al @TITLE@ wiki s-au modificat.
+Acestea sunt modificările:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Pentru a anula notificarea paginii, logați-vă pe wiki la
+@DOKUWIKIURL@ apoi navigați la
+@SUBSCRIBE@
+și dezabonați-vă de la pagină și/sau modificările numelui de spațiu.
+
+--
+Acest mail a fost generat de DokuWiki la
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ro/subscr_single.txt b/sources/inc/lang/ro/subscr_single.txt
new file mode 100644
index 0000000..006db74
--- /dev/null
+++ b/sources/inc/lang/ro/subscr_single.txt
@@ -0,0 +1,23 @@
+Bună ziua!
+
+Pagina @PAGE@ în @TITLE@ wiki s-a modificat.
+Acestea sunt modificările:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data: @DATE@
+Utilizator: @USER@
+Sumarul editării: @SUMMARY@
+Vechea revizie: @OLDPAGE@
+Noua revizie: @NEWPAGE@
+
+Pentru a anula notificarea paginii, logați-vă pe wiki la
+@DOKUWIKIURL@ apoi navigați la
+@SUBSCRIBE@
+și dezabonați-vă de la pagină și/sau modificările numelui de spațiu.
+
+--
+Acest mail a fost generat de DokuWiki la
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ro/updateprofile.txt b/sources/inc/lang/ro/updateprofile.txt
new file mode 100644
index 0000000..f3985a1
--- /dev/null
+++ b/sources/inc/lang/ro/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Actualizare profil utilizator ======
+
+Trebuie să completați doar câmpurile pe care doriți să le modificați. Nu puteți modifica numele de utilizator.
\ No newline at end of file
diff --git a/sources/inc/lang/ro/uploadmail.txt b/sources/inc/lang/ro/uploadmail.txt
new file mode 100644
index 0000000..c1e5736
--- /dev/null
+++ b/sources/inc/lang/ro/uploadmail.txt
@@ -0,0 +1,14 @@
+Un fișier a fost încărcat în DocuWiki. Iată detaliile:
+
+Fișier : @MEDIA@
+Data : @DATE@
+Browser : @BROWSER@
+Adresă IP : @IPADDRESS@
+Hostname : @HOSTNAME@
+Dimensiune : @SIZE@
+MIME Type : @MIME@
+Utilizator : @USER@
+
+-- 
+Acest mail a fost generat automat de către DokuWiki la
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ru/admin.txt b/sources/inc/lang/ru/admin.txt
new file mode 100644
index 0000000..e00daa4
--- /dev/null
+++ b/sources/inc/lang/ru/admin.txt
@@ -0,0 +1,4 @@
+====== Управление ======
+
+Ниже вы сможете найти список административных операций, доступных в «ДокуВики».
+
diff --git a/sources/inc/lang/ru/adminplugins.txt b/sources/inc/lang/ru/adminplugins.txt
new file mode 100644
index 0000000..6e3fc26
--- /dev/null
+++ b/sources/inc/lang/ru/adminplugins.txt
@@ -0,0 +1 @@
+===== Дополнительные плагины =====
\ No newline at end of file
diff --git a/sources/inc/lang/ru/backlinks.txt b/sources/inc/lang/ru/backlinks.txt
new file mode 100644
index 0000000..a3b638d
--- /dev/null
+++ b/sources/inc/lang/ru/backlinks.txt
@@ -0,0 +1,4 @@
+====== Обратные ссылки ======
+
+Это список страниц, которые ссылаются на текущую страницу.
+
diff --git a/sources/inc/lang/ru/conflict.txt b/sources/inc/lang/ru/conflict.txt
new file mode 100644
index 0000000..6c5e33d
--- /dev/null
+++ b/sources/inc/lang/ru/conflict.txt
@@ -0,0 +1,5 @@
+====== Существует более новая версия ======
+
+Существует более новая версия документа, который вы редактировали. Такое случается, когда другой пользователь изменил документ, пока вы делали то же самое.
+
+Внимательно изучите различия, приведенные ниже, и решите, какую версию оставить. Если вы выберете «Сохранить», то ваша версия будет сохранена. Нажав «Отменить», вы оставите текущую версию.
diff --git a/sources/inc/lang/ru/denied.txt b/sources/inc/lang/ru/denied.txt
new file mode 100644
index 0000000..f7f53ce
--- /dev/null
+++ b/sources/inc/lang/ru/denied.txt
@@ -0,0 +1,3 @@
+====== Доступ запрещён ======
+
+Извините, у вас не хватает прав для этого действия. Может быть вы забыли войти в вики под своим логином?
diff --git a/sources/inc/lang/ru/diff.txt b/sources/inc/lang/ru/diff.txt
new file mode 100644
index 0000000..8025261
--- /dev/null
+++ b/sources/inc/lang/ru/diff.txt
@@ -0,0 +1,4 @@
+====== Различия ======
+
+Здесь показаны различия между двумя версиями данной страницы.
+
diff --git a/sources/inc/lang/ru/draft.txt b/sources/inc/lang/ru/draft.txt
new file mode 100644
index 0000000..cb35f72
--- /dev/null
+++ b/sources/inc/lang/ru/draft.txt
@@ -0,0 +1,6 @@
+====== Найден черновик ======
+
+Последний раз редактирование этой страницы не было корректно завершено. Во время вашей работы был автоматически сохранён черновик, который вы теперь можете восстановить и продолжить прерванную правку. Ниже вы видите автоматически сохранённую версию.
+
+Пожалуйста, решите, хотите ли вы //восстановить// потерянную версию, //удалить// черновик, или //отменить// редактирование.
+
diff --git a/sources/inc/lang/ru/edit.txt b/sources/inc/lang/ru/edit.txt
new file mode 100644
index 0000000..aac399d
--- /dev/null
+++ b/sources/inc/lang/ru/edit.txt
@@ -0,0 +1,2 @@
+Отредактируйте страницу и нажмите «Сохранить». Прочтите [[wiki:syntax|справочную страницу]] для ознакомления с синтаксисом вики. Пожалуйста, редактируйте только в том случае, если планируете **улучшить** содержимое. Если вы просто хотите потестировать что-либо, воспользуйтесь специальной страницей: [[playground:playground]].
+
diff --git a/sources/inc/lang/ru/editrev.txt b/sources/inc/lang/ru/editrev.txt
new file mode 100644
index 0000000..97b799a
--- /dev/null
+++ b/sources/inc/lang/ru/editrev.txt
@@ -0,0 +1,2 @@
+**Вы загрузили старую ревизию документа.** Сохранив её, вы создадите новую текущую версию с этим содержимым.
+----
diff --git a/sources/inc/lang/ru/index.txt b/sources/inc/lang/ru/index.txt
new file mode 100644
index 0000000..fc42f87
--- /dev/null
+++ b/sources/inc/lang/ru/index.txt
@@ -0,0 +1,4 @@
+====== Содержание ======
+
+Перед вами список доступных страниц, упорядоченный по ([[doku>namespaces|пространствам имён]]).
+
diff --git a/sources/inc/lang/ru/install.html b/sources/inc/lang/ru/install.html
new file mode 100644
index 0000000..c1c58fa
--- /dev/null
+++ b/sources/inc/lang/ru/install.html
@@ -0,0 +1,7 @@
+
        Эта страница предназначена помочь в первоначальной установке и конфигурации «ДокуВики». Дополнительная информация о программе установки доступна на её странице документации.
        
+
+
        «ДокуВики» использует обычные файлы для хранения страниц и дополнительной информации (например, изображений, поискового индекса, предыдущих версий страницы, и т. д.). Для успешной работы «ДокуВики» необходим доступ на запись к директориям с этими файлами. Данная программа установки не может самостоятельно изменять системные права доступа к директориям. Обычно это делается напрямую из командной строки (shell), или, если вы используете удалённый хостинг, через FTP или панель управления своего хостинга (например, cPanel).
        
+
+
        Программа установки включит использование списков контроля доступа (ACL) в вашей «ДокуВики». Это позволит администратору, после авторизации в «ДокуВики», использовать специальное меню для установки плагинов, управления пользователями и доступом к страницам вики, а также для настройки конфигурационных параметров. Списки контроля доступа не обязательны для работы «ДокуВики», однако они позволяют упростить управление вашей «ДокуВики».
        
+
+
        Опытным пользователям и пользователям со специальными требованиями к установке рекомендуется обратиться по следующим ссылкам для уточнения подробностей процесса установки и параметров конфигурации.
        
diff --git a/sources/inc/lang/ru/lang.php b/sources/inc/lang/ru/lang.php
new file mode 100644
index 0000000..237b819
--- /dev/null
+++ b/sources/inc/lang/ru/lang.php
@@ -0,0 +1,347 @@
+
+ * @author Igor Tarasov 
+ * @author Denis Simakov 
+ * @author Kaens Bard 
+ * @author Andrew Pleshakov 
+ * @author Змей Этерийский 
+ * @author Hikaru Nakajima 
+ * @author Alexei Tereschenko 
+ * @author Irina Ponomareva 
+ * @author Alexander Sorkin 
+ * @author Kirill Krasnov 
+ * @author Vlad Tsybenko 
+ * @author Aleksey Osadchiy 
+ * @author Aleksandr Selivanov 
+ * @author Ladyko Andrey 
+ * @author Eugene 
+ * @author Johnny Utah 
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ * @author Pavel 
+ * @author Artur 
+ */
+$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_profile']           = 'Профиль';
+$lang['btn_reset']             = 'Сброс';
+$lang['btn_resendpwd']         = 'Установить новый пароль';
+$lang['btn_draft']             = 'Править черновик';
+$lang['btn_recover']           = 'Восстановить черновик';
+$lang['btn_draftdel']          = 'Удалить черновик';
+$lang['btn_revert']            = 'Восстановить';
+$lang['btn_register']          = 'Зарегистрироваться';
+$lang['btn_apply']             = 'Применить';
+$lang['btn_media']             = 'Управление медиафайлами';
+$lang['btn_deleteuser']        = 'Удалить мой аккаунт';
+$lang['loggedinas']            = 'Зашли как';
+$lang['user']                  = 'Логин';
+$lang['pass']                  = 'Пароль';
+$lang['newpass']               = 'Новый пароль';
+$lang['oldpass']               = 'Введите текущий пароль';
+$lang['passchk']               = 'повторите';
+$lang['remember']              = 'Запомнить меня';
+$lang['fullname']              = 'Полное имя';
+$lang['email']                 = 'Эл. адрес';
+$lang['profile']               = 'Профиль пользователя';
+$lang['badlogin']              = 'Извините, неверное имя пользователя или пароль.';
+$lang['badpassconfirm']        = 'Простите, пароль неверный';
+$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['profnodelete']          = 'Удалённый пользователь не может работать с этим документом';
+$lang['profdeleteuser']        = 'Удалить аккаунт';
+$lang['profdeleted']           = 'Ваш аккаунт был удален из этой вики';
+$lang['profconfdelete']        = 'Я хочу удалить мой аккаунт из этой вики.
        Это действие необратимо.';
+$lang['profconfdeletemissing'] = 'Флажок подтверждения не установлен';
+$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['maxuploadsize']         = 'Максимальный размер загружаемого файла %s';
+$lang['lockedby']              = 'В данный момент заблокирован';
+$lang['lockexpire']            = 'Блокировка истекает в';
+$lang['js']['willexpire']      = 'Ваша блокировка этой страницы на редактирование истекает в течение минуты.\nЧтобы предотвратить конфликты используйте кнопку «Просмотр» для сброса таймера блокировки.';
+$lang['js']['notsavedyet']     = 'Несохранённые изменения будут потеряны. Вы действительно хотите продолжить?';
+$lang['js']['searchmedia']     = 'Поиск файлов';
+$lang['js']['keepopen']        = 'Не закрывать окно после выбора';
+$lang['js']['hidedetails']     = 'Скрыть детали';
+$lang['js']['mediatitle']      = 'Настройки ссылок';
+$lang['js']['mediadisplay']    = 'Тип ссылки';
+$lang['js']['mediaalign']      = 'Выравнивание';
+$lang['js']['mediasize']       = 'Размер изображения';
+$lang['js']['mediatarget']     = 'Значение target ссылки';
+$lang['js']['mediaclose']      = 'Закрыть';
+$lang['js']['mediainsert']     = 'Вставить';
+$lang['js']['mediadisplayimg'] = 'Показывать изображение.';
+$lang['js']['mediadisplaylnk'] = 'Показывать только ссылку.';
+$lang['js']['mediasmall']      = 'Малая версия';
+$lang['js']['mediamedium']     = 'Средняя версия';
+$lang['js']['medialarge']      = 'Крупная версия';
+$lang['js']['mediaoriginal']   = 'Исходная версия';
+$lang['js']['medialnk']        = 'Ссылка на подробности';
+$lang['js']['mediadirect']     = 'Прямая ссылка на оригинал';
+$lang['js']['medianolnk']      = 'Без ссылки';
+$lang['js']['medianolink']     = 'Не давать ссылку на изображение';
+$lang['js']['medialeft']       = 'Выровнять изображение по левому краю.';
+$lang['js']['mediaright']      = 'Выровнять изображение по правому краю.';
+$lang['js']['mediacenter']     = 'Выровнять изображение по центру.';
+$lang['js']['medianoalign']    = 'Не выравнивать.';
+$lang['js']['nosmblinks']      = 'Ссылка на сетевые каталоги Windows работает только из Интернет Эксплорера. Но вы можете скопировать ссылку.';
+$lang['js']['linkwiz']         = 'Мастер ссылок';
+$lang['js']['linkto']          = 'Ссылка на:';
+$lang['js']['del_confirm']     = 'Вы на самом деле желаете удалить выбранное?';
+$lang['js']['restore_confirm'] = 'Действительно восстановить эту версию?';
+$lang['js']['media_diff']      = 'Просмотр отличий:';
+$lang['js']['media_diff_both'] = 'рядом';
+$lang['js']['media_diff_opacity'] = 'наложением';
+$lang['js']['media_diff_portions'] = 'Частями';
+$lang['js']['media_select']    = 'Выбрать файлы…';
+$lang['js']['media_upload_btn'] = 'Загрузить';
+$lang['js']['media_done_btn']  = 'Готово';
+$lang['js']['media_drop']      = 'Переместите файлы сюда для загрузки';
+$lang['js']['media_cancel']    = 'отменить';
+$lang['js']['media_overwrt']   = 'Перезаписать существующие файлы';
+$lang['rssfailed']             = 'Произошла ошибка при получении следующей новостной ленты: ';
+$lang['nothingfound']          = 'Ничего не найдено.';
+$lang['mediaselect']           = 'Выбор медиафайла';
+$lang['fileupload']            = 'Загрузка медиафайла';
+$lang['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['accessdenied']          = 'Вы не можете просмотреть эту страницу.';
+$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['difflink']              = 'Ссылка на это сравнение';
+$lang['diff_type']             = 'Посмотреть отличия';
+$lang['diff_inline']           = 'встроенный';
+$lang['diff_side']             = 'бок о бок';
+$lang['line']                  = 'Строка';
+$lang['breadcrumb']            = 'Вы посетили';
+$lang['youarehere']            = 'Вы находитесь здесь';
+$lang['lastmod']               = 'Последние изменения';
+$lang['by']                    = ' —';
+$lang['deleted']               = 'удалено';
+$lang['created']               = 'создано';
+$lang['restored']              = 'старая ревизия восстановлена (%s)';
+$lang['external_edit']         = 'внешнее изменение';
+$lang['summary']               = 'Сводка изменений';
+$lang['noflash']               = 'Для просмотра этого содержимого требуется Adobe Flash Plugin.';
+$lang['download']              = 'Скачать код';
+$lang['tools']                 = 'Инструменты';
+$lang['user_tools']            = 'Инструменты пользователя';
+$lang['site_tools']            = 'Инструменты сайта';
+$lang['page_tools']            = 'Инструменты страницы';
+$lang['skip_to_content']       = 'Перейти к содержанию';
+$lang['sidebar']               = 'Боковая панель';
+$lang['mail_newpage']          = 'страница добавлена:';
+$lang['mail_changed']          = 'страница изменена:';
+$lang['mail_subscribe_list']   = 'изменились страницы в пространстве имён:';
+$lang['mail_new_user']         = 'новый пользователь:';
+$lang['mail_upload']           = 'файл закачан:';
+$lang['changes_type']          = 'Посмотреть изменения';
+$lang['pages_changes']         = 'страниц';
+$lang['media_changes']         = 'медиафайлов';
+$lang['both_changes']          = 'и страниц, и медиафайлов';
+$lang['qb_bold']               = 'Полужирный';
+$lang['qb_italic']             = 'Курсив';
+$lang['qb_underl']             = 'Подчёркнутый';
+$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['img_width']             = 'Ширина';
+$lang['img_height']            = 'Высота';
+$lang['img_manager']           = 'Просмотр в «управлении медиафайлами»';
+$lang['subscr_subscribe_success'] = 'Добавлен %s в подписку на %s';
+$lang['subscr_subscribe_error'] = 'Невозможно добавить %s в подписку на %s';
+$lang['subscr_subscribe_noaddress'] = 'Нет адреса электронной почты, сопоставленного с вашей учётной записью. Вы не можете подписаться на рассылку';
+$lang['subscr_unsubscribe_success'] = 'Удалён %s из подписки на %s';
+$lang['subscr_unsubscribe_error'] = 'Ошибка удаления %s из подписки на %s';
+$lang['subscr_already_subscribed'] = '%s уже подписан на %s';
+$lang['subscr_not_subscribed'] = '%s не подписан на %s';
+$lang['subscr_m_not_subscribed'] = 'Вы не подписаны на текущую страницу или пространство имён.';
+$lang['subscr_m_new_header']   = 'Добавить подписку';
+$lang['subscr_m_current_header'] = 'Текущие подписки';
+$lang['subscr_m_unsubscribe']  = 'Отменить подписку';
+$lang['subscr_m_subscribe']    = 'Подписаться';
+$lang['subscr_m_receive']      = 'Получить';
+$lang['subscr_style_every']    = 'уведомлять о каждом изменении';
+$lang['subscr_style_digest']   = 'информационное электронное письмо со списком изменений для каждой страницы (каждые %.2f дней)';
+$lang['subscr_style_list']     = 'список изменённых страниц со времени последнего отправленного электронного письма (каждые %.2f дней)';
+$lang['authtempfail']          = 'Аутентификация пользователей временно недоступна. Если проблема продолжается какое-то время, пожалуйста, сообщите об этом своему администратору вики.';
+$lang['authpwdexpire']         = 'Действие вашего пароля истекает через %d дней. Вы должны изменить его как можно скорее';
+$lang['i_chooselang']          = 'Выберите свой язык/Choose your language';
+$lang['i_installer']           = 'Установка «ДокуВики»';
+$lang['i_wikiname']            = 'Название вики';
+$lang['i_enableacl']           = 'Разрешить ограничение прав доступа (рекомендуется)';
+$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_confexists']          = '%s уже существует';
+$lang['i_writeerr']            = 'Не удалось создать %s. Вам необходимо проверить системные права доступа к файлу/директориям и создать файл вручную. ';
+$lang['i_badhash']             = 'dokuwiki.php не распознан или изменён (хэш=%s)';
+$lang['i_badval']              = '%s — недопустимое или пустое значение';
+$lang['i_success']             = 'Конфигурация прошла успешно. Теперь вы можете удалить файл install.php. Переходите к
+                                 своей новой «ДокуВики».';
+$lang['i_failure']             = 'При записи в файлы конфигурации были обнаружены ошибки. Возможно, вам придётся исправить их вручную, прежде чем вы сможете использовать свою новую «ДокуВики».';
+$lang['i_policy']              = 'Исходная политика прав доступа';
+$lang['i_pol0']                = 'Открытая вики (чтение, запись, закачка файлов для всех)';
+$lang['i_pol1']                = 'Общедоступная вики (чтение для всех, запись и загрузка файлов для зарегистрированных пользователей)';
+$lang['i_pol2']                = 'Закрытая вики (чтение, запись и загрузка файлов только для зарегистрированных пользователей)';
+$lang['i_retry']               = 'Повторить попытку';
+$lang['i_license']             = 'Пожалуйста, выберите тип лицензии для своей вики:';
+$lang['i_license_none']        = 'Не отображать информацию о лицензионных операциях';
+$lang['i_pop_field']           = 'Пожалуйста, помогите нам улучшить «ДокуВики»:';
+$lang['i_pop_label']           = 'Отправлять раз в месяц анонимную пользовательскую информацию разработчикам «ДокуВики»';
+$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 секунд назад';
+$lang['wordblock']             = 'Ваши изменения не сохранены, поскольку они содержат блокируемые слова (спам).';
+$lang['media_uploadtab']       = 'Загрузка';
+$lang['media_searchtab']       = 'Поиск';
+$lang['media_file']            = 'Файл';
+$lang['media_viewtab']         = 'Просмотр';
+$lang['media_edittab']         = 'Правка';
+$lang['media_historytab']      = 'История';
+$lang['media_list_thumbs']     = 'Миниатюры';
+$lang['media_list_rows']       = 'Строки';
+$lang['media_sort_name']       = 'Сортировка по имени';
+$lang['media_sort_date']       = 'Сортировка по дате';
+$lang['media_namespaces']      = 'Выберите каталог';
+$lang['media_files']           = 'Файлы в %s';
+$lang['media_upload']          = 'Загрузка в пространство имён %s.';
+$lang['media_search']          = 'Поиск в пространстве имён %s.';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s в %s
+';
+$lang['media_edit']            = 'Правка %s';
+$lang['media_history']         = 'История %s';
+$lang['media_meta_edited']     = 'метаданные изменены';
+$lang['media_perm_read']       = 'Извините, у вас недостаточно прав для чтения файлов.';
+$lang['media_perm_upload']     = 'Извините, у вас недостаточно прав для загрузки файлов.';
+$lang['media_update']          = 'Загрузить новую версию';
+$lang['media_restore']         = 'Восстановить эту версию';
diff --git a/sources/inc/lang/ru/locked.txt b/sources/inc/lang/ru/locked.txt
new file mode 100644
index 0000000..3e868ba
--- /dev/null
+++ b/sources/inc/lang/ru/locked.txt
@@ -0,0 +1,3 @@
+====== Страница заблокирована ======
+
+Эта страница в данный момент заблокирована для редактирования другим пользователем. Вам придётся подождать, пока этот пользователь закончит редактирование или истечёт время блокировки.
diff --git a/sources/inc/lang/ru/login.txt b/sources/inc/lang/ru/login.txt
new file mode 100644
index 0000000..0a94a0b
--- /dev/null
+++ b/sources/inc/lang/ru/login.txt
@@ -0,0 +1,4 @@
+====== Авторизация ======
+
+В данный момент вы не в системе. Авторизируйтесь при помощи следующей формы. //Замечание:// для работы у вас должны быть включены куки (cookies).
+
diff --git a/sources/inc/lang/ru/mailtext.txt b/sources/inc/lang/ru/mailtext.txt
new file mode 100644
index 0000000..2b3f76b
--- /dev/null
+++ b/sources/inc/lang/ru/mailtext.txt
@@ -0,0 +1,17 @@
+В вашей вики была добавлена или изменена страница. Подробности:
+
+Дата: @DATE@
+Браузер: @BROWSER@
+IP-адрес: @IPADDRESS@
+Хост: @HOSTNAME@
+Старая версия: @OLDPAGE@
+Новая версия: @NEWPAGE@
+Сводка изменений: @SUMMARY@
+Пользователь: @USER@
+
+@DIFF@
+
+
+-- 
+Это письмо было сгенерировано «ДокуВики» по адресу
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ru/newpage.txt b/sources/inc/lang/ru/newpage.txt
new file mode 100644
index 0000000..ea8e35b
--- /dev/null
+++ b/sources/inc/lang/ru/newpage.txt
@@ -0,0 +1,3 @@
+====== Эта страница ещё не существует ======
+
+Вы перешли по ссылке на тему, для которой ещё не создана страница. Если позволяют ваши права доступа, вы можете создать её, нажав на кнопку «Создать страницу».
diff --git a/sources/inc/lang/ru/norev.txt b/sources/inc/lang/ru/norev.txt
new file mode 100644
index 0000000..388d614
--- /dev/null
+++ b/sources/inc/lang/ru/norev.txt
@@ -0,0 +1,4 @@
+====== Такой версии не существует ======
+
+Указанная версия страницы не существует. Нажмите на кнопку «История страницы», чтобы получить список доступных предыдущих версий этого документа.
+
diff --git a/sources/inc/lang/ru/password.txt b/sources/inc/lang/ru/password.txt
new file mode 100644
index 0000000..eb100f3
--- /dev/null
+++ b/sources/inc/lang/ru/password.txt
@@ -0,0 +1,10 @@
+Здравствуйте, @FULLNAME@.
+
+Ваши данные для @TITLE@ (@DOKUWIKIURL@)
+
+Имя пользователя: @LOGIN@
+Пароль: @PASSWORD@
+
+-- 
+Это письмо было сгенерировано «ДокуВики» по адресу
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ru/preview.txt b/sources/inc/lang/ru/preview.txt
new file mode 100644
index 0000000..4018276
--- /dev/null
+++ b/sources/inc/lang/ru/preview.txt
@@ -0,0 +1,4 @@
+====== Просмотр ======
+
+Здесь показано, как ваш текст будет выглядеть. Внимание: текст ещё **не сохранён.**
+
diff --git a/sources/inc/lang/ru/pwconfirm.txt b/sources/inc/lang/ru/pwconfirm.txt
new file mode 100644
index 0000000..9c27af7
--- /dev/null
+++ b/sources/inc/lang/ru/pwconfirm.txt
@@ -0,0 +1,13 @@
+Здравствуйте, @FULLNAME@.
+
+Кто-то запросил новый пароль для входа в @TITLE@ по адресу @DOKUWIKIURL@
+
+Если вы не запрашивали новый пароль, просто проигнорируйте это письмо.
+
+Для подтверждения, что запрос был действительно сделан вами, пожалуйста, перейдите по следующей ссылке.
+
+@CONFIRM@
+
+-- 
+Это сообщение было сгенерировано «ДокуВики» по адресу
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ru/read.txt b/sources/inc/lang/ru/read.txt
new file mode 100644
index 0000000..fd52d1a
--- /dev/null
+++ b/sources/inc/lang/ru/read.txt
@@ -0,0 +1,2 @@
+Эта страница только для чтения. Вы можете посмотреть исходный текст, но не можете его изменить. Сообщите администратору, если считаете, что это неправильно.
+
diff --git a/sources/inc/lang/ru/recent.txt b/sources/inc/lang/ru/recent.txt
new file mode 100644
index 0000000..aa088c7
--- /dev/null
+++ b/sources/inc/lang/ru/recent.txt
@@ -0,0 +1,5 @@
+====== Недавние изменения ======
+
+Эти страницы были изменены недавно.
+
+
diff --git a/sources/inc/lang/ru/register.txt b/sources/inc/lang/ru/register.txt
new file mode 100644
index 0000000..2d5d987
--- /dev/null
+++ b/sources/inc/lang/ru/register.txt
@@ -0,0 +1,3 @@
+====== Регистрация нового пользователя ======
+
+Для регистрации в вики заполните все поля ниже. Обратите внимание на **правильность адреса электронной почты** — туда будет выслан пароль в том случае, если вас не просят самостоятельно ввести его здесь. Логин должен удовлетворять ограничениям для [[doku>pagename|идентификатора страницы]].
diff --git a/sources/inc/lang/ru/registermail.txt b/sources/inc/lang/ru/registermail.txt
new file mode 100644
index 0000000..fc862b0
--- /dev/null
+++ b/sources/inc/lang/ru/registermail.txt
@@ -0,0 +1,14 @@
+Был зарегистрирован новый пользователь. Подробности:
+
+Логин: @NEWUSER@
+Полное имя: @NEWNAME@
+Эл. адрес: @NEWEMAIL@
+
+Дата: @DATE@
+Браузер: @BROWSER@
+Адрес IP: @IPADDRESS@
+Хост: @HOSTNAME@
+
+-- 
+Это сообщение было сгенерировано «ДокуВики» по адресу
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ru/resendpwd.txt b/sources/inc/lang/ru/resendpwd.txt
new file mode 100644
index 0000000..3cd0504
--- /dev/null
+++ b/sources/inc/lang/ru/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Выслать новый пароль ======
+
+Для получения нового пароля введите требуемые данные ниже. Ваш новый пароль будет послан по адресу электронной почты, зарегистрированному на ваше имя. Указанное ниже имя должно быть вашим логином в этой вики.
diff --git a/sources/inc/lang/ru/resetpwd.txt b/sources/inc/lang/ru/resetpwd.txt
new file mode 100644
index 0000000..81a46a7
--- /dev/null
+++ b/sources/inc/lang/ru/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Установка нового пароля ======
+
+Пожалуйста введите новый пароль для вашей учетной записи для этой вики.
diff --git a/sources/inc/lang/ru/revisions.txt b/sources/inc/lang/ru/revisions.txt
new file mode 100644
index 0000000..55072cd
--- /dev/null
+++ b/sources/inc/lang/ru/revisions.txt
@@ -0,0 +1,3 @@
+====== История страницы ======
+
+Перед вами — история правок текущего документа. Чтобы вернуться к одной из предыдущих версий, выберите нужную, нажмите «Править страницу» и сохраните.
diff --git a/sources/inc/lang/ru/searchpage.txt b/sources/inc/lang/ru/searchpage.txt
new file mode 100644
index 0000000..04feb21
--- /dev/null
+++ b/sources/inc/lang/ru/searchpage.txt
@@ -0,0 +1,5 @@
+====== Поиск ======
+
+Перед вами результаты поиска. Если вы не нашли то, что искали, вы можете создать новую страницу с именем, совпадающим с запросом. Чтобы сделать это, просто нажмите на кнопку «Создать страницу».
+
+===== Результаты =====
\ No newline at end of file
diff --git a/sources/inc/lang/ru/showrev.txt b/sources/inc/lang/ru/showrev.txt
new file mode 100644
index 0000000..5968158
--- /dev/null
+++ b/sources/inc/lang/ru/showrev.txt
@@ -0,0 +1,2 @@
+**Это старая версия документа.**
+----
diff --git a/sources/inc/lang/ru/stopwords.txt b/sources/inc/lang/ru/stopwords.txt
new file mode 100644
index 0000000..a6df139
--- /dev/null
+++ b/sources/inc/lang/ru/stopwords.txt
@@ -0,0 +1,93 @@
+# 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
+более
+больше
+будет
+будто
+была
+было
+быть
+вдруг
+ведь
+впрочем
+всегда
+всех
+всего
+говорил
+говорила
+даже
+другой
+другая
+если
+есть
+жизнь
+жизня
+зачем
+здесь
+иногда
+кажется
+какая
+какой
+какое
+когда
+конечно
+лучше
+между
+менее
+меньше
+меня
+много
+может
+можно
+надо
+наконец
+него
+нельзя
+нибудь
+никогда
+ничего
+нужно
+один
+одна
+опять
+перед
+после
+потом
+потому
+почти
+разве
+свое
+своё
+свой
+свою
+своя
+себе
+себя
+сегодня
+сейчас
+сказал
+сказала
+сказать
+совсем
+такая
+такое
+такой
+тебя
+теперь
+тогда
+того
+тоже
+только
+тому
+хорошо
+хоть
+чего
+через
+чтоб
+чтобы
+чуть
+этого
+этой
+этим
+этот
diff --git a/sources/inc/lang/ru/subscr_digest.txt b/sources/inc/lang/ru/subscr_digest.txt
new file mode 100644
index 0000000..41774a4
--- /dev/null
+++ b/sources/inc/lang/ru/subscr_digest.txt
@@ -0,0 +1,20 @@
+Привет.
+
+Страница @PAGE@ в вики @TITLE@ изменилась.
+Список изменений:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Старая версия: @OLDPAGE@
+Новая версия: @NEWPAGE@
+
+Чтобы отписаться от уведомлений об изменениях, войдите в вики
+@DOKUWIKIURL@ в раздел
+@SUBSCRIBE@
+и отмените подписку на страницу и/или пространство имен.
+
+--
+Это письмо создано «ДокуВики» с сайта
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ru/subscr_form.txt b/sources/inc/lang/ru/subscr_form.txt
new file mode 100644
index 0000000..2a775c5
--- /dev/null
+++ b/sources/inc/lang/ru/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Управление подписками ======
+
+Здесь вы можете управлять подписками для текущей страницы и пространства имён.
\ No newline at end of file
diff --git a/sources/inc/lang/ru/subscr_list.txt b/sources/inc/lang/ru/subscr_list.txt
new file mode 100644
index 0000000..41e1323
--- /dev/null
+++ b/sources/inc/lang/ru/subscr_list.txt
@@ -0,0 +1,17 @@
+Привет.
+
+Страницы в пространстве имён @PAGE@ в вики @TITLE@ были изменены.
+Список изменившихся страниц:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Чтобы отписаться от уведомлений об изменениях, войдите в вики
+@DOKUWIKIURL@ в раздел
+@SUBSCRIBE@
+и отмените подписку на страницу и/или пространство имён.
+
+--
+Это письмо создано «ДокуВики» с сайта
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ru/subscr_single.txt b/sources/inc/lang/ru/subscr_single.txt
new file mode 100644
index 0000000..911a48e
--- /dev/null
+++ b/sources/inc/lang/ru/subscr_single.txt
@@ -0,0 +1,24 @@
+Привет.
+
+Страница @PAGE@ в вики @TITLE@ изменилась.
+Список изменений:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Дата: @DATE@
+Автор: @USER@
+
+Примечание: @SUMMARY@
+Старая версия: @OLDPAGE@
+Новая версия: @NEWPAGE@
+
+Чтобы отписаться от уведомлений об изменениях, войдите в вики
+@DOKUWIKIURL@ в раздел
+@SUBSCRIBE@
+и отмените подписку на страницу и/или пространство имён.
+
+--
+Это письмо создано «ДокуВики» с сайта
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/ru/updateprofile.txt b/sources/inc/lang/ru/updateprofile.txt
new file mode 100644
index 0000000..b1f9f56
--- /dev/null
+++ b/sources/inc/lang/ru/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Обновить профиль ======
+
+Необходимо заполнить только те поля, которые вы хотите изменить. Имя пользователя не может быть изменено.
+
+
diff --git a/sources/inc/lang/ru/uploadmail.txt b/sources/inc/lang/ru/uploadmail.txt
new file mode 100644
index 0000000..f696f2c
--- /dev/null
+++ b/sources/inc/lang/ru/uploadmail.txt
@@ -0,0 +1,15 @@
+В вашу вики был закачан файл. Подробная информация:
+
+Файл: @MEDIA@
+Старая версия: @OLD@
+Дата: @DATE@
+Браузер: @BROWSER@
+Адрес IP: @IPADDRESS@
+Хост: @HOSTNAME@
+Размер: @SIZE@
+Тип MIME: @MIME@
+Пользователь: @USER@
+
+-- 
+Это письмо было сгенерировано «ДокуВики» по адресу
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/ru/wordblock.txt b/sources/inc/lang/ru/wordblock.txt
new file mode 100644
index 0000000..09c663f
--- /dev/null
+++ b/sources/inc/lang/ru/wordblock.txt
@@ -0,0 +1,3 @@
+====== СПАМ заблокирован ======
+
+Ваши изменения **не были** сохранены, так как они содержат одно или более запрещенных слов. Если Вы пытались добавить спам в Вики -- ай-яй-яй!  Если Вы считаете, что это какая-то ошибка, обратитесь к администратору вики.
diff --git a/sources/inc/lang/sk/admin.txt b/sources/inc/lang/sk/admin.txt
new file mode 100644
index 0000000..510eeb9
--- /dev/null
+++ b/sources/inc/lang/sk/admin.txt
@@ -0,0 +1,5 @@
+====== Administrácia ======
+
+Nižšie môžete nájsť zoznam administratívnych úloh dostupných v DokuWiki.
+
+
diff --git a/sources/inc/lang/sk/adminplugins.txt b/sources/inc/lang/sk/adminplugins.txt
new file mode 100644
index 0000000..64d2ca7
--- /dev/null
+++ b/sources/inc/lang/sk/adminplugins.txt
@@ -0,0 +1 @@
+===== Ďalšie pluginy =====
\ No newline at end of file
diff --git a/sources/inc/lang/sk/backlinks.txt b/sources/inc/lang/sk/backlinks.txt
new file mode 100644
index 0000000..b3217d5
--- /dev/null
+++ b/sources/inc/lang/sk/backlinks.txt
@@ -0,0 +1,3 @@
+====== Spätné odkazy ======
+
+Tu je zoznam stránok, ktoré pravdepodobne odkazujú na aktuálnu stránku.
diff --git a/sources/inc/lang/sk/conflict.txt b/sources/inc/lang/sk/conflict.txt
new file mode 100644
index 0000000..5dab2db
--- /dev/null
+++ b/sources/inc/lang/sk/conflict.txt
@@ -0,0 +1,5 @@
+====== Existuje novšia verzia ======
+
+Existuje novšia verzia práve upravovaného dokumentu. To sa stáva, keď niekto iný zmenil dokument, ktorý práve upravujete.
+
+Prehliadnite si nižšie uvedené rozdiely, prípadne rozdiely z obidvoch verzií ručne spojte dohromady a rozhodnite sa, ktorú verziu uchovať. Ak zvolíte ''Uložiť', bude uložená vaša verzia. V opačnom prípade stlačte ''Storno'' pre uchovanie pôvodnej verzie.
diff --git a/sources/inc/lang/sk/denied.txt b/sources/inc/lang/sk/denied.txt
new file mode 100644
index 0000000..6e9c984
--- /dev/null
+++ b/sources/inc/lang/sk/denied.txt
@@ -0,0 +1,3 @@
+====== Nepovolená akcia ======
+
+Prepáčte, ale nemáte dostatočné oprávnenie k tejto činnosti. Možno ste sa zabudli prihlásiť?
diff --git a/sources/inc/lang/sk/diff.txt b/sources/inc/lang/sk/diff.txt
new file mode 100644
index 0000000..0548ea5
--- /dev/null
+++ b/sources/inc/lang/sk/diff.txt
@@ -0,0 +1,4 @@
+====== Rozdiely ======
+
+Tu môžete vidieť rozdiely medzi vybranou verziou a aktuálnou verziou danej stránky.
+
diff --git a/sources/inc/lang/sk/draft.txt b/sources/inc/lang/sk/draft.txt
new file mode 100644
index 0000000..96a4e91
--- /dev/null
+++ b/sources/inc/lang/sk/draft.txt
@@ -0,0 +1,6 @@
+====== Nájdený súbor konceptu ======
+
+Vaša posledná editácia tejto stránky nebola ukončená korektne. Dokuwiki automaticky uložila počas vašej práce koncept a ten môžete teraz použiť pre pokračovanie editácie. Nižšie môžete vidieť dáta, ktoré boli uložené.
+
+Prosím, rozhodnite sa, či chcete //obnoviť// vašu poslednú editáciu, //zmazať// automaticky uložený koncept alebo //stornovať// proces editácie.
+
diff --git a/sources/inc/lang/sk/edit.txt b/sources/inc/lang/sk/edit.txt
new file mode 100644
index 0000000..b8d63fb
--- /dev/null
+++ b/sources/inc/lang/sk/edit.txt
@@ -0,0 +1 @@
+Upravte stránku a stlačte ''Uložiť''. Na stránke [[wiki:syntax]] sa môžete dozvedieť viac o Wiki syntaxi. Prosím upravujte stránky, len pokiaľ ich môžete **zdokonaliť**. Pokiaľ si chcete niečo len vyskúšať, použite [[playground:playground| pieskovisko]].
diff --git a/sources/inc/lang/sk/editrev.txt b/sources/inc/lang/sk/editrev.txt
new file mode 100644
index 0000000..ed15e79
--- /dev/null
+++ b/sources/inc/lang/sk/editrev.txt
@@ -0,0 +1 @@
+**Máte načítanú staršiu verziu dokumentu!** Pokiaľ ju uložíte, vytvoríte tým novú aktuálnu verziu.
diff --git a/sources/inc/lang/sk/index.txt b/sources/inc/lang/sk/index.txt
new file mode 100644
index 0000000..b4189f2
--- /dev/null
+++ b/sources/inc/lang/sk/index.txt
@@ -0,0 +1,3 @@
+====== Index ======
+
+Tu je k dispozícii index všetkých dostupných stránok zoradených podľa [[doku>namespaces|menných priestorov]].
diff --git a/sources/inc/lang/sk/install.html b/sources/inc/lang/sk/install.html
new file mode 100644
index 0000000..86cc6cc
--- /dev/null
+++ b/sources/inc/lang/sk/install.html
@@ -0,0 +1,23 @@
+
        Táto stránka sprevádza prvou inštaláciou a konfiguráciou
+Dokuwiki. Viac informácií o tomto inštalátore je dostupných na jeho
+dokumentačnej stránke.
        
+
+
        DokuWiki používa bežné súbory pre ukladanie wiki stránok a iných informácií
+priradených k týmto stránkam (napr. obrázkov, vyhľadávacích indexov, starých
+revízií). Ak chcete úspešne narábať s DokuWiki, musí
+mať práva pre zápis do adresárov, kde sa ukladajú tieto súbory. Tento inštalátor
+nie je schopný nastaviť prístupové práva pre adresáre. Je potrebné to urobiť
+priamo cez príkazový riadok alebo, ak využívate webhosting, cez FTP alebo vaše
+webhostingové administračné rozhranie.
        
+
+
        Tento inštalátor nastaví ACL
+konfiguráciu vašej Dokuwiki. Umožňuje vytvoriť administrátorské konto
+s prístupom do administračného menu s možnosťou inštalácie pluginov, správy
+užívateľov, správy prístupových práv k wiki stránkam a zmeny konfiguračných
+nastavení. Nie je nevyhnutné pre používanie Dokuwiki, ale umožňuje to ľahšie
+spravovať Dokuwiki.
        
+
+
        Skúsení užívatelia alebo užívatelia so špeciálnymi požiadavkami môžu použiť
+tieto odkazy pre bližšie informácie týkajúce sa
+inštalačných pokynov
+a konfiguračných nastavení.
        
diff --git a/sources/inc/lang/sk/lang.php b/sources/inc/lang/sk/lang.php
new file mode 100644
index 0000000..a5fc47f
--- /dev/null
+++ b/sources/inc/lang/sk/lang.php
@@ -0,0 +1,333 @@
+ with help of the scholars from Zdruzena stredna skola polygraficka in Bratislava
+ * @author Michal Mesko 
+ * @author exusik@gmail.com
+ * @author Martin Michalek 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Upraviť stránku';
+$lang['btn_source']            = 'Zobraziť zdroj stránky';
+$lang['btn_show']              = 'Zobraziť stránku';
+$lang['btn_create']            = 'Vytvoriť stránku';
+$lang['btn_search']            = 'Hľadať';
+$lang['btn_save']              = 'Uložiť';
+$lang['btn_preview']           = 'Náhľad';
+$lang['btn_top']               = 'Hore';
+$lang['btn_newer']             = '<< novšie';
+$lang['btn_older']             = 'staršie >>';
+$lang['btn_revs']              = 'Staršie verzie';
+$lang['btn_recent']            = 'Posledné úpravy';
+$lang['btn_upload']            = 'Nahrať';
+$lang['btn_cancel']            = 'Storno';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Upraviť';
+$lang['btn_login']             = 'Prihlásiť sa';
+$lang['btn_logout']            = 'Odhlásiť sa';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Aktualizovať';
+$lang['btn_delete']            = 'Zmazať';
+$lang['btn_back']              = 'Späť';
+$lang['btn_backlink']          = 'Spätné odkazy';
+$lang['btn_backtomedia']       = 'Späť na výber súboru';
+$lang['btn_subscribe']         = 'Sledovať zmeny';
+$lang['btn_profile']           = 'Aktualizovať profil';
+$lang['btn_reset']             = 'Zrušiť';
+$lang['btn_resendpwd']         = 'Nastaviť nové heslo';
+$lang['btn_draft']             = 'Upraviť koncept';
+$lang['btn_recover']           = 'Obnoviť koncept';
+$lang['btn_draftdel']          = 'Zmazať koncept';
+$lang['btn_revert']            = 'Obnoviť';
+$lang['btn_register']          = 'Registrovať';
+$lang['btn_apply']             = 'Použiť';
+$lang['btn_media']             = 'Správa médií';
+$lang['btn_deleteuser']        = 'Zrušiť môj účet';
+$lang['loggedinas']            = 'Prihlásený(á) ako';
+$lang['user']                  = 'Užívateľské meno';
+$lang['pass']                  = 'Heslo';
+$lang['newpass']               = 'Nové heslo';
+$lang['oldpass']               = 'Potvrď aktuálne heslo';
+$lang['passchk']               = 'Ešte raz znovu';
+$lang['remember']              = 'Zapamätaj si ma';
+$lang['fullname']              = 'Celé meno';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'Užívateľský profil';
+$lang['badlogin']              = 'Zadané užívateľské meno a heslo nie je správne.';
+$lang['badpassconfirm']        = 'Ľutujem, heslo bolo nesprávne.';
+$lang['minoredit']             = 'Menšie zmeny';
+$lang['draftdate']             = 'Koncept automaticky uložený';
+$lang['nosecedit']             = 'Stránka bola medzičasom zmenená, informácie o sekcii sú zastaralé a z tohto dôvodu bola nahraná celá stránka.';
+$lang['regmissing']            = 'Musíte vyplniť všetky údaje.';
+$lang['reguexists']            = 'Užívateľ s rovnakým menom je už zaregistrovaný.';
+$lang['regsuccess']            = 'Užívateľský účet bol vytvorený a heslo zaslané emailom.';
+$lang['regsuccess2']           = 'Užívateľský účet bol vytvorený.';
+$lang['regmailfail']           = 'Zdá sa, že nastala chyba pri posielaní mailu s heslom. Skúste kontaktovať správcu.';
+$lang['regbadmail']            = 'Zadaná emailová adresa nie je platná. Pokiaľ si myslíte, že to je zle, skúste kontaktovať správcu.';
+$lang['regbadpass']            = 'Zadané heslá nie sú rovnaké, zadajte ich prosím znovu.';
+$lang['regpwmail']             = 'Vaše heslo do systému DokuWiki';
+$lang['reghere']               = 'Nemáte užívateľský účet? Vytvorte si ho';
+$lang['profna']                = 'Táto wiki nepodporuje zmenu profilu';
+$lang['profnochange']          = 'Žiadne zmeny, nie je čo robiť.';
+$lang['profnoempty']           = 'Prázdne meno alebo mailová adresa nie sú povolené.';
+$lang['profchanged']           = 'Užívateľský účet úspešne zmenený.';
+$lang['profnodelete']          = 'Táto wiki neumožňuje zrušenie používateľov.';
+$lang['profdeleteuser']        = 'Zrušiť účet';
+$lang['profdeleted']           = 'Váš účet bol zrušený v tejto wiki.';
+$lang['profconfdelete']        = 'Chcem odstrániť môj účet z tejto wiki. 
         Táto operácia je nevratná.';
+$lang['profconfdeletemissing'] = 'Nebolo zavolené potvrdzovacie políčko';
+$lang['pwdforget']             = 'Zabudli ste heslo? Získajte nové!';
+$lang['resendna']              = 'Táto wiki nepodporuje opätovné zasielanie hesla.';
+$lang['resendpwd']             = 'Nastaviť nové heslo pre';
+$lang['resendpwdmissing']      = 'Prepáčte, musíte vyplniť všetky polia.';
+$lang['resendpwdnouser']       = 'Prepáčte, nemôžeme nájsť zadaného užívateľa v databáze.';
+$lang['resendpwdbadauth']      = 'Prepáčte, tento autorizačný kód nie je platný. Uistite sa, či ste použili celý autorizačný odkaz.';
+$lang['resendpwdconfirm']      = 'Autorizačný odkaz bol zaslaný na e-mail.';
+$lang['resendpwdsuccess']      = 'Vaše nové heslo bolo zaslané na e-mail.';
+$lang['license']               = 'Ak nie je uvedené inak, obsah tejto wiki je uverejnený pod nasledujúcou licenciou:';
+$lang['licenseok']             = 'Poznámka: Zmenou tejto stránky súhlasíte s uverejnením obsahu pod nasledujúcou licenciou:';
+$lang['searchmedia']           = 'Hľadať meno súboru:';
+$lang['searchmedia_in']        = 'Hľadať v %s';
+$lang['txt_upload']            = 'Vyberte súbor ako prílohu';
+$lang['txt_filename']          = 'Uložiť ako (voliteľné)';
+$lang['txt_overwrt']           = 'Prepísať existujúci súbor';
+$lang['maxuploadsize']         = 'Obmedzenie max. %s na súbor.';
+$lang['lockedby']              = 'Práve zamknuté:';
+$lang['lockexpire']            = 'Zámok stratí platnosť:';
+$lang['js']['willexpire']      = 'Váš zámok pre editáciu za chvíľu stratí platnosť.\nAby ste predišli konfliktom, stlačte tlačítko Náhľad a zámok sa predĺži.';
+$lang['js']['notsavedyet']     = 'Neuložené zmeny budú stratené.
+Chcete naozaj pokračovať?';
+$lang['js']['searchmedia']     = 'Hľadať súbory';
+$lang['js']['keepopen']        = 'Po vybraní súboru ponechať okno otvorené';
+$lang['js']['hidedetails']     = 'Skryť detaily';
+$lang['js']['mediatitle']      = 'Nastavenia odkazu';
+$lang['js']['mediadisplay']    = 'Typ odkazu';
+$lang['js']['mediaalign']      = 'Zarovnanie';
+$lang['js']['mediasize']       = 'Veľkosť obrázka';
+$lang['js']['mediatarget']     = 'Cieľ odkazu';
+$lang['js']['mediaclose']      = 'Zatvoriť';
+$lang['js']['mediainsert']     = 'Vložiť';
+$lang['js']['mediadisplayimg'] = 'Zobraziť obrázok.';
+$lang['js']['mediadisplaylnk'] = 'Zobraziť iba odkaz.';
+$lang['js']['mediasmall']      = 'Malý';
+$lang['js']['mediamedium']     = 'Stredný';
+$lang['js']['medialarge']      = 'Veľký';
+$lang['js']['mediaoriginal']   = 'Originál';
+$lang['js']['medialnk']        = 'Odkaz na stránku s detailným popisom';
+$lang['js']['mediadirect']     = 'Priamy odkaz na originál';
+$lang['js']['medianolnk']      = 'Žiadny odkaz';
+$lang['js']['medianolink']     = 'Bez odkazu na obrázok';
+$lang['js']['medialeft']       = 'Zarovnať obrázok vľavo.';
+$lang['js']['mediaright']      = 'Zarovnať obrázok vpravo.';
+$lang['js']['mediacenter']     = 'Zarovnať obrázok na stred.';
+$lang['js']['medianoalign']    = 'Nepoužívať zarovnanie.';
+$lang['js']['nosmblinks']      = 'Odkazovanie na zdieľané prostriedky Windows funguje len v Internet Exploreri.
+Aj napriek tomu tento odkaz môžete skopírovať a vložiť inde.';
+$lang['js']['linkwiz']         = 'Sprievodca odkazmi';
+$lang['js']['linkto']          = 'Odkaz na:';
+$lang['js']['del_confirm']     = 'Zmazať túto položku?';
+$lang['js']['restore_confirm'] = 'Skutočne obnoviť túto verziu?';
+$lang['js']['media_diff']      = 'Zobraziť rozdiely:';
+$lang['js']['media_diff_both'] = 'Vedľa seba';
+$lang['js']['media_diff_opacity'] = 'Presvitaním';
+$lang['js']['media_diff_portions'] = 'Potiahnutím';
+$lang['js']['media_select']    = 'Vybrať súbory...';
+$lang['js']['media_upload_btn'] = 'Nahrať';
+$lang['js']['media_done_btn']  = 'Hotovo';
+$lang['js']['media_drop']      = 'Pridajte súbory potiahnutím myšou';
+$lang['js']['media_cancel']    = 'odstrániť';
+$lang['js']['media_overwrt']   = 'Prepísať existujúce súbory';
+$lang['rssfailed']             = 'Nastala chyba pri vytváraní tohto RSS: ';
+$lang['nothingfound']          = 'Nič nenájdené.';
+$lang['mediaselect']           = 'Výber súboru';
+$lang['fileupload']            = 'Nahrávanie súboru';
+$lang['uploadsucc']            = 'Prenos prebehol v poriadku';
+$lang['uploadfail']            = 'Chyba pri nahrávaní. Možno kvôli zle nastaveným právam?';
+$lang['uploadwrong']           = 'Prenos súboru s takouto príponou nie je dovolený.';
+$lang['uploadexist']           = 'Súbor už existuje. Žiadna akcia.';
+$lang['uploadbadcontent']      = 'Nahraný obsah sa nezhoduje s príponou súboru %s.';
+$lang['uploadspam']            = 'Nahrávanie bolo zablokované spamovým blacklistom.';
+$lang['uploadxss']             = 'Nahrávanie bolo zablokované kvôli potenciálnemu škodlivému obsahu.';
+$lang['uploadsize']            = 'Nahraný súbor bol príliš veľký. (max %s)';
+$lang['deletesucc']            = 'Súbor "%s" bol zmazaný.';
+$lang['deletefail']            = '"%s" nie je možné zmazať - skontrolujte oprávnenia.';
+$lang['mediainuse']            = 'Súbor "%s" nebol zmazaný - je stále používaný.';
+$lang['namespaces']            = 'Menné priestory';
+$lang['mediafiles']            = 'Dostupné súbory';
+$lang['accessdenied']          = 'Nemáte oprávnenie na zobrazenie požadovanej stránky.';
+$lang['mediausage']            = 'Pre odkázanie na súbor použite nasledujúcu syntax:';
+$lang['mediaview']             = 'Zobraziť pôvodný súbor';
+$lang['mediaroot']             = 'root';
+$lang['mediaupload']           = 'Nahrať súbor do aktuálneho menného priestoru. Pre vytvorenie menného podpriestoru, pridajte jeho názov na začiatok mena súboru (oddelený dvojbodkou)';
+$lang['mediaextchange']        = 'Prípona súboru bola zmenená z .%s na .%s!';
+$lang['reference']             = 'Referencie pre';
+$lang['ref_inuse']             = 'Súbor nemôže byť zmazaný, pretože je stále používaný nasledujúcimi stránkami:';
+$lang['ref_hidden']            = 'Niektoré referencie sú na stránky, pre ktoré nemáte právo na čítanie';
+$lang['hits']                  = '- počet výskytov';
+$lang['quickhits']             = 'Zodpovedajúce stránky';
+$lang['toc']                   = 'Obsah';
+$lang['current']               = 'aktuálne';
+$lang['yours']                 = 'Vaša verzia';
+$lang['diff']                  = 'Zobraziť rozdiely voči aktuálnej verzii';
+$lang['diff2']                 = 'Zobraziť rozdiely medzi vybranými verziami';
+$lang['difflink']              = 'Odkaz na tento prehľad zmien';
+$lang['diff_type']             = 'Prehľad zmien:';
+$lang['diff_inline']           = 'Vnorený';
+$lang['diff_side']             = 'Vedľa seba';
+$lang['line']                  = 'Riadok';
+$lang['breadcrumb']            = 'História';
+$lang['youarehere']            = 'Nachádzate sa';
+$lang['lastmod']               = 'Posledná úprava';
+$lang['by']                    = 'od';
+$lang['deleted']               = 'odstránené';
+$lang['created']               = 'vytvorené';
+$lang['restored']              = 'stará verzia bola obnovená (%s)';
+$lang['external_edit']         = 'externá úprava';
+$lang['summary']               = 'Komentár k úpravám';
+$lang['noflash']               = 'Pre zobrazenie tohto obsahu potrebujete Adobe Flash Plugin.';
+$lang['download']              = 'Stiahnuť';
+$lang['tools']                 = 'Nástroje';
+$lang['user_tools']            = 'Nástroje používateľa';
+$lang['site_tools']            = 'Nástoje správy stránok';
+$lang['page_tools']            = 'Nástoje stránky';
+$lang['skip_to_content']       = 'skok na obsah';
+$lang['sidebar']               = 'Bočný panel';
+$lang['mail_newpage']          = 'stránka pridaná:';
+$lang['mail_changed']          = 'stránka zmenená:';
+$lang['mail_subscribe_list']   = 'stránky zmenené v mennom priestore:';
+$lang['mail_new_user']         = 'nový užívateľ:';
+$lang['mail_upload']           = 'nahraný súbor:';
+$lang['changes_type']          = 'Prehľad zmien';
+$lang['pages_changes']         = 'Stránok';
+$lang['media_changes']         = 'Súbory';
+$lang['both_changes']          = 'Stránok spolu s média súbormi';
+$lang['qb_bold']               = 'Tučné';
+$lang['qb_italic']             = 'Kurzíva';
+$lang['qb_underl']             = 'Podčiarknutie';
+$lang['qb_code']               = 'Neformátovať (zdrojový kód)';
+$lang['qb_strike']             = 'Prečiarknutie';
+$lang['qb_h1']                 = 'Nadpis 1. úrovne';
+$lang['qb_h2']                 = 'Nadpis 2. úrovne';
+$lang['qb_h3']                 = 'Nadpis 3. úrovne';
+$lang['qb_h4']                 = 'Nadpis 4. úrovne';
+$lang['qb_h5']                 = 'Nadpis 5. úrovne';
+$lang['qb_h']                  = 'Nadpis';
+$lang['qb_hs']                 = 'Zvoliť nadpis';
+$lang['qb_hplus']              = 'Nadpis vyššej úrovne';
+$lang['qb_hminus']             = 'Nadpis nižšej úrovne';
+$lang['qb_hequal']             = 'Nadpis predchádzajúcej úrovne';
+$lang['qb_link']               = 'Interný odkaz';
+$lang['qb_extlink']            = 'Externý odkaz';
+$lang['qb_hr']                 = 'Horizontálna linka';
+$lang['qb_ol']                 = 'Číslovaný zoznam';
+$lang['qb_ul']                 = 'Nečíslovaný zoznam';
+$lang['qb_media']              = 'Vložiť obrázky alebo iné súbory';
+$lang['qb_sig']                = 'Vložiť podpis';
+$lang['qb_smileys']            = 'Smajlíky';
+$lang['qb_chars']              = 'Špeciálne znaky';
+$lang['upperns']               = 'návrat do nadradeného menného priestoru';
+$lang['admin_register']        = 'Pridaj nového užívateľa';
+$lang['metaedit']              = 'Upraviť metainformácie';
+$lang['metasaveerr']           = 'Zápis metainformácií zlyhal';
+$lang['metasaveok']            = 'Metainformácie uložené';
+$lang['img_backto']            = 'Späť na';
+$lang['img_title']             = 'Titul';
+$lang['img_caption']           = 'Popis';
+$lang['img_date']              = 'Dátum';
+$lang['img_fname']             = 'Názov súboru';
+$lang['img_fsize']             = 'Veľkosť';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Kopírovacie práva';
+$lang['img_format']            = 'Formát';
+$lang['img_camera']            = 'Fotoaparát';
+$lang['img_keywords']          = 'Kľúčové slová';
+$lang['img_width']             = 'Šírka';
+$lang['img_height']            = 'Výška';
+$lang['img_manager']           = 'Prezrieť v správcovi médií';
+$lang['subscr_subscribe_success'] = 'Používateľ %s bol pridaný do zoznamu hlásení o zmenách %s';
+$lang['subscr_subscribe_error'] = 'Chyba pri pridaní používateľa %s do zoznamu hlásení o zmenách %s';
+$lang['subscr_subscribe_noaddress'] = 'Vaše prihlasovacie meno nemá priradenú žiadnu email adresu, nemôžete byť pridaný do zoznamu hlásení o zmenách';
+$lang['subscr_unsubscribe_success'] = 'Používateľ %s bol odstránený zo zoznamu hlásení o zmenách %s';
+$lang['subscr_unsubscribe_error'] = 'Chyba pri odstránení používateľa %s zo zoznamu hlásení o zmenách %s';
+$lang['subscr_already_subscribed'] = 'Používateľ %s už je v zozname hlásení o zmenách %s';
+$lang['subscr_not_subscribed'] = 'Používateľ %s nie je v zozname hlásení o zmenách %s';
+$lang['subscr_m_not_subscribed'] = 'Momentálne nesledujete zmeny aktuálnej stránky alebo menného priestoru.';
+$lang['subscr_m_new_header']   = 'Pridať sledovanie zmien';
+$lang['subscr_m_current_header'] = 'Aktuálne sledované zmeny';
+$lang['subscr_m_unsubscribe']  = 'Nesledovať zmeny';
+$lang['subscr_m_subscribe']    = 'Sledovať zmeny';
+$lang['subscr_m_receive']      = 'Dostávať';
+$lang['subscr_style_every']    = 'email pri každej zmene';
+$lang['subscr_style_digest']   = 'email so zhrnutím zmien pre každú stránku (perióda %.2f dňa)';
+$lang['subscr_style_list']     = 'zoznam zmenených stránok od posledného emailu (perióda %.2f dňa)';
+$lang['authtempfail']          = 'Užívateľská autentifikácia je dočasne nedostupná. Ak táto situácia pretrváva, prosím informujte správcu systému.';
+$lang['authpwdexpire']         = 'Platnosť hesla vyprší za %d dní, mali by ste ho zmeniť čo najskôr.';
+$lang['i_chooselang']          = 'Zvoľte váš jazyk';
+$lang['i_installer']           = 'DokuWiki inštalátor';
+$lang['i_wikiname']            = 'Názov Wiki';
+$lang['i_enableacl']           = 'Aktivovať ACL (doporučené)';
+$lang['i_superuser']           = 'Správca';
+$lang['i_problems']            = 'Inštalátor narazil na nižšie uvedené problémy. Nemôžete pokračovať, pokiaľ ich neodstránite.';
+$lang['i_modified']            = 'Z bezpečnostných dôvodov bude tento skript fungovať iba s novou, neupravenou inštaláciou Dokuwiki. Môžete buď znovu rozbaliť stiahnutý inštalačný balík alebo preštudovať  inštalačné inštrukcie Dokuwiki';
+$lang['i_funcna']              = 'PHP funkcia %s nie je dostupná. Je možné, že ju z určitých dôvodov zablokoval váš poskytovateľ webhostingu?';
+$lang['i_phpver']              = 'Vaša verzia PHP %s je nižšia ako požadovaná %s. Potrebujete aktualizovať Vašu inštaláciu PHP.';
+$lang['i_permfail']            = '%s nie je zapisovateľný pre DokuWiki. Musíte zmeniť prístupové práva pre tento adresár!';
+$lang['i_confexists']          = '%s už existuje';
+$lang['i_writeerr']            = 'Nie je možné vytvoriť %s. Potrebujete skontrolovať prístupové práva pre adresár/súbor a vytvoriť ho manuálne.';
+$lang['i_badhash']             = 'neznámy alebo zmenený súbor dokuwiki.php (hash=%s)';
+$lang['i_badval']              = '%s - nesprávna alebo žiadna hodnota';
+$lang['i_success']             = 'Konfigurácia bola úspešne ukončená. Teraz môžete zmazať súbor install.php. Pokračujte vo vašej novej DokuWiki.';
+$lang['i_failure']             = 'Pri zápise konfiguračného súboru nastali nejaké chyby. Potrebujete ich opraviť manuálne pred tým, ako budete môcť používať vašu novú DokuWiki.';
+$lang['i_policy']              = 'Počiatočná ACL politika';
+$lang['i_pol0']                = 'Otvorená Wiki (čítanie, zápis a nahrávanie pre každého)';
+$lang['i_pol1']                = 'Verejná Wiki (čítanie pre každého, zápis a nahrávanie pre registrovaných užívateľov)';
+$lang['i_pol2']                = 'Uzatvorená Wiki (čítanie, zápis a nahrávanie len pre registrovaných užívateľov)';
+$lang['i_retry']               = 'Skúsiť znovu';
+$lang['i_license']             = 'Vyberte licenciu, pod ktorou chcete uložiť váš obsah:';
+$lang['i_license_none']        = 'Nezobrazovať žiadne licenčné informácie';
+$lang['i_pop_field']           = 'Prosím pomôžte nám zlepšiť prácu s DokuWiki:';
+$lang['i_pop_label']           = 'Raz mesačne zaslať anonymné údaje vývojárom DokuWiki';
+$lang['recent_global']         = 'Práve prehliadate zmeny v mennom priestore %s. Môžete si tiež pozrieť aktuálne zmeny celej wiki.';
+$lang['years']                 = 'pred %d rokmi';
+$lang['months']                = 'pred %d mesiacmi';
+$lang['weeks']                 = 'pred %d týždňami';
+$lang['days']                  = 'pred %d dňami';
+$lang['hours']                 = 'pred %d hodinami';
+$lang['minutes']               = 'pred %d minútami';
+$lang['seconds']               = 'pred %d sekundami';
+$lang['wordblock']             = 'Vaše zmeny neboli uložené, pretože obsahovali nepovolený text (spam).';
+$lang['media_uploadtab']       = 'Nahrať';
+$lang['media_searchtab']       = 'Hľadať';
+$lang['media_file']            = 'Súbor';
+$lang['media_viewtab']         = 'Náhľad';
+$lang['media_edittab']         = 'Upraviť';
+$lang['media_historytab']      = 'História';
+$lang['media_list_thumbs']     = 'Miniatúry';
+$lang['media_list_rows']       = 'Zoznam';
+$lang['media_sort_name']       = 'Meno';
+$lang['media_sort_date']       = 'Dátum';
+$lang['media_namespaces']      = 'Vybrať priestor';
+$lang['media_files']           = 'Súbory v %s';
+$lang['media_upload']          = 'Nahrať do %s';
+$lang['media_search']          = 'Hľadať v %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s v %s';
+$lang['media_edit']            = 'Upraviť %s';
+$lang['media_history']         = 'História %s';
+$lang['media_meta_edited']     = 'metadáta upravené';
+$lang['media_perm_read']       = 'Prepáčte, ale nemáte dostatočné oprávnenie na čítanie súborov.';
+$lang['media_perm_upload']     = 'Prepáčte, ale nemáte dostatočné oprávnenie na nahrávanie súborov.';
+$lang['media_update']          = 'Nahrať novú verziu';
+$lang['media_restore']         = 'Obnoviť túto verziu';
+$lang['currentns']             = 'Aktuálny menný priestor';
+$lang['searchresult']          = 'Výsledky hľadania';
+$lang['plainhtml']             = 'Jednoduché HTML';
+$lang['wikimarkup']            = 'Wiki formát';
diff --git a/sources/inc/lang/sk/locked.txt b/sources/inc/lang/sk/locked.txt
new file mode 100644
index 0000000..5063c06
--- /dev/null
+++ b/sources/inc/lang/sk/locked.txt
@@ -0,0 +1,3 @@
+====== Stránka je uzamknutá ======
+
+Tato stránka je práve uzamknutá pre úpravy iným užívateľom. Musíte počkať dovtedy, pokiaľ daný užívateľ dokončí svoje úpravy alebo pokiaľ tento zámok stratí platnosť.
diff --git a/sources/inc/lang/sk/login.txt b/sources/inc/lang/sk/login.txt
new file mode 100644
index 0000000..3bfc910
--- /dev/null
+++ b/sources/inc/lang/sk/login.txt
@@ -0,0 +1,3 @@
+====== Prihlásenie ======
+
+Momentálne nie ste prihlásený(á)! Prosím vložte svoje identifikačné údaje. Pre prihlásenie musíte mať zapnuté cookies.
diff --git a/sources/inc/lang/sk/mailtext.txt b/sources/inc/lang/sk/mailtext.txt
new file mode 100644
index 0000000..30b7f5c
--- /dev/null
+++ b/sources/inc/lang/sk/mailtext.txt
@@ -0,0 +1,17 @@
+Stránka vo vašej DokuWiki bola zmenená. Tu sú podrobnosti:
+
+Dátum : @DATE@
+Prehliadač : @BROWSER@
+IP adresa : @IPADDRESS@
+Adresa : @HOSTNAME@
+Stará verzia : @OLDPAGE@
+Nová verzia : @NEWPAGE@
+Komentár : @SUMMARY@
+User : @USER@
+
+@DIFF@
+
+
+-- 
+Táto správa bola zaslaná DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sk/mailwrap.html b/sources/inc/lang/sk/mailwrap.html
new file mode 100644
index 0000000..2e42515
--- /dev/null
+++ b/sources/inc/lang/sk/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Táto správa bola zaslaná DokuWiki @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/sk/newpage.txt b/sources/inc/lang/sk/newpage.txt
new file mode 100644
index 0000000..180d80e
--- /dev/null
+++ b/sources/inc/lang/sk/newpage.txt
@@ -0,0 +1,3 @@
+====== Stránka s týmto názvom ešte neexistuje ======
+
+Odkaz vás zaviedol na stránku, ktorá ešte neexistuje. Môžete ju vytvoriť stlačením tlačítka ''Vytvoriť stránku''.
diff --git a/sources/inc/lang/sk/norev.txt b/sources/inc/lang/sk/norev.txt
new file mode 100644
index 0000000..f664ae4
--- /dev/null
+++ b/sources/inc/lang/sk/norev.txt
@@ -0,0 +1,3 @@
+====== Takáto verzia neexistuje ======
+
+Zadaná verzia neexistuje. Stlačte tlačítko ''Staršie verzie'' pre zoznam starších verzií tohoto dokumentu.
diff --git a/sources/inc/lang/sk/password.txt b/sources/inc/lang/sk/password.txt
new file mode 100644
index 0000000..2b85e9c
--- /dev/null
+++ b/sources/inc/lang/sk/password.txt
@@ -0,0 +1,11 @@
+Dobrý deň,
+
+Tu sú prihlasovacie informácie pre @TITLE@ (@DOKUWIKIURL@)
+
+Meno : @FULLNAME@
+Užívateľské meno : @LOGIN@
+Heslo : @PASSWORD@
+
+-- 
+Táto správa bola zaslaná DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sk/preview.txt b/sources/inc/lang/sk/preview.txt
new file mode 100644
index 0000000..871bca3
--- /dev/null
+++ b/sources/inc/lang/sk/preview.txt
@@ -0,0 +1,3 @@
+====== Náhľad ======
+
+Tu je náhľad, ako bude dokument vyzerať. Pozor: Súbor zatiaľ **nie je uložený**!
diff --git a/sources/inc/lang/sk/pwconfirm.txt b/sources/inc/lang/sk/pwconfirm.txt
new file mode 100644
index 0000000..210740d
--- /dev/null
+++ b/sources/inc/lang/sk/pwconfirm.txt
@@ -0,0 +1,15 @@
+Ahoj @FULLNAME@!
+
+Niekto žiadal o nové heslo pre vaše @TITLE@
+konto na @DOKUWIKIURL@
+
+Ak ste nežiadali o nové heslo, potom iba ignorujte tento mail.
+
+Pre potvrdenie, že požiadavka bola skutočne odoslaná vami,
+použite prosím nasledujúci odkaz.
+
+@CONFIRM@
+
+-- 
+Táto správa bola zaslaná DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sk/read.txt b/sources/inc/lang/sk/read.txt
new file mode 100644
index 0000000..64b7ed2
--- /dev/null
+++ b/sources/inc/lang/sk/read.txt
@@ -0,0 +1,2 @@
+Táto stránka je iba na čítanie. Môžete si prehliadnuť zdrojový kód, ale nemôžete ho meniť. Opýtajte sa správcu, ak si myslíte, že niečo nie je v poriadku.
+
diff --git a/sources/inc/lang/sk/recent.txt b/sources/inc/lang/sk/recent.txt
new file mode 100644
index 0000000..d9f7c3b
--- /dev/null
+++ b/sources/inc/lang/sk/recent.txt
@@ -0,0 +1,3 @@
+====== Posledné úpravy ======
+
+Nasledujúce stránky boli nedávno zmenené.
diff --git a/sources/inc/lang/sk/register.txt b/sources/inc/lang/sk/register.txt
new file mode 100644
index 0000000..59c225d
--- /dev/null
+++ b/sources/inc/lang/sk/register.txt
@@ -0,0 +1,3 @@
+====== Zaregistrujte sa ako nový užívateľ ======
+
+Aby ste získali užívateľský účet, vyplňte prosím všetky informácie v nasledujúcom formulári. Zadajte **platnú** mailovú adresu, na ktorú bude zaslané heslo. Užívateľské meno musí byť v platnom [[doku>pagename|formáte]] (ktorý je rovnaký ako formát názvu stránky).
diff --git a/sources/inc/lang/sk/registermail.txt b/sources/inc/lang/sk/registermail.txt
new file mode 100644
index 0000000..a0bf9e3
--- /dev/null
+++ b/sources/inc/lang/sk/registermail.txt
@@ -0,0 +1,14 @@
+Nový užívateľ bol registrovaný. Tu sú detaily:
+
+Užívateľské meno : @NEWUSER@
+Celé meno        : @NEWNAME@
+E-Mail           : @NEWEMAIL@
+
+Dátum            : @DATE@
+Prehliadač       : @BROWSER@
+IP adresa        : @IPADDRESS@
+Meno servera     : @HOSTNAME@
+
+-- 
+Táto správa bola zaslaná DokuWiki
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sk/resendpwd.txt b/sources/inc/lang/sk/resendpwd.txt
new file mode 100644
index 0000000..143706b
--- /dev/null
+++ b/sources/inc/lang/sk/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Poslať nové heslo ======
+
+Zadajte prosím vaše prihlasovacie meno do formulára za účelom vygenerovania nového hesla. Autorizačný odkaz bude zaslaný na vašu zaregistrovanú email adresu.
\ No newline at end of file
diff --git a/sources/inc/lang/sk/resetpwd.txt b/sources/inc/lang/sk/resetpwd.txt
new file mode 100644
index 0000000..a4df4a5
--- /dev/null
+++ b/sources/inc/lang/sk/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Nastavenie nového hesla ======
+
+Prosím zadajte nové heslo vášho účtu v tejto wiki.
diff --git a/sources/inc/lang/sk/revisions.txt b/sources/inc/lang/sk/revisions.txt
new file mode 100644
index 0000000..ad99e72
--- /dev/null
+++ b/sources/inc/lang/sk/revisions.txt
@@ -0,0 +1,3 @@
+====== Staršie verzie ======
+
+Tu sú staršie verzie daného dokumentu. Pre návrat ku staršej verzii si ju zvoľte zo zoznamu nižšie, stlačte tlačidlo ''Upraviť stránku'' a uložte ju.
diff --git a/sources/inc/lang/sk/searchpage.txt b/sources/inc/lang/sk/searchpage.txt
new file mode 100644
index 0000000..3fdf074
--- /dev/null
+++ b/sources/inc/lang/sk/searchpage.txt
@@ -0,0 +1,5 @@
+====== Vyhľadávanie ======
+
+Výsledky hľadania môžete vidieť nižšie. Pokiaľ ste nenašli, čo hľadáte, skúste požadovanú stránku sami vytvoriť stlačením tlačidla ''Vytvoriť stránku''.
+
+===== Výsledky =====
diff --git a/sources/inc/lang/sk/showrev.txt b/sources/inc/lang/sk/showrev.txt
new file mode 100644
index 0000000..0367696
--- /dev/null
+++ b/sources/inc/lang/sk/showrev.txt
@@ -0,0 +1,3 @@
+**Toto je staršia verzia dokumentu!**
+----
+
diff --git a/sources/inc/lang/sk/stopwords.txt b/sources/inc/lang/sk/stopwords.txt
new file mode 100644
index 0000000..060ee49
--- /dev/null
+++ b/sources/inc/lang/sk/stopwords.txt
@@ -0,0 +1,28 @@
+#Toto je zoznam slov ignorovaných indexáciou, jedno slovo na riadok
+# Keď editujete tento súbor, uistite sa, či používate UNIXové konce riadkov (jednoduchý nový riadok)
+# Nie je potrebné vkladať slová kratšie ako 3 znaky - tie sú ignorované vždy.
+# Tento zoznam je založený na inom nájdenom na http://www.ranks.nl/stopwords/
+okolo
+tvoj
+ale
+ako
+aký
+aká
+aké
+kde
+kým
+kom
+komu
+ich
+jeho
+jej
+tvoj
+môj
+moja
+moje
+moji
+náš
+váš
+www
+
+
diff --git a/sources/inc/lang/sk/subscr_digest.txt b/sources/inc/lang/sk/subscr_digest.txt
new file mode 100644
index 0000000..273cc7e
--- /dev/null
+++ b/sources/inc/lang/sk/subscr_digest.txt
@@ -0,0 +1,20 @@
+Dobrý deň!
+
+Stránka @PAGE@ wiki @TITLE@ bola zmenená.
+Zoznam zmien:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Stará verzia: @OLDPAGE@
+Nová verzia: @NEWPAGE@
+
+Ak si neprajete zasielať tieto správy, prihláste sa do wiki
+@DOKUWIKIURL@, potom prejdite na
+@SUBSCRIBE@
+a odhláste sa z informovania o zmenách stránky alebo menného priestoru.
+
+--
+Táto správa bola zaslaná DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sk/subscr_form.txt b/sources/inc/lang/sk/subscr_form.txt
new file mode 100644
index 0000000..1f12e9a
--- /dev/null
+++ b/sources/inc/lang/sk/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Sledovanie zmien ======
+
+Táto stánka umožňuje sledovať zmeny aktuálnej stránky a menného priestoru.
\ No newline at end of file
diff --git a/sources/inc/lang/sk/subscr_list.txt b/sources/inc/lang/sk/subscr_list.txt
new file mode 100644
index 0000000..3a5bfb5
--- /dev/null
+++ b/sources/inc/lang/sk/subscr_list.txt
@@ -0,0 +1,17 @@
+Dobrý deň!
+
+Stránky v mennom priestore @PAGE@ wiki @TITLE@ boli zmenené.
+Zoznam zmenených stránok:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Ak si neprajete zasielať tieto správy, prihláste sa do wiki
+@DOKUWIKIURL@, potom prejdite na
+@SUBSCRIBE@
+a odhláste sa z informovania o zmenách stránky alebo menného priestoru.
+
+--
+Táto správa bola zaslaná DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sk/subscr_single.txt b/sources/inc/lang/sk/subscr_single.txt
new file mode 100644
index 0000000..3abbc40
--- /dev/null
+++ b/sources/inc/lang/sk/subscr_single.txt
@@ -0,0 +1,23 @@
+Dobrý deň!
+
+Stránka @PAGE@ wiki @TITLE@ bola zmenená.
+Zoznam zmien:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Dátum : @DATE@
+Používateľ : @USER@
+Komentár: @SUMMARY@
+Stará verzia: @OLDPAGE@
+Nová verzia: @NEWPAGE@
+
+Ak si neprajete zasielať tieto správy, prihláste sa do wiki
+@DOKUWIKIURL@, potom prejdite na
+@SUBSCRIBE@
+a odhláste sa z informovania o zmenách stránky alebo menného priestoru.
+
+--
+Táto správa bola zaslaná DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sk/updateprofile.txt b/sources/inc/lang/sk/updateprofile.txt
new file mode 100644
index 0000000..67b823d
--- /dev/null
+++ b/sources/inc/lang/sk/updateprofile.txt
@@ -0,0 +1,6 @@
+====== Zmena vášho užívateľského profilu ======
+
+Potrebujete vyplniť len tie polia, ktoré chcete zmeniť. Nemôžete zmeniť prihlasovacie meno.
+
+
+
diff --git a/sources/inc/lang/sk/uploadmail.txt b/sources/inc/lang/sk/uploadmail.txt
new file mode 100644
index 0000000..1829379
--- /dev/null
+++ b/sources/inc/lang/sk/uploadmail.txt
@@ -0,0 +1,14 @@
+Súbor bol nahraný do DokuWiki. Tu sú podrobnosti:
+
+Súbor : @MEDIA@
+Dátum : @DATE@
+Prehliadač : @BROWSER@
+IP adresa : @IPADDRESS@
+Názov hostiteľa : @HOSTNAME@
+Veľkosť : @SIZE@
+MIME Typ : @MIME@
+Užívateľ : @USER@
+
+-- 
+Táto správa bola zaslaná DokuWiki
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sl/admin.txt b/sources/inc/lang/sl/admin.txt
new file mode 100644
index 0000000..cee19de
--- /dev/null
+++ b/sources/inc/lang/sl/admin.txt
@@ -0,0 +1,3 @@
+===== Skrbništvo =====
+
+Navedene možnosti omogočajo skrbniško prilagajanje nastavitev sistema DokuWiki.
diff --git a/sources/inc/lang/sl/adminplugins.txt b/sources/inc/lang/sl/adminplugins.txt
new file mode 100644
index 0000000..899c854
--- /dev/null
+++ b/sources/inc/lang/sl/adminplugins.txt
@@ -0,0 +1 @@
+===== Dodatni vstavki =====
\ No newline at end of file
diff --git a/sources/inc/lang/sl/backlinks.txt b/sources/inc/lang/sl/backlinks.txt
new file mode 100644
index 0000000..5e4d8ff
--- /dev/null
+++ b/sources/inc/lang/sl/backlinks.txt
@@ -0,0 +1,3 @@
+====== Povratne povezave ======
+
+Spodaj je naveden seznam strani, ki so povezane na trenutno stran. EnoBesedne povezave niso zaznane kot povratne povezave.
diff --git a/sources/inc/lang/sl/conflict.txt b/sources/inc/lang/sl/conflict.txt
new file mode 100644
index 0000000..ec5b370
--- /dev/null
+++ b/sources/inc/lang/sl/conflict.txt
@@ -0,0 +1,5 @@
+====== Obstaja novejša različica dokumenta ======
+
+Obstaja novejša različica dokumenta, ki ga trenutno urejate. Do zapleta pride, ko drug uporabnik spremeni dokument med vašim urejanjem in ga pred vami shrani.
+
+Temeljito preglejte spodaj izpisane razlike med dokumentoma in izberite različico, ki jo želite ohraniti. V kolikor je izbrana možnost ''shrani'', bo shranjena vaša zadnja različica. Z izbiro možnosti ''prekliči'', pa bo ohranjena trenutno shranjena različica.
diff --git a/sources/inc/lang/sl/denied.txt b/sources/inc/lang/sl/denied.txt
new file mode 100644
index 0000000..5b5fd4d
--- /dev/null
+++ b/sources/inc/lang/sl/denied.txt
@@ -0,0 +1,3 @@
+====== Ni ustreznih dovoljenj ======
+
+Za nadaljevanje opravila je treba imeti ustrezna dovoljenja. Ali ste se morda pozabili prijaviti?
diff --git a/sources/inc/lang/sl/diff.txt b/sources/inc/lang/sl/diff.txt
new file mode 100644
index 0000000..5cb2e3a
--- /dev/null
+++ b/sources/inc/lang/sl/diff.txt
@@ -0,0 +1,3 @@
+====== Primerjava izbranih različic ======
+
+Prikazane so razlike med izbrano in trenutno različico strani.
diff --git a/sources/inc/lang/sl/draft.txt b/sources/inc/lang/sl/draft.txt
new file mode 100644
index 0000000..b3fe4de
--- /dev/null
+++ b/sources/inc/lang/sl/draft.txt
@@ -0,0 +1,5 @@
+===== Zaznan je shranjen osnutek strani =====
+
+Zadnja seja te strani ni bila pravilno zaključena. Sistem DokuWiki je samodejno shranil osnutek strani, ki ga je mogoče naprej urejati. Spodaj so navedeni podatki samodejnega shranjevanja zadnje seje.
+
+Vsebino osnutka je mogoče //obnoviti// na zadnjo sejo, //izbrisati// samodejno shranjen osnutek ali pa //prekiniti// urejanje.
\ No newline at end of file
diff --git a/sources/inc/lang/sl/edit.txt b/sources/inc/lang/sl/edit.txt
new file mode 100644
index 0000000..71d5fb0
--- /dev/null
+++ b/sources/inc/lang/sl/edit.txt
@@ -0,0 +1 @@
+Po koncu urejanja strani, je stran treba ''shraniti''. Navodila in podrobnosti za urejanje je mogoče najti na strani [[wiki:syntax|skladnje]]. Možnosti urejanja in pravila skladnje je mogoče varno preizkusiti v [[playground:playground|peskovniku]].
diff --git a/sources/inc/lang/sl/editrev.txt b/sources/inc/lang/sl/editrev.txt
new file mode 100644
index 0000000..baaacd2
--- /dev/null
+++ b/sources/inc/lang/sl/editrev.txt
@@ -0,0 +1,2 @@
+**Naložena je stara različica dokumenta!** V kolikor staro različico shranite, bo shranjena kot najnovejša različica.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/sl/index.txt b/sources/inc/lang/sl/index.txt
new file mode 100644
index 0000000..dd54d2b
--- /dev/null
+++ b/sources/inc/lang/sl/index.txt
@@ -0,0 +1,4 @@
+====== Kazalo ======
+
+Na spodnjem seznamu so izpisane vse wiki strani, ki so na voljo, razvrščene pa so po posameznih [[doku>namespaces|imenskih prostorih]].
+
diff --git a/sources/inc/lang/sl/install.html b/sources/inc/lang/sl/install.html
new file mode 100644
index 0000000..a008334
--- /dev/null
+++ b/sources/inc/lang/sl/install.html
@@ -0,0 +1,20 @@
+
        Stran je namenjena pomoči pri prvi namestitvi in nastavitvi spletišča
+Dokuwiki. Več podrobnosti o tem je mogoče najti na straneh dokumentacije
+namestitve.
        
+
+
        Sistem DokuWiki uporablja običajne besedilne datoteke za shranjevanje
+wiki strani in drugih podrobnosti o teh straneh (npr. slike, kazalo, stare
+različice in drugo). Za pravilno delovanje mora imeti sistem DokuWiki prost
+dostop do map in datotek, zato je ključno, da so dovoljenja določena pravilno.
+Z namestilnikom ni mogoče spreminjanje dovoljenj map. To je običajno najlažje
+narediti v ukazni lupini ali pa, če spletišče Wiki gostuje na zunanjih
+strežnikih, preko nadzornika FTP povezave (npr. cPanel).
        
+
+
        Z namestilnikom lahko spremenite nastavitve dostopa sistema Dokuwiki
+ACL, ki omogoča skrbniško prijavo in dostop do upravljanja z vstavki,
+uporabniki, dovoljenji dostopa uporabnikov do določenih strani in do nekaterih
+nastavitev. Za delovanje sistema ACL ni bistven, vendar pa močno vpliva na
+enostavnost upravljanja strani in nastavitev.
        
+
+
        Zahtevnejši uporabniki ali skrbniki s posebnimi zahtevami namestitve sistema
+si lahko več podrobnosti ogledajo na straneh navodil namestitve in nastavitve.
        
\ No newline at end of file
diff --git a/sources/inc/lang/sl/lang.php b/sources/inc/lang/sl/lang.php
new file mode 100644
index 0000000..371b665
--- /dev/null
+++ b/sources/inc/lang/sl/lang.php
@@ -0,0 +1,326 @@
+
+ * @author Boštjan Seničar 
+ * @author Dejan Levec 
+ * @author Gregor Skumavc (grega.skumavc@gmail.com)
+ * @author Matej Urbančič (mateju@svn.gnome.org)
+ * @author Matej Urbančič 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '„';
+$lang['doublequoteclosing']    = '“';
+$lang['singlequoteopening']    = '‚';
+$lang['singlequoteclosing']    = '‘';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Uredi stran';
+$lang['btn_source']            = 'Pokaži izvorno kodo strani';
+$lang['btn_show']              = 'Pokaži stran';
+$lang['btn_create']            = 'Ustvari stran';
+$lang['btn_search']            = 'Poišči';
+$lang['btn_save']              = 'Shrani';
+$lang['btn_preview']           = 'Predogled';
+$lang['btn_top']               = 'Nazaj na vrh';
+$lang['btn_newer']             = '<< novejši';
+$lang['btn_older']             = 'starejši >>';
+$lang['btn_revs']              = 'Stare različice';
+$lang['btn_recent']            = 'Nedavne spremembe';
+$lang['btn_upload']            = 'Pošlji';
+$lang['btn_cancel']            = 'Prekliči';
+$lang['btn_index']             = 'Kazalo';
+$lang['btn_secedit']           = 'Uredi';
+$lang['btn_login']             = 'Prijava';
+$lang['btn_logout']            = 'Odjava';
+$lang['btn_admin']             = 'Skrbništvo';
+$lang['btn_update']            = 'Posodobi';
+$lang['btn_delete']            = 'Izbriši';
+$lang['btn_back']              = 'Nazaj';
+$lang['btn_backlink']          = 'Povratne povezave';
+$lang['btn_backtomedia']       = 'Nazaj na izbiro predstavnih datotek';
+$lang['btn_subscribe']         = 'Urejanje naročnin';
+$lang['btn_profile']           = 'Posodobi profil';
+$lang['btn_reset']             = 'Ponastavi';
+$lang['btn_resendpwd']         = 'Nastavi novo geslo';
+$lang['btn_draft']             = 'Uredi osnutek';
+$lang['btn_recover']           = 'Obnovi osnutek';
+$lang['btn_draftdel']          = 'Izbriši osnutek';
+$lang['btn_revert']            = 'Povrni';
+$lang['btn_register']          = 'Prijava';
+$lang['btn_apply']             = 'Uveljavi';
+$lang['btn_media']             = 'Urejevalnik predstavnih vsebin';
+$lang['btn_deleteuser']        = 'Odstrani račun';
+$lang['loggedinas']            = 'Prijava kot';
+$lang['user']                  = 'Uporabniško ime';
+$lang['pass']                  = 'Geslo';
+$lang['newpass']               = 'Novo geslo';
+$lang['oldpass']               = 'Potrdi trenutno geslo';
+$lang['passchk']               = 'Ponovi novo geslo';
+$lang['remember']              = 'Zapomni si me';
+$lang['fullname']              = 'Pravo ime';
+$lang['email']                 = 'Elektronski naslov';
+$lang['profile']               = 'Uporabniški profil';
+$lang['badlogin']              = 'Uporabniško ime ali geslo je napačno.';
+$lang['badpassconfirm']        = 'Napaka! Geslo ni pravo.';
+$lang['minoredit']             = 'Manjše spremembe';
+$lang['draftdate']             = 'Samodejno shranjevanje osnutka je omogočeno';
+$lang['nosecedit']             = 'Stran je bila v vmesnem času spremenjena. Podatki strani so bili zastareli, zato se je celotna vsebina naložila znova.';
+$lang['regmissing']            = 'Izpolniti je treba vsa polja.';
+$lang['reguexists']            = 'Uporabnik s tem imenom že obstaja.';
+$lang['regsuccess']            = 'Uporabniški račun je uspešno ustvarjen. Geslo je bilo poslano na naveden elektronski naslov.';
+$lang['regsuccess2']           = 'Uporabniški račun je uspešno ustvarjen.';
+$lang['regmailfail']           = 'Videti je, da je prišlo do napake med pošiljanjem gesla. Stopite v stik s skrbnikom sistema!';
+$lang['regbadmail']            = 'Videti je, da je naveden elektronski naslov neveljaven - v kolikor je to napaka, stopite v stik s skrbnikom sistema.';
+$lang['regbadpass']            = 'Gesli nista enaki. Poskusite znova.';
+$lang['regpwmail']             = 'Geslo za DokuWiki';
+$lang['reghere']               = 'Nimate še računa? Vpišite se za nov račun.';
+$lang['profna']                = 'DokuWiki ne podpira spreminjanja profila.';
+$lang['profnochange']          = 'Brez sprememb.';
+$lang['profnoempty']           = 'Prazno polje elektronskega naslova ali imena ni dovoljeno.';
+$lang['profchanged']           = 'Uporabniški profil je uspešno posodobljen.';
+$lang['profnodelete']          = 'Ni omogočena podpora za brisanje uporabnikov.';
+$lang['profdeleteuser']        = 'Izbriši račun';
+$lang['profdeleted']           = 'Uporabniški račun je izbrisan.';
+$lang['pwdforget']             = 'Ali ste pozabili geslo? Pridobite si novo geslo.';
+$lang['resendna']              = 'DokuWiki ne podpira možnosti ponovnega pošiljanja gesel.';
+$lang['resendpwd']             = 'Nastavi novo geslo za';
+$lang['resendpwdmissing']      = 'Izpolniti je treba vsa polja.';
+$lang['resendpwdnouser']       = 'Podanega uporabniškega imena v podatkovni zbirki ni mogoče najti.';
+$lang['resendpwdbadauth']      = 'Koda za overitev ni prava. Prepričajte se, da ste uporabili celotno povezavo za potrditev.';
+$lang['resendpwdconfirm']      = 'Povezava za potrditev računa je bila poslana na elektronski naslov.';
+$lang['resendpwdsuccess']      = 'Novo geslo je bilo poslano na elektronski naslov.';
+$lang['license']               = 'V kolikor ni posebej določeno, je vsebina Wiki strani objavljena pod pogoji dovoljenja:';
+$lang['licenseok']             = 'Opomba: z urejanjem vsebine strani, se strinjate z objavo pod pogoji dovoljenja:';
+$lang['searchmedia']           = 'Poišči ime datoteke:';
+$lang['searchmedia_in']        = 'Poišči v %s';
+$lang['txt_upload']            = 'Izberite datoteko za pošiljanje';
+$lang['txt_filename']          = 'Pošlji z imenom (izborno)';
+$lang['txt_overwrt']           = 'Prepiši obstoječo datoteko';
+$lang['lockedby']              = 'Trenutno je zaklenjeno s strani';
+$lang['lockexpire']            = 'Zaklep preteče ob';
+$lang['js']['willexpire']      = 'Zaklep za urejevanje bo pretekel čez eno minuto.\nV izogib sporom, uporabite predogled, da se merilnik časa za zaklep ponastavi.';
+$lang['js']['notsavedyet']     = 'Neshranjene spremembe bodo izgubljene.';
+$lang['js']['searchmedia']     = 'Poišči datoteke';
+$lang['js']['keepopen']        = 'Od izbiri ohrani okno odprto';
+$lang['js']['hidedetails']     = 'Skrij podrobnosti';
+$lang['js']['mediatitle']      = 'Nastavitve povezave';
+$lang['js']['mediadisplay']    = 'Vrsta povezave';
+$lang['js']['mediaalign']      = 'Poravnava';
+$lang['js']['mediasize']       = 'Velikost slike';
+$lang['js']['mediatarget']     = 'Mesto povezave';
+$lang['js']['mediaclose']      = 'Zapri';
+$lang['js']['mediainsert']     = 'Vstavi';
+$lang['js']['mediadisplayimg'] = 'Pokaži sliko.';
+$lang['js']['mediadisplaylnk'] = 'Pokaži le povezavo.';
+$lang['js']['mediasmall']      = 'Majhna različica';
+$lang['js']['mediamedium']     = 'Srednja različica';
+$lang['js']['medialarge']      = 'Velika različica';
+$lang['js']['mediaoriginal']   = 'Izvorna različica';
+$lang['js']['medialnk']        = 'Povezava na strani podrobnosti';
+$lang['js']['mediadirect']     = 'Neposredna povezava do izvorne različice';
+$lang['js']['medianolnk']      = 'Brez povezave';
+$lang['js']['medianolink']     = 'Ne poveži s sliko';
+$lang['js']['medialeft']       = 'Poravnaj sliko na levo.';
+$lang['js']['mediaright']      = 'Poravnaj sliko na desno.';
+$lang['js']['mediacenter']     = 'Poravnaj sliko na sredini.';
+$lang['js']['medianoalign']    = 'Ne uporabi poravnave.';
+$lang['js']['nosmblinks']      = 'Povezovanje do souporabnih datotek sistema Windows deluje le pri uporabi brskalnika Microsoft Internet Explorer. Povezavo je mogoče kopirati ročno.';
+$lang['js']['linkwiz']         = 'Čarovnik za povezave';
+$lang['js']['linkto']          = 'Poveži na:';
+$lang['js']['del_confirm']     = 'Ali naj se res izbrišejo izbrani predmeti?';
+$lang['js']['restore_confirm'] = 'Ali naj se koda obnovi na to različico?';
+$lang['js']['media_diff']      = 'Razlike:';
+$lang['js']['media_diff_both'] = 'Eno ob drugem';
+$lang['js']['media_diff_opacity'] = 'Prosojno';
+$lang['js']['media_select']    = 'Izbor datotek ...';
+$lang['js']['media_upload_btn'] = 'Naloži';
+$lang['js']['media_done_btn']  = 'Končano';
+$lang['js']['media_drop']      = 'Spusti datoteke za nalaganje.';
+$lang['js']['media_cancel']    = 'odstrani';
+$lang['js']['media_overwrt']   = 'Prepiši obstoječe datoteke';
+$lang['rssfailed']             = 'Prišlo je do napake med pridobivanjem vira: ';
+$lang['nothingfound']          = 'Ni najdenih predmetov.';
+$lang['mediaselect']           = 'Predstavne datoteke';
+$lang['fileupload']            = 'Pošiljanje predstavnih datotek';
+$lang['uploadsucc']            = 'Pošiljanje je bilo uspešno končano.';
+$lang['uploadfail']            = 'Pošiljanje je spodletelo. Morda so uporabljena neustrezna dovoljenja.';
+$lang['uploadwrong']           = 'Pošiljanje je zavrnjeno. Uporabljena pripona datoteke je prepovedana.';
+$lang['uploadexist']           = 'Datoteka že obstaja. Ni sprememb.';
+$lang['uploadbadcontent']      = 'Poslana datoteka se ne sklada s pripono (%s) datoteke.';
+$lang['uploadspam']            = 'Pošiljanje je bilo ustavljeno na podlagi zapisa na črnem seznamu neželenih datotek.';
+$lang['uploadxss']             = 'Pošiljanje je zaustavljeno zaradi morebitne zlonamerne vsebine.';
+$lang['uploadsize']            = 'poslana datoteka prevelika (največja dovoljena velikost je %s).';
+$lang['deletesucc']            = 'Datoteka "%s" je izbrisana.';
+$lang['deletefail']            = 'Datoteke "%s" ni mogoče izbrisati - preverite uporabniška dovoljenja.';
+$lang['mediainuse']            = 'Datoteka "%s" ni izbrisana - datoteka je še vedno v uporabi.';
+$lang['namespaces']            = 'Imenski prostori';
+$lang['mediafiles']            = 'Datoteke, ki so na voljo v';
+$lang['accessdenied']          = 'Za ogled te strani so zahtevana posebna dovoljenja.';
+$lang['mediausage']            = 'Za navajanje datoteke je treba uporabiti navedeno skladnjo:';
+$lang['mediaview']             = 'Pogled izvorne datoteke';
+$lang['mediaroot']             = 'koren';
+$lang['mediaupload']           = 'Pošiljanje datoteke v trenutni imenski prostor. Za ustvarjanje novih imenskih prostorov, jih pripnite k imenu datoteke navedene pri vnosnem polju "Naloži kot" in jih ločite z dvopičjem.';
+$lang['mediaextchange']        = 'Pripona datoteke je spremenjena iz .%s v .%s!';
+$lang['reference']             = 'Sklic za';
+$lang['ref_inuse']             = 'Datoteke ni mogoče izbrisati, saj je še vedno povezana s stranmi:';
+$lang['ref_hidden']            = 'Nekaj sklicev je navedenih na straneh, do katerih s trenutnimi dovoljenji ni mogoč dostop.';
+$lang['hits']                  = 'Zadetki';
+$lang['quickhits']             = 'Ujemanje imen strani';
+$lang['toc']                   = 'Kazalo';
+$lang['current']               = 'Trenutna';
+$lang['yours']                 = 'Vaša različica';
+$lang['diff']                  = 'Pokaži razlike s trenutno različico';
+$lang['diff2']                 = 'Pokaži razlike med izbranimi različicami.';
+$lang['difflink']              = 'Poveži s tem pogledom primerjave.';
+$lang['diff_type']             = 'Razlike:';
+$lang['diff_inline']           = 'V besedilu';
+$lang['diff_side']             = 'Eno ob drugem';
+$lang['line']                  = 'Vrstica';
+$lang['breadcrumb']            = 'Sled';
+$lang['youarehere']            = 'Trenutno dejavna stran';
+$lang['lastmod']               = 'Zadnja sprememba';
+$lang['by']                    = 'uporabnika';
+$lang['deleted']               = 'odstranjena';
+$lang['created']               = 'ustvarjena';
+$lang['restored']              = 'povrnjena stara različica (%s)';
+$lang['external_edit']         = 'urejanje v zunanjem urejevalniku';
+$lang['summary']               = 'Povzetek urejanja';
+$lang['noflash']               = 'Za prikaz vsebine je treba namestiti Adobe Flash Plugin';
+$lang['download']              = 'Naloži izrezek';
+$lang['tools']                 = 'Orodja';
+$lang['user_tools']            = 'Uporabniška orodja';
+$lang['site_tools']            = 'Orodja spletišča';
+$lang['page_tools']            = 'Orodja strani';
+$lang['skip_to_content']       = 'preskoči na vsebino';
+$lang['sidebar']               = 'Stranska vrstica';
+$lang['mail_newpage']          = '[DokuWiki] stran dodana:';
+$lang['mail_changed']          = '[DokuWiki] stran spremenjena:';
+$lang['mail_subscribe_list']   = 'strani s spremenjenim imenom:';
+$lang['mail_new_user']         = 'nov uporabnik:';
+$lang['mail_upload']           = 'naložena datoteka:';
+$lang['changes_type']          = 'Poglej spremembe';
+$lang['pages_changes']         = 'Strani';
+$lang['media_changes']         = 'Predstavne datoteke';
+$lang['both_changes']          = 'Strani in predstavne datoteke';
+$lang['qb_bold']               = 'Krepko besedilo';
+$lang['qb_italic']             = 'Ležeče besedilo';
+$lang['qb_underl']             = 'Podčrtano besedilo';
+$lang['qb_code']               = 'Oznaka kode';
+$lang['qb_strike']             = 'Prečrtano besedilo';
+$lang['qb_h1']                 = 'Naslov prve ravni';
+$lang['qb_h2']                 = 'Naslov druge ravni';
+$lang['qb_h3']                 = 'Naslov tretje ravni';
+$lang['qb_h4']                 = 'Naslov četrte ravni';
+$lang['qb_h5']                 = 'Naslov pete ravni';
+$lang['qb_h']                  = 'Naslov';
+$lang['qb_hs']                 = 'Izberi naslov';
+$lang['qb_hplus']              = 'Naslov na višji ravni';
+$lang['qb_hminus']             = 'Naslov na nižji ravni';
+$lang['qb_hequal']             = 'Naslov na isti ravni';
+$lang['qb_link']               = 'Notranja povezava';
+$lang['qb_extlink']            = 'Zunanja povezava';
+$lang['qb_hr']                 = 'Vodoravna črta';
+$lang['qb_ol']                 = 'Številčna oznaka predmeta';
+$lang['qb_ul']                 = 'Vrstična oznaka predmeta';
+$lang['qb_media']              = 'Dodajanje slik in drugih datotek';
+$lang['qb_sig']                = 'Vstavi podpis';
+$lang['qb_smileys']            = 'Smeški';
+$lang['qb_chars']              = 'Posebni znaki';
+$lang['upperns']               = 'skoči na nadrejeni imenski prostor';
+$lang['admin_register']        = 'Dodaj novega uporabnika';
+$lang['metaedit']              = 'Uredi metapodatke';
+$lang['metasaveerr']           = 'Zapisovanje metapodatkov je spodletelo';
+$lang['metasaveok']            = 'Metapodatki so shranjeni';
+$lang['img_backto']            = 'Nazaj na';
+$lang['img_title']             = 'Naslov';
+$lang['img_caption']           = 'Opis';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Ime datoteke';
+$lang['img_fsize']             = 'Velikost';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Avtorska pravica';
+$lang['img_format']            = 'Zapis';
+$lang['img_camera']            = 'Fotoaparat';
+$lang['img_keywords']          = 'Ključne besede';
+$lang['img_width']             = 'Širina';
+$lang['img_height']            = 'Višina';
+$lang['img_manager']           = 'Poglej v urejevalniku predstavnih vsebin';
+$lang['subscr_subscribe_success'] = 'Uporabniški račun %s je dodan na seznam naročnin na %s';
+$lang['subscr_subscribe_error'] = 'Napaka med dodajanjem %s na seznam naročnin na %s';
+$lang['subscr_subscribe_noaddress'] = 'S trenutnimi prijavnimi podatki ni povezanega elektronskega naslova, zato uporabniškega računa ni mogoče dodati na seznam naročnikov.';
+$lang['subscr_unsubscribe_success'] = 'Uporabniški račun %s je odstranjen s seznama naročnin na %s';
+$lang['subscr_unsubscribe_error'] = 'Napaka med odstranjevanjem %s s seznama naročnin na %s';
+$lang['subscr_already_subscribed'] = '%s je že naročen na %s';
+$lang['subscr_not_subscribed'] = '%s ni naročen na %s';
+$lang['subscr_m_not_subscribed'] = 'Trenutni uporabniški račun nima prijavljene naročnine na trenutno stran ali imenski prostor.';
+$lang['subscr_m_new_header']   = 'Naročanje';
+$lang['subscr_m_current_header'] = 'Trenutne naročnine';
+$lang['subscr_m_unsubscribe']  = 'Prekliči naročnino';
+$lang['subscr_m_subscribe']    = 'Prijavi naročnino';
+$lang['subscr_m_receive']      = 'Prejmi';
+$lang['subscr_style_every']    = 'elektronsko sporočilo ob vsaki spremembi';
+$lang['subscr_style_digest']   = 'strnjeno elektronsko sporočilo sprememb za vsako stran (vsakih %.2f dni)';
+$lang['subscr_style_list']     = 'seznam spremenjenih strani od zadnjega elektronskega sporočila (vsakih %.2f dni)';
+$lang['authtempfail']          = 'Potrditev uporabnika je trenutno nedostopna. Stopite v stik s skrbnikom sistema wiki.';
+$lang['i_chooselang']          = 'Izberite jezik';
+$lang['i_installer']           = 'DokuWiki namestitev';
+$lang['i_wikiname']            = 'Ime Wiki spletišča';
+$lang['i_enableacl']           = 'Omogoči ACL (priporočeno)';
+$lang['i_superuser']           = 'Skrbnik';
+$lang['i_problems']            = 'Namestilnik je naletel na težave, ki so izpisane spodaj. Namestitve ni mogoče nadaljevati, dokler težave ne bodo odpravljene.';
+$lang['i_modified']            = 'Iz varnostnih razlogov skript deluje le v novi in neprilagojeni namestitvi sistema DokuWiki. Postopek namestitve je treba začeti znova ali pa sistem namestiti ročno s pomočjo navodil nameščanja Dokuwiki.';
+$lang['i_funcna']              = 'Funkcija PHP %s ni na voljo. Morda je možnost na strežniku zaradi varnostnih razlogov onemogočena.';
+$lang['i_phpver']              = 'Različica PHP %s je nižja od zahtevane različice %s. Pred nadaljevanjem je treba posodobiti namestitev PHP.';
+$lang['i_permfail']            = 'Predmet %s ni zapisljiv. Zahtevana je sprememba dovoljenj za to mapo.';
+$lang['i_confexists']          = 'Predmet %s že obstaja.';
+$lang['i_writeerr']            = 'Ni mogoče ustvariti predmeta %s. Preveriti je treba dovoljenja datotek in map in nato ustvariti datoteko ročno.';
+$lang['i_badhash']             = 'nepoznana ali spremenjena datoteka dokuwiki.php (razpršilo=%s)';
+$lang['i_badval']              = '%s - neveljavna ali prazna vrednost';
+$lang['i_success']             = 'Nastavitev je uspešno končana. Datoteko install.php lahko sedaj izbrišete. Nadaljujte v novi DokuWiki.';
+$lang['i_failure']             = 'Med zapisovanjem nastavitvenih datotek je prišlo do napak. Preden lahko uporabite vaš DokuWiki, jih je treba odpraviti.';
+$lang['i_policy']              = 'Začetna določila ACL';
+$lang['i_pol0']                = 'Odprt Wiki (branje, zapis, nalaganje datotek je javno za vse)';
+$lang['i_pol1']                = 'Javni Wiki (branje za vse, zapis in nalaganje datotek za prijavljene uporabnike)';
+$lang['i_pol2']                = 'Zaprt Wiki (berejo in urejajo lahko le prijavljeni uporabniki)';
+$lang['i_allowreg']            = 'Dovoli uporabnikom vpis';
+$lang['i_retry']               = 'Ponovni poskus';
+$lang['i_license']             = 'Izbor dovoljenja objave vsebine:';
+$lang['i_license_none']        = 'Ne pokaži podrobnosti dovoljenja.';
+$lang['recent_global']         = 'Trenutno so prikazane spremembe znotraj imenskega prostora %s. Mogoče si je ogledati tudi spremembe celotnega sistema Wiki.';
+$lang['years']                 = '%d let nazaj';
+$lang['months']                = '%d mesecev nazaj';
+$lang['weeks']                 = '%d tednov nazaj';
+$lang['days']                  = '%d dni nazaj';
+$lang['hours']                 = '%d ur nazaj';
+$lang['minutes']               = '%d minut nazaj';
+$lang['seconds']               = '%d sekund nazaj';
+$lang['wordblock']             = 'Spremembe niso shranjene, ker je v vsebini navedeno neželeno besedilo (spam).';
+$lang['media_uploadtab']       = 'Naloži';
+$lang['media_searchtab']       = 'Poišči';
+$lang['media_file']            = 'Datoteka';
+$lang['media_viewtab']         = 'Pogled';
+$lang['media_edittab']         = 'Uredi';
+$lang['media_historytab']      = 'Zgodovina';
+$lang['media_list_thumbs']     = 'Sličice';
+$lang['media_list_rows']       = 'Vrstice';
+$lang['media_sort_name']       = 'Ime';
+$lang['media_sort_date']       = 'Datum';
+$lang['media_namespaces']      = 'Izbor imenskega prostora';
+$lang['media_files']           = 'Datoteke v %s';
+$lang['media_upload']          = 'Naloži v %s';
+$lang['media_search']          = 'Poišči v %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s pri %s';
+$lang['media_edit']            = 'Uredi %s';
+$lang['media_history']         = 'Zgodovina %s';
+$lang['media_meta_edited']     = 'metapodatki so urejeni';
+$lang['media_perm_read']       = 'Ni ustreznih dovoljenj za branje datotek.';
+$lang['media_perm_upload']     = 'Ni ustreznih dovoljenj za nalaganje datotek.';
+$lang['media_update']          = 'Naloži novo različico';
+$lang['media_restore']         = 'Obnovi to različico';
+$lang['currentns']             = 'Trenutni imenski prostor';
+$lang['searchresult']          = 'Rezultati iskanja';
+$lang['plainhtml']             = 'Zapis HTML';
diff --git a/sources/inc/lang/sl/locked.txt b/sources/inc/lang/sl/locked.txt
new file mode 100644
index 0000000..cc693d3
--- /dev/null
+++ b/sources/inc/lang/sl/locked.txt
@@ -0,0 +1,3 @@
+====== Stran je zaklenjena ======
+
+Stran je zaklenjena za urejanje. Počakati je treba, da zaklep strani poteče.
diff --git a/sources/inc/lang/sl/login.txt b/sources/inc/lang/sl/login.txt
new file mode 100644
index 0000000..eeae0c9
--- /dev/null
+++ b/sources/inc/lang/sl/login.txt
@@ -0,0 +1,3 @@
+====== Prijava ======
+
+Niste prijavljeni! Spodaj vnesite ustrezne podatke in se prijavite. Prijaviti se je mogoče le, če so omogočeni piškotki.
diff --git a/sources/inc/lang/sl/mailtext.txt b/sources/inc/lang/sl/mailtext.txt
new file mode 100644
index 0000000..e08d01d
--- /dev/null
+++ b/sources/inc/lang/sl/mailtext.txt
@@ -0,0 +1,15 @@
+Stran na vašem DokuWiki je bila dodana ali spremenjena. Podrobnosti:
+
+Datum            : @DATE@
+Brskalnik        : @BROWSER@
+Naslov IP        : @IPADDRESS@
+Ime gostitelja   : @HOSTNAME@
+Stara različica  : @OLDPAGE@
+Nova različica   : @NEWPAGE@
+Povzetek urejanja: @SUMMARY@
+Uporabnik        : @USER@
+
+@DIFF@
+
+--
+Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/sources/inc/lang/sl/newpage.txt b/sources/inc/lang/sl/newpage.txt
new file mode 100644
index 0000000..2f11bbf
--- /dev/null
+++ b/sources/inc/lang/sl/newpage.txt
@@ -0,0 +1,3 @@
+====== Stran še ne obstaja ======
+
+Sledili ste povezavi na stran, ki še ne obstaja. Stran je mogoče ustvariti preko povezave ''Ustvari stran''.
diff --git a/sources/inc/lang/sl/norev.txt b/sources/inc/lang/sl/norev.txt
new file mode 100644
index 0000000..adaa22d
--- /dev/null
+++ b/sources/inc/lang/sl/norev.txt
@@ -0,0 +1,3 @@
+====== Neobstoječa različica strani ======
+
+Zahtevana različica strani ne obstaja. Uporabite gumb ''Stare različice'' za izpis seznama starih različic tega dokumenta.
diff --git a/sources/inc/lang/sl/password.txt b/sources/inc/lang/sl/password.txt
new file mode 100644
index 0000000..61929dc
--- /dev/null
+++ b/sources/inc/lang/sl/password.txt
@@ -0,0 +1,9 @@
+Pozdravljeni, @FULLNAME@!
+
+Spodaj so navedeni podatki za @TITLE@ na wiki spletišču @DOKUWIKIURL@
+
+Uporabniško ime: @LOGIN@
+Geslo          : @PASSWORD@
+
+--
+Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/sources/inc/lang/sl/preview.txt b/sources/inc/lang/sl/preview.txt
new file mode 100644
index 0000000..c49de66
--- /dev/null
+++ b/sources/inc/lang/sl/preview.txt
@@ -0,0 +1,3 @@
+====== Predogled ======
+
+Prikazan je predogled strani. Stran še ni shranjena!
diff --git a/sources/inc/lang/sl/pwconfirm.txt b/sources/inc/lang/sl/pwconfirm.txt
new file mode 100644
index 0000000..a621821
--- /dev/null
+++ b/sources/inc/lang/sl/pwconfirm.txt
@@ -0,0 +1,11 @@
+Pozdravljeni, @FULLNAME@!
+
+S podatki vašega imena je bila poslana zahteva za pridobitev novega gesla za uporabniško ime @TITLE@ na wiki spletišču @DOKUWIKIURL@.
+
+ - V kolikor novega gesla niste zahtevali, prezrite to sporočilo.
+ - Za potrditev zahteve za pridobitev novega gesla, kliknite spodnjo povezavo.
+
+@CONFIRM@
+
+--
+Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/sources/inc/lang/sl/read.txt b/sources/inc/lang/sl/read.txt
new file mode 100644
index 0000000..5ba9a2e
--- /dev/null
+++ b/sources/inc/lang/sl/read.txt
@@ -0,0 +1,2 @@
+Stran je odprta z dovoljenji le za branje. Dovoljeno je ogledati si izvorno kodo strani, vsebine pa ni mogoče spreminjati. Za več podrobnosti stopite v stik s skrbnikom sistema.
+
diff --git a/sources/inc/lang/sl/recent.txt b/sources/inc/lang/sl/recent.txt
new file mode 100644
index 0000000..282a492
--- /dev/null
+++ b/sources/inc/lang/sl/recent.txt
@@ -0,0 +1,3 @@
+====== Nedavne spremembe ======
+
+Izpisane wiki strani so bile nedavno spremenjene.
diff --git a/sources/inc/lang/sl/register.txt b/sources/inc/lang/sl/register.txt
new file mode 100644
index 0000000..f1b22f9
--- /dev/null
+++ b/sources/inc/lang/sl/register.txt
@@ -0,0 +1,3 @@
+====== Vpis novega računa ======
+
+V spodnji obrazec je treba vnesti vse zahtevane podatke za ustvarjanje novega računa. Vnesti je treba veljaven **elektronski naslov**, na katerega bo poslano geslo. Uporabniško ime mora biti veljavno [[doku>pagename|ime strani]].
diff --git a/sources/inc/lang/sl/registermail.txt b/sources/inc/lang/sl/registermail.txt
new file mode 100644
index 0000000..801b7d0
--- /dev/null
+++ b/sources/inc/lang/sl/registermail.txt
@@ -0,0 +1,14 @@
+Nov uporabniški račun je uspešno vpisan.
+Podatki računa:
+
+Uporabniško ime   : @NEWUSER@
+Polno ime         : @NEWNAME@
+Elektronski naslov: @NEWEMAIL@
+
+Datum             : @DATE@
+Brskalnik         : @BROWSER@
+Naslov IP         : @IPADDRESS@
+Ime gostitelja    : @HOSTNAME@
+
+-- 
+Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/sources/inc/lang/sl/resendpwd.txt b/sources/inc/lang/sl/resendpwd.txt
new file mode 100644
index 0000000..8a1e614
--- /dev/null
+++ b/sources/inc/lang/sl/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Pošiljanje novega gesla ======
+
+Za pridobitev novega gesla, vnesite vaše uporabniško ime ustrezno polje spodnjega obrazca. Na naveden elektronski naslov bo poslano sporočilo v katerem bo navedena povezava do strani za overjanje istovetnosti uporabnika.
diff --git a/sources/inc/lang/sl/revisions.txt b/sources/inc/lang/sl/revisions.txt
new file mode 100644
index 0000000..86ede9d
--- /dev/null
+++ b/sources/inc/lang/sl/revisions.txt
@@ -0,0 +1,3 @@
+====== Stare različice ======
+
+Prikazana je stara različica tega dokumenta. Stran je mogoče povrniti na starejšo različico tako, da stran izberete, pritisnete na povezavo ''Uredi stran'' in stran nato shranite.
diff --git a/sources/inc/lang/sl/searchpage.txt b/sources/inc/lang/sl/searchpage.txt
new file mode 100644
index 0000000..736a361
--- /dev/null
+++ b/sources/inc/lang/sl/searchpage.txt
@@ -0,0 +1,5 @@
+====== Iskanje ======
+
+Spodaj so izpisani rezultati iskanja. V kolikor rezultati niso skladni z zahtevami iskanja, je mogoče ustvariti  novo stran z nazivom vaše poizvedbe preko povezave ''Uredi stran''.
+
+===== Rezultati =====
\ No newline at end of file
diff --git a/sources/inc/lang/sl/showrev.txt b/sources/inc/lang/sl/showrev.txt
new file mode 100644
index 0000000..8383392
--- /dev/null
+++ b/sources/inc/lang/sl/showrev.txt
@@ -0,0 +1,2 @@
+**Stara različica tega dokumenta!**
+----
diff --git a/sources/inc/lang/sl/stopwords.txt b/sources/inc/lang/sl/stopwords.txt
new file mode 100644
index 0000000..8eed2da
--- /dev/null
+++ b/sources/inc/lang/sl/stopwords.txt
@@ -0,0 +1,18 @@
+# To je seznam besed, ki jih ustvarjalnik kazala prezre. Seznam je sestavljen iz
+# besede, ki so zapisane vsaka v svoji vrstici. Datoteka mora biti zapisana s končnim
+# UNIX znakom vrstice. Besede krajše od treh znakov so iz kazala izločene samodejno
+# zaradi preglednosti. Seznam se s bo s časom spreminjal in dopolnjeval.
+moja
+moje
+moji
+mojo
+njegovi
+njegove
+njegovo
+njeno
+njeni
+njene
+njihova
+njihove
+njihovi
+njihovo
diff --git a/sources/inc/lang/sl/subscr_digest.txt b/sources/inc/lang/sl/subscr_digest.txt
new file mode 100644
index 0000000..aeb548b
--- /dev/null
+++ b/sources/inc/lang/sl/subscr_digest.txt
@@ -0,0 +1,19 @@
+Pozdravljeni!
+
+Strani v imenskem prostoru @PAGE@ wiki spletišča @TITLE@ so spremenjene.
+Podrobnosti sprememb so navedene spodaj.
+
+------------------------------------------------
+@DIFF@
+------------------------------------------------
+
+Stara različica: @OLDPAGE@
+Nova različica : @NEWPAGE@
+
+Za odjavo prejemanja podrobnosti sprememb, se je treba prijaviti na spletišče
+@DOKUWIKIURL@ in med možnostmi naročanja
+@SUBSCRIBE@
+odjaviti prejemanje poročil sprememb strani ali imenskega prostora.
+
+--
+Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/sources/inc/lang/sl/subscr_form.txt b/sources/inc/lang/sl/subscr_form.txt
new file mode 100644
index 0000000..46be8c9
--- /dev/null
+++ b/sources/inc/lang/sl/subscr_form.txt
@@ -0,0 +1,3 @@
+===== Urejanje naročnin ====
+
+Ta stran vam omogoča urejanje vaših naročnin za trenutno stran in imenski prostor.
\ No newline at end of file
diff --git a/sources/inc/lang/sl/subscr_list.txt b/sources/inc/lang/sl/subscr_list.txt
new file mode 100644
index 0000000..253cb41
--- /dev/null
+++ b/sources/inc/lang/sl/subscr_list.txt
@@ -0,0 +1,16 @@
+Pozdravljeni!
+
+Strani v imenskem prostoru @PAGE@ wiki spletišča @TITLE@ so spremenjene.
+Podrobnosti sprememb so navedene spodaj.
+
+------------------------------------------------
+@DIFF@
+------------------------------------------------
+
+Za odjavo prejemanja podrobnosti sprememb, se je treba prijaviti na spletišče
+@DOKUWIKIURL@ in med možnostmi naročanja
+@SUBSCRIBE@
+odjaviti prejemanje poročil sprememb strani ali imenskega prostora.
+
+--
+Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
diff --git a/sources/inc/lang/sl/subscr_single.txt b/sources/inc/lang/sl/subscr_single.txt
new file mode 100644
index 0000000..9fd64be
--- /dev/null
+++ b/sources/inc/lang/sl/subscr_single.txt
@@ -0,0 +1,22 @@
+Pozdravljeni!
+
+Stran @PAGE@ na spletišču Wiki @TITLE@ je spremenjena.
+Spremenjeno je:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum            : @DATE@
+Uporabnik        : @USER@
+Povzetek urejanja: @SUMMARY@
+Stara različica  : @OLDPAGE@
+Nova različica   : @NEWPAGE@
+
+Preklic obveščanja o spremembah strani je mogoče določiti
+na Wiki naslovu @DOKUWIKIURL@ in z obiskom @NEWPAGE@,
+kjer se je mogoče odjaviti od spremljanja strani ali
+imenskega prostora.
+
+--
+Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sl/updateprofile.txt b/sources/inc/lang/sl/updateprofile.txt
new file mode 100644
index 0000000..5e939f2
--- /dev/null
+++ b/sources/inc/lang/sl/updateprofile.txt
@@ -0,0 +1,3 @@
+===== Posodabljanje računa =====
+
+Posodobiti ali spremeniti je mogoče le nekatere podatke. Uporabniškega imena ni mogoče spremeniti.
\ No newline at end of file
diff --git a/sources/inc/lang/sl/uploadmail.txt b/sources/inc/lang/sl/uploadmail.txt
new file mode 100644
index 0000000..0479be7
--- /dev/null
+++ b/sources/inc/lang/sl/uploadmail.txt
@@ -0,0 +1,14 @@
+Datoteka je bila uspešno naložena na DokuWiki spletišče.
+Podrobnosti o datoteki:
+
+Datoteka  : @MEDIA@
+Datum     : @DATE@
+Brskalnik : @BROWSER@
+Naslov IP : @IPADDRESS@
+Ponudnik  : @HOSTNAME@
+Velikost  : @SIZE@
+Vrsta MIME: @MIME@
+Uporabnik : @USER@
+
+--
+Sporočilo je samodejno ustvarjeno na spletišču @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sq/admin.txt b/sources/inc/lang/sq/admin.txt
new file mode 100644
index 0000000..6edbf8a
--- /dev/null
+++ b/sources/inc/lang/sq/admin.txt
@@ -0,0 +1,3 @@
+====== Administrimi ======
+
+Poshtë është një listë e punëve administrative të disponueshme në DokuWiki.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/adminplugins.txt b/sources/inc/lang/sq/adminplugins.txt
new file mode 100644
index 0000000..f87626c
--- /dev/null
+++ b/sources/inc/lang/sq/adminplugins.txt
@@ -0,0 +1 @@
+===== Plugin-e Shtesë =====
\ No newline at end of file
diff --git a/sources/inc/lang/sq/backlinks.txt b/sources/inc/lang/sq/backlinks.txt
new file mode 100644
index 0000000..b25df00
--- /dev/null
+++ b/sources/inc/lang/sq/backlinks.txt
@@ -0,0 +1,3 @@
+====== Linke të kthyeshëm ======
+
+Kjo është një listë e faqeve që duket se lidhen mbrapsht te kjo faqe aktuale.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/conflict.txt b/sources/inc/lang/sq/conflict.txt
new file mode 100644
index 0000000..9c6cc94
--- /dev/null
+++ b/sources/inc/lang/sq/conflict.txt
@@ -0,0 +1,5 @@
+====== Ekziston një version më i ri ======
+
+Ekziston një version më i ri i dokumentit që ju redaktuat. Kjo ndodh kur një përdorues tjetër e ndryshoi dokumentin ndërkohë që ju po e redaktonit atë.
+
+Gjeni ndryshimet e treguara më poshtë dhe pastaj vendosni se kë version doni të mbani. Nëse zgjidhni "ruaj", versioni juaj do të ruhet. Klikon "fshi" për të mbajtur versioni aktual.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/denied.txt b/sources/inc/lang/sq/denied.txt
new file mode 100644
index 0000000..03e1052
--- /dev/null
+++ b/sources/inc/lang/sq/denied.txt
@@ -0,0 +1,3 @@
+====== Leja Refuzohet ======
+
+Na vjen keq, ju nuk keni të drejta të mjaftueshme për të vazhduar. Mbase harruat të hyni?
\ No newline at end of file
diff --git a/sources/inc/lang/sq/diff.txt b/sources/inc/lang/sq/diff.txt
new file mode 100644
index 0000000..ab03a28
--- /dev/null
+++ b/sources/inc/lang/sq/diff.txt
@@ -0,0 +1,3 @@
+====== Ndryshimet ======
+
+Kjo tregon ndryshimet midis dy versioneve të faqes.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/draft.txt b/sources/inc/lang/sq/draft.txt
new file mode 100644
index 0000000..80634a7
--- /dev/null
+++ b/sources/inc/lang/sq/draft.txt
@@ -0,0 +1,5 @@
+====== Skedari skicë u gjend ======
+
+Sesioni juaj i fundit i redaktimit në këtë faqe nuk përfundoi me sukses. DokuWiki ruajti automatikisht një skicë gjatë punës tuaj të cilën mund ta përdorni tani për të vazhduar redaktimin tuaj. Më poshtë mund të shihni të dhënat që janë ruajtur nga sesioni juaj i fundit.
+
+Ju lutem vendosni nëse doni të //rekuperoni// sesionin tuaj të humbur të redaktimit, //fshini// skicën e ruajtur automatikisht ose //dilni// nga proçesi i redaktimit.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/edit.txt b/sources/inc/lang/sq/edit.txt
new file mode 100644
index 0000000..1f038ea
--- /dev/null
+++ b/sources/inc/lang/sq/edit.txt
@@ -0,0 +1 @@
+Redaktoni faqen dhe shtypni "Ruaj". Shikoni [[wiki:syntax]] për sintaksën e Wiki-t. Nëse doni të provoni disa gjëra, mësoni të hidhni hapat e parë në [[playground:playground|playground]].
\ No newline at end of file
diff --git a/sources/inc/lang/sq/editrev.txt b/sources/inc/lang/sq/editrev.txt
new file mode 100644
index 0000000..08792ea
--- /dev/null
+++ b/sources/inc/lang/sq/editrev.txt
@@ -0,0 +1,2 @@
+**Keni ngarkuar një rishikim të vjetër të dokumentit!** Nëse e ruani, do të krijoni një version të ri me këto të dhëna.
+----
\ No newline at end of file
diff --git a/sources/inc/lang/sq/index.txt b/sources/inc/lang/sq/index.txt
new file mode 100644
index 0000000..6daef1c
--- /dev/null
+++ b/sources/inc/lang/sq/index.txt
@@ -0,0 +1,3 @@
+====== Index ======
+
+Ky është një index mbi të gjitha faqet e disponueshme të renditura sipas [[doku>namespaces|namespaces]].
\ No newline at end of file
diff --git a/sources/inc/lang/sq/install.html b/sources/inc/lang/sq/install.html
new file mode 100644
index 0000000..bad30b1
--- /dev/null
+++ b/sources/inc/lang/sq/install.html
@@ -0,0 +1,8 @@
+
        Kjo faqe ndihmon në instalimin dhe konfigurimin për herë të parë të Dokuwiki-t. Më shumë informacion mbi këtë installer gjendet në faqen e tij të dokumentimit.
        
+
+
        Dokuwiki përdor skedarë të zakonshëm për ruajtjen e faqeve wiki dhe informacioneve të tjera të lidhura me ato faqe (psh imazhe, indekse kërkimi, rishikime të vjetra etj). Në mënyrë që të funksionojë me sukses DokuWiki duhet të ketë akses shkrimi mbi direktoritë që mbajnë këto skedarë. Ky installer nuk është në gjendje të vendosë leje mbi direktoritë. Kjo normalisht duhet bërë drejtpërdrejt nga një command shell ose nëse jeni duke përdorur hostimin, nëpërmjet FTP ose panelit të kontrollit të hostit (psh cPanel).
        
+
+
        Ky installer do të instalojë konfigurimin e DokuWiki-t tuaj
+për ACL, që në këmbim lejon hyrje si administrator dhe akses të menusë së administrimit të DokuWiki-t për të instaluar plugin-e, menaxhuar përdoruesit, menaxhuar akses në faqet wiki dhe ndryshim të konfigurimeve. Nuk është e domosdoshme për DokuWiki-n të funksionojë, megjithatë do ta bëjë DokuWiki-n më të lehtë për tu administruar.
        
+
+
        Përduruesit me përvojë ose përdoruesit me kërkesa speciale për instalim duhet të përdorin këto linke për detaje mbi instruksionet e instalimit dhe konfigurimeve.
        
\ No newline at end of file
diff --git a/sources/inc/lang/sq/lang.php b/sources/inc/lang/sq/lang.php
new file mode 100644
index 0000000..2ed62ed
--- /dev/null
+++ b/sources/inc/lang/sq/lang.php
@@ -0,0 +1,237 @@
+
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '"';
+$lang['doublequoteclosing']    = '"';
+$lang['singlequoteopening']    = '\'';
+$lang['singlequoteclosing']    = '\'';
+$lang['apostrophe']            = '\'';
+$lang['btn_edit']              = 'Redaktoni këtë faqe';
+$lang['btn_source']            = 'Trego kodin burim të faqes';
+$lang['btn_show']              = 'Trego faqen';
+$lang['btn_create']            = 'Krijo këtë faqe';
+$lang['btn_search']            = 'Kërko';
+$lang['btn_save']              = 'Ruaj';
+$lang['btn_preview']           = 'Shikim paraprak';
+$lang['btn_top']               = 'Kthehu ne krye';
+$lang['btn_newer']             = '<< më të hershme';
+$lang['btn_older']             = 'më të vonshme';
+$lang['btn_revs']              = 'Shqyrtime të vjetra';
+$lang['btn_recent']            = 'Ndryshime së fundmi';
+$lang['btn_upload']            = 'Ngarko';
+$lang['btn_cancel']            = 'Harroji';
+$lang['btn_index']             = 'Kreu';
+$lang['btn_secedit']           = 'Redaktoni';
+$lang['btn_login']             = 'Hyrje';
+$lang['btn_logout']            = 'Dalje';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Përditëso';
+$lang['btn_delete']            = 'Fshi';
+$lang['btn_back']              = 'Mbrapa';
+$lang['btn_backlink']          = 'Lidhjet këtu';
+$lang['btn_backtomedia']       = 'Mbrapa tek Përzgjedhja e Media-ve';
+$lang['btn_subscribe']         = 'Menaxho Abonimet';
+$lang['btn_profile']           = 'Përditëso Profilin';
+$lang['btn_reset']             = 'Rivendos';
+$lang['btn_draft']             = 'Redakto skicën';
+$lang['btn_recover']           = 'Rekupero skicën';
+$lang['btn_draftdel']          = 'Fshi skicën';
+$lang['btn_revert']            = 'Kthe si më parë';
+$lang['btn_register']          = 'Regjsitrohuni';
+$lang['loggedinas']            = 'Regjistruar si ';
+$lang['user']                  = 'Nofka e përdoruesit:';
+$lang['pass']                  = 'Fjalëkalimi';
+$lang['newpass']               = 'Fjalëkalim i ri';
+$lang['oldpass']               = 'Konfirmo fjalëkalimin aktual';
+$lang['passchk']               = 'Edhe një herë';
+$lang['remember']              = 'Më mbaj mend';
+$lang['fullname']              = 'Emri i vërtetë';
+$lang['email']                 = 'Adresa e email-it*';
+$lang['profile']               = 'Profili i përdoruesit';
+$lang['badlogin']              = 'Na vjen keq, emri ose fjalëkalimi është gabim.';
+$lang['minoredit']             = 'Ndryshime të Vogla';
+$lang['draftdate']             = 'Skica u ruajt automatikisht në';
+$lang['nosecedit']             = 'Faqja u ndryshua ndëwrkohë, informacioni i kwtij seksioni ishte i vjetër, u ngarkua faqja e tërë në vend të saj.';
+$lang['regmissing']            = 'Na vjen keq, duhet të plotësoni të gjitha fushat.';
+$lang['reguexists']            = 'Na vjen keq, ekziston një përdorues tjetër me të njëjtin emër.';
+$lang['regsuccess']            = 'Përdoruesi u regjistrua dhe fjalëkalimi u dërgua me email.';
+$lang['regsuccess2']           = 'Llogarija e Përdoruesit u krijua';
+$lang['regmailfail']           = 'Duket se ka ndodhur një gabim gjatë dërgimit të fjalëkalimit me e-mail. Ju lutemi kontaktoni administratorin!';
+$lang['regbadmail']            = 'Adresa email e dhënë nuk mund të pranohet sepse nuk duket e rregullt. Ju lutem fusni një adresë të rregullt ose boshatisni kutinë e shtypit.';
+$lang['regbadpass']            = 'Dy fjalëkalimet e dhëna nuk janë njësoj, ju lutemi provoni përsëri.';
+$lang['regpwmail']             = 'Fjalëkalimi juaj i DokuWiki-it.';
+$lang['reghere']               = 'Ende nuk keni llogari? Hap një';
+$lang['profna']                = 'Ky wiki nuk e lejon ndryshimin e profilit.';
+$lang['profnochange']          = 'Asnjë ndryshim, asgjë për të bërë.';
+$lang['profnoempty']           = 'Një emër bosh ose adresë email-i bosh nuk lejohet.';
+$lang['profchanged']           = 'Profili i përdoruesit u përditësua me sukses.';
+$lang['pwdforget']             = 'E harruat fjalëkalimin? Merni një të ri';
+$lang['resendna']              = 'Ky wiki nuk e lejon ridërgimin e fjalëkalimeve.';
+$lang['resendpwdmissing']      = 'Na vjen keq, duhet t\'i plotësoni të gjitha fushat.';
+$lang['resendpwdnouser']       = 'Na vjen keq, nuk mund ta gjejmë këtë përdorues në bazën tonë të të dhënave.';
+$lang['resendpwdbadauth']      = 'Na vjen keq, ky kod autorizimi nuk është i vlefshëm. Sigurohuni që përdoret linkun e plotë të konfirmimit.';
+$lang['resendpwdconfirm']      = 'U dërgua një link konfirmimi nëpërmjet eMail-it.';
+$lang['resendpwdsuccess']      = 'Fjalëkalimi juaj i ri u dërgua nëpërmjet eMail-it.';
+$lang['license']               = 'Përveç rasteve të përcaktuara, përmbajtja në këtë wiki është e liçnsuar nën liçensën e mëposhtme:';
+$lang['licenseok']             = 'Shënim: Duke redaktuar këtë faqe ju bini dakort të liçensoni përmbajtjen tuaj nën liçensën e mëposhtme:';
+$lang['searchmedia']           = 'Kërko emrin e skedarit:';
+$lang['searchmedia_in']        = 'Kërko në %s';
+$lang['txt_upload']            = 'Zgjidh skedarin për ngarkim';
+$lang['txt_filename']          = 'Ngarko si (alternative)';
+$lang['txt_overwrt']           = 'Zëvendëso skedarin ekzistues';
+$lang['lockedby']              = 'Kyçur momentalisht nga';
+$lang['lockexpire']            = 'Kyçi skadon në';
+$lang['js']['willexpire']            = 'Kyçi juaj për redaktimin e kësaj faqeje është duke skaduar.\nPër të shmangur konflikte përdorni butonin Shiko Paraprakisht për të rivendosur kohën e kyçjes.';
+$lang['js']['notsavedyet']     = 'Ndryshimet e paruajtura do të humbasin.\nVazhdo me të vërtetë?';
+$lang['rssfailed']             = 'Ndoshi një gabim gjatë kapjes së këtij lajmi:';
+$lang['nothingfound']          = 'Nuk u gjet asgjë.';
+$lang['mediaselect']           = 'Skedarët e Medias';
+$lang['fileupload']            = 'Ngarkoje';
+$lang['uploadsucc']            = 'Ngarkim i suksesshëm';
+$lang['uploadfail']            = 'Ngarkimi dështoi. Ndoshta leje të gabuara?';
+$lang['uploadwrong']           = 'Ngarkimi u refuzua! Prapashtesa e skedarit është e ndaluar!';
+$lang['uploadexist']           = 'Skedari ekziston. Nuk u bë asgjë.';
+$lang['uploadbadcontent']      = 'Përmbajtja e ngarkimit nuk përkoi me prapshtesën e skedarit %s';
+$lang['uploadspam']            = 'Ngarkimi u bllokua nga lista e zezë e spam-eve.';
+$lang['uploadxss']             = 'Ngarkimi u bllokua për dyshim përmbajtjeje jo të sigurt.';
+$lang['uploadsize']            = 'Skedari i ngarkuar ishte tepër i madh. (maksimumi %s)';
+$lang['deletesucc']            = 'Skedari "%s" u fshi.';
+$lang['deletefail']            = '"%s" nuk mundi të fshihej. Kontrollo lejet.';
+$lang['mediainuse']            = 'Skedari "%s" nuk u fshi - është ende në përdorim.';
+$lang['namespaces']            = 'Hapësirat e Emrave';
+$lang['mediafiles']            = 'Skedarët e disponueshëm në';
+$lang['js']['searchmedia']     = 'Kërko për skedarë';
+$lang['js']['keepopen']        = 'Mbaje dritaren të hapur gjatë përzgjedhjes';
+$lang['js']['hidedetails']     = 'Fshih Detajet';
+$lang['js']['nosmblinks']      = 'Lidhja te Windows shares funksionon vetëm në Microsoft Internet Explorer. Ju prapë mund ta kopjoni dhe ngjitni linkun.';
+$lang['js']['linkwiz']         = 'Magjistari i Link';
+$lang['js']['linkto']          = 'Lidh tek:';
+$lang['js']['del_confirm']     = 'Fshiji vërtetë objektet e përzgjedhura?';
+$lang['mediausage']            = 'Përdor sintaksën e mëposhtme për të referuar këtë skedar:';
+$lang['mediaview']             = 'Shiko skedarin origjinal';
+$lang['mediaroot']             = 'rrënja';
+$lang['mediaupload']           = 'Ngarko një skedar tek hapësira e emrit aktuale këtu. Për të krijuaj nënhapësira emri, bashkangjiti ato pas emrit të skedarit "Ngarko Si" duke e ndarë me dy pika (:).';
+$lang['mediaextchange']        = 'Prapashtesa e skedarit u ndërrua nga .%s në .%s!';
+$lang['reference']             = 'Referenca për:';
+$lang['ref_inuse']             = 'Skedari nuk mund të fshihet, sepse është duke u përdorur ende nga faqet e mëposhtme:';
+$lang['ref_hidden']            = 'Disa referenca janë në faqe të cilat ju nuk keni leje t\'i lexoni.';
+$lang['hits']                  = 'Pamje';
+$lang['quickhits']             = 'Emrat e faqeve që përkojnë';
+$lang['toc']                   = 'Tabela e Përmbajtjeve';
+$lang['current']               = 'aktuale';
+$lang['yours']                 = 'Versioni Juaj';
+$lang['diff']                  = 'Trego ndryshimet nga rishikimet aktuale';
+$lang['diff2']                 = 'Trego ndryshimet mes rishikimeve të përzgjedhura';
+$lang['line']                  = 'Vijë';
+$lang['breadcrumb']            = 'Gjurmë';
+$lang['youarehere']            = 'Ju jeni këtu';
+$lang['lastmod']               = 'Redaktuar për herë të fundit';
+$lang['by']                    = 'nga';
+$lang['deleted']               = 'u fshi';
+$lang['created']               = 'u krijua';
+$lang['restored']              = 'Kthehu tek një version i vjetër (%s)';
+$lang['external_edit']         = 'redaktim i jashtëm';
+$lang['summary']               = 'Përmbledhja redaktimit';
+$lang['noflash']               = 'Nevojitet Adobe Flash Plugin për të paraqitur këtë përmbajtje.';
+$lang['download']              = 'Shkarko Copën';
+$lang['mail_newpage']          = 'faqje u shtua:';
+$lang['mail_changed']          = 'faqja u ndryshua:';
+$lang['mail_subscribe_list']   = 'faqet u ndryshuan në hapësirën e emrave:';
+$lang['mail_new_user']         = 'përdorues i ri:';
+$lang['mail_upload']           = 'skedari u ngarkua:';
+$lang['qb_bold']               = 'Tekst i Theksuar';
+$lang['qb_italic']             = 'Tekst i Pjerrët';
+$lang['qb_underl']             = 'Tekst i Nënvijëzuar';
+$lang['qb_code']               = 'Tekst Kodi';
+$lang['qb_strike']             = 'Tekst me Vijë Mespërmes';
+$lang['qb_h1']                 = 'Titull me Nivel 1';
+$lang['qb_h2']                 = 'Titull me Nivel 2';
+$lang['qb_h3']                 = 'Titull me Nivel 3';
+$lang['qb_h4']                 = 'Titull me Nivel 4';
+$lang['qb_h5']                 = 'Titull me Nivel 5';
+$lang['qb_h']                  = 'Titull';
+$lang['qb_hs']                 = 'Përzgjidh Titull';
+$lang['qb_hplus']              = 'Titull Më i Lartë';
+$lang['qb_hminus']             = 'Titull Më i Ulët';
+$lang['qb_hequal']             = 'Titull i të Njëjtit Nivel';
+$lang['qb_link']               = 'Lidhje e Brendshme';
+$lang['qb_extlink']            = 'Lidhje e Jashtme ';
+$lang['qb_hr']                 = 'Vijë Horizontale';
+$lang['qb_ol']                 = 'Listë Objektesh të Renditur';
+$lang['qb_ul']                 = 'Listë Objektesh të Parenditura';
+$lang['qb_media']              = 'Shto imazhe dhe skedarë të tjerë';
+$lang['qb_sig']                = 'Fut Firmën';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Karaktere Speciale';
+$lang['upperns']               = 'kërce tek hapësira e emrit prind';
+$lang['admin_register']        = 'Shto Përdorues të Ri';
+$lang['metaedit']              = 'Redakto Metadata';
+$lang['metasaveerr']           = 'Shkrimi i metadata-ve dështoi';
+$lang['metasaveok']            = 'Metadata u ruajt';
+$lang['img_backto']            = 'Mbrapa te';
+$lang['img_title']             = 'Titulli ';
+$lang['img_caption']           = 'Titra';
+$lang['img_date']              = 'Data';
+$lang['img_fname']             = 'Emri Skedarit';
+$lang['img_fsize']             = 'Madhësia';
+$lang['img_artist']            = 'Autor';
+$lang['img_copyr']             = 'Mbajtësi i të drejtave të autorit';
+$lang['img_format']            = 'Formati';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Fjalë Kyçe';
+$lang['subscr_subscribe_success'] = 'Iu shtua %s listës së abonimeve për %s';
+$lang['subscr_subscribe_error'] = 'Gabim gjatë shtimit të %s listës së abonimeve për %s';
+$lang['subscr_subscribe_noaddress'] = 'Nuk ekziston asnjë adresë e lidhur me regjistrimin tuaj, ju nuk mund t\'i shtoheni listës së abonimeve.';
+$lang['subscr_unsubscribe_success'] = 'U hoq %s nga lista e abonimeve për %s';
+$lang['subscr_unsubscribe_error'] = 'Gabim në heqjen e %s nga lista e abonimeve për %s';
+$lang['subscr_already_subscribed'] = '%s është abonuar njëherë te %s';
+$lang['subscr_not_subscribed'] = '%s nuk është abonuar te %s';
+$lang['subscr_m_not_subscribed'] = 'Momentalisht ju nuk jeni i abonuar në faqen aktuale apo hapësirën e emrit aktual.';
+$lang['subscr_m_new_header']   = 'Shto abonim';
+$lang['subscr_m_current_header'] = 'Abonimet aktuale';
+$lang['subscr_m_unsubscribe']  = 'Fshi Abonimin';
+$lang['subscr_m_subscribe']    = 'Abonohu';
+$lang['subscr_m_receive']      = 'Mer';
+$lang['subscr_style_every']    = 'email mbi çdo ndryshim';
+$lang['authtempfail']          = 'Autentikimi i përdoruesve është përkohësisht i padisponueshëm. Nëse kjo gjendje vazhdon, ju lutemi të informoni Administratorin tuaj të Wiki-it.';
+$lang['i_chooselang']          = 'Zgjidhni gjuhën tuaj';
+$lang['i_installer']           = 'Installer-i DokuWiki';
+$lang['i_wikiname']            = 'Emri Wiki-it';
+$lang['i_enableacl']           = 'Aktivizo ACL (rekomanduar)';
+$lang['i_superuser']           = 'Superpërdorues';
+$lang['i_problems']            = 'Installer-i gjeti disa probleme, të shfaqura më poshtë. Nuk mund të vazhdoni derisa t\'i keni rregulluar.';
+$lang['i_modified']            = 'Për arsye sigurie ky skript do të punojë vetëm me një instalim të ri dhe të pamodifikuar DokuWiki.
+Ose duhet të ekstraktoni skedarët nga e para nga pakoja e shkarkimit ose konsultohuni me Dokuwiki installation instructions';
+$lang['i_funcna']              = 'Funksioni PHP %s nuk është i disponueshëm. Mbase siguruesi juaj i host-it e ka çaktivizuar për ndonjë arsye?';
+$lang['i_phpver']              = 'Versioni juaj i PHP %s është më i vogël se ai i duhuri %s. Duhet të përditësoni instalimin tuaj të PHP-së.';
+$lang['i_permfail']            = '%s nuk është e shkruajtshme nga DokuWiki. Duhet të rregulloni lejet e përdorimit për këtë direktori.';
+$lang['i_confexists']          = '%s ekziston njëherë';
+$lang['i_writeerr']            = '%s nuk mundi të krijohej. Duhet të kontrolloni lejet e dirkektorisë/skedarit dhe ta krijoni skedarin manualisht.';
+$lang['i_badhash']             = 'dokuwiki.php e panjohur ose e ndryshuar (hash=code>%s)';
+$lang['i_badval']              = '%s - vlerë e palejuar ose boshe';
+$lang['i_success']             = 'Konfigurimi u mbarua me sukses. Tani mund ta fshini skedarin install.php. Vazhdoni tek DokuWiki juaj i ri..';
+$lang['i_failure']             = 'Ndodhën disa gabime gjatë shkrimit të skedarit të konfigurimit. Do t\'ju duhet t\'i rregulloni manualisht para se të përdorni DokuWiki-in tuaj të ri..';
+$lang['i_policy']              = 'Veprimi fillestar ACL';
+$lang['i_pol0']                = 'Wiki i Hapur (lexim, shkrim, ngarkim për këdo)';
+$lang['i_pol1']                = 'Wiki Publike (lexim për këdo, shkrim dhe ngarkim për përdoruesit e regjistruar)';
+$lang['i_pol2']                = 'Wiki e Mbyllur (lexim, shkrim, ngarkim vetëm për përdoruesit e regjistruar)';
+$lang['i_retry']               = 'Provo Përsëri';
+$lang['recent_global']         = 'Momentalisht jeni duke parë ndryshimet brenda hapësirës së emrit %s. Gjithashtu mund të shihni ndryshimet më të fundit në të gjithë wiki-n.';
+$lang['years']                 = '%d vite më parë';
+$lang['months']                = '%d muaj më parë';
+$lang['weeks']                 = '%d javë më parë';
+$lang['days']                  = '%d ditë më parë';
+$lang['hours']                 = '%d orë më parë';
+$lang['minutes']               = '%d minuta më parë';
+$lang['seconds']               = '%d sekonda më parë';
diff --git a/sources/inc/lang/sq/locked.txt b/sources/inc/lang/sq/locked.txt
new file mode 100644
index 0000000..8c86c8b
--- /dev/null
+++ b/sources/inc/lang/sq/locked.txt
@@ -0,0 +1,3 @@
+====== Faqe e kyçur ======
+
+Kjo faqe është përkohësisht e kyçur për redaktim nga një përdorues tjetër. Duhet të prisni derisa ky përdorues të mbarojë redaktimin ose çelësi të skadojë.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/login.txt b/sources/inc/lang/sq/login.txt
new file mode 100644
index 0000000..843e476
--- /dev/null
+++ b/sources/inc/lang/sq/login.txt
@@ -0,0 +1,3 @@
+====== Hyrje ======
+
+Momentalisht nuk jeni të futur në Wiki! Futni informacionet tuaja të autentikimit më poshtë për të hyrë. Duhet t'i keni cookies të aktivizuara për të hyrë.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/mailtext.txt b/sources/inc/lang/sq/mailtext.txt
new file mode 100644
index 0000000..0746ca4
--- /dev/null
+++ b/sources/inc/lang/sq/mailtext.txt
@@ -0,0 +1,16 @@
+Një faqe në DokuWiki-n tuaj u shtua ose u ndryshua. Këto janë detajet:
+
+Data: @DATE@
+Shfletuesi: @BROWSER@
+Adresa IP: @IPADDRESS@
+Emri Hostit: @HOSTNAME@
+Rishikimi i vjetër: @OLDPAGE@
+Rishikimi i ri: @NEWPAGE@
+Përmbledhja redaktimit: @SUMMARY@
+Përdoruesi: @USER@
+
+@DIFF@
+
+---
+Ky email u gjenerua nga DokuWiki në 
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sq/newpage.txt b/sources/inc/lang/sq/newpage.txt
new file mode 100644
index 0000000..1db750d
--- /dev/null
+++ b/sources/inc/lang/sq/newpage.txt
@@ -0,0 +1,3 @@
+====== Kjo temë nuk ekziston ende ======
+
+Keni ndjekur një link për në një temë që nuk ekziston ende. Nëse ua lejojnë të drejtat, mund ta krijoni duke klikuar butonin "Krijo këtë faqe".
\ No newline at end of file
diff --git a/sources/inc/lang/sq/norev.txt b/sources/inc/lang/sq/norev.txt
new file mode 100644
index 0000000..0e73223
--- /dev/null
+++ b/sources/inc/lang/sq/norev.txt
@@ -0,0 +1,3 @@
+====== Nuk ekzistion një rishikim i tillë ======
+
+Rishikimi i specifikuar nuk ekziston. Përdor buttonin "Rishikime të vjetra" për një listë të rishikimeve të vjetra të këtij dokumenti.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/password.txt b/sources/inc/lang/sq/password.txt
new file mode 100644
index 0000000..1c8a869
--- /dev/null
+++ b/sources/inc/lang/sq/password.txt
@@ -0,0 +1,10 @@
+Përshëndetje @FULLNAME@!
+
+Këtu janë të dhënat e përdoruesit për @TITLE@ në @DOKUWIKIURL@
+
+Hyrje: @LOGIN@
+Fjalëkalimi: @PASSWORD@
+
+---
+Ky email u gjenerua nga DokuWiki në 
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sq/preview.txt b/sources/inc/lang/sq/preview.txt
new file mode 100644
index 0000000..07148b8
--- /dev/null
+++ b/sources/inc/lang/sq/preview.txt
@@ -0,0 +1,3 @@
+====== Shikim Paraprak ======
+
+Ky është një shikim paraprak i tekstit tuaj. Kujtohuni: **Nuk** është ruajtur ende!
\ No newline at end of file
diff --git a/sources/inc/lang/sq/pwconfirm.txt b/sources/inc/lang/sq/pwconfirm.txt
new file mode 100644
index 0000000..44d6c2d
--- /dev/null
+++ b/sources/inc/lang/sq/pwconfirm.txt
@@ -0,0 +1,13 @@
+Përshëndetje @FULLNAME@!
+
+Dikush kërkoi një fjalëkalim të ri për hyrjen tuaj @TITLE@ në @DOKUWIKIURL@
+
+Nëse nuk kërkuat një fjalëkalim të ri atëherë thjesht injorojeni këtë email.
+
+Për të konfirmuar që kërkesa u dërgua me të vërtetë nga ju, ju lutemi përdorni link-un e mëposhtëm.
+
+@CONFIRM@
+
+--
+Ky email u gjenerua nga DokuWiki në 
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sq/read.txt b/sources/inc/lang/sq/read.txt
new file mode 100644
index 0000000..cbb0280
--- /dev/null
+++ b/sources/inc/lang/sq/read.txt
@@ -0,0 +1 @@
+Kjo faqe është vetëm për lexim. Mund të shihni kodin burim, por nuk mund ta ndryshoni atë. Kontaktoni administratorin nëse mendoni se kjo është e gabuar.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/recent.txt b/sources/inc/lang/sq/recent.txt
new file mode 100644
index 0000000..4b3bdf4
--- /dev/null
+++ b/sources/inc/lang/sq/recent.txt
@@ -0,0 +1,3 @@
+====== Ndryshimet e kohëve të fundit ======
+
+Faqet e mëposhtme janë ndryshuar së fundmi.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/register.txt b/sources/inc/lang/sq/register.txt
new file mode 100644
index 0000000..d4a3ca3
--- /dev/null
+++ b/sources/inc/lang/sq/register.txt
@@ -0,0 +1,3 @@
+====== Regjistrohuni si një përdorues i ri ======
+
+Plotësoni të gjitha informacionet e mëposhtme për të krijuar një llogari në këtë wiki. Sigorohuni që të jepni një **adresë email-i të vlefshme**. Nëse nuk ju kërkohet të futni një fjalëkalim këtu, një fjalëkalim i ri do t'ju dërgohet në adresën e email-it që specifikuat. Emri i hyrjes duhet të një [[doku>pagename|pagename]] e vlefshme.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/registermail.txt b/sources/inc/lang/sq/registermail.txt
new file mode 100644
index 0000000..ef90e45
--- /dev/null
+++ b/sources/inc/lang/sq/registermail.txt
@@ -0,0 +1,14 @@
+Një përdorues i ri u regjistrua. Këto janë detajet:
+
+Emri përdoruesit: @NEWUSER@
+Emri i plotë i përdoruesit: @NEWNAME@
+E-mail: @NEWEMAIL@
+
+Data: @DATE@
+Shfletuesi: @BROWSER@
+Adresa IP: @IPADDRESS@
+Emri Hostit: @HOSTNAME@
+
+--
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sq/resendpwd.txt b/sources/inc/lang/sq/resendpwd.txt
new file mode 100644
index 0000000..79d0b3e
--- /dev/null
+++ b/sources/inc/lang/sq/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Dërgo fjalëkalim të ri ======
+
+Ju lutemi futni emrin tuaj të përdorimit në formën e mëposhtme për të kërkuar një fjalëkalim të ri për llogarinë tuaj në këtë wiki. Një link konfirmimi do të dërgohet në adresën tuaj të eMail-it.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/revisions.txt b/sources/inc/lang/sq/revisions.txt
new file mode 100644
index 0000000..349631f
--- /dev/null
+++ b/sources/inc/lang/sq/revisions.txt
@@ -0,0 +1,3 @@
+====== Rishikime të vjetra ======
+
+Këto janë rishikimet e vjetra të dokumentit aktual. Për t'u kthyer në një rishikim të vjetër, zgjidhni nga këtu poshtë, klikoni "Redaktoni këtë faqe" dhe ruajeni atë.
diff --git a/sources/inc/lang/sq/searchpage.txt b/sources/inc/lang/sq/searchpage.txt
new file mode 100644
index 0000000..2f34cab
--- /dev/null
+++ b/sources/inc/lang/sq/searchpage.txt
@@ -0,0 +1,5 @@
+====== Kërko ======
+
+Mund të gjeni rezultatet e kërkimit tuaj më poshtë. Nëse nuk e gjetët atë që po kërkonit, mund të krijoni ose redaktoni një faqe pas pyetjes suaj me butonin përkatës.
+
+===== Rezultate =====
\ No newline at end of file
diff --git a/sources/inc/lang/sq/showrev.txt b/sources/inc/lang/sq/showrev.txt
new file mode 100644
index 0000000..9c1f761
--- /dev/null
+++ b/sources/inc/lang/sq/showrev.txt
@@ -0,0 +1,2 @@
+**Ky është një rishikim i vjetër i dokumentit!**
+----
\ No newline at end of file
diff --git a/sources/inc/lang/sq/stopwords.txt b/sources/inc/lang/sq/stopwords.txt
new file mode 100644
index 0000000..e356694
--- /dev/null
+++ b/sources/inc/lang/sq/stopwords.txt
@@ -0,0 +1,39 @@
+# Kjo është një listë e fjalëve që indexer-i injoron, një fjalë për rresht
+# Kur të redaktoni këtë faqe sigurohuni që të përdorni fund-rreshtash UNIX (rresht i ri i vetëm)
+# Nuk është nevoja të përfshini fjalë më të shkurtra se tre karaktere - këtë injorohen gjithsesi
+# Kjo listë bazohet mbi ato që gjenden në 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
\ No newline at end of file
diff --git a/sources/inc/lang/sq/subscr_digest.txt b/sources/inc/lang/sq/subscr_digest.txt
new file mode 100644
index 0000000..41404cf
--- /dev/null
+++ b/sources/inc/lang/sq/subscr_digest.txt
@@ -0,0 +1,20 @@
+Përshëndetje!
+
+Faqja @PAGE@ në wiki-n @TITLE@ ndryshoi.
+Këtu janë ndryshimet:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Rishikimi i vjetër: @OLDPAGE@
+Rishikimi i ri: @NEWPAGE@
+
+Për të fshirë lajmërimet e faqes, mund të hyni tek wiki në
+@DOKUWIKIURL@ pastaj vizitoni
+@SUBSCRIBE@
+dhe ç'regjistro faqen dhe/ose ndryshimet e hapësirës së emrit.
+
+--
+Ky eMail është gjeneruar nga DokuWiki në
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sq/subscr_form.txt b/sources/inc/lang/sq/subscr_form.txt
new file mode 100644
index 0000000..7c71a4c
--- /dev/null
+++ b/sources/inc/lang/sq/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Menaxhimi i Abonimeve ======
+
+Kjo faqe lejon menaxhimin e abonimeve tuaja për faqen dhe hapësirën e emrit aktual.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/subscr_list.txt b/sources/inc/lang/sq/subscr_list.txt
new file mode 100644
index 0000000..cb10d42
--- /dev/null
+++ b/sources/inc/lang/sq/subscr_list.txt
@@ -0,0 +1,13 @@
+Përshëndetje!
+
+Faqet në hapësirën e emrit @PAGE@ të wiki-t @TITLE@ ndryshuan. Këto janë faqet e ndryshuara:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Për të fshirë lajmërimet e faqes, hyni në wiki-n tek @DOKUWIKIURL@ dhe pastaj vizitoni @SUBSCRIBE@ dhe fshini ndryshimet e faqes dhe/ose të hapësirës së emrit.
+
+--
+Ky email u gjenerua nga DokuWiki në 
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sq/subscr_single.txt b/sources/inc/lang/sq/subscr_single.txt
new file mode 100644
index 0000000..df28ee1
--- /dev/null
+++ b/sources/inc/lang/sq/subscr_single.txt
@@ -0,0 +1,23 @@
+Përshëndetje!
+
+Faqja @PAGE@ në wiki-n @TITLE@ ndryshoi.
+Këto janë ndryshimet:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Data : @DATE@
+Përdoruesi : @USER@
+Përmbledhja redaktimit: @SUMMARY@
+Rishikimi i vjetër: @OLDPAGE@
+Rishikimi i ri: @NEWPAGE@
+
+Për të fshirë lajmërimet e faqes, hyni në wiki tek
+@DOKUWIKIURL@ dhe pastaj vizitoni
+@SUBSCRIBE@
+dhe fshini ndryshimet e faqes dhe/ose hapësirës së emrit.
+
+--
+Ky email u gjenerua nga DokuWiki në
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sq/updateprofile.txt b/sources/inc/lang/sq/updateprofile.txt
new file mode 100644
index 0000000..ba76beb
--- /dev/null
+++ b/sources/inc/lang/sq/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Përditësoni profilin e llogarisë tuaj ======
+
+Duhet vetëm të plotësoni ato fusha që doni të ndryshoni. Mund të mos e ndryshoni emrin tuaj të përdoruesit.
\ No newline at end of file
diff --git a/sources/inc/lang/sq/uploadmail.txt b/sources/inc/lang/sq/uploadmail.txt
new file mode 100644
index 0000000..e7c62df
--- /dev/null
+++ b/sources/inc/lang/sq/uploadmail.txt
@@ -0,0 +1,14 @@
+Një skedar u ngarkua në DokuWiki-n tënd. Detajet janë:
+
+Skedar: @MEDIA@
+Data: @DATE@
+Shfletuesi: @BROWSER@
+Adresa IP: @IPADDRESS@
+Emri Hostit: @HOSTNAME@
+Madhësia: @SIZE@
+Tipi MIME: @MIME@
+Përdoruesi: @USER@
+
+---
+Ky email u gjenerua nga DokuWiki në 
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sr/admin.txt b/sources/inc/lang/sr/admin.txt
new file mode 100644
index 0000000..1e42970
--- /dev/null
+++ b/sources/inc/lang/sr/admin.txt
@@ -0,0 +1,4 @@
+====== Администрација ======
+
+Изпод се налази листа доступних администраторских опција у DokuWiki-ју.
+
diff --git a/sources/inc/lang/sr/adminplugins.txt b/sources/inc/lang/sr/adminplugins.txt
new file mode 100644
index 0000000..02b1a04
--- /dev/null
+++ b/sources/inc/lang/sr/adminplugins.txt
@@ -0,0 +1 @@
+===== Остали додаци =====
\ No newline at end of file
diff --git a/sources/inc/lang/sr/backlinks.txt b/sources/inc/lang/sr/backlinks.txt
new file mode 100644
index 0000000..dae8d5a
--- /dev/null
+++ b/sources/inc/lang/sr/backlinks.txt
@@ -0,0 +1,4 @@
+====== Повратне везе ======
+
+Ово је листа страница које имају везе ка тренутној страници.
+
diff --git a/sources/inc/lang/sr/conflict.txt b/sources/inc/lang/sr/conflict.txt
new file mode 100644
index 0000000..2a1427e
--- /dev/null
+++ b/sources/inc/lang/sr/conflict.txt
@@ -0,0 +1,6 @@
+====== Постоји новија верзија ======
+
+Постоји новија верзија документа који сте изменили. Ово се дешава када неки други корисник измени документ док га Ви још увек мењате.
+
+Проучите разлике које су доле детаљно приказане, па након тога одлучите коју верзију желите да задржите. Ако изаберете ''сачувај'', Ваша верзија ће да буде сачувана. Ако изаберите ''поништи'', тренутна верзија ће да буде сачувана.
+
diff --git a/sources/inc/lang/sr/denied.txt b/sources/inc/lang/sr/denied.txt
new file mode 100644
index 0000000..b74f2b1
--- /dev/null
+++ b/sources/inc/lang/sr/denied.txt
@@ -0,0 +1,4 @@
+====== Забрањен приступ ======
+
+Извините, али немате довољно права да наставите. Можда сте заборавили да се пријавите?
+
diff --git a/sources/inc/lang/sr/diff.txt b/sources/inc/lang/sr/diff.txt
new file mode 100644
index 0000000..39b7427
--- /dev/null
+++ b/sources/inc/lang/sr/diff.txt
@@ -0,0 +1,4 @@
+====== Разлике ======
+
+Овде су приказане разлике између изабране ревизије и тренутне верзије странице.
+
diff --git a/sources/inc/lang/sr/draft.txt b/sources/inc/lang/sr/draft.txt
new file mode 100644
index 0000000..44affdd
--- /dev/null
+++ b/sources/inc/lang/sr/draft.txt
@@ -0,0 +1,5 @@
+====== Пронађена је скица датотеке ======
+
+Прошли пут кад сте покушали нешто да измените на овој страници ваше измене нису успешно сачуване. DokuWiki је аутоматски сачувао скицу вашег рада коју сада можете да искористите да бисте наставили са изменама. Испод можете да видите податке који су сачувани током ваше последње посете.
+
+Молимо вас, одаберите да ли желите да  //повратите// ваше измене, //обришете// аутоматски сачувану скицу, или //поништите// цео процес измена.
\ No newline at end of file
diff --git a/sources/inc/lang/sr/edit.txt b/sources/inc/lang/sr/edit.txt
new file mode 100644
index 0000000..2d6fa7b
--- /dev/null
+++ b/sources/inc/lang/sr/edit.txt
@@ -0,0 +1,2 @@
+Измените ову страницу и притисните ''Сачувај''. Погледајте [[wiki:syntax]] за синтаксу Викија. Молим Вас, измените ову страницу само ако имате намеру да је **побољшате**. Ако желите да тестирате могућности, научите да направите своје кораке на [[playground:playground]].
+
diff --git a/sources/inc/lang/sr/editrev.txt b/sources/inc/lang/sr/editrev.txt
new file mode 100644
index 0000000..3279029
--- /dev/null
+++ b/sources/inc/lang/sr/editrev.txt
@@ -0,0 +1,2 @@
+**Учитали сте стару ревизију документа!** Ако је сачувате, направићете нову верзију са овим подацима.
+----
diff --git a/sources/inc/lang/sr/index.txt b/sources/inc/lang/sr/index.txt
new file mode 100644
index 0000000..fe6467a
--- /dev/null
+++ b/sources/inc/lang/sr/index.txt
@@ -0,0 +1,4 @@
+====== Индекс ======
+
+Овде је индекс свих доступних страница поређаних по [[doku>namespaces|именским просторима]].
+
diff --git a/sources/inc/lang/sr/install.html b/sources/inc/lang/sr/install.html
new file mode 100644
index 0000000..c6c70df
--- /dev/null
+++ b/sources/inc/lang/sr/install.html
@@ -0,0 +1,12 @@
+
        Ова страница ће вам помоћи у инсталацији и подешавању Dokuwiki-ја. Више информација о инсталацији можете пронаћи у
+документацији.
        
+
+
        DokuWiki користи обичне датотеке за складиштење вики страница и осталих информација везаних за странице (слике, индекс претраге, старе преправке, итд.).
+Да би радио како треба DokuWiki као апликација мора имати могућност писања под фасциклама у којима се налазе ове датотеке. Овај програм за инсталацију нема могућност постављања дозвола за фасцикле. То се обично ради директно из командне линије или ако користите изнајмњени сервер, помоћу ФТПа или кроз Контролни панел (нпр. cPanel).
        
+
+
        Овај програм за инсталацију DokuWiki-а ће поставити подешавања за
+Права приступа, које ће омогућити пријјављивање као администратор и приступ менију за инсталацију додатака, управљање корисницима, управљање приступом ка страницама и алтернатвна подешавања. Није неопходно да би DokuWiki радио, али ће вам олакшати администрацију.
        
+
+
        Искуснији корисници и корисници са посебним захтевима би требало да погледају следеће линкове са детаљним упутствима о
+инструкцијама за инсталацију
+и подешавањима.
        
\ No newline at end of file
diff --git a/sources/inc/lang/sr/lang.php b/sources/inc/lang/sr/lang.php
new file mode 100644
index 0000000..7c434cb
--- /dev/null
+++ b/sources/inc/lang/sr/lang.php
@@ -0,0 +1,262 @@
+
+ * @author Иван Петровић (Ivan Petrovic) 
+ * @author Miroslav Šolti 
+ */
+$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_profile']           = 'Ажурирај профил';
+$lang['btn_reset']             = 'Поништи';
+$lang['btn_draft']             = 'Измени нацрт';
+$lang['btn_recover']           = 'Опорави нацрт';
+$lang['btn_draftdel']          = 'Обриши нацрт';
+$lang['btn_revert']            = 'Врати на пређашњу верзију';
+$lang['btn_register']          = 'Региструј се';
+$lang['loggedinas']            = 'Пријављен као';
+$lang['user']                  = 'Корисничко име';
+$lang['pass']                  = 'Лозинка';
+$lang['newpass']               = 'Нова лозинка';
+$lang['oldpass']               = 'Потврди нову лозинку';
+$lang['passchk']               = 'поново';
+$lang['remember']              = 'Запамти ме';
+$lang['fullname']              = 'Име и презиме';
+$lang['email']                 = 'Е-адреса';
+$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']             = 'Ваша DokuWiki лозинка';
+$lang['reghere']               = 'Још увек немате налог? Само направите један';
+$lang['profna']                = 'Овај вики не дозвољава измену профила';
+$lang['profnochange']          = 'Нема промена.';
+$lang['profnoempty']           = 'Није дозвољено оставити празно поље имена или е-адресе.';
+$lang['profchanged']           = 'Кориснички профил је ажуриран.';
+$lang['pwdforget']             = 'Заборавили сте лозинку? Направите нову';
+$lang['resendna']              = 'Овај вики не дозвољава слање лозинки.';
+$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['js']['willexpire']            = 'Ваше закључавање за измену ове странице ће да истекне за један минут.\nДа би сте избегли конфликте, искористите дугме за преглед како би сте ресетовали тајмер закључавања.';
+$lang['js']['notsavedyet']     = 'Несачуване измене ће бити изгубљене.
+Да ли стварно желите да наставите?';
+$lang['js']['searchmedia']     = 'Потражи фајлове';
+$lang['js']['keepopen']        = 'Задржи отворен прозор након одабира';
+$lang['js']['hidedetails']     = 'Сакриј детаље';
+$lang['js']['mediatitle']      = 'Подешаванја везе';
+$lang['js']['mediadisplay']    = 'Тип везе';
+$lang['js']['mediaalign']      = 'Поравнање';
+$lang['js']['mediasize']       = 'Величина слике';
+$lang['js']['mediatarget']     = 'веза води ка:';
+$lang['js']['mediaclose']      = 'Затвори';
+$lang['js']['mediainsert']     = 'Убаци';
+$lang['js']['mediadisplayimg'] = 'Покажи слику';
+$lang['js']['mediadisplaylnk'] = 'Покажи само везу';
+$lang['js']['mediasmall']      = 'Мала верзија';
+$lang['js']['mediamedium']     = 'Средња верзија';
+$lang['js']['medialarge']      = 'Велика верзија';
+$lang['js']['mediaoriginal']   = 'Оригинална верзија';
+$lang['js']['medialnk']        = 'Веза ка страници са детаљима';
+$lang['js']['mediadirect']     = 'Директна веза ка оригиналу';
+$lang['js']['medianolnk']      = 'Без везе';
+$lang['js']['medianolink']     = 'Не постављај слику као везу';
+$lang['js']['medialeft']       = 'Поравнај слику на лево';
+$lang['js']['mediaright']      = 'Поравнај слику на десно';
+$lang['js']['mediacenter']     = 'Поравнај слику по средини';
+$lang['js']['medianoalign']    = 'Без поравнања';
+$lang['js']['nosmblinks']      = 'Повезивање са Windows дељеним фолдерима ради само у Мајкрософтовом Интернет Претраживачу.
+Ипак, можете да ископирате и залепите везу.';
+$lang['js']['linkwiz']         = 'Чаробњак за стварање везе';
+$lang['js']['linkto']          = 'Повежи ка:';
+$lang['js']['del_confirm']     = 'Обриши овај унос?';
+$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['accessdenied']          = 'Немате дозволу да видите ову страницу.';
+$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['difflink']              = 'Постави везу ка овом компаративном приказу';
+$lang['line']                  = 'Линија';
+$lang['breadcrumb']            = 'Траг';
+$lang['youarehere']            = 'Сада сте овде';
+$lang['lastmod']               = 'Последњи пут мењано';
+$lang['by']                    = 'од';
+$lang['deleted']               = 'избрисано';
+$lang['created']               = 'направљено';
+$lang['restored']              = 'стара верзија повраћена (%s)';
+$lang['external_edit']         = 'спољна измена';
+$lang['summary']               = 'Сажетак измене';
+$lang['noflash']               = 'За приказивање ове врсте материјала потребан вам је Adobe Flash Plugin.';
+$lang['download']              = 'Преузми снипет';
+$lang['mail_newpage']          = 'страница додата:';
+$lang['mail_changed']          = 'страница измењена:';
+$lang['mail_subscribe_list']   = 'Странице промењене у именском простору:';
+$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']            = 'Спољашња веза';
+$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['subscr_subscribe_success'] = '%s је додат на списак претплатника %s';
+$lang['subscr_subscribe_error'] = 'Грешка приликом додавања %s на списак претплатника %s';
+$lang['subscr_subscribe_noaddress'] = 'Не постоји адреса повезана са вашим подацима, стога вас не можемо додати на списак претплатника.';
+$lang['subscr_unsubscribe_success'] = '%s уклоњен са списка претплатника %s';
+$lang['subscr_unsubscribe_error'] = 'Грешка приликом уклањања %s са списка претплатника %s';
+$lang['subscr_already_subscribed'] = '%s је већ претплаћен на %s';
+$lang['subscr_not_subscribed'] = '%s још није претплаћен на %s';
+$lang['subscr_m_not_subscribed'] = 'Тренутно нисте претплаћени на ову страницу или именски простор.';
+$lang['subscr_m_new_header']   = 'Додај претплату';
+$lang['subscr_m_current_header'] = 'Тренутне претплате';
+$lang['subscr_m_unsubscribe']  = 'Уклони претплату';
+$lang['subscr_m_subscribe']    = 'Претплати се';
+$lang['subscr_m_receive']      = 'Прими';
+$lang['subscr_style_every']    = 'имејл о свакој промени';
+$lang['subscr_style_digest']   = 'скраћени имејл о променама за сваку страницу (сваких %.2f дана)';
+$lang['subscr_style_list']     = 'Списак страница промењених након последњег имејла (сваких %.2f дана)';
+$lang['authtempfail']          = 'Провера корисника је тренутно недоступна. Ако се ситуација настави, молимо Вас да обавестите администратора викија.';
+$lang['i_chooselang']          = 'Одаберите језик';
+$lang['i_installer']           = 'Докувики инсталација';
+$lang['i_wikiname']            = 'Назив викија';
+$lang['i_enableacl']           = 'Укључи ';
+$lang['i_superuser']           = 'Суперкорисник';
+$lang['i_problems']            = 'Инсталација је наишла на проблеме који су навадени у тексту испод. Не можете наставити даље док их не исправите.';
+$lang['i_modified']            = 'Из сигурносних разлога ова скрипта ради само са новом Dokuwiki инсталацијом. Требало би или да опет распакујете архиву преузету са сајта или да погледате Dokuwiki инструкције за инсталацију';
+$lang['i_funcna']              = 'ПХП функција %s није доступна. Можда је Ваш хостинг провајдер забранио из неког разлога?';
+$lang['i_phpver']              = '%s Верзија Вашег ПХПа је нижа од неопходне %s. Требало би да надоградите ПХП инсталацију.';
+$lang['i_permfail']            = 'DokuWiki нема дозволу писања у %s. Потребно је да поправите дозволе за ову фасциклу!';
+$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']             = 'Појавили су се проблеми при писању датотеке са подешавањима. Требало би да их ручно исправите пре него што ћете моћи да користите Ваш нови DokuWiki.';
+$lang['i_policy']              = 'Иницијалне корисничке дозволе';
+$lang['i_pol0']                = 'Отворени вики (читање, писање, слање датотека за све)';
+$lang['i_pol1']                = 'Јавни вики (читање за све, писање и слање датотека само за регистроване кориснике)';
+$lang['i_pol2']                = 'Затворени вики (читање, писање и слање датотека само за регистроване кориснике)';
+$lang['i_retry']               = 'Понови';
+$lang['i_license']             = 'Молимо вас, одаберите лиценцу под коју желите да ставите свој садржај:';
+$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 секунди';
+$lang['wordblock']             = 'Ваше измене нису сачуване јер садрже забрањен текст (спам)';
diff --git a/sources/inc/lang/sr/locked.txt b/sources/inc/lang/sr/locked.txt
new file mode 100644
index 0000000..4bcc0ac
--- /dev/null
+++ b/sources/inc/lang/sr/locked.txt
@@ -0,0 +1,3 @@
+====== Страница је закључана ======
+
+Ову страница је други корисник у овом тренутку закључао за измене. Мораћете да сачекате док он не заврши са изменама или не истекне закључавање.
diff --git a/sources/inc/lang/sr/login.txt b/sources/inc/lang/sr/login.txt
new file mode 100644
index 0000000..c2f5a6f
--- /dev/null
+++ b/sources/inc/lang/sr/login.txt
@@ -0,0 +1,4 @@
+====== Пријављивање ======
+
+Тренутно нисте пријављени! Унесите Ваше информације испод да бисте се пријавили. За то је неопходно да колачићи буду омогућен.
+
diff --git a/sources/inc/lang/sr/mailtext.txt b/sources/inc/lang/sr/mailtext.txt
new file mode 100644
index 0000000..2ed99bf
--- /dev/null
+++ b/sources/inc/lang/sr/mailtext.txt
@@ -0,0 +1,17 @@
+Страница на Вашем DokuWiki-ју је додата или измењена. Ево детаља
+
+Датум                 : @DATE@
+Веб читач           : @BROWSER@
+ИП адреса          : @IPADDRESS@
+Име домаћина     : @HOSTNAME@
+Стара ревизија    : @OLDPAGE@
+Нова ревизија      : @NEWPAGE@
+Сажетак измена   : @SUMMARY@
+Корисник             : @USER@
+
+@DIFF@
+
+
+-- 
+Ову поруку је генерисао DokuWiki са
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sr/newpage.txt b/sources/inc/lang/sr/newpage.txt
new file mode 100644
index 0000000..40a36e6
--- /dev/null
+++ b/sources/inc/lang/sr/newpage.txt
@@ -0,0 +1,3 @@
+====== Ова тема још увек не постоји ======
+
+Пратили сте везу до теме која још увек не постоји. Можете да је направите користећи дугме ''Направи ову страницу''.
diff --git a/sources/inc/lang/sr/norev.txt b/sources/inc/lang/sr/norev.txt
new file mode 100644
index 0000000..73f8d0b
--- /dev/null
+++ b/sources/inc/lang/sr/norev.txt
@@ -0,0 +1,4 @@
+====== Не постоји таква ревизија ======
+
+Задата ревизија не постоји. Искористите дугме ''Старе ревизије'' да излистате старе ревизије овог документа.
+
diff --git a/sources/inc/lang/sr/password.txt b/sources/inc/lang/sr/password.txt
new file mode 100644
index 0000000..1141855
--- /dev/null
+++ b/sources/inc/lang/sr/password.txt
@@ -0,0 +1,10 @@
+Здраво @FULLNAME@!
+
+Ево Ваших података за @TITLE@ на @DOKUWIKIURL@
+
+Корисничко име : @LOGIN@
+Шифра          : @PASSWORD@
+
+-- 
+Ову поруку је генерисао DokuWiki на
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sr/preview.txt b/sources/inc/lang/sr/preview.txt
new file mode 100644
index 0000000..be92888
--- /dev/null
+++ b/sources/inc/lang/sr/preview.txt
@@ -0,0 +1,4 @@
+====== Преглед ======
+
+Ово је преглед тога како би Ваш текст изгледао. Не заборавите: он још **није сачуван**!
+
diff --git a/sources/inc/lang/sr/pwconfirm.txt b/sources/inc/lang/sr/pwconfirm.txt
new file mode 100644
index 0000000..35e23b7
--- /dev/null
+++ b/sources/inc/lang/sr/pwconfirm.txt
@@ -0,0 +1,13 @@
+Здраво @FULLNAME@!
+
+Неко је затражио нову лозинку за Ваш налог @TITLE@ на @DOKUWIKIURL@
+
+Ако то нисте Ви, само игноришите ову поруку.
+
+У супротном, да бисте потврдили захтев кликните на следећи линк:
+
+@CONFIRM@
+
+-- 
+Ову поруку је генерисао DokuWiki sa
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sr/read.txt b/sources/inc/lang/sr/read.txt
new file mode 100644
index 0000000..c2d9fff
--- /dev/null
+++ b/sources/inc/lang/sr/read.txt
@@ -0,0 +1,2 @@
+Ова страница је само за читање. Можете да погледате изворни код, али не можете да је мењате. Обратите се администратору ако мислите да то није уреду.
+
diff --git a/sources/inc/lang/sr/recent.txt b/sources/inc/lang/sr/recent.txt
new file mode 100644
index 0000000..54c0c26
--- /dev/null
+++ b/sources/inc/lang/sr/recent.txt
@@ -0,0 +1,5 @@
+====== Скорије измене ======
+
+Следеће странице су биле измењене у скорије време.
+
+
diff --git a/sources/inc/lang/sr/register.txt b/sources/inc/lang/sr/register.txt
new file mode 100644
index 0000000..a553b7a
--- /dev/null
+++ b/sources/inc/lang/sr/register.txt
@@ -0,0 +1,4 @@
+====== Региструјте се као нови корисник ======
+
+Попуните све информације испод како би сте направили нови налог на овом викију. Обавезно упишите **тачну е-адресу** - Ваша нова лозинка ће тамо бити послата. Корисничко име би требало да буде исправно [[doku>pagename|име странице]]
+
diff --git a/sources/inc/lang/sr/registermail.txt b/sources/inc/lang/sr/registermail.txt
new file mode 100644
index 0000000..efdcbb5
--- /dev/null
+++ b/sources/inc/lang/sr/registermail.txt
@@ -0,0 +1,15 @@
+Регистрован је нови корисник. Ово су детаљи:
+
+Корисничко име: @NEWUSER@
+Име и презиме: @NEWNAME@
+Е-адреса: @NEWEMAIL@
+
+Датум: @DATE@
+Веб читач: @BROWSER@
+ИП адреса: @IPADDRESS@
+Домаћин: @HOSTNAME@
+
+
+-- 
+Ову поруку је генерисао DokuWiki sa
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sr/resendpwd.txt b/sources/inc/lang/sr/resendpwd.txt
new file mode 100644
index 0000000..7f6623d
--- /dev/null
+++ b/sources/inc/lang/sr/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Пошаљи нову лозинку ======
+
+Молим Вас унесите корисничко име у форму да бисте затражили нову лозинку за Ваш налог на овом викију. Потврдни линк ће бити послат на е-адресу коју сте користили на регистрацији.
\ No newline at end of file
diff --git a/sources/inc/lang/sr/revisions.txt b/sources/inc/lang/sr/revisions.txt
new file mode 100644
index 0000000..1ca995a
--- /dev/null
+++ b/sources/inc/lang/sr/revisions.txt
@@ -0,0 +1,4 @@
+====== Старе ревизије ======
+
+Ово су старије ревизије тренутног документа. Да би сте повратили стару ревизију, изаберите је одоздо, кликните на ''Измени страницу'' и сачувајте је.
+
diff --git a/sources/inc/lang/sr/searchpage.txt b/sources/inc/lang/sr/searchpage.txt
new file mode 100644
index 0000000..010966a
--- /dev/null
+++ b/sources/inc/lang/sr/searchpage.txt
@@ -0,0 +1,5 @@
+====== Претрага ======
+
+Испод можете да нађете резултате Ваше претраге. Ако нисте нашли то што сте тражили, можете да направите нову страницу названу по Вашем упиту користећи дугме ''Измени ову страницу''.
+
+===== Резултати =====
diff --git a/sources/inc/lang/sr/showrev.txt b/sources/inc/lang/sr/showrev.txt
new file mode 100644
index 0000000..f2aabb2
--- /dev/null
+++ b/sources/inc/lang/sr/showrev.txt
@@ -0,0 +1,2 @@
+**Ово је стара верзија документа!**
+----
diff --git a/sources/inc/lang/sr/stopwords.txt b/sources/inc/lang/sr/stopwords.txt
new file mode 100644
index 0000000..78093e2
--- /dev/null
+++ b/sources/inc/lang/sr/stopwords.txt
@@ -0,0 +1,12 @@
+# Ово је листа речи које се неће индексирати, по једна реч у реду
+# Када мењате ову датотеку проверите да ли је нови ред записан по UNIX систему
+# Нема потребе уносити речи краће од 3 слова - оне се прескачу иначе
+ваш
+они
+њихов
+како
+ово
+шта
+кад
+где
+www
diff --git a/sources/inc/lang/sr/subscr_digest.txt b/sources/inc/lang/sr/subscr_digest.txt
new file mode 100644
index 0000000..db84168
--- /dev/null
+++ b/sources/inc/lang/sr/subscr_digest.txt
@@ -0,0 +1,20 @@
+Здраво!
+
+Страница @PAGE@ под Вики насловом @TITLE@ је промењена.
+Ово су промене:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Стара верзија: @OLDPAGE@
+Нова верзија: @NEWPAGE@
+
+
+Да бисте поништили обавештења о променама страница, улогујте се на Вики овде
+@DOKUWIKIURL@ а затим посетите
+@SUBSCRIBE@ и поништите обавештавање о променама страница и/или именских простора..
+
+--
+Овај имејл је направио DokuWiki на страници
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sr/subscr_form.txt b/sources/inc/lang/sr/subscr_form.txt
new file mode 100644
index 0000000..9bf72e4
--- /dev/null
+++ b/sources/inc/lang/sr/subscr_form.txt
@@ -0,0 +1,3 @@
+===== Управљање претплатама =====
+
+Ова страница вам омогућава да управљате својим претплатама на страницу и именски простор на којима се налазите.
\ No newline at end of file
diff --git a/sources/inc/lang/sr/subscr_list.txt b/sources/inc/lang/sr/subscr_list.txt
new file mode 100644
index 0000000..b388701
--- /dev/null
+++ b/sources/inc/lang/sr/subscr_list.txt
@@ -0,0 +1,17 @@
+Здраво!
+
+Страница у именском простору @PAGE@ под Вики насловом @TITLE@ је промењена.
+Ово су промењене странице:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+
+Да бисте поништили обавештења о променама страница, улогујте се на Вики овде
+@DOKUWIKIURL@ а затим посетите
+@SUBSCRIBE@ и поништите обавештавање о променама страница и/или именских простора..
+
+--
+Овај имејл је направио DokuWiki на страници
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sr/subscr_single.txt b/sources/inc/lang/sr/subscr_single.txt
new file mode 100644
index 0000000..c0ed4d8
--- /dev/null
+++ b/sources/inc/lang/sr/subscr_single.txt
@@ -0,0 +1,23 @@
+Здраво!
+
+Страница @PAGE@ под Вики насловом @TITLE@ је промењена.
+Ово су промене:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Датум : @DATE@
+Корисникr : @USER@
+Измени сиже: @SUMMARY@
+Стара верзија: @OLDPAGE@
+Нова верзија: @NEWPAGE@
+
+
+Да бисте поништили обавештења о променама страница, улогујте се на Бики овде
+@DOKUWIKIURL@ а затим посетите
+@SUBSCRIBE@ и поништите обавештавање о променама страница и/или именских простора..
+
+--
+Овај имејл је направио DokuWiki на страници
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sr/updateprofile.txt b/sources/inc/lang/sr/updateprofile.txt
new file mode 100644
index 0000000..15b9955
--- /dev/null
+++ b/sources/inc/lang/sr/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Ажурирање Вашег профила ======
+
+Потребно је попунити само она поља која желите да промените. Поље Корисничко име не можете да променити.
\ No newline at end of file
diff --git a/sources/inc/lang/sr/uploadmail.txt b/sources/inc/lang/sr/uploadmail.txt
new file mode 100644
index 0000000..36b3bb3
--- /dev/null
+++ b/sources/inc/lang/sr/uploadmail.txt
@@ -0,0 +1,14 @@
+Нова датотека је послата на Ваш DokuWiki. Ово су њени детањи:
+
+Датотека: @MEDIA@
+Датум: @DATE@
+Веб читач: @BROWSER@
+ИП адреса: @IPADDRESS@
+Домаћин: @HOSTNAME@
+Величина: @SIZE@
+MIME тип: @MIME@
+Корисник: @USER@
+
+-- 
+Ову поруку је генерисао DokuWiki sa
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sv/admin.txt b/sources/inc/lang/sv/admin.txt
new file mode 100644
index 0000000..10887da
--- /dev/null
+++ b/sources/inc/lang/sv/admin.txt
@@ -0,0 +1,4 @@
+====== Administration ======
+
+Nedan hittar du en lista över de tillgängliga administrativa uppgifterna i DokuWiki.
+
diff --git a/sources/inc/lang/sv/adminplugins.txt b/sources/inc/lang/sv/adminplugins.txt
new file mode 100644
index 0000000..0af37c7
--- /dev/null
+++ b/sources/inc/lang/sv/adminplugins.txt
@@ -0,0 +1,2 @@
+	
+===== Ytterligare Tillägg =====
\ No newline at end of file
diff --git a/sources/inc/lang/sv/backlinks.txt b/sources/inc/lang/sv/backlinks.txt
new file mode 100644
index 0000000..c907c8e
--- /dev/null
+++ b/sources/inc/lang/sv/backlinks.txt
@@ -0,0 +1,3 @@
+====== Tillbakalänkar ======
+
+Detta är en lista över sidor som verkar länka tillbaka till den aktuella sidan.
diff --git a/sources/inc/lang/sv/conflict.txt b/sources/inc/lang/sv/conflict.txt
new file mode 100644
index 0000000..42168d1
--- /dev/null
+++ b/sources/inc/lang/sv/conflict.txt
@@ -0,0 +1,6 @@
+====== Det finns en senare version ======
+
+Det finns en senare version av dokumentet du har redigerat. Detta kan hända när en annan användare redigerar dokumentet samtidigt som du.
+
+Granska skillnaderna som visas nedan noga, och välj sedan vilken version du vill behålla. Om du väljer ''spara'', så kommer din version att sparas. Välj ''avbryt'' för att behålla den nuvarande versionen.
+
diff --git a/sources/inc/lang/sv/denied.txt b/sources/inc/lang/sv/denied.txt
new file mode 100644
index 0000000..64d1292
--- /dev/null
+++ b/sources/inc/lang/sv/denied.txt
@@ -0,0 +1,4 @@
+====== Åtkomst nekad ======
+
+Tyvärr, du har inte behörighet att fortsätta. Kanske har du glömt att logga in?
+
diff --git a/sources/inc/lang/sv/diff.txt b/sources/inc/lang/sv/diff.txt
new file mode 100644
index 0000000..9fb8c20
--- /dev/null
+++ b/sources/inc/lang/sv/diff.txt
@@ -0,0 +1,4 @@
+====== Skillnader ======
+
+Här visas skillnader mellan den valda versionen och den nuvarande versionen av sidan.
+
diff --git a/sources/inc/lang/sv/draft.txt b/sources/inc/lang/sv/draft.txt
new file mode 100644
index 0000000..3749ad0
--- /dev/null
+++ b/sources/inc/lang/sv/draft.txt
@@ -0,0 +1,6 @@
+====== Utkast hittat ======
+
+Din senaste redigering av sidan avslutades inte på ett korrekt sätt. DokuWiki sparade automatiskt ett utkast under tiden du arbetade, och nu kan du använda det för att fortsätta redigeringen. Nedan kan du se det innehåll som sparats från din förra session.
+
+Bestäm om du vill //återskapa// din förlorade redigeringssession, //radera// det automatiskt sparade utkastet eller //avbryta// redigeringen.
+
diff --git a/sources/inc/lang/sv/edit.txt b/sources/inc/lang/sv/edit.txt
new file mode 100644
index 0000000..187b11f
--- /dev/null
+++ b/sources/inc/lang/sv/edit.txt
@@ -0,0 +1,2 @@
+Redigera sidan och klicka ''Spara''. Se [[wiki:syntax]] för Wikisyntax. Redigera bara sidan om du kan **förbättra** den. Om du vill testa hur saker och ting fungerar, gör det på [[playground:playground|lekplatsen]].
+
diff --git a/sources/inc/lang/sv/editrev.txt b/sources/inc/lang/sv/editrev.txt
new file mode 100644
index 0000000..8bd1adb
--- /dev/null
+++ b/sources/inc/lang/sv/editrev.txt
@@ -0,0 +1,2 @@
+**Du har hämtat en tidigare version av dokumentet!** Om du sparar den så kommer du att skapa en ny version med detta innehåll.
+----
diff --git a/sources/inc/lang/sv/index.txt b/sources/inc/lang/sv/index.txt
new file mode 100644
index 0000000..24d715b
--- /dev/null
+++ b/sources/inc/lang/sv/index.txt
@@ -0,0 +1,4 @@
+====== Innehållsförteckning ======
+
+Detta är en innehållsförteckning över alla tillgängliga sidor, sorterad efter [[doku>namespaces|namnrymder]].
+
diff --git a/sources/inc/lang/sv/install.html b/sources/inc/lang/sv/install.html
new file mode 100644
index 0000000..a6b3ade
--- /dev/null
+++ b/sources/inc/lang/sv/install.html
@@ -0,0 +1,25 @@
+
        Denna sida hjälper dig med nyinstallation och inställningar för
+Dokuwiki. Mer information om
+installationsprogrammet finns på dess egen
+dokumentationssida.
        
+
+
        DokuWiki använder vanliga filer för att lagra wikisidor och annan
+information som här till sidorna (till exempel bilder, sökindex, gamla
+versioner, etc).  För att kunna fungera
+måste DokuWiki ha skrivrättigheter i de kataloger där
+filerna ligger. Detta installationsprogram kan inte ändra rättigheter
+på kataloger. Det måste normalt göras direkt på en kommandorad, eller
+om du använder ett webbhotell, via FTP eller din leverantörs kontrollpanel
+(till exempel cPanel).
        
+
+
        Detta installationsprogram anpassar inställningarna i din DokuWiki för
+ACL (behörighetslista), vilket i sin tur gör att
+administratören kan logga in och komma åt DokuWikis administrationsmenu för
+att installera insticksmoduler, hantera användare, hantera behörighet till
+wikisidor och ändra inställningar. ACL är inget krav för att DokuWiki ska
+fungera, men det förenklar administrationen.
        
+
+
        Erfarna användare, eller användare med särskilda behov, kan använda dessa
+länkar för att hitta mer detaljer om
+installation
+och inställningar.
        
diff --git a/sources/inc/lang/sv/lang.php b/sources/inc/lang/sv/lang.php
new file mode 100644
index 0000000..7d85f54
--- /dev/null
+++ b/sources/inc/lang/sv/lang.php
@@ -0,0 +1,337 @@
+
+ * @author Per Foreby 
+ * @author Nicklas Henriksson 
+ * @author Håkan Sandell 
+ * @author Dennis Karlsson
+ * @author Tormod Otter Johansson 
+ * @author Tormod Johansson 
+ * @author emil@sys.nu
+ * @author Pontus Bergendahl 
+ * @author Emil Lind 
+ * @author Bogge Bogge 
+ * @author Peter Åström 
+ * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
+ * @author Henrik 
+ * @author Tor Härnqvist 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '”';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '’';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$lang['btn_edit']              = 'Redigera sidan';
+$lang['btn_source']            = 'Visa källkod';
+$lang['btn_show']              = 'Visa sidan';
+$lang['btn_create']            = 'Skapa sidan';
+$lang['btn_search']            = 'Sök';
+$lang['btn_save']              = 'Spara';
+$lang['btn_preview']           = 'Granska';
+$lang['btn_top']               = 'Till början av sidan';
+$lang['btn_newer']             = '<< nyare';
+$lang['btn_older']             = 'äldre >>';
+$lang['btn_revs']              = 'Historik';
+$lang['btn_recent']            = 'Nyligen ändrat';
+$lang['btn_upload']            = 'Ladda upp';
+$lang['btn_cancel']            = 'Avbryt';
+$lang['btn_index']             = 'Index';
+$lang['btn_secedit']           = 'Redigera';
+$lang['btn_login']             = 'Logga in';
+$lang['btn_logout']            = 'Logga ut';
+$lang['btn_admin']             = 'Admin';
+$lang['btn_update']            = 'Uppdatera';
+$lang['btn_delete']            = 'Radera';
+$lang['btn_back']              = 'Tillbaka';
+$lang['btn_backlink']          = 'Tillbakalänkar';
+$lang['btn_backtomedia']       = 'Tillbaka till val av Mediafil';
+$lang['btn_subscribe']         = 'Prenumerera på ändringar';
+$lang['btn_profile']           = 'Uppdatera profil';
+$lang['btn_reset']             = 'Återställ';
+$lang['btn_resendpwd']         = 'Skapa nytt lösenord';
+$lang['btn_draft']             = 'Redigera utkast';
+$lang['btn_recover']           = 'Återskapa utkast';
+$lang['btn_draftdel']          = 'Radera utkast';
+$lang['btn_revert']            = 'Återställ';
+$lang['btn_register']          = 'Registrera';
+$lang['btn_apply']             = 'Verkställ';
+$lang['btn_media']             = 'Media Hanteraren';
+$lang['btn_deleteuser']        = 'Ta bort Mitt Konto';
+$lang['loggedinas']            = 'Inloggad som';
+$lang['user']                  = 'Användarnamn';
+$lang['pass']                  = 'Lösenord';
+$lang['newpass']               = 'Nytt lösenord';
+$lang['oldpass']               = 'Bekräfta nuvarande lösenord';
+$lang['passchk']               = 'en gång till';
+$lang['remember']              = 'Kom ihåg mig';
+$lang['fullname']              = 'Namn';
+$lang['email']                 = 'E-post';
+$lang['profile']               = 'Användarprofil';
+$lang['badlogin']              = 'Felaktigt användarnamn eller lösenord.';
+$lang['badpassconfirm']        = 'Ledsen, lösenordet var felaktigt';
+$lang['minoredit']             = 'Små ändringar';
+$lang['draftdate']             = 'Utkast automatiskt sparat';
+$lang['nosecedit']             = 'Sidan ändrades medan du skrev, sektionsinformationen var inte uppdaterad. Laddar hela sidan istället.';
+$lang['regmissing']            = 'Du måste fylla i alla fälten.';
+$lang['reguexists']            = 'Det finns redan en användare med det användarnamnet.';
+$lang['regsuccess']            = 'Användarkontot skapat, lösenordet har skickats via e-post.';
+$lang['regsuccess2']           = 'Användarkontot skapat.';
+$lang['regmailfail']           = 'Ett fel uppstod när ditt lösenord skulle skickas via e-post. Var god kontakta administratören!';
+$lang['regbadmail']            = 'Den angivna e-postadressen verkar vara ogiltig - om du anser detta felaktigt, var god kontakta administratören';
+$lang['regbadpass']            = 'De två angivna lösenorden är inte identiska. Försök igen.';
+$lang['regpwmail']             = 'Ditt DokuWikilösenord';
+$lang['reghere']               = 'Har du inte ett konto än? Skaffa ett';
+$lang['profna']                = 'Denna wiki stödjer inte ändringar av profiler';
+$lang['profnochange']          = 'Ingenting ändrades, inget att göra.';
+$lang['profnoempty']           = 'Namn och e-postadress måste fyllas i.';
+$lang['profchanged']           = 'Användarprofilen uppdaterad.';
+$lang['profnodelete']          = 'Den här wiki:n stödjer ej borttagning av användare';
+$lang['profdeleteuser']        = 'Radera kontot';
+$lang['profdeleted']           = 'Ditt användarkonto har raderats från den här wiki:n';
+$lang['profconfdelete']        = 'Jag vill ta bort mitt konto/inlogg på den här wiki:n 
         Denna åtgärd går ej att ångra.';
+$lang['profconfdeletemissing'] = 'Bekräftelse-kryssrutan är ej markerad';
+$lang['pwdforget']             = 'Glömt ditt lösenord? Ordna ett nytt';
+$lang['resendna']              = 'Den här wikin stödjer inte utskick av lösenord.';
+$lang['resendpwd']             = 'Sätt lösenord för';
+$lang['resendpwdmissing']      = 'Du måste fylla i alla fält.';
+$lang['resendpwdnouser']       = 'Den här användaren hittas inte i databasen.';
+$lang['resendpwdbadauth']      = 'Den här verifieringskoden är inte giltig. Kontrollera att du använde hela verifieringslänken.';
+$lang['resendpwdconfirm']      = 'En verifieringslänk har skickats med e-post.';
+$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';
+$lang['maxuploadsize']         = 'Max %s per uppladdad fil.';
+$lang['lockedby']              = 'Låst av';
+$lang['lockexpire']            = 'Lås upphör att gälla';
+$lang['js']['willexpire']      = 'Ditt redigeringslås för detta dokument kommer snart att upphöra.\nFör att undvika versionskonflikter bör du förhandsgranska ditt dokument för att förlänga redigeringslåset.';
+$lang['js']['notsavedyet']     = 'Det finns ändringar som inte är sparade.
+Är du säker på att du vill fortsätta?';
+$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']['mediatitle']      = 'Länkinställningar';
+$lang['js']['mediadisplay']    = 'Länktyp';
+$lang['js']['mediaalign']      = 'Justering';
+$lang['js']['mediasize']       = 'Bildstorlek';
+$lang['js']['mediatarget']     = 'Länköppning';
+$lang['js']['mediaclose']      = 'Stäng';
+$lang['js']['mediainsert']     = 'Infoga';
+$lang['js']['mediadisplayimg'] = 'Visa bilden.';
+$lang['js']['mediadisplaylnk'] = 'Visa endast länken.';
+$lang['js']['mediasmall']      = 'Liten storlek';
+$lang['js']['mediamedium']     = 'Mellanstor storlek';
+$lang['js']['medialarge']      = 'Stor storlek';
+$lang['js']['mediaoriginal']   = 'Originalstorlek';
+$lang['js']['medialnk']        = 'Länk till detalj sida';
+$lang['js']['mediadirect']     = 'Direktlänk till originalet';
+$lang['js']['medianolnk']      = 'Ingen länk';
+$lang['js']['medianolink']     = 'Länka inte bilden';
+$lang['js']['medialeft']       = 'Justera bilden till vänster.';
+$lang['js']['mediaright']      = 'Justera bilden till höger.';
+$lang['js']['mediacenter']     = 'Centrera bilden.';
+$lang['js']['nosmblinks']      = 'Länkning till Windowsresurser fungerar bara med Microsofts Internet Explorer.
+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']['restore_confirm'] = 'Återställa denna version?';
+$lang['js']['media_diff']      = 'Se skillnader:';
+$lang['js']['media_diff_both'] = 'Sida vid sida';
+$lang['js']['media_select']    = 'Välj filer...';
+$lang['js']['media_upload_btn'] = 'Ladda upp';
+$lang['js']['media_done_btn']  = 'Färdig';
+$lang['js']['media_drop']      = 'Släpp filer här för att ladda upp';
+$lang['js']['media_cancel']    = 'ta bort';
+$lang['js']['media_overwrt']   = 'Skriv över existerande filer';
+$lang['rssfailed']             = 'Ett fel uppstod när detta RSS-flöde skulle hämtas: ';
+$lang['nothingfound']          = 'Inga filer hittades.';
+$lang['mediaselect']           = 'Mediafiler';
+$lang['fileupload']            = 'Ladda upp mediafiler';
+$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. 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.';
+$lang['uploadsize']            = 'Den uppladdade filen är för stor. (max. %s)';
+$lang['deletesucc']            = 'Filen "%s" har raderats.';
+$lang['deletefail']            = 'Kunde inte radera "%s" - kontrollera filskydd.';
+$lang['mediainuse']            = 'Filen "%s" har inte raderats - den används fortfarande.';
+$lang['namespaces']            = 'Namnrymder';
+$lang['mediafiles']            = 'Tillgängliga filer i';
+$lang['accessdenied']          = 'Du får inte läsa den här sidan.';
+$lang['mediausage']            = 'Använd följande syntax för att referera till denna fil:';
+$lang['mediaview']             = 'Visa originalfilen';
+$lang['mediaroot']             = 'rot';
+$lang['mediaupload']           = 'Här kan du ladda upp en fil till den nuvarande namnrymden. För att skapa undernamnrymder, skriv dem före filnamnet under "Ladda upp som". Separera namnrymd och filnamn med kolon.';
+$lang['mediaextchange']        = 'Filändelsen ändrad från .%s till .%s!';
+$lang['reference']             = 'Referenser till';
+$lang['ref_inuse']             = 'Filen kan inte raderas eftersom den fortfarande används av följande sidor:';
+$lang['ref_hidden']            = 'Vissa referenser är på sidor som du inte har rätt att läsa';
+$lang['hits']                  = 'Träffar';
+$lang['quickhits']             = 'Matchande sidnamn';
+$lang['toc']                   = 'Innehållsförteckning';
+$lang['current']               = 'aktuell';
+$lang['yours']                 = 'Din version';
+$lang['diff']                  = 'visa skillnader mot aktuell version';
+$lang['diff2']                 = 'Visa skillnader mellan valda versioner';
+$lang['difflink']              = 'Länk till den här jämförelsesidan';
+$lang['diff_type']             = 'Visa skillnader:';
+$lang['diff_side']             = 'Sida vid sida';
+$lang['line']                  = 'Rad';
+$lang['breadcrumb']            = 'Spår';
+$lang['youarehere']            = 'Här är du';
+$lang['lastmod']               = 'Senast uppdaterad';
+$lang['by']                    = 'av';
+$lang['deleted']               = 'raderad';
+$lang['created']               = 'skapad';
+$lang['restored']              = 'tidigare version återställd (%s)';
+$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['tools']                 = 'Verktyg';
+$lang['user_tools']            = 'Användarverktyg';
+$lang['page_tools']            = 'Sidverktyg';
+$lang['skip_to_content']       = 'hoppa till innehåll';
+$lang['mail_newpage']          = 'sida tillagd:';
+$lang['mail_changed']          = 'sida ändrad:';
+$lang['mail_subscribe_list']   = 'sidor ändrade i namnrymd:';
+$lang['mail_new_user']         = 'Ny användare:';
+$lang['mail_upload']           = 'fil uppladdad:';
+$lang['changes_type']          = 'Se ändringar av';
+$lang['pages_changes']         = 'Sidor';
+$lang['media_changes']         = 'Mediafiler';
+$lang['both_changes']          = 'Både sidor och mediafiler';
+$lang['qb_bold']               = 'Fet text';
+$lang['qb_italic']             = 'Kursiv text';
+$lang['qb_underl']             = 'Understruken text';
+$lang['qb_code']               = 'Kodtext';
+$lang['qb_strike']             = 'Överstruken text';
+$lang['qb_h1']                 = 'Rubrik nivå 1';
+$lang['qb_h2']                 = 'Rubrik nivå 2';
+$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';
+$lang['qb_ol']                 = 'Punkt i sorterad lista';
+$lang['qb_ul']                 = 'Punkt i osorterad lista';
+$lang['qb_media']              = 'Lägg till bilder och andra filer';
+$lang['qb_sig']                = 'Infoga signatur';
+$lang['qb_smileys']            = 'Smileys';
+$lang['qb_chars']              = 'Specialtecken';
+$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';
+$lang['metasaveok']            = 'Metadata sparad';
+$lang['img_backto']            = 'Tillbaka till';
+$lang['img_title']             = 'Rubrik';
+$lang['img_caption']           = 'Bildtext';
+$lang['img_date']              = 'Datum';
+$lang['img_fname']             = 'Filnamn';
+$lang['img_fsize']             = 'Storlek';
+$lang['img_artist']            = 'Fotograf';
+$lang['img_copyr']             = 'Copyright';
+$lang['img_format']            = 'Format';
+$lang['img_camera']            = 'Kamera';
+$lang['img_keywords']          = 'Nyckelord';
+$lang['img_width']             = 'Bredd';
+$lang['img_height']            = 'Höjd';
+$lang['img_manager']           = 'Se mediahanteraren';
+$lang['subscr_subscribe_success'] = 'La till %s till prenumerationslista %s';
+$lang['subscr_subscribe_noaddress'] = 'Det finns ingen adress associerad med din inloggning, du kan inte bli tillagd i prenumerationslistan';
+$lang['subscr_unsubscribe_success'] = '%s borttagen från prenumerationslistan för %s';
+$lang['subscr_unsubscribe_error'] = 'Fel vid borttagning av %s från prenumerationslista %s';
+$lang['subscr_already_subscribed'] = '%s prenumererar redan på %s';
+$lang['subscr_not_subscribed'] = '%s prenumererar inte på %s';
+$lang['subscr_m_not_subscribed'] = 'Du prenumererar inte på denna sida eller namnrymd.';
+$lang['subscr_m_new_header']   = 'Lägg till prenumeration';
+$lang['subscr_m_current_header'] = 'Nuvarande prenumerationer';
+$lang['subscr_m_unsubscribe']  = 'Avsluta prenumeration';
+$lang['subscr_m_subscribe']    = 'Prenumerera';
+$lang['subscr_m_receive']      = 'Ta emot';
+$lang['subscr_style_every']    = 'skicka epost vid varje ändring';
+$lang['subscr_style_list']     = 'lista över ändrade sidor sedan senaste e-post (varje %.2f dag)';
+$lang['authtempfail']          = 'Tillfälligt fel på användarautentisering. Om felet kvarstår, var vänlig meddela wikiadministratören.';
+$lang['authpwdexpire']         = 'Ditt lösenord kommer att bli ogiltigt om %d dagar, du bör ändra det snart.';
+$lang['i_chooselang']          = 'Välj språk';
+$lang['i_installer']           = 'Installation av DokuWiki';
+$lang['i_wikiname']            = 'Wikins namn';
+$lang['i_enableacl']           = 'Aktivera behörighetslistan (ACL) (rekommenderas)';
+$lang['i_superuser']           = 'Användarnamn för administratören';
+$lang['i_problems']            = 'Installationsprogrammet hittade några problem som visas nedan. Du kan inte fortsätta innan du har fixat dem.';
+$lang['i_modified']            = 'Av säkerhetsskäl fungerar det här skriptet bara med en ny och omodifierad installation av Dokuwiki.
+                         Du får antingen packa upp det nedladdade paketet på nytt, eller konsultera de kompletta
+                         instruktionerna för installation av Dokuwiki';
+$lang['i_funcna']              = 'PHP-funktionen %s är inte tillgänglig. Kanske ditt webbhotell har avaktiverat den av någon anledning?';
+$lang['i_phpver']              = 'Din PHP-version %s är lägre än vad som krävs %s. Du behöver uppgradera din PHP-installation.';
+$lang['i_permfail']            = '%s är inte skrivbar av DokuWiki. Du behöver ändra filskyddet på den här katalogen!';
+$lang['i_confexists']          = '%s finns redan';
+$lang['i_writeerr']            = 'Kan inte skapa %s. Kontrollera filskyddet på kataloger/filer och skapa filen manuellt.';
+$lang['i_badhash']             = 'okänd eller ändrad dokuwiki.php (hash=%s)';
+$lang['i_badval']              = '%s - felaktig eller blank';
+$lang['i_success']             = 'Konfigurationen avslutades utan fel. Du kan radera filen install.php nu. Fortsätt till
+                        din nya DokuWiki.';
+$lang['i_failure']             = 'Fel uppstod vid skrivning av konfigurationsfilerna. Du kan behöva ordna till dem manuellt innan
+                         du kan använda din nya DokuWiki.';
+$lang['i_policy']              = 'Initial ACL-policy';
+$lang['i_pol0']                = 'Öppen wiki (alla får läsa, skriva och ladda upp filer)';
+$lang['i_pol1']                = 'Publik wiki (alla får läsa, registrerade användare för skriva och ladda upp filer)';
+$lang['i_pol2']                = 'Sluten wiki (endast registrerade användare får läsa, skriva och ladda upp filer)';
+$lang['i_retry']               = 'Försök igen';
+$lang['i_license']             = 'Vänligen välj licens du vill använda för ditt innehåll:';
+$lang['i_license_none']        = 'Visa ingen licensinformation';
+$lang['i_pop_field']           = 'Hjälp oss förbättra DokuWiki upplevelsen:';
+$lang['i_pop_label']           = 'Sänd anonym användarinformation en gång i månaden till DokuWikis utvecklare';
+$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';
+$lang['wordblock']             = 'Din ändring sparades inte för att den innehåller otillåten text (spam).';
+$lang['media_uploadtab']       = 'Ladda upp';
+$lang['media_searchtab']       = 'Sök';
+$lang['media_file']            = 'Fil';
+$lang['media_viewtab']         = 'Visa';
+$lang['media_edittab']         = 'Redigera';
+$lang['media_historytab']      = 'Historik';
+$lang['media_list_thumbs']     = 'Miniatyrbild';
+$lang['media_list_rows']       = 'Rader';
+$lang['media_sort_name']       = 'Namn';
+$lang['media_sort_date']       = 'Datum';
+$lang['media_namespaces']      = 'Visa namnrymd';
+$lang['media_files']           = 'Filer i %s';
+$lang['media_upload']          = 'Ladda upp till %s';
+$lang['media_search']          = 'Sök i %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s vid %s';
+$lang['media_edit']            = 'Redigera %s';
+$lang['media_history']         = '%s-historik';
+$lang['media_meta_edited']     = 'metadata redigerat';
+$lang['media_perm_read']       = 'Du har tyvärr inte tillräckliga behörigheter för att läsa filer.';
+$lang['media_perm_upload']     = 'Du har tyvärr inte tillräckliga behörigheter för att ladda upp filer.';
+$lang['media_update']          = 'Ladda upp ny version';
+$lang['media_restore']         = 'Återställ denna version';
diff --git a/sources/inc/lang/sv/locked.txt b/sources/inc/lang/sv/locked.txt
new file mode 100644
index 0000000..cb64eaf
--- /dev/null
+++ b/sources/inc/lang/sv/locked.txt
@@ -0,0 +1,3 @@
+====== Sidan låst ======
+
+Den här sidan är för närvarande låst för redigering av en annan användare. Du måste vänta tills den användaren är klar med sin redigering, eller tills dess att dokumentlåset upphör att gälla.
diff --git a/sources/inc/lang/sv/login.txt b/sources/inc/lang/sv/login.txt
new file mode 100644
index 0000000..5f0e3b2
--- /dev/null
+++ b/sources/inc/lang/sv/login.txt
@@ -0,0 +1,4 @@
+====== Logga in ======
+
+Du är inte inloggad! Ange ditt användarnamn och lösenord i formuläret nedan för att logga in. Stöd för cookies måste vara aktiverat i din webbläsare för att du skall kunna logga in.
+
diff --git a/sources/inc/lang/sv/mailtext.txt b/sources/inc/lang/sv/mailtext.txt
new file mode 100644
index 0000000..616bb4e
--- /dev/null
+++ b/sources/inc/lang/sv/mailtext.txt
@@ -0,0 +1,17 @@
+En sida i din DokuWiki har lagts till eller ändrats. Här är detaljerna:
+
+Datum                : @DATE@
+Webbläsare           : @BROWSER@
+IP-adress            : @IPADDRESS@
+Datornamn            : @HOSTNAME@
+Tidigare version     : @OLDPAGE@
+Aktuell version      : @NEWPAGE@
+Redigeringskommentar : @SUMMARY@
+Användare            : @USER@
+
+@DIFF@
+
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sv/mailwrap.html b/sources/inc/lang/sv/mailwrap.html
new file mode 100644
index 0000000..d8ab9ba
--- /dev/null
+++ b/sources/inc/lang/sv/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+Denna e-post har genererats av DokuWiki vid @DOKUWIKIURL@.
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/sv/newpage.txt b/sources/inc/lang/sv/newpage.txt
new file mode 100644
index 0000000..3e09510
--- /dev/null
+++ b/sources/inc/lang/sv/newpage.txt
@@ -0,0 +1,3 @@
+====== Det här ämnet finns inte ännu ======
+
+Du har följt en länk till ett ämne som inte finns ännu. Du kan skapa det genom att klicka på ''Skapa den här sidan''.
diff --git a/sources/inc/lang/sv/norev.txt b/sources/inc/lang/sv/norev.txt
new file mode 100644
index 0000000..46df862
--- /dev/null
+++ b/sources/inc/lang/sv/norev.txt
@@ -0,0 +1,4 @@
+====== Det finns ingen sådan version ======
+
+Den angivna versionen finns inte. Använd ''Historik'' för en förteckning över de versioner som finns av detta dokument.
+
diff --git a/sources/inc/lang/sv/password.txt b/sources/inc/lang/sv/password.txt
new file mode 100644
index 0000000..934d913
--- /dev/null
+++ b/sources/inc/lang/sv/password.txt
@@ -0,0 +1,10 @@
+Hej @FULLNAME@!
+
+Här är dina användaruppgifter för @TITLE@ på @DOKUWIKIURL@
+
+Användarnamn : @LOGIN@
+Lösenord     : @PASSWORD@
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sv/preview.txt b/sources/inc/lang/sv/preview.txt
new file mode 100644
index 0000000..5c3a653
--- /dev/null
+++ b/sources/inc/lang/sv/preview.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/sv/pwconfirm.txt b/sources/inc/lang/sv/pwconfirm.txt
new file mode 100644
index 0000000..5414377
--- /dev/null
+++ b/sources/inc/lang/sv/pwconfirm.txt
@@ -0,0 +1,16 @@
+Hej @FULLNAME@!
+
+Någon har bett om ett nytt lösenord för ditt konto på @TITLE@
+(@DOKUWIKIURL@)
+
+Om det inte var du som bad om ett nytt lösenord kan du helt
+enkelt ignorera det här brevet.
+
+För att bekräfta att förfrågan verkligen kom från dig, var vänlig
+och använd följande länk.
+
+@CONFIRM@
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sv/read.txt b/sources/inc/lang/sv/read.txt
new file mode 100644
index 0000000..5391b3d
--- /dev/null
+++ b/sources/inc/lang/sv/read.txt
@@ -0,0 +1,2 @@
+Denna sida är skrivskyddad. Du kan titta på källkoden, men inte ändra den. Kontakta administratören om du anser att du bör kunna ändra sidan.
+
diff --git a/sources/inc/lang/sv/recent.txt b/sources/inc/lang/sv/recent.txt
new file mode 100644
index 0000000..d8c39df
--- /dev/null
+++ b/sources/inc/lang/sv/recent.txt
@@ -0,0 +1,5 @@
+====== Senaste ändringarna ======
+
+Följande sidor/dokument har nyligen uppdaterats.
+
+
diff --git a/sources/inc/lang/sv/register.txt b/sources/inc/lang/sv/register.txt
new file mode 100644
index 0000000..e75d2a6
--- /dev/null
+++ b/sources/inc/lang/sv/register.txt
@@ -0,0 +1,4 @@
+====== Registrera dig som användare ======
+
+Fyll i all information som efterfrågas i formuläret nedan för att skapa ett nytt konto i denna wiki. Var särskilt noga med att ange en **giltig e-postadress** - om du inte blir ombedd att ange ett lösenord här kommer ett nytt lösenord att skickas till den adressen.  Användarnamnet skall vara ett giltigt [[doku>pagename|sidnamn]].
+
diff --git a/sources/inc/lang/sv/registermail.txt b/sources/inc/lang/sv/registermail.txt
new file mode 100644
index 0000000..c0edc37
--- /dev/null
+++ b/sources/inc/lang/sv/registermail.txt
@@ -0,0 +1,14 @@
+En ny användare har registrerat sig. Här är detaljerna:
+
+Användarnamn : @NEWUSER@
+Namn         : @NEWNAME@
+E-post       : @NEWEMAIL@
+
+Datum        : @DATE@
+Webbläsare   : @BROWSER@
+IP-adress    : @IPADDRESS@
+Datornamn    : @HOSTNAME@
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/sv/resendpwd.txt b/sources/inc/lang/sv/resendpwd.txt
new file mode 100644
index 0000000..0757ee9
--- /dev/null
+++ b/sources/inc/lang/sv/resendpwd.txt
@@ -0,0 +1,4 @@
+====== Skicka nytt lösenord ======
+
+Fyll i ditt användarnamn i formuläret nedan för att få ett nytt lösenord till ditt konto i denna wiki. En länk för verifiering kommer att skickas till din registrerade e-postadress.
+
diff --git a/sources/inc/lang/sv/resetpwd.txt b/sources/inc/lang/sv/resetpwd.txt
new file mode 100644
index 0000000..a329ce5
--- /dev/null
+++ b/sources/inc/lang/sv/resetpwd.txt
@@ -0,0 +1,3 @@
+====== Sätt nytt lösenord ======
+
+Vänligen skriv ett nytt lösenord för ditt konto på denna wiki.
\ No newline at end of file
diff --git a/sources/inc/lang/sv/revisions.txt b/sources/inc/lang/sv/revisions.txt
new file mode 100644
index 0000000..b9dfc56
--- /dev/null
+++ b/sources/inc/lang/sv/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/sv/searchpage.txt b/sources/inc/lang/sv/searchpage.txt
new file mode 100644
index 0000000..bcc88cd
--- /dev/null
+++ b/sources/inc/lang/sv/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
diff --git a/sources/inc/lang/sv/showrev.txt b/sources/inc/lang/sv/showrev.txt
new file mode 100644
index 0000000..a79b30b
--- /dev/null
+++ b/sources/inc/lang/sv/showrev.txt
@@ -0,0 +1,2 @@
+**Detta är en gammal version av dokumentet!**
+----
diff --git a/sources/inc/lang/sv/stopwords.txt b/sources/inc/lang/sv/stopwords.txt
new file mode 100644
index 0000000..3576596
--- /dev/null
+++ b/sources/inc/lang/sv/stopwords.txt
@@ -0,0 +1,129 @@
+# 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
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
+
+# Följande svenska stoppord kommer från
+# http://snowball.tartarus.org/algorithms/swedish/stop.txt. Ord kortare än tre
+# bokstäver har tagits bort (se kommentaren ovan) Se även
+# http://www.cling.gu.se/theses/2004/cl0sknub_cl0tsven.pdf. Vi behåller de
+# engelska orden eftersom det är rätt vanligt med engelska texter.
+och
+det
+att
+jag
+hon
+som
+han
+den
+med
+var
+sig
+för
+till
+men
+ett
+hade
+icke
+mig
+henne
+sin
+har
+inte
+hans
+honom
+skulle
+hennes
+där
+min
+man
+vid
+kunde
+något
+från
+när
+efter
+upp
+dem
+vara
+vad
+över
+dig
+kan
+sina
+här
+mot
+alla
+under
+någon
+eller
+allt
+mycket
+sedan
+denna
+själv
+detta
+utan
+varit
+hur
+ingen
+mitt
+bli
+blev
+oss
+din
+dessa
+några
+deras
+blir
+mina
+samma
+vilken
+sådan
+vår
+blivit
+dess
+inom
+mellan
+sådant
+varför
+varje
+vilka
+ditt
+vem
+vilket
+sitta
+sådana
+vart
+dina
+vars
+vårt
+våra
+ert
+era
+vilkas
diff --git a/sources/inc/lang/sv/subscr_form.txt b/sources/inc/lang/sv/subscr_form.txt
new file mode 100644
index 0000000..bfb8fa3
--- /dev/null
+++ b/sources/inc/lang/sv/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Prenumerations hantering ======
+
+Denna sida låter dig hantera dina prenumerationer för nuvarande sida och namnrymd.
\ No newline at end of file
diff --git a/sources/inc/lang/sv/subscr_single.txt b/sources/inc/lang/sv/subscr_single.txt
new file mode 100644
index 0000000..dff8834
--- /dev/null
+++ b/sources/inc/lang/sv/subscr_single.txt
@@ -0,0 +1,23 @@
+Hej!
+
+Sidan @PAGE@ i wikin @TITLE@ har ändrats.
+Detta är ändringarna:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Datum: @DATE@
+Användare: @USER@
+Ändrings sammanfattning: @SUMMARY@
+Gammal version: @OLDPAGE@
+Ny version: @NEWPAGE@
+
+För att avsluta noteringar om sidor, logga in på wikin vid
+@DOKUWIKIURL@ gå sedan till
+@SUBSCRIBE@
+och avsluta prenumerationen av sida och/eller namnrymd ändringar.
+
+--
+Denna e-post har genererats av DokuWiki vid
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/sv/updateprofile.txt b/sources/inc/lang/sv/updateprofile.txt
new file mode 100644
index 0000000..98ed6e3
--- /dev/null
+++ b/sources/inc/lang/sv/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Uppdatera din användarprofil ======
+
+Du behöver bara fylla i de fält som du vill ändra. Du kan inte ändra ditt användarnamn.
+
+
diff --git a/sources/inc/lang/sv/uploadmail.txt b/sources/inc/lang/sv/uploadmail.txt
new file mode 100644
index 0000000..5963adc
--- /dev/null
+++ b/sources/inc/lang/sv/uploadmail.txt
@@ -0,0 +1,14 @@
+En fil har laddats upp till din DokuWiki. Här är detaljerna:
+
+Fil         : @MEDIA@
+Datum       : @DATE@
+Webbläsare  : @BROWSER@
+IP-adress   : @IPADDRESS@
+Datornamn   : @HOSTNAME@
+Storlek     : @SIZE@
+MIME-typ    : @MIME@
+Användare   : @USER@
+
+-- 
+Detta meddelande har skapats av DokuWiki på
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/th/admin.txt b/sources/inc/lang/th/admin.txt
new file mode 100644
index 0000000..677e779
--- /dev/null
+++ b/sources/inc/lang/th/admin.txt
@@ -0,0 +1,3 @@
+====== งานธุรการควบคุมระบบ ======
+
+ด้านล่างนี้คุณสามารถพบรายการงานควบคุมระบบทั้งหมดในโดกุวิกิ
\ No newline at end of file
diff --git a/sources/inc/lang/th/adminplugins.txt b/sources/inc/lang/th/adminplugins.txt
new file mode 100644
index 0000000..85a6b17
--- /dev/null
+++ b/sources/inc/lang/th/adminplugins.txt
@@ -0,0 +1 @@
+====== ปลั๊กอินเสริม ======
\ No newline at end of file
diff --git a/sources/inc/lang/th/backlinks.txt b/sources/inc/lang/th/backlinks.txt
new file mode 100644
index 0000000..fff6898
--- /dev/null
+++ b/sources/inc/lang/th/backlinks.txt
@@ -0,0 +1,3 @@
+====== ลิงค์กลับ(Backlinks) ======
+
+นี่คือรายชื่อเพจที่ชี้ลิงค์กลับมายังเพจปัจจุบัน
\ No newline at end of file
diff --git a/sources/inc/lang/th/conflict.txt b/sources/inc/lang/th/conflict.txt
new file mode 100644
index 0000000..5e786a6
--- /dev/null
+++ b/sources/inc/lang/th/conflict.txt
@@ -0,0 +1,5 @@
+====== มีเนื้อหารุ่นใหม่กว่าเกิดขึ้น ======
+
+มีเอกสารรุ่นใหม่กว่าที่คุณได้แก้ไขไว้ มันเกิดขึ้นเมื่อผู้ใช้รายอื่นได้ทำการแก้ไขเอกสารในขณะที่ขณะเดียวกันกับที่คุณกำลังแก้ไขมัน
+
+ให้ตรวจสอบความแตกต่างที่แสดงไว้ด้านล่างนี้ให้ทั่วถึง, แล้วตัดสินใจว่าจะเก็บฉบับไหนไว้ ถ้าคุณเลือก "บันทึก", ฉบับของคุณจะถูกบันทึกไว้ หรือกด "ยกเลิก" เพื่อเก็บฉบับปัจจุบัน
\ No newline at end of file
diff --git a/sources/inc/lang/th/denied.txt b/sources/inc/lang/th/denied.txt
new file mode 100644
index 0000000..88b012a
--- /dev/null
+++ b/sources/inc/lang/th/denied.txt
@@ -0,0 +1,3 @@
+====== ปฏิเสธสิทธิ์ ======
+
+ขออภัย คุณไม่มีสิทธิ์เพียงพอที่จะดำเนินการต่อ บางทีคุณอาจจะลืมล็อกอิน?
\ No newline at end of file
diff --git a/sources/inc/lang/th/diff.txt b/sources/inc/lang/th/diff.txt
new file mode 100644
index 0000000..e21759e
--- /dev/null
+++ b/sources/inc/lang/th/diff.txt
@@ -0,0 +1,3 @@
+====== ความแตกต่าง ======
+
+นี่เป็นการแสดงความแตกต่างระหว่างเพจสองรุ่น
\ No newline at end of file
diff --git a/sources/inc/lang/th/draft.txt b/sources/inc/lang/th/draft.txt
new file mode 100644
index 0000000..37b1841
--- /dev/null
+++ b/sources/inc/lang/th/draft.txt
@@ -0,0 +1,5 @@
+====== พบไฟล์ฉบับร่าง ======
+
+เซสชั่นที่คุณแก้ไขฉบับล่าสุดในเพจนี้ไม่ถูกจัดเก็บให้สมบูรณ์ โดกุวิกิได้ทำการบันทึกฉบับร่างให้โดยอัตโนมัติในระหว่างที่คุณกำลังทำงาน อันซึ่งขณะนี้คุณอาจต้องการใช้มันเพื่อแก้ไขต่อ ด้านล่างนี้คุณจะเห็นข้อมูลที่ถูกบันทึกไว้จากการทำงานครั้งล่าสุด
+
+กรุณาตัดสินใจว่าคุณต้องการที่จะ //กู้คืน//งานฉบับที่แก้ไขล่าสุด, //ลบทิ้ง/// ตัวฉบับร่างที่ได้บันทึกอัตโนมัติไว้, //ยกเลิก// กระบวนการแก้ไขนี้
\ No newline at end of file
diff --git a/sources/inc/lang/th/edit.txt b/sources/inc/lang/th/edit.txt
new file mode 100644
index 0000000..81dc000
--- /dev/null
+++ b/sources/inc/lang/th/edit.txt
@@ -0,0 +1 @@
+แก้ไขหน้านี้แล้วกด "บันทึก" ให้อ่าน[[wiki:syntax|ไวยกรณ์วิกิ]] สำหรับค้นหาไวยกรณ์ที่ใช้ในวิกิ และกรุณาแก้ไขเฉพาะเพจที่คุณสามารถ**ปรับปรุง**ให้มันดีขึ้นได้, ถ้าหากคุณต้องการที่จะทดสอบอะไรบางอย่าง ให้ไปลองเล่นครั้งแรกได้ใน[[playground:playground|สนามเด็กเล่น]]
\ No newline at end of file
diff --git a/sources/inc/lang/th/editrev.txt b/sources/inc/lang/th/editrev.txt
new file mode 100644
index 0000000..28e6760
--- /dev/null
+++ b/sources/inc/lang/th/editrev.txt
@@ -0,0 +1,2 @@
+**คุณได้โหลดเอาเอกสารฉบับเก่าขึ้นมา!** ถ้าคุณบันทึกมัน คุณจะสร้างเอกสารรุ่นใหม่ด้วยข้อมูลเหล่านี้
+----
\ No newline at end of file
diff --git a/sources/inc/lang/th/index.txt b/sources/inc/lang/th/index.txt
new file mode 100644
index 0000000..eb32a64
--- /dev/null
+++ b/sources/inc/lang/th/index.txt
@@ -0,0 +1,2 @@
+====== ดัชนี ======
+นี่คือดัชนีรวมทุกเพจ เรียงตาม[[doku>namespaces|เนมสเปซ]]
\ No newline at end of file
diff --git a/sources/inc/lang/th/lang.php b/sources/inc/lang/th/lang.php
new file mode 100644
index 0000000..5d36416
--- /dev/null
+++ b/sources/inc/lang/th/lang.php
@@ -0,0 +1,221 @@
+
+ * @author Arthit Suriyawongkul 
+ * @author Kittithat Arnontavilas 
+ * @author Thanasak Sompaisansin 
+ */
+$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_profile']           = 'แก้ข้อมูลผู้ใช้';
+$lang['btn_reset']             = 'เริ่มใหม่';
+$lang['btn_draft']             = 'แก้ไขเอกสารฉบับร่าง';
+$lang['btn_recover']           = 'กู้คืนเอกสารฉบับร่าง';
+$lang['btn_draftdel']          = 'ลบเอกสารฉบับร่าง';
+$lang['btn_revert']            = 'กู้คืน';
+$lang['btn_register']          = 'สร้างบัญชีผู้ใช้';
+$lang['loggedinas']            = 'ลงชื่อเข้าใช้เป็น';
+$lang['user']                  = 'ชื่อผู้ใช้:';
+$lang['pass']                  = 'รหัสผ่าน';
+$lang['newpass']               = 'รหัสผ่านใหม่';
+$lang['oldpass']               = 'รหัสผ่านเดิม:';
+$lang['passchk']               = 'พิมพ์รหัสผ่านอีกครั้ง:';
+$lang['remember']              = 'จำชื่อและรหัสผ่าน';
+$lang['fullname']              = 'ชื่อจริง:';
+$lang['email']                 = 'อีเมล:';
+$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['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['js']['willexpire']            = 'การล๊อคเพื่อแก้ไขหน้านี้กำลังจะหมดเวลาในอีก \n นาที เพื่อที่จะหลีกเลี่ยงข้อขัดแย้งให้ใช้ปุ่ม "Preview" เพื่อรีเซ็ทเวลาใหม่';
+$lang['js']['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['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']              = 'ย้อนไปรุ่นก่อนหน้า (%s)';
+$lang['external_edit']         = 'แก้ไขภายนอก';
+$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['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_funcna']              = 'PHP function %s ไม่สามารถใช้งานได้ อาจเป็นเพราะผู้ให้บริการโฮสไม่เปิดให้ใช้งาน';
+$lang['i_phpver']              = 'PHP รุ่นที่คุณกำลังใช้งานอยู่คือ %s คุณจำเป็นต้องอัพเกรด PHP ให้เป็นรุ่น %s หรือสูงกว่า';
+$lang['i_permfail']            = '%s DokuWiki ไม่สามารถเขียนข้อมูลได้ ต้องตั้งค่าสิทธิ์การอนุญาตของไดเรคทอรีนี้เสียก่อน!';
+$lang['i_confexists']          = '%s ถูกใช้งานไปแล้ว';
+$lang['i_writeerr']            = 'ไม่สามารถสร้าง %s. ตรวจสอบสิทธิ์การอนุญาตของไดเรคทอรีหรือไฟล์ แล้วสร้างไฟล์ด้วยตนเอง';
+$lang['i_policy']              = 'นโยบายสิทธิ์เข้าถึง(ACL)ตั้งต้น';
+$lang['i_pol0']                = 'วิกิเปิดกว้าง (ใครก็ อ่าน, เขียน, อัพโหลดได้)';
+$lang['i_pol1']                = 'วิกิสาธารณะ (ทุกคนอ่านได้, เขียน และ อัพโหลดเฉพาะผู้ใช้ที่ลงทะเบียนแล้ว)';
+$lang['i_pol2']                = 'วิกิภายใน (อ่าน, เขียน, อัพโหลด สำหรับผู้ใช้ที่ลงทะเบียนแล้วเท่านั้น)';
+$lang['i_retry']               = 'ลองใหม่';
+$lang['years']                 = '%d ปีก่อน';
+$lang['months']                = '%d เดือนก่อน';
+$lang['weeks']                 = '%d สัปดาห์ก่อน';
+$lang['days']                  = '%d วันก่อน';
+$lang['hours']                 = '%d ชั่วโมงก่อน';
+$lang['minutes']               = '%d นาทีก่อน';
+$lang['seconds']               = '%d วินาทีก่อน';
diff --git a/sources/inc/lang/th/locked.txt b/sources/inc/lang/th/locked.txt
new file mode 100644
index 0000000..a198ad7
--- /dev/null
+++ b/sources/inc/lang/th/locked.txt
@@ -0,0 +1,3 @@
+====== เพจถูกล๊อค ======
+
+เพจนี้กำลังถูกล๊อคจากการแก้ไขโดยผู้ใช้ท่านอื่น คุณต้องรอจนกว่าผู้ใช้คนนี้จะแก้ไขเสร็จ หรือการล๊อคนั้นหมดเวลา
\ No newline at end of file
diff --git a/sources/inc/lang/th/login.txt b/sources/inc/lang/th/login.txt
new file mode 100644
index 0000000..d384c2d
--- /dev/null
+++ b/sources/inc/lang/th/login.txt
@@ -0,0 +1,4 @@
+====== ล็อกอิน ======
+
+คุณยังไม่ได้เข้าสู่ระบบ(ล็อกอิน)ในขณะนี้! กรอกรายละเอียดเพื่อพิสูจน์สิทธิ์ข้างล่างนี้เพื่อล็อกอิน คุณต้องเปิดคุ๊กกี้ให้ทำงานก่อนที่จะล็อกอิน
+
diff --git a/sources/inc/lang/th/mailtext.txt b/sources/inc/lang/th/mailtext.txt
new file mode 100644
index 0000000..a4af8a0
--- /dev/null
+++ b/sources/inc/lang/th/mailtext.txt
@@ -0,0 +1,17 @@
+เพจในโดกุวิกิของคุณได้ถูกเพิ่ม หรือแก้ไข นี่คือรายละเอียด:
+
+วันที่: @DATE@
+บราวเซอร์: @BROWSER@
+ที่อยู่ไอพี: @IPADDRESS@
+ชื่อโฮสต์: @HOSTNAME@
+ฉบับเก่า: @OLDPAGE@
+ฉบับใหม่: @NEWPAGE@
+สรุปการแก้ไข: @SUMMARY@
+ผู้ใช้: @USER@
+
+@DIFF@
+
+
+-- 
+จดหมายนี้สร้างขึ้นโดยโดกุวิกิที่
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/th/newpage.txt b/sources/inc/lang/th/newpage.txt
new file mode 100644
index 0000000..cab906d
--- /dev/null
+++ b/sources/inc/lang/th/newpage.txt
@@ -0,0 +1,3 @@
+====== ยังไม่มีหัวข้อนี้ ======
+
+คุณได้กดลิ้งค์เข้ามายังหัวข้อที่ยังไม่ได้สร้าง ถ้าคุณได้รับอนุญาติ คุณอาจจะสร้างมันได้ด้วยการกดปุ่ม "สร้างเพจนี้"
\ No newline at end of file
diff --git a/sources/inc/lang/th/norev.txt b/sources/inc/lang/th/norev.txt
new file mode 100644
index 0000000..9127a20
--- /dev/null
+++ b/sources/inc/lang/th/norev.txt
@@ -0,0 +1,3 @@
+====== ไม่มีฉบับที่ระบุ ======
+
+ฉบับที่ระบุไม่มีอยู่จริง กรุณาใช้ปุ่ม "ฉบับเก่าๆ" เพื่อแสดงรายการรุ่นเก่าๆของเอกสารนี้ิ
\ No newline at end of file
diff --git a/sources/inc/lang/th/password.txt b/sources/inc/lang/th/password.txt
new file mode 100644
index 0000000..5f0dcff
--- /dev/null
+++ b/sources/inc/lang/th/password.txt
@@ -0,0 +1,10 @@
+สวัสดี@FULLNAME@!
+
+นี่คือข้อมูลผู้ใช้ของคุณสำหรับ @TITLE@ ที่ @DOKUWIKIURL@
+
+ล็อกอิน: @LOGIN@
+รหัสผ่าน : @PASSWORD@
+
+-- 
+จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/th/preview.txt b/sources/inc/lang/th/preview.txt
new file mode 100644
index 0000000..caaf8ad
--- /dev/null
+++ b/sources/inc/lang/th/preview.txt
@@ -0,0 +1,3 @@
+====== ดูตัวอย่าง ======
+
+นี่คือหน้าตัวอย่างของข้อความที่คุณกรอก จำไว้ว่า: มันยัง **ไม่ได้บันทึก** เก็บไว้!
\ No newline at end of file
diff --git a/sources/inc/lang/th/pwconfirm.txt b/sources/inc/lang/th/pwconfirm.txt
new file mode 100644
index 0000000..e6ab876
--- /dev/null
+++ b/sources/inc/lang/th/pwconfirm.txt
@@ -0,0 +1,14 @@
+เฮ้ @FULLNAME@!
+
+มีบางคนร้องขอรหัสผ่านใหม่สำหรับ @TITLE@ ของคุณ
+เพื่อล็อกอินที่ @DOKUWIKIURL@
+
+ถ้าคุรไม่ได้ร้องขอรหัสผ่านใหม่ ก็ไม่ต้องสนใจอีเมลนี้
+
+หากต้องการยืนยันว่านี่การร้องขอนี้ถูกส่งโดยคุณจริงๆ กรุณาใช้ลิงค์ดังต่อไปนี้
+
+@CONFIRM@
+
+-- 
+จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/th/read.txt b/sources/inc/lang/th/read.txt
new file mode 100644
index 0000000..ac4f312
--- /dev/null
+++ b/sources/inc/lang/th/read.txt
@@ -0,0 +1 @@
+หน้านี้มีไว้อ่านอย่างเดียว คุณสามารถอ่านข้อความต้นฉบับ ไม่สามารถแก้ไขได้ ให้สอบถามผู้ดูแลระบบถ้าคุณคิดว่านี่คือข้อผิดพลาด
\ No newline at end of file
diff --git a/sources/inc/lang/th/recent.txt b/sources/inc/lang/th/recent.txt
new file mode 100644
index 0000000..1655ae8
--- /dev/null
+++ b/sources/inc/lang/th/recent.txt
@@ -0,0 +1,3 @@
+====== การเปลี่ยนแปลงเมื่อเร็วๆนี้ ======
+
+เพจเหล่านี้ถูกเปลี่ยนแปลงเมื่อเร็วๆนี้
\ No newline at end of file
diff --git a/sources/inc/lang/th/register.txt b/sources/inc/lang/th/register.txt
new file mode 100644
index 0000000..ed4a408
--- /dev/null
+++ b/sources/inc/lang/th/register.txt
@@ -0,0 +1,3 @@
+====== ลงทะเบียนเป็นผู้ใช้หน้าใหม่ ======
+
+กรอกข้อมูลทั้งหมดด้านล่างเพื่อสร้างบัญชีใหม่ในวิกินี้ ให้แน่ใจว่าคุณให้ **ที่อยู่อีเมลที่ใช้ได้จริง** ถ้าคุณไม่ถูกถามให้กรอกรหัสผา่นที่นี่, รหัสผ่านใหม่จะถูกส่งไปยังที่อยู่ดังกล่าว ชื่อล็อกอินควรจะใช้ได้ถูกต้องตาม[[doku>pagename|pagename]].
\ No newline at end of file
diff --git a/sources/inc/lang/th/registermail.txt b/sources/inc/lang/th/registermail.txt
new file mode 100644
index 0000000..a96026d
--- /dev/null
+++ b/sources/inc/lang/th/registermail.txt
@@ -0,0 +1,14 @@
+มีผู้ใช้คนใหม่ได้ลงทะเบียน นี่คือรายละเอียด:
+
+ชื่อผู้ใช้ : @NEWUSER@
+ชื่อเต็ม : @NEWNAME@
+อีเมล : @NEWEMAIL@
+
+วันที่ : @DATE@
+บราวเซอร์ : @BROWSER@
+ที่อยู่ไอพี : @IPADDRESS@
+ชื่อโฮสต์ : @HOSTNAME@
+
+-- 
+จดหมายนี้ถูกสร้างขึ้นโดยโดกุวิกิที่
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/th/resendpwd.txt b/sources/inc/lang/th/resendpwd.txt
new file mode 100644
index 0000000..1935abe
--- /dev/null
+++ b/sources/inc/lang/th/resendpwd.txt
@@ -0,0 +1,3 @@
+====== ส่งรหัสผ่านใหม่ ======
+
+กรุณากรอกชื่อผู้ใช้ในช่องด้านล่างเพื่อร้องขอรหัสผ่านใหม่จากบัญชีของคุณในวิกินี้ ลิงค์ยืนยันจะถูกส่งไปยังที่อยู่อีเมลที่คุณลงทะเบียนไว้
\ No newline at end of file
diff --git a/sources/inc/lang/th/revisions.txt b/sources/inc/lang/th/revisions.txt
new file mode 100644
index 0000000..98a49d7
--- /dev/null
+++ b/sources/inc/lang/th/revisions.txt
@@ -0,0 +1,3 @@
+====== ฉบับเก่า ======
+
+เหล่านี้เป็นรายการฉบับเก่าของเอกสารปัจจุบัน หากต้องการคืนสภาพฉบับเก่า ให้เลือกมันจากด้านล่าง, คลิ๊ก "แก้ไขเพจนี้" แล้วจึงค่อยบันทึกมัน
\ No newline at end of file
diff --git a/sources/inc/lang/th/searchpage.txt b/sources/inc/lang/th/searchpage.txt
new file mode 100644
index 0000000..d6399a9
--- /dev/null
+++ b/sources/inc/lang/th/searchpage.txt
@@ -0,0 +1,4 @@
+====== สืบค้น ======
+คุณสามารถพบผลลัพธ์การสืบค้นของคุณด้านล่าง ถ้าคุณไม่พบสิ่งที่คนมองหา คุณสามารถเลือกที่จะสร้าง หรือแก้ไขชื่อเพจหลังจากดูผลสืบค้นแล้วด้วยปุ่มที่เหมาะสม
+
+====== ผลลัพธ์ ======
\ No newline at end of file
diff --git a/sources/inc/lang/th/showrev.txt b/sources/inc/lang/th/showrev.txt
new file mode 100644
index 0000000..f93869f
--- /dev/null
+++ b/sources/inc/lang/th/showrev.txt
@@ -0,0 +1,2 @@
+**นี่คือเอกสารรุ่น/ฉบับเก่า**
+----
\ No newline at end of file
diff --git a/sources/inc/lang/th/updateprofile.txt b/sources/inc/lang/th/updateprofile.txt
new file mode 100644
index 0000000..3e0a8df
--- /dev/null
+++ b/sources/inc/lang/th/updateprofile.txt
@@ -0,0 +1,3 @@
+====== ปรับปรุงข้อมูลส่วนตัวของบัญชีคุณ ======
+
+คุณเพียงต้องการกรอกช่องที่ต้องการแก้ไขเหล่านี้ให้ครบ แต่ไม่สามารถเปลี่ยนชื่อผู้ใช้ได้
\ No newline at end of file
diff --git a/sources/inc/lang/th/uploadmail.txt b/sources/inc/lang/th/uploadmail.txt
new file mode 100644
index 0000000..0269657
--- /dev/null
+++ b/sources/inc/lang/th/uploadmail.txt
@@ -0,0 +1,14 @@
+มีไฟล์ได้ถูกอัพโหลดเข้าไปยังโดกุวิกิของคุณ นี่คือรายละเอียด:
+
+ไฟล์: @MEDIA@
+วันที่: @DATE@
+เบราเซอร์: @BROWSER@
+ที่อยู่ไอพี: @IPADDRESS@
+ชื่อโฮสต์: @HOSTNAME@
+ขนาด: @SIZE@
+MIME Type : @MIME@
+ผู้ใช้: @USER@
+
+-- 
+This mail was generated by DokuWiki at
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/tr/admin.txt b/sources/inc/lang/tr/admin.txt
new file mode 100644
index 0000000..2292b6e
--- /dev/null
+++ b/sources/inc/lang/tr/admin.txt
@@ -0,0 +1,3 @@
+====== Yönetim ======
+
+Aşağıda DokuWiki için yapılabilecek yönetim işleri vardır.
diff --git a/sources/inc/lang/tr/adminplugins.txt b/sources/inc/lang/tr/adminplugins.txt
new file mode 100644
index 0000000..7c8de9d
--- /dev/null
+++ b/sources/inc/lang/tr/adminplugins.txt
@@ -0,0 +1 @@
+===== İlave Eklentiler =====
\ No newline at end of file
diff --git a/sources/inc/lang/tr/backlinks.txt b/sources/inc/lang/tr/backlinks.txt
new file mode 100644
index 0000000..e219a60
--- /dev/null
+++ b/sources/inc/lang/tr/backlinks.txt
@@ -0,0 +1,4 @@
+====== Geri linkler ======
+
+Bu sayfaya bağlantı veren sayfaların listesi aşağıdadır.
+
diff --git a/sources/inc/lang/tr/conflict.txt b/sources/inc/lang/tr/conflict.txt
new file mode 100644
index 0000000..5049479
--- /dev/null
+++ b/sources/inc/lang/tr/conflict.txt
@@ -0,0 +1,6 @@
+====== Yeni versiyon mevcut ======
+
+Değiştirdiğiniz dökümanın daha yeni bir versiyonu mevcut. Bu durum, siz dökümanı değiştirirken başka bir kullanıcının da aynı dökümanı değiştirmesi halinde olur.
+
+Aşağıda gösterilen farkları dikkatlice inceleyin, daha sonra hangi versiyonun korunacağına karar verin. Eğer ''Kaydet''i seçerseniz, sizin sürümünüz kaydedilir. Mevcut sürümü korumak için ''İptal''e tıklayın.
+
diff --git a/sources/inc/lang/tr/denied.txt b/sources/inc/lang/tr/denied.txt
new file mode 100644
index 0000000..04e9b8b
--- /dev/null
+++ b/sources/inc/lang/tr/denied.txt
@@ -0,0 +1,4 @@
+====== Yetki Reddedildi ======
+
+Üzgünüz, devam etmek için yetkiniz yok. Giriş yapmayı unutmuş olabilir misiniz?
+
diff --git a/sources/inc/lang/tr/diff.txt b/sources/inc/lang/tr/diff.txt
new file mode 100644
index 0000000..72baa67
--- /dev/null
+++ b/sources/inc/lang/tr/diff.txt
@@ -0,0 +1,4 @@
+====== Farklar ======
+
+Bu sayfanın seçili sürümü ile mevcut sürümü arasındaki farkları gösterir.
+
diff --git a/sources/inc/lang/tr/draft.txt b/sources/inc/lang/tr/draft.txt
new file mode 100644
index 0000000..b1a8881
--- /dev/null
+++ b/sources/inc/lang/tr/draft.txt
@@ -0,0 +1,5 @@
+====== Taslak Dosyası Bulundu ======
+
+Bu sayfadaki en son oturumunuz düzgün olarak tamamlanmamış. DokuWiki otomatik olarak bir taslak kaydetmiş olduğu için çalışmanıza devam edebilirsiniz.  Aşağıda en son oturumunuzda kaydedilmiş olan taslağı görebilirsiniz.
+
+Bu taslağı //geri getirebilir//, //silebilir// veya düzenleme sürecinden //vazgeçebilirsiniz//.
\ No newline at end of file
diff --git a/sources/inc/lang/tr/edit.txt b/sources/inc/lang/tr/edit.txt
new file mode 100644
index 0000000..4f84c4e
--- /dev/null
+++ b/sources/inc/lang/tr/edit.txt
@@ -0,0 +1,2 @@
+Sayfayı değiştirin ve ''Kaydete'' basın. Wiki sözdizimi için [[wiki:syntax]]'a bakınız. Lütfen sayfayı sadece eğer **geliştirebiliyorsanız** değiştirin. Eğer testler yapmak istiyorsanız, [[playground:playground|playground]] adresini kullanın.
+
diff --git a/sources/inc/lang/tr/editrev.txt b/sources/inc/lang/tr/editrev.txt
new file mode 100644
index 0000000..9c70fbe
--- /dev/null
+++ b/sources/inc/lang/tr/editrev.txt
@@ -0,0 +1,2 @@
+**Sayfanın eski bir sürümünü yüklediniz!** Eğer kaydederseniz, bu veriyle yeni bir sürüm oluşturacaksınız.
+----
diff --git a/sources/inc/lang/tr/index.txt b/sources/inc/lang/tr/index.txt
new file mode 100644
index 0000000..e361e87
--- /dev/null
+++ b/sources/inc/lang/tr/index.txt
@@ -0,0 +1,4 @@
+====== İndeks ======
+
+Bu mevcut tüm sayfaların [[doku>namespaces|isim alanlarına]] göre sıralı bir indeksidir.
+
diff --git a/sources/inc/lang/tr/install.html b/sources/inc/lang/tr/install.html
new file mode 100644
index 0000000..de82d72
--- /dev/null
+++ b/sources/inc/lang/tr/install.html
@@ -0,0 +1,8 @@
+
        Bu sayfa Dokuwiki kurmanıza yardımcı olmaktadır. Kurulum hakkında bilgi sahibi olmak için bu sayfayı ziyaret edebilirsiniz.
        
+
+
        DokuWiki wiki sayfalarını ve wiki sayfalarına ilişkin verileri (resimler, arama indeksi, geçmiş sürümler) dosyalarda tutar. DokuWikiyi sorunsuz olarak kullanmak için bu dosyaların bulunduğu dizinlere mutlaka yazma izniniz olması gereklidir.  Bu kurulum betiği yazma izinlerini ayarlayamamaktadır. İzinleri shell, FTP veya kontrol paneliniz (CPanel, Plesk vs.) aracılığı ile düzenleyebilirsiniz.
        
+
+
        Kurulum betiği ACL'yi otomatik olarak ayarlamaktadır.  Böylece yönetici izinleri belirlenip, DokuWiki kullanımı kolaylaştırılmaktadır.
        
+
+
        Deneyimli kullanıcılar bu sayfayı 
+ edebilir ve bu sayfa yardımıyla  yapılandırma hakkında ekstra bilgi sahibi olabilir.
        
\ No newline at end of file
diff --git a/sources/inc/lang/tr/lang.php b/sources/inc/lang/tr/lang.php
new file mode 100644
index 0000000..6b9e0dd
--- /dev/null
+++ b/sources/inc/lang/tr/lang.php
@@ -0,0 +1,293 @@
+
+ * @author Aydın Coşkuner 
+ * @author Cihan Kahveci 
+ * @author Yavuz Selim 
+ * @author Caleb Maclennan 
+ * @author farukerdemoncel@gmail.com
+ * @author Mustafa Aslan 
+ */
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“';
+$lang['doublequoteclosing']    = '”';
+$lang['singlequoteopening']    = '‘';
+$lang['singlequoteclosing']    = '’';
+$lang['apostrophe']            = '’';
+$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';
+$lang['btn_search']            = 'Ara';
+$lang['btn_save']              = 'Kaydet';
+$lang['btn_preview']           = 'Önizleme';
+$lang['btn_top']               = 'Başa dön';
+$lang['btn_newer']             = '<< daha yeniler';
+$lang['btn_older']             = 'daha eskiler >>';
+$lang['btn_revs']              = 'Eski sürümler';
+$lang['btn_recent']            = 'En son değişiklikler';
+$lang['btn_upload']            = 'Yükle';
+$lang['btn_cancel']            = 'İptal';
+$lang['btn_index']             = 'İndeks';
+$lang['btn_secedit']           = 'Düzenle';
+$lang['btn_login']             = 'Giriş yap';
+$lang['btn_logout']            = 'Çıkış yap';
+$lang['btn_admin']             = 'Yönetici';
+$lang['btn_update']            = 'Güncelle';
+$lang['btn_delete']            = 'Sil';
+$lang['btn_back']              = 'Geri';
+$lang['btn_backlink']          = 'Geri linkler';
+$lang['btn_backtomedia']       = 'Çokluortam dosyası seçimine dön';
+$lang['btn_subscribe']         = 'Sayfa Değişikliklerini Bildir';
+$lang['btn_profile']           = 'Kullanıcı Bilgilerini Güncelle';
+$lang['btn_reset']             = 'Sıfırla';
+$lang['btn_resendpwd']         = 'Yeni şifre belirle';
+$lang['btn_draft']             = 'Taslağı düzenle';
+$lang['btn_recover']           = 'Taslağı geri yükle';
+$lang['btn_draftdel']          = 'Taslağı sil';
+$lang['btn_revert']            = 'Geri Yükle';
+$lang['btn_register']          = 'Kayıt ol';
+$lang['btn_apply']             = 'Uygula';
+$lang['btn_media']             = 'Çokluortam Yöneticisi';
+$lang['btn_deleteuser']        = 'Hesabımı Sil';
+$lang['loggedinas']            = 'Giriş ismi';
+$lang['user']                  = 'Kullanıcı ismi';
+$lang['pass']                  = 'Parola';
+$lang['newpass']               = 'Yeni Parola';
+$lang['oldpass']               = 'Kullanılan parolayı doğrula';
+$lang['passchk']               = 'Bir kez daha girin';
+$lang['remember']              = 'Beni hatırla';
+$lang['fullname']              = 'Tam isim';
+$lang['email']                 = 'E-posta';
+$lang['profile']               = 'Kullanıcı Bilgileri';
+$lang['badlogin']              = 'Üzgünüz, Kullanıcı adı veya şifre yanlış oldu.';
+$lang['badpassconfirm']        = 'Üzgünüz, parolanız yanlış';
+$lang['minoredit']             = 'Küçük Değişiklikler';
+$lang['draftdate']             = 'Taslak şu saatte otomatik kaydedildi:';
+$lang['nosecedit']             = 'Sayfa yakın zamanda değiştirilmiştir, bölüm bilgisi eski kalmıştır. Bunun için bölüm yerine tüm sayfa yüklenmiştir.';
+$lang['regmissing']            = 'Üzgünüz, tüm alanları doldurmalısınız.';
+$lang['reguexists']            = 'Üzgünüz, bu isime sahip bir kullanıcı zaten mevcut.';
+$lang['regsuccess']            = 'Kullanıcı oluşturuldu ve şifre e-posta adresine gönderildi.';
+$lang['regsuccess2']           = 'Kullanıcı oluşturuldu.';
+$lang['regmailfail']           = 'Şifrenizi e-posta ile gönderirken bir hata oluşmuş gibi görünüyor. Lütfen yönetici ile temasa geçiniz!';
+$lang['regbadmail']            = 'Verilen e-posta adresi geçersiz gibi görünüyor - bunun bir hata olduğunu düşünüyorsanız yönetici ile temasa geçiniz.';
+$lang['regbadpass']            = 'Girilen parolalar aynı değil. Lütfen tekrar deneyiniz.';
+$lang['regpwmail']             = 'DokuWiki parolanız';
+$lang['reghere']               = 'Daha hesabınız yok mu? Hemen bir tane açtırın!';
+$lang['profna']                = 'Bu wiki kullanıcı bilgilerini değiştirmeyi desteklememektedir';
+$lang['profnochange']          = 'Değişiklik yok, birşey yapılmadı.';
+$lang['profnoempty']           = 'Boş isim veya e-posta adresine izin verilmiyor.';
+$lang['profchanged']           = 'Kullanıcı bilgileri başarıyla değiştirildi.';
+$lang['profnodelete']          = 'Bu wiki kullanıcı silmeyi desteklemiyor';
+$lang['profdeleteuser']        = 'Hesabı Sil';
+$lang['profdeleted']           = 'Bu wiki\'den hesabınız silindi';
+$lang['profconfdelete']        = 'Bu wiki\'den hesabımı silmek istiyorum. 
        Bu işlem geri alınamaz';
+$lang['profconfdeletemissing'] = 'Onay kutusu işaretlenmedi';
+$lang['pwdforget']             = 'Parolanızı mı unuttunuz? Yeni bir parola alın';
+$lang['resendna']              = 'Bu wiki parolayı tekrar göndermeyi desteklememektedir.';
+$lang['resendpwd']             = 'İçin yeni şifre belirle';
+$lang['resendpwdmissing']      = 'Üzgünüz, tüm alanları doldurmalısınız.';
+$lang['resendpwdnouser']       = 'Üzgünüz,  veritabanımızda bu kullanıcıyı bulamadık.';
+$lang['resendpwdbadauth']      = 'Üzgünüz, bu doğrulama kodu doğru değil. Doğrulama linkini tam olarak kullandığınıza emin olun.';
+$lang['resendpwdconfirm']      = 'Doğrulama linki e-posta adresinize gönderildi.';
+$lang['resendpwdsuccess']      = 'Yeni parolanız e-posta adresinize gönderildi.';
+$lang['license']               = 'Aksi belirtilmediği halde, bu wikinin içeriğinin telif hakları şu lisans ile korunmaktadır:';
+$lang['licenseok']             = 'Not: Bu sayfayı değiştirerek yazınızın şu lisans ile yayınlanmasını kabul etmiş olacaksınız:';
+$lang['searchmedia']           = 'Dosya Adı Ara:';
+$lang['searchmedia_in']        = '%s içinde ara';
+$lang['txt_upload']            = 'Yüklenecek dosyayı seç';
+$lang['txt_filename']          = 'Dosya adı (zorunlu değil)';
+$lang['txt_overwrt']           = 'Mevcut dosyanın üstüne yaz';
+$lang['maxuploadsize']         = 'Yükleme dosya başına en fazla %s';
+$lang['lockedby']              = 'Şu an şunun tarafından kilitli:';
+$lang['lockexpire']            = 'Kilitin açılma tarihi:';
+$lang['js']['willexpire']      = 'Bu sayfayı değiştirme kilidinin süresi yaklaşık bir dakika içinde geçecek.\nÇakışmaları önlemek için önizleme tuşunu kullanarak kilit sayacını sıfırla.';
+$lang['js']['notsavedyet']     = 'Kaydedilmemiş değişiklikler kaybolacak.
+Devam etmek istiyor musunuz?';
+$lang['js']['searchmedia']     = 'Dosyalar için Ara';
+$lang['js']['keepopen']        = 'Seçim yapıldığında bu pencereyi açık tut';
+$lang['js']['hidedetails']     = 'Ayrıntıları gizle';
+$lang['js']['mediatitle']      = 'Bağlantı Ayarları';
+$lang['js']['mediadisplay']    = 'Bağlantı Tipi';
+$lang['js']['mediaalign']      = 'Hizalama';
+$lang['js']['mediasize']       = 'Resim büyüklüğü';
+$lang['js']['mediatarget']     = 'Bağlantı hedefi';
+$lang['js']['mediaclose']      = 'Kapat';
+$lang['js']['mediainsert']     = 'Ekle';
+$lang['js']['mediadisplayimg'] = 'Resmi görüntüle';
+$lang['js']['mediadisplaylnk'] = 'Sadece bağlantıyı görüntüle ';
+$lang['js']['mediasmall']      = 'Küçük versiyon';
+$lang['js']['mediamedium']     = 'Orta versiyon';
+$lang['js']['medialarge']      = 'Büyük versiyon';
+$lang['js']['mediaoriginal']   = 'Orjinal versiyon';
+$lang['js']['medialnk']        = 'Detay sayfasına bağlantı';
+$lang['js']['mediadirect']     = 'Orjinal sayfaya bağlantı';
+$lang['js']['medianolnk']      = 'Bağlantı yok';
+$lang['js']['medianolink']     = 'Resme bağlantı verme';
+$lang['js']['medialeft']       = 'Resmi sola hizala';
+$lang['js']['mediaright']      = 'Resmi sağa hizala';
+$lang['js']['mediacenter']     = 'Resmi ortaya hizala';
+$lang['js']['medianoalign']    = 'Hizalama kullanma';
+$lang['js']['nosmblinks']      = 'Windows paylaşımı sadece Microsoft Internet Explorer ile çalışmaktadır. Yine de hala bağlantıyı kopyalayıp yapıştırarak kullanabilirsiniz. ';
+$lang['js']['linkwiz']         = 'Bağlantı sihirbazı';
+$lang['js']['linkto']          = 'Bağlantı:';
+$lang['js']['del_confirm']     = 'Bu girişi sil?';
+$lang['js']['restore_confirm'] = 'Bu sürüme geri dönmek istediğinizden emin misiniz?';
+$lang['js']['media_diff']      = 'Farkları gör:';
+$lang['js']['media_diff_both'] = 'Yan yana';
+$lang['js']['media_select']    = 'Dosyalar seç...';
+$lang['js']['media_upload_btn'] = 'Yükle';
+$lang['js']['media_done_btn']  = 'Bitti';
+$lang['js']['media_drop']      = 'Yüklemek istediğiniz dosyaları buraya bırakın';
+$lang['js']['media_cancel']    = 'kaldır';
+$lang['js']['media_overwrt']   = 'Var olan dosyaların üzerine yaz';
+$lang['rssfailed']             = 'Bu beslemeyi çekerken hata oluştu: ';
+$lang['nothingfound']          = 'Hiçbir şey yok.';
+$lang['mediaselect']           = 'Çokluortam dosyası seçimi';
+$lang['fileupload']            = 'Çokluortam dosyası yükleme';
+$lang['uploadsucc']            = 'Yükleme tamam';
+$lang['uploadfail']            = 'Yükleme başarısız. Yetki hatası olabilir!';
+$lang['uploadwrong']           = 'Yükleme engellendi. Bu dosya uzantısına izin verilmiyor!';
+$lang['uploadexist']           = 'Dosya zaten var. Hiçbir şey yapılmadı.';
+$lang['uploadbadcontent']      = 'Yüklenen içerik %s uzantısı ile uyuşmuyor.';
+$lang['uploadspam']            = 'Yükleme işlemi spam karalistesi tarafından engellendi.';
+$lang['uploadxss']             = 'Yükleme işlemi muhtemel kötü içerik sebebiyle engellendi.';
+$lang['uploadsize']            = 'Yüklenmek istenen dosya boyutu çok büyük (en fazla %s)';
+$lang['deletesucc']            = '"%s" dosyası silindi.';
+$lang['deletefail']            = '"%s" silinemedi - yetkileri kontrol et.';
+$lang['mediainuse']            = '"%s" dosyası silinmedi, hala kullanımda.';
+$lang['namespaces']            = 'Namespaces';
+$lang['mediafiles']            = 'Şuradaki kullanıma hazır dosyalar:';
+$lang['accessdenied']          = 'Bu sayfayı görüntüleme yetkiniz bulunmamaktadır';
+$lang['mediausage']            = 'Şu ';
+$lang['mediaview']             = 'Özgün dosyayı göster';
+$lang['mediaroot']             = 'Kök dizini';
+$lang['mediaupload']           = 'Dosya bu namespace\'e yüklenir. Alt namespace oluşturmak için "Dosya adı" kısmınının başına alt namespace adını ekleyip ardından iki nokta koyun.';
+$lang['mediaextchange']        = 'Dosya uzantısı .%s\'den .%s\'e çevrildi!';
+$lang['reference']             = 'Şunun için referanslar:';
+$lang['ref_inuse']             = 'Dosya silinemiyor, çünkü şu sayfalar tarafından hala kullanılmakta:';
+$lang['ref_hidden']            = 'Bazı referanslar okuma yetkiniz olmayan sayfalarda';
+$lang['hits']                  = 'tane bulundu';
+$lang['quickhits']             = 'Uyan sayfalar';
+$lang['toc']                   = 'İçindekiler';
+$lang['current']               = 'mevcut';
+$lang['yours']                 = 'Senin Sürümün';
+$lang['diff']                  = 'Kullanılan sürüm ile farkları göster';
+$lang['diff2']                 = 'Seçili sürümler arasındaki farkı göster';
+$lang['difflink']              = 'Karşılaştırma görünümüne bağlantı';
+$lang['line']                  = 'Satır';
+$lang['breadcrumb']            = 'İz';
+$lang['youarehere']            = 'Buradasınız';
+$lang['lastmod']               = 'Son değiştirilme';
+$lang['by']                    = 'Değiştiren:';
+$lang['deleted']               = 'silindi';
+$lang['created']               = 'oluşturuldu';
+$lang['restored']              = 'eski sürüme dönüldü (%s)';
+$lang['external_edit']         = 'Dışarıdan düzenle';
+$lang['summary']               = 'Özeti düzenle';
+$lang['noflash']               = 'Bu içeriği göstermek için Adobe Flash Eklentisi gerekmektedir.';
+$lang['download']              = 'Parçacığı indir';
+$lang['mail_newpage']          = 'sayfa eklenme:';
+$lang['mail_changed']          = 'sayfa değiştirilme:';
+$lang['mail_new_user']         = 'yeni kullanıcı';
+$lang['mail_upload']           = 'dosya yüklendi:';
+$lang['pages_changes']         = 'Sayfalar';
+$lang['media_changes']         = 'Çokluortam dosyaları';
+$lang['both_changes']          = 'Sayfalar ve çoklu ortam dosyaları';
+$lang['qb_bold']               = 'Kalın Yazı';
+$lang['qb_italic']             = 'Eğik Yazı';
+$lang['qb_underl']             = 'Altı Çizgili Yazı';
+$lang['qb_code']               = 'Kod Haline Getir';
+$lang['qb_strike']             = 'Ortası Çizilmiş Yazı';
+$lang['qb_h1']                 = '1. Seviye Başlık';
+$lang['qb_h2']                 = '2. Seviye Başlık';
+$lang['qb_h3']                 = '3. Seviye Başlık';
+$lang['qb_h4']                 = '4. Seviye Başlık';
+$lang['qb_h5']                 = '5. Seviye Başlık';
+$lang['qb_h']                  = 'Başlık';
+$lang['qb_hs']                 = 'Başlığı seç';
+$lang['qb_hplus']              = 'Daha yüksek başlık';
+$lang['qb_link']               = 'İç Bağlantı';
+$lang['qb_extlink']            = 'Dış Bağlantı';
+$lang['qb_hr']                 = 'Yatay Çizgi';
+$lang['qb_ol']                 = 'Sıralı liste';
+$lang['qb_ul']                 = 'Sırasız liste';
+$lang['qb_media']              = 'Resim ve başka dosyalar ekle';
+$lang['qb_sig']                = 'İmza Ekle';
+$lang['qb_smileys']            = 'Gülen Yüzler';
+$lang['qb_chars']              = 'Özel Karakterler';
+$lang['admin_register']        = 'Yeni kullanıcı ekle...';
+$lang['metaedit']              = 'Metaverileri Değiştir';
+$lang['metasaveerr']           = 'Metaveri yazma başarısız ';
+$lang['metasaveok']            = 'Metaveri kaydedildi';
+$lang['img_backto']            = 'Şuna dön:';
+$lang['img_title']             = 'Başlık';
+$lang['img_caption']           = 'Serlevha';
+$lang['img_date']              = 'Tarih';
+$lang['img_fname']             = 'Dosya Adı';
+$lang['img_fsize']             = 'Boyut';
+$lang['img_artist']            = 'Fotoğrafçı';
+$lang['img_copyr']             = 'Telif Hakkı';
+$lang['img_format']            = 'Biçim';
+$lang['img_camera']            = 'Fotoğraf Makinası';
+$lang['img_keywords']          = 'Anahtar Sözcükler';
+$lang['img_width']             = 'Genişlik';
+$lang['img_height']            = 'Yükseklik';
+$lang['img_manager']           = 'Ortam oynatıcısında göster';
+$lang['subscr_m_subscribe']    = 'Kayıt ol';
+$lang['subscr_m_receive']      = 'Al';
+$lang['authtempfail']          = 'Kullanıcı doğrulama geçici olarak yapılamıyor. Eğer bu durum devam ederse lütfen Wiki yöneticine haber veriniz.';
+$lang['authpwdexpire']         = 'Şifreniz %d gün sonra geçersiz hale gelecek, yakın bir zamanda değiştirmelisiniz.';
+$lang['i_chooselang']          = 'Dili seçiniz';
+$lang['i_installer']           = 'Dokuwiki Kurulum Sihirbazı';
+$lang['i_wikiname']            = 'Wiki Adı';
+$lang['i_enableacl']           = 'ACL\'yi etkinleştir (tavsiye edilir)';
+$lang['i_superuser']           = 'Ana Kullanıcı';
+$lang['i_problems']            = 'Kurulum sihirbazı aşağıda gösterilen sorunları buldu. Bunları düzeltmeden devam etmeniz mümkün değil.';
+$lang['i_modified']            = 'Güzenlik sebebiyle bu script sadece yeni ve değiştirilmemiş bir Dokuwiki kurulumunda çalışır. Ya indirdiğiniz paketi yeniden açmalı ya da  adresindeki Dokuwiki kurulum kılavuzuna bakmalısınız.';
+$lang['i_funcna']              = '%s PHP fonksiyonu bulunmamaktadır. Barındırma(Hosting) hizmetinde bu özellik kapatılmış olabilir.';
+$lang['i_phpver']              = '%s PHP sürümü, gereken %s  sürümünden daha düşük. PHP kurulumunu yükseltmeniz gerekmektedir.';
+$lang['i_permfail']            = '%s Dokuwiki tarafından yazılabilir değil. İzin ayarlarını bu klasör için düzeltmeniz gerekmektedir!';
+$lang['i_confexists']          = '%s zaten var';
+$lang['i_writeerr']            = '%s oluşturulamadı. Dosya/Klasör izin ayarlarını gözden geçirip dosyayı elle oluşturmalısınız.';
+$lang['i_badhash']             = 'dokuwiki.php tanınamadı ya da değiştirilmiş (hash=%s)';
+$lang['i_badval']              = '%s - Yanlış veya boş değer';
+$lang['i_success']             = 'Kurulum başarıyla tamamlandı. Şimdi install.php dosyasını silebilirsiniz. Yeni DokuWikinizi kullanabilirsiniz.';
+$lang['i_failure']             = 'Ayar dosyalarını yazarken bazı hatalar oluştu. Yeni DokuWikinizi kullanmadan önce bu hatalarınızı elle düzeltmeniz gerekebilir.';
+$lang['i_policy']              = 'İlk ACL ayarı';
+$lang['i_pol0']                = 'Tamamen Açık Wiki (herkes okuyabilir, yazabilir ve dosya yükleyebilir)';
+$lang['i_pol1']                = 'Açık Wiki (herkes okuyabilir, ancak  sadece üye olanlar yazabilir ve dosya yükleyebilir)';
+$lang['i_pol2']                = 'Kapalı Wiki (sadece üye olanlar okuyabilir, yazabilir ve dosya yükleyebilir)';
+$lang['i_retry']               = 'Tekrar Dene';
+$lang['i_license']             = 'Lütfen içeriği hangi lisans altında yayınlamak istediğniizi belirtin:';
+$lang['recent_global']         = '%s namespace\'i içerisinde yapılan değişiklikleri görüntülemektesiniz. Wiki\'deki tüm değişiklikleri de bu adresten görebilirsiniz. ';
+$lang['years']                 = '%d yıl önce';
+$lang['months']                = '%d ay önce';
+$lang['weeks']                 = '%d hafta önce';
+$lang['days']                  = '%d gün önce';
+$lang['hours']                 = '%d saat önce';
+$lang['minutes']               = '%d dakika önce';
+$lang['seconds']               = '%d saniye önce';
+$lang['wordblock']             = 'Değişikliğiniz kaydedilmedi çünkü istenmeyen mesaj içeriyor (spam).';
+$lang['media_uploadtab']       = 'Karşıya yükle';
+$lang['media_searchtab']       = 'Ara';
+$lang['media_file']            = 'Dosya';
+$lang['media_viewtab']         = 'Görünüm';
+$lang['media_edittab']         = 'Düzenle';
+$lang['media_historytab']      = 'Geçmiş';
+$lang['media_list_thumbs']     = 'Küçük resimler';
+$lang['media_list_rows']       = 'Satırlar';
+$lang['media_sort_name']       = 'İsim';
+$lang['media_sort_date']       = 'Tarih';
+$lang['media_files']           = '%s deki dosyalar';
+$lang['media_upload']          = '%s dizinine yükle';
+$lang['media_search']          = '%s dizininde ara';
+$lang['media_view']            = '%s';
+$lang['media_edit']            = 'Düzenle %s';
+$lang['media_history']         = 'Geçmiş %s';
+$lang['media_perm_upload']     = 'Üzgünüm, karşıya dosya yükleme yetkiniz yok.';
+$lang['media_restore']         = 'Bu sürümü eski haline getir';
diff --git a/sources/inc/lang/tr/locked.txt b/sources/inc/lang/tr/locked.txt
new file mode 100644
index 0000000..1438542
--- /dev/null
+++ b/sources/inc/lang/tr/locked.txt
@@ -0,0 +1,4 @@
+====== Sayfa kilitli ======
+
+Bu sayfa şu anda başka bir kullanıcının değiştirmesi için kilitli. Kilitin süresi geçene veya bu kullanıcı değiştirmeyi bitirene kadar beklemelisiniz.
+
diff --git a/sources/inc/lang/tr/login.txt b/sources/inc/lang/tr/login.txt
new file mode 100644
index 0000000..2ce378d
--- /dev/null
+++ b/sources/inc/lang/tr/login.txt
@@ -0,0 +1,4 @@
+====== Giriş ======
+
+Şu an giriş yapmış değilsiniz! Giriş yapmak için giriş bilgilerinizi aşağıya yazın. Giriş yapmak için çerezleri açmalısınız.
+
diff --git a/sources/inc/lang/tr/mailtext.txt b/sources/inc/lang/tr/mailtext.txt
new file mode 100644
index 0000000..7e8fc8d
--- /dev/null
+++ b/sources/inc/lang/tr/mailtext.txt
@@ -0,0 +1,16 @@
+DokuWikinizde bir sayfa eklendi veya değişti. Detaylar şunlar:
+
+Tarih            : @DATE@
+Tarayıcı         : @BROWSER@
+IP-Adresi        : @IPADDRESS@
+Sunucu adı       : @HOSTNAME@
+Eski Sürüm       : @OLDPAGE@
+Yeni Sürüm       : @NEWPAGE@
+Değiştirme Özeti : @SUMMARY@
+Kullanıcı        : @USER@
+
+@DIFF@
+
+
+-- 
+Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
diff --git a/sources/inc/lang/tr/newpage.txt b/sources/inc/lang/tr/newpage.txt
new file mode 100644
index 0000000..8a47e6b
--- /dev/null
+++ b/sources/inc/lang/tr/newpage.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/tr/norev.txt b/sources/inc/lang/tr/norev.txt
new file mode 100644
index 0000000..e6f97be
--- /dev/null
+++ b/sources/inc/lang/tr/norev.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/tr/password.txt b/sources/inc/lang/tr/password.txt
new file mode 100644
index 0000000..956a786
--- /dev/null
+++ b/sources/inc/lang/tr/password.txt
@@ -0,0 +1,10 @@
+Merhaba @FULLNAME@!
+
+
+@DOKUWIKIURL@ adresindeki @TITLE@ için kullanıcı bilgin şöyle:
+
+Giriş ismi : @LOGIN@
+Parola : @PASSWORD@
+
+-- 
+Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
\ No newline at end of file
diff --git a/sources/inc/lang/tr/preview.txt b/sources/inc/lang/tr/preview.txt
new file mode 100644
index 0000000..71a8a42
--- /dev/null
+++ b/sources/inc/lang/tr/preview.txt
@@ -0,0 +1,4 @@
+====== Önizleme ======
+
+Bu yazınızın nasıl çıkacağının bir önizlemesi. Unutma: Yazı henüz **kaydedilmedi!**
+
diff --git a/sources/inc/lang/tr/pwconfirm.txt b/sources/inc/lang/tr/pwconfirm.txt
new file mode 100644
index 0000000..22348bb
--- /dev/null
+++ b/sources/inc/lang/tr/pwconfirm.txt
@@ -0,0 +1,13 @@
+Merhaba @FULLNAME@!
+
+@DOKUWIKIURL@ adresinde kullanılan @TITLE@ hesabı için parola talebinde bulunuldu.
+
+Eğer böyle bir talebiniz olmadıysa, bu e-postayı görmezden gelebilirsiniz.
+
+Onaylamak istiyorsanız aşağıdaki linke tıklayınız.
+
+@CONFIRM@
+
+-- 
+Bu e-posta aşağıdaki DokuWiki tarafından otomatik olarak oluşturulmuştur.
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/tr/read.txt b/sources/inc/lang/tr/read.txt
new file mode 100644
index 0000000..59314f1
--- /dev/null
+++ b/sources/inc/lang/tr/read.txt
@@ -0,0 +1,2 @@
+Bu sayfa salt okunur. Kaynağı görebilirsiniz ama değiştiremezsiniz. Bunun yanlış olduğunu düşünüyorsanız yöneticiye danışın.
+
diff --git a/sources/inc/lang/tr/recent.txt b/sources/inc/lang/tr/recent.txt
new file mode 100644
index 0000000..99efc8f
--- /dev/null
+++ b/sources/inc/lang/tr/recent.txt
@@ -0,0 +1,5 @@
+====== Son değişiklikler ======
+
+Aşağıdaki sayfalar yakın zamanda değiştirildi.
+
+
diff --git a/sources/inc/lang/tr/register.txt b/sources/inc/lang/tr/register.txt
new file mode 100644
index 0000000..b67e4b5
--- /dev/null
+++ b/sources/inc/lang/tr/register.txt
@@ -0,0 +1,4 @@
+====== Yeni kullanıcı olarak kaydolun ======
+
+Bu wikide yeni bir hesap açmak için aşağıdaki tüm bilgileri doldurunuz. **Doğru e-posta adresi verdiğinizden** emin olun, yeni parolanız e-postanıza gönderilecek. Giriş adınız geçerli bir [[doku>pagename|sayfa adı]] olmalıdır.
+
diff --git a/sources/inc/lang/tr/registermail.txt b/sources/inc/lang/tr/registermail.txt
new file mode 100644
index 0000000..7754a56
--- /dev/null
+++ b/sources/inc/lang/tr/registermail.txt
@@ -0,0 +1,13 @@
+Yeni bir kullanıcı kayıt oldu. Ayrıntıları aşağıda listelenmiştir:
+
+Kullanıcı adı : @NEWUSER@
+İsim : @NEWNAME@
+E-posta : @NEWEMAIL@
+
+Tarih : @DATE@
+Tarayıcı : @BROWSER@
+IP Numarası : @IPADDRESS@
+Host : @HOSTNAME@
+
+-- 
+Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
\ No newline at end of file
diff --git a/sources/inc/lang/tr/resendpwd.txt b/sources/inc/lang/tr/resendpwd.txt
new file mode 100644
index 0000000..1a34396
--- /dev/null
+++ b/sources/inc/lang/tr/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Yeni Parola Gönderimi ======
+
+Lütfen bu wikide kullanmış olduğunuz kullanıcı adını aşağıdaki forma yazınız. Onay linki, kayıtlı e-posta adresinize gönderilecektir.
diff --git a/sources/inc/lang/tr/resetpwd.txt b/sources/inc/lang/tr/resetpwd.txt
new file mode 100644
index 0000000..1ed7586
--- /dev/null
+++ b/sources/inc/lang/tr/resetpwd.txt
@@ -0,0 +1,3 @@
+	====== Yeni şifre belirle ======
+
+Lütfen bu wiki hesabınız için yeni bir şifre belirleyin.
\ No newline at end of file
diff --git a/sources/inc/lang/tr/revisions.txt b/sources/inc/lang/tr/revisions.txt
new file mode 100644
index 0000000..841fba2
--- /dev/null
+++ b/sources/inc/lang/tr/revisions.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/tr/searchpage.txt b/sources/inc/lang/tr/searchpage.txt
new file mode 100644
index 0000000..ae6d50c
--- /dev/null
+++ b/sources/inc/lang/tr/searchpage.txt
@@ -0,0 +1,5 @@
+====== 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 =====
diff --git a/sources/inc/lang/tr/showrev.txt b/sources/inc/lang/tr/showrev.txt
new file mode 100644
index 0000000..4cf3d26
--- /dev/null
+++ b/sources/inc/lang/tr/showrev.txt
@@ -0,0 +1,2 @@
+**Bu, dökümanın eski bir sürümüdür!**
+----
diff --git a/sources/inc/lang/tr/stopwords.txt b/sources/inc/lang/tr/stopwords.txt
new file mode 100644
index 0000000..293067a
--- /dev/null
+++ b/sources/inc/lang/tr/stopwords.txt
@@ -0,0 +1,29 @@
+# Bu indeksleyicinin yok saydığı kelimelerin bir listesidir, satır başına bir kelime yazılır
+# Bu dosyayı değiştirirken UNIX satır sonları (tek satır sonu) kullandığınız emin olun
+# 3 karakterden kısa kelimeleri eklenmesine gerek yoktur, bunlar zaten indekslenmez
+# Bu liste http://www.ranks.nl/stopwords/ altındakilerden derlenmiştir
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/tr/updateprofile.txt b/sources/inc/lang/tr/updateprofile.txt
new file mode 100644
index 0000000..20b07f9
--- /dev/null
+++ b/sources/inc/lang/tr/updateprofile.txt
@@ -0,0 +1,3 @@
+====== Kullanıcı Bilgilerini Güncelleme ======
+
+İstediğiniz kullanıcı bilgilerini değiştirebilirsiniz. Ancak kullanıcı adınızı değiştirmeniz mümkün değildir.
diff --git a/sources/inc/lang/tr/uploadmail.txt b/sources/inc/lang/tr/uploadmail.txt
new file mode 100644
index 0000000..2d75345
--- /dev/null
+++ b/sources/inc/lang/tr/uploadmail.txt
@@ -0,0 +1,13 @@
+Yeni dosya yüklendi. Ayrıntıları aşağıda listelenmiştir:
+
+Dosya : @MEDIA@
+Tarih : @DATE@
+Tarayıcı : @BROWSER@
+IP Adresi : @IPADDRESS@
+Host : @HOSTNAME@
+Boyut : @SIZE@
+MIME Type : @MIME@
+Kullanıcı : @USER@
+
+-- 
+Bu e-posta @DOKUWIKIURL@ adresindeki DokuWiki tarafından hazırlandı.
\ No newline at end of file
diff --git a/sources/inc/lang/uk/admin.txt b/sources/inc/lang/uk/admin.txt
new file mode 100644
index 0000000..f698d93
--- /dev/null
+++ b/sources/inc/lang/uk/admin.txt
@@ -0,0 +1,4 @@
+====== Адміністрування ======
+
+Нижче ви можете знайти перелік адміністративних задач, що наявні в ДокуВікі.
+
diff --git a/sources/inc/lang/uk/adminplugins.txt b/sources/inc/lang/uk/adminplugins.txt
new file mode 100644
index 0000000..3689ccd
--- /dev/null
+++ b/sources/inc/lang/uk/adminplugins.txt
@@ -0,0 +1 @@
+===== Додаткові плагіни =====
\ No newline at end of file
diff --git a/sources/inc/lang/uk/backlinks.txt b/sources/inc/lang/uk/backlinks.txt
new file mode 100644
index 0000000..5f293e5
--- /dev/null
+++ b/sources/inc/lang/uk/backlinks.txt
@@ -0,0 +1,3 @@
+====== Зворотні зв'язки ======
+
+Це перелік сторінок, які, здається, посилаються на поточну сторінку.
diff --git a/sources/inc/lang/uk/conflict.txt b/sources/inc/lang/uk/conflict.txt
new file mode 100644
index 0000000..5a89307
--- /dev/null
+++ b/sources/inc/lang/uk/conflict.txt
@@ -0,0 +1,8 @@
+====== Існує більш нова версія ======
+
+Існує новіша версія документу, що ви редагували. Це може статися, коли інший користувач змінив документ під час вашого редагування.
+
+Уважно перегляньте розбіжності та вирішіть, яку версію залишити. Якщо ви натиснете
+''зберегти'', буде збережена ваша версія. Якщо натиснете ''скасувати'' --- то залишиться
+поточна версія.
+
diff --git a/sources/inc/lang/uk/denied.txt b/sources/inc/lang/uk/denied.txt
new file mode 100644
index 0000000..5db12e1
--- /dev/null
+++ b/sources/inc/lang/uk/denied.txt
@@ -0,0 +1,4 @@
+====== Доступ заборонено ======
+
+Вибачте, але у вас не вистачає прав для продовження. Можливо ви забули увійти в систему?
+
diff --git a/sources/inc/lang/uk/diff.txt b/sources/inc/lang/uk/diff.txt
new file mode 100644
index 0000000..cfdf9a8
--- /dev/null
+++ b/sources/inc/lang/uk/diff.txt
@@ -0,0 +1,4 @@
+====== Розбіжності ======
+
+Тут показані розбіжності між вибраною ревізією та поточною версією сторінки.
+
diff --git a/sources/inc/lang/uk/draft.txt b/sources/inc/lang/uk/draft.txt
new file mode 100644
index 0000000..f6acca8
--- /dev/null
+++ b/sources/inc/lang/uk/draft.txt
@@ -0,0 +1,6 @@
+====== Знайдено чернетку ======
+
+Останнє редагування цієї сторінки не було завершено коректно. ДокуВікі автоматично зберегла чернетку під час вашої роботи. Ви можете використати чернетку для продовження редагування. Нижче ви можете побачити дані, збережені з попереднього сеансу.
+
+Будь ласка вирішить, чи ви бажаєте //відновити// останній сеанс редагування, //знищити// збережену чернетку або //скасувати// редагування.
+
diff --git a/sources/inc/lang/uk/edit.txt b/sources/inc/lang/uk/edit.txt
new file mode 100644
index 0000000..82dbc1a
--- /dev/null
+++ b/sources/inc/lang/uk/edit.txt
@@ -0,0 +1 @@
+Відредагуйте сторінку та натисніть ''Зберегти''. Використовуйте [[wiki:syntax|посібник]] з синтаксису для довідки. Будь ласка, змінюйте сторінку лише у тому випадку, коли ви можете **покращити** її. Якщо ви бажаєте щось спробувати, використовуйте спеціальну сторінку [[playground:playground]]
diff --git a/sources/inc/lang/uk/editrev.txt b/sources/inc/lang/uk/editrev.txt
new file mode 100644
index 0000000..aae86fa
--- /dev/null
+++ b/sources/inc/lang/uk/editrev.txt
@@ -0,0 +1,2 @@
+**Ви завантажили стару версію документу!** Якщо ви збережете її, ви створите нову версію з ціми даними.
+----
diff --git a/sources/inc/lang/uk/index.txt b/sources/inc/lang/uk/index.txt
new file mode 100644
index 0000000..0ba0d18
--- /dev/null
+++ b/sources/inc/lang/uk/index.txt
@@ -0,0 +1,4 @@
+====== Зміст ======
+
+Це перелік усіх доступних сторінок, упоряджених за [[doku>namespaces|просторами імен]]
+
diff --git a/sources/inc/lang/uk/install.html b/sources/inc/lang/uk/install.html
new file mode 100644
index 0000000..a280427
--- /dev/null
+++ b/sources/inc/lang/uk/install.html
@@ -0,0 +1,21 @@
+
        Ця сторінка допомагає при першій установці та налаштуванні ДокуВікі.
+Більше інформації про програму установки можна знайти на сторінці документації.
        
+
+
        ДокуВікі використовую звичайні файли для зберігання сторінок вікі та іншої інформації,
+щодо цих сторінок (наприклад, зображень, індексів пошуку, старих ревізій та ін.). Для
+успішного функціонування ДокуВікі має мати права на запис для папок, що
+містять ці файли. Ця програма установки не може змінювати права доступу. Звичайно це
+робиться за допомогою інтерпретатора shell, або, якщо ви використовуєте хостинг,
+за допомогою FTP або панелі управління хостингом (наприклад cPanel).
        
+
+
        Ця програма установки налаштує вашу ДокуВікі для використання
+ACL, що, в свою чергу,
+дозволить адміністратору входити до адміністративного меню для установки доданків,
+керування користувачами, керування правами доступу до сторінок Вікі та змін параметрів
+конфігурації. Це не є обов'язковим для роботи ДокуВікі, але зробить життя адміністратора
+значно легшим.
        
+
+
        Досвідчені користувачі, або користувачі, що мають особливі вимоги до налагодження, мають
+використовувати ці посилання для детальної інформації, щодо
+інструкцій з установки
+та параметрів конфігурації.
        
diff --git a/sources/inc/lang/uk/lang.php b/sources/inc/lang/uk/lang.php
new file mode 100644
index 0000000..4e91e82
--- /dev/null
+++ b/sources/inc/lang/uk/lang.php
@@ -0,0 +1,287 @@
+
+ * @author serg_stetsuk@ukr.net
+ * @author Oleksandr Kunytsia 
+ * @author Uko 
+ * @author Ulrikhe Lukoie  
+ * @author Kate Arzamastseva pshns@ukr.net
+ * @author Egor Smkv 
+ */
+$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_profile']           = 'Оновити профіль';
+$lang['btn_reset']             = 'Очистити';
+$lang['btn_resendpwd']         = 'Встановити новий пароль';
+$lang['btn_draft']             = 'Редагувати чернетку';
+$lang['btn_recover']           = 'Відновити чернетку';
+$lang['btn_draftdel']          = 'Знищити чернетку';
+$lang['btn_revert']            = 'Відновити';
+$lang['btn_register']          = 'Реєстрація';
+$lang['btn_apply']             = 'Застосувати';
+$lang['btn_deleteuser']        = 'Видалити мій аккаунт';
+$lang['loggedinas']            = 'Ви';
+$lang['user']                  = 'Користувач';
+$lang['pass']                  = 'Пароль';
+$lang['newpass']               = 'Новий пароль';
+$lang['oldpass']               = 'Поточний пароль';
+$lang['passchk']               = 'ще раз';
+$lang['remember']              = 'Запам\'ятати мене';
+$lang['fullname']              = 'Повне ім\'я';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = 'Профіль користувача';
+$lang['badlogin']              = 'Вибачте, невірне ім\'я чи пароль.';
+$lang['badpassconfirm']        = 'Вибачте, але пароль невірний';
+$lang['minoredit']             = 'Незначні зміни';
+$lang['draftdate']             = 'Чернетка збережена';
+$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['profnochange']          = 'Немає змін, немає що робити.';
+$lang['profnoempty']           = 'Ім’я або e-mail не можуть бути пустими.';
+$lang['profchanged']           = 'Профіль успішно змінено.';
+$lang['profdeleteuser']        = 'Видалити аккаунт';
+$lang['pwdforget']             = 'Забули пароль? Отримайте новий';
+$lang['resendna']              = 'Ця Вікі не підтримує повторне відправлення пароля.';
+$lang['resendpwd']             = 'Встановити новий пароль для';
+$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['js']['willexpire']      = 'Блокування редагування цієї сторінки закінчується через хвилину.\n Щоб уникнути конфліктів використовуйте кнопку перегляду для продовження блокування.';
+$lang['js']['notsavedyet']     = 'Незбережені зміни будуть втрачені.
+ Дійсно продовжити?';
+$lang['js']['searchmedia']     = 'Шукати файли';
+$lang['js']['keepopen']        = 'Тримати вікно відкритим під час вибору';
+$lang['js']['hidedetails']     = 'Сховати деталі';
+$lang['js']['mediatitle']      = 'Налаштунки посилання';
+$lang['js']['mediadisplay']    = 'Тип посилання';
+$lang['js']['mediaalign']      = 'Вирівнювання';
+$lang['js']['mediasize']       = 'Розмір зображення';
+$lang['js']['mediatarget']     = 'Ціль посилання';
+$lang['js']['mediaclose']      = 'Закрити';
+$lang['js']['mediainsert']     = 'Вставити';
+$lang['js']['mediadisplayimg'] = 'Показати зображення.';
+$lang['js']['mediadisplaylnk'] = 'Показати тільки посилання.';
+$lang['js']['mediasmall']      = 'Зменшена версія';
+$lang['js']['mediamedium']     = 'Середня версія';
+$lang['js']['medialarge']      = 'Велика версія';
+$lang['js']['mediaoriginal']   = 'Оригінальна версія';
+$lang['js']['medialnk']        = 'Посилання на сторінку з описом';
+$lang['js']['mediadirect']     = 'Пряме посилання на оригінал';
+$lang['js']['medianolnk']      = 'Немає посилання';
+$lang['js']['medianolink']     = 'Не посилайтеся на зображення';
+$lang['js']['medialeft']       = 'Вирівняти зображення по лівому краю.';
+$lang['js']['mediaright']      = 'Вирівняти зображення по правому краю.';
+$lang['js']['mediacenter']     = 'Вирівняти зображення по центру.';
+$lang['js']['medianoalign']    = 'Не вирівнювати зображення.';
+$lang['js']['nosmblinks']      = 'Посилання на мережеві папки працює лише в Internet Explorer.
+Ви можете скопіювати посилання і відкрити його за допомогою Internet Explorer.';
+$lang['js']['linkwiz']         = 'Чарівник посилань';
+$lang['js']['linkto']          = 'Посилання на:';
+$lang['js']['del_confirm']     = 'Дійсно знищити обрані елементи?';
+$lang['js']['media_upload_btn'] = 'Завантажити';
+$lang['js']['media_done_btn']  = 'Успішно';
+$lang['js']['media_cancel']    = 'видалити';
+$lang['rssfailed']             = 'Виникла помилка під час отримання RSS-стрічки: ';
+$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['accessdenied']          = 'Вам не дозволено переглядати цю сторінку.';
+$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['difflink']              = 'Посилання на цей список змін';
+$lang['diff_type']             = 'Переглянути відмінності:';
+$lang['diff_inline']           = 'Вбудувати';
+$lang['diff_side']             = 'Поряд';
+$lang['line']                  = 'Рядок';
+$lang['breadcrumb']            = 'Відвідано';
+$lang['youarehere']            = 'Ви тут';
+$lang['lastmod']               = 'В останнє змінено';
+$lang['by']                    = ' ';
+$lang['deleted']               = 'знищено';
+$lang['created']               = 'створено';
+$lang['restored']              = 'відновлено стару ревізію (%s)';
+$lang['external_edit']         = 'зовнішнє редагування';
+$lang['summary']               = 'Підсумок змін';
+$lang['noflash']               = 'Для перегляду цієї сторінки необхідно встановити Adobe Flash Plugin.';
+$lang['download']              = 'Завантажити фрагмент';
+$lang['tools']                 = 'Налаштування';
+$lang['user_tools']            = 'Користувальницькькі налаштування';
+$lang['site_tools']            = 'Налаштування сайту';
+$lang['page_tools']            = 'Налаштування сторінки';
+$lang['sidebar']               = 'Сайдбар';
+$lang['mail_newpage']          = 'сторінку додано:';
+$lang['mail_changed']          = 'сторінку змінено:';
+$lang['mail_subscribe_list']   = 'сторінки, що змінено у просторі імен:';
+$lang['mail_new_user']         = 'новий користувач:';
+$lang['mail_upload']           = 'завантажено файл:';
+$lang['pages_changes']         = 'Сторінок';
+$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['subscr_subscribe_success'] = 'Додано %s до списку підписки для %s';
+$lang['subscr_subscribe_error'] = 'Помилка при додавані %s до списку підписки для %s';
+$lang['subscr_subscribe_noaddress'] = 'Немає адреси, асоційованої з Вашим логіном, тому Ви не можете бути додані до списку підписки.';
+$lang['subscr_unsubscribe_success'] = 'Видалено %s із списку підписки для %s';
+$lang['subscr_unsubscribe_error'] = 'Помилка при видаленні %s зі списку підписки для %s';
+$lang['subscr_already_subscribed'] = '%s вже підписаний до %s';
+$lang['subscr_not_subscribed'] = '%s не підписаний до %s';
+$lang['subscr_m_not_subscribed'] = 'Ви зараз не підписані до цієї сторінки або простору імен.';
+$lang['subscr_m_new_header']   = 'Додати підписку';
+$lang['subscr_m_current_header'] = 'Поточні підписки';
+$lang['subscr_m_unsubscribe']  = 'Відписатися';
+$lang['subscr_m_subscribe']    = 'Підписатися';
+$lang['subscr_m_receive']      = 'Отримувати';
+$lang['subscr_style_every']    = 'повідомляти на пошту про кожну зміну';
+$lang['subscr_style_digest']   = 'лист з дайджестом для зміни кожної сторінки (кожні %.2f днів)';
+$lang['subscr_style_list']     = 'список змінених сторінок від часу отримання останнього листа (кожні %.2f днів)';
+$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_confexists']          = '%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_policy']              = 'Початкова політика ACL';
+$lang['i_pol0']                = 'Відкрита Вікі (читання, запис та завантаження файлів для всіх)';
+$lang['i_pol1']                = 'Публічна Вікі (читання для всіх, запис та завантаження для зареєстрованих користувачів)';
+$lang['i_pol2']                = 'Закрита Вікі (читання, запис та завантаження тільки для зареєстрованих користувачів)';
+$lang['i_retry']               = 'Повторити';
+$lang['i_license']             = 'Будь ласка, виберіть тип ліцензії, під якою Ві бажаєте опублікувати матеріал:';
+$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 секунд тому';
+$lang['wordblock']             = 'Ваші зміни не збережено, тому що вони розпізнані як такі, що містять заблокований текст(спам).';
diff --git a/sources/inc/lang/uk/locked.txt b/sources/inc/lang/uk/locked.txt
new file mode 100644
index 0000000..367c286
--- /dev/null
+++ b/sources/inc/lang/uk/locked.txt
@@ -0,0 +1,3 @@
+====== Сторінку заблоковано ======
+
+Цю сторінку заблоковано іншим користувачем для редагування. Зачекайте, поки цей користувач завершить редагування або закінчиться час блокування.
\ No newline at end of file
diff --git a/sources/inc/lang/uk/login.txt b/sources/inc/lang/uk/login.txt
new file mode 100644
index 0000000..f45f810
--- /dev/null
+++ b/sources/inc/lang/uk/login.txt
@@ -0,0 +1,4 @@
+====== Вхід до вікі ======
+
+Ви не ввійшли до системи. Введіть ваші реєстраційні дані для того, щоб увійти. У вашому браузері повинні бути увімкнені файли cookies.
+
diff --git a/sources/inc/lang/uk/mailtext.txt b/sources/inc/lang/uk/mailtext.txt
new file mode 100644
index 0000000..5bd25c3
--- /dev/null
+++ b/sources/inc/lang/uk/mailtext.txt
@@ -0,0 +1,17 @@
+Сторінка в вашому ДокуВікі була змінена. Деталі нижче:
+
+Дата         : @DATE@
+Оглядач      : @BROWSER@
+Адреса IP    : @IPADDRESS@
+Ім'я вузла   : @HOSTNAME@
+Стара ревізія: @OLDPAGE@
+Нова ревізія : @NEWPAGE@
+Підсумок змін : @SUMMARY@
+Користувач   : @USER@
+
+@DIFF@
+
+
+-- 
+Це повідомлення було створене ДокуВікі з
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/uk/newpage.txt b/sources/inc/lang/uk/newpage.txt
new file mode 100644
index 0000000..39cdecc
--- /dev/null
+++ b/sources/inc/lang/uk/newpage.txt
@@ -0,0 +1,4 @@
+====== Сторінка ще не існує ======
+
+Ви прийшли за посиланням на сторінку, що ще не існує. Якщо ваші права дозволяють, ви можете створити цю сторінку натиснувши кнопку ''Створити сторінку''.
+
diff --git a/sources/inc/lang/uk/norev.txt b/sources/inc/lang/uk/norev.txt
new file mode 100644
index 0000000..3c9295f
--- /dev/null
+++ b/sources/inc/lang/uk/norev.txt
@@ -0,0 +1,4 @@
+====== Немає такої ревізії ======
+
+Вказана ревізія не існує. Використовуйте кнопку ''Старі ревізії'', щоб отримати перелік ревізій цього документу.
+
diff --git a/sources/inc/lang/uk/password.txt b/sources/inc/lang/uk/password.txt
new file mode 100644
index 0000000..8597d49
--- /dev/null
+++ b/sources/inc/lang/uk/password.txt
@@ -0,0 +1,10 @@
+Доброго дня, @FULLNAME@!
+
+Ваші дані користувача для @TITLE@ на @DOKUWIKIURL@
+
+Login    : @LOGIN@
+Password : @PASSWORD@
+
+-- 
+Це повідомлення було створене ДокуВікі з
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/uk/preview.txt b/sources/inc/lang/uk/preview.txt
new file mode 100644
index 0000000..b4174c7
--- /dev/null
+++ b/sources/inc/lang/uk/preview.txt
@@ -0,0 +1,4 @@
+====== Попередній перегляд ======
+
+Це попередній перегляд того, як буде виглядати ваш текст. Не забувайте, текст ще **не збережено**!
+
diff --git a/sources/inc/lang/uk/pwconfirm.txt b/sources/inc/lang/uk/pwconfirm.txt
new file mode 100644
index 0000000..54d7a20
--- /dev/null
+++ b/sources/inc/lang/uk/pwconfirm.txt
@@ -0,0 +1,13 @@
+Доброго дня, @FULLNAME@!
+
+Хтось запитав новий пароль для користувача @TITLE@ на @DOKUWIKIURL@
+
+Якщо це були не ви, ігноруйте це повідомлення.
+
+Для підтвердження, що це дійсно ви запитали новий пароль, будь ласка
+перейдіть за наступним посиланням.
+
+@CONFIRM@
+
+--
+Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
diff --git a/sources/inc/lang/uk/read.txt b/sources/inc/lang/uk/read.txt
new file mode 100644
index 0000000..59ea6a1
--- /dev/null
+++ b/sources/inc/lang/uk/read.txt
@@ -0,0 +1,2 @@
+Ця сторінка доступна тільки для перегляду. Ви можете продивитися вихідний текст, але не можете змінювати його. Якщо ви вважаєте, що це не вірно, зверніться до адміністратора.
+
diff --git a/sources/inc/lang/uk/recent.txt b/sources/inc/lang/uk/recent.txt
new file mode 100644
index 0000000..645e3d8
--- /dev/null
+++ b/sources/inc/lang/uk/recent.txt
@@ -0,0 +1,4 @@
+====== Останні зміни ======
+
+Вказані нижче сторінки було змінено нещодавно.
+
diff --git a/sources/inc/lang/uk/register.txt b/sources/inc/lang/uk/register.txt
new file mode 100644
index 0000000..8fffc00
--- /dev/null
+++ b/sources/inc/lang/uk/register.txt
@@ -0,0 +1,4 @@
+====== Реєстрація нового користувача ======
+
+Введіть необхідну інформацію для того, щоб створити нового користувача у цій Вікі. Переконайтеся. що ви ввели **правильну адресу e-mail** - якщо ви не ввели пароль, то новий пароль буде відіслано на цю адресу. Ім'я користувача повинно бути дозволеною [[doku>pagename|назвою сторінки]] вікі.
+
diff --git a/sources/inc/lang/uk/registermail.txt b/sources/inc/lang/uk/registermail.txt
new file mode 100644
index 0000000..28735ed
--- /dev/null
+++ b/sources/inc/lang/uk/registermail.txt
@@ -0,0 +1,13 @@
+Зареєстровано нового користувача. Перегляньте деталі:
+
+Користувач  : @NEWUSER@
+Повне ім'я  : @NEWNAME@
+E-Mail      : @NEWEMAIL@
+
+Дата        : @DATE@
+Браузер     : @BROWSER@
+Адреса IP   : @IPADDRESS@
+Назва хосту : @HOSTNAME@
+
+--
+Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
diff --git a/sources/inc/lang/uk/resendpwd.txt b/sources/inc/lang/uk/resendpwd.txt
new file mode 100644
index 0000000..208efad
--- /dev/null
+++ b/sources/inc/lang/uk/resendpwd.txt
@@ -0,0 +1,3 @@
+====== Надіслати новий пароль ======
+
+Заповніть відомості для того, щоб отримати новий пароль у цій Вікі. Новий пароль буде надіслано на e-mail, що вказано у реєстраційних даних. Ім'я користувача повинно бути дозволеним іменем користувача Вікі.
diff --git a/sources/inc/lang/uk/revisions.txt b/sources/inc/lang/uk/revisions.txt
new file mode 100644
index 0000000..646de2a
--- /dev/null
+++ b/sources/inc/lang/uk/revisions.txt
@@ -0,0 +1,4 @@
+====== Старі ревізії ======
+
+Це старі версії поточного документа. Для того, щоб повернутися до старої версії, виберіть її, натисніть ''Редагувати'', та збережіть сторінку.
+
diff --git a/sources/inc/lang/uk/searchpage.txt b/sources/inc/lang/uk/searchpage.txt
new file mode 100644
index 0000000..971c248
--- /dev/null
+++ b/sources/inc/lang/uk/searchpage.txt
@@ -0,0 +1,5 @@
+====== Пошук ======
+
+Дивіться результати пошуку нижче. Якщо ви не знайшли те, що ви шукали, ви можете створити або редагувати сторінку, що має таке ж ім’я, що і пошуковий запит за допомогою відповідної кнопки.
+
+===== Результати =====
diff --git a/sources/inc/lang/uk/showrev.txt b/sources/inc/lang/uk/showrev.txt
new file mode 100644
index 0000000..2706b35
--- /dev/null
+++ b/sources/inc/lang/uk/showrev.txt
@@ -0,0 +1,2 @@
+**Це стара версія документу!**
+----
diff --git a/sources/inc/lang/uk/stopwords.txt b/sources/inc/lang/uk/stopwords.txt
new file mode 100644
index 0000000..288ab8e
--- /dev/null
+++ b/sources/inc/lang/uk/stopwords.txt
@@ -0,0 +1,3 @@
+# Це список ігнорованих індексатором слів, одне слово в рядку
+# При редагуванні цього файлу переконайтеся, що використовуєте символи переведення рядку, як в UNIX (одиночні)
+# Слова, коротші за 3 символи включати не треба. Вони ігноруються в будь-якому випадку
diff --git a/sources/inc/lang/uk/subscr_digest.txt b/sources/inc/lang/uk/subscr_digest.txt
new file mode 100644
index 0000000..3237918
--- /dev/null
+++ b/sources/inc/lang/uk/subscr_digest.txt
@@ -0,0 +1,17 @@
+Доброго дня!
+
+Сторінку @PAGE@ у @TITLE@ було змінено.
+Зміни, які відбулися:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Стара версія: @OLDPAGE@
+Нова версія: @NEWPAGE@
+
+Щоб відмовитися від повідомлень про редагування сторінок, зайдіть під своїм ім'ям на сайт @DOKUWIKIURL@, потім відвідайте сторінку @SUBSCRIBE@
+та відпишіться від повідомлень про зміну сторінки та/або простору імен.
+
+--
+Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/uk/subscr_form.txt b/sources/inc/lang/uk/subscr_form.txt
new file mode 100644
index 0000000..1c9d6d2
--- /dev/null
+++ b/sources/inc/lang/uk/subscr_form.txt
@@ -0,0 +1,3 @@
+====== Керування підписками ======
+
+Ця сторінка дозволяє Вам керувати Вашими підписками для цієї сторінки та простору імен.
\ No newline at end of file
diff --git a/sources/inc/lang/uk/subscr_list.txt b/sources/inc/lang/uk/subscr_list.txt
new file mode 100644
index 0000000..7a538bc
--- /dev/null
+++ b/sources/inc/lang/uk/subscr_list.txt
@@ -0,0 +1,14 @@
+Доброго дня!
+
+Було змінено сторінки простору імен @PAGE@ у @TITLE@.
+Зміни, які вібдулися:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Щоб відмовитися від повідомлень про редагування сторінок, зайдіть під своїм ім'ям на сайт @DOKUWIKIURL@, потім відвідайте сторінку @SUBSCRIBE@
+та відпишіться від повідомлень про зміну сторінки та/або простору імен.
+
+--
+Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/uk/subscr_single.txt b/sources/inc/lang/uk/subscr_single.txt
new file mode 100644
index 0000000..22a0691
--- /dev/null
+++ b/sources/inc/lang/uk/subscr_single.txt
@@ -0,0 +1,20 @@
+Доброго часу!
+
+Сторінку @PAGE@ у @TITLE@ було змінено.
+Зміни, що відбулися:
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+Дата : @DATE@
+Користувач : @USER@
+Підсумок: @SUMMARY@
+Стара версія: @OLDPAGE@
+Нова версія: @NEWPAGE@
+
+Щоб відмовитися від повідомлень про редагування сторінок, зайдіть під своїм ім'ям на сайт @DOKUWIKIURL@, потім відвідайте сторінку @NEWPAGE@
+та відпишіться від повідомлень про зміну сторінки та/або простору імен.
+
+--
+Цей лист було надіслано за допомогою служби повідомлень DokuWiki, сайту @DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/uk/updateprofile.txt b/sources/inc/lang/uk/updateprofile.txt
new file mode 100644
index 0000000..d043f99
--- /dev/null
+++ b/sources/inc/lang/uk/updateprofile.txt
@@ -0,0 +1,5 @@
+====== Оновити ваш профіль ======
+
+Необхідно заповнити тільки ті поля, які ви бажаєте змінити. Ви не можете змінити ім’я користувача.
+
+
diff --git a/sources/inc/lang/uk/uploadmail.txt b/sources/inc/lang/uk/uploadmail.txt
new file mode 100644
index 0000000..6eb8c93
--- /dev/null
+++ b/sources/inc/lang/uk/uploadmail.txt
@@ -0,0 +1,14 @@
+На вашу ДокуВікі завантажено файл. Деталі:
+
+Файл : @MEDIA@
+Дата : @DATE@
+Браузер : @BROWSER@
+IP-Адреса : @IPADDRESS@
+Назва вузла : @HOSTNAME@
+Розмір : @SIZE@
+Тип MIME : @MIME@
+Користувач : @USER@
+
+-- 
+Цей лист автоматично створено ДокуВікі на сайті:
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/vi/admin.txt b/sources/inc/lang/vi/admin.txt
new file mode 100644
index 0000000..d8ac73e
--- /dev/null
+++ b/sources/inc/lang/vi/admin.txt
@@ -0,0 +1,3 @@
+====== Quản lý ======
+
+Sau đây là các mục quản lý trong DokuWiki.
diff --git a/sources/inc/lang/vi/backlinks.txt b/sources/inc/lang/vi/backlinks.txt
new file mode 100644
index 0000000..eee624d
--- /dev/null
+++ b/sources/inc/lang/vi/backlinks.txt
@@ -0,0 +1,3 @@
+====== Liên kết đến trang vừa xem ======
+
+Đây là danh sách các trang có liên kết đến trang vừa xem.
diff --git a/sources/inc/lang/vi/conflict.txt b/sources/inc/lang/vi/conflict.txt
new file mode 100644
index 0000000..646dcbc
--- /dev/null
+++ b/sources/inc/lang/vi/conflict.txt
@@ -0,0 +1,5 @@
+====== Có phiên bản mới hơn ======
+
+Trang bạn đang biên soạn có một phiên bản mới hơn. Việc này xảy ra khi một bạn đổi trang ấy khi bạn đang biên soạn trang này.
+
+Xem kỹ những thay đổi dưới đây, rồi quyết định giữ phiên bản nào. Nếu chọn ''Lưu'', phiên bản của bạn được giữ lại. Bấm ''huỷ'' để giữ phiên bản kia.
diff --git a/sources/inc/lang/vi/denied.txt b/sources/inc/lang/vi/denied.txt
new file mode 100644
index 0000000..35acaeb
--- /dev/null
+++ b/sources/inc/lang/vi/denied.txt
@@ -0,0 +1,3 @@
+====== 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 quên đăng nhập hay sao?
diff --git a/sources/inc/lang/vi/diff.txt b/sources/inc/lang/vi/diff.txt
new file mode 100644
index 0000000..10bfd0f
--- /dev/null
+++ b/sources/inc/lang/vi/diff.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/inc/lang/vi/edit.txt b/sources/inc/lang/vi/edit.txt
new file mode 100644
index 0000000..1c16f90
--- /dev/null
+++ b/sources/inc/lang/vi/edit.txt
@@ -0,0 +1 @@
+Biên soạn trang này và bấm ''Lưu''. Xem [[wiki:syntax:vi|cú pháp của Wiki]] để biết cách soạn thảo. Xin bạn biên soạn trang này nếu bạn có thể **cải tiến** nó. Nếu bạn muốn thử nghiệm, bạn có thể thử ở [[playground:playground| chỗ thử]].
diff --git a/sources/inc/lang/vi/editrev.txt b/sources/inc/lang/vi/editrev.txt
new file mode 100644
index 0000000..8a2031c
--- /dev/null
+++ b/sources/inc/lang/vi/editrev.txt
@@ -0,0 +1,2 @@
+**Bạn đã nạp một phiên bản cũ của văn bản!** Nếu lưu nó, bạn sẽ tạo phiên bản mới với dữ kiện này.
+----
diff --git a/sources/inc/lang/vi/index.txt b/sources/inc/lang/vi/index.txt
new file mode 100644
index 0000000..708d203
--- /dev/null
+++ b/sources/inc/lang/vi/index.txt
@@ -0,0 +1,3 @@
+====== Mục lục ======
+
+Đây là mục lục của tất cả các trang, xếp theo thứ tự [[doku>namespaces|namespaces]].
diff --git a/sources/inc/lang/vi/lang.php b/sources/inc/lang/vi/lang.php
new file mode 100644
index 0000000..c6b61da
--- /dev/null
+++ b/sources/inc/lang/vi/lang.php
@@ -0,0 +1,266 @@
+
+ */
+
+
+
+$lang['encoding']              = 'utf-8';
+$lang['direction']             = 'ltr';
+$lang['doublequoteopening']    = '“'; //“
+$lang['doublequoteclosing']    = '”'; //”
+$lang['singlequoteopening']    = '‘'; //‘
+$lang['singlequoteclosing']    = '’'; //’
+$lang['apostrophe']            = '’'; //’
+
+$lang['btn_edit']   = 'Biên soạn trang này';
+$lang['btn_source'] = 'Xem mã nguồn';
+$lang['btn_show']   = 'Xem trang';
+$lang['btn_create'] = 'Tạo trang này';
+$lang['btn_search'] = 'Tìm';
+$lang['btn_save']   = 'Lưu';
+$lang['btn_preview']= 'Duyệt trước';
+$lang['btn_top']    = 'Trở lên trên';
+$lang['btn_newer']             = '<< mới hơn';
+$lang['btn_older']             = 'cũ hơn >>';
+$lang['btn_revs']   = 'Các phiên bản cũ';
+$lang['btn_recent'] = 'Thay đổi gần đây';
+$lang['btn_upload'] = 'Tải lên';
+$lang['btn_cancel'] = 'Huỷ bỏ';
+$lang['btn_index']  = 'Mục lục';
+$lang['btn_secedit']= 'Biên soạn';
+$lang['btn_login']  = 'Đăng nhập';
+$lang['btn_logout'] = 'Thoát';
+$lang['btn_admin']  = 'Quản lý';
+$lang['btn_update'] = 'Cập nhật';
+$lang['btn_delete'] = 'Xoá';
+$lang['btn_back']              = 'Quay lại';
+$lang['btn_backlink']          = 'Liên kết tới đây';
+$lang['btn_profile']           = 'Cập nhật hồ sơ';
+$lang['btn_reset']             = 'Làm lại';
+$lang['btn_resendpwd']         = 'Gửi mật khẩu mới';
+$lang['btn_draft']             = 'Sửa bản nháp';
+$lang['btn_recover']           = 'Phục hồi bản nháp';
+$lang['btn_draftdel']          = 'Xóa bản nháp';
+$lang['btn_revert']            = 'Phục hồi';
+$lang['btn_register'] = 'Đăng ký';
+$lang['btn_apply']             = 'Chấp nhận';
+$lang['btn_media']             = 'Quản lý tệp tin';
+
+$lang['loggedinas'] = 'Username đang dùng';
+$lang['user']       = 'Username';
+$lang['pass']       = 'Mật khẩu';
+$lang['newpass']               = 'Mật khẩu mới';
+$lang['oldpass']               = 'Nhập lại mật khẩu hiện tại';
+$lang['passchk']               = 'lần nữa';
+$lang['remember']   = 'Lưu username/password lại';
+$lang['fullname']   = 'Họ và tên';
+$lang['email']      = 'E-Mail';
+$lang['profile']               = 'Hồ sơ thành viên';
+$lang['badlogin']   = 'Username hoặc password không đúng.';
+$lang['minoredit']             = 'Minor Changes';
+$lang['draftdate']             = 'Bản nháp được tự động lưu lúc'; // full dformat date will be added
+$lang['nosecedit']             = 'Các trang web đã được thay đổi trong khi chờ đợi, phần thông tin quá hạn đã được thay thế bằng trang đầy đủ.';
+
+$lang['regmissing'] = 'Bạn cần điền vào tất cả các trường';
+$lang['reguexists'] = 'Bạn khác đã dùng username này rồi.';
+$lang['regsuccess'] = 'Đã tạo username, và đã gởi password.';
+$lang['regsuccess2']           = 'Thành viên vừa được tạo.';
+$lang['regmailfail']= 'Không gởi password được. Xin bạn liên hệ với người quản lý.';
+$lang['regbadmail'] = 'Email hình như không đúng. Xin bạn liên hệ với người quản lý.';
+$lang['regbadpass']            = 'Hai mật khẩu đưa ra là không giống nhau, xin vui lòng thử lại.';
+$lang['regpwmail']  = 'Password DokuWiki của bạn là';
+$lang['reghere']    = 'Xin bạn đăng ký username nếu chưa có';
+
+$lang['profna']                = 'Wiki này không hỗ trợ sửa đổi hồ sơ cá nhân';
+$lang['profnochange']          = 'Không có thay đổi, không có gì để làm.';
+$lang['profnoempty']           = 'Không được để trống tên hoặc địa chỉ email.';
+$lang['profchanged']           = 'Cập nhật hồ sơ thành viên thành công.';
+
+$lang['pwdforget']             = 'Bạn quên mật khẩu? Tạo lại mật khẩu mới';
+$lang['resendna']              = 'Wiki này không hỗ trợ gửi lại mật khẩu.';
+$lang['resendpwd']             = 'Gửi mật khẩu mới cho';
+$lang['resendpwdmissing']      = 'Xin lỗi, bạn phải điền vào tất cả các trường.';
+$lang['resendpwdnouser']       = 'Xin lỗi, chúng tôi không thể tìm thấy thành viên này trong cơ sở dữ liệu của chúng tôi.';
+$lang['resendpwdbadauth']      = 'Xin lỗi, mã này xác thực không hợp lệ. Hãy chắc chắn rằng bạn sử dụng liên kết xác nhận đầy đủ.';
+$lang['resendpwdconfirm']      = 'Một liên kết xác nhận đã được gửi bằng email.';
+$lang['resendpwdsuccess']      = 'Mật khẩu mới của bạn đã được gửi bằng email.';
+
+$lang['license']               = 'Trừ khi có ghi chú khác, nội dung trên wiki này được cấp phép theo giấy phép sau đây:';
+$lang['licenseok']             = 'Lưu ý: Bằng cách chỉnh sửa trang này, bạn đồng ý cấp giấy phép nội dung của bạn theo giấy phép sau:';
+
+$lang['searchmedia']           = 'Tìm tên file:';
+$lang['searchmedia_in']        = 'Tìm ở %s';
+$lang['txt_upload']   = 'Chọn tệp để tải lên';
+$lang['txt_filename'] = 'Điền wikiname (tuỳ ý)';
+$lang['txt_overwrt']           = 'Ghi đè file trùng';
+$lang['lockedby']     = 'Đang khoá bởi';
+$lang['lockexpire']   = 'Sẽ được mở khóa vào lúc';
+
+$lang['js']['willexpire']   = 'Trong một phút nữa bài viết sẽ được mở khóa để cho phép người khác chỉnh sửa.\nĐể tránh xung đột, bạn nên bấm nút Duyệt trước để lập lại thời gian khoá bài';
+$lang['js']['notsavedyet'] = 'Hiện có những thay đổi chưa được bảo lưu, và sẽ mất.\nBạn thật sự muốn tiếp tục?';
+$lang['js']['searchmedia']     = 'Tìm kiếm tập tin';
+$lang['js']['keepopen']        = 'Giữ cửa sổ đang mở trên lựa chọn';
+$lang['js']['hidedetails']     = 'Ẩn thông tin chi tiết';
+$lang['js']['mediatitle']      = 'Thiết lập liên kết';
+$lang['js']['mediadisplay']    = 'Kiểu liên kết';
+$lang['js']['mediaalign']      = 'Sắp hàng';
+$lang['js']['mediasize']       = 'Cỡ ảnh';
+$lang['js']['mediatarget']     = 'Đích của liên kết';
+$lang['js']['mediaclose']      = 'Đóng';
+$lang['js']['mediainsert']     = 'Chèn';
+$lang['js']['mediadisplayimg'] = 'Hiển thị ảnh.';
+$lang['js']['mediadisplaylnk'] = 'Chỉ hiển thị liên kết.';
+$lang['js']['mediasmall']      = 'Nhỏ';
+$lang['js']['mediamedium']     = 'Vừa';
+$lang['js']['medialarge']      = 'To';
+$lang['js']['mediaoriginal']   = 'Kích cỡ gốc';
+$lang['js']['medialnk']        = 'Liên kết tới trang chi tiết';
+$lang['js']['mediadirect']     = 'Liên kết trực tiếp tới ảnh gốc';
+$lang['js']['medianolnk']      = 'Không liên kết';
+$lang['js']['medianolink']     = 'Không liên kết tới ảnh';
+$lang['js']['medialeft']       = 'Căn ảnh sang trái.';
+$lang['js']['mediaright']      = 'Căn ảnh sang phải.';
+$lang['js']['mediacenter']     = 'Cản ảnh ra giữa.';
+$lang['js']['medianoalign']    = 'Không căn.';
+$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['js']['linkwiz']         = 'Hộp thoại liên kết';
+$lang['js']['linkto']          = 'Liên kết tới:';
+$lang['js']['del_confirm']= 'Xoá mục này?';
+$lang['js']['restore_confirm'] = 'Sẵn sàng phục hồi phiên bản này?';
+$lang['js']['media_diff']          = 'So sánh:';
+$lang['js']['media_select']        = 'Chọn nhiều file…';
+$lang['js']['media_upload_btn']    = 'Tải lên';
+$lang['js']['media_done_btn']      = 'Xong';
+$lang['js']['media_drop']          = 'Kéo các file vào đây để tải lên';
+$lang['js']['media_overwrt']       = 'Ghi đè các file trùng';
+
+$lang['rssfailed']   = 'Nguồn này gặp phải lỗi';
+$lang['nothingfound']= 'Không tìm được gì';
+
+$lang['mediaselect'] = 'Xem';
+$lang['fileupload']  = 'Tải lên tệp media';
+$lang['uploadsucc']  = 'Tải lên thành công';
+$lang['uploadfail']  = 'Tải lên thất bại. Có thể vì không đủ quyền?';
+$lang['uploadwrong'] = 'Tải lên bị từ chối. Cấm tải loại tệp này';
+$lang['uploadexist']           = 'Tệp tin bị trùng. Chưa có gì xảy ra.';
+$lang['namespaces']  = 'Thư mục';
+$lang['mediafiles']  = 'Tệp có sẵn ở';
+$lang['accessdenied']          = 'Bạn không được phép xem trang này.';
+$lang['mediausage']            = 'Sử dụng cú pháp sau đây để dẫn đến tập tin này:';
+$lang['mediaview']             = 'Xem tệp gốc';
+$lang['mediaroot']             = 'thư mục gốc';
+$lang['mediaupload']           = 'Tải một tập tin lên thư mục hiện tại ở đây. Để tạo thư mục con, thêm nó vào trước tên tập tin của bạn, phân cách bằng dấu hai chấm sau khi bạn chọn các tập tin. File còn có thể được lựa chọn bằng cách kéo và thả.';
+$lang['mediaextchange']        = 'Phần mở rộng thay đổi từ .%s thành .%s!';
+$lang['ref_inuse']             = 'Không thể xóa tập tin vì nó đang được sử dụng cho các trang sau:';
+$lang['ref_hidden']            = 'Một số tài liệu sử dụng cho trang này bạn không được cấp phép truy cập.';
+
+$lang['hits']       = 'Trùng';
+$lang['quickhits']  = 'Trang trùng hợp';
+$lang['toc']        = 'Nội dung';
+$lang['current']    = 'hiện tại';
+$lang['yours']      = 'Phiên bản hiện tại';
+$lang['diff']       = 'cho xem khác biệt với phiên bản hiện tại';
+$lang['diff2']                 = 'Sự khác biệt giữa các bản được lựa chọn';
+$lang['difflink']              = 'Liên kết để xem bản so sánh này';
+$lang['diff_type']             = 'Xem sự khác biệt:';
+$lang['diff_inline']           = 'Nội tuyến';
+$lang['diff_side']             = 'Xếp cạnh nhau';
+$lang['line']       = 'Dòng';
+$lang['breadcrumb'] = 'Trang đã xem';
+$lang['youarehere']            = 'Bạn đang ở đây';
+$lang['lastmod']    = 'Thời điểm thay đổi';
+$lang['by']         = 'do';
+$lang['deleted']    = 'bị xoá';
+$lang['created']    = 'được tạo ra';
+$lang['restored']   = 'phiên bản cũ đã được khôi phục (%s)';
+$lang['external_edit']         = 'external edit';
+$lang['summary']    = 'Tóm tắt biên soạn';
+$lang['noflash']               = 'Adobe Flash Plugin cần được cài để có thể xem nội dung này.';
+
+$lang['mail_newpage'] = 'Trang được thêm:';
+$lang['mail_changed'] = 'Trang thay đổi:';
+
+$lang['changes_type']          = 'Xem thay đổi của';
+$lang['pages_changes']         = 'Trang';
+$lang['media_changes']         = 'Tệp media';
+$lang['both_changes']          = 'Cả trang và các tập tin media';
+
+$lang['qb_bold']    = 'Chữ đậm';
+$lang['qb_italic']  = 'Chữ nghiêng';
+$lang['qb_underl']  = 'Chữ gạch dưới';
+$lang['qb_code']    = 'Chữ mã nguồn';
+$lang['qb_strike']             = 'Strike-through Text';
+$lang['qb_h1']      = 'Đầu đề cấp 1';
+$lang['qb_h2']      = 'Đầu đề cấp 2';
+$lang['qb_h3']      = 'Đầu đề cấp 3';
+$lang['qb_h4']      = 'Đầu đề cấp 4';
+$lang['qb_h5']      = 'Đầu đề cấp 5';
+$lang['qb_link']    = 'Mốc nối nội tại';
+$lang['qb_extlink'] = 'Mốc nối ra ngoài';
+$lang['qb_hr']      = 'Gạch ngang';
+$lang['qb_ol']      = 'Điểm trong danh sách có thứ tự';
+$lang['qb_ul']      = 'Điểm trong danh sách không đánh số';
+$lang['qb_media']   = 'Thêm ảnh và tệp khác';
+$lang['qb_sig']     = 'Đặt chữ ký';
+
+$lang['metaedit']              = 'Sửa Metadata';
+$lang['metasaveerr']           = 'Thất bại khi viết metadata';
+$lang['metasaveok']            = 'Metadata đã được lưu';
+$lang['img_backto']            = 'Quay lại';
+$lang['img_title']             = 'Tiêu đề';
+$lang['img_caption']           = 'Ghi chú';
+$lang['img_date']              = 'Ngày';
+$lang['img_fname']             = 'Tên file';
+$lang['img_fsize']             = 'Kích cỡ';
+$lang['img_artist']            = 'Người chụp';
+$lang['img_copyr']             = 'Bản quyền';
+$lang['img_format']            = 'Định dạng';
+$lang['img_camera']            = 'Camera';
+$lang['img_keywords']          = 'Từ khóa';
+$lang['img_width']             = 'Rộng';
+$lang['img_height']            = 'Cao';
+$lang['img_manager']           = 'Xem trong trình quản lý tệp media';
+
+/* installer strings */
+$lang['i_chooselang']          = 'Chọn ngôn ngữ';
+$lang['i_retry']               = 'Thử lại';
+
+$lang['years']                 = 'cách đây %d năm';
+$lang['months']                = 'cách đây %d tháng';
+$lang['weeks']                 = 'cách đây %d tuần';
+$lang['days']                  = 'cách đây %d ngày';
+$lang['hours']                 = 'cách đây %d giờ';
+$lang['minutes']               = 'cách đây %d phút';
+$lang['seconds']               = 'cách đây %d giây';
+
+$lang['wordblock']             = 'Thay đổi của bạn đã không được lưu lại bởi vì nó có chứa văn bản bị chặn (spam).';
+
+$lang['media_uploadtab']       = 'Tải lên';
+$lang['media_searchtab']       = 'Tìm';
+$lang['media_file']            = 'Tệp';
+$lang['media_viewtab']         = 'Xem';
+$lang['media_edittab']         = 'Sửa';
+$lang['media_historytab']      = 'Lịch sử';
+$lang['media_list_thumbs']     = 'Ảnh thu nhỏ';
+$lang['media_list_rows']       = 'Dòng';
+$lang['media_sort_name']       = 'Tên';
+$lang['media_sort_date']       = 'Ngày';
+$lang['media_namespaces']      = 'Chọn thư mục';
+$lang['media_files']           = 'Các tệp trong %s';
+$lang['media_upload']          = 'Tải lên %s';
+$lang['media_search']          = 'Tìm ở %s';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s ở %s';
+$lang['media_edit']            = 'Sửa %s';
+$lang['media_history']         = 'Lịch sử của %s';
+$lang['media_meta_edited']     = 'đã sửa metadata';
+$lang['media_perm_read']       = 'Sorry, bạn không đủ quyền truy cập.';
+$lang['media_perm_upload']     = 'Xin lỗi, bạn không đủ quyền để upload file lên.';
+$lang['media_update']          = 'Tải lên phiên bản mới';
+$lang['media_restore']         = 'Phục hồi phiên bản này';
+
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/inc/lang/vi/locked.txt b/sources/inc/lang/vi/locked.txt
new file mode 100644
index 0000000..acb0981
--- /dev/null
+++ b/sources/inc/lang/vi/locked.txt
@@ -0,0 +1,3 @@
+====== Trang bị khoá ======
+
+Trang này đang bị khoá để một bạn khác biên soạn. Bạn cần đợi cho đến khi nào bạn kia đã biên soạn xong, hoặc khoá hết hạn.
diff --git a/sources/inc/lang/vi/login.txt b/sources/inc/lang/vi/login.txt
new file mode 100644
index 0000000..71a8b1a
--- /dev/null
+++ b/sources/inc/lang/vi/login.txt
@@ -0,0 +1,3 @@
+====== Đăng nhập ======
+
+Hiện bạn chưa đăng nhập! Hãy khai báo thông tin đăng nhập vào ô ở phía dưới. Máy của bạn cần đặt chế độ nhận cookies để đăng nhập.
diff --git a/sources/inc/lang/vi/mailtext.txt b/sources/inc/lang/vi/mailtext.txt
new file mode 100644
index 0000000..836e02d
--- /dev/null
+++ b/sources/inc/lang/vi/mailtext.txt
@@ -0,0 +1,16 @@
+Một trang trên DokuWiki của bạn vừa được bổ sung hoặc thay đổi. Sau đây là chi tiết:
+
+Date        : @DATE@
+Browser     : @BROWSER@
+IP-Address  : @IPADDRESS@
+Hostname    : @HOSTNAME@
+Old Revision: @OLDPAGE@
+New Revision: @NEWPAGE@
+Edit Summary: @SUMMARY@
+User        : @USER@
+
+@DIFF@
+
+-- 
+Điện thư này tạo bởi DokuWiki ở
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/vi/newpage.txt b/sources/inc/lang/vi/newpage.txt
new file mode 100644
index 0000000..93f474b
--- /dev/null
+++ b/sources/inc/lang/vi/newpage.txt
@@ -0,0 +1,3 @@
+====== Chưa có đề tài này ======
+
+Bạn kết 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'' ở góc trên, bên trái cửa sổ này. Nếu bạn không thấy nút này, thay vào đó là nút ''Xem mã nguồn'' chứng tỏ bạn không có quyền biên tập trang này, hãy đăng nhập thử xem bạn có quyền biên tập trang không. Nếu bạn nghĩ đây là một lỗi, hãy báo cho người quản trị.
diff --git a/sources/inc/lang/vi/norev.txt b/sources/inc/lang/vi/norev.txt
new file mode 100644
index 0000000..224bd1d
--- /dev/null
+++ b/sources/inc/lang/vi/norev.txt
@@ -0,0 +1,3 @@
+====== 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 bản này.
diff --git a/sources/inc/lang/vi/password.txt b/sources/inc/lang/vi/password.txt
new file mode 100644
index 0000000..798a20d
--- /dev/null
+++ b/sources/inc/lang/vi/password.txt
@@ -0,0 +1,9 @@
+Thân chào bạn @FULLNAME@!
+
+Đây là chi tiết để bạn đăng nhập @TITLE@ tại @DOKUWIKIURL@:
+
+Username: @LOGIN@
+Password: @PASSWORD@
+
+-- 
+Điện thư này xuất phát từ @DOKUWIKIURL@.
diff --git a/sources/inc/lang/vi/preview.txt b/sources/inc/lang/vi/preview.txt
new file mode 100644
index 0000000..f02a251
--- /dev/null
+++ b/sources/inc/lang/vi/preview.txt
@@ -0,0 +1,3 @@
+====== Xem trước ======
+
+Văn bản của bạn sẽ thể hiện như sau. Nên nhớ: Văn bản này **chưa được lưu**!
diff --git a/sources/inc/lang/vi/read.txt b/sources/inc/lang/vi/read.txt
new file mode 100644
index 0000000..eec6996
--- /dev/null
+++ b/sources/inc/lang/vi/read.txt
@@ -0,0 +1 @@
+Trang này chỉ được đọc thôi. Bạn có thể xem mã nguồn, nhưng không được thay đổi. Hãy báo lại người quản lý nếu hệ thống hoạt động không đúng.
diff --git a/sources/inc/lang/vi/recent.txt b/sources/inc/lang/vi/recent.txt
new file mode 100644
index 0000000..fe6628f
--- /dev/null
+++ b/sources/inc/lang/vi/recent.txt
@@ -0,0 +1,3 @@
+====== Thay đổi gần đây ======
+
+Những trang sau được thay đổi gần đây.
diff --git a/sources/inc/lang/vi/register.txt b/sources/inc/lang/vi/register.txt
new file mode 100644
index 0000000..f7d35c8
--- /dev/null
+++ b/sources/inc/lang/vi/register.txt
@@ -0,0 +1,3 @@
+====== Đăng ký mới ======
+
+Xin điền vào mọi thông tin sau đây để tạo một username mới cho wiki này. Bạn cần cung cấp **e-mail chính xác** - để gởi password mới của bạn đến đấy. Username cần là một [[doku>pagename|pagename]] hợp lệ.
diff --git a/sources/inc/lang/vi/revisions.txt b/sources/inc/lang/vi/revisions.txt
new file mode 100644
index 0000000..b9e9779
--- /dev/null
+++ b/sources/inc/lang/vi/revisions.txt
@@ -0,0 +1,3 @@
+====== Phiên bản cũ ======
+
+Sau đây là các phiên bản cũ của văn bản này. Để quay về một phiên bản cũ, bạn hãy chọn nó từ danh sách dưới đây, sau đó bấm vào nút ''Phục hồi'' hoặc nhấp nút ''Biên soạn trang này'' và lưu nó lại.
diff --git a/sources/inc/lang/vi/searchpage.txt b/sources/inc/lang/vi/searchpage.txt
new file mode 100644
index 0000000..7ded7a8
--- /dev/null
+++ b/sources/inc/lang/vi/searchpage.txt
@@ -0,0 +1,5 @@
+====== Tìm ======
+
+Sau đây là kết quả mà bạn đã tìm. Nếu bạn không thấy được những gì bạn đang tìm, bạn có thể tạo một trang mới bằng cách bấm vào nút ''Biên soạn trang này'', khi đó bạn sẽ có 1 trang mới với tên trang chính là tuwfw khóa bạn đã tìm kiếm.
+
+===== Kết quả =====
diff --git a/sources/inc/lang/vi/showrev.txt b/sources/inc/lang/vi/showrev.txt
new file mode 100644
index 0000000..a146f4e
--- /dev/null
+++ b/sources/inc/lang/vi/showrev.txt
@@ -0,0 +1,2 @@
+**Đây là một phiên bản cũ cùa văn kiện!**
+----
diff --git a/sources/inc/lang/zh-tw/admin.txt b/sources/inc/lang/zh-tw/admin.txt
new file mode 100644
index 0000000..5916e71
--- /dev/null
+++ b/sources/inc/lang/zh-tw/admin.txt
@@ -0,0 +1,3 @@
+====== 管理選單 ======
+
+以下為 DokuWiki 的管理設定。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/adminplugins.txt b/sources/inc/lang/zh-tw/adminplugins.txt
new file mode 100644
index 0000000..6d21ac2
--- /dev/null
+++ b/sources/inc/lang/zh-tw/adminplugins.txt
@@ -0,0 +1 @@
+===== 附加元件 =====
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/backlinks.txt b/sources/inc/lang/zh-tw/backlinks.txt
new file mode 100644
index 0000000..6a8bf88
--- /dev/null
+++ b/sources/inc/lang/zh-tw/backlinks.txt
@@ -0,0 +1,4 @@
+====== 反向連結 ======
+
+這是引用、連結到目前頁面的頁面清單。
+
diff --git a/sources/inc/lang/zh-tw/conflict.txt b/sources/inc/lang/zh-tw/conflict.txt
new file mode 100644
index 0000000..4f31f66
--- /dev/null
+++ b/sources/inc/lang/zh-tw/conflict.txt
@@ -0,0 +1,5 @@
+====== 已存在更新版本 ======
+
+此檔案已存在更新的版本。這是因為有其他使用者在您編輯時變更了這份文件。
+
+請仔細檢查以下差異，再決定保留哪份。您可選擇「儲存」您的版本或「取消」保留目前版本。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/denied.txt b/sources/inc/lang/zh-tw/denied.txt
new file mode 100644
index 0000000..5a4d483
--- /dev/null
+++ b/sources/inc/lang/zh-tw/denied.txt
@@ -0,0 +1,4 @@
+====== 權限拒絕 ======
+
+抱歉，您沒有足夠權限繼續執行。或許您忘了登入？
+
diff --git a/sources/inc/lang/zh-tw/diff.txt b/sources/inc/lang/zh-tw/diff.txt
new file mode 100644
index 0000000..e2c0500
--- /dev/null
+++ b/sources/inc/lang/zh-tw/diff.txt
@@ -0,0 +1,3 @@
+====== 差異處 ======
+
+這裏顯示兩個版本的差異處。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/draft.txt b/sources/inc/lang/zh-tw/draft.txt
new file mode 100644
index 0000000..f14702e
--- /dev/null
+++ b/sources/inc/lang/zh-tw/draft.txt
@@ -0,0 +1,5 @@
+====== 發現草稿檔案 ======
+
+您上次的編輯程序並未正確完成。DokuWiki 已在您編輯時自動儲存了一份草稿使您可以繼續編輯。以下是上次的編輯資料。
+
+請決定要//復原//您遺失的編輯文件，//刪除//這份草稿，或者//取消//編輯程序。
diff --git a/sources/inc/lang/zh-tw/edit.txt b/sources/inc/lang/zh-tw/edit.txt
new file mode 100644
index 0000000..f6b7479
--- /dev/null
+++ b/sources/inc/lang/zh-tw/edit.txt
@@ -0,0 +1 @@
+編輯本頁後，請按下「儲存」按鈕。若要參看語法說明，請到[[wiki:syntax|語法]]頁。請只在能讓本文品質**更好**時才編輯。如果只是要測試，請移玉步至 [[playground:playground|遊樂場]]。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/editrev.txt b/sources/inc/lang/zh-tw/editrev.txt
new file mode 100644
index 0000000..98a800a
--- /dev/null
+++ b/sources/inc/lang/zh-tw/editrev.txt
@@ -0,0 +1,2 @@
+**您目前載入的是本份文件的舊版！** 您如果存檔，這些舊版資料就會變成最新版本。
+----
diff --git a/sources/inc/lang/zh-tw/index.txt b/sources/inc/lang/zh-tw/index.txt
new file mode 100644
index 0000000..31e60ac
--- /dev/null
+++ b/sources/inc/lang/zh-tw/index.txt
@@ -0,0 +1,3 @@
+====== 網站地圖 ======
+
+這個網站地圖列出了所有允許的頁面，依 [[doku>namespaces|分類名稱]] 排序。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/install.html b/sources/inc/lang/zh-tw/install.html
new file mode 100644
index 0000000..9a0d1dc
--- /dev/null
+++ b/sources/inc/lang/zh-tw/install.html
@@ -0,0 +1,8 @@
+
        本頁面旨在幫助您完成第一次安装和設定 Dokuwiki。關於安裝工具的更多訊息請參閱 官方文檔頁面。
        
+
+
        DokuWiki 使用普通檔案來儲存 wiki 頁面，以及與頁面相關的訊息（例如：圖像、搜尋索引、修訂記錄等）。為了正常運作，DokuWiki 必須 擁有針對那些路徑和檔案的寫入權限。本安裝工具無法設定目錄權限，這通常要透過命令行、FTP 或您主機上的控制台（如cPanel）進行。
        
+
+
        本安裝工具將設定您的 DokuWiki 用於 ACL 的設定檔，它能讓管理員登入並使用「管理」功能來安裝附加元件、管理使用者、管理訪問權限和其他設定設定。它並不是 DokuWiki 正常運作所必須，但安裝之後將更方便管理。
        
+
+
        有經驗的或有特殊需求的使用者，請參閱更詳細的 安裝指南
+和 設定。
        
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/lang.php b/sources/inc/lang/zh-tw/lang.php
new file mode 100644
index 0000000..4563778
--- /dev/null
+++ b/sources/inc/lang/zh-tw/lang.php
@@ -0,0 +1,343 @@
+
+ * @author Li-Jiun Huang 
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San 
+ * @author Cheng-Wei Chien 
+ * @author Shuo-Ting Jian 
+ * @author syaoranhinata@gmail.com
+ * @author Ichirou Uchiki 
+ * @author tsangho 
+ * @author Danny Lin 
+ */
+$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_profile']           = '更新個人資料';
+$lang['btn_reset']             = '資料重設';
+$lang['btn_resendpwd']         = '設定新密碼';
+$lang['btn_draft']             = '編輯草稿';
+$lang['btn_recover']           = '復原草稿';
+$lang['btn_draftdel']          = '捨棄草稿';
+$lang['btn_revert']            = '復原';
+$lang['btn_register']          = '註冊';
+$lang['btn_apply']             = '套用';
+$lang['btn_media']             = '多媒體管理器';
+$lang['btn_deleteuser']        = '移除我的帳號';
+$lang['loggedinas']            = '登入成';
+$lang['user']                  = '帳號';
+$lang['pass']                  = '密碼';
+$lang['newpass']               = '新密碼';
+$lang['oldpass']               = '目前密碼';
+$lang['passchk']               = '確認密碼';
+$lang['remember']              = '記住帳號密碼';
+$lang['fullname']              = '姓名';
+$lang['email']                 = '電郵';
+$lang['profile']               = '使用者個人資料';
+$lang['badlogin']              = '很抱歉，您的使用者名稱或密碼可能有錯誤。';
+$lang['badpassconfirm']        = '抱歉，這密碼是錯的';
+$lang['minoredit']             = '小修改';
+$lang['draftdate']             = '草稿已自動存檔於';
+$lang['nosecedit']             = '在您編輯期間，其他使用者修改過本頁面。區段資料已逾時，因此系統載入了全頁，以取代之。';
+$lang['regmissing']            = '很抱歉，所有欄位都要填寫。';
+$lang['reguexists']            = '很抱歉，有人已使用了這個帳號。';
+$lang['regsuccess']            = '使用者帳號已建立，密碼已寄發至該電郵。';
+$lang['regsuccess2']           = '使用者帳號已建立。';
+$lang['regmailfail']           = '寄出密碼信似乎有問題，請跟管理員聯絡！';
+$lang['regbadmail']            = '您輸入的電郵地址似乎不正確。若您覺得是正確的，請與管理員聯絡。';
+$lang['regbadpass']            = '兩次輸入的密碼不一致，請再試一次。';
+$lang['regpwmail']             = '您的 DokuWiki 帳號密碼';
+$lang['reghere']               = '您還沒有帳號嗎？註冊一個吧。';
+$lang['profna']                = '本 wiki 不支援修改個人資料。';
+$lang['profnochange']          = '並未作任何變更。';
+$lang['profnoempty']           = '帳號或電郵地址不可空白！';
+$lang['profchanged']           = '個人資料已更新。';
+$lang['profnodelete']          = '本 wiki 不支援刪除使用者';
+$lang['profdeleteuser']        = '刪除帳號';
+$lang['profdeleted']           = '您的使用者帳號已從本 wiki 刪除';
+$lang['profconfdelete']        = '我想把帳號從本 wiki 刪除（不能復原）';
+$lang['profconfdeletemissing'] = '未勾選確認方塊';
+$lang['pwdforget']             = '忘記密碼了？索取新密碼！';
+$lang['resendna']              = '本 wiki 不支援重寄密碼。';
+$lang['resendpwd']             = '設定新密碼供';
+$lang['resendpwdmissing']      = '抱歉，您必須填寫所有欄位。';
+$lang['resendpwdnouser']       = '抱歉，資料庫內找不到這個使用者。';
+$lang['resendpwdbadauth']      = '抱歉，認證碼無效。請確認您使用了完整的確認連結。';
+$lang['resendpwdconfirm']      = '確認連結已通過郵件發送給您了。';
+$lang['resendpwdsuccess']      = '您的新密碼已寄出。';
+$lang['license']               = '若無特別註明，本 wiki 上的內容都是採用以下授權方式：';
+$lang['licenseok']             = '注意：編輯此頁面表示您同意用以下授權方式發布您撰寫的內容：';
+$lang['searchmedia']           = '搜尋檔名：';
+$lang['searchmedia_in']        = '在 %s 裏搜尋';
+$lang['txt_upload']            = '請選擇要上傳的檔案';
+$lang['txt_filename']          = '請輸入要上傳至本 wiki 的檔案名稱 (非必要)';
+$lang['txt_overwrt']           = '是否要覆蓋原有檔案';
+$lang['maxuploadsize']         = '每個上傳檔案不可大於 %s 。';
+$lang['lockedby']              = '目前已被下列人員鎖定';
+$lang['lockexpire']            = '預計解除鎖定於';
+$lang['js']['willexpire']      = '本頁的編輯鎖定將在一分鐘內到期。要避免發生衝突，請按「預覽」鍵重設鎖定計時。';
+$lang['js']['notsavedyet']     = '未儲存的變更將會遺失，繼續嗎？';
+$lang['js']['searchmedia']     = '搜尋檔案';
+$lang['js']['keepopen']        = '選擇時保持視窗開啟';
+$lang['js']['hidedetails']     = '隱藏詳細內容';
+$lang['js']['mediatitle']      = '連結設定';
+$lang['js']['mediadisplay']    = '連結類型';
+$lang['js']['mediaalign']      = '校正';
+$lang['js']['mediasize']       = '圖像大小';
+$lang['js']['mediatarget']     = '連結目標';
+$lang['js']['mediaclose']      = '關閉';
+$lang['js']['mediainsert']     = '插入';
+$lang['js']['mediadisplayimg'] = '顯示此圖像';
+$lang['js']['mediadisplaylnk'] = '只顯示連結';
+$lang['js']['mediasmall']      = '小型版本';
+$lang['js']['mediamedium']     = '中型版本';
+$lang['js']['medialarge']      = '大型版本';
+$lang['js']['mediaoriginal']   = '原始版本';
+$lang['js']['medialnk']        = '連向內容頁面';
+$lang['js']['mediadirect']     = '連向原始圖片';
+$lang['js']['medianolnk']      = '不連結';
+$lang['js']['medianolink']     = '不連結圖像';
+$lang['js']['medialeft']       = '圖像靠左對齊';
+$lang['js']['mediaright']      = '圖像靠右對齊';
+$lang['js']['mediacenter']     = '圖像置中對齊';
+$lang['js']['medianoalign']    = '不對齊';
+$lang['js']['nosmblinks']      = '只有在 Microsoft IE 下才能執行「連結到 Windows shares」。
+不過您仍可複製及貼上這個連結。';
+$lang['js']['linkwiz']         = '建立連結精靈';
+$lang['js']['linkto']          = '連結至：';
+$lang['js']['del_confirm']     = '確定刪除選取的項目？';
+$lang['js']['restore_confirm'] = '確定還原到這個版本？';
+$lang['js']['media_diff']      = '檢視差異：';
+$lang['js']['media_diff_both'] = '並排';
+$lang['js']['media_diff_opacity'] = '重疊';
+$lang['js']['media_diff_portions'] = '滑動';
+$lang['js']['media_select']    = '選擇檔案……';
+$lang['js']['media_upload_btn'] = '上傳';
+$lang['js']['media_done_btn']  = '完成';
+$lang['js']['media_drop']      = '拖拉檔案到此上傳';
+$lang['js']['media_cancel']    = '刪除';
+$lang['js']['media_overwrt']   = '覆蓋已存在的檔案';
+$lang['rssfailed']             = '擷取 RSS 饋送檔時發生錯誤：';
+$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['accessdenied']          = '您不可以檢視此頁面。';
+$lang['mediausage']            = '使用以下的語法來連結此檔案：';
+$lang['mediaview']             = '檢視原始檔案';
+$lang['mediaroot']             = 'root';
+$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['difflink']              = '連向這個比對檢視';
+$lang['diff_type']             = '檢視差異：';
+$lang['diff_inline']           = '行內';
+$lang['diff_side']             = '並排';
+$lang['line']                  = '行';
+$lang['breadcrumb']            = '足跡';
+$lang['youarehere']            = '您在這裏';
+$lang['lastmod']               = '上一次變更';
+$lang['by']                    = '由';
+$lang['deleted']               = '移除';
+$lang['created']               = '建立';
+$lang['restored']              = '還原成舊版 (%s)';
+$lang['external_edit']         = '外部編輯';
+$lang['summary']               = '編輯摘要';
+$lang['noflash']               = '顯示此內容需要 Adobe Flash 附加元件。';
+$lang['download']              = '下載程式碼片段';
+$lang['tools']                 = '工具';
+$lang['user_tools']            = '使用者工具';
+$lang['site_tools']            = '網站工具';
+$lang['page_tools']            = '頁面工具';
+$lang['skip_to_content']       = '跳至內容';
+$lang['sidebar']               = '側欄';
+$lang['mail_newpage']          = '增加的頁面：';
+$lang['mail_changed']          = '變更的頁面：';
+$lang['mail_subscribe_list']   = '分類名稱中變更的頁面：';
+$lang['mail_new_user']         = '新使用者：';
+$lang['mail_upload']           = '已上傳檔案：';
+$lang['changes_type']          = '檢視最近更新類型';
+$lang['pages_changes']         = '頁面';
+$lang['media_changes']         = '多媒體檔案';
+$lang['both_changes']          = '頁面和多媒體檔案';
+$lang['qb_bold']               = '粗體';
+$lang['qb_italic']             = '斜體';
+$lang['qb_underl']             = '底線';
+$lang['qb_code']               = '程式碼';
+$lang['qb_strike']             = '刪除線';
+$lang['qb_h1']                 = 'H1 標題';
+$lang['qb_h2']                 = 'H2 標題';
+$lang['qb_h3']                 = 'H3 標題';
+$lang['qb_h4']                 = 'H4 標題';
+$lang['qb_h5']                 = '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']                 = '水平線';
+$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['img_width']             = '寬度';
+$lang['img_height']            = '高度';
+$lang['img_manager']           = '在多媒體管理器中檢視';
+$lang['subscr_subscribe_success'] = '已將 %s 加入至 %s 的訂閱列表';
+$lang['subscr_subscribe_error'] = '將 %s 加入至 %s 的訂閱列表時發生錯誤';
+$lang['subscr_subscribe_noaddress'] = '沒有與您登入相關的地址，無法將您加入訂閱列表';
+$lang['subscr_unsubscribe_success'] = '已將 %s 移除自 %s 的訂閱列表';
+$lang['subscr_unsubscribe_error'] = '將 %s 移除自 %s 的訂閱列表時發生錯誤';
+$lang['subscr_already_subscribed'] = '%s 已經獲 %s 訂閱了';
+$lang['subscr_not_subscribed'] = '%s 尚未獲 %s 訂閱';
+$lang['subscr_m_not_subscribed'] = '您尚未訂閱目前的頁面或分類名稱。';
+$lang['subscr_m_new_header']   = '加入訂閱';
+$lang['subscr_m_current_header'] = '目前訂閱';
+$lang['subscr_m_unsubscribe']  = '取消訂閱';
+$lang['subscr_m_subscribe']    = '訂閱';
+$lang['subscr_m_receive']      = '接收';
+$lang['subscr_style_every']    = '每次更改都發送信件';
+$lang['subscr_style_digest']   = '對每個頁面發送更改的摘要信件 (每 %.2f 天)';
+$lang['subscr_style_list']     = '自上次發信以來更改的頁面的列表 (每 %.2f 天)';
+
+/* auth.class language support */
+$lang['authtempfail']          = '暫不提供帳號認證。若本狀況持續，請通知本 wiki 管理員。';
+$lang['authpwdexpire']         = '您的密碼將在 %d 天內到期，請馬上更換新密碼。';
+$lang['i_chooselang']          = '選擇您的語系';
+$lang['i_installer']           = 'DokuWiki 安裝工具';
+$lang['i_wikiname']            = '本 wiki 的名稱';
+$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 檔案。繼續到
+您的新 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['i_license']             = '請選擇您想要的內容發佈授權方式：';
+$lang['i_license_none']        = '不要顯示任何關於授權方式的訊息';
+$lang['i_pop_field']           = '請協助我們改進 Dokuwiki：';
+$lang['i_pop_label']           = '每月向 Dokuwiki 開發者發送匿名的使用數據';
+$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 秒鐘前';
+$lang['wordblock']             = '無法儲存您的更改，因它含有受阻擋的文字 (垃圾訊息)。';
+$lang['media_uploadtab']       = '上傳';
+$lang['media_searchtab']       = '搜尋';
+$lang['media_file']            = '檔案';
+$lang['media_viewtab']         = '檢視';
+$lang['media_edittab']         = '編輯';
+$lang['media_historytab']      = '歷史紀錄';
+$lang['media_list_thumbs']     = '縮圖';
+$lang['media_list_rows']       = '列表';
+$lang['media_sort_name']       = '名稱';
+$lang['media_sort_date']       = '日期';
+$lang['media_namespaces']      = '選擇分類名稱';
+$lang['media_files']           = '在 %s 中的檔案';
+$lang['media_upload']          = '上傳至 %s';
+$lang['media_search']          = '在 %s 中搜尋';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s 在 %s';
+$lang['media_edit']            = '編輯 %s';
+$lang['media_history']         = '%s 的歷史紀錄';
+$lang['media_meta_edited']     = '元資料已編輯';
+$lang['media_perm_read']       = '抱歉，您沒有足夠權限讀取檔案。';
+$lang['media_perm_upload']     = '抱歉，您沒有足夠權限上傳檔案。';
+$lang['media_update']          = '上傳新的版本';
+$lang['media_restore']         = '還原這個版本';
+
+$lang['currentns']             = '目前的命名空間';
+$lang['searchresult']          = '搜尋結果';
+$lang['plainhtml']             = '純 HTML';
+$lang['wikimarkup']            = 'Wiki 語法標記';
diff --git a/sources/inc/lang/zh-tw/locked.txt b/sources/inc/lang/zh-tw/locked.txt
new file mode 100644
index 0000000..819e59e
--- /dev/null
+++ b/sources/inc/lang/zh-tw/locked.txt
@@ -0,0 +1,3 @@
+====== 頁面鎖定 ======
+
+其他使用者正在編輯本頁，您必須等他完成編輯或等鎖定時間過去。
diff --git a/sources/inc/lang/zh-tw/login.txt b/sources/inc/lang/zh-tw/login.txt
new file mode 100644
index 0000000..b82f08a
--- /dev/null
+++ b/sources/inc/lang/zh-tw/login.txt
@@ -0,0 +1,4 @@
+====== 登入 ======
+
+您尚未登入，請輸入您的使用者名稱和密碼。 另外，瀏覽器需要啟用 cookies 以登入本 wiki。
+
diff --git a/sources/inc/lang/zh-tw/mailtext.txt b/sources/inc/lang/zh-tw/mailtext.txt
new file mode 100644
index 0000000..e99858c
--- /dev/null
+++ b/sources/inc/lang/zh-tw/mailtext.txt
@@ -0,0 +1,17 @@
+您的 DokuWiki 有個新增或變動的頁面。詳細資料如下：
+
+日期     : @DATE@
+瀏覽器   : @BROWSER@
+IP 位址   : @IPADDRESS@
+主機名稱 : @HOSTNAME@
+舊版本   : @OLDPAGE@
+新版本   : @NEWPAGE@
+編輯摘要 : @SUMMARY@
+使用者   : @USER@
+
+@DIFF@
+
+
+--
+本信件由以下 DokuWiki 網站產生：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/mailwrap.html b/sources/inc/lang/zh-tw/mailwrap.html
new file mode 100644
index 0000000..9cd5faa
--- /dev/null
+++ b/sources/inc/lang/zh-tw/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+這郵件由DokuWiki at @DOKUWIKIURL@. 生成
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/newpage.txt b/sources/inc/lang/zh-tw/newpage.txt
new file mode 100644
index 0000000..06ccd3d
--- /dev/null
+++ b/sources/inc/lang/zh-tw/newpage.txt
@@ -0,0 +1,3 @@
+====== 此主題不存在 ======
+
+您來到了一個未建立頁面的主題。如果權限允許，您可以用 「建立此頁」按鈕建立頁面。 
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/norev.txt b/sources/inc/lang/zh-tw/norev.txt
new file mode 100644
index 0000000..2a32ba6
--- /dev/null
+++ b/sources/inc/lang/zh-tw/norev.txt
@@ -0,0 +1,3 @@
+====== 無此版本 ======
+
+該版本的文件不存在。請用「舊版」按鈕檢視該文件所有舊版本清單。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/password.txt b/sources/inc/lang/zh-tw/password.txt
new file mode 100644
index 0000000..9c5ad2f
--- /dev/null
+++ b/sources/inc/lang/zh-tw/password.txt
@@ -0,0 +1,10 @@
+@FULLNAME@ 您好！
+
+這是您在位於 @DOKUWIKIURL@ 之 @TITLE@ 的使用者資料
+
+帳號 : @LOGIN@
+密碼 : @PASSWORD@
+
+--
+本信件由以下 DokuWiki 網站產生：
+@DOKUWIKIURL@
diff --git a/sources/inc/lang/zh-tw/preview.txt b/sources/inc/lang/zh-tw/preview.txt
new file mode 100644
index 0000000..95d4b10
--- /dev/null
+++ b/sources/inc/lang/zh-tw/preview.txt
@@ -0,0 +1,4 @@
+====== 預覽 ======
+
+以下是該文件的預覽。請記住：**您還未儲存它**！
+
diff --git a/sources/inc/lang/zh-tw/pwconfirm.txt b/sources/inc/lang/zh-tw/pwconfirm.txt
new file mode 100644
index 0000000..6f6dcd3
--- /dev/null
+++ b/sources/inc/lang/zh-tw/pwconfirm.txt
@@ -0,0 +1,13 @@
+@FULLNAME@ 您好！
+
+感謝您在 @TITLE@ ( @DOKUWIKIURL@ ) 註冊了使用者帳號。我們收到請求，希望能允許此帳號使用新密碼。
+
+如果您沒有發送此請求，請忽略這封郵件。
+
+若您真的要使用新密碼，請拜訪以下的連結。
+
+@CONFIRM@
+
+--
+本信件由以下 DokuWiki 網站產生：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/read.txt b/sources/inc/lang/zh-tw/read.txt
new file mode 100644
index 0000000..4a472cd
--- /dev/null
+++ b/sources/inc/lang/zh-tw/read.txt
@@ -0,0 +1 @@
+本頁是唯讀的，您可以看到原始碼，但不能更動它。您如果覺得它不應被鎖上，請詢問管理員。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/recent.txt b/sources/inc/lang/zh-tw/recent.txt
new file mode 100644
index 0000000..2831429
--- /dev/null
+++ b/sources/inc/lang/zh-tw/recent.txt
@@ -0,0 +1,5 @@
+====== 最近更新 ======
+
+以下的頁面是最近才更新的：
+
+
diff --git a/sources/inc/lang/zh-tw/register.txt b/sources/inc/lang/zh-tw/register.txt
new file mode 100644
index 0000000..6f2a75c
--- /dev/null
+++ b/sources/inc/lang/zh-tw/register.txt
@@ -0,0 +1,3 @@
+====== 註冊新使用者 ======
+
+若要註冊本 wiki 的帳號，請填寫下列資料。請確定您提供的是**合法的電郵地址**。如果您不必填寫密碼，系統就會為您自動產生登入密碼，並寄送到該電郵地址。登入名稱須符合正確[[doku>pagename|頁面名稱]]之條件。
diff --git a/sources/inc/lang/zh-tw/registermail.txt b/sources/inc/lang/zh-tw/registermail.txt
new file mode 100644
index 0000000..a67835d
--- /dev/null
+++ b/sources/inc/lang/zh-tw/registermail.txt
@@ -0,0 +1,14 @@
+有新的使用者註冊。詳細資料如下：
+
+帳號     : @NEWUSER@
+姓名     : @NEWNAME@
+電郵   : @NEWEMAIL@
+
+日期     : @DATE@
+瀏覽器   : @BROWSER@
+IP 位址   : @IPADDRESS@
+主機名稱 : @HOSTNAME@
+
+--
+本信件由以下 DokuWiki 網站產生：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/resendpwd.txt b/sources/inc/lang/zh-tw/resendpwd.txt
new file mode 100644
index 0000000..46078a3
--- /dev/null
+++ b/sources/inc/lang/zh-tw/resendpwd.txt
@@ -0,0 +1,3 @@
+====== 寄送新密碼 ======
+
+請在以下欄位輸入您的帳號，新密碼將會寄送到您註冊時填寫的電郵地址。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/resetpwd.txt b/sources/inc/lang/zh-tw/resetpwd.txt
new file mode 100644
index 0000000..ef0bff2
--- /dev/null
+++ b/sources/inc/lang/zh-tw/resetpwd.txt
@@ -0,0 +1,3 @@
+====== 設定新密碼 ======
+
+請為您的帳號輸入新密碼。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/revisions.txt b/sources/inc/lang/zh-tw/revisions.txt
new file mode 100644
index 0000000..64daa99
--- /dev/null
+++ b/sources/inc/lang/zh-tw/revisions.txt
@@ -0,0 +1,3 @@
+====== 舊版 ======
+
+以下是該文件的舊版本。如要還原成某個舊版次，就點下它，然後按「編輯本頁」，並存檔起來就可以了。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/searchpage.txt b/sources/inc/lang/zh-tw/searchpage.txt
new file mode 100644
index 0000000..e0f04c4
--- /dev/null
+++ b/sources/inc/lang/zh-tw/searchpage.txt
@@ -0,0 +1,5 @@
+====== 搜尋精靈 ======
+
+提示：您可以在下面找到您的搜尋結果。若沒找到您想要的，可按下按鈕建立或編輯和查詢關鍵字同名的頁面。
+
+===== 搜尋結果 =====
diff --git a/sources/inc/lang/zh-tw/showrev.txt b/sources/inc/lang/zh-tw/showrev.txt
new file mode 100644
index 0000000..306aa6e
--- /dev/null
+++ b/sources/inc/lang/zh-tw/showrev.txt
@@ -0,0 +1,2 @@
+**這是本文件的舊版！**
+----
diff --git a/sources/inc/lang/zh-tw/stopwords.txt b/sources/inc/lang/zh-tw/stopwords.txt
new file mode 100644
index 0000000..e549250
--- /dev/null
+++ b/sources/inc/lang/zh-tw/stopwords.txt
@@ -0,0 +1,31 @@
+# 本清單列出製作索引檔 (index) 時不要列入的關鍵字，格式為每字 (詞) 佔一行。
+# 在修改本清單時，請注意要用 UNIX 格式的換行符號 (newline) 處理，而非 DOS 的 CR-LR 。
+# (如果在 MS Windows 環境使用的話，可使用 vim win32 版、 UltraEdit 或其他類似編輯器修改。)
+#
+# 還有，不必把小於 3 個字元 (英數字元) 都包括進來。
+# 目前本清單的內容是以 http://www.ranks.nl/stopwords/ 為基礎，發展而成的。
+about
+are
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/zh-tw/subscr_digest.txt b/sources/inc/lang/zh-tw/subscr_digest.txt
new file mode 100644
index 0000000..1a34087
--- /dev/null
+++ b/sources/inc/lang/zh-tw/subscr_digest.txt
@@ -0,0 +1,19 @@
+您好！
+
+本 wiki ( @TITLE@ ) 的頁面 @PAGE@ 已更改。
+更改內容如下：
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+舊版本：@OLDPAGE@
+新版本：@NEWPAGE@
+
+要取消頁面提醒，請登入本 wiki @DOKUWIKIURL@
+然後拜訪 @SUBSCRIBE@
+並取消訂閱頁面或分類名稱的更改。
+
+--
+本信件由以下 DokuWiki 網站產生：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/subscr_form.txt b/sources/inc/lang/zh-tw/subscr_form.txt
new file mode 100644
index 0000000..ba3f161
--- /dev/null
+++ b/sources/inc/lang/zh-tw/subscr_form.txt
@@ -0,0 +1,3 @@
+====== 訂閱管理 ======
+
+在此頁裏，您可以管理在目前頁面及分類名稱之訂閱。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/subscr_list.txt b/sources/inc/lang/zh-tw/subscr_list.txt
new file mode 100644
index 0000000..da2fb33
--- /dev/null
+++ b/sources/inc/lang/zh-tw/subscr_list.txt
@@ -0,0 +1,16 @@
+您好！
+
+本 wiki ( @TITLE@ ) 的 @PAGE@ 分類名稱頁面已更改。
+更改內容如下：
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+要取消頁面提醒，請登入本 wiki @DOKUWIKIURL@
+然後拜訪 @SUBSCRIBE@
+並取消訂閱頁面或分類名稱的更改。
+
+--
+本信件由以下 DokuWiki 網站產生：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/subscr_single.txt b/sources/inc/lang/zh-tw/subscr_single.txt
new file mode 100644
index 0000000..b11841b
--- /dev/null
+++ b/sources/inc/lang/zh-tw/subscr_single.txt
@@ -0,0 +1,22 @@
+您好！
+
+本 wiki ( @TITLE@ ) 的頁面 @PAGE@ 已更改。
+更改內容如下：
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+時間     : @DATE@
+使用者   : @USER@
+編輯摘要 : @SUMMARY@
+舊版本   : @OLDPAGE@
+新版本   : @NEWPAGE@
+
+要取消頁面提醒，請登入本 wiki @DOKUWIKIURL@
+然後拜訪 @NEWPAGE@
+並取消訂閱頁面或分類名稱的更改。
+
+--
+本信件由以下 DokuWiki 網站產生：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/updateprofile.txt b/sources/inc/lang/zh-tw/updateprofile.txt
new file mode 100644
index 0000000..a7a2ad8
--- /dev/null
+++ b/sources/inc/lang/zh-tw/updateprofile.txt
@@ -0,0 +1,3 @@
+====== 更新個人資料 ======
+
+您只需修改想更新的欄位就好，帳號名稱不能變更。
\ No newline at end of file
diff --git a/sources/inc/lang/zh-tw/uploadmail.txt b/sources/inc/lang/zh-tw/uploadmail.txt
new file mode 100644
index 0000000..0084d7a
--- /dev/null
+++ b/sources/inc/lang/zh-tw/uploadmail.txt
@@ -0,0 +1,14 @@
+有人把檔案上傳到您的 DokuWiki。詳細資料如下：
+
+檔名     : @MEDIA@
+日期     : @DATE@
+瀏覽器   : @BROWSER@
+IP 位址   : @IPADDRESS@
+主機名稱 : @HOSTNAME@
+大小     : @SIZE@
+MIME類型 : @MIME@
+使用者   : @USER@
+
+--
+本信件由以下 DokuWiki 網站產生：
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh/admin.txt b/sources/inc/lang/zh/admin.txt
new file mode 100644
index 0000000..bf6476e
--- /dev/null
+++ b/sources/inc/lang/zh/admin.txt
@@ -0,0 +1,3 @@
+====== 管理 ======
+
+在下面您能找到 DokuWiki 中可用管理任务的列表。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/adminplugins.txt b/sources/inc/lang/zh/adminplugins.txt
new file mode 100644
index 0000000..66cee45
--- /dev/null
+++ b/sources/inc/lang/zh/adminplugins.txt
@@ -0,0 +1 @@
+===== 附加插件 =====
\ No newline at end of file
diff --git a/sources/inc/lang/zh/backlinks.txt b/sources/inc/lang/zh/backlinks.txt
new file mode 100644
index 0000000..19e3fee
--- /dev/null
+++ b/sources/inc/lang/zh/backlinks.txt
@@ -0,0 +1,3 @@
+====== 反向链接 ======
+
+这里是能够反向链接到当前页面的其他页面列表。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/conflict.txt b/sources/inc/lang/zh/conflict.txt
new file mode 100644
index 0000000..92eedf4
--- /dev/null
+++ b/sources/inc/lang/zh/conflict.txt
@@ -0,0 +1,5 @@
+====== 存在一个更新的版本 ======
+
+您编辑的文档存在一个更新的版本。这种情况的发生是因为在您编辑时有另一个用户更改了该文档。
+
+请仔细检查下面列出的差别，并决定保留哪个版本。如果您选择“保存”，您的版本将被保留。点击“取消”将保留当前版本。
diff --git a/sources/inc/lang/zh/denied.txt b/sources/inc/lang/zh/denied.txt
new file mode 100644
index 0000000..276741c
--- /dev/null
+++ b/sources/inc/lang/zh/denied.txt
@@ -0,0 +1,3 @@
+====== 拒绝授权 ======
+
+对不起，您没有足够权限，无法继续。也许您忘了登录？
\ No newline at end of file
diff --git a/sources/inc/lang/zh/diff.txt b/sources/inc/lang/zh/diff.txt
new file mode 100644
index 0000000..19e8ef7
--- /dev/null
+++ b/sources/inc/lang/zh/diff.txt
@@ -0,0 +1,3 @@
+====== 差别 ======
+
+这里会显示出您选择的修订版和当前版本之间的差别。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/draft.txt b/sources/inc/lang/zh/draft.txt
new file mode 100644
index 0000000..615cb07
--- /dev/null
+++ b/sources/inc/lang/zh/draft.txt
@@ -0,0 +1,7 @@
+====== 发现草稿 ======
+
+您在本页最后的编辑过程没有正常结束。DokuWiki 在您的编辑过程中自动保存了一份草稿，您现在可以使用它继续编辑。 下面是最后编辑时的数据。
+
+请决定您希望 //恢复// 您丢失的编辑数据，//删除// 自动保存的草稿，或者 //取消// 本编辑过程。
+
+
diff --git a/sources/inc/lang/zh/edit.txt b/sources/inc/lang/zh/edit.txt
new file mode 100644
index 0000000..846e898
--- /dev/null
+++ b/sources/inc/lang/zh/edit.txt
@@ -0,0 +1 @@
+编辑本页后请点击“保存”。请参阅 [[wiki:syntax]] 了解维基语法。只有在您能 **改进** 该页面的前提下才编辑它。如果您想尝试一些东西，请先到 [[playground:playground|playground]] 热身。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/editrev.txt b/sources/inc/lang/zh/editrev.txt
new file mode 100644
index 0000000..82013cb
--- /dev/null
+++ b/sources/inc/lang/zh/editrev.txt
@@ -0,0 +1,2 @@
+**您载入了该文档旧的修订版！** 如果您保存了它，您就会用这些数据创建一份新的修订版。
+----
\ No newline at end of file
diff --git a/sources/inc/lang/zh/index.txt b/sources/inc/lang/zh/index.txt
new file mode 100644
index 0000000..efb07b9
--- /dev/null
+++ b/sources/inc/lang/zh/index.txt
@@ -0,0 +1,3 @@
+====== 索引 ======
+
+这是根据 [[doku>namespaces|命名空间]] 排列的所有可访问页面的索引。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/install.html b/sources/inc/lang/zh/install.html
new file mode 100644
index 0000000..448f6bd
--- /dev/null
+++ b/sources/inc/lang/zh/install.html
@@ -0,0 +1,8 @@
+
        本页面旨在帮助您完成第一次安装和配置 Dokuwiki。关于安装工具的更多信息请参阅其 官方文档页面。
        
+
+
        DokuWiki 使用普通的文件保存维基页面和其他与这些页面挂钩的信息（例如：图像，搜索索引，修订记录等）。为了能正常运行，DokuWiki 必须 拥有针对那些路径和文件的写权限。本安装工具不能用于设置这些权限。对权限的操作通常通过命令行或使用您的网络服务提供商的 FTP 或控制面板（例如 cPanel）进行操作。
        
+
+
        本安装工具将设置您的 DokuWiki 配置 ACL，它能让管理员登录并使用“管理”功能来安装插件，管理用户，管理访问权限和其他配置设置。它并不是 DokuWiki 正常运行所必须的，但安装之后它将更方便您的管理。
        
+
+
        有经验的用户或有特殊需求的用户请参阅更详细的 安装指南
+和 配置设置。
        
diff --git a/sources/inc/lang/zh/lang.php b/sources/inc/lang/zh/lang.php
new file mode 100644
index 0000000..0c00119
--- /dev/null
+++ b/sources/inc/lang/zh/lang.php
@@ -0,0 +1,348 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton 
+ * @author Simon zhan 
+ * @author mr.jinyi@gmail.com
+ * @author ben 
+ * @author lainme 
+ * @author caii 
+ * @author Hiphen Lee 
+ * @author caii, patent agent in China 
+ * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian 
+ * @author Rachel 
+ * @author Donald 
+ * @author Yangyu Huang 
+ * @author anjianshi 
+ */
+$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_profile']           = '更新个人信息';
+$lang['btn_reset']             = '重设';
+$lang['btn_resendpwd']         = '设置新密码';
+$lang['btn_draft']             = '编辑草稿';
+$lang['btn_recover']           = '恢复草稿';
+$lang['btn_draftdel']          = '删除草稿';
+$lang['btn_revert']            = '恢复';
+$lang['btn_register']          = '注册';
+$lang['btn_apply']             = '应用';
+$lang['btn_media']             = '媒体管理器';
+$lang['btn_deleteuser']        = '移除我的账户';
+$lang['loggedinas']            = '登录为';
+$lang['user']                  = '用户名';
+$lang['pass']                  = '密码';
+$lang['newpass']               = '请输入新密码';
+$lang['oldpass']               = '请输入当前密码';
+$lang['passchk']               = '请再输一次';
+$lang['remember']              = '记住我';
+$lang['fullname']              = '全名';
+$lang['email']                 = 'E-Mail';
+$lang['profile']               = '用户信息';
+$lang['badlogin']              = '对不起，用户名或密码错误。';
+$lang['badpassconfirm']        = '对不起，密码错误';
+$lang['minoredit']             = '细微修改';
+$lang['draftdate']             = '草稿自动保存于';
+$lang['nosecedit']             = '在您编辑期间本页刚被他人修改过，局部信息已过期，故载入全页。';
+$lang['regmissing']            = '对不起，您必须填写所有的字段。';
+$lang['reguexists']            = '对不起，该用户名已经存在。';
+$lang['regsuccess']            = '新用户已建立，密码将通过电子邮件发送给您。';
+$lang['regsuccess2']           = '新用户已建立';
+$lang['regmailfail']           = '发送密码邮件时产生错误。请联系管理员！';
+$lang['regbadmail']            = '您输入的邮件地址有问题——如果您认为这是系统错误，请联系管理员。';
+$lang['regbadpass']            = '您输入的密码与系统产生的不符，请重试。';
+$lang['regpwmail']             = '您的 DokuWiki 密码';
+$lang['reghere']               = '还没有账号？立即注册';
+$lang['profna']                = '本维基不允许修改个人信息';
+$lang['profnochange']          = '没有改动，不进行操作。';
+$lang['profnoempty']           = '不允许使用空的用户名或邮件地址。';
+$lang['profchanged']           = '用户信息更新成功。';
+$lang['profnodelete']          = '这个 wiki 不支持删除用户';
+$lang['profdeleteuser']        = '删除账号';
+$lang['profdeleted']           = '你的用户已经从这个 wiki 中删除';
+$lang['profconfdelete']        = '我希望删除我的账户。
        这项操作无法撤销。';
+$lang['profconfdeletemissing'] = '确认框未勾选';
+$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['maxuploadsize']         = '上传限制。每个文件 %s';
+$lang['lockedby']              = '目前已被下列人员锁定';
+$lang['lockexpire']            = '预计锁定解除于';
+$lang['js']['willexpire']      = '您对本页的独有编辑权将于一分钟之后解除。\n为了防止与其他人的编辑冲突，请使用预览按钮重设计时器。';
+$lang['js']['notsavedyet']     = '未保存的更改将丢失。
+真的要继续？';
+$lang['js']['searchmedia']     = '查找文件';
+$lang['js']['keepopen']        = '选中后不自动关闭窗口';
+$lang['js']['hidedetails']     = '隐藏详细信息';
+$lang['js']['mediatitle']      = '链接设置';
+$lang['js']['mediadisplay']    = '链接类型';
+$lang['js']['mediaalign']      = '对齐';
+$lang['js']['mediasize']       = '图片大小';
+$lang['js']['mediatarget']     = '链接目标';
+$lang['js']['mediaclose']      = '关闭';
+$lang['js']['mediainsert']     = '插入';
+$lang['js']['mediadisplayimg'] = '显示图片。';
+$lang['js']['mediadisplaylnk'] = '仅显示链接。';
+$lang['js']['mediasmall']      = '小尺寸';
+$lang['js']['mediamedium']     = '中等尺寸';
+$lang['js']['medialarge']      = '大尺寸';
+$lang['js']['mediaoriginal']   = '原始版本';
+$lang['js']['medialnk']        = '到详细页面的链接';
+$lang['js']['mediadirect']     = '到原始文件的直接链接';
+$lang['js']['medianolnk']      = '没有链接';
+$lang['js']['medianolink']     = '不要链接图片';
+$lang['js']['medialeft']       = '左对齐图片。';
+$lang['js']['mediaright']      = '右对齐图片。';
+$lang['js']['mediacenter']     = '居中对齐图片。';
+$lang['js']['medianoalign']    = '不使用对齐。';
+$lang['js']['nosmblinks']      = '连接到 Windows 共享功能只有在 IE 浏览器中才能正常使用。
+但您仍能复制并粘贴该链接。';
+$lang['js']['linkwiz']         = '链接向导';
+$lang['js']['linkto']          = '链接到：';
+$lang['js']['del_confirm']     = '真的要删除选中的项目吗？';
+$lang['js']['restore_confirm'] = '确实要恢复这个版本么？';
+$lang['js']['media_diff']      = '查看差异：';
+$lang['js']['media_diff_both'] = '肩并肩';
+$lang['js']['media_diff_opacity'] = '叠加';
+$lang['js']['media_diff_portions'] = '滑块';
+$lang['js']['media_select']    = '选择文件……';
+$lang['js']['media_upload_btn'] = '上传';
+$lang['js']['media_done_btn']  = '完成';
+$lang['js']['media_drop']      = '拖拽文件到此处来上传';
+$lang['js']['media_cancel']    = '删除';
+$lang['js']['media_overwrt']   = '覆盖已存在的文件';
+$lang['rssfailed']             = '获取该 RSS 信息时产生错误：';
+$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['accessdenied']          = '您没有权限浏览此页面。';
+$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['difflink']              = '到此差别页面的链接';
+$lang['diff_type']             = '查看差异：';
+$lang['diff_inline']           = '行内显示';
+$lang['diff_side']             = '并排显示';
+$lang['line']                  = '行';
+$lang['breadcrumb']            = '您的足迹';
+$lang['youarehere']            = '您在这里';
+$lang['lastmod']               = '最后更改';
+$lang['by']                    = '由';
+$lang['deleted']               = '移除';
+$lang['created']               = '创建';
+$lang['restored']              = '已恢复为旧版 (%s)';
+$lang['external_edit']         = '外部编辑';
+$lang['summary']               = '编辑摘要';
+$lang['noflash']               = '需要 Adobe Flash 插件 来播放本内容。 ';
+$lang['download']              = '下载片段';
+$lang['tools']                 = '工具';
+$lang['user_tools']            = '用户工具';
+$lang['site_tools']            = '站点工具';
+$lang['page_tools']            = '页面工具';
+$lang['skip_to_content']       = '跳至内容';
+$lang['sidebar']               = '侧边栏';
+$lang['mail_newpage']          = '添加页面：';
+$lang['mail_changed']          = '更改页面：';
+$lang['mail_subscribe_list']   = '命名空间中改变的页面：';
+$lang['mail_new_user']         = '新用户：';
+$lang['mail_upload']           = '已上传的文件：';
+$lang['changes_type']          = '查看何种更改';
+$lang['pages_changes']         = '页面';
+$lang['media_changes']         = '媒体文件';
+$lang['both_changes']          = '页面和媒体文件';
+$lang['qb_bold']               = '粗体';
+$lang['qb_italic']             = '斜体';
+$lang['qb_underl']             = '下划线';
+$lang['qb_code']               = '代码';
+$lang['qb_strike']             = '删除线';
+$lang['qb_h1']                 = '标题 H1';
+$lang['qb_h2']                 = '标题 H2 ';
+$lang['qb_h3']                 = '标题 H3';
+$lang['qb_h4']                 = '标题 H4';
+$lang['qb_h5']                 = '标题 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']                 = '水平线';
+$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['img_width']             = '宽度';
+$lang['img_height']            = '高度';
+$lang['img_manager']           = '在媒体管理器中查看';
+$lang['subscr_subscribe_success'] = '添加 %s 到 %s 的订阅列表';
+$lang['subscr_subscribe_error'] = '添加 %s 到 %s 的订阅列表中出现错误';
+$lang['subscr_subscribe_noaddress'] = '没有与您登录信息相关联的地址，您无法被添加到订阅列表';
+$lang['subscr_unsubscribe_success'] = '%s 被移出 %s 的订阅列表';
+$lang['subscr_unsubscribe_error'] = '%s 被移出 %s 的订阅列表中出现错误';
+$lang['subscr_already_subscribed'] = '%s 已经订阅了 %s';
+$lang['subscr_not_subscribed'] = '%s 没有订阅 %s';
+$lang['subscr_m_not_subscribed'] = '您现在没有订阅当前页面或者命名空间。';
+$lang['subscr_m_new_header']   = '添加订阅';
+$lang['subscr_m_current_header'] = '当前订阅';
+$lang['subscr_m_unsubscribe']  = '退订';
+$lang['subscr_m_subscribe']    = '订阅';
+$lang['subscr_m_receive']      = '接收';
+$lang['subscr_style_every']    = '对每次更改发送邮件';
+$lang['subscr_style_digest']   = '对每个页面发送更改的摘要邮件（每 %.2f 天）';
+$lang['subscr_style_list']     = '自上封邮件以来更改的页面的列表（每 %.2f 天）';
+$lang['authtempfail']          = '用户认证暂时无法使用。如果该状态一直存在，请通知维基管理员。';
+$lang['authpwdexpire']         = '您的密码将在 %d 天内过期，请尽快更改';
+$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']            = 'DokuWiki 无法写入 %s。您需要修改该路径的权限设定！';
+$lang['i_confexists']          = '%s 已经存在';
+$lang['i_writeerr']            = '无法创建 %s。您需要检查该路径/文件的权限设定并手动创建该文件。';
+$lang['i_badhash']             = '无法识别的或被修改的 dokuwiki.php（值=%s）';
+$lang['i_badval']              = '%s - 非法或空值';
+$lang['i_success']             = '配置成功完成。您现在可以删除 install.php 了。继续进入
+                        您全新的 DokuWiki。';
+$lang['i_failure']             = '写入配置文件的时候产生一些错误。在使用 您全新安装的 DokuWiki 前
+                         您需要手动修复它们。';
+$lang['i_policy']              = '初始的 ACL 政策';
+$lang['i_pol0']                = '开放的维基（任何人都有读、写、上传的权限）';
+$lang['i_pol1']                = '公共的维基（任何人都有读的权限，只有注册用户才有写和上传的权限）';
+$lang['i_pol2']                = '关闭的维基（只有注册用户才有读、写、上传的权限）';
+$lang['i_allowreg']            = '允许用户自行注册';
+$lang['i_retry']               = '重试';
+$lang['i_license']             = '请选择您希望的内容发布许可协议：';
+$lang['i_license_none']        = '不要显示任何许可协议信息';
+$lang['i_pop_field']           = '请帮助我们改进 Dokuwiki 的体验：';
+$lang['i_pop_label']           = '每个月向 Dokuwiki 开发者发送匿名的使用数据';
+$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秒前';
+$lang['wordblock']             = '您的更改没有被保存，因为它包含被屏蔽的文字（垃圾信息）。';
+$lang['media_uploadtab']       = '上传';
+$lang['media_searchtab']       = '搜索';
+$lang['media_file']            = '文件';
+$lang['media_viewtab']         = '查看';
+$lang['media_edittab']         = '编辑';
+$lang['media_historytab']      = '历史';
+$lang['media_list_thumbs']     = '缩图';
+$lang['media_list_rows']       = '列表';
+$lang['media_sort_name']       = '按名称';
+$lang['media_sort_date']       = '按日期';
+$lang['media_namespaces']      = '选择命名空间';
+$lang['media_files']           = '在 %s 中的文件';
+$lang['media_upload']          = '上传到 %s 命名空间。';
+$lang['media_search']          = '在 %s 命名空间中搜索。';
+$lang['media_view']            = '%s';
+$lang['media_viewold']         = '%s 在 %s';
+$lang['media_edit']            = '编辑 %s';
+$lang['media_history']         = '%s 的历史纪录';
+$lang['media_meta_edited']     = '元数据已编辑';
+$lang['media_perm_read']       = '抱歉，您没有足够权限读取这些文件。';
+$lang['media_perm_upload']     = '抱歉，您没有足够权限来上传文件。';
+$lang['media_update']          = '上传新版本';
+$lang['media_restore']         = '恢复这个版本';
+$lang['currentns']             = '当前命名空间';
+$lang['searchresult']          = '搜索结果';
diff --git a/sources/inc/lang/zh/locked.txt b/sources/inc/lang/zh/locked.txt
new file mode 100644
index 0000000..321e4a0
--- /dev/null
+++ b/sources/inc/lang/zh/locked.txt
@@ -0,0 +1,3 @@
+====== 页面已锁定 ======
+
+本页面目前正被其他用户编辑。您要等到该用户完成编辑或锁定因过期而自动解除后才能编辑。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/login.txt b/sources/inc/lang/zh/login.txt
new file mode 100644
index 0000000..8ff8b38
--- /dev/null
+++ b/sources/inc/lang/zh/login.txt
@@ -0,0 +1,3 @@
+====== 登录 ======
+
+您尚未登录！请在下方输入您的用户名和密码进行登录。 您的浏览器需要支持 Cookies 才能正常登录。
diff --git a/sources/inc/lang/zh/mailtext.txt b/sources/inc/lang/zh/mailtext.txt
new file mode 100644
index 0000000..311acf1
--- /dev/null
+++ b/sources/inc/lang/zh/mailtext.txt
@@ -0,0 +1,17 @@
+您的 DokuWiki 中有一个页面被添加或更改了。以下是详细资料：
+
+日期        : @DATE@
+浏览器      : @BROWSER@
+IP 地址     : @IPADDRESS@
+机器名称    : @HOSTNAME@
+修订记录    : @OLDPAGE@
+最新修订    : @NEWPAGE@
+编辑摘要    : @SUMMARY@
+用户        : @USER@
+
+@DIFF@
+
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh/mailwrap.html b/sources/inc/lang/zh/mailwrap.html
new file mode 100644
index 0000000..0f00d95
--- /dev/null
+++ b/sources/inc/lang/zh/mailwrap.html
@@ -0,0 +1,13 @@
+
+
+@TITLE@
+
+
+
+
+@HTMLBODY@
+
+
        
+本邮件由位于 @DOKUWIKIURL@ 的 Dokuwiki 自动创建。
+
+
\ No newline at end of file
diff --git a/sources/inc/lang/zh/newpage.txt b/sources/inc/lang/zh/newpage.txt
new file mode 100644
index 0000000..6f96b56
--- /dev/null
+++ b/sources/inc/lang/zh/newpage.txt
@@ -0,0 +1,3 @@
+====== 该主题尚不存在 ======
+
+您访问的页面并不存在。如果允许，您可以使用“创建该页面”按钮来创建它。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/norev.txt b/sources/inc/lang/zh/norev.txt
new file mode 100644
index 0000000..3fe5aab
--- /dev/null
+++ b/sources/inc/lang/zh/norev.txt
@@ -0,0 +1,3 @@
+====== 没有该修订版 ======
+
+您指定的修订版并不存在。请使用“修订记录”按钮查看本页面的修订记录列表。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/password.txt b/sources/inc/lang/zh/password.txt
new file mode 100644
index 0000000..9692970
--- /dev/null
+++ b/sources/inc/lang/zh/password.txt
@@ -0,0 +1,10 @@
+@FULLNAME@ 您好！
+
+这是您在 @TITLE@（@DOKUWIKIURL@）的用户资料
+用户名：@LOGIN@
+密码：@PASSWORD@
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+
diff --git a/sources/inc/lang/zh/preview.txt b/sources/inc/lang/zh/preview.txt
new file mode 100644
index 0000000..dbb3de6
--- /dev/null
+++ b/sources/inc/lang/zh/preview.txt
@@ -0,0 +1,3 @@
+====== 预览 ======
+
+这是该文件的效果预览。请记住：它**并没有被保存**！
diff --git a/sources/inc/lang/zh/pwconfirm.txt b/sources/inc/lang/zh/pwconfirm.txt
new file mode 100644
index 0000000..7e48751
--- /dev/null
+++ b/sources/inc/lang/zh/pwconfirm.txt
@@ -0,0 +1,15 @@
+@FULLNAME@ 您好！
+
+有人请求为您在 @DOKUWIKIURL@ 注册的用户名 @TITLE@ 发送新密码
+
+如果您没有请求发送新密码，请忽略这封邮件。
+
+为了确认发送新密码请求的确来自您，请使用下面的链接。
+
+@CONFIRM@
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+
+
diff --git a/sources/inc/lang/zh/read.txt b/sources/inc/lang/zh/read.txt
new file mode 100644
index 0000000..eb47765
--- /dev/null
+++ b/sources/inc/lang/zh/read.txt
@@ -0,0 +1,2 @@
+本页面只读。您可以查看源文件，但不能更改它。如果您觉得这是系统错误，请联系管理员。
+
diff --git a/sources/inc/lang/zh/recent.txt b/sources/inc/lang/zh/recent.txt
new file mode 100644
index 0000000..95634d0
--- /dev/null
+++ b/sources/inc/lang/zh/recent.txt
@@ -0,0 +1,5 @@
+====== 最近更新 ======
+
+以下的页面是最近才更新的：
+
+
diff --git a/sources/inc/lang/zh/register.txt b/sources/inc/lang/zh/register.txt
new file mode 100644
index 0000000..7410ff1
--- /dev/null
+++ b/sources/inc/lang/zh/register.txt
@@ -0,0 +1,3 @@
+====== 注册新用户 ======
+
+填写以下资料来创建一个新帐户。请确定您提供的是 **正确的 E-mail 地址** - 如果您没有被要求在这里输入密码，那么新密码将通过您的邮件地址发送给您。 用于登录的用户名必须合法，请参阅 [[doku>pagename|pagename]]。
diff --git a/sources/inc/lang/zh/registermail.txt b/sources/inc/lang/zh/registermail.txt
new file mode 100644
index 0000000..9647b5f
--- /dev/null
+++ b/sources/inc/lang/zh/registermail.txt
@@ -0,0 +1,16 @@
+新用户已创建。下面是详细信息：
+
+用户名      : @NEWUSER@
+全名        : @NEWNAME@
+E-mail      : @NEWEMAIL@
+
+日期        : @DATE@
+浏览器      : @BROWSER@
+IP 地址     : @IPADDRESS@
+机器名称    : @HOSTNAME@
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+
+
diff --git a/sources/inc/lang/zh/resendpwd.txt b/sources/inc/lang/zh/resendpwd.txt
new file mode 100644
index 0000000..f98e469
--- /dev/null
+++ b/sources/inc/lang/zh/resendpwd.txt
@@ -0,0 +1,5 @@
+====== 发送新密码 ======
+
+请在下列区域中输入您的用户名来获取新密码。 一封包含确认链接的邮件将发送给您注册的邮件地址。
+
+
diff --git a/sources/inc/lang/zh/resetpwd.txt b/sources/inc/lang/zh/resetpwd.txt
new file mode 100644
index 0000000..a9d59fd
--- /dev/null
+++ b/sources/inc/lang/zh/resetpwd.txt
@@ -0,0 +1,3 @@
+====== 设置新密码 ======
+
+请为您在本维基上的账户设置一个新密码。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/revisions.txt b/sources/inc/lang/zh/revisions.txt
new file mode 100644
index 0000000..89d2a78
--- /dev/null
+++ b/sources/inc/lang/zh/revisions.txt
@@ -0,0 +1,3 @@
+====== 修订记录 ======
+
+以下是当前文档的修订记录。如果要回复到某个旧的修订版，请在下面选择它，并点击“编辑本页”，之后保存即可。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/searchpage.txt b/sources/inc/lang/zh/searchpage.txt
new file mode 100644
index 0000000..8222e24
--- /dev/null
+++ b/sources/inc/lang/zh/searchpage.txt
@@ -0,0 +1,5 @@
+====== 搜索 ======
+
+下面将显示您的搜索结果。如果没有找到您想要的东西，您可以使用相应的按钮来创建或编辑该页面。
+
+===== 搜索结果 =====
\ No newline at end of file
diff --git a/sources/inc/lang/zh/showrev.txt b/sources/inc/lang/zh/showrev.txt
new file mode 100644
index 0000000..770fecc
--- /dev/null
+++ b/sources/inc/lang/zh/showrev.txt
@@ -0,0 +1,2 @@
+**这是本文档旧的修订版！**
+----
diff --git a/sources/inc/lang/zh/stopwords.txt b/sources/inc/lang/zh/stopwords.txt
new file mode 100644
index 0000000..bc6eb48
--- /dev/null
+++ b/sources/inc/lang/zh/stopwords.txt
@@ -0,0 +1,29 @@
+# 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
+and
+you
+your
+them
+their
+com
+for
+from
+into
+how
+that
+the
+this
+was
+what
+when
+where
+who
+will
+with
+und
+the
+www
diff --git a/sources/inc/lang/zh/subscr_digest.txt b/sources/inc/lang/zh/subscr_digest.txt
new file mode 100644
index 0000000..3c73ff4
--- /dev/null
+++ b/sources/inc/lang/zh/subscr_digest.txt
@@ -0,0 +1,19 @@
+您好！
+
+@TITLE@ 维基中的页面 @PAGE@ 已经更改。
+这里是更改的内容：
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+旧版本：@OLDPAGE@
+新版本：@NEWPAGE@
+
+要取消页面提醒，从 @DOKUWIKIURL@ 登录维基，然后浏览
+@SUBSCRIBE@
+并退订页面以及/或者命名空间的更改。
+
+--
+本邮件由以下 DokuWiki 产生
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh/subscr_form.txt b/sources/inc/lang/zh/subscr_form.txt
new file mode 100644
index 0000000..65bfd40
--- /dev/null
+++ b/sources/inc/lang/zh/subscr_form.txt
@@ -0,0 +1,3 @@
+====== 订阅管理 ======
+
+这个页面允许您管理在当前页面和命名空间的订阅。
\ No newline at end of file
diff --git a/sources/inc/lang/zh/subscr_list.txt b/sources/inc/lang/zh/subscr_list.txt
new file mode 100644
index 0000000..1fc1e21
--- /dev/null
+++ b/sources/inc/lang/zh/subscr_list.txt
@@ -0,0 +1,16 @@
+您好！
+
+@TITLE@ 维基中的命名空间 @PAGE@ 的页面已经更改。
+这里是更改的页面：
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+要取消页面提醒，从 @DOKUWIKIURL@ 登录维基，然后浏览
+@SUBSCRIBE@
+并退订页面以及/或者命名空间的更改。
+
+--
+本邮件由以下 DokuWiki 产生
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh/subscr_single.txt b/sources/inc/lang/zh/subscr_single.txt
new file mode 100644
index 0000000..7da57d5
--- /dev/null
+++ b/sources/inc/lang/zh/subscr_single.txt
@@ -0,0 +1,22 @@
+您好！
+
+@TITLE@ 维基中的页面 @PAGE@ 已经更改。
+这里是更改的内容：
+
+--------------------------------------------------------
+@DIFF@
+--------------------------------------------------------
+
+时间：@DATE@
+用户：@USER@
+编辑摘要：@SUMMARY@
+旧版本：@OLDPAGE@
+新版本：@NEWPAGE@
+
+要取消页面提醒，从 @DOKUWIKIURL@ 登录维基，然后浏览
+@SUBSCRIBE@
+并退订页面以及/或者命名空间的更改。
+
+--
+本邮件由以下 DokuWiki 产生
+@DOKUWIKIURL@
\ No newline at end of file
diff --git a/sources/inc/lang/zh/updateprofile.txt b/sources/inc/lang/zh/updateprofile.txt
new file mode 100644
index 0000000..0075788
--- /dev/null
+++ b/sources/inc/lang/zh/updateprofile.txt
@@ -0,0 +1,5 @@
+====== 更新您帐户的信息 ======
+
+您只需要填写希望更改的区域即可。您不能更改用户名。
+
+
diff --git a/sources/inc/lang/zh/uploadmail.txt b/sources/inc/lang/zh/uploadmail.txt
new file mode 100644
index 0000000..b820cee
--- /dev/null
+++ b/sources/inc/lang/zh/uploadmail.txt
@@ -0,0 +1,20 @@
+您好！
+
+一个文件被上传到您的 DokuWiki 站点。下面是详细信息：
+
+文件名 : @MEDIA@
+日期 : @DATE@
+浏览器 : @BROWSER@
+IP 地址 : @IPADDRESS@
+主机名 : @HOSTNAME@
+大小 : @SIZE@
+MIME 类型 : @MIME@
+用户 : @USER@
+
+-- 
+本邮件由 DokuWiki 自动创建
+@DOKUWIKIURL@
+
+
+
+
diff --git a/sources/inc/lessc.inc.php b/sources/inc/lessc.inc.php
new file mode 100644
index 0000000..0699de5
--- /dev/null
+++ b/sources/inc/lessc.inc.php
@@ -0,0 +1,3675 @@
+
+ * Licensed under MIT or GPLv3, see LICENSE
+ */
+
+
+/**
+ * The less compiler and parser.
+ *
+ * Converting LESS to CSS is a three stage process. The incoming file is parsed
+ * by `lessc_parser` into a syntax tree, then it is compiled into another tree
+ * representing the CSS structure by `lessc`. The CSS tree is fed into a
+ * formatter, like `lessc_formatter` which then outputs CSS as a string.
+ *
+ * During the first compile, all values are *reduced*, which means that their
+ * types are brought to the lowest form before being dump as strings. This
+ * handles math equations, variable dereferences, and the like.
+ *
+ * The `parse` function of `lessc` is the entry point.
+ *
+ * In summary:
+ *
+ * The `lessc` class creates an intstance of the parser, feeds it LESS code,
+ * then transforms the resulting tree to a CSS tree. This class also holds the
+ * evaluation context, such as all available mixins and variables at any given
+ * time.
+ *
+ * The `lessc_parser` class is only concerned with parsing its input.
+ *
+ * The `lessc_formatter` takes a CSS tree, and dumps it to a formatted string,
+ * handling things like indentation.
+ */
+class lessc {
+	static public $VERSION = "v0.4.0";
+	static protected $TRUE = array("keyword", "true");
+	static protected $FALSE = array("keyword", "false");
+
+	protected $libFunctions = array();
+	protected $registeredVars = array();
+	protected $preserveComments = false;
+
+	public $vPrefix = '@'; // prefix of abstract properties
+	public $mPrefix = '$'; // prefix of abstract blocks
+	public $parentSelector = '&';
+
+	public $importDisabled = false;
+	public $importDir = '';
+
+	protected $numberPrecision = null;
+
+	protected $allParsedFiles = array();
+
+	// set to the parser that generated the current line when compiling
+	// so we know how to create error messages
+	protected $sourceParser = null;
+	protected $sourceLoc = null;
+
+	static public $defaultValue = array("keyword", "");
+
+	static protected $nextImportId = 0; // uniquely identify imports
+
+	// attempts to find the path of an import url, returns null for css files
+	protected function findImport($url) {
+		foreach ((array)$this->importDir as $dir) {
+			$full = $dir.(substr($dir, -1) != '/' ? '/' : '').$url;
+			if ($this->fileExists($file = $full.'.less') || $this->fileExists($file = $full)) {
+				return $file;
+			}
+		}
+
+		return null;
+	}
+
+	protected function fileExists($name) {
+		return is_file($name);
+	}
+
+	static public function compressList($items, $delim) {
+		if (!isset($items[1]) && isset($items[0])) return $items[0];
+		else return array('list', $delim, $items);
+	}
+
+	static public function preg_quote($what) {
+		return preg_quote($what, '/');
+	}
+
+	protected function tryImport($importPath, $parentBlock, $out) {
+		if ($importPath[0] == "function" && $importPath[1] == "url") {
+			$importPath = $this->flattenList($importPath[2]);
+		}
+
+		$str = $this->coerceString($importPath);
+		if ($str === null) return false;
+
+		$url = $this->compileValue($this->lib_e($str));
+
+		// don't import if it ends in css
+		if (substr_compare($url, '.css', -4, 4) === 0) return false;
+
+		$realPath = $this->findImport($url);
+
+		if ($realPath === null) return false;
+
+		if ($this->importDisabled) {
+			return array(false, "/* import disabled */");
+		}
+
+		if (isset($this->allParsedFiles[realpath($realPath)])) {
+			return array(false, null);
+		}
+
+		$this->addParsedFile($realPath);
+		$parser = $this->makeParser($realPath);
+		$root = $parser->parse(file_get_contents($realPath));
+
+		// set the parents of all the block props
+		foreach ($root->props as $prop) {
+			if ($prop[0] == "block") {
+				$prop[1]->parent = $parentBlock;
+			}
+		}
+
+		// copy mixins into scope, set their parents
+		// bring blocks from import into current block
+		// TODO: need to mark the source parser	these came from this file
+		foreach ($root->children as $childName => $child) {
+			if (isset($parentBlock->children[$childName])) {
+				$parentBlock->children[$childName] = array_merge(
+					$parentBlock->children[$childName],
+					$child);
+			} else {
+				$parentBlock->children[$childName] = $child;
+			}
+		}
+
+		$pi = pathinfo($realPath);
+		$dir = $pi["dirname"];
+
+		list($top, $bottom) = $this->sortProps($root->props, true);
+		$this->compileImportedProps($top, $parentBlock, $out, $parser, $dir);
+
+		return array(true, $bottom, $parser, $dir);
+	}
+
+	protected function compileImportedProps($props, $block, $out, $sourceParser, $importDir) {
+		$oldSourceParser = $this->sourceParser;
+
+		$oldImport = $this->importDir;
+
+		// TODO: this is because the importDir api is stupid
+		$this->importDir = (array)$this->importDir;
+		array_unshift($this->importDir, $importDir);
+
+		foreach ($props as $prop) {
+			$this->compileProp($prop, $block, $out);
+		}
+
+		$this->importDir = $oldImport;
+		$this->sourceParser = $oldSourceParser;
+	}
+
+	/**
+	 * Recursively compiles a block.
+	 *
+	 * A block is analogous to a CSS block in most cases. A single LESS document
+	 * is encapsulated in a block when parsed, but it does not have parent tags
+	 * so all of it's children appear on the root level when compiled.
+	 *
+	 * Blocks are made up of props and children.
+	 *
+	 * Props are property instructions, array tuples which describe an action
+	 * to be taken, eg. write a property, set a variable, mixin a block.
+	 *
+	 * The children of a block are just all the blocks that are defined within.
+	 * This is used to look up mixins when performing a mixin.
+	 *
+	 * Compiling the block involves pushing a fresh environment on the stack,
+	 * and iterating through the props, compiling each one.
+	 *
+	 * See lessc::compileProp()
+	 *
+	 */
+	protected function compileBlock($block) {
+		switch ($block->type) {
+		case "root":
+			$this->compileRoot($block);
+			break;
+		case null:
+			$this->compileCSSBlock($block);
+			break;
+		case "media":
+			$this->compileMedia($block);
+			break;
+		case "directive":
+			$name = "@" . $block->name;
+			if (!empty($block->value)) {
+				$name .= " " . $this->compileValue($this->reduce($block->value));
+			}
+
+			$this->compileNestedBlock($block, array($name));
+			break;
+		default:
+			$this->throwError("unknown block type: $block->type\n");
+		}
+	}
+
+	protected function compileCSSBlock($block) {
+		$env = $this->pushEnv();
+
+		$selectors = $this->compileSelectors($block->tags);
+		$env->selectors = $this->multiplySelectors($selectors);
+		$out = $this->makeOutputBlock(null, $env->selectors);
+
+		$this->scope->children[] = $out;
+		$this->compileProps($block, $out);
+
+		$block->scope = $env; // mixins carry scope with them!
+		$this->popEnv();
+	}
+
+	protected function compileMedia($media) {
+		$env = $this->pushEnv($media);
+		$parentScope = $this->mediaParent($this->scope);
+
+		$query = $this->compileMediaQuery($this->multiplyMedia($env));
+
+		$this->scope = $this->makeOutputBlock($media->type, array($query));
+		$parentScope->children[] = $this->scope;
+
+		$this->compileProps($media, $this->scope);
+
+		if (count($this->scope->lines) > 0) {
+			$orphanSelelectors = $this->findClosestSelectors();
+			if (!is_null($orphanSelelectors)) {
+				$orphan = $this->makeOutputBlock(null, $orphanSelelectors);
+				$orphan->lines = $this->scope->lines;
+				array_unshift($this->scope->children, $orphan);
+				$this->scope->lines = array();
+			}
+		}
+
+		$this->scope = $this->scope->parent;
+		$this->popEnv();
+	}
+
+	protected function mediaParent($scope) {
+		while (!empty($scope->parent)) {
+			if (!empty($scope->type) && $scope->type != "media") {
+				break;
+			}
+			$scope = $scope->parent;
+		}
+
+		return $scope;
+	}
+
+	protected function compileNestedBlock($block, $selectors) {
+		$this->pushEnv($block);
+		$this->scope = $this->makeOutputBlock($block->type, $selectors);
+		$this->scope->parent->children[] = $this->scope;
+
+		$this->compileProps($block, $this->scope);
+
+		$this->scope = $this->scope->parent;
+		$this->popEnv();
+	}
+
+	protected function compileRoot($root) {
+		$this->pushEnv();
+		$this->scope = $this->makeOutputBlock($root->type);
+		$this->compileProps($root, $this->scope);
+		$this->popEnv();
+	}
+
+	protected function compileProps($block, $out) {
+		foreach ($this->sortProps($block->props) as $prop) {
+			$this->compileProp($prop, $block, $out);
+		}
+
+		$out->lines = array_values(array_unique($out->lines));
+	}
+
+	protected function sortProps($props, $split = false) {
+		$vars = array();
+		$imports = array();
+		$other = array();
+
+		foreach ($props as $prop) {
+			switch ($prop[0]) {
+			case "assign":
+				if (isset($prop[1][0]) && $prop[1][0] == $this->vPrefix) {
+					$vars[] = $prop;
+				} else {
+					$other[] = $prop;
+				}
+				break;
+			case "import":
+				$id = self::$nextImportId++;
+				$prop[] = $id;
+				$imports[] = $prop;
+				$other[] = array("import_mixin", $id);
+				break;
+			default:
+				$other[] = $prop;
+			}
+		}
+
+		if ($split) {
+			return array(array_merge($vars, $imports), $other);
+		} else {
+			return array_merge($vars, $imports, $other);
+		}
+	}
+
+	protected function compileMediaQuery($queries) {
+		$compiledQueries = array();
+		foreach ($queries as $query) {
+			$parts = array();
+			foreach ($query as $q) {
+				switch ($q[0]) {
+				case "mediaType":
+					$parts[] = implode(" ", array_slice($q, 1));
+					break;
+				case "mediaExp":
+					if (isset($q[2])) {
+						$parts[] = "($q[1]: " .
+							$this->compileValue($this->reduce($q[2])) . ")";
+					} else {
+						$parts[] = "($q[1])";
+					}
+					break;
+				case "variable":
+					$parts[] = $this->compileValue($this->reduce($q));
+				break;
+				}
+			}
+
+			if (count($parts) > 0) {
+				$compiledQueries[] =  implode(" and ", $parts);
+			}
+		}
+
+		$out = "@media";
+		if (!empty($parts)) {
+			$out .= " " .
+				implode($this->formatter->selectorSeparator, $compiledQueries);
+		}
+		return $out;
+	}
+
+	protected function multiplyMedia($env, $childQueries = null) {
+		if (is_null($env) ||
+			!empty($env->block->type) && $env->block->type != "media")
+		{
+			return $childQueries;
+		}
+
+		// plain old block, skip
+		if (empty($env->block->type)) {
+			return $this->multiplyMedia($env->parent, $childQueries);
+		}
+
+		$out = array();
+		$queries = $env->block->queries;
+		if (is_null($childQueries)) {
+			$out = $queries;
+		} else {
+			foreach ($queries as $parent) {
+				foreach ($childQueries as $child) {
+					$out[] = array_merge($parent, $child);
+				}
+			}
+		}
+
+		return $this->multiplyMedia($env->parent, $out);
+	}
+
+	protected function expandParentSelectors(&$tag, $replace) {
+		$parts = explode("$&$", $tag);
+		$count = 0;
+		foreach ($parts as &$part) {
+			$part = str_replace($this->parentSelector, $replace, $part, $c);
+			$count += $c;
+		}
+		$tag = implode($this->parentSelector, $parts);
+		return $count;
+	}
+
+	protected function findClosestSelectors() {
+		$env = $this->env;
+		$selectors = null;
+		while ($env !== null) {
+			if (isset($env->selectors)) {
+				$selectors = $env->selectors;
+				break;
+			}
+			$env = $env->parent;
+		}
+
+		return $selectors;
+	}
+
+
+	// multiply $selectors against the nearest selectors in env
+	protected function multiplySelectors($selectors) {
+		// find parent selectors
+
+		$parentSelectors = $this->findClosestSelectors();
+		if (is_null($parentSelectors)) {
+			// kill parent reference in top level selector
+			foreach ($selectors as &$s) {
+				$this->expandParentSelectors($s, "");
+			}
+
+			return $selectors;
+		}
+
+		$out = array();
+		foreach ($parentSelectors as $parent) {
+			foreach ($selectors as $child) {
+				$count = $this->expandParentSelectors($child, $parent);
+
+				// don't prepend the parent tag if & was used
+				if ($count > 0) {
+					$out[] = trim($child);
+				} else {
+					$out[] = trim($parent . ' ' . $child);
+				}
+			}
+		}
+
+		return $out;
+	}
+
+	// reduces selector expressions
+	protected function compileSelectors($selectors) {
+		$out = array();
+
+		foreach ($selectors as $s) {
+			if (is_array($s)) {
+				list(, $value) = $s;
+				$out[] = trim($this->compileValue($this->reduce($value)));
+			} else {
+				$out[] = $s;
+			}
+		}
+
+		return $out;
+	}
+
+	protected function eq($left, $right) {
+		return $left == $right;
+	}
+
+	protected function patternMatch($block, $orderedArgs, $keywordArgs) {
+		// match the guards if it has them
+		// any one of the groups must have all its guards pass for a match
+		if (!empty($block->guards)) {
+			$groupPassed = false;
+			foreach ($block->guards as $guardGroup) {
+				foreach ($guardGroup as $guard) {
+					$this->pushEnv();
+					$this->zipSetArgs($block->args, $orderedArgs, $keywordArgs);
+
+					$negate = false;
+					if ($guard[0] == "negate") {
+						$guard = $guard[1];
+						$negate = true;
+					}
+
+					$passed = $this->reduce($guard) == self::$TRUE;
+					if ($negate) $passed = !$passed;
+
+					$this->popEnv();
+
+					if ($passed) {
+						$groupPassed = true;
+					} else {
+						$groupPassed = false;
+						break;
+					}
+				}
+
+				if ($groupPassed) break;
+			}
+
+			if (!$groupPassed) {
+				return false;
+			}
+		}
+
+		if (empty($block->args)) {
+			return $block->isVararg || empty($orderedArgs) && empty($keywordArgs);
+		}
+
+		$remainingArgs = $block->args;
+		if ($keywordArgs) {
+			$remainingArgs = array();
+			foreach ($block->args as $arg) {
+				if ($arg[0] == "arg" && isset($keywordArgs[$arg[1]])) {
+					continue;
+				}
+
+				$remainingArgs[] = $arg;
+			}
+		}
+
+		$i = -1; // no args
+		// try to match by arity or by argument literal
+		foreach ($remainingArgs as $i => $arg) {
+			switch ($arg[0]) {
+			case "lit":
+				if (empty($orderedArgs[$i]) || !$this->eq($arg[1], $orderedArgs[$i])) {
+					return false;
+				}
+				break;
+			case "arg":
+				// no arg and no default value
+				if (!isset($orderedArgs[$i]) && !isset($arg[2])) {
+					return false;
+				}
+				break;
+			case "rest":
+				$i--; // rest can be empty
+				break 2;
+			}
+		}
+
+		if ($block->isVararg) {
+			return true; // not having enough is handled above
+		} else {
+			$numMatched = $i + 1;
+			// greater than becuase default values always match
+			return $numMatched >= count($orderedArgs);
+		}
+	}
+
+	protected function patternMatchAll($blocks, $orderedArgs, $keywordArgs, $skip=array()) {
+		$matches = null;
+		foreach ($blocks as $block) {
+			// skip seen blocks that don't have arguments
+			if (isset($skip[$block->id]) && !isset($block->args)) {
+				continue;
+			}
+
+			if ($this->patternMatch($block, $orderedArgs, $keywordArgs)) {
+				$matches[] = $block;
+			}
+		}
+
+		return $matches;
+	}
+
+	// attempt to find blocks matched by path and args
+	protected function findBlocks($searchIn, $path, $orderedArgs, $keywordArgs, $seen=array()) {
+		if ($searchIn == null) return null;
+		if (isset($seen[$searchIn->id])) return null;
+		$seen[$searchIn->id] = true;
+
+		$name = $path[0];
+
+		if (isset($searchIn->children[$name])) {
+			$blocks = $searchIn->children[$name];
+			if (count($path) == 1) {
+				$matches = $this->patternMatchAll($blocks, $orderedArgs, $keywordArgs, $seen);
+				if (!empty($matches)) {
+					// This will return all blocks that match in the closest
+					// scope that has any matching block, like lessjs
+					return $matches;
+				}
+			} else {
+				$matches = array();
+				foreach ($blocks as $subBlock) {
+					$subMatches = $this->findBlocks($subBlock,
+						array_slice($path, 1), $orderedArgs, $keywordArgs, $seen);
+
+					if (!is_null($subMatches)) {
+						foreach ($subMatches as $sm) {
+							$matches[] = $sm;
+						}
+					}
+				}
+
+				return count($matches) > 0 ? $matches : null;
+			}
+		}
+		if ($searchIn->parent === $searchIn) return null;
+		return $this->findBlocks($searchIn->parent, $path, $orderedArgs, $keywordArgs, $seen);
+	}
+
+	// sets all argument names in $args to either the default value
+	// or the one passed in through $values
+	protected function zipSetArgs($args, $orderedValues, $keywordValues) {
+		$assignedValues = array();
+
+		$i = 0;
+		foreach ($args as  $a) {
+			if ($a[0] == "arg") {
+				if (isset($keywordValues[$a[1]])) {
+					// has keyword arg
+					$value = $keywordValues[$a[1]];
+				} elseif (isset($orderedValues[$i])) {
+					// has ordered arg
+					$value = $orderedValues[$i];
+					$i++;
+				} elseif (isset($a[2])) {
+					// has default value
+					$value = $a[2];
+				} else {
+					$this->throwError("Failed to assign arg " . $a[1]);
+					$value = null; // :(
+				}
+
+				$value = $this->reduce($value);
+				$this->set($a[1], $value);
+				$assignedValues[] = $value;
+			} else {
+				// a lit
+				$i++;
+			}
+		}
+
+		// check for a rest
+		$last = end($args);
+		if ($last[0] == "rest") {
+			$rest = array_slice($orderedValues, count($args) - 1);
+			$this->set($last[1], $this->reduce(array("list", " ", $rest)));
+		}
+
+		// wow is this the only true use of PHP's + operator for arrays?
+		$this->env->arguments = $assignedValues + $orderedValues;
+	}
+
+	// compile a prop and update $lines or $blocks appropriately
+	protected function compileProp($prop, $block, $out) {
+		// set error position context
+		$this->sourceLoc = isset($prop[-1]) ? $prop[-1] : -1;
+
+		switch ($prop[0]) {
+		case 'assign':
+			list(, $name, $value) = $prop;
+			if ($name[0] == $this->vPrefix) {
+				$this->set($name, $value);
+			} else {
+				$out->lines[] = $this->formatter->property($name,
+						$this->compileValue($this->reduce($value)));
+			}
+			break;
+		case 'block':
+			list(, $child) = $prop;
+			$this->compileBlock($child);
+			break;
+		case 'mixin':
+			list(, $path, $args, $suffix) = $prop;
+
+			$orderedArgs = array();
+			$keywordArgs = array();
+			foreach ((array)$args as $arg) {
+				$argval = null;
+				switch ($arg[0]) {
+				case "arg":
+					if (!isset($arg[2])) {
+						$orderedArgs[] = $this->reduce(array("variable", $arg[1]));
+					} else {
+						$keywordArgs[$arg[1]] = $this->reduce($arg[2]);
+					}
+					break;
+
+				case "lit":
+					$orderedArgs[] = $this->reduce($arg[1]);
+					break;
+				default:
+					$this->throwError("Unknown arg type: " . $arg[0]);
+				}
+			}
+
+			$mixins = $this->findBlocks($block, $path, $orderedArgs, $keywordArgs);
+
+			if ($mixins === null) {
+				// fwrite(STDERR,"failed to find block: ".implode(" > ", $path)."\n");
+				break; // throw error here??
+			}
+
+			foreach ($mixins as $mixin) {
+				if ($mixin === $block && !$orderedArgs) {
+					continue;
+				}
+
+				$haveScope = false;
+				if (isset($mixin->parent->scope)) {
+					$haveScope = true;
+					$mixinParentEnv = $this->pushEnv();
+					$mixinParentEnv->storeParent = $mixin->parent->scope;
+				}
+
+				$haveArgs = false;
+				if (isset($mixin->args)) {
+					$haveArgs = true;
+					$this->pushEnv();
+					$this->zipSetArgs($mixin->args, $orderedArgs, $keywordArgs);
+				}
+
+				$oldParent = $mixin->parent;
+				if ($mixin != $block) $mixin->parent = $block;
+
+				foreach ($this->sortProps($mixin->props) as $subProp) {
+					if ($suffix !== null &&
+						$subProp[0] == "assign" &&
+						is_string($subProp[1]) &&
+						$subProp[1]{0} != $this->vPrefix)
+					{
+						$subProp[2] = array(
+							'list', ' ',
+							array($subProp[2], array('keyword', $suffix))
+						);
+					}
+
+					$this->compileProp($subProp, $mixin, $out);
+				}
+
+				$mixin->parent = $oldParent;
+
+				if ($haveArgs) $this->popEnv();
+				if ($haveScope) $this->popEnv();
+			}
+
+			break;
+		case 'raw':
+			$out->lines[] = $prop[1];
+			break;
+		case "directive":
+			list(, $name, $value) = $prop;
+			$out->lines[] = "@$name " . $this->compileValue($this->reduce($value)).';';
+			break;
+		case "comment":
+			$out->lines[] = $prop[1];
+			break;
+		case "import";
+			list(, $importPath, $importId) = $prop;
+			$importPath = $this->reduce($importPath);
+
+			if (!isset($this->env->imports)) {
+				$this->env->imports = array();
+			}
+
+			$result = $this->tryImport($importPath, $block, $out);
+
+			$this->env->imports[$importId] = $result === false ?
+				array(false, "@import " . $this->compileValue($importPath).";") :
+				$result;
+
+			break;
+		case "import_mixin":
+			list(,$importId) = $prop;
+			$import = $this->env->imports[$importId];
+			if ($import[0] === false) {
+				if (isset($import[1])) {
+					$out->lines[] = $import[1];
+				}
+			} else {
+				list(, $bottom, $parser, $importDir) = $import;
+				$this->compileImportedProps($bottom, $block, $out, $parser, $importDir);
+			}
+
+			break;
+		default:
+			$this->throwError("unknown op: {$prop[0]}\n");
+		}
+	}
+
+
+	/**
+	 * Compiles a primitive value into a CSS property value.
+	 *
+	 * Values in lessphp are typed by being wrapped in arrays, their format is
+	 * typically:
+	 *
+	 *     array(type, contents [, additional_contents]*)
+	 *
+	 * The input is expected to be reduced. This function will not work on
+	 * things like expressions and variables.
+	 */
+	protected function compileValue($value) {
+		switch ($value[0]) {
+		case 'list':
+			// [1] - delimiter
+			// [2] - array of values
+			return implode($value[1], array_map(array($this, 'compileValue'), $value[2]));
+		case 'raw_color':
+			if (!empty($this->formatter->compressColors)) {
+				return $this->compileValue($this->coerceColor($value));
+			}
+			return $value[1];
+		case 'keyword':
+			// [1] - the keyword
+			return $value[1];
+		case 'number':
+			list(, $num, $unit) = $value;
+			// [1] - the number
+			// [2] - the unit
+			if ($this->numberPrecision !== null) {
+				$num = round($num, $this->numberPrecision);
+			}
+			return $num . $unit;
+		case 'string':
+			// [1] - contents of string (includes quotes)
+			list(, $delim, $content) = $value;
+			foreach ($content as &$part) {
+				if (is_array($part)) {
+					$part = $this->compileValue($part);
+				}
+			}
+			return $delim . implode($content) . $delim;
+		case 'color':
+			// [1] - red component (either number or a %)
+			// [2] - green component
+			// [3] - blue component
+			// [4] - optional alpha component
+			list(, $r, $g, $b) = $value;
+			$r = round($r);
+			$g = round($g);
+			$b = round($b);
+
+			if (count($value) == 5 && $value[4] != 1) { // rgba
+				return 'rgba('.$r.','.$g.','.$b.','.$value[4].')';
+			}
+
+			$h = sprintf("#%02x%02x%02x", $r, $g, $b);
+
+			if (!empty($this->formatter->compressColors)) {
+				// Converting hex color to short notation (e.g. #003399 to #039)
+				if ($h[1] === $h[2] && $h[3] === $h[4] && $h[5] === $h[6]) {
+					$h = '#' . $h[1] . $h[3] . $h[5];
+				}
+			}
+
+			return $h;
+
+		case 'function':
+			list(, $name, $args) = $value;
+			return $name.'('.$this->compileValue($args).')';
+		default: // assumed to be unit
+			$this->throwError("unknown value type: $value[0]");
+		}
+	}
+
+	protected function lib_pow($args) {
+		list($base, $exp) = $this->assertArgs($args, 2, "pow");
+		return pow($this->assertNumber($base), $this->assertNumber($exp));
+	}
+
+	protected function lib_pi() {
+		return pi();
+	}
+
+	protected function lib_mod($args) {
+		list($a, $b) = $this->assertArgs($args, 2, "mod");
+		return $this->assertNumber($a) % $this->assertNumber($b);
+	}
+
+	protected function lib_tan($num) {
+		return tan($this->assertNumber($num));
+	}
+
+	protected function lib_sin($num) {
+		return sin($this->assertNumber($num));
+	}
+
+	protected function lib_cos($num) {
+		return cos($this->assertNumber($num));
+	}
+
+	protected function lib_atan($num) {
+		$num = atan($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_asin($num) {
+		$num = asin($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_acos($num) {
+		$num = acos($this->assertNumber($num));
+		return array("number", $num, "rad");
+	}
+
+	protected function lib_sqrt($num) {
+		return sqrt($this->assertNumber($num));
+	}
+
+	protected function lib_extract($value) {
+		list($list, $idx) = $this->assertArgs($value, 2, "extract");
+		$idx = $this->assertNumber($idx);
+		// 1 indexed
+		if ($list[0] == "list" && isset($list[2][$idx - 1])) {
+			return $list[2][$idx - 1];
+		}
+	}
+
+	protected function lib_isnumber($value) {
+		return $this->toBool($value[0] == "number");
+	}
+
+	protected function lib_isstring($value) {
+		return $this->toBool($value[0] == "string");
+	}
+
+	protected function lib_iscolor($value) {
+		return $this->toBool($this->coerceColor($value));
+	}
+
+	protected function lib_iskeyword($value) {
+		return $this->toBool($value[0] == "keyword");
+	}
+
+	protected function lib_ispixel($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "px");
+	}
+
+	protected function lib_ispercentage($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "%");
+	}
+
+	protected function lib_isem($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "em");
+	}
+
+	protected function lib_isrem($value) {
+		return $this->toBool($value[0] == "number" && $value[2] == "rem");
+	}
+
+	protected function lib_rgbahex($color) {
+		$color = $this->coerceColor($color);
+		if (is_null($color))
+			$this->throwError("color expected for rgbahex");
+
+		return sprintf("#%02x%02x%02x%02x",
+			isset($color[4]) ? $color[4]*255 : 255,
+			$color[1],$color[2], $color[3]);
+	}
+
+	protected function lib_argb($color){
+		return $this->lib_rgbahex($color);
+	}
+
+	// utility func to unquote a string
+	protected function lib_e($arg) {
+		switch ($arg[0]) {
+			case "list":
+				$items = $arg[2];
+				if (isset($items[0])) {
+					return $this->lib_e($items[0]);
+				}
+				return self::$defaultValue;
+			case "string":
+				$arg[1] = "";
+				return $arg;
+			case "keyword":
+				return $arg;
+			default:
+				return array("keyword", $this->compileValue($arg));
+		}
+	}
+
+	protected function lib__sprintf($args) {
+		if ($args[0] != "list") return $args;
+		$values = $args[2];
+		$string = array_shift($values);
+		$template = $this->compileValue($this->lib_e($string));
+
+		$i = 0;
+		if (preg_match_all('/%[dsa]/', $template, $m)) {
+			foreach ($m[0] as $match) {
+				$val = isset($values[$i]) ?
+					$this->reduce($values[$i]) : array('keyword', '');
+
+				// lessjs compat, renders fully expanded color, not raw color
+				if ($color = $this->coerceColor($val)) {
+					$val = $color;
+				}
+
+				$i++;
+				$rep = $this->compileValue($this->lib_e($val));
+				$template = preg_replace('/'.self::preg_quote($match).'/',
+					$rep, $template, 1);
+			}
+		}
+
+		$d = $string[0] == "string" ? $string[1] : '"';
+		return array("string", $d, array($template));
+	}
+
+	protected function lib_floor($arg) {
+		$value = $this->assertNumber($arg);
+		return array("number", floor($value), $arg[2]);
+	}
+
+	protected function lib_ceil($arg) {
+		$value = $this->assertNumber($arg);
+		return array("number", ceil($value), $arg[2]);
+	}
+
+	protected function lib_round($arg) {
+		$value = $this->assertNumber($arg);
+		return array("number", round($value), $arg[2]);
+	}
+
+	protected function lib_unit($arg) {
+		if ($arg[0] == "list") {
+			list($number, $newUnit) = $arg[2];
+			return array("number", $this->assertNumber($number),
+				$this->compileValue($this->lib_e($newUnit)));
+		} else {
+			return array("number", $this->assertNumber($arg), "");
+		}
+	}
+
+	/**
+	 * Helper function to get arguments for color manipulation functions.
+	 * takes a list that contains a color like thing and a percentage
+	 */
+	protected function colorArgs($args) {
+		if ($args[0] != 'list' || count($args[2]) < 2) {
+			return array(array('color', 0, 0, 0), 0);
+		}
+		list($color, $delta) = $args[2];
+		$color = $this->assertColor($color);
+		$delta = floatval($delta[1]);
+
+		return array($color, $delta);
+	}
+
+	protected function lib_darken($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[3] = $this->clamp($hsl[3] - $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_lighten($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[3] = $this->clamp($hsl[3] + $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_saturate($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[2] = $this->clamp($hsl[2] + $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_desaturate($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+		$hsl[2] = $this->clamp($hsl[2] - $delta, 100);
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_spin($args) {
+		list($color, $delta) = $this->colorArgs($args);
+
+		$hsl = $this->toHSL($color);
+
+		$hsl[1] = $hsl[1] + $delta % 360;
+		if ($hsl[1] < 0) $hsl[1] += 360;
+
+		return $this->toRGB($hsl);
+	}
+
+	protected function lib_fadeout($args) {
+		list($color, $delta) = $this->colorArgs($args);
+		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) - $delta/100);
+		return $color;
+	}
+
+	protected function lib_fadein($args) {
+		list($color, $delta) = $this->colorArgs($args);
+		$color[4] = $this->clamp((isset($color[4]) ? $color[4] : 1) + $delta/100);
+		return $color;
+	}
+
+	protected function lib_hue($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[1]);
+	}
+
+	protected function lib_saturation($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[2]);
+	}
+
+	protected function lib_lightness($color) {
+		$hsl = $this->toHSL($this->assertColor($color));
+		return round($hsl[3]);
+	}
+
+	// get the alpha of a color
+	// defaults to 1 for non-colors or colors without an alpha
+	protected function lib_alpha($value) {
+		if (!is_null($color = $this->coerceColor($value))) {
+			return isset($color[4]) ? $color[4] : 1;
+		}
+	}
+
+	// set the alpha of the color
+	protected function lib_fade($args) {
+		list($color, $alpha) = $this->colorArgs($args);
+		$color[4] = $this->clamp($alpha / 100.0);
+		return $color;
+	}
+
+	protected function lib_percentage($arg) {
+		$num = $this->assertNumber($arg);
+		return array("number", $num*100, "%");
+	}
+
+	// mixes two colors by weight
+	// mix(@color1, @color2, [@weight: 50%]);
+	// http://sass-lang.com/docs/yardoc/Sass/Script/Functions.html#mix-instance_method
+	protected function lib_mix($args) {
+		if ($args[0] != "list" || count($args[2]) < 2)
+			$this->throwError("mix expects (color1, color2, weight)");
+
+		list($first, $second) = $args[2];
+		$first = $this->assertColor($first);
+		$second = $this->assertColor($second);
+
+		$first_a = $this->lib_alpha($first);
+		$second_a = $this->lib_alpha($second);
+
+		if (isset($args[2][2])) {
+			$weight = $args[2][2][1] / 100.0;
+		} else {
+			$weight = 0.5;
+		}
+
+		$w = $weight * 2 - 1;
+		$a = $first_a - $second_a;
+
+		$w1 = (($w * $a == -1 ? $w : ($w + $a)/(1 + $w * $a)) + 1) / 2.0;
+		$w2 = 1.0 - $w1;
+
+		$new = array('color',
+			$w1 * $first[1] + $w2 * $second[1],
+			$w1 * $first[2] + $w2 * $second[2],
+			$w1 * $first[3] + $w2 * $second[3],
+		);
+
+		if ($first_a != 1.0 || $second_a != 1.0) {
+			$new[] = $first_a * $weight + $second_a * ($weight - 1);
+		}
+
+		return $this->fixColor($new);
+	}
+
+	protected function lib_contrast($args) {
+		if ($args[0] != 'list' || count($args[2]) < 3) {
+			return array(array('color', 0, 0, 0), 0);
+		}
+
+		list($inputColor, $darkColor, $lightColor) = $args[2];
+
+		$inputColor = $this->assertColor($inputColor);
+		$darkColor = $this->assertColor($darkColor);
+		$lightColor = $this->assertColor($lightColor);
+		$hsl = $this->toHSL($inputColor);
+
+		if ($hsl[3] > 50) {
+			return $darkColor;
+		}
+
+		return $lightColor;
+	}
+
+	protected function assertColor($value, $error = "expected color value") {
+		$color = $this->coerceColor($value);
+		if (is_null($color)) $this->throwError($error);
+		return $color;
+	}
+
+	protected function assertNumber($value, $error = "expecting number") {
+		if ($value[0] == "number") return $value[1];
+		$this->throwError($error);
+	}
+
+	protected function assertArgs($value, $expectedArgs, $name="") {
+		if ($expectedArgs == 1) {
+			return $value;
+		} else {
+			if ($value[0] !== "list" || $value[1] != ",") $this->throwError("expecting list");
+			$values = $value[2];
+			$numValues = count($values);
+			if ($expectedArgs != $numValues) {
+				if ($name) {
+					$name = $name . ": ";
+				}
+
+				$this->throwError("${name}expecting $expectedArgs arguments, got $numValues");
+			}
+
+			return $values;
+		}
+	}
+
+	protected function toHSL($color) {
+		if ($color[0] == 'hsl') return $color;
+
+		$r = $color[1] / 255;
+		$g = $color[2] / 255;
+		$b = $color[3] / 255;
+
+		$min = min($r, $g, $b);
+		$max = max($r, $g, $b);
+
+		$L = ($min + $max) / 2;
+		if ($min == $max) {
+			$S = $H = 0;
+		} else {
+			if ($L < 0.5)
+				$S = ($max - $min)/($max + $min);
+			else
+				$S = ($max - $min)/(2.0 - $max - $min);
+
+			if ($r == $max) $H = ($g - $b)/($max - $min);
+			elseif ($g == $max) $H = 2.0 + ($b - $r)/($max - $min);
+			elseif ($b == $max) $H = 4.0 + ($r - $g)/($max - $min);
+
+		}
+
+		$out = array('hsl',
+			($H < 0 ? $H + 6 : $H)*60,
+			$S*100,
+			$L*100,
+		);
+
+		if (count($color) > 4) $out[] = $color[4]; // copy alpha
+		return $out;
+	}
+
+	protected function toRGB_helper($comp, $temp1, $temp2) {
+		if ($comp < 0) $comp += 1.0;
+		elseif ($comp > 1) $comp -= 1.0;
+
+		if (6 * $comp < 1) return $temp1 + ($temp2 - $temp1) * 6 * $comp;
+		if (2 * $comp < 1) return $temp2;
+		if (3 * $comp < 2) return $temp1 + ($temp2 - $temp1)*((2/3) - $comp) * 6;
+
+		return $temp1;
+	}
+
+	/**
+	 * Converts a hsl array into a color value in rgb.
+	 * Expects H to be in range of 0 to 360, S and L in 0 to 100
+	 */
+	protected function toRGB($color) {
+		if ($color[0] == 'color') return $color;
+
+		$H = $color[1] / 360;
+		$S = $color[2] / 100;
+		$L = $color[3] / 100;
+
+		if ($S == 0) {
+			$r = $g = $b = $L;
+		} else {
+			$temp2 = $L < 0.5 ?
+				$L*(1.0 + $S) :
+				$L + $S - $L * $S;
+
+			$temp1 = 2.0 * $L - $temp2;
+
+			$r = $this->toRGB_helper($H + 1/3, $temp1, $temp2);
+			$g = $this->toRGB_helper($H, $temp1, $temp2);
+			$b = $this->toRGB_helper($H - 1/3, $temp1, $temp2);
+		}
+
+		// $out = array('color', round($r*255), round($g*255), round($b*255));
+		$out = array('color', $r*255, $g*255, $b*255);
+		if (count($color) > 4) $out[] = $color[4]; // copy alpha
+		return $out;
+	}
+
+	protected function clamp($v, $max = 1, $min = 0) {
+		return min($max, max($min, $v));
+	}
+
+	/**
+	 * Convert the rgb, rgba, hsl color literals of function type
+	 * as returned by the parser into values of color type.
+	 */
+	protected function funcToColor($func) {
+		$fname = $func[1];
+		if ($func[2][0] != 'list') return false; // need a list of arguments
+		$rawComponents = $func[2][2];
+
+		if ($fname == 'hsl' || $fname == 'hsla') {
+			$hsl = array('hsl');
+			$i = 0;
+			foreach ($rawComponents as $c) {
+				$val = $this->reduce($c);
+				$val = isset($val[1]) ? floatval($val[1]) : 0;
+
+				if ($i == 0) $clamp = 360;
+				elseif ($i < 3) $clamp = 100;
+				else $clamp = 1;
+
+				$hsl[] = $this->clamp($val, $clamp);
+				$i++;
+			}
+
+			while (count($hsl) < 4) $hsl[] = 0;
+			return $this->toRGB($hsl);
+
+		} elseif ($fname == 'rgb' || $fname == 'rgba') {
+			$components = array();
+			$i = 1;
+			foreach	($rawComponents as $c) {
+				$c = $this->reduce($c);
+				if ($i < 4) {
+					if ($c[0] == "number" && $c[2] == "%") {
+						$components[] = 255 * ($c[1] / 100);
+					} else {
+						$components[] = floatval($c[1]);
+					}
+				} elseif ($i == 4) {
+					if ($c[0] == "number" && $c[2] == "%") {
+						$components[] = 1.0 * ($c[1] / 100);
+					} else {
+						$components[] = floatval($c[1]);
+					}
+				} else break;
+
+				$i++;
+			}
+			while (count($components) < 3) $components[] = 0;
+			array_unshift($components, 'color');
+			return $this->fixColor($components);
+		}
+
+		return false;
+	}
+
+	protected function reduce($value, $forExpression = false) {
+		switch ($value[0]) {
+		case "interpolate":
+			$reduced = $this->reduce($value[1]);
+			$var = $this->compileValue($reduced);
+			$res = $this->reduce(array("variable", $this->vPrefix . $var));
+
+			if ($res[0] == "raw_color") {
+				$res = $this->coerceColor($res);
+			}
+
+			if (empty($value[2])) $res = $this->lib_e($res);
+
+			return $res;
+		case "variable":
+			$key = $value[1];
+			if (is_array($key)) {
+				$key = $this->reduce($key);
+				$key = $this->vPrefix . $this->compileValue($this->lib_e($key));
+			}
+
+			$seen =& $this->env->seenNames;
+
+			if (!empty($seen[$key])) {
+				$this->throwError("infinite loop detected: $key");
+			}
+
+			$seen[$key] = true;
+			$out = $this->reduce($this->get($key, self::$defaultValue));
+			$seen[$key] = false;
+			return $out;
+		case "list":
+			foreach ($value[2] as &$item) {
+				$item = $this->reduce($item, $forExpression);
+			}
+			return $value;
+		case "expression":
+			return $this->evaluate($value);
+		case "string":
+			foreach ($value[2] as &$part) {
+				if (is_array($part)) {
+					$strip = $part[0] == "variable";
+					$part = $this->reduce($part);
+					if ($strip) $part = $this->lib_e($part);
+				}
+			}
+			return $value;
+		case "escape":
+			list(,$inner) = $value;
+			return $this->lib_e($this->reduce($inner));
+		case "function":
+			$color = $this->funcToColor($value);
+			if ($color) return $color;
+
+			list(, $name, $args) = $value;
+			if ($name == "%") $name = "_sprintf";
+			$f = isset($this->libFunctions[$name]) ?
+				$this->libFunctions[$name] : array($this, 'lib_'.$name);
+
+			if (is_callable($f)) {
+				if ($args[0] == 'list')
+					$args = self::compressList($args[2], $args[1]);
+
+				$ret = call_user_func($f, $this->reduce($args, true), $this);
+
+				if (is_null($ret)) {
+					return array("string", "", array(
+						$name, "(", $args, ")"
+					));
+				}
+
+				// convert to a typed value if the result is a php primitive
+				if (is_numeric($ret)) $ret = array('number', $ret, "");
+				elseif (!is_array($ret)) $ret = array('keyword', $ret);
+
+				return $ret;
+			}
+
+			// plain function, reduce args
+			$value[2] = $this->reduce($value[2]);
+			return $value;
+		case "unary":
+			list(, $op, $exp) = $value;
+			$exp = $this->reduce($exp);
+
+			if ($exp[0] == "number") {
+				switch ($op) {
+				case "+":
+					return $exp;
+				case "-":
+					$exp[1] *= -1;
+					return $exp;
+				}
+			}
+			return array("string", "", array($op, $exp));
+		}
+
+		if ($forExpression) {
+			switch ($value[0]) {
+			case "keyword":
+				if ($color = $this->coerceColor($value)) {
+					return $color;
+				}
+				break;
+			case "raw_color":
+				return $this->coerceColor($value);
+			}
+		}
+
+		return $value;
+	}
+
+
+	// coerce a value for use in color operation
+	protected function coerceColor($value) {
+		switch($value[0]) {
+			case 'color': return $value;
+			case 'raw_color':
+				$c = array("color", 0, 0, 0);
+				$colorStr = substr($value[1], 1);
+				$num = hexdec($colorStr);
+				$width = strlen($colorStr) == 3 ? 16 : 256;
+
+				for ($i = 3; $i > 0; $i--) { // 3 2 1
+					$t = $num % $width;
+					$num /= $width;
+
+					$c[$i] = $t * (256/$width) + $t * floor(16/$width);
+				}
+
+				return $c;
+			case 'keyword':
+				$name = $value[1];
+				if (isset(self::$cssColors[$name])) {
+					$rgba = explode(',', self::$cssColors[$name]);
+
+					if(isset($rgba[3]))
+						return array('color', $rgba[0], $rgba[1], $rgba[2], $rgba[3]);
+
+					return array('color', $rgba[0], $rgba[1], $rgba[2]);
+				}
+				return null;
+		}
+	}
+
+	// make something string like into a string
+	protected function coerceString($value) {
+		switch ($value[0]) {
+		case "string":
+			return $value;
+		case "keyword":
+			return array("string", "", array($value[1]));
+		}
+		return null;
+	}
+
+	// turn list of length 1 into value type
+	protected function flattenList($value) {
+		if ($value[0] == "list" && count($value[2]) == 1) {
+			return $this->flattenList($value[2][0]);
+		}
+		return $value;
+	}
+
+	protected function toBool($a) {
+		if ($a) return self::$TRUE;
+		else return self::$FALSE;
+	}
+
+	// evaluate an expression
+	protected function evaluate($exp) {
+		list(, $op, $left, $right, $whiteBefore, $whiteAfter) = $exp;
+
+		$left = $this->reduce($left, true);
+		$right = $this->reduce($right, true);
+
+		if ($leftColor = $this->coerceColor($left)) {
+			$left = $leftColor;
+		}
+
+		if ($rightColor = $this->coerceColor($right)) {
+			$right = $rightColor;
+		}
+
+		$ltype = $left[0];
+		$rtype = $right[0];
+
+		// operators that work on all types
+		if ($op == "and") {
+			return $this->toBool($left == self::$TRUE && $right == self::$TRUE);
+		}
+
+		if ($op == "=") {
+			return $this->toBool($this->eq($left, $right) );
+		}
+
+		if ($op == "+" && !is_null($str = $this->stringConcatenate($left, $right))) {
+			return $str;
+		}
+
+		// type based operators
+		$fname = "op_${ltype}_${rtype}";
+		if (is_callable(array($this, $fname))) {
+			$out = $this->$fname($op, $left, $right);
+			if (!is_null($out)) return $out;
+		}
+
+		// make the expression look it did before being parsed
+		$paddedOp = $op;
+		if ($whiteBefore) $paddedOp = " " . $paddedOp;
+		if ($whiteAfter) $paddedOp .= " ";
+
+		return array("string", "", array($left, $paddedOp, $right));
+	}
+
+	protected function stringConcatenate($left, $right) {
+		if ($strLeft = $this->coerceString($left)) {
+			if ($right[0] == "string") {
+				$right[1] = "";
+			}
+			$strLeft[2][] = $right;
+			return $strLeft;
+		}
+
+		if ($strRight = $this->coerceString($right)) {
+			array_unshift($strRight[2], $left);
+			return $strRight;
+		}
+	}
+
+
+	// make sure a color's components don't go out of bounds
+	protected function fixColor($c) {
+		foreach (range(1, 3) as $i) {
+			if ($c[$i] < 0) $c[$i] = 0;
+			if ($c[$i] > 255) $c[$i] = 255;
+		}
+
+		return $c;
+	}
+
+	protected function op_number_color($op, $lft, $rgt) {
+		if ($op == '+' || $op == '*') {
+			return $this->op_color_number($op, $rgt, $lft);
+		}
+	}
+
+	protected function op_color_number($op, $lft, $rgt) {
+		if ($rgt[0] == '%') $rgt[1] /= 100;
+
+		return $this->op_color_color($op, $lft,
+			array_fill(1, count($lft) - 1, $rgt[1]));
+	}
+
+	protected function op_color_color($op, $left, $right) {
+		$out = array('color');
+		$max = count($left) > count($right) ? count($left) : count($right);
+		foreach (range(1, $max - 1) as $i) {
+			$lval = isset($left[$i]) ? $left[$i] : 0;
+			$rval = isset($right[$i]) ? $right[$i] : 0;
+			switch ($op) {
+			case '+':
+				$out[] = $lval + $rval;
+				break;
+			case '-':
+				$out[] = $lval - $rval;
+				break;
+			case '*':
+				$out[] = $lval * $rval;
+				break;
+			case '%':
+				$out[] = $lval % $rval;
+				break;
+			case '/':
+				if ($rval == 0) $this->throwError("evaluate error: can't divide by zero");
+				$out[] = $lval / $rval;
+				break;
+			default:
+				$this->throwError('evaluate error: color op number failed on op '.$op);
+			}
+		}
+		return $this->fixColor($out);
+	}
+
+	function lib_red($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for red()');
+		}
+
+		return $color[1];
+	}
+
+	function lib_green($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for green()');
+		}
+
+		return $color[2];
+	}
+
+	function lib_blue($color){
+		$color = $this->coerceColor($color);
+		if (is_null($color)) {
+			$this->throwError('color expected for blue()');
+		}
+
+		return $color[3];
+	}
+
+
+	// operator on two numbers
+	protected function op_number_number($op, $left, $right) {
+		$unit = empty($left[2]) ? $right[2] : $left[2];
+
+		$value = 0;
+		switch ($op) {
+		case '+':
+			$value = $left[1] + $right[1];
+			break;
+		case '*':
+			$value = $left[1] * $right[1];
+			break;
+		case '-':
+			$value = $left[1] - $right[1];
+			break;
+		case '%':
+			$value = $left[1] % $right[1];
+			break;
+		case '/':
+			if ($right[1] == 0) $this->throwError('parse error: divide by zero');
+			$value = $left[1] / $right[1];
+			break;
+		case '<':
+			return $this->toBool($left[1] < $right[1]);
+		case '>':
+			return $this->toBool($left[1] > $right[1]);
+		case '>=':
+			return $this->toBool($left[1] >= $right[1]);
+		case '=<':
+			return $this->toBool($left[1] <= $right[1]);
+		default:
+			$this->throwError('parse error: unknown number operator: '.$op);
+		}
+
+		return array("number", $value, $unit);
+	}
+
+
+	/* environment functions */
+
+	protected function makeOutputBlock($type, $selectors = null) {
+		$b = new stdclass;
+		$b->lines = array();
+		$b->children = array();
+		$b->selectors = $selectors;
+		$b->type = $type;
+		$b->parent = $this->scope;
+		return $b;
+	}
+
+	// the state of execution
+	protected function pushEnv($block = null) {
+		$e = new stdclass;
+		$e->parent = $this->env;
+		$e->store = array();
+		$e->block = $block;
+
+		$this->env = $e;
+		return $e;
+	}
+
+	// pop something off the stack
+	protected function popEnv() {
+		$old = $this->env;
+		$this->env = $this->env->parent;
+		return $old;
+	}
+
+	// set something in the current env
+	protected function set($name, $value) {
+		$this->env->store[$name] = $value;
+	}
+
+
+	// get the highest occurrence entry for a name
+	protected function get($name, $default=null) {
+		$current = $this->env;
+
+		$isArguments = $name == $this->vPrefix . 'arguments';
+		while ($current) {
+			if ($isArguments && isset($current->arguments)) {
+				return array('list', ' ', $current->arguments);
+			}
+
+			if (isset($current->store[$name]))
+				return $current->store[$name];
+			else {
+				$current = isset($current->storeParent) ?
+					$current->storeParent : $current->parent;
+			}
+		}
+
+		return $default;
+	}
+
+	// inject array of unparsed strings into environment as variables
+	protected function injectVariables($args) {
+		$this->pushEnv();
+		$parser = new lessc_parser($this, __METHOD__);
+		foreach ($args as $name => $strValue) {
+			if ($name{0} != '@') $name = '@'.$name;
+			$parser->count = 0;
+			$parser->buffer = (string)$strValue;
+			if (!$parser->propertyValue($value)) {
+				throw new Exception("failed to parse passed in variable $name: $strValue");
+			}
+
+			$this->set($name, $value);
+		}
+	}
+
+	/**
+	 * Initialize any static state, can initialize parser for a file
+	 * $opts isn't used yet
+	 */
+	public function __construct($fname = null) {
+		if ($fname !== null) {
+			// used for deprecated parse method
+			$this->_parseFile = $fname;
+		}
+	}
+
+	public function compile($string, $name = null) {
+		$locale = setlocale(LC_NUMERIC, 0);
+		setlocale(LC_NUMERIC, "C");
+
+		$this->parser = $this->makeParser($name);
+		$root = $this->parser->parse($string);
+
+		$this->env = null;
+		$this->scope = null;
+
+		$this->formatter = $this->newFormatter();
+
+		if (!empty($this->registeredVars)) {
+			$this->injectVariables($this->registeredVars);
+		}
+
+		$this->sourceParser = $this->parser; // used for error messages
+		$this->compileBlock($root);
+
+		ob_start();
+		$this->formatter->block($this->scope);
+		$out = ob_get_clean();
+		setlocale(LC_NUMERIC, $locale);
+		return $out;
+	}
+
+	public function compileFile($fname, $outFname = null) {
+		if (!is_readable($fname)) {
+			throw new Exception('load error: failed to find '.$fname);
+		}
+
+		$pi = pathinfo($fname);
+
+		$oldImport = $this->importDir;
+
+		$this->importDir = (array)$this->importDir;
+		$this->importDir[] = $pi['dirname'].'/';
+
+		$this->addParsedFile($fname);
+
+		$out = $this->compile(file_get_contents($fname), $fname);
+
+		$this->importDir = $oldImport;
+
+		if ($outFname !== null) {
+			return file_put_contents($outFname, $out);
+		}
+
+		return $out;
+	}
+
+	// compile only if changed input has changed or output doesn't exist
+	public function checkedCompile($in, $out) {
+		if (!is_file($out) || filemtime($in) > filemtime($out)) {
+			$this->compileFile($in, $out);
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Execute lessphp on a .less file or a lessphp cache structure
+	 *
+	 * The lessphp cache structure contains information about a specific
+	 * less file having been parsed. It can be used as a hint for future
+	 * calls to determine whether or not a rebuild is required.
+	 *
+	 * The cache structure contains two important keys that may be used
+	 * externally:
+	 *
+	 * compiled: The final compiled CSS
+	 * updated: The time (in seconds) the CSS was last compiled
+	 *
+	 * The cache structure is a plain-ol' PHP associative array and can
+	 * be serialized and unserialized without a hitch.
+	 *
+	 * @param mixed $in Input
+	 * @param bool $force Force rebuild?
+	 * @return array lessphp cache structure
+	 */
+	public function cachedCompile($in, $force = false) {
+		// assume no root
+		$root = null;
+
+		if (is_string($in)) {
+			$root = $in;
+		} elseif (is_array($in) and isset($in['root'])) {
+			if ($force or ! isset($in['files'])) {
+				// If we are forcing a recompile or if for some reason the
+				// structure does not contain any file information we should
+				// specify the root to trigger a rebuild.
+				$root = $in['root'];
+			} elseif (isset($in['files']) and is_array($in['files'])) {
+				foreach ($in['files'] as $fname => $ftime ) {
+					if (!file_exists($fname) or filemtime($fname) > $ftime) {
+						// One of the files we knew about previously has changed
+						// so we should look at our incoming root again.
+						$root = $in['root'];
+						break;
+					}
+				}
+			}
+		} else {
+			// TODO: Throw an exception? We got neither a string nor something
+			// that looks like a compatible lessphp cache structure.
+			return null;
+		}
+
+		if ($root !== null) {
+			// If we have a root value which means we should rebuild.
+			$out = array();
+			$out['root'] = $root;
+			$out['compiled'] = $this->compileFile($root);
+			$out['files'] = $this->allParsedFiles();
+			$out['updated'] = time();
+			return $out;
+		} else {
+			// No changes, pass back the structure
+			// we were given initially.
+			return $in;
+		}
+
+	}
+
+	// parse and compile buffer
+	// This is deprecated
+	public function parse($str = null, $initialVariables = null) {
+		if (is_array($str)) {
+			$initialVariables = $str;
+			$str = null;
+		}
+
+		$oldVars = $this->registeredVars;
+		if ($initialVariables !== null) {
+			$this->setVariables($initialVariables);
+		}
+
+		if ($str == null) {
+			if (empty($this->_parseFile)) {
+				throw new exception("nothing to parse");
+			}
+
+			$out = $this->compileFile($this->_parseFile);
+		} else {
+			$out = $this->compile($str);
+		}
+
+		$this->registeredVars = $oldVars;
+		return $out;
+	}
+
+	protected function makeParser($name) {
+		$parser = new lessc_parser($this, $name);
+		$parser->writeComments = $this->preserveComments;
+
+		return $parser;
+	}
+
+	public function setFormatter($name) {
+		$this->formatterName = $name;
+	}
+
+	protected function newFormatter() {
+		$className = "lessc_formatter_lessjs";
+		if (!empty($this->formatterName)) {
+			if (!is_string($this->formatterName))
+				return $this->formatterName;
+			$className = "lessc_formatter_$this->formatterName";
+		}
+
+		return new $className;
+	}
+
+	public function setPreserveComments($preserve) {
+		$this->preserveComments = $preserve;
+	}
+
+	public function registerFunction($name, $func) {
+		$this->libFunctions[$name] = $func;
+	}
+
+	public function unregisterFunction($name) {
+		unset($this->libFunctions[$name]);
+	}
+
+	public function setVariables($variables) {
+		$this->registeredVars = array_merge($this->registeredVars, $variables);
+	}
+
+	public function unsetVariable($name) {
+		unset($this->registeredVars[$name]);
+	}
+
+	public function setImportDir($dirs) {
+		$this->importDir = (array)$dirs;
+	}
+
+	public function addImportDir($dir) {
+		$this->importDir = (array)$this->importDir;
+		$this->importDir[] = $dir;
+	}
+
+	public function allParsedFiles() {
+		return $this->allParsedFiles;
+	}
+
+	protected function addParsedFile($file) {
+		$this->allParsedFiles[realpath($file)] = filemtime($file);
+	}
+
+	/**
+	 * Uses the current value of $this->count to show line and line number
+	 */
+	protected function throwError($msg = null) {
+		if ($this->sourceLoc >= 0) {
+			$this->sourceParser->throwError($msg, $this->sourceLoc);
+		}
+		throw new exception($msg);
+	}
+
+	// compile file $in to file $out if $in is newer than $out
+	// returns true when it compiles, false otherwise
+	public static function ccompile($in, $out, $less = null) {
+		if ($less === null) {
+			$less = new self;
+		}
+		return $less->checkedCompile($in, $out);
+	}
+
+	public static function cexecute($in, $force = false, $less = null) {
+		if ($less === null) {
+			$less = new self;
+		}
+		return $less->cachedCompile($in, $force);
+	}
+
+	static protected $cssColors = array(
+		'aliceblue' => '240,248,255',
+		'antiquewhite' => '250,235,215',
+		'aqua' => '0,255,255',
+		'aquamarine' => '127,255,212',
+		'azure' => '240,255,255',
+		'beige' => '245,245,220',
+		'bisque' => '255,228,196',
+		'black' => '0,0,0',
+		'blanchedalmond' => '255,235,205',
+		'blue' => '0,0,255',
+		'blueviolet' => '138,43,226',
+		'brown' => '165,42,42',
+		'burlywood' => '222,184,135',
+		'cadetblue' => '95,158,160',
+		'chartreuse' => '127,255,0',
+		'chocolate' => '210,105,30',
+		'coral' => '255,127,80',
+		'cornflowerblue' => '100,149,237',
+		'cornsilk' => '255,248,220',
+		'crimson' => '220,20,60',
+		'cyan' => '0,255,255',
+		'darkblue' => '0,0,139',
+		'darkcyan' => '0,139,139',
+		'darkgoldenrod' => '184,134,11',
+		'darkgray' => '169,169,169',
+		'darkgreen' => '0,100,0',
+		'darkgrey' => '169,169,169',
+		'darkkhaki' => '189,183,107',
+		'darkmagenta' => '139,0,139',
+		'darkolivegreen' => '85,107,47',
+		'darkorange' => '255,140,0',
+		'darkorchid' => '153,50,204',
+		'darkred' => '139,0,0',
+		'darksalmon' => '233,150,122',
+		'darkseagreen' => '143,188,143',
+		'darkslateblue' => '72,61,139',
+		'darkslategray' => '47,79,79',
+		'darkslategrey' => '47,79,79',
+		'darkturquoise' => '0,206,209',
+		'darkviolet' => '148,0,211',
+		'deeppink' => '255,20,147',
+		'deepskyblue' => '0,191,255',
+		'dimgray' => '105,105,105',
+		'dimgrey' => '105,105,105',
+		'dodgerblue' => '30,144,255',
+		'firebrick' => '178,34,34',
+		'floralwhite' => '255,250,240',
+		'forestgreen' => '34,139,34',
+		'fuchsia' => '255,0,255',
+		'gainsboro' => '220,220,220',
+		'ghostwhite' => '248,248,255',
+		'gold' => '255,215,0',
+		'goldenrod' => '218,165,32',
+		'gray' => '128,128,128',
+		'green' => '0,128,0',
+		'greenyellow' => '173,255,47',
+		'grey' => '128,128,128',
+		'honeydew' => '240,255,240',
+		'hotpink' => '255,105,180',
+		'indianred' => '205,92,92',
+		'indigo' => '75,0,130',
+		'ivory' => '255,255,240',
+		'khaki' => '240,230,140',
+		'lavender' => '230,230,250',
+		'lavenderblush' => '255,240,245',
+		'lawngreen' => '124,252,0',
+		'lemonchiffon' => '255,250,205',
+		'lightblue' => '173,216,230',
+		'lightcoral' => '240,128,128',
+		'lightcyan' => '224,255,255',
+		'lightgoldenrodyellow' => '250,250,210',
+		'lightgray' => '211,211,211',
+		'lightgreen' => '144,238,144',
+		'lightgrey' => '211,211,211',
+		'lightpink' => '255,182,193',
+		'lightsalmon' => '255,160,122',
+		'lightseagreen' => '32,178,170',
+		'lightskyblue' => '135,206,250',
+		'lightslategray' => '119,136,153',
+		'lightslategrey' => '119,136,153',
+		'lightsteelblue' => '176,196,222',
+		'lightyellow' => '255,255,224',
+		'lime' => '0,255,0',
+		'limegreen' => '50,205,50',
+		'linen' => '250,240,230',
+		'magenta' => '255,0,255',
+		'maroon' => '128,0,0',
+		'mediumaquamarine' => '102,205,170',
+		'mediumblue' => '0,0,205',
+		'mediumorchid' => '186,85,211',
+		'mediumpurple' => '147,112,219',
+		'mediumseagreen' => '60,179,113',
+		'mediumslateblue' => '123,104,238',
+		'mediumspringgreen' => '0,250,154',
+		'mediumturquoise' => '72,209,204',
+		'mediumvioletred' => '199,21,133',
+		'midnightblue' => '25,25,112',
+		'mintcream' => '245,255,250',
+		'mistyrose' => '255,228,225',
+		'moccasin' => '255,228,181',
+		'navajowhite' => '255,222,173',
+		'navy' => '0,0,128',
+		'oldlace' => '253,245,230',
+		'olive' => '128,128,0',
+		'olivedrab' => '107,142,35',
+		'orange' => '255,165,0',
+		'orangered' => '255,69,0',
+		'orchid' => '218,112,214',
+		'palegoldenrod' => '238,232,170',
+		'palegreen' => '152,251,152',
+		'paleturquoise' => '175,238,238',
+		'palevioletred' => '219,112,147',
+		'papayawhip' => '255,239,213',
+		'peachpuff' => '255,218,185',
+		'peru' => '205,133,63',
+		'pink' => '255,192,203',
+		'plum' => '221,160,221',
+		'powderblue' => '176,224,230',
+		'purple' => '128,0,128',
+		'red' => '255,0,0',
+		'rosybrown' => '188,143,143',
+		'royalblue' => '65,105,225',
+		'saddlebrown' => '139,69,19',
+		'salmon' => '250,128,114',
+		'sandybrown' => '244,164,96',
+		'seagreen' => '46,139,87',
+		'seashell' => '255,245,238',
+		'sienna' => '160,82,45',
+		'silver' => '192,192,192',
+		'skyblue' => '135,206,235',
+		'slateblue' => '106,90,205',
+		'slategray' => '112,128,144',
+		'slategrey' => '112,128,144',
+		'snow' => '255,250,250',
+		'springgreen' => '0,255,127',
+		'steelblue' => '70,130,180',
+		'tan' => '210,180,140',
+		'teal' => '0,128,128',
+		'thistle' => '216,191,216',
+		'tomato' => '255,99,71',
+		'transparent' => '0,0,0,0',
+		'turquoise' => '64,224,208',
+		'violet' => '238,130,238',
+		'wheat' => '245,222,179',
+		'white' => '255,255,255',
+		'whitesmoke' => '245,245,245',
+		'yellow' => '255,255,0',
+		'yellowgreen' => '154,205,50'
+	);
+}
+
+// responsible for taking a string of LESS code and converting it into a
+// syntax tree
+class lessc_parser {
+	static protected $nextBlockId = 0; // used to uniquely identify blocks
+
+	static protected $precedence = array(
+		'=<' => 0,
+		'>=' => 0,
+		'=' => 0,
+		'<' => 0,
+		'>' => 0,
+
+		'+' => 1,
+		'-' => 1,
+		'*' => 2,
+		'/' => 2,
+		'%' => 2,
+	);
+
+	static protected $whitePattern;
+	static protected $commentMulti;
+
+	static protected $commentSingle = "//";
+	static protected $commentMultiLeft = "/*";
+	static protected $commentMultiRight = "*/";
+
+	// regex string to match any of the operators
+	static protected $operatorString;
+
+	// these properties will supress division unless it's inside parenthases
+	static protected $supressDivisionProps =
+		array('/border-radius$/i', '/^font$/i');
+
+	protected $blockDirectives = array("font-face", "keyframes", "page", "-moz-document", "viewport", "-moz-viewport", "-o-viewport", "-ms-viewport");
+	protected $lineDirectives = array("charset");
+
+	/**
+	 * if we are in parens we can be more liberal with whitespace around
+	 * operators because it must evaluate to a single value and thus is less
+	 * ambiguous.
+	 *
+	 * Consider:
+	 *     property1: 10 -5; // is two numbers, 10 and -5
+	 *     property2: (10 -5); // should evaluate to 5
+	 */
+	protected $inParens = false;
+
+	// caches preg escaped literals
+	static protected $literalCache = array();
+
+	public function __construct($lessc, $sourceName = null) {
+		$this->eatWhiteDefault = true;
+		// reference to less needed for vPrefix, mPrefix, and parentSelector
+		$this->lessc = $lessc;
+
+		$this->sourceName = $sourceName; // name used for error messages
+
+		$this->writeComments = false;
+
+		if (!self::$operatorString) {
+			self::$operatorString =
+				'('.implode('|', array_map(array('lessc', 'preg_quote'),
+					array_keys(self::$precedence))).')';
+
+			$commentSingle = lessc::preg_quote(self::$commentSingle);
+			$commentMultiLeft = lessc::preg_quote(self::$commentMultiLeft);
+			$commentMultiRight = lessc::preg_quote(self::$commentMultiRight);
+
+			self::$commentMulti = $commentMultiLeft.'.*?'.$commentMultiRight;
+			self::$whitePattern = '/'.$commentSingle.'[^\n]*\s*|('.self::$commentMulti.')\s*|\s+/Ais';
+		}
+	}
+
+	public function parse($buffer) {
+		$this->count = 0;
+		$this->line = 1;
+
+		$this->env = null; // block stack
+		$this->buffer = $this->writeComments ? $buffer : $this->removeComments($buffer);
+		$this->pushSpecialBlock("root");
+		$this->eatWhiteDefault = true;
+		$this->seenComments = array();
+
+		// trim whitespace on head
+		// if (preg_match('/^\s+/', $this->buffer, $m)) {
+		// 	$this->line += substr_count($m[0], "\n");
+		// 	$this->buffer = ltrim($this->buffer);
+		// }
+		$this->whitespace();
+
+		// parse the entire file
+		$lastCount = $this->count;
+		while (false !== $this->parseChunk());
+
+		if ($this->count != strlen($this->buffer))
+			$this->throwError();
+
+		// TODO report where the block was opened
+		if (!is_null($this->env->parent))
+			throw new exception('parse error: unclosed block');
+
+		return $this->env;
+	}
+
+	/**
+	 * Parse a single chunk off the head of the buffer and append it to the
+	 * current parse environment.
+	 * Returns false when the buffer is empty, or when there is an error.
+	 *
+	 * This function is called repeatedly until the entire document is
+	 * parsed.
+	 *
+	 * This parser is most similar to a recursive descent parser. Single
+	 * functions represent discrete grammatical rules for the language, and
+	 * they are able to capture the text that represents those rules.
+	 *
+	 * Consider the function lessc::keyword(). (all parse functions are
+	 * structured the same)
+	 *
+	 * The function takes a single reference argument. When calling the
+	 * function it will attempt to match a keyword on the head of the buffer.
+	 * If it is successful, it will place the keyword in the referenced
+	 * argument, advance the position in the buffer, and return true. If it
+	 * fails then it won't advance the buffer and it will return false.
+	 *
+	 * All of these parse functions are powered by lessc::match(), which behaves
+	 * the same way, but takes a literal regular expression. Sometimes it is
+	 * more convenient to use match instead of creating a new function.
+	 *
+	 * Because of the format of the functions, to parse an entire string of
+	 * grammatical rules, you can chain them together using &&.
+	 *
+	 * But, if some of the rules in the chain succeed before one fails, then
+	 * the buffer position will be left at an invalid state. In order to
+	 * avoid this, lessc::seek() is used to remember and set buffer positions.
+	 *
+	 * Before parsing a chain, use $s = $this->seek() to remember the current
+	 * position into $s. Then if a chain fails, use $this->seek($s) to
+	 * go back where we started.
+	 */
+	protected function parseChunk() {
+		if (empty($this->buffer)) return false;
+		$s = $this->seek();
+
+		// setting a property
+		if ($this->keyword($key) && $this->assign() &&
+			$this->propertyValue($value, $key) && $this->end())
+		{
+			$this->append(array('assign', $key, $value), $s);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+
+		// look for special css blocks
+		if ($this->literal('@', false)) {
+			$this->count--;
+
+			// media
+			if ($this->literal('@media')) {
+				if (($this->mediaQueryList($mediaQueries) || true)
+					&& $this->literal('{'))
+				{
+					$media = $this->pushSpecialBlock("media");
+					$media->queries = is_null($mediaQueries) ? array() : $mediaQueries;
+					return true;
+				} else {
+					$this->seek($s);
+					return false;
+				}
+			}
+
+			if ($this->literal("@", false) && $this->keyword($dirName)) {
+				if ($this->isDirective($dirName, $this->blockDirectives)) {
+					if (($this->openString("{", $dirValue, null, array(";")) || true) &&
+						$this->literal("{"))
+					{
+						$dir = $this->pushSpecialBlock("directive");
+						$dir->name = $dirName;
+						if (isset($dirValue)) $dir->value = $dirValue;
+						return true;
+					}
+				} elseif ($this->isDirective($dirName, $this->lineDirectives)) {
+					if ($this->propertyValue($dirValue) && $this->end()) {
+						$this->append(array("directive", $dirName, $dirValue));
+						return true;
+					}
+				}
+			}
+
+			$this->seek($s);
+		}
+
+		// setting a variable
+		if ($this->variable($var) && $this->assign() &&
+			$this->propertyValue($value) && $this->end())
+		{
+			$this->append(array('assign', $var, $value), $s);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		if ($this->import($importValue)) {
+			$this->append($importValue, $s);
+			return true;
+		}
+
+		// opening parametric mixin
+		if ($this->tag($tag, true) && $this->argumentDef($args, $isVararg) &&
+			($this->guards($guards) || true) &&
+			$this->literal('{'))
+		{
+			$block = $this->pushBlock($this->fixTags(array($tag)));
+			$block->args = $args;
+			$block->isVararg = $isVararg;
+			if (!empty($guards)) $block->guards = $guards;
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// opening a simple block
+		if ($this->tags($tags) && $this->literal('{')) {
+			$tags = $this->fixTags($tags);
+			$this->pushBlock($tags);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// closing a block
+		if ($this->literal('}', false)) {
+			try {
+				$block = $this->pop();
+			} catch (exception $e) {
+				$this->seek($s);
+				$this->throwError($e->getMessage());
+			}
+
+			$hidden = false;
+			if (is_null($block->type)) {
+				$hidden = true;
+				if (!isset($block->args)) {
+					foreach ($block->tags as $tag) {
+						if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix) {
+							$hidden = false;
+							break;
+						}
+					}
+				}
+
+				foreach ($block->tags as $tag) {
+					if (is_string($tag)) {
+						$this->env->children[$tag][] = $block;
+					}
+				}
+			}
+
+			if (!$hidden) {
+				$this->append(array('block', $block), $s);
+			}
+
+			// this is done here so comments aren't bundled into he block that
+			// was just closed
+			$this->whitespace();
+			return true;
+		}
+
+		// mixin
+		if ($this->mixinTags($tags) &&
+			($this->argumentDef($argv, $isVararg) || true) &&
+			($this->keyword($suffix) || true) && $this->end())
+		{
+			$tags = $this->fixTags($tags);
+			$this->append(array('mixin', $tags, $argv, $suffix), $s);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// spare ;
+		if ($this->literal(';')) return true;
+
+		return false; // got nothing, throw error
+	}
+
+	protected function isDirective($dirname, $directives) {
+		// TODO: cache pattern in parser
+		$pattern = implode("|",
+			array_map(array("lessc", "preg_quote"), $directives));
+		$pattern = '/^(-[a-z-]+-)?(' . $pattern . ')$/i';
+
+		return preg_match($pattern, $dirname);
+	}
+
+	protected function fixTags($tags) {
+		// move @ tags out of variable namespace
+		foreach ($tags as &$tag) {
+			if ($tag{0} == $this->lessc->vPrefix)
+				$tag[0] = $this->lessc->mPrefix;
+		}
+		return $tags;
+	}
+
+	// a list of expressions
+	protected function expressionList(&$exps) {
+		$values = array();
+
+		while ($this->expression($exp)) {
+			$values[] = $exp;
+		}
+
+		if (count($values) == 0) return false;
+
+		$exps = lessc::compressList($values, ' ');
+		return true;
+	}
+
+	/**
+	 * Attempt to consume an expression.
+	 * @link http://en.wikipedia.org/wiki/Operator-precedence_parser#Pseudo-code
+	 */
+	protected function expression(&$out) {
+		if ($this->value($lhs)) {
+			$out = $this->expHelper($lhs, 0);
+
+			// look for / shorthand
+			if (!empty($this->env->supressedDivision)) {
+				unset($this->env->supressedDivision);
+				$s = $this->seek();
+				if ($this->literal("/") && $this->value($rhs)) {
+					$out = array("list", "",
+						array($out, array("keyword", "/"), $rhs));
+				} else {
+					$this->seek($s);
+				}
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	/**
+	 * recursively parse infix equation with $lhs at precedence $minP
+	 */
+	protected function expHelper($lhs, $minP) {
+		$this->inExp = true;
+		$ss = $this->seek();
+
+		while (true) {
+			$whiteBefore = isset($this->buffer[$this->count - 1]) &&
+				ctype_space($this->buffer[$this->count - 1]);
+
+			// If there is whitespace before the operator, then we require
+			// whitespace after the operator for it to be an expression
+			$needWhite = $whiteBefore && !$this->inParens;
+
+			if ($this->match(self::$operatorString.($needWhite ? '\s' : ''), $m) && self::$precedence[$m[1]] >= $minP) {
+				if (!$this->inParens && isset($this->env->currentProperty) && $m[1] == "/" && empty($this->env->supressedDivision)) {
+					foreach (self::$supressDivisionProps as $pattern) {
+						if (preg_match($pattern, $this->env->currentProperty)) {
+							$this->env->supressedDivision = true;
+							break 2;
+						}
+					}
+				}
+
+
+				$whiteAfter = isset($this->buffer[$this->count - 1]) &&
+					ctype_space($this->buffer[$this->count - 1]);
+
+				if (!$this->value($rhs)) break;
+
+				// peek for next operator to see what to do with rhs
+				if ($this->peek(self::$operatorString, $next) && self::$precedence[$next[1]] > self::$precedence[$m[1]]) {
+					$rhs = $this->expHelper($rhs, self::$precedence[$next[1]]);
+				}
+
+				$lhs = array('expression', $m[1], $lhs, $rhs, $whiteBefore, $whiteAfter);
+				$ss = $this->seek();
+
+				continue;
+			}
+
+			break;
+		}
+
+		$this->seek($ss);
+
+		return $lhs;
+	}
+
+	// consume a list of values for a property
+	public function propertyValue(&$value, $keyName = null) {
+		$values = array();
+
+		if ($keyName !== null) $this->env->currentProperty = $keyName;
+
+		$s = null;
+		while ($this->expressionList($v)) {
+			$values[] = $v;
+			$s = $this->seek();
+			if (!$this->literal(',')) break;
+		}
+
+		if ($s) $this->seek($s);
+
+		if ($keyName !== null) unset($this->env->currentProperty);
+
+		if (count($values) == 0) return false;
+
+		$value = lessc::compressList($values, ', ');
+		return true;
+	}
+
+	protected function parenValue(&$out) {
+		$s = $this->seek();
+
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "(") {
+			return false;
+		}
+
+		$inParens = $this->inParens;
+		if ($this->literal("(") &&
+			($this->inParens = true) && $this->expression($exp) &&
+			$this->literal(")"))
+		{
+			$out = $exp;
+			$this->inParens = $inParens;
+			return true;
+		} else {
+			$this->inParens = $inParens;
+			$this->seek($s);
+		}
+
+		return false;
+	}
+
+	// a single value
+	protected function value(&$value) {
+		$s = $this->seek();
+
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "-") {
+			// negation
+			if ($this->literal("-", false) &&
+				(($this->variable($inner) && $inner = array("variable", $inner)) ||
+				$this->unit($inner) ||
+				$this->parenValue($inner)))
+			{
+				$value = array("unary", "-", $inner);
+				return true;
+			} else {
+				$this->seek($s);
+			}
+		}
+
+		if ($this->parenValue($value)) return true;
+		if ($this->unit($value)) return true;
+		if ($this->color($value)) return true;
+		if ($this->func($value)) return true;
+		if ($this->string($value)) return true;
+
+		if ($this->keyword($word)) {
+			$value = array('keyword', $word);
+			return true;
+		}
+
+		// try a variable
+		if ($this->variable($var)) {
+			$value = array('variable', $var);
+			return true;
+		}
+
+		// unquote string (should this work on any type?
+		if ($this->literal("~") && $this->string($str)) {
+			$value = array("escape", $str);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		// css hack: \0
+		if ($this->literal('\\') && $this->match('([0-9]+)', $m)) {
+			$value = array('keyword', '\\'.$m[1]);
+			return true;
+		} else {
+			$this->seek($s);
+		}
+
+		return false;
+	}
+
+	// an import statement
+	protected function import(&$out) {
+		$s = $this->seek();
+		if (!$this->literal('@import')) return false;
+
+		// @import "something.css" media;
+		// @import url("something.css") media;
+		// @import url(something.css) media;
+
+		if ($this->propertyValue($value)) {
+			$out = array("import", $value);
+			return true;
+		}
+	}
+
+	protected function mediaQueryList(&$out) {
+		if ($this->genericList($list, "mediaQuery", ",", false)) {
+			$out = $list[2];
+			return true;
+		}
+		return false;
+	}
+
+	protected function mediaQuery(&$out) {
+		$s = $this->seek();
+
+		$expressions = null;
+		$parts = array();
+
+		if (($this->literal("only") && ($only = true) || $this->literal("not") && ($not = true) || true) && $this->keyword($mediaType)) {
+			$prop = array("mediaType");
+			if (isset($only)) $prop[] = "only";
+			if (isset($not)) $prop[] = "not";
+			$prop[] = $mediaType;
+			$parts[] = $prop;
+		} else {
+			$this->seek($s);
+		}
+
+
+		if (!empty($mediaType) && !$this->literal("and")) {
+			// ~
+		} else {
+			$this->genericList($expressions, "mediaExpression", "and", false);
+			if (is_array($expressions)) $parts = array_merge($parts, $expressions[2]);
+		}
+
+		if (count($parts) == 0) {
+			$this->seek($s);
+			return false;
+		}
+
+		$out = $parts;
+		return true;
+	}
+
+	protected function mediaExpression(&$out) {
+		$s = $this->seek();
+		$value = null;
+		if ($this->literal("(") &&
+			$this->keyword($feature) &&
+			($this->literal(":") && $this->expression($value) || true) &&
+			$this->literal(")"))
+		{
+			$out = array("mediaExp", $feature);
+			if ($value) $out[] = $value;
+			return true;
+		} elseif ($this->variable($variable)) {
+			$out = array('variable', $variable);
+			return true;
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	// an unbounded string stopped by $end
+	protected function openString($end, &$out, $nestingOpen=null, $rejectStrs = null) {
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		$stop = array("'", '"', "@{", $end);
+		$stop = array_map(array("lessc", "preg_quote"), $stop);
+		// $stop[] = self::$commentMulti;
+
+		if (!is_null($rejectStrs)) {
+			$stop = array_merge($stop, $rejectStrs);
+		}
+
+		$patt = '(.*?)('.implode("|", $stop).')';
+
+		$nestingLevel = 0;
+
+		$content = array();
+		while ($this->match($patt, $m, false)) {
+			if (!empty($m[1])) {
+				$content[] = $m[1];
+				if ($nestingOpen) {
+					$nestingLevel += substr_count($m[1], $nestingOpen);
+				}
+			}
+
+			$tok = $m[2];
+
+			$this->count-= strlen($tok);
+			if ($tok == $end) {
+				if ($nestingLevel == 0) {
+					break;
+				} else {
+					$nestingLevel--;
+				}
+			}
+
+			if (($tok == "'" || $tok == '"') && $this->string($str)) {
+				$content[] = $str;
+				continue;
+			}
+
+			if ($tok == "@{" && $this->interpolation($inter)) {
+				$content[] = $inter;
+				continue;
+			}
+
+			if (!empty($rejectStrs) && in_array($tok, $rejectStrs)) {
+				break;
+			}
+
+			$content[] = $tok;
+			$this->count+= strlen($tok);
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+
+		if (count($content) == 0) return false;
+
+		// trim the end
+		if (is_string(end($content))) {
+			$content[count($content) - 1] = rtrim(end($content));
+		}
+
+		$out = array("string", "", $content);
+		return true;
+	}
+
+	protected function string(&$out) {
+		$s = $this->seek();
+		if ($this->literal('"', false)) {
+			$delim = '"';
+		} elseif ($this->literal("'", false)) {
+			$delim = "'";
+		} else {
+			return false;
+		}
+
+		$content = array();
+
+		// look for either ending delim , escape, or string interpolation
+		$patt = '([^\n]*?)(@\{|\\\\|' .
+			lessc::preg_quote($delim).')';
+
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		while ($this->match($patt, $m, false)) {
+			$content[] = $m[1];
+			if ($m[2] == "@{") {
+				$this->count -= strlen($m[2]);
+				if ($this->interpolation($inter, false)) {
+					$content[] = $inter;
+				} else {
+					$this->count += strlen($m[2]);
+					$content[] = "@{"; // ignore it
+				}
+			} elseif ($m[2] == '\\') {
+				$content[] = $m[2];
+				if ($this->literal($delim, false)) {
+					$content[] = $delim;
+				}
+			} else {
+				$this->count -= strlen($delim);
+				break; // delim
+			}
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+
+		if ($this->literal($delim)) {
+			$out = array("string", $delim, $content);
+			return true;
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	protected function interpolation(&$out) {
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = true;
+
+		$s = $this->seek();
+		if ($this->literal("@{") &&
+			$this->openString("}", $interp, null, array("'", '"', ";")) &&
+			$this->literal("}", false))
+		{
+			$out = array("interpolate", $interp);
+			$this->eatWhiteDefault = $oldWhite;
+			if ($this->eatWhiteDefault) $this->whitespace();
+			return true;
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+		$this->seek($s);
+		return false;
+	}
+
+	protected function unit(&$unit) {
+		// speed shortcut
+		if (isset($this->buffer[$this->count])) {
+			$char = $this->buffer[$this->count];
+			if (!ctype_digit($char) && $char != ".") return false;
+		}
+
+		if ($this->match('([0-9]+(?:\.[0-9]*)?|\.[0-9]+)([%a-zA-Z]+)?', $m)) {
+			$unit = array("number", $m[1], empty($m[2]) ? "" : $m[2]);
+			return true;
+		}
+		return false;
+	}
+
+	// a # color
+	protected function color(&$out) {
+		if ($this->match('(#(?:[0-9a-f]{8}|[0-9a-f]{6}|[0-9a-f]{3}))', $m)) {
+			if (strlen($m[1]) > 7) {
+				$out = array("string", "", array($m[1]));
+			} else {
+				$out = array("raw_color", $m[1]);
+			}
+			return true;
+		}
+
+		return false;
+	}
+
+	// consume an argument definition list surrounded by ()
+	// each argument is a variable name with optional value
+	// or at the end a ... or a variable named followed by ...
+	// arguments are separated by , unless a ; is in the list, then ; is the
+	// delimiter.
+	protected function argumentDef(&$args, &$isVararg) {
+		$s = $this->seek();
+		if (!$this->literal('(')) return false;
+
+		$values = array();
+		$delim = ",";
+		$method = "expressionList";
+
+		$isVararg = false;
+		while (true) {
+			if ($this->literal("...")) {
+				$isVararg = true;
+				break;
+			}
+
+			if ($this->$method($value)) {
+				if ($value[0] == "variable") {
+					$arg = array("arg", $value[1]);
+					$ss = $this->seek();
+
+					if ($this->assign() && $this->$method($rhs)) {
+						$arg[] = $rhs;
+					} else {
+						$this->seek($ss);
+						if ($this->literal("...")) {
+							$arg[0] = "rest";
+							$isVararg = true;
+						}
+					}
+
+					$values[] = $arg;
+					if ($isVararg) break;
+					continue;
+				} else {
+					$values[] = array("lit", $value);
+				}
+			}
+
+
+			if (!$this->literal($delim)) {
+				if ($delim == "," && $this->literal(";")) {
+					// found new delim, convert existing args
+					$delim = ";";
+					$method = "propertyValue";
+
+					// transform arg list
+					if (isset($values[1])) { // 2 items
+						$newList = array();
+						foreach ($values as $i => $arg) {
+							switch($arg[0]) {
+							case "arg":
+								if ($i) {
+									$this->throwError("Cannot mix ; and , as delimiter types");
+								}
+								$newList[] = $arg[2];
+								break;
+							case "lit":
+								$newList[] = $arg[1];
+								break;
+							case "rest":
+								$this->throwError("Unexpected rest before semicolon");
+							}
+						}
+
+						$newList = array("list", ", ", $newList);
+
+						switch ($values[0][0]) {
+						case "arg":
+							$newArg = array("arg", $values[0][1], $newList);
+							break;
+						case "lit":
+							$newArg = array("lit", $newList);
+							break;
+						}
+
+					} elseif ($values) { // 1 item
+						$newArg = $values[0];
+					}
+
+					if ($newArg) {
+						$values = array($newArg);
+					}
+				} else {
+					break;
+				}
+			}
+		}
+
+		if (!$this->literal(')')) {
+			$this->seek($s);
+			return false;
+		}
+
+		$args = $values;
+
+		return true;
+	}
+
+	// consume a list of tags
+	// this accepts a hanging delimiter
+	protected function tags(&$tags, $simple = false, $delim = ',') {
+		$tags = array();
+		while ($this->tag($tt, $simple)) {
+			$tags[] = $tt;
+			if (!$this->literal($delim)) break;
+		}
+		if (count($tags) == 0) return false;
+
+		return true;
+	}
+
+	// list of tags of specifying mixin path
+	// optionally separated by > (lazy, accepts extra >)
+	protected function mixinTags(&$tags) {
+		$s = $this->seek();
+		$tags = array();
+		while ($this->tag($tt, true)) {
+			$tags[] = $tt;
+			$this->literal(">");
+		}
+
+		if (count($tags) == 0) return false;
+
+		return true;
+	}
+
+	// a bracketed value (contained within in a tag definition)
+	protected function tagBracket(&$parts, &$hasExpression) {
+		// speed shortcut
+		if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] != "[") {
+			return false;
+		}
+
+		$s = $this->seek();
+
+		$hasInterpolation = false;
+
+		if ($this->literal("[", false)) {
+			$attrParts = array("[");
+			// keyword, string, operator
+			while (true) {
+				if ($this->literal("]", false)) {
+					$this->count--;
+					break; // get out early
+				}
+
+				if ($this->match('\s+', $m)) {
+					$attrParts[] = " ";
+					continue;
+				}
+				if ($this->string($str)) {
+					// escape parent selector, (yuck)
+					foreach ($str[2] as &$chunk) {
+						$chunk = str_replace($this->lessc->parentSelector, "$&$", $chunk);
+					}
+
+					$attrParts[] = $str;
+					$hasInterpolation = true;
+					continue;
+				}
+
+				if ($this->keyword($word)) {
+					$attrParts[] = $word;
+					continue;
+				}
+
+				if ($this->interpolation($inter, false)) {
+					$attrParts[] = $inter;
+					$hasInterpolation = true;
+					continue;
+				}
+
+				// operator, handles attr namespace too
+				if ($this->match('[|-~\$\*\^=]+', $m)) {
+					$attrParts[] = $m[0];
+					continue;
+				}
+
+				break;
+			}
+
+			if ($this->literal("]", false)) {
+				$attrParts[] = "]";
+				foreach ($attrParts as $part) {
+					$parts[] = $part;
+				}
+				$hasExpression = $hasExpression || $hasInterpolation;
+				return true;
+			}
+			$this->seek($s);
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	// a space separated list of selectors
+	protected function tag(&$tag, $simple = false) {
+		if ($simple)
+			$chars = '^@,:;{}\][>\(\) "\'';
+		else
+			$chars = '^@,;{}["\'';
+
+		$s = $this->seek();
+
+		$hasExpression = false;
+		$parts = array();
+		while ($this->tagBracket($parts, $hasExpression));
+
+		$oldWhite = $this->eatWhiteDefault;
+		$this->eatWhiteDefault = false;
+
+		while (true) {
+			if ($this->match('(['.$chars.'0-9]['.$chars.']*)', $m)) {
+				$parts[] = $m[1];
+				if ($simple) break;
+
+				while ($this->tagBracket($parts, $hasExpression));
+				continue;
+			}
+
+			if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] == "@") {
+				if ($this->interpolation($interp)) {
+					$hasExpression = true;
+					$interp[2] = true; // don't unescape
+					$parts[] = $interp;
+					continue;
+				}
+
+				if ($this->literal("@")) {
+					$parts[] = "@";
+					continue;
+				}
+			}
+
+			if ($this->unit($unit)) { // for keyframes
+				$parts[] = $unit[1];
+				$parts[] = $unit[2];
+				continue;
+			}
+
+			break;
+		}
+
+		$this->eatWhiteDefault = $oldWhite;
+		if (!$parts) {
+			$this->seek($s);
+			return false;
+		}
+
+		if ($hasExpression) {
+			$tag = array("exp", array("string", "", $parts));
+		} else {
+			$tag = trim(implode($parts));
+		}
+
+		$this->whitespace();
+		return true;
+	}
+
+	// a css function
+	protected function func(&$func) {
+		$s = $this->seek();
+
+		if ($this->match('(%|[\w\-_][\w\-_:\.]+|[\w_])', $m) && $this->literal('(')) {
+			$fname = $m[1];
+
+			$sPreArgs = $this->seek();
+
+			$args = array();
+			while (true) {
+				$ss = $this->seek();
+				// this ugly nonsense is for ie filter properties
+				if ($this->keyword($name) && $this->literal('=') && $this->expressionList($value)) {
+					$args[] = array("string", "", array($name, "=", $value));
+				} else {
+					$this->seek($ss);
+					if ($this->expressionList($value)) {
+						$args[] = $value;
+					}
+				}
+
+				if (!$this->literal(',')) break;
+			}
+			$args = array('list', ',', $args);
+
+			if ($this->literal(')')) {
+				$func = array('function', $fname, $args);
+				return true;
+			} elseif ($fname == 'url') {
+				// couldn't parse and in url? treat as string
+				$this->seek($sPreArgs);
+				if ($this->openString(")", $string) && $this->literal(")")) {
+					$func = array('function', $fname, $string);
+					return true;
+				}
+			}
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	// consume a less variable
+	protected function variable(&$name) {
+		$s = $this->seek();
+		if ($this->literal($this->lessc->vPrefix, false) &&
+			($this->variable($sub) || $this->keyword($name)))
+		{
+			if (!empty($sub)) {
+				$name = array('variable', $sub);
+			} else {
+				$name = $this->lessc->vPrefix.$name;
+			}
+			return true;
+		}
+
+		$name = null;
+		$this->seek($s);
+		return false;
+	}
+
+	/**
+	 * Consume an assignment operator
+	 * Can optionally take a name that will be set to the current property name
+	 */
+	protected function assign($name = null) {
+		if ($name) $this->currentProperty = $name;
+		return $this->literal(':') || $this->literal('=');
+	}
+
+	// consume a keyword
+	protected function keyword(&$word) {
+		if ($this->match('([\w_\-\*!"][\w\-_"]*)', $m)) {
+			$word = $m[1];
+			return true;
+		}
+		return false;
+	}
+
+	// consume an end of statement delimiter
+	protected function end() {
+		if ($this->literal(';')) {
+			return true;
+		} elseif ($this->count == strlen($this->buffer) || $this->buffer[$this->count] == '}') {
+			// if there is end of file or a closing block next then we don't need a ;
+			return true;
+		}
+		return false;
+	}
+
+	protected function guards(&$guards) {
+		$s = $this->seek();
+
+		if (!$this->literal("when")) {
+			$this->seek($s);
+			return false;
+		}
+
+		$guards = array();
+
+		while ($this->guardGroup($g)) {
+			$guards[] = $g;
+			if (!$this->literal(",")) break;
+		}
+
+		if (count($guards) == 0) {
+			$guards = null;
+			$this->seek($s);
+			return false;
+		}
+
+		return true;
+	}
+
+	// a bunch of guards that are and'd together
+	// TODO rename to guardGroup
+	protected function guardGroup(&$guardGroup) {
+		$s = $this->seek();
+		$guardGroup = array();
+		while ($this->guard($guard)) {
+			$guardGroup[] = $guard;
+			if (!$this->literal("and")) break;
+		}
+
+		if (count($guardGroup) == 0) {
+			$guardGroup = null;
+			$this->seek($s);
+			return false;
+		}
+
+		return true;
+	}
+
+	protected function guard(&$guard) {
+		$s = $this->seek();
+		$negate = $this->literal("not");
+
+		if ($this->literal("(") && $this->expression($exp) && $this->literal(")")) {
+			$guard = $exp;
+			if ($negate) $guard = array("negate", $guard);
+			return true;
+		}
+
+		$this->seek($s);
+		return false;
+	}
+
+	/* raw parsing functions */
+
+	protected function literal($what, $eatWhitespace = null) {
+		if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+
+		// shortcut on single letter
+		if (!isset($what[1]) && isset($this->buffer[$this->count])) {
+			if ($this->buffer[$this->count] == $what) {
+				if (!$eatWhitespace) {
+					$this->count++;
+					return true;
+				}
+				// goes below...
+			} else {
+				return false;
+			}
+		}
+
+		if (!isset(self::$literalCache[$what])) {
+			self::$literalCache[$what] = lessc::preg_quote($what);
+		}
+
+		return $this->match(self::$literalCache[$what], $m, $eatWhitespace);
+	}
+
+	protected function genericList(&$out, $parseItem, $delim="", $flatten=true) {
+		$s = $this->seek();
+		$items = array();
+		while ($this->$parseItem($value)) {
+			$items[] = $value;
+			if ($delim) {
+				if (!$this->literal($delim)) break;
+			}
+		}
+
+		if (count($items) == 0) {
+			$this->seek($s);
+			return false;
+		}
+
+		if ($flatten && count($items) == 1) {
+			$out = $items[0];
+		} else {
+			$out = array("list", $delim, $items);
+		}
+
+		return true;
+	}
+
+
+	// advance counter to next occurrence of $what
+	// $until - don't include $what in advance
+	// $allowNewline, if string, will be used as valid char set
+	protected function to($what, &$out, $until = false, $allowNewline = false) {
+		if (is_string($allowNewline)) {
+			$validChars = $allowNewline;
+		} else {
+			$validChars = $allowNewline ? "." : "[^\n]";
+		}
+		if (!$this->match('('.$validChars.'*?)'.lessc::preg_quote($what), $m, !$until)) return false;
+		if ($until) $this->count -= strlen($what); // give back $what
+		$out = $m[1];
+		return true;
+	}
+
+	// try to match something on head of buffer
+	protected function match($regex, &$out, $eatWhitespace = null) {
+		if ($eatWhitespace === null) $eatWhitespace = $this->eatWhiteDefault;
+
+		$r = '/'.$regex.($eatWhitespace && !$this->writeComments ? '\s*' : '').'/Ais';
+		if (preg_match($r, $this->buffer, $out, null, $this->count)) {
+			$this->count += strlen($out[0]);
+			if ($eatWhitespace && $this->writeComments) $this->whitespace();
+			return true;
+		}
+		return false;
+	}
+
+	// match some whitespace
+	protected function whitespace() {
+		if ($this->writeComments) {
+			$gotWhite = false;
+			while (preg_match(self::$whitePattern, $this->buffer, $m, null, $this->count)) {
+				if (isset($m[1]) && empty($this->commentsSeen[$this->count])) {
+					$this->append(array("comment", $m[1]));
+					$this->commentsSeen[$this->count] = true;
+				}
+				$this->count += strlen($m[0]);
+				$gotWhite = true;
+			}
+			return $gotWhite;
+		} else {
+			$this->match("", $m);
+			return strlen($m[0]) > 0;
+		}
+	}
+
+	// match something without consuming it
+	protected function peek($regex, &$out = null, $from=null) {
+		if (is_null($from)) $from = $this->count;
+		$r = '/'.$regex.'/Ais';
+		$result = preg_match($r, $this->buffer, $out, null, $from);
+
+		return $result;
+	}
+
+	// seek to a spot in the buffer or return where we are on no argument
+	protected function seek($where = null) {
+		if ($where === null) return $this->count;
+		else $this->count = $where;
+		return true;
+	}
+
+	/* misc functions */
+
+	public function throwError($msg = "parse error", $count = null) {
+		$count = is_null($count) ? $this->count : $count;
+
+		$line = $this->line +
+			substr_count(substr($this->buffer, 0, $count), "\n");
+
+		if (!empty($this->sourceName)) {
+			$loc = "$this->sourceName on line $line";
+		} else {
+			$loc = "line: $line";
+		}
+
+		// TODO this depends on $this->count
+		if ($this->peek("(.*?)(\n|$)", $m, $count)) {
+			throw new exception("$msg: failed at `$m[1]` $loc");
+		} else {
+			throw new exception("$msg: $loc");
+		}
+	}
+
+	protected function pushBlock($selectors=null, $type=null) {
+		$b = new stdclass;
+		$b->parent = $this->env;
+
+		$b->type = $type;
+		$b->id = self::$nextBlockId++;
+
+		$b->isVararg = false; // TODO: kill me from here
+		$b->tags = $selectors;
+
+		$b->props = array();
+		$b->children = array();
+
+		$this->env = $b;
+		return $b;
+	}
+
+	// push a block that doesn't multiply tags
+	protected function pushSpecialBlock($type) {
+		return $this->pushBlock(null, $type);
+	}
+
+	// append a property to the current block
+	protected function append($prop, $pos = null) {
+		if ($pos !== null) $prop[-1] = $pos;
+		$this->env->props[] = $prop;
+	}
+
+	// pop something off the stack
+	protected function pop() {
+		$old = $this->env;
+		$this->env = $this->env->parent;
+		return $old;
+	}
+
+	// remove comments from $text
+	// todo: make it work for all functions, not just url
+	protected function removeComments($text) {
+		$look = array(
+			'url(', '//', '/*', '"', "'"
+		);
+
+		$out = '';
+		$min = null;
+		while (true) {
+			// find the next item
+			foreach ($look as $token) {
+				$pos = strpos($text, $token);
+				if ($pos !== false) {
+					if (!isset($min) || $pos < $min[1]) $min = array($token, $pos);
+				}
+			}
+
+			if (is_null($min)) break;
+
+			$count = $min[1];
+			$skip = 0;
+			$newlines = 0;
+			switch ($min[0]) {
+			case 'url(':
+				if (preg_match('/url\(.*?\)/', $text, $m, 0, $count))
+					$count += strlen($m[0]) - strlen($min[0]);
+				break;
+			case '"':
+			case "'":
+				if (preg_match('/'.$min[0].'.*?(?indentLevel = 0;
+	}
+
+	public function indentStr($n = 0) {
+		return str_repeat($this->indentChar, max($this->indentLevel + $n, 0));
+	}
+
+	public function property($name, $value) {
+		return $name . $this->assignSeparator . $value . ";";
+	}
+
+	protected function isEmpty($block) {
+		if (empty($block->lines)) {
+			foreach ($block->children as $child) {
+				if (!$this->isEmpty($child)) return false;
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	public function block($block) {
+		if ($this->isEmpty($block)) return;
+
+		$inner = $pre = $this->indentStr();
+
+		$isSingle = !$this->disableSingle &&
+			is_null($block->type) && count($block->lines) == 1;
+
+		if (!empty($block->selectors)) {
+			$this->indentLevel++;
+
+			if ($this->breakSelectors) {
+				$selectorSeparator = $this->selectorSeparator . $this->break . $pre;
+			} else {
+				$selectorSeparator = $this->selectorSeparator;
+			}
+
+			echo $pre .
+				implode($selectorSeparator, $block->selectors);
+			if ($isSingle) {
+				echo $this->openSingle;
+				$inner = "";
+			} else {
+				echo $this->open . $this->break;
+				$inner = $this->indentStr();
+			}
+
+		}
+
+		if (!empty($block->lines)) {
+			$glue = $this->break.$inner;
+			echo $inner . implode($glue, $block->lines);
+			if (!$isSingle && !empty($block->children)) {
+				echo $this->break;
+			}
+		}
+
+		foreach ($block->children as $child) {
+			$this->block($child);
+		}
+
+		if (!empty($block->selectors)) {
+			if (!$isSingle && empty($block->children)) echo $this->break;
+
+			if ($isSingle) {
+				echo $this->closeSingle . $this->break;
+			} else {
+				echo $pre . $this->close . $this->break;
+			}
+
+			$this->indentLevel--;
+		}
+	}
+}
+
+class lessc_formatter_compressed extends lessc_formatter_classic {
+	public $disableSingle = true;
+	public $open = "{";
+	public $selectorSeparator = ",";
+	public $assignSeparator = ":";
+	public $break = "";
+	public $compressColors = true;
+
+	public function indentStr($n = 0) {
+		return "";
+	}
+}
+
+class lessc_formatter_lessjs extends lessc_formatter_classic {
+	public $disableSingle = true;
+	public $breakSelectors = true;
+	public $assignSeparator = ": ";
+	public $selectorSeparator = ",";
+}
+
+
diff --git a/sources/inc/load.php b/sources/inc/load.php
new file mode 100644
index 0000000..c5b40ff
--- /dev/null
+++ b/sources/inc/load.php
@@ -0,0 +1,117 @@
+
+ */
+
+// setup class autoloader
+spl_autoload_register('load_autoload');
+
+// require all the common libraries
+// for a few of these order does matter
+require_once(DOKU_INC.'inc/blowfish.php');
+require_once(DOKU_INC.'inc/actions.php');
+require_once(DOKU_INC.'inc/changelog.php');
+require_once(DOKU_INC.'inc/common.php');
+require_once(DOKU_INC.'inc/confutils.php');
+require_once(DOKU_INC.'inc/pluginutils.php');
+require_once(DOKU_INC.'inc/plugin.php');
+require_once(DOKU_INC.'inc/events.php');
+require_once(DOKU_INC.'inc/form.php');
+require_once(DOKU_INC.'inc/fulltext.php');
+require_once(DOKU_INC.'inc/html.php');
+require_once(DOKU_INC.'inc/httputils.php');
+require_once(DOKU_INC.'inc/indexer.php');
+require_once(DOKU_INC.'inc/infoutils.php');
+require_once(DOKU_INC.'inc/io.php');
+require_once(DOKU_INC.'inc/mail.php');
+require_once(DOKU_INC.'inc/media.php');
+require_once(DOKU_INC.'inc/pageutils.php');
+require_once(DOKU_INC.'inc/parserutils.php');
+require_once(DOKU_INC.'inc/search.php');
+require_once(DOKU_INC.'inc/subscription.php');
+require_once(DOKU_INC.'inc/template.php');
+require_once(DOKU_INC.'inc/toolbar.php');
+require_once(DOKU_INC.'inc/utf8.php');
+require_once(DOKU_INC.'inc/auth.php');
+require_once(DOKU_INC.'inc/compatibility.php');
+
+/**
+ * spl_autoload_register callback
+ *
+ * Contains a static list of DokuWiki's core classes and automatically
+ * require()s their associated php files when an object is instantiated.
+ *
+ * @author Andreas Gohr 
+ * @todo   add generic loading of renderers and auth backends
+ */
+function load_autoload($name){
+    static $classes = null;
+    if(is_null($classes)) $classes = array(
+        'DokuHTTPClient'        => DOKU_INC.'inc/HTTPClient.php',
+        'HTTPClient'            => DOKU_INC.'inc/HTTPClient.php',
+        'JSON'                  => DOKU_INC.'inc/JSON.php',
+        'Diff'                  => DOKU_INC.'inc/DifferenceEngine.php',
+        'UnifiedDiffFormatter'  => DOKU_INC.'inc/DifferenceEngine.php',
+        'TableDiffFormatter'    => DOKU_INC.'inc/DifferenceEngine.php',
+        'cache'                 => DOKU_INC.'inc/cache.php',
+        'cache_parser'          => DOKU_INC.'inc/cache.php',
+        'cache_instructions'    => DOKU_INC.'inc/cache.php',
+        'cache_renderer'        => DOKU_INC.'inc/cache.php',
+        'Doku_Event'            => DOKU_INC.'inc/events.php',
+        'Doku_Event_Handler'    => DOKU_INC.'inc/events.php',
+        'EmailAddressValidator' => DOKU_INC.'inc/EmailAddressValidator.php',
+        'Input'                 => DOKU_INC.'inc/Input.class.php',
+        'JpegMeta'              => DOKU_INC.'inc/JpegMeta.php',
+        'SimplePie'             => DOKU_INC.'inc/SimplePie.php',
+        'FeedParser'            => DOKU_INC.'inc/FeedParser.php',
+        'IXR_Server'            => DOKU_INC.'inc/IXR_Library.php',
+        'IXR_Client'            => DOKU_INC.'inc/IXR_Library.php',
+        'IXR_IntrospectionServer' => DOKU_INC.'inc/IXR_Library.php',
+        'Doku_Plugin_Controller'=> DOKU_INC.'inc/plugincontroller.class.php',
+        'GeSHi'                 => DOKU_INC.'inc/geshi.php',
+        'Tar'                   => DOKU_INC.'inc/Tar.class.php',
+        'TarLib'                => DOKU_INC.'inc/TarLib.class.php',
+        'ZipLib'                => DOKU_INC.'inc/ZipLib.class.php',
+        'DokuWikiFeedCreator'   => DOKU_INC.'inc/feedcreator.class.php',
+        'Doku_Parser_Mode'      => DOKU_INC.'inc/parser/parser.php',
+        'SafeFN'                => DOKU_INC.'inc/SafeFN.class.php',
+        'Sitemapper'            => DOKU_INC.'inc/Sitemapper.php',
+        'PassHash'              => DOKU_INC.'inc/PassHash.class.php',
+        'Mailer'                => DOKU_INC.'inc/Mailer.class.php',
+        'RemoteAPI'             => DOKU_INC.'inc/remote.php',
+        'RemoteAPICore'         => DOKU_INC.'inc/RemoteAPICore.php',
+        'Subscription'          => DOKU_INC.'inc/subscription.php',
+        'Crypt_Base'            => DOKU_INC.'inc/phpseclib/Crypt_Base.php',
+        'Crypt_Rijndael'        => DOKU_INC.'inc/phpseclib/Crypt_Rijndael.php',
+        'Crypt_AES'             => DOKU_INC.'inc/phpseclib/Crypt_AES.php',
+        'Crypt_Hash'            => DOKU_INC.'inc/phpseclib/Crypt_Hash.php',
+        'lessc'                 => DOKU_INC.'inc/lessc.inc.php',
+
+        'DokuWiki_Action_Plugin' => DOKU_PLUGIN.'action.php',
+        'DokuWiki_Admin_Plugin'  => DOKU_PLUGIN.'admin.php',
+        'DokuWiki_Syntax_Plugin' => DOKU_PLUGIN.'syntax.php',
+        'DokuWiki_Remote_Plugin' => DOKU_PLUGIN.'remote.php',
+        'DokuWiki_Auth_Plugin'   => DOKU_PLUGIN.'auth.php',
+
+    );
+
+    if(isset($classes[$name])){
+        require_once($classes[$name]);
+        return;
+    }
+
+    // Plugin loading
+    if(preg_match('/^(auth|helper|syntax|action|admin|renderer|remote)_plugin_('.DOKU_PLUGIN_NAME_REGEX.')(?:_([^_]+))?$/',
+                  $name, $m)) {
+        // try to load the wanted plugin file
+        $c = ((count($m) === 4) ? "/{$m[3]}" : '');
+        $plg = DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
+        if(@file_exists($plg)){
+            include_once DOKU_PLUGIN . "{$m[2]}/{$m[1]}$c.php";
+        }
+        return;
+    }
+}
+
diff --git a/sources/inc/mail.php b/sources/inc/mail.php
new file mode 100644
index 0000000..0b60c0a
--- /dev/null
+++ b/sources/inc/mail.php
@@ -0,0 +1,334 @@
+
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+
+// end of line for mail lines - RFC822 says CRLF but postfix (and other MTAs?)
+// think different
+if(!defined('MAILHEADER_EOL')) define('MAILHEADER_EOL',"\n");
+#define('MAILHEADER_ASCIIONLY',1);
+
+/**
+ * Patterns for use in email detection and validation
+ *
+ * NOTE: there is an unquoted '/' in RFC2822_ATEXT, it must remain unquoted to be used in the parser
+ * the pattern uses non-capturing groups as captured groups aren't allowed in the parser
+ * select pattern delimiters with care!
+ *
+ * May not be completly RFC conform!
+ * @link http://www.faqs.org/rfcs/rfc2822.html (paras 3.4.1 & 3.2.4)
+ *
+ * @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)');
+
+/**
+ * Prepare mailfrom replacement patterns
+ *
+ * Also prepares a mailfromnobody config that contains an autoconstructed address
+ * if the mailfrom one is userdependent and this might not be wanted (subscriptions)
+ *
+ * @author Andreas Gohr 
+ */
+function mail_setup(){
+    global $conf;
+    global $USERINFO;
+
+    // auto constructed address
+    $host = @parse_url(DOKU_URL,PHP_URL_HOST);
+    if(!$host) $host = 'example.com';
+    $noreply = 'noreply@'.$host;
+
+    $replace = array();
+    if(!empty($USERINFO['mail'])){
+        $replace['@MAIL@'] = $USERINFO['mail'];
+    }else{
+        $replace['@MAIL@'] = $noreply;
+    }
+
+    if(!empty($_SERVER['REMOTE_USER'])){
+        $replace['@USER@'] = $_SERVER['REMOTE_USER'];
+    }else{
+        $replace['@USER@'] = 'noreply';
+    }
+
+    if(!empty($USERINFO['name'])){
+        $replace['@NAME@'] = $USERINFO['name'];
+    }else{
+        $replace['@NAME@'] = '';
+    }
+
+    // apply replacements
+    $from = str_replace(array_keys($replace),
+                        array_values($replace),
+                        $conf['mailfrom']);
+
+    // any replacements done? set different mailfromnone
+    if($from != $conf['mailfrom']){
+        $conf['mailfromnobody'] = $noreply;
+    }else{
+        $conf['mailfromnobody'] = $from;
+    }
+    $conf['mailfrom'] = $from;
+}
+
+/**
+ * UTF-8 autoencoding replacement for PHPs mail function
+ *
+ * Email address fields (To, From, Cc, Bcc can contain a textpart and an address
+ * like this: 'Andreas Gohr ' - the text part is encoded
+ * automatically. You can seperate receivers by commas.
+ *
+ * @param string $to      Receiver of the mail (multiple seperated by commas)
+ * @param string $subject Mailsubject
+ * @param string $body    Messagebody
+ * @param string $from    Sender address
+ * @param string $cc      CarbonCopy receiver (multiple seperated by commas)
+ * @param string $bcc     BlindCarbonCopy receiver (multiple seperated by commas)
+ * @param string $headers Additional Headers (seperated by MAILHEADER_EOL
+ * @param string $params  Additonal Sendmail params (passed to mail())
+ *
+ * @author Andreas Gohr 
+ * @see    mail()
+ */
+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');
+}
+
+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;
+
+    // discard mail request if no recipients are available
+    if(trim($to) === '' && trim($cc) === '' && trim($bcc) === '') return false;
+
+    // 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)) {
+        $enc_subj = '=?UTF-8?Q?'.mail_quotedprintable_encode($subject,0).'?=';
+        // Spaces must be encoded according to rfc2047. Use the "_" shorthand
+        $enc_subj = preg_replace('/ /', '_', $enc_subj);
+
+        // quoted printable has length restriction, use base64 if needed
+        if(strlen($subject) > 74){
+            $enc_subj = '=?UTF-8?B?'.base64_encode($subject).'?=';
+        }
+
+        $subject = $enc_subj;
+    }
+
+    $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);
+    }
+}
+
+/**
+ * Encodes an email address header
+ *
+ * Unicode characters will be deaccented and encoded
+ * quoted_printable for headers.
+ * Addresses may not contain Non-ASCII data!
+ *
+ * Example:
+ *   mail_encode_address("föö , me@somewhere.com","TBcc");
+ *
+ * @param string  $string Multiple adresses separated by commas
+ * @param string  $header Name of the header (To,Bcc,Cc,...)
+ * @param boolean $names  Allow named Recipients?
+ */
+function mail_encode_address($string,$header='',$names=true){
+    $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)){
+                // put the quotes outside as in =?UTF-8?Q?"Elan Ruusam=C3=A4e"?= vs "=?UTF-8?Q?Elan Ruusam=C3=A4e?="
+                if (preg_match('/^"(.+)"$/', $text, $matches)) {
+                    $text = '"=?UTF-8?Q?'.mail_quotedprintable_encode($matches[1], 0).'?="';
+                } else {
+                    $text = '=?UTF-8?Q?'.mail_quotedprintable_encode($text, 0).'?=';
+                }
+                // additionally the space character should be encoded as =20 (or each
+                // word QP encoded separately).
+                // however this is needed only in mail headers, not globally in mail_quotedprintable_encode().
+                $text = str_replace(" ", "=20", $text);
+            }
+        }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;
+}
+
+/**
+ * Check if a given mail address is valid
+ *
+ * @param   string $email the address to check
+ * @return  bool          true if address is valid
+ */
+function mail_isvalid($email){
+    $validator = new EmailAddressValidator;
+    $validator->allowLocalAddresses = true;
+    return $validator->check_email_address($email);
+}
+
+/**
+ * Quoted printable encoding
+ *
+ * @author umu 
+ * @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);
+    $cnt = count($aLines);
+
+    for ($i=0;$i<$cnt;$i++) {
+        $sLine =& $aLines[$i];
+        if (strlen($sLine)===0) continue; // do nothing, if empty
+
+        $sRegExp = '/[^\x09\x20\x21-\x3C\x3E-\x7E]/e';
+
+        // imap_8bit encodes x09 everywhere, not only at lineends,
+        // for EBCDIC safeness encode !"#$@[\]^`{|}~,
+        // for complete safeness encode every character :)
+        if ($bEmulate_imap_8bit)
+            $sRegExp = '/[^\x20\x21-\x3C\x3E-\x7E]/';
+
+        $sLine = preg_replace_callback( $sRegExp, 'mail_quotedprintable_encode_callback', $sLine );
+
+        // encode x09,x20 at lineends
+        {
+            $iLength = strlen($sLine);
+            $iLastChar = ord($sLine{$iLength-1});
+
+            //              !!!!!!!!
+            // imap_8_bit does not encode x20 at the very end of a text,
+            // here is, where I don't agree with imap_8_bit,
+            // please correct me, if I'm wrong,
+            // or comment next line for RFC2045 conformance, if you like
+            if (!($bEmulate_imap_8bit && ($i==count($aLines)-1))){
+                if (($iLastChar==0x09)||($iLastChar==0x20)) {
+                    $sLine{$iLength-1}='=';
+                    $sLine .= ($iLastChar==0x09)?'09':'20';
+                }
+            }
+        }    // imap_8bit encodes x20 before chr(13), too
+        // although IMHO not requested by RFC2045, why not do it safer :)
+        // and why not encode any x20 around chr(10) or chr(13)
+        if ($bEmulate_imap_8bit) {
+            $sLine=str_replace(' =0D','=20=0D',$sLine);
+            //$sLine=str_replace(' =0A','=20=0A',$sLine);
+            //$sLine=str_replace('=0D ','=0D=20',$sLine);
+            //$sLine=str_replace('=0A ','=0A=20',$sLine);
+        }
+
+        // finally split into softlines no longer than $maxlen chars,
+        // for even more safeness one could encode x09,x20
+        // at the very first character of the line
+        // and after soft linebreaks, as well,
+        // but this wouldn't be caught by such an easy RegExp
+        if($maxlen){
+            preg_match_all( '/.{1,'.($maxlen - 2).'}([^=]{0,2})?/', $sLine, $aMatch );
+            $sLine = implode( '=' . MAILHEADER_EOL, $aMatch[0] ); // add soft crlf's
+        }
+    }
+
+    // join lines into text
+    return implode(MAILHEADER_EOL,$aLines);
+}
+
+function mail_quotedprintable_encode_callback($matches){
+    return sprintf( "=%02X", ord ( $matches[0] ) ) ;
+}
diff --git a/sources/inc/media.php b/sources/inc/media.php
new file mode 100644
index 0000000..d694264
--- /dev/null
+++ b/sources/inc/media.php
@@ -0,0 +1,2132 @@
+
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+if(!defined('NL')) define('NL',"\n");
+
+/**
+ * Lists pages which currently use a media file selected for deletion
+ *
+ * References uses the same visual as search results and share
+ * their CSS tags except pagenames won't be links.
+ *
+ * @author Matthias Grimm 
+ */
+function media_filesinuse($data,$id){
+    global $lang;
+    echo '
        '.$lang['reference'].' '.hsc(noNS($id)).'
        ';
+    echo '
        '.hsc($lang['ref_inuse']).'
        ';
+
+    $hidden=0; //count of hits without read permission
+    foreach($data as $row){
+        if(auth_quickaclcheck($row) >= AUTH_READ && isVisiblePage($row)){
+            echo '
        ';
+            echo ''.hsc($row).'';
+            echo '
        ';
+        }else
+            $hidden++;
+    }
+    if ($hidden){
+        print '
        '.$lang['ref_hidden'].'
        ';
+    }
+}
+
+/**
+ * Handles the saving of image meta data
+ *
+ * @author Andreas Gohr 
+ * @author Kate Arzamastseva 
+ */
+function media_metasave($id,$auth,$data){
+    if($auth < AUTH_UPLOAD) return false;
+    if(!checkSecurityToken()) return false;
+    global $lang;
+    global $conf;
+    $src = mediaFN($id);
+
+    $meta = new JpegMeta($src);
+    $meta->_parseAll();
+
+    foreach($data as $key => $val){
+        $val=trim($val);
+        if(empty($val)){
+            $meta->deleteField($key);
+        }else{
+            $meta->setField($key,$val);
+        }
+    }
+
+    $old = @filemtime($src);
+    if(!@file_exists(mediaFN($id, $old)) && @file_exists($src)) {
+        // add old revision to the attic
+        media_saveOldRevision($id);
+    }
+
+    if($meta->save()){
+        if($conf['fperm']) chmod($src, $conf['fperm']);
+
+        $new = @filemtime($src);
+        // add a log entry to the media changelog
+        addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT, $lang['media_meta_edited']);
+
+        msg($lang['metasaveok'],1);
+        return $id;
+    }else{
+        msg($lang['metasaveerr'],-1);
+        return false;
+    }
+}
+
+/**
+ * check if a media is external source
+ *
+ * @author Gerrit Uitslag 
+ * @param string $id the media ID or URL
+ * @return bool
+ */
+function media_isexternal($id){
+    if (preg_match('#^(?:https?|ftp)://#i', $id)) return true;
+    return false;
+}
+
+/**
+ * Check if a media item is public (eg, external URL or readable by @ALL)
+ *
+ * @author Andreas Gohr 
+ * @param string $id  the media ID or URL
+ * @return bool
+ */
+function media_ispublic($id){
+    if(media_isexternal($id)) return true;
+    $id = cleanID($id);
+    if(auth_aclcheck(getNS($id).':*', '', array()) >= AUTH_READ) return true;
+    return false;
+}
+
+/**
+ * Display the form to edit image meta data
+ *
+ * @author Andreas Gohr 
+ * @author Kate Arzamastseva 
+ */
+function media_metaform($id,$auth){
+    global $lang, $config_cascade;
+
+    if($auth < AUTH_UPLOAD) {
+        echo '
        '.$lang['media_perm_upload'].'
        '.NL;
+        return false;
+    }
+
+    // load the field descriptions
+    static $fields = null;
+    if(is_null($fields)){
+        $config_files = getConfigFiles('mediameta');
+        foreach ($config_files as $config_file) {
+            if(@file_exists($config_file)) include($config_file);
+        }
+    }
+
+    $src = mediaFN($id);
+
+    // output
+    $form = new Doku_Form(array('action' => media_managerURL(array('tab_details' => 'view'), '&'),
+                                'class' => 'meta'));
+    $form->addHidden('img', $id);
+    $form->addHidden('mediado', 'save');
+    foreach($fields as $key => $field){
+        // get current value
+        if (empty($field[0])) continue;
+        $tags = array($field[0]);
+        if(is_array($field[3])) $tags = array_merge($tags,$field[3]);
+        $value = tpl_img_getTag($tags,'',$src);
+        $value = cleanText($value);
+
+        // prepare attributes
+        $p = array();
+        $p['class'] = 'edit';
+        $p['id']    = 'meta__'.$key;
+        $p['name']  = 'meta['.$field[0].']';
+        $p_attrs    = array('class' => 'edit');
+
+        $form->addElement('
        ');
+        if($field[2] == 'text'){
+            $form->addElement(form_makeField('text', $p['name'], $value, ($lang[$field[1]]) ? $lang[$field[1]] : $field[1] . ':', $p['id'], $p['class'], $p_attrs));
+        }else{
+            $att = buildAttributes($p);
+            $form->addElement('');
+            $form->addElement("');
+        }
+        $form->addElement('
        '.NL);
+    }
+    $form->addElement('
        ');
+    $form->addElement(form_makeButton('submit', '', $lang['btn_save'], array('accesskey' => 's', 'name' => 'mediado[save]')));
+    $form->addElement('
        '.NL);
+    $form->printForm();
+}
+
+/**
+ * Convenience function to check if a media file is still in use
+ *
+ * @author Michael Klier 
+ */
+function media_inuse($id) {
+    global $conf;
+    $mediareferences = array();
+    if($conf['refcheck']){
+        $mediareferences = ft_mediause($id,true);
+        if(!count($mediareferences)) {
+            return false;
+        } else {
+            return $mediareferences;
+        }
+    } else {
+        return false;
+    }
+}
+
+define('DOKU_MEDIA_DELETED', 1);
+define('DOKU_MEDIA_NOT_AUTH', 2);
+define('DOKU_MEDIA_INUSE', 4);
+define('DOKU_MEDIA_EMPTY_NS', 8);
+
+/**
+ * Handles media file deletions
+ *
+ * If configured, checks for media references before deletion
+ *
+ * @author Andreas Gohr 
+ * @return int One of: 0,
+ *                     DOKU_MEDIA_DELETED,
+ *                     DOKU_MEDIA_DELETED | DOKU_MEDIA_EMPTY_NS,
+ *                     DOKU_MEDIA_NOT_AUTH,
+ *                     DOKU_MEDIA_INUSE
+ */
+function media_delete($id,$auth){
+    global $lang;
+    if($auth < AUTH_DELETE) return DOKU_MEDIA_NOT_AUTH;
+    if(media_inuse($id)) return DOKU_MEDIA_INUSE;
+
+    $file = mediaFN($id);
+
+    // trigger an event - MEDIA_DELETE_FILE
+    $data['id']   = $id;
+    $data['name'] = utf8_basename($file);
+    $data['path'] = $file;
+    $data['size'] = (@file_exists($file)) ? filesize($file) : 0;
+
+    $data['unl'] = false;
+    $data['del'] = false;
+    $evt = new Doku_Event('MEDIA_DELETE_FILE',$data);
+    if ($evt->advise_before()) {
+        $old = @filemtime($file);
+        if(!@file_exists(mediaFN($id, $old)) && @file_exists($file)) {
+            // add old revision to the attic
+            media_saveOldRevision($id);
+        }
+
+        $data['unl'] = @unlink($file);
+        if($data['unl']){
+            addMediaLogEntry(time(), $id, DOKU_CHANGE_TYPE_DELETE, $lang['deleted']);
+            $data['del'] = io_sweepNS($id,'mediadir');
+        }
+    }
+    $evt->advise_after();
+    unset($evt);
+
+    if($data['unl'] && $data['del']){
+        return DOKU_MEDIA_DELETED | DOKU_MEDIA_EMPTY_NS;
+    }
+
+    return $data['unl'] ? DOKU_MEDIA_DELETED : 0;
+}
+
+/**
+ * Handle file uploads via XMLHttpRequest
+ *
+ * @return mixed false on error, id of the new file on success
+ */
+function media_upload_xhr($ns,$auth){
+    if(!checkSecurityToken()) return false;
+    global $INPUT;
+
+    $id = $INPUT->get->str('qqfile');
+    list($ext,$mime,$dl) = mimetype($id);
+    $input = fopen("php://input", "r");
+    if (!($tmp = io_mktmpdir())) return false;
+    $path = $tmp.'/'.md5($id);
+    $target = fopen($path, "w");
+    $realSize = stream_copy_to_stream($input, $target);
+    fclose($target);
+    fclose($input);
+    if (isset($_SERVER["CONTENT_LENGTH"]) && ($realSize != (int)$_SERVER["CONTENT_LENGTH"])){
+        unlink($path);
+        return false;
+    }
+
+    $res = media_save(
+        array('name' => $path,
+            'mime' => $mime,
+            'ext'  => $ext),
+        $ns.':'.$id,
+        (($INPUT->get->str('ow') == 'checked') ? true : false),
+        $auth,
+        'copy'
+    );
+    unlink($path);
+    if ($tmp) dir_delete($tmp);
+    if (is_array($res)) {
+        msg($res[0], $res[1]);
+        return false;
+    }
+    return $res;
+}
+
+/**
+ * Handles media file uploads
+ *
+ * @author Andreas Gohr 
+ * @author Michael Klier 
+ * @return mixed false on error, id of the new file on success
+ */
+function media_upload($ns,$auth,$file=false){
+    if(!checkSecurityToken()) return false;
+    global $lang;
+    global $INPUT;
+
+    // get file and id
+    $id   = $INPUT->post->str('mediaid');
+    if (!$file) $file = $_FILES['upload'];
+    if(empty($id)) $id = $file['name'];
+
+    // 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']);
+    list($iext,$imime,$dl) = mimetype($id);
+    if($fext && !$iext){
+        // no extension specified in id - read original one
+        $id   .= '.'.$fext;
+        $imime = $fmime;
+    }elseif($fext && $fext != $iext){
+        // extension was changed, print warning
+        msg(sprintf($lang['mediaextchange'],$fext,$iext));
+    }
+
+    $res = media_save(array('name' => $file['tmp_name'],
+                            'mime' => $imime,
+                            'ext'  => $iext), $ns.':'.$id,
+                      $INPUT->post->bool('ow'), $auth, 'copy_uploaded_file');
+    if (is_array($res)) {
+        msg($res[0], $res[1]);
+        return false;
+    }
+    return $res;
+}
+
+/**
+ * An alternative to move_uploaded_file that copies
+ *
+ * Using copy, makes sure any setgid bits on the media directory are honored
+ *
+ * @see   move_uploaded_file()
+ * @param string $from
+ * @param string $to
+ * @return bool
+ */
+function copy_uploaded_file($from, $to){
+    if(!is_uploaded_file($from)) return false;
+    $ok = copy($from, $to);
+    @unlink($from);
+    return $ok;
+}
+
+/**
+ * This generates an action event and delegates to _media_upload_action().
+ * Action plugins are allowed to pre/postprocess the uploaded file.
+ * (The triggered event is preventable.)
+ *
+ * Event data:
+ * $data[0]     fn_tmp: the temporary file name (read from $_FILES)
+ * $data[1]     fn: the file name of the uploaded file
+ * $data[2]     id: the future directory id of the uploaded file
+ * $data[3]     imime: the mimetype of the uploaded file
+ * $data[4]     overwrite: if an existing file is going to be overwritten
+ *
+ * @triggers MEDIA_UPLOAD_FINISH
+ */
+function media_save($file, $id, $ow, $auth, $move) {
+    if($auth < AUTH_UPLOAD) {
+        return array("You don't have permissions to upload files.", -1);
+    }
+
+    if (!isset($file['mime']) || !isset($file['ext'])) {
+        list($ext, $mime) = mimetype($id);
+        if (!isset($file['mime'])) {
+            $file['mime'] = $mime;
+        }
+        if (!isset($file['ext'])) {
+            $file['ext'] = $ext;
+        }
+    }
+
+    global $lang, $conf;
+
+    // get filename
+    $id   = cleanID($id);
+    $fn   = mediaFN($id);
+
+    // get filetype regexp
+    $types = array_keys(getMimeTypes());
+    $types = array_map(create_function('$q','return preg_quote($q,"/");'),$types);
+    $regex = join('|',$types);
+
+    // because a temp file was created already
+    if(!preg_match('/\.('.$regex.')$/i',$fn)) {
+        return array($lang['uploadwrong'],-1);
+    }
+
+    //check for overwrite
+    $overwrite = @file_exists($fn);
+    $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
+    if($overwrite && (!$ow || $auth < $auth_ow)) {
+        return array($lang['uploadexist'], 0);
+    }
+    // check for valid content
+    $ok = media_contentcheck($file['name'], $file['mime']);
+    if($ok == -1){
+        return array(sprintf($lang['uploadbadcontent'],'.' . $file['ext']),-1);
+    }elseif($ok == -2){
+        return array($lang['uploadspam'],-1);
+    }elseif($ok == -3){
+        return array($lang['uploadxss'],-1);
+    }
+
+    // prepare event data
+    $data[0] = $file['name'];
+    $data[1] = $fn;
+    $data[2] = $id;
+    $data[3] = $file['mime'];
+    $data[4] = $overwrite;
+    $data[5] = $move;
+
+    // trigger event
+    return trigger_event('MEDIA_UPLOAD_FINISH', $data, '_media_upload_action', true);
+}
+
+/**
+ * Callback adapter for media_upload_finish()
+ * @author Michael Klier 
+ */
+function _media_upload_action($data) {
+    // fixme do further sanity tests of given data?
+    if(is_array($data) && count($data)===6) {
+        return media_upload_finish($data[0], $data[1], $data[2], $data[3], $data[4], $data[5]);
+    } else {
+        return false; //callback error
+    }
+}
+
+/**
+ * Saves an uploaded media file
+ *
+ * @author Andreas Gohr 
+ * @author Michael Klier 
+ * @author Kate Arzamastseva 
+ */
+function media_upload_finish($fn_tmp, $fn, $id, $imime, $overwrite, $move = 'move_uploaded_file') {
+    global $conf;
+    global $lang;
+    global $REV;
+
+    $old = @filemtime($fn);
+    if(!@file_exists(mediaFN($id, $old)) && @file_exists($fn)) {
+        // add old revision to the attic if missing
+        media_saveOldRevision($id);
+    }
+
+    // prepare directory
+    io_createNamespace($id, 'media');
+
+    if($move($fn_tmp, $fn)) {
+        @clearstatcache(true,$fn);
+        $new = @filemtime($fn);
+        // Set the correct permission here.
+        // Always chmod media because they may be saved with different permissions than expected from the php umask.
+        // (Should normally chmod to $conf['fperm'] only if $conf['fperm'] is set.)
+        chmod($fn, $conf['fmode']);
+        msg($lang['uploadsucc'],1);
+        media_notify($id,$fn,$imime,$old);
+        // add a log entry to the media changelog
+        if ($REV){
+            addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_REVERT, sprintf($lang['restored'], dformat($REV)), $REV);
+        } elseif ($overwrite) {
+            addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_EDIT);
+        } else {
+            addMediaLogEntry($new, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created']);
+        }
+        return $id;
+    }else{
+        return array($lang['uploadfail'],-1);
+    }
+}
+
+/**
+ * Moves the current version of media file to the media_attic
+ * directory
+ *
+ * @author Kate Arzamastseva 
+ * @param string $id
+ * @return int - revision date
+ */
+function media_saveOldRevision($id){
+    global $conf, $lang;
+
+    $oldf = mediaFN($id);
+    if(!@file_exists($oldf)) return '';
+    $date = filemtime($oldf);
+    if (!$conf['mediarevisions']) return $date;
+
+    if (!getRevisionInfo($id, $date, 8192, true)) {
+        // there was an external edit,
+        // there is no log entry for current version of file
+        if (!@file_exists(mediaMetaFN($id,'.changes'))) {
+            addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_CREATE, $lang['created']);
+        } else {
+            addMediaLogEntry($date, $id, DOKU_CHANGE_TYPE_EDIT);
+        }
+    }
+
+    $newf = mediaFN($id,$date);
+    io_makeFileDir($newf);
+    if(copy($oldf, $newf)) {
+        // Set the correct permission here.
+        // Always chmod media because they may be saved with different permissions than expected from the php umask.
+        // (Should normally chmod to $conf['fperm'] only if $conf['fperm'] is set.)
+        chmod($newf, $conf['fmode']);
+    }
+    return $date;
+}
+
+/**
+ * This function checks if the uploaded content is really what the
+ * mimetype says it is. We also do spam checking for text types here.
+ *
+ * We need to do this stuff because we can not rely on the browser
+ * to do this check correctly. Yes, IE is broken as usual.
+ *
+ * @author Andreas Gohr 
+ * @link   http://www.splitbrain.org/blog/2007-02/12-internet_explorer_facilitates_cross_site_scripting
+ * @fixme  check all 26 magic IE filetypes here?
+ */
+function media_contentcheck($file,$mime){
+    global $conf;
+    if($conf['iexssprotect']){
+        $fh = @fopen($file, 'rb');
+        if($fh){
+            $bytes = fread($fh, 256);
+            fclose($fh);
+            if(preg_match('/<(script|a|img|html|body|iframe)[\s>]/i',$bytes)){
+                return -3;
+            }
+        }
+    }
+    if(substr($mime,0,6) == 'image/'){
+        $info = @getimagesize($file);
+        if($mime == 'image/gif' && $info[2] != 1){
+            return -1;
+        }elseif($mime == 'image/jpeg' && $info[2] != 2){
+            return -1;
+        }elseif($mime == 'image/png' && $info[2] != 3){
+            return -1;
+        }
+        # fixme maybe check other images types as well
+    }elseif(substr($mime,0,5) == 'text/'){
+        global $TEXT;
+        $TEXT = io_readFile($file);
+        if(checkwordblock()){
+            return -2;
+        }
+    }
+    return 0;
+}
+
+/**
+ * Send a notify mail on uploads
+ *
+ * @author Andreas Gohr 
+ */
+function media_notify($id,$file,$mime,$old_rev=false){
+    global $conf;
+    if(empty($conf['notify'])) return; //notify enabled?
+
+    $subscription = new Subscription();
+    return $subscription->send_media_diff($conf['notify'], 'uploadmail', $id, $old_rev, '');
+}
+
+/**
+ * List all files in a given Media namespace
+ */
+function media_filelist($ns,$auth=null,$jump='',$fullscreenview=false,$sort=false){
+    global $conf;
+    global $lang;
+    $ns = cleanID($ns);
+
+    // check auth our self if not given (needed for ajax calls)
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    if (!$fullscreenview) echo '
        :'.hsc($ns).'
        '.NL;
+
+    if($auth < AUTH_READ){
+        // FIXME: print permission warning here instead?
+        echo '
        '.$lang['nothingfound'].'
        '.NL;
+    }else{
+        if (!$fullscreenview) {
+            media_uploadform($ns, $auth);
+            media_searchform($ns);
+        }
+
+        $dir = utf8_encodeFN(str_replace(':','/',$ns));
+        $data = array();
+        search($data,$conf['mediadir'],'search_media',
+                array('showmsg'=>true,'depth'=>1),$dir,1,$sort);
+
+        if(!count($data)){
+            echo '
        '.$lang['nothingfound'].'
        '.NL;
+        }else {
+            if ($fullscreenview) {
+                echo '
          ';
+            }
+            foreach($data as $item){
+                if (!$fullscreenview) {
+                    media_printfile($item,$auth,$jump);
+                } else {
+                    media_printfile_thumbs($item,$auth,$jump);
+                }
+            }
+            if ($fullscreenview) echo '
        '.NL;
+        }
+    }
+}
+
+/**
+ * Prints tabs for files list actions
+ *
+ * @author Kate Arzamastseva 
+ * @author Adrian Lang 
+ *
+ * @param string $selected_tab - opened tab
+ */
+
+function media_tabs_files($selected_tab = ''){
+    global $lang;
+    $tabs = array();
+    foreach(array('files'  => 'mediaselect',
+                  'upload' => 'media_uploadtab',
+                  'search' => 'media_searchtab') as $tab => $caption) {
+        $tabs[$tab] = array('href'    => media_managerURL(array('tab_files' => $tab), '&'),
+                            'caption' => $lang[$caption]);
+    }
+
+    html_tabs($tabs, $selected_tab);
+}
+
+/**
+ * Prints tabs for files details actions
+ *
+ * @author Kate Arzamastseva 
+ * @param string $selected_tab - opened tab
+ */
+function media_tabs_details($image, $selected_tab = ''){
+    global $lang, $conf;
+
+    $tabs = array();
+    $tabs['view'] = array('href'    => media_managerURL(array('tab_details' => 'view'), '&'),
+                          'caption' => $lang['media_viewtab']);
+
+    list($ext, $mime) = mimetype($image);
+    if ($mime == 'image/jpeg' && @file_exists(mediaFN($image))) {
+        $tabs['edit'] = array('href'    => media_managerURL(array('tab_details' => 'edit'), '&'),
+                              'caption' => $lang['media_edittab']);
+    }
+    if ($conf['mediarevisions']) {
+        $tabs['history'] = array('href'    => media_managerURL(array('tab_details' => 'history'), '&'),
+                                 'caption' => $lang['media_historytab']);
+    }
+
+    html_tabs($tabs, $selected_tab);
+}
+
+/**
+ * Prints options for the tab that displays a list of all files
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_tab_files_options(){
+    global $lang;
+    global $NS;
+    global $INPUT;
+    global $ID;
+    $form = new Doku_Form(array('class' => 'options', 'method' => 'get',
+                                'action' => wl($ID)));
+    $media_manager_params = media_managerURL(array(), '', false, true);
+    foreach($media_manager_params as $pKey => $pVal){
+        $form->addHidden($pKey, $pVal);
+    }
+    $form->addHidden('sectok', null);
+    if ($INPUT->has('q')) {
+        $form->addHidden('q', $INPUT->str('q'));
+    }
+    $form->addElement('
          '.NL);
+    foreach(array('list' => array('listType', array('thumbs', 'rows')),
+                  'sort' => array('sortBy', array('name', 'date')))
+            as $group => $content) {
+        $checked = "_media_get_${group}_type";
+        $checked = $checked();
+
+        $form->addElement('
        • ');
+        foreach($content[1] as $option) {
+            $attrs = array();
+            if ($checked == $option) {
+                $attrs['checked'] = 'checked';
+            }
+            $form->addElement(form_makeRadioField($group, $option,
+                                       $lang['media_' . $group . '_' . $option],
+                                                  $content[0] . '__' . $option,
+                                                  $option, $attrs));
+        }
+        $form->addElement('
          • '.NL);
+    }
+    $form->addElement('
        • ');
+    $form->addElement(form_makeButton('submit', '', $lang['btn_apply']));
+    $form->addElement('
          • '.NL);
+    $form->addElement('
        '.NL);
+    $form->printForm();
+}
+
+/**
+ * Returns type of sorting for the list of files in media manager
+ *
+ * @author Kate Arzamastseva 
+ * @return string - sort type
+ */
+function _media_get_sort_type() {
+    return _media_get_display_param('sort', array('default' => 'name', 'date'));
+}
+
+function _media_get_list_type() {
+    return _media_get_display_param('list', array('default' => 'thumbs', 'rows'));
+}
+
+function _media_get_display_param($param, $values) {
+    global $INPUT;
+    if (in_array($INPUT->str($param), $values)) {
+        // FIXME: Set cookie
+        return $INPUT->str($param);
+    } else {
+        $val = get_doku_pref($param, $values['default']);
+        if (!in_array($val, $values)) {
+            $val = $values['default'];
+        }
+        return $val;
+    }
+}
+
+/**
+ * Prints tab that displays a list of all files
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_tab_files($ns,$auth=null,$jump='') {
+    global $lang;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    if($auth < AUTH_READ){
+        echo '
        '.$lang['media_perm_read'].'
        '.NL;
+    }else{
+        media_filelist($ns,$auth,$jump,true,_media_get_sort_type());
+    }
+}
+
+/**
+ * Prints tab that displays uploading form
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_tab_upload($ns,$auth=null,$jump='') {
+    global $lang;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    echo '
        '.NL;
+    if ($auth >= AUTH_UPLOAD) {
+        echo '
        ' . $lang['mediaupload'] . '
        ';
+    }
+    media_uploadform($ns, $auth, true);
+    echo '
        '.NL;
+}
+
+/**
+ * Prints tab that displays search form
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_tab_search($ns,$auth=null) {
+    global $lang;
+    global $INPUT;
+
+    $do = $INPUT->str('mediado');
+    $query = $INPUT->str('q');
+    echo '
        '.NL;
+
+    media_searchform($ns, $query, true);
+    if ($do == 'searchlist' || $query) {
+        media_searchlist($query,$ns,$auth,true,_media_get_sort_type());
+    }
+    echo '
        '.NL;
+}
+
+/**
+ * Prints tab that displays mediafile details
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_tab_view($image, $ns, $auth=null, $rev=false) {
+    global $lang, $conf;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    if ($image && $auth >= AUTH_READ) {
+        $meta = new JpegMeta(mediaFN($image, $rev));
+        media_preview($image, $auth, $rev, $meta);
+        media_preview_buttons($image, $auth, $rev);
+        media_details($image, $auth, $rev, $meta);
+
+    } else {
+        echo '
        '.$lang['media_perm_read'].'
        '.NL;
+    }
+}
+
+/**
+ * Prints tab that displays form for editing mediafile metadata
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_tab_edit($image, $ns, $auth=null) {
+    global $lang;
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+
+    if ($image) {
+        list($ext, $mime) = mimetype($image);
+        if ($mime == 'image/jpeg') media_metaform($image,$auth);
+    }
+}
+
+/**
+ * Prints tab that displays mediafile revisions
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_tab_history($image, $ns, $auth=null) {
+    global $lang;
+    global $INPUT;
+
+    if(is_null($auth)) $auth = auth_quickaclcheck("$ns:*");
+    $do = $INPUT->str('mediado');
+
+    if ($auth >= AUTH_READ && $image) {
+        if ($do == 'diff'){
+            media_diff($image, $ns, $auth);
+        } else {
+            $first = $INPUT->int('first');
+            html_revisions($first, $image);
+        }
+    } else {
+        echo '
        '.$lang['media_perm_read'].'
        '.NL;
+    }
+}
+
+/**
+ * Prints mediafile details
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_preview($image, $auth, $rev=false, $meta=false) {
+
+    $size = media_image_preview_size($image, $rev, $meta);
+
+    if ($size) {
+        global $lang;
+        echo '
        ';
+
+        $more = array();
+        if ($rev) {
+            $more['rev'] = $rev;
+        } else {
+            $t = @filemtime(mediaFN($image));
+            $more['t'] = $t;
+        }
+
+        $more['w'] = $size[0];
+        $more['h'] = $size[1];
+        $src = ml($image, $more);
+
+        echo '';
+        echo '';
+        echo '';
+
+        echo '
        '.NL;
+    }
+}
+
+/**
+ * Prints mediafile action buttons
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_preview_buttons($image, $auth, $rev=false) {
+    global $lang, $conf;
+
+    echo '
          '.NL;
+
+    if($auth >= AUTH_DELETE && !$rev && @file_exists(mediaFN($image))){
+
+        // delete button
+        $form = new Doku_Form(array('id' => 'mediamanager__btn_delete',
+            'action'=>media_managerURL(array('delete' => $image), '&')));
+        $form->addElement(form_makeButton('submit','',$lang['btn_delete']));
+        echo '
        • ';
+        $form->printForm();
+        echo '
          • '.NL;
+    }
+
+    $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
+    if($auth >= $auth_ow && !$rev){
+
+        // upload new version button
+        $form = new Doku_Form(array('id' => 'mediamanager__btn_update',
+            'action'=>media_managerURL(array('image' => $image, 'mediado' => 'update'), '&')));
+        $form->addElement(form_makeButton('submit','',$lang['media_update']));
+        echo '
        • ';
+        $form->printForm();
+        echo '
          • '.NL;
+    }
+
+    if($auth >= AUTH_UPLOAD && $rev && $conf['mediarevisions'] && @file_exists(mediaFN($image, $rev))){
+
+        // restore button
+        $form = new Doku_Form(array('id' => 'mediamanager__btn_restore',
+            'action'=>media_managerURL(array('image' => $image), '&')));
+        $form->addHidden('mediado','restore');
+        $form->addHidden('rev',$rev);
+        $form->addElement(form_makeButton('submit','',$lang['media_restore']));
+        echo '
        • ';
+        $form->printForm();
+        echo '
          • '.NL;
+    }
+
+    echo '
        '.NL;
+}
+
+/**
+ * Returns image width and height for mediamanager preview panel
+ *
+ * @author Kate Arzamastseva 
+ * @param string $image
+ * @param int $rev
+ * @param JpegMeta $meta
+ * @return array
+ */
+function media_image_preview_size($image, $rev, $meta, $size = 500) {
+    if (!preg_match("/\.(jpe?g|gif|png)$/", $image) || !file_exists(mediaFN($image, $rev))) return false;
+
+    $info = getimagesize(mediaFN($image, $rev));
+    $w = (int) $info[0];
+    $h = (int) $info[1];
+
+    if($meta && ($w > $size || $h > $size)){
+        $ratio = $meta->getResizeRatio($size, $size);
+        $w = floor($w * $ratio);
+        $h = floor($h * $ratio);
+    }
+    return array($w, $h);
+}
+
+/**
+ * Returns the requested EXIF/IPTC tag from the image meta
+ *
+ * @author Kate Arzamastseva 
+ * @param array $tags
+ * @param JpegMeta $meta
+ * @param string $alt
+ * @return string
+ */
+function media_getTag($tags,$meta,$alt=''){
+    if($meta === false) return $alt;
+    $info = $meta->getField($tags);
+    if($info == false) return $alt;
+    return $info;
+}
+
+/**
+ * Returns mediafile tags
+ *
+ * @author Kate Arzamastseva 
+ * @param JpegMeta $meta
+ * @return array
+ */
+function media_file_tags($meta) {
+    global $config_cascade;
+
+    // load the field descriptions
+    static $fields = null;
+    if(is_null($fields)){
+        $config_files = getConfigFiles('mediameta');
+        foreach ($config_files as $config_file) {
+            if(@file_exists($config_file)) include($config_file);
+        }
+    }
+
+    $tags = array();
+
+    foreach($fields as $key => $tag){
+        $t = array();
+        if (!empty($tag[0])) $t = array($tag[0]);
+        if(is_array($tag[3])) $t = array_merge($t,$tag[3]);
+        $value = media_getTag($t, $meta);
+        $tags[] = array('tag' => $tag, 'value' => $value);
+    }
+
+    return $tags;
+}
+
+/**
+ * Prints mediafile tags
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_details($image, $auth, $rev=false, $meta=false) {
+    global $lang;
+
+    if (!$meta) $meta = new JpegMeta(mediaFN($image, $rev));
+    $tags = media_file_tags($meta);
+
+    echo '
        '.NL;
+    foreach($tags as $tag){
+        if ($tag['value']) {
+            $value = cleanText($tag['value']);
+            echo '
        '.$lang[$tag['tag'][1]].':
        ';
+            if ($tag['tag'][2] == 'date') echo dformat($value);
+            else echo hsc($value);
+            echo '
        '.NL;
+        }
+    }
+    echo '
        '.NL;
+}
+
+/**
+ * Shows difference between two revisions of file
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_diff($image, $ns, $auth, $fromajax = false) {
+    global $lang;
+    global $conf;
+    global $INPUT;
+
+    if ($auth < AUTH_READ || !$image || !$conf['mediarevisions']) return '';
+
+    $rev1 = $INPUT->int('rev');
+
+    $rev2 = $INPUT->ref('rev2');
+    if(is_array($rev2)){
+        $rev1 = (int) $rev2[0];
+        $rev2 = (int) $rev2[1];
+
+        if(!$rev1){
+            $rev1 = $rev2;
+            unset($rev2);
+        }
+    }else{
+        $rev2 = $INPUT->int('rev2');
+    }
+
+    if ($rev1 && !file_exists(mediaFN($image, $rev1))) $rev1 = false;
+    if ($rev2 && !file_exists(mediaFN($image, $rev2))) $rev2 = false;
+
+    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($image, 0, 1, 8192, true);
+        if (file_exists(mediaFN($image, $revs[0]))) {
+            $l_rev = $revs[0];
+        } else {
+            $l_rev = '';
+        }
+    }
+
+    // prepare event data
+    $data[0] = $image;
+    $data[1] = $l_rev;
+    $data[2] = $r_rev;
+    $data[3] = $ns;
+    $data[4] = $auth;
+    $data[5] = $fromajax;
+
+    // trigger event
+    return trigger_event('MEDIA_DIFF', $data, '_media_file_diff', true);
+
+}
+
+function _media_file_diff($data) {
+    if(is_array($data) && count($data)===6) {
+        return media_file_diff($data[0], $data[1], $data[2], $data[3], $data[4], $data[5]);
+    } else {
+        return false;
+    }
+}
+
+/**
+ * Shows difference between two revisions of image
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_file_diff($image, $l_rev, $r_rev, $ns, $auth, $fromajax){
+    global $lang;
+    global $config_cascade;
+    global $INPUT;
+
+    $l_meta = new JpegMeta(mediaFN($image, $l_rev));
+    $r_meta = new JpegMeta(mediaFN($image, $r_rev));
+
+    $is_img = preg_match("/\.(jpe?g|gif|png)$/", $image);
+    if ($is_img) {
+        $l_size = media_image_preview_size($image, $l_rev, $l_meta);
+        $r_size = media_image_preview_size($image, $r_rev, $r_meta);
+        $is_img = ($l_size && $r_size && ($l_size[0] >= 30 || $r_size[0] >= 30));
+
+        $difftype = $INPUT->str('difftype');
+
+        if (!$fromajax) {
+            $form = new Doku_Form(array(
+                'action' => media_managerURL(array(), '&'),
+                'method' => 'get',
+                'id' => 'mediamanager__form_diffview',
+                'class' => 'diffView'
+            ));
+            $form->addHidden('sectok', null);
+            $form->addElement('');
+            $form->addElement('');
+            $form->addHidden('mediado', 'diff');
+            $form->printForm();
+
+            echo NL.'
        '.NL;
+        }
+
+        if ($difftype == 'opacity' || $difftype == 'portions') {
+            media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $difftype);
+            if (!$fromajax) echo '
        ';
+            return '';
+        }
+    }
+
+    list($l_head, $r_head) = html_diff_head($l_rev, $r_rev, $image, true);
+
+    ?>
+    
        
+    
+      
+        
+        
+      
+    ';
+    echo '';
+
+    echo '';
+    echo ''.NL;
+
+    echo '';
+    echo '';
+
+    echo '';
+    echo ''.NL;
+
+    $l_tags = media_file_tags($l_meta);
+    $r_tags = media_file_tags($r_meta);
+    // FIXME r_tags-only stuff
+    foreach ($l_tags as $key => $l_tag) {
+        if ($l_tag['value'] != $r_tags[$key]['value']) {
+            $r_tags[$key]['highlighted'] = true;
+            $l_tags[$key]['highlighted'] = true;
+        } else if (!$l_tag['value'] || !$r_tags[$key]['value']) {
+            unset($r_tags[$key]);
+            unset($l_tags[$key]);
+        }
+    }
+
+    echo '';
+    foreach(array($l_tags,$r_tags) as $tags){
+        echo '';
+    }
+    echo ''.NL;
+
+    echo '
        ';
+    media_preview($image, $auth, $l_rev, $l_meta);
+    echo '';
+    media_preview($image, $auth, $r_rev, $r_meta);
+    echo '
        ';
+    media_preview_buttons($image, $auth, $l_rev);
+    echo '';
+    media_preview_buttons($image, $auth, $r_rev);
+    echo '
        '.NL;
+
+        echo '
        ';
+        foreach($tags as $tag){
+            $value = cleanText($tag['value']);
+            if (!$value) $value = '-';
+            echo '
        '.$lang[$tag['tag'][1]].':
        ';
+            echo '
        ';
+            if ($tag['highlighted']) {
+                echo '';
+            }
+            if ($tag['tag'][2] == 'date') echo dformat($value);
+            else echo hsc($value);
+            if ($tag['highlighted']) {
+                echo '';
+            }
+            echo '
        ';
+        }
+        echo '
        '.NL;
+
+        echo '
        '.NL;
+    echo '
        '.NL;
+
+    if ($is_img && !$fromajax) echo '';
+}
+
+/**
+ * Prints two images side by side
+ * and slider
+ *
+ * @author Kate Arzamastseva 
+ * @param string $image
+ * @param int $l_rev
+ * @param int $r_rev
+ * @param array $l_size
+ * @param array $r_size
+ * @param string $type
+ */
+function media_image_diff($image, $l_rev, $r_rev, $l_size, $r_size, $type) {
+    if ($l_size != $r_size) {
+        if ($r_size[0] > $l_size[0]) {
+            $l_size = $r_size;
+        }
+    }
+
+    $l_more = array('rev' => $l_rev, 'h' => $l_size[1], 'w' => $l_size[0]);
+    $r_more = array('rev' => $r_rev, 'h' => $l_size[1], 'w' => $l_size[0]);
+
+    $l_src = ml($image, $l_more);
+    $r_src = ml($image, $r_more);
+
+    // slider
+    echo '
        '.NL;
+
+    // two images in divs
+    echo '
        '.NL;
+    echo '
        ';
+    echo '';
+    echo '
        '.NL;
+    echo '
        ';
+    echo '';
+    echo '
        '.NL;
+    echo '
        '.NL;
+}
+
+/**
+ * Restores an old revision of a media file
+ *
+ * @param string $image
+ * @param int $rev
+ * @param int $auth
+ * @return string - file's id
+ * @author Kate Arzamastseva 
+ */
+function media_restore($image, $rev, $auth){
+    global $conf;
+    if ($auth < AUTH_UPLOAD || !$conf['mediarevisions']) return false;
+    $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')));
+    if (!$image || (!file_exists(mediaFN($image)) && !$removed)) return false;
+    if (!$rev || !file_exists(mediaFN($image, $rev))) return false;
+    list($iext,$imime,$dl) = mimetype($image);
+    $res = media_upload_finish(mediaFN($image, $rev),
+        mediaFN($image),
+        $image,
+        $imime,
+        true,
+        'copy');
+    if (is_array($res)) {
+        msg($res[0], $res[1]);
+        return false;
+    }
+    return $res;
+}
+
+/**
+ * List all files found by the search request
+ *
+ * @author Tobias Sarnowski 
+ * @author Andreas Gohr 
+ * @author Kate Arzamastseva 
+ * @triggers MEDIA_SEARCH
+ */
+function media_searchlist($query,$ns,$auth=null,$fullscreen=false,$sort='natural'){
+    global $conf;
+    global $lang;
+
+    $ns = cleanID($ns);
+
+    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,
+                    1,
+                    $sort);
+        }
+        $evt->advise_after();
+        unset($evt);
+    }
+
+    if (!$fullscreen) {
+        echo '
        '.sprintf($lang['searchmedia_in'],hsc($ns).':*').'
        '.NL;
+        media_searchform($ns,$query);
+    }
+
+    if(!count($evdata['data'])){
+        echo '
        '.$lang['nothingfound'].'
        '.NL;
+    }else {
+        if ($fullscreen) {
+            echo '
          ';
+        }
+        foreach($evdata['data'] as $item){
+            if (!$fullscreen) media_printfile($item,$item['perm'],'',true);
+            else media_printfile_thumbs($item,$item['perm'],false,true);
+        }
+        if ($fullscreen) echo '
        '.NL;
+    }
+}
+
+/**
+ * Formats and prints one file in the list
+ */
+function media_printfile($item,$auth,$jump,$display_namespace=false){
+    global $lang;
+    global $conf;
+
+    // Prepare zebra coloring
+    // I always wanted to use this variable name :-D
+    static $twibble = 1;
+    $twibble *= -1;
+    $zebra = ($twibble == -1) ? 'odd' : 'even';
+
+    // Automatically jump to recent action
+    if($jump == $item['id']) {
+        $jump = ' id="scroll__here" ';
+    }else{
+        $jump = '';
+    }
+
+    // Prepare fileicons
+    list($ext,$mime,$dl) = mimetype($item['file'],false);
+    $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+    $class = 'select mediafile mf_'.$class;
+
+    // Prepare filename
+    $file = utf8_decodeFN($item['file']);
+
+    // Prepare info
+    $info = '';
+    if($item['isimg']){
+        $info .= (int) $item['meta']->getField('File.Width');
+        $info .= '×';
+        $info .= (int) $item['meta']->getField('File.Height');
+        $info .= ' ';
+    }
+    $info .= ''.dformat($item['mtime']).'';
+    $info .= ' ';
+    $info .= filesize_h($item['size']);
+
+    // output
+    echo '
        '.NL;
+    if (!$display_namespace) {
+        echo ''.hsc($file).' ';
+    } else {
+        echo ''.hsc($item['id']).'
        ';
+    }
+    echo '('.$info.')'.NL;
+
+    // view button
+    $link = ml($item['id'],'',true);
+    echo ' ';
+
+    // mediamanager button
+    $link = wl('',array('do'=>'media','image'=>$item['id'],'ns'=>getNS($item['id'])));
+    echo ' ';
+
+    // delete button
+    if($item['writable'] && $auth >= AUTH_DELETE){
+        $link = DOKU_BASE.'lib/exe/mediamanager.php?delete='.rawurlencode($item['id']).
+            '&sectok='.getSecurityToken();
+        echo ' '.
+            ''.$lang['btn_delete'].'';
+    }
+
+    echo '
        ';
+    echo $lang['mediausage'].' {{:'.$item['id'].'}}';
+    echo '
        ';
+    if($item['isimg']) media_printimgdetail($item);
+    echo '
        '.NL;
+    echo '
        '.NL;
+}
+
+function media_printicon($filename){
+    list($ext,$mime,$dl) = mimetype(mediaFN($filename),false);
+
+    if (@file_exists(DOKU_INC.'lib/images/fileicons/'.$ext.'.png')) {
+        $icon = DOKU_BASE.'lib/images/fileicons/'.$ext.'.png';
+    } else {
+        $icon = DOKU_BASE.'lib/images/fileicons/file.png';
+    }
+
+    return ''.$filename.'';
+
+}
+
+/**
+ * Formats and prints one file in the list in the thumbnails view
+ *
+ * @author Kate Arzamastseva 
+ */
+function media_printfile_thumbs($item,$auth,$jump=false,$display_namespace=false){
+    global $lang;
+    global $conf;
+
+    // Prepare filename
+    $file = utf8_decodeFN($item['file']);
+
+    // output
+    echo '
      9. '.NL;
+
+        echo '
        ';
+    if($item['isimg']) {
+        media_printimgdetail($item, true);
+
+    } else {
+        echo '';
+        echo media_printicon($item['id']);
+        echo '';
+    }
+    echo '
        '.NL;
+    if (!$display_namespace) {
+        $name = hsc($file);
+    } else {
+        $name = hsc($item['id']);
+    }
+    echo '
        '.$name.'
        '.NL;
+
+    if($item['isimg']){
+        $size = '';
+        $size .= (int) $item['meta']->getField('File.Width');
+        $size .= '×';
+        $size .= (int) $item['meta']->getField('File.Height');
+        echo '
        '.$size.'
        '.NL;
+    } else {
+        echo '
         
        '.NL;
+    }
+    $date = dformat($item['mtime']);
+    echo '
        '.$date.'
        '.NL;
+    $filesize = filesize_h($item['size']);
+    echo '
        '.$filesize.'
        '.NL;
+    echo '
        10. '.NL;
+}
+
+/**
+ * Prints a thumbnail and metainfo
+ */
+function media_printimgdetail($item, $fullscreen=false){
+    // prepare thumbnail
+    $size = $fullscreen ? 90 : 120;
+
+    $w = (int) $item['meta']->getField('File.Width');
+    $h = (int) $item['meta']->getField('File.Height');
+    if($w>$size || $h>$size){
+        if (!$fullscreen) {
+            $ratio = $item['meta']->getResizeRatio($size);
+        } else {
+            $ratio = $item['meta']->getResizeRatio($size,$size);
+        }
+        $w = floor($w * $ratio);
+        $h = floor($h * $ratio);
+    }
+    $src = ml($item['id'],array('w'=>$w,'h'=>$h,'t'=>$item['mtime']));
+    $p = array();
+    if (!$fullscreen) {
+        // In fullscreen mediamanager view, image resizing is done via CSS.
+        $p['width']  = $w;
+        $p['height'] = $h;
+    }
+    $p['alt']    = $item['id'];
+    $att = buildAttributes($p);
+
+    // output
+    if ($fullscreen) {
+        echo '';
+        echo '';
+        echo '';
+    }
+
+    if ($fullscreen) return;
+
+    echo '
        ';
+    echo '
        ';
+    echo '';
+    echo '';
+    echo '';
+    echo '
        ';
+
+    // 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'));
+    if(utf8_strlen($d) > 250) $d = utf8_substr($d,0,250).'...';
+    $k = $item['meta']->getField(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'));
+
+    // print EXIF/IPTC data
+    if($t || $d || $k ){
+        echo '
        ';
+        if($t) echo ''.htmlspecialchars($t).'
        ';
+        if($d) echo htmlspecialchars($d).'
        ';
+        if($t) echo ''.htmlspecialchars($k).'';
+        echo '
        ';
+    }
+    echo '
        ';
+}
+
+/**
+ * Build link based on the current, adding/rewriting
+ * parameters
+ *
+ * @author Kate Arzamastseva 
+ * @param array $params
+ * @param string $amp - separator
+ * @return string - link
+ */
+function media_managerURL($params=false, $amp='&', $abs=false, $params_array=false) {
+    global $conf;
+    global $ID;
+    global $INPUT;
+
+    $gets = array('do' => 'media');
+    $media_manager_params = array('tab_files', 'tab_details', 'image', 'ns', 'list', 'sort');
+    foreach ($media_manager_params as $x) {
+        if ($INPUT->has($x)) $gets[$x] = $INPUT->str($x);
+    }
+
+    if ($params) {
+        $gets = $params + $gets;
+    }
+    unset($gets['id']);
+    if (isset($gets['delete'])) {
+        unset($gets['image']);
+        unset($gets['tab_details']);
+    }
+
+    if ($params_array) return $gets;
+
+    return wl($ID,$gets,$abs,$amp);
+}
+
+/**
+ * Print the media upload form if permissions are correct
+ *
+ * @author Andreas Gohr 
+ * @author Kate Arzamastseva 
+ */
+function media_uploadform($ns, $auth, $fullscreen = false){
+    global $lang;
+    global $conf;
+    global $INPUT;
+
+    if($auth < AUTH_UPLOAD) {
+        echo '
        '.$lang['media_perm_upload'].'
        '.NL;
+        return;
+    }
+    $auth_ow = (($conf['mediarevisions']) ? AUTH_UPLOAD : AUTH_DELETE);
+
+    $update = false;
+    $id = '';
+    if ($auth >= $auth_ow && $fullscreen && $INPUT->str('mediado') == 'update') {
+        $update = true;
+        $id = cleanID($INPUT->str('image'));
+    }
+
+    // The default HTML upload form
+    $params = array('id'      => 'dw__upload',
+                    'enctype' => 'multipart/form-data');
+    if (!$fullscreen) {
+        $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
+    } else {
+        $params['action'] = media_managerURL(array('tab_files' => 'files',
+            'tab_details' => 'view'), '&');
+    }
+
+    $form = new Doku_Form($params);
+    if (!$fullscreen) echo '
        ' . $lang['mediaupload'] . '
        ';
+    $form->addElement(formSecurityToken());
+    $form->addHidden('ns', hsc($ns));
+    $form->addElement(form_makeOpenTag('p'));
+    $form->addElement(form_makeFileField('upload', $lang['txt_upload'].':', 'upload__file'));
+    $form->addElement(form_makeCloseTag('p'));
+    $form->addElement(form_makeOpenTag('p'));
+    $form->addElement(form_makeTextField('mediaid', noNS($id), $lang['txt_filename'].':', 'upload__name'));
+    $form->addElement(form_makeButton('submit', '', $lang['btn_upload']));
+    $form->addElement(form_makeCloseTag('p'));
+
+    if($auth >= $auth_ow){
+        $form->addElement(form_makeOpenTag('p'));
+        $attrs = array();
+        if ($update) $attrs['checked'] = 'checked';
+        $form->addElement(form_makeCheckboxField('ow', 1, $lang['txt_overwrt'], 'dw__ow', 'check', $attrs));
+        $form->addElement(form_makeCloseTag('p'));
+    }
+
+    echo NL.'
        '.NL;
+    html_form('upload', $form);
+
+    echo '
        '.NL;
+
+    echo '
        ';
+    printf($lang['maxuploadsize'],filesize_h(media_getuploadsize()));
+    echo '
        '.NL;
+
+}
+
+/**
+ * Returns the size uploaded files may have
+ *
+ * This uses a conservative approach using the lowest number found
+ * in any of the limiting ini settings
+ *
+ * @returns int size in bytes
+ */
+function media_getuploadsize(){
+    $okay = 0;
+
+    $post = (int) php_to_byte(@ini_get('post_max_size'));
+    $suho = (int) php_to_byte(@ini_get('suhosin.post.max_value_length'));
+    $upld = (int) php_to_byte(@ini_get('upload_max_filesize'));
+
+    if($post && ($post < $okay || $okay == 0)) $okay = $post;
+    if($suho && ($suho < $okay || $okay == 0)) $okay = $suho;
+    if($upld && ($upld < $okay || $okay == 0)) $okay = $upld;
+
+    return $okay;
+}
+
+/**
+ * Print the search field form
+ *
+ * @author Tobias Sarnowski 
+ * @author Kate Arzamastseva 
+ */
+function media_searchform($ns,$query='',$fullscreen=false){
+    global $lang;
+
+    // The default HTML search form
+    $params = array('id' => 'dw__mediasearch');
+    if (!$fullscreen) {
+        $params['action'] = DOKU_BASE.'lib/exe/mediamanager.php';
+    } else {
+        $params['action'] = media_managerURL(array(), '&');
+    }
+    $form = new Doku_Form($params);
+    $form->addHidden('ns', $ns);
+    $form->addHidden($fullscreen ? 'mediado' : 'do', 'searchlist');
+
+    if (!$fullscreen) $form->addElement('
        ' . $lang['mediasearch'] . '
        '.NL);
+    $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);
+}
+
+/**
+ * Build a tree outline of available media namespaces
+ *
+ * @author Andreas Gohr 
+ */
+function media_nstree($ns){
+    global $conf;
+    global $lang;
+
+    // currently selected namespace
+    $ns  = cleanID($ns);
+    if(empty($ns)){
+        global $ID;
+        $ns = (string)getNS($ID);
+    }
+
+    $ns_dir  = utf8_encodeFN(str_replace(':','/',$ns));
+
+    $data = array();
+    search($data,$conf['mediadir'],'search_index',array('ns' => $ns_dir, 'nofiles' => true));
+
+    // wrap a list with the root level around the other namespaces
+    array_unshift($data, array('level' => 0, 'id' => '', 'open' =>'true',
+                               'label' => '['.$lang['mediaroot'].']'));
+
+    // insert the current ns into the hierarchy if it isn't already part of it
+    $ns_parts = explode(':', $ns);
+    $tmp_ns = '';
+    $pos = 0;
+    foreach ($ns_parts as $level => $part) {
+        if ($tmp_ns) $tmp_ns .= ':'.$part;
+        else $tmp_ns = $part;
+
+        // find the namespace parts or insert them
+        while ($data[$pos]['id'] != $tmp_ns) {
+            if ($pos >= count($data) || ($data[$pos]['level'] <= $level+1 && strnatcmp(utf8_encodeFN($data[$pos]['id']), utf8_encodeFN($tmp_ns)) > 0)) {
+                array_splice($data, $pos, 0, array(array('level' => $level+1, 'id' => $tmp_ns, 'open' => 'true')));
+                break;
+            }
+            ++$pos;
+        }
+    }
+
+    echo html_buildlist($data,'idx','media_nstree_item','media_nstree_li');
+}
+
+/**
+ * Userfunction for html_buildlist
+ *
+ * Prints a media namespace tree item
+ *
+ * @author Andreas Gohr 
+ */
+function media_nstree_item($item){
+    global $INPUT;
+    $pos   = strrpos($item['id'], ':');
+    $label = substr($item['id'], $pos > 0 ? $pos + 1 : 0);
+    if(!$item['label']) $item['label'] = $label;
+
+    $ret  = '';
+    if (!($INPUT->str('do') == 'media'))
+    $ret .= '';
+    else $ret .= '';
+    $ret .= $item['label'];
+    $ret .= '';
+    return $ret;
+}
+
+/**
+ * Userfunction for html_buildlist
+ *
+ * Prints a media namespace tree item opener
+ *
+ * @author Andreas Gohr 
+ */
+function media_nstree_li($item){
+    $class='media level'.$item['level'];
+    if($item['open']){
+        $class .= ' open';
+        $img   = DOKU_BASE.'lib/images/minus.gif';
+        $alt   = '−';
+    }else{
+        $class .= ' closed';
+        $img   = DOKU_BASE.'lib/images/plus.gif';
+        $alt   = '+';
+    }
+    // TODO: only deliver an image if it actually has a subtree...
+    return '
      10. '.
+        ''.$alt.'';
+}
+
+/**
+ * Resizes the given image to the given size
+ *
+ * @author  Andreas Gohr 
+ */
+function media_resize_image($file, $ext, $w, $h=0){
+    global $conf;
+
+    $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]);
+
+    // we wont scale up to infinity
+    if($w > 2000 || $h > 2000) return $file;
+
+    // resize necessary? - (w,h) = native dimensions
+    if(($w == $info[0]) && ($h == $info[1])) 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;
+}
+
+/**
+ * Crops the given image to the wanted ratio, then calls media_resize_image to scale it
+ * to the wanted size
+ *
+ * Crops are centered horizontally but prefer the upper third of an vertical
+ * image because most pics are more interesting in that area (rule of thirds)
+ *
+ * @author  Andreas Gohr 
+ */
+function media_crop_image($file, $ext, $w, $h=0){
+    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;
+
+    // check if the crop can be handled completely by resize,
+    // i.e. the specified width & height match the aspect ratio of the source image
+    if ($w == round($h*$fr)) {
+        return media_resize_image($file, $ext, $w);
+    }
+
+    if($tr >= 1){
+        if($tr > $fr){
+            $cw = $info[0];
+            $ch = (int) ($info[0]/$tr);
+        }else{
+            $cw = (int) ($info[1]*$tr);
+            $ch = $info[1];
+        }
+    }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);
+    }
+
+    //still here? cropping failed
+    return media_resize_image($file,$ext, $w, $h);
+}
+
+/**
+ * Calculate a token to be used to verify fetch requests for resized or
+ * cropped images have been internally generated - and prevent external
+ * DDOS attacks via fetch
+ *
+ * @author Christopher Smith 
+ *
+ * @param string  $id    id of the image
+ * @param int     $w     resize/crop width
+ * @param int     $h     resize/crop height
+ * @return string
+ */
+function media_get_token($id,$w,$h){
+    // token is only required for modified images
+    if ($w || $h || media_isexternal($id)) {
+        $token = $id;
+        if ($w) $token .= '.'.$w;
+        if ($h) $token .= '.'.$h;
+
+        return substr(PassHash::hmac('md5', $token, auth_cookiesalt()),0,6);
+    }
+
+    return '';
+}
+
+/**
+ * Download a remote file and return local filename
+ *
+ * returns false if download fails. Uses cached file if available and
+ * wanted
+ *
+ * @author  Andreas Gohr 
+ * @author  Pavel Vitis 
+ */
+function media_get_from_URL($url,$ext,$cache){
+    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 cache exists use it else
+    if($mtime) return $local;
+
+    //else return false
+    return false;
+}
+
+/**
+ * Download image files
+ *
+ * @author Andreas Gohr 
+ */
+function media_image_download($url,$file){
+    global $conf;
+    $http = new DokuHTTPClient();
+    $http->keep_alive = false; // we do single ops here, no need for keep-alive
+
+    $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;
+}
+
+/**
+ * resize images using external ImageMagick convert program
+ *
+ * @author Pavel Vitis 
+ * @author Andreas Gohr 
+ */
+function media_resize_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h){
+    global $conf;
+
+    // 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";
+
+    @exec($cmd,$out,$retval);
+    if ($retval == 0) return true;
+    return false;
+}
+
+/**
+ * crop images using external ImageMagick convert program
+ *
+ * @author Andreas Gohr 
+ */
+function media_crop_imageIM($ext,$from,$from_w,$from_h,$to,$to_w,$to_h,$ofs_x,$ofs_y){
+    global $conf;
+
+    // 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";
+
+    @exec($cmd,$out,$retval);
+    if ($retval == 0) return true;
+    return false;
+}
+
+/**
+ * resize or crop images using PHP's libGD support
+ *
+ * @author Andreas Gohr 
+ * @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;
+
+    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;
+    }
+
+    // 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']);
+        }
+    }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);
+
+    return $okay;
+}
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
diff --git a/sources/inc/pageutils.php b/sources/inc/pageutils.php
new file mode 100644
index 0000000..c8d3cf4
--- /dev/null
+++ b/sources/inc/pageutils.php
@@ -0,0 +1,660 @@
+
+ * @todo       Combine similar functions like {wiki,media,meta}FN()
+ */
+
+/**
+ * Fetch the an ID from request
+ *
+ * Uses either standard $_REQUEST variable or extracts it from
+ * the full request URI when userewrite is set to 2
+ *
+ * For $param='id' $conf['start'] is returned if no id was found.
+ * If the second parameter is true (default) the ID is cleaned.
+ *
+ * @author Andreas Gohr 
+ */
+function getID($param='id',$clean=true){
+    global $INPUT;
+    global $conf;
+    global $ACT;
+
+    $id = $INPUT->str($param);
+
+    //construct page id from request URI
+    if(empty($id) && $conf['userewrite'] == 2){
+        $request = $_SERVER['REQUEST_URI'];
+        $script = '';
+
+        //get the script URL
+        if($conf['basedir']){
+            $relpath = '';
+            if($param != 'id') {
+                $relpath = 'lib/exe/';
+            }
+            $script = $conf['basedir'].$relpath.utf8_basename($_SERVER['SCRIPT_FILENAME']);
+
+        }elseif($_SERVER['PATH_INFO']){
+            $request = $_SERVER['PATH_INFO'];
+        }elseif($_SERVER['SCRIPT_NAME']){
+            $script = $_SERVER['SCRIPT_NAME'];
+        }elseif($_SERVER['DOCUMENT_ROOT'] && $_SERVER['SCRIPT_FILENAME']){
+            $script = preg_replace ('/^'.preg_quote($_SERVER['DOCUMENT_ROOT'],'/').'/','',
+                    $_SERVER['SCRIPT_FILENAME']);
+            $script = '/'.$script;
+        }
+
+        //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'];
+        }
+        if (isset($ACT) && $ACT === 'show') send_redirect(wl($id,'',true));
+    }
+
+    if($clean) $id = cleanID($id);
+    if(empty($id) && $param=='id') $id = $conf['start'];
+
+    return $id;
+}
+
+/**
+ * Remove unwanted chars from ID
+ *
+ * Cleans a given ID to only use allowed characters. Accented characters are
+ * converted to unaccented ones
+ *
+ * @author Andreas Gohr 
+ * @param  string  $raw_id    The pageid to clean
+ * @param  boolean $ascii     Force ASCII
+ */
+function cleanID($raw_id,$ascii=false){
+    global $conf;
+    static $sepcharpat = null;
+
+    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];
+    }
+
+    $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);
+
+    //alternative namespace seperator
+    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);
+
+    //remove specials
+    $id = utf8_stripspecials($id,$sepchar,'\*');
+
+    if($ascii) $id = utf8_strip($id);
+
+    //clean up
+    $id = preg_replace($sepcharpat,$sepchar,$id);
+    $id = preg_replace('#:+#',':',$id);
+    $id = trim($id,':._-');
+    $id = preg_replace('#:[:\._\-]+#',':',$id);
+    $id = preg_replace('#[:\._\-]+:#',':',$id);
+
+    $cache[(string)$raw_id] = $id;
+    return($id);
+}
+
+/**
+ * Return namespacepart of a wiki ID
+ *
+ * @author Andreas Gohr 
+ */
+function getNS($id){
+    $pos = strrpos((string)$id,':');
+    if($pos!==false){
+        return substr((string)$id,0,$pos);
+    }
+    return false;
+}
+
+/**
+ * Returns the ID without the namespace
+ *
+ * @author Andreas Gohr 
+ */
+function noNS($id) {
+    $pos = strrpos($id, ':');
+    if ($pos!==false) {
+        return substr($id, $pos+1);
+    } else {
+        return $id;
+    }
+}
+
+/**
+ * Returns the current namespace
+ *
+ * @author Nathan Fritz 
+ */
+function curNS($id) {
+    return noNS(getNS($id));
+}
+
+/**
+ * Returns the ID without the namespace or current namespace for 'start' pages
+ *
+ * @author Nathan Fritz 
+ */
+function noNSorNS($id) {
+    global $conf;
+
+    $p = noNS($id);
+    if ($p == $conf['start'] || $p == false) {
+        $p = curNS($id);
+        if ($p == false) {
+            return $conf['start'];
+        }
+    }
+    return $p;
+}
+
+/**
+ * Creates a XHTML valid linkid from a given headline title
+ *
+ * @param string  $title   The headline title
+ * @param array|bool   $check   Existing IDs (title => number)
+ * @return string the title
+ * @author Andreas Gohr 
+ */
+function sectionID($title,&$check) {
+    $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{
+        $title = $new;
+    }
+
+    if(is_array($check)){
+        // make sure tiles are unique
+        if (!array_key_exists ($title,$check)) {
+            $check[$title] = 0;
+        } else {
+            $title .= ++ $check[$title];
+        }
+    }
+
+    return $title;
+}
+
+
+/**
+ * Wiki page existence check
+ *
+ * parameters as for wikiFN
+ *
+ * @author Chris Smith 
+ */
+function page_exists($id,$rev='',$clean=true) {
+    return @file_exists(wikiFN($id,$rev,$clean));
+}
+
+/**
+ * returns the full path to the datafile specified by ID and optional revision
+ *
+ * The filename is URL encoded to protect Unicode chars
+ *
+ * @param  $raw_id  string   id of wikipage
+ * @param  $rev     string   page revision, empty string for current
+ * @param  $clean   bool     flag indicating that $raw_id should be cleaned.  Only set to false
+ *                           when $id is guaranteed to have been cleaned already.
+ *
+ * @author Andreas Gohr 
+ */
+function wikiFN($raw_id,$rev='',$clean=true){
+    global $conf;
+
+    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;
+}
+
+/**
+ * Returns the full path to the file for locking the page while editing.
+ *
+ * @author Ben Coburn 
+ */
+function wikiLockFN($id) {
+    global $conf;
+    return $conf['lockdir'].'/'.md5(cleanID($id)).'.lock';
+}
+
+
+/**
+ * returns the full path to the meta file specified by ID and extension
+ *
+ * @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;
+}
+
+/**
+ * returns the full path to the media's meta file specified by ID and extension
+ *
+ * @author Kate Arzamastseva 
+ */
+function mediaMetaFN($id,$ext){
+    global $conf;
+    $id = cleanID($id);
+    $id = str_replace(':','/',$id);
+    $fn = $conf['mediametadir'].'/'.utf8_encodeFN($id).$ext;
+    return $fn;
+}
+
+/**
+ * returns an array of full paths to all metafiles of a given ID
+ *
+ * @author Esther Brunner 
+ * @author Michael Hamann 
+ */
+function metaFiles($id){
+    $basename = metaFN($id, '');
+    $files    = glob($basename.'.*', GLOB_MARK);
+    // filter files like foo.bar.meta when $id == 'foo'
+    return    $files ? preg_grep('/^'.preg_quote($basename, '/').'\.[^.\/]*$/u', $files) : array();
+}
+
+/**
+ * returns the full path to the mediafile specified by ID
+ *
+ * The filename is URL encoded to protect Unicode chars
+ *
+ * @author Andreas Gohr 
+ * @author Kate Arzamastseva 
+ */
+function mediaFN($id, $rev=''){
+    global $conf;
+    $id = cleanID($id);
+    $id = str_replace(':','/',$id);
+    if(empty($rev)){
+        $fn = $conf['mediadir'].'/'.utf8_encodeFN($id);
+    }else{
+        $ext = mimetype($id);
+        $name = substr($id,0, -1*strlen($ext[0])-1);
+        $fn = $conf['mediaolddir'].'/'.utf8_encodeFN($name .'.'.( (int) $rev ).'.'.$ext[0]);
+    }
+    return $fn;
+}
+
+/**
+ * Returns the full filepath to a localized file if local
+ * version isn't found the english one is returned
+ *
+ * @param  string $id  The id of the local file
+ * @param  string $ext The file extension (usually txt)
+ * @author Andreas Gohr 
+ */
+function localeFN($id,$ext='txt'){
+    global $conf;
+    $file = DOKU_CONF.'lang/'.$conf['lang'].'/'.$id.'.'.$ext;
+    if(!@file_exists($file)){
+        $file = DOKU_INC.'inc/lang/'.$conf['lang'].'/'.$id.'.'.$ext;
+        if(!@file_exists($file)){
+            //fall back to english
+            $file = DOKU_INC.'inc/lang/en/'.$id.'.'.$ext;
+        }
+    }
+    return $file;
+}
+
+/**
+ * Resolve relative paths in IDs
+ *
+ * Do not call directly use resolve_mediaid or resolve_pageid
+ * instead
+ *
+ * Partyly based on a cleanPath function found at
+ * http://www.php.net/manual/en/function.realpath.php#57016
+ *
+ * @author 
+ */
+function resolve_id($ns,$id,$clean=true){
+    global $conf;
+
+    // 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 && $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;
+            }
+        }
+        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;
+}
+
+/**
+ * Returns a full media id
+ *
+ * @author Andreas Gohr 
+ */
+function resolve_mediaid($ns,&$page,&$exists){
+    $page   = resolve_id($ns,$page);
+    $file   = mediaFN($page);
+    $exists = @file_exists($file);
+}
+
+/**
+ * Returns a full page id
+ *
+ * @author Andreas Gohr 
+ */
+function resolve_pageid($ns,&$page,&$exists){
+    global $conf;
+    global $ID;
+    $exists = false;
+
+    //empty address should point to current page
+    if ($page === "") {
+        $page = $ID;
+    }
+
+    //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(in_array(substr($page,-1), array(':', ';')) ||
+       ($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);
+                }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);
+
+    //add hash if any
+    if(!empty($hash)) $page .= '#'.$hash;
+}
+
+/**
+ * Returns the name of a cachefile from given data
+ *
+ * The needed directory is created by this function!
+ *
+ * @author Andreas Gohr 
+ *
+ * @param string $data  This data is used to create a unique md5 name
+ * @param string $ext   This is appended to the filename if given
+ * @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;
+}
+
+/**
+ * Checks a pageid against $conf['hidepages']
+ *
+ * @author Andreas Gohr 
+ */
+function isHiddenPage($id){
+    $data = array(
+        'id' => $id,
+        'hidden' => false
+    );
+    trigger_event('PAGEUTILS_ID_HIDEPAGE', $data, '_isHiddenPage');
+    return $data['hidden'];
+}
+
+function _isHiddenPage(&$data) {
+    global $conf;
+    global $ACT;
+
+    if ($data['hidden']) return;
+    if(empty($conf['hidepages'])) return;
+    if($ACT == 'admin') return;
+
+    if(preg_match('/'.$conf['hidepages'].'/ui',':'.$data['id'])){
+        $data['hidden'] = true;
+    }
+}
+
+/**
+ * Reverse of isHiddenPage
+ *
+ * @author Andreas Gohr 
+ */
+function isVisiblePage($id){
+    return !isHiddenPage($id);
+}
+
+/**
+ * Format an id for output to a user
+ *
+ * Namespaces are denoted by a trailing “:*”. The root namespace is
+ * “*”. Output is escaped.
+ *
+ * @author Adrian Lang 
+ */
+
+function prettyprint_id($id) {
+    if (!$id || $id === ':') {
+        return '*';
+    }
+    if ((substr($id, -1, 1) === ':')) {
+        $id .= '*';
+    }
+    return hsc($id);
+}
+
+/**
+ * Encode a UTF-8 filename to use on any filesystem
+ *
+ * Uses the 'fnencode' option to determine encoding
+ *
+ * When the second parameter is true the string will
+ * be encoded only if non ASCII characters are detected -
+ * This makes it safe to run it multiple times on the
+ * same string (default is true)
+ *
+ * @author Andreas Gohr 
+ * @see    urlencode
+ */
+function utf8_encodeFN($file,$safe=true){
+    global $conf;
+    if($conf['fnencode'] == 'utf-8') return $file;
+
+    if($safe && preg_match('#^[a-zA-Z0-9/_\-\.%]+$#',$file)){
+        return $file;
+    }
+
+    if($conf['fnencode'] == 'safe'){
+        return SafeFN::encode($file);
+    }
+
+    $file = urlencode($file);
+    $file = str_replace('%2F','/',$file);
+    return $file;
+}
+
+/**
+ * Decode a filename back to UTF-8
+ *
+ * Uses the 'fnencode' option to determine encoding
+ *
+ * @author Andreas Gohr 
+ * @see    urldecode
+ */
+function utf8_decodeFN($file){
+    global $conf;
+    if($conf['fnencode'] == 'utf-8') return $file;
+
+    if($conf['fnencode'] == 'safe'){
+        return SafeFN::decode($file);
+    }
+
+    return urldecode($file);
+}
+
+/**
+ * Find a page in the current namespace (determined from $ID) or any
+ * higher namespace
+ *
+ * Used for sidebars, but can be used other stuff as well
+ *
+ * @todo   add event hook
+ * @param  string $page the pagename you're looking for
+ * @return string|false the full page id of the found page, false if any
+ */
+function page_findnearest($page){
+    if (!$page) return false;
+    global $ID;
+
+    $ns = $ID;
+    do {
+        $ns = getNS($ns);
+        $pageid = ltrim("$ns:$page",':');
+        if(page_exists($pageid)){
+            return $pageid;
+        }
+    } while($ns);
+
+    return false;
+}
diff --git a/sources/inc/parser/code.php b/sources/inc/parser/code.php
new file mode 100644
index 0000000..0b8e3ee
--- /dev/null
+++ b/sources/inc/parser/code.php
@@ -0,0 +1,60 @@
+
+ */
+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='' ) {
+        global $INPUT;
+        if(!$language) $language = 'txt';
+        if(!$filename) $filename = 'snippet.'.$language;
+        $filename = utf8_basename($filename);
+        $filename = utf8_stripspecials($filename, '_');
+
+        if($this->_codeblock == $INPUT->str('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() {
+        http_status(404);
+        echo '404 - Not found';
+        exit;
+    }
+
+    /**
+     * Return the format of the renderer
+     *
+     * @returns string 'code'
+     */
+    function getFormat(){
+        return 'code';
+    }
+}
diff --git a/sources/inc/parser/handler.php b/sources/inc/parser/handler.php
new file mode 100644
index 0000000..8ae9912
--- /dev/null
+++ b/sources/inc/parser/handler.php
@@ -0,0 +1,1621 @@
+ false,
+    );
+
+    var $rewriteBlocks = true;
+
+    function Doku_Handler() {
+        $this->CallWriter = new Doku_Handler_CallWriter($this);
+    }
+
+    function _addCall($handler, $args, $pos) {
+        $call = array($handler,$args, $pos);
+        $this->CallWriter->writeCall($call);
+    }
+
+    function addPluginCall($plugin, $args, $state, $pos, $match) {
+        $call = array('plugin',array($plugin, $args, $state, $match), $pos);
+        $this->CallWriter->writeCall($call);
+    }
+
+    function _finalize(){
+
+        $this->CallWriter->finalise();
+
+        if ( $this->status['section'] ) {
+            $last_call = end($this->calls);
+            array_push($this->calls,array('section_close',array(), $last_call[2]));
+        }
+
+        if ( $this->rewriteBlocks ) {
+            $B = new Doku_Handler_Block();
+            $this->calls = $B->process($this->calls);
+        }
+
+        trigger_event('PARSER_HANDLER_DONE',$this);
+
+        array_unshift($this->calls,array('document_start',array(),0));
+        $last_call = end($this->calls);
+        array_push($this->calls,array('document_end',array(),$last_call[2]));
+    }
+
+    function fetch() {
+        $call = each($this->calls);
+        if ( $call ) {
+            return $call['value'];
+        }
+        return false;
+    }
+
+
+    /**
+     * Special plugin handler
+     *
+     * This handler is called for all modes starting with 'plugin_'.
+     * An additional parameter with the plugin name is passed
+     *
+     * @author Andreas Gohr 
+     */
+    function plugin($match, $state, $pos, $pluginname){
+        $data = array($match);
+        $plugin = plugin_load('syntax',$pluginname);
+        if($plugin != null){
+            $data = $plugin->handle($match, $state, $pos, $this);
+        }
+        if ($data !== false) {
+            $this->addPluginCall($pluginname,$data,$state,$pos,$match);
+        }
+        return true;
+    }
+
+    function base($match, $state, $pos) {
+        switch ( $state ) {
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata',array($match), $pos);
+                return true;
+            break;
+        }
+    }
+
+    function header($match, $state, $pos) {
+        // get level and title
+        $title = trim($match);
+        $level = 7 - strspn($title,'=');
+        if($level < 1) $level = 1;
+        $title = trim($title,'=');
+        $title = trim($title);
+
+        if ($this->status['section']) $this->_addCall('section_close',array(),$pos);
+
+        $this->_addCall('header',array($title,$level,$pos), $pos);
+
+        $this->_addCall('section_open',array($level),$pos);
+        $this->status['section'] = true;
+        return true;
+    }
+
+    function notoc($match, $state, $pos) {
+        $this->_addCall('notoc',array(),$pos);
+        return true;
+    }
+
+    function nocache($match, $state, $pos) {
+        $this->_addCall('nocache',array(),$pos);
+        return true;
+    }
+
+    function linebreak($match, $state, $pos) {
+        $this->_addCall('linebreak',array(),$pos);
+        return true;
+    }
+
+    function eol($match, $state, $pos) {
+        $this->_addCall('eol',array(),$pos);
+        return true;
+    }
+
+    function hr($match, $state, $pos) {
+        $this->_addCall('hr',array(),$pos);
+        return true;
+    }
+
+    function _nestingTag($match, $state, $pos, $name) {
+        switch ( $state ) {
+            case DOKU_LEXER_ENTER:
+                $this->_addCall($name.'_open', array(), $pos);
+            break;
+            case DOKU_LEXER_EXIT:
+                $this->_addCall($name.'_close', array(), $pos);
+            break;
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata',array($match), $pos);
+            break;
+        }
+    }
+
+    function strong($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'strong');
+        return true;
+    }
+
+    function emphasis($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'emphasis');
+        return true;
+    }
+
+    function underline($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'underline');
+        return true;
+    }
+
+    function monospace($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'monospace');
+        return true;
+    }
+
+    function subscript($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'subscript');
+        return true;
+    }
+
+    function superscript($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'superscript');
+        return true;
+    }
+
+    function deleted($match, $state, $pos) {
+        $this->_nestingTag($match, $state, $pos, 'deleted');
+        return true;
+    }
+
+
+    function footnote($match, $state, $pos) {
+//        $this->_nestingTag($match, $state, $pos, 'footnote');
+        if (!isset($this->_footnote)) $this->_footnote = false;
+
+        switch ( $state ) {
+            case DOKU_LEXER_ENTER:
+                // footnotes can not be nested - however due to limitations in lexer it can't be prevented
+                // we will still enter a new footnote mode, we just do nothing
+                if ($this->_footnote) {
+                    $this->_addCall('cdata',array($match), $pos);
+                    break;
+                }
+
+                $this->_footnote = true;
+
+                $ReWriter = new Doku_Handler_Nest($this->CallWriter,'footnote_close');
+                $this->CallWriter = & $ReWriter;
+                $this->_addCall('footnote_open', array(), $pos);
+            break;
+            case DOKU_LEXER_EXIT:
+                // check whether we have already exitted the footnote mode, can happen if the modes were nested
+                if (!$this->_footnote) {
+                    $this->_addCall('cdata',array($match), $pos);
+                    break;
+                }
+
+                $this->_footnote = false;
+
+                $this->_addCall('footnote_close', array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata', array($match), $pos);
+            break;
+        }
+        return true;
+    }
+
+    function listblock($match, $state, $pos) {
+        switch ( $state ) {
+            case DOKU_LEXER_ENTER:
+                $ReWriter = new Doku_Handler_List($this->CallWriter);
+                $this->CallWriter = & $ReWriter;
+                $this->_addCall('list_open', array($match), $pos);
+            break;
+            case DOKU_LEXER_EXIT:
+                $this->_addCall('list_close', array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+            case DOKU_LEXER_MATCHED:
+                $this->_addCall('list_item', array($match), $pos);
+            break;
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata', array($match), $pos);
+            break;
+        }
+        return true;
+    }
+
+    function unformatted($match, $state, $pos) {
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('unformatted',array($match), $pos);
+        }
+        return true;
+    }
+
+    function php($match, $state, $pos) {
+        global $conf;
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('php',array($match), $pos);
+        }
+        return true;
+    }
+
+    function phpblock($match, $state, $pos) {
+        global $conf;
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('phpblock',array($match), $pos);
+        }
+        return true;
+    }
+
+    function html($match, $state, $pos) {
+        global $conf;
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('html',array($match), $pos);
+        }
+        return true;
+    }
+
+    function htmlblock($match, $state, $pos) {
+        global $conf;
+        if ( $state == DOKU_LEXER_UNMATCHED ) {
+            $this->_addCall('htmlblock',array($match), $pos);
+        }
+        return true;
+    }
+
+    function preformatted($match, $state, $pos) {
+        switch ( $state ) {
+            case DOKU_LEXER_ENTER:
+                $ReWriter = new Doku_Handler_Preformatted($this->CallWriter);
+                $this->CallWriter = & $ReWriter;
+                $this->_addCall('preformatted_start',array(), $pos);
+            break;
+            case DOKU_LEXER_EXIT:
+                $this->_addCall('preformatted_end',array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+            case DOKU_LEXER_MATCHED:
+                $this->_addCall('preformatted_newline',array(), $pos);
+            break;
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('preformatted_content',array($match), $pos);
+            break;
+        }
+
+        return true;
+    }
+
+    function quote($match, $state, $pos) {
+
+        switch ( $state ) {
+
+            case DOKU_LEXER_ENTER:
+                $ReWriter = new Doku_Handler_Quote($this->CallWriter);
+                $this->CallWriter = & $ReWriter;
+                $this->_addCall('quote_start',array($match), $pos);
+            break;
+
+            case DOKU_LEXER_EXIT:
+                $this->_addCall('quote_end',array(), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+
+            case DOKU_LEXER_MATCHED:
+                $this->_addCall('quote_newline',array($match), $pos);
+            break;
+
+            case DOKU_LEXER_UNMATCHED:
+                $this->_addCall('cdata',array($match), $pos);
+            break;
+
+        }
+
+        return true;
+    }
+
+    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);
+
+            $param = preg_split('/\s+/', $matches[0], 2, PREG_SPLIT_NO_EMPTY);
+            while(count($param) < 2) array_push($param, null);
+
+            // We shortcut html here.
+            if ($param[0] == 'html') $param[0] = 'html4strict';
+            if ($param[0] == '-') $param[0] = null;
+            array_unshift($param, $matches[1]);
+
+            $this->_addCall($type, $param, $pos);
+        }
+        return true;
+    }
+
+    function acronym($match, $state, $pos) {
+        $this->_addCall('acronym',array($match), $pos);
+        return true;
+    }
+
+    function smiley($match, $state, $pos) {
+        $this->_addCall('smiley',array($match), $pos);
+        return true;
+    }
+
+    function wordblock($match, $state, $pos) {
+        $this->_addCall('wordblock',array($match), $pos);
+        return true;
+    }
+
+    function entity($match, $state, $pos) {
+        $this->_addCall('entity',array($match), $pos);
+        return true;
+    }
+
+    function multiplyentity($match, $state, $pos) {
+        preg_match_all('/\d+/',$match,$matches);
+        $this->_addCall('multiplyentity',array($matches[0][0],$matches[0][1]), $pos);
+        return true;
+    }
+
+    function singlequoteopening($match, $state, $pos) {
+        $this->_addCall('singlequoteopening',array(), $pos);
+        return true;
+    }
+
+    function singlequoteclosing($match, $state, $pos) {
+        $this->_addCall('singlequoteclosing',array(), $pos);
+        return true;
+    }
+
+    function apostrophe($match, $state, $pos) {
+        $this->_addCall('apostrophe',array(), $pos);
+        return true;
+    }
+
+    function doublequoteopening($match, $state, $pos) {
+        $this->_addCall('doublequoteopening',array(), $pos);
+        return true;
+    }
+
+    function doublequoteclosing($match, $state, $pos) {
+        $this->_addCall('doublequoteclosing',array(), $pos);
+        return true;
+    }
+
+    function camelcaselink($match, $state, $pos) {
+        $this->_addCall('camelcaselink',array($match), $pos);
+        return true;
+    }
+
+    /*
+    */
+    function internallink($match, $state, $pos) {
+        // Strip the opening and closing markup
+        $link = preg_replace(array('/^\[\[/','/\]\]$/u'),'',$match);
+
+        // Split title from URL
+        $link = explode('|',$link,2);
+        if ( !isset($link[1]) ) {
+            $link[1] = null;
+        } else if ( preg_match('/^\{\{[^\}]+\}\}$/',$link[1]) ) {
+            // If the title is an image, convert it to an array containing the image details
+            $link[1] = Doku_Handler_Parse_Media($link[1]);
+        }
+        $link[0] = trim($link[0]);
+
+        //decide which kind of link it is
+
+        if ( preg_match('/^[a-zA-Z0-9\.]+>{1}.*$/u',$link[0]) ) {
+            // Interwiki
+            $interwiki = explode('>',$link[0],2);
+            $this->_addCall(
+                'interwikilink',
+                array($link[0],$link[1],strtolower($interwiki[0]),$interwiki[1]),
+                $pos
+                );
+        }elseif ( preg_match('/^\\\\\\\\[^\\\\]+?\\\\/u',$link[0]) ) {
+            // Windows Share
+            $this->_addCall(
+                'windowssharelink',
+                array($link[0],$link[1]),
+                $pos
+                );
+        }elseif ( preg_match('#^([a-z0-9\-\.+]+?)://#i',$link[0]) ) {
+            // external link (accepts all protocols)
+            $this->_addCall(
+                    'externallink',
+                    array($link[0],$link[1]),
+                    $pos
+                    );
+        }elseif ( preg_match('<'.PREG_PATTERN_VALID_EMAIL.'>',$link[0]) ) {
+            // E-Mail (pattern above is defined in inc/mail.php)
+            $this->_addCall(
+                'emaillink',
+                array($link[0],$link[1]),
+                $pos
+                );
+        }elseif ( preg_match('!^#.+!',$link[0]) ){
+            // local link
+            $this->_addCall(
+                'locallink',
+                array(substr($link[0],1),$link[1]),
+                $pos
+                );
+        }else{
+            // internal link
+            $this->_addCall(
+                'internallink',
+                array($link[0],$link[1]),
+                $pos
+                );
+        }
+
+        return true;
+    }
+
+    function filelink($match, $state, $pos) {
+        $this->_addCall('filelink',array($match, null), $pos);
+        return true;
+    }
+
+    function windowssharelink($match, $state, $pos) {
+        $this->_addCall('windowssharelink',array($match, null), $pos);
+        return true;
+    }
+
+    function media($match, $state, $pos) {
+        $p = Doku_Handler_Parse_Media($match);
+
+        $this->_addCall(
+              $p['type'],
+              array($p['src'], $p['title'], $p['align'], $p['width'],
+                     $p['height'], $p['cache'], $p['linking']),
+              $pos
+             );
+        return true;
+    }
+
+    function rss($match, $state, $pos) {
+        $link = preg_replace(array('/^\{\{rss>/','/\}\}$/'),'',$match);
+
+        // get params
+        list($link,$params) = explode(' ',$link,2);
+
+        $p = array();
+        if(preg_match('/\b(\d+)\b/',$params,$match)){
+            $p['max'] = $match[1];
+        }else{
+            $p['max'] = 8;
+        }
+        $p['reverse'] = (preg_match('/rev/',$params));
+        $p['author']  = (preg_match('/\b(by|author)/',$params));
+        $p['date']    = (preg_match('/\b(date)/',$params));
+        $p['details'] = (preg_match('/\b(desc|detail)/',$params));
+
+        if (preg_match('/\b(\d+)([dhm])\b/',$params,$match)) {
+            $period = array('d' => 86400, 'h' => 3600, 'm' => 60);
+            $p['refresh'] = max(600,$match[1]*$period[$match[2]]);  // n * period in seconds, minimum 10 minutes
+        } else {
+            $p['refresh'] = 14400;   // default to 4 hours
+        }
+
+        $this->_addCall('rss',array($link,$p),$pos);
+        return true;
+    }
+
+    function externallink($match, $state, $pos) {
+        $url   = $match;
+        $title = null;
+
+        // add protocol on simple short URLs
+        if(substr($url,0,3) == 'ftp' && (substr($url,0,6) != 'ftp://')){
+            $title = $url;
+            $url   = 'ftp://'.$url;
+        }
+        if(substr($url,0,3) == 'www' && (substr($url,0,7) != 'http://')){
+            $title = $url;
+            $url = 'http://'.$url;
+        }
+
+        $this->_addCall('externallink',array($url, $title), $pos);
+        return true;
+    }
+
+    function emaillink($match, $state, $pos) {
+        $email = preg_replace(array('/^$/'),'',$match);
+        $this->_addCall('emaillink',array($email, null), $pos);
+        return true;
+    }
+
+    function table($match, $state, $pos) {
+        switch ( $state ) {
+
+            case DOKU_LEXER_ENTER:
+
+                $ReWriter = new Doku_Handler_Table($this->CallWriter);
+                $this->CallWriter = & $ReWriter;
+
+                $this->_addCall('table_start', array($pos + 1), $pos);
+                if ( trim($match) == '^' ) {
+                    $this->_addCall('tableheader', array(), $pos);
+                } else {
+                    $this->_addCall('tablecell', array(), $pos);
+                }
+            break;
+
+            case DOKU_LEXER_EXIT:
+                $this->_addCall('table_end', array($pos), $pos);
+                $this->CallWriter->process();
+                $ReWriter = & $this->CallWriter;
+                $this->CallWriter = & $ReWriter->CallWriter;
+            break;
+
+            case DOKU_LEXER_UNMATCHED:
+                if ( trim($match) != '' ) {
+                    $this->_addCall('cdata',array($match), $pos);
+                }
+            break;
+
+            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) ) {
+                    $this->_addCall('table_align', array($match), $pos);
+                } else if ( $match == "\n|" ) {
+                    $this->_addCall('table_row', array(), $pos);
+                    $this->_addCall('tablecell', array(), $pos);
+                } else if ( $match == "\n^" ) {
+                    $this->_addCall('table_row', array(), $pos);
+                    $this->_addCall('tableheader', array(), $pos);
+                } else if ( $match == '|' ) {
+                    $this->_addCall('tablecell', array(), $pos);
+                } else if ( $match == '^' ) {
+                    $this->_addCall('tableheader', array(), $pos);
+                }
+            break;
+        }
+        return true;
+    }
+}
+
+//------------------------------------------------------------------------
+function Doku_Handler_Parse_Media($match) {
+
+    // Strip the opening and closing markup
+    $link = preg_replace(array('/^\{\{/','/\}\}$/u'),'',$match);
+
+    // Split title from URL
+    $link = explode('|',$link,2);
+
+    // Check alignment
+    $ralign = (bool)preg_match('/^ /',$link[0]);
+    $lalign = (bool)preg_match('/ $/',$link[0]);
+
+    // Logic = what's that ;)...
+    if ( $lalign & $ralign ) {
+        $align = 'center';
+    } else if ( $ralign ) {
+        $align = 'right';
+    } else if ( $lalign ) {
+        $align = 'left';
+    } else {
+        $align = null;
+    }
+
+    // The title...
+    if ( !isset($link[1]) ) {
+        $link[1] = null;
+    }
+
+    //remove aligning spaces
+    $link[0] = trim($link[0]);
+
+    //split into src and parameters (using the very last questionmark)
+    $pos = strrpos($link[0], '?');
+    if($pos !== false){
+        $src   = substr($link[0],0,$pos);
+        $param = substr($link[0],$pos+1);
+    }else{
+        $src   = $link[0];
+        $param = '';
+    }
+
+    //parse width and height
+    if(preg_match('#(\d+)(x(\d+))?#i',$param,$size)){
+        !empty($size[1]) ? $w = $size[1] : $w = null;
+        !empty($size[3]) ? $h = $size[3] : $h = null;
+    } else {
+        $w = null;
+        $h = null;
+    }
+
+    //get linking command
+    if(preg_match('/nolink/i',$param)){
+        $linking = 'nolink';
+    }else if(preg_match('/direct/i',$param)){
+        $linking = 'direct';
+    }else if(preg_match('/linkonly/i',$param)){
+        $linking = 'linkonly';
+    }else{
+        $linking = 'details';
+    }
+
+    //get caching command
+    if (preg_match('/(nocache|recache)/i',$param,$cachemode)){
+        $cache = $cachemode[1];
+    }else{
+        $cache = 'cache';
+    }
+
+    // Check whether this is a local or remote image
+    if ( media_isexternal($src) ) {
+        $call = 'externalmedia';
+    } else {
+        $call = 'internalmedia';
+    }
+
+    $params = array(
+        'type'=>$call,
+        'src'=>$src,
+        'title'=>$link[1],
+        'align'=>$align,
+        'width'=>$w,
+        'height'=>$h,
+        'cache'=>$cache,
+        'linking'=>$linking,
+    );
+
+    return $params;
+}
+
+//------------------------------------------------------------------------
+class Doku_Handler_CallWriter {
+
+    var $Handler;
+
+    function Doku_Handler_CallWriter(& $Handler) {
+        $this->Handler = & $Handler;
+    }
+
+    function writeCall($call) {
+        $this->Handler->calls[] = $call;
+    }
+
+    function writeCalls($calls) {
+        $this->Handler->calls = array_merge($this->Handler->calls, $calls);
+    }
+
+    // function is required, but since this call writer is first/highest in
+    // the chain it is not required to do anything
+    function finalise() {
+        unset($this->Handler);
+    }
+}
+
+//------------------------------------------------------------------------
+/**
+ * Generic call writer class to handle nesting of rendering instructions
+ * within a render instruction. Also see nest() method of renderer base class
+ *
+ * @author    Chris Smith 
+ */
+class Doku_Handler_Nest {
+
+    var $CallWriter;
+    var $calls = array();
+
+    var $closingInstruction;
+
+    /**
+     * constructor
+     *
+     * @param  object     $CallWriter     the renderers current call writer
+     * @param  string     $close          closing instruction name, this is required to properly terminate the
+     *                                    syntax mode if the document ends without a closing pattern
+     */
+    function Doku_Handler_Nest(& $CallWriter, $close="nest_close") {
+        $this->CallWriter = & $CallWriter;
+
+        $this->closingInstruction = $close;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array($this->closingInstruction,array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+        unset($this->CallWriter);
+    }
+
+    function process() {
+        // merge consecutive cdata
+        $unmerged_calls = $this->calls;
+        $this->calls = array();
+
+        foreach ($unmerged_calls as $call) $this->addCall($call);
+
+        $first_call = reset($this->calls);
+        $this->CallWriter->writeCall(array("nest", array($this->calls), $first_call[2]));
+    }
+
+    function addCall($call) {
+        $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;
+        }
+    }
+}
+
+class Doku_Handler_List {
+
+    var $CallWriter;
+
+    var $calls = array();
+    var $listCalls = array();
+    var $listStack = array();
+
+    function Doku_Handler_List(& $CallWriter) {
+        $this->CallWriter = & $CallWriter;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    // Probably not needed but just in case...
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+#        $this->CallWriter->writeCalls($this->calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array('list_close',array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+        unset($this->CallWriter);
+    }
+
+    //------------------------------------------------------------------------
+    function process() {
+
+        foreach ( $this->calls as $call ) {
+            switch ($call[0]) {
+                case 'list_item':
+                    $this->listOpen($call);
+                break;
+                case 'list_open':
+                    $this->listStart($call);
+                break;
+                case 'list_close':
+                    $this->listEnd($call);
+                break;
+                default:
+                    $this->listContent($call);
+                break;
+            }
+        }
+
+        $this->CallWriter->writeCalls($this->listCalls);
+    }
+
+    //------------------------------------------------------------------------
+    function listStart($call) {
+        $depth = $this->interpretSyntax($call[1][0], $listType);
+
+        $this->initialDepth = $depth;
+        $this->listStack[] = array($listType, $depth);
+
+        $this->listCalls[] = array('list'.$listType.'_open',array(),$call[2]);
+        $this->listCalls[] = array('listitem_open',array(1),$call[2]);
+        $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+    }
+
+    //------------------------------------------------------------------------
+    function listEnd($call) {
+        $closeContent = true;
+
+        while ( $list = array_pop($this->listStack) ) {
+            if ( $closeContent ) {
+                $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+                $closeContent = false;
+            }
+            $this->listCalls[] = array('listitem_close',array(),$call[2]);
+            $this->listCalls[] = array('list'.$list[0].'_close', array(), $call[2]);
+        }
+    }
+
+    //------------------------------------------------------------------------
+    function listOpen($call) {
+        $depth = $this->interpretSyntax($call[1][0], $listType);
+        $end = end($this->listStack);
+
+        // Not allowed to be shallower than initialDepth
+        if ( $depth < $this->initialDepth ) {
+            $depth = $this->initialDepth;
+        }
+
+        //------------------------------------------------------------------------
+        if ( $depth == $end[1] ) {
+
+            // Just another item in the list...
+            if ( $listType == $end[0] ) {
+                $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+                $this->listCalls[] = array('listitem_close',array(),$call[2]);
+                $this->listCalls[] = array('listitem_open',array($depth-1),$call[2]);
+                $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+            // Switched list type...
+            } else {
+
+                $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+                $this->listCalls[] = array('listitem_close',array(),$call[2]);
+                $this->listCalls[] = array('list'.$end[0].'_close', array(), $call[2]);
+                $this->listCalls[] = array('list'.$listType.'_open', array(), $call[2]);
+                $this->listCalls[] = array('listitem_open', array($depth-1), $call[2]);
+                $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+                array_pop($this->listStack);
+                $this->listStack[] = array($listType, $depth);
+            }
+
+        //------------------------------------------------------------------------
+        // Getting deeper...
+        } else if ( $depth > $end[1] ) {
+
+            $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+            $this->listCalls[] = array('list'.$listType.'_open', array(), $call[2]);
+            $this->listCalls[] = array('listitem_open', array($depth-1), $call[2]);
+            $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+            $this->listStack[] = array($listType, $depth);
+
+        //------------------------------------------------------------------------
+        // Getting shallower ( $depth < $end[1] )
+        } else {
+            $this->listCalls[] = array('listcontent_close',array(),$call[2]);
+            $this->listCalls[] = array('listitem_close',array(),$call[2]);
+            $this->listCalls[] = array('list'.$end[0].'_close',array(),$call[2]);
+
+            // Throw away the end - done
+            array_pop($this->listStack);
+
+            while (1) {
+                $end = end($this->listStack);
+
+                if ( $end[1] <= $depth ) {
+
+                    // Normalize depths
+                    $depth = $end[1];
+
+                    $this->listCalls[] = array('listitem_close',array(),$call[2]);
+
+                    if ( $end[0] == $listType ) {
+                        $this->listCalls[] = array('listitem_open',array($depth-1),$call[2]);
+                        $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+                    } else {
+                        // Switching list type...
+                        $this->listCalls[] = array('list'.$end[0].'_close', array(), $call[2]);
+                        $this->listCalls[] = array('list'.$listType.'_open', array(), $call[2]);
+                        $this->listCalls[] = array('listitem_open', array($depth-1), $call[2]);
+                        $this->listCalls[] = array('listcontent_open',array(),$call[2]);
+
+                        array_pop($this->listStack);
+                        $this->listStack[] = array($listType, $depth);
+                    }
+
+                    break;
+
+                // Haven't dropped down far enough yet.... ( $end[1] > $depth )
+                } else {
+
+                    $this->listCalls[] = array('listitem_close',array(),$call[2]);
+                    $this->listCalls[] = array('list'.$end[0].'_close',array(),$call[2]);
+
+                    array_pop($this->listStack);
+
+                }
+
+            }
+
+        }
+    }
+
+    //------------------------------------------------------------------------
+    function listContent($call) {
+        $this->listCalls[] = $call;
+    }
+
+    //------------------------------------------------------------------------
+    function interpretSyntax($match, & $type) {
+        if ( substr($match,-1) == '*' ) {
+            $type = 'u';
+        } else {
+            $type = 'o';
+        }
+        // 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;
+    }
+}
+
+//------------------------------------------------------------------------
+class Doku_Handler_Preformatted {
+
+    var $CallWriter;
+
+    var $calls = array();
+    var $pos;
+    var $text ='';
+
+
+
+    function Doku_Handler_Preformatted(& $CallWriter) {
+        $this->CallWriter = & $CallWriter;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    // Probably not needed but just in case...
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+#        $this->CallWriter->writeCalls($this->calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array('preformatted_end',array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+        unset($this->CallWriter);
+    }
+
+    function process() {
+        foreach ( $this->calls as $call ) {
+            switch ($call[0]) {
+                case 'preformatted_start':
+                    $this->pos = $call[2];
+                break;
+                case 'preformatted_newline':
+                    $this->text .= "\n";
+                break;
+                case 'preformatted_content':
+                    $this->text .= $call[1][0];
+                break;
+                case 'preformatted_end':
+                    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;
+            }
+        }
+    }
+
+}
+
+//------------------------------------------------------------------------
+class Doku_Handler_Quote {
+
+    var $CallWriter;
+
+    var $calls = array();
+
+    var $quoteCalls = array();
+
+    function Doku_Handler_Quote(& $CallWriter) {
+        $this->CallWriter = & $CallWriter;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    // Probably not needed but just in case...
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array('quote_end',array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+        unset($this->CallWriter);
+    }
+
+    function process() {
+
+        $quoteDepth = 1;
+
+        foreach ( $this->calls as $call ) {
+            switch ($call[0]) {
+
+                case 'quote_start':
+
+                    $this->quoteCalls[] = array('quote_open',array(),$call[2]);
+
+                case 'quote_newline':
+
+                    $quoteLength = $this->getDepth($call[1][0]);
+
+                    if ( $quoteLength > $quoteDepth ) {
+                        $quoteDiff = $quoteLength - $quoteDepth;
+                        for ( $i = 1; $i <= $quoteDiff; $i++ ) {
+                            $this->quoteCalls[] = array('quote_open',array(),$call[2]);
+                        }
+                    } else if ( $quoteLength < $quoteDepth ) {
+                        $quoteDiff = $quoteDepth - $quoteLength;
+                        for ( $i = 1; $i <= $quoteDiff; $i++ ) {
+                            $this->quoteCalls[] = array('quote_close',array(),$call[2]);
+                        }
+                    } else {
+                        if ($call[0] != 'quote_start') $this->quoteCalls[] = array('linebreak',array(),$call[2]);
+                    }
+
+                    $quoteDepth = $quoteLength;
+
+                break;
+
+                case 'quote_end':
+
+                    if ( $quoteDepth > 1 ) {
+                        $quoteDiff = $quoteDepth - 1;
+                        for ( $i = 1; $i <= $quoteDiff; $i++ ) {
+                            $this->quoteCalls[] = array('quote_close',array(),$call[2]);
+                        }
+                    }
+
+                    $this->quoteCalls[] = array('quote_close',array(),$call[2]);
+
+                    $this->CallWriter->writeCalls($this->quoteCalls);
+                break;
+
+                default:
+                    $this->quoteCalls[] = $call;
+                break;
+            }
+        }
+    }
+
+    function getDepth($marker) {
+        preg_match('/>{1,}/', $marker, $matches);
+        $quoteLength = strlen($matches[0]);
+        return $quoteLength;
+    }
+}
+
+//------------------------------------------------------------------------
+class Doku_Handler_Table {
+
+    var $CallWriter;
+
+    var $calls = array();
+    var $tableCalls = array();
+    var $maxCols = 0;
+    var $maxRows = 1;
+    var $currentCols = 0;
+    var $firstCell = false;
+    var $lastCellType = 'tablecell';
+
+    function Doku_Handler_Table(& $CallWriter) {
+        $this->CallWriter = & $CallWriter;
+    }
+
+    function writeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    // Probably not needed but just in case...
+    function writeCalls($calls) {
+        $this->calls = array_merge($this->calls, $calls);
+    }
+
+    function finalise() {
+        $last_call = end($this->calls);
+        $this->writeCall(array('table_end',array(), $last_call[2]));
+
+        $this->process();
+        $this->CallWriter->finalise();
+        unset($this->CallWriter);
+    }
+
+    //------------------------------------------------------------------------
+    function process() {
+        foreach ( $this->calls as $call ) {
+            switch ( $call[0] ) {
+                case 'table_start':
+                    $this->tableStart($call);
+                break;
+                case 'table_row':
+                    $this->tableRowClose($call);
+                    $this->tableRowOpen(array('tablerow_open',$call[1],$call[2]));
+                break;
+                case 'tableheader':
+                case 'tablecell':
+                    $this->tableCell($call);
+                break;
+                case 'table_end':
+                    $this->tableRowClose($call);
+                    $this->tableEnd($call);
+                break;
+                default:
+                    $this->tableDefault($call);
+                break;
+            }
+        }
+        $this->CallWriter->writeCalls($this->tableCalls);
+    }
+
+    function tableStart($call) {
+        $this->tableCalls[] = array('table_open',$call[1],$call[2]);
+        $this->tableCalls[] = array('tablerow_open',array(),$call[2]);
+        $this->firstCell = true;
+    }
+
+    function tableEnd($call) {
+        $this->tableCalls[] = array('table_close',$call[1],$call[2]);
+        $this->finalizeTable();
+    }
+
+    function tableRowOpen($call) {
+        $this->tableCalls[] = $call;
+        $this->currentCols = 0;
+        $this->firstCell = true;
+        $this->lastCellType = 'tablecell';
+        $this->maxRows++;
+    }
+
+    function tableRowClose($call) {
+        // Strip off final cell opening and anything after it
+        while ( $discard = array_pop($this->tableCalls ) ) {
+
+            if ( $discard[0] == 'tablecell_open' || $discard[0] == 'tableheader_open') {
+                break;
+            }
+        }
+        $this->tableCalls[] = array('tablerow_close', array(), $call[2]);
+
+        if ( $this->currentCols > $this->maxCols ) {
+            $this->maxCols = $this->currentCols;
+        }
+    }
+
+    function tableCell($call) {
+        if ( !$this->firstCell ) {
+
+            // Increase the span
+            $lastCall = end($this->tableCalls);
+
+            // A cell call which follows an open cell means an empty cell so span
+            if ( $lastCall[0] == 'tablecell_open' || $lastCall[0] == 'tableheader_open' ) {
+                 $this->tableCalls[] = array('colspan',array(),$call[2]);
+
+            }
+
+            $this->tableCalls[] = array($this->lastCellType.'_close',array(),$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,1),$call[2]);
+            $this->lastCellType = $call[0];
+            $this->firstCell = false;
+
+        }
+
+        $this->currentCols++;
+    }
+
+    function tableDefault($call) {
+        $this->tableCalls[] = $call;
+    }
+
+    function finalizeTable() {
+
+        // Add the max cols and rows to the table opening
+        if ( $this->tableCalls[0][0] == 'table_open' ) {
+            // Adjust to num cols not num col delimeters
+            $this->tableCalls[0][1][] = $this->maxCols - 1;
+            $this->tableCalls[0][1][] = $this->maxRows;
+            $this->tableCalls[0][1][] = array_shift($this->tableCalls[0][1]);
+        } else {
+            trigger_error('First element in table call list is not table_open');
+        }
+
+        $lastRow = 0;
+        $lastCell = 0;
+        $cellKey = array();
+        $toDelete = array();
+
+        // Look for the colspan elements and increment the colspan on the
+        // previous non-empty opening cell. Once done, delete all the cells
+        // that contain colspans
+        for ($key = 0 ; $key < count($this->tableCalls) ; ++$key) {
+            $call = $this->tableCalls[$key];
+
+            switch ($call[0]) {
+                case 'tablerow_open':
+
+                    $lastRow++;
+                    $lastCell = 0;
+                    break;
+
+                case 'tablecell_open':
+                case 'tableheader_open':
+
+                    $lastCell++;
+                    $cellKey[$lastRow][$lastCell] = $key;
+                    break;
+
+                case '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
+                    } elseif ($prev) {
+                        $this->tableCalls[$key-1][1][1] = 'right';
+
+                    // 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[$cellKey[$lastRow][$lastCell]][1][1] = 'left';
+                        }
+
+                    }
+
+                    // Now convert the whitespace back to cdata
+                    $this->tableCalls[$key][0] = 'cdata';
+                    break;
+
+                case 'colspan':
+
+                    $this->tableCalls[$key-1][1][0] = false;
+
+                    for($i = $key-2; $i >= $cellKey[$lastRow][1]; $i--) {
+
+                        if ( $this->tableCalls[$i][0] == 'tablecell_open' || $this->tableCalls[$i][0] == 'tableheader_open' ) {
+
+                            if ( false !== $this->tableCalls[$i][1][0] ) {
+                                $this->tableCalls[$i][1][0]++;
+                                break;
+                            }
+
+                        }
+                    }
+
+                    $toDelete[] = $key-1;
+                    $toDelete[] = $key;
+                    $toDelete[] = $key+1;
+                    break;
+
+                case '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 {
+
+                        $spanning_cell = null;
+                        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 ($this->tableCalls[$cellKey[$i][$lastCell]][1][2] >= $lastRow - $i) {
+                                    $spanning_cell = $i;
+                                    break;
+                                }
+
+                            }
+                        }
+                        if (is_null($spanning_cell)) {
+                            // No spanning cell found, so convert this cell to
+                            // an empty one to avoid broken tables
+                            $this->tableCalls[$key][0] = 'cdata';
+                            $this->tableCalls[$key][1][0] = '';
+                            continue;
+                        }
+                        $this->tableCalls[$cellKey[$spanning_cell][$lastCell]][1][2]++;
+
+                        $this->tableCalls[$key-1][1][2] = false;
+
+                        $toDelete[] = $key-1;
+                        $toDelete[] = $key;
+                        $toDelete[] = $key+1;
+                    }
+                    break;
+
+                case 'tablerow_close':
+
+                    // Fix broken tables by adding missing cells
+                    while (++$lastCell < $this->maxCols) {
+                        array_splice($this->tableCalls, $key, 0, array(
+                               array('tablecell_open', array(1, null, 1), $call[2]),
+                               array('cdata', array(''), $call[2]),
+                               array('tablecell_close', array(), $call[2])));
+                        $key += 3;
+                    }
+
+                    break;
+
+            }
+        }
+
+        // condense cdata
+        $cnt = count($this->tableCalls);
+        for( $key = 0; $key < $cnt; $key++){
+            if($this->tableCalls[$key][0] == 'cdata'){
+                $ckey = $key;
+                $key++;
+                while($this->tableCalls[$key][0] == 'cdata'){
+                    $this->tableCalls[$ckey][1][0] .= $this->tableCalls[$key][1][0];
+                    $toDelete[] = $key;
+                    $key++;
+                }
+                continue;
+            }
+        }
+
+        foreach ( $toDelete as $delete ) {
+            unset($this->tableCalls[$delete]);
+        }
+        $this->tableCalls = array_values($this->tableCalls);
+    }
+}
+
+
+/**
+ * Handler for paragraphs
+ *
+ * @author Harry Fuecks 
+ */
+class Doku_Handler_Block {
+    var $calls = array();
+    var $skipEol = false;
+    var $inParagraph = false;
+
+    // Blocks these should not be inside paragraphs
+    var $blockOpen = array(
+            'header',
+            'listu_open','listo_open','listitem_open','listcontent_open',
+            'table_open','tablerow_open','tablecell_open','tableheader_open',
+            'quote_open',
+            'code','file','hr','preformatted','rss',
+            'htmlblock','phpblock',
+            'footnote_open',
+        );
+
+    var $blockClose = array(
+            'header',
+            'listu_close','listo_close','listitem_close','listcontent_close',
+            'table_close','tablerow_close','tablecell_close','tableheader_close',
+            'quote_close',
+            'code','file','hr','preformatted','rss',
+            'htmlblock','phpblock',
+            'footnote_close',
+        );
+
+    // Stacks can contain paragraphs
+    var $stackOpen = array(
+        'section_open',
+        );
+
+    var $stackClose = array(
+        'section_close',
+        );
+
+
+    /**
+     * Constructor. Adds loaded syntax plugins to the block and stack
+     * arrays
+     *
+     * @author Andreas Gohr 
+     */
+    function Doku_Handler_Block(){
+        global $DOKU_PLUGINS;
+        //check if syntax plugins were loaded
+        if(empty($DOKU_PLUGINS['syntax'])) return;
+        foreach($DOKU_PLUGINS['syntax'] as $n => $p){
+            $ptype = $p->getPType();
+            if($ptype == 'block'){
+                $this->blockOpen[]  = 'plugin_'.$n;
+                $this->blockClose[] = 'plugin_'.$n;
+            }elseif($ptype == 'stack'){
+                $this->stackOpen[]  = 'plugin_'.$n;
+                $this->stackClose[] = 'plugin_'.$n;
+            }
+        }
+    }
+
+    function openParagraph($pos){
+        if ($this->inParagraph) return;
+        $this->calls[] = array('p_open',array(), $pos);
+        $this->inParagraph = true;
+        $this->skipEol = true;
+    }
+
+    /**
+     * Close a paragraph if needed
+     *
+     * This function makes sure there are no empty paragraphs on the stack
+     *
+     * @author Andreas Gohr 
+     */
+    function closeParagraph($pos){
+        if (!$this->inParagraph) return;
+        // look back if there was any content - we don't want empty paragraphs
+        $content = '';
+        $ccount = count($this->calls);
+        for($i=$ccount-1; $i>=0; $i--){
+            if($this->calls[$i][0] == 'p_open'){
+                break;
+            }elseif($this->calls[$i][0] == 'cdata'){
+                $content .= $this->calls[$i][1][0];
+            }else{
+                $content = 'found markup';
+                break;
+            }
+        }
+
+        if(trim($content)==''){
+            //remove the whole paragraph
+            //array_splice($this->calls,$i); // <- this is much slower than the loop below
+            for($x=$ccount; $x>$i; $x--) array_pop($this->calls);
+        }else{
+            // remove ending linebreaks in the paragraph
+            $i=count($this->calls)-1;
+            if ($this->calls[$i][0] == 'cdata') $this->calls[$i][1][0] = rtrim($this->calls[$i][1][0],DOKU_PARSER_EOL);
+            $this->calls[] = array('p_close',array(), $pos);
+        }
+
+        $this->inParagraph = false;
+        $this->skipEol = true;
+    }
+
+    function addCall($call) {
+        $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 {
+            $this->calls[] = $call;
+        }
+    }
+
+    // simple version of addCall, without checking cdata
+    function storeCall($call) {
+        $this->calls[] = $call;
+    }
+
+    /**
+     * Processes the whole instruction stack to open and close paragraphs
+     *
+     * @author Harry Fuecks 
+     * @author Andreas Gohr 
+     */
+    function process($calls) {
+        // open first paragraph
+        $this->openParagraph(0);
+        foreach ( $calls as $key => $call ) {
+            $cname = $call[0];
+            if ($cname == 'plugin') {
+                $cname='plugin_'.$call[1][0];
+                $plugin = true;
+                $plugin_open = (($call[1][2] == DOKU_LEXER_ENTER) || ($call[1][2] == DOKU_LEXER_SPECIAL));
+                $plugin_close = (($call[1][2] == DOKU_LEXER_EXIT) || ($call[1][2] == DOKU_LEXER_SPECIAL));
+            } else {
+                $plugin = false;
+            }
+            /* stack */
+            if ( in_array($cname,$this->stackClose ) && (!$plugin || $plugin_close)) {
+                $this->closeParagraph($call[2]);
+                $this->storeCall($call);
+                $this->openParagraph($call[2]);
+                continue;
+            }
+            if ( in_array($cname,$this->stackOpen ) && (!$plugin || $plugin_open) ) {
+                $this->closeParagraph($call[2]);
+                $this->storeCall($call);
+                $this->openParagraph($call[2]);
+                continue;
+            }
+            /* block */
+            // If it's a substition it opens and closes at the same call.
+            // To make sure next paragraph is correctly started, let close go first.
+            if ( in_array($cname, $this->blockClose) && (!$plugin || $plugin_close)) {
+                $this->closeParagraph($call[2]);
+                $this->storeCall($call);
+                $this->openParagraph($call[2]);
+                continue;
+            }
+            if ( in_array($cname, $this->blockOpen) && (!$plugin || $plugin_open)) {
+                $this->closeParagraph($call[2]);
+                $this->storeCall($call);
+                continue;
+            }
+            /* eol */
+            if ( $cname == 'eol' ) {
+                // Check this isn't an eol instruction to skip...
+                if ( !$this->skipEol ) {
+                    // Next is EOL => double eol => mark as paragraph
+                    if ( isset($calls[$key+1]) && $calls[$key+1][0] == 'eol' ) {
+                        $this->closeParagraph($call[2]);
+                        $this->openParagraph($call[2]);
+                    } else {
+                        //if this is just a single eol make a space from it
+                        $this->addCall(array('cdata',array(DOKU_PARSER_EOL), $call[2]));
+                    }
+                }
+                continue;
+            }
+            /* normal */
+            $this->addCall($call);
+            $this->skipEol = false;
+        }
+        // close last paragraph
+        $call = end($this->calls);
+        $this->closeParagraph($call[2]);
+        return $this->calls;
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/inc/parser/lexer.php b/sources/inc/parser/lexer.php
new file mode 100644
index 0000000..2e84eca
--- /dev/null
+++ b/sources/inc/parser/lexer.php
@@ -0,0 +1,604 @@
+_case = $case;
+        $this->_patterns = array();
+        $this->_labels = array();
+        $this->_regex = null;
+    }
+
+    /**
+     * Adds a pattern with an optional label.
+     *
+     * @param mixed $pattern       Perl style regex. Must be UTF-8
+     *                             encoded. If its a string, the (, )
+     *                             lose their meaning unless they
+     *                             form part of a lookahead or
+     *                             lookbehind assertation.
+     * @param string $label        Label of regex to be returned
+     *                             on a match. Label must be ASCII
+     * @access public
+     */
+    function addPattern($pattern, $label = true) {
+        $count = count($this->_patterns);
+        $this->_patterns[$count] = $pattern;
+        $this->_labels[$count] = $label;
+        $this->_regex = null;
+    }
+
+    /**
+     * Attempts to match all patterns at once against a string.
+     *
+     * @param string $subject      String to match against.
+     * @param string $match        First matched portion of
+     *                             subject.
+     * @return boolean             True on success.
+     * @access public
+     */
+    function match($subject, &$match) {
+        if (count($this->_patterns) == 0) {
+            return false;
+        }
+        if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
+            $match = "";
+            return false;
+        }
+
+        $match = $matches[0];
+        $size = count($matches);
+        for ($i = 1; $i < $size; $i++) {
+            if ($matches[$i] && isset($this->_labels[$i - 1])) {
+                return $this->_labels[$i - 1];
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Attempts to split the string against all patterns at once
+     *
+     * @param string $subject      String to match against.
+     * @param array $split         The split result: array containing, pre-match, match & post-match strings
+     * @return boolean             True on success.
+     * @access public
+     *
+     * @author Christopher Smith 
+     */
+    function split($subject, &$split) {
+        if (count($this->_patterns) == 0) {
+            return false;
+        }
+
+        if (! preg_match($this->_getCompoundedRegex(), $subject, $matches)) {
+            if(function_exists('preg_last_error')){
+                $err = preg_last_error();
+                switch($err){
+                    case PREG_BACKTRACK_LIMIT_ERROR:
+                        msg('A PCRE backtrack error occured. Try to increase the pcre.backtrack_limit in php.ini',-1);
+                        break;
+                    case PREG_RECURSION_LIMIT_ERROR:
+                        msg('A PCRE recursion error occured. Try to increase the pcre.recursion_limit in php.ini',-1);
+                        break;
+                    case PREG_BAD_UTF8_ERROR:
+                        msg('A PCRE UTF-8 error occured. This might be caused by a faulty plugin',-1);
+                        break;
+                    case PREG_INTERNAL_ERROR:
+                        msg('A PCRE internal error occured. This might be caused by a faulty plugin',-1);
+                        break;
+                }
+            }
+
+            $split = array($subject, "", "");
+            return false;
+        }
+
+        $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;
+    }
+
+    /**
+     * Compounds the patterns into a single
+     * regular expression separated with the
+     * "or" operator. Caches the regex.
+     * Will automatically escape (, ) and / tokens.
+     *
+     * @param array $patterns    List of patterns in order.
+     * @access private
+     */
+    function _getCompoundedRegex() {
+        if ($this->_regex == null) {
+            $cnt = count($this->_patterns);
+            for ($i = 0; $i < $cnt; $i++) {
+
+                /*
+                 * decompose the input pattern into "(", "(?", ")",
+                 * "[...]", "[]..]", "[^]..]", "[...[:...:]..]", "\x"...
+                 * elements.
+                 */
+                preg_match_all('/\\\\.|' .
+                               '\(\?|' .
+                               '[()]|' .
+                               '\[\^?\]?(?:\\\\.|\[:[^]]*:\]|[^]\\\\])*\]|' .
+                               '[^[()\\\\]+/', $this->_patterns[$i], $elts);
+
+                $pattern = "";
+                $level = 0;
+
+                foreach ($elts[0] as $elt) {
+                    /*
+                     * for "(", ")" remember the nesting level, add "\"
+                     * only to the non-"(?" ones.
+                     */
+
+                    switch($elt) {
+                        case '(':
+                            $pattern .= '\(';
+                            break;
+                        case ')':
+                            if ($level > 0)
+                                $level--; /* closing (? */
+                            else
+                                $pattern .= '\\';
+                            $pattern .= ')';
+                            break;
+                        case '(?':
+                            $level++;
+                            $pattern .= '(?';
+                            break;
+                        default:
+                            if (substr($elt, 0, 1) == '\\')
+                                $pattern .= $elt;
+                            else
+                                $pattern .= str_replace('/', '\/', $elt);
+                    }
+                }
+                $this->_patterns[$i] = "($pattern)";
+            }
+            $this->_regex = "/" . implode("|", $this->_patterns) . "/" . $this->_getPerlMatchingFlags();
+        }
+        return $this->_regex;
+    }
+
+    /**
+     * Accessor for perl regex mode flags to use.
+     * @return string       Perl regex flags.
+     * @access private
+     */
+    function _getPerlMatchingFlags() {
+        return ($this->_case ? "msS" : "msSi");
+    }
+}
+
+/**
+ * States for a stack machine.
+ * @package Lexer
+ * @subpackage Lexer
+ */
+class Doku_LexerStateStack {
+    var $_stack;
+
+    /**
+     * Constructor. Starts in named state.
+     * @param string $start        Starting state name.
+     * @access public
+     */
+    function Doku_LexerStateStack($start) {
+        $this->_stack = array($start);
+    }
+
+    /**
+     * Accessor for current state.
+     * @return string       State.
+     * @access public
+     */
+    function getCurrent() {
+        return $this->_stack[count($this->_stack) - 1];
+    }
+
+    /**
+     * Adds a state to the stack and sets it
+     * to be the current state.
+     * @param string $state        New state.
+     * @access public
+     */
+    function enter($state) {
+        array_push($this->_stack, $state);
+    }
+
+    /**
+     * Leaves the current state and reverts
+     * to the previous one.
+     * @return boolean    False if we drop off
+     *                    the bottom of the list.
+     * @access public
+     */
+    function leave() {
+        if (count($this->_stack) == 1) {
+            return false;
+        }
+        array_pop($this->_stack);
+        return true;
+    }
+}
+
+/**
+ * Accepts text and breaks it into tokens.
+ * Some optimisation to make the sure the
+ * content is only scanned by the PHP regex
+ * parser once. Lexer modes must not start
+ * with leading underscores.
+ * @package Doku
+ * @subpackage Lexer
+ */
+class Doku_Lexer {
+    var $_regexes;
+    var $_parser;
+    var $_mode;
+    var $_mode_handlers;
+    var $_case;
+
+    /**
+     * Sets up the lexer in case insensitive matching
+     * by default.
+     * @param Doku_Parser $parser  Handling strategy by
+     *                                 reference.
+     * @param string $start            Starting handler.
+     * @param boolean $case            True for case sensitive.
+     * @access public
+     */
+    function Doku_Lexer(&$parser, $start = "accept", $case = false) {
+        $this->_case = $case;
+        $this->_regexes = array();
+        $this->_parser = &$parser;
+        $this->_mode = new Doku_LexerStateStack($start);
+        $this->_mode_handlers = array();
+    }
+
+    /**
+     * Adds a token search pattern for a particular
+     * parsing mode. The pattern does not change the
+     * current mode.
+     * @param string $pattern      Perl style regex, but ( and )
+     *                             lose the usual meaning.
+     * @param string $mode         Should only apply this
+     *                             pattern when dealing with
+     *                             this type of input.
+     * @access public
+     */
+    function addPattern($pattern, $mode = "accept") {
+        if (! isset($this->_regexes[$mode])) {
+            $this->_regexes[$mode] = new Doku_LexerParallelRegex($this->_case);
+        }
+        $this->_regexes[$mode]->addPattern($pattern);
+    }
+
+    /**
+     * Adds a pattern that will enter a new parsing
+     * mode. Useful for entering parenthesis, strings,
+     * tags, etc.
+     * @param string $pattern      Perl style regex, but ( and )
+     *                             lose the usual meaning.
+     * @param string $mode         Should only apply this
+     *                             pattern when dealing with
+     *                             this type of input.
+     * @param string $new_mode     Change parsing to this new
+     *                             nested mode.
+     * @access public
+     */
+    function addEntryPattern($pattern, $mode, $new_mode) {
+        if (! isset($this->_regexes[$mode])) {
+            $this->_regexes[$mode] = new Doku_LexerParallelRegex($this->_case);
+        }
+        $this->_regexes[$mode]->addPattern($pattern, $new_mode);
+    }
+
+    /**
+     * Adds a pattern that will exit the current mode
+     * and re-enter the previous one.
+     * @param string $pattern      Perl style regex, but ( and )
+     *                             lose the usual meaning.
+     * @param string $mode         Mode to leave.
+     * @access public
+     */
+    function addExitPattern($pattern, $mode) {
+        if (! isset($this->_regexes[$mode])) {
+            $this->_regexes[$mode] = new Doku_LexerParallelRegex($this->_case);
+        }
+        $this->_regexes[$mode]->addPattern($pattern, "__exit");
+    }
+
+    /**
+     * Adds a pattern that has a special mode. Acts as an entry
+     * and exit pattern in one go, effectively calling a special
+     * parser handler for this token only.
+     * @param string $pattern      Perl style regex, but ( and )
+     *                             lose the usual meaning.
+     * @param string $mode         Should only apply this
+     *                             pattern when dealing with
+     *                             this type of input.
+     * @param string $special      Use this mode for this one token.
+     * @access public
+     */
+    function addSpecialPattern($pattern, $mode, $special) {
+        if (! isset($this->_regexes[$mode])) {
+            $this->_regexes[$mode] = new Doku_LexerParallelRegex($this->_case);
+        }
+        $this->_regexes[$mode]->addPattern($pattern, "_$special");
+    }
+
+    /**
+     * Adds a mapping from a mode to another handler.
+     * @param string $mode        Mode to be remapped.
+     * @param string $handler     New target handler.
+     * @access public
+     */
+    function mapHandler($mode, $handler) {
+        $this->_mode_handlers[$mode] = $handler;
+    }
+
+    /**
+     * Splits the page text into tokens. Will fail
+     * if the handlers report an error or if no
+     * content is consumed. If successful then each
+     * unparsed and parsed token invokes a call to the
+     * held listener.
+     * @param string $raw        Raw HTML text.
+     * @return boolean           True on success, else false.
+     * @access public
+     */
+    function parse($raw) {
+        if (! isset($this->_parser)) {
+            return false;
+        }
+        $initialLength = strlen($raw);
+        $length = $initialLength;
+        $pos = 0;
+        while (is_array($parsed = $this->_reduce($raw))) {
+            list($unmatched, $matched, $mode) = $parsed;
+            $currentLength = strlen($raw);
+            $matchPos = $initialLength - $currentLength - strlen($matched);
+            if (! $this->_dispatchTokens($unmatched, $matched, $mode, $pos, $matchPos)) {
+                return false;
+            }
+            if ($currentLength == $length) {
+                return false;
+            }
+            $length = $currentLength;
+            $pos = $initialLength - $currentLength;
+        }
+        if (!$parsed) {
+            return false;
+        }
+        return $this->_invokeParser($raw, DOKU_LEXER_UNMATCHED, $pos);
+    }
+
+    /**
+     * Sends the matched token and any leading unmatched
+     * text to the parser changing the lexer to a new
+     * mode if one is listed.
+     * @param string $unmatched    Unmatched leading portion.
+     * @param string $matched      Actual token match.
+     * @param string $mode         Mode after match. A boolean
+     *                             false mode causes no change.
+     * @param int $pos             Current byte index location in raw doc
+     *                             thats being parsed
+     * @return boolean             False if there was any error
+     *                             from the parser.
+     * @access private
+     */
+    function _dispatchTokens($unmatched, $matched, $mode = false, $initialPos, $matchPos) {
+        if (! $this->_invokeParser($unmatched, DOKU_LEXER_UNMATCHED, $initialPos) ){
+            return false;
+        }
+        if ($this->_isModeEnd($mode)) {
+            if (! $this->_invokeParser($matched, DOKU_LEXER_EXIT, $matchPos)) {
+                return false;
+            }
+            return $this->_mode->leave();
+        }
+        if ($this->_isSpecialMode($mode)) {
+            $this->_mode->enter($this->_decodeSpecial($mode));
+            if (! $this->_invokeParser($matched, DOKU_LEXER_SPECIAL, $matchPos)) {
+                return false;
+            }
+            return $this->_mode->leave();
+        }
+        if (is_string($mode)) {
+            $this->_mode->enter($mode);
+            return $this->_invokeParser($matched, DOKU_LEXER_ENTER, $matchPos);
+        }
+        return $this->_invokeParser($matched, DOKU_LEXER_MATCHED, $matchPos);
+    }
+
+    /**
+     * Tests to see if the new mode is actually to leave
+     * the current mode and pop an item from the matching
+     * mode stack.
+     * @param string $mode    Mode to test.
+     * @return boolean        True if this is the exit mode.
+     * @access private
+     */
+    function _isModeEnd($mode) {
+        return ($mode === "__exit");
+    }
+
+    /**
+     * Test to see if the mode is one where this mode
+     * is entered for this token only and automatically
+     * leaves immediately afterwoods.
+     * @param string $mode    Mode to test.
+     * @return boolean        True if this is the exit mode.
+     * @access private
+     */
+    function _isSpecialMode($mode) {
+        return (strncmp($mode, "_", 1) == 0);
+    }
+
+    /**
+     * Strips the magic underscore marking single token
+     * modes.
+     * @param string $mode    Mode to decode.
+     * @return string         Underlying mode name.
+     * @access private
+     */
+    function _decodeSpecial($mode) {
+        return substr($mode, 1);
+    }
+
+    /**
+     * Calls the parser method named after the current
+     * mode. Empty content will be ignored. The lexer
+     * has a parser handler for each mode in the lexer.
+     * @param string $content        Text parsed.
+     * @param boolean $is_match      Token is recognised rather
+     *                               than unparsed data.
+     * @param int $pos         Current byte index location in raw doc
+     *                             thats being parsed
+     * @access private
+     */
+    function _invokeParser($content, $is_match, $pos) {
+        if (($content === "") || ($content === false)) {
+            return true;
+        }
+        $handler = $this->_mode->getCurrent();
+        if (isset($this->_mode_handlers[$handler])) {
+            $handler = $this->_mode_handlers[$handler];
+        }
+
+        // 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) = explode('_',$handler,2);
+            return $this->_parser->$handler($content, $is_match, $pos, $plugin);
+        }
+
+            return $this->_parser->$handler($content, $is_match, $pos);
+        }
+
+    /**
+     * Tries to match a chunk of text and if successful
+     * removes the recognised chunk and any leading
+     * unparsed data. Empty strings will not be matched.
+     * @param string $raw         The subject to parse. This is the
+     *                            content that will be eaten.
+     * @return array              Three item list of unparsed
+     *                            content followed by the
+     *                            recognised token and finally the
+     *                            action the parser is to take.
+     *                            True if no match, false if there
+     *                            is a parsing error.
+     * @access private
+     */
+    function _reduce(&$raw) {
+        if (! isset($this->_regexes[$this->_mode->getCurrent()])) {
+            return false;
+        }
+        if ($raw === "") {
+            return true;
+        }
+        if ($action = $this->_regexes[$this->_mode->getCurrent()]->split($raw, $split)) {
+            list($unparsed, $match, $raw) = $split;
+            return array($unparsed, $match, $action);
+        }
+        return true;
+    }
+}
+
+/**
+ * Escapes regex characters other than (, ) and /
+ * @TODO
+ */
+function Doku_Lexer_Escape($str) {
+    //$str = addslashes($str);
+    $chars = array(
+        '/\\\\/',
+        '/\./',
+        '/\+/',
+        '/\*/',
+        '/\?/',
+        '/\[/',
+        '/\^/',
+        '/\]/',
+        '/\$/',
+        '/\{/',
+        '/\}/',
+        '/\=/',
+        '/\!/',
+        '/\/',
+        '/\|/',
+        '/\:/'
+        );
+
+    $escaped = array(
+        '\\\\\\\\',
+        '\.',
+        '\+',
+        '\*',
+        '\?',
+        '\[',
+        '\^',
+        '\]',
+        '\$',
+        '\{',
+        '\}',
+        '\=',
+        '\!',
+        '\<',
+        '\>',
+        '\|',
+        '\:'
+        );
+    return preg_replace($chars, $escaped, $str);
+}
+
+//Setup VIM: ex: et ts=4 sw=4 :
diff --git a/sources/inc/parser/metadata.php b/sources/inc/parser/metadata.php
new file mode 100644
index 0000000..8ba159d
--- /dev/null
+++ b/sources/inc/parser/metadata.php
@@ -0,0 +1,474 @@
+
+ */
+if(!defined('DOKU_INC')) die('meh.');
+
+if ( !defined('DOKU_LF') ) {
+    // Some whitespace to help View > Source
+    define ('DOKU_LF',"\n");
+}
+
+if ( !defined('DOKU_TAB') ) {
+    // Some whitespace to help View > Source
+    define ('DOKU_TAB',"\t");
+}
+
+require_once DOKU_INC . 'inc/parser/renderer.php';
+
+/**
+ * The Renderer
+ */
+class Doku_Renderer_metadata extends Doku_Renderer {
+
+    var $doc  = '';
+    var $meta = array();
+    var $persistent = array();
+
+    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['user'])){
+            $this->persistent['user'] = '';
+        }
+        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 (!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) {
+        global $conf;
+
+        //only add items within configured levels
+        if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']){
+            // the TOC is one of our standard ul list arrays ;-)
+            $this->meta['description']['tableofcontents'][] = array(
+              'hid'   => $id,
+              'title' => $text,
+              'type'  => 'ul',
+              'level' => $level-$conf['toptoclevel']+1
+            );
+        }
+
+    }
+
+    function header($text, $level, $pos) {
+        if (!isset($this->meta['title'])) $this->meta['title'] = $text;
+
+        // add the header to the TOC
+        $hid = $this->_headerToLink($text,'true');
+        $this->toc_additem($hid, $text, $level);
+
+        // add to summary
+        if ($this->capture && ($level > 1)) $this->doc .= DOKU_LF.$text.DOKU_LF;
+    }
+
+    function section_open($level){}
+    function section_close(){}
+
+    function cdata($text){
+      if ($this->capture) $this->doc .= $text;
+    }
+
+    function p_open(){
+      if ($this->capture) $this->doc .= DOKU_LF;
+    }
+
+    function p_close(){
+        if ($this->capture){
+            if (strlen($this->doc) > 250) $this->capture = false;
+            else $this->doc .= DOKU_LF;
+        }
+    }
+
+    function linebreak(){
+        if ($this->capture) $this->doc .= DOKU_LF;
+    }
+
+    function hr(){
+        if ($this->capture){
+            if (strlen($this->doc) > 250) $this->capture = false;
+            else $this->doc .= DOKU_LF.'----------'.DOKU_LF;
+        }
+    }
+
+    /**
+     * Callback for footnote start syntax
+     *
+     * All following content will go to the footnote instead of
+     * the document. To achieve this the previous rendered content
+     * is moved to $store and $doc is cleared
+     *
+     * @author Andreas Gohr 
+     */
+    function footnote_open() {
+        if ($this->capture){
+            // move current content to store and record footnote
+            $this->store = $this->doc;
+            $this->doc   = '';
+        }
+    }
+
+    /**
+     * Callback for footnote end syntax
+     *
+     * All rendered content is moved to the $footnotes array and the old
+     * content is restored from $store again
+     *
+     * @author Andreas Gohr
+     */
+    function footnote_close() {
+        if ($this->capture){
+            // restore old content
+            $this->doc = $this->store;
+            $this->store = '';
+        }
+    }
+
+    function listu_open(){
+        if ($this->capture) $this->doc .= DOKU_LF;
+    }
+
+    function listu_close(){
+        if ($this->capture && (strlen($this->doc) > 250)) $this->capture = false;
+    }
+
+    function listo_open(){
+        if ($this->capture) $this->doc .= DOKU_LF;
+    }
+
+    function listo_close(){
+        if ($this->capture && (strlen($this->doc) > 250)) $this->capture = false;
+    }
+
+    function listitem_open($level){
+        if ($this->capture) $this->doc .= str_repeat(DOKU_TAB, $level).'* ';
+    }
+
+    function listitem_close(){
+        if ($this->capture) $this->doc .= DOKU_LF;
+    }
+
+    function listcontent_open(){}
+    function listcontent_close(){}
+
+    function unformatted($text){
+        if ($this->capture) $this->doc .= $text;
+    }
+
+    function preformatted($text){
+        if ($this->capture) $this->doc .= $text;
+    }
+
+    function file($text, $lang = null, $file = null){
+        if ($this->capture){
+            $this->doc .= DOKU_LF.$text;
+            if (strlen($this->doc) > 250) $this->capture = false;
+            else $this->doc .= DOKU_LF;
+        }
+    }
+
+    function quote_open(){
+        if ($this->capture) $this->doc .= DOKU_LF.DOKU_TAB.'"';
+    }
+
+    function quote_close(){
+        if ($this->capture){
+            $this->doc .= '"';
+            if (strlen($this->doc) > 250) $this->capture = false;
+            else $this->doc .= DOKU_LF;
+        }
+    }
+
+    function code($text, $language = null, $file = null){
+        if ($this->capture){
+            $this->doc .= DOKU_LF.$text;
+            if (strlen($this->doc) > 250) $this->capture = false;
+            else $this->doc .= DOKU_LF;
+      }
+    }
+
+    function acronym($acronym){
+        if ($this->capture) $this->doc .= $acronym;
+    }
+
+    function smiley($smiley){
+        if ($this->capture) $this->doc .= $smiley;
+    }
+
+    function entity($entity){
+        if ($this->capture) $this->doc .= $entity;
+    }
+
+    function multiplyentity($x, $y){
+        if ($this->capture) $this->doc .= $x.'×'.$y;
+    }
+
+    function singlequoteopening(){
+        global $lang;
+        if ($this->capture) $this->doc .= $lang['singlequoteopening'];
+    }
+
+    function singlequoteclosing(){
+        global $lang;
+        if ($this->capture) $this->doc .= $lang['singlequoteclosing'];
+    }
+
+    function apostrophe() {
+        global $lang;
+        if ($this->capture) $this->doc .= $lang['apostrophe'];
+    }
+
+    function doublequoteopening(){
+        global $lang;
+        if ($this->capture) $this->doc .= $lang['doublequoteopening'];
+    }
+
+    function doublequoteclosing(){
+        global $lang;
+        if ($this->capture) $this->doc .= $lang['doublequoteclosing'];
+    }
+
+    function camelcaselink($link) {
+        $this->internallink($link, $link);
+    }
+
+    function locallink($hash, $name = null){
+        if(is_array($name)) {
+            $this->_firstimage($name['src']);
+            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+        }
+    }
+
+    /**
+     * keep track of internal links in $this->meta['relation']['references']
+     */
+    function internallink($id, $name = null){
+        global $ID;
+
+        if(is_array($name)) {
+            $this->_firstimage($name['src']);
+            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+        }
+
+        $parts = explode('?', $id, 2);
+        if (count($parts) === 2) {
+            $id = $parts[0];
+        }
+
+        $default = $this->_simpleTitle($id);
+
+        // first resolve and clean up the $id
+        resolve_pageid(getNS($ID), $id, $exists);
+        list($page, $hash) = explode('#', $id, 2);
+
+        // set metadata
+        $this->meta['relation']['references'][$page] = $exists;
+        // $data = array('relation' => array('isreferencedby' => array($ID => true)));
+        // p_set_metadata($id, $data);
+
+        // add link title to summary
+        if ($this->capture){
+            $name = $this->_getLinkTitle($name, $default, $id);
+            $this->doc .= $name;
+        }
+    }
+
+    function externallink($url, $name = null){
+        if(is_array($name)) {
+            $this->_firstimage($name['src']);
+            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+        }
+
+        if ($this->capture){
+            $this->doc .= $this->_getLinkTitle($name, '<' . $url . '>');
+        }
+    }
+
+    function interwikilink($match, $name = null, $wikiName, $wikiUri){
+        if(is_array($name)) {
+            $this->_firstimage($name['src']);
+            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+        }
+
+        if ($this->capture){
+            list($wikiUri, $hash) = explode('#', $wikiUri, 2);
+            $name = $this->_getLinkTitle($name, $wikiUri);
+            $this->doc .= $name;
+        }
+    }
+
+    function windowssharelink($url, $name = null){
+        if(is_array($name)) {
+            $this->_firstimage($name['src']);
+            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+        }
+
+        if ($this->capture){
+            if ($name) $this->doc .= $name;
+            else $this->doc .= '<'.$url.'>';
+        }
+    }
+
+    function emaillink($address, $name = null){
+        if(is_array($name)) {
+            $this->_firstimage($name['src']);
+            if ($name['type'] == 'internalmedia') $this->_recordMediaUsage($name['src']);
+        }
+
+        if ($this->capture){
+            if ($name) $this->doc .= $name;
+            else $this->doc .= '<'.$address.'>';
+        }
+    }
+
+    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);
+        $this->_recordMediaUsage($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) {
+        $this->meta['relation']['haspart'][$url] = true;
+
+        $this->meta['date']['valid']['age'] =
+              isset($this->meta['date']['valid']['age']) ?
+                  min($this->meta['date']['valid']['age'],$params['refresh']) :
+                  $params['refresh'];
+    }
+
+    //----------------------------------------------------------
+    // Utils
+
+    /**
+     * Removes any Namespace from the given name but keeps
+     * casing and special chars
+     *
+     * @author Andreas Gohr 
+     */
+    function _simpleTitle($name){
+        global $conf;
+
+        if(is_array($name)) return '';
+
+        if($conf['useslash']){
+            $nssep = '[:;/]';
+        }else{
+            $nssep = '[:;]';
+        }
+        $name = preg_replace('!.*'.$nssep.'!','',$name);
+        //if there is a hash we use the anchor name only
+        $name = preg_replace('!.*#!','',$name);
+        return $name;
+    }
+
+    /**
+     * Creates a linkid from a headline
+     *
+     * @param string  $title   The headline title
+     * @param boolean $create  Create a new unique ID?
+     * @author Andreas Gohr 
+     */
+    function _headerToLink($title, $create=false) {
+        if($create){
+            return sectionID($title,$this->headers);
+        }else{
+            $check = false;
+            return sectionID($title,$check);
+        }
+    }
+
+    /**
+     * Construct a title and handle images in titles
+     *
+     * @author Harry Fuecks 
+     */
+    function _getLinkTitle($title, $default, $id=null) {
+        global $conf;
+
+        $isImage = false;
+        if (is_array($title)){
+            if($title['title']) return '['.$title['title'].']';
+        } else if (is_null($title) || trim($title)==''){
+            if (useHeading('content') && $id){
+                $heading = p_get_first_heading($id,METADATA_DONT_RENDER);
+                if ($heading) return $heading;
+            }
+            return $default;
+        } else {
+            return $title;
+        }
+    }
+
+    function _firstimage($src){
+        if($this->firstimage) return;
+        global $ID;
+
+        list($src,$hash) = explode('#',$src,2);
+        if(!media_isexternal($src)){
+            resolve_mediaid(getNS($ID),$src, $exists);
+        }
+        if(preg_match('/.(jpe?g|gif|png)$/i',$src)){
+            $this->firstimage = $src;
+        }
+    }
+
+    function _recordMediaUsage($src) {
+        global $ID;
+
+        list ($src, $hash) = explode('#', $src, 2);
+        if (media_isexternal($src)) return;
+        resolve_mediaid(getNS($ID), $src, $exists);
+        $this->meta['relation']['media'][$src] = $exists;
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/inc/parser/parser.php b/sources/inc/parser/parser.php
new file mode 100644
index 0000000..1f14b98
--- /dev/null
+++ b/sources/inc/parser/parser.php
@@ -0,0 +1,964 @@
+ array('listblock','table','quote','hr'),
+
+    // some mode are allowed inside the base mode only
+    'baseonly'     => array('header'),
+
+    // modes for styling text -- footnote behaves similar to styling
+    'formatting'   => array('strong', 'emphasis', 'underline', 'monospace',
+                            'subscript', 'superscript', 'deleted', 'footnote'),
+
+    // modes where the token is simply replaced - they can not contain any
+    // other modes
+    'substition'   => array('acronym','smiley','wordblock','entity',
+                            'camelcaselink', 'internallink','media',
+                            'externallink','linebreak','emaillink',
+                            'windowssharelink','filelink','notoc',
+                            'nocache','multiplyentity','quotes','rss'),
+
+    // modes which have a start and end token but inside which
+    // no other modes should be applied
+    'protected'    => array('preformatted','code','file','php','html','htmlblock','phpblock'),
+
+    // inside this mode no wiki markup should be applied but lineendings
+    // and whitespace isn't preserved
+    'disabled'     => array('unformatted'),
+
+    // used to mark paragraph boundaries
+    'paragraphs'   => array('eol')
+);
+
+//-------------------------------------------------------------------
+
+/**
+ * Sets up the Lexer with modes and points it to the Handler
+ * For an intro to the Lexer see: wiki:parser
+ */
+class Doku_Parser {
+
+    var $Handler;
+
+    /**
+     * @var Doku_Lexer $Lexer
+     */
+    var $Lexer;
+
+    var $modes = array();
+
+    var $connected = false;
+
+    function addBaseMode(& $BaseMode) {
+        $this->modes['base'] =& $BaseMode;
+        if ( !$this->Lexer ) {
+            $this->Lexer = new Doku_Lexer($this->Handler,'base', true);
+        }
+        $this->modes['base']->Lexer =& $this->Lexer;
+    }
+
+    /**
+     * PHP preserves order of associative elements
+     * Mode sequence is important
+     */
+    function addMode($name, & $Mode) {
+        if ( !isset($this->modes['base']) ) {
+            $this->addBaseMode(new Doku_Parser_Mode_base());
+        }
+        $Mode->Lexer = & $this->Lexer;
+        $this->modes[$name] =& $Mode;
+    }
+
+    function connectModes() {
+
+        if ( $this->connected ) {
+            return;
+        }
+
+        foreach ( array_keys($this->modes) as $mode ) {
+
+            // Base isn't connected to anything
+            if ( $mode == 'base' ) {
+                continue;
+            }
+            $this->modes[$mode]->preConnect();
+
+            foreach ( array_keys($this->modes) as $cm ) {
+
+                if ( $this->modes[$cm]->accepts($mode) ) {
+                    $this->modes[$mode]->connectTo($cm);
+                }
+
+            }
+
+            $this->modes[$mode]->postConnect();
+        }
+
+        $this->connected = true;
+    }
+
+    function parse($doc) {
+        if ( $this->Lexer ) {
+            $this->connectModes();
+            // Normalize CRs and pad doc
+            $doc = "\n".str_replace("\r\n","\n",$doc)."\n";
+            $this->Lexer->parse($doc);
+            $this->Handler->_finalize();
+            return $this->Handler->calls;
+        } else {
+            return false;
+        }
+    }
+
+}
+
+//-------------------------------------------------------------------
+/**
+ * This class and all the subclasses below are
+ * used to reduce the effort required to register
+ * modes with the Lexer. For performance these
+ * could all be eliminated later perhaps, or
+ * the Parser could be serialized to a file once
+ * all modes are registered
+ *
+ * @author Harry Fuecks 
+ */
+class Doku_Parser_Mode {
+
+    /**
+     * @var Doku_Lexer $Lexer
+     */
+    var $Lexer;
+
+    var $allowedModes = array();
+
+    // returns a number used to determine in which order modes are added
+    function getSort() {
+        trigger_error('getSort() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    // Called before any calls to connectTo
+    function preConnect() {}
+
+    // Connects the mode
+    function connectTo($mode) {}
+
+    // Called after all calls to connectTo
+    function postConnect() {}
+
+    function accepts($mode) {
+        return in_array($mode, (array) $this->allowedModes );
+    }
+
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_base extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_base() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['container'],
+                $PARSER_MODES['baseonly'],
+                $PARSER_MODES['paragraphs'],
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['protected'],
+                $PARSER_MODES['disabled']
+            );
+    }
+
+    function getSort() {
+        return 0;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_footnote extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_footnote() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['container'],
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['protected'],
+                $PARSER_MODES['disabled']
+            );
+
+        unset($this->allowedModes[array_search('footnote', $this->allowedModes)]);
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern(
+            '\x28\x28(?=.*\x29\x29)',$mode,'footnote'
+            );
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern(
+            '\x29\x29','footnote'
+            );
+    }
+
+    function getSort() {
+        return 150;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_header extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        //we're not picky about the closing ones, two are enough
+        $this->Lexer->addSpecialPattern(
+                            '[ \t]*={2,}[^\n]+={2,}[ \t]*(?=\n)',
+                            $mode,
+                            'header'
+                        );
+    }
+
+    function getSort() {
+        return 50;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_notoc extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('~~NOTOC~~',$mode,'notoc');
+    }
+
+    function getSort() {
+        return 30;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_nocache extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('~~NOCACHE~~',$mode,'nocache');
+    }
+
+    function getSort() {
+        return 40;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_linebreak extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('\x5C{2}(?:[ \t]|(?=\n))',$mode,'linebreak');
+    }
+
+    function getSort() {
+        return 140;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_eol extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $badModes = array('listblock','table');
+        if ( in_array($mode, $badModes) ) {
+            return;
+        }
+        // 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() {
+        return 370;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_hr extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('\n[ \t]*-{4,}[ \t]*(?=\n)',$mode,'hr');
+    }
+
+    function getSort() {
+        return 160;
+    }
+}
+
+//-------------------------------------------------------------------
+/**
+ * This class sets the markup for bold (=strong),
+ * italic (=emphasis), underline etc.
+ */
+class Doku_Parser_Mode_formatting extends Doku_Parser_Mode {
+    var $type;
+
+    var $formatting = array (
+        'strong' => array (
+            'entry'=>'\*\*(?=.*\*\*)',
+            'exit'=>'\*\*',
+            'sort'=>70
+            ),
+
+        'emphasis'=> array (
+            'entry'=>'//(?=[^\x00]*[^:])', //hack for bugs #384 #763 #1468
+            'exit'=>'//',
+            'sort'=>80
+            ),
+
+        'underline'=> array (
+            'entry'=>'__(?=.*__)',
+            'exit'=>'__',
+            'sort'=>90
+            ),
+
+        'monospace'=> array (
+            'entry'=>'\x27\x27(?=.*\x27\x27)',
+            'exit'=>'\x27\x27',
+            'sort'=>100
+            ),
+
+        'subscript'=> array (
+            'entry'=>'(?=.*)',
+            'exit'=>'',
+            'sort'=>110
+            ),
+
+        'superscript'=> array (
+            'entry'=>'(?=.*)',
+            'exit'=>'',
+            'sort'=>120
+            ),
+
+        'deleted'=> array (
+            'entry'=>'(?=.*)',
+            'exit'=>'',
+            'sort'=>130
+            ),
+        );
+
+    function Doku_Parser_Mode_formatting($type) {
+        global $PARSER_MODES;
+
+        if ( !array_key_exists($type, $this->formatting) ) {
+            trigger_error('Invalid formatting type '.$type, E_USER_WARNING);
+        }
+
+        $this->type = $type;
+
+        // formatting may contain other formatting but not it self
+        $modes = $PARSER_MODES['formatting'];
+        $key = array_search($type, $modes);
+        if ( is_int($key) ) {
+            unset($modes[$key]);
+        }
+
+        $this->allowedModes = array_merge (
+                $modes,
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['disabled']
+            );
+    }
+
+    function connectTo($mode) {
+
+        // Can't nest formatting in itself
+        if ( $mode == $this->type ) {
+            return;
+        }
+
+        $this->Lexer->addEntryPattern(
+                $this->formatting[$this->type]['entry'],
+                $mode,
+                $this->type
+            );
+    }
+
+    function postConnect() {
+
+        $this->Lexer->addExitPattern(
+            $this->formatting[$this->type]['exit'],
+            $this->type
+            );
+
+    }
+
+    function getSort() {
+        return $this->formatting[$this->type]['sort'];
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_listblock extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_listblock() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['disabled'],
+                $PARSER_MODES['protected'] #XXX new
+            );
+
+    //    $this->allowedModes[] = 'footnote';
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('[ \t]*\n {2,}[\-\*]',$mode,'listblock');
+        $this->Lexer->addEntryPattern('[ \t]*\n\t{1,}[\-\*]',$mode,'listblock');
+
+        $this->Lexer->addPattern('\n {2,}[\-\*]','listblock');
+        $this->Lexer->addPattern('\n\t{1,}[\-\*]','listblock');
+
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('\n','listblock');
+    }
+
+    function getSort() {
+        return 10;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_table extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_table() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['disabled'],
+                $PARSER_MODES['protected']
+            );
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('[\t ]*\n\^',$mode,'table');
+        $this->Lexer->addEntryPattern('[\t ]*\n\|',$mode,'table');
+    }
+
+    function postConnect() {
+        $this->Lexer->addPattern('\n\^','table');
+        $this->Lexer->addPattern('\n\|','table');
+        $this->Lexer->addPattern('[\t ]*:::[\t ]*(?=[\|\^])','table');
+        $this->Lexer->addPattern('[\t ]+','table');
+        $this->Lexer->addPattern('\^','table');
+        $this->Lexer->addPattern('\|','table');
+        $this->Lexer->addExitPattern('\n','table');
+    }
+
+    function getSort() {
+        return 60;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_unformatted extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('(?=.*)',$mode,'unformatted');
+        $this->Lexer->addEntryPattern('%%(?=.*%%)',$mode,'unformattedalt');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('','unformatted');
+        $this->Lexer->addExitPattern('%%','unformattedalt');
+        $this->Lexer->mapHandler('unformattedalt','unformatted');
+    }
+
+    function getSort() {
+        return 170;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_php extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('(?=.*)',$mode,'php');
+        $this->Lexer->addEntryPattern('(?=.*)',$mode,'phpblock');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('','php');
+        $this->Lexer->addExitPattern('','phpblock');
+    }
+
+    function getSort() {
+        return 180;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_html extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('(?=.*)',$mode,'html');
+        $this->Lexer->addEntryPattern('(?=.*)',$mode,'htmlblock');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('','html');
+        $this->Lexer->addExitPattern('','htmlblock');
+    }
+
+    function getSort() {
+        return 190;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_preformatted extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        // Has hard coded awareness of lists...
+        $this->Lexer->addEntryPattern('\n  (?![\*\-])',$mode,'preformatted');
+        $this->Lexer->addEntryPattern('\n\t(?![\*\-])',$mode,'preformatted');
+
+        // How to effect a sub pattern with the Lexer!
+        $this->Lexer->addPattern('\n  ','preformatted');
+        $this->Lexer->addPattern('\n\t','preformatted');
+
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('\n','preformatted');
+    }
+
+    function getSort() {
+        return 20;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_code extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern(')',$mode,'code');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('','code');
+    }
+
+    function getSort() {
+        return 200;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_file extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern(')',$mode,'file');
+    }
+
+    function postConnect() {
+        $this->Lexer->addExitPattern('','file');
+    }
+
+    function getSort() {
+        return 210;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_quote extends Doku_Parser_Mode {
+
+    function Doku_Parser_Mode_quote() {
+        global $PARSER_MODES;
+
+        $this->allowedModes = array_merge (
+                $PARSER_MODES['formatting'],
+                $PARSER_MODES['substition'],
+                $PARSER_MODES['disabled'],
+                $PARSER_MODES['protected'] #XXX new
+            );
+            #$this->allowedModes[] = 'footnote';
+            #$this->allowedModes[] = 'preformatted';
+            #$this->allowedModes[] = 'unformatted';
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addEntryPattern('\n>{1,}',$mode,'quote');
+    }
+
+    function postConnect() {
+        $this->Lexer->addPattern('\n>{1,}','quote');
+        $this->Lexer->addExitPattern('\n','quote');
+    }
+
+    function getSort() {
+        return 220;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_acronym extends Doku_Parser_Mode {
+    // A list
+    var $acronyms = array();
+    var $pattern = '';
+
+    function Doku_Parser_Mode_acronym($acronyms) {
+        usort($acronyms,array($this,'_compare'));
+        $this->acronyms = $acronyms;
+    }
+
+    function preConnect() {
+        if(!count($this->acronyms)) return;
+
+        $bound = '[\x00-\x2f\x3a-\x40\x5b-\x60\x7b-\x7f]';
+        $acronyms = array_map('Doku_Lexer_Escape',$this->acronyms);
+        $this->pattern = '(?<=^|'.$bound.')(?:'.join('|',$acronyms).')(?='.$bound.')';
+    }
+
+    function connectTo($mode) {
+        if(!count($this->acronyms)) return;
+
+        if ( strlen($this->pattern) > 0 ) {
+            $this->Lexer->addSpecialPattern($this->pattern,$mode,'acronym');
+        }
+    }
+
+    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;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_smiley extends Doku_Parser_Mode {
+    // A list
+    var $smileys = array();
+    var $pattern = '';
+
+    function Doku_Parser_Mode_smiley($smileys) {
+        $this->smileys = $smileys;
+    }
+
+    function preConnect() {
+        if(!count($this->smileys) || $this->pattern != '') return;
+
+        $sep = '';
+        foreach ( $this->smileys as $smiley ) {
+            $this->pattern .= $sep.'(?<=\W|^)'.Doku_Lexer_Escape($smiley).'(?=\W|$)';
+            $sep = '|';
+        }
+    }
+
+    function connectTo($mode) {
+        if(!count($this->smileys)) return;
+
+        if ( strlen($this->pattern) > 0 ) {
+            $this->Lexer->addSpecialPattern($this->pattern,$mode,'smiley');
+        }
+    }
+
+    function getSort() {
+        return 230;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_wordblock extends Doku_Parser_Mode {
+    // A list
+    var $badwords = array();
+    var $pattern = '';
+
+    function Doku_Parser_Mode_wordblock($badwords) {
+        $this->badwords = $badwords;
+    }
+
+    function preConnect() {
+
+        if ( count($this->badwords) == 0 || $this->pattern != '') {
+            return;
+        }
+
+        $sep = '';
+        foreach ( $this->badwords as $badword ) {
+            $this->pattern .= $sep.'(?<=\b)(?i)'.Doku_Lexer_Escape($badword).'(?-i)(?=\b)';
+            $sep = '|';
+        }
+
+    }
+
+    function connectTo($mode) {
+        if ( strlen($this->pattern) > 0 ) {
+            $this->Lexer->addSpecialPattern($this->pattern,$mode,'wordblock');
+        }
+    }
+
+    function getSort() {
+        return 250;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_entity extends Doku_Parser_Mode {
+    // A list
+    var $entities = array();
+    var $pattern = '';
+
+    function Doku_Parser_Mode_entity($entities) {
+        $this->entities = $entities;
+    }
+
+    function preConnect() {
+        if(!count($this->entities) || $this->pattern != '') return;
+
+        $sep = '';
+        foreach ( $this->entities as $entity ) {
+            $this->pattern .= $sep.Doku_Lexer_Escape($entity);
+            $sep = '|';
+        }
+    }
+
+    function connectTo($mode) {
+        if(!count($this->entities)) return;
+
+        if ( strlen($this->pattern) > 0 ) {
+            $this->Lexer->addSpecialPattern($this->pattern,$mode,'entity');
+        }
+    }
+
+    function getSort() {
+        return 260;
+    }
+}
+
+//-------------------------------------------------------------------
+// Implements the 640x480 replacement
+class Doku_Parser_Mode_multiplyentity extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+
+        $this->Lexer->addSpecialPattern(
+                    '(?<=\b)(?:[1-9]|\d{2,})[xX]\d+(?=\b)',$mode,'multiplyentity'
+                );
+
+    }
+
+    function getSort() {
+        return 270;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_quotes extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        global $conf;
+
+        $ws   =  '\s/\#~:+=&%@\-\x28\x29\]\[{}><"\'';   // whitespace
+        $punc =  ';,\.?!';
+
+        if($conf['typography'] == 2){
+            $this->Lexer->addSpecialPattern(
+                        "(?<=^|[$ws])'(?=[^$ws$punc])",$mode,'singlequoteopening'
+                    );
+            $this->Lexer->addSpecialPattern(
+                        "(?<=^|[^$ws]|[$punc])'(?=$|[$ws$punc])",$mode,'singlequoteclosing'
+                    );
+            $this->Lexer->addSpecialPattern(
+                        "(?<=^|[^$ws$punc])'(?=$|[^$ws$punc])",$mode,'apostrophe'
+                    );
+        }
+
+        $this->Lexer->addSpecialPattern(
+                    "(?<=^|[$ws])\"(?=[^$ws$punc])",$mode,'doublequoteopening'
+                );
+        $this->Lexer->addSpecialPattern(
+                    "\"",$mode,'doublequoteclosing'
+                );
+
+    }
+
+    function getSort() {
+        return 280;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_camelcaselink extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern(
+                '\b[A-Z]+[a-z]+[A-Z][A-Za-z]*\b',$mode,'camelcaselink'
+            );
+    }
+
+    function getSort() {
+        return 290;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_internallink extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        // Word boundaries?
+        $this->Lexer->addSpecialPattern("\[\[(?:(?:[^[\]]*?\[.*?\])|.*?)\]\]",$mode,'internallink');
+    }
+
+    function getSort() {
+        return 300;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_media extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        // Word boundaries?
+        $this->Lexer->addSpecialPattern("\{\{[^\}]+\}\}",$mode,'media');
+    }
+
+    function getSort() {
+        return 320;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_rss extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern("\{\{rss>[^\}]+\}\}",$mode,'rss');
+    }
+
+    function getSort() {
+        return 310;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_externallink extends Doku_Parser_Mode {
+    var $schemes = array();
+    var $patterns = array();
+
+    function preConnect() {
+        if(count($this->patterns)) return;
+
+        $ltrs = '\w';
+        $gunk = '/\#~:.?+=&%@!\-\[\]';
+        $punc = '.:?\-;,';
+        $host = $ltrs.$punc;
+        $any  = $ltrs.$gunk.$punc;
+
+        $this->schemes = getSchemes();
+        foreach ( $this->schemes as $scheme ) {
+            $this->patterns[] = '\b(?i)'.$scheme.'(?-i)://['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+        }
+
+        $this->patterns[] = '\b(?i)www?(?-i)\.['.$host.']+?\.['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+        $this->patterns[] = '\b(?i)ftp?(?-i)\.['.$host.']+?\.['.$host.']+?['.$any.']+?(?=['.$punc.']*[^'.$any.'])';
+    }
+
+    function connectTo($mode) {
+
+        foreach ( $this->patterns as $pattern ) {
+            $this->Lexer->addSpecialPattern($pattern,$mode,'externallink');
+        }
+    }
+
+    function getSort() {
+        return 330;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_filelink extends Doku_Parser_Mode {
+
+    var $pattern;
+
+    function preConnect() {
+
+        $ltrs = '\w';
+        $gunk = '/\#~:.?+=&%@!\-';
+        $punc = '.:?\-;,';
+        $host = $ltrs.$punc;
+        $any  = $ltrs.$gunk.$punc;
+
+        $this->pattern = '\b(?i)file(?-i)://['.$any.']+?['.
+            $punc.']*[^'.$any.']';
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern(
+            $this->pattern,$mode,'filelink');
+    }
+
+    function getSort() {
+        return 360;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_windowssharelink extends Doku_Parser_Mode {
+
+    var $pattern;
+
+    function preConnect() {
+        $this->pattern = "\\\\\\\\\w+?(?:\\\\[\w-$]+)+";
+    }
+
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern(
+            $this->pattern,$mode,'windowssharelink');
+    }
+
+    function getSort() {
+        return 350;
+    }
+}
+
+//-------------------------------------------------------------------
+class Doku_Parser_Mode_emaillink extends Doku_Parser_Mode {
+
+    function connectTo($mode) {
+        // pattern below is defined in inc/mail.php
+        $this->Lexer->addSpecialPattern('<'.PREG_PATTERN_VALID_EMAIL.'>',$mode,'emaillink');
+    }
+
+    function getSort() {
+        return 340;
+    }
+}
+
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/inc/parser/renderer.php b/sources/inc/parser/renderer.php
new file mode 100644
index 0000000..c697e99
--- /dev/null
+++ b/sources/inc/parser/renderer.php
@@ -0,0 +1,325 @@
+
+ * @author Andreas Gohr 
+ */
+if(!defined('DOKU_INC')) die('meh.');
+require_once DOKU_INC . 'inc/plugin.php';
+require_once DOKU_INC . 'inc/pluginutils.php';
+
+/**
+ * An empty renderer, produces no output
+ *
+ * Inherits from DokuWiki_Plugin for giving additional functions to render plugins
+ */
+class Doku_Renderer extends DokuWiki_Plugin {
+    var $info = array(
+        'cache' => true, // may the rendered result cached?
+        'toc'   => true, // render the TOC?
+    );
+
+    var $doc = '';
+
+    // keep some config options
+    var $acronyms = array();
+    var $smileys = array();
+    var $badwords = array();
+    var $entities = array();
+    var $interwiki = array();
+
+    // allows renderer to be used again, clean out any per-use values
+    function reset() {
+    }
+
+    function nocache() {
+        $this->info['cache'] = false;
+    }
+
+    function notoc() {
+        $this->info['toc'] = false;
+    }
+
+    /**
+     * Returns the format produced by this renderer.
+     *
+     * Has to be overidden by decendend classes
+     */
+    function getFormat(){
+        trigger_error('getFormat() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    /**
+     * Allow the plugin to prevent DokuWiki from reusing an instance
+     *
+     * @return bool   false if the plugin has to be instantiated
+     */
+    function isSingleton() {
+        return false;
+    }
+
+
+    //handle plugin rendering
+    function plugin($name,$data){
+        $plugin = plugin_load('syntax',$name);
+        if($plugin != null){
+            $plugin->render($this->getFormat(),$this,$data);
+        }
+    }
+
+    /**
+     * handle nested render instructions
+     * this method (and nest_close method) should not be overloaded in actual renderer output classes
+     */
+    function nest($instructions) {
+
+        foreach ( $instructions as $instruction ) {
+            // execute the callback against ourself
+            if (method_exists($this,$instruction[0])) {
+                call_user_func_array(array($this, $instruction[0]), $instruction[1] ? $instruction[1] : array());
+            }
+        }
+    }
+
+    // dummy closing instruction issued by Doku_Handler_Nest, normally the syntax mode should
+    // override this instruction when instantiating Doku_Handler_Nest - however plugins will not
+    // be able to - as their instructions require data.
+    function nest_close() {}
+
+    function document_start() {}
+
+    function document_end() {}
+
+    function render_TOC() { return ''; }
+
+    function toc_additem($id, $text, $level) {}
+
+    function header($text, $level, $pos) {}
+
+    function section_open($level) {}
+
+    function section_close() {}
+
+    function cdata($text) {}
+
+    function p_open() {}
+
+    function p_close() {}
+
+    function linebreak() {}
+
+    function hr() {}
+
+    function strong_open() {}
+
+    function strong_close() {}
+
+    function emphasis_open() {}
+
+    function emphasis_close() {}
+
+    function underline_open() {}
+
+    function underline_close() {}
+
+    function monospace_open() {}
+
+    function monospace_close() {}
+
+    function subscript_open() {}
+
+    function subscript_close() {}
+
+    function superscript_open() {}
+
+    function superscript_close() {}
+
+    function deleted_open() {}
+
+    function deleted_close() {}
+
+    function footnote_open() {}
+
+    function footnote_close() {}
+
+    function listu_open() {}
+
+    function listu_close() {}
+
+    function listo_open() {}
+
+    function listo_close() {}
+
+    function listitem_open($level) {}
+
+    function listitem_close() {}
+
+    function listcontent_open() {}
+
+    function listcontent_close() {}
+
+    function unformatted($text) {}
+
+    function php($text) {}
+
+    function phpblock($text) {}
+
+    function html($text) {}
+
+    function htmlblock($text) {}
+
+    function preformatted($text) {}
+
+    function quote_open() {}
+
+    function quote_close() {}
+
+    function file($text, $lang = null, $file = null ) {}
+
+    function code($text, $lang = null, $file = null ) {}
+
+    function acronym($acronym) {}
+
+    function smiley($smiley) {}
+
+    function wordblock($word) {}
+
+    function entity($entity) {}
+
+    // 640x480 ($x=640, $y=480)
+    function multiplyentity($x, $y) {}
+
+    function singlequoteopening() {}
+
+    function singlequoteclosing() {}
+
+    function apostrophe() {}
+
+    function doublequoteopening() {}
+
+    function doublequoteclosing() {}
+
+    // $link like 'SomePage'
+    function camelcaselink($link) {}
+
+    function locallink($hash, $name = null) {}
+
+    // $link like 'wiki:syntax', $title could be an array (media)
+    function internallink($link, $title = null) {}
+
+    // $link is full URL with scheme, $title could be an array (media)
+    function externallink($link, $title = null) {}
+
+    function rss ($url,$params) {}
+
+    // $link is the original link - probably not much use
+    // $wikiName is an indentifier for the wiki
+    // $wikiUri is the URL fragment to append to some known URL
+    function interwikilink($link, $title = null, $wikiName, $wikiUri) {}
+
+    // Link to file on users OS, $title could be an array (media)
+    function filelink($link, $title = null) {}
+
+    // Link to a Windows share, , $title could be an array (media)
+    function windowssharelink($link, $title = null) {}
+
+//  function email($address, $title = null) {}
+    function emaillink($address, $name = null) {}
+
+    function internalmedia ($src, $title=null, $align=null, $width=null,
+                            $height=null, $cache=null, $linking=null) {}
+
+    function externalmedia ($src, $title=null, $align=null, $width=null,
+                            $height=null, $cache=null, $linking=null) {}
+
+    function internalmedialink (
+        $src,$title=null,$align=null,$width=null,$height=null,$cache=null
+        ) {}
+
+    function externalmedialink(
+        $src,$title=null,$align=null,$width=null,$height=null,$cache=null
+        ) {}
+
+    function table_open($maxcols = null, $numrows = null, $pos = null){}
+
+    function table_close($pos = null){}
+
+    function tablerow_open(){}
+
+    function tablerow_close(){}
+
+    function tableheader_open($colspan = 1, $align = null, $rowspan = 1){}
+
+    function tableheader_close(){}
+
+    function tablecell_open($colspan = 1, $align = null, $rowspan = 1){}
+
+    function tablecell_close(){}
+
+
+    // util functions follow, you probably won't need to reimplement them
+
+
+    /**
+     * Removes any Namespace from the given name but keeps
+     * casing and special chars
+     *
+     * @author Andreas Gohr 
+     */
+    function _simpleTitle($name){
+        global $conf;
+
+        //if there is a hash we use the ancor name only
+        list($name,$hash) = explode('#',$name,2);
+        if($hash) return $hash;
+
+        if($conf['useslash']){
+            $name = strtr($name,';/',';:');
+        }else{
+            $name = strtr($name,';',':');
+        }
+
+        return noNSorNS($name);
+    }
+
+    /**
+     * Resolve an interwikilink
+     */
+    function _resolveInterWiki(&$shortcut,$reference){
+        //get interwiki URL
+        if ( isset($this->interwiki[$shortcut]) ) {
+            $url = $this->interwiki[$shortcut];
+        } else {
+            // Default to Google I'm feeling lucky
+            $url = 'http://www.google.com/search?q={URL}&btnI=lucky';
+            $shortcut = 'go';
+        }
+
+        //split into hash and url part
+        list($reference,$hash) = explode('#',$reference,2);
+
+        //replace placeholder
+        if(preg_match('#\{(URL|NAME|SCHEME|HOST|PORT|PATH|QUERY)\}#',$url)){
+            //use placeholders
+            $url = str_replace('{URL}',rawurlencode($reference),$url);
+            $url = str_replace('{NAME}',$reference,$url);
+            $parsed = parse_url($reference);
+            if(!$parsed['port']) $parsed['port'] = 80;
+            $url = str_replace('{SCHEME}',$parsed['scheme'],$url);
+            $url = str_replace('{HOST}',$parsed['host'],$url);
+            $url = str_replace('{PORT}',$parsed['port'],$url);
+            $url = str_replace('{PATH}',$parsed['path'],$url);
+            $url = str_replace('{QUERY}',$parsed['query'],$url);
+        }else{
+            //default
+            $url = $url.rawurlencode($reference);
+        }
+        if($hash) $url .= '#'.rawurlencode($hash);
+
+        return $url;
+    }
+}
+
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/inc/parser/xhtml.php b/sources/inc/parser/xhtml.php
new file mode 100644
index 0000000..fd02c0c
--- /dev/null
+++ b/sources/inc/parser/xhtml.php
@@ -0,0 +1,1228 @@
+
+ * @author Andreas Gohr 
+ */
+if(!defined('DOKU_INC')) die('meh.');
+
+if ( !defined('DOKU_LF') ) {
+    // Some whitespace to help View > Source
+    define ('DOKU_LF',"\n");
+}
+
+if ( !defined('DOKU_TAB') ) {
+    // Some whitespace to help View > Source
+    define ('DOKU_TAB',"\t");
+}
+
+require_once DOKU_INC . 'inc/parser/renderer.php';
+require_once DOKU_INC . 'inc/html.php';
+
+/**
+ * The Renderer
+ */
+class Doku_Renderer_xhtml extends Doku_Renderer {
+
+    // @access public
+    var $doc = '';        // will contain the whole document
+    var $toc = array();   // will contain the Table of Contents
+
+    var $sectionedits = array(); // A stack of section edit data
+    private $lastsecid = 0; // last section edit id, used by startSectionEdit
+
+    var $headers = array();
+    /** @var array a list of footnotes, list starts at 1! */
+    var $footnotes = array();
+    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 $_codeblock = 0; // counts the code and file blocks, used to provide download links
+
+    /**
+     * Register a new edit section range
+     *
+     * @param $type  string The section type identifier
+     * @param $title string The section title
+     * @param $start int    The byte position for the edit start
+     * @return string A marker class for the starting HTML element
+     * @author Adrian Lang 
+     */
+    public function startSectionEdit($start, $type, $title = null) {
+        $this->sectionedits[] = array(++$this->lastsecid, $start, $type, $title);
+        return 'sectionedit' . $this->lastsecid;
+    }
+
+    /**
+     * Finish an edit section range
+     *
+     * @param $end int The byte position for the edit end; null for the rest of
+     *                 the page
+     * @author Adrian Lang 
+     */
+    public function finishSectionEdit($end = null) {
+        list($id, $start, $type, $title) = array_pop($this->sectionedits);
+        if (!is_null($end) && $end <= $start) {
+            return;
+        }
+        $this->doc .= "';
+    }
+
+    function getFormat(){
+        return 'xhtml';
+    }
+
+
+    function document_start() {
+        //reset some internals
+        $this->toc     = array();
+        $this->headers = array();
+    }
+
+    function document_end() {
+        // Finish open section edits.
+        while (count($this->sectionedits) > 0) {
+            if ($this->sectionedits[count($this->sectionedits) - 1][1] <= 1) {
+                // If there is only one section, do not write a section edit
+                // marker.
+                array_pop($this->sectionedits);
+            } else {
+                $this->finishSectionEdit();
+            }
+        }
+
+        if ( count ($this->footnotes) > 0 ) {
+            $this->doc .= '
        '.DOKU_LF;
+
+            foreach ( $this->footnotes as $id => $footnote ) {
+                // check its not a placeholder that indicates actual footnote text is elsewhere
+                if (substr($footnote, 0, 5) != "@@FNT") {
+
+                    // open the footnote and set the anchor and backlink
+                    $this->doc .= '
        ';
+                    $this->doc .= '';
+                    $this->doc .= $id.') '.DOKU_LF;
+
+                    // get any other footnotes that use the same markup
+                    $alt = array_keys($this->footnotes, "@@FNT$id");
+
+                    if (count($alt)) {
+                        foreach ($alt as $ref) {
+                            // set anchor and backlink for the other footnotes
+                            $this->doc .= ', ';
+                            $this->doc .= ($ref).') '.DOKU_LF;
+                        }
+                    }
+
+                    // add footnote markup and close this footnote
+                    $this->doc .= $footnote;
+                    $this->doc .= '
        ' . DOKU_LF;
+                }
+            }
+            $this->doc .= '
        '.DOKU_LF;
+        }
+
+        // Prepare the TOC
+        global $conf;
+        if($this->info['toc'] && is_array($this->toc) && $conf['tocminheads'] && count($this->toc) >= $conf['tocminheads']){
+            global $TOC;
+            $TOC = $this->toc;
+        }
+
+        // make sure there are no empty paragraphs
+        $this->doc = preg_replace('#
        \s*
        #','',$this->doc);
+    }
+
+    function toc_additem($id, $text, $level) {
+        global $conf;
+
+        //handle TOC
+        if($level >= $conf['toptoclevel'] && $level <= $conf['maxtoclevel']){
+            $this->toc[] = html_mktocitem($id, $text, $level-$conf['toptoclevel']+1);
+        }
+    }
+
+    function header($text, $level, $pos) {
+        global $conf;
+
+        if(!$text) return; //skip empty headlines
+
+        $hid = $this->_headerToLink($text,true);
+
+        //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;
+
+        if ($level <= $conf['maxseclevel'] &&
+            count($this->sectionedits) > 0 &&
+            $this->sectionedits[count($this->sectionedits) - 1][2] === 'section') {
+            $this->finishSectionEdit($pos - 1);
+        }
+
+        // write the header
+        $this->doc .= DOKU_LF.'doc .= ' class="' . $this->startSectionEdit($pos, 'section', $text) . '"';
+        }
+        $this->doc .= ' id="'.$hid.'">';
+        $this->doc .= $this->_xmlEntities($text);
+        $this->doc .= "".DOKU_LF;
+    }
+
+    function section_open($level) {
+        $this->doc .= '
        ' . DOKU_LF;
+    }
+
+    function section_close() {
+        $this->doc .= DOKU_LF.'
        '.DOKU_LF;
+    }
+
+    function cdata($text) {
+        $this->doc .= $this->_xmlEntities($text);
+    }
+
+    function p_open() {
+        $this->doc .= DOKU_LF.'
        '.DOKU_LF;
+    }
+
+    function p_close() {
+        $this->doc .= DOKU_LF.'
        '.DOKU_LF;
+    }
+
+    function linebreak() {
+        $this->doc .= '
        '.DOKU_LF;
+    }
+
+    function hr() {
+        $this->doc .= '
        '.DOKU_LF;
+    }
+
+    function strong_open() {
+        $this->doc .= '';
+    }
+
+    function strong_close() {
+        $this->doc .= '';
+    }
+
+    function emphasis_open() {
+        $this->doc .= '';
+    }
+
+    function emphasis_close() {
+        $this->doc .= '';
+    }
+
+    function underline_open() {
+        $this->doc .= '';
+    }
+
+    function underline_close() {
+        $this->doc .= '';
+    }
+
+    function monospace_open() {
+        $this->doc .= '';
+    }
+
+    function monospace_close() {
+        $this->doc .= '';
+    }
+
+    function subscript_open() {
+        $this->doc .= '';
+    }
+
+    function subscript_close() {
+        $this->doc .= '';
+    }
+
+    function superscript_open() {
+        $this->doc .= '';
+    }
+
+    function superscript_close() {
+        $this->doc .= '';
+    }
+
+    function deleted_open() {
+        $this->doc .= '';
+    }
+
+    function deleted_close() {
+        $this->doc .= '';
+    }
+
+    /**
+     * Callback for footnote start syntax
+     *
+     * All following content will go to the footnote instead of
+     * the document. To achieve this the previous rendered content
+     * is moved to $store and $doc is cleared
+     *
+     * @author Andreas Gohr 
+     */
+    function footnote_open() {
+
+        // move current content to store and record footnote
+        $this->store = $this->doc;
+        $this->doc   = '';
+    }
+
+    /**
+     * Callback for footnote end syntax
+     *
+     * All rendered content is moved to the $footnotes array and the old
+     * content is restored from $store again
+     *
+     * @author Andreas Gohr
+     */
+    function footnote_close() {
+        /** @var $fnid int takes track of seen footnotes, assures they are unique even across multiple docs FS#2841 */
+        static $fnid = 0;
+        // assign new footnote id (we start at 1)
+        $fnid++;
+
+        // recover footnote into the stack and restore old content
+        $footnote = $this->doc;
+        $this->doc = $this->store;
+        $this->store = '';
+
+        // check to see if this footnote has been seen before
+        $i = array_search($footnote, $this->footnotes);
+
+        if ($i === false) {
+            // its a new footnote, add it to the $footnotes array
+            $this->footnotes[$fnid] = $footnote;
+        } else {
+            // seen this one before, save a placeholder
+            $this->footnotes[$fnid] = "@@FNT".($i);
+        }
+
+        // output the footnote reference and link
+        $this->doc .= ''.$fnid.')';
+    }
+
+    function listu_open() {
+        $this->doc .= '
          '.DOKU_LF;
+    }
+
+    function listu_close() {
+        $this->doc .= '
        '.DOKU_LF;
+    }
+
+    function listo_open() {
+        $this->doc .= '
          '.DOKU_LF;
+    }
+
+    function listo_close() {
+        $this->doc .= '
        '.DOKU_LF;
+    }
+
+    function listitem_open($level) {
+        $this->doc .= '
      11. ';
+    }
+
+    function listitem_close() {
+        $this->doc .= '
        12. '.DOKU_LF;
+    }
+
+    function listcontent_open() {
+        $this->doc .= '
        ';
+    }
+
+    function listcontent_close() {
+        $this->doc .= '
        '.DOKU_LF;
+    }
+
+    function unformatted($text) {
+        $this->doc .= $this->_xmlEntities($text);
+    }
+
+    /**
+     * Execute PHP code if allowed
+     *
+     * @param  string   $text      PHP code that is either executed or printed
+     * @param  string   $wrapper   html element to wrap result if $conf['phpok'] is okff
+     *
+     * @author Andreas Gohr 
+     */
+    function php($text, $wrapper='code') {
+        global $conf;
+
+        if($conf['phpok']){
+            ob_start();
+            eval($text);
+            $this->doc .= ob_get_contents();
+            ob_end_clean();
+        } else {
+            $this->doc .= p_xhtml_cached_geshi($text, 'php', $wrapper);
+        }
+    }
+
+    function phpblock($text) {
+        $this->php($text, 'pre');
+    }
+
+    /**
+     * Insert HTML if allowed
+     *
+     * @param  string   $text      html text
+     * @param  string   $wrapper   html element to wrap result if $conf['htmlok'] is okff
+     *
+     * @author Andreas Gohr 
+     */
+    function html($text, $wrapper='code') {
+        global $conf;
+
+        if($conf['htmlok']){
+            $this->doc .= $text;
+        } else {
+            $this->doc .= p_xhtml_cached_geshi($text, 'html4strict', $wrapper);
+        }
+    }
+
+    function htmlblock($text) {
+        $this->html($text, 'pre');
+    }
+
+    function quote_open() {
+        $this->doc .= '
        '.DOKU_LF;
+    }
+
+    function quote_close() {
+        $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);
+    }
+
+    /**
+     * Use GeSHi to highlight language syntax in code and file blocks
+     *
+     * @author Andreas Gohr 
+     */
+    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 ($text{0} == "\n") {
+            $text = substr($text, 1);
+        }
+        if (substr($text, -1) == "\n") {
+            $text = substr($text, 0, -1);
+        }
+
+        if ( is_null($language) ) {
+            $this->doc .= '
        '.$this->_xmlEntities($text).'
        '.DOKU_LF;
+        } else {
+            $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) {
+
+        if ( array_key_exists($acronym, $this->acronyms) ) {
+
+            $title = $this->_xmlEntities($this->acronyms[$acronym]);
+
+            $this->doc .= ''.$this->_xmlEntities($acronym).'';
+
+        } else {
+            $this->doc .= $this->_xmlEntities($acronym);
+        }
+    }
+
+    function smiley($smiley) {
+        if ( array_key_exists($smiley, $this->smileys) ) {
+            $title = $this->_xmlEntities($this->smileys[$smiley]);
+            $this->doc .= ''.
+                    $this->_xmlEntities($smiley).'';
+        } else {
+            $this->doc .= $this->_xmlEntities($smiley);
+        }
+    }
+
+    /*
+    * not used
+    function wordblock($word) {
+        if ( array_key_exists($word, $this->badwords) ) {
+            $this->doc .= '** BLEEP **';
+        } else {
+            $this->doc .= $this->_xmlEntities($word);
+        }
+    }
+    */
+
+    function entity($entity) {
+        if ( array_key_exists($entity, $this->entities) ) {
+            $this->doc .= $this->entities[$entity];
+        } else {
+            $this->doc .= $this->_xmlEntities($entity);
+        }
+    }
+
+    function multiplyentity($x, $y) {
+        $this->doc .= "$x×$y";
+    }
+
+    function singlequoteopening() {
+        global $lang;
+        $this->doc .= $lang['singlequoteopening'];
+    }
+
+    function singlequoteclosing() {
+        global $lang;
+        $this->doc .= $lang['singlequoteclosing'];
+    }
+
+    function apostrophe() {
+        global $lang;
+        $this->doc .= $lang['apostrophe'];
+    }
+
+    function doublequoteopening() {
+        global $lang;
+        $this->doc .= $lang['doublequoteopening'];
+    }
+
+    function doublequoteclosing() {
+        global $lang;
+        $this->doc .= $lang['doublequoteclosing'];
+    }
+
+    /**
+     */
+    function camelcaselink($link) {
+        $this->internallink($link,$link);
+    }
+
+
+    function locallink($hash, $name = null){
+        global $ID;
+        $name  = $this->_getLinkTitle($name, $hash, $isImage);
+        $hash  = $this->_headerToLink($hash);
+        $title = $ID.' ↵';
+        $this->doc .= '';
+        $this->doc .= $name;
+        $this->doc .= '';
+    }
+
+    /**
+     * Render an internal Wiki Link
+     *
+     * $search,$returnonly & $linktype are not for the renderer but are used
+     * elsewhere - no need to implement them in other renderers
+     *
+     * @author Andreas Gohr 
+     */
+    function internallink($id, $name = null, $search=null,$returnonly=false,$linktype='content') {
+        global $conf;
+        global $ID;
+        global $INFO;
+
+        $params = '';
+        $parts = explode('?', $id, 2);
+        if (count($parts) === 2) {
+            $id = $parts[0];
+            $params = $parts[1];
+        }
+
+        // For empty $id we need to know the current $ID
+        // We need this check because _simpleTitle needs
+        // correct $id and resolve_pageid() use cleanID($id)
+        // (some things could be lost)
+        if ($id === '') {
+            $id = $ID;
+        }
+
+        // default name is based on $id as given
+        $default = $this->_simpleTitle($id);
+
+        // now first resolve and clean up the $id
+        resolve_pageid(getNS($ID),$id,$exists);
+
+        $name = $this->_getLinkTitle($name, $default, $isImage, $id, $linktype);
+        if ( !$isImage ) {
+            if ( $exists ) {
+                $class='wikilink1';
+            } else {
+                $class='wikilink2';
+                $link['rel']='nofollow';
+            }
+        } else {
+            $class='media';
+        }
+
+        //keep hash anchor
+        list($id,$hash) = explode('#',$id,2);
+        if(!empty($hash)) $hash = $this->_headerToLink($hash);
+
+        //prepare for formating
+        $link['target'] = $conf['target']['wiki'];
+        $link['style']  = '';
+        $link['pre']    = '';
+        $link['suf']    = '';
+        // highlight link to current page
+        if ($id == $INFO['id']) {
+            $link['pre']    = '';
+            $link['suf']    = '';
+        }
+        $link['more']   = '';
+        $link['class']  = $class;
+        $link['url']    = wl($id, $params);
+        $link['name']   = $name;
+        $link['title']  = $id;
+        //add search string
+        if($search){
+            ($conf['userewrite']) ? $link['url'].='?' : $link['url'].='&';
+            if(is_array($search)){
+                $search = array_map('rawurlencode',$search);
+                $link['url'] .= 's[]='.join('&s[]=',$search);
+            }else{
+                $link['url'] .= 's='.rawurlencode($search);
+            }
+        }
+
+        //keep hash
+        if($hash) $link['url'].='#'.$hash;
+
+        //output formatted
+        if($returnonly){
+            return $this->_formatLink($link);
+        }else{
+            $this->doc .= $this->_formatLink($link);
+        }
+    }
+
+    function externallink($url, $name = null) {
+        global $conf;
+
+        $name = $this->_getLinkTitle($name, $url, $isImage);
+
+        // url might be an attack vector, only allow registered protocols
+        if(is_null($this->schemes)) $this->schemes = getSchemes();
+        list($scheme) = explode('://',$url);
+        $scheme = strtolower($scheme);
+        if(!in_array($scheme,$this->schemes)) $url = '';
+
+        // is there still an URL?
+        if(!$url){
+            $this->doc .= $name;
+            return;
+        }
+
+        // set class
+        if ( !$isImage ) {
+            $class='urlextern';
+        } else {
+            $class='media';
+        }
+
+        //prepare for formating
+        $link['target'] = $conf['target']['extern'];
+        $link['style']  = '';
+        $link['pre']    = '';
+        $link['suf']    = '';
+        $link['more']   = '';
+        $link['class']  = $class;
+        $link['url']    = $url;
+
+        $link['name']   = $name;
+        $link['title']  = $this->_xmlEntities($url);
+        if($conf['relnofollow']) $link['more'] .= ' rel="nofollow"';
+
+        //output formatted
+        $this->doc .= $this->_formatLink($link);
+    }
+
+    /**
+    */
+    function interwikilink($match, $name = null, $wikiName, $wikiUri) {
+        global $conf;
+
+        $link = array();
+        $link['target'] = $conf['target']['interwiki'];
+        $link['pre']    = '';
+        $link['suf']    = '';
+        $link['more']   = '';
+        $link['name']   = $this->_getLinkTitle($name, $wikiUri, $isImage);
+
+        //get interwiki URL
+        $url = $this->_resolveInterWiki($wikiName,$wikiUri);
+
+        if ( !$isImage ) {
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$wikiName);
+            $link['class'] = "interwiki iw_$class";
+        } else {
+            $link['class'] = 'media';
+        }
+
+        //do we stay at the same server? Use local target
+        if( strpos($url,DOKU_URL) === 0 ){
+            $link['target'] = $conf['target']['wiki'];
+        }
+
+        $link['url'] = $url;
+        $link['title'] = htmlspecialchars($link['url']);
+
+        //output formatted
+        $this->doc .= $this->_formatLink($link);
+    }
+
+    /**
+     */
+    function windowssharelink($url, $name = null) {
+        global $conf;
+        global $lang;
+        //simple setup
+        $link['target'] = $conf['target']['windows'];
+        $link['pre']    = '';
+        $link['suf']   = '';
+        $link['style']  = '';
+
+        $link['name'] = $this->_getLinkTitle($name, $url, $isImage);
+        if ( !$isImage ) {
+            $link['class'] = 'windows';
+        } else {
+            $link['class'] = 'media';
+        }
+
+        $link['title'] = $this->_xmlEntities($url);
+        $url = str_replace('\\','/',$url);
+        $url = 'file:///'.$url;
+        $link['url'] = $url;
+
+        //output formatted
+        $this->doc .= $this->_formatLink($link);
+    }
+
+    function emaillink($address, $name = null) {
+        global $conf;
+        //simple setup
+        $link = array();
+        $link['target'] = '';
+        $link['pre']    = '';
+        $link['suf']   = '';
+        $link['style']  = '';
+        $link['more']   = '';
+
+        $name = $this->_getLinkTitle($name, '', $isImage);
+        if ( !$isImage ) {
+            $link['class']='mail';
+        } else {
+            $link['class']='media';
+        }
+
+        $address = $this->_xmlEntities($address);
+        $address = obfuscate($address);
+        $title   = $address;
+
+        if(empty($name)){
+            $name = $address;
+        }
+
+        if($conf['mailguard'] == 'visible') $address = rawurlencode($address);
+
+        $link['url']   = 'mailto:'.$address;
+        $link['name']  = $name;
+        $link['title'] = $title;
+
+        //output formatted
+        $this->doc .= $this->_formatLink($link);
+    }
+
+    function internalmedia ($src, $title=null, $align=null, $width=null,
+                            $height=null, $cache=null, $linking=null) {
+        global $ID;
+        list($src,$hash) = explode('#',$src,2);
+        resolve_mediaid(getNS($ID),$src, $exists);
+
+        $noLink = false;
+        $render = ($linking == 'linkonly') ? false : true;
+        $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
+
+        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){
+            // don't link flash movies
+            $noLink = true;
+        }else{
+            // add file icons
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $link['class'] .= ' mediafile mf_'.$class;
+            $link['url'] = ml($src,array('id'=>$ID,'cache'=>$cache),true);
+            if ($exists) $link['title'] .= ' (' . filesize_h(filesize(mediaFN($src))).')';
+        }
+
+        if($hash) $link['url'] .= '#'.$hash;
+
+        //markup non existing files
+        if (!$exists) {
+            $link['class'] .= ' wikilink2';
+        }
+
+        //output formatted
+        if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
+        else $this->doc .= $this->_formatLink($link);
+    }
+
+    function externalmedia ($src, $title=null, $align=null, $width=null,
+                            $height=null, $cache=null, $linking=null) {
+        list($src,$hash) = explode('#',$src,2);
+        $noLink = false;
+        $render = ($linking == 'linkonly') ? false : true;
+        $link = $this->_getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render);
+
+        $link['url']    = ml($src,array('cache'=>$cache));
+
+        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;
+        }elseif($mime == 'application/x-shockwave-flash' && $render){
+            // don't link flash movies
+            $noLink = true;
+        }else{
+            // add file icons
+            $class = preg_replace('/[^_\-a-z0-9]+/i','_',$ext);
+            $link['class'] .= ' mediafile mf_'.$class;
+        }
+
+        if($hash) $link['url'] .= '#'.$hash;
+
+        //output formatted
+        if ($linking == 'nolink' || $noLink) $this->doc .= $link['name'];
+        else $this->doc .= $this->_formatLink($link);
+    }
+
+    /**
+     * Renders an RSS feed
+     *
+     * @author Andreas Gohr 
+     */
+    function rss ($url,$params){
+        global $lang;
+        global $conf;
+
+        require_once(DOKU_INC.'inc/FeedParser.php');
+        $feed = new FeedParser();
+        $feed->set_feed_url($url);
+
+        //disable warning while fetching
+        if (!defined('DOKU_E_LEVEL')) { $elvl = error_reporting(E_ERROR); }
+        $rc = $feed->init();
+        if (!defined('DOKU_E_LEVEL')) { error_reporting($elvl); }
+
+        //decide on start and end
+        if($params['reverse']){
+            $mod = -1;
+            $start = $feed->get_item_quantity()-1;
+            $end   = $start - ($params['max']);
+            $end   = ($end < -1) ? -1 : $end;
+        }else{
+            $mod   = 1;
+            $start = 0;
+            $end   = $feed->get_item_quantity();
+            $end   = ($end > $params['max']) ? $params['max'] : $end;
+        }
+
+        $this->doc .= '
          ';
+        if($rc){
+            for ($x = $start; $x != $end; $x += $mod) {
+                $item = $feed->get_item($x);
+                $this->doc .= '
        • ';
+                // 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(),
+                                        html_entity_decode($item->get_title(), ENT_QUOTES, 'UTF-8'));
+                }else{
+                    $this->doc .= ' '.$item->get_title();
+                }
+                if($params['author']){
+                    $author = $item->get_author(0);
+                    if($author){
+                        $name = $author->get_name();
+                        if(!$name) $name = $author->get_email();
+                        if($name) $this->doc .= ' '.$lang['by'].' '.$name;
+                    }
+                }
+                if($params['date']){
+                    $this->doc .= ' ('.$item->get_local_date($conf['dformat']).')';
+                }
+                if($params['details']){
+                    $this->doc .= '
          ';
+                    if($conf['htmlok']){
+                        $this->doc .= $item->get_description();
+                    }else{
+                        $this->doc .= strip_tags($item->get_description());
+                    }
+                    $this->doc .= '
          ';
+                }
+
+                $this->doc .= '
          • ';
+            }
+        }else{
+            $this->doc .= '
        • ';
+            $this->doc .= ''.$lang['rssfailed'].'';
+            $this->externallink($url);
+            if($conf['allowdebug']){
+                $this->doc .= '';
+            }
+            $this->doc .= '
          • ';
+        }
+        $this->doc .= '
        ';
+    }
+
+    // $numrows not yet implemented
+    function table_open($maxcols = null, $numrows = null, $pos = null){
+        global $lang;
+        // initialize the row counter used for classes
+        $this->_counter['row_counter'] = 0;
+        $class = 'table';
+        if ($pos !== null) {
+            $class .= ' ' . $this->startSectionEdit($pos, 'table');
+        }
+        $this->doc .= '
        ' .
+                      DOKU_LF;
+    }
+
+    function table_close($pos = null){
+        $this->doc .= '
        '.DOKU_LF;
+        if ($pos !== null) {
+            $this->finishSectionEdit($pos);
+        }
+    }
+
+    function tablerow_open(){
+        // initialize the cell counter used for classes
+        $this->_counter['cell_counter'] = 0;
+        $class = 'row' . $this->_counter['row_counter']++;
+        $this->doc .= DOKU_TAB . '' . DOKU_LF . DOKU_TAB . DOKU_TAB;
+    }
+
+    function tablerow_close(){
+        $this->doc .= DOKU_LF . DOKU_TAB . '' . DOKU_LF;
+    }
+
+    function tableheader_open($colspan = 1, $align = null, $rowspan = 1){
+        $class = 'class="col' . $this->_counter['cell_counter']++;
+        if ( !is_null($align) ) {
+            $class .= ' '.$align.'align';
+        }
+        $class .= '"';
+        $this->doc .= ' 1 ) {
+            $this->_counter['cell_counter'] += $colspan-1;
+            $this->doc .= ' colspan="'.$colspan.'"';
+        }
+        if ( $rowspan > 1 ) {
+            $this->doc .= ' rowspan="'.$rowspan.'"';
+        }
+        $this->doc .= '>';
+    }
+
+    function tableheader_close(){
+        $this->doc .= '';
+    }
+
+    function tablecell_open($colspan = 1, $align = null, $rowspan = 1){
+        $class = 'class="col' . $this->_counter['cell_counter']++;
+        if ( !is_null($align) ) {
+            $class .= ' '.$align.'align';
+        }
+        $class .= '"';
+        $this->doc .= ' 1 ) {
+            $this->_counter['cell_counter'] += $colspan-1;
+            $this->doc .= ' colspan="'.$colspan.'"';
+        }
+        if ( $rowspan > 1 ) {
+            $this->doc .= ' rowspan="'.$rowspan.'"';
+        }
+        $this->doc .= '>';
+    }
+
+    function tablecell_close(){
+        $this->doc .= '';
+    }
+
+    //----------------------------------------------------------
+    // Utils
+
+    /**
+     * Build a link
+     *
+     * Assembles all parts defined in $link returns HTML for the link
+     *
+     * @author Andreas Gohr 
+     */
+    function _formatLink($link){
+        //make sure the url is XHTML compliant (skip mailto)
+        if(substr($link['url'],0,7) != 'mailto:'){
+            $link['url'] = str_replace('&','&',$link['url']);
+            $link['url'] = str_replace('&amp;','&',$link['url']);
+        }
+        //remove double encodings in titles
+        $link['title'] = str_replace('&amp;','&',$link['title']);
+
+        // be sure there are no bad chars in url or title
+        // (we can't do this for name because it can contain an img tag)
+        $link['url']   = strtr($link['url'],array('>'=>'%3E','<'=>'%3C','"'=>'%22'));
+        $link['title'] = strtr($link['title'],array('>'=>'>','<'=>'<','"'=>'"'));
+
+        $ret  = '';
+        $ret .= $link['pre'];
+        $ret .= '
+     */
+    function _media ($src, $title=null, $align=null, $width=null,
+                      $height=null, $cache=null, $render = true) {
+
+        $ret = '';
+
+        list($ext,$mime,$dl) = mimetype($src);
+        if(substr($mime,0,5) == 'image'){
+            // first get the $title
+            if (!is_null($title)) {
+                $title  = $this->_xmlEntities($title);
+            }elseif($ext == 'jpg' || $ext == 'jpeg'){
+                //try to use the caption from IPTC/EXIF
+                require_once(DOKU_INC.'inc/JpegMeta.php');
+                $jpeg =new JpegMeta(mediaFN($src));
+                if($jpeg !== false) $cap = $jpeg->getTitle();
+                if($cap){
+                    $title = $this->_xmlEntities($cap);
+                }
+            }
+            if (!$render) {
+                // if the picture is not supposed to be rendered
+                // return the title of the picture
+                if (!$title) {
+                    // just show the sourcename
+                    $title = $this->_xmlEntities(utf8_basename(noNS($src)));
+                }
+                return $title;
+            }
+            //add image tag
+            $ret .= '_xmlEntities($width).'"';
+
+            if ( !is_null($height) )
+                $ret .= ' height="'.$this->_xmlEntities($height).'"';
+
+            $ret .= ' />';
+
+        }elseif($mime == 'application/x-shockwave-flash'){
+            if (!$render) {
+                // if the flash is not supposed to be rendered
+                // return the title of the flash
+                if (!$title) {
+                    // just show the sourcename
+                    $title = utf8_basename(noNS($src));
+                }
+                return $this->_xmlEntities($title);
+            }
+
+            $att = array();
+            $att['class'] = "media$align";
+            if($align == 'right') $att['align'] = 'right';
+            if($align == 'left')  $att['align'] = 'left';
+            $ret .= html_flashobject(ml($src,array('cache'=>$cache),true,'&'),$width,$height,
+                                     array('quality' => 'high'),
+                                     null,
+                                     $att,
+                                     $this->_xmlEntities($title));
+        }elseif($title){
+            // well at least we have a title to display
+            $ret .= $this->_xmlEntities($title);
+        }else{
+            // just show the sourcename
+            $ret .= $this->_xmlEntities(utf8_basename(noNS($src)));
+        }
+
+        return $ret;
+    }
+
+    function _xmlEntities($string) {
+        return htmlspecialchars($string,ENT_QUOTES,'UTF-8');
+    }
+
+    /**
+     * Creates a linkid from a headline
+     *
+     * @param string  $title   The headline title
+     * @param boolean $create  Create a new unique ID?
+     * @author Andreas Gohr 
+     */
+    function _headerToLink($title,$create=false) {
+        if($create){
+            return sectionID($title,$this->headers);
+        }else{
+            $check = false;
+            return sectionID($title,$check);
+        }
+    }
+
+    /**
+     * Construct a title and handle images in titles
+     *
+     * @author Harry Fuecks 
+     */
+    function _getLinkTitle($title, $default, & $isImage, $id=null, $linktype='content') {
+        global $conf;
+
+        $isImage = false;
+        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);
+                if ($heading) {
+                    return $this->_xmlEntities($heading);
+                }
+            }
+            return $this->_xmlEntities($default);
+        } else {
+            return $this->_xmlEntities($title);
+        }
+    }
+
+    /**
+     * Returns an HTML code for images used in link titles
+     *
+     * @todo Resolve namespace on internal images
+     * @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'],
+                              $img['width'],
+                              $img['height'],
+                              $img['cache']);
+    }
+
+    /**
+     * _getMediaLinkConf is a helperfunction to internalmedia() and externalmedia()
+     * which returns a basic link to a media.
+     *
+     * @author Pierre Spring 
+     * @param string $src
+     * @param string $title
+     * @param string $align
+     * @param string $width
+     * @param string $height
+     * @param string $cache
+     * @param string $render
+     * @access protected
+     * @return array
+     */
+    function _getMediaLinkConf($src, $title, $align, $width, $height, $cache, $render) {
+        global $conf;
+
+        $link = array();
+        $link['class']  = 'media';
+        $link['style']  = '';
+        $link['pre']    = '';
+        $link['suf']    = '';
+        $link['more']   = '';
+        $link['target'] = $conf['target']['media'];
+        $link['title']  = $this->_xmlEntities($src);
+        $link['name']   = $this->_media($src, $title, $align, $width, $height, $cache, $render);
+
+        return $link;
+    }
+
+
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/inc/parser/xhtmlsummary.php b/sources/inc/parser/xhtmlsummary.php
new file mode 100644
index 0000000..95f86cb
--- /dev/null
+++ b/sources/inc/parser/xhtmlsummary.php
@@ -0,0 +1,90 @@
+
+ * @todo   Is this currently used anywhere? Should it?
+ */
+class Doku_Renderer_xhtmlsummary extends Doku_Renderer_xhtml {
+
+    // Namespace these variables to
+    // avoid clashes with parent classes
+    var $sum_paragraphs = 0;
+    var $sum_capture = true;
+    var $sum_inSection = false;
+    var $sum_summary = '';
+    var $sum_pageTitle = false;
+
+    function document_start() {
+        $this->doc .= DOKU_LF.'
        '.DOKU_LF;
+    }
+
+    function document_end() {
+        $this->doc = $this->sum_summary;
+        $this->doc .= DOKU_LF.'
        '.DOKU_LF;
+    }
+
+    // FIXME not supported anymore
+    function toc_open() {
+        $this->sum_summary .= $this->doc;
+    }
+
+    // FIXME not supported anymore
+    function toc_close() {
+        $this->doc = '';
+    }
+
+    function header($text, $level, $pos) {
+        if ( !$this->sum_pageTitle ) {
+            $this->info['sum_pagetitle'] = $text;
+            $this->sum_pageTitle = true;
+        }
+        $this->doc .= DOKU_LF.'';
+        $this->doc .= $this->_xmlEntities($text);
+        $this->doc .= "".DOKU_LF;
+    }
+
+    function section_open($level) {
+        if ( $this->sum_capture ) {
+            $this->sum_inSection = true;
+        }
+    }
+
+    function section_close() {
+        if ( $this->sum_capture && $this->sum_inSection ) {
+            $this->sum_summary .= $this->doc;
+            $this->sum_capture = false;
+        }
+    }
+
+    function p_open() {
+        if ( $this->sum_capture && $this->sum_paragraphs < 2 ) {
+            $this->sum_paragraphs++;
+        }
+        parent :: p_open();
+    }
+
+    function p_close() {
+        parent :: p_close();
+        if ( $this->sum_capture && $this->sum_paragraphs >= 2 ) {
+            $this->sum_summary .= $this->doc;
+            $this->sum_capture = false;
+        }
+    }
+
+}
+
+
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/inc/parserutils.php b/sources/inc/parserutils.php
new file mode 100644
index 0000000..b67daaa
--- /dev/null
+++ b/sources/inc/parserutils.php
@@ -0,0 +1,722 @@
+
+ * @author     Andreas Gohr 
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+
+/**
+ * How many pages shall be rendered for getting metadata during one request
+ * at maximum? Note that this limit isn't respected when METADATA_RENDER_UNLIMITED
+ * is passed as render parameter to p_get_metadata.
+ */
+if (!defined('P_GET_METADATA_RENDER_LIMIT')) define('P_GET_METADATA_RENDER_LIMIT', 5);
+
+/** Don't render metadata even if it is outdated or doesn't exist */
+define('METADATA_DONT_RENDER', 0);
+/**
+ * Render metadata when the page is really newer or the metadata doesn't exist.
+ * Uses just a simple check, but should work pretty well for loading simple
+ * metadata values like the page title and avoids rendering a lot of pages in
+ * one request. The P_GET_METADATA_RENDER_LIMIT is used in this mode.
+ * Use this if it is unlikely that the metadata value you are requesting
+ * does depend e.g. on pages that are included in the current page using
+ * the include plugin (this is very likely the case for the page title, but
+ * not for relation references).
+ */
+define('METADATA_RENDER_USING_SIMPLE_CACHE', 1);
+/**
+ * Render metadata using the metadata cache logic. The P_GET_METADATA_RENDER_LIMIT
+ * is used in this mode. Use this mode when you are requesting more complex
+ * metadata. Although this will cause rendering more often it might actually have
+ * the effect that less current metadata is returned as it is more likely than in
+ * the simple cache mode that metadata needs to be rendered for all pages at once
+ * which means that when the metadata for the page is requested that actually needs
+ * to be updated the limit might have been reached already.
+ */
+define('METADATA_RENDER_USING_CACHE', 2);
+/**
+ * Render metadata without limiting the number of pages for which metadata is
+ * rendered. Use this mode with care, normally it should only be used in places
+ * like the indexer or in cli scripts where the execution time normally isn't
+ * limited. This can be combined with the simple cache using
+ * METADATA_RENDER_USING_CACHE | METADATA_RENDER_UNLIMITED.
+ */
+define('METADATA_RENDER_UNLIMITED', 4);
+
+/**
+ * Returns the parsed Wikitext in XHTML for the given id and revision.
+ *
+ * If $excuse is true an explanation is returned if the file
+ * wasn't found
+ *
+ * @author Andreas Gohr 
+ */
+function p_wiki_xhtml($id, $rev='', $excuse=true){
+    $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');
+        }
+    }
+
+    //restore ID (just in case)
+    $ID = $keep;
+
+    return $ret;
+}
+
+/**
+ * Returns the specified local text in parsed format
+ *
+ * @author Andreas Gohr 
+ */
+function p_locale_xhtml($id){
+    //fetch parsed locale
+    $html = p_cached_output(localeFN($id));
+    return $html;
+}
+
+/**
+ * Returns the given file parsed into the requested output format
+ *
+ * @author Andreas Gohr 
+ * @author Chris Smith 
+ */
+function p_cached_output($file, $format='xhtml', $id='') {
+    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";
+        }
+    }
+
+    return $parsed;
+}
+
+/**
+ * Returns the render instructions for a file
+ *
+ * Uses and creates a serialized cache file
+ *
+ * @author Andreas Gohr 
+ */
+function p_cached_instructions($file,$cacheonly=false,$id='') {
+    static $run = null;
+    if(is_null($run)) $run = array();
+
+    $cache = new cache_instructions($id, $file);
+
+    if ($cacheonly || $cache->useCache() || (isset($run[$file]) && !defined('DOKU_UNITTEST'))) {
+        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 null;
+}
+
+/**
+ * turns a page into a list of instructions
+ *
+ * @author Harry Fuecks 
+ * @author Andreas Gohr 
+ */
+function p_get_instructions($text){
+
+    $modes = p_get_parsermodes();
+
+    // Create the parser
+    $Parser = new Doku_Parser();
+
+    // Add the Handler
+    $Parser->Handler = new Doku_Handler();
+
+    //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;
+}
+
+/**
+ * returns the metadata of a page
+ *
+ * @param string $id The id of the page the metadata should be returned from
+ * @param string $key The key of the metdata value that shall be read (by default everything) - separate hierarchies by " " like "date created"
+ * @param int $render If the page should be rendererd - possible values:
+ *     METADATA_DONT_RENDER, METADATA_RENDER_USING_SIMPLE_CACHE, METADATA_RENDER_USING_CACHE
+ *     METADATA_RENDER_UNLIMITED (also combined with the previous two options),
+ *     default: METADATA_RENDER_USING_CACHE
+ * @return mixed The requested metadata fields
+ *
+ * @author Esther Brunner 
+ * @author Michael Hamann 
+ */
+function p_get_metadata($id, $key='', $render=METADATA_RENDER_USING_CACHE){
+    global $ID;
+    static $render_count = 0;
+    // track pages that have already been rendered in order to avoid rendering the same page
+    // again
+    static $rendered_pages = array();
+
+    // 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);
+
+    if (!is_numeric($render)) {
+        if ($render) {
+            $render = METADATA_RENDER_USING_SIMPLE_CACHE;
+        } else {
+            $render = METADATA_DONT_RENDER;
+        }
+    }
+
+    // prevent recursive calls in the cache
+    static $recursion = false;
+    if (!$recursion && $render != METADATA_DONT_RENDER && !isset($rendered_pages[$id])&& page_exists($id)){
+        $recursion = true;
+
+        $cachefile = new cache_renderer($id, wikiFN($id), 'metadata');
+
+        $do_render = false;
+        if ($render & METADATA_RENDER_UNLIMITED || $render_count < P_GET_METADATA_RENDER_LIMIT) {
+            if ($render & METADATA_RENDER_USING_SIMPLE_CACHE) {
+                $pagefn = wikiFN($id);
+                $metafn = metaFN($id, '.meta');
+                if (!@file_exists($metafn) || @filemtime($pagefn) > @filemtime($cachefile->cache)) {
+                    $do_render = true;
+                }
+            } elseif (!$cachefile->useCache()){
+                $do_render = true;
+            }
+        }
+        if ($do_render) {
+            if (!defined('DOKU_UNITTEST')) {
+                ++$render_count;
+                $rendered_pages[$id] = true;
+            }
+            $old_meta = $meta;
+            $meta = p_render_metadata($id, $meta);
+            // only update the file when the metadata has been changed
+            if ($meta == $old_meta || p_save_metadata($id, $meta)) {
+                // store a timestamp in order to make sure that the cachefile is touched
+                // this timestamp is also stored when the meta data is still the same
+                $cachefile->storeCache(time());
+            } else {
+                msg('Unable to save metadata file. Hint: disk full; file permissions; safe_mode setting.',-1);
+            }
+        }
+
+        $recursion = false;
+    }
+
+    $val = $meta['current'];
+
+    // filter by $key
+    foreach(preg_split('/\s+/', $key, 2, PREG_SPLIT_NO_EMPTY) as $cur_key) {
+        if (!isset($val[$cur_key])) {
+            return null;
+        }
+        $val = $val[$cur_key];
+    }
+    return $val;
+}
+
+/**
+ * sets metadata elements of a page
+ *
+ * @see http://www.dokuwiki.org/devel:metadata#functions_to_get_and_set_metadata
+ *
+ * @param String  $id         is the ID of a wiki page
+ * @param Array   $data       is an array with key ⇒ value pairs to be set in the metadata
+ * @param Boolean $render     whether or not the page metadata should be generated with the renderer
+ * @param Boolean $persistent indicates whether or not the particular metadata value will persist through
+ *                            the next metadata rendering.
+ * @return boolean true on success
+ *
+ * @author Esther Brunner 
+ * @author Michael Hamann 
+ */
+function p_set_metadata($id, $data, $render=false, $persistent=true){
+    if (!is_array($data)) return false;
+
+    global $ID, $METADATA_RENDERERS;
+
+    // if there is currently a renderer change the data in the renderer instead
+    if (isset($METADATA_RENDERERS[$id])) {
+        $orig =& $METADATA_RENDERERS[$id];
+        $meta = $orig;
+    } else {
+        // cache the current page
+        $cache = ($ID == $id);
+        $orig = p_read_metadata($id, $cache);
+
+        // 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){
+
+        // be careful with sub-arrays of $meta['relation']
+        if ($key == 'relation'){
+
+            foreach ($value as $subkey => $subvalue){
+                if(isset($meta['current'][$key][$subkey]) && is_array($meta['current'][$key][$subkey])) {
+                    $meta['current'][$key][$subkey] = array_merge($meta['current'][$key][$subkey], (array)$subvalue);
+                } else {
+                    $meta['current'][$key][$subkey] = $subvalue;
+                }
+                if($persistent) {
+                    if(isset($meta['persistent'][$key][$subkey]) && is_array($meta['persistent'][$key][$subkey])) {
+                        $meta['persistent'][$key][$subkey] = array_merge($meta['persistent'][$key][$subkey], (array)$subvalue);
+                    } else {
+                        $meta['persistent'][$key][$subkey] = $subvalue;
+                    }
+                }
+            }
+
+            // 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((array)$meta['current'][$key],$value) : $value;
+
+                if ($persistent) {
+                    $meta['persistent'][$key] = !empty($meta['persistent'][$key]) ? array_merge((array)$meta['persistent'][$key],$value) : $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;
+
+    if (isset($METADATA_RENDERERS[$id])) {
+        // set both keys individually as the renderer has references to the individual keys
+        $METADATA_RENDERERS[$id]['current']    = $meta['current'];
+        $METADATA_RENDERERS[$id]['persistent'] = $meta['persistent'];
+        return true;
+    } else {
+        return p_save_metadata($id, $meta);
+    }
+}
+
+/**
+ * Purges the non-persistant part of the meta data
+ * used on page deletion
+ *
+ * @author Michael Klier 
+ */
+function p_purge_metadata($id) {
+    $meta = p_read_metadata($id);
+    foreach($meta['current'] as $key => $value) {
+        if(is_array($meta[$key])) {
+            $meta['current'][$key] = array();
+        } else {
+            $meta['current'][$key] = '';
+        }
+
+    }
+    return p_save_metadata($id, $meta);
+}
+
+/**
+ * read the metadata from source/cache for $id
+ * (internal use only - called by p_get_metadata & p_set_metadata)
+ *
+ * @author   Christopher Smith 
+ *
+ * @param    string   $id      absolute wiki page id
+ * @param    bool     $cache   whether or not to cache metadata in memory
+ *                             (only use for metadata likely to be accessed several times)
+ *
+ * @return   array             metadata
+ */
+function p_read_metadata($id,$cache=false) {
+    global $cache_metadata;
+
+    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());
+
+    if ($cache) {
+        $cache_metadata[(string)$id] = $meta;
+    }
+
+    return $meta;
+}
+
+/**
+ * This is the backend function to save a metadata array to a file
+ *
+ * @param    string   $id      absolute wiki page id
+ * @param    array    $meta    metadata
+ *
+ * @return   bool              success / fail
+ */
+function p_save_metadata($id, $meta) {
+    // sync cached copies, including $INFO metadata
+    global $cache_metadata, $INFO;
+
+    if (isset($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));
+}
+
+/**
+ * renders the metadata of a page
+ *
+ * @author Esther Brunner 
+ */
+function p_render_metadata($id, $orig){
+    // make sure the correct ID is in global ID
+    global $ID, $METADATA_RENDERERS;
+
+    // avoid recursive rendering processes for the same id
+    if (isset($METADATA_RENDERERS[$id]))
+        return $orig;
+
+    // store the original metadata in the global $METADATA_RENDERERS so p_set_metadata can use it
+    $METADATA_RENDERERS[$id] =& $orig;
+
+    $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;
+            unset($METADATA_RENDERERS[$id]);
+            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'];
+
+        // loop through the instructions
+        foreach ($instructions as $instruction){
+            // execute the callback against the renderer
+            call_user_func_array(array(&$renderer, $instruction[0]), (array) $instruction[1]);
+        }
+
+        $evt->result = array('current'=>&$renderer->meta,'persistent'=>&$renderer->persistent);
+    }
+    $evt->advise_after();
+
+    // clean up
+    $ID = $keep;
+    unset($METADATA_RENDERERS[$id]);
+    return $evt->result;
+}
+
+/**
+ * returns all available parser syntax modes in correct order
+ *
+ * @author Andreas Gohr 
+ */
+function p_get_parsermodes(){
+    global $conf;
+
+    //reuse old data
+    static $modes = null;
+    if($modes != null && !defined('DOKU_UNITTEST')){
+        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){
+            /** @var DokuWiki_Syntax_Plugin $obj */
+            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 );
+    }
+
+    //sort modes
+    usort($modes,'p_sort_modes');
+
+    return $modes;
+}
+
+/**
+ * Callback function for usort
+ *
+ * @author Andreas Gohr 
+ */
+function p_sort_modes($a, $b){
+    if($a['sort'] == $b['sort']) return 0;
+    return ($a['sort'] < $b['sort']) ? -1 : 1;
+}
+
+/**
+ * Renders a list of instruction to the specified output mode
+ *
+ * In the $info array is information from the renderer returned
+ *
+ * @author Harry Fuecks 
+ * @author Andreas Gohr 
+ */
+function p_render($mode,$instructions,&$info){
+    if(is_null($instructions)) return '';
+
+    $Renderer =& p_get_renderer($mode);
+    if (is_null($Renderer)) return null;
+
+    $Renderer->reset();
+
+    $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
+        if(method_exists($Renderer, $instruction[0])){
+            call_user_func_array(array(&$Renderer, $instruction[0]), $instruction[1] ? $instruction[1] : array());
+        }
+    }
+
+    //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;
+}
+
+/**
+ * @param $mode string Mode of the renderer to get
+ * @return null|Doku_Renderer The renderer
+ */
+function & p_get_renderer($mode) {
+    /** @var Doku_Plugin_Controller $plugin_controller */
+    global $conf, $plugin_controller;
+
+    $rname = !empty($conf['renderer_'.$mode]) ? $conf['renderer_'.$mode] : $mode;
+    $rclass = "Doku_Renderer_$rname";
+
+    if( class_exists($rclass) ) {
+        $Renderer = new $rclass();
+        return $Renderer;
+    }
+
+    // try default renderer first:
+    $file = DOKU_INC."inc/parser/$rname.php";
+    if(@file_exists($file)){
+        require_once $file;
+
+        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?
+        $Renderer = $plugin_controller->load('renderer',$rname);
+
+        if(!isset($Renderer) || is_null($Renderer)){
+            msg("No renderer '$rname' found for mode '$mode'",-1);
+            return null;
+        }
+    }
+
+    return $Renderer;
+}
+
+/**
+ * Gets the first heading from a file
+ *
+ * @param   string   $id       dokuwiki page id
+ * @param   int      $render   rerender if first heading not known
+ *                             default: METADATA_RENDER_USING_SIMPLE_CACHE
+ *                             Possible values: METADATA_DONT_RENDER,
+ *                                              METADATA_RENDER_USING_SIMPLE_CACHE,
+ *                                              METADATA_RENDER_USING_CACHE,
+ *                                              METADATA_RENDER_UNLIMITED
+ *
+ * @return string|null The first heading
+ * @author Andreas Gohr 
+ * @author Michael Hamann 
+ */
+function p_get_first_heading($id, $render=METADATA_RENDER_USING_SIMPLE_CACHE){
+    return p_get_metadata(cleanID($id),'title',$render);
+}
+
+/**
+ * Wrapper for GeSHi Code Highlighter, provides caching of its output
+ *
+ * @param  string   $code       source code to be highlighted
+ * @param  string   $language   language to provide highlighting
+ * @param  string   $wrapper    html element to wrap the returned highlighted text
+ *
+ * @return string xhtml code
+ * @author Christopher Smith 
+ * @author Andreas Gohr 
+ */
+function p_xhtml_cached_geshi($code, $language, $wrapper='pre') {
+    global $conf, $config_cascade, $INPUT;
+    $language = strtolower($language);
+
+    // 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 && !$INPUT->bool('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 {
+
+        $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;
+    }
+}
+
diff --git a/sources/inc/phpseclib/Crypt_AES.php b/sources/inc/phpseclib/Crypt_AES.php
new file mode 100644
index 0000000..81fa2fe
--- /dev/null
+++ b/sources/inc/phpseclib/Crypt_AES.php
@@ -0,0 +1,188 @@
+
+ * setKey('abcdefghijklmnop');
+ *
+ *    $size = 10 * 1024;
+ *    $plaintext = '';
+ *    for ($i = 0; $i < $size; $i++) {
+ *        $plaintext.= 'a';
+ *    }
+ *
+ *    echo $aes->decrypt($aes->encrypt($plaintext));
+ * ?>
+ * 
+ *
+ * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @category   Crypt
+ * @package    Crypt_AES
+ * @author     Jim Wigginton 
+ * @copyright  MMVIII Jim Wigginton
+ * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link       http://phpseclib.sourceforge.net
+ */
+
+/**
+ * Include Crypt_Rijndael
+ */
+if (!class_exists('Crypt_Rijndael')) {
+    require_once('Rijndael.php');
+}
+
+/**#@+
+ * @access public
+ * @see Crypt_AES::encrypt()
+ * @see Crypt_AES::decrypt()
+ */
+/**
+ * Encrypt / decrypt using the Counter mode.
+ *
+ * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+ */
+define('CRYPT_AES_MODE_CTR', CRYPT_MODE_CTR);
+/**
+ * Encrypt / decrypt using the Electronic Code Book mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+ */
+define('CRYPT_AES_MODE_ECB', CRYPT_MODE_ECB);
+/**
+ * Encrypt / decrypt using the Code Book Chaining mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+ */
+define('CRYPT_AES_MODE_CBC', CRYPT_MODE_CBC);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+ */
+define('CRYPT_AES_MODE_CFB', CRYPT_MODE_CFB);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+ */
+define('CRYPT_AES_MODE_OFB', CRYPT_MODE_OFB);
+/**#@-*/
+
+/**#@+
+ * @access private
+ * @see Crypt_AES::Crypt_AES()
+ */
+/**
+ * Toggles the internal implementation
+ */
+define('CRYPT_AES_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
+/**
+ * Toggles the mcrypt implementation
+ */
+define('CRYPT_AES_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
+/**#@-*/
+
+/**
+ * Pure-PHP implementation of AES.
+ *
+ * @author  Jim Wigginton 
+ * @version 0.1.0
+ * @access  public
+ * @package Crypt_AES
+ */
+class Crypt_AES extends Crypt_Rijndael {
+    /**
+     * The namespace used by the cipher for its constants.
+     *
+     * @see Crypt_Base::const_namespace
+     * @var String
+     * @access private
+     */
+    var $const_namespace = 'AES';
+
+    /**
+     * Default Constructor.
+     *
+     * Determines whether or not the mcrypt extension should be used.
+     *
+     * $mode could be:
+     *
+     * - CRYPT_AES_MODE_ECB
+     *
+     * - CRYPT_AES_MODE_CBC
+     *
+     * - CRYPT_AES_MODE_CTR
+     *
+     * - CRYPT_AES_MODE_CFB
+     *
+     * - CRYPT_AES_MODE_OFB
+     *
+     * If not explictly set, CRYPT_AES_MODE_CBC will be used.
+     *
+     * @see Crypt_Rijndael::Crypt_Rijndael()
+     * @see Crypt_Base::Crypt_Base()
+     * @param optional Integer $mode
+     * @access public
+     */
+    function Crypt_AES($mode = CRYPT_AES_MODE_CBC)
+    {
+        parent::Crypt_Rijndael($mode);
+    }
+
+    /**
+     * Dummy function
+     *
+     * Since Crypt_AES extends Crypt_Rijndael, this function is, technically, available, but it doesn't do anything.
+     *
+     * @see Crypt_Rijndael::setBlockLength()
+     * @access public
+     * @param Integer $length
+     */
+    function setBlockLength($length)
+    {
+        return;
+    }
+}
+
+// vim: ts=4:sw=4:et:
+// vim6: fdl=1:
diff --git a/sources/inc/phpseclib/Crypt_Base.php b/sources/inc/phpseclib/Crypt_Base.php
new file mode 100644
index 0000000..7c650ca
--- /dev/null
+++ b/sources/inc/phpseclib/Crypt_Base.php
@@ -0,0 +1,1989 @@
+
+ * @author     Hans-Juergen Petrich 
+ * @copyright  MMVII Jim Wigginton
+ * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @version    1.0.1
+ * @link       http://phpseclib.sourceforge.net
+ */
+
+/**#@+
+ * @access public
+ * @see Crypt_Base::encrypt()
+ * @see Crypt_Base::decrypt()
+ */
+/**
+ * Encrypt / decrypt using the Counter mode.
+ *
+ * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+ */
+define('CRYPT_MODE_CTR', -1);
+/**
+ * Encrypt / decrypt using the Electronic Code Book mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+ */
+define('CRYPT_MODE_ECB', 1);
+/**
+ * Encrypt / decrypt using the Code Book Chaining mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+ */
+define('CRYPT_MODE_CBC', 2);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+ */
+define('CRYPT_MODE_CFB', 3);
+/**
+ * Encrypt / decrypt using the Output Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+ */
+define('CRYPT_MODE_OFB', 4);
+/**
+ * Encrypt / decrypt using streaming mode.
+ *
+ */
+define('CRYPT_MODE_STREAM', 5);
+/**#@-*/
+
+/**#@+
+ * @access private
+ * @see Crypt_Base::Crypt_Base()
+ */
+/**
+ * Base value for the internal implementation $engine switch
+ */
+define('CRYPT_MODE_INTERNAL', 1);
+/**
+ * Base value for the mcrypt implementation $engine switch
+ */
+define('CRYPT_MODE_MCRYPT', 2);
+/**#@-*/
+
+/**
+ * Base Class for all Crypt_* cipher classes
+ *
+ * @author  Jim Wigginton 
+ * @author  Hans-Juergen Petrich 
+ * @version 1.0.0
+ * @access  public
+ * @package Crypt_Base
+ */
+class Crypt_Base {
+    /**
+     * The Encryption Mode
+     *
+     * @see Crypt_Base::Crypt_Base()
+     * @var Integer
+     * @access private
+     */
+    var $mode;
+
+    /**
+     * The Block Length of the block cipher
+     *
+     * @var Integer
+     * @access private
+     */
+    var $block_size = 16;
+
+    /**
+     * The Key
+     *
+     * @see Crypt_Base::setKey()
+     * @var String
+     * @access private
+     */
+    var $key = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0";
+
+    /**
+     * The Initialization Vector
+     *
+     * @see Crypt_Base::setIV()
+     * @var String
+     * @access private
+     */
+    var $iv;
+
+    /**
+     * A "sliding" Initialization Vector
+     *
+     * @see Crypt_Base::enableContinuousBuffer()
+     * @see Crypt_Base::_clearBuffers()
+     * @var String
+     * @access private
+     */
+    var $encryptIV;
+
+    /**
+     * A "sliding" Initialization Vector
+     *
+     * @see Crypt_Base::enableContinuousBuffer()
+     * @see Crypt_Base::_clearBuffers()
+     * @var String
+     * @access private
+     */
+    var $decryptIV;
+
+    /**
+     * Continuous Buffer status
+     *
+     * @see Crypt_Base::enableContinuousBuffer()
+     * @var Boolean
+     * @access private
+     */
+    var $continuousBuffer = false;
+
+    /**
+     * Encryption buffer for CTR, OFB and CFB modes
+     *
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::_clearBuffers()
+     * @var Array
+     * @access private
+     */
+    var $enbuffer;
+
+    /**
+     * Decryption buffer for CTR, OFB and CFB modes
+     *
+     * @see Crypt_Base::decrypt()
+     * @see Crypt_Base::_clearBuffers()
+     * @var Array
+     * @access private
+     */
+    var $debuffer;
+
+    /**
+     * mcrypt resource for encryption
+     *
+     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
+     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+     *
+     * @see Crypt_Base::encrypt()
+     * @var Resource
+     * @access private
+     */
+    var $enmcrypt;
+
+    /**
+     * mcrypt resource for decryption
+     *
+     * The mcrypt resource can be recreated every time something needs to be created or it can be created just once.
+     * Since mcrypt operates in continuous mode, by default, it'll need to be recreated when in non-continuous mode.
+     *
+     * @see Crypt_Base::decrypt()
+     * @var Resource
+     * @access private
+     */
+    var $demcrypt;
+
+    /**
+     * Does the enmcrypt resource need to be (re)initialized?
+     *
+     * @see Crypt_Twofish::setKey()
+     * @see Crypt_Twofish::setIV()
+     * @var Boolean
+     * @access private
+     */
+    var $enchanged = true;
+
+    /**
+     * Does the demcrypt resource need to be (re)initialized?
+     *
+     * @see Crypt_Twofish::setKey()
+     * @see Crypt_Twofish::setIV()
+     * @var Boolean
+     * @access private
+     */
+    var $dechanged = true;
+
+    /**
+     * mcrypt resource for CFB mode
+     *
+     * mcrypt's CFB mode, in (and only in) buffered context,
+     * is broken, so phpseclib implements the CFB mode by it self,
+     * even when the mcrypt php extension is available.
+     *
+     * In order to do the CFB-mode work (fast) phpseclib
+     * use a separate ECB-mode mcrypt resource.
+     *
+     * @link http://phpseclib.sourceforge.net/cfb-demo.phps
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::decrypt()
+     * @see Crypt_Base::_setupMcrypt()
+     * @var Resource
+     * @access private
+     */
+    var $ecb;
+
+    /**
+     * Optimizing value while CFB-encrypting
+     *
+     * Only relevant if $continuousBuffer enabled
+     * and $engine == CRYPT_MODE_MCRYPT
+     *
+     * It's faster to re-init $enmcrypt if
+     * $buffer bytes > $cfb_init_len than
+     * using the $ecb resource furthermore.
+     *
+     * This value depends of the choosen cipher
+     * and the time it would be needed for it's
+     * initialization [by mcrypt_generic_init()]
+     * which, typically, depends on the complexity
+     * on its internaly Key-expanding algorithm.
+     *
+     * @see Crypt_Base::encrypt()
+     * @var Integer
+     * @access private
+     */
+    var $cfb_init_len = 600;
+
+    /**
+     * Does internal cipher state need to be (re)initialized?
+     *
+     * @see setKey()
+     * @see setIV()
+     * @see disableContinuousBuffer()
+     * @var Boolean
+     * @access private
+     */
+    var $changed = true;
+
+    /**
+     * Padding status
+     *
+     * @see Crypt_Base::enablePadding()
+     * @var Boolean
+     * @access private
+     */
+    var $padding = true;
+
+    /**
+     * Is the mode one that is paddable?
+     *
+     * @see Crypt_Base::Crypt_Base()
+     * @var Boolean
+     * @access private
+     */
+    var $paddable = false;
+
+    /**
+     * Holds which crypt engine internaly should be use,
+     * which will be determined automatically on __construct()
+     *
+     * Currently available $engines are:
+     * - CRYPT_MODE_MCRYPT   (fast, php-extension: mcrypt, extension_loaded('mcrypt') required)
+     * - CRYPT_MODE_INTERNAL (slower, pure php-engine, no php-extension required)
+     *
+     * In the pipeline... maybe. But currently not available:
+     * - CRYPT_MODE_OPENSSL  (very fast, php-extension: openssl, extension_loaded('openssl') required)
+     *
+     * If possible, CRYPT_MODE_MCRYPT will be used for each cipher.
+     * Otherwise CRYPT_MODE_INTERNAL
+     *
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::decrypt()
+     * @var Integer
+     * @access private
+     */
+    var $engine;
+
+    /**
+     * The mcrypt specific name of the cipher
+     *
+     * Only used if $engine == CRYPT_MODE_MCRYPT
+     *
+     * @link http://www.php.net/mcrypt_module_open
+     * @link http://www.php.net/mcrypt_list_algorithms
+     * @see Crypt_Base::_setupMcrypt()
+     * @var String
+     * @access private
+     */
+    var $cipher_name_mcrypt;
+
+    /**
+     * The default password key_size used by setPassword()
+     *
+     * @see Crypt_Base::setPassword()
+     * @var Integer
+     * @access private
+     */
+    var $password_key_size = 32;
+
+    /**
+     * The default salt used by setPassword()
+     *
+     * @see Crypt_Base::setPassword()
+     * @var String
+     * @access private
+     */
+    var $password_default_salt = 'phpseclib/salt';
+
+    /**
+     * The namespace used by the cipher for its constants.
+     *
+     * ie: AES.php is using CRYPT_AES_MODE_* for its constants
+     *     so $const_namespace is AES
+     *
+     *     DES.php is using CRYPT_DES_MODE_* for its constants
+     *     so $const_namespace is DES... and so on
+     *
+     * All CRYPT_<$const_namespace>_MODE_* are aliases of
+     * the generic CRYPT_MODE_* constants, so both could be used
+     * for each cipher.
+     *
+     * Example:
+     * $aes = new Crypt_AES(CRYPT_AES_MODE_CFB); // $aes will operate in cfb mode
+     * $aes = new Crypt_AES(CRYPT_MODE_CFB);     // identical
+     *
+     * @see Crypt_Base::Crypt_Base()
+     * @var String
+     * @access private
+     */
+    var $const_namespace;
+
+    /**
+     * The name of the performance-optimized callback function
+     *
+     * Used by encrypt() / decrypt()
+     * only if $engine == CRYPT_MODE_INTERNAL
+     *
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::decrypt()
+     * @see Crypt_Base::_setupInlineCrypt()
+     * @see Crypt_Base::$use_inline_crypt
+     * @var Callback
+     * @access private
+     */
+    var $inline_crypt;
+
+    /**
+     * Holds whether performance-optimized $inline_crypt() can/should be used.
+     *
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::decrypt()
+     * @see Crypt_Base::inline_crypt
+     * @var mixed
+     * @access private
+     */
+    var $use_inline_crypt;
+
+    /**
+     * Default Constructor.
+     *
+     * Determines whether or not the mcrypt extension should be used.
+     *
+     * $mode could be:
+     *
+     * - CRYPT_MODE_ECB
+     *
+     * - CRYPT_MODE_CBC
+     *
+     * - CRYPT_MODE_CTR
+     *
+     * - CRYPT_MODE_CFB
+     *
+     * - CRYPT_MODE_OFB
+     *
+     * (or the alias constants of the choosen cipher, for example for AES: CRYPT_AES_MODE_ECB or CRYPT_AES_MODE_CBC ...)
+     *
+     * If not explictly set, CRYPT_MODE_CBC will be used.
+     *
+     * @param optional Integer $mode
+     * @access public
+     */
+    function Crypt_Base($mode = CRYPT_MODE_CBC)
+    {
+        $const_crypt_mode = 'CRYPT_' . $this->const_namespace . '_MODE';
+
+        // Determining the availibility of mcrypt support for the cipher
+        if (!defined($const_crypt_mode)) {
+            switch (true) {
+                case extension_loaded('mcrypt') && in_array($this->cipher_name_mcrypt, mcrypt_list_algorithms()):
+                    define($const_crypt_mode, CRYPT_MODE_MCRYPT);
+                    break;
+                default:
+                    define($const_crypt_mode, CRYPT_MODE_INTERNAL);
+            }
+        }
+
+        // Determining which internal $engine should be used.
+        // The fastes possible first.
+        switch (true) {
+            case empty($this->cipher_name_mcrypt): // The cipher module has no mcrypt-engine support at all so we force CRYPT_MODE_INTERNAL
+                $this->engine = CRYPT_MODE_INTERNAL;
+                break;
+            case constant($const_crypt_mode) == CRYPT_MODE_MCRYPT:
+                $this->engine = CRYPT_MODE_MCRYPT;
+                break;
+            default:
+                $this->engine = CRYPT_MODE_INTERNAL;
+        }
+
+        // $mode dependent settings
+        switch ($mode) {
+            case CRYPT_MODE_ECB:
+                $this->paddable = true;
+                $this->mode = $mode;
+                break;
+            case CRYPT_MODE_CTR:
+            case CRYPT_MODE_CFB:
+            case CRYPT_MODE_OFB:
+            case CRYPT_MODE_STREAM:
+                $this->mode = $mode;
+                break;
+            case CRYPT_MODE_CBC:
+            default:
+                $this->paddable = true;
+                $this->mode = CRYPT_MODE_CBC;
+        }
+
+        // Determining whether inline crypting can be used by the cipher
+        if ($this->use_inline_crypt !== false && function_exists('create_function')) {
+            $this->use_inline_crypt = true;
+        }
+    }
+
+    /**
+     * Sets the initialization vector. (optional)
+     *
+     * SetIV is not required when CRYPT_MODE_ECB (or ie for AES: CRYPT_AES_MODE_ECB) is being used.  If not explictly set, it'll be assumed
+     * to be all zero's.
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @access public
+     * @param String $iv
+     */
+    function setIV($iv)
+    {
+        if ($this->mode == CRYPT_MODE_ECB) {
+            return;
+        }
+
+        $this->iv = $iv;
+        $this->changed = true;
+    }
+
+    /**
+     * Sets the key.
+     *
+     * The min/max length(s) of the key depends on the cipher which is used.
+     * If the key not fits the length(s) of the cipher it will paded with null bytes
+     * up to the closest valid key length.  If the key is more than max length,
+     * we trim the excess bits.
+     *
+     * If the key is not explicitly set, it'll be assumed to be all null bytes.
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @access public
+     * @param String $key
+     */
+    function setKey($key)
+    {
+        $this->key = $key;
+        $this->changed = true;
+    }
+
+    /**
+     * Sets the password.
+     *
+     * Depending on what $method is set to, setPassword()'s (optional) parameters are as follows:
+     *     {@link http://en.wikipedia.org/wiki/PBKDF2 pbkdf2}:
+     *         $hash, $salt, $count, $dkLen
+     *
+     *         Where $hash (default = sha1) currently supports the following hashes: see: Crypt/Hash.php
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @see Crypt/Hash.php
+     * @param String $password
+     * @param optional String $method
+     * @access public
+     */
+    function setPassword($password, $method = 'pbkdf2')
+    {
+        $key = '';
+
+        switch ($method) {
+            default: // 'pbkdf2'
+                $func_args = func_get_args();
+
+                // Hash function
+                $hash = isset($func_args[2]) ? $func_args[2] : 'sha1';
+
+                // WPA and WPA2 use the SSID as the salt
+                $salt = isset($func_args[3]) ? $func_args[3] : $this->password_default_salt;
+
+                // RFC2898#section-4.2 uses 1,000 iterations by default
+                // WPA and WPA2 use 4,096.
+                $count = isset($func_args[4]) ? $func_args[4] : 1000;
+
+                // Keylength
+                $dkLen = isset($func_args[5]) ? $func_args[5] : $this->password_key_size;
+
+                // Determining if php[>=5.5.0]'s hash_pbkdf2() function avail- and useable
+                switch (true) {
+                    case !function_exists('hash_pbkdf2'):
+                    case !function_exists('hash_algos'):
+                    case !in_array($hash, hash_algos()):
+                        if (!class_exists('Crypt_Hash')) {
+                            require_once('Crypt/Hash.php');
+                        }
+                        $i = 1;
+                        while (strlen($key) < $dkLen) {
+                            $hmac = new Crypt_Hash();
+                            $hmac->setHash($hash);
+                            $hmac->setKey($password);
+                            $f = $u = $hmac->hash($salt . pack('N', $i++));
+                            for ($j = 2; $j <= $count; ++$j) {
+                                $u = $hmac->hash($u);
+                                $f^= $u;
+                            }
+                            $key.= $f;
+                        }
+                        $key = substr($key, 0, $dkLen);
+                        break;
+                    default:
+                        $key = hash_pbkdf2($hash, $password, $salt, $count, $dkLen, true);
+                }
+        }
+
+        $this->setKey($key);
+    }
+
+    /**
+     * Encrypts a message.
+     *
+     * $plaintext will be padded with additional bytes such that it's length is a multiple of the block size. Other cipher
+     * implementations may or may not pad in the same manner.  Other common approaches to padding and the reasons why it's
+     * necessary are discussed in the following
+     * URL:
+     *
+     * {@link http://www.di-mgt.com.au/cryptopad.html http://www.di-mgt.com.au/cryptopad.html}
+     *
+     * An alternative to padding is to, separately, send the length of the file.  This is what SSH, in fact, does.
+     * strlen($plaintext) will still need to be a multiple of the block size, however, arbitrary values can be added to make it that
+     * length.
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @see Crypt_Base::decrypt()
+     * @access public
+     * @param String $plaintext
+     * @return String $cipertext
+     */
+    function encrypt($plaintext)
+    {
+        if ($this->engine == CRYPT_MODE_MCRYPT) {
+            if ($this->changed) {
+                $this->_setupMcrypt();
+                $this->changed = false;
+            }
+            if ($this->enchanged) {
+                mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
+                $this->enchanged = false;
+            }
+
+            // re: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
+            // using mcrypt's default handing of CFB the above would output two different things.  using phpseclib's
+            // rewritten CFB implementation the above outputs the same thing twice.
+            if ($this->mode == CRYPT_MODE_CFB && $this->continuousBuffer) {
+                $block_size = $this->block_size;
+                $iv = &$this->encryptIV;
+                $pos = &$this->enbuffer['pos'];
+                $len = strlen($plaintext);
+                $ciphertext = '';
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len-= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos+= $len;
+                        $len = 0;
+                    }
+                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+                    $this->enbuffer['enmcrypt_init'] = true;
+                }
+                if ($len >= $block_size) {
+                    if ($this->enbuffer['enmcrypt_init'] === false || $len > $this->cfb_init_len) {
+                        if ($this->enbuffer['enmcrypt_init'] === true) {
+                            mcrypt_generic_init($this->enmcrypt, $this->key, $iv);
+                            $this->enbuffer['enmcrypt_init'] = false;
+                        }
+                        $ciphertext.= mcrypt_generic($this->enmcrypt, substr($plaintext, $i, $len - $len % $block_size));
+                        $iv = substr($ciphertext, -$block_size);
+                        $len%= $block_size;
+                    } else {
+                        while ($len >= $block_size) {
+                            $iv = mcrypt_generic($this->ecb, $iv) ^ substr($plaintext, $i, $block_size);
+                            $ciphertext.= $iv;
+                            $len-= $block_size;
+                            $i+= $block_size;
+                        }
+                    }
+                }
+
+                if ($len) {
+                    $iv = mcrypt_generic($this->ecb, $iv);
+                    $block = $iv ^ substr($plaintext, -$len);
+                    $iv = substr_replace($iv, $block, 0, $len);
+                    $ciphertext.= $block;
+                    $pos = $len;
+                }
+
+                return $ciphertext;
+            }
+
+            if ($this->paddable) {
+                $plaintext = $this->_pad($plaintext);
+            }
+
+            $ciphertext = mcrypt_generic($this->enmcrypt, $plaintext);
+
+            if (!$this->continuousBuffer) {
+                mcrypt_generic_init($this->enmcrypt, $this->key, $this->encryptIV);
+            }
+
+            return $ciphertext;
+        }
+
+        if ($this->changed) {
+            $this->_setup();
+            $this->changed = false;
+        }
+        if ($this->use_inline_crypt) {
+            $inline = $this->inline_crypt;
+            return $inline('encrypt', $this, $plaintext);
+        }
+        if ($this->paddable) {
+            $plaintext = $this->_pad($plaintext);
+        }
+
+        $buffer = &$this->enbuffer;
+        $block_size = $this->block_size;
+        $ciphertext = '';
+        switch ($this->mode) {
+            case CRYPT_MODE_ECB:
+                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    $ciphertext.= $this->_encryptBlock(substr($plaintext, $i, $block_size));
+                }
+                break;
+            case CRYPT_MODE_CBC:
+                $xor = $this->encryptIV;
+                for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                    $block = substr($plaintext, $i, $block_size);
+                    $block = $this->_encryptBlock($block ^ $xor);
+                    $xor = $block;
+                    $ciphertext.= $block;
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                }
+                break;
+            case CRYPT_MODE_CTR:
+                $xor = $this->encryptIV;
+                if (strlen($buffer['encrypted'])) {
+                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['encrypted'])) {
+                            $buffer['encrypted'].= $this->_encryptBlock($this->_generateXor($xor, $block_size));
+                        }
+                        $key = $this->_stringShift($buffer['encrypted'], $block_size);
+                        $ciphertext.= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        $key = $this->_encryptBlock($this->_generateXor($xor, $block_size));
+                        $ciphertext.= $block ^ $key;
+                    }
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                    if ($start = strlen($plaintext) % $block_size) {
+                        $buffer['encrypted'] = substr($key, $start) . $buffer['encrypted'];
+                    }
+                }
+                break;
+            case CRYPT_MODE_CFB:
+                // cfb loosely routines inspired by openssl's:
+                // {@link http://cvs.openssl.org/fileview?f=openssl/crypto/modes/cfb128.c&v=1.3.2.2.2.1}
+                if ($this->continuousBuffer) {
+                    $iv = &$this->encryptIV;
+                    $pos = &$buffer['pos'];
+                } else {
+                    $iv = $this->encryptIV;
+                    $pos = 0;
+                }
+                $len = strlen($plaintext);
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len-= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos+= $len;
+                        $len = 0;
+                    }
+                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                    $ciphertext = substr($iv, $orig_pos) ^ $plaintext;
+                    $iv = substr_replace($iv, $ciphertext, $orig_pos, $i);
+                }
+                while ($len >= $block_size) {
+                    $iv = $this->_encryptBlock($iv) ^ substr($plaintext, $i, $block_size);
+                    $ciphertext.= $iv;
+                    $len-= $block_size;
+                    $i+= $block_size;
+                }
+                if ($len) {
+                    $iv = $this->_encryptBlock($iv);
+                    $block = $iv ^ substr($plaintext, $i);
+                    $iv = substr_replace($iv, $block, 0, $len);
+                    $ciphertext.= $block;
+                    $pos = $len;
+                }
+                break;
+            case CRYPT_MODE_OFB:
+                $xor = $this->encryptIV;
+                if (strlen($buffer['xor'])) {
+                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                        $block = substr($plaintext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['xor'])) {
+                            $xor = $this->_encryptBlock($xor);
+                            $buffer['xor'].= $xor;
+                        }
+                        $key = $this->_stringShift($buffer['xor'], $block_size);
+                        $ciphertext.= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($plaintext); $i+=$block_size) {
+                        $xor = $this->_encryptBlock($xor);
+                        $ciphertext.= substr($plaintext, $i, $block_size) ^ $xor;
+                    }
+                    $key = $xor;
+                }
+                if ($this->continuousBuffer) {
+                    $this->encryptIV = $xor;
+                    if ($start = strlen($plaintext) % $block_size) {
+                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                    }
+                }
+                break;
+            case CRYPT_MODE_STREAM:
+                $ciphertext = $this->_encryptBlock($plaintext);
+                break;
+        }
+
+        return $ciphertext;
+    }
+
+    /**
+     * Decrypts a message.
+     *
+     * If strlen($ciphertext) is not a multiple of the block size, null bytes will be added to the end of the string until
+     * it is.
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @see Crypt_Base::encrypt()
+     * @access public
+     * @param String $ciphertext
+     * @return String $plaintext
+     */
+    function decrypt($ciphertext)
+    {
+        if ($this->engine == CRYPT_MODE_MCRYPT) {
+            $block_size = $this->block_size;
+            if ($this->changed) {
+                $this->_setupMcrypt();
+                $this->changed = false;
+            }
+            if ($this->dechanged) {
+                mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
+                $this->dechanged = false;
+            }
+
+            if ($this->mode == CRYPT_MODE_CFB && $this->continuousBuffer) {
+                $iv = &$this->decryptIV;
+                $pos = &$this->debuffer['pos'];
+                $len = strlen($ciphertext);
+                $plaintext = '';
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len-= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos+= $len;
+                        $len = 0;
+                    }
+                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+                }
+                if ($len >= $block_size) {
+                    $cb = substr($ciphertext, $i, $len - $len % $block_size);
+                    $plaintext.= mcrypt_generic($this->ecb, $iv . $cb) ^ $cb;
+                    $iv = substr($cb, -$block_size);
+                    $len%= $block_size;
+                }
+                if ($len) {
+                    $iv = mcrypt_generic($this->ecb, $iv);
+                    $plaintext.= $iv ^ substr($ciphertext, -$len);
+                    $iv = substr_replace($iv, substr($ciphertext, -$len), 0, $len);
+                    $pos = $len;
+                }
+
+                return $plaintext;
+            }
+
+            if ($this->paddable) {
+                // we pad with chr(0) since that's what mcrypt_generic does.  to quote from {@link http://www.php.net/function.mcrypt-generic}:
+                // "The data is padded with "\0" to make sure the length of the data is n * blocksize."
+                $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($block_size - strlen($ciphertext) % $block_size) % $block_size, chr(0));
+            }
+
+            $plaintext = mdecrypt_generic($this->demcrypt, $ciphertext);
+
+            if (!$this->continuousBuffer) {
+                mcrypt_generic_init($this->demcrypt, $this->key, $this->decryptIV);
+            }
+
+            return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+        }
+
+        if ($this->changed) {
+            $this->_setup();
+            $this->changed = false;
+        }
+        if ($this->use_inline_crypt) {
+            $inline = $this->inline_crypt;
+            return $inline('decrypt', $this, $ciphertext);
+        }
+
+        $block_size = $this->block_size;
+        if ($this->paddable) {
+            // we pad with chr(0) since that's what mcrypt_generic does [...]
+            $ciphertext = str_pad($ciphertext, strlen($ciphertext) + ($block_size - strlen($ciphertext) % $block_size) % $block_size, chr(0));
+        }
+
+        $buffer = &$this->debuffer;
+        $plaintext = '';
+        switch ($this->mode) {
+            case CRYPT_MODE_ECB:
+                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    $plaintext.= $this->_decryptBlock(substr($ciphertext, $i, $block_size));
+                }
+                break;
+            case CRYPT_MODE_CBC:
+                $xor = $this->decryptIV;
+                for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                    $block = substr($ciphertext, $i, $block_size);
+                    $plaintext.= $this->_decryptBlock($block) ^ $xor;
+                    $xor = $block;
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                }
+                break;
+            case CRYPT_MODE_CTR:
+                $xor = $this->decryptIV;
+                if (strlen($buffer['ciphertext'])) {
+                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['ciphertext'])) {
+                            $buffer['ciphertext'].= $this->_encryptBlock($this->_generateXor($xor, $block_size));
+                        }
+                        $key = $this->_stringShift($buffer['ciphertext'], $block_size);
+                        $plaintext.= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        $key = $this->_encryptBlock($this->_generateXor($xor, $block_size));
+                        $plaintext.= $block ^ $key;
+                    }
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                    if ($start = strlen($ciphertext) % $block_size) {
+                        $buffer['ciphertext'] = substr($key, $start) . $buffer['ciphertext'];
+                    }
+                }
+                break;
+            case CRYPT_MODE_CFB:
+                if ($this->continuousBuffer) {
+                    $iv = &$this->decryptIV;
+                    $pos = &$buffer['pos'];
+                } else {
+                    $iv = $this->decryptIV;
+                    $pos = 0;
+                }
+                $len = strlen($ciphertext);
+                $i = 0;
+                if ($pos) {
+                    $orig_pos = $pos;
+                    $max = $block_size - $pos;
+                    if ($len >= $max) {
+                        $i = $max;
+                        $len-= $max;
+                        $pos = 0;
+                    } else {
+                        $i = $len;
+                        $pos+= $len;
+                        $len = 0;
+                    }
+                    // ie. $i = min($max, $len), $len-= $i, $pos+= $i, $pos%= $blocksize
+                    $plaintext = substr($iv, $orig_pos) ^ $ciphertext;
+                    $iv = substr_replace($iv, substr($ciphertext, 0, $i), $orig_pos, $i);
+                }
+                while ($len >= $block_size) {
+                    $iv = $this->_encryptBlock($iv);
+                    $cb = substr($ciphertext, $i, $block_size);
+                    $plaintext.= $iv ^ $cb;
+                    $iv = $cb;
+                    $len-= $block_size;
+                    $i+= $block_size;
+                }
+                if ($len) {
+                    $iv = $this->_encryptBlock($iv);
+                    $plaintext.= $iv ^ substr($ciphertext, $i);
+                    $iv = substr_replace($iv, substr($ciphertext, $i), 0, $len);
+                    $pos = $len;
+                }
+                break;
+            case CRYPT_MODE_OFB:
+                $xor = $this->decryptIV;
+                if (strlen($buffer['xor'])) {
+                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                        $block = substr($ciphertext, $i, $block_size);
+                        if (strlen($block) > strlen($buffer['xor'])) {
+                            $xor = $this->_encryptBlock($xor);
+                            $buffer['xor'].= $xor;
+                        }
+                        $key = $this->_stringShift($buffer['xor'], $block_size);
+                        $plaintext.= $block ^ $key;
+                    }
+                } else {
+                    for ($i = 0; $i < strlen($ciphertext); $i+=$block_size) {
+                        $xor = $this->_encryptBlock($xor);
+                        $plaintext.= substr($ciphertext, $i, $block_size) ^ $xor;
+                    }
+                    $key = $xor;
+                }
+                if ($this->continuousBuffer) {
+                    $this->decryptIV = $xor;
+                    if ($start = strlen($ciphertext) % $block_size) {
+                         $buffer['xor'] = substr($key, $start) . $buffer['xor'];
+                    }
+                }
+                break;
+            case CRYPT_MODE_STREAM:
+                $plaintext = $this->_decryptBlock($ciphertext);
+                break;
+        }
+        return $this->paddable ? $this->_unpad($plaintext) : $plaintext;
+    }
+
+    /**
+     * Pad "packets".
+     *
+     * Block ciphers working by encrypting between their specified [$this->]block_size at a time
+     * If you ever need to encrypt or decrypt something that isn't of the proper length, it becomes necessary to
+     * pad the input so that it is of the proper length.
+     *
+     * Padding is enabled by default.  Sometimes, however, it is undesirable to pad strings.  Such is the case in SSH,
+     * where "packets" are padded with random bytes before being encrypted.  Unpad these packets and you risk stripping
+     * away characters that shouldn't be stripped away. (SSH knows how many bytes are added because the length is
+     * transmitted separately)
+     *
+     * @see Crypt_Base::disablePadding()
+     * @access public
+     */
+    function enablePadding()
+    {
+        $this->padding = true;
+    }
+
+    /**
+     * Do not pad packets.
+     *
+     * @see Crypt_Base::enablePadding()
+     * @access public
+     */
+    function disablePadding()
+    {
+        $this->padding = false;
+    }
+
+    /**
+     * Treat consecutive "packets" as if they are a continuous buffer.
+     *
+     * Say you have a 32-byte plaintext $plaintext.  Using the default behavior, the two following code snippets
+     * will yield different outputs:
+     *
+     * 
+     *    echo $rijndael->encrypt(substr($plaintext,  0, 16));
+     *    echo $rijndael->encrypt(substr($plaintext, 16, 16));
+     * 
+     * 
+     *    echo $rijndael->encrypt($plaintext);
+     * 
+     *
+     * The solution is to enable the continuous buffer.  Although this will resolve the above discrepancy, it creates
+     * another, as demonstrated with the following:
+     *
+     * 
+     *    $rijndael->encrypt(substr($plaintext, 0, 16));
+     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
+     * 
+     * 
+     *    echo $rijndael->decrypt($rijndael->encrypt(substr($plaintext, 16, 16)));
+     * 
+     *
+     * With the continuous buffer disabled, these would yield the same output.  With it enabled, they yield different
+     * outputs.  The reason is due to the fact that the initialization vector's change after every encryption /
+     * decryption round when the continuous buffer is enabled.  When it's disabled, they remain constant.
+     *
+     * Put another way, when the continuous buffer is enabled, the state of the Crypt_*() object changes after each
+     * encryption / decryption round, whereas otherwise, it'd remain constant.  For this reason, it's recommended that
+     * continuous buffers not be used.  They do offer better security and are, in fact, sometimes required (SSH uses them),
+     * however, they are also less intuitive and more likely to cause you problems.
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @see Crypt_Base::disableContinuousBuffer()
+     * @access public
+     */
+    function enableContinuousBuffer()
+    {
+        if ($this->mode == CRYPT_MODE_ECB) {
+            return;
+        }
+
+        $this->continuousBuffer = true;
+    }
+
+    /**
+     * Treat consecutive packets as if they are a discontinuous buffer.
+     *
+     * The default behavior.
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @see Crypt_Base::enableContinuousBuffer()
+     * @access public
+     */
+    function disableContinuousBuffer()
+    {
+        if ($this->mode == CRYPT_MODE_ECB) {
+            return;
+        }
+        if (!$this->continuousBuffer) {
+            return;
+        }
+
+        $this->continuousBuffer = false;
+        $this->changed = true;
+    }
+
+    /**
+     * Encrypts a block
+     *
+     * Note: Must extend by the child Crypt_* class
+     *
+     * @access private
+     * @param String $in
+     * @return String
+     */
+    function _encryptBlock($in)
+    {
+        user_error((version_compare(PHP_VERSION, '5.0.0', '>=')  ? __METHOD__ : __FUNCTION__)  . '() must extend by class ' . get_class($this), E_USER_ERROR);
+    }
+
+    /**
+     * Decrypts a block
+     *
+     * Note: Must extend by the child Crypt_* class
+     *
+     * @access private
+     * @param String $in
+     * @return String
+     */
+    function _decryptBlock($in)
+    {
+        user_error((version_compare(PHP_VERSION, '5.0.0', '>=')  ? __METHOD__ : __FUNCTION__)  . '() must extend by class ' . get_class($this), E_USER_ERROR);
+    }
+
+    /**
+     * Setup the key (expansion)
+     *
+     * Only used if $engine == CRYPT_MODE_INTERNAL
+     *
+     * Note: Must extend by the child Crypt_* class
+     *
+     * @see Crypt_Base::_setup()
+     * @access private
+     */
+    function _setupKey()
+    {
+        user_error((version_compare(PHP_VERSION, '5.0.0', '>=')  ? __METHOD__ : __FUNCTION__)  . '() must extend by class ' . get_class($this), E_USER_ERROR);
+    }
+
+    /**
+     * Setup the CRYPT_MODE_INTERNAL $engine
+     *
+     * (re)init, if necessary, the internal cipher $engine and flush all $buffers
+     * Used (only) if $engine == CRYPT_MODE_INTERNAL
+     *
+     * _setup() will be called each time if $changed === true
+     * typically this happens when using one or more of following public methods:
+     *
+     * - setKey()
+     *
+     * - setIV()
+     *
+     * - disableContinuousBuffer()
+     *
+     * - First run of encrypt() / decrypt() with no init-settings
+     *
+     * Internally: _setup() is called always before(!) en/decryption.
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @see setKey()
+     * @see setIV()
+     * @see disableContinuousBuffer()
+     * @access private
+     */
+    function _setup()
+    {
+        $this->_clearBuffers();
+        $this->_setupKey();
+
+        if ($this->use_inline_crypt) {
+            $this->_setupInlineCrypt();
+        }
+    }
+
+    /**
+     * Setup the CRYPT_MODE_MCRYPT $engine
+     *
+     * (re)init, if necessary, the (ext)mcrypt resources and flush all $buffers
+     * Used (only) if $engine = CRYPT_MODE_MCRYPT
+     *
+     * _setupMcrypt() will be called each time if $changed === true
+     * typically this happens when using one or more of following public methods:
+     *
+     * - setKey()
+     *
+     * - setIV()
+     *
+     * - disableContinuousBuffer()
+     *
+     * - First run of encrypt() / decrypt()
+     *
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @see setKey()
+     * @see setIV()
+     * @see disableContinuousBuffer()
+     * @access private
+     */
+    function _setupMcrypt()
+    {
+        $this->_clearBuffers();
+        $this->enchanged = $this->dechanged = true;
+
+        if (!isset($this->enmcrypt)) {
+            static $mcrypt_modes = array(
+                CRYPT_MODE_CTR    => 'ctr',
+                CRYPT_MODE_ECB    => MCRYPT_MODE_ECB,
+                CRYPT_MODE_CBC    => MCRYPT_MODE_CBC,
+                CRYPT_MODE_CFB    => 'ncfb',
+                CRYPT_MODE_OFB    => MCRYPT_MODE_NOFB,
+                CRYPT_MODE_STREAM => MCRYPT_MODE_STREAM,
+            );
+
+            $this->demcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
+            $this->enmcrypt = mcrypt_module_open($this->cipher_name_mcrypt, '', $mcrypt_modes[$this->mode], '');
+
+            // we need the $ecb mcrypt resource (only) in MODE_CFB with enableContinuousBuffer()
+            // to workaround mcrypt's broken ncfb implementation in buffered mode
+            // see: {@link http://phpseclib.sourceforge.net/cfb-demo.phps}
+            if ($this->mode == CRYPT_MODE_CFB) {
+                $this->ecb = mcrypt_module_open($this->cipher_name_mcrypt, '', MCRYPT_MODE_ECB, '');
+            }
+
+        } // else should mcrypt_generic_deinit be called?
+
+        if ($this->mode == CRYPT_MODE_CFB) {
+            mcrypt_generic_init($this->ecb, $this->key, str_repeat("\0", $this->block_size));
+        }
+    }
+
+    /**
+     * Pads a string
+     *
+     * Pads a string using the RSA PKCS padding standards so that its length is a multiple of the blocksize.
+     * $this->block_size - (strlen($text) % $this->block_size) bytes are added, each of which is equal to
+     * chr($this->block_size - (strlen($text) % $this->block_size)
+     *
+     * If padding is disabled and $text is not a multiple of the blocksize, the string will be padded regardless
+     * and padding will, hence forth, be enabled.
+     *
+     * @see Crypt_Base::_unpad()
+     * @param String $text
+     * @access private
+     * @return String
+     */
+    function _pad($text)
+    {
+        $length = strlen($text);
+
+        if (!$this->padding) {
+            if ($length % $this->block_size == 0) {
+                return $text;
+            } else {
+                user_error("The plaintext's length ($length) is not a multiple of the block size ({$this->block_size})");
+                $this->padding = true;
+            }
+        }
+
+        $pad = $this->block_size - ($length % $this->block_size);
+
+        return str_pad($text, $length + $pad, chr($pad));
+    }
+
+    /**
+     * Unpads a string.
+     *
+     * If padding is enabled and the reported padding length is invalid the encryption key will be assumed to be wrong
+     * and false will be returned.
+     *
+     * @see Crypt_Base::_pad()
+     * @param String $text
+     * @access private
+     * @return String
+     */
+    function _unpad($text)
+    {
+        if (!$this->padding) {
+            return $text;
+        }
+
+        $length = ord($text[strlen($text) - 1]);
+
+        if (!$length || $length > $this->block_size) {
+            return false;
+        }
+
+        return substr($text, 0, -$length);
+    }
+
+    /**
+     * Clears internal buffers
+     *
+     * Clearing/resetting the internal buffers is done everytime
+     * after disableContinuousBuffer() or on cipher $engine (re)init
+     * ie after setKey() or setIV()
+     *
+     * Note: Could, but not must, extend by the child Crypt_* class
+     *
+     * @access public
+     */
+    function _clearBuffers()
+    {
+        $this->enbuffer = array('encrypted'  => '', 'xor' => '', 'pos' => 0, 'enmcrypt_init' => true);
+        $this->debuffer = array('ciphertext' => '', 'xor' => '', 'pos' => 0, 'demcrypt_init' => true);
+
+        // mcrypt's handling of invalid's $iv:
+        // $this->encryptIV = $this->decryptIV = strlen($this->iv) == $this->block_size ? $this->iv : str_repeat("\0", $this->block_size);
+        $this->encryptIV = $this->decryptIV = str_pad(substr($this->iv, 0, $this->block_size), $this->block_size, "\0");
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param String $string
+     * @param optional Integer $index
+     * @access private
+     * @return String
+     */
+    function _stringShift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+
+    /**
+     * Generate CTR XOR encryption key
+     *
+     * Encrypt the output of this and XOR it against the ciphertext / plaintext to get the
+     * plaintext / ciphertext in CTR mode.
+     *
+     * @see Crypt_Base::decrypt()
+     * @see Crypt_Base::encrypt()
+     * @param String $iv
+     * @param Integer $length
+     * @access private
+     * @return String $xor
+     */
+    function _generateXor(&$iv, $length)
+    {
+        $xor = '';
+        $block_size = $this->block_size;
+        $num_blocks = floor(($length + ($block_size - 1)) / $block_size);
+        for ($i = 0; $i < $num_blocks; $i++) {
+            $xor.= $iv;
+            for ($j = 4; $j <= $block_size; $j+= 4) {
+                $temp = substr($iv, -$j, 4);
+                switch ($temp) {
+                    case "\xFF\xFF\xFF\xFF":
+                        $iv = substr_replace($iv, "\x00\x00\x00\x00", -$j, 4);
+                        break;
+                    case "\x7F\xFF\xFF\xFF":
+                        $iv = substr_replace($iv, "\x80\x00\x00\x00", -$j, 4);
+                        break 2;
+                    default:
+                        extract(unpack('Ncount', $temp));
+                        $iv = substr_replace($iv, pack('N', $count + 1), -$j, 4);
+                        break 2;
+                }
+            }
+        }
+
+        return $xor;
+    }
+
+    /**
+     * Setup the performance-optimized function for de/encrypt()
+     *
+     * Stores the created (or existing) callback function-name
+     * in $this->inline_crypt
+     *
+     * Internally for phpseclib developers:
+     *
+     *     _setupInlineCrypt() would be called only if:
+     *
+     *     - $engine == CRYPT_MODE_INTERNAL and
+     *
+     *     - $use_inline_crypt === true
+     *
+     *     - each time on _setup(), after(!) _setupKey()
+     *
+     *
+     *     This ensures that _setupInlineCrypt() has allways a
+     *     full ready2go initializated internal cipher $engine state
+     *     where, for example, the keys allready expanded,
+     *     keys/block_size calculated and such.
+     *
+     *     It is, each time if called, the responsibility of _setupInlineCrypt():
+     *
+     *     - to set $this->inline_crypt to a valid and fully working callback function
+     *       as a (faster) replacement for encrypt() / decrypt()
+     *
+     *     - NOT to create unlimited callback functions (for memory reasons!)
+     *       no matter how often _setupInlineCrypt() would be called. At some
+     *       point of amount they must be generic re-useable.
+     *
+     *     - the code of _setupInlineCrypt() it self,
+     *       and the generated callback code,
+     *       must be, in following order:
+     *       - 100% safe
+     *       - 100% compatible to encrypt()/decrypt()
+     *       - using only php5+ features/lang-constructs/php-extensions if
+     *         compatibility (down to php4) or fallback is provided
+     *       - readable/maintainable/understandable/commented and... not-cryptic-styled-code :-)
+     *       - >= 10% faster than encrypt()/decrypt() [which is, by the way,
+     *         the reason for the existence of _setupInlineCrypt() :-)]
+     *       - memory-nice
+     *       - short (as good as possible)
+     *
+     * Note: - _setupInlineCrypt() is using _createInlineCryptFunction() to create the full callback function code.
+     *       - In case of using inline crypting, _setupInlineCrypt() must extend by the child Crypt_* class.
+     *       - The following variable names are reserved:
+     *         - $_*  (all variable names prefixed with an underscore)
+     *         - $self (object reference to it self. Do not use $this, but $self instead)
+     *         - $in (the content of $in has to en/decrypt by the generated code)
+     *       - The callback function should not use the 'return' statement, but en/decrypt'ing the content of $in only
+     *
+     *
+     * @see Crypt_Base::_setup()
+     * @see Crypt_Base::_createInlineCryptFunction()
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::decrypt()
+     * @access private
+     */
+    function _setupInlineCrypt()
+    {
+        // If a Crypt_* class providing inline crypting it must extend _setupInlineCrypt()
+
+        // If, for any reason, an extending Crypt_Base() Crypt_* class
+        // not using inline crypting then it must be ensured that: $this->use_inline_crypt = false
+        // ie in the class var declaration of $use_inline_crypt in general for the Crypt_* class,
+        // in the constructor at object instance-time
+        // or, if it's runtime-specific, at runtime
+
+        $this->use_inline_crypt = false;
+    }
+
+    /**
+     * Creates the performance-optimized function for en/decrypt()
+     *
+     * Internally for phpseclib developers:
+     *
+     *    _createInlineCryptFunction():
+     *
+     *    - merge the $cipher_code [setup'ed by _setupInlineCrypt()]
+     *      with the current [$this->]mode of operation code
+     *
+     *    - create the $inline function, which called by encrypt() / decrypt()
+     *      as its replacement to speed up the en/decryption operations.
+     *
+     *    - return the name of the created $inline callback function
+     *
+     *    - used to speed up en/decryption
+     *
+     *
+     *
+     *    The main reason why can speed up things [up to 50%] this way are:
+     *
+     *    - using variables more effective then regular.
+     *      (ie no use of expensive arrays but integers $k_0, $k_1 ...
+     *      or even, for example, the pure $key[] values hardcoded)
+     *
+     *    - avoiding 1000's of function calls of ie _encryptBlock()
+     *      but inlining the crypt operations.
+     *      in the mode of operation for() loop.
+     *
+     *    - full loop unroll the (sometimes key-dependent) rounds
+     *      avoiding this way ++$i counters and runtime-if's etc...
+     *
+     *    The basic code architectur of the generated $inline en/decrypt()
+     *    lambda function, in pseudo php, is:
+     *
+     *    
+     *    +----------------------------------------------------------------------------------------------+
+     *    | callback $inline = create_function:                                                          |
+     *    | lambda_function_0001_crypt_ECB($action, $text)                                               |
+     *    | {                                                                                            |
+     *    |     INSERT PHP CODE OF:                                                                      |
+     *    |     $cipher_code['init_crypt'];                  // general init code.                       |
+     *    |                                                  // ie: $sbox'es declarations used for       |
+     *    |                                                  //     encrypt and decrypt'ing.             |
+     *    |                                                                                              |
+     *    |     switch ($action) {                                                                       |
+     *    |         case 'encrypt':                                                                      |
+     *    |             INSERT PHP CODE OF:                                                              |
+     *    |             $cipher_code['init_encrypt'];       // encrypt sepcific init code.               |
+     *    |                                                    ie: specified $key or $box                |
+     *    |                                                        declarations for encrypt'ing.         |
+     *    |                                                                                              |
+     *    |             foreach ($ciphertext) {                                                          |
+     *    |                 $in = $block_size of $ciphertext;                                            |
+     *    |                                                                                              |
+     *    |                 INSERT PHP CODE OF:                                                          |
+     *    |                 $cipher_code['encrypt_block'];  // encrypt's (string) $in, which is always:  |
+     *    |                                                 // strlen($in) == $this->block_size          |
+     *    |                                                 // here comes the cipher algorithm in action |
+     *    |                                                 // for encryption.                           |
+     *    |                                                 // $cipher_code['encrypt_block'] has to      |
+     *    |                                                 // encrypt the content of the $in variable   |
+     *    |                                                                                              |
+     *    |                 $plaintext .= $in;                                                           |
+     *    |             }                                                                                |
+     *    |             return $plaintext;                                                               |
+     *    |                                                                                              |
+     *    |         case 'decrypt':                                                                      |
+     *    |             INSERT PHP CODE OF:                                                              |
+     *    |             $cipher_code['init_decrypt'];       // decrypt sepcific init code                |
+     *    |                                                    ie: specified $key or $box                |
+     *    |                                                        declarations for decrypt'ing.         |
+     *    |             foreach ($plaintext) {                                                           |
+     *    |                 $in = $block_size of $plaintext;                                             |
+     *    |                                                                                              |
+     *    |                 INSERT PHP CODE OF:                                                          |
+     *    |                 $cipher_code['decrypt_block'];  // decrypt's (string) $in, which is always   |
+     *    |                                                 // strlen($in) == $this->block_size          |
+     *    |                                                 // here comes the cipher algorithm in action |
+     *    |                                                 // for decryption.                           |
+     *    |                                                 // $cipher_code['decrypt_block'] has to      |
+     *    |                                                 // decrypt the content of the $in variable   |
+     *    |                 $ciphertext .= $in;                                                          |
+     *    |             }                                                                                |
+     *    |             return $ciphertext;                                                              |
+     *    |     }                                                                                        |
+     *    | }                                                                                            |
+     *    +----------------------------------------------------------------------------------------------+
+     *    
+     *
+     *    See also the Crypt_*::_setupInlineCrypt()'s for
+     *    productive inline $cipher_code's how they works.
+     *
+     *    Structure of:
+     *    
+     *    $cipher_code = array(
+     *        'init_crypt'    => (string) '', // optional
+     *        'init_encrypt'  => (string) '', // optional
+     *        'init_decrypt'  => (string) '', // optional
+     *        'encrypt_block' => (string) '', // required
+     *        'decrypt_block' => (string) ''  // required
+     *    );
+     *    
+     *
+     * @see Crypt_Base::_setupInlineCrypt()
+     * @see Crypt_Base::encrypt()
+     * @see Crypt_Base::decrypt()
+     * @param Array $cipher_code
+     * @access private
+     * @return String (the name of the created callback function)
+     */
+    function _createInlineCryptFunction($cipher_code)
+    {
+        $block_size = $this->block_size;
+
+        // optional
+        $init_crypt    = isset($cipher_code['init_crypt'])    ? $cipher_code['init_crypt']    : '';
+        $init_encrypt  = isset($cipher_code['init_encrypt'])  ? $cipher_code['init_encrypt']  : '';
+        $init_decrypt  = isset($cipher_code['init_decrypt'])  ? $cipher_code['init_decrypt']  : '';
+        // required
+        $encrypt_block = $cipher_code['encrypt_block'];
+        $decrypt_block = $cipher_code['decrypt_block'];
+
+        // Generating mode of operation inline code,
+        // merged with the $cipher_code algorithm
+        // for encrypt- and decryption.
+        switch ($this->mode) {
+            case CRYPT_MODE_ECB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_text = $self->_pad($_text);
+                    $_plaintext_len = strlen($_text);
+
+                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                        $in = substr($_text, $_i, '.$block_size.');
+                        '.$encrypt_block.'
+                        $_ciphertext.= $in;
+                    }
+
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
+                    $_ciphertext_len = strlen($_text);
+
+                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                        $in = substr($_text, $_i, '.$block_size.');
+                        '.$decrypt_block.'
+                        $_plaintext.= $in;
+                    }
+
+                    return $self->_unpad($_plaintext);
+                    ';
+                break;
+            case CRYPT_MODE_CTR:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+                    $_xor = $self->encryptIV;
+                    $_buffer = &$self->enbuffer;
+
+                    if (strlen($_buffer["encrypted"])) {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["encrypted"])) {
+                                $in = $self->_generateXor($_xor, '.$block_size.');
+                                '.$encrypt_block.'
+                                $_buffer["encrypted"].= $in;
+                            }
+                            $_key = $self->_stringShift($_buffer["encrypted"], '.$block_size.');
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            $in = $self->_generateXor($_xor, '.$block_size.');
+                            '.$encrypt_block.'
+                            $_key = $in;
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    }
+                    if ($self->continuousBuffer) {
+                        $self->encryptIV = $_xor;
+                        if ($_start = $_plaintext_len % '.$block_size.') {
+                            $_buffer["encrypted"] = substr($_key, $_start) . $_buffer["encrypted"];
+                        }
+                    }
+
+                    return $_ciphertext;
+                ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_ciphertext_len = strlen($_text);
+                    $_xor = $self->decryptIV;
+                    $_buffer = &$self->debuffer;
+
+                    if (strlen($_buffer["ciphertext"])) {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["ciphertext"])) {
+                                $in = $self->_generateXor($_xor, '.$block_size.');
+                                '.$encrypt_block.'
+                                $_buffer["ciphertext"].= $in;
+                            }
+                            $_key = $self->_stringShift($_buffer["ciphertext"], '.$block_size.');
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            $in = $self->_generateXor($_xor, '.$block_size.');
+                            '.$encrypt_block.'
+                            $_key = $in;
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    }
+                    if ($self->continuousBuffer) {
+                        $self->decryptIV = $_xor;
+                        if ($_start = $_ciphertext_len % '.$block_size.') {
+                            $_buffer["ciphertext"] = substr($_key, $_start) . $_buffer["ciphertext"];
+                        }
+                    }
+
+                    return $_plaintext;
+                    ';
+                break;
+            case CRYPT_MODE_CFB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_buffer = &$self->enbuffer;
+
+                    if ($self->continuousBuffer) {
+                        $_iv = &$self->encryptIV;
+                        $_pos = &$_buffer["pos"];
+                    } else {
+                        $_iv = $self->encryptIV;
+                        $_pos = 0;
+                    }
+                    $_len = strlen($_text);
+                    $_i = 0;
+                    if ($_pos) {
+                        $_orig_pos = $_pos;
+                        $_max = '.$block_size.' - $_pos;
+                        if ($_len >= $_max) {
+                            $_i = $_max;
+                            $_len-= $_max;
+                            $_pos = 0;
+                        } else {
+                            $_i = $_len;
+                            $_pos+= $_len;
+                            $_len = 0;
+                        }
+                        $_ciphertext = substr($_iv, $_orig_pos) ^ $_text;
+                        $_iv = substr_replace($_iv, $_ciphertext, $_orig_pos, $_i);
+                    }
+                    while ($_len >= '.$block_size.') {
+                        $in = $_iv;
+                        '.$encrypt_block.';
+                        $_iv = $in ^ substr($_text, $_i, '.$block_size.');
+                        $_ciphertext.= $_iv;
+                        $_len-= '.$block_size.';
+                        $_i+= '.$block_size.';
+                    }
+                    if ($_len) {
+                        $in = $_iv;
+                        '.$encrypt_block.'
+                        $_iv = $in;
+                        $_block = $_iv ^ substr($_text, $_i);
+                        $_iv = substr_replace($_iv, $_block, 0, $_len);
+                        $_ciphertext.= $_block;
+                        $_pos = $_len;
+                    }
+                    return $_ciphertext;
+                ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_buffer = &$self->debuffer;
+
+                    if ($self->continuousBuffer) {
+                        $_iv = &$self->decryptIV;
+                        $_pos = &$_buffer["pos"];
+                    } else {
+                        $_iv = $self->decryptIV;
+                        $_pos = 0;
+                    }
+                    $_len = strlen($_text);
+                    $_i = 0;
+                    if ($_pos) {
+                        $_orig_pos = $_pos;
+                        $_max = '.$block_size.' - $_pos;
+                        if ($_len >= $_max) {
+                            $_i = $_max;
+                            $_len-= $_max;
+                            $_pos = 0;
+                        } else {
+                            $_i = $_len;
+                            $_pos+= $_len;
+                            $_len = 0;
+                        }
+                        $_plaintext = substr($_iv, $_orig_pos) ^ $_text;
+                        $_iv = substr_replace($_iv, substr($_text, 0, $_i), $_orig_pos, $_i);
+                    }
+                    while ($_len >= '.$block_size.') {
+                        $in = $_iv;
+                        '.$encrypt_block.'
+                        $_iv = $in;
+                        $cb = substr($_text, $_i, '.$block_size.');
+                        $_plaintext.= $_iv ^ $cb;
+                        $_iv = $cb;
+                        $_len-= '.$block_size.';
+                        $_i+= '.$block_size.';
+                    }
+                    if ($_len) {
+                        $in = $_iv;
+                        '.$encrypt_block.'
+                        $_iv = $in;
+                        $_plaintext.= $_iv ^ substr($_text, $_i);
+                        $_iv = substr_replace($_iv, substr($_text, $_i), 0, $_len);
+                        $_pos = $_len;
+                    }
+
+                    return $_plaintext;
+                    ';
+                break;
+            case CRYPT_MODE_OFB:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_plaintext_len = strlen($_text);
+                    $_xor = $self->encryptIV;
+                    $_buffer = &$self->enbuffer;
+
+                    if (strlen($_buffer["xor"])) {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["xor"])) {
+                                $in = $_xor;
+                                '.$encrypt_block.'
+                                $_xor = $in;
+                                $_buffer["xor"].= $_xor;
+                            }
+                            $_key = $self->_stringShift($_buffer["xor"], '.$block_size.');
+                            $_ciphertext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                            $in = $_xor;
+                            '.$encrypt_block.'
+                            $_xor = $in;
+                            $_ciphertext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
+                        }
+                        $_key = $_xor;
+                    }
+                    if ($self->continuousBuffer) {
+                        $self->encryptIV = $_xor;
+                        if ($_start = $_plaintext_len % '.$block_size.') {
+                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
+                        }
+                    }
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_encrypt . '
+                    $_plaintext = "";
+                    $_ciphertext_len = strlen($_text);
+                    $_xor = $self->decryptIV;
+                    $_buffer = &$self->debuffer;
+
+                    if (strlen($_buffer["xor"])) {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                            $_block = substr($_text, $_i, '.$block_size.');
+                            if (strlen($_block) > strlen($_buffer["xor"])) {
+                                $in = $_xor;
+                                '.$encrypt_block.'
+                                $_xor = $in;
+                                $_buffer["xor"].= $_xor;
+                            }
+                            $_key = $self->_stringShift($_buffer["xor"], '.$block_size.');
+                            $_plaintext.= $_block ^ $_key;
+                        }
+                    } else {
+                        for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                            $in = $_xor;
+                            '.$encrypt_block.'
+                            $_xor = $in;
+                            $_plaintext.= substr($_text, $_i, '.$block_size.') ^ $_xor;
+                        }
+                        $_key = $_xor;
+                    }
+                    if ($self->continuousBuffer) {
+                        $self->decryptIV = $_xor;
+                        if ($_start = $_ciphertext_len % '.$block_size.') {
+                             $_buffer["xor"] = substr($_key, $_start) . $_buffer["xor"];
+                        }
+                    }
+                    return $_plaintext;
+                    ';
+                break;
+            case CRYPT_MODE_STREAM:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    '.$encrypt_block.'
+                    return $_ciphertext;
+                    ';
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    '.$decrypt_block.'
+                    return $_plaintext;
+                    ';
+                break;
+            // case CRYPT_MODE_CBC:
+            default:
+                $encrypt = $init_encrypt . '
+                    $_ciphertext = "";
+                    $_text = $self->_pad($_text);
+                    $_plaintext_len = strlen($_text);
+
+                    $in = $self->encryptIV;
+
+                    for ($_i = 0; $_i < $_plaintext_len; $_i+= '.$block_size.') {
+                        $in = substr($_text, $_i, '.$block_size.') ^ $in;
+                        '.$encrypt_block.'
+                        $_ciphertext.= $in;
+                    }
+
+                    if ($self->continuousBuffer) {
+                        $self->encryptIV = $in;
+                    }
+
+                    return $_ciphertext;
+                    ';
+
+                $decrypt = $init_decrypt . '
+                    $_plaintext = "";
+                    $_text = str_pad($_text, strlen($_text) + ('.$block_size.' - strlen($_text) % '.$block_size.') % '.$block_size.', chr(0));
+                    $_ciphertext_len = strlen($_text);
+
+                    $_iv = $self->decryptIV;
+
+                    for ($_i = 0; $_i < $_ciphertext_len; $_i+= '.$block_size.') {
+                        $in = $_block = substr($_text, $_i, '.$block_size.');
+                        '.$decrypt_block.'
+                        $_plaintext.= $in ^ $_iv;
+                        $_iv = $_block;
+                    }
+
+                    if ($self->continuousBuffer) {
+                        $self->decryptIV = $_iv;
+                    }
+
+                    return $self->_unpad($_plaintext);
+                    ';
+                break;
+        }
+
+        // Create the $inline function and return its name as string. Ready to run!
+        return create_function('$_action, &$self, $_text', $init_crypt . 'if ($_action == "encrypt") { ' . $encrypt . ' } else { ' . $decrypt . ' }');
+    }
+
+    /**
+     * Holds the lambda_functions table (classwide)
+     *
+     * Each name of the lambda function, created from
+     * _setupInlineCrypt() && _createInlineCryptFunction()
+     * is stored, classwide (!), here for reusing.
+     *
+     * The string-based index of $function is a classwide
+     * uniqe value representing, at least, the $mode of
+     * operation (or more... depends of the optimizing level)
+     * for which $mode the lambda function was created.
+     *
+     * @access private
+     * @return &Array
+     */
+    function &_getLambdaFunctions()
+    {
+        static $functions = array();
+        return $functions;
+    }
+}
+
+// vim: ts=4:sw=4:et:
+// vim6: fdl=1:
diff --git a/sources/inc/phpseclib/Crypt_Hash.php b/sources/inc/phpseclib/Crypt_Hash.php
new file mode 100644
index 0000000..840fcd5
--- /dev/null
+++ b/sources/inc/phpseclib/Crypt_Hash.php
@@ -0,0 +1,823 @@
+
+ * setKey('abcdefg');
+ *
+ *    echo base64_encode($hash->hash('abcdefg'));
+ * ?>
+ * 
+ *
+ * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @category   Crypt
+ * @package    Crypt_Hash
+ * @author     Jim Wigginton 
+ * @copyright  MMVII Jim Wigginton
+ * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link       http://phpseclib.sourceforge.net
+ */
+
+/**#@+
+ * @access private
+ * @see Crypt_Hash::Crypt_Hash()
+ */
+/**
+ * Toggles the internal implementation
+ */
+define('CRYPT_HASH_MODE_INTERNAL', 1);
+/**
+ * Toggles the mhash() implementation, which has been deprecated on PHP 5.3.0+.
+ */
+define('CRYPT_HASH_MODE_MHASH',    2);
+/**
+ * Toggles the hash() implementation, which works on PHP 5.1.2+.
+ */
+define('CRYPT_HASH_MODE_HASH',     3);
+/**#@-*/
+
+/**
+ * Pure-PHP implementations of keyed-hash message authentication codes (HMACs) and various cryptographic hashing functions.
+ *
+ * @author  Jim Wigginton 
+ * @version 0.1.0
+ * @access  public
+ * @package Crypt_Hash
+ */
+class Crypt_Hash {
+    /**
+     * Byte-length of compression blocks / key (Internal HMAC)
+     *
+     * @see Crypt_Hash::setAlgorithm()
+     * @var Integer
+     * @access private
+     */
+    var $b;
+
+    /**
+     * Byte-length of hash output (Internal HMAC)
+     *
+     * @see Crypt_Hash::setHash()
+     * @var Integer
+     * @access private
+     */
+    var $l = false;
+
+    /**
+     * Hash Algorithm
+     *
+     * @see Crypt_Hash::setHash()
+     * @var String
+     * @access private
+     */
+    var $hash;
+
+    /**
+     * Key
+     *
+     * @see Crypt_Hash::setKey()
+     * @var String
+     * @access private
+     */
+    var $key = false;
+
+    /**
+     * Outer XOR (Internal HMAC)
+     *
+     * @see Crypt_Hash::setKey()
+     * @var String
+     * @access private
+     */
+    var $opad;
+
+    /**
+     * Inner XOR (Internal HMAC)
+     *
+     * @see Crypt_Hash::setKey()
+     * @var String
+     * @access private
+     */
+    var $ipad;
+
+    /**
+     * Default Constructor.
+     *
+     * @param optional String $hash
+     * @return Crypt_Hash
+     * @access public
+     */
+    function Crypt_Hash($hash = 'sha1')
+    {
+        if ( !defined('CRYPT_HASH_MODE') ) {
+            switch (true) {
+                case extension_loaded('hash'):
+                    define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_HASH);
+                    break;
+                case extension_loaded('mhash'):
+                    define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_MHASH);
+                    break;
+                default:
+                    define('CRYPT_HASH_MODE', CRYPT_HASH_MODE_INTERNAL);
+            }
+        }
+
+        $this->setHash($hash);
+    }
+
+    /**
+     * Sets the key for HMACs
+     *
+     * Keys can be of any length.
+     *
+     * @access public
+     * @param optional String $key
+     */
+    function setKey($key = false)
+    {
+        $this->key = $key;
+    }
+
+    /**
+     * Sets the hash function.
+     *
+     * @access public
+     * @param String $hash
+     */
+    function setHash($hash)
+    {
+        $hash = strtolower($hash);
+        switch ($hash) {
+            case 'md5-96':
+            case 'sha1-96':
+                $this->l = 12; // 96 / 8 = 12
+                break;
+            case 'md2':
+            case 'md5':
+                $this->l = 16;
+                break;
+            case 'sha1':
+                $this->l = 20;
+                break;
+            case 'sha256':
+                $this->l = 32;
+                break;
+            case 'sha384':
+                $this->l = 48;
+                break;
+            case 'sha512':
+                $this->l = 64;
+        }
+
+        switch ($hash) {
+            case 'md2':
+                $mode = CRYPT_HASH_MODE == CRYPT_HASH_MODE_HASH && in_array('md2', hash_algos()) ?
+                    CRYPT_HASH_MODE_HASH : CRYPT_HASH_MODE_INTERNAL;
+                break;
+            case 'sha384':
+            case 'sha512':
+                $mode = CRYPT_HASH_MODE == CRYPT_HASH_MODE_MHASH ? CRYPT_HASH_MODE_INTERNAL : CRYPT_HASH_MODE;
+                break;
+            default:
+                $mode = CRYPT_HASH_MODE;
+        }
+
+        switch ( $mode ) {
+            case CRYPT_HASH_MODE_MHASH:
+                switch ($hash) {
+                    case 'md5':
+                    case 'md5-96':
+                        $this->hash = MHASH_MD5;
+                        break;
+                    case 'sha256':
+                        $this->hash = MHASH_SHA256;
+                        break;
+                    case 'sha1':
+                    case 'sha1-96':
+                    default:
+                        $this->hash = MHASH_SHA1;
+                }
+                return;
+            case CRYPT_HASH_MODE_HASH:
+                switch ($hash) {
+                    case 'md5':
+                    case 'md5-96':
+                        $this->hash = 'md5';
+                        return;
+                    case 'md2':
+                    case 'sha256':
+                    case 'sha384':
+                    case 'sha512':
+                        $this->hash = $hash;
+                        return;
+                    case 'sha1':
+                    case 'sha1-96':
+                    default:
+                        $this->hash = 'sha1';
+                }
+                return;
+        }
+
+        switch ($hash) {
+            case 'md2':
+                 $this->b = 16;
+                 $this->hash = array($this, '_md2');
+                 break;
+            case 'md5':
+            case 'md5-96':
+                 $this->b = 64;
+                 $this->hash = array($this, '_md5');
+                 break;
+            case 'sha256':
+                 $this->b = 64;
+                 $this->hash = array($this, '_sha256');
+                 break;
+            case 'sha384':
+            case 'sha512':
+                 $this->b = 128;
+                 $this->hash = array($this, '_sha512');
+                 break;
+            case 'sha1':
+            case 'sha1-96':
+            default:
+                 $this->b = 64;
+                 $this->hash = array($this, '_sha1');
+        }
+
+        $this->ipad = str_repeat(chr(0x36), $this->b);
+        $this->opad = str_repeat(chr(0x5C), $this->b);
+    }
+
+    /**
+     * Compute the HMAC.
+     *
+     * @access public
+     * @param String $text
+     * @return String
+     */
+    function hash($text)
+    {
+        $mode = is_array($this->hash) ? CRYPT_HASH_MODE_INTERNAL : CRYPT_HASH_MODE;
+
+        if (!empty($this->key) || is_string($this->key)) {
+            switch ( $mode ) {
+                case CRYPT_HASH_MODE_MHASH:
+                    $output = mhash($this->hash, $text, $this->key);
+                    break;
+                case CRYPT_HASH_MODE_HASH:
+                    $output = hash_hmac($this->hash, $text, $this->key, true);
+                    break;
+                case CRYPT_HASH_MODE_INTERNAL:
+                    /* "Applications that use keys longer than B bytes will first hash the key using H and then use the
+                        resultant L byte string as the actual key to HMAC."
+
+                        -- http://tools.ietf.org/html/rfc2104#section-2 */
+                    $key = strlen($this->key) > $this->b ? call_user_func($this->hash, $this->key) : $this->key;
+
+                    $key    = str_pad($key, $this->b, chr(0));      // step 1
+                    $temp   = $this->ipad ^ $key;                   // step 2
+                    $temp  .= $text;                                // step 3
+                    $temp   = call_user_func($this->hash, $temp);   // step 4
+                    $output = $this->opad ^ $key;                   // step 5
+                    $output.= $temp;                                // step 6
+                    $output = call_user_func($this->hash, $output); // step 7
+            }
+        } else {
+            switch ( $mode ) {
+                case CRYPT_HASH_MODE_MHASH:
+                    $output = mhash($this->hash, $text);
+                    break;
+                case CRYPT_HASH_MODE_HASH:
+                    $output = hash($this->hash, $text, true);
+                    break;
+                case CRYPT_HASH_MODE_INTERNAL:
+                    $output = call_user_func($this->hash, $text);
+            }
+        }
+
+        return substr($output, 0, $this->l);
+    }
+
+    /**
+     * Returns the hash length (in bytes)
+     *
+     * @access public
+     * @return Integer
+     */
+    function getLength()
+    {
+        return $this->l;
+    }
+
+    /**
+     * Wrapper for MD5
+     *
+     * @access private
+     * @param String $m
+     */
+    function _md5($m)
+    {
+        return pack('H*', md5($m));
+    }
+
+    /**
+     * Wrapper for SHA1
+     *
+     * @access private
+     * @param String $m
+     */
+    function _sha1($m)
+    {
+        return pack('H*', sha1($m));
+    }
+
+    /**
+     * Pure-PHP implementation of MD2
+     *
+     * See {@link http://tools.ietf.org/html/rfc1319 RFC1319}.
+     *
+     * @access private
+     * @param String $m
+     */
+    function _md2($m)
+    {
+        static $s = array(
+             41,  46,  67, 201, 162, 216, 124,   1,  61,  54,  84, 161, 236, 240, 6,
+             19,  98, 167,   5, 243, 192, 199, 115, 140, 152, 147,  43, 217, 188,
+             76, 130, 202,  30, 155,  87,  60, 253, 212, 224,  22, 103,  66, 111, 24,
+            138,  23, 229,  18, 190,  78, 196, 214, 218, 158, 222,  73, 160, 251,
+            245, 142, 187,  47, 238, 122, 169, 104, 121, 145,  21, 178,   7,  63,
+            148, 194,  16, 137,  11,  34,  95,  33, 128, 127,  93, 154,  90, 144, 50,
+             39,  53,  62, 204, 231, 191, 247, 151,   3, 255,  25,  48, 179,  72, 165,
+            181, 209, 215,  94, 146,  42, 172,  86, 170, 198,  79, 184,  56, 210,
+            150, 164, 125, 182, 118, 252, 107, 226, 156, 116,   4, 241,  69, 157,
+            112,  89, 100, 113, 135,  32, 134,  91, 207, 101, 230,  45, 168,   2, 27,
+             96,  37, 173, 174, 176, 185, 246,  28,  70,  97, 105,  52,  64, 126, 15,
+             85,  71, 163,  35, 221,  81, 175,  58, 195,  92, 249, 206, 186, 197,
+            234,  38,  44,  83,  13, 110, 133,  40, 132,   9, 211, 223, 205, 244, 65,
+            129,  77,  82, 106, 220,  55, 200, 108, 193, 171, 250,  36, 225, 123,
+              8,  12, 189, 177,  74, 120, 136, 149, 139, 227,  99, 232, 109, 233,
+            203, 213, 254,  59,   0,  29,  57, 242, 239, 183,  14, 102,  88, 208, 228,
+            166, 119, 114, 248, 235, 117,  75,  10,  49,  68,  80, 180, 143, 237,
+             31,  26, 219, 153, 141,  51, 159,  17, 131, 20
+        );
+
+        // Step 1. Append Padding Bytes
+        $pad = 16 - (strlen($m) & 0xF);
+        $m.= str_repeat(chr($pad), $pad);
+
+        $length = strlen($m);
+
+        // Step 2. Append Checksum
+        $c = str_repeat(chr(0), 16);
+        $l = chr(0);
+        for ($i = 0; $i < $length; $i+= 16) {
+            for ($j = 0; $j < 16; $j++) {
+                // RFC1319 incorrectly states that C[j] should be set to S[c xor L]
+                //$c[$j] = chr($s[ord($m[$i + $j] ^ $l)]);
+                // per , however, C[j] should be set to S[c xor L] xor C[j]
+                $c[$j] = chr($s[ord($m[$i + $j] ^ $l)] ^ ord($c[$j]));
+                $l = $c[$j];
+            }
+        }
+        $m.= $c;
+
+        $length+= 16;
+
+        // Step 3. Initialize MD Buffer
+        $x = str_repeat(chr(0), 48);
+
+        // Step 4. Process Message in 16-Byte Blocks
+        for ($i = 0; $i < $length; $i+= 16) {
+            for ($j = 0; $j < 16; $j++) {
+                $x[$j + 16] = $m[$i + $j];
+                $x[$j + 32] = $x[$j + 16] ^ $x[$j];
+            }
+            $t = chr(0);
+            for ($j = 0; $j < 18; $j++) {
+                for ($k = 0; $k < 48; $k++) {
+                    $x[$k] = $t = $x[$k] ^ chr($s[ord($t)]);
+                    //$t = $x[$k] = $x[$k] ^ chr($s[ord($t)]);
+                }
+                $t = chr(ord($t) + $j);
+            }
+        }
+
+        // Step 5. Output
+        return substr($x, 0, 16);
+    }
+
+    /**
+     * Pure-PHP implementation of SHA256
+     *
+     * See {@link http://en.wikipedia.org/wiki/SHA_hash_functions#SHA-256_.28a_SHA-2_variant.29_pseudocode SHA-256 (a SHA-2 variant) pseudocode - Wikipedia}.
+     *
+     * @access private
+     * @param String $m
+     */
+    function _sha256($m)
+    {
+        if (extension_loaded('suhosin')) {
+            return pack('H*', sha256($m));
+        }
+
+        // Initialize variables
+        $hash = array(
+            0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a, 0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19
+        );
+        // Initialize table of round constants
+        // (first 32 bits of the fractional parts of the cube roots of the first 64 primes 2..311)
+        static $k = array(
+            0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, 0x923f82a4, 0xab1c5ed5,
+            0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174,
+            0xe49b69c1, 0xefbe4786, 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
+            0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, 0x06ca6351, 0x14292967,
+            0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85,
+            0xa2bfe8a1, 0xa81a664b, 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
+            0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, 0x5b9cca4f, 0x682e6ff3,
+            0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
+        );
+
+        // Pre-processing
+        $length = strlen($m);
+        // to round to nearest 56 mod 64, we'll add 64 - (length + (64 - 56)) % 64
+        $m.= str_repeat(chr(0), 64 - (($length + 8) & 0x3F));
+        $m[$length] = chr(0x80);
+        // we don't support hashing strings 512MB long
+        $m.= pack('N2', 0, $length << 3);
+
+        // Process the message in successive 512-bit chunks
+        $chunks = str_split($m, 64);
+        foreach ($chunks as $chunk) {
+            $w = array();
+            for ($i = 0; $i < 16; $i++) {
+                extract(unpack('Ntemp', $this->_string_shift($chunk, 4)));
+                $w[] = $temp;
+            }
+
+            // Extend the sixteen 32-bit words into sixty-four 32-bit words
+            for ($i = 16; $i < 64; $i++) {
+                $s0 = $this->_rightRotate($w[$i - 15],  7) ^
+                      $this->_rightRotate($w[$i - 15], 18) ^
+                      $this->_rightShift( $w[$i - 15],  3);
+                $s1 = $this->_rightRotate($w[$i - 2], 17) ^
+                      $this->_rightRotate($w[$i - 2], 19) ^
+                      $this->_rightShift( $w[$i - 2], 10);
+                $w[$i] = $this->_add($w[$i - 16], $s0, $w[$i - 7], $s1);
+
+            }
+
+            // Initialize hash value for this chunk
+            list($a, $b, $c, $d, $e, $f, $g, $h) = $hash;
+
+            // Main loop
+            for ($i = 0; $i < 64; $i++) {
+                $s0 = $this->_rightRotate($a,  2) ^
+                      $this->_rightRotate($a, 13) ^
+                      $this->_rightRotate($a, 22);
+                $maj = ($a & $b) ^
+                       ($a & $c) ^
+                       ($b & $c);
+                $t2 = $this->_add($s0, $maj);
+
+                $s1 = $this->_rightRotate($e,  6) ^
+                      $this->_rightRotate($e, 11) ^
+                      $this->_rightRotate($e, 25);
+                $ch = ($e & $f) ^
+                      ($this->_not($e) & $g);
+                $t1 = $this->_add($h, $s1, $ch, $k[$i], $w[$i]);
+
+                $h = $g;
+                $g = $f;
+                $f = $e;
+                $e = $this->_add($d, $t1);
+                $d = $c;
+                $c = $b;
+                $b = $a;
+                $a = $this->_add($t1, $t2);
+            }
+
+            // Add this chunk's hash to result so far
+            $hash = array(
+                $this->_add($hash[0], $a),
+                $this->_add($hash[1], $b),
+                $this->_add($hash[2], $c),
+                $this->_add($hash[3], $d),
+                $this->_add($hash[4], $e),
+                $this->_add($hash[5], $f),
+                $this->_add($hash[6], $g),
+                $this->_add($hash[7], $h)
+            );
+        }
+
+        // Produce the final hash value (big-endian)
+        return pack('N8', $hash[0], $hash[1], $hash[2], $hash[3], $hash[4], $hash[5], $hash[6], $hash[7]);
+    }
+
+    /**
+     * Pure-PHP implementation of SHA384 and SHA512
+     *
+     * @access private
+     * @param String $m
+     */
+    function _sha512($m)
+    {
+        if (!class_exists('Math_BigInteger')) {
+            require_once('Math/BigInteger.php');
+        }
+
+        static $init384, $init512, $k;
+
+        if (!isset($k)) {
+            // Initialize variables
+            $init384 = array( // initial values for SHA384
+                'cbbb9d5dc1059ed8', '629a292a367cd507', '9159015a3070dd17', '152fecd8f70e5939', 
+                '67332667ffc00b31', '8eb44a8768581511', 'db0c2e0d64f98fa7', '47b5481dbefa4fa4'
+            );
+            $init512 = array( // initial values for SHA512
+                '6a09e667f3bcc908', 'bb67ae8584caa73b', '3c6ef372fe94f82b', 'a54ff53a5f1d36f1', 
+                '510e527fade682d1', '9b05688c2b3e6c1f', '1f83d9abfb41bd6b', '5be0cd19137e2179'
+            );
+
+            for ($i = 0; $i < 8; $i++) {
+                $init384[$i] = new Math_BigInteger($init384[$i], 16);
+                $init384[$i]->setPrecision(64);
+                $init512[$i] = new Math_BigInteger($init512[$i], 16);
+                $init512[$i]->setPrecision(64);
+            }
+
+            // Initialize table of round constants
+            // (first 64 bits of the fractional parts of the cube roots of the first 80 primes 2..409)
+            $k = array(
+                '428a2f98d728ae22', '7137449123ef65cd', 'b5c0fbcfec4d3b2f', 'e9b5dba58189dbbc',
+                '3956c25bf348b538', '59f111f1b605d019', '923f82a4af194f9b', 'ab1c5ed5da6d8118',
+                'd807aa98a3030242', '12835b0145706fbe', '243185be4ee4b28c', '550c7dc3d5ffb4e2',
+                '72be5d74f27b896f', '80deb1fe3b1696b1', '9bdc06a725c71235', 'c19bf174cf692694',
+                'e49b69c19ef14ad2', 'efbe4786384f25e3', '0fc19dc68b8cd5b5', '240ca1cc77ac9c65',
+                '2de92c6f592b0275', '4a7484aa6ea6e483', '5cb0a9dcbd41fbd4', '76f988da831153b5',
+                '983e5152ee66dfab', 'a831c66d2db43210', 'b00327c898fb213f', 'bf597fc7beef0ee4',
+                'c6e00bf33da88fc2', 'd5a79147930aa725', '06ca6351e003826f', '142929670a0e6e70',
+                '27b70a8546d22ffc', '2e1b21385c26c926', '4d2c6dfc5ac42aed', '53380d139d95b3df',
+                '650a73548baf63de', '766a0abb3c77b2a8', '81c2c92e47edaee6', '92722c851482353b',
+                'a2bfe8a14cf10364', 'a81a664bbc423001', 'c24b8b70d0f89791', 'c76c51a30654be30',
+                'd192e819d6ef5218', 'd69906245565a910', 'f40e35855771202a', '106aa07032bbd1b8',
+                '19a4c116b8d2d0c8', '1e376c085141ab53', '2748774cdf8eeb99', '34b0bcb5e19b48a8',
+                '391c0cb3c5c95a63', '4ed8aa4ae3418acb', '5b9cca4f7763e373', '682e6ff3d6b2b8a3',
+                '748f82ee5defb2fc', '78a5636f43172f60', '84c87814a1f0ab72', '8cc702081a6439ec',
+                '90befffa23631e28', 'a4506cebde82bde9', 'bef9a3f7b2c67915', 'c67178f2e372532b',
+                'ca273eceea26619c', 'd186b8c721c0c207', 'eada7dd6cde0eb1e', 'f57d4f7fee6ed178',
+                '06f067aa72176fba', '0a637dc5a2c898a6', '113f9804bef90dae', '1b710b35131c471b',
+                '28db77f523047d84', '32caab7b40c72493', '3c9ebe0a15c9bebc', '431d67c49c100d4c',
+                '4cc5d4becb3e42b6', '597f299cfc657e2a', '5fcb6fab3ad6faec', '6c44198c4a475817'
+            );
+
+            for ($i = 0; $i < 80; $i++) {
+                $k[$i] = new Math_BigInteger($k[$i], 16);
+            }
+        }
+
+        $hash = $this->l == 48 ? $init384 : $init512;
+
+        // Pre-processing
+        $length = strlen($m);
+        // to round to nearest 112 mod 128, we'll add 128 - (length + (128 - 112)) % 128
+        $m.= str_repeat(chr(0), 128 - (($length + 16) & 0x7F));
+        $m[$length] = chr(0x80);
+        // we don't support hashing strings 512MB long
+        $m.= pack('N4', 0, 0, 0, $length << 3);
+
+        // Process the message in successive 1024-bit chunks
+        $chunks = str_split($m, 128);
+        foreach ($chunks as $chunk) {
+            $w = array();
+            for ($i = 0; $i < 16; $i++) {
+                $temp = new Math_BigInteger($this->_string_shift($chunk, 8), 256);
+                $temp->setPrecision(64);
+                $w[] = $temp;
+            }
+
+            // Extend the sixteen 32-bit words into eighty 32-bit words
+            for ($i = 16; $i < 80; $i++) {
+                $temp = array(
+                          $w[$i - 15]->bitwise_rightRotate(1),
+                          $w[$i - 15]->bitwise_rightRotate(8),
+                          $w[$i - 15]->bitwise_rightShift(7)
+                );
+                $s0 = $temp[0]->bitwise_xor($temp[1]);
+                $s0 = $s0->bitwise_xor($temp[2]);
+                $temp = array(
+                          $w[$i - 2]->bitwise_rightRotate(19),
+                          $w[$i - 2]->bitwise_rightRotate(61),
+                          $w[$i - 2]->bitwise_rightShift(6)
+                );
+                $s1 = $temp[0]->bitwise_xor($temp[1]);
+                $s1 = $s1->bitwise_xor($temp[2]);
+                $w[$i] = $w[$i - 16]->copy();
+                $w[$i] = $w[$i]->add($s0);
+                $w[$i] = $w[$i]->add($w[$i - 7]);
+                $w[$i] = $w[$i]->add($s1);
+            }
+
+            // Initialize hash value for this chunk
+            $a = $hash[0]->copy();
+            $b = $hash[1]->copy();
+            $c = $hash[2]->copy();
+            $d = $hash[3]->copy();
+            $e = $hash[4]->copy();
+            $f = $hash[5]->copy();
+            $g = $hash[6]->copy();
+            $h = $hash[7]->copy();
+
+            // Main loop
+            for ($i = 0; $i < 80; $i++) {
+                $temp = array(
+                    $a->bitwise_rightRotate(28),
+                    $a->bitwise_rightRotate(34),
+                    $a->bitwise_rightRotate(39)
+                );
+                $s0 = $temp[0]->bitwise_xor($temp[1]);
+                $s0 = $s0->bitwise_xor($temp[2]);
+                $temp = array(
+                    $a->bitwise_and($b),
+                    $a->bitwise_and($c),
+                    $b->bitwise_and($c)
+                );
+                $maj = $temp[0]->bitwise_xor($temp[1]);
+                $maj = $maj->bitwise_xor($temp[2]);
+                $t2 = $s0->add($maj);
+
+                $temp = array(
+                    $e->bitwise_rightRotate(14),
+                    $e->bitwise_rightRotate(18),
+                    $e->bitwise_rightRotate(41)
+                );
+                $s1 = $temp[0]->bitwise_xor($temp[1]);
+                $s1 = $s1->bitwise_xor($temp[2]);
+                $temp = array(
+                    $e->bitwise_and($f),
+                    $g->bitwise_and($e->bitwise_not())
+                );
+                $ch = $temp[0]->bitwise_xor($temp[1]);
+                $t1 = $h->add($s1);
+                $t1 = $t1->add($ch);
+                $t1 = $t1->add($k[$i]);
+                $t1 = $t1->add($w[$i]);
+
+                $h = $g->copy();
+                $g = $f->copy();
+                $f = $e->copy();
+                $e = $d->add($t1);
+                $d = $c->copy();
+                $c = $b->copy();
+                $b = $a->copy();
+                $a = $t1->add($t2);
+            }
+
+            // Add this chunk's hash to result so far
+            $hash = array(
+                $hash[0]->add($a),
+                $hash[1]->add($b),
+                $hash[2]->add($c),
+                $hash[3]->add($d),
+                $hash[4]->add($e),
+                $hash[5]->add($f),
+                $hash[6]->add($g),
+                $hash[7]->add($h)
+            );
+        }
+
+        // Produce the final hash value (big-endian)
+        // (Crypt_Hash::hash() trims the output for hashes but not for HMACs.  as such, we trim the output here)
+        $temp = $hash[0]->toBytes() . $hash[1]->toBytes() . $hash[2]->toBytes() . $hash[3]->toBytes() .
+                $hash[4]->toBytes() . $hash[5]->toBytes();
+        if ($this->l != 48) {
+            $temp.= $hash[6]->toBytes() . $hash[7]->toBytes();
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Right Rotate
+     *
+     * @access private
+     * @param Integer $int
+     * @param Integer $amt
+     * @see _sha256()
+     * @return Integer
+     */
+    function _rightRotate($int, $amt)
+    {
+        $invamt = 32 - $amt;
+        $mask = (1 << $invamt) - 1;
+        return (($int << $invamt) & 0xFFFFFFFF) | (($int >> $amt) & $mask);
+    }
+
+    /**
+     * Right Shift
+     *
+     * @access private
+     * @param Integer $int
+     * @param Integer $amt
+     * @see _sha256()
+     * @return Integer
+     */
+    function _rightShift($int, $amt)
+    {
+        $mask = (1 << (32 - $amt)) - 1;
+        return ($int >> $amt) & $mask;
+    }
+
+    /**
+     * Not
+     *
+     * @access private
+     * @param Integer $int
+     * @see _sha256()
+     * @return Integer
+     */
+    function _not($int)
+    {
+        return ~$int & 0xFFFFFFFF;
+    }
+
+    /**
+     * Add
+     *
+     * _sha256() adds multiple unsigned 32-bit integers.  Since PHP doesn't support unsigned integers and since the
+     * possibility of overflow exists, care has to be taken.  Math_BigInteger() could be used but this should be faster.
+     *
+     * @param Integer $...
+     * @return Integer
+     * @see _sha256()
+     * @access private
+     */
+    function _add()
+    {
+        static $mod;
+        if (!isset($mod)) {
+            $mod = pow(2, 32);
+        }
+
+        $result = 0;
+        $arguments = func_get_args();
+        foreach ($arguments as $argument) {
+            $result+= $argument < 0 ? ($argument & 0x7FFFFFFF) + 0x80000000 : $argument;
+        }
+
+        return fmod($result, $mod);
+    }
+
+    /**
+     * String Shift
+     *
+     * Inspired by array_shift
+     *
+     * @param String $string
+     * @param optional Integer $index
+     * @return String
+     * @access private
+     */
+    function _string_shift(&$string, $index = 1)
+    {
+        $substr = substr($string, 0, $index);
+        $string = substr($string, $index);
+        return $substr;
+    }
+}
diff --git a/sources/inc/phpseclib/Crypt_Rijndael.php b/sources/inc/phpseclib/Crypt_Rijndael.php
new file mode 100644
index 0000000..c63e0ff
--- /dev/null
+++ b/sources/inc/phpseclib/Crypt_Rijndael.php
@@ -0,0 +1,1374 @@
+
+ * setKey('abcdefghijklmnop');
+ *
+ *    $size = 10 * 1024;
+ *    $plaintext = '';
+ *    for ($i = 0; $i < $size; $i++) {
+ *        $plaintext.= 'a';
+ *    }
+ *
+ *    echo $rijndael->decrypt($rijndael->encrypt($plaintext));
+ * ?>
+ * 
+ *
+ * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @category   Crypt
+ * @package    Crypt_Rijndael
+ * @author     Jim Wigginton 
+ * @copyright  MMVIII Jim Wigginton
+ * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link       http://phpseclib.sourceforge.net
+ */
+
+/**
+ * Include Crypt_Base
+ *
+ * Base cipher class
+ */
+if (!class_exists('Crypt_Base')) {
+    require_once('Base.php');
+}
+
+/**#@+
+ * @access public
+ * @see Crypt_Rijndael::encrypt()
+ * @see Crypt_Rijndael::decrypt()
+ */
+/**
+ * Encrypt / decrypt using the Counter mode.
+ *
+ * Set to -1 since that's what Crypt/Random.php uses to index the CTR mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Counter_.28CTR.29
+ */
+define('CRYPT_RIJNDAEL_MODE_CTR', CRYPT_MODE_CTR);
+/**
+ * Encrypt / decrypt using the Electronic Code Book mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Electronic_codebook_.28ECB.29
+ */
+define('CRYPT_RIJNDAEL_MODE_ECB', CRYPT_MODE_ECB);
+/**
+ * Encrypt / decrypt using the Code Book Chaining mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher-block_chaining_.28CBC.29
+ */
+define('CRYPT_RIJNDAEL_MODE_CBC', CRYPT_MODE_CBC);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Cipher_feedback_.28CFB.29
+ */
+define('CRYPT_RIJNDAEL_MODE_CFB', CRYPT_MODE_CFB);
+/**
+ * Encrypt / decrypt using the Cipher Feedback mode.
+ *
+ * @link http://en.wikipedia.org/wiki/Block_cipher_modes_of_operation#Output_feedback_.28OFB.29
+ */
+define('CRYPT_RIJNDAEL_MODE_OFB', CRYPT_MODE_OFB);
+/**#@-*/
+
+/**#@+
+ * @access private
+ * @see Crypt_Rijndael::Crypt_Rijndael()
+ */
+/**
+ * Toggles the internal implementation
+ */
+define('CRYPT_RIJNDAEL_MODE_INTERNAL', CRYPT_MODE_INTERNAL);
+/**
+ * Toggles the mcrypt implementation
+ */
+define('CRYPT_RIJNDAEL_MODE_MCRYPT', CRYPT_MODE_MCRYPT);
+/**#@-*/
+
+/**
+ * Pure-PHP implementation of Rijndael.
+ *
+ * @author  Jim Wigginton 
+ * @version 0.1.0
+ * @access  public
+ * @package Crypt_Rijndael
+ */
+class Crypt_Rijndael extends Crypt_Base {
+    /**
+     * The default password key_size used by setPassword()
+     *
+     * @see Crypt_Base::password_key_size
+     * @see Crypt_Base::setPassword()
+     * @var Integer
+     * @access private
+     */
+    var $password_key_size = 16;
+
+    /**
+     * The namespace used by the cipher for its constants.
+     *
+     * @see Crypt_Base::const_namespace
+     * @var String
+     * @access private
+     */
+    var $const_namespace = 'RIJNDAEL';
+
+    /**
+     * The mcrypt specific name of the cipher
+     *
+     * Mcrypt is useable for 128/192/256-bit $block_size/$key_size. For 160/224 not.
+     * Crypt_Rijndael determines automatically whether mcrypt is useable
+     * or not for the current $block_size/$key_size.
+     * In case of, $cipher_name_mcrypt will be set dynamicaly at run time accordingly.
+     *
+     * @see Crypt_Base::cipher_name_mcrypt
+     * @see Crypt_Base::engine
+     * @see _setupEngine()
+     * @var String
+     * @access private
+     */
+    var $cipher_name_mcrypt = 'rijndael-128';
+
+    /**
+     * The default salt used by setPassword()
+     *
+     * @see Crypt_Base::password_default_salt
+     * @see Crypt_Base::setPassword()
+     * @var String
+     * @access private
+     */
+    var $password_default_salt = 'phpseclib';
+
+    /**
+     * Has the key length explicitly been set or should it be derived from the key, itself?
+     *
+     * @see setKeyLength()
+     * @var Boolean
+     * @access private
+     */
+    var $explicit_key_length = false;
+
+    /**
+     * The Key Schedule
+     *
+     * @see _setup()
+     * @var Array
+     * @access private
+     */
+    var $w;
+
+    /**
+     * The Inverse Key Schedule
+     *
+     * @see _setup()
+     * @var Array
+     * @access private
+     */
+    var $dw;
+
+    /**
+     * The Block Length divided by 32
+     *
+     * @see setBlockLength()
+     * @var Integer
+     * @access private
+     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4.  Exists in conjunction with $block_size
+     *    because the encryption / decryption / key schedule creation requires this number and not $block_size.  We could
+     *    derive this from $block_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
+     *    of that, we'll just precompute it once.
+     *
+     */
+    var $Nb = 4;
+
+    /**
+     * The Key Length
+     *
+     * @see setKeyLength()
+     * @var Integer
+     * @access private
+     * @internal The max value is 256 / 8 = 32, the min value is 128 / 8 = 16.  Exists in conjunction with $Nk
+     *    because the encryption / decryption / key schedule creation requires this number and not $key_size.  We could
+     *    derive this from $key_size or vice versa, but that'd mean we'd have to do multiple shift operations, so in lieu
+     *    of that, we'll just precompute it once.
+     */
+    var $key_size = 16;
+
+    /**
+     * The Key Length divided by 32
+     *
+     * @see setKeyLength()
+     * @var Integer
+     * @access private
+     * @internal The max value is 256 / 32 = 8, the min value is 128 / 32 = 4
+     */
+    var $Nk = 4;
+
+    /**
+     * The Number of Rounds
+     *
+     * @var Integer
+     * @access private
+     * @internal The max value is 14, the min value is 10.
+     */
+    var $Nr;
+
+    /**
+     * Shift offsets
+     *
+     * @var Array
+     * @access private
+     */
+    var $c;
+
+    /**
+     * Holds the last used key- and block_size information
+     *
+     * @var Array
+     * @access private
+     */
+    var $kl;
+
+    /**
+     * Precomputed mixColumns table
+     *
+     * According to  (section 5.2.1),
+     * precomputed tables can be used in the mixColumns phase.  in that example, they're assigned t0...t3, so
+     * those are the names we'll use.
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $t0 = array(
+        0xC66363A5, 0xF87C7C84, 0xEE777799, 0xF67B7B8D, 0xFFF2F20D, 0xD66B6BBD, 0xDE6F6FB1, 0x91C5C554,
+        0x60303050, 0x02010103, 0xCE6767A9, 0x562B2B7D, 0xE7FEFE19, 0xB5D7D762, 0x4DABABE6, 0xEC76769A,
+        0x8FCACA45, 0x1F82829D, 0x89C9C940, 0xFA7D7D87, 0xEFFAFA15, 0xB25959EB, 0x8E4747C9, 0xFBF0F00B,
+        0x41ADADEC, 0xB3D4D467, 0x5FA2A2FD, 0x45AFAFEA, 0x239C9CBF, 0x53A4A4F7, 0xE4727296, 0x9BC0C05B,
+        0x75B7B7C2, 0xE1FDFD1C, 0x3D9393AE, 0x4C26266A, 0x6C36365A, 0x7E3F3F41, 0xF5F7F702, 0x83CCCC4F,
+        0x6834345C, 0x51A5A5F4, 0xD1E5E534, 0xF9F1F108, 0xE2717193, 0xABD8D873, 0x62313153, 0x2A15153F,
+        0x0804040C, 0x95C7C752, 0x46232365, 0x9DC3C35E, 0x30181828, 0x379696A1, 0x0A05050F, 0x2F9A9AB5,
+        0x0E070709, 0x24121236, 0x1B80809B, 0xDFE2E23D, 0xCDEBEB26, 0x4E272769, 0x7FB2B2CD, 0xEA75759F,
+        0x1209091B, 0x1D83839E, 0x582C2C74, 0x341A1A2E, 0x361B1B2D, 0xDC6E6EB2, 0xB45A5AEE, 0x5BA0A0FB,
+        0xA45252F6, 0x763B3B4D, 0xB7D6D661, 0x7DB3B3CE, 0x5229297B, 0xDDE3E33E, 0x5E2F2F71, 0x13848497,
+        0xA65353F5, 0xB9D1D168, 0x00000000, 0xC1EDED2C, 0x40202060, 0xE3FCFC1F, 0x79B1B1C8, 0xB65B5BED,
+        0xD46A6ABE, 0x8DCBCB46, 0x67BEBED9, 0x7239394B, 0x944A4ADE, 0x984C4CD4, 0xB05858E8, 0x85CFCF4A,
+        0xBBD0D06B, 0xC5EFEF2A, 0x4FAAAAE5, 0xEDFBFB16, 0x864343C5, 0x9A4D4DD7, 0x66333355, 0x11858594,
+        0x8A4545CF, 0xE9F9F910, 0x04020206, 0xFE7F7F81, 0xA05050F0, 0x783C3C44, 0x259F9FBA, 0x4BA8A8E3,
+        0xA25151F3, 0x5DA3A3FE, 0x804040C0, 0x058F8F8A, 0x3F9292AD, 0x219D9DBC, 0x70383848, 0xF1F5F504,
+        0x63BCBCDF, 0x77B6B6C1, 0xAFDADA75, 0x42212163, 0x20101030, 0xE5FFFF1A, 0xFDF3F30E, 0xBFD2D26D,
+        0x81CDCD4C, 0x180C0C14, 0x26131335, 0xC3ECEC2F, 0xBE5F5FE1, 0x359797A2, 0x884444CC, 0x2E171739,
+        0x93C4C457, 0x55A7A7F2, 0xFC7E7E82, 0x7A3D3D47, 0xC86464AC, 0xBA5D5DE7, 0x3219192B, 0xE6737395,
+        0xC06060A0, 0x19818198, 0x9E4F4FD1, 0xA3DCDC7F, 0x44222266, 0x542A2A7E, 0x3B9090AB, 0x0B888883,
+        0x8C4646CA, 0xC7EEEE29, 0x6BB8B8D3, 0x2814143C, 0xA7DEDE79, 0xBC5E5EE2, 0x160B0B1D, 0xADDBDB76,
+        0xDBE0E03B, 0x64323256, 0x743A3A4E, 0x140A0A1E, 0x924949DB, 0x0C06060A, 0x4824246C, 0xB85C5CE4,
+        0x9FC2C25D, 0xBDD3D36E, 0x43ACACEF, 0xC46262A6, 0x399191A8, 0x319595A4, 0xD3E4E437, 0xF279798B,
+        0xD5E7E732, 0x8BC8C843, 0x6E373759, 0xDA6D6DB7, 0x018D8D8C, 0xB1D5D564, 0x9C4E4ED2, 0x49A9A9E0,
+        0xD86C6CB4, 0xAC5656FA, 0xF3F4F407, 0xCFEAEA25, 0xCA6565AF, 0xF47A7A8E, 0x47AEAEE9, 0x10080818,
+        0x6FBABAD5, 0xF0787888, 0x4A25256F, 0x5C2E2E72, 0x381C1C24, 0x57A6A6F1, 0x73B4B4C7, 0x97C6C651,
+        0xCBE8E823, 0xA1DDDD7C, 0xE874749C, 0x3E1F1F21, 0x964B4BDD, 0x61BDBDDC, 0x0D8B8B86, 0x0F8A8A85,
+        0xE0707090, 0x7C3E3E42, 0x71B5B5C4, 0xCC6666AA, 0x904848D8, 0x06030305, 0xF7F6F601, 0x1C0E0E12,
+        0xC26161A3, 0x6A35355F, 0xAE5757F9, 0x69B9B9D0, 0x17868691, 0x99C1C158, 0x3A1D1D27, 0x279E9EB9,
+        0xD9E1E138, 0xEBF8F813, 0x2B9898B3, 0x22111133, 0xD26969BB, 0xA9D9D970, 0x078E8E89, 0x339494A7,
+        0x2D9B9BB6, 0x3C1E1E22, 0x15878792, 0xC9E9E920, 0x87CECE49, 0xAA5555FF, 0x50282878, 0xA5DFDF7A,
+        0x038C8C8F, 0x59A1A1F8, 0x09898980, 0x1A0D0D17, 0x65BFBFDA, 0xD7E6E631, 0x844242C6, 0xD06868B8,
+        0x824141C3, 0x299999B0, 0x5A2D2D77, 0x1E0F0F11, 0x7BB0B0CB, 0xA85454FC, 0x6DBBBBD6, 0x2C16163A
+    );
+
+    /**
+     * Precomputed mixColumns table
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $t1 = array(
+        0xA5C66363, 0x84F87C7C, 0x99EE7777, 0x8DF67B7B, 0x0DFFF2F2, 0xBDD66B6B, 0xB1DE6F6F, 0x5491C5C5,
+        0x50603030, 0x03020101, 0xA9CE6767, 0x7D562B2B, 0x19E7FEFE, 0x62B5D7D7, 0xE64DABAB, 0x9AEC7676,
+        0x458FCACA, 0x9D1F8282, 0x4089C9C9, 0x87FA7D7D, 0x15EFFAFA, 0xEBB25959, 0xC98E4747, 0x0BFBF0F0,
+        0xEC41ADAD, 0x67B3D4D4, 0xFD5FA2A2, 0xEA45AFAF, 0xBF239C9C, 0xF753A4A4, 0x96E47272, 0x5B9BC0C0,
+        0xC275B7B7, 0x1CE1FDFD, 0xAE3D9393, 0x6A4C2626, 0x5A6C3636, 0x417E3F3F, 0x02F5F7F7, 0x4F83CCCC,
+        0x5C683434, 0xF451A5A5, 0x34D1E5E5, 0x08F9F1F1, 0x93E27171, 0x73ABD8D8, 0x53623131, 0x3F2A1515,
+        0x0C080404, 0x5295C7C7, 0x65462323, 0x5E9DC3C3, 0x28301818, 0xA1379696, 0x0F0A0505, 0xB52F9A9A,
+        0x090E0707, 0x36241212, 0x9B1B8080, 0x3DDFE2E2, 0x26CDEBEB, 0x694E2727, 0xCD7FB2B2, 0x9FEA7575,
+        0x1B120909, 0x9E1D8383, 0x74582C2C, 0x2E341A1A, 0x2D361B1B, 0xB2DC6E6E, 0xEEB45A5A, 0xFB5BA0A0,
+        0xF6A45252, 0x4D763B3B, 0x61B7D6D6, 0xCE7DB3B3, 0x7B522929, 0x3EDDE3E3, 0x715E2F2F, 0x97138484,
+        0xF5A65353, 0x68B9D1D1, 0x00000000, 0x2CC1EDED, 0x60402020, 0x1FE3FCFC, 0xC879B1B1, 0xEDB65B5B,
+        0xBED46A6A, 0x468DCBCB, 0xD967BEBE, 0x4B723939, 0xDE944A4A, 0xD4984C4C, 0xE8B05858, 0x4A85CFCF,
+        0x6BBBD0D0, 0x2AC5EFEF, 0xE54FAAAA, 0x16EDFBFB, 0xC5864343, 0xD79A4D4D, 0x55663333, 0x94118585,
+        0xCF8A4545, 0x10E9F9F9, 0x06040202, 0x81FE7F7F, 0xF0A05050, 0x44783C3C, 0xBA259F9F, 0xE34BA8A8,
+        0xF3A25151, 0xFE5DA3A3, 0xC0804040, 0x8A058F8F, 0xAD3F9292, 0xBC219D9D, 0x48703838, 0x04F1F5F5,
+        0xDF63BCBC, 0xC177B6B6, 0x75AFDADA, 0x63422121, 0x30201010, 0x1AE5FFFF, 0x0EFDF3F3, 0x6DBFD2D2,
+        0x4C81CDCD, 0x14180C0C, 0x35261313, 0x2FC3ECEC, 0xE1BE5F5F, 0xA2359797, 0xCC884444, 0x392E1717,
+        0x5793C4C4, 0xF255A7A7, 0x82FC7E7E, 0x477A3D3D, 0xACC86464, 0xE7BA5D5D, 0x2B321919, 0x95E67373,
+        0xA0C06060, 0x98198181, 0xD19E4F4F, 0x7FA3DCDC, 0x66442222, 0x7E542A2A, 0xAB3B9090, 0x830B8888,
+        0xCA8C4646, 0x29C7EEEE, 0xD36BB8B8, 0x3C281414, 0x79A7DEDE, 0xE2BC5E5E, 0x1D160B0B, 0x76ADDBDB,
+        0x3BDBE0E0, 0x56643232, 0x4E743A3A, 0x1E140A0A, 0xDB924949, 0x0A0C0606, 0x6C482424, 0xE4B85C5C,
+        0x5D9FC2C2, 0x6EBDD3D3, 0xEF43ACAC, 0xA6C46262, 0xA8399191, 0xA4319595, 0x37D3E4E4, 0x8BF27979,
+        0x32D5E7E7, 0x438BC8C8, 0x596E3737, 0xB7DA6D6D, 0x8C018D8D, 0x64B1D5D5, 0xD29C4E4E, 0xE049A9A9,
+        0xB4D86C6C, 0xFAAC5656, 0x07F3F4F4, 0x25CFEAEA, 0xAFCA6565, 0x8EF47A7A, 0xE947AEAE, 0x18100808,
+        0xD56FBABA, 0x88F07878, 0x6F4A2525, 0x725C2E2E, 0x24381C1C, 0xF157A6A6, 0xC773B4B4, 0x5197C6C6,
+        0x23CBE8E8, 0x7CA1DDDD, 0x9CE87474, 0x213E1F1F, 0xDD964B4B, 0xDC61BDBD, 0x860D8B8B, 0x850F8A8A,
+        0x90E07070, 0x427C3E3E, 0xC471B5B5, 0xAACC6666, 0xD8904848, 0x05060303, 0x01F7F6F6, 0x121C0E0E,
+        0xA3C26161, 0x5F6A3535, 0xF9AE5757, 0xD069B9B9, 0x91178686, 0x5899C1C1, 0x273A1D1D, 0xB9279E9E,
+        0x38D9E1E1, 0x13EBF8F8, 0xB32B9898, 0x33221111, 0xBBD26969, 0x70A9D9D9, 0x89078E8E, 0xA7339494,
+        0xB62D9B9B, 0x223C1E1E, 0x92158787, 0x20C9E9E9, 0x4987CECE, 0xFFAA5555, 0x78502828, 0x7AA5DFDF,
+        0x8F038C8C, 0xF859A1A1, 0x80098989, 0x171A0D0D, 0xDA65BFBF, 0x31D7E6E6, 0xC6844242, 0xB8D06868,
+        0xC3824141, 0xB0299999, 0x775A2D2D, 0x111E0F0F, 0xCB7BB0B0, 0xFCA85454, 0xD66DBBBB, 0x3A2C1616
+    );
+
+    /**
+     * Precomputed mixColumns table
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $t2 = array(
+        0x63A5C663, 0x7C84F87C, 0x7799EE77, 0x7B8DF67B, 0xF20DFFF2, 0x6BBDD66B, 0x6FB1DE6F, 0xC55491C5,
+        0x30506030, 0x01030201, 0x67A9CE67, 0x2B7D562B, 0xFE19E7FE, 0xD762B5D7, 0xABE64DAB, 0x769AEC76,
+        0xCA458FCA, 0x829D1F82, 0xC94089C9, 0x7D87FA7D, 0xFA15EFFA, 0x59EBB259, 0x47C98E47, 0xF00BFBF0,
+        0xADEC41AD, 0xD467B3D4, 0xA2FD5FA2, 0xAFEA45AF, 0x9CBF239C, 0xA4F753A4, 0x7296E472, 0xC05B9BC0,
+        0xB7C275B7, 0xFD1CE1FD, 0x93AE3D93, 0x266A4C26, 0x365A6C36, 0x3F417E3F, 0xF702F5F7, 0xCC4F83CC,
+        0x345C6834, 0xA5F451A5, 0xE534D1E5, 0xF108F9F1, 0x7193E271, 0xD873ABD8, 0x31536231, 0x153F2A15,
+        0x040C0804, 0xC75295C7, 0x23654623, 0xC35E9DC3, 0x18283018, 0x96A13796, 0x050F0A05, 0x9AB52F9A,
+        0x07090E07, 0x12362412, 0x809B1B80, 0xE23DDFE2, 0xEB26CDEB, 0x27694E27, 0xB2CD7FB2, 0x759FEA75,
+        0x091B1209, 0x839E1D83, 0x2C74582C, 0x1A2E341A, 0x1B2D361B, 0x6EB2DC6E, 0x5AEEB45A, 0xA0FB5BA0,
+        0x52F6A452, 0x3B4D763B, 0xD661B7D6, 0xB3CE7DB3, 0x297B5229, 0xE33EDDE3, 0x2F715E2F, 0x84971384,
+        0x53F5A653, 0xD168B9D1, 0x00000000, 0xED2CC1ED, 0x20604020, 0xFC1FE3FC, 0xB1C879B1, 0x5BEDB65B,
+        0x6ABED46A, 0xCB468DCB, 0xBED967BE, 0x394B7239, 0x4ADE944A, 0x4CD4984C, 0x58E8B058, 0xCF4A85CF,
+        0xD06BBBD0, 0xEF2AC5EF, 0xAAE54FAA, 0xFB16EDFB, 0x43C58643, 0x4DD79A4D, 0x33556633, 0x85941185,
+        0x45CF8A45, 0xF910E9F9, 0x02060402, 0x7F81FE7F, 0x50F0A050, 0x3C44783C, 0x9FBA259F, 0xA8E34BA8,
+        0x51F3A251, 0xA3FE5DA3, 0x40C08040, 0x8F8A058F, 0x92AD3F92, 0x9DBC219D, 0x38487038, 0xF504F1F5,
+        0xBCDF63BC, 0xB6C177B6, 0xDA75AFDA, 0x21634221, 0x10302010, 0xFF1AE5FF, 0xF30EFDF3, 0xD26DBFD2,
+        0xCD4C81CD, 0x0C14180C, 0x13352613, 0xEC2FC3EC, 0x5FE1BE5F, 0x97A23597, 0x44CC8844, 0x17392E17,
+        0xC45793C4, 0xA7F255A7, 0x7E82FC7E, 0x3D477A3D, 0x64ACC864, 0x5DE7BA5D, 0x192B3219, 0x7395E673,
+        0x60A0C060, 0x81981981, 0x4FD19E4F, 0xDC7FA3DC, 0x22664422, 0x2A7E542A, 0x90AB3B90, 0x88830B88,
+        0x46CA8C46, 0xEE29C7EE, 0xB8D36BB8, 0x143C2814, 0xDE79A7DE, 0x5EE2BC5E, 0x0B1D160B, 0xDB76ADDB,
+        0xE03BDBE0, 0x32566432, 0x3A4E743A, 0x0A1E140A, 0x49DB9249, 0x060A0C06, 0x246C4824, 0x5CE4B85C,
+        0xC25D9FC2, 0xD36EBDD3, 0xACEF43AC, 0x62A6C462, 0x91A83991, 0x95A43195, 0xE437D3E4, 0x798BF279,
+        0xE732D5E7, 0xC8438BC8, 0x37596E37, 0x6DB7DA6D, 0x8D8C018D, 0xD564B1D5, 0x4ED29C4E, 0xA9E049A9,
+        0x6CB4D86C, 0x56FAAC56, 0xF407F3F4, 0xEA25CFEA, 0x65AFCA65, 0x7A8EF47A, 0xAEE947AE, 0x08181008,
+        0xBAD56FBA, 0x7888F078, 0x256F4A25, 0x2E725C2E, 0x1C24381C, 0xA6F157A6, 0xB4C773B4, 0xC65197C6,
+        0xE823CBE8, 0xDD7CA1DD, 0x749CE874, 0x1F213E1F, 0x4BDD964B, 0xBDDC61BD, 0x8B860D8B, 0x8A850F8A,
+        0x7090E070, 0x3E427C3E, 0xB5C471B5, 0x66AACC66, 0x48D89048, 0x03050603, 0xF601F7F6, 0x0E121C0E,
+        0x61A3C261, 0x355F6A35, 0x57F9AE57, 0xB9D069B9, 0x86911786, 0xC15899C1, 0x1D273A1D, 0x9EB9279E,
+        0xE138D9E1, 0xF813EBF8, 0x98B32B98, 0x11332211, 0x69BBD269, 0xD970A9D9, 0x8E89078E, 0x94A73394,
+        0x9BB62D9B, 0x1E223C1E, 0x87921587, 0xE920C9E9, 0xCE4987CE, 0x55FFAA55, 0x28785028, 0xDF7AA5DF,
+        0x8C8F038C, 0xA1F859A1, 0x89800989, 0x0D171A0D, 0xBFDA65BF, 0xE631D7E6, 0x42C68442, 0x68B8D068,
+        0x41C38241, 0x99B02999, 0x2D775A2D, 0x0F111E0F, 0xB0CB7BB0, 0x54FCA854, 0xBBD66DBB, 0x163A2C16
+    );
+
+    /**
+     * Precomputed mixColumns table
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $t3 = array(
+        0x6363A5C6, 0x7C7C84F8, 0x777799EE, 0x7B7B8DF6, 0xF2F20DFF, 0x6B6BBDD6, 0x6F6FB1DE, 0xC5C55491,
+        0x30305060, 0x01010302, 0x6767A9CE, 0x2B2B7D56, 0xFEFE19E7, 0xD7D762B5, 0xABABE64D, 0x76769AEC,
+        0xCACA458F, 0x82829D1F, 0xC9C94089, 0x7D7D87FA, 0xFAFA15EF, 0x5959EBB2, 0x4747C98E, 0xF0F00BFB,
+        0xADADEC41, 0xD4D467B3, 0xA2A2FD5F, 0xAFAFEA45, 0x9C9CBF23, 0xA4A4F753, 0x727296E4, 0xC0C05B9B,
+        0xB7B7C275, 0xFDFD1CE1, 0x9393AE3D, 0x26266A4C, 0x36365A6C, 0x3F3F417E, 0xF7F702F5, 0xCCCC4F83,
+        0x34345C68, 0xA5A5F451, 0xE5E534D1, 0xF1F108F9, 0x717193E2, 0xD8D873AB, 0x31315362, 0x15153F2A,
+        0x04040C08, 0xC7C75295, 0x23236546, 0xC3C35E9D, 0x18182830, 0x9696A137, 0x05050F0A, 0x9A9AB52F,
+        0x0707090E, 0x12123624, 0x80809B1B, 0xE2E23DDF, 0xEBEB26CD, 0x2727694E, 0xB2B2CD7F, 0x75759FEA,
+        0x09091B12, 0x83839E1D, 0x2C2C7458, 0x1A1A2E34, 0x1B1B2D36, 0x6E6EB2DC, 0x5A5AEEB4, 0xA0A0FB5B,
+        0x5252F6A4, 0x3B3B4D76, 0xD6D661B7, 0xB3B3CE7D, 0x29297B52, 0xE3E33EDD, 0x2F2F715E, 0x84849713,
+        0x5353F5A6, 0xD1D168B9, 0x00000000, 0xEDED2CC1, 0x20206040, 0xFCFC1FE3, 0xB1B1C879, 0x5B5BEDB6,
+        0x6A6ABED4, 0xCBCB468D, 0xBEBED967, 0x39394B72, 0x4A4ADE94, 0x4C4CD498, 0x5858E8B0, 0xCFCF4A85,
+        0xD0D06BBB, 0xEFEF2AC5, 0xAAAAE54F, 0xFBFB16ED, 0x4343C586, 0x4D4DD79A, 0x33335566, 0x85859411,
+        0x4545CF8A, 0xF9F910E9, 0x02020604, 0x7F7F81FE, 0x5050F0A0, 0x3C3C4478, 0x9F9FBA25, 0xA8A8E34B,
+        0x5151F3A2, 0xA3A3FE5D, 0x4040C080, 0x8F8F8A05, 0x9292AD3F, 0x9D9DBC21, 0x38384870, 0xF5F504F1,
+        0xBCBCDF63, 0xB6B6C177, 0xDADA75AF, 0x21216342, 0x10103020, 0xFFFF1AE5, 0xF3F30EFD, 0xD2D26DBF,
+        0xCDCD4C81, 0x0C0C1418, 0x13133526, 0xECEC2FC3, 0x5F5FE1BE, 0x9797A235, 0x4444CC88, 0x1717392E,
+        0xC4C45793, 0xA7A7F255, 0x7E7E82FC, 0x3D3D477A, 0x6464ACC8, 0x5D5DE7BA, 0x19192B32, 0x737395E6,
+        0x6060A0C0, 0x81819819, 0x4F4FD19E, 0xDCDC7FA3, 0x22226644, 0x2A2A7E54, 0x9090AB3B, 0x8888830B,
+        0x4646CA8C, 0xEEEE29C7, 0xB8B8D36B, 0x14143C28, 0xDEDE79A7, 0x5E5EE2BC, 0x0B0B1D16, 0xDBDB76AD,
+        0xE0E03BDB, 0x32325664, 0x3A3A4E74, 0x0A0A1E14, 0x4949DB92, 0x06060A0C, 0x24246C48, 0x5C5CE4B8,
+        0xC2C25D9F, 0xD3D36EBD, 0xACACEF43, 0x6262A6C4, 0x9191A839, 0x9595A431, 0xE4E437D3, 0x79798BF2,
+        0xE7E732D5, 0xC8C8438B, 0x3737596E, 0x6D6DB7DA, 0x8D8D8C01, 0xD5D564B1, 0x4E4ED29C, 0xA9A9E049,
+        0x6C6CB4D8, 0x5656FAAC, 0xF4F407F3, 0xEAEA25CF, 0x6565AFCA, 0x7A7A8EF4, 0xAEAEE947, 0x08081810,
+        0xBABAD56F, 0x787888F0, 0x25256F4A, 0x2E2E725C, 0x1C1C2438, 0xA6A6F157, 0xB4B4C773, 0xC6C65197,
+        0xE8E823CB, 0xDDDD7CA1, 0x74749CE8, 0x1F1F213E, 0x4B4BDD96, 0xBDBDDC61, 0x8B8B860D, 0x8A8A850F,
+        0x707090E0, 0x3E3E427C, 0xB5B5C471, 0x6666AACC, 0x4848D890, 0x03030506, 0xF6F601F7, 0x0E0E121C,
+        0x6161A3C2, 0x35355F6A, 0x5757F9AE, 0xB9B9D069, 0x86869117, 0xC1C15899, 0x1D1D273A, 0x9E9EB927,
+        0xE1E138D9, 0xF8F813EB, 0x9898B32B, 0x11113322, 0x6969BBD2, 0xD9D970A9, 0x8E8E8907, 0x9494A733,
+        0x9B9BB62D, 0x1E1E223C, 0x87879215, 0xE9E920C9, 0xCECE4987, 0x5555FFAA, 0x28287850, 0xDFDF7AA5,
+        0x8C8C8F03, 0xA1A1F859, 0x89898009, 0x0D0D171A, 0xBFBFDA65, 0xE6E631D7, 0x4242C684, 0x6868B8D0,
+        0x4141C382, 0x9999B029, 0x2D2D775A, 0x0F0F111E, 0xB0B0CB7B, 0x5454FCA8, 0xBBBBD66D, 0x16163A2C
+    );
+
+    /**
+     * Precomputed invMixColumns table
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $dt0 = array(
+        0x51F4A750, 0x7E416553, 0x1A17A4C3, 0x3A275E96, 0x3BAB6BCB, 0x1F9D45F1, 0xACFA58AB, 0x4BE30393,
+        0x2030FA55, 0xAD766DF6, 0x88CC7691, 0xF5024C25, 0x4FE5D7FC, 0xC52ACBD7, 0x26354480, 0xB562A38F,
+        0xDEB15A49, 0x25BA1B67, 0x45EA0E98, 0x5DFEC0E1, 0xC32F7502, 0x814CF012, 0x8D4697A3, 0x6BD3F9C6,
+        0x038F5FE7, 0x15929C95, 0xBF6D7AEB, 0x955259DA, 0xD4BE832D, 0x587421D3, 0x49E06929, 0x8EC9C844,
+        0x75C2896A, 0xF48E7978, 0x99583E6B, 0x27B971DD, 0xBEE14FB6, 0xF088AD17, 0xC920AC66, 0x7DCE3AB4,
+        0x63DF4A18, 0xE51A3182, 0x97513360, 0x62537F45, 0xB16477E0, 0xBB6BAE84, 0xFE81A01C, 0xF9082B94,
+        0x70486858, 0x8F45FD19, 0x94DE6C87, 0x527BF8B7, 0xAB73D323, 0x724B02E2, 0xE31F8F57, 0x6655AB2A,
+        0xB2EB2807, 0x2FB5C203, 0x86C57B9A, 0xD33708A5, 0x302887F2, 0x23BFA5B2, 0x02036ABA, 0xED16825C,
+        0x8ACF1C2B, 0xA779B492, 0xF307F2F0, 0x4E69E2A1, 0x65DAF4CD, 0x0605BED5, 0xD134621F, 0xC4A6FE8A,
+        0x342E539D, 0xA2F355A0, 0x058AE132, 0xA4F6EB75, 0x0B83EC39, 0x4060EFAA, 0x5E719F06, 0xBD6E1051,
+        0x3E218AF9, 0x96DD063D, 0xDD3E05AE, 0x4DE6BD46, 0x91548DB5, 0x71C45D05, 0x0406D46F, 0x605015FF,
+        0x1998FB24, 0xD6BDE997, 0x894043CC, 0x67D99E77, 0xB0E842BD, 0x07898B88, 0xE7195B38, 0x79C8EEDB,
+        0xA17C0A47, 0x7C420FE9, 0xF8841EC9, 0x00000000, 0x09808683, 0x322BED48, 0x1E1170AC, 0x6C5A724E,
+        0xFD0EFFFB, 0x0F853856, 0x3DAED51E, 0x362D3927, 0x0A0FD964, 0x685CA621, 0x9B5B54D1, 0x24362E3A,
+        0x0C0A67B1, 0x9357E70F, 0xB4EE96D2, 0x1B9B919E, 0x80C0C54F, 0x61DC20A2, 0x5A774B69, 0x1C121A16,
+        0xE293BA0A, 0xC0A02AE5, 0x3C22E043, 0x121B171D, 0x0E090D0B, 0xF28BC7AD, 0x2DB6A8B9, 0x141EA9C8,
+        0x57F11985, 0xAF75074C, 0xEE99DDBB, 0xA37F60FD, 0xF701269F, 0x5C72F5BC, 0x44663BC5, 0x5BFB7E34,
+        0x8B432976, 0xCB23C6DC, 0xB6EDFC68, 0xB8E4F163, 0xD731DCCA, 0x42638510, 0x13972240, 0x84C61120,
+        0x854A247D, 0xD2BB3DF8, 0xAEF93211, 0xC729A16D, 0x1D9E2F4B, 0xDCB230F3, 0x0D8652EC, 0x77C1E3D0,
+        0x2BB3166C, 0xA970B999, 0x119448FA, 0x47E96422, 0xA8FC8CC4, 0xA0F03F1A, 0x567D2CD8, 0x223390EF,
+        0x87494EC7, 0xD938D1C1, 0x8CCAA2FE, 0x98D40B36, 0xA6F581CF, 0xA57ADE28, 0xDAB78E26, 0x3FADBFA4,
+        0x2C3A9DE4, 0x5078920D, 0x6A5FCC9B, 0x547E4662, 0xF68D13C2, 0x90D8B8E8, 0x2E39F75E, 0x82C3AFF5,
+        0x9F5D80BE, 0x69D0937C, 0x6FD52DA9, 0xCF2512B3, 0xC8AC993B, 0x10187DA7, 0xE89C636E, 0xDB3BBB7B,
+        0xCD267809, 0x6E5918F4, 0xEC9AB701, 0x834F9AA8, 0xE6956E65, 0xAAFFE67E, 0x21BCCF08, 0xEF15E8E6,
+        0xBAE79BD9, 0x4A6F36CE, 0xEA9F09D4, 0x29B07CD6, 0x31A4B2AF, 0x2A3F2331, 0xC6A59430, 0x35A266C0,
+        0x744EBC37, 0xFC82CAA6, 0xE090D0B0, 0x33A7D815, 0xF104984A, 0x41ECDAF7, 0x7FCD500E, 0x1791F62F,
+        0x764DD68D, 0x43EFB04D, 0xCCAA4D54, 0xE49604DF, 0x9ED1B5E3, 0x4C6A881B, 0xC12C1FB8, 0x4665517F,
+        0x9D5EEA04, 0x018C355D, 0xFA877473, 0xFB0B412E, 0xB3671D5A, 0x92DBD252, 0xE9105633, 0x6DD64713,
+        0x9AD7618C, 0x37A10C7A, 0x59F8148E, 0xEB133C89, 0xCEA927EE, 0xB761C935, 0xE11CE5ED, 0x7A47B13C,
+        0x9CD2DF59, 0x55F2733F, 0x1814CE79, 0x73C737BF, 0x53F7CDEA, 0x5FFDAA5B, 0xDF3D6F14, 0x7844DB86,
+        0xCAAFF381, 0xB968C43E, 0x3824342C, 0xC2A3405F, 0x161DC372, 0xBCE2250C, 0x283C498B, 0xFF0D9541,
+        0x39A80171, 0x080CB3DE, 0xD8B4E49C, 0x6456C190, 0x7BCB8461, 0xD532B670, 0x486C5C74, 0xD0B85742
+    );
+
+    /**
+     * Precomputed invMixColumns table
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $dt1 = array(
+        0x5051F4A7, 0x537E4165, 0xC31A17A4, 0x963A275E, 0xCB3BAB6B, 0xF11F9D45, 0xABACFA58, 0x934BE303,
+        0x552030FA, 0xF6AD766D, 0x9188CC76, 0x25F5024C, 0xFC4FE5D7, 0xD7C52ACB, 0x80263544, 0x8FB562A3,
+        0x49DEB15A, 0x6725BA1B, 0x9845EA0E, 0xE15DFEC0, 0x02C32F75, 0x12814CF0, 0xA38D4697, 0xC66BD3F9,
+        0xE7038F5F, 0x9515929C, 0xEBBF6D7A, 0xDA955259, 0x2DD4BE83, 0xD3587421, 0x2949E069, 0x448EC9C8,
+        0x6A75C289, 0x78F48E79, 0x6B99583E, 0xDD27B971, 0xB6BEE14F, 0x17F088AD, 0x66C920AC, 0xB47DCE3A,
+        0x1863DF4A, 0x82E51A31, 0x60975133, 0x4562537F, 0xE0B16477, 0x84BB6BAE, 0x1CFE81A0, 0x94F9082B,
+        0x58704868, 0x198F45FD, 0x8794DE6C, 0xB7527BF8, 0x23AB73D3, 0xE2724B02, 0x57E31F8F, 0x2A6655AB,
+        0x07B2EB28, 0x032FB5C2, 0x9A86C57B, 0xA5D33708, 0xF2302887, 0xB223BFA5, 0xBA02036A, 0x5CED1682,
+        0x2B8ACF1C, 0x92A779B4, 0xF0F307F2, 0xA14E69E2, 0xCD65DAF4, 0xD50605BE, 0x1FD13462, 0x8AC4A6FE,
+        0x9D342E53, 0xA0A2F355, 0x32058AE1, 0x75A4F6EB, 0x390B83EC, 0xAA4060EF, 0x065E719F, 0x51BD6E10,
+        0xF93E218A, 0x3D96DD06, 0xAEDD3E05, 0x464DE6BD, 0xB591548D, 0x0571C45D, 0x6F0406D4, 0xFF605015,
+        0x241998FB, 0x97D6BDE9, 0xCC894043, 0x7767D99E, 0xBDB0E842, 0x8807898B, 0x38E7195B, 0xDB79C8EE,
+        0x47A17C0A, 0xE97C420F, 0xC9F8841E, 0x00000000, 0x83098086, 0x48322BED, 0xAC1E1170, 0x4E6C5A72,
+        0xFBFD0EFF, 0x560F8538, 0x1E3DAED5, 0x27362D39, 0x640A0FD9, 0x21685CA6, 0xD19B5B54, 0x3A24362E,
+        0xB10C0A67, 0x0F9357E7, 0xD2B4EE96, 0x9E1B9B91, 0x4F80C0C5, 0xA261DC20, 0x695A774B, 0x161C121A,
+        0x0AE293BA, 0xE5C0A02A, 0x433C22E0, 0x1D121B17, 0x0B0E090D, 0xADF28BC7, 0xB92DB6A8, 0xC8141EA9,
+        0x8557F119, 0x4CAF7507, 0xBBEE99DD, 0xFDA37F60, 0x9FF70126, 0xBC5C72F5, 0xC544663B, 0x345BFB7E,
+        0x768B4329, 0xDCCB23C6, 0x68B6EDFC, 0x63B8E4F1, 0xCAD731DC, 0x10426385, 0x40139722, 0x2084C611,
+        0x7D854A24, 0xF8D2BB3D, 0x11AEF932, 0x6DC729A1, 0x4B1D9E2F, 0xF3DCB230, 0xEC0D8652, 0xD077C1E3,
+        0x6C2BB316, 0x99A970B9, 0xFA119448, 0x2247E964, 0xC4A8FC8C, 0x1AA0F03F, 0xD8567D2C, 0xEF223390,
+        0xC787494E, 0xC1D938D1, 0xFE8CCAA2, 0x3698D40B, 0xCFA6F581, 0x28A57ADE, 0x26DAB78E, 0xA43FADBF,
+        0xE42C3A9D, 0x0D507892, 0x9B6A5FCC, 0x62547E46, 0xC2F68D13, 0xE890D8B8, 0x5E2E39F7, 0xF582C3AF,
+        0xBE9F5D80, 0x7C69D093, 0xA96FD52D, 0xB3CF2512, 0x3BC8AC99, 0xA710187D, 0x6EE89C63, 0x7BDB3BBB,
+        0x09CD2678, 0xF46E5918, 0x01EC9AB7, 0xA8834F9A, 0x65E6956E, 0x7EAAFFE6, 0x0821BCCF, 0xE6EF15E8,
+        0xD9BAE79B, 0xCE4A6F36, 0xD4EA9F09, 0xD629B07C, 0xAF31A4B2, 0x312A3F23, 0x30C6A594, 0xC035A266,
+        0x37744EBC, 0xA6FC82CA, 0xB0E090D0, 0x1533A7D8, 0x4AF10498, 0xF741ECDA, 0x0E7FCD50, 0x2F1791F6,
+        0x8D764DD6, 0x4D43EFB0, 0x54CCAA4D, 0xDFE49604, 0xE39ED1B5, 0x1B4C6A88, 0xB8C12C1F, 0x7F466551,
+        0x049D5EEA, 0x5D018C35, 0x73FA8774, 0x2EFB0B41, 0x5AB3671D, 0x5292DBD2, 0x33E91056, 0x136DD647,
+        0x8C9AD761, 0x7A37A10C, 0x8E59F814, 0x89EB133C, 0xEECEA927, 0x35B761C9, 0xEDE11CE5, 0x3C7A47B1,
+        0x599CD2DF, 0x3F55F273, 0x791814CE, 0xBF73C737, 0xEA53F7CD, 0x5B5FFDAA, 0x14DF3D6F, 0x867844DB,
+        0x81CAAFF3, 0x3EB968C4, 0x2C382434, 0x5FC2A340, 0x72161DC3, 0x0CBCE225, 0x8B283C49, 0x41FF0D95,
+        0x7139A801, 0xDE080CB3, 0x9CD8B4E4, 0x906456C1, 0x617BCB84, 0x70D532B6, 0x74486C5C, 0x42D0B857
+    );
+
+    /**
+     * Precomputed invMixColumns table
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $dt2 = array(
+        0xA75051F4, 0x65537E41, 0xA4C31A17, 0x5E963A27, 0x6BCB3BAB, 0x45F11F9D, 0x58ABACFA, 0x03934BE3,
+        0xFA552030, 0x6DF6AD76, 0x769188CC, 0x4C25F502, 0xD7FC4FE5, 0xCBD7C52A, 0x44802635, 0xA38FB562,
+        0x5A49DEB1, 0x1B6725BA, 0x0E9845EA, 0xC0E15DFE, 0x7502C32F, 0xF012814C, 0x97A38D46, 0xF9C66BD3,
+        0x5FE7038F, 0x9C951592, 0x7AEBBF6D, 0x59DA9552, 0x832DD4BE, 0x21D35874, 0x692949E0, 0xC8448EC9,
+        0x896A75C2, 0x7978F48E, 0x3E6B9958, 0x71DD27B9, 0x4FB6BEE1, 0xAD17F088, 0xAC66C920, 0x3AB47DCE,
+        0x4A1863DF, 0x3182E51A, 0x33609751, 0x7F456253, 0x77E0B164, 0xAE84BB6B, 0xA01CFE81, 0x2B94F908,
+        0x68587048, 0xFD198F45, 0x6C8794DE, 0xF8B7527B, 0xD323AB73, 0x02E2724B, 0x8F57E31F, 0xAB2A6655,
+        0x2807B2EB, 0xC2032FB5, 0x7B9A86C5, 0x08A5D337, 0x87F23028, 0xA5B223BF, 0x6ABA0203, 0x825CED16,
+        0x1C2B8ACF, 0xB492A779, 0xF2F0F307, 0xE2A14E69, 0xF4CD65DA, 0xBED50605, 0x621FD134, 0xFE8AC4A6,
+        0x539D342E, 0x55A0A2F3, 0xE132058A, 0xEB75A4F6, 0xEC390B83, 0xEFAA4060, 0x9F065E71, 0x1051BD6E,
+        0x8AF93E21, 0x063D96DD, 0x05AEDD3E, 0xBD464DE6, 0x8DB59154, 0x5D0571C4, 0xD46F0406, 0x15FF6050,
+        0xFB241998, 0xE997D6BD, 0x43CC8940, 0x9E7767D9, 0x42BDB0E8, 0x8B880789, 0x5B38E719, 0xEEDB79C8,
+        0x0A47A17C, 0x0FE97C42, 0x1EC9F884, 0x00000000, 0x86830980, 0xED48322B, 0x70AC1E11, 0x724E6C5A,
+        0xFFFBFD0E, 0x38560F85, 0xD51E3DAE, 0x3927362D, 0xD9640A0F, 0xA621685C, 0x54D19B5B, 0x2E3A2436,
+        0x67B10C0A, 0xE70F9357, 0x96D2B4EE, 0x919E1B9B, 0xC54F80C0, 0x20A261DC, 0x4B695A77, 0x1A161C12,
+        0xBA0AE293, 0x2AE5C0A0, 0xE0433C22, 0x171D121B, 0x0D0B0E09, 0xC7ADF28B, 0xA8B92DB6, 0xA9C8141E,
+        0x198557F1, 0x074CAF75, 0xDDBBEE99, 0x60FDA37F, 0x269FF701, 0xF5BC5C72, 0x3BC54466, 0x7E345BFB,
+        0x29768B43, 0xC6DCCB23, 0xFC68B6ED, 0xF163B8E4, 0xDCCAD731, 0x85104263, 0x22401397, 0x112084C6,
+        0x247D854A, 0x3DF8D2BB, 0x3211AEF9, 0xA16DC729, 0x2F4B1D9E, 0x30F3DCB2, 0x52EC0D86, 0xE3D077C1,
+        0x166C2BB3, 0xB999A970, 0x48FA1194, 0x642247E9, 0x8CC4A8FC, 0x3F1AA0F0, 0x2CD8567D, 0x90EF2233,
+        0x4EC78749, 0xD1C1D938, 0xA2FE8CCA, 0x0B3698D4, 0x81CFA6F5, 0xDE28A57A, 0x8E26DAB7, 0xBFA43FAD,
+        0x9DE42C3A, 0x920D5078, 0xCC9B6A5F, 0x4662547E, 0x13C2F68D, 0xB8E890D8, 0xF75E2E39, 0xAFF582C3,
+        0x80BE9F5D, 0x937C69D0, 0x2DA96FD5, 0x12B3CF25, 0x993BC8AC, 0x7DA71018, 0x636EE89C, 0xBB7BDB3B,
+        0x7809CD26, 0x18F46E59, 0xB701EC9A, 0x9AA8834F, 0x6E65E695, 0xE67EAAFF, 0xCF0821BC, 0xE8E6EF15,
+        0x9BD9BAE7, 0x36CE4A6F, 0x09D4EA9F, 0x7CD629B0, 0xB2AF31A4, 0x23312A3F, 0x9430C6A5, 0x66C035A2,
+        0xBC37744E, 0xCAA6FC82, 0xD0B0E090, 0xD81533A7, 0x984AF104, 0xDAF741EC, 0x500E7FCD, 0xF62F1791,
+        0xD68D764D, 0xB04D43EF, 0x4D54CCAA, 0x04DFE496, 0xB5E39ED1, 0x881B4C6A, 0x1FB8C12C, 0x517F4665,
+        0xEA049D5E, 0x355D018C, 0x7473FA87, 0x412EFB0B, 0x1D5AB367, 0xD25292DB, 0x5633E910, 0x47136DD6,
+        0x618C9AD7, 0x0C7A37A1, 0x148E59F8, 0x3C89EB13, 0x27EECEA9, 0xC935B761, 0xE5EDE11C, 0xB13C7A47,
+        0xDF599CD2, 0x733F55F2, 0xCE791814, 0x37BF73C7, 0xCDEA53F7, 0xAA5B5FFD, 0x6F14DF3D, 0xDB867844,
+        0xF381CAAF, 0xC43EB968, 0x342C3824, 0x405FC2A3, 0xC372161D, 0x250CBCE2, 0x498B283C, 0x9541FF0D,
+        0x017139A8, 0xB3DE080C, 0xE49CD8B4, 0xC1906456, 0x84617BCB, 0xB670D532, 0x5C74486C, 0x5742D0B8
+    );
+
+    /**
+     * Precomputed invMixColumns table
+     *
+     * @see Crypt_Rijndael:_encryptBlock()
+     * @see Crypt_Rijndael:_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $dt3 = array(
+        0xF4A75051, 0x4165537E, 0x17A4C31A, 0x275E963A, 0xAB6BCB3B, 0x9D45F11F, 0xFA58ABAC, 0xE303934B,
+        0x30FA5520, 0x766DF6AD, 0xCC769188, 0x024C25F5, 0xE5D7FC4F, 0x2ACBD7C5, 0x35448026, 0x62A38FB5,
+        0xB15A49DE, 0xBA1B6725, 0xEA0E9845, 0xFEC0E15D, 0x2F7502C3, 0x4CF01281, 0x4697A38D, 0xD3F9C66B,
+        0x8F5FE703, 0x929C9515, 0x6D7AEBBF, 0x5259DA95, 0xBE832DD4, 0x7421D358, 0xE0692949, 0xC9C8448E,
+        0xC2896A75, 0x8E7978F4, 0x583E6B99, 0xB971DD27, 0xE14FB6BE, 0x88AD17F0, 0x20AC66C9, 0xCE3AB47D,
+        0xDF4A1863, 0x1A3182E5, 0x51336097, 0x537F4562, 0x6477E0B1, 0x6BAE84BB, 0x81A01CFE, 0x082B94F9,
+        0x48685870, 0x45FD198F, 0xDE6C8794, 0x7BF8B752, 0x73D323AB, 0x4B02E272, 0x1F8F57E3, 0x55AB2A66,
+        0xEB2807B2, 0xB5C2032F, 0xC57B9A86, 0x3708A5D3, 0x2887F230, 0xBFA5B223, 0x036ABA02, 0x16825CED,
+        0xCF1C2B8A, 0x79B492A7, 0x07F2F0F3, 0x69E2A14E, 0xDAF4CD65, 0x05BED506, 0x34621FD1, 0xA6FE8AC4,
+        0x2E539D34, 0xF355A0A2, 0x8AE13205, 0xF6EB75A4, 0x83EC390B, 0x60EFAA40, 0x719F065E, 0x6E1051BD,
+        0x218AF93E, 0xDD063D96, 0x3E05AEDD, 0xE6BD464D, 0x548DB591, 0xC45D0571, 0x06D46F04, 0x5015FF60,
+        0x98FB2419, 0xBDE997D6, 0x4043CC89, 0xD99E7767, 0xE842BDB0, 0x898B8807, 0x195B38E7, 0xC8EEDB79,
+        0x7C0A47A1, 0x420FE97C, 0x841EC9F8, 0x00000000, 0x80868309, 0x2BED4832, 0x1170AC1E, 0x5A724E6C,
+        0x0EFFFBFD, 0x8538560F, 0xAED51E3D, 0x2D392736, 0x0FD9640A, 0x5CA62168, 0x5B54D19B, 0x362E3A24,
+        0x0A67B10C, 0x57E70F93, 0xEE96D2B4, 0x9B919E1B, 0xC0C54F80, 0xDC20A261, 0x774B695A, 0x121A161C,
+        0x93BA0AE2, 0xA02AE5C0, 0x22E0433C, 0x1B171D12, 0x090D0B0E, 0x8BC7ADF2, 0xB6A8B92D, 0x1EA9C814,
+        0xF1198557, 0x75074CAF, 0x99DDBBEE, 0x7F60FDA3, 0x01269FF7, 0x72F5BC5C, 0x663BC544, 0xFB7E345B,
+        0x4329768B, 0x23C6DCCB, 0xEDFC68B6, 0xE4F163B8, 0x31DCCAD7, 0x63851042, 0x97224013, 0xC6112084,
+        0x4A247D85, 0xBB3DF8D2, 0xF93211AE, 0x29A16DC7, 0x9E2F4B1D, 0xB230F3DC, 0x8652EC0D, 0xC1E3D077,
+        0xB3166C2B, 0x70B999A9, 0x9448FA11, 0xE9642247, 0xFC8CC4A8, 0xF03F1AA0, 0x7D2CD856, 0x3390EF22,
+        0x494EC787, 0x38D1C1D9, 0xCAA2FE8C, 0xD40B3698, 0xF581CFA6, 0x7ADE28A5, 0xB78E26DA, 0xADBFA43F,
+        0x3A9DE42C, 0x78920D50, 0x5FCC9B6A, 0x7E466254, 0x8D13C2F6, 0xD8B8E890, 0x39F75E2E, 0xC3AFF582,
+        0x5D80BE9F, 0xD0937C69, 0xD52DA96F, 0x2512B3CF, 0xAC993BC8, 0x187DA710, 0x9C636EE8, 0x3BBB7BDB,
+        0x267809CD, 0x5918F46E, 0x9AB701EC, 0x4F9AA883, 0x956E65E6, 0xFFE67EAA, 0xBCCF0821, 0x15E8E6EF,
+        0xE79BD9BA, 0x6F36CE4A, 0x9F09D4EA, 0xB07CD629, 0xA4B2AF31, 0x3F23312A, 0xA59430C6, 0xA266C035,
+        0x4EBC3774, 0x82CAA6FC, 0x90D0B0E0, 0xA7D81533, 0x04984AF1, 0xECDAF741, 0xCD500E7F, 0x91F62F17,
+        0x4DD68D76, 0xEFB04D43, 0xAA4D54CC, 0x9604DFE4, 0xD1B5E39E, 0x6A881B4C, 0x2C1FB8C1, 0x65517F46,
+        0x5EEA049D, 0x8C355D01, 0x877473FA, 0x0B412EFB, 0x671D5AB3, 0xDBD25292, 0x105633E9, 0xD647136D,
+        0xD7618C9A, 0xA10C7A37, 0xF8148E59, 0x133C89EB, 0xA927EECE, 0x61C935B7, 0x1CE5EDE1, 0x47B13C7A,
+        0xD2DF599C, 0xF2733F55, 0x14CE7918, 0xC737BF73, 0xF7CDEA53, 0xFDAA5B5F, 0x3D6F14DF, 0x44DB8678,
+        0xAFF381CA, 0x68C43EB9, 0x24342C38, 0xA3405FC2, 0x1DC37216, 0xE2250CBC, 0x3C498B28, 0x0D9541FF,
+        0xA8017139, 0x0CB3DE08, 0xB4E49CD8, 0x56C19064, 0xCB84617B, 0x32B670D5, 0x6C5C7448, 0xB85742D0
+    );
+
+    /**
+     * The SubByte S-Box
+     *
+     * @see Crypt_Rijndael::_encryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $sbox = array(
+        0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76,
+        0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0,
+        0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15,
+        0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75,
+        0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84,
+        0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF,
+        0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8,
+        0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2,
+        0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73,
+        0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB,
+        0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79,
+        0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08,
+        0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A,
+        0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E,
+        0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF,
+        0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16
+    );
+
+    /**
+     * The inverse SubByte S-Box
+     *
+     * @see Crypt_Rijndael::_decryptBlock()
+     * @var Array
+     * @access private
+     */
+    var $isbox = array(
+        0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB,
+        0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB,
+        0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E,
+        0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25,
+        0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92,
+        0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84,
+        0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06,
+        0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B,
+        0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73,
+        0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E,
+        0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B,
+        0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4,
+        0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F,
+        0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF,
+        0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61,
+        0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D
+    );
+
+    /**
+     * Default Constructor.
+     *
+     * Determines whether or not the mcrypt extension should be used.
+     *
+     * $mode could be:
+     *
+     * - CRYPT_RIJNDAEL_MODE_ECB
+     *
+     * - CRYPT_RIJNDAEL_MODE_CBC
+     *
+     * - CRYPT_RIJNDAEL_MODE_CTR
+     *
+     * - CRYPT_RIJNDAEL_MODE_CFB
+     *
+     * - CRYPT_RIJNDAEL_MODE_OFB
+     *
+     * If not explictly set, CRYPT_RIJNDAEL_MODE_CBC will be used.
+     *
+     * @see Crypt_Base::Crypt_Base()
+     * @param optional Integer $mode
+     * @access public
+     */
+    function Crypt_Rijndael($mode = CRYPT_RIJNDAEL_MODE_CBC)
+    {
+        parent::Crypt_Base($mode);
+    }
+
+    /**
+     * Sets the key.
+     *
+     * Keys can be of any length.  Rijndael, itself, requires the use of a key that's between 128-bits and 256-bits long and
+     * whose length is a multiple of 32.  If the key is less than 256-bits and the key length isn't set, we round the length
+     * up to the closest valid key length, padding $key with null bytes.  If the key is more than 256-bits, we trim the
+     * excess bits.
+     *
+     * If the key is not explicitly set, it'll be assumed to be all null bytes.
+     *
+     * Note: 160/224-bit keys must explicitly set by setKeyLength(), otherwise they will be round/pad up to 192/256 bits.
+     *
+     * @see Crypt_Base:setKey()
+     * @see setKeyLength()
+     * @access public
+     * @param String $key
+     */
+    function setKey($key)
+    {
+        parent::setKey($key);
+
+        if (!$this->explicit_key_length) {
+            $length = strlen($key);
+            switch (true) {
+                case $length <= 16:
+                    $this->key_size = 16;
+                    break;
+                case $length <= 24:
+                    $this->key_size = 24;
+                    break;
+                default:
+                    $this->key_size = 32;
+            }
+            $this->_setupEngine();
+        }
+    }
+
+    /**
+     * Sets the key length
+     *
+     * Valid key lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
+     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
+     *
+     * Note: phpseclib extends Rijndael (and AES) for using 160- and 224-bit keys but they are officially not defined
+     *       and the most (if not all) implementations are not able using 160/224-bit keys but round/pad them up to
+     *       192/256 bits as, for example, mcrypt will do.
+     *
+     *       That said, if you want be compatible with other Rijndael and AES implementations,
+     *       you should not setKeyLength(160) or setKeyLength(224).
+     *
+     * Additional: In case of 160- and 224-bit keys, phpseclib will/can, for that reason, not use
+     *             the mcrypt php extention, even if available.
+     *             This results then in slower encryption.
+     *
+     * @access public
+     * @param Integer $length
+     */
+    function setKeyLength($length)
+    {
+        switch (true) {
+            case $length == 160:
+                $this->key_size = 20;
+                break;
+            case $length == 224:
+                $this->key_size = 28;
+                break;
+            case $length <= 128:
+                $this->key_size = 16;
+                break;
+            case $length <= 192:
+                $this->key_size = 24;
+                break;
+            default:
+                $this->key_size = 32;
+        }
+
+        $this->explicit_key_length = true;
+        $this->changed = true;
+        $this->_setupEngine();
+    }
+
+    /**
+     * Sets the block length
+     *
+     * Valid block lengths are 128, 160, 192, 224, and 256.  If the length is less than 128, it will be rounded up to
+     * 128.  If the length is greater than 128 and invalid, it will be rounded down to the closest valid amount.
+     *
+     * @access public
+     * @param Integer $length
+     */
+    function setBlockLength($length)
+    {
+        $length >>= 5;
+        if ($length > 8) {
+            $length = 8;
+        } else if ($length < 4) {
+            $length = 4;
+        }
+        $this->Nb = $length;
+        $this->block_size = $length << 2;
+        $this->changed = true;
+        $this->_setupEngine();
+    }
+
+    /**
+     * Setup the fastest possible $engine
+     *
+     * Determines if the mcrypt (MODE_MCRYPT) $engine available
+     * and usable for the current $block_size and $key_size.
+     *
+     * If not, the slower MODE_INTERNAL $engine will be set.
+     *
+     * @see setKey()
+     * @see setKeyLength()
+     * @see setBlockLength()
+     * @access private
+     */
+    function _setupEngine()
+    {
+        if (constant('CRYPT_' . $this->const_namespace . '_MODE') == CRYPT_MODE_INTERNAL) {
+            // No mcrypt support at all for rijndael
+            return;
+        }
+
+        // The required mcrypt module name for the current $block_size of rijndael
+        $cipher_name_mcrypt = 'rijndael-' . ($this->block_size << 3);
+
+        // Determining the availibility/usability of $cipher_name_mcrypt
+        switch (true) {
+            case $this->key_size % 8: // mcrypt is not usable for 160/224-bit keys, only for 128/192/256-bit keys
+            case !in_array($cipher_name_mcrypt, mcrypt_list_algorithms()): // $cipher_name_mcrypt is not available for the current $block_size
+                $engine = CRYPT_MODE_INTERNAL;
+                break;
+            default:
+                $engine = CRYPT_MODE_MCRYPT;
+        }
+
+        if ($this->engine == $engine && $this->cipher_name_mcrypt == $cipher_name_mcrypt) {
+            // allready set, so we not unnecessary close $this->enmcrypt/demcrypt/ecb
+            return;
+        }
+
+        // Set the $engine
+        $this->engine = $engine;
+        $this->cipher_name_mcrypt = $cipher_name_mcrypt;
+
+        if ($this->enmcrypt) {
+            // Closing the current mcrypt resource(s). _mcryptSetup() will, if needed,
+            // (re)open them with the module named in $this->cipher_name_mcrypt
+            mcrypt_module_close($this->enmcrypt);
+            mcrypt_module_close($this->demcrypt);
+            $this->enmcrypt = null;
+            $this->demcrypt = null;
+
+            if ($this->ecb) {
+                mcrypt_module_close($this->ecb);
+                $this->ecb = null;
+            }
+        }
+    }
+
+    /**
+     * Setup the CRYPT_MODE_MCRYPT $engine
+     *
+     * @see Crypt_Base::_setupMcrypt()
+     * @access private
+     */
+    function _setupMcrypt()
+    {
+        $this->key = str_pad(substr($this->key, 0, $this->key_size), $this->key_size, "\0");
+        parent::_setupMcrypt();
+    }
+
+    /**
+     * Encrypts a block
+     *
+     * @access private
+     * @param String $in
+     * @return String
+     */
+    function _encryptBlock($in)
+    {
+        static $t0, $t1, $t2, $t3, $sbox;
+        if (!$t0) {
+            for ($i = 0; $i < 256; ++$i) {
+                $t0[] = (int)$this->t0[$i];
+                $t1[] = (int)$this->t1[$i];
+                $t2[] = (int)$this->t2[$i];
+                $t3[] = (int)$this->t3[$i];
+                $sbox[] = (int)$this->sbox[$i];
+            }
+        }
+
+        $state = array();
+        $words = unpack('N*', $in);
+
+        $c = $this->c;
+        $w = $this->w;
+        $Nb = $this->Nb;
+        $Nr = $this->Nr;
+
+        // addRoundKey
+        $i = -1;
+        foreach ($words as $word) {
+            $state[] = $word ^ $w[0][++$i];
+        }
+
+        // fips-197.pdf#page=19, "Figure 5. Pseudo Code for the Cipher", states that this loop has four components -
+        // subBytes, shiftRows, mixColumns, and addRoundKey. fips-197.pdf#page=30, "Implementation Suggestions Regarding
+        // Various Platforms" suggests that performs enhanced implementations are described in Rijndael-ammended.pdf.
+        // Rijndael-ammended.pdf#page=20, "Implementation aspects / 32-bit processor", discusses such an optimization.
+        // Unfortunately, the description given there is not quite correct.  Per aes.spec.v316.pdf#page=19 [1],
+        // equation (7.4.7) is supposed to use addition instead of subtraction, so we'll do that here, as well.
+
+        // [1] http://fp.gladman.plus.com/cryptography_technology/rijndael/aes.spec.v316.pdf
+        $temp = array();
+        for ($round = 1; $round < $Nr; ++$round) {
+            $i = 0; // $c[0] == 0
+            $j = $c[1];
+            $k = $c[2];
+            $l = $c[3];
+
+            while ($i < $Nb) {
+                $temp[$i] = $t0[$state[$i] >> 24 & 0x000000FF] ^
+                            $t1[$state[$j] >> 16 & 0x000000FF] ^
+                            $t2[$state[$k] >>  8 & 0x000000FF] ^
+                            $t3[$state[$l]       & 0x000000FF] ^
+                            $w[$round][$i];
+                ++$i;
+                $j = ($j + 1) % $Nb;
+                $k = ($k + 1) % $Nb;
+                $l = ($l + 1) % $Nb;
+            }
+            $state = $temp;
+        }
+
+        // subWord
+        for ($i = 0; $i < $Nb; ++$i) {
+            $state[$i] =   $sbox[$state[$i]       & 0x000000FF]        |
+                          ($sbox[$state[$i] >>  8 & 0x000000FF] <<  8) |
+                          ($sbox[$state[$i] >> 16 & 0x000000FF] << 16) |
+                          ($sbox[$state[$i] >> 24 & 0x000000FF] << 24);
+        }
+
+        // shiftRows + addRoundKey
+        $i = 0; // $c[0] == 0
+        $j = $c[1];
+        $k = $c[2];
+        $l = $c[3];
+        while ($i < $Nb) {
+            $temp[$i] = ($state[$i] & 0xFF000000) ^
+                        ($state[$j] & 0x00FF0000) ^
+                        ($state[$k] & 0x0000FF00) ^
+                        ($state[$l] & 0x000000FF) ^
+                         $w[$Nr][$i];
+            ++$i;
+            $j = ($j + 1) % $Nb;
+            $k = ($k + 1) % $Nb;
+            $l = ($l + 1) % $Nb;
+        }
+
+        switch ($Nb) {
+            case 8:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
+            case 7:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
+            case 6:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
+            case 5:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
+            default:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
+        }
+    }
+
+    /**
+     * Decrypts a block
+     *
+     * @access private
+     * @param String $in
+     * @return String
+     */
+    function _decryptBlock($in)
+    {
+        static $dt0, $dt1, $dt2, $dt3, $isbox;
+        if (!$dt0) {
+            for ($i = 0; $i < 256; ++$i) {
+                $dt0[] = (int)$this->dt0[$i];
+                $dt1[] = (int)$this->dt1[$i];
+                $dt2[] = (int)$this->dt2[$i];
+                $dt3[] = (int)$this->dt3[$i];
+                $isbox[] = (int)$this->isbox[$i];
+            }
+        }
+
+        $state = array();
+        $words = unpack('N*', $in);
+
+        $c  = $this->c;
+        $dw = $this->dw;
+        $Nb = $this->Nb;
+        $Nr = $this->Nr;
+
+        // addRoundKey
+        $i = -1;
+        foreach ($words as $word) {
+            $state[] = $word ^ $dw[$Nr][++$i];
+        }
+
+        $temp = array();
+        for ($round = $Nr - 1; $round > 0; --$round) {
+            $i = 0; // $c[0] == 0
+            $j = $Nb - $c[1];
+            $k = $Nb - $c[2];
+            $l = $Nb - $c[3];
+
+            while ($i < $Nb) {
+                $temp[$i] = $dt0[$state[$i] >> 24 & 0x000000FF] ^
+                            $dt1[$state[$j] >> 16 & 0x000000FF] ^
+                            $dt2[$state[$k] >>  8 & 0x000000FF] ^
+                            $dt3[$state[$l]       & 0x000000FF] ^
+                            $dw[$round][$i];
+                ++$i;
+                $j = ($j + 1) % $Nb;
+                $k = ($k + 1) % $Nb;
+                $l = ($l + 1) % $Nb;
+            }
+            $state = $temp;
+        }
+
+        // invShiftRows + invSubWord + addRoundKey
+        $i = 0; // $c[0] == 0
+        $j = $Nb - $c[1];
+        $k = $Nb - $c[2];
+        $l = $Nb - $c[3];
+
+        while ($i < $Nb) {
+            $word = ($state[$i] & 0xFF000000) |
+                    ($state[$j] & 0x00FF0000) |
+                    ($state[$k] & 0x0000FF00) |
+                    ($state[$l] & 0x000000FF);
+
+            $temp[$i] = $dw[0][$i] ^ ($isbox[$word       & 0x000000FF]        |
+                                     ($isbox[$word >>  8 & 0x000000FF] <<  8) |
+                                     ($isbox[$word >> 16 & 0x000000FF] << 16) |
+                                     ($isbox[$word >> 24 & 0x000000FF] << 24));
+            ++$i;
+            $j = ($j + 1) % $Nb;
+            $k = ($k + 1) % $Nb;
+            $l = ($l + 1) % $Nb;
+        }
+
+        switch ($Nb) {
+            case 8:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6], $temp[7]);
+            case 7:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5], $temp[6]);
+            case 6:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4], $temp[5]);
+            case 5:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3], $temp[4]);
+            default:
+                return pack('N*', $temp[0], $temp[1], $temp[2], $temp[3]);
+        }
+    }
+
+    /**
+     * Setup the key (expansion)
+     *
+     * @see Crypt_Base::_setupKey()
+     * @access private
+     */
+    function _setupKey()
+    {
+        // Each number in $rcon is equal to the previous number multiplied by two in Rijndael's finite field.
+        // See http://en.wikipedia.org/wiki/Finite_field_arithmetic#Multiplicative_inverse
+        static $rcon = array(0,
+            0x01000000, 0x02000000, 0x04000000, 0x08000000, 0x10000000,
+            0x20000000, 0x40000000, 0x80000000, 0x1B000000, 0x36000000,
+            0x6C000000, 0xD8000000, 0xAB000000, 0x4D000000, 0x9A000000,
+            0x2F000000, 0x5E000000, 0xBC000000, 0x63000000, 0xC6000000,
+            0x97000000, 0x35000000, 0x6A000000, 0xD4000000, 0xB3000000,
+            0x7D000000, 0xFA000000, 0xEF000000, 0xC5000000, 0x91000000
+        );
+
+        $this->key = str_pad(substr($this->key, 0, $this->key_size), $this->key_size, "\0");
+
+        if (isset($this->kl['key']) && $this->key === $this->kl['key'] && $this->key_size === $this->kl['key_size'] && $this->block_size === $this->kl['block_size']) {
+            // already expanded
+            return;
+        }
+        $this->kl = array('key' => $this->key, 'key_size' => $this->key_size, 'block_size' => $this->block_size);
+
+        $this->Nk = $this->key_size >> 2;
+        // see Rijndael-ammended.pdf#page=44
+        $this->Nr = max($this->Nk, $this->Nb) + 6;
+
+        // shift offsets for Nb = 5, 7 are defined in Rijndael-ammended.pdf#page=44,
+        //     "Table 8: Shift offsets in Shiftrow for the alternative block lengths"
+        // shift offsets for Nb = 4, 6, 8 are defined in Rijndael-ammended.pdf#page=14,
+        //     "Table 2: Shift offsets for different block lengths"
+        switch ($this->Nb) {
+            case 4:
+            case 5:
+            case 6:
+                $this->c = array(0, 1, 2, 3);
+                break;
+            case 7:
+                $this->c = array(0, 1, 2, 4);
+                break;
+            case 8:
+                $this->c = array(0, 1, 3, 4);
+        }
+
+        $w = array_values(unpack('N*words', $this->key));
+
+        $length = $this->Nb * ($this->Nr + 1);
+        for ($i = $this->Nk; $i < $length; $i++) {
+            $temp = $w[$i - 1];
+            if ($i % $this->Nk == 0) {
+                // according to , "the size of an integer is platform-dependent".
+                // on a 32-bit machine, it's 32-bits, and on a 64-bit machine, it's 64-bits. on a 32-bit machine,
+                // 0xFFFFFFFF << 8 == 0xFFFFFF00, but on a 64-bit machine, it equals 0xFFFFFFFF00. as such, doing 'and'
+                // with 0xFFFFFFFF (or 0xFFFFFF00) on a 32-bit machine is unnecessary, but on a 64-bit machine, it is.
+                $temp = (($temp << 8) & 0xFFFFFF00) | (($temp >> 24) & 0x000000FF); // rotWord
+                $temp = $this->_subWord($temp) ^ $rcon[$i / $this->Nk];
+            } else if ($this->Nk > 6 && $i % $this->Nk == 4) {
+                $temp = $this->_subWord($temp);
+            }
+            $w[$i] = $w[$i - $this->Nk] ^ $temp;
+        }
+
+        // convert the key schedule from a vector of $Nb * ($Nr + 1) length to a matrix with $Nr + 1 rows and $Nb columns
+        // and generate the inverse key schedule.  more specifically,
+        // according to  (section 5.3.3),
+        // "The key expansion for the Inverse Cipher is defined as follows:
+        //        1. Apply the Key Expansion.
+        //        2. Apply InvMixColumn to all Round Keys except the first and the last one."
+        // also, see fips-197.pdf#page=27, "5.3.5 Equivalent Inverse Cipher"
+        $temp = $this->w = $this->dw = array();
+        for ($i = $row = $col = 0; $i < $length; $i++, $col++) {
+            if ($col == $this->Nb) {
+                if ($row == 0) {
+                    $this->dw[0] = $this->w[0];
+                } else {
+                    // subWord + invMixColumn + invSubWord = invMixColumn
+                    $j = 0;
+                    while ($j < $this->Nb) {
+                        $dw = $this->_subWord($this->w[$row][$j]);
+                        $temp[$j] = $this->dt0[$dw >> 24 & 0x000000FF] ^
+                                    $this->dt1[$dw >> 16 & 0x000000FF] ^
+                                    $this->dt2[$dw >>  8 & 0x000000FF] ^
+                                    $this->dt3[$dw       & 0x000000FF];
+                        $j++;
+                    }
+                    $this->dw[$row] = $temp;
+                }
+
+                $col = 0;
+                $row++;
+            }
+            $this->w[$row][$col] = $w[$i];
+        }
+
+        $this->dw[$row] = $this->w[$row];
+
+        // In case of $this->use_inline_crypt === true we have to use 1-dim key arrays (both ascending)
+        if ($this->use_inline_crypt) {
+            $this->dw = array_reverse($this->dw);
+            $w  = array_pop($this->w);
+            $dw = array_pop($this->dw);
+            foreach ($this->w as $r => $wr) {
+                foreach ($wr as $c => $wc) {
+                    $w[]  = $wc;
+                    $dw[] = $this->dw[$r][$c];
+                }
+            }
+            $this->w  = $w;
+            $this->dw = $dw;
+        }
+    }
+
+    /**
+     * Performs S-Box substitutions
+     *
+     * @access private
+     * @param Integer $word
+     */
+    function _subWord($word)
+    {
+        $sbox = $this->sbox;
+
+        return  $sbox[$word       & 0x000000FF]        |
+               ($sbox[$word >>  8 & 0x000000FF] <<  8) |
+               ($sbox[$word >> 16 & 0x000000FF] << 16) |
+               ($sbox[$word >> 24 & 0x000000FF] << 24);
+    }
+
+    /**
+     * Setup the performance-optimized function for de/encrypt()
+     *
+     * @see Crypt_Base::_setupInlineCrypt()
+     * @access private
+     */
+    function _setupInlineCrypt()
+    {
+        // Note: _setupInlineCrypt() will be called only if $this->changed === true
+        // So here we are'nt under the same heavy timing-stress as we are in _de/encryptBlock() or de/encrypt().
+        // However...the here generated function- $code, stored as php callback in $this->inline_crypt, must work as fast as even possible.
+
+        $lambda_functions =& Crypt_Rijndael::_getLambdaFunctions();
+
+        // The first 10 generated $lambda_functions will use the key-words hardcoded for better performance.
+        // For memory reason we limit those ultra-optimized functions.
+        // After that, we use pure (extracted) integer vars for the key-words which is faster than accessing them via array.
+        if (count($lambda_functions) < 10) {
+            $w  = $this->w;
+            $dw = $this->dw;
+            $init_encrypt = '';
+            $init_decrypt = '';
+        } else {
+            for ($i = 0, $cw = count($this->w); $i < $cw; ++$i) {
+                $w[]  = '$w['  . $i . ']';
+                $dw[] = '$dw[' . $i . ']';
+            }
+            $init_encrypt = '$w = $self->w;';
+            $init_decrypt = '$dw = $self->dw;';
+        }
+
+        $code_hash = md5(str_pad("Crypt_Rijndael, {$this->mode}, {$this->block_size}, ", 32, "\0") . implode(',', $w));
+
+        if (!isset($lambda_functions[$code_hash])) {
+            $Nr = $this->Nr;
+            $Nb = $this->Nb;
+            $c  = $this->c;
+
+            // Generating encrypt code:
+            $init_encrypt.= '
+                static $t0, $t1, $t2, $t3, $sbox;
+                if (!$t0) {
+                    for ($i = 0; $i < 256; ++$i) {
+                        $t0[$i]    = (int)$self->t0[$i];
+                        $t1[$i]    = (int)$self->t1[$i];
+                        $t2[$i]    = (int)$self->t2[$i];
+                        $t3[$i]    = (int)$self->t3[$i];
+                        $sbox[$i]  = (int)$self->sbox[$i];
+                    }
+                }
+            ';
+
+            $s  = 'e';
+            $e  = 's';
+            $wc = $Nb - 1;
+
+            // Preround: addRoundKey
+            $encrypt_block = '$in = unpack("N*", $in);'."\n";
+            for ($i = 0; $i < $Nb; ++$i) {
+                $encrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$w[++$wc].";\n";
+            }
+
+            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
+            for ($round = 1; $round < $Nr; ++$round) {
+                list($s, $e) = array($e, $s);
+                for ($i = 0; $i < $Nb; ++$i) {
+                    $encrypt_block.=
+                        '$'.$e.$i.' =
+                        $t0[($'.$s.$i                  .' >> 24) & 0xff] ^
+                        $t1[($'.$s.(($i + $c[1]) % $Nb).' >> 16) & 0xff] ^
+                        $t2[($'.$s.(($i + $c[2]) % $Nb).' >>  8) & 0xff] ^
+                        $t3[ $'.$s.(($i + $c[3]) % $Nb).'        & 0xff] ^
+                        '.$w[++$wc].";\n";
+                }
+            }
+
+            // Finalround: subWord + shiftRows + addRoundKey
+            for ($i = 0; $i < $Nb; ++$i) {
+                $encrypt_block.=
+                    '$'.$e.$i.' =
+                     $sbox[ $'.$e.$i.'        & 0xff]        |
+                    ($sbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
+                    ($sbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
+                    ($sbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
+            }
+            $encrypt_block .= '$in = pack("N*"'."\n";
+            for ($i = 0; $i < $Nb; ++$i) {
+                $encrypt_block.= ',
+                    ($'.$e.$i                  .' & 0xFF000000) ^
+                    ($'.$e.(($i + $c[1]) % $Nb).' & 0x00FF0000) ^
+                    ($'.$e.(($i + $c[2]) % $Nb).' & 0x0000FF00) ^
+                    ($'.$e.(($i + $c[3]) % $Nb).' & 0x000000FF) ^
+                    '.$w[$i]."\n";
+            }
+            $encrypt_block .= ');';
+
+            // Generating decrypt code:
+            $init_decrypt.= '
+                static $dt0, $dt1, $dt2, $dt3, $isbox;
+                if (!$dt0) {
+                    for ($i = 0; $i < 256; ++$i) {
+                        $dt0[$i]   = (int)$self->dt0[$i];
+                        $dt1[$i]   = (int)$self->dt1[$i];
+                        $dt2[$i]   = (int)$self->dt2[$i];
+                        $dt3[$i]   = (int)$self->dt3[$i];
+                        $isbox[$i] = (int)$self->isbox[$i];
+                    }
+                }
+            ';
+
+            $s  = 'e';
+            $e  = 's';
+            $wc = $Nb - 1;
+
+            // Preround: addRoundKey
+            $decrypt_block = '$in = unpack("N*", $in);'."\n";
+            for ($i = 0; $i < $Nb; ++$i) {
+                $decrypt_block .= '$s'.$i.' = $in['.($i + 1).'] ^ '.$dw[++$wc].';'."\n";
+            }
+
+            // Mainrounds: shiftRows + subWord + mixColumns + addRoundKey
+            for ($round = 1; $round < $Nr; ++$round) {
+                list($s, $e) = array($e, $s);
+                for ($i = 0; $i < $Nb; ++$i) {
+                    $decrypt_block.=
+                        '$'.$e.$i.' =
+                        $dt0[($'.$s.$i                        .' >> 24) & 0xff] ^
+                        $dt1[($'.$s.(($Nb + $i - $c[1]) % $Nb).' >> 16) & 0xff] ^
+                        $dt2[($'.$s.(($Nb + $i - $c[2]) % $Nb).' >>  8) & 0xff] ^
+                        $dt3[ $'.$s.(($Nb + $i - $c[3]) % $Nb).'        & 0xff] ^
+                        '.$dw[++$wc].";\n";
+                }
+            }
+
+            // Finalround: subWord + shiftRows + addRoundKey
+            for ($i = 0; $i < $Nb; ++$i) {
+                $decrypt_block.=
+                    '$'.$e.$i.' =
+                     $isbox[ $'.$e.$i.'        & 0xff]        |
+                    ($isbox[($'.$e.$i.' >>  8) & 0xff] <<  8) |
+                    ($isbox[($'.$e.$i.' >> 16) & 0xff] << 16) |
+                    ($isbox[($'.$e.$i.' >> 24) & 0xff] << 24);'."\n";
+            }
+            $decrypt_block .= '$in = pack("N*"'."\n";
+            for ($i = 0; $i < $Nb; ++$i) {
+                $decrypt_block.= ',
+                    ($'.$e.$i.                        ' & 0xFF000000) ^
+                    ($'.$e.(($Nb + $i - $c[1]) % $Nb).' & 0x00FF0000) ^
+                    ($'.$e.(($Nb + $i - $c[2]) % $Nb).' & 0x0000FF00) ^
+                    ($'.$e.(($Nb + $i - $c[3]) % $Nb).' & 0x000000FF) ^
+                    '.$dw[$i]."\n";
+            }
+            $decrypt_block .= ');';
+
+            $lambda_functions[$code_hash] = $this->_createInlineCryptFunction(
+                array(
+                   'init_crypt'    => '',
+                   'init_encrypt'  => $init_encrypt,
+                   'init_decrypt'  => $init_decrypt,
+                   'encrypt_block' => $encrypt_block,
+                   'decrypt_block' => $decrypt_block
+                )
+            );
+        }
+        $this->inline_crypt = $lambda_functions[$code_hash];
+    }
+}
+
+// vim: ts=4:sw=4:et:
+// vim6: fdl=1:
diff --git a/sources/inc/phpseclib/LICENSE b/sources/inc/phpseclib/LICENSE
new file mode 100644
index 0000000..6ecd9b9
--- /dev/null
+++ b/sources/inc/phpseclib/LICENSE
@@ -0,0 +1,21 @@
+Copyright 2007-2012 TerraFrost and other contributors
+http://phpseclib.sourceforge.net/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
\ No newline at end of file
diff --git a/sources/inc/phpseclib/Math_BigInteger.php b/sources/inc/phpseclib/Math_BigInteger.php
new file mode 100644
index 0000000..a37662d
--- /dev/null
+++ b/sources/inc/phpseclib/Math_BigInteger.php
@@ -0,0 +1,3651 @@
+> and << cannot be used, nor can the modulo operator %,
+ * which only supports integers.  Although this fact will slow this library down, the fact that such a high
+ * base is being used should more than compensate.
+ *
+ * When PHP version 6 is officially released, we'll be able to use 64-bit integers.  This should, once again,
+ * allow bitwise operators, and will increase the maximum possible base to 2**31 (or 2**62 for addition /
+ * subtraction).
+ *
+ * Numbers are stored in {@link http://en.wikipedia.org/wiki/Endianness little endian} format.  ie.
+ * (new Math_BigInteger(pow(2, 26)))->value = array(0, 1)
+ *
+ * Useful resources are as follows:
+ *
+ *  - {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf Handbook of Applied Cryptography (HAC)}
+ *  - {@link http://math.libtomcrypt.com/files/tommath.pdf Multi-Precision Math (MPM)}
+ *  - Java's BigInteger classes.  See /j2se/src/share/classes/java/math in jdk-1_5_0-src-jrl.zip
+ *
+ * Here's an example of how to use this library:
+ * 
+ * add($b);
+ *
+ *    echo $c->toString(); // outputs 5
+ * ?>
+ * 
+ *
+ * LICENSE: Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * @category   Math
+ * @package    Math_BigInteger
+ * @author     Jim Wigginton 
+ * @copyright  MMVI Jim Wigginton
+ * @license    http://www.opensource.org/licenses/mit-license.html  MIT License
+ * @link       http://pear.php.net/package/Math_BigInteger
+ */
+
+/**#@+
+ * Reduction constants
+ *
+ * @access private
+ * @see Math_BigInteger::_reduce()
+ */
+/**
+ * @see Math_BigInteger::_montgomery()
+ * @see Math_BigInteger::_prepMontgomery()
+ */
+define('MATH_BIGINTEGER_MONTGOMERY', 0);
+/**
+ * @see Math_BigInteger::_barrett()
+ */
+define('MATH_BIGINTEGER_BARRETT', 1);
+/**
+ * @see Math_BigInteger::_mod2()
+ */
+define('MATH_BIGINTEGER_POWEROF2', 2);
+/**
+ * @see Math_BigInteger::_remainder()
+ */
+define('MATH_BIGINTEGER_CLASSIC', 3);
+/**
+ * @see Math_BigInteger::__clone()
+ */
+define('MATH_BIGINTEGER_NONE', 4);
+/**#@-*/
+
+/**#@+
+ * Array constants
+ *
+ * Rather than create a thousands and thousands of new Math_BigInteger objects in repeated function calls to add() and
+ * multiply() or whatever, we'll just work directly on arrays, taking them in as parameters and returning them.
+ *
+ * @access private
+ */
+/**
+ * $result[MATH_BIGINTEGER_VALUE] contains the value.
+ */
+define('MATH_BIGINTEGER_VALUE', 0);
+/**
+ * $result[MATH_BIGINTEGER_SIGN] contains the sign.
+ */
+define('MATH_BIGINTEGER_SIGN', 1);
+/**#@-*/
+
+/**#@+
+ * @access private
+ * @see Math_BigInteger::_montgomery()
+ * @see Math_BigInteger::_barrett()
+ */
+/**
+ * Cache constants
+ *
+ * $cache[MATH_BIGINTEGER_VARIABLE] tells us whether or not the cached data is still valid.
+ */
+define('MATH_BIGINTEGER_VARIABLE', 0);
+/**
+ * $cache[MATH_BIGINTEGER_DATA] contains the cached data.
+ */
+define('MATH_BIGINTEGER_DATA', 1);
+/**#@-*/
+
+/**#@+
+ * Mode constants.
+ *
+ * @access private
+ * @see Math_BigInteger::Math_BigInteger()
+ */
+/**
+ * To use the pure-PHP implementation
+ */
+define('MATH_BIGINTEGER_MODE_INTERNAL', 1);
+/**
+ * To use the BCMath library
+ *
+ * (if enabled; otherwise, the internal implementation will be used)
+ */
+define('MATH_BIGINTEGER_MODE_BCMATH', 2);
+/**
+ * To use the GMP library
+ *
+ * (if present; otherwise, either the BCMath or the internal implementation will be used)
+ */
+define('MATH_BIGINTEGER_MODE_GMP', 3);
+/**#@-*/
+
+/**
+ * Karatsuba Cutoff
+ *
+ * At what point do we switch between Karatsuba multiplication and schoolbook long multiplication?
+ *
+ * @access private
+ */
+define('MATH_BIGINTEGER_KARATSUBA_CUTOFF', 25);
+
+/**
+ * Pure-PHP arbitrary precision integer arithmetic library. Supports base-2, base-10, base-16, and base-256
+ * numbers.
+ *
+ * @author  Jim Wigginton 
+ * @version 1.0.0RC4
+ * @access  public
+ * @package Math_BigInteger
+ */
+class Math_BigInteger {
+    /**
+     * Holds the BigInteger's value.
+     *
+     * @var Array
+     * @access private
+     */
+    var $value;
+
+    /**
+     * Holds the BigInteger's magnitude.
+     *
+     * @var Boolean
+     * @access private
+     */
+    var $is_negative = false;
+
+    /**
+     * Random number generator function
+     *
+     * @see setRandomGenerator()
+     * @access private
+     */
+    var $generator = 'mt_rand';
+
+    /**
+     * Precision
+     *
+     * @see setPrecision()
+     * @access private
+     */
+    var $precision = -1;
+
+    /**
+     * Precision Bitmask
+     *
+     * @see setPrecision()
+     * @access private
+     */
+    var $bitmask = false;
+
+    /**
+     * Mode independent value used for serialization.
+     *
+     * If the bcmath or gmp extensions are installed $this->value will be a non-serializable resource, hence the need for 
+     * a variable that'll be serializable regardless of whether or not extensions are being used.  Unlike $this->value,
+     * however, $this->hex is only calculated when $this->__sleep() is called.
+     *
+     * @see __sleep()
+     * @see __wakeup()
+     * @var String
+     * @access private
+     */
+    var $hex;
+
+    /**
+     * Converts base-2, base-10, base-16, and binary strings (base-256) to BigIntegers.
+     *
+     * If the second parameter - $base - is negative, then it will be assumed that the number's are encoded using
+     * two's compliment.  The sole exception to this is -10, which is treated the same as 10 is.
+     *
+     * Here's an example:
+     * 
+     * <?php
+     *    include('Math/BigInteger.php');
+     *
+     *    $a = new Math_BigInteger('0x32', 16); // 50 in base-16
+     *
+     *    echo $a->toString(); // outputs 50
+     * ?>
+     * 
+     *
+     * @param optional $x base-10 number or base-$base number if $base set.
+     * @param optional integer $base
+     * @return Math_BigInteger
+     * @access public
+     */
+    function Math_BigInteger($x = 0, $base = 10)
+    {
+        if ( !defined('MATH_BIGINTEGER_MODE') ) {
+            switch (true) {
+                case extension_loaded('gmp'):
+                    define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_GMP);
+                    break;
+                case extension_loaded('bcmath'):
+                    define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_BCMATH);
+                    break;
+                default:
+                    define('MATH_BIGINTEGER_MODE', MATH_BIGINTEGER_MODE_INTERNAL);
+            }
+        }
+
+        if (function_exists('openssl_public_encrypt') && !defined('MATH_BIGINTEGER_OPENSSL_DISABLE') && !defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
+            define('MATH_BIGINTEGER_OPENSSL_ENABLED', true);
+        }
+
+        if (!defined('PHP_INT_SIZE')) {
+            define('PHP_INT_SIZE', 4);
+        }
+
+        if (!defined('MATH_BIGINTEGER_BASE') && MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_INTERNAL) {
+            switch (PHP_INT_SIZE) {
+                case 8: // use 64-bit integers if int size is 8 bytes
+                    define('MATH_BIGINTEGER_BASE',       31);
+                    define('MATH_BIGINTEGER_BASE_FULL',  0x80000000);
+                    define('MATH_BIGINTEGER_MAX_DIGIT',  0x7FFFFFFF);
+                    define('MATH_BIGINTEGER_MSB',        0x40000000);
+                    // 10**9 is the closest we can get to 2**31 without passing it
+                    define('MATH_BIGINTEGER_MAX10',      1000000000);
+                    define('MATH_BIGINTEGER_MAX10_LEN',  9);
+                    // the largest digit that may be used in addition / subtraction
+                    define('MATH_BIGINTEGER_MAX_DIGIT2', pow(2, 62));
+                    break;
+                //case 4: // use 64-bit floats if int size is 4 bytes
+                default:
+                    define('MATH_BIGINTEGER_BASE',       26);
+                    define('MATH_BIGINTEGER_BASE_FULL',  0x4000000);
+                    define('MATH_BIGINTEGER_MAX_DIGIT',  0x3FFFFFF);
+                    define('MATH_BIGINTEGER_MSB',        0x2000000);
+                    // 10**7 is the closest to 2**26 without passing it
+                    define('MATH_BIGINTEGER_MAX10',      10000000);
+                    define('MATH_BIGINTEGER_MAX10_LEN',  7);
+                    // the largest digit that may be used in addition / subtraction
+                    // we do pow(2, 52) instead of using 4503599627370496 directly because some
+                    // PHP installations will truncate 4503599627370496.
+                    define('MATH_BIGINTEGER_MAX_DIGIT2', pow(2, 52));
+            }
+        }
+
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                if (is_resource($x) && get_resource_type($x) == 'GMP integer') {
+                    $this->value = $x;
+                    return;
+                }
+                $this->value = gmp_init(0);
+                break;
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $this->value = '0';
+                break;
+            default:
+                $this->value = array();
+        }
+
+        // '0' counts as empty() but when the base is 256 '0' is equal to ord('0') or 48
+        // '0' is the only value like this per http://php.net/empty
+        if (empty($x) && (abs($base) != 256 || $x !== '0')) {
+            return;
+        }
+
+        switch ($base) {
+            case -256:
+                if (ord($x[0]) & 0x80) {
+                    $x = ~$x;
+                    $this->is_negative = true;
+                }
+            case  256:
+                switch ( MATH_BIGINTEGER_MODE ) {
+                    case MATH_BIGINTEGER_MODE_GMP:
+                        $sign = $this->is_negative ? '-' : '';
+                        $this->value = gmp_init($sign . '0x' . bin2hex($x));
+                        break;
+                    case MATH_BIGINTEGER_MODE_BCMATH:
+                        // round $len to the nearest 4 (thanks, DavidMJ!)
+                        $len = (strlen($x) + 3) & 0xFFFFFFFC;
+
+                        $x = str_pad($x, $len, chr(0), STR_PAD_LEFT);
+
+                        for ($i = 0; $i < $len; $i+= 4) {
+                            $this->value = bcmul($this->value, '4294967296', 0); // 4294967296 == 2**32
+                            $this->value = bcadd($this->value, 0x1000000 * ord($x[$i]) + ((ord($x[$i + 1]) << 16) | (ord($x[$i + 2]) << 8) | ord($x[$i + 3])), 0);
+                        }
+
+                        if ($this->is_negative) {
+                            $this->value = '-' . $this->value;
+                        }
+
+                        break;
+                    // converts a base-2**8 (big endian / msb) number to base-2**26 (little endian / lsb)
+                    default:
+                        while (strlen($x)) {
+                            $this->value[] = $this->_bytes2int($this->_base256_rshift($x, MATH_BIGINTEGER_BASE));
+                        }
+                }
+
+                if ($this->is_negative) {
+                    if (MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_INTERNAL) {
+                        $this->is_negative = false;
+                    }
+                    $temp = $this->add(new Math_BigInteger('-1'));
+                    $this->value = $temp->value;
+                }
+                break;
+            case  16:
+            case -16:
+                if ($base > 0 && $x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = preg_replace('#^(?:0x)?([A-Fa-f0-9]*).*#', '$1', $x);
+
+                $is_negative = false;
+                if ($base < 0 && hexdec($x[0]) >= 8) {
+                    $this->is_negative = $is_negative = true;
+                    $x = bin2hex(~pack('H*', $x));
+                }
+
+                switch ( MATH_BIGINTEGER_MODE ) {
+                    case MATH_BIGINTEGER_MODE_GMP:
+                        $temp = $this->is_negative ? '-0x' . $x : '0x' . $x;
+                        $this->value = gmp_init($temp);
+                        $this->is_negative = false;
+                        break;
+                    case MATH_BIGINTEGER_MODE_BCMATH:
+                        $x = ( strlen($x) & 1 ) ? '0' . $x : $x;
+                        $temp = new Math_BigInteger(pack('H*', $x), 256);
+                        $this->value = $this->is_negative ? '-' . $temp->value : $temp->value;
+                        $this->is_negative = false;
+                        break;
+                    default:
+                        $x = ( strlen($x) & 1 ) ? '0' . $x : $x;
+                        $temp = new Math_BigInteger(pack('H*', $x), 256);
+                        $this->value = $temp->value;
+                }
+
+                if ($is_negative) {
+                    $temp = $this->add(new Math_BigInteger('-1'));
+                    $this->value = $temp->value;
+                }
+                break;
+            case  10:
+            case -10:
+                // (?value = gmp_init($x);
+                        break;
+                    case MATH_BIGINTEGER_MODE_BCMATH:
+                        // explicitly casting $x to a string is necessary, here, since doing $x[0] on -1 yields different
+                        // results then doing it on '-1' does (modInverse does $x[0])
+                        $this->value = $x === '-' ? '0' : (string) $x;
+                        break;
+                    default:
+                        $temp = new Math_BigInteger();
+
+                        $multiplier = new Math_BigInteger();
+                        $multiplier->value = array(MATH_BIGINTEGER_MAX10);
+
+                        if ($x[0] == '-') {
+                            $this->is_negative = true;
+                            $x = substr($x, 1);
+                        }
+
+                        $x = str_pad($x, strlen($x) + ((MATH_BIGINTEGER_MAX10_LEN - 1) * strlen($x)) % MATH_BIGINTEGER_MAX10_LEN, 0, STR_PAD_LEFT);
+
+                        while (strlen($x)) {
+                            $temp = $temp->multiply($multiplier);
+                            $temp = $temp->add(new Math_BigInteger($this->_int2bytes(substr($x, 0, MATH_BIGINTEGER_MAX10_LEN)), 256));
+                            $x = substr($x, MATH_BIGINTEGER_MAX10_LEN);
+                        }
+
+                        $this->value = $temp->value;
+                }
+                break;
+            case  2: // base-2 support originally implemented by Lluis Pamies - thanks!
+            case -2:
+                if ($base > 0 && $x[0] == '-') {
+                    $this->is_negative = true;
+                    $x = substr($x, 1);
+                }
+
+                $x = preg_replace('#^([01]*).*#', '$1', $x);
+                $x = str_pad($x, strlen($x) + (3 * strlen($x)) % 4, 0, STR_PAD_LEFT);
+
+                $str = '0x';
+                while (strlen($x)) {
+                    $part = substr($x, 0, 4);
+                    $str.= dechex(bindec($part));
+                    $x = substr($x, 4);
+                }
+
+                if ($this->is_negative) {
+                    $str = '-' . $str;
+                }
+
+                $temp = new Math_BigInteger($str, 8 * $base); // ie. either -16 or +16
+                $this->value = $temp->value;
+                $this->is_negative = $temp->is_negative;
+
+                break;
+            default:
+                // base not supported, so we'll let $this == 0
+        }
+    }
+
+    /**
+     * Converts a BigInteger to a byte string (eg. base-256).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     *
+     * Here's an example:
+     * 
+     * toBytes(); // outputs chr(65)
+     * ?>
+     * 
+     *
+     * @param Boolean $twos_compliment
+     * @return String
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**8
+     */
+    function toBytes($twos_compliment = false)
+    {
+        if ($twos_compliment) {
+            $comparison = $this->compare(new Math_BigInteger());
+            if ($comparison == 0) {
+                return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+            }
+
+            $temp = $comparison < 0 ? $this->add(new Math_BigInteger(1)) : $this->copy();
+            $bytes = $temp->toBytes();
+
+            if (empty($bytes)) { // eg. if the number we're trying to convert is -1
+                $bytes = chr(0);
+            }
+
+            if (ord($bytes[0]) & 0x80) {
+                $bytes = chr(0) . $bytes;
+            }
+
+            return $comparison < 0 ? ~$bytes : $bytes;
+        }
+
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                if (gmp_cmp($this->value, gmp_init(0)) == 0) {
+                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+                }
+
+                $temp = gmp_strval(gmp_abs($this->value), 16);
+                $temp = ( strlen($temp) & 1 ) ? '0' . $temp : $temp;
+                $temp = pack('H*', $temp);
+
+                return $this->precision > 0 ?
+                    substr(str_pad($temp, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
+                    ltrim($temp, chr(0));
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                if ($this->value === '0') {
+                    return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+                }
+
+                $value = '';
+                $current = $this->value;
+
+                if ($current[0] == '-') {
+                    $current = substr($current, 1);
+                }
+
+                while (bccomp($current, '0', 0) > 0) {
+                    $temp = bcmod($current, '16777216');
+                    $value = chr($temp >> 16) . chr($temp >> 8) . chr($temp) . $value;
+                    $current = bcdiv($current, '16777216', 0);
+                }
+
+                return $this->precision > 0 ?
+                    substr(str_pad($value, $this->precision >> 3, chr(0), STR_PAD_LEFT), -($this->precision >> 3)) :
+                    ltrim($value, chr(0));
+        }
+
+        if (!count($this->value)) {
+            return $this->precision > 0 ? str_repeat(chr(0), ($this->precision + 1) >> 3) : '';
+        }
+        $result = $this->_int2bytes($this->value[count($this->value) - 1]);
+
+        $temp = $this->copy();
+
+        for ($i = count($temp->value) - 2; $i >= 0; --$i) {
+            $temp->_base256_lshift($result, MATH_BIGINTEGER_BASE);
+            $result = $result | str_pad($temp->_int2bytes($temp->value[$i]), strlen($result), chr(0), STR_PAD_LEFT);
+        }
+
+        return $this->precision > 0 ?
+            str_pad(substr($result, -(($this->precision + 7) >> 3)), ($this->precision + 7) >> 3, chr(0), STR_PAD_LEFT) :
+            $result;
+    }
+
+    /**
+     * Converts a BigInteger to a hex string (eg. base-16)).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     *
+     * Here's an example:
+     * 
+     * toHex(); // outputs '41'
+     * ?>
+     * 
+     *
+     * @param Boolean $twos_compliment
+     * @return String
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**8
+     */
+    function toHex($twos_compliment = false)
+    {
+        return bin2hex($this->toBytes($twos_compliment));
+    }
+
+    /**
+     * Converts a BigInteger to a bit string (eg. base-2).
+     *
+     * Negative numbers are saved as positive numbers, unless $twos_compliment is set to true, at which point, they're
+     * saved as two's compliment.
+     *
+     * Here's an example:
+     * 
+     * toBits(); // outputs '1000001'
+     * ?>
+     * 
+     *
+     * @param Boolean $twos_compliment
+     * @return String
+     * @access public
+     * @internal Converts a base-2**26 number to base-2**2
+     */
+    function toBits($twos_compliment = false)
+    {
+        $hex = $this->toHex($twos_compliment);
+        $bits = '';
+        for ($i = strlen($hex) - 8, $start = strlen($hex) & 7; $i >= $start; $i-=8) {
+            $bits = str_pad(decbin(hexdec(substr($hex, $i, 8))), 32, '0', STR_PAD_LEFT) . $bits;
+        }
+        if ($start) { // hexdec('') == 0
+            $bits = str_pad(decbin(hexdec(substr($hex, 0, $start))), 8, '0', STR_PAD_LEFT) . $bits;
+        }
+        $result = $this->precision > 0 ? substr($bits, -$this->precision) : ltrim($bits, '0');
+
+        if ($twos_compliment && $this->compare(new Math_BigInteger()) > 0 && $this->precision <= 0) {
+            return '0' . $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Converts a BigInteger to a base-10 number.
+     *
+     * Here's an example:
+     * 
+     * toString(); // outputs 50
+     * ?>
+     * 
+     *
+     * @return String
+     * @access public
+     * @internal Converts a base-2**26 number to base-10**7 (which is pretty much base-10)
+     */
+    function toString()
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                return gmp_strval($this->value);
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                if ($this->value === '0') {
+                    return '0';
+                }
+
+                return ltrim($this->value, '0');
+        }
+
+        if (!count($this->value)) {
+            return '0';
+        }
+
+        $temp = $this->copy();
+        $temp->is_negative = false;
+
+        $divisor = new Math_BigInteger();
+        $divisor->value = array(MATH_BIGINTEGER_MAX10);
+        $result = '';
+        while (count($temp->value)) {
+            list($temp, $mod) = $temp->divide($divisor);
+            $result = str_pad(isset($mod->value[0]) ? $mod->value[0] : '', MATH_BIGINTEGER_MAX10_LEN, '0', STR_PAD_LEFT) . $result;
+        }
+        $result = ltrim($result, '0');
+        if (empty($result)) {
+            $result = '0';
+        }
+
+        if ($this->is_negative) {
+            $result = '-' . $result;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Copy an object
+     *
+     * PHP5 passes objects by reference while PHP4 passes by value.  As such, we need a function to guarantee
+     * that all objects are passed by value, when appropriate.  More information can be found here:
+     *
+     * {@link http://php.net/language.oop5.basic#51624}
+     *
+     * @access public
+     * @see __clone()
+     * @return Math_BigInteger
+     */
+    function copy()
+    {
+        $temp = new Math_BigInteger();
+        $temp->value = $this->value;
+        $temp->is_negative = $this->is_negative;
+        $temp->generator = $this->generator;
+        $temp->precision = $this->precision;
+        $temp->bitmask = $this->bitmask;
+        return $temp;
+    }
+
+    /**
+     *  __toString() magic method
+     *
+     * Will be called, automatically, if you're supporting just PHP5.  If you're supporting PHP4, you'll need to call
+     * toString().
+     *
+     * @access public
+     * @internal Implemented per a suggestion by Techie-Michael - thanks!
+     */
+    function __toString()
+    {
+        return $this->toString();
+    }
+
+    /**
+     * __clone() magic method
+     *
+     * Although you can call Math_BigInteger::__toString() directly in PHP5, you cannot call Math_BigInteger::__clone()
+     * directly in PHP5.  You can in PHP4 since it's not a magic method, but in PHP5, you have to call it by using the PHP5
+     * only syntax of $y = clone $x.  As such, if you're trying to write an application that works on both PHP4 and PHP5,
+     * call Math_BigInteger::copy(), instead.
+     *
+     * @access public
+     * @see copy()
+     * @return Math_BigInteger
+     */
+    function __clone()
+    {
+        return $this->copy();
+    }
+
+    /**
+     *  __sleep() magic method
+     *
+     * Will be called, automatically, when serialize() is called on a Math_BigInteger object.
+     *
+     * @see __wakeup()
+     * @access public
+     */
+    function __sleep()
+    {
+        $this->hex = $this->toHex(true);
+        $vars = array('hex');
+        if ($this->generator != 'mt_rand') {
+            $vars[] = 'generator';
+        }
+        if ($this->precision > 0) {
+            $vars[] = 'precision';
+        }
+        return $vars;
+        
+    }
+
+    /**
+     *  __wakeup() magic method
+     *
+     * Will be called, automatically, when unserialize() is called on a Math_BigInteger object.
+     *
+     * @see __sleep()
+     * @access public
+     */
+    function __wakeup()
+    {
+        $temp = new Math_BigInteger($this->hex, -16);
+        $this->value = $temp->value;
+        $this->is_negative = $temp->is_negative;
+        $this->setRandomGenerator($this->generator);
+        if ($this->precision > 0) {
+            // recalculate $this->bitmask
+            $this->setPrecision($this->precision);
+        }
+    }
+
+    /**
+     * Adds two BigIntegers.
+     *
+     * Here's an example:
+     * 
+     * add($b);
+     *
+     *    echo $c->toString(); // outputs 30
+     * ?>
+     * 
+     *
+     * @param Math_BigInteger $y
+     * @return Math_BigInteger
+     * @access public
+     * @internal Performs base-2**52 addition
+     */
+    function add($y)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $temp = new Math_BigInteger();
+                $temp->value = gmp_add($this->value, $y->value);
+
+                return $this->_normalize($temp);
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $temp = new Math_BigInteger();
+                $temp->value = bcadd($this->value, $y->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_add($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        $result = new Math_BigInteger();
+        $result->value = $temp[MATH_BIGINTEGER_VALUE];
+        $result->is_negative = $temp[MATH_BIGINTEGER_SIGN];
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs addition.
+     *
+     * @param Array $x_value
+     * @param Boolean $x_negative
+     * @param Array $y_value
+     * @param Boolean $y_negative
+     * @return Array
+     * @access private
+     */
+    function _add($x_value, $x_negative, $y_value, $y_negative)
+    {
+        $x_size = count($x_value);
+        $y_size = count($y_value);
+
+        if ($x_size == 0) {
+            return array(
+                MATH_BIGINTEGER_VALUE => $y_value,
+                MATH_BIGINTEGER_SIGN => $y_negative
+            );
+        } else if ($y_size == 0) {
+            return array(
+                MATH_BIGINTEGER_VALUE => $x_value,
+                MATH_BIGINTEGER_SIGN => $x_negative
+            );
+        }
+
+        // subtract, if appropriate
+        if ( $x_negative != $y_negative ) {
+            if ( $x_value == $y_value ) {
+                return array(
+                    MATH_BIGINTEGER_VALUE => array(),
+                    MATH_BIGINTEGER_SIGN => false
+                );
+            }
+
+            $temp = $this->_subtract($x_value, false, $y_value, false);
+            $temp[MATH_BIGINTEGER_SIGN] = $this->_compare($x_value, false, $y_value, false) > 0 ?
+                                          $x_negative : $y_negative;
+
+            return $temp;
+        }
+
+        if ($x_size < $y_size) {
+            $size = $x_size;
+            $value = $y_value;
+        } else {
+            $size = $y_size;
+            $value = $x_value;
+        }
+
+        $value[] = 0; // just in case the carry adds an extra digit
+
+        $carry = 0;
+        for ($i = 0, $j = 1; $j < $size; $i+=2, $j+=2) {
+            $sum = $x_value[$j] * MATH_BIGINTEGER_BASE_FULL + $x_value[$i] + $y_value[$j] * MATH_BIGINTEGER_BASE_FULL + $y_value[$i] + $carry;
+            $carry = $sum >= MATH_BIGINTEGER_MAX_DIGIT2; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
+            $sum = $carry ? $sum - MATH_BIGINTEGER_MAX_DIGIT2 : $sum;
+
+            $temp = (int) ($sum / MATH_BIGINTEGER_BASE_FULL);
+
+            $value[$i] = (int) ($sum - MATH_BIGINTEGER_BASE_FULL * $temp); // eg. a faster alternative to fmod($sum, 0x4000000)
+            $value[$j] = $temp;
+        }
+
+        if ($j == $size) { // ie. if $y_size is odd
+            $sum = $x_value[$i] + $y_value[$i] + $carry;
+            $carry = $sum >= MATH_BIGINTEGER_BASE_FULL;
+            $value[$i] = $carry ? $sum - MATH_BIGINTEGER_BASE_FULL : $sum;
+            ++$i; // ie. let $i = $j since we've just done $value[$i]
+        }
+
+        if ($carry) {
+            for (; $value[$i] == MATH_BIGINTEGER_MAX_DIGIT; ++$i) {
+                $value[$i] = 0;
+            }
+            ++$value[$i];
+        }
+
+        return array(
+            MATH_BIGINTEGER_VALUE => $this->_trim($value),
+            MATH_BIGINTEGER_SIGN => $x_negative
+        );
+    }
+
+    /**
+     * Subtracts two BigIntegers.
+     *
+     * Here's an example:
+     * 
+     * subtract($b);
+     *
+     *    echo $c->toString(); // outputs -10
+     * ?>
+     * 
+     *
+     * @param Math_BigInteger $y
+     * @return Math_BigInteger
+     * @access public
+     * @internal Performs base-2**52 subtraction
+     */
+    function subtract($y)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $temp = new Math_BigInteger();
+                $temp->value = gmp_sub($this->value, $y->value);
+
+                return $this->_normalize($temp);
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $temp = new Math_BigInteger();
+                $temp->value = bcsub($this->value, $y->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_subtract($this->value, $this->is_negative, $y->value, $y->is_negative);
+
+        $result = new Math_BigInteger();
+        $result->value = $temp[MATH_BIGINTEGER_VALUE];
+        $result->is_negative = $temp[MATH_BIGINTEGER_SIGN];
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs subtraction.
+     *
+     * @param Array $x_value
+     * @param Boolean $x_negative
+     * @param Array $y_value
+     * @param Boolean $y_negative
+     * @return Array
+     * @access private
+     */
+    function _subtract($x_value, $x_negative, $y_value, $y_negative)
+    {
+        $x_size = count($x_value);
+        $y_size = count($y_value);
+
+        if ($x_size == 0) {
+            return array(
+                MATH_BIGINTEGER_VALUE => $y_value,
+                MATH_BIGINTEGER_SIGN => !$y_negative
+            );
+        } else if ($y_size == 0) {
+            return array(
+                MATH_BIGINTEGER_VALUE => $x_value,
+                MATH_BIGINTEGER_SIGN => $x_negative
+            );
+        }
+
+        // add, if appropriate (ie. -$x - +$y or +$x - -$y)
+        if ( $x_negative != $y_negative ) {
+            $temp = $this->_add($x_value, false, $y_value, false);
+            $temp[MATH_BIGINTEGER_SIGN] = $x_negative;
+
+            return $temp;
+        }
+
+        $diff = $this->_compare($x_value, $x_negative, $y_value, $y_negative);
+
+        if ( !$diff ) {
+            return array(
+                MATH_BIGINTEGER_VALUE => array(),
+                MATH_BIGINTEGER_SIGN => false
+            );
+        }
+
+        // switch $x and $y around, if appropriate.
+        if ( (!$x_negative && $diff < 0) || ($x_negative && $diff > 0) ) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_negative = !$x_negative;
+
+            $x_size = count($x_value);
+            $y_size = count($y_value);
+        }
+
+        // at this point, $x_value should be at least as big as - if not bigger than - $y_value
+
+        $carry = 0;
+        for ($i = 0, $j = 1; $j < $y_size; $i+=2, $j+=2) {
+            $sum = $x_value[$j] * MATH_BIGINTEGER_BASE_FULL + $x_value[$i] - $y_value[$j] * MATH_BIGINTEGER_BASE_FULL - $y_value[$i] - $carry;
+            $carry = $sum < 0; // eg. floor($sum / 2**52); only possible values (in any base) are 0 and 1
+            $sum = $carry ? $sum + MATH_BIGINTEGER_MAX_DIGIT2 : $sum;
+
+            $temp = (int) ($sum / MATH_BIGINTEGER_BASE_FULL);
+
+            $x_value[$i] = (int) ($sum - MATH_BIGINTEGER_BASE_FULL * $temp);
+            $x_value[$j] = $temp;
+        }
+
+        if ($j == $y_size) { // ie. if $y_size is odd
+            $sum = $x_value[$i] - $y_value[$i] - $carry;
+            $carry = $sum < 0;
+            $x_value[$i] = $carry ? $sum + MATH_BIGINTEGER_BASE_FULL : $sum;
+            ++$i;
+        }
+
+        if ($carry) {
+            for (; !$x_value[$i]; ++$i) {
+                $x_value[$i] = MATH_BIGINTEGER_MAX_DIGIT;
+            }
+            --$x_value[$i];
+        }
+
+        return array(
+            MATH_BIGINTEGER_VALUE => $this->_trim($x_value),
+            MATH_BIGINTEGER_SIGN => $x_negative
+        );
+    }
+
+    /**
+     * Multiplies two BigIntegers
+     *
+     * Here's an example:
+     * 
+     * multiply($b);
+     *
+     *    echo $c->toString(); // outputs 200
+     * ?>
+     * 
+     *
+     * @param Math_BigInteger $x
+     * @return Math_BigInteger
+     * @access public
+     */
+    function multiply($x)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $temp = new Math_BigInteger();
+                $temp->value = gmp_mul($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $temp = new Math_BigInteger();
+                $temp->value = bcmul($this->value, $x->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        $temp = $this->_multiply($this->value, $this->is_negative, $x->value, $x->is_negative);
+
+        $product = new Math_BigInteger();
+        $product->value = $temp[MATH_BIGINTEGER_VALUE];
+        $product->is_negative = $temp[MATH_BIGINTEGER_SIGN];
+
+        return $this->_normalize($product);
+    }
+
+    /**
+     * Performs multiplication.
+     *
+     * @param Array $x_value
+     * @param Boolean $x_negative
+     * @param Array $y_value
+     * @param Boolean $y_negative
+     * @return Array
+     * @access private
+     */
+    function _multiply($x_value, $x_negative, $y_value, $y_negative)
+    {
+        //if ( $x_value == $y_value ) {
+        //    return array(
+        //        MATH_BIGINTEGER_VALUE => $this->_square($x_value),
+        //        MATH_BIGINTEGER_SIGN => $x_sign != $y_value
+        //    );
+        //}
+
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if ( !$x_length || !$y_length ) { // a 0 is being multiplied
+            return array(
+                MATH_BIGINTEGER_VALUE => array(),
+                MATH_BIGINTEGER_SIGN => false
+            );
+        }
+
+        return array(
+            MATH_BIGINTEGER_VALUE => min($x_length, $y_length) < 2 * MATH_BIGINTEGER_KARATSUBA_CUTOFF ?
+                $this->_trim($this->_regularMultiply($x_value, $y_value)) :
+                $this->_trim($this->_karatsuba($x_value, $y_value)),
+            MATH_BIGINTEGER_SIGN => $x_negative != $y_negative
+        );
+    }
+
+    /**
+     * Performs long multiplication on two BigIntegers
+     *
+     * Modeled after 'multiply' in MutableBigInteger.java.
+     *
+     * @param Array $x_value
+     * @param Array $y_value
+     * @return Array
+     * @access private
+     */
+    function _regularMultiply($x_value, $y_value)
+    {
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if ( !$x_length || !$y_length ) { // a 0 is being multiplied
+            return array();
+        }
+
+        if ( $x_length < $y_length ) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_length = count($x_value);
+            $y_length = count($y_value);
+        }
+
+        $product_value = $this->_array_repeat(0, $x_length + $y_length);
+
+        // the following for loop could be removed if the for loop following it
+        // (the one with nested for loops) initially set $i to 0, but
+        // doing so would also make the result in one set of unnecessary adds,
+        // since on the outermost loops first pass, $product->value[$k] is going
+        // to always be 0
+
+        $carry = 0;
+
+        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0
+            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
+            $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+            $product_value[$j] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
+        }
+
+        $product_value[$j] = $carry;
+
+        // the above for loop is what the previous comment was talking about.  the
+        // following for loop is the "one with nested for loops"
+        for ($i = 1; $i < $y_length; ++$i) {
+            $carry = 0;
+
+            for ($j = 0, $k = $i; $j < $x_length; ++$j, ++$k) {
+                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
+                $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+                $product_value[$k] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
+            }
+
+            $product_value[$k] = $carry;
+        }
+
+        return $product_value;
+    }
+
+    /**
+     * Performs Karatsuba multiplication on two BigIntegers
+     *
+     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=120 MPM 5.2.3}.
+     *
+     * @param Array $x_value
+     * @param Array $y_value
+     * @return Array
+     * @access private
+     */
+    function _karatsuba($x_value, $y_value)
+    {
+        $m = min(count($x_value) >> 1, count($y_value) >> 1);
+
+        if ($m < MATH_BIGINTEGER_KARATSUBA_CUTOFF) {
+            return $this->_regularMultiply($x_value, $y_value);
+        }
+
+        $x1 = array_slice($x_value, $m);
+        $x0 = array_slice($x_value, 0, $m);
+        $y1 = array_slice($y_value, $m);
+        $y0 = array_slice($y_value, 0, $m);
+
+        $z2 = $this->_karatsuba($x1, $y1);
+        $z0 = $this->_karatsuba($x0, $y0);
+
+        $z1 = $this->_add($x1, false, $x0, false);
+        $temp = $this->_add($y1, false, $y0, false);
+        $z1 = $this->_karatsuba($z1[MATH_BIGINTEGER_VALUE], $temp[MATH_BIGINTEGER_VALUE]);
+        $temp = $this->_add($z2, false, $z0, false);
+        $z1 = $this->_subtract($z1, false, $temp[MATH_BIGINTEGER_VALUE], false);
+
+        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
+        $z1[MATH_BIGINTEGER_VALUE] = array_merge(array_fill(0, $m, 0), $z1[MATH_BIGINTEGER_VALUE]);
+
+        $xy = $this->_add($z2, false, $z1[MATH_BIGINTEGER_VALUE], $z1[MATH_BIGINTEGER_SIGN]);
+        $xy = $this->_add($xy[MATH_BIGINTEGER_VALUE], $xy[MATH_BIGINTEGER_SIGN], $z0, false);
+
+        return $xy[MATH_BIGINTEGER_VALUE];
+    }
+
+    /**
+     * Performs squaring
+     *
+     * @param Array $x
+     * @return Array
+     * @access private
+     */
+    function _square($x = false)
+    {
+        return count($x) < 2 * MATH_BIGINTEGER_KARATSUBA_CUTOFF ?
+            $this->_trim($this->_baseSquare($x)) :
+            $this->_trim($this->_karatsubaSquare($x));
+    }
+
+    /**
+     * Performs traditional squaring on two BigIntegers
+     *
+     * Squaring can be done faster than multiplying a number by itself can be.  See
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=7 HAC 14.2.4} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=141 MPM 5.3} for more information.
+     *
+     * @param Array $value
+     * @return Array
+     * @access private
+     */
+    function _baseSquare($value)
+    {
+        if ( empty($value) ) {
+            return array();
+        }
+        $square_value = $this->_array_repeat(0, 2 * count($value));
+
+        for ($i = 0, $max_index = count($value) - 1; $i <= $max_index; ++$i) {
+            $i2 = $i << 1;
+
+            $temp = $square_value[$i2] + $value[$i] * $value[$i];
+            $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+            $square_value[$i2] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
+
+            // note how we start from $i+1 instead of 0 as we do in multiplication.
+            for ($j = $i + 1, $k = $i2 + 1; $j <= $max_index; ++$j, ++$k) {
+                $temp = $square_value[$k] + 2 * $value[$j] * $value[$i] + $carry;
+                $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+                $square_value[$k] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
+            }
+
+            // the following line can yield values larger 2**15.  at this point, PHP should switch
+            // over to floats.
+            $square_value[$i + $max_index + 1] = $carry;
+        }
+
+        return $square_value;
+    }
+
+    /**
+     * Performs Karatsuba "squaring" on two BigIntegers
+     *
+     * See {@link http://en.wikipedia.org/wiki/Karatsuba_algorithm Karatsuba algorithm} and
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=151 MPM 5.3.4}.
+     *
+     * @param Array $value
+     * @return Array
+     * @access private
+     */
+    function _karatsubaSquare($value)
+    {
+        $m = count($value) >> 1;
+
+        if ($m < MATH_BIGINTEGER_KARATSUBA_CUTOFF) {
+            return $this->_baseSquare($value);
+        }
+
+        $x1 = array_slice($value, $m);
+        $x0 = array_slice($value, 0, $m);
+
+        $z2 = $this->_karatsubaSquare($x1);
+        $z0 = $this->_karatsubaSquare($x0);
+
+        $z1 = $this->_add($x1, false, $x0, false);
+        $z1 = $this->_karatsubaSquare($z1[MATH_BIGINTEGER_VALUE]);
+        $temp = $this->_add($z2, false, $z0, false);
+        $z1 = $this->_subtract($z1, false, $temp[MATH_BIGINTEGER_VALUE], false);
+
+        $z2 = array_merge(array_fill(0, 2 * $m, 0), $z2);
+        $z1[MATH_BIGINTEGER_VALUE] = array_merge(array_fill(0, $m, 0), $z1[MATH_BIGINTEGER_VALUE]);
+
+        $xx = $this->_add($z2, false, $z1[MATH_BIGINTEGER_VALUE], $z1[MATH_BIGINTEGER_SIGN]);
+        $xx = $this->_add($xx[MATH_BIGINTEGER_VALUE], $xx[MATH_BIGINTEGER_SIGN], $z0, false);
+
+        return $xx[MATH_BIGINTEGER_VALUE];
+    }
+
+    /**
+     * Divides two BigIntegers.
+     *
+     * Returns an array whose first element contains the quotient and whose second element contains the
+     * "common residue".  If the remainder would be positive, the "common residue" and the remainder are the
+     * same.  If the remainder would be negative, the "common residue" is equal to the sum of the remainder
+     * and the divisor (basically, the "common residue" is the first positive modulo).
+     *
+     * Here's an example:
+     * 
+     * divide($b);
+     *
+     *    echo $quotient->toString(); // outputs 0
+     *    echo "\r\n";
+     *    echo $remainder->toString(); // outputs 10
+     * ?>
+     * 
+     *
+     * @param Math_BigInteger $y
+     * @return Array
+     * @access public
+     * @internal This function is based off of {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=9 HAC 14.20}.
+     */
+    function divide($y)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $quotient = new Math_BigInteger();
+                $remainder = new Math_BigInteger();
+
+                list($quotient->value, $remainder->value) = gmp_div_qr($this->value, $y->value);
+
+                if (gmp_sign($remainder->value) < 0) {
+                    $remainder->value = gmp_add($remainder->value, gmp_abs($y->value));
+                }
+
+                return array($this->_normalize($quotient), $this->_normalize($remainder));
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $quotient = new Math_BigInteger();
+                $remainder = new Math_BigInteger();
+
+                $quotient->value = bcdiv($this->value, $y->value, 0);
+                $remainder->value = bcmod($this->value, $y->value);
+
+                if ($remainder->value[0] == '-') {
+                    $remainder->value = bcadd($remainder->value, $y->value[0] == '-' ? substr($y->value, 1) : $y->value, 0);
+                }
+
+                return array($this->_normalize($quotient), $this->_normalize($remainder));
+        }
+
+        if (count($y->value) == 1) {
+            list($q, $r) = $this->_divide_digit($this->value, $y->value[0]);
+            $quotient = new Math_BigInteger();
+            $remainder = new Math_BigInteger();
+            $quotient->value = $q;
+            $remainder->value = array($r);
+            $quotient->is_negative = $this->is_negative != $y->is_negative;
+            return array($this->_normalize($quotient), $this->_normalize($remainder));
+        }
+
+        static $zero;
+        if ( !isset($zero) ) {
+            $zero = new Math_BigInteger();
+        }
+
+        $x = $this->copy();
+        $y = $y->copy();
+
+        $x_sign = $x->is_negative;
+        $y_sign = $y->is_negative;
+
+        $x->is_negative = $y->is_negative = false;
+
+        $diff = $x->compare($y);
+
+        if ( !$diff ) {
+            $temp = new Math_BigInteger();
+            $temp->value = array(1);
+            $temp->is_negative = $x_sign != $y_sign;
+            return array($this->_normalize($temp), $this->_normalize(new Math_BigInteger()));
+        }
+
+        if ( $diff < 0 ) {
+            // if $x is negative, "add" $y.
+            if ( $x_sign ) {
+                $x = $y->subtract($x);
+            }
+            return array($this->_normalize(new Math_BigInteger()), $this->_normalize($x));
+        }
+
+        // normalize $x and $y as described in HAC 14.23 / 14.24
+        $msb = $y->value[count($y->value) - 1];
+        for ($shift = 0; !($msb & MATH_BIGINTEGER_MSB); ++$shift) {
+            $msb <<= 1;
+        }
+        $x->_lshift($shift);
+        $y->_lshift($shift);
+        $y_value = &$y->value;
+
+        $x_max = count($x->value) - 1;
+        $y_max = count($y->value) - 1;
+
+        $quotient = new Math_BigInteger();
+        $quotient_value = &$quotient->value;
+        $quotient_value = $this->_array_repeat(0, $x_max - $y_max + 1);
+
+        static $temp, $lhs, $rhs;
+        if (!isset($temp)) {
+            $temp = new Math_BigInteger();
+            $lhs =  new Math_BigInteger();
+            $rhs =  new Math_BigInteger();
+        }
+        $temp_value = &$temp->value;
+        $rhs_value =  &$rhs->value;
+
+        // $temp = $y << ($x_max - $y_max-1) in base 2**26
+        $temp_value = array_merge($this->_array_repeat(0, $x_max - $y_max), $y_value);
+
+        while ( $x->compare($temp) >= 0 ) {
+            // calculate the "common residue"
+            ++$quotient_value[$x_max - $y_max];
+            $x = $x->subtract($temp);
+            $x_max = count($x->value) - 1;
+        }
+
+        for ($i = $x_max; $i >= $y_max + 1; --$i) {
+            $x_value = &$x->value;
+            $x_window = array(
+                isset($x_value[$i]) ? $x_value[$i] : 0,
+                isset($x_value[$i - 1]) ? $x_value[$i - 1] : 0,
+                isset($x_value[$i - 2]) ? $x_value[$i - 2] : 0
+            );
+            $y_window = array(
+                $y_value[$y_max],
+                ( $y_max > 0 ) ? $y_value[$y_max - 1] : 0
+            );
+
+            $q_index = $i - $y_max - 1;
+            if ($x_window[0] == $y_window[0]) {
+                $quotient_value[$q_index] = MATH_BIGINTEGER_MAX_DIGIT;
+            } else {
+                $quotient_value[$q_index] = (int) (
+                    ($x_window[0] * MATH_BIGINTEGER_BASE_FULL + $x_window[1])
+                    /
+                    $y_window[0]
+                );
+            }
+
+            $temp_value = array($y_window[1], $y_window[0]);
+
+            $lhs->value = array($quotient_value[$q_index]);
+            $lhs = $lhs->multiply($temp);
+
+            $rhs_value = array($x_window[2], $x_window[1], $x_window[0]);
+
+            while ( $lhs->compare($rhs) > 0 ) {
+                --$quotient_value[$q_index];
+
+                $lhs->value = array($quotient_value[$q_index]);
+                $lhs = $lhs->multiply($temp);
+            }
+
+            $adjust = $this->_array_repeat(0, $q_index);
+            $temp_value = array($quotient_value[$q_index]);
+            $temp = $temp->multiply($y);
+            $temp_value = &$temp->value;
+            $temp_value = array_merge($adjust, $temp_value);
+
+            $x = $x->subtract($temp);
+
+            if ($x->compare($zero) < 0) {
+                $temp_value = array_merge($adjust, $y_value);
+                $x = $x->add($temp);
+
+                --$quotient_value[$q_index];
+            }
+
+            $x_max = count($x_value) - 1;
+        }
+
+        // unnormalize the remainder
+        $x->_rshift($shift);
+
+        $quotient->is_negative = $x_sign != $y_sign;
+
+        // calculate the "common residue", if appropriate
+        if ( $x_sign ) {
+            $y->_rshift($shift);
+            $x = $y->subtract($x);
+        }
+
+        return array($this->_normalize($quotient), $this->_normalize($x));
+    }
+
+    /**
+     * Divides a BigInteger by a regular integer
+     *
+     * abc / x = a00 / x + b0 / x + c / x
+     *
+     * @param Array $dividend
+     * @param Array $divisor
+     * @return Array
+     * @access private
+     */
+    function _divide_digit($dividend, $divisor)
+    {
+        $carry = 0;
+        $result = array();
+
+        for ($i = count($dividend) - 1; $i >= 0; --$i) {
+            $temp = MATH_BIGINTEGER_BASE_FULL * $carry + $dividend[$i];
+            $result[$i] = (int) ($temp / $divisor);
+            $carry = (int) ($temp - $divisor * $result[$i]);
+        }
+
+        return array($result, $carry);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Here's an example:
+     * 
+     * modPow($b, $c);
+     *
+     *    echo $c->toString(); // outputs 10
+     * ?>
+     * 
+     *
+     * @param Math_BigInteger $e
+     * @param Math_BigInteger $n
+     * @return Math_BigInteger
+     * @access public
+     * @internal The most naive approach to modular exponentiation has very unreasonable requirements, and
+     *    and although the approach involving repeated squaring does vastly better, it, too, is impractical
+     *    for our purposes.  The reason being that division - by far the most complicated and time-consuming
+     *    of the basic operations (eg. +,-,*,/) - occurs multiple times within it.
+     *
+     *    Modular reductions resolve this issue.  Although an individual modular reduction takes more time
+     *    then an individual division, when performed in succession (with the same modulo), they're a lot faster.
+     *
+     *    The two most commonly used modular reductions are Barrett and Montgomery reduction.  Montgomery reduction,
+     *    although faster, only works when the gcd of the modulo and of the base being used is 1.  In RSA, when the
+     *    base is a power of two, the modulo - a product of two primes - is always going to have a gcd of 1 (because
+     *    the product of two odd numbers is odd), but what about when RSA isn't used?
+     *
+     *    In contrast, Barrett reduction has no such constraint.  As such, some bigint implementations perform a
+     *    Barrett reduction after every operation in the modpow function.  Others perform Barrett reductions when the
+     *    modulo is even and Montgomery reductions when the modulo is odd.  BigInteger.java's modPow method, however,
+     *    uses a trick involving the Chinese Remainder Theorem to factor the even modulo into two numbers - one odd and
+     *    the other, a power of two - and recombine them, later.  This is the method that this modPow function uses.
+     *    {@link http://islab.oregonstate.edu/papers/j34monex.pdf Montgomery Reduction with Even Modulus} elaborates.
+     */
+    function modPow($e, $n)
+    {
+        $n = $this->bitmask !== false && $this->bitmask->compare($n) < 0 ? $this->bitmask : $n->abs();
+
+        if ($e->compare(new Math_BigInteger()) < 0) {
+            $e = $e->abs();
+
+            $temp = $this->modInverse($n);
+            if ($temp === false) {
+                return false;
+            }
+
+            return $this->_normalize($temp->modPow($e, $n));
+        }
+
+        if ( MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_GMP ) {
+            $temp = new Math_BigInteger();
+            $temp->value = gmp_powm($this->value, $e->value, $n->value);
+
+            return $this->_normalize($temp);
+        }
+
+        if ($this->compare(new Math_BigInteger()) < 0 || $this->compare($n) > 0) {
+            list(, $temp) = $this->divide($n);
+            return $temp->modPow($e, $n);
+        }
+
+        if (defined('MATH_BIGINTEGER_OPENSSL_ENABLED')) {
+            $components = array(
+                'modulus' => $n->toBytes(true),
+                'publicExponent' => $e->toBytes(true)
+            );
+
+            $components = array(
+                'modulus' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['modulus'])), $components['modulus']),
+                'publicExponent' => pack('Ca*a*', 2, $this->_encodeASN1Length(strlen($components['publicExponent'])), $components['publicExponent'])
+            );
+
+            $RSAPublicKey = pack('Ca*a*a*',
+                48, $this->_encodeASN1Length(strlen($components['modulus']) + strlen($components['publicExponent'])),
+                $components['modulus'], $components['publicExponent']
+            );
+
+            $rsaOID = pack('H*', '300d06092a864886f70d0101010500'); // hex version of MA0GCSqGSIb3DQEBAQUA
+            $RSAPublicKey = chr(0) . $RSAPublicKey;
+            $RSAPublicKey = chr(3) . $this->_encodeASN1Length(strlen($RSAPublicKey)) . $RSAPublicKey;
+
+            $encapsulated = pack('Ca*a*',
+                48, $this->_encodeASN1Length(strlen($rsaOID . $RSAPublicKey)), $rsaOID . $RSAPublicKey
+            );
+
+            $RSAPublicKey = "-----BEGIN PUBLIC KEY-----\r\n" .
+                             chunk_split(base64_encode($encapsulated)) .
+                             '-----END PUBLIC KEY-----';
+
+            $plaintext = str_pad($this->toBytes(), strlen($n->toBytes(true)) - 1, "\0", STR_PAD_LEFT);
+
+            if (openssl_public_encrypt($plaintext, $result, $RSAPublicKey, OPENSSL_NO_PADDING)) {
+                return new Math_BigInteger($result, 256);
+            }
+        }
+
+        if ( MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_BCMATH ) {
+                $temp = new Math_BigInteger();
+                $temp->value = bcpowmod($this->value, $e->value, $n->value, 0);
+
+                return $this->_normalize($temp);
+        }
+
+        if ( empty($e->value) ) {
+            $temp = new Math_BigInteger();
+            $temp->value = array(1);
+            return $this->_normalize($temp);
+        }
+
+        if ( $e->value == array(1) ) {
+            list(, $temp) = $this->divide($n);
+            return $this->_normalize($temp);
+        }
+
+        if ( $e->value == array(2) ) {
+            $temp = new Math_BigInteger();
+            $temp->value = $this->_square($this->value);
+            list(, $temp) = $temp->divide($n);
+            return $this->_normalize($temp);
+        }
+
+        return $this->_normalize($this->_slidingWindow($e, $n, MATH_BIGINTEGER_BARRETT));
+
+        // is the modulo odd?
+        if ( $n->value[0] & 1 ) {
+            return $this->_normalize($this->_slidingWindow($e, $n, MATH_BIGINTEGER_MONTGOMERY));
+        }
+        // if it's not, it's even
+
+        // find the lowest set bit (eg. the max pow of 2 that divides $n)
+        for ($i = 0; $i < count($n->value); ++$i) {
+            if ( $n->value[$i] ) {
+                $temp = decbin($n->value[$i]);
+                $j = strlen($temp) - strrpos($temp, '1') - 1;
+                $j+= 26 * $i;
+                break;
+            }
+        }
+        // at this point, 2^$j * $n/(2^$j) == $n
+
+        $mod1 = $n->copy();
+        $mod1->_rshift($j);
+        $mod2 = new Math_BigInteger();
+        $mod2->value = array(1);
+        $mod2->_lshift($j);
+
+        $part1 = ( $mod1->value != array(1) ) ? $this->_slidingWindow($e, $mod1, MATH_BIGINTEGER_MONTGOMERY) : new Math_BigInteger();
+        $part2 = $this->_slidingWindow($e, $mod2, MATH_BIGINTEGER_POWEROF2);
+
+        $y1 = $mod2->modInverse($mod1);
+        $y2 = $mod1->modInverse($mod2);
+
+        $result = $part1->multiply($mod2);
+        $result = $result->multiply($y1);
+
+        $temp = $part2->multiply($mod1);
+        $temp = $temp->multiply($y2);
+
+        $result = $result->add($temp);
+        list(, $result) = $result->divide($n);
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Performs modular exponentiation.
+     *
+     * Alias for Math_BigInteger::modPow()
+     *
+     * @param Math_BigInteger $e
+     * @param Math_BigInteger $n
+     * @return Math_BigInteger
+     * @access public
+     */
+    function powMod($e, $n)
+    {
+        return $this->modPow($e, $n);
+    }
+
+    /**
+     * Sliding Window k-ary Modular Exponentiation
+     *
+     * Based on {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=27 HAC 14.85} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=210 MPM 7.7}.  In a departure from those algorithims,
+     * however, this function performs a modular reduction after every multiplication and squaring operation.
+     * As such, this function has the same preconditions that the reductions being used do.
+     *
+     * @param Math_BigInteger $e
+     * @param Math_BigInteger $n
+     * @param Integer $mode
+     * @return Math_BigInteger
+     * @access private
+     */
+    function _slidingWindow($e, $n, $mode)
+    {
+        static $window_ranges = array(7, 25, 81, 241, 673, 1793); // from BigInteger.java's oddModPow function
+        //static $window_ranges = array(0, 7, 36, 140, 450, 1303, 3529); // from MPM 7.3.1
+
+        $e_value = $e->value;
+        $e_length = count($e_value) - 1;
+        $e_bits = decbin($e_value[$e_length]);
+        for ($i = $e_length - 1; $i >= 0; --$i) {
+            $e_bits.= str_pad(decbin($e_value[$i]), MATH_BIGINTEGER_BASE, '0', STR_PAD_LEFT);
+        }
+
+        $e_length = strlen($e_bits);
+
+        // calculate the appropriate window size.
+        // $window_size == 3 if $window_ranges is between 25 and 81, for example.
+        for ($i = 0, $window_size = 1; $e_length > $window_ranges[$i] && $i < count($window_ranges); ++$window_size, ++$i);
+
+        $n_value = $n->value;
+
+        // precompute $this^0 through $this^$window_size
+        $powers = array();
+        $powers[1] = $this->_prepareReduce($this->value, $n_value, $mode);
+        $powers[2] = $this->_squareReduce($powers[1], $n_value, $mode);
+
+        // we do every other number since substr($e_bits, $i, $j+1) (see below) is supposed to end
+        // in a 1.  ie. it's supposed to be odd.
+        $temp = 1 << ($window_size - 1);
+        for ($i = 1; $i < $temp; ++$i) {
+            $i2 = $i << 1;
+            $powers[$i2 + 1] = $this->_multiplyReduce($powers[$i2 - 1], $powers[2], $n_value, $mode);
+        }
+
+        $result = array(1);
+        $result = $this->_prepareReduce($result, $n_value, $mode);
+
+        for ($i = 0; $i < $e_length; ) {
+            if ( !$e_bits[$i] ) {
+                $result = $this->_squareReduce($result, $n_value, $mode);
+                ++$i;
+            } else {
+                for ($j = $window_size - 1; $j > 0; --$j) {
+                    if ( !empty($e_bits[$i + $j]) ) {
+                        break;
+                    }
+                }
+
+                for ($k = 0; $k <= $j; ++$k) {// eg. the length of substr($e_bits, $i, $j+1)
+                    $result = $this->_squareReduce($result, $n_value, $mode);
+                }
+
+                $result = $this->_multiplyReduce($result, $powers[bindec(substr($e_bits, $i, $j + 1))], $n_value, $mode);
+
+                $i+=$j + 1;
+            }
+        }
+
+        $temp = new Math_BigInteger();
+        $temp->value = $this->_reduce($result, $n_value, $mode);
+
+        return $temp;
+    }
+
+    /**
+     * Modular reduction
+     *
+     * For most $modes this will return the remainder.
+     *
+     * @see _slidingWindow()
+     * @access private
+     * @param Array $x
+     * @param Array $n
+     * @param Integer $mode
+     * @return Array
+     */
+    function _reduce($x, $n, $mode)
+    {
+        switch ($mode) {
+            case MATH_BIGINTEGER_MONTGOMERY:
+                return $this->_montgomery($x, $n);
+            case MATH_BIGINTEGER_BARRETT:
+                return $this->_barrett($x, $n);
+            case MATH_BIGINTEGER_POWEROF2:
+                $lhs = new Math_BigInteger();
+                $lhs->value = $x;
+                $rhs = new Math_BigInteger();
+                $rhs->value = $n;
+                return $x->_mod2($n);
+            case MATH_BIGINTEGER_CLASSIC:
+                $lhs = new Math_BigInteger();
+                $lhs->value = $x;
+                $rhs = new Math_BigInteger();
+                $rhs->value = $n;
+                list(, $temp) = $lhs->divide($rhs);
+                return $temp->value;
+            case MATH_BIGINTEGER_NONE:
+                return $x;
+            default:
+                // an invalid $mode was provided
+        }
+    }
+
+    /**
+     * Modular reduction preperation
+     *
+     * @see _slidingWindow()
+     * @access private
+     * @param Array $x
+     * @param Array $n
+     * @param Integer $mode
+     * @return Array
+     */
+    function _prepareReduce($x, $n, $mode)
+    {
+        if ($mode == MATH_BIGINTEGER_MONTGOMERY) {
+            return $this->_prepMontgomery($x, $n);
+        }
+        return $this->_reduce($x, $n, $mode);
+    }
+
+    /**
+     * Modular multiply
+     *
+     * @see _slidingWindow()
+     * @access private
+     * @param Array $x
+     * @param Array $y
+     * @param Array $n
+     * @param Integer $mode
+     * @return Array
+     */
+    function _multiplyReduce($x, $y, $n, $mode)
+    {
+        if ($mode == MATH_BIGINTEGER_MONTGOMERY) {
+            return $this->_montgomeryMultiply($x, $y, $n);
+        }
+        $temp = $this->_multiply($x, false, $y, false);
+        return $this->_reduce($temp[MATH_BIGINTEGER_VALUE], $n, $mode);
+    }
+
+    /**
+     * Modular square
+     *
+     * @see _slidingWindow()
+     * @access private
+     * @param Array $x
+     * @param Array $n
+     * @param Integer $mode
+     * @return Array
+     */
+    function _squareReduce($x, $n, $mode)
+    {
+        if ($mode == MATH_BIGINTEGER_MONTGOMERY) {
+            return $this->_montgomeryMultiply($x, $x, $n);
+        }
+        return $this->_reduce($this->_square($x), $n, $mode);
+    }
+
+    /**
+     * Modulos for Powers of Two
+     *
+     * Calculates $x%$n, where $n = 2**$e, for some $e.  Since this is basically the same as doing $x & ($n-1),
+     * we'll just use this function as a wrapper for doing that.
+     *
+     * @see _slidingWindow()
+     * @access private
+     * @param Math_BigInteger
+     * @return Math_BigInteger
+     */
+    function _mod2($n)
+    {
+        $temp = new Math_BigInteger();
+        $temp->value = array(1);
+        return $this->bitwise_and($n->subtract($temp));
+    }
+
+    /**
+     * Barrett Modular Reduction
+     *
+     * See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=14 HAC 14.3.3} /
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=165 MPM 6.2.5} for more information.  Modified slightly,
+     * so as not to require negative numbers (initially, this script didn't support negative numbers).
+     *
+     * Employs "folding", as described at
+     * {@link http://www.cosic.esat.kuleuven.be/publications/thesis-149.pdf#page=66 thesis-149.pdf#page=66}.  To quote from
+     * it, "the idea [behind folding] is to find a value x' such that x (mod m) = x' (mod m), with x' being smaller than x."
+     *
+     * Unfortunately, the "Barrett Reduction with Folding" algorithm described in thesis-149.pdf is not, as written, all that
+     * usable on account of (1) its not using reasonable radix points as discussed in
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=162 MPM 6.2.2} and (2) the fact that, even with reasonable
+     * radix points, it only works when there are an even number of digits in the denominator.  The reason for (2) is that
+     * (x >> 1) + (x >> 1) != x / 2 + x / 2.  If x is even, they're the same, but if x is odd, they're not.  See the in-line
+     * comments for details.
+     *
+     * @see _slidingWindow()
+     * @access private
+     * @param Array $n
+     * @param Array $m
+     * @return Array
+     */
+    function _barrett($n, $m)
+    {
+        static $cache = array(
+            MATH_BIGINTEGER_VARIABLE => array(),
+            MATH_BIGINTEGER_DATA => array()
+        );
+
+        $m_length = count($m);
+
+        // if ($this->_compare($n, $this->_square($m)) >= 0) {
+        if (count($n) > 2 * $m_length) {
+            $lhs = new Math_BigInteger();
+            $rhs = new Math_BigInteger();
+            $lhs->value = $n;
+            $rhs->value = $m;
+            list(, $temp) = $lhs->divide($rhs);
+            return $temp->value;
+        }
+
+        // if (m.length >> 1) + 2 <= m.length then m is too small and n can't be reduced
+        if ($m_length < 5) {
+            return $this->_regularBarrett($n, $m);
+        }
+
+        // n = 2 * m.length
+
+        if ( ($key = array_search($m, $cache[MATH_BIGINTEGER_VARIABLE])) === false ) {
+            $key = count($cache[MATH_BIGINTEGER_VARIABLE]);
+            $cache[MATH_BIGINTEGER_VARIABLE][] = $m;
+
+            $lhs = new Math_BigInteger();
+            $lhs_value = &$lhs->value;
+            $lhs_value = $this->_array_repeat(0, $m_length + ($m_length >> 1));
+            $lhs_value[] = 1;
+            $rhs = new Math_BigInteger();
+            $rhs->value = $m;
+
+            list($u, $m1) = $lhs->divide($rhs);
+            $u = $u->value;
+            $m1 = $m1->value;
+
+            $cache[MATH_BIGINTEGER_DATA][] = array(
+                'u' => $u, // m.length >> 1 (technically (m.length >> 1) + 1)
+                'm1'=> $m1 // m.length
+            );
+        } else {
+            extract($cache[MATH_BIGINTEGER_DATA][$key]);
+        }
+
+        $cutoff = $m_length + ($m_length >> 1);
+        $lsd = array_slice($n, 0, $cutoff); // m.length + (m.length >> 1)
+        $msd = array_slice($n, $cutoff);    // m.length >> 1
+        $lsd = $this->_trim($lsd);
+        $temp = $this->_multiply($msd, false, $m1, false);
+        $n = $this->_add($lsd, false, $temp[MATH_BIGINTEGER_VALUE], false); // m.length + (m.length >> 1) + 1
+
+        if ($m_length & 1) {
+            return $this->_regularBarrett($n[MATH_BIGINTEGER_VALUE], $m);
+        }
+
+        // (m.length + (m.length >> 1) + 1) - (m.length - 1) == (m.length >> 1) + 2
+        $temp = array_slice($n[MATH_BIGINTEGER_VALUE], $m_length - 1);
+        // if even: ((m.length >> 1) + 2) + (m.length >> 1) == m.length + 2
+        // if odd:  ((m.length >> 1) + 2) + (m.length >> 1) == (m.length - 1) + 2 == m.length + 1
+        $temp = $this->_multiply($temp, false, $u, false);
+        // if even: (m.length + 2) - ((m.length >> 1) + 1) = m.length - (m.length >> 1) + 1
+        // if odd:  (m.length + 1) - ((m.length >> 1) + 1) = m.length - (m.length >> 1)
+        $temp = array_slice($temp[MATH_BIGINTEGER_VALUE], ($m_length >> 1) + 1);
+        // if even: (m.length - (m.length >> 1) + 1) + m.length = 2 * m.length - (m.length >> 1) + 1
+        // if odd:  (m.length - (m.length >> 1)) + m.length     = 2 * m.length - (m.length >> 1)
+        $temp = $this->_multiply($temp, false, $m, false);
+
+        // at this point, if m had an odd number of digits, we'd be subtracting a 2 * m.length - (m.length >> 1) digit
+        // number from a m.length + (m.length >> 1) + 1 digit number.  ie. there'd be an extra digit and the while loop
+        // following this comment would loop a lot (hence our calling _regularBarrett() in that situation).
+
+        $result = $this->_subtract($n[MATH_BIGINTEGER_VALUE], false, $temp[MATH_BIGINTEGER_VALUE], false);
+
+        while ($this->_compare($result[MATH_BIGINTEGER_VALUE], $result[MATH_BIGINTEGER_SIGN], $m, false) >= 0) {
+            $result = $this->_subtract($result[MATH_BIGINTEGER_VALUE], $result[MATH_BIGINTEGER_SIGN], $m, false);
+        }
+
+        return $result[MATH_BIGINTEGER_VALUE];
+    }
+
+    /**
+     * (Regular) Barrett Modular Reduction
+     *
+     * For numbers with more than four digits Math_BigInteger::_barrett() is faster.  The difference between that and this
+     * is that this function does not fold the denominator into a smaller form.
+     *
+     * @see _slidingWindow()
+     * @access private
+     * @param Array $x
+     * @param Array $n
+     * @return Array
+     */
+    function _regularBarrett($x, $n)
+    {
+        static $cache = array(
+            MATH_BIGINTEGER_VARIABLE => array(),
+            MATH_BIGINTEGER_DATA => array()
+        );
+
+        $n_length = count($n);
+
+        if (count($x) > 2 * $n_length) {
+            $lhs = new Math_BigInteger();
+            $rhs = new Math_BigInteger();
+            $lhs->value = $x;
+            $rhs->value = $n;
+            list(, $temp) = $lhs->divide($rhs);
+            return $temp->value;
+        }
+
+        if ( ($key = array_search($n, $cache[MATH_BIGINTEGER_VARIABLE])) === false ) {
+            $key = count($cache[MATH_BIGINTEGER_VARIABLE]);
+            $cache[MATH_BIGINTEGER_VARIABLE][] = $n;
+            $lhs = new Math_BigInteger();
+            $lhs_value = &$lhs->value;
+            $lhs_value = $this->_array_repeat(0, 2 * $n_length);
+            $lhs_value[] = 1;
+            $rhs = new Math_BigInteger();
+            $rhs->value = $n;
+            list($temp, ) = $lhs->divide($rhs); // m.length
+            $cache[MATH_BIGINTEGER_DATA][] = $temp->value;
+        }
+
+        // 2 * m.length - (m.length - 1) = m.length + 1
+        $temp = array_slice($x, $n_length - 1);
+        // (m.length + 1) + m.length = 2 * m.length + 1
+        $temp = $this->_multiply($temp, false, $cache[MATH_BIGINTEGER_DATA][$key], false);
+        // (2 * m.length + 1) - (m.length - 1) = m.length + 2
+        $temp = array_slice($temp[MATH_BIGINTEGER_VALUE], $n_length + 1);
+
+        // m.length + 1
+        $result = array_slice($x, 0, $n_length + 1);
+        // m.length + 1
+        $temp = $this->_multiplyLower($temp, false, $n, false, $n_length + 1);
+        // $temp == array_slice($temp->_multiply($temp, false, $n, false)->value, 0, $n_length + 1)
+
+        if ($this->_compare($result, false, $temp[MATH_BIGINTEGER_VALUE], $temp[MATH_BIGINTEGER_SIGN]) < 0) {
+            $corrector_value = $this->_array_repeat(0, $n_length + 1);
+            $corrector_value[] = 1;
+            $result = $this->_add($result, false, $corrector_value, false);
+            $result = $result[MATH_BIGINTEGER_VALUE];
+        }
+
+        // at this point, we're subtracting a number with m.length + 1 digits from another number with m.length + 1 digits
+        $result = $this->_subtract($result, false, $temp[MATH_BIGINTEGER_VALUE], $temp[MATH_BIGINTEGER_SIGN]);
+        while ($this->_compare($result[MATH_BIGINTEGER_VALUE], $result[MATH_BIGINTEGER_SIGN], $n, false) > 0) {
+            $result = $this->_subtract($result[MATH_BIGINTEGER_VALUE], $result[MATH_BIGINTEGER_SIGN], $n, false);
+        }
+
+        return $result[MATH_BIGINTEGER_VALUE];
+    }
+
+    /**
+     * Performs long multiplication up to $stop digits
+     *
+     * If you're going to be doing array_slice($product->value, 0, $stop), some cycles can be saved.
+     *
+     * @see _regularBarrett()
+     * @param Array $x_value
+     * @param Boolean $x_negative
+     * @param Array $y_value
+     * @param Boolean $y_negative
+     * @param Integer $stop
+     * @return Array
+     * @access private
+     */
+    function _multiplyLower($x_value, $x_negative, $y_value, $y_negative, $stop)
+    {
+        $x_length = count($x_value);
+        $y_length = count($y_value);
+
+        if ( !$x_length || !$y_length ) { // a 0 is being multiplied
+            return array(
+                MATH_BIGINTEGER_VALUE => array(),
+                MATH_BIGINTEGER_SIGN => false
+            );
+        }
+
+        if ( $x_length < $y_length ) {
+            $temp = $x_value;
+            $x_value = $y_value;
+            $y_value = $temp;
+
+            $x_length = count($x_value);
+            $y_length = count($y_value);
+        }
+
+        $product_value = $this->_array_repeat(0, $x_length + $y_length);
+
+        // the following for loop could be removed if the for loop following it
+        // (the one with nested for loops) initially set $i to 0, but
+        // doing so would also make the result in one set of unnecessary adds,
+        // since on the outermost loops first pass, $product->value[$k] is going
+        // to always be 0
+
+        $carry = 0;
+
+        for ($j = 0; $j < $x_length; ++$j) { // ie. $i = 0, $k = $i
+            $temp = $x_value[$j] * $y_value[0] + $carry; // $product_value[$k] == 0
+            $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+            $product_value[$j] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
+        }
+
+        if ($j < $stop) {
+            $product_value[$j] = $carry;
+        }
+
+        // the above for loop is what the previous comment was talking about.  the
+        // following for loop is the "one with nested for loops"
+
+        for ($i = 1; $i < $y_length; ++$i) {
+            $carry = 0;
+
+            for ($j = 0, $k = $i; $j < $x_length && $k < $stop; ++$j, ++$k) {
+                $temp = $product_value[$k] + $x_value[$j] * $y_value[$i] + $carry;
+                $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+                $product_value[$k] = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * $carry);
+            }
+
+            if ($k < $stop) {
+                $product_value[$k] = $carry;
+            }
+        }
+
+        return array(
+            MATH_BIGINTEGER_VALUE => $this->_trim($product_value),
+            MATH_BIGINTEGER_SIGN => $x_negative != $y_negative
+        );
+    }
+
+    /**
+     * Montgomery Modular Reduction
+     *
+     * ($x->_prepMontgomery($n))->_montgomery($n) yields $x % $n.
+     * {@link http://math.libtomcrypt.com/files/tommath.pdf#page=170 MPM 6.3} provides insights on how this can be
+     * improved upon (basically, by using the comba method).  gcd($n, 2) must be equal to one for this function
+     * to work correctly.
+     *
+     * @see _prepMontgomery()
+     * @see _slidingWindow()
+     * @access private
+     * @param Array $x
+     * @param Array $n
+     * @return Array
+     */
+    function _montgomery($x, $n)
+    {
+        static $cache = array(
+            MATH_BIGINTEGER_VARIABLE => array(),
+            MATH_BIGINTEGER_DATA => array()
+        );
+
+        if ( ($key = array_search($n, $cache[MATH_BIGINTEGER_VARIABLE])) === false ) {
+            $key = count($cache[MATH_BIGINTEGER_VARIABLE]);
+            $cache[MATH_BIGINTEGER_VARIABLE][] = $x;
+            $cache[MATH_BIGINTEGER_DATA][] = $this->_modInverse67108864($n);
+        }
+
+        $k = count($n);
+
+        $result = array(MATH_BIGINTEGER_VALUE => $x);
+
+        for ($i = 0; $i < $k; ++$i) {
+            $temp = $result[MATH_BIGINTEGER_VALUE][$i] * $cache[MATH_BIGINTEGER_DATA][$key];
+            $temp = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * ((int) ($temp / MATH_BIGINTEGER_BASE_FULL)));
+            $temp = $this->_regularMultiply(array($temp), $n);
+            $temp = array_merge($this->_array_repeat(0, $i), $temp);
+            $result = $this->_add($result[MATH_BIGINTEGER_VALUE], false, $temp, false);
+        }
+
+        $result[MATH_BIGINTEGER_VALUE] = array_slice($result[MATH_BIGINTEGER_VALUE], $k);
+
+        if ($this->_compare($result, false, $n, false) >= 0) {
+            $result = $this->_subtract($result[MATH_BIGINTEGER_VALUE], false, $n, false);
+        }
+
+        return $result[MATH_BIGINTEGER_VALUE];
+    }
+
+    /**
+     * Montgomery Multiply
+     *
+     * Interleaves the montgomery reduction and long multiplication algorithms together as described in 
+     * {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=13 HAC 14.36}
+     *
+     * @see _prepMontgomery()
+     * @see _montgomery()
+     * @access private
+     * @param Array $x
+     * @param Array $y
+     * @param Array $m
+     * @return Array
+     */
+    function _montgomeryMultiply($x, $y, $m)
+    {
+        $temp = $this->_multiply($x, false, $y, false);
+        return $this->_montgomery($temp[MATH_BIGINTEGER_VALUE], $m);
+
+        static $cache = array(
+            MATH_BIGINTEGER_VARIABLE => array(),
+            MATH_BIGINTEGER_DATA => array()
+        );
+
+        if ( ($key = array_search($m, $cache[MATH_BIGINTEGER_VARIABLE])) === false ) {
+            $key = count($cache[MATH_BIGINTEGER_VARIABLE]);
+            $cache[MATH_BIGINTEGER_VARIABLE][] = $m;
+            $cache[MATH_BIGINTEGER_DATA][] = $this->_modInverse67108864($m);
+        }
+
+        $n = max(count($x), count($y), count($m));
+        $x = array_pad($x, $n, 0);
+        $y = array_pad($y, $n, 0);
+        $m = array_pad($m, $n, 0);
+        $a = array(MATH_BIGINTEGER_VALUE => $this->_array_repeat(0, $n + 1));
+        for ($i = 0; $i < $n; ++$i) {
+            $temp = $a[MATH_BIGINTEGER_VALUE][0] + $x[$i] * $y[0];
+            $temp = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * ((int) ($temp / MATH_BIGINTEGER_BASE_FULL)));
+            $temp = $temp * $cache[MATH_BIGINTEGER_DATA][$key];
+            $temp = (int) ($temp - MATH_BIGINTEGER_BASE_FULL * ((int) ($temp / MATH_BIGINTEGER_BASE_FULL)));
+            $temp = $this->_add($this->_regularMultiply(array($x[$i]), $y), false, $this->_regularMultiply(array($temp), $m), false);
+            $a = $this->_add($a[MATH_BIGINTEGER_VALUE], false, $temp[MATH_BIGINTEGER_VALUE], false);
+            $a[MATH_BIGINTEGER_VALUE] = array_slice($a[MATH_BIGINTEGER_VALUE], 1);
+        }
+        if ($this->_compare($a[MATH_BIGINTEGER_VALUE], false, $m, false) >= 0) {
+            $a = $this->_subtract($a[MATH_BIGINTEGER_VALUE], false, $m, false);
+        }
+        return $a[MATH_BIGINTEGER_VALUE];
+    }
+
+    /**
+     * Prepare a number for use in Montgomery Modular Reductions
+     *
+     * @see _montgomery()
+     * @see _slidingWindow()
+     * @access private
+     * @param Array $x
+     * @param Array $n
+     * @return Array
+     */
+    function _prepMontgomery($x, $n)
+    {
+        $lhs = new Math_BigInteger();
+        $lhs->value = array_merge($this->_array_repeat(0, count($n)), $x);
+        $rhs = new Math_BigInteger();
+        $rhs->value = $n;
+
+        list(, $temp) = $lhs->divide($rhs);
+        return $temp->value;
+    }
+
+    /**
+     * Modular Inverse of a number mod 2**26 (eg. 67108864)
+     *
+     * Based off of the bnpInvDigit function implemented and justified in the following URL:
+     *
+     * {@link http://www-cs-students.stanford.edu/~tjw/jsbn/jsbn.js}
+     *
+     * The following URL provides more info:
+     *
+     * {@link http://groups.google.com/group/sci.crypt/msg/7a137205c1be7d85}
+     *
+     * As for why we do all the bitmasking...  strange things can happen when converting from floats to ints. For
+     * instance, on some computers, var_dump((int) -4294967297) yields int(-1) and on others, it yields 
+     * int(-2147483648).  To avoid problems stemming from this, we use bitmasks to guarantee that ints aren't
+     * auto-converted to floats.  The outermost bitmask is present because without it, there's no guarantee that
+     * the "residue" returned would be the so-called "common residue".  We use fmod, in the last step, because the
+     * maximum possible $x is 26 bits and the maximum $result is 16 bits.  Thus, we have to be able to handle up to
+     * 40 bits, which only 64-bit floating points will support.
+     *
+     * Thanks to Pedro Gimeno Fortea for input!
+     *
+     * @see _montgomery()
+     * @access private
+     * @param Array $x
+     * @return Integer
+     */
+    function _modInverse67108864($x) // 2**26 == 67,108,864
+    {
+        $x = -$x[0];
+        $result = $x & 0x3; // x**-1 mod 2**2
+        $result = ($result * (2 - $x * $result)) & 0xF; // x**-1 mod 2**4
+        $result = ($result * (2 - ($x & 0xFF) * $result))  & 0xFF; // x**-1 mod 2**8
+        $result = ($result * ((2 - ($x & 0xFFFF) * $result) & 0xFFFF)) & 0xFFFF; // x**-1 mod 2**16
+        $result = fmod($result * (2 - fmod($x * $result, MATH_BIGINTEGER_BASE_FULL)), MATH_BIGINTEGER_BASE_FULL); // x**-1 mod 2**26
+        return $result & MATH_BIGINTEGER_MAX_DIGIT;
+    }
+
+    /**
+     * Calculates modular inverses.
+     *
+     * Say you have (30 mod 17 * x mod 17) mod 17 == 1.  x can be found using modular inverses.
+     *
+     * Here's an example:
+     * 
+     * modInverse($b);
+     *    echo $c->toString(); // outputs 4
+     *
+     *    echo "\r\n";
+     *
+     *    $d = $a->multiply($c);
+     *    list(, $d) = $d->divide($b);
+     *    echo $d; // outputs 1 (as per the definition of modular inverse)
+     * ?>
+     * 
+     *
+     * @param Math_BigInteger $n
+     * @return mixed false, if no modular inverse exists, Math_BigInteger, otherwise.
+     * @access public
+     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=21 HAC 14.64} for more information.
+     */
+    function modInverse($n)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $temp = new Math_BigInteger();
+                $temp->value = gmp_invert($this->value, $n->value);
+
+                return ( $temp->value === false ) ? false : $this->_normalize($temp);
+        }
+
+        static $zero, $one;
+        if (!isset($zero)) {
+            $zero = new Math_BigInteger();
+            $one = new Math_BigInteger(1);
+        }
+
+        // $x mod -$n == $x mod $n.
+        $n = $n->abs();
+
+        if ($this->compare($zero) < 0) {
+            $temp = $this->abs();
+            $temp = $temp->modInverse($n);
+            return $this->_normalize($n->subtract($temp));
+        }
+
+        extract($this->extendedGCD($n));
+
+        if (!$gcd->equals($one)) {
+            return false;
+        }
+
+        $x = $x->compare($zero) < 0 ? $x->add($n) : $x;
+
+        return $this->compare($zero) < 0 ? $this->_normalize($n->subtract($x)) : $this->_normalize($x);
+    }
+
+    /**
+     * Calculates the greatest common divisor and Bezout's identity.
+     *
+     * Say you have 693 and 609.  The GCD is 21.  Bezout's identity states that there exist integers x and y such that
+     * 693*x + 609*y == 21.  In point of fact, there are actually an infinite number of x and y combinations and which
+     * combination is returned is dependant upon which mode is in use.  See
+     * {@link http://en.wikipedia.org/wiki/B%C3%A9zout%27s_identity Bezout's identity - Wikipedia} for more information.
+     *
+     * Here's an example:
+     * 
+     * extendedGCD($b));
+     *
+     *    echo $gcd->toString() . "\r\n"; // outputs 21
+     *    echo $a->toString() * $x->toString() + $b->toString() * $y->toString(); // outputs 21
+     * ?>
+     * 
+     *
+     * @param Math_BigInteger $n
+     * @return Math_BigInteger
+     * @access public
+     * @internal Calculates the GCD using the binary xGCD algorithim described in
+     *    {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap14.pdf#page=19 HAC 14.61}.  As the text above 14.61 notes,
+     *    the more traditional algorithim requires "relatively costly multiple-precision divisions".
+     */
+    function extendedGCD($n)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                extract(gmp_gcdext($this->value, $n->value));
+
+                return array(
+                    'gcd' => $this->_normalize(new Math_BigInteger($g)),
+                    'x'   => $this->_normalize(new Math_BigInteger($s)),
+                    'y'   => $this->_normalize(new Math_BigInteger($t))
+                );
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                // it might be faster to use the binary xGCD algorithim here, as well, but (1) that algorithim works
+                // best when the base is a power of 2 and (2) i don't think it'd make much difference, anyway.  as is,
+                // the basic extended euclidean algorithim is what we're using.
+
+                $u = $this->value;
+                $v = $n->value;
+
+                $a = '1';
+                $b = '0';
+                $c = '0';
+                $d = '1';
+
+                while (bccomp($v, '0', 0) != 0) {
+                    $q = bcdiv($u, $v, 0);
+
+                    $temp = $u;
+                    $u = $v;
+                    $v = bcsub($temp, bcmul($v, $q, 0), 0);
+
+                    $temp = $a;
+                    $a = $c;
+                    $c = bcsub($temp, bcmul($a, $q, 0), 0);
+
+                    $temp = $b;
+                    $b = $d;
+                    $d = bcsub($temp, bcmul($b, $q, 0), 0);
+                }
+
+                return array(
+                    'gcd' => $this->_normalize(new Math_BigInteger($u)),
+                    'x'   => $this->_normalize(new Math_BigInteger($a)),
+                    'y'   => $this->_normalize(new Math_BigInteger($b))
+                );
+        }
+
+        $y = $n->copy();
+        $x = $this->copy();
+        $g = new Math_BigInteger();
+        $g->value = array(1);
+
+        while ( !(($x->value[0] & 1)|| ($y->value[0] & 1)) ) {
+            $x->_rshift(1);
+            $y->_rshift(1);
+            $g->_lshift(1);
+        }
+
+        $u = $x->copy();
+        $v = $y->copy();
+
+        $a = new Math_BigInteger();
+        $b = new Math_BigInteger();
+        $c = new Math_BigInteger();
+        $d = new Math_BigInteger();
+
+        $a->value = $d->value = $g->value = array(1);
+        $b->value = $c->value = array();
+
+        while ( !empty($u->value) ) {
+            while ( !($u->value[0] & 1) ) {
+                $u->_rshift(1);
+                if ( (!empty($a->value) && ($a->value[0] & 1)) || (!empty($b->value) && ($b->value[0] & 1)) ) {
+                    $a = $a->add($y);
+                    $b = $b->subtract($x);
+                }
+                $a->_rshift(1);
+                $b->_rshift(1);
+            }
+
+            while ( !($v->value[0] & 1) ) {
+                $v->_rshift(1);
+                if ( (!empty($d->value) && ($d->value[0] & 1)) || (!empty($c->value) && ($c->value[0] & 1)) ) {
+                    $c = $c->add($y);
+                    $d = $d->subtract($x);
+                }
+                $c->_rshift(1);
+                $d->_rshift(1);
+            }
+
+            if ($u->compare($v) >= 0) {
+                $u = $u->subtract($v);
+                $a = $a->subtract($c);
+                $b = $b->subtract($d);
+            } else {
+                $v = $v->subtract($u);
+                $c = $c->subtract($a);
+                $d = $d->subtract($b);
+            }
+        }
+
+        return array(
+            'gcd' => $this->_normalize($g->multiply($v)),
+            'x'   => $this->_normalize($c),
+            'y'   => $this->_normalize($d)
+        );
+    }
+
+    /**
+     * Calculates the greatest common divisor
+     *
+     * Say you have 693 and 609.  The GCD is 21.
+     *
+     * Here's an example:
+     * 
+     * extendedGCD($b);
+     *
+     *    echo $gcd->toString() . "\r\n"; // outputs 21
+     * ?>
+     * 
+     *
+     * @param Math_BigInteger $n
+     * @return Math_BigInteger
+     * @access public
+     */
+    function gcd($n)
+    {
+        extract($this->extendedGCD($n));
+        return $gcd;
+    }
+
+    /**
+     * Absolute value.
+     *
+     * @return Math_BigInteger
+     * @access public
+     */
+    function abs()
+    {
+        $temp = new Math_BigInteger();
+
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $temp->value = gmp_abs($this->value);
+                break;
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $temp->value = (bccomp($this->value, '0', 0) < 0) ? substr($this->value, 1) : $this->value;
+                break;
+            default:
+                $temp->value = $this->value;
+        }
+
+        return $temp;
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * Although one might think !$x->compare($y) means $x != $y, it, in fact, means the opposite.  The reason for this is
+     * demonstrated thusly:
+     *
+     * $x  > $y: $x->compare($y)  > 0
+     * $x  < $y: $x->compare($y)  < 0
+     * $x == $y: $x->compare($y) == 0
+     *
+     * Note how the same comparison operator is used.  If you want to test for equality, use $x->equals($y).
+     *
+     * @param Math_BigInteger $y
+     * @return Integer < 0 if $this is less than $y; > 0 if $this is greater than $y, and 0 if they are equal.
+     * @access public
+     * @see equals()
+     * @internal Could return $this->subtract($x), but that's not as fast as what we do do.
+     */
+    function compare($y)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                return gmp_cmp($this->value, $y->value);
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                return bccomp($this->value, $y->value, 0);
+        }
+
+        return $this->_compare($this->value, $this->is_negative, $y->value, $y->is_negative);
+    }
+
+    /**
+     * Compares two numbers.
+     *
+     * @param Array $x_value
+     * @param Boolean $x_negative
+     * @param Array $y_value
+     * @param Boolean $y_negative
+     * @return Integer
+     * @see compare()
+     * @access private
+     */
+    function _compare($x_value, $x_negative, $y_value, $y_negative)
+    {
+        if ( $x_negative != $y_negative ) {
+            return ( !$x_negative && $y_negative ) ? 1 : -1;
+        }
+
+        $result = $x_negative ? -1 : 1;
+
+        if ( count($x_value) != count($y_value) ) {
+            return ( count($x_value) > count($y_value) ) ? $result : -$result;
+        }
+        $size = max(count($x_value), count($y_value));
+
+        $x_value = array_pad($x_value, $size, 0);
+        $y_value = array_pad($y_value, $size, 0);
+
+        for ($i = count($x_value) - 1; $i >= 0; --$i) {
+            if ($x_value[$i] != $y_value[$i]) {
+                return ( $x_value[$i] > $y_value[$i] ) ? $result : -$result;
+            }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Tests the equality of two numbers.
+     *
+     * If you need to see if one number is greater than or less than another number, use Math_BigInteger::compare()
+     *
+     * @param Math_BigInteger $x
+     * @return Boolean
+     * @access public
+     * @see compare()
+     */
+    function equals($x)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                return gmp_cmp($this->value, $x->value) == 0;
+            default:
+                return $this->value === $x->value && $this->is_negative == $x->is_negative;
+        }
+    }
+
+    /**
+     * Set Precision
+     *
+     * Some bitwise operations give different results depending on the precision being used.  Examples include left
+     * shift, not, and rotates.
+     *
+     * @param Integer $bits
+     * @access public
+     */
+    function setPrecision($bits)
+    {
+        $this->precision = $bits;
+        if ( MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_BCMATH ) {
+            $this->bitmask = new Math_BigInteger(chr((1 << ($bits & 0x7)) - 1) . str_repeat(chr(0xFF), $bits >> 3), 256);
+        } else {
+            $this->bitmask = new Math_BigInteger(bcpow('2', $bits, 0));
+        }
+
+        $temp = $this->_normalize($this);
+        $this->value = $temp->value;
+    }
+
+    /**
+     * Logical And
+     *
+     * @param Math_BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez 
+     * @return Math_BigInteger
+     */
+    function bitwise_and($x)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $temp = new Math_BigInteger();
+                $temp->value = gmp_and($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new Math_BigInteger($left & $right, 256));
+        }
+
+        $result = $this->copy();
+
+        $length = min(count($x->value), count($this->value));
+
+        $result->value = array_slice($result->value, 0, $length);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]&= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Or
+     *
+     * @param Math_BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez 
+     * @return Math_BigInteger
+     */
+    function bitwise_or($x)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $temp = new Math_BigInteger();
+                $temp->value = gmp_or($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new Math_BigInteger($left | $right, 256));
+        }
+
+        $length = max(count($this->value), count($x->value));
+        $result = $this->copy();
+        $result->value = array_pad($result->value, $length, 0);
+        $x->value = array_pad($x->value, $length, 0);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]|= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Exclusive-Or
+     *
+     * @param Math_BigInteger $x
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez 
+     * @return Math_BigInteger
+     */
+    function bitwise_xor($x)
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                $temp = new Math_BigInteger();
+                $temp->value = gmp_xor($this->value, $x->value);
+
+                return $this->_normalize($temp);
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $left = $this->toBytes();
+                $right = $x->toBytes();
+
+                $length = max(strlen($left), strlen($right));
+
+                $left = str_pad($left, $length, chr(0), STR_PAD_LEFT);
+                $right = str_pad($right, $length, chr(0), STR_PAD_LEFT);
+
+                return $this->_normalize(new Math_BigInteger($left ^ $right, 256));
+        }
+
+        $length = max(count($this->value), count($x->value));
+        $result = $this->copy();
+        $result->value = array_pad($result->value, $length, 0);
+        $x->value = array_pad($x->value, $length, 0);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $result->value[$i]^= $x->value[$i];
+        }
+
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Not
+     *
+     * @access public
+     * @internal Implemented per a request by Lluis Pamies i Juarez 
+     * @return Math_BigInteger
+     */
+    function bitwise_not()
+    {
+        // calculuate "not" without regard to $this->precision
+        // (will always result in a smaller number.  ie. ~1 isn't 1111 1110 - it's 0)
+        $temp = $this->toBytes();
+        $pre_msb = decbin(ord($temp[0]));
+        $temp = ~$temp;
+        $msb = decbin(ord($temp[0]));
+        if (strlen($msb) == 8) {
+            $msb = substr($msb, strpos($msb, '0'));
+        }
+        $temp[0] = chr(bindec($msb));
+
+        // see if we need to add extra leading 1's
+        $current_bits = strlen($pre_msb) + 8 * strlen($temp) - 8;
+        $new_bits = $this->precision - $current_bits;
+        if ($new_bits <= 0) {
+            return $this->_normalize(new Math_BigInteger($temp, 256));
+        }
+
+        // generate as many leading 1's as we need to.
+        $leading_ones = chr((1 << ($new_bits & 0x7)) - 1) . str_repeat(chr(0xFF), $new_bits >> 3);
+        $this->_base256_lshift($leading_ones, $current_bits);
+
+        $temp = str_pad($temp, ceil($this->bits / 8), chr(0), STR_PAD_LEFT);
+
+        return $this->_normalize(new Math_BigInteger($leading_ones | $temp, 256));
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively dividing by 2**$shift.
+     *
+     * @param Integer $shift
+     * @return Math_BigInteger
+     * @access public
+     * @internal The only version that yields any speed increases is the internal version.
+     */
+    function bitwise_rightShift($shift)
+    {
+        $temp = new Math_BigInteger();
+
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                static $two;
+
+                if (!isset($two)) {
+                    $two = gmp_init('2');
+                }
+
+                $temp->value = gmp_div_q($this->value, gmp_pow($two, $shift));
+
+                break;
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $temp->value = bcdiv($this->value, bcpow('2', $shift, 0), 0);
+
+                break;
+            default: // could just replace _lshift with this, but then all _lshift() calls would need to be rewritten
+                     // and I don't want to do that...
+                $temp->value = $this->value;
+                $temp->_rshift($shift);
+        }
+
+        return $this->_normalize($temp);
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts BigInteger's by $shift bits, effectively multiplying by 2**$shift.
+     *
+     * @param Integer $shift
+     * @return Math_BigInteger
+     * @access public
+     * @internal The only version that yields any speed increases is the internal version.
+     */
+    function bitwise_leftShift($shift)
+    {
+        $temp = new Math_BigInteger();
+
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                static $two;
+
+                if (!isset($two)) {
+                    $two = gmp_init('2');
+                }
+
+                $temp->value = gmp_mul($this->value, gmp_pow($two, $shift));
+
+                break;
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                $temp->value = bcmul($this->value, bcpow('2', $shift, 0), 0);
+
+                break;
+            default: // could just replace _rshift with this, but then all _lshift() calls would need to be rewritten
+                     // and I don't want to do that...
+                $temp->value = $this->value;
+                $temp->_lshift($shift);
+        }
+
+        return $this->_normalize($temp);
+    }
+
+    /**
+     * Logical Left Rotate
+     *
+     * Instead of the top x bits being dropped they're appended to the shifted bit string.
+     *
+     * @param Integer $shift
+     * @return Math_BigInteger
+     * @access public
+     */
+    function bitwise_leftRotate($shift)
+    {
+        $bits = $this->toBytes();
+
+        if ($this->precision > 0) {
+            $precision = $this->precision;
+            if ( MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_BCMATH ) {
+                $mask = $this->bitmask->subtract(new Math_BigInteger(1));
+                $mask = $mask->toBytes();
+            } else {
+                $mask = $this->bitmask->toBytes();
+            }
+        } else {
+            $temp = ord($bits[0]);
+            for ($i = 0; $temp >> $i; ++$i);
+            $precision = 8 * strlen($bits) - 8 + $i;
+            $mask = chr((1 << ($precision & 0x7)) - 1) . str_repeat(chr(0xFF), $precision >> 3);
+        }
+
+        if ($shift < 0) {
+            $shift+= $precision;
+        }
+        $shift%= $precision;
+
+        if (!$shift) {
+            return $this->copy();
+        }
+
+        $left = $this->bitwise_leftShift($shift);
+        $left = $left->bitwise_and(new Math_BigInteger($mask, 256));
+        $right = $this->bitwise_rightShift($precision - $shift);
+        $result = MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_BCMATH ? $left->bitwise_or($right) : $left->add($right);
+        return $this->_normalize($result);
+    }
+
+    /**
+     * Logical Right Rotate
+     *
+     * Instead of the bottom x bits being dropped they're prepended to the shifted bit string.
+     *
+     * @param Integer $shift
+     * @return Math_BigInteger
+     * @access public
+     */
+    function bitwise_rightRotate($shift)
+    {
+        return $this->bitwise_leftRotate(-$shift);
+    }
+
+    /**
+     * Set random number generator function
+     *
+     * This function is deprecated.
+     *
+     * @param String $generator
+     * @access public
+     */
+    function setRandomGenerator($generator)
+    {
+    }
+
+    /**
+     * Generate a random number
+     *
+     * @param optional Integer $min
+     * @param optional Integer $max
+     * @return Math_BigInteger
+     * @access public
+     */
+    function random($min = false, $max = false)
+    {
+        if ($min === false) {
+            $min = new Math_BigInteger(0);
+        }
+
+        if ($max === false) {
+            $max = new Math_BigInteger(0x7FFFFFFF);
+        }
+
+        $compare = $max->compare($min);
+
+        if (!$compare) {
+            return $this->_normalize($min);
+        } else if ($compare < 0) {
+            // if $min is bigger then $max, swap $min and $max
+            $temp = $max;
+            $max = $min;
+            $min = $temp;
+        }
+
+        $max = $max->subtract($min);
+        $max = ltrim($max->toBytes(), chr(0));
+        $size = strlen($max) - 1;
+
+        $crypt_random = function_exists('crypt_random_string') || (!class_exists('Crypt_Random') && function_exists('crypt_random_string'));
+        if ($crypt_random) {
+            $random = crypt_random_string($size);
+        } else {
+            $random = '';
+
+            if ($size & 1) {
+                $random.= chr(mt_rand(0, 255));
+            }
+
+            $blocks = $size >> 1;
+            for ($i = 0; $i < $blocks; ++$i) {
+                // mt_rand(-2147483648, 0x7FFFFFFF) always produces -2147483648 on some systems
+                $random.= pack('n', mt_rand(0, 0xFFFF));
+            }
+        }
+
+        $fragment = new Math_BigInteger($random, 256);
+        $leading = $fragment->compare(new Math_BigInteger(substr($max, 1), 256)) > 0 ?
+            ord($max[0]) - 1 : ord($max[0]);
+
+        if (!$crypt_random) {
+            $msb = chr(mt_rand(0, $leading));
+        } else {
+            $cutoff = floor(0xFF / $leading) * $leading;
+            while (true) {
+                $msb = ord(crypt_random_string(1));
+                if ($msb <= $cutoff) {
+                    $msb%= $leading;
+                    break;
+                }
+            }
+            $msb = chr($msb);
+        }
+
+        $random = new Math_BigInteger($msb . $random, 256);
+
+        return $this->_normalize($random->add($min));
+    }
+
+    /**
+     * Generate a random prime number.
+     *
+     * If there's not a prime within the given range, false will be returned.  If more than $timeout seconds have elapsed,
+     * give up and return false.
+     *
+     * @param optional Integer $min
+     * @param optional Integer $max
+     * @param optional Integer $timeout
+     * @return Math_BigInteger
+     * @access public
+     * @internal See {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=15 HAC 4.44}.
+     */
+    function randomPrime($min = false, $max = false, $timeout = false)
+    {
+        if ($min === false) {
+            $min = new Math_BigInteger(0);
+        }
+
+        if ($max === false) {
+            $max = new Math_BigInteger(0x7FFFFFFF);
+        }
+
+        $compare = $max->compare($min);
+
+        if (!$compare) {
+            return $min->isPrime() ? $min : false;
+        } else if ($compare < 0) {
+            // if $min is bigger then $max, swap $min and $max
+            $temp = $max;
+            $max = $min;
+            $min = $temp;
+        }
+
+        static $one, $two;
+        if (!isset($one)) {
+            $one = new Math_BigInteger(1);
+            $two = new Math_BigInteger(2);
+        }
+
+        $start = time();
+
+        $x = $this->random($min, $max);
+
+        // gmp_nextprime() requires PHP 5 >= 5.2.0 per .
+        if ( MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_GMP && function_exists('gmp_nextprime') ) {
+            $p = new Math_BigInteger();
+            $p->value = gmp_nextprime($x->value);
+
+            if ($p->compare($max) <= 0) {
+                return $p;
+            }
+
+            if (!$min->equals($x)) {
+                $x = $x->subtract($one);
+            }
+
+            return $x->randomPrime($min, $x);
+        }
+
+        if ($x->equals($two)) {
+            return $x;
+        }
+
+        $x->_make_odd();
+        if ($x->compare($max) > 0) {
+            // if $x > $max then $max is even and if $min == $max then no prime number exists between the specified range
+            if ($min->equals($max)) {
+                return false;
+            }
+            $x = $min->copy();
+            $x->_make_odd();
+        }
+
+        $initial_x = $x->copy();
+
+        while (true) {
+            if ($timeout !== false && time() - $start > $timeout) {
+                return false;
+            }
+
+            if ($x->isPrime()) {
+                return $x;
+            }
+
+            $x = $x->add($two);
+
+            if ($x->compare($max) > 0) {
+                $x = $min->copy();
+                if ($x->equals($two)) {
+                    return $x;
+                }
+                $x->_make_odd();
+            }
+
+            if ($x->equals($initial_x)) {
+                return false;
+            }
+        }
+    }
+
+    /**
+     * Make the current number odd
+     *
+     * If the current number is odd it'll be unchanged.  If it's even, one will be added to it.
+     *
+     * @see randomPrime()
+     * @access private
+     */
+    function _make_odd()
+    {
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                gmp_setbit($this->value, 0);
+                break;
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
+                    $this->value = bcadd($this->value, '1');
+                }
+                break;
+            default:
+                $this->value[0] |= 1;
+        }
+    }
+
+    /**
+     * Checks a numer to see if it's prime
+     *
+     * Assuming the $t parameter is not set, this function has an error rate of 2**-80.  The main motivation for the
+     * $t parameter is distributability.  Math_BigInteger::randomPrime() can be distributed accross multiple pageloads
+     * on a website instead of just one.
+     *
+     * @param optional Integer $t
+     * @return Boolean
+     * @access public
+     * @internal Uses the
+     *     {@link http://en.wikipedia.org/wiki/Miller%E2%80%93Rabin_primality_test Miller-Rabin primality test}.  See 
+     *     {@link http://www.cacr.math.uwaterloo.ca/hac/about/chap4.pdf#page=8 HAC 4.24}.
+     */
+    function isPrime($t = false)
+    {
+        $length = strlen($this->toBytes());
+
+        if (!$t) {
+            // see HAC 4.49 "Note (controlling the error probability)"
+                 if ($length >= 163) { $t =  2; } // floor(1300 / 8)
+            else if ($length >= 106) { $t =  3; } // floor( 850 / 8)
+            else if ($length >= 81 ) { $t =  4; } // floor( 650 / 8)
+            else if ($length >= 68 ) { $t =  5; } // floor( 550 / 8)
+            else if ($length >= 56 ) { $t =  6; } // floor( 450 / 8)
+            else if ($length >= 50 ) { $t =  7; } // floor( 400 / 8)
+            else if ($length >= 43 ) { $t =  8; } // floor( 350 / 8)
+            else if ($length >= 37 ) { $t =  9; } // floor( 300 / 8)
+            else if ($length >= 31 ) { $t = 12; } // floor( 250 / 8)
+            else if ($length >= 25 ) { $t = 15; } // floor( 200 / 8)
+            else if ($length >= 18 ) { $t = 18; } // floor( 150 / 8)
+            else                     { $t = 27; }
+        }
+
+        // ie. gmp_testbit($this, 0)
+        // ie. isEven() or !isOdd()
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                return gmp_prob_prime($this->value, $t) != 0;
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                if ($this->value === '2') {
+                    return true;
+                }
+                if ($this->value[strlen($this->value) - 1] % 2 == 0) {
+                    return false;
+                }
+                break;
+            default:
+                if ($this->value == array(2)) {
+                    return true;
+                }
+                if (~$this->value[0] & 1) {
+                    return false;
+                }
+        }
+
+        static $primes, $zero, $one, $two;
+
+        if (!isset($primes)) {
+            $primes = array(
+                3,    5,    7,    11,   13,   17,   19,   23,   29,   31,   37,   41,   43,   47,   53,   59,   
+                61,   67,   71,   73,   79,   83,   89,   97,   101,  103,  107,  109,  113,  127,  131,  137,  
+                139,  149,  151,  157,  163,  167,  173,  179,  181,  191,  193,  197,  199,  211,  223,  227,  
+                229,  233,  239,  241,  251,  257,  263,  269,  271,  277,  281,  283,  293,  307,  311,  313,  
+                317,  331,  337,  347,  349,  353,  359,  367,  373,  379,  383,  389,  397,  401,  409,  419,  
+                421,  431,  433,  439,  443,  449,  457,  461,  463,  467,  479,  487,  491,  499,  503,  509,  
+                521,  523,  541,  547,  557,  563,  569,  571,  577,  587,  593,  599,  601,  607,  613,  617,  
+                619,  631,  641,  643,  647,  653,  659,  661,  673,  677,  683,  691,  701,  709,  719,  727,  
+                733,  739,  743,  751,  757,  761,  769,  773,  787,  797,  809,  811,  821,  823,  827,  829,  
+                839,  853,  857,  859,  863,  877,  881,  883,  887,  907,  911,  919,  929,  937,  941,  947,  
+                953,  967,  971,  977,  983,  991,  997
+            );
+
+            if ( MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_INTERNAL ) {
+                for ($i = 0; $i < count($primes); ++$i) {
+                    $primes[$i] = new Math_BigInteger($primes[$i]);
+                }
+            }
+
+            $zero = new Math_BigInteger();
+            $one = new Math_BigInteger(1);
+            $two = new Math_BigInteger(2);
+        }
+
+        if ($this->equals($one)) {
+            return false;
+        }
+
+        // see HAC 4.4.1 "Random search for probable primes"
+        if ( MATH_BIGINTEGER_MODE != MATH_BIGINTEGER_MODE_INTERNAL ) {
+            foreach ($primes as $prime) {
+                list(, $r) = $this->divide($prime);
+                if ($r->equals($zero)) {
+                    return $this->equals($prime);
+                }
+            }
+        } else {
+            $value = $this->value;
+            foreach ($primes as $prime) {
+                list(, $r) = $this->_divide_digit($value, $prime);
+                if (!$r) {
+                    return count($value) == 1 && $value[0] == $prime;
+                }
+            }
+        }
+
+        $n   = $this->copy();
+        $n_1 = $n->subtract($one);
+        $n_2 = $n->subtract($two);
+
+        $r = $n_1->copy();
+        $r_value = $r->value;
+        // ie. $s = gmp_scan1($n, 0) and $r = gmp_div_q($n, gmp_pow(gmp_init('2'), $s));
+        if ( MATH_BIGINTEGER_MODE == MATH_BIGINTEGER_MODE_BCMATH ) {
+            $s = 0;
+            // if $n was 1, $r would be 0 and this would be an infinite loop, hence our $this->equals($one) check earlier
+            while ($r->value[strlen($r->value) - 1] % 2 == 0) {
+                $r->value = bcdiv($r->value, '2', 0);
+                ++$s;
+            }
+        } else {
+            for ($i = 0, $r_length = count($r_value); $i < $r_length; ++$i) {
+                $temp = ~$r_value[$i] & 0xFFFFFF;
+                for ($j = 1; ($temp >> $j) & 1; ++$j);
+                if ($j != 25) {
+                    break;
+                }
+            }
+            $s = 26 * $i + $j - 1;
+            $r->_rshift($s);
+        }
+
+        for ($i = 0; $i < $t; ++$i) {
+            $a = $this->random($two, $n_2);
+            $y = $a->modPow($r, $n);
+
+            if (!$y->equals($one) && !$y->equals($n_1)) {
+                for ($j = 1; $j < $s && !$y->equals($n_1); ++$j) {
+                    $y = $y->modPow($two, $n);
+                    if ($y->equals($one)) {
+                        return false;
+                    }
+                }
+
+                if (!$y->equals($n_1)) {
+                    return false;
+                }
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts BigInteger's by $shift bits.
+     *
+     * @param Integer $shift
+     * @access private
+     */
+    function _lshift($shift)
+    {
+        if ( $shift == 0 ) {
+            return;
+        }
+
+        $num_digits = (int) ($shift / MATH_BIGINTEGER_BASE);
+        $shift %= MATH_BIGINTEGER_BASE;
+        $shift = 1 << $shift;
+
+        $carry = 0;
+
+        for ($i = 0; $i < count($this->value); ++$i) {
+            $temp = $this->value[$i] * $shift + $carry;
+            $carry = (int) ($temp / MATH_BIGINTEGER_BASE_FULL);
+            $this->value[$i] = (int) ($temp - $carry * MATH_BIGINTEGER_BASE_FULL);
+        }
+
+        if ( $carry ) {
+            $this->value[] = $carry;
+        }
+
+        while ($num_digits--) {
+            array_unshift($this->value, 0);
+        }
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts BigInteger's by $shift bits.
+     *
+     * @param Integer $shift
+     * @access private
+     */
+    function _rshift($shift)
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_digits = (int) ($shift / MATH_BIGINTEGER_BASE);
+        $shift %= MATH_BIGINTEGER_BASE;
+        $carry_shift = MATH_BIGINTEGER_BASE - $shift;
+        $carry_mask = (1 << $shift) - 1;
+
+        if ( $num_digits ) {
+            $this->value = array_slice($this->value, $num_digits);
+        }
+
+        $carry = 0;
+
+        for ($i = count($this->value) - 1; $i >= 0; --$i) {
+            $temp = $this->value[$i] >> $shift | $carry;
+            $carry = ($this->value[$i] & $carry_mask) << $carry_shift;
+            $this->value[$i] = $temp;
+        }
+
+        $this->value = $this->_trim($this->value);
+    }
+
+    /**
+     * Normalize
+     *
+     * Removes leading zeros and truncates (if necessary) to maintain the appropriate precision
+     *
+     * @param Math_BigInteger
+     * @return Math_BigInteger
+     * @see _trim()
+     * @access private
+     */
+    function _normalize($result)
+    {
+        $result->precision = $this->precision;
+        $result->bitmask = $this->bitmask;
+
+        switch ( MATH_BIGINTEGER_MODE ) {
+            case MATH_BIGINTEGER_MODE_GMP:
+                if (!empty($result->bitmask->value)) {
+                    $result->value = gmp_and($result->value, $result->bitmask->value);
+                }
+
+                return $result;
+            case MATH_BIGINTEGER_MODE_BCMATH:
+                if (!empty($result->bitmask->value)) {
+                    $result->value = bcmod($result->value, $result->bitmask->value);
+                }
+
+                return $result;
+        }
+
+        $value = &$result->value;
+
+        if ( !count($value) ) {
+            return $result;
+        }
+
+        $value = $this->_trim($value);
+
+        if (!empty($result->bitmask->value)) {
+            $length = min(count($value), count($this->bitmask->value));
+            $value = array_slice($value, 0, $length);
+
+            for ($i = 0; $i < $length; ++$i) {
+                $value[$i] = $value[$i] & $this->bitmask->value[$i];
+            }
+        }
+
+        return $result;
+    }
+
+    /**
+     * Trim
+     *
+     * Removes leading zeros
+     *
+     * @param Array $value
+     * @return Math_BigInteger
+     * @access private
+     */
+    function _trim($value)
+    {
+        for ($i = count($value) - 1; $i >= 0; --$i) {
+            if ( $value[$i] ) {
+                break;
+            }
+            unset($value[$i]);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Array Repeat
+     *
+     * @param $input Array
+     * @param $multiplier mixed
+     * @return Array
+     * @access private
+     */
+    function _array_repeat($input, $multiplier)
+    {
+        return ($multiplier) ? array_fill(0, $multiplier, $input) : array();
+    }
+
+    /**
+     * Logical Left Shift
+     *
+     * Shifts binary strings $shift bits, essentially multiplying by 2**$shift.
+     *
+     * @param $x String
+     * @param $shift Integer
+     * @return String
+     * @access private
+     */
+    function _base256_lshift(&$x, $shift)
+    {
+        if ($shift == 0) {
+            return;
+        }
+
+        $num_bytes = $shift >> 3; // eg. floor($shift/8)
+        $shift &= 7; // eg. $shift % 8
+
+        $carry = 0;
+        for ($i = strlen($x) - 1; $i >= 0; --$i) {
+            $temp = ord($x[$i]) << $shift | $carry;
+            $x[$i] = chr($temp);
+            $carry = $temp >> 8;
+        }
+        $carry = ($carry != 0) ? chr($carry) : '';
+        $x = $carry . $x . str_repeat(chr(0), $num_bytes);
+    }
+
+    /**
+     * Logical Right Shift
+     *
+     * Shifts binary strings $shift bits, essentially dividing by 2**$shift and returning the remainder.
+     *
+     * @param $x String
+     * @param $shift Integer
+     * @return String
+     * @access private
+     */
+    function _base256_rshift(&$x, $shift)
+    {
+        if ($shift == 0) {
+            $x = ltrim($x, chr(0));
+            return '';
+        }
+
+        $num_bytes = $shift >> 3; // eg. floor($shift/8)
+        $shift &= 7; // eg. $shift % 8
+
+        $remainder = '';
+        if ($num_bytes) {
+            $start = $num_bytes > strlen($x) ? -strlen($x) : -$num_bytes;
+            $remainder = substr($x, $start);
+            $x = substr($x, 0, -$num_bytes);
+        }
+
+        $carry = 0;
+        $carry_shift = 8 - $shift;
+        for ($i = 0; $i < strlen($x); ++$i) {
+            $temp = (ord($x[$i]) >> $shift) | $carry;
+            $carry = (ord($x[$i]) << $carry_shift) & 0xFF;
+            $x[$i] = chr($temp);
+        }
+        $x = ltrim($x, chr(0));
+
+        $remainder = chr($carry >> $carry_shift) . $remainder;
+
+        return ltrim($remainder, chr(0));
+    }
+
+    // one quirk about how the following functions are implemented is that PHP defines N to be an unsigned long
+    // at 32-bits, while java's longs are 64-bits.
+
+    /**
+     * Converts 32-bit integers to bytes.
+     *
+     * @param Integer $x
+     * @return String
+     * @access private
+     */
+    function _int2bytes($x)
+    {
+        return ltrim(pack('N', $x), chr(0));
+    }
+
+    /**
+     * Converts bytes to 32-bit integers
+     *
+     * @param String $x
+     * @return Integer
+     * @access private
+     */
+    function _bytes2int($x)
+    {
+        $temp = unpack('Nint', str_pad($x, 4, chr(0), STR_PAD_LEFT));
+        return $temp['int'];
+    }
+
+    /**
+     * DER-encode an integer
+     *
+     * The ability to DER-encode integers is needed to create RSA public keys for use with OpenSSL
+     *
+     * @see modPow()
+     * @access private
+     * @param Integer $length
+     * @return String
+     */
+    function _encodeASN1Length($length)
+    {
+        if ($length <= 0x7F) {
+            return chr($length);
+        }
+
+        $temp = ltrim(pack('N', $length), chr(0));
+        return pack('Ca*', 0x80 | strlen($temp), $temp);
+    }
+}
diff --git a/sources/inc/phpseclib/update.sh b/sources/inc/phpseclib/update.sh
new file mode 100755
index 0000000..ff3747a
--- /dev/null
+++ b/sources/inc/phpseclib/update.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+wget -nv https://raw.github.com/phpseclib/phpseclib/master/LICENSE -O LICENSE
+wget -nv https://raw.github.com/phpseclib/phpseclib/master/phpseclib/Math/BigInteger.php -O Math_BigInteger.php
+wget -nv https://raw.github.com/phpseclib/phpseclib/master/phpseclib/Crypt/AES.php -O Crypt_AES.php
+wget -nv https://raw.github.com/phpseclib/phpseclib/master/phpseclib/Crypt/Rijndael.php -O Crypt_Rijndael.php
+wget -nv https://raw.github.com/phpseclib/phpseclib/master/phpseclib/Crypt/Base.php -O Crypt_Base.php
+wget -nv https://raw.github.com/phpseclib/phpseclib/master/phpseclib/Crypt/Hash.php -O Crypt_Hash.php
diff --git a/sources/inc/plugin.php b/sources/inc/plugin.php
new file mode 100644
index 0000000..dccd37b
--- /dev/null
+++ b/sources/inc/plugin.php
@@ -0,0 +1,257 @@
+
+ */
+
+/**
+ * Do not inherit directly from this class, instead inherit from the specialized
+ * ones in lib/plugin
+ */
+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:
+     *
+     * base   - the plugin's base name (eg. the directory it needs to be installed in)
+     * 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);
+
+        msg('getInfo() not implemented in '.get_class($this).
+               ' and '.$info.' not found.
        This is a bug in the '.
+               $parts[2].' plugin and should be reported to the '.
+               'plugin author.',-1);
+        return array(
+            'date'   => '0000-00-00',
+            'name'   => $parts[2].' plugin',
+        );
+    }
+
+    // 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   string  $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   string $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_CONF.'plugin_lang/'.$plugin.'/'.$conf['lang'].'/'.$id.'.txt';
+        if (!@file_exists($file)){
+            $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
+     *
+     * @param string $setting the setting to access
+     * @param mixed  $notset  what to return if the setting is not available
+     * @return mixed
+     */
+    function getConf($setting, $notset=false){
+
+        if (!$this->configloaded){ $this->loadConfig(); }
+
+        if(isset($this->conf[$setting])){
+            return $this->conf[$setting];
+        }else{
+            return $notset;
+        }
+    }
+
+    /**
+     * 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   string $name   name of plugin to load
+     * @param   bool   $msg    if a message should be displayed in case the plugin is not available
+     *
+     * @return  object  helper plugin object
+     */
+    function loadHelper($name, $msg = true){
+        $obj = plugin_load('helper',$name);
+        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 from reusing an instance
+     *
+     * @return bool   false if the plugin has to be instantiated
+     */
+    function isSingleton() {
+        return true;
+    }
+}
diff --git a/sources/inc/plugincontroller.class.php b/sources/inc/plugincontroller.class.php
new file mode 100644
index 0000000..d80cd4c
--- /dev/null
+++ b/sources/inc/plugincontroller.class.php
@@ -0,0 +1,361 @@
+
+ */
+
+// plugin related constants
+if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+
+class Doku_Plugin_Controller {
+
+    protected $list_bytype = array();
+    protected $tmp_plugins = array();
+    protected $plugin_cascade = array('default'=>array(),'local'=>array(),'protected'=>array());
+    protected $last_local_config_file = '';
+
+    /**
+     * Populates the master list of plugins
+     */
+    public function __construct() {
+        $this->loadConfig();
+        $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 when $type = ''
+     *                  - or plugin component names when a $type is given
+     *
+     * @author Andreas Gohr 
+     */
+    public function getList($type='',$all=false){
+
+        // request the complete list
+        if (!$type) {
+            return $all ? array_keys($this->tmp_plugins) : array_keys(array_filter($this->tmp_plugins));
+        }
+
+        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
+     * @param  $disabled bool   true to load even disabled plugins
+     * @return DokuWiki_Plugin|DokuWiki_Syntax_Plugin|null  the plugin object or null on failure
+     */
+    public function load($type,$name,$new=false,$disabled=false){
+
+        //we keep all loaded plugins available in global scope for reuse
+        global $DOKU_PLUGINS;
+
+        list($plugin,$component) = $this->_splitName($name);
+
+        // check if disabled
+        if(!$disabled && $this->isdisabled($plugin)){
+            return null;
+        }
+
+        $class = $type.'_plugin_'.$name;
+
+        //plugin already loaded?
+        if(!empty($DOKU_PLUGINS[$type][$name])){
+            if ($new || !$DOKU_PLUGINS[$type][$name]->isSingleton()) {
+                return class_exists($class, true) ? new $class : null;
+            } else {
+                return $DOKU_PLUGINS[$type][$name];
+            }
+        }
+
+        //construct class and instantiate
+        if (!class_exists($class, true)) {
+
+            # the plugin might be in the wrong directory
+            $dir = $this->get_directory($plugin);
+            $inf = confToHash(DOKU_PLUGIN."$dir/plugin.info.txt");
+            if($inf['base'] && $inf['base'] != $plugin){
+                msg(sprintf("Plugin installed incorrectly. Rename plugin directory '%s' to '%s'.", hsc($plugin), hsc($inf['base'])), -1);
+            } elseif (preg_match('/^'.DOKU_PLUGIN_NAME_REGEX.'$/', $plugin) !== 1) {
+                msg(sprintf("Plugin name '%s' is not a valid plugin name, only the characters a-z and 0-9 are allowed. ".
+                                'Maybe the plugin has been installed in the wrong directory?', hsc($plugin)), -1);
+            }
+            return null;
+        }
+
+        $DOKU_PLUGINS[$type][$name] = new $class;
+        return $DOKU_PLUGINS[$type][$name];
+    }
+
+    /**
+     * Whether plugin is disabled
+     *
+     * @param string $plugin name of plugin
+     * @return bool; true disabled, false enabled
+     */
+    public function isdisabled($plugin) {
+        return empty($this->tmp_plugins[$plugin]);
+    }
+
+    /**
+     * Disable the plugin
+     *
+     * @param string $plugin name of plugin
+     * @return bool; true saving succeed, false saving failed
+     */
+    public function disable($plugin) {
+        if(array_key_exists($plugin,$this->plugin_cascade['protected'])) return false;
+        $this->tmp_plugins[$plugin] = 0;
+        return $this->saveList();
+    }
+
+    /**
+     * Enable the plugin
+     *
+     * @param string $plugin name of plugin
+     * @return bool; true saving succeed, false saving failed
+     */
+    public function enable($plugin) {
+        if(array_key_exists($plugin,$this->plugin_cascade['protected'])) return false;
+        $this->tmp_plugins[$plugin] = 1;
+        return $this->saveList();
+    }
+
+    /**
+     * Returns directory name of plugin
+     *
+     * @param string $plugin name of plugin
+     * @return string name of directory
+     */
+    public function get_directory($plugin) {
+        return $plugin;
+    }
+
+    /**
+     * Returns cascade of the config files
+     *
+     * @return array with arrays of plugin configs
+     */
+    public function getCascade() {
+        return $this->plugin_cascade;
+    }
+
+    protected function _populateMasterList() {
+        global $conf;
+
+        if ($dh = @opendir(DOKU_PLUGIN)) {
+            $all_plugins = array();
+            while (false !== ($plugin = readdir($dh))) {
+                if ($plugin[0] == '.') continue;               // skip hidden entries
+                if (is_file(DOKU_PLUGIN.$plugin)) continue;    // skip files, we're only interested in directories
+
+                if (substr($plugin,-9) == '.disabled') {
+                    // the plugin was disabled by rc2009-01-26
+                    // disabling mechanism was changed back very soon again
+                    // to keep everything simple we just skip the plugin completely
+                    continue;
+                } elseif (@file_exists(DOKU_PLUGIN.$plugin.'/disabled')) {
+                    // treat this as a default disabled plugin(over-rideable by the plugin manager)
+                    // deprecated 2011-09-10 (usage of disabled files)
+                    if (empty($this->plugin_cascade['local'][$plugin])) {
+                        $all_plugins[$plugin] = 0;
+                    } else {
+                        $all_plugins[$plugin] = 1;
+                    }
+                    $this->plugin_cascade['default'][$plugin] = 0;
+
+                } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 0) ||
+                          ($plugin === 'plugin' && isset($conf['pluginmanager']) && !$conf['pluginmanager'])){
+                    $all_plugins[$plugin] = 0;
+
+                } elseif ((array_key_exists($plugin,$this->tmp_plugins) && $this->tmp_plugins[$plugin] == 1)) {
+                    $all_plugins[$plugin] = 1;
+                } else {
+                    $all_plugins[$plugin] = 1;
+                }
+            }
+            $this->tmp_plugins = $all_plugins;
+            if (!file_exists($this->last_local_config_file)) {
+                $this->saveList(true);
+            }
+        }
+    }
+
+    /**
+     * Includes the plugin config $files
+     * and returns the entries of the $plugins array set in these files
+     *
+     * @param array $files list of files to include, latter overrides previous
+     * @return array with entries of the $plugins arrays of the included files
+     */
+    protected function checkRequire($files) {
+        $plugins = array();
+        foreach($files as $file) {
+            if(file_exists($file)) {
+                include_once($file);
+            }
+        }
+        return $plugins;
+    }
+
+    /**
+     * Save the current list of plugins
+     *
+     * @param bool $forceSave;
+     *              false to save only when config changed
+     *              true to always save
+     * @return bool; true saving succeed, false saving failed
+     */
+    protected function saveList($forceSave = false) {
+        global $conf;
+
+        if (empty($this->tmp_plugins)) return false;
+
+        // Rebuild list of local settings
+        $local_plugins = $this->rebuildLocal();
+        if($local_plugins != $this->plugin_cascade['local'] || $forceSave) {
+            $file = $this->last_local_config_file;
+            $out = " $value) {
+                $out .= "\$plugins['$plugin'] = $value;\n";
+            }
+            // backup current file (remove any existing backup)
+            if (@file_exists($file)) {
+                $backup = $file.'.bak';
+                if (@file_exists($backup)) @unlink($backup);
+                if (!@copy($file,$backup)) return false;
+                if (!empty($conf['fperm'])) chmod($backup, $conf['fperm']);
+            }
+            //check if can open for writing, else restore
+            return io_saveFile($file,$out);
+        }
+        return false;
+    }
+
+    /**
+     * Rebuild the set of local plugins
+     *
+     * @return array array of plugins to be saved in end($config_cascade['plugins']['local'])
+     */
+    protected function rebuildLocal() {
+        //assign to local variable to avoid overwriting
+        $backup = $this->tmp_plugins;
+        //Can't do anything about protected one so rule them out completely
+        $local_default = array_diff_key($backup,$this->plugin_cascade['protected']);
+        //Diff between local+default and default
+        //gives us the ones we need to check and save
+        $diffed_ones = array_diff_key($local_default,$this->plugin_cascade['default']);
+        //The ones which we are sure of (list of 0s not in default)
+        $sure_plugins = array_filter($diffed_ones,array($this,'negate'));
+        //the ones in need of diff
+        $conflicts = array_diff_key($local_default,$diffed_ones);
+        //The final list
+        return array_merge($sure_plugins,array_diff_assoc($conflicts,$this->plugin_cascade['default']));
+    }
+
+    /**
+     * Build the list of plugins and cascade
+     * 
+     */
+    protected function loadConfig() {
+        global $config_cascade;
+        foreach(array('default','protected') as $type) {
+            if(array_key_exists($type,$config_cascade['plugins']))
+                $this->plugin_cascade[$type] = $this->checkRequire($config_cascade['plugins'][$type]);
+        }
+        $local = $config_cascade['plugins']['local'];
+        $this->last_local_config_file = array_pop($local);
+        $this->plugin_cascade['local'] = $this->checkRequire(array($this->last_local_config_file));
+        if(is_array($local)) {
+            $this->plugin_cascade['default'] = array_merge($this->plugin_cascade['default'],$this->checkRequire($local));
+        }
+        $this->tmp_plugins = array_merge($this->plugin_cascade['default'],$this->plugin_cascade['local'],$this->plugin_cascade['protected']);
+    }
+
+    /**
+     * Returns a list of available plugin components of given type
+     *
+     * @param string $type, plugin_type name;
+     *                      the type of plugin to return,
+     * @param bool   $enabled;
+     *                      true to return enabled plugins,
+     *                      false to return disabled plugins
+     *
+     * @return array of plugin components of requested type
+     */
+    protected function _getListByType($type, $enabled) {
+        $master_list = $enabled ? array_keys(array_filter($this->tmp_plugins)) : array_keys(array_filter($this->tmp_plugins,array($this,'negate')));
+
+        $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);
+                }
+            }
+        }
+
+        return $plugins;
+    }
+
+    /**
+     * Split name in a plugin name and a component name
+     *
+     * @param string $name
+     * @return array with
+     *              - plugin name
+     *              - and component name when available, otherwise empty string
+     */
+    protected function _splitName($name) {
+        if (array_search($name, array_keys($this->tmp_plugins)) === false) {
+            return explode('_',$name,2);
+        }
+
+        return array($name,'');
+    }
+
+    /**
+     * Returns inverse boolean value of the input
+     *
+     * @param mixed $input
+     * @return bool inversed boolean value of input
+     */
+    protected function negate($input) {
+        return !(bool) $input;
+    }
+}
diff --git a/sources/inc/pluginutils.php b/sources/inc/pluginutils.php
new file mode 100644
index 0000000..894bbef
--- /dev/null
+++ b/sources/inc/pluginutils.php
@@ -0,0 +1,105 @@
+
+ */
+
+// plugin related constants
+if(!defined('DOKU_PLUGIN'))  define('DOKU_PLUGIN',DOKU_INC.'lib/plugins/');
+// note that only [a-z0-9]+ is officially supported, this is only to support plugins that don't follow these conventions, too
+if(!defined('DOKU_PLUGIN_NAME_REGEX')) define('DOKU_PLUGIN_NAME_REGEX', '[a-zA-Z0-9\x7f-\xff]+');
+
+/**
+ * Original plugin functions, remain for backwards compatibility
+ */
+
+/**
+ * Return list of available plugins
+ *
+ * @param string $type type of plugins; empty string for all
+ * @param bool $all; true to retrieve all, false to retrieve only enabled plugins
+ * @return array with plugin names or plugin component names
+ */
+function plugin_list($type='',$all=false) {
+    /** @var $plugin_controller Doku_Plugin_Controller */
+    global $plugin_controller;
+    return $plugin_controller->getList($type,$all);
+}
+
+/**
+ * Returns plugin object
+ * Returns only new instances of a plugin when $new is true or if plugin is not Singleton,
+ * otherwise an already loaded instance.
+ *
+ * @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
+ * @param  $disabled bool   true to load even disabled plugins
+ * @return DokuWiki_Plugin|DokuWiki_Syntax_Plugin|null  the plugin object or null on failure
+ */
+function plugin_load($type,$name,$new=false,$disabled=false) {
+    /** @var $plugin_controller Doku_Plugin_Controller */
+    global $plugin_controller;
+    return $plugin_controller->load($type,$name,$new,$disabled);
+}
+
+/**
+ * Whether plugin is disabled
+ *
+ * @param string $plugin name of plugin
+ * @return bool; true disabled, false enabled
+ */
+function plugin_isdisabled($plugin) {
+    /** @var $plugin_controller Doku_Plugin_Controller */
+    global $plugin_controller;
+    return $plugin_controller->isdisabled($plugin);
+}
+
+/**
+ * Enable the plugin
+ *
+ * @param string $plugin name of plugin
+ * @return bool; true saving succeed, false saving failed
+ */
+function plugin_enable($plugin) {
+    /** @var $plugin_controller Doku_Plugin_Controller */
+    global $plugin_controller;
+    return $plugin_controller->enable($plugin);
+}
+
+/**
+ * Disable the plugin
+ *
+ * @param string $plugin name of plugin
+ * @return bool; true saving succeed, false saving failed
+ */
+function plugin_disable($plugin) {
+    /** @var $plugin_controller Doku_Plugin_Controller */
+    global $plugin_controller;
+    return $plugin_controller->disable($plugin);
+}
+
+/**
+ * Returns directory name of plugin
+ *
+ * @param string $plugin name of plugin
+ * @return string name of directory
+ */
+function plugin_directory($plugin) {
+    /** @var $plugin_controller Doku_Plugin_Controller */
+    global $plugin_controller;
+    return $plugin_controller->get_directory($plugin);
+}
+
+/**
+ * Returns cascade of the config files
+ *
+ * @return array with arrays of plugin configs
+ */
+function plugin_getcascade() {
+    /** @var $plugin_controller Doku_Plugin_Controller */
+    global $plugin_controller;
+    return $plugin_controller->getCascade();
+}
diff --git a/sources/inc/preload.php.dist b/sources/inc/preload.php.dist
new file mode 100644
index 0000000..7acda0e
--- /dev/null
+++ b/sources/inc/preload.php.dist
@@ -0,0 +1,17 @@
+ array(
+ *          'args' => array(
+ *              'type eg. string|int|...|date|file',
+ *          )
+ *          'name' => 'method name in class',
+ *          'return' => 'type',
+ *          'public' => 1/0 - method bypass default group check (used by login)
+ *          ['doc' = 'method documentation'],
+ *     )
+ * )
+ *
+ * plugin names are formed the following:
+ *   core methods begin by a 'dokuwiki' or 'wiki' followed by a . and the method name itself.
+ *   i.e.: dokuwiki.version or wiki.getPage
+ *
+ * plugin methods are formed like 'plugin..'.
+ * i.e.: plugin.clock.getTime or plugin.clock_gmt.getTime
+ *
+ * @throws RemoteException
+ */
+class RemoteAPI {
+
+    /**
+     * @var RemoteAPICore
+     */
+    private $coreMethods = null;
+
+    /**
+     * @var array remote methods provided by dokuwiki plugins - will be filled lazy via
+     * {@see RemoteAPI#getPluginMethods}
+     */
+    private $pluginMethods = null;
+
+    /**
+     * @var array contains custom calls to the api. Plugins can use the XML_CALL_REGISTER event.
+     * The data inside is 'custom.call.something' => array('plugin name', 'remote method name')
+     *
+     * The remote method name is the same as in the remote name returned by _getMethods().
+     */
+    private $pluginCustomCalls = null;
+
+    private $dateTransformation;
+    private $fileTransformation;
+
+    public function __construct() {
+        $this->dateTransformation = array($this, 'dummyTransformation');
+        $this->fileTransformation = array($this, 'dummyTransformation');
+    }
+
+    /**
+     * Get all available methods with remote access.
+     *
+     * @return array with information to all available methods
+     */
+    public function getMethods() {
+        return array_merge($this->getCoreMethods(), $this->getPluginMethods());
+    }
+
+    /**
+     * call a method via remote api.
+     *
+     * @param string $method name of the method to call.
+     * @param array $args arguments to pass to the given method
+     * @return mixed result of method call, must be a primitive type.
+     */
+    public function call($method, $args = array()) {
+        if ($args === null) {
+            $args = array();
+        }
+        list($type, $pluginName, $call) = explode('.', $method, 3);
+        if ($type === 'plugin') {
+            return $this->callPlugin($pluginName, $method, $args);
+        }
+        if ($this->coreMethodExist($method)) {
+            return $this->callCoreMethod($method, $args);
+        }
+        return $this->callCustomCallPlugin($method, $args);
+    }
+
+    private function coreMethodExist($name) {
+        $coreMethods = $this->getCoreMethods();
+        return array_key_exists($name, $coreMethods);
+    }
+
+    private function  callCustomCallPlugin($method, $args) {
+        $customCalls = $this->getCustomCallPlugins();
+        if (!array_key_exists($method, $customCalls)) {
+            throw new RemoteException('Method does not exist', -32603);
+        }
+        $customCall = $customCalls[$method];
+        return $this->callPlugin($customCall[0], $customCall[1], $args);
+    }
+
+    private function getCustomCallPlugins() {
+        if ($this->pluginCustomCalls === null) {
+            $data = array();
+            trigger_event('RPC_CALL_ADD', $data);
+            $this->pluginCustomCalls = $data;
+        }
+        return $this->pluginCustomCalls;
+    }
+
+    private function callPlugin($pluginName, $method, $args) {
+        $plugin = plugin_load('remote', $pluginName);
+        $methods = $this->getPluginMethods();
+        if (!$plugin) {
+            throw new RemoteException('Method does not exist', -32603);
+        }
+        $this->checkAccess($methods[$method]);
+        $name = $this->getMethodName($methods, $method);
+        return call_user_func_array(array($plugin, $name), $args);
+    }
+
+    private function callCoreMethod($method, $args) {
+        $coreMethods = $this->getCoreMethods();
+        $this->checkAccess($coreMethods[$method]);
+        if (!isset($coreMethods[$method])) {
+            throw new RemoteException('Method does not exist', -32603);
+        }
+        $this->checkArgumentLength($coreMethods[$method], $args);
+        return call_user_func_array(array($this->coreMethods, $this->getMethodName($coreMethods, $method)), $args);
+    }
+
+    private function checkAccess($methodMeta) {
+        if (!isset($methodMeta['public'])) {
+            $this->forceAccess();
+        } else{
+            if ($methodMeta['public'] == '0') {
+                $this->forceAccess();
+            }
+        }
+    }
+
+    private function checkArgumentLength($method, $args) {
+        if (count($method['args']) < count($args)) {
+            throw new RemoteException('Method does not exist - wrong parameter count.', -32603);
+        }
+    }
+
+    private function getMethodName($methodMeta, $method) {
+        if (isset($methodMeta[$method]['name'])) {
+            return $methodMeta[$method]['name'];
+        }
+        $method = explode('.', $method);
+        return $method[count($method)-1];
+    }
+
+    /**
+     * @return bool true if the current user has access to remote api.
+     */
+    public function hasAccess() {
+        global $conf;
+        global $USERINFO;
+        if (!$conf['remote']) {
+            return false;
+        }
+        if(!$conf['useacl']) {
+            return true;
+        }
+        if(trim($conf['remoteuser']) == '') {
+            return true;
+        }
+
+        return auth_isMember($conf['remoteuser'], $_SERVER['REMOTE_USER'], (array) $USERINFO['grps']);
+    }
+
+    /**
+     * @throws RemoteException On denied access.
+     * @return void
+     */
+    public function forceAccess() {
+        if (!$this->hasAccess()) {
+            throw new RemoteAccessDeniedException('server error. not authorized to call method', -32604);
+        }
+    }
+
+    /**
+     * @return array all plugin methods.
+     */
+    public function getPluginMethods() {
+        if ($this->pluginMethods === null) {
+            $this->pluginMethods = array();
+            $plugins = plugin_list('remote');
+
+            foreach ($plugins as $pluginName) {
+                $plugin = plugin_load('remote', $pluginName);
+                if (!is_subclass_of($plugin, 'DokuWiki_Remote_Plugin')) {
+                    throw new RemoteException("Plugin $pluginName does not implement DokuWiki_Remote_Plugin");
+                }
+
+                $methods = $plugin->_getMethods();
+                foreach ($methods as $method => $meta) {
+                    $this->pluginMethods["plugin.$pluginName.$method"] = $meta;
+                }
+            }
+        }
+        return $this->pluginMethods;
+    }
+
+    /**
+     * @param RemoteAPICore $apiCore this parameter is used for testing. Here you can pass a non-default RemoteAPICore
+     *                               instance. (for mocking)
+     * @return array all core methods.
+     */
+    public function getCoreMethods($apiCore = null) {
+        if ($this->coreMethods === null) {
+            if ($apiCore === null) {
+                $this->coreMethods = new RemoteAPICore($this);
+            } else {
+                $this->coreMethods = $apiCore;
+            }
+        }
+        return $this->coreMethods->__getRemoteInfo();
+    }
+
+    public function toFile($data) {
+        return call_user_func($this->fileTransformation, $data);
+    }
+
+    public function toDate($data) {
+        return call_user_func($this->dateTransformation, $data);
+    }
+
+    public function dummyTransformation($data) {
+        return $data;
+    }
+
+    public function setDateTransformation($dateTransformation) {
+        $this->dateTransformation = $dateTransformation;
+    }
+
+    public function setFileTransformation($fileTransformation) {
+        $this->fileTransformation = $fileTransformation;
+    }
+}
diff --git a/sources/inc/search.php b/sources/inc/search.php
new file mode 100644
index 0000000..c2d31b9
--- /dev/null
+++ b/sources/inc/search.php
@@ -0,0 +1,429 @@
+
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+
+/**
+ * Recurse directory
+ *
+ * This function recurses into a given base directory
+ * and calls the supplied function for each file and directory
+ *
+ * @param   array    &$data The results of the search are stored here
+ * @param   string    $base Where to start the search
+ * @param   callback  $func Callback (function name or array with object,method)
+ * @param   array     $opts option array will be given to the Callback
+ * @param   string    $dir  Current directory beyond $base
+ * @param   int       $lvl  Recursion Level
+ * @param   mixed     $sort 'natural' to use natural order sorting (default); 'date' to sort by filemtime; leave empty to skip sorting.
+ * @author  Andreas Gohr 
+ */
+function search(&$data,$base,$func,$opts,$dir='',$lvl=1,$sort='natural'){
+    $dirs   = array();
+    $files  = array();
+    $filepaths = 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;
+        $filepaths[] = $base.'/'.$dir.'/'.$file;
+    }
+    closedir($dh);
+    if (!empty($sort)) {
+        if ($sort == 'date') {
+            @array_multisort(array_map('filemtime', $filepaths), SORT_NUMERIC, SORT_DESC, $files);
+        } else /* natural */ {
+            natsort($files);
+        }
+        natsort($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,$sort);
+        }
+    }
+    //now handle the files
+    foreach($files as $file){
+        call_user_func_array($func, array(&$data,$base,$file,'f',$lvl,$opts));
+    }
+}
+
+/**
+ * The following functions are userfunctions to use with the search
+ * function above. This function is called for every found file or
+ * directory. When a directory is given to the function it has to
+ * decide if this directory should be traversed (true) or not (false)
+ * The function has to accept the following parameters:
+ *
+ * array &$data  - Reference to the result data structure
+ * string $base  - Base usually $conf['datadir']
+ * string $file  - current file or directory relative to $base
+ * string $type  - Type either 'd' for directory or 'f' for file
+ * int    $lvl   - Current recursion depht
+ * array  $opts  - option array as given to search()
+ *
+ * return values for files are ignored
+ *
+ * All functions should check the ACL for document READ rights
+ * namespaces (directories) are NOT checked (when sneaky_index is 0) as this
+ * would break the recursion (You can have an nonreadable dir over a readable
+ * one deeper nested) also make sure to check the file type (for example
+ * in case of lockfiles).
+ */
+
+/**
+ * Searches for pages beginning with the given query
+ *
+ * @author Andreas Gohr 
+ */
+function search_qsearch(&$data,$base,$file,$type,$lvl,$opts){
+    $opts = array(
+            'idmatch'   => '(^|:)'.preg_quote($opts['query'],'/').'/',
+            'listfiles' => true,
+            'pagesonly' => true,
+            );
+    return search_universal($data,$base,$file,$type,$lvl,$opts);
+}
+
+/**
+ * Build the browsable index of pages
+ *
+ * $opts['ns'] is the currently viewed namespace
+ *
+ * @author  Andreas Gohr 
+ */
+function search_index(&$data,$base,$file,$type,$lvl,$opts){
+    global $conf;
+    $opts = array(
+        'pagesonly' => true,
+        'listdirs' => true,
+        'listfiles' => empty($opts['nofiles']),
+        'sneakyacl' => $conf['sneaky_index'],
+        // Hacky, should rather use recmatch
+        'depth' => preg_match('#^'.preg_quote($file, '#').'(/|$)#','/'.$opts['ns']) ? 0 : -1
+    );
+
+    return search_universal($data, $base, $file, $type, $lvl, $opts);
+}
+
+/**
+ * List all namespaces
+ *
+ * @author  Andreas Gohr 
+ */
+function search_namespaces(&$data,$base,$file,$type,$lvl,$opts){
+    $opts = array(
+            'listdirs' => true,
+            );
+    return search_universal($data,$base,$file,$type,$lvl,$opts);
+}
+
+/**
+ * List all mediafiles in a namespace
+ *
+ * @author  Andreas Gohr 
+ */
+function search_media(&$data,$base,$file,$type,$lvl,$opts){
+
+    //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         = 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)
+    $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']     = utf8_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;
+        $info['meta']  = new JpegMeta($base.'/'.$file);
+    }else{
+        $info['isimg'] = false;
+    }
+    if($opts['hash']){
+        $info['hash'] = md5(io_readFile(mediaFN($info['id']),false));
+    }
+
+    $data[] = $info;
+
+    return false;
+}
+
+/**
+ * This function just lists documents (for RSS namespace export)
+ *
+ * @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;
+        }
+        $data[]['id'] = $id;
+    }
+    return false;
+}
+
+/**
+ * Quicksearch for searching matching pagenames
+ *
+ * $opts['query'] is the search query
+ *
+ * @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;
+        }
+    }
+    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){
+    if(isset($opts['depth']) && $opts['depth']){
+        $parts = explode('/',ltrim($file,'/'));
+        if(($type == 'd' && count($parts) >= $opts['depth'])
+          || ($type != 'd' && count($parts) > $opts['depth'])){
+            return false; // depth reached
+        }
+    }
+
+    //we do nothing with directories
+    if($type == 'd'){
+        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[] = $item;
+    return true;
+}
+
+/* ------------- helper functions below -------------- */
+
+/**
+ * fulltext sort
+ *
+ * Callback sort function for use with usort to sort the data
+ * structure created by search_fulltext. Sorts descending by count
+ *
+ * @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']);
+    }
+}
+
+/**
+ * translates a document path to an ID
+ *
+ * @author  Andreas Gohr 
+ * @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 = trim($id, ':');
+    return $id;
+}
+
+
+/**
+ * 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
+ *
+ * @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 string $type  - Type either 'd' for directory or 'f' for file
+ * @param int    $lvl   - Current recursion depht
+ * @param array  $opts  - option array as given to search()
+ * @return bool if this directory should be traversed (true) or not (false)
+ *              return value is ignored for files
+ *
+ * @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,($type == 'd' || $opts['keeptxt']));
+    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(empty($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(empty($opts['listdirs'])) return $return;
+        if(empty($opts['skipacl']) && !empty($opts['sneakyacl']) && $item['perm'] < AUTH_READ) return false; //neither list nor recurse
+        if(!empty($opts['dirmatch']) && !preg_match('/'.$opts['dirmatch'].'/',$file)) return $return;
+        if(!empty($opts['nsmatch']) && !preg_match('/'.$opts['nsmatch'].'/',$item['ns'])) return $return;
+    }else{
+        if(empty($opts['listfiles'])) return $return;
+        if(empty($opts['skipacl']) && $item['perm'] < AUTH_READ) return $return;
+        if(!empty($opts['pagesonly']) && (substr($file,-4) != '.txt')) return $return;
+        if(empty($opts['showhidden']) && isHiddenPage($item['id'])) return $return;
+        if(!empty($opts['filematch']) && !preg_match('/'.$opts['filematch'].'/',$file)) return $return;
+        if(!empty($opts['idmatch']) && !preg_match('/'.$opts['idmatch'].'/',$item['id'])) return $return;
+    }
+
+    // still here? prepare the item
+    $item['type']  = $type;
+    $item['level'] = $lvl;
+    $item['open']  = $return;
+
+    if($opts['meta']){
+        $item['file']       = utf8_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'],METADATA_DONT_RENDER);
+    }
+
+    // finally add the item
+    $data[] = $item;
+    return $return;
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/inc/subscription.php b/sources/inc/subscription.php
new file mode 100644
index 0000000..ddf2f39
--- /dev/null
+++ b/sources/inc/subscription.php
@@ -0,0 +1,697 @@
+
+ * @author  Andreas Gohr 
+ * @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
+ */
+class Subscription {
+
+    /**
+     * Check if subscription system is enabled
+     *
+     * @return bool
+     */
+    public function isenabled() {
+        return actionOK('subscribe');
+    }
+
+    /**
+     * Return the subscription meta file for the given ID
+     *
+     * @author Adrian Lang 
+     *
+     * @param string $id The target page or namespace, specified by id; Namespaces
+     *                   are identified by appending a colon.
+     * @return string
+     */
+    protected function file($id) {
+        $meta_fname = '.mlist';
+        if((substr($id, -1, 1) === ':')) {
+            $meta_froot = getNS($id);
+            $meta_fname = '/'.$meta_fname;
+        } else {
+            $meta_froot = $id;
+        }
+        return metaFN((string) $meta_froot, $meta_fname);
+    }
+
+    /**
+     * Lock subscription info
+     *
+     * We don't use io_lock() her because we do not wait for the lock and use a larger stale time
+     *
+     * @author Adrian Lang 
+     * @param string $id The target page or namespace, specified by id; Namespaces
+     *                   are identified by appending a colon.
+     * @return bool true, if you got a succesful lock
+     */
+    protected function lock($id) {
+        global $conf;
+
+        $lock = $conf['lockdir'].'/_subscr_'.md5($id).'.lock';
+
+        if(is_dir($lock) && time() - @filemtime($lock) > 60 * 5) {
+            // looks like a stale lock - remove it
+            @rmdir($lock);
+        }
+
+        // try creating the lock directory
+        if(!@mkdir($lock, $conf['dmode'])) {
+            return false;
+        }
+
+        if(!empty($conf['dperm'])) chmod($lock, $conf['dperm']);
+        return true;
+    }
+
+    /**
+     * Unlock subscription info
+     *
+     * @author Adrian Lang 
+     * @param string $id The target page or namespace, specified by id; Namespaces
+     *                   are identified by appending a colon.
+     * @return bool
+     */
+    protected function unlock($id) {
+        global $conf;
+        $lock = $conf['lockdir'].'/_subscr_'.md5($id).'.lock';
+        return @rmdir($lock);
+    }
+
+    /**
+     * Construct a regular expression for parsing a subscription definition line
+     *
+     * @author Andreas Gohr 
+     *
+     * @param string|array $user
+     * @param string|array $style
+     * @param string|array $data
+     * @return string complete regexp including delimiters
+     * @throws Exception when no data is passed
+     */
+    protected function buildregex($user = null, $style = null, $data = null) {
+        // always work with arrays
+        $user = (array) $user;
+        $style = (array) $style;
+        $data = (array) $data;
+
+        // clean
+        $user = array_filter(array_map('trim', $user));
+        $style = array_filter(array_map('trim', $style));
+        $data = array_filter(array_map('trim', $data));
+
+        // user names are encoded
+        $user = array_map('auth_nameencode', $user);
+
+        // quote
+        $user = array_map('preg_quote_cb', $user);
+        $style = array_map('preg_quote_cb', $style);
+        $data = array_map('preg_quote_cb', $data);
+
+        // join
+        $user = join('|', $user);
+        $style = join('|', $style);
+        $data = join('|', $data);
+
+        // any data at all?
+        if($user.$style.$data === '') throw new Exception('no data passed');
+
+        // replace empty values, set which ones are optional
+        $sopt = '';
+        $dopt = '';
+        if($user === '') {
+            $user = '\S+';
+        }
+        if($style === '') {
+            $style = '\S+';
+            $sopt = '?';
+        }
+        if($data === '') {
+            $data = '\S+';
+            $dopt = '?';
+        }
+
+        // assemble
+        return "/^($user)(?:\\s+($style))$sopt(?:\\s+($data))$dopt$/";
+    }
+
+    /**
+     * Recursively search for matching subscriptions
+     *
+     * This function searches all relevant subscription files for a page or
+     * namespace.
+     *
+     * @author Adrian Lang 
+     *
+     * @param string         $page The target object’s (namespace or page) id
+     * @param string|array   $user
+     * @param string|array   $style
+     * @param string|array   $data
+     * @return array
+     */
+    public function subscribers($page, $user = null, $style = null, $data = null) {
+        if(!$this->isenabled()) return array();
+
+        // Construct list of files which may contain relevant subscriptions.
+        $files = array(':' => $this->file(':'));
+        do {
+            $files[$page] = $this->file($page);
+            $page = getNS(rtrim($page, ':')).':';
+        } while($page !== ':');
+
+        $re = $this->buildregex($user, $style, $data);
+
+        // Handle files.
+        $result = array();
+        foreach($files as $target => $file) {
+            if(!@file_exists($file)) continue;
+
+            $lines = file($file);
+            foreach($lines as $line) {
+                // fix old style subscription files
+                if(strpos($line, ' ') === false) $line = trim($line)." every\n";
+
+                // check for matching entries
+                if(!preg_match($re, $line, $m)) continue;
+
+                $u = rawurldecode($m[1]); // decode the user name
+                if(!isset($result[$target])) $result[$target] = array();
+                $result[$target][$u] = array($m[2], $m[3]); // add to result
+            }
+        }
+        return array_reverse($result);
+    }
+
+    /**
+     * Adds a new subscription for the given page or namespace
+     *
+     * This will automatically overwrite any existent subscription for the given user on this
+     * *exact* page or namespace. It will *not* modify any subscription that may exist in higher namespaces.
+     *
+     * @param string $id The target page or namespace, specified by id; Namespaces
+     *                   are identified by appending a colon.
+     * @param string $user
+     * @param string $style
+     * @param string $data
+     * @throws Exception when user or style is empty
+     * @return bool
+     */
+    public function add($id, $user, $style, $data = '') {
+        if(!$this->isenabled()) return false;
+
+        // delete any existing subscription
+        $this->remove($id, $user);
+
+        $user  = auth_nameencode(trim($user));
+        $style = trim($style);
+        $data  = trim($data);
+
+        if(!$user) throw new Exception('no subscription user given');
+        if(!$style) throw new Exception('no subscription style given');
+        if(!$data) $data = time(); //always add current time for new subscriptions
+
+        $line = "$user $style $data\n";
+        $file = $this->file($id);
+        return io_saveFile($file, $line, true);
+    }
+
+    /**
+     * Removes a subscription for the given page or namespace
+     *
+     * This removes all subscriptions matching the given criteria on the given page or
+     * namespace. It will *not* modify any subscriptions that may exist in higher
+     * namespaces.
+     *
+     * @param string         $id   The target object’s (namespace or page) id
+     * @param string|array   $user
+     * @param string|array   $style
+     * @param string|array   $data
+     * @return bool
+     */
+    public function remove($id, $user = null, $style = null, $data = null) {
+        if(!$this->isenabled()) return false;
+
+        $file = $this->file($id);
+        if(!file_exists($file)) return true;
+
+        $re = $this->buildregex($user, $style, $data);
+        return io_deleteFromFile($file, $re, true);
+    }
+
+    /**
+     * Get data for $INFO['subscribed']
+     *
+     * $INFO['subscribed'] is either false if no subscription for the current page
+     * and user is in effect. Else it contains an array of arrays with the fields
+     * “target”, “style”, and optionally “data”.
+     *
+     * @param string $id  Page ID, defaults to global $ID
+     * @param string $user User, defaults to $_SERVER['REMOTE_USER']
+     * @return array
+     * @author Adrian Lang 
+     */
+    function user_subscription($id = '', $user = '') {
+        if(!$this->isenabled()) return false;
+
+        global $ID;
+        if(!$id) $id = $ID;
+        if(!$user) $user = $_SERVER['REMOTE_USER'];
+
+        $subs = $this->subscribers($id, $user);
+        if(!count($subs)) return false;
+
+        $result = array();
+        foreach($subs as $target => $info) {
+            $result[] = array(
+                'target' => $target,
+                'style' => $info[$user][0],
+                'data' => $info[$user][1]
+            );
+        }
+
+        return $result;
+    }
+
+    /**
+     * Send digest and list subscriptions
+     *
+     * This sends mails to all subscribers that have a subscription for namespaces above
+     * the given page if the needed $conf['subscribe_time'] has passed already.
+     *
+     * This function is called form lib/exe/indexer.php
+     *
+     * @param string $page
+     * @return int number of sent mails
+     */
+    public function send_bulk($page) {
+        if(!$this->isenabled()) return 0;
+
+        /** @var auth_basic $auth */
+        global $auth;
+        global $conf;
+        global $USERINFO;
+        $count = 0;
+
+        $subscriptions = $this->subscribers($page, null, array('digest', 'list'));
+
+        // remember current user info
+        $olduinfo = $USERINFO;
+        $olduser = $_SERVER['REMOTE_USER'];
+
+        foreach($subscriptions as $target => $users) {
+            if(!$this->lock($target)) continue;
+
+            foreach($users as $user => $info) {
+                list($style, $lastupdate) = $info;
+
+                $lastupdate = (int) $lastupdate;
+                if($lastupdate + $conf['subscribe_time'] > time()) {
+                    // Less than the configured time period passed since last
+                    // update.
+                    continue;
+                }
+
+                // Work as the user to make sure ACLs apply correctly
+                $USERINFO = $auth->getUserData($user);
+                $_SERVER['REMOTE_USER'] = $user;
+                if($USERINFO === false) continue;
+                if(!$USERINFO['mail']) continue;
+
+                if(substr($target, -1, 1) === ':') {
+                    // subscription target is a namespace, get all changes within
+                    $changes = getRecentsSince($lastupdate, null, getNS($target));
+                } else {
+                    // single page subscription, check ACL ourselves
+                    if(auth_quickaclcheck($target) < AUTH_READ) continue;
+                    $meta = p_get_metadata($target);
+                    $changes = array($meta['last_change']);
+                }
+
+                // Filter out pages only changed in small and own edits
+                $change_ids = array();
+                foreach($changes as $rev) {
+                    $n = 0;
+                    while(!is_null($rev) && $rev['date'] >= $lastupdate &&
+                        ($_SERVER['REMOTE_USER'] === $rev['user'] ||
+                            $rev['type'] === DOKU_CHANGE_TYPE_MINOR_EDIT)) {
+                        $rev = getRevisions($rev['id'], $n++, 1);
+                        $rev = (count($rev) > 0) ? $rev[0] : null;
+                    }
+
+                    if(!is_null($rev) && $rev['date'] >= $lastupdate) {
+                        // Some change was not a minor one and not by myself
+                        $change_ids[] = $rev['id'];
+                    }
+                }
+
+                // send it
+                if($style === 'digest') {
+                    foreach($change_ids as $change_id) {
+                        $this->send_digest(
+                            $USERINFO['mail'], $change_id,
+                            $lastupdate
+                        );
+                        $count++;
+                    }
+                } elseif($style === 'list') {
+                    $this->send_list($USERINFO['mail'], $change_ids, $target);
+                    $count++;
+                }
+                // TODO: Handle duplicate subscriptions.
+
+                // Update notification time.
+                $this->add($target, $user, $style, time());
+            }
+            $this->unlock($target);
+        }
+
+        // restore current user info
+        $USERINFO = $olduinfo;
+        $_SERVER['REMOTE_USER'] = $olduser;
+        return $count;
+    }
+
+    /**
+     * Send the diff for some page change
+     *
+     * @param string   $subscriber_mail The target mail address
+     * @param string   $template        Mail template ('subscr_digest', 'subscr_single', 'mailtext', ...)
+     * @param string   $id              Page for which the notification is
+     * @param int|null $rev             Old revision if any
+     * @param string   $summary         Change summary if any
+     * @return bool                     true if successfully sent
+     */
+    public function send_diff($subscriber_mail, $template, $id, $rev = null, $summary = '') {
+        global $DIFF_INLINESTYLES;
+
+        // prepare replacements (keys not set in hrep will be taken from trep)
+        $trep = array(
+            'PAGE' => $id,
+            'NEWPAGE' => wl($id, '', true, '&'),
+            'SUMMARY' => $summary,
+            'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&')
+        );
+        $hrep = array();
+
+        if($rev) {
+            $subject = 'changed';
+            $trep['OLDPAGE'] = wl($id, "rev=$rev", true, '&');
+
+            $old_content = rawWiki($id, $rev);
+            $new_content = rawWiki($id);
+
+            $df = new Diff(explode("\n", $old_content),
+                           explode("\n", $new_content));
+            $dformat = new UnifiedDiffFormatter();
+            $tdiff = $dformat->format($df);
+
+            $DIFF_INLINESTYLES = true;
+            $df = new Diff(explode("\n", $old_content),
+                           explode("\n", $new_content));
+            $dformat = new InlineDiffFormatter();
+            $hdiff = $dformat->format($df);
+            $hdiff = ''.$hdiff.'
        ';
+            $DIFF_INLINESTYLES = false;
+        } else {
+            $subject = 'newpage';
+            $trep['OLDPAGE'] = '---';
+            $tdiff = rawWiki($id);
+            $hdiff = nl2br(hsc($tdiff));
+        }
+
+        $trep['DIFF'] = $tdiff;
+        $hrep['DIFF'] = $hdiff;
+
+        $headers = array('Message-Id' => $this->getMessageID($id));
+        if ($rev) {
+            $headers['In-Reply-To'] =  $this->getMessageID($id, $rev);
+        }
+
+        return $this->send(
+            $subscriber_mail, $subject, $id,
+            $template, $trep, $hrep, $headers
+        );
+    }
+
+    /**
+     * Send the diff for some media change
+     *
+     * @fixme this should embed thumbnails of images in HTML version
+     * @param string   $subscriber_mail The target mail address
+     * @param string   $template        Mail template ('uploadmail', ...)
+     * @param string   $id              Media file for which the notification is
+     * @param int|bool $rev             Old revision if any
+     * @return bool                     true if successfully sent
+     */
+    public function send_media_diff($subscriber_mail, $template, $id, $rev = false) {
+        global $conf;
+
+        $file = mediaFN($id);
+        list($mime, $ext) = mimetype($id);
+
+        $trep = array(
+            'MIME'  => $mime,
+            'MEDIA' => ml($id,'',true,'&',true),
+            'SIZE'  => filesize_h(filesize($file)),
+        );
+
+        if ($rev && $conf['mediarevisions']) {
+            $trep['OLD'] = ml($id, "rev=$rev", true, '&', true);
+        } else {
+            $trep['OLD'] = '---';
+        }
+
+        $headers = array('Message-Id' => $this->getMessageID($id, @filemtime($file)));
+        if ($rev) {
+            $headers['In-Reply-To'] =  $this->getMessageID($id, $rev);
+        }
+
+        $this->send($subscriber_mail, 'upload', $id, $template, $trep, null, $headers);
+
+    }
+
+    /**
+     * Send a notify mail on new registration
+     *
+     * @author Andreas Gohr 
+     *
+     * @param string $login    login name of the new user
+     * @param string $fullname full name of the new user
+     * @param string $email    email address of the new user
+     * @return bool true if a mail was sent
+     */
+    public function send_register($login, $fullname, $email) {
+        global $conf;
+        if(empty($conf['registernotify'])) return false;
+
+        $trep = array(
+            'NEWUSER' => $login,
+            'NEWNAME' => $fullname,
+            'NEWEMAIL' => $email,
+        );
+
+        return $this->send(
+            $conf['registernotify'],
+            'new_user',
+            $login,
+            'registermail',
+            $trep
+        );
+    }
+
+    /**
+     * Send a digest mail
+     *
+     * Sends a digest mail showing a bunch of changes of a single page. Basically the same as send_diff()
+     * but determines the last known revision first
+     *
+     * @author Adrian Lang 
+     *
+     * @param string $subscriber_mail The target mail address
+     * @param array  $id              The ID
+     * @param int    $lastupdate      Time of the last notification
+     * @return bool
+     */
+    protected function send_digest($subscriber_mail, $id, $lastupdate) {
+        $n = 0;
+        do {
+            $rev = getRevisions($id, $n++, 1);
+            $rev = (count($rev) > 0) ? $rev[0] : null;
+        } while(!is_null($rev) && $rev > $lastupdate);
+
+        return $this->send_diff(
+            $subscriber_mail,
+            'subscr_digest',
+            $id, $rev
+        );
+    }
+
+    /**
+     * Send a list mail
+     *
+     * Sends a list mail showing a list of changed pages.
+     *
+     * @author Adrian Lang 
+     *
+     * @param string $subscriber_mail The target mail address
+     * @param array  $ids             Array of ids
+     * @param string $ns_id           The id of the namespace
+     * @return bool true if a mail was sent
+     */
+    protected function send_list($subscriber_mail, $ids, $ns_id) {
+        if(count($ids) === 0) return false;
+
+        $tlist = '';
+        $hlist = '
          ';
+        foreach($ids as $id) {
+            $link = wl($id, array(), true);
+            $tlist .= '* '.$link.NL;
+            $hlist .= '
        • '.hsc($id).'
          • '.NL;
+        }
+        $hlist .= '
        ';
+
+        $id = prettyprint_id($ns_id);
+        $trep = array(
+            'DIFF' => rtrim($tlist),
+            'PAGE' => $id,
+            'SUBSCRIBE' => wl($id, array('do' => 'subscribe'), true, '&')
+        );
+        $hrep = array(
+            'DIFF' => $hlist
+        );
+
+        return $this->send(
+            $subscriber_mail,
+            'subscribe_list',
+            $ns_id,
+            'subscr_list', $trep, $hrep
+        );
+    }
+
+    /**
+     * Helper function for sending a mail
+     *
+     * @author Adrian Lang 
+     *
+     * @param string $subscriber_mail The target mail address
+     * @param string $subject         The lang id of the mail subject (without the
+     *                                prefix “mail_”)
+     * @param string $context         The context of this mail, eg. page or namespace id
+     * @param string $template        The name of the mail template
+     * @param array  $trep            Predefined parameters used to parse the
+     *                                template (in text format)
+     * @param array  $hrep            Predefined parameters used to parse the
+     *                                template (in HTML format), null to default to $trep
+     * @param array  $headers         Additional mail headers in the form 'name' => 'value'
+     * @return bool
+     */
+    protected function send($subscriber_mail, $subject, $context, $template, $trep, $hrep = null, $headers = array()) {
+        global $lang;
+        global $conf;
+
+        $text = rawLocale($template);
+        $subject = $lang['mail_'.$subject].' '.$context;
+        $mail = new Mailer();
+        $mail->bcc($subscriber_mail);
+        $mail->subject($subject);
+        $mail->setBody($text, $trep, $hrep);
+        if(in_array($template, array('subscr_list', 'subscr_digest'))){
+            $mail->from($conf['mailfromnobody']);
+        }
+        if(isset($trep['SUBSCRIBE'])) {
+            $mail->setHeader('List-Unsubscribe', '<'.$trep['SUBSCRIBE'].'>', false);
+        }
+
+        foreach ($headers as $header => $value) {
+            $mail->setHeader($header, $value);
+        }
+
+        return $mail->send();
+    }
+
+    /**
+     * Get a valid message id for a certain $id and revision (or the current revision)
+     * @param string $id  The id of the page (or media file) the message id should be for
+     * @param string $rev The revision of the page, set to the current revision of the page $id if not set
+     * @return string
+     */
+    protected function getMessageID($id, $rev = null) {
+        static $listid = null;
+        if (is_null($listid)) {
+            $server = parse_url(DOKU_URL, PHP_URL_HOST);
+            $listid = join('.', array_reverse(explode('/', DOKU_BASE))).$server;
+            $listid = urlencode($listid);
+            $listid = strtolower(trim($listid, '.'));
+        }
+
+        if (is_null($rev)) {
+            $rev = @filemtime(wikiFN($id));
+        }
+
+        return "<$id?rev=$rev@$listid>";
+    }
+
+    /**
+     * Default callback for COMMON_NOTIFY_ADDRESSLIST
+     *
+     * Aggregates all email addresses of user who have subscribed the given page with 'every' style
+     *
+     * @author Steven Danz 
+     * @author Adrian Lang 
+     *
+     * @todo move the whole functionality into this class, trigger SUBSCRIPTION_NOTIFY_ADDRESSLIST instead,
+     *       use an array for the addresses within it
+     *
+     * @param array &$data Containing $id (the page id), $self (whether the author
+     *                     should be notified, $addresslist (current email address
+     *                     list)
+     */
+    public function notifyaddresses(&$data) {
+        if(!$this->isenabled()) return;
+
+        /** @var auth_basic $auth */
+        global $auth;
+        global $conf;
+
+        $id = $data['id'];
+        $self = $data['self'];
+        $addresslist = $data['addresslist'];
+
+        $subscriptions = $this->subscribers($id, null, 'every');
+
+        $result = array();
+        foreach($subscriptions as $target => $users) {
+            foreach($users as $user => $info) {
+                $userinfo = $auth->getUserData($user);
+                if($userinfo === false) continue;
+                if(!$userinfo['mail']) continue;
+                if(!$self && $user == $_SERVER['REMOTE_USER']) continue; //skip our own changes
+
+                $level = auth_aclcheck($id, $user, $userinfo['grps']);
+                if($level >= AUTH_READ) {
+                    if(strcasecmp($userinfo['mail'], $conf['notify']) != 0) { //skip user who get notified elsewhere
+                        $result[$user] = $userinfo['mail'];
+                    }
+                }
+            }
+        }
+        $data['addresslist'] = trim($addresslist.','.implode(',', $result), ',');
+    }
+}
+
+/**
+ * Compatibility wrapper around Subscription:notifyaddresses
+ *
+ * for plugins emitting COMMON_NOTIFY_ADDRESSLIST themselves and relying on on this to
+ * be the default handler
+ *
+ * @param array $data event data for
+ *
+ * @deprecated 2012-12-07
+ */
+function subscription_addresslist(&$data) {
+    $sub = new Subscription();
+    $sub->notifyaddresses($data);
+}
diff --git a/sources/inc/template.php b/sources/inc/template.php
new file mode 100644
index 0000000..60e178d
--- /dev/null
+++ b/sources/inc/template.php
@@ -0,0 +1,1790 @@
+
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+
+/**
+ * Access a template file
+ *
+ * Returns the path to the given file inside the current template, uses
+ * default template if the custom version doesn't exist.
+ *
+ * @author Andreas Gohr 
+ * @param string $file
+ * @return string
+ */
+function template($file) {
+    global $conf;
+
+    if(@is_readable(DOKU_INC.'lib/tpl/'.$conf['template'].'/'.$file))
+        return DOKU_INC.'lib/tpl/'.$conf['template'].'/'.$file;
+
+    return DOKU_INC.'lib/tpl/dokuwiki/'.$file;
+}
+
+/**
+ * Convenience function to access template dir from local FS
+ *
+ * This replaces the deprecated DOKU_TPLINC constant
+ *
+ * @author Andreas Gohr 
+ * @param string $tpl The template to use, default to current one
+ * @return string
+ */
+function tpl_incdir($tpl='') {
+    global $conf;
+    if(!$tpl) $tpl = $conf['template'];
+    return DOKU_INC.'lib/tpl/'.$tpl.'/';
+}
+
+/**
+ * Convenience function to access template dir from web
+ *
+ * This replaces the deprecated DOKU_TPL constant
+ *
+ * @author Andreas Gohr 
+ * @param string $tpl The template to use, default to current one
+ * @return string
+ */
+function tpl_basedir($tpl='') {
+    global $conf;
+    if(!$tpl) $tpl = $conf['template'];
+    return DOKU_BASE.'lib/tpl/'.$tpl.'/';
+}
+
+/**
+ * Print the content
+ *
+ * This function is used for printing all the usual content
+ * (defined by the global $ACT var) by calling the appropriate
+ * outputfunction(s) from html.php
+ *
+ * Everything that doesn't use the main template file isn't
+ * handled by this function. ACL stuff is not done here either.
+ *
+ * @author Andreas Gohr 
+ * @triggers TPL_ACT_RENDER
+ * @triggers TPL_CONTENT_DISPLAY
+ * @param bool $prependTOC should the TOC be displayed here?
+ * @return bool true if any output
+ */
+function tpl_content($prependTOC = true) {
+    global $ACT;
+    global $INFO;
+    $INFO['prependTOC'] = $prependTOC;
+
+    ob_start();
+    trigger_event('TPL_ACT_RENDER', $ACT, 'tpl_content_core');
+    $html_output = ob_get_clean();
+    trigger_event('TPL_CONTENT_DISPLAY', $html_output, 'ptln');
+
+    return !empty($html_output);
+}
+
+/**
+ * Default Action of TPL_ACT_RENDER
+ *
+ * @return bool
+ */
+function tpl_content_core() {
+    global $ACT;
+    global $TEXT;
+    global $PRE;
+    global $SUF;
+    global $SUM;
+    global $IDX;
+    global $INPUT;
+
+    switch($ACT) {
+        case 'show':
+            html_show();
+            break;
+        /** @noinspection PhpMissingBreakStatementInspection */
+        case 'locked':
+            html_locked();
+        case 'edit':
+        case 'recover':
+            html_edit();
+            break;
+        case 'preview':
+            html_edit();
+            html_show($TEXT);
+            break;
+        case 'draft':
+            html_draft();
+            break;
+        case 'search':
+            html_search();
+            break;
+        case 'revisions':
+            html_revisions($INPUT->int('first'));
+            break;
+        case 'diff':
+            html_diff();
+            break;
+        case 'recent':
+            $show_changes = $INPUT->str('show_changes');
+            if (empty($show_changes)) {
+                $show_changes = get_doku_pref('show_changes', $show_changes);
+            }
+            html_recent($INPUT->extract('first')->int('first'), $show_changes);
+            break;
+        case 'index':
+            html_index($IDX); #FIXME can this be pulled from globals? is it sanitized correctly?
+            break;
+        case 'backlink':
+            html_backlinks();
+            break;
+        case 'conflict':
+            html_conflict(con($PRE, $TEXT, $SUF), $SUM);
+            html_diff(con($PRE, $TEXT, $SUF), false);
+            break;
+        case 'login':
+            html_login();
+            break;
+        case 'register':
+            html_register();
+            break;
+        case 'resendpwd':
+            html_resendpwd();
+            break;
+        case 'denied':
+            print p_locale_xhtml('denied');
+            break;
+        case 'profile' :
+            html_updateprofile();
+            break;
+        case 'admin':
+            tpl_admin();
+            break;
+        case 'subscribe':
+            tpl_subscribe();
+            break;
+        case 'media':
+            tpl_media();
+            break;
+        default:
+            $evt = new Doku_Event('TPL_ACT_UNKNOWN', $ACT);
+            if($evt->advise_before())
+                msg("Failed to handle command: ".hsc($ACT), -1);
+            $evt->advise_after();
+            unset($evt);
+            return false;
+    }
+    return true;
+}
+
+/**
+ * Places the TOC where the function is called
+ *
+ * If you use this you most probably want to call tpl_content with
+ * a false argument
+ *
+ * @author Andreas Gohr 
+ * @param bool $return Should the TOC be returned instead to be printed?
+ * @return string
+ */
+function tpl_toc($return = false) {
+    global $TOC;
+    global $ACT;
+    global $ID;
+    global $REV;
+    global $INFO;
+    global $conf;
+    global $INPUT;
+    $toc = array();
+
+    if(is_array($TOC)) {
+        // if a TOC was prepared in global scope, always use it
+        $toc = $TOC;
+    } elseif(($ACT == 'show' || substr($ACT, 0, 6) == 'export') && !$REV && $INFO['exists']) {
+        // get TOC from metadata, render if neccessary
+        $meta = p_get_metadata($ID, false, METADATA_RENDER_USING_CACHE);
+        if(isset($meta['internal']['toc'])) {
+            $tocok = $meta['internal']['toc'];
+        } else {
+            $tocok = true;
+        }
+        $toc = $meta['description']['tableofcontents'];
+        if(!$tocok || !is_array($toc) || !$conf['tocminheads'] || count($toc) < $conf['tocminheads']) {
+            $toc = array();
+        }
+    } elseif($ACT == 'admin') {
+        // try to load admin plugin TOC FIXME: duplicates code from tpl_admin
+        $plugin = null;
+        $class  = $INPUT->str('page');
+        if(!empty($class)) {
+            $pluginlist = plugin_list('admin');
+            if(in_array($class, $pluginlist)) {
+                // attempt to load the plugin
+                /** @var $plugin DokuWiki_Admin_Plugin */
+                $plugin = plugin_load('admin', $class);
+            }
+        }
+        if( ($plugin !== null) && (!$plugin->forAdminOnly() || $INFO['isadmin']) ) {
+            $toc = $plugin->getTOC();
+            $TOC = $toc; // avoid later rebuild
+        }
+    }
+
+    trigger_event('TPL_TOC_RENDER', $toc, null, false);
+    $html = html_TOC($toc);
+    if($return) return $html;
+    echo $html;
+    return '';
+}
+
+/**
+ * Handle the admin page contents
+ *
+ * @author Andreas Gohr 
+ */
+function tpl_admin() {
+    global $INFO;
+    global $TOC;
+    global $INPUT;
+
+    $plugin = null;
+    $class  = $INPUT->str('page');
+    if(!empty($class)) {
+        $pluginlist = plugin_list('admin');
+
+        if(in_array($class, $pluginlist)) {
+            // attempt to load the plugin
+            /** @var $plugin DokuWiki_Admin_Plugin */
+            $plugin = plugin_load('admin', $class);
+        }
+    }
+
+    if($plugin !== null) {
+        if(!is_array($TOC)) $TOC = $plugin->getTOC(); //if TOC wasn't requested yet
+        if($INFO['prependTOC']) tpl_toc();
+        $plugin->html();
+    } else {
+        html_admin();
+    }
+    return true;
+}
+
+/**
+ * Print the correct HTML meta headers
+ *
+ * This has to go into the head section of your template.
+ *
+ * @author Andreas Gohr 
+ * @triggers TPL_METAHEADER_OUTPUT
+ * @param  bool $alt Should feeds and alternative format links be added?
+ * @return bool
+ */
+function tpl_metaheaders($alt = true) {
+    global $ID;
+    global $REV;
+    global $INFO;
+    global $JSINFO;
+    global $ACT;
+    global $QUERY;
+    global $lang;
+    global $conf;
+    global $updateVersion;
+
+    // prepare the head array
+    $head = array();
+
+    // prepare seed for js and css
+    $tseed   = $updateVersion;
+    $depends = getConfigFiles('main');
+    foreach($depends as $f) $tseed .= @filemtime($f);
+    $tseed   = md5($tseed);
+
+    // the usual stuff
+    $head['meta'][] = array('name'=> 'generator', 'content'=> 'DokuWiki');
+    $head['link'][] = array(
+        'rel' => 'search', 'type'=> 'application/opensearchdescription+xml',
+        'href'=> DOKU_BASE.'lib/exe/opensearch.php', 'title'=> $conf['title']
+    );
+    $head['link'][] = array('rel'=> 'start', 'href'=> DOKU_BASE);
+    if(actionOK('index')) {
+        $head['link'][] = array(
+            'rel'  => 'contents', 'href'=> wl($ID, 'do=index', false, '&'),
+            'title'=> $lang['btn_index']
+        );
+    }
+
+    if($alt) {
+        $head['link'][] = array(
+            'rel'  => 'alternate', 'type'=> 'application/rss+xml',
+            'title'=> $lang['btn_recent'], 'href'=> DOKU_BASE.'feed.php'
+        );
+        $head['link'][] = array(
+            'rel'  => 'alternate', 'type'=> 'application/rss+xml',
+            'title'=> $lang['currentns'],
+            'href' => DOKU_BASE.'feed.php?mode=list&ns='.$INFO['namespace']
+        );
+        if(($ACT == 'show' || $ACT == 'search') && $INFO['writable']) {
+            $head['link'][] = array(
+                'rel'  => 'edit',
+                'title'=> $lang['btn_edit'],
+                'href' => wl($ID, 'do=edit', false, '&')
+            );
+        }
+
+        if($ACT == 'search') {
+            $head['link'][] = array(
+                'rel'  => 'alternate', 'type'=> 'application/rss+xml',
+                'title'=> $lang['searchresult'],
+                'href' => DOKU_BASE.'feed.php?mode=search&q='.$QUERY
+            );
+        }
+
+        if(actionOK('export_xhtml')) {
+            $head['link'][] = array(
+                'rel' => 'alternate', 'type'=> 'text/html', 'title'=> $lang['plainhtml'],
+                'href'=> exportlink($ID, 'xhtml', '', false, '&')
+            );
+        }
+
+        if(actionOK('export_raw')) {
+            $head['link'][] = array(
+                'rel' => 'alternate', 'type'=> 'text/plain', 'title'=> $lang['wikimarkup'],
+                'href'=> exportlink($ID, 'raw', '', false, '&')
+            );
+        }
+    }
+
+    // setup robot tags apropriate for different modes
+    if(($ACT == 'show' || $ACT == 'export_xhtml') && !$REV) {
+        if($INFO['exists']) {
+            //delay indexing:
+            if((time() - $INFO['lastmod']) >= $conf['indexdelay']) {
+                $head['meta'][] = array('name'=> 'robots', 'content'=> 'index,follow');
+            } 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');
+        }
+    } elseif(defined('DOKU_MEDIADETAIL')) {
+        $head['meta'][] = array('name'=> 'robots', 'content'=> 'index,follow');
+    } else {
+        $head['meta'][] = array('name'=> 'robots', 'content'=> 'noindex,nofollow');
+    }
+
+    // set metadata
+    if($ACT == 'show' || $ACT == 'export_xhtml') {
+        // date of modification
+        if($REV) {
+            $head['meta'][] = array('name'=> 'date', 'content'=> date('Y-m-d\TH:i:sO', $REV));
+        } else {
+            $head['meta'][] = array('name'=> 'date', 'content'=> date('Y-m-d\TH:i:sO', $INFO['lastmod']));
+        }
+
+        // keywords (explicit or implicit)
+        if(!empty($INFO['meta']['subject'])) {
+            $head['meta'][] = array('name'=> 'keywords', 'content'=> join(',', $INFO['meta']['subject']));
+        } else {
+            $head['meta'][] = array('name'=> 'keywords', 'content'=> str_replace(':', ',', $ID));
+        }
+    }
+
+    // load stylesheets
+    $head['link'][] = array(
+        'rel' => 'stylesheet', 'type'=> 'text/css',
+        'href'=> DOKU_BASE.'lib/exe/css.php?t='.$conf['template'].'&tseed='.$tseed
+    );
+
+    // make $INFO and other vars available to JavaScripts
+    $json   = new JSON();
+    $script = "var NS='".$INFO['namespace']."';";
+    if($conf['useacl'] && !empty($_SERVER['REMOTE_USER'])) {
+        $script .= "var SIG='".toolbar_signature()."';";
+    }
+    $script .= 'var JSINFO = '.$json->encode($JSINFO).';';
+    $head['script'][] = array('type'=> 'text/javascript', '_data'=> $script);
+
+    // load external javascript
+    $head['script'][] = array(
+        'type'=> 'text/javascript', 'charset'=> 'utf-8', '_data'=> '',
+        'src' => DOKU_BASE.'lib/exe/js.php'.'?tseed='.$tseed
+    );
+
+    // trigger event here
+    trigger_event('TPL_METAHEADER_OUTPUT', $head, '_tpl_metaheaders_action', true);
+    return true;
+}
+
+/**
+ * prints the array build by tpl_metaheaders
+ *
+ * $data is an array of different header tags. Each tag can have multiple
+ * instances. Attributes are given as key value pairs. Values will be HTML
+ * encoded automatically so they should be provided as is in the $data array.
+ *
+ * For tags having a body attribute specify the the body data in the special
+ * attribute '_data'. This field will NOT BE ESCAPED automatically.
+ *
+ * @author Andreas Gohr 
+ */
+function _tpl_metaheaders_action($data) {
+    foreach($data as $tag => $inst) {
+        foreach($inst as $attr) {
+            echo '<', $tag, ' ', buildAttributes($attr);
+            if(isset($attr['_data']) || $tag == 'script') {
+                if($tag == 'script' && $attr['_data'])
+                    $attr['_data'] = "/**/";
+
+                echo '>', $attr['_data'], '';
+            } else {
+                echo '/>';
+            }
+            echo "\n";
+        }
+    }
+}
+
+/**
+ * Print a link
+ *
+ * Just builds a link.
+ *
+ * @author Andreas Gohr 
+ */
+function tpl_link($url, $name, $more = '', $return = false) {
+    $out = '
+ */
+function tpl_pagelink($id, $name = null) {
+    print ''.html_wikilink($id, $name).'';
+    return true;
+}
+
+/**
+ * get the parent page
+ *
+ * Tries to find out which page is parent.
+ * returns false if none is available
+ *
+ * @author Andreas Gohr 
+ */
+function tpl_getparent($id) {
+    $parent = getNS($id).':';
+    resolve_pageid('', $parent, $exists);
+    if($parent == $id) {
+        $pos    = strrpos(getNS($id), ':');
+        $parent = substr($parent, 0, $pos).':';
+        resolve_pageid('', $parent, $exists);
+        if($parent == $id) return false;
+    }
+    return $parent;
+}
+
+/**
+ * Print one of the buttons
+ *
+ * @author Adrian Lang 
+ * @see    tpl_get_action
+ */
+function tpl_button($type, $return = false) {
+    $data = tpl_get_action($type);
+    if($data === false) {
+        return false;
+    } elseif(!is_array($data)) {
+        $out = sprintf($data, 'button');
+    } else {
+        /**
+         * @var string $accesskey
+         * @var string $id
+         * @var string $method
+         * @var array  $params
+         */
+        extract($data);
+        if($id === '#dokuwiki__top') {
+            $out = html_topbtn();
+        } else {
+            $out = html_btn($type, $id, $accesskey, $params, $method);
+        }
+    }
+    if($return) return $out;
+    echo $out;
+    return true;
+}
+
+/**
+ * Like the action buttons but links
+ *
+ * @author Adrian Lang 
+ * @see    tpl_get_action
+ */
+function tpl_actionlink($type, $pre = '', $suf = '', $inner = '', $return = false) {
+    global $lang;
+    $data = tpl_get_action($type);
+    if($data === false) {
+        return false;
+    } elseif(!is_array($data)) {
+        $out = sprintf($data, 'link');
+    } else {
+        /**
+         * @var string $accesskey
+         * @var string $id
+         * @var string $method
+         * @var bool   $nofollow
+         * @var array  $params
+         */
+        extract($data);
+        if(strpos($id, '#') === 0) {
+            $linktarget = $id;
+        } else {
+            $linktarget = wl($id, $params);
+        }
+        $caption = $lang['btn_'.$type];
+        $akey    = $addTitle = '';
+        if($accesskey) {
+            $akey     = 'accesskey="'.$accesskey.'" ';
+            $addTitle = ' ['.strtoupper($accesskey).']';
+        }
+        $rel = $nofollow ? 'rel="nofollow" ' : '';
+        $out = tpl_link(
+            $linktarget, $pre.(($inner) ? $inner : $caption).$suf,
+            'class="action '.$type.'" '.
+                $akey.$rel.
+                'title="'.hsc($caption).$addTitle.'"', 1
+        );
+    }
+    if($return) return $out;
+    echo $out;
+    return true;
+}
+
+/**
+ * Check the actions and get data for buttons and links
+ *
+ * Available actions are
+ *
+ *  edit        - edit/create/show/draft
+ *  history     - old revisions
+ *  recent      - recent changes
+ *  login       - login/logout - if ACL enabled
+ *  profile     - user profile (if logged in)
+ *  index       - The index
+ *  admin       - admin page - if enough rights
+ *  top         - back to top
+ *  back        - back to parent - if available
+ *  backlink    - links to the list of backlinks
+ *  subscribe/subscription- subscribe/unsubscribe
+ *
+ * @author Andreas Gohr 
+ * @author Matthias Grimm 
+ * @author Adrian Lang 
+ * @param string $type
+ * @return array|bool|string
+ */
+function tpl_get_action($type) {
+    global $ID;
+    global $INFO;
+    global $REV;
+    global $ACT;
+    global $conf;
+
+    // check disabled actions and fix the badly named ones
+    if($type == 'history') $type = 'revisions';
+    if ($type == 'subscription') $type = 'subscribe';
+    if(!actionOK($type)) return false;
+
+    $accesskey = null;
+    $id        = $ID;
+    $method    = 'get';
+    $params    = array('do' => $type);
+    $nofollow  = true;
+    switch($type) {
+        case 'edit':
+            // most complicated type - we need to decide on current action
+            if($ACT == 'show' || $ACT == 'search') {
+                $method = 'post';
+                if($INFO['writable']) {
+                    $accesskey = 'e';
+                    if(!empty($INFO['draft'])) {
+                        $type         = 'draft';
+                        $params['do'] = 'draft';
+                    } else {
+                        $params['rev'] = $REV;
+                        if(!$INFO['exists']) {
+                            $type = 'create';
+                        }
+                    }
+                } else {
+                    if(!actionOK('source')) return false; //pseudo action
+                    $params['rev'] = $REV;
+                    $type          = 'source';
+                    $accesskey     = 'v';
+                }
+            } else {
+                $params    = array();
+                $type      = 'show';
+                $accesskey = 'v';
+            }
+            break;
+        case 'revisions':
+            $type      = 'revs';
+            $accesskey = 'o';
+            break;
+        case 'recent':
+            $accesskey = 'r';
+            break;
+        case 'index':
+            $accesskey = 'x';
+            // allow searchbots to get to the sitemap from the homepage (when dokuwiki isn't providing a sitemap.xml)
+            if ($conf['start'] == $ID && !$conf['sitemap']) {
+                $nofollow = false;
+            }
+            break;
+        case 'top':
+            $accesskey = 't';
+            $params    = array();
+            $id        = '#dokuwiki__top';
+            break;
+        case 'back':
+            $parent = tpl_getparent($ID);
+            if(!$parent) {
+                return false;
+            }
+            $id        = $parent;
+            $params    = array();
+            $accesskey = 'b';
+            break;
+        case 'login':
+            $params['sectok'] = getSecurityToken();
+            if(isset($_SERVER['REMOTE_USER'])) {
+                if(!actionOK('logout')) {
+                    return false;
+                }
+                $params['do'] = 'logout';
+                $type         = 'logout';
+            }
+            break;
+        case 'register':
+            if(!empty($_SERVER['REMOTE_USER'])) {
+                return false;
+            }
+            break;
+        case 'resendpwd':
+            if(!empty($_SERVER['REMOTE_USER'])) {
+                return false;
+            }
+            break;
+        case 'admin':
+            if(!$INFO['ismanager']) {
+                return false;
+            }
+            break;
+        case 'revert':
+            if(!$INFO['ismanager'] || !$REV || !$INFO['writable']) {
+                return false;
+            }
+            $params['rev']    = $REV;
+            $params['sectok'] = getSecurityToken();
+            break;
+        case 'subscribe':
+            if(!$_SERVER['REMOTE_USER']) {
+                return false;
+            }
+            break;
+        case 'backlink':
+            break;
+        case 'profile':
+            if(!isset($_SERVER['REMOTE_USER'])) {
+                return false;
+            }
+            break;
+        case 'media':
+            $params['ns'] = getNS($ID);
+            break;
+        default:
+            return '[unknown %s type]';
+            break;
+    }
+    return compact('accesskey', 'type', 'id', 'method', 'params', 'nofollow');
+}
+
+/**
+ * Wrapper around tpl_button() and tpl_actionlink()
+ *
+ * @author Anika Henke 
+ * @param
+ * @param bool   $link link or form button?
+ * @param bool   $wrapper HTML element wrapper
+ * @param bool   $return return or print
+ * @param string $pre prefix for links
+ * @param string $suf suffix for links
+ * @param string $inner inner HTML for links
+ * @return bool|string
+ */
+function tpl_action($type, $link = false, $wrapper = false, $return = false, $pre = '', $suf = '', $inner = '') {
+    $out = '';
+    if($link) {
+        $out .= tpl_actionlink($type, $pre, $suf, $inner, 1);
+    } else {
+        $out .= tpl_button($type, 1);
+    }
+    if($out && $wrapper) $out = "<$wrapper>$out";
+
+    if($return) return $out;
+    print $out;
+    return $out ? true : false;
+}
+
+/**
+ * Print the search form
+ *
+ * If the first parameter is given a div with the ID 'qsearch_out' will
+ * be added which instructs the ajax pagequicksearch to kick in and place
+ * its output into this div. The second parameter controls the propritary
+ * attribute autocomplete. If set to false this attribute will be set with an
+ * value of "off" to instruct the browser to disable it's own built in
+ * autocompletion feature (MSIE and Firefox)
+ *
+ * @author Andreas Gohr 
+ * @param bool $ajax
+ * @param bool $autocomplete
+ * @return bool
+ */
+function tpl_searchform($ajax = true, $autocomplete = true) {
+    global $lang;
+    global $ACT;
+    global $QUERY;
+
+    // don't print the search form if search action has been disabled
+    if(!actionOK('search')) return false;
+
+    print '
        ';
+    print '';
+    print '';
+    print '';
+    if($ajax) print '
        ';
+    print '
        ';
+    return true;
+}
+
+/**
+ * Print the breadcrumbs trace
+ *
+ * @author Andreas Gohr 
+ * @param string $sep Separator between entries
+ * @return bool
+ */
+function tpl_breadcrumbs($sep = '•') {
+    global $lang;
+    global $conf;
+
+    //check if enabled
+    if(!$conf['breadcrumbs']) return false;
+
+    $crumbs = breadcrumbs(); //setup crumb trace
+
+    $crumbs_sep = ' '.$sep.' ';
+
+    //render crumbs, highlight the last one
+    print ''.$lang['breadcrumb'].':';
+    $last = count($crumbs);
+    $i    = 0;
+    foreach($crumbs as $id => $name) {
+        $i++;
+        echo $crumbs_sep;
+        if($i == $last) print '';
+        print '';
+        tpl_link(wl($id), hsc($name), 'class="breadcrumbs" title="'.$id.'"');
+        print '';
+        if($i == $last) print '';
+    }
+    return true;
+}
+
+/**
+ * Hierarchical breadcrumbs
+ *
+ * This code was suggested as replacement for the usual breadcrumbs.
+ * It only makes sense with a deep site structure.
+ *
+ * @author Andreas Gohr 
+ * @author Nigel McNie 
+ * @author Sean Coates 
+ * @author 
+ * @todo   May behave strangely in RTL languages
+ * @param string $sep Separator between entries
+ * @return bool
+ */
+function tpl_youarehere($sep = ' » ') {
+    global $conf;
+    global $ID;
+    global $lang;
+
+    // check if enabled
+    if(!$conf['youarehere']) return false;
+
+    $parts = explode(':', $ID);
+    $count = count($parts);
+
+    echo ''.$lang['youarehere'].': ';
+
+    // always print the startpage
+    echo '';
+    tpl_pagelink(':'.$conf['start']);
+    echo '';
+
+    // print intermediate namespace links
+    $part = '';
+    for($i = 0; $i < $count - 1; $i++) {
+        $part .= $parts[$i].':';
+        $page = $part;
+        if($page == $conf['start']) continue; // Skip startpage
+
+        // output
+        echo $sep;
+        tpl_pagelink($page);
+    }
+
+    // print current page, skipping start page, skipping for namespace index
+    resolve_pageid('', $page, $exists);
+    if(isset($page) && $page == $part.$parts[$i]) return true;
+    $page = $part.$parts[$i];
+    if($page == $conf['start']) return true;
+    echo $sep;
+    tpl_pagelink($page);
+    return true;
+}
+
+/**
+ * Print info if the user is logged in
+ * and show full name in that case
+ *
+ * Could be enhanced with a profile link in future?
+ *
+ * @author Andreas Gohr 
+ * @return bool
+ */
+function tpl_userinfo() {
+    global $lang;
+    global $INFO;
+    if(isset($_SERVER['REMOTE_USER'])) {
+        print $lang['loggedinas'].': '.hsc($INFO['userinfo']['name']).' ('.hsc($_SERVER['REMOTE_USER']).')';
+        return true;
+    }
+    return false;
+}
+
+/**
+ * Print some info about the current page
+ *
+ * @author Andreas Gohr 
+ * @param bool $ret return content instead of printing it
+ * @return bool|string
+ */
+function tpl_pageinfo($ret = false) {
+    global $conf;
+    global $lang;
+    global $INFO;
+    global $ID;
+
+    // return if we are not allowed to view the page
+    if(!auth_quickaclcheck($ID)) {
+        return false;
+    }
+
+    // prepare date and path
+    $fn = $INFO['filepath'];
+    if(!$conf['fullpath']) {
+        if($INFO['rev']) {
+            $fn = str_replace(fullpath($conf['olddir']).'/', '', $fn);
+        } else {
+            $fn = str_replace(fullpath($conf['datadir']).'/', '', $fn);
+        }
+    }
+    $fn   = utf8_decodeFN($fn);
+    $date = dformat($INFO['lastmod']);
+
+    // print it
+    if($INFO['exists']) {
+        $out = '';
+        $out .= ''.$fn.'';
+        $out .= ' · ';
+        $out .= $lang['lastmod'];
+        $out .= ': ';
+        $out .= $date;
+        if($INFO['editor']) {
+            $out .= ' '.$lang['by'].' ';
+            $out .= ''.editorinfo($INFO['editor']).'';
+        } else {
+            $out .= ' ('.$lang['external_edit'].')';
+        }
+        if($INFO['locked']) {
+            $out .= ' · ';
+            $out .= $lang['lockedby'];
+            $out .= ': ';
+            $out .= ''.editorinfo($INFO['locked']).'';
+        }
+        if($ret) {
+            return $out;
+        } else {
+            echo $out;
+            return true;
+        }
+    }
+    return false;
+}
+
+/**
+ * Prints or returns the name of the given page (current one if none given).
+ *
+ * If useheading is enabled this will use the first headline else
+ * the given ID is used.
+ *
+ * @author Andreas Gohr 
+ * @param string $id page id
+ * @param bool   $ret return content instead of printing
+ * @return bool|string
+ */
+function tpl_pagetitle($id = null, $ret = false) {
+    if(is_null($id)) {
+        global $ID;
+        $id = $ID;
+    }
+
+    $name = $id;
+    if(useHeading('navigation')) {
+        $title = p_get_first_heading($id);
+        if($title) $name = $title;
+    }
+
+    if($ret) {
+        return hsc($name);
+    } else {
+        print hsc($name);
+        return true;
+    }
+}
+
+/**
+ * Returns the requested EXIF/IPTC tag from the current image
+ *
+ * If $tags is an array all given tags are tried until a
+ * value is found. If no value is found $alt is returned.
+ *
+ * Which texts are known is defined in the functions _exifTagNames
+ * and _iptcTagNames() in inc/jpeg.php (You need to prepend IPTC
+ * to the names of the latter one)
+ *
+ * Only allowed in: detail.php
+ *
+ * @author Andreas Gohr 
+ * @param array  $tags tags to try
+ * @param string $alt alternative output if no data was found
+ * @param null   $src the image src, uses global $SRC if not given
+ * @return string
+ */
+function tpl_img_getTag($tags, $alt = '', $src = null) {
+    // Init Exif Reader
+    global $SRC;
+
+    if(is_null($src)) $src = $SRC;
+
+    static $meta = null;
+    if(is_null($meta)) $meta = new JpegMeta($src);
+    if($meta === false) return $alt;
+    $info = $meta->getField($tags);
+    if($info == false) return $alt;
+    return $info;
+}
+
+/**
+ * Prints the image with a link to the full sized version
+ *
+ * Only allowed in: detail.php
+ *
+ * @triggers TPL_IMG_DISPLAY
+ * @param $maxwidth  int - maximal width of the image
+ * @param $maxheight int - maximal height of the image
+ * @param $link bool     - link to the orginal size?
+ * @param $params array  - additional image attributes
+ * @return mixed Result of TPL_IMG_DISPLAY
+ */
+function tpl_img($maxwidth = 0, $maxheight = 0, $link = true, $params = null) {
+    global $IMG;
+    global $INPUT;
+    $w = tpl_img_getTag('File.Width');
+    $h = tpl_img_getTag('File.Height');
+
+    //resize to given max values
+    $ratio = 1;
+    if($w >= $h) {
+        if($maxwidth && $w >= $maxwidth) {
+            $ratio = $maxwidth / $w;
+        } elseif($maxheight && $h > $maxheight) {
+            $ratio = $maxheight / $h;
+        }
+    } else {
+        if($maxheight && $h >= $maxheight) {
+            $ratio = $maxheight / $h;
+        } elseif($maxwidth && $w > $maxwidth) {
+            $ratio = $maxwidth / $w;
+        }
+    }
+    if($ratio) {
+        $w = floor($ratio * $w);
+        $h = floor($ratio * $h);
+    }
+
+    //prepare URLs
+    $url = ml($IMG, array('cache'=> $INPUT->str('cache')), true, '&');
+    $src = ml($IMG, array('cache'=> $INPUT->str('cache'), 'w'=> $w, 'h'=> $h), true, '&');
+
+    //prepare attributes
+    $alt = tpl_img_getTag('Simple.Title');
+    if(is_null($params)) {
+        $p = array();
+    } else {
+        $p = $params;
+    }
+    if($w) $p['width'] = $w;
+    if($h) $p['height'] = $h;
+    $p['class'] = 'img_detail';
+    if($alt) {
+        $p['alt']   = $alt;
+        $p['title'] = $alt;
+    } else {
+        $p['alt'] = '';
+    }
+    $p['src'] = $src;
+
+    $data = array('url'=> ($link ? $url : null), 'params'=> $p);
+    return trigger_event('TPL_IMG_DISPLAY', $data, '_tpl_img_action', true);
+}
+
+/**
+ * Default action for TPL_IMG_DISPLAY
+ *
+ * @param array $data
+ * @return bool
+ */
+function _tpl_img_action($data) {
+    global $lang;
+    $p = buildAttributes($data['params']);
+
+    if($data['url']) print '        ';
+    print '';
+    if($data['url']) print '';
+    return true;
+}
+
+/**
+ * This function inserts a small gif which in reality is the indexer function.
+ *
+ * Should be called somewhere at the very end of the main.php
+ * template
+ *
+ * @return bool
+ */
+function tpl_indexerWebBug() {
+    global $ID;
+
+    $p           = array();
+    $p['src']    = DOKU_BASE.'lib/exe/indexer.php?id='.rawurlencode($ID).
+        '&'.time();
+    $p['width']  = 2; //no more 1x1 px image because we live in times of ad blockers...
+    $p['height'] = 1;
+    $p['alt']    = '';
+    $att         = buildAttributes($p);
+    print "";
+    return true;
+}
+
+/**
+ * tpl_getConf($id)
+ *
+ * use this function to access template configuration variables
+ *
+ * @param string $id
+ * @return string
+ */
+function tpl_getConf($id) {
+    global $conf;
+    static $tpl_configloaded = false;
+
+    $tpl = $conf['template'];
+
+    if(!$tpl_configloaded) {
+        $tconf = tpl_loadConfig();
+        if($tconf !== false) {
+            foreach($tconf as $key => $value) {
+                if(isset($conf['tpl'][$tpl][$key])) continue;
+                $conf['tpl'][$tpl][$key] = $value;
+            }
+            $tpl_configloaded = true;
+        }
+    }
+
+    return $conf['tpl'][$tpl][$id];
+}
+
+/**
+ * tpl_loadConfig()
+ *
+ * reads all template configuration variables
+ * this function is automatically called by tpl_getConf()
+ *
+ * @return array
+ */
+function tpl_loadConfig() {
+
+    $file = tpl_incdir().'/conf/default.php';
+    $conf = array();
+
+    if(!@file_exists($file)) return false;
+
+    // load default config file
+    include($file);
+
+    return $conf;
+}
+
+// language methods
+/**
+ * tpl_getLang($id)
+ *
+ * use this function to access template language variables
+ */
+function tpl_getLang($id) {
+    static $lang = array();
+
+    if(count($lang) === 0) {
+        $path = tpl_incdir().'lang/';
+
+        $lang = array();
+
+        global $conf; // definitely don't invoke "global $lang"
+        // don't include once
+        @include($path.'en/lang.php');
+        if($conf['lang'] != 'en') @include($path.$conf['lang'].'/lang.php');
+    }
+
+    return $lang[$id];
+}
+
+/**
+ * Retrieve a language dependent file and pass to xhtml renderer for display
+ * template equivalent of p_locale_xhtml()
+ *
+ * @param   string $id id of language dependent wiki page
+ * @return  string     parsed contents of the wiki page in xhtml format
+ */
+function tpl_locale_xhtml($id) {
+    return p_cached_output(tpl_localeFN($id));
+}
+
+/**
+ * Prepends appropriate path for a language dependent filename
+ */
+function tpl_localeFN($id) {
+    $path = tpl_incdir().'lang/';
+    global $conf;
+    $file = DOKU_CONF.'/template_lang/'.$conf['template'].'/'.$conf['lang'].'/'.$id.'.txt';
+    if (!@file_exists($file)){
+        $file = $path.$conf['lang'].'/'.$id.'.txt';
+        if(!@file_exists($file)){
+            //fall back to english
+            $file = $path.'en/'.$id.'.txt';
+        }
+    }
+    return $file;
+}
+
+/**
+ * prints the "main content" in the mediamanger popup
+ *
+ * Depending on the user's actions this may be a list of
+ * files in a namespace, the meta editing dialog or
+ * a message of referencing pages
+ *
+ * Only allowed in mediamanager.php
+ *
+ * @triggers MEDIAMANAGER_CONTENT_OUTPUT
+ * @param bool $fromajax - set true when calling this function via ajax
+ * @author Andreas Gohr 
+ */
+function tpl_mediaContent($fromajax = false, $sort='natural') {
+    global $IMG;
+    global $AUTH;
+    global $INUSE;
+    global $NS;
+    global $JUMPTO;
+    global $INPUT;
+
+    $do = $INPUT->extract('do')->str('do');
+    if(in_array($do, array('save', 'cancel'))) $do = '';
+
+    if(!$do) {
+        if($INPUT->bool('edit')) {
+            $do = 'metaform';
+        } elseif(is_array($INUSE)) {
+            $do = 'filesinuse';
+        } else {
+            $do = 'filelist';
+        }
+    }
+
+    // output the content pane, wrapped in an event.
+    if(!$fromajax) ptln('
        ');
+    $data = array('do' => $do);
+    $evt  = new Doku_Event('MEDIAMANAGER_CONTENT_OUTPUT', $data);
+    if($evt->advise_before()) {
+        $do = $data['do'];
+        if($do == 'filesinuse') {
+            media_filesinuse($INUSE, $IMG);
+        } elseif($do == 'filelist') {
+            media_filelist($NS, $AUTH, $JUMPTO,false,$sort);
+        } elseif($do == 'searchlist') {
+            media_searchlist($INPUT->str('q'), $NS, $AUTH);
+        } else {
+            msg('Unknown action '.hsc($do), -1);
+        }
+    }
+    $evt->advise_after();
+    unset($evt);
+    if(!$fromajax) ptln('
        ');
+
+}
+
+/**
+ * Prints the central column in full-screen media manager
+ * Depending on the opened tab this may be a list of
+ * files in a namespace, upload form or search form
+ *
+ * @author Kate Arzamastseva 
+ */
+function tpl_mediaFileList() {
+    global $AUTH;
+    global $NS;
+    global $JUMPTO;
+    global $lang;
+    global $INPUT;
+
+    $opened_tab = $INPUT->str('tab_files');
+    if(!$opened_tab || !in_array($opened_tab, array('files', 'upload', 'search'))) $opened_tab = 'files';
+    if($INPUT->str('mediado') == 'update') $opened_tab = 'upload';
+
+    echo '
        '.$lang['mediaselect'].'
        '.NL;
+
+    media_tabs_files($opened_tab);
+
+    echo '
        '.NL;
+    echo '
        ';
+    $tabTitle = ($NS) ? $NS : '['.$lang['mediaroot'].']';
+    printf($lang['media_'.$opened_tab], ''.hsc($tabTitle).'');
+    echo '
        '.NL;
+    if($opened_tab === 'search' || $opened_tab === 'files') {
+        media_tab_files_options();
+    }
+    echo '
        '.NL;
+
+    echo '
        '.NL;
+    if($opened_tab == 'files') {
+        media_tab_files($NS, $AUTH, $JUMPTO);
+    } elseif($opened_tab == 'upload') {
+        media_tab_upload($NS, $AUTH, $JUMPTO);
+    } elseif($opened_tab == 'search') {
+        media_tab_search($NS, $AUTH);
+    }
+    echo '
        '.NL;
+}
+
+/**
+ * Prints the third column in full-screen media manager
+ * Depending on the opened tab this may be details of the
+ * selected file, the meta editing dialog or
+ * list of file revisions
+ *
+ * @author Kate Arzamastseva 
+ */
+function tpl_mediaFileDetails($image, $rev) {
+    global $AUTH, $NS, $conf, $DEL, $lang, $INPUT;
+
+    $removed = (!file_exists(mediaFN($image)) && file_exists(mediaMetaFN($image, '.changes')) && $conf['mediarevisions']);
+    if(!$image || (!file_exists(mediaFN($image)) && !$removed) || $DEL) return;
+    if($rev && !file_exists(mediaFN($image, $rev))) $rev = false;
+    if(isset($NS) && getNS($image) != $NS) return;
+    $do = $INPUT->str('mediado');
+
+    $opened_tab = $INPUT->str('tab_details');
+
+    $tab_array = array('view');
+    list(, $mime) = mimetype($image);
+    if($mime == 'image/jpeg') {
+        $tab_array[] = 'edit';
+    }
+    if($conf['mediarevisions']) {
+        $tab_array[] = 'history';
+    }
+
+    if(!$opened_tab || !in_array($opened_tab, $tab_array)) $opened_tab = 'view';
+    if($INPUT->bool('edit')) $opened_tab = 'edit';
+    if($do == 'restore') $opened_tab = 'view';
+
+    media_tabs_details($image, $opened_tab);
+
+    echo '
        ';
+    list($ext) = mimetype($image, false);
+    $class    = preg_replace('/[^_\-a-z0-9]+/i', '_', $ext);
+    $class    = 'select mediafile mf_'.$class;
+    $tabTitle = ''.$image.''.'';
+    if($opened_tab === 'view' && $rev) {
+        printf($lang['media_viewold'], $tabTitle, dformat($rev));
+    } else {
+        printf($lang['media_'.$opened_tab], $tabTitle);
+    }
+
+    echo '
        '.NL;
+
+    echo '
        '.NL;
+
+    if($opened_tab == 'view') {
+        media_tab_view($image, $NS, $AUTH, $rev);
+
+    } elseif($opened_tab == 'edit' && !$removed) {
+        media_tab_edit($image, $NS, $AUTH);
+
+    } elseif($opened_tab == 'history' && $conf['mediarevisions']) {
+        media_tab_history($image, $NS, $AUTH);
+    }
+
+    echo '
        '.NL;
+}
+
+/**
+ * prints the namespace tree in the mediamanger popup
+ *
+ * Only allowed in mediamanager.php
+ *
+ * @author Andreas Gohr 
+ */
+function tpl_mediaTree() {
+    global $NS;
+    ptln('
        ');
+    media_nstree($NS);
+    ptln('
        ');
+}
+
+/**
+ * Print a dropdown menu with all DokuWiki actions
+ *
+ * Note: this will not use any pretty URLs
+ *
+ * @author Andreas Gohr 
+ */
+function tpl_actiondropdown($empty = '', $button = '>') {
+    global $ID;
+    global $REV;
+    global $lang;
+
+    echo '
        ';
+    echo '
        ';
+    echo '';
+    if($REV) echo '';
+    if (!empty($_SERVER['REMOTE_USER'])) {
+        echo '';
+    }
+
+    echo '';
+    echo '';
+    echo '
        ';
+    echo '
        ';
+}
+
+/**
+ * Print a informational line about the used license
+ *
+ * @author Andreas Gohr 
+ * @param  string $img     print image? (|button|badge)
+ * @param  bool   $imgonly skip the textual description?
+ * @param  bool   $return  when true don't print, but return HTML
+ * @param  bool   $wrap    wrap in div with class="license"?
+ * @return string
+ */
+function tpl_license($img = 'badge', $imgonly = false, $return = false, $wrap = true) {
+    global $license;
+    global $conf;
+    global $lang;
+    if(!$conf['license']) return '';
+    if(!is_array($license[$conf['license']])) return '';
+    $lic    = $license[$conf['license']];
+    $target = ($conf['target']['extern']) ? ' target="'.$conf['target']['extern'].'"' : '';
+
+    $out = '';
+    if($wrap) $out .= '
        ';
+    if($img) {
+        $src = license_img($img);
+        if($src) {
+            $out .= '';
+            if(!$imgonly) $out .= ' ';
+        }
+    }
+    if(!$imgonly) {
+        $out .= $lang['license'].' ';
+        $out .= '';
+    }
+    if($wrap) $out .= '
        ';
+
+    if($return) return $out;
+    echo $out;
+    return '';
+}
+
+/**
+ * Includes the rendered HTML of a given page
+ *
+ * This function is useful to populate sidebars or similar features in a
+ * template
+ */
+function tpl_include_page($pageid, $print = true, $propagate = false) {
+    if (!$pageid) return false;
+    if ($propagate) $pageid = page_findnearest($pageid);
+
+    global $TOC;
+    $oldtoc = $TOC;
+    $html   = p_wiki_xhtml($pageid, '', false);
+    $TOC    = $oldtoc;
+
+    if(!$print) return $html;
+    echo $html;
+    return $html;
+}
+
+/**
+ * Display the subscribe form
+ *
+ * @author Adrian Lang 
+ */
+function tpl_subscribe() {
+    global $INFO;
+    global $ID;
+    global $lang;
+    global $conf;
+    $stime_days = $conf['subscribe_time'] / 60 / 60 / 24;
+
+    echo p_locale_xhtml('subscr_form');
+    echo '
        '.$lang['subscr_m_current_header'].'
        ';
+    echo '
        ';
+    if($INFO['subscribed'] === false) {
+        echo '
        '.$lang['subscr_m_not_subscribed'].'
        ';
+    } else {
+        echo '        ';
+    }
+    echo '
        ';
+
+    // Add new subscription form
+    echo '
        '.$lang['subscr_m_new_header'].'
        ';
+    echo '
        ';
+    $ns      = getNS($ID).':';
+    $targets = array(
+        $ID => ''.prettyprint_id($ID).'',
+        $ns => ''.prettyprint_id($ns).'',
+    );
+    $styles  = array(
+        'every'  => $lang['subscr_style_every'],
+        'digest' => sprintf($lang['subscr_style_digest'], $stime_days),
+        'list'   => sprintf($lang['subscr_style_list'], $stime_days),
+    );
+
+    $form = new Doku_Form(array('id' => 'subscribe__form'));
+    $form->startFieldset($lang['subscr_m_subscribe']);
+    $form->addRadioSet('sub_target', $targets);
+    $form->startFieldset($lang['subscr_m_receive']);
+    $form->addRadioSet('sub_style', $styles);
+    $form->addHidden('sub_action', 'subscribe');
+    $form->addHidden('do', 'subscribe');
+    $form->addHidden('id', $ID);
+    $form->endFieldset();
+    $form->addElement(form_makeButton('submit', 'subscribe', $lang['subscr_m_subscribe']));
+    html_form('SUBSCRIBE', $form);
+    echo '
        ';
+}
+
+/**
+ * Tries to send already created content right to the browser
+ *
+ * Wraps around ob_flush() and flush()
+ *
+ * @author Andreas Gohr 
+ */
+function tpl_flush() {
+    ob_flush();
+    flush();
+}
+
+/**
+ * Tries to find a ressource file in the given locations.
+ *
+ * If a given location starts with a colon it is assumed to be a media
+ * file, otherwise it is assumed to be relative to the current template
+ *
+ * @param  array $search       locations to look at
+ * @param  bool  $abs           if to use absolute URL
+ * @param  array &$imginfo   filled with getimagesize()
+ * @return string
+ * @author Andreas  Gohr 
+ */
+function tpl_getMediaFile($search, $abs = false, &$imginfo = null) {
+    $img     = '';
+    $file    = '';
+    $ismedia = false;
+    // loop through candidates until a match was found:
+    foreach($search as $img) {
+        if(substr($img, 0, 1) == ':') {
+            $file    = mediaFN($img);
+            $ismedia = true;
+        } else {
+            $file    = tpl_incdir().$img;
+            $ismedia = false;
+        }
+
+        if(file_exists($file)) break;
+    }
+
+    // fetch image data if requested
+    if(!is_null($imginfo)) {
+        $imginfo = getimagesize($file);
+    }
+
+    // build URL
+    if($ismedia) {
+        $url = ml($img, '', true, '', $abs);
+    } else {
+        $url = tpl_basedir().$img;
+        if($abs) $url = DOKU_URL.substr($url, strlen(DOKU_REL));
+    }
+
+    return $url;
+}
+
+/**
+ * PHP include a file
+ *
+ * either from the conf directory if it exists, otherwise use
+ * file in the template's root directory.
+ *
+ * The function honours config cascade settings and looks for the given
+ * file next to the ´main´ config files, in the order protected, local,
+ * default.
+ *
+ * Note: no escaping or sanity checking is done here. Never pass user input
+ * to this function!
+ *
+ * @author Anika Henke 
+ * @author Andreas Gohr 
+ */
+function tpl_includeFile($file) {
+    global $config_cascade;
+    foreach(array('protected', 'local', 'default') as $config_group) {
+        if(empty($config_cascade['main'][$config_group])) continue;
+        foreach($config_cascade['main'][$config_group] as $conf_file) {
+            $dir = dirname($conf_file);
+            if(file_exists("$dir/$file")) {
+                include("$dir/$file");
+                return;
+            }
+        }
+    }
+
+    // still here? try the template dir
+    $file = tpl_incdir().$file;
+    if(file_exists($file)) {
+        include($file);
+    }
+}
+
+/**
+ * Returns  tag for various icon types (favicon|mobile|generic)
+ *
+ * @author Anika Henke 
+ * @param  array $types - list of icon types to display (favicon|mobile|generic)
+ * @return string
+ */
+function tpl_favicon($types = array('favicon')) {
+
+    $return = '';
+
+    foreach($types as $type) {
+        switch($type) {
+            case 'favicon':
+                $look = array(':wiki:favicon.ico', ':favicon.ico', 'images/favicon.ico');
+                $return .= ''.NL;
+                break;
+            case 'mobile':
+                $look = array(':wiki:apple-touch-icon.png', ':apple-touch-icon.png', 'images/apple-touch-icon.png');
+                $return .= ''.NL;
+                break;
+            case 'generic':
+                // ideal world solution, which doesn't work in any browser yet
+                $look = array(':wiki:favicon.svg', ':favicon.svg', 'images/favicon.svg');
+                $return .= ''.NL;
+                break;
+        }
+    }
+
+    return $return;
+}
+
+/**
+ * Prints full-screen media manager
+ *
+ * @author Kate Arzamastseva 
+ */
+function tpl_media() {
+    global $NS, $IMG, $JUMPTO, $REV, $lang, $fullscreen, $INPUT;
+    $fullscreen = true;
+    require_once DOKU_INC.'lib/exe/mediamanager.php';
+
+    $rev   = '';
+    $image = cleanID($INPUT->str('image'));
+    if(isset($IMG)) $image = $IMG;
+    if(isset($JUMPTO)) $image = $JUMPTO;
+    if(isset($REV) && !$JUMPTO) $rev = $REV;
+
+    echo '
        '.NL;
+    echo '
        '.$lang['btn_media'].'
        '.NL;
+    html_msgarea();
+
+    echo '
        '.NL;
+    echo '
        '.$lang['namespaces'].'
        '.NL;
+    echo '
        ';
+    echo $lang['media_namespaces'];
+    echo '
        '.NL;
+
+    echo '
        '.NL;
+    media_nstree($NS);
+    echo '
        '.NL;
+    echo '
        '.NL;
+
+    echo '
        '.NL;
+    tpl_mediaFileList();
+    echo '
        '.NL;
+
+    echo '
        '.NL;
+    echo '
        '.$lang['media_file'].'
        '.NL;
+    tpl_mediaFileDetails($image, $rev);
+    echo '
        '.NL;
+
+    echo '
        '.NL;
+}
+
+/**
+ * Return useful layout classes
+ *
+ * @author Anika Henke 
+ */
+function tpl_classes() {
+    global $ACT, $conf, $ID, $INFO;
+    $classes = array(
+        'dokuwiki',
+        'mode_'.$ACT,
+        'tpl_'.$conf['template'],
+        !empty($_SERVER['REMOTE_USER']) ? 'loggedIn' : '',
+        $INFO['exists'] ? '' : 'notFound',
+        ($ID == $conf['start']) ? 'home' : '',
+    );
+    return join(' ', $classes);
+}
+
+//Setup VIM: ex: et ts=4 :
+
diff --git a/sources/inc/toolbar.php b/sources/inc/toolbar.php
new file mode 100644
index 0000000..b588d44
--- /dev/null
+++ b/sources/inc/toolbar.php
@@ -0,0 +1,255 @@
+
+ */
+
+if(!defined('DOKU_INC')) die('meh.');
+
+/**
+ * Prepares and prints an JavaScript array with all toolbar buttons
+ *
+ * @emits  TOOLBAR_DEFINE
+ * @param  string $varname Name of the JS variable to fill
+ * @author Andreas Gohr 
+ */
+function toolbar_JSdefines($varname){
+    global $lang;
+
+    $menu = array();
+
+    $evt = new Doku_Event('TOOLBAR_DEFINE', $menu);
+    if ($evt->advise_before()){
+
+        // build button array
+        $menu = array_merge($menu, array(
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_bold'],
+                'icon'   => 'bold.png',
+                'key'    => 'b',
+                'open'   => '**',
+                'close'  => '**',
+                'block'  => false
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_italic'],
+                'icon'   => 'italic.png',
+                'key'    => 'i',
+                'open'   => '//',
+                'close'  => '//',
+                'block'  => false
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_underl'],
+                'icon'   => 'underline.png',
+                'key'    => 'u',
+                'open'   => '__',
+                'close'  => '__',
+                'block'  => false
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_code'],
+                'icon'   => 'mono.png',
+                'key'    => 'c',
+                'open'   => "''",
+                'close'  => "''",
+                'block'  => false
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_strike'],
+                'icon'   => 'strike.png',
+                'key'    => 'd',
+                'open'  => '',
+                'close'   => '',
+                'block'  => false
+                ),
+
+           array(
+                'type'   => 'autohead',
+                'title'  => $lang['qb_hequal'],
+                'icon'   => 'hequal.png',
+                'key'    => '8',
+                'text'   => $lang['qb_h'],
+                'mod'    => 0,
+                'block'  => true
+               ),
+           array(
+                'type'   => 'autohead',
+                'title'  => $lang['qb_hminus'],
+                'icon'   => 'hminus.png',
+                'key'    => '9',
+                'text'   => $lang['qb_h'],
+                'mod'    => 1,
+                'block'  => true
+               ),
+           array(
+                'type'   => 'autohead',
+                'title'  => $lang['qb_hplus'],
+                'icon'   => 'hplus.png',
+                'key'    => '0',
+                'text'   => $lang['qb_h'],
+                'mod'    => -1,
+                'block'  => true
+               ),
+
+           array(
+                'type'   => 'picker',
+                'title'  => $lang['qb_hs'],
+                'icon'   => 'h.png',
+                'class'  => 'pk_hl',
+                'list'   => array(
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h1'],
+                                    'icon'   => 'h1.png',
+                                    'key'    => '1',
+                                    'open'   => '====== ',
+                                    'close'  => ' ======\n',
+                                    ),
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h2'],
+                                    'icon'   => 'h2.png',
+                                    'key'    => '2',
+                                    'open'   => '===== ',
+                                    'close'  => ' =====\n',
+                                    ),
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h3'],
+                                    'icon'   => 'h3.png',
+                                    'key'    => '3',
+                                    'open'   => '==== ',
+                                    'close'  => ' ====\n',
+                                    ),
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h4'],
+                                    'icon'   => 'h4.png',
+                                    'key'    => '4',
+                                    'open'   => '=== ',
+                                    'close'  => ' ===\n',
+                                    ),
+                               array(
+                                    'type'   => 'format',
+                                    'title'  => $lang['qb_h5'],
+                                    'icon'   => 'h5.png',
+                                    'key'    => '5',
+                                    'open'   => '== ',
+                                    'close'  => ' ==\n',
+                                    ),
+                            ),
+                'block'  => true
+                ),
+
+           array(
+                'type'   => 'linkwiz',
+                'title'  => $lang['qb_link'],
+                'icon'   => 'link.png',
+                'key'    => 'l',
+                'open'   => '[[',
+                'close'  => ']]',
+                'block'  => false
+                ),
+           array(
+                'type'   => 'format',
+                'title'  => $lang['qb_extlink'],
+                'icon'   => 'linkextern.png',
+                'open'   => '[[',
+                'close'  => ']]',
+                'sample' => 'http://example.com|'.$lang['qb_extlink'],
+                'block'  => false
+                ),
+           array(
+                'type'   => 'formatln',
+                'title'  => $lang['qb_ol'],
+                'icon'   => 'ol.png',
+                'open'   => '  - ',
+                'close'  => '',
+                'key'    => '-',
+                'block'  => true
+                ),
+           array(
+                'type'   => 'formatln',
+                'title'  => $lang['qb_ul'],
+                'icon'   => 'ul.png',
+                'open'   => '  * ',
+                'close'  => '',
+                'key'    => '.',
+                'block'  => true
+                ),
+           array(
+                'type'   => 'insert',
+                'title'  => $lang['qb_hr'],
+                'icon'   => 'hr.png',
+                'insert' => '\n----\n',
+                'block'  => true
+                ),
+           array(
+                'type'   => 'mediapopup',
+                'title'  => $lang['qb_media'],
+                'icon'   => 'image.png',
+                'url'    => 'lib/exe/mediamanager.php?ns=',
+                'name'   => 'mediaselect',
+                'options'=> 'width=750,height=500,left=20,top=20,scrollbars=yes,resizable=yes',
+                'block'  => false
+                ),
+          array(
+                'type'   => 'picker',
+                'title'  => $lang['qb_smileys'],
+                'icon'   => 'smiley.png',
+                'list'   => getSmileys(),
+                'icobase'=> 'smileys',
+                'block'  => false
+               ),
+          array(
+                'type'   => 'picker',
+                'title'  => $lang['qb_chars'],
+                'icon'   => 'chars.png',
+                'list'   => explode(' ','À à Á á  â à ã Ä ä Ǎ ǎ Ă ă Å å Ā ā Ą ą Æ æ Ć ć Ç ç Č č Ĉ ĉ Ċ ċ Ð đ ð Ď ď È è É é Ê ê Ë ë Ě ě Ē ē Ė ė Ę ę Ģ ģ Ĝ ĝ Ğ ğ Ġ ġ Ĥ ĥ Ì ì Í í Î î Ï ï Ǐ ǐ Ī ī İ ı Į į Ĵ ĵ Ķ ķ Ĺ ĺ Ļ ļ Ľ ľ Ł ł Ŀ ŀ Ń ń Ñ ñ Ņ ņ Ň ň Ò ò Ó ó Ô ô Õ õ Ö ö Ǒ ǒ Ō ō Ő ő Œ œ Ø ø Ŕ ŕ Ŗ ŗ Ř ř Ś ś Ş ş Š š Ŝ ŝ Ţ ţ Ť ť Ù ù Ú ú Û û Ü ü Ǔ ǔ Ŭ ŭ Ū ū Ů ů ǖ ǘ ǚ ǜ Ų ų Ű ű Ŵ ŵ Ý ý Ÿ ÿ Ŷ ŷ Ź ź Ž ž Ż ż Þ þ ß Ħ ħ ¿ ¡ ¢ £ ¤ ¥ € ¦ § ª ¬ ¯ ° ± ÷ ‰ ¼ ½ ¾ ¹ ² ³ µ ¶ † ‡ · • º ∀ ∂ ∃ Ə ə ∅ ∇ ∈ ∉ ∋ ∏ ∑ ‾ − ∗ × ⁄ √ ∝ ∞ ∠ ∧ ∨ ∩ ∪ ∫ ∴ ∼ ≅ ≈ ≠ ≡ ≤ ≥ ⊂ ⊃ ⊄ ⊆ ⊇ ⊕ ⊗ ⊥ ⋅ ◊ ℘ ℑ ℜ ℵ ♠ ♣ ♥ ♦ α β Γ γ Δ δ ε ζ η Θ θ ι κ Λ λ μ Ξ ξ Π π ρ Σ σ Τ τ υ Φ φ χ Ψ ψ Ω ω ★ ☆ ☎ ☚ ☛ ☜ ☝ ☞ ☟ ☹ ☺ ✔ ✘ „ “ ” ‚ ‘ ’ « » ‹ › — – … ← ↑ → ↓ ↔ ⇐ ⇑ ⇒ ⇓ ⇔ © ™ ® ′ ″ [ ] { } ~ ( ) % § $ # | @'),
+                'block'  => false
+               ),
+          array(
+                'type'   => 'signature',
+                'title'  => $lang['qb_sig'],
+                'icon'   => 'sig.png',
+                'key'    => 'y',
+                'block'  => false
+               ),
+        ));
+    } // end event TOOLBAR_DEFINE default action
+    $evt->advise_after();
+    unset($evt);
+
+    // use JSON to build the JavaScript array
+    $json = new JSON();
+    print "var $varname = ".$json->encode($menu).";\n";
+}
+
+/**
+ * prepares the signature string as configured in the config
+ *
+ * @author Andreas Gohr 
+ */
+function toolbar_signature(){
+    global $conf;
+    global $INFO;
+
+    $sig = $conf['signature'];
+    $sig = dformat(null,$sig);
+    $sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig);
+    $sig = str_replace('@NAME@',$INFO['userinfo']['name'],$sig);
+    $sig = str_replace('@MAIL@',$INFO['userinfo']['mail'],$sig);
+    $sig = str_replace('@DATE@',dformat(),$sig);
+    $sig = str_replace('\\\\n','\\n',addslashes($sig));
+    return $sig;
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/inc/utf8.php b/sources/inc/utf8.php
new file mode 100644
index 0000000..c944667
--- /dev/null
+++ b/sources/inc/utf8.php
@@ -0,0 +1,1702 @@
+
+ */
+
+/**
+ * check for mb_string support
+ */
+if(!defined('UTF8_MBSTRING')){
+    if(function_exists('mb_substr') && !defined('UTF8_NOMBSTRING')){
+        define('UTF8_MBSTRING',1);
+    }else{
+        define('UTF8_MBSTRING',0);
+    }
+}
+
+/**
+ * Check if PREG was compiled with UTF-8 support
+ *
+ * Without this many of the functions below will not work, so this is a minimal requirement
+ */
+if(!defined('UTF8_PREGSUPPORT')){
+    define('UTF8_PREGSUPPORT', (bool) @preg_match('/^.$/u', 'ñ'));
+}
+
+/**
+ * Check if PREG was compiled with Unicode Property support
+ *
+ * This is not required for the functions below, but might be needed in a UTF-8 aware application
+ */
+if(!defined('UTF8_PROPERTYSUPPORT')){
+    define('UTF8_PROPERTYSUPPORT', (bool) @preg_match('/^\pL$/u', 'ñ'));
+}
+
+
+if(UTF8_MBSTRING){ mb_internal_encoding('UTF-8'); }
+
+if(!function_exists('utf8_isASCII')){
+    /**
+     * Checks if a string contains 7bit ASCII only
+     *
+     * @author Andreas Haerter 
+     */
+    function utf8_isASCII($str){
+        return (preg_match('/(?:[^\x00-\x7F])/', $str) !== 1);
+    }
+}
+
+if(!function_exists('utf8_strip')){
+    /**
+     * Strips all highbyte chars
+     *
+     * Returns a pure ASCII7 string
+     *
+     * @author Andreas Gohr 
+     */
+    function utf8_strip($str){
+        $ascii = '';
+        $len = strlen($str);
+        for($i=0; $i<$len; $i++){
+            if(ord($str{$i}) <128){
+                $ascii .= $str{$i};
+            }
+        }
+        return $ascii;
+    }
+}
+
+if(!function_exists('utf8_check')){
+    /**
+     * Tries to detect if a string is in Unicode encoding
+     *
+     * @author 
+     * @link   http://www.php.net/manual/en/function.utf8-encode.php
+     */
+    function utf8_check($Str) {
+        $len = strlen($Str);
+        for ($i=0; $i<$len; $i++) {
+            $b = ord($Str[$i]);
+            if ($b < 0x80) continue; # 0bbbbbbb
+            elseif (($b & 0xE0) == 0xC0) $n=1; # 110bbbbb
+            elseif (($b & 0xF0) == 0xE0) $n=2; # 1110bbbb
+            elseif (($b & 0xF8) == 0xF0) $n=3; # 11110bbb
+            elseif (($b & 0xFC) == 0xF8) $n=4; # 111110bb
+            elseif (($b & 0xFE) == 0xFC) $n=5; # 1111110b
+            else return false; # Does not match any model
+
+            for ($j=0; $j<$n; $j++) { # n bytes matching 10bbbbbb follow ?
+                if ((++$i == $len) || ((ord($Str[$i]) & 0xC0) != 0x80))
+                    return false;
+            }
+        }
+        return true;
+    }
+}
+
+if(!function_exists('utf8_basename')){
+    /**
+     * A locale independent basename() implementation
+     *
+     * works around a bug in PHP's basename() implementation
+     *
+     * @see basename()
+     * @link   https://bugs.php.net/bug.php?id=37738
+     * @param string $path     A path
+     * @param string $suffix   If the name component ends in suffix this will also be cut off
+     * @return string
+     */
+    function utf8_basename($path, $suffix=''){
+        $path = trim($path,'\\/');
+        $rpos = max(strrpos($path, '/'), strrpos($path, '\\'));
+        if($rpos) $path = substr($path, $rpos+1);
+
+        $suflen = strlen($suffix);
+        if($suflen && (substr($path, -$suflen) == $suffix)){
+            $path = substr($path, 0, -$suflen);
+        }
+
+        return $path;
+    }
+}
+
+if(!function_exists('utf8_strlen')){
+    /**
+     * Unicode aware replacement for strlen()
+     *
+     * utf8_decode() converts characters that are not in ISO-8859-1
+     * to '?', which, for the purpose of counting, is alright - It's
+     * even faster than mb_strlen.
+     *
+     * @author 
+     * @see    strlen()
+     * @see    utf8_decode()
+     */
+    function utf8_strlen($string){
+        return strlen(utf8_decode($string));
+    }
+}
+
+if(!function_exists('utf8_substr')){
+    /**
+     * UTF-8 aware alternative to substr
+     *
+     * Return part of a string given character offset (and optionally length)
+     *
+     * @author Harry Fuecks 
+     * @author Chris Smith 
+     * @param string $str
+     * @param int $offset number of UTF-8 characters offset (from left)
+     * @param int $length (optional) length in UTF-8 characters from offset
+     * @return mixed string or false if failure
+     */
+    function utf8_substr($str, $offset, $length = null) {
+        if(UTF8_MBSTRING){
+            if( $length === null ){
+                return mb_substr($str, $offset);
+            }else{
+                return mb_substr($str, $offset, $length);
+            }
+        }
+
+        /*
+         * Notes:
+         *
+         * no mb string support, so we'll use pcre regex's with 'u' flag
+         * pcre only supports repetitions of less than 65536, in order to accept up to MAXINT values for
+         * offset and length, we'll repeat a group of 65535 characters when needed (ok, up to MAXINT-65536)
+         *
+         * substr documentation states false can be returned in some cases (e.g. offset > string length)
+         * mb_substr never returns false, it will return an empty string instead.
+         *
+         * calculating the number of characters in the string is a relatively expensive operation, so
+         * we only carry it out when necessary. It isn't necessary for +ve offsets and no specified length
+         */
+
+        // cast parameters to appropriate types to avoid multiple notices/warnings
+        $str = (string)$str;                          // generates E_NOTICE for PHP4 objects, but not PHP5 objects
+        $offset = (int)$offset;
+        if (!is_null($length)) $length = (int)$length;
+
+        // handle trivial cases
+        if ($length === 0) return '';
+        if ($offset < 0 && $length < 0 && $length < $offset) return '';
+
+        $offset_pattern = '';
+        $length_pattern = '';
+
+        // normalise -ve offsets (we could use a tail anchored pattern, but they are horribly slow!)
+        if ($offset < 0) {
+            $strlen = strlen(utf8_decode($str));        // see notes
+            $offset = $strlen + $offset;
+            if ($offset < 0) $offset = 0;
+        }
+
+        // establish a pattern for offset, a non-captured group equal in length to offset
+        if ($offset > 0) {
+            $Ox = (int)($offset/65535);
+            $Oy = $offset%65535;
+
+            if ($Ox) $offset_pattern = '(?:.{65535}){'.$Ox.'}';
+            $offset_pattern = '^(?:'.$offset_pattern.'.{'.$Oy.'})';
+        } else {
+            $offset_pattern = '^';                      // offset == 0; just anchor the pattern
+        }
+
+        // establish a pattern for length
+        if (is_null($length)) {
+            $length_pattern = '(.*)$';                  // the rest of the string
+        } else {
+
+            if (!isset($strlen)) $strlen = strlen(utf8_decode($str));    // see notes
+            if ($offset > $strlen) return '';           // another trivial case
+
+            if ($length > 0) {
+
+                $length = min($strlen-$offset, $length);  // reduce any length that would go passed the end of the string
+
+                $Lx = (int)($length/65535);
+                $Ly = $length%65535;
+
+                // +ve length requires ... a captured group of length characters
+                if ($Lx) $length_pattern = '(?:.{65535}){'.$Lx.'}';
+                    $length_pattern = '('.$length_pattern.'.{'.$Ly.'})';
+
+            } else if ($length < 0) {
+
+                if ($length < ($offset - $strlen)) return '';
+
+                $Lx = (int)((-$length)/65535);
+                $Ly = (-$length)%65535;
+
+                // -ve length requires ... capture everything except a group of -length characters
+                //                         anchored at the tail-end of the string
+                if ($Lx) $length_pattern = '(?:.{65535}){'.$Lx.'}';
+                $length_pattern = '(.*)(?:'.$length_pattern.'.{'.$Ly.'})$';
+            }
+        }
+
+        if (!preg_match('#'.$offset_pattern.$length_pattern.'#us',$str,$match)) return '';
+        return $match[1];
+    }
+}
+
+if(!function_exists('utf8_substr_replace')){
+    /**
+     * Unicode aware replacement for substr_replace()
+     *
+     * @author Andreas Gohr 
+     * @see    substr_replace()
+     */
+    function utf8_substr_replace($string, $replacement, $start , $length=0 ){
+        $ret = '';
+        if($start>0) $ret .= utf8_substr($string, 0, $start);
+        $ret .= $replacement;
+        $ret .= utf8_substr($string, $start+$length);
+        return $ret;
+    }
+}
+
+if(!function_exists('utf8_ltrim')){
+    /**
+     * Unicode aware replacement for ltrim()
+     *
+     * @author Andreas Gohr 
+     * @see    ltrim()
+     * @param  string $str
+     * @param  string $charlist
+     * @return string
+     */
+    function utf8_ltrim($str,$charlist=''){
+        if($charlist == '') return ltrim($str);
+
+        //quote charlist for use in a characterclass
+        $charlist = preg_replace('!([\\\\\\-\\]\\[/])!','\\\${1}',$charlist);
+
+        return preg_replace('/^['.$charlist.']+/u','',$str);
+    }
+}
+
+if(!function_exists('utf8_rtrim')){
+    /**
+     * Unicode aware replacement for rtrim()
+     *
+     * @author Andreas Gohr 
+     * @see    rtrim()
+     * @param  string $str
+     * @param  string $charlist
+     * @return string
+     */
+    function  utf8_rtrim($str,$charlist=''){
+        if($charlist == '') return rtrim($str);
+
+        //quote charlist for use in a characterclass
+        $charlist = preg_replace('!([\\\\\\-\\]\\[/])!','\\\${1}',$charlist);
+
+        return preg_replace('/['.$charlist.']+$/u','',$str);
+    }
+}
+
+if(!function_exists('utf8_trim')){
+    /**
+     * Unicode aware replacement for trim()
+     *
+     * @author Andreas Gohr 
+     * @see    trim()
+     * @param  string $str
+     * @param  string $charlist
+     * @return string
+     */
+    function  utf8_trim($str,$charlist='') {
+        if($charlist == '') return trim($str);
+
+        return utf8_ltrim(utf8_rtrim($str,$charlist),$charlist);
+    }
+}
+
+if(!function_exists('utf8_strtolower')){
+    /**
+     * This is a unicode aware replacement for strtolower()
+     *
+     * Uses mb_string extension if available
+     *
+     * @author Leo Feyer 
+     * @see    strtolower()
+     * @see    utf8_strtoupper()
+     */
+    function utf8_strtolower($string){
+        if(UTF8_MBSTRING) return mb_strtolower($string,'utf-8');
+
+        global $UTF8_UPPER_TO_LOWER;
+        return strtr($string,$UTF8_UPPER_TO_LOWER);
+    }
+}
+
+if(!function_exists('utf8_strtoupper')){
+    /**
+     * This is a unicode aware replacement for strtoupper()
+     *
+     * Uses mb_string extension if available
+     *
+     * @author Leo Feyer 
+     * @see    strtoupper()
+     * @see    utf8_strtoupper()
+     */
+    function utf8_strtoupper($string){
+        if(UTF8_MBSTRING) return mb_strtoupper($string,'utf-8');
+
+        global $UTF8_LOWER_TO_UPPER;
+        return strtr($string,$UTF8_LOWER_TO_UPPER);
+    }
+}
+
+if(!function_exists('utf8_ucfirst')){
+    /**
+     * UTF-8 aware alternative to ucfirst
+     * Make a string's first character uppercase
+     *
+     * @author Harry Fuecks
+     * @param string
+     * @return string with first character as upper case (if applicable)
+     */
+    function utf8_ucfirst($str){
+        switch ( utf8_strlen($str) ) {
+            case 0:
+                return '';
+            case 1:
+                return utf8_strtoupper($str);
+            default:
+                preg_match('/^(.{1})(.*)$/us', $str, $matches);
+                return utf8_strtoupper($matches[1]).$matches[2];
+        }
+    }
+}
+
+if(!function_exists('utf8_ucwords')){
+    /**
+     * UTF-8 aware alternative to ucwords
+     * Uppercase the first character of each word in a string
+     *
+     * @author Harry Fuecks
+     * @param string
+     * @return string with first char of each word uppercase
+     * @see http://www.php.net/ucwords
+     */
+    function utf8_ucwords($str) {
+        // Note: [\x0c\x09\x0b\x0a\x0d\x20] matches;
+        // form feeds, horizontal tabs, vertical tabs, linefeeds and carriage returns
+        // This corresponds to the definition of a "word" defined at http://www.php.net/ucwords
+        $pattern = '/(^|([\x0c\x09\x0b\x0a\x0d\x20]+))([^\x0c\x09\x0b\x0a\x0d\x20]{1})[^\x0c\x09\x0b\x0a\x0d\x20]*/u';
+
+        return preg_replace_callback($pattern, 'utf8_ucwords_callback',$str);
+    }
+
+    /**
+     * Callback function for preg_replace_callback call in utf8_ucwords
+     * You don't need to call this yourself
+     *
+     * @author Harry Fuecks
+     * @param  array $matches matches corresponding to a single word
+     * @return string with first char of the word in uppercase
+     * @see utf8_ucwords
+     * @see utf8_strtoupper
+     */
+    function utf8_ucwords_callback($matches) {
+        $leadingws = $matches[2];
+        $ucfirst = utf8_strtoupper($matches[3]);
+        $ucword = utf8_substr_replace(ltrim($matches[0]),$ucfirst,0,1);
+        return $leadingws . $ucword;
+    }
+}
+
+if(!function_exists('utf8_deaccent')){
+    /**
+     * Replace accented UTF-8 characters by unaccented ASCII-7 equivalents
+     *
+     * Use the optional parameter to just deaccent lower ($case = -1) or upper ($case = 1)
+     * letters. Default is to deaccent both cases ($case = 0)
+     *
+     * @author Andreas Gohr 
+     */
+    function utf8_deaccent($string,$case=0){
+        if($case <= 0){
+            global $UTF8_LOWER_ACCENTS;
+            $string = strtr($string,$UTF8_LOWER_ACCENTS);
+        }
+        if($case >= 0){
+            global $UTF8_UPPER_ACCENTS;
+            $string = strtr($string,$UTF8_UPPER_ACCENTS);
+        }
+        return $string;
+    }
+}
+
+if(!function_exists('utf8_romanize')){
+    /**
+     * Romanize a non-latin string
+     *
+     * @author Andreas Gohr 
+     */
+    function utf8_romanize($string){
+        if(utf8_isASCII($string)) return $string; //nothing to do
+
+        global $UTF8_ROMANIZATION;
+        return strtr($string,$UTF8_ROMANIZATION);
+    }
+}
+
+if(!function_exists('utf8_stripspecials')){
+    /**
+     * Removes special characters (nonalphanumeric) from a UTF-8 string
+     *
+     * This function adds the controlchars 0x00 to 0x19 to the array of
+     * stripped chars (they are not included in $UTF8_SPECIAL_CHARS)
+     *
+     * @author Andreas Gohr 
+     * @param  string $string     The UTF8 string to strip of special chars
+     * @param  string $repl       Replace special with this string
+     * @param  string $additional Additional chars to strip (used in regexp char class)
+     * @return string
+     */
+    function utf8_stripspecials($string,$repl='',$additional=''){
+        global $UTF8_SPECIAL_CHARS2;
+
+        static $specials = null;
+        if(is_null($specials)){
+            #$specials = preg_quote(unicode_to_utf8($UTF8_SPECIAL_CHARS), '/');
+            $specials = preg_quote($UTF8_SPECIAL_CHARS2, '/');
+        }
+
+        return preg_replace('/['.$additional.'\x00-\x19'.$specials.']/u',$repl,$string);
+    }
+}
+
+if(!function_exists('utf8_strpos')){
+    /**
+     * This is an Unicode aware replacement for strpos
+     *
+     * @author Leo Feyer 
+     * @see    strpos()
+     * @param  string
+     * @param  string
+     * @param  integer
+     * @return integer
+     */
+    function utf8_strpos($haystack, $needle, $offset=0){
+        $comp = 0;
+        $length = null;
+
+        while (is_null($length) || $length < $offset) {
+            $pos = strpos($haystack, $needle, $offset + $comp);
+
+            if ($pos === false)
+                return false;
+
+            $length = utf8_strlen(substr($haystack, 0, $pos));
+
+            if ($length < $offset)
+                $comp = $pos - $length;
+        }
+
+        return $length;
+    }
+}
+
+if(!function_exists('utf8_tohtml')){
+    /**
+     * Encodes UTF-8 characters to HTML entities
+     *
+     * @author Tom N Harris 
+     * @author 
+     * @link   http://www.php.net/manual/en/function.utf8-decode.php
+     */
+    function utf8_tohtml ($str) {
+        $ret = '';
+        foreach (utf8_to_unicode($str) as $cp) {
+            if ($cp < 0x80)
+                $ret .= chr($cp);
+            elseif ($cp < 0x100)
+                $ret .= "&#$cp;";
+            else
+                $ret .= '&#x'.dechex($cp).';';
+        }
+        return $ret;
+    }
+}
+
+if(!function_exists('utf8_unhtml')){
+    /**
+     * Decodes HTML entities to UTF-8 characters
+     *
+     * Convert any &#..; entity to a codepoint,
+     * The entities flag defaults to only decoding numeric entities.
+     * Pass HTML_ENTITIES and named entities, including & < etc.
+     * are handled as well. Avoids the problem that would occur if you
+     * had to decode "&#38;&amp;#38;"
+     *
+     * unhtmlspecialchars(utf8_unhtml($s)) -> "&&"
+     * utf8_unhtml(unhtmlspecialchars($s)) -> "&&#38;"
+     * what it should be                   -> "&&#38;"
+     *
+     * @author Tom N Harris 
+     * @param  string  $str      UTF-8 encoded string
+     * @param  boolean $entities Flag controlling decoding of named entities.
+     * @return string  UTF-8 encoded string with numeric (and named) entities replaced.
+     */
+    function utf8_unhtml($str, $entities=null) {
+        static $decoder = null;
+        if (is_null($decoder))
+            $decoder = new utf8_entity_decoder();
+        if (is_null($entities))
+            return preg_replace_callback('/(&#([Xx])?([0-9A-Za-z]+);)/m',
+                                         'utf8_decode_numeric', $str);
+        else
+            return preg_replace_callback('/&(#)?([Xx])?([0-9A-Za-z]+);/m',
+                                         array(&$decoder, 'decode'), $str);
+    }
+}
+
+if(!function_exists('utf8_decode_numeric')){
+    /**
+     * Decodes numeric HTML entities to their correct UTF-8 characters
+     *
+     * @param $ent string A numeric entity
+     * @return string
+     */
+    function utf8_decode_numeric($ent) {
+        switch ($ent[2]) {
+            case 'X':
+            case 'x':
+                $cp = hexdec($ent[3]);
+                break;
+            default:
+                $cp = intval($ent[3]);
+                break;
+        }
+        return unicode_to_utf8(array($cp));
+    }
+}
+
+if(!class_exists('utf8_entity_decoder')){
+    /**
+     * Encapsulate HTML entity decoding tables
+     */
+    class utf8_entity_decoder {
+        var $table;
+
+        /**
+         * Initializes the decoding tables
+         */
+        function __construct() {
+            $table = get_html_translation_table(HTML_ENTITIES);
+            $table = array_flip($table);
+            $this->table = array_map(array(&$this,'makeutf8'), $table);
+        }
+
+        /**
+         * Wrapper aorund unicode_to_utf8()
+         *
+         * @param $c string
+         * @return mixed
+         */
+        function makeutf8($c) {
+            return unicode_to_utf8(array(ord($c)));
+        }
+
+        /**
+         * Decodes any HTML entity to it's correct UTF-8 char equivalent
+         *
+         * @param $ent string An entity
+         * @return string
+         */
+        function decode($ent) {
+            if ($ent[1] == '#') {
+                return utf8_decode_numeric($ent);
+            } elseif (array_key_exists($ent[0],$this->table)) {
+                return $this->table[$ent[0]];
+            } else {
+                return $ent[0];
+            }
+        }
+    }
+}
+
+if(!function_exists('utf8_to_unicode')){
+    /**
+     * Takes an UTF-8 string and returns an array of ints representing the
+     * Unicode characters. Astral planes are supported ie. the ints in the
+     * output can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
+     * are not allowed.
+     *
+     * If $strict is set to true the function returns false if the input
+     * string isn't a valid UTF-8 octet sequence and raises a PHP error at
+     * level E_USER_WARNING
+     *
+     * Note: this function has been modified slightly in this library to
+     * trigger errors on encountering bad bytes
+     *
+     * @author 
+     * @author Harry Fuecks 
+     * @param  string  $str UTF-8 encoded string
+     * @param  boolean $strict Check for invalid sequences?
+     * @return mixed array of unicode code points or false if UTF-8 invalid
+     * @see    unicode_to_utf8
+     * @link   http://hsivonen.iki.fi/php-utf8/
+     * @link   http://sourceforge.net/projects/phputf8/
+     */
+    function utf8_to_unicode($str,$strict=false) {
+        $mState = 0;     // cached expected number of octets after the current octet
+                         // until the beginning of the next UTF8 character sequence
+        $mUcs4  = 0;     // cached Unicode character
+        $mBytes = 1;     // cached expected number of octets in the current sequence
+
+        $out = array();
+
+        $len = strlen($str);
+
+        for($i = 0; $i < $len; $i++) {
+
+            $in = ord($str{$i});
+
+            if ( $mState == 0) {
+
+                // When mState is zero we expect either a US-ASCII character or a
+                // multi-octet sequence.
+                if (0 == (0x80 & ($in))) {
+                    // US-ASCII, pass straight through.
+                    $out[] = $in;
+                    $mBytes = 1;
+
+                } else if (0xC0 == (0xE0 & ($in))) {
+                    // First octet of 2 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x1F) << 6;
+                    $mState = 1;
+                    $mBytes = 2;
+
+                } else if (0xE0 == (0xF0 & ($in))) {
+                    // First octet of 3 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x0F) << 12;
+                    $mState = 2;
+                    $mBytes = 3;
+
+                } else if (0xF0 == (0xF8 & ($in))) {
+                    // First octet of 4 octet sequence
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x07) << 18;
+                    $mState = 3;
+                    $mBytes = 4;
+
+                } else if (0xF8 == (0xFC & ($in))) {
+                    /* First octet of 5 octet sequence.
+                     *
+                     * This is illegal because the encoded codepoint must be either
+                     * (a) not the shortest form or
+                     * (b) outside the Unicode range of 0-0x10FFFF.
+                     * Rather than trying to resynchronize, we will carry on until the end
+                     * of the sequence and let the later error handling code catch it.
+                     */
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 0x03) << 24;
+                    $mState = 4;
+                    $mBytes = 5;
+
+                } else if (0xFC == (0xFE & ($in))) {
+                    // First octet of 6 octet sequence, see comments for 5 octet sequence.
+                    $mUcs4 = ($in);
+                    $mUcs4 = ($mUcs4 & 1) << 30;
+                    $mState = 5;
+                    $mBytes = 6;
+
+                } elseif($strict) {
+                    /* Current octet is neither in the US-ASCII range nor a legal first
+                     * octet of a multi-octet sequence.
+                     */
+                    trigger_error(
+                            'utf8_to_unicode: Illegal sequence identifier '.
+                                'in UTF-8 at byte '.$i,
+                            E_USER_WARNING
+                        );
+                    return false;
+
+                }
+
+            } else {
+
+                // When mState is non-zero, we expect a continuation of the multi-octet
+                // sequence
+                if (0x80 == (0xC0 & ($in))) {
+
+                    // Legal continuation.
+                    $shift = ($mState - 1) * 6;
+                    $tmp = $in;
+                    $tmp = ($tmp & 0x0000003F) << $shift;
+                    $mUcs4 |= $tmp;
+
+                    /**
+                     * End of the multi-octet sequence. mUcs4 now contains the final
+                     * Unicode codepoint to be output
+                     */
+                    if (0 == --$mState) {
+
+                        /*
+                         * Check for illegal sequences and codepoints.
+                         */
+                        // From Unicode 3.1, non-shortest form is illegal
+                        if (((2 == $mBytes) && ($mUcs4 < 0x0080)) ||
+                            ((3 == $mBytes) && ($mUcs4 < 0x0800)) ||
+                            ((4 == $mBytes) && ($mUcs4 < 0x10000)) ||
+                            (4 < $mBytes) ||
+                            // From Unicode 3.2, surrogate characters are illegal
+                            (($mUcs4 & 0xFFFFF800) == 0xD800) ||
+                            // Codepoints outside the Unicode range are illegal
+                            ($mUcs4 > 0x10FFFF)) {
+
+                            if($strict){
+                                trigger_error(
+                                        'utf8_to_unicode: Illegal sequence or codepoint '.
+                                            'in UTF-8 at byte '.$i,
+                                        E_USER_WARNING
+                                    );
+
+                                return false;
+                            }
+
+                        }
+
+                        if (0xFEFF != $mUcs4) {
+                            // BOM is legal but we don't want to output it
+                            $out[] = $mUcs4;
+                        }
+
+                        //initialize UTF8 cache
+                        $mState = 0;
+                        $mUcs4  = 0;
+                        $mBytes = 1;
+                    }
+
+                } elseif($strict) {
+                    /**
+                     *((0xC0 & (*in) != 0x80) && (mState != 0))
+                     * Incomplete multi-octet sequence.
+                     */
+                    trigger_error(
+                            'utf8_to_unicode: Incomplete multi-octet '.
+                            '   sequence in UTF-8 at byte '.$i,
+                            E_USER_WARNING
+                        );
+
+                    return false;
+                }
+            }
+        }
+        return $out;
+    }
+}
+
+if(!function_exists('unicode_to_utf8')){
+    /**
+     * Takes an array of ints representing the Unicode characters and returns
+     * a UTF-8 string. Astral planes are supported ie. the ints in the
+     * input can be > 0xFFFF. Occurrances of the BOM are ignored. Surrogates
+     * are not allowed.
+     *
+     * If $strict is set to true the function returns false if the input
+     * array contains ints that represent surrogates or are outside the
+     * Unicode range and raises a PHP error at level E_USER_WARNING
+     *
+     * Note: this function has been modified slightly in this library to use
+     * output buffering to concatenate the UTF-8 string (faster) as well as
+     * reference the array by it's keys
+     *
+     * @param  array $arr of unicode code points representing a string
+     * @param  boolean $strict Check for invalid sequences?
+     * @return mixed UTF-8 string or false if array contains invalid code points
+     * @author 
+     * @author Harry Fuecks 
+     * @see    utf8_to_unicode
+     * @link   http://hsivonen.iki.fi/php-utf8/
+     * @link   http://sourceforge.net/projects/phputf8/
+     */
+    function unicode_to_utf8($arr,$strict=false) {
+        if (!is_array($arr)) return '';
+        ob_start();
+
+        foreach (array_keys($arr) as $k) {
+
+            if ( ($arr[$k] >= 0) && ($arr[$k] <= 0x007f) ) {
+                # ASCII range (including control chars)
+
+                echo chr($arr[$k]);
+
+            } else if ($arr[$k] <= 0x07ff) {
+                # 2 byte sequence
+
+                echo chr(0xc0 | ($arr[$k] >> 6));
+                echo chr(0x80 | ($arr[$k] & 0x003f));
+
+            } else if($arr[$k] == 0xFEFF) {
+                # Byte order mark (skip)
+
+                // nop -- zap the BOM
+
+            } else if ($arr[$k] >= 0xD800 && $arr[$k] <= 0xDFFF) {
+                # Test for illegal surrogates
+
+                // found a surrogate
+                if($strict){
+                    trigger_error(
+                        'unicode_to_utf8: Illegal surrogate '.
+                            'at index: '.$k.', value: '.$arr[$k],
+                        E_USER_WARNING
+                        );
+                    return false;
+                }
+
+            } else if ($arr[$k] <= 0xffff) {
+                # 3 byte sequence
+
+                echo chr(0xe0 | ($arr[$k] >> 12));
+                echo chr(0x80 | (($arr[$k] >> 6) & 0x003f));
+                echo chr(0x80 | ($arr[$k] & 0x003f));
+
+            } else if ($arr[$k] <= 0x10ffff) {
+                # 4 byte sequence
+
+                echo chr(0xf0 | ($arr[$k] >> 18));
+                echo chr(0x80 | (($arr[$k] >> 12) & 0x3f));
+                echo chr(0x80 | (($arr[$k] >> 6) & 0x3f));
+                echo chr(0x80 | ($arr[$k] & 0x3f));
+
+            } elseif($strict) {
+
+                trigger_error(
+                    'unicode_to_utf8: Codepoint out of Unicode range '.
+                        'at index: '.$k.', value: '.$arr[$k],
+                    E_USER_WARNING
+                    );
+
+                // out of range
+                return false;
+            }
+        }
+
+        $result = ob_get_contents();
+        ob_end_clean();
+        return $result;
+    }
+}
+
+if(!function_exists('utf8_to_utf16be')){
+    /**
+     * UTF-8 to UTF-16BE conversion.
+     *
+     * Maybe really UCS-2 without mb_string due to utf8_to_unicode limits
+     */
+    function utf8_to_utf16be(&$str, $bom = false) {
+        $out = $bom ? "\xFE\xFF" : '';
+        if(UTF8_MBSTRING) return $out.mb_convert_encoding($str,'UTF-16BE','UTF-8');
+
+        $uni = utf8_to_unicode($str);
+        foreach($uni as $cp){
+            $out .= pack('n',$cp);
+        }
+        return $out;
+    }
+}
+
+if(!function_exists('utf16be_to_utf8')){
+    /**
+     * UTF-8 to UTF-16BE conversion.
+     *
+     * Maybe really UCS-2 without mb_string due to utf8_to_unicode limits
+     */
+    function utf16be_to_utf8(&$str) {
+        $uni = unpack('n*',$str);
+        return unicode_to_utf8($uni);
+    }
+}
+
+if(!function_exists('utf8_bad_replace')){
+    /**
+     * Replace bad bytes with an alternative character
+     *
+     * ASCII character is recommended for replacement char
+     *
+     * PCRE Pattern to locate bad bytes in a UTF-8 string
+     * Comes from W3 FAQ: Multilingual Forms
+     * Note: modified to include full ASCII range including control chars
+     *
+     * @author Harry Fuecks 
+     * @see http://www.w3.org/International/questions/qa-forms-utf-8
+     * @param string $str to search
+     * @param string $replace to replace bad bytes with (defaults to '?') - use ASCII
+     * @return string
+     */
+    function utf8_bad_replace($str, $replace = '') {
+        $UTF8_BAD =
+         '([\x00-\x7F]'.                          # ASCII (including control chars)
+         '|[\xC2-\xDF][\x80-\xBF]'.               # non-overlong 2-byte
+         '|\xE0[\xA0-\xBF][\x80-\xBF]'.           # excluding overlongs
+         '|[\xE1-\xEC\xEE\xEF][\x80-\xBF]{2}'.    # straight 3-byte
+         '|\xED[\x80-\x9F][\x80-\xBF]'.           # excluding surrogates
+         '|\xF0[\x90-\xBF][\x80-\xBF]{2}'.        # planes 1-3
+         '|[\xF1-\xF3][\x80-\xBF]{3}'.            # planes 4-15
+         '|\xF4[\x80-\x8F][\x80-\xBF]{2}'.        # plane 16
+         '|(.{1}))';                              # invalid byte
+        ob_start();
+        while (preg_match('/'.$UTF8_BAD.'/S', $str, $matches)) {
+            if ( !isset($matches[2])) {
+                echo $matches[0];
+            } else {
+                echo $replace;
+            }
+            $str = substr($str,strlen($matches[0]));
+        }
+        $result = ob_get_contents();
+        ob_end_clean();
+        return $result;
+    }
+}
+
+if(!function_exists('utf8_correctIdx')){
+    /**
+     * adjust a byte index into a utf8 string to a utf8 character boundary
+     *
+     * @param $str   string   utf8 character string
+     * @param $i     int      byte index into $str
+     * @param $next  bool     direction to search for boundary,
+     *                           false = up (current character)
+     *                           true = down (next character)
+     *
+     * @return int            byte index into $str now pointing to a utf8 character boundary
+     *
+     * @author       chris smith 
+     */
+    function utf8_correctIdx(&$str,$i,$next=false) {
+
+        if ($i <= 0) return 0;
+
+        $limit = strlen($str);
+        if ($i>=$limit) return $limit;
+
+        if ($next) {
+            while (($i<$limit) && ((ord($str[$i]) & 0xC0) == 0x80)) $i++;
+        } else {
+            while ($i && ((ord($str[$i]) & 0xC0) == 0x80)) $i--;
+        }
+
+        return $i;
+    }
+}
+
+// only needed if no mb_string available
+if(!UTF8_MBSTRING){
+    /**
+     * UTF-8 Case lookup table
+     *
+     * This lookuptable defines the upper case letters to their correspponding
+     * lower case letter in UTF-8
+     *
+     * @author Andreas Gohr 
+     */
+    global $UTF8_LOWER_TO_UPPER;
+    if(empty($UTF8_LOWER_TO_UPPER)) $UTF8_LOWER_TO_UPPER = array(
+            "ｚ"=>"Ｚ","ｙ"=>"Ｙ","ｘ"=>"Ｘ","ｗ"=>"Ｗ","ｖ"=>"Ｖ","ｕ"=>"Ｕ","ｔ"=>"Ｔ","ｓ"=>"Ｓ","ｒ"=>"Ｒ","ｑ"=>"Ｑ",
+            "ｐ"=>"Ｐ","ｏ"=>"Ｏ","ｎ"=>"Ｎ","ｍ"=>"Ｍ","ｌ"=>"Ｌ","ｋ"=>"Ｋ","ｊ"=>"Ｊ","ｉ"=>"Ｉ","ｈ"=>"Ｈ","ｇ"=>"Ｇ",
+            "ｆ"=>"Ｆ","ｅ"=>"Ｅ","ｄ"=>"Ｄ","ｃ"=>"Ｃ","ｂ"=>"Ｂ","ａ"=>"Ａ","ῳ"=>"ῼ","ῥ"=>"Ῥ","ῡ"=>"Ῡ","ῑ"=>"Ῑ",
+            "ῐ"=>"Ῐ","ῃ"=>"ῌ","ι"=>"Ι","ᾳ"=>"ᾼ","ᾱ"=>"Ᾱ","ᾰ"=>"Ᾰ","ᾧ"=>"ᾯ","ᾦ"=>"ᾮ","ᾥ"=>"ᾭ","ᾤ"=>"ᾬ",
+            "ᾣ"=>"ᾫ","ᾢ"=>"ᾪ","ᾡ"=>"ᾩ","ᾗ"=>"ᾟ","ᾖ"=>"ᾞ","ᾕ"=>"ᾝ","ᾔ"=>"ᾜ","ᾓ"=>"ᾛ","ᾒ"=>"ᾚ","ᾑ"=>"ᾙ",
+            "ᾐ"=>"ᾘ","ᾇ"=>"ᾏ","ᾆ"=>"ᾎ","ᾅ"=>"ᾍ","ᾄ"=>"ᾌ","ᾃ"=>"ᾋ","ᾂ"=>"ᾊ","ᾁ"=>"ᾉ","ᾀ"=>"ᾈ","ώ"=>"Ώ",
+            "ὼ"=>"Ὼ","ύ"=>"Ύ","ὺ"=>"Ὺ","ό"=>"Ό","ὸ"=>"Ὸ","ί"=>"Ί","ὶ"=>"Ὶ","ή"=>"Ή","ὴ"=>"Ὴ","έ"=>"Έ",
+            "ὲ"=>"Ὲ","ά"=>"Ά","ὰ"=>"Ὰ","ὧ"=>"Ὧ","ὦ"=>"Ὦ","ὥ"=>"Ὥ","ὤ"=>"Ὤ","ὣ"=>"Ὣ","ὢ"=>"Ὢ","ὡ"=>"Ὡ",
+            "ὗ"=>"Ὗ","ὕ"=>"Ὕ","ὓ"=>"Ὓ","ὑ"=>"Ὑ","ὅ"=>"Ὅ","ὄ"=>"Ὄ","ὃ"=>"Ὃ","ὂ"=>"Ὂ","ὁ"=>"Ὁ","ὀ"=>"Ὀ",
+            "ἷ"=>"Ἷ","ἶ"=>"Ἶ","ἵ"=>"Ἵ","ἴ"=>"Ἴ","ἳ"=>"Ἳ","ἲ"=>"Ἲ","ἱ"=>"Ἱ","ἰ"=>"Ἰ","ἧ"=>"Ἧ","ἦ"=>"Ἦ",
+            "ἥ"=>"Ἥ","ἤ"=>"Ἤ","ἣ"=>"Ἣ","ἢ"=>"Ἢ","ἡ"=>"Ἡ","ἕ"=>"Ἕ","ἔ"=>"Ἔ","ἓ"=>"Ἓ","ἒ"=>"Ἒ","ἑ"=>"Ἑ",
+            "ἐ"=>"Ἐ","ἇ"=>"Ἇ","ἆ"=>"Ἆ","ἅ"=>"Ἅ","ἄ"=>"Ἄ","ἃ"=>"Ἃ","ἂ"=>"Ἂ","ἁ"=>"Ἁ","ἀ"=>"Ἀ","ỹ"=>"Ỹ",
+            "ỷ"=>"Ỷ","ỵ"=>"Ỵ","ỳ"=>"Ỳ","ự"=>"Ự","ữ"=>"Ữ","ử"=>"Ử","ừ"=>"Ừ","ứ"=>"Ứ","ủ"=>"Ủ","ụ"=>"Ụ",
+            "ợ"=>"Ợ","ỡ"=>"Ỡ","ở"=>"Ở","ờ"=>"Ờ","ớ"=>"Ớ","ộ"=>"Ộ","ỗ"=>"Ỗ","ổ"=>"Ổ","ồ"=>"Ồ","ố"=>"Ố",
+            "ỏ"=>"Ỏ","ọ"=>"Ọ","ị"=>"Ị","ỉ"=>"Ỉ","ệ"=>"Ệ","ễ"=>"Ễ","ể"=>"Ể","ề"=>"Ề","ế"=>"Ế","ẽ"=>"Ẽ",
+            "ẻ"=>"Ẻ","ẹ"=>"Ẹ","ặ"=>"Ặ","ẵ"=>"Ẵ","ẳ"=>"Ẳ","ằ"=>"Ằ","ắ"=>"Ắ","ậ"=>"Ậ","ẫ"=>"Ẫ","ẩ"=>"Ẩ",
+            "ầ"=>"Ầ","ấ"=>"Ấ","ả"=>"Ả","ạ"=>"Ạ","ẛ"=>"Ṡ","ẕ"=>"Ẕ","ẓ"=>"Ẓ","ẑ"=>"Ẑ","ẏ"=>"Ẏ","ẍ"=>"Ẍ",
+            "ẋ"=>"Ẋ","ẉ"=>"Ẉ","ẇ"=>"Ẇ","ẅ"=>"Ẅ","ẃ"=>"Ẃ","ẁ"=>"Ẁ","ṿ"=>"Ṿ","ṽ"=>"Ṽ","ṻ"=>"Ṻ","ṹ"=>"Ṹ",
+            "ṷ"=>"Ṷ","ṵ"=>"Ṵ","ṳ"=>"Ṳ","ṱ"=>"Ṱ","ṯ"=>"Ṯ","ṭ"=>"Ṭ","ṫ"=>"Ṫ","ṩ"=>"Ṩ","ṧ"=>"Ṧ","ṥ"=>"Ṥ",
+            "ṣ"=>"Ṣ","ṡ"=>"Ṡ","ṟ"=>"Ṟ","ṝ"=>"Ṝ","ṛ"=>"Ṛ","ṙ"=>"Ṙ","ṗ"=>"Ṗ","ṕ"=>"Ṕ","ṓ"=>"Ṓ","ṑ"=>"Ṑ",
+            "ṏ"=>"Ṏ","ṍ"=>"Ṍ","ṋ"=>"Ṋ","ṉ"=>"Ṉ","ṇ"=>"Ṇ","ṅ"=>"Ṅ","ṃ"=>"Ṃ","ṁ"=>"Ṁ","ḿ"=>"Ḿ","ḽ"=>"Ḽ",
+            "ḻ"=>"Ḻ","ḹ"=>"Ḹ","ḷ"=>"Ḷ","ḵ"=>"Ḵ","ḳ"=>"Ḳ","ḱ"=>"Ḱ","ḯ"=>"Ḯ","ḭ"=>"Ḭ","ḫ"=>"Ḫ","ḩ"=>"Ḩ",
+            "ḧ"=>"Ḧ","ḥ"=>"Ḥ","ḣ"=>"Ḣ","ḡ"=>"Ḡ","ḟ"=>"Ḟ","ḝ"=>"Ḝ","ḛ"=>"Ḛ","ḙ"=>"Ḙ","ḗ"=>"Ḗ","ḕ"=>"Ḕ",
+            "ḓ"=>"Ḓ","ḑ"=>"Ḑ","ḏ"=>"Ḏ","ḍ"=>"Ḍ","ḋ"=>"Ḋ","ḉ"=>"Ḉ","ḇ"=>"Ḇ","ḅ"=>"Ḅ","ḃ"=>"Ḃ","ḁ"=>"Ḁ",
+            "ֆ"=>"Ֆ","օ"=>"Օ","ք"=>"Ք","փ"=>"Փ","ւ"=>"Ւ","ց"=>"Ց","ր"=>"Ր","տ"=>"Տ","վ"=>"Վ","ս"=>"Ս",
+            "ռ"=>"Ռ","ջ"=>"Ջ","պ"=>"Պ","չ"=>"Չ","ո"=>"Ո","շ"=>"Շ","ն"=>"Ն","յ"=>"Յ","մ"=>"Մ","ճ"=>"Ճ",
+            "ղ"=>"Ղ","ձ"=>"Ձ","հ"=>"Հ","կ"=>"Կ","ծ"=>"Ծ","խ"=>"Խ","լ"=>"Լ","ի"=>"Ի","ժ"=>"Ժ","թ"=>"Թ",
+            "ը"=>"Ը","է"=>"Է","զ"=>"Զ","ե"=>"Ե","դ"=>"Դ","գ"=>"Գ","բ"=>"Բ","ա"=>"Ա","ԏ"=>"Ԏ","ԍ"=>"Ԍ",
+            "ԋ"=>"Ԋ","ԉ"=>"Ԉ","ԇ"=>"Ԇ","ԅ"=>"Ԅ","ԃ"=>"Ԃ","ԁ"=>"Ԁ","ӹ"=>"Ӹ","ӵ"=>"Ӵ","ӳ"=>"Ӳ","ӱ"=>"Ӱ",
+            "ӯ"=>"Ӯ","ӭ"=>"Ӭ","ӫ"=>"Ӫ","ө"=>"Ө","ӧ"=>"Ӧ","ӥ"=>"Ӥ","ӣ"=>"Ӣ","ӡ"=>"Ӡ","ӟ"=>"Ӟ","ӝ"=>"Ӝ",
+            "ӛ"=>"Ӛ","ә"=>"Ә","ӗ"=>"Ӗ","ӕ"=>"Ӕ","ӓ"=>"Ӓ","ӑ"=>"Ӑ","ӎ"=>"Ӎ","ӌ"=>"Ӌ","ӊ"=>"Ӊ","ӈ"=>"Ӈ",
+            "ӆ"=>"Ӆ","ӄ"=>"Ӄ","ӂ"=>"Ӂ","ҿ"=>"Ҿ","ҽ"=>"Ҽ","һ"=>"Һ","ҹ"=>"Ҹ","ҷ"=>"Ҷ","ҵ"=>"Ҵ","ҳ"=>"Ҳ",
+            "ұ"=>"Ұ","ү"=>"Ү","ҭ"=>"Ҭ","ҫ"=>"Ҫ","ҩ"=>"Ҩ","ҧ"=>"Ҧ","ҥ"=>"Ҥ","ң"=>"Ң","ҡ"=>"Ҡ","ҟ"=>"Ҟ",
+            "ҝ"=>"Ҝ","қ"=>"Қ","ҙ"=>"Ҙ","җ"=>"Җ","ҕ"=>"Ҕ","ғ"=>"Ғ","ґ"=>"Ґ","ҏ"=>"Ҏ","ҍ"=>"Ҍ","ҋ"=>"Ҋ",
+            "ҁ"=>"Ҁ","ѿ"=>"Ѿ","ѽ"=>"Ѽ","ѻ"=>"Ѻ","ѹ"=>"Ѹ","ѷ"=>"Ѷ","ѵ"=>"Ѵ","ѳ"=>"Ѳ","ѱ"=>"Ѱ","ѯ"=>"Ѯ",
+            "ѭ"=>"Ѭ","ѫ"=>"Ѫ","ѩ"=>"Ѩ","ѧ"=>"Ѧ","ѥ"=>"Ѥ","ѣ"=>"Ѣ","ѡ"=>"Ѡ","џ"=>"Џ","ў"=>"Ў","ѝ"=>"Ѝ",
+            "ќ"=>"Ќ","ћ"=>"Ћ","њ"=>"Њ","љ"=>"Љ","ј"=>"Ј","ї"=>"Ї","і"=>"І","ѕ"=>"Ѕ","є"=>"Є","ѓ"=>"Ѓ",
+            "ђ"=>"Ђ","ё"=>"Ё","ѐ"=>"Ѐ","я"=>"Я","ю"=>"Ю","э"=>"Э","ь"=>"Ь","ы"=>"Ы","ъ"=>"Ъ","щ"=>"Щ",
+            "ш"=>"Ш","ч"=>"Ч","ц"=>"Ц","х"=>"Х","ф"=>"Ф","у"=>"У","т"=>"Т","с"=>"С","р"=>"Р","п"=>"П",
+            "о"=>"О","н"=>"Н","м"=>"М","л"=>"Л","к"=>"К","й"=>"Й","и"=>"И","з"=>"З","ж"=>"Ж","е"=>"Е",
+            "д"=>"Д","г"=>"Г","в"=>"В","б"=>"Б","а"=>"А","ϵ"=>"Ε","ϲ"=>"Σ","ϱ"=>"Ρ","ϰ"=>"Κ","ϯ"=>"Ϯ",
+            "ϭ"=>"Ϭ","ϫ"=>"Ϫ","ϩ"=>"Ϩ","ϧ"=>"Ϧ","ϥ"=>"Ϥ","ϣ"=>"Ϣ","ϡ"=>"Ϡ","ϟ"=>"Ϟ","ϝ"=>"Ϝ","ϛ"=>"Ϛ",
+            "ϙ"=>"Ϙ","ϖ"=>"Π","ϕ"=>"Φ","ϑ"=>"Θ","ϐ"=>"Β","ώ"=>"Ώ","ύ"=>"Ύ","ό"=>"Ό","ϋ"=>"Ϋ","ϊ"=>"Ϊ",
+            "ω"=>"Ω","ψ"=>"Ψ","χ"=>"Χ","φ"=>"Φ","υ"=>"Υ","τ"=>"Τ","σ"=>"Σ","ς"=>"Σ","ρ"=>"Ρ","π"=>"Π",
+            "ο"=>"Ο","ξ"=>"Ξ","ν"=>"Ν","μ"=>"Μ","λ"=>"Λ","κ"=>"Κ","ι"=>"Ι","θ"=>"Θ","η"=>"Η","ζ"=>"Ζ",
+            "ε"=>"Ε","δ"=>"Δ","γ"=>"Γ","β"=>"Β","α"=>"Α","ί"=>"Ί","ή"=>"Ή","έ"=>"Έ","ά"=>"Ά","ʒ"=>"Ʒ",
+            "ʋ"=>"Ʋ","ʊ"=>"Ʊ","ʈ"=>"Ʈ","ʃ"=>"Ʃ","ʀ"=>"Ʀ","ɵ"=>"Ɵ","ɲ"=>"Ɲ","ɯ"=>"Ɯ","ɩ"=>"Ɩ","ɨ"=>"Ɨ",
+            "ɣ"=>"Ɣ","ɛ"=>"Ɛ","ə"=>"Ə","ɗ"=>"Ɗ","ɖ"=>"Ɖ","ɔ"=>"Ɔ","ɓ"=>"Ɓ","ȳ"=>"Ȳ","ȱ"=>"Ȱ","ȯ"=>"Ȯ",
+            "ȭ"=>"Ȭ","ȫ"=>"Ȫ","ȩ"=>"Ȩ","ȧ"=>"Ȧ","ȥ"=>"Ȥ","ȣ"=>"Ȣ","ȟ"=>"Ȟ","ȝ"=>"Ȝ","ț"=>"Ț","ș"=>"Ș",
+            "ȗ"=>"Ȗ","ȕ"=>"Ȕ","ȓ"=>"Ȓ","ȑ"=>"Ȑ","ȏ"=>"Ȏ","ȍ"=>"Ȍ","ȋ"=>"Ȋ","ȉ"=>"Ȉ","ȇ"=>"Ȇ","ȅ"=>"Ȅ",
+            "ȃ"=>"Ȃ","ȁ"=>"Ȁ","ǿ"=>"Ǿ","ǽ"=>"Ǽ","ǻ"=>"Ǻ","ǹ"=>"Ǹ","ǵ"=>"Ǵ","dz"=>"Dz","ǯ"=>"Ǯ","ǭ"=>"Ǭ",
+            "ǫ"=>"Ǫ","ǩ"=>"Ǩ","ǧ"=>"Ǧ","ǥ"=>"Ǥ","ǣ"=>"Ǣ","ǡ"=>"Ǡ","ǟ"=>"Ǟ","ǝ"=>"Ǝ","ǜ"=>"Ǜ","ǚ"=>"Ǚ",
+            "ǘ"=>"Ǘ","ǖ"=>"Ǖ","ǔ"=>"Ǔ","ǒ"=>"Ǒ","ǐ"=>"Ǐ","ǎ"=>"Ǎ","nj"=>"Nj","lj"=>"Lj","dž"=>"Dž","ƿ"=>"Ƿ",
+            "ƽ"=>"Ƽ","ƹ"=>"Ƹ","ƶ"=>"Ƶ","ƴ"=>"Ƴ","ư"=>"Ư","ƭ"=>"Ƭ","ƨ"=>"Ƨ","ƥ"=>"Ƥ","ƣ"=>"Ƣ","ơ"=>"Ơ",
+            "ƞ"=>"Ƞ","ƙ"=>"Ƙ","ƕ"=>"Ƕ","ƒ"=>"Ƒ","ƌ"=>"Ƌ","ƈ"=>"Ƈ","ƅ"=>"Ƅ","ƃ"=>"Ƃ","ſ"=>"S","ž"=>"Ž",
+            "ż"=>"Ż","ź"=>"Ź","ŷ"=>"Ŷ","ŵ"=>"Ŵ","ų"=>"Ų","ű"=>"Ű","ů"=>"Ů","ŭ"=>"Ŭ","ū"=>"Ū","ũ"=>"Ũ",
+            "ŧ"=>"Ŧ","ť"=>"Ť","ţ"=>"Ţ","š"=>"Š","ş"=>"Ş","ŝ"=>"Ŝ","ś"=>"Ś","ř"=>"Ř","ŗ"=>"Ŗ","ŕ"=>"Ŕ",
+            "œ"=>"Œ","ő"=>"Ő","ŏ"=>"Ŏ","ō"=>"Ō","ŋ"=>"Ŋ","ň"=>"Ň","ņ"=>"Ņ","ń"=>"Ń","ł"=>"Ł","ŀ"=>"Ŀ",
+            "ľ"=>"Ľ","ļ"=>"Ļ","ĺ"=>"Ĺ","ķ"=>"Ķ","ĵ"=>"Ĵ","ij"=>"IJ","ı"=>"I","į"=>"Į","ĭ"=>"Ĭ","ī"=>"Ī",
+            "ĩ"=>"Ĩ","ħ"=>"Ħ","ĥ"=>"Ĥ","ģ"=>"Ģ","ġ"=>"Ġ","ğ"=>"Ğ","ĝ"=>"Ĝ","ě"=>"Ě","ę"=>"Ę","ė"=>"Ė",
+            "ĕ"=>"Ĕ","ē"=>"Ē","đ"=>"Đ","ď"=>"Ď","č"=>"Č","ċ"=>"Ċ","ĉ"=>"Ĉ","ć"=>"Ć","ą"=>"Ą","ă"=>"Ă",
+            "ā"=>"Ā","ÿ"=>"Ÿ","þ"=>"Þ","ý"=>"Ý","ü"=>"Ü","û"=>"Û","ú"=>"Ú","ù"=>"Ù","ø"=>"Ø","ö"=>"Ö",
+            "õ"=>"Õ","ô"=>"Ô","ó"=>"Ó","ò"=>"Ò","ñ"=>"Ñ","ð"=>"Ð","ï"=>"Ï","î"=>"Î","í"=>"Í","ì"=>"Ì",
+            "ë"=>"Ë","ê"=>"Ê","é"=>"É","è"=>"È","ç"=>"Ç","æ"=>"Æ","å"=>"Å","ä"=>"Ä","ã"=>"Ã","â"=>"Â",
+            "á"=>"Á","à"=>"À","µ"=>"Μ","z"=>"Z","y"=>"Y","x"=>"X","w"=>"W","v"=>"V","u"=>"U","t"=>"T",
+            "s"=>"S","r"=>"R","q"=>"Q","p"=>"P","o"=>"O","n"=>"N","m"=>"M","l"=>"L","k"=>"K","j"=>"J",
+            "i"=>"I","h"=>"H","g"=>"G","f"=>"F","e"=>"E","d"=>"D","c"=>"C","b"=>"B","a"=>"A"
+                );
+
+    /**
+     * UTF-8 Case lookup table
+     *
+     * This lookuptable defines the lower case letters to their corresponding
+     * upper case letter in UTF-8
+     *
+     * @author Andreas Gohr 
+     */
+    global $UTF8_UPPER_TO_LOWER;
+    if(empty($UTF8_UPPER_TO_LOWER)) $UTF8_UPPER_TO_LOWER = array (
+            "Ｚ"=>"ｚ","Ｙ"=>"ｙ","Ｘ"=>"ｘ","Ｗ"=>"ｗ","Ｖ"=>"ｖ","Ｕ"=>"ｕ","Ｔ"=>"ｔ","Ｓ"=>"ｓ","Ｒ"=>"ｒ","Ｑ"=>"ｑ",
+            "Ｐ"=>"ｐ","Ｏ"=>"ｏ","Ｎ"=>"ｎ","Ｍ"=>"ｍ","Ｌ"=>"ｌ","Ｋ"=>"ｋ","Ｊ"=>"ｊ","Ｉ"=>"ｉ","Ｈ"=>"ｈ","Ｇ"=>"ｇ",
+            "Ｆ"=>"ｆ","Ｅ"=>"ｅ","Ｄ"=>"ｄ","Ｃ"=>"ｃ","Ｂ"=>"ｂ","Ａ"=>"ａ","ῼ"=>"ῳ","Ῥ"=>"ῥ","Ῡ"=>"ῡ","Ῑ"=>"ῑ",
+            "Ῐ"=>"ῐ","ῌ"=>"ῃ","Ι"=>"ι","ᾼ"=>"ᾳ","Ᾱ"=>"ᾱ","Ᾰ"=>"ᾰ","ᾯ"=>"ᾧ","ᾮ"=>"ᾦ","ᾭ"=>"ᾥ","ᾬ"=>"ᾤ",
+            "ᾫ"=>"ᾣ","ᾪ"=>"ᾢ","ᾩ"=>"ᾡ","ᾟ"=>"ᾗ","ᾞ"=>"ᾖ","ᾝ"=>"ᾕ","ᾜ"=>"ᾔ","ᾛ"=>"ᾓ","ᾚ"=>"ᾒ","ᾙ"=>"ᾑ",
+            "ᾘ"=>"ᾐ","ᾏ"=>"ᾇ","ᾎ"=>"ᾆ","ᾍ"=>"ᾅ","ᾌ"=>"ᾄ","ᾋ"=>"ᾃ","ᾊ"=>"ᾂ","ᾉ"=>"ᾁ","ᾈ"=>"ᾀ","Ώ"=>"ώ",
+            "Ὼ"=>"ὼ","Ύ"=>"ύ","Ὺ"=>"ὺ","Ό"=>"ό","Ὸ"=>"ὸ","Ί"=>"ί","Ὶ"=>"ὶ","Ή"=>"ή","Ὴ"=>"ὴ","Έ"=>"έ",
+            "Ὲ"=>"ὲ","Ά"=>"ά","Ὰ"=>"ὰ","Ὧ"=>"ὧ","Ὦ"=>"ὦ","Ὥ"=>"ὥ","Ὤ"=>"ὤ","Ὣ"=>"ὣ","Ὢ"=>"ὢ","Ὡ"=>"ὡ",
+            "Ὗ"=>"ὗ","Ὕ"=>"ὕ","Ὓ"=>"ὓ","Ὑ"=>"ὑ","Ὅ"=>"ὅ","Ὄ"=>"ὄ","Ὃ"=>"ὃ","Ὂ"=>"ὂ","Ὁ"=>"ὁ","Ὀ"=>"ὀ",
+            "Ἷ"=>"ἷ","Ἶ"=>"ἶ","Ἵ"=>"ἵ","Ἴ"=>"ἴ","Ἳ"=>"ἳ","Ἲ"=>"ἲ","Ἱ"=>"ἱ","Ἰ"=>"ἰ","Ἧ"=>"ἧ","Ἦ"=>"ἦ",
+            "Ἥ"=>"ἥ","Ἤ"=>"ἤ","Ἣ"=>"ἣ","Ἢ"=>"ἢ","Ἡ"=>"ἡ","Ἕ"=>"ἕ","Ἔ"=>"ἔ","Ἓ"=>"ἓ","Ἒ"=>"ἒ","Ἑ"=>"ἑ",
+            "Ἐ"=>"ἐ","Ἇ"=>"ἇ","Ἆ"=>"ἆ","Ἅ"=>"ἅ","Ἄ"=>"ἄ","Ἃ"=>"ἃ","Ἂ"=>"ἂ","Ἁ"=>"ἁ","Ἀ"=>"ἀ","Ỹ"=>"ỹ",
+            "Ỷ"=>"ỷ","Ỵ"=>"ỵ","Ỳ"=>"ỳ","Ự"=>"ự","Ữ"=>"ữ","Ử"=>"ử","Ừ"=>"ừ","Ứ"=>"ứ","Ủ"=>"ủ","Ụ"=>"ụ",
+            "Ợ"=>"ợ","Ỡ"=>"ỡ","Ở"=>"ở","Ờ"=>"ờ","Ớ"=>"ớ","Ộ"=>"ộ","Ỗ"=>"ỗ","Ổ"=>"ổ","Ồ"=>"ồ","Ố"=>"ố",
+            "Ỏ"=>"ỏ","Ọ"=>"ọ","Ị"=>"ị","Ỉ"=>"ỉ","Ệ"=>"ệ","Ễ"=>"ễ","Ể"=>"ể","Ề"=>"ề","Ế"=>"ế","Ẽ"=>"ẽ",
+            "Ẻ"=>"ẻ","Ẹ"=>"ẹ","Ặ"=>"ặ","Ẵ"=>"ẵ","Ẳ"=>"ẳ","Ằ"=>"ằ","Ắ"=>"ắ","Ậ"=>"ậ","Ẫ"=>"ẫ","Ẩ"=>"ẩ",
+            "Ầ"=>"ầ","Ấ"=>"ấ","Ả"=>"ả","Ạ"=>"ạ","Ṡ"=>"ẛ","Ẕ"=>"ẕ","Ẓ"=>"ẓ","Ẑ"=>"ẑ","Ẏ"=>"ẏ","Ẍ"=>"ẍ",
+            "Ẋ"=>"ẋ","Ẉ"=>"ẉ","Ẇ"=>"ẇ","Ẅ"=>"ẅ","Ẃ"=>"ẃ","Ẁ"=>"ẁ","Ṿ"=>"ṿ","Ṽ"=>"ṽ","Ṻ"=>"ṻ","Ṹ"=>"ṹ",
+            "Ṷ"=>"ṷ","Ṵ"=>"ṵ","Ṳ"=>"ṳ","Ṱ"=>"ṱ","Ṯ"=>"ṯ","Ṭ"=>"ṭ","Ṫ"=>"ṫ","Ṩ"=>"ṩ","Ṧ"=>"ṧ","Ṥ"=>"ṥ",
+            "Ṣ"=>"ṣ","Ṡ"=>"ṡ","Ṟ"=>"ṟ","Ṝ"=>"ṝ","Ṛ"=>"ṛ","Ṙ"=>"ṙ","Ṗ"=>"ṗ","Ṕ"=>"ṕ","Ṓ"=>"ṓ","Ṑ"=>"ṑ",
+            "Ṏ"=>"ṏ","Ṍ"=>"ṍ","Ṋ"=>"ṋ","Ṉ"=>"ṉ","Ṇ"=>"ṇ","Ṅ"=>"ṅ","Ṃ"=>"ṃ","Ṁ"=>"ṁ","Ḿ"=>"ḿ","Ḽ"=>"ḽ",
+            "Ḻ"=>"ḻ","Ḹ"=>"ḹ","Ḷ"=>"ḷ","Ḵ"=>"ḵ","Ḳ"=>"ḳ","Ḱ"=>"ḱ","Ḯ"=>"ḯ","Ḭ"=>"ḭ","Ḫ"=>"ḫ","Ḩ"=>"ḩ",
+            "Ḧ"=>"ḧ","Ḥ"=>"ḥ","Ḣ"=>"ḣ","Ḡ"=>"ḡ","Ḟ"=>"ḟ","Ḝ"=>"ḝ","Ḛ"=>"ḛ","Ḙ"=>"ḙ","Ḗ"=>"ḗ","Ḕ"=>"ḕ",
+            "Ḓ"=>"ḓ","Ḑ"=>"ḑ","Ḏ"=>"ḏ","Ḍ"=>"ḍ","Ḋ"=>"ḋ","Ḉ"=>"ḉ","Ḇ"=>"ḇ","Ḅ"=>"ḅ","Ḃ"=>"ḃ","Ḁ"=>"ḁ",
+            "Ֆ"=>"ֆ","Օ"=>"օ","Ք"=>"ք","Փ"=>"փ","Ւ"=>"ւ","Ց"=>"ց","Ր"=>"ր","Տ"=>"տ","Վ"=>"վ","Ս"=>"ս",
+            "Ռ"=>"ռ","Ջ"=>"ջ","Պ"=>"պ","Չ"=>"չ","Ո"=>"ո","Շ"=>"շ","Ն"=>"ն","Յ"=>"յ","Մ"=>"մ","Ճ"=>"ճ",
+            "Ղ"=>"ղ","Ձ"=>"ձ","Հ"=>"հ","Կ"=>"կ","Ծ"=>"ծ","Խ"=>"խ","Լ"=>"լ","Ի"=>"ի","Ժ"=>"ժ","Թ"=>"թ",
+            "Ը"=>"ը","Է"=>"է","Զ"=>"զ","Ե"=>"ե","Դ"=>"դ","Գ"=>"գ","Բ"=>"բ","Ա"=>"ա","Ԏ"=>"ԏ","Ԍ"=>"ԍ",
+            "Ԋ"=>"ԋ","Ԉ"=>"ԉ","Ԇ"=>"ԇ","Ԅ"=>"ԅ","Ԃ"=>"ԃ","Ԁ"=>"ԁ","Ӹ"=>"ӹ","Ӵ"=>"ӵ","Ӳ"=>"ӳ","Ӱ"=>"ӱ",
+            "Ӯ"=>"ӯ","Ӭ"=>"ӭ","Ӫ"=>"ӫ","Ө"=>"ө","Ӧ"=>"ӧ","Ӥ"=>"ӥ","Ӣ"=>"ӣ","Ӡ"=>"ӡ","Ӟ"=>"ӟ","Ӝ"=>"ӝ",
+            "Ӛ"=>"ӛ","Ә"=>"ә","Ӗ"=>"ӗ","Ӕ"=>"ӕ","Ӓ"=>"ӓ","Ӑ"=>"ӑ","Ӎ"=>"ӎ","Ӌ"=>"ӌ","Ӊ"=>"ӊ","Ӈ"=>"ӈ",
+            "Ӆ"=>"ӆ","Ӄ"=>"ӄ","Ӂ"=>"ӂ","Ҿ"=>"ҿ","Ҽ"=>"ҽ","Һ"=>"һ","Ҹ"=>"ҹ","Ҷ"=>"ҷ","Ҵ"=>"ҵ","Ҳ"=>"ҳ",
+            "Ұ"=>"ұ","Ү"=>"ү","Ҭ"=>"ҭ","Ҫ"=>"ҫ","Ҩ"=>"ҩ","Ҧ"=>"ҧ","Ҥ"=>"ҥ","Ң"=>"ң","Ҡ"=>"ҡ","Ҟ"=>"ҟ",
+            "Ҝ"=>"ҝ","Қ"=>"қ","Ҙ"=>"ҙ","Җ"=>"җ","Ҕ"=>"ҕ","Ғ"=>"ғ","Ґ"=>"ґ","Ҏ"=>"ҏ","Ҍ"=>"ҍ","Ҋ"=>"ҋ",
+            "Ҁ"=>"ҁ","Ѿ"=>"ѿ","Ѽ"=>"ѽ","Ѻ"=>"ѻ","Ѹ"=>"ѹ","Ѷ"=>"ѷ","Ѵ"=>"ѵ","Ѳ"=>"ѳ","Ѱ"=>"ѱ","Ѯ"=>"ѯ",
+            "Ѭ"=>"ѭ","Ѫ"=>"ѫ","Ѩ"=>"ѩ","Ѧ"=>"ѧ","Ѥ"=>"ѥ","Ѣ"=>"ѣ","Ѡ"=>"ѡ","Џ"=>"џ","Ў"=>"ў","Ѝ"=>"ѝ",
+            "Ќ"=>"ќ","Ћ"=>"ћ","Њ"=>"њ","Љ"=>"љ","Ј"=>"ј","Ї"=>"ї","І"=>"і","Ѕ"=>"ѕ","Є"=>"є","Ѓ"=>"ѓ",
+            "Ђ"=>"ђ","Ё"=>"ё","Ѐ"=>"ѐ","Я"=>"я","Ю"=>"ю","Э"=>"э","Ь"=>"ь","Ы"=>"ы","Ъ"=>"ъ","Щ"=>"щ",
+            "Ш"=>"ш","Ч"=>"ч","Ц"=>"ц","Х"=>"х","Ф"=>"ф","У"=>"у","Т"=>"т","С"=>"с","Р"=>"р","П"=>"п",
+            "О"=>"о","Н"=>"н","М"=>"м","Л"=>"л","К"=>"к","Й"=>"й","И"=>"и","З"=>"з","Ж"=>"ж","Е"=>"е",
+            "Д"=>"д","Г"=>"г","В"=>"в","Б"=>"б","А"=>"а","Ε"=>"ϵ","Σ"=>"ϲ","Ρ"=>"ϱ","Κ"=>"ϰ","Ϯ"=>"ϯ",
+            "Ϭ"=>"ϭ","Ϫ"=>"ϫ","Ϩ"=>"ϩ","Ϧ"=>"ϧ","Ϥ"=>"ϥ","Ϣ"=>"ϣ","Ϡ"=>"ϡ","Ϟ"=>"ϟ","Ϝ"=>"ϝ","Ϛ"=>"ϛ",
+            "Ϙ"=>"ϙ","Π"=>"ϖ","Φ"=>"ϕ","Θ"=>"ϑ","Β"=>"ϐ","Ώ"=>"ώ","Ύ"=>"ύ","Ό"=>"ό","Ϋ"=>"ϋ","Ϊ"=>"ϊ",
+            "Ω"=>"ω","Ψ"=>"ψ","Χ"=>"χ","Φ"=>"φ","Υ"=>"υ","Τ"=>"τ","Σ"=>"σ","Σ"=>"ς","Ρ"=>"ρ","Π"=>"π",
+            "Ο"=>"ο","Ξ"=>"ξ","Ν"=>"ν","Μ"=>"μ","Λ"=>"λ","Κ"=>"κ","Ι"=>"ι","Θ"=>"θ","Η"=>"η","Ζ"=>"ζ",
+            "Ε"=>"ε","Δ"=>"δ","Γ"=>"γ","Β"=>"β","Α"=>"α","Ί"=>"ί","Ή"=>"ή","Έ"=>"έ","Ά"=>"ά","Ʒ"=>"ʒ",
+            "Ʋ"=>"ʋ","Ʊ"=>"ʊ","Ʈ"=>"ʈ","Ʃ"=>"ʃ","Ʀ"=>"ʀ","Ɵ"=>"ɵ","Ɲ"=>"ɲ","Ɯ"=>"ɯ","Ɩ"=>"ɩ","Ɨ"=>"ɨ",
+            "Ɣ"=>"ɣ","Ɛ"=>"ɛ","Ə"=>"ə","Ɗ"=>"ɗ","Ɖ"=>"ɖ","Ɔ"=>"ɔ","Ɓ"=>"ɓ","Ȳ"=>"ȳ","Ȱ"=>"ȱ","Ȯ"=>"ȯ",
+            "Ȭ"=>"ȭ","Ȫ"=>"ȫ","Ȩ"=>"ȩ","Ȧ"=>"ȧ","Ȥ"=>"ȥ","Ȣ"=>"ȣ","Ȟ"=>"ȟ","Ȝ"=>"ȝ","Ț"=>"ț","Ș"=>"ș",
+            "Ȗ"=>"ȗ","Ȕ"=>"ȕ","Ȓ"=>"ȓ","Ȑ"=>"ȑ","Ȏ"=>"ȏ","Ȍ"=>"ȍ","Ȋ"=>"ȋ","Ȉ"=>"ȉ","Ȇ"=>"ȇ","Ȅ"=>"ȅ",
+            "Ȃ"=>"ȃ","Ȁ"=>"ȁ","Ǿ"=>"ǿ","Ǽ"=>"ǽ","Ǻ"=>"ǻ","Ǹ"=>"ǹ","Ǵ"=>"ǵ","Dz"=>"dz","Ǯ"=>"ǯ","Ǭ"=>"ǭ",
+            "Ǫ"=>"ǫ","Ǩ"=>"ǩ","Ǧ"=>"ǧ","Ǥ"=>"ǥ","Ǣ"=>"ǣ","Ǡ"=>"ǡ","Ǟ"=>"ǟ","Ǝ"=>"ǝ","Ǜ"=>"ǜ","Ǚ"=>"ǚ",
+            "Ǘ"=>"ǘ","Ǖ"=>"ǖ","Ǔ"=>"ǔ","Ǒ"=>"ǒ","Ǐ"=>"ǐ","Ǎ"=>"ǎ","Nj"=>"nj","Lj"=>"lj","Dž"=>"dž","Ƿ"=>"ƿ",
+            "Ƽ"=>"ƽ","Ƹ"=>"ƹ","Ƶ"=>"ƶ","Ƴ"=>"ƴ","Ư"=>"ư","Ƭ"=>"ƭ","Ƨ"=>"ƨ","Ƥ"=>"ƥ","Ƣ"=>"ƣ","Ơ"=>"ơ",
+            "Ƞ"=>"ƞ","Ƙ"=>"ƙ","Ƕ"=>"ƕ","Ƒ"=>"ƒ","Ƌ"=>"ƌ","Ƈ"=>"ƈ","Ƅ"=>"ƅ","Ƃ"=>"ƃ","S"=>"ſ","Ž"=>"ž",
+            "Ż"=>"ż","Ź"=>"ź","Ŷ"=>"ŷ","Ŵ"=>"ŵ","Ų"=>"ų","Ű"=>"ű","Ů"=>"ů","Ŭ"=>"ŭ","Ū"=>"ū","Ũ"=>"ũ",
+            "Ŧ"=>"ŧ","Ť"=>"ť","Ţ"=>"ţ","Š"=>"š","Ş"=>"ş","Ŝ"=>"ŝ","Ś"=>"ś","Ř"=>"ř","Ŗ"=>"ŗ","Ŕ"=>"ŕ",
+            "Œ"=>"œ","Ő"=>"ő","Ŏ"=>"ŏ","Ō"=>"ō","Ŋ"=>"ŋ","Ň"=>"ň","Ņ"=>"ņ","Ń"=>"ń","Ł"=>"ł","Ŀ"=>"ŀ",
+            "Ľ"=>"ľ","Ļ"=>"ļ","Ĺ"=>"ĺ","Ķ"=>"ķ","Ĵ"=>"ĵ","IJ"=>"ij","I"=>"ı","Į"=>"į","Ĭ"=>"ĭ","Ī"=>"ī",
+            "Ĩ"=>"ĩ","Ħ"=>"ħ","Ĥ"=>"ĥ","Ģ"=>"ģ","Ġ"=>"ġ","Ğ"=>"ğ","Ĝ"=>"ĝ","Ě"=>"ě","Ę"=>"ę","Ė"=>"ė",
+            "Ĕ"=>"ĕ","Ē"=>"ē","Đ"=>"đ","Ď"=>"ď","Č"=>"č","Ċ"=>"ċ","Ĉ"=>"ĉ","Ć"=>"ć","Ą"=>"ą","Ă"=>"ă",
+            "Ā"=>"ā","Ÿ"=>"ÿ","Þ"=>"þ","Ý"=>"ý","Ü"=>"ü","Û"=>"û","Ú"=>"ú","Ù"=>"ù","Ø"=>"ø","Ö"=>"ö",
+            "Õ"=>"õ","Ô"=>"ô","Ó"=>"ó","Ò"=>"ò","Ñ"=>"ñ","Ð"=>"ð","Ï"=>"ï","Î"=>"î","Í"=>"í","Ì"=>"ì",
+            "Ë"=>"ë","Ê"=>"ê","É"=>"é","È"=>"è","Ç"=>"ç","Æ"=>"æ","Å"=>"å","Ä"=>"ä","Ã"=>"ã","Â"=>"â",
+            "Á"=>"á","À"=>"à","Μ"=>"µ","Z"=>"z","Y"=>"y","X"=>"x","W"=>"w","V"=>"v","U"=>"u","T"=>"t",
+            "S"=>"s","R"=>"r","Q"=>"q","P"=>"p","O"=>"o","N"=>"n","M"=>"m","L"=>"l","K"=>"k","J"=>"j",
+            "I"=>"i","H"=>"h","G"=>"g","F"=>"f","E"=>"e","D"=>"d","C"=>"c","B"=>"b","A"=>"a"
+                );
+}; // end of case lookup tables
+
+/**
+ * UTF-8 lookup table for lower case accented letters
+ *
+ * This lookuptable defines replacements for accented characters from the ASCII-7
+ * range. This are lower case letters only.
+ *
+ * @author Andreas Gohr 
+ * @see    utf8_deaccent()
+ */
+global $UTF8_LOWER_ACCENTS;
+if(empty($UTF8_LOWER_ACCENTS)) $UTF8_LOWER_ACCENTS = array(
+  'à' => 'a', 'ô' => 'o', 'ď' => 'd', 'ḟ' => 'f', 'ë' => 'e', 'š' => 's', 'ơ' => 'o',
+  'ß' => 'ss', 'ă' => 'a', 'ř' => 'r', 'ț' => 't', 'ň' => 'n', 'ā' => 'a', 'ķ' => 'k',
+  'ŝ' => 's', 'ỳ' => 'y', 'ņ' => 'n', 'ĺ' => 'l', 'ħ' => 'h', 'ṗ' => 'p', 'ó' => 'o',
+  'ú' => 'u', 'ě' => 'e', 'é' => 'e', 'ç' => 'c', 'ẁ' => 'w', 'ċ' => 'c', 'õ' => 'o',
+  'ṡ' => 's', 'ø' => 'o', 'ģ' => 'g', 'ŧ' => 't', 'ș' => 's', 'ė' => 'e', 'ĉ' => 'c',
+  'ś' => 's', 'î' => 'i', 'ű' => 'u', 'ć' => 'c', 'ę' => 'e', 'ŵ' => 'w', 'ṫ' => 't',
+  'ū' => 'u', 'č' => 'c', 'ö' => 'oe', 'è' => 'e', 'ŷ' => 'y', 'ą' => 'a', 'ł' => 'l',
+  'ų' => 'u', 'ů' => 'u', 'ş' => 's', 'ğ' => 'g', 'ļ' => 'l', 'ƒ' => 'f', 'ž' => 'z',
+  'ẃ' => 'w', 'ḃ' => 'b', 'å' => 'a', 'ì' => 'i', 'ï' => 'i', 'ḋ' => 'd', 'ť' => 't',
+  'ŗ' => 'r', 'ä' => 'ae', 'í' => 'i', 'ŕ' => 'r', 'ê' => 'e', 'ü' => 'ue', 'ò' => 'o',
+  'ē' => 'e', 'ñ' => 'n', 'ń' => 'n', 'ĥ' => 'h', 'ĝ' => 'g', 'đ' => 'd', 'ĵ' => 'j',
+  'ÿ' => 'y', 'ũ' => 'u', 'ŭ' => 'u', 'ư' => 'u', 'ţ' => 't', 'ý' => 'y', 'ő' => 'o',
+  'â' => 'a', 'ľ' => 'l', 'ẅ' => 'w', 'ż' => 'z', 'ī' => 'i', 'ã' => 'a', 'ġ' => 'g',
+  'ṁ' => 'm', 'ō' => 'o', 'ĩ' => 'i', 'ù' => 'u', 'į' => 'i', 'ź' => 'z', 'á' => 'a',
+  'û' => 'u', 'þ' => 'th', 'ð' => 'dh', 'æ' => 'ae', 'µ' => 'u', 'ĕ' => 'e',
+);
+
+/**
+ * UTF-8 lookup table for upper case accented letters
+ *
+ * This lookuptable defines replacements for accented characters from the ASCII-7
+ * range. This are upper case letters only.
+ *
+ * @author Andreas Gohr 
+ * @see    utf8_deaccent()
+ */
+global $UTF8_UPPER_ACCENTS;
+if(empty($UTF8_UPPER_ACCENTS)) $UTF8_UPPER_ACCENTS = array(
+  'À' => 'A', 'Ô' => 'O', 'Ď' => 'D', 'Ḟ' => 'F', 'Ë' => 'E', 'Š' => 'S', 'Ơ' => 'O',
+  'Ă' => 'A', 'Ř' => 'R', 'Ț' => 'T', 'Ň' => 'N', 'Ā' => 'A', 'Ķ' => 'K',
+  'Ŝ' => 'S', 'Ỳ' => 'Y', 'Ņ' => 'N', 'Ĺ' => 'L', 'Ħ' => 'H', 'Ṗ' => 'P', 'Ó' => 'O',
+  'Ú' => 'U', 'Ě' => 'E', 'É' => 'E', 'Ç' => 'C', 'Ẁ' => 'W', 'Ċ' => 'C', 'Õ' => 'O',
+  'Ṡ' => 'S', 'Ø' => 'O', 'Ģ' => 'G', 'Ŧ' => 'T', 'Ș' => 'S', 'Ė' => 'E', 'Ĉ' => 'C',
+  'Ś' => 'S', 'Î' => 'I', 'Ű' => 'U', 'Ć' => 'C', 'Ę' => 'E', 'Ŵ' => 'W', 'Ṫ' => 'T',
+  'Ū' => 'U', 'Č' => 'C', 'Ö' => 'Oe', 'È' => 'E', 'Ŷ' => 'Y', 'Ą' => 'A', 'Ł' => 'L',
+  'Ų' => 'U', 'Ů' => 'U', 'Ş' => 'S', 'Ğ' => 'G', 'Ļ' => 'L', 'Ƒ' => 'F', 'Ž' => 'Z',
+  'Ẃ' => 'W', 'Ḃ' => 'B', 'Å' => 'A', 'Ì' => 'I', 'Ï' => 'I', 'Ḋ' => 'D', 'Ť' => 'T',
+  'Ŗ' => 'R', 'Ä' => 'Ae', 'Í' => 'I', 'Ŕ' => 'R', 'Ê' => 'E', 'Ü' => 'Ue', 'Ò' => 'O',
+  'Ē' => 'E', 'Ñ' => 'N', 'Ń' => 'N', 'Ĥ' => 'H', 'Ĝ' => 'G', 'Đ' => 'D', 'Ĵ' => 'J',
+  'Ÿ' => 'Y', 'Ũ' => 'U', 'Ŭ' => 'U', 'Ư' => 'U', 'Ţ' => 'T', 'Ý' => 'Y', 'Ő' => 'O',
+  'Â' => 'A', 'Ľ' => 'L', 'Ẅ' => 'W', 'Ż' => 'Z', 'Ī' => 'I', 'Ã' => 'A', 'Ġ' => 'G',
+  'Ṁ' => 'M', 'Ō' => 'O', 'Ĩ' => 'I', 'Ù' => 'U', 'Į' => 'I', 'Ź' => 'Z', 'Á' => 'A',
+  'Û' => 'U', 'Þ' => 'Th', 'Ð' => 'Dh', 'Æ' => 'Ae', 'Ĕ' => 'E',
+);
+
+/**
+ * UTF-8 array of common special characters
+ *
+ * This array should contain all special characters (not a letter or digit)
+ * defined in the various local charsets - it's not a complete list of non-alphanum
+ * characters in UTF-8. It's not perfect but should match most cases of special
+ * chars.
+ *
+ * The controlchars 0x00 to 0x19 are _not_ included in this array. The space 0x20 is!
+ * These chars are _not_ in the array either:  _ (0x5f), : 0x3a, . 0x2e, - 0x2d, * 0x2a
+ *
+ * @author Andreas Gohr 
+ * @see    utf8_stripspecials()
+ */
+global $UTF8_SPECIAL_CHARS;
+if(empty($UTF8_SPECIAL_CHARS)) $UTF8_SPECIAL_CHARS = array(
+  0x001a, 0x001b, 0x001c, 0x001d, 0x001e, 0x001f, 0x0020, 0x0021, 0x0022, 0x0023,
+  0x0024, 0x0025, 0x0026, 0x0027, 0x0028, 0x0029,         0x002b, 0x002c,
+          0x002f,         0x003b, 0x003c, 0x003d, 0x003e, 0x003f, 0x0040, 0x005b,
+  0x005c, 0x005d, 0x005e,         0x0060, 0x007b, 0x007c, 0x007d, 0x007e,
+  0x007f, 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087, 0x0088,
+  0x0089, 0x008a, 0x008b, 0x008c, 0x008d, 0x008e, 0x008f, 0x0090, 0x0091, 0x0092,
+  0x0093, 0x0094, 0x0095, 0x0096, 0x0097, 0x0098, 0x0099, 0x009a, 0x009b, 0x009c,
+  0x009d, 0x009e, 0x009f, 0x00a0, 0x00a1, 0x00a2, 0x00a3, 0x00a4, 0x00a5, 0x00a6,
+  0x00a7, 0x00a8, 0x00a9, 0x00aa, 0x00ab, 0x00ac, 0x00ad, 0x00ae, 0x00af, 0x00b0,
+  0x00b1, 0x00b2, 0x00b3, 0x00b4, 0x00b5, 0x00b6, 0x00b7, 0x00b8, 0x00b9, 0x00ba,
+  0x00bb, 0x00bc, 0x00bd, 0x00be, 0x00bf, 0x00d7, 0x00f7, 0x02c7, 0x02d8, 0x02d9,
+  0x02da, 0x02db, 0x02dc, 0x02dd, 0x0300, 0x0301, 0x0303, 0x0309, 0x0323, 0x0384,
+  0x0385, 0x0387, 0x03c6, 0x03d1, 0x03d2, 0x03d5, 0x03d6, 0x05b0, 0x05b1,
+  0x05b2, 0x05b3, 0x05b4, 0x05b5, 0x05b6, 0x05b7, 0x05b8, 0x05b9, 0x05bb, 0x05bc,
+  0x05bd, 0x05be, 0x05bf, 0x05c0, 0x05c1, 0x05c2, 0x05c3, 0x05f3, 0x05f4, 0x060c,
+  0x061b, 0x061f, 0x0640, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, 0x0650, 0x0651,
+  0x0652, 0x066a, 0x0e3f, 0x200c, 0x200d, 0x200e, 0x200f, 0x2013, 0x2014, 0x2015,
+  0x2017, 0x2018, 0x2019, 0x201a, 0x201c, 0x201d, 0x201e, 0x2020, 0x2021, 0x2022,
+  0x2026, 0x2030, 0x2032, 0x2033, 0x2039, 0x203a, 0x2044, 0x20a7, 0x20aa, 0x20ab,
+  0x20ac, 0x2116, 0x2118, 0x2122, 0x2126, 0x2135, 0x2190, 0x2191, 0x2192, 0x2193,
+  0x2194, 0x2195, 0x21b5, 0x21d0, 0x21d1, 0x21d2, 0x21d3, 0x21d4, 0x2200, 0x2202,
+  0x2203, 0x2205, 0x2206, 0x2207, 0x2208, 0x2209, 0x220b, 0x220f, 0x2211, 0x2212,
+  0x2215, 0x2217, 0x2219, 0x221a, 0x221d, 0x221e, 0x2220, 0x2227, 0x2228, 0x2229,
+  0x222a, 0x222b, 0x2234, 0x223c, 0x2245, 0x2248, 0x2260, 0x2261, 0x2264, 0x2265,
+  0x2282, 0x2283, 0x2284, 0x2286, 0x2287, 0x2295, 0x2297, 0x22a5, 0x22c5, 0x2310,
+  0x2320, 0x2321, 0x2329, 0x232a, 0x2469, 0x2500, 0x2502, 0x250c, 0x2510, 0x2514,
+  0x2518, 0x251c, 0x2524, 0x252c, 0x2534, 0x253c, 0x2550, 0x2551, 0x2552, 0x2553,
+  0x2554, 0x2555, 0x2556, 0x2557, 0x2558, 0x2559, 0x255a, 0x255b, 0x255c, 0x255d,
+  0x255e, 0x255f, 0x2560, 0x2561, 0x2562, 0x2563, 0x2564, 0x2565, 0x2566, 0x2567,
+  0x2568, 0x2569, 0x256a, 0x256b, 0x256c, 0x2580, 0x2584, 0x2588, 0x258c, 0x2590,
+  0x2591, 0x2592, 0x2593, 0x25a0, 0x25b2, 0x25bc, 0x25c6, 0x25ca, 0x25cf, 0x25d7,
+  0x2605, 0x260e, 0x261b, 0x261e, 0x2660, 0x2663, 0x2665, 0x2666, 0x2701, 0x2702,
+  0x2703, 0x2704, 0x2706, 0x2707, 0x2708, 0x2709, 0x270c, 0x270d, 0x270e, 0x270f,
+  0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, 0x2718, 0x2719,
+  0x271a, 0x271b, 0x271c, 0x271d, 0x271e, 0x271f, 0x2720, 0x2721, 0x2722, 0x2723,
+  0x2724, 0x2725, 0x2726, 0x2727, 0x2729, 0x272a, 0x272b, 0x272c, 0x272d, 0x272e,
+  0x272f, 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738,
+  0x2739, 0x273a, 0x273b, 0x273c, 0x273d, 0x273e, 0x273f, 0x2740, 0x2741, 0x2742,
+  0x2743, 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274a, 0x274b, 0x274d,
+  0x274f, 0x2750, 0x2751, 0x2752, 0x2756, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c,
+  0x275d, 0x275e, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x277f,
+  0x2789, 0x2793, 0x2794, 0x2798, 0x2799, 0x279a, 0x279b, 0x279c, 0x279d, 0x279e,
+  0x279f, 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8,
+  0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, 0x27b1, 0x27b2, 0x27b3,
+  0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd,
+  0x27be, 0x3000, 0x3001, 0x3002, 0x3003, 0x3008, 0x3009, 0x300a, 0x300b, 0x300c,
+  0x300d, 0x300e, 0x300f, 0x3010, 0x3011, 0x3012, 0x3014, 0x3015, 0x3016, 0x3017,
+  0x3018, 0x3019, 0x301a, 0x301b, 0x3036,
+  0xf6d9, 0xf6da, 0xf6db, 0xf8d7, 0xf8d8, 0xf8d9, 0xf8da, 0xf8db, 0xf8dc,
+  0xf8dd, 0xf8de, 0xf8df, 0xf8e0, 0xf8e1, 0xf8e2, 0xf8e3, 0xf8e4, 0xf8e5, 0xf8e6,
+  0xf8e7, 0xf8e8, 0xf8e9, 0xf8ea, 0xf8eb, 0xf8ec, 0xf8ed, 0xf8ee, 0xf8ef, 0xf8f0,
+  0xf8f1, 0xf8f2, 0xf8f3, 0xf8f4, 0xf8f5, 0xf8f6, 0xf8f7, 0xf8f8, 0xf8f9, 0xf8fa,
+  0xf8fb, 0xf8fc, 0xf8fd, 0xf8fe, 0xfe7c, 0xfe7d,
+          0xff01, 0xff02, 0xff03, 0xff04, 0xff05, 0xff06, 0xff07, 0xff08, 0xff09,
+  0xff09, 0xff0a, 0xff0b, 0xff0c, 0xff0d, 0xff0e, 0xff0f, 0xff1a, 0xff1b, 0xff1c,
+  0xff1d, 0xff1e, 0xff1f, 0xff20, 0xff3b, 0xff3c, 0xff3d, 0xff3e, 0xff40, 0xff5b,
+  0xff5c, 0xff5d, 0xff5e, 0xff5f, 0xff60, 0xff61, 0xff62, 0xff63, 0xff64, 0xff65,
+  0xffe0, 0xffe1, 0xffe2, 0xffe3, 0xffe4, 0xffe5, 0xffe6, 0xffe8, 0xffe9, 0xffea,
+  0xffeb, 0xffec, 0xffed, 0xffee,
+  0x01d6fc, 0x01d6fd, 0x01d6fe, 0x01d6ff, 0x01d700, 0x01d701, 0x01d702, 0x01d703,
+  0x01d704, 0x01d705, 0x01d706, 0x01d707, 0x01d708, 0x01d709, 0x01d70a, 0x01d70b,
+  0x01d70c, 0x01d70d, 0x01d70e, 0x01d70f, 0x01d710, 0x01d711, 0x01d712, 0x01d713,
+  0x01d714, 0x01d715, 0x01d716, 0x01d717, 0x01d718, 0x01d719, 0x01d71a, 0x01d71b,
+  0xc2a0, 0xe28087, 0xe280af, 0xe281a0, 0xefbbbf,
+);
+
+// utf8 version of above data
+global $UTF8_SPECIAL_CHARS2;
+if(empty($UTF8_SPECIAL_CHARS2)) $UTF8_SPECIAL_CHARS2 =
+    "\x1A".' !"#$%&\'()+,/;<=>?@[\]^`{|}~€‚ƒ„…†‡ˆ‰Š‹ŒŽ‘’“”•�'.
+    '�—˜™š›œžŸ ¡¢£¤¥¦§¨©ª«¬­®¯°±²³´µ¶·¸¹º»¼½�'.
+    '�¿×÷ˇ˘˙˚˛˜˝̣̀́̃̉΄΅·ϖְֱֲֳִֵֶַָֹֻּֽ־ֿ�'.
+    '�ׁׂ׃׳״،؛؟ـًٌٍَُِّْ٪฿‌‍‎‏–—―‗‘’‚“”�'.
+    '��†‡•…‰′″‹›⁄₧₪₫€№℘™Ωℵ←↑→↓↔↕↵'.
+    '⇐⇑⇒⇓⇔∀∂∃∅∆∇∈∉∋∏∑−∕∗∙√∝∞∠∧∨�'.
+    '�∪∫∴∼≅≈≠≡≤≥⊂⊃⊄⊆⊇⊕⊗⊥⋅⌐⌠⌡〈〉⑩─�'.
+    '��┌┐└┘├┤┬┴┼═║╒╓╔╕╖╗╘╙╚╛╜╝╞╟╠'.
+    '╡╢╣╤╥╦╧╨╩╪╫╬▀▄█▌▐░▒▓■▲▼◆◊●�'.
+    '�★☎☛☞♠♣♥♦✁✂✃✄✆✇✈✉✌✍✎✏✐✑✒✓✔✕�'.
+    '��✗✘✙✚✛✜✝✞✟✠✡✢✣✤✥✦✧✩✪✫✬✭✮✯✰✱'.
+    '✲✳✴✵✶✷✸✹✺✻✼✽✾✿❀❁❂❃❄❅❆❇❈❉❊❋�'.
+    '�❏❐❑❒❖❘❙❚❛❜❝❞❡❢❣❤❥❦❧❿➉➓➔➘➙➚�'.
+    '��➜➝➞➟➠➡➢➣➤➥➦➧➨➩➪➫➬➭➮➯➱➲➳➴➵➶'.
+    '➷➸➹➺➻➼➽➾'.
+    '　、。〃〈〉《》「」『』【】〒〔〕〖〗〘〙〚〛〶'.
+    '�'.
+    '�ﹼﹽ'.
+    '！＂＃＄％＆＇（）＊＋，－．／：；＜＝＞？＠［＼］＾｀｛｜｝～'.
+    '｟｠｡｢｣､･￠￡￢￣￤￥￦￨￩￪￫￬￭￮'.
+    '𝛼𝛽𝛾𝛿𝜀𝜁𝜂𝜃𝜄𝜅𝜆𝜇𝜈𝜉𝜊𝜋𝜌𝜍𝜎𝜏𝜐𝜑𝜒𝜓𝜔𝜕𝜖𝜗𝜘𝜙𝜚𝜛'.
+    '   ⁠';
+
+/**
+ * Romanization lookup table
+ *
+ * This lookup tables provides a way to transform strings written in a language
+ * different from the ones based upon latin letters into plain ASCII.
+ *
+ * Please note: this is not a scientific transliteration table. It only works
+ * oneway from nonlatin to ASCII and it works by simple character replacement
+ * only. Specialities of each language are not supported.
+ *
+ * @author Andreas Gohr 
+ * @author Vitaly Blokhin 
+ * @link   http://www.uconv.com/translit.htm
+ * @author Bisqwit 
+ * @link   http://kanjidict.stc.cx/hiragana.php?src=2
+ * @link   http://www.translatum.gr/converter/greek-transliteration.htm
+ * @link   http://en.wikipedia.org/wiki/Royal_Thai_General_System_of_Transcription
+ * @link   http://www.btranslations.com/resources/romanization/korean.asp
+ * @author Arthit Suriyawongkul 
+ * @author Denis Scheither 
+ * @author Eivind Morland 
+ */
+global $UTF8_ROMANIZATION;
+if(empty($UTF8_ROMANIZATION)) $UTF8_ROMANIZATION = array(
+  // scandinavian - differs from what we do in deaccent
+  'å'=>'a','Å'=>'A','ä'=>'a','Ä'=>'A','ö'=>'o','Ö'=>'O',
+
+  //russian cyrillic
+  'а'=>'a','А'=>'A','б'=>'b','Б'=>'B','в'=>'v','В'=>'V','г'=>'g','Г'=>'G',
+  'д'=>'d','Д'=>'D','е'=>'e','Е'=>'E','ё'=>'jo','Ё'=>'Jo','ж'=>'zh','Ж'=>'Zh',
+  'з'=>'z','З'=>'Z','и'=>'i','И'=>'I','й'=>'j','Й'=>'J','к'=>'k','К'=>'K',
+  'л'=>'l','Л'=>'L','м'=>'m','М'=>'M','н'=>'n','Н'=>'N','о'=>'o','О'=>'O',
+  'п'=>'p','П'=>'P','р'=>'r','Р'=>'R','с'=>'s','С'=>'S','т'=>'t','Т'=>'T',
+  'у'=>'u','У'=>'U','ф'=>'f','Ф'=>'F','х'=>'x','Х'=>'X','ц'=>'c','Ц'=>'C',
+  'ч'=>'ch','Ч'=>'Ch','ш'=>'sh','Ш'=>'Sh','щ'=>'sch','Щ'=>'Sch','ъ'=>'',
+  'Ъ'=>'','ы'=>'y','Ы'=>'Y','ь'=>'','Ь'=>'','э'=>'eh','Э'=>'Eh','ю'=>'ju',
+  'Ю'=>'Ju','я'=>'ja','Я'=>'Ja',
+  // Ukrainian cyrillic
+  'Ґ'=>'Gh','ґ'=>'gh','Є'=>'Je','є'=>'je','І'=>'I','і'=>'i','Ї'=>'Ji','ї'=>'ji',
+  // Georgian
+  'ა'=>'a','ბ'=>'b','გ'=>'g','დ'=>'d','ე'=>'e','ვ'=>'v','ზ'=>'z','თ'=>'th',
+  'ი'=>'i','კ'=>'p','ლ'=>'l','მ'=>'m','ნ'=>'n','ო'=>'o','პ'=>'p','ჟ'=>'zh',
+  'რ'=>'r','ს'=>'s','ტ'=>'t','უ'=>'u','ფ'=>'ph','ქ'=>'kh','ღ'=>'gh','ყ'=>'q',
+  'შ'=>'sh','ჩ'=>'ch','ც'=>'c','ძ'=>'dh','წ'=>'w','ჭ'=>'j','ხ'=>'x','ჯ'=>'jh',
+  'ჰ'=>'xh',
+  //Sanskrit
+  'अ'=>'a','आ'=>'ah','इ'=>'i','ई'=>'ih','उ'=>'u','ऊ'=>'uh','ऋ'=>'ry',
+  'ॠ'=>'ryh','ऌ'=>'ly','ॡ'=>'lyh','ए'=>'e','ऐ'=>'ay','ओ'=>'o','औ'=>'aw',
+  'अं'=>'amh','अः'=>'aq','क'=>'k','ख'=>'kh','ग'=>'g','घ'=>'gh','ङ'=>'nh',
+  'च'=>'c','छ'=>'ch','ज'=>'j','झ'=>'jh','ञ'=>'ny','ट'=>'tq','ठ'=>'tqh',
+  'ड'=>'dq','ढ'=>'dqh','ण'=>'nq','त'=>'t','थ'=>'th','द'=>'d','ध'=>'dh',
+  'न'=>'n','प'=>'p','फ'=>'ph','ब'=>'b','भ'=>'bh','म'=>'m','य'=>'z','र'=>'r',
+  'ल'=>'l','व'=>'v','श'=>'sh','ष'=>'sqh','स'=>'s','ह'=>'x',
+  //Sanskrit diacritics
+  'Ā'=>'A','Ī'=>'I','Ū'=>'U','Ṛ'=>'R','Ṝ'=>'R','Ṅ'=>'N','Ñ'=>'N','Ṭ'=>'T',
+  'Ḍ'=>'D','Ṇ'=>'N','Ś'=>'S','Ṣ'=>'S','Ṁ'=>'M','Ṃ'=>'M','Ḥ'=>'H','Ḷ'=>'L','Ḹ'=>'L',
+  'ā'=>'a','ī'=>'i','ū'=>'u','ṛ'=>'r','ṝ'=>'r','ṅ'=>'n','ñ'=>'n','ṭ'=>'t',
+  'ḍ'=>'d','ṇ'=>'n','ś'=>'s','ṣ'=>'s','ṁ'=>'m','ṃ'=>'m','ḥ'=>'h','ḷ'=>'l','ḹ'=>'l',
+  //Hebrew
+  'א'=>'a', 'ב'=>'b','ג'=>'g','ד'=>'d','ה'=>'h','ו'=>'v','ז'=>'z','ח'=>'kh','ט'=>'th',
+  'י'=>'y','ך'=>'h','כ'=>'k','ל'=>'l','ם'=>'m','מ'=>'m','ן'=>'n','נ'=>'n',
+  'ס'=>'s','ע'=>'ah','ף'=>'f','פ'=>'p','ץ'=>'c','צ'=>'c','ק'=>'q','ר'=>'r',
+  'ש'=>'sh','ת'=>'t',
+  //Arabic
+  'ا'=>'a','ب'=>'b','ت'=>'t','ث'=>'th','ج'=>'g','ح'=>'xh','خ'=>'x','د'=>'d',
+  'ذ'=>'dh','ر'=>'r','ز'=>'z','س'=>'s','ش'=>'sh','ص'=>'s\'','ض'=>'d\'',
+  'ط'=>'t\'','ظ'=>'z\'','ع'=>'y','غ'=>'gh','ف'=>'f','ق'=>'q','ك'=>'k',
+  'ل'=>'l','م'=>'m','ن'=>'n','ه'=>'x\'','و'=>'u','ي'=>'i',
+
+  // Japanese characters  (last update: 2008-05-09)
+
+  // Japanese hiragana
+
+  // 3 character syllables, っ doubles the consonant after
+  'っちゃ'=>'ccha','っちぇ'=>'cche','っちょ'=>'ccho','っちゅ'=>'cchu',
+  'っびゃ'=>'bbya','っびぇ'=>'bbye','っびぃ'=>'bbyi','っびょ'=>'bbyo','っびゅ'=>'bbyu',
+  'っぴゃ'=>'ppya','っぴぇ'=>'ppye','っぴぃ'=>'ppyi','っぴょ'=>'ppyo','っぴゅ'=>'ppyu',
+  'っちゃ'=>'ccha','っちぇ'=>'cche','っち'=>'cchi','っちょ'=>'ccho','っちゅ'=>'cchu',
+  // 'っひゃ'=>'hya','っひぇ'=>'hye','っひぃ'=>'hyi','っひょ'=>'hyo','っひゅ'=>'hyu',
+  'っきゃ'=>'kkya','っきぇ'=>'kkye','っきぃ'=>'kkyi','っきょ'=>'kkyo','っきゅ'=>'kkyu',
+  'っぎゃ'=>'ggya','っぎぇ'=>'ggye','っぎぃ'=>'ggyi','っぎょ'=>'ggyo','っぎゅ'=>'ggyu',
+  'っみゃ'=>'mmya','っみぇ'=>'mmye','っみぃ'=>'mmyi','っみょ'=>'mmyo','っみゅ'=>'mmyu',
+  'っにゃ'=>'nnya','っにぇ'=>'nnye','っにぃ'=>'nnyi','っにょ'=>'nnyo','っにゅ'=>'nnyu',
+  'っりゃ'=>'rrya','っりぇ'=>'rrye','っりぃ'=>'rryi','っりょ'=>'rryo','っりゅ'=>'rryu',
+  'っしゃ'=>'ssha','っしぇ'=>'sshe','っし'=>'sshi','っしょ'=>'ssho','っしゅ'=>'sshu',
+
+  // seperate hiragana 'n' ('n' + 'i' != 'ni', normally we would write "kon'nichi wa" but the apostrophe would be converted to _ anyway)
+  'んあ'=>'n_a','んえ'=>'n_e','んい'=>'n_i','んお'=>'n_o','んう'=>'n_u',
+  'んや'=>'n_ya','んよ'=>'n_yo','んゆ'=>'n_yu',
+
+   // 2 character syllables - normal
+  'ふぁ'=>'fa','ふぇ'=>'fe','ふぃ'=>'fi','ふぉ'=>'fo',
+  'ちゃ'=>'cha','ちぇ'=>'che','ち'=>'chi','ちょ'=>'cho','ちゅ'=>'chu',
+  'ひゃ'=>'hya','ひぇ'=>'hye','ひぃ'=>'hyi','ひょ'=>'hyo','ひゅ'=>'hyu',
+  'びゃ'=>'bya','びぇ'=>'bye','びぃ'=>'byi','びょ'=>'byo','びゅ'=>'byu',
+  'ぴゃ'=>'pya','ぴぇ'=>'pye','ぴぃ'=>'pyi','ぴょ'=>'pyo','ぴゅ'=>'pyu',
+  'きゃ'=>'kya','きぇ'=>'kye','きぃ'=>'kyi','きょ'=>'kyo','きゅ'=>'kyu',
+  'ぎゃ'=>'gya','ぎぇ'=>'gye','ぎぃ'=>'gyi','ぎょ'=>'gyo','ぎゅ'=>'gyu',
+  'みゃ'=>'mya','みぇ'=>'mye','みぃ'=>'myi','みょ'=>'myo','みゅ'=>'myu',
+  'にゃ'=>'nya','にぇ'=>'nye','にぃ'=>'nyi','にょ'=>'nyo','にゅ'=>'nyu',
+  'りゃ'=>'rya','りぇ'=>'rye','りぃ'=>'ryi','りょ'=>'ryo','りゅ'=>'ryu',
+  'しゃ'=>'sha','しぇ'=>'she','し'=>'shi','しょ'=>'sho','しゅ'=>'shu',
+  'じゃ'=>'ja','じぇ'=>'je','じょ'=>'jo','じゅ'=>'ju',
+  'うぇ'=>'we','うぃ'=>'wi',
+  'いぇ'=>'ye',
+
+  // 2 character syllables, っ doubles the consonant after
+  'っば'=>'bba','っべ'=>'bbe','っび'=>'bbi','っぼ'=>'bbo','っぶ'=>'bbu',
+  'っぱ'=>'ppa','っぺ'=>'ppe','っぴ'=>'ppi','っぽ'=>'ppo','っぷ'=>'ppu',
+  'った'=>'tta','って'=>'tte','っち'=>'cchi','っと'=>'tto','っつ'=>'ttsu',
+  'っだ'=>'dda','っで'=>'dde','っぢ'=>'ddi','っど'=>'ddo','っづ'=>'ddu',
+  'っが'=>'gga','っげ'=>'gge','っぎ'=>'ggi','っご'=>'ggo','っぐ'=>'ggu',
+  'っか'=>'kka','っけ'=>'kke','っき'=>'kki','っこ'=>'kko','っく'=>'kku',
+  'っま'=>'mma','っめ'=>'mme','っみ'=>'mmi','っも'=>'mmo','っむ'=>'mmu',
+  'っな'=>'nna','っね'=>'nne','っに'=>'nni','っの'=>'nno','っぬ'=>'nnu',
+  'っら'=>'rra','っれ'=>'rre','っり'=>'rri','っろ'=>'rro','っる'=>'rru',
+  'っさ'=>'ssa','っせ'=>'sse','っし'=>'sshi','っそ'=>'sso','っす'=>'ssu',
+  'っざ'=>'zza','っぜ'=>'zze','っじ'=>'jji','っぞ'=>'zzo','っず'=>'zzu',
+
+  // 1 character syllabels
+  'あ'=>'a','え'=>'e','い'=>'i','お'=>'o','う'=>'u','ん'=>'n',
+  'は'=>'ha','へ'=>'he','ひ'=>'hi','ほ'=>'ho','ふ'=>'fu',
+  'ば'=>'ba','べ'=>'be','び'=>'bi','ぼ'=>'bo','ぶ'=>'bu',
+  'ぱ'=>'pa','ぺ'=>'pe','ぴ'=>'pi','ぽ'=>'po','ぷ'=>'pu',
+  'た'=>'ta','て'=>'te','ち'=>'chi','と'=>'to','つ'=>'tsu',
+  'だ'=>'da','で'=>'de','ぢ'=>'di','ど'=>'do','づ'=>'du',
+  'が'=>'ga','げ'=>'ge','ぎ'=>'gi','ご'=>'go','ぐ'=>'gu',
+  'か'=>'ka','け'=>'ke','き'=>'ki','こ'=>'ko','く'=>'ku',
+  'ま'=>'ma','め'=>'me','み'=>'mi','も'=>'mo','む'=>'mu',
+  'な'=>'na','ね'=>'ne','に'=>'ni','の'=>'no','ぬ'=>'nu',
+  'ら'=>'ra','れ'=>'re','り'=>'ri','ろ'=>'ro','る'=>'ru',
+  'さ'=>'sa','せ'=>'se','し'=>'shi','そ'=>'so','す'=>'su',
+  'わ'=>'wa','を'=>'wo',
+  'ざ'=>'za','ぜ'=>'ze','じ'=>'ji','ぞ'=>'zo','ず'=>'zu',
+  'や'=>'ya','よ'=>'yo','ゆ'=>'yu',
+  // old characters
+  'ゑ'=>'we','ゐ'=>'wi',
+
+  //  convert what's left (probably only kicks in when something's missing above)
+  // 'ぁ'=>'a','ぇ'=>'e','ぃ'=>'i','ぉ'=>'o','ぅ'=>'u',
+  // 'ゃ'=>'ya','ょ'=>'yo','ゅ'=>'yu',
+
+  // never seen one of those (disabled for the moment)
+  // 'ヴぁ'=>'va','ヴぇ'=>'ve','ヴぃ'=>'vi','ヴぉ'=>'vo','ヴ'=>'vu',
+  // 'でゃ'=>'dha','でぇ'=>'dhe','でぃ'=>'dhi','でょ'=>'dho','でゅ'=>'dhu',
+  // 'どぁ'=>'dwa','どぇ'=>'dwe','どぃ'=>'dwi','どぉ'=>'dwo','どぅ'=>'dwu',
+  // 'ぢゃ'=>'dya','ぢぇ'=>'dye','ぢぃ'=>'dyi','ぢょ'=>'dyo','ぢゅ'=>'dyu',
+  // 'ふぁ'=>'fwa','ふぇ'=>'fwe','ふぃ'=>'fwi','ふぉ'=>'fwo','ふぅ'=>'fwu',
+  // 'ふゃ'=>'fya','ふぇ'=>'fye','ふぃ'=>'fyi','ふょ'=>'fyo','ふゅ'=>'fyu',
+  // 'すぁ'=>'swa','すぇ'=>'swe','すぃ'=>'swi','すぉ'=>'swo','すぅ'=>'swu',
+  // 'てゃ'=>'tha','てぇ'=>'the','てぃ'=>'thi','てょ'=>'tho','てゅ'=>'thu',
+  // 'つゃ'=>'tsa','つぇ'=>'tse','つぃ'=>'tsi','つょ'=>'tso','つ'=>'tsu',
+  // 'とぁ'=>'twa','とぇ'=>'twe','とぃ'=>'twi','とぉ'=>'two','とぅ'=>'twu',
+  // 'ヴゃ'=>'vya','ヴぇ'=>'vye','ヴぃ'=>'vyi','ヴょ'=>'vyo','ヴゅ'=>'vyu',
+  // 'うぁ'=>'wha','うぇ'=>'whe','うぃ'=>'whi','うぉ'=>'who','うぅ'=>'whu',
+  // 'じゃ'=>'zha','じぇ'=>'zhe','じぃ'=>'zhi','じょ'=>'zho','じゅ'=>'zhu',
+  // 'じゃ'=>'zya','じぇ'=>'zye','じぃ'=>'zyi','じょ'=>'zyo','じゅ'=>'zyu',
+
+  // 'spare' characters from other romanization systems
+  // 'だ'=>'da','で'=>'de','ぢ'=>'di','ど'=>'do','づ'=>'du',
+  // 'ら'=>'la','れ'=>'le','り'=>'li','ろ'=>'lo','る'=>'lu',
+  // 'さ'=>'sa','せ'=>'se','し'=>'si','そ'=>'so','す'=>'su',
+  // 'ちゃ'=>'cya','ちぇ'=>'cye','ちぃ'=>'cyi','ちょ'=>'cyo','ちゅ'=>'cyu',
+  //'じゃ'=>'jya','じぇ'=>'jye','じぃ'=>'jyi','じょ'=>'jyo','じゅ'=>'jyu',
+  //'りゃ'=>'lya','りぇ'=>'lye','りぃ'=>'lyi','りょ'=>'lyo','りゅ'=>'lyu',
+  //'しゃ'=>'sya','しぇ'=>'sye','しぃ'=>'syi','しょ'=>'syo','しゅ'=>'syu',
+  //'ちゃ'=>'tya','ちぇ'=>'tye','ちぃ'=>'tyi','ちょ'=>'tyo','ちゅ'=>'tyu',
+  //'し'=>'ci',,い'=>'yi','ぢ'=>'dzi',
+  //'っじゃ'=>'jja','っじぇ'=>'jje','っじ'=>'jji','っじょ'=>'jjo','っじゅ'=>'jju',
+
+
+  // Japanese katakana
+
+  // 4 character syllables: ッ doubles the consonant after, ー doubles the vowel before (usualy written with macron, but we don't want that in our URLs)
+  'ッビャー'=>'bbyaa','ッビェー'=>'bbyee','ッビィー'=>'bbyii','ッビョー'=>'bbyoo','ッビュー'=>'bbyuu',
+  'ッピャー'=>'ppyaa','ッピェー'=>'ppyee','ッピィー'=>'ppyii','ッピョー'=>'ppyoo','ッピュー'=>'ppyuu',
+  'ッキャー'=>'kkyaa','ッキェー'=>'kkyee','ッキィー'=>'kkyii','ッキョー'=>'kkyoo','ッキュー'=>'kkyuu',
+  'ッギャー'=>'ggyaa','ッギェー'=>'ggyee','ッギィー'=>'ggyii','ッギョー'=>'ggyoo','ッギュー'=>'ggyuu',
+  'ッミャー'=>'mmyaa','ッミェー'=>'mmyee','ッミィー'=>'mmyii','ッミョー'=>'mmyoo','ッミュー'=>'mmyuu',
+  'ッニャー'=>'nnyaa','ッニェー'=>'nnyee','ッニィー'=>'nnyii','ッニョー'=>'nnyoo','ッニュー'=>'nnyuu',
+  'ッリャー'=>'rryaa','ッリェー'=>'rryee','ッリィー'=>'rryii','ッリョー'=>'rryoo','ッリュー'=>'rryuu',
+  'ッシャー'=>'sshaa','ッシェー'=>'sshee','ッシー'=>'sshii','ッショー'=>'sshoo','ッシュー'=>'sshuu',
+  'ッチャー'=>'cchaa','ッチェー'=>'cchee','ッチー'=>'cchii','ッチョー'=>'cchoo','ッチュー'=>'cchuu',
+  'ッティー'=>'ttii',
+  'ッヂィー'=>'ddii',
+
+  // 3 character syllables - doubled vowels
+  'ファー'=>'faa','フェー'=>'fee','フィー'=>'fii','フォー'=>'foo',
+  'フャー'=>'fyaa','フェー'=>'fyee','フィー'=>'fyii','フョー'=>'fyoo','フュー'=>'fyuu',
+  'ヒャー'=>'hyaa','ヒェー'=>'hyee','ヒィー'=>'hyii','ヒョー'=>'hyoo','ヒュー'=>'hyuu',
+  'ビャー'=>'byaa','ビェー'=>'byee','ビィー'=>'byii','ビョー'=>'byoo','ビュー'=>'byuu',
+  'ピャー'=>'pyaa','ピェー'=>'pyee','ピィー'=>'pyii','ピョー'=>'pyoo','ピュー'=>'pyuu',
+  'キャー'=>'kyaa','キェー'=>'kyee','キィー'=>'kyii','キョー'=>'kyoo','キュー'=>'kyuu',
+  'ギャー'=>'gyaa','ギェー'=>'gyee','ギィー'=>'gyii','ギョー'=>'gyoo','ギュー'=>'gyuu',
+  'ミャー'=>'myaa','ミェー'=>'myee','ミィー'=>'myii','ミョー'=>'myoo','ミュー'=>'myuu',
+  'ニャー'=>'nyaa','ニェー'=>'nyee','ニィー'=>'nyii','ニョー'=>'nyoo','ニュー'=>'nyuu',
+  'リャー'=>'ryaa','リェー'=>'ryee','リィー'=>'ryii','リョー'=>'ryoo','リュー'=>'ryuu',
+  'シャー'=>'shaa','シェー'=>'shee','シー'=>'shii','ショー'=>'shoo','シュー'=>'shuu',
+  'ジャー'=>'jaa','ジェー'=>'jee','ジー'=>'jii','ジョー'=>'joo','ジュー'=>'juu',
+  'スァー'=>'swaa','スェー'=>'swee','スィー'=>'swii','スォー'=>'swoo','スゥー'=>'swuu',
+  'デァー'=>'daa','デェー'=>'dee','ディー'=>'dii','デォー'=>'doo','デゥー'=>'duu',
+  'チャー'=>'chaa','チェー'=>'chee','チー'=>'chii','チョー'=>'choo','チュー'=>'chuu',
+  'ヂャー'=>'dyaa','ヂェー'=>'dyee','ヂィー'=>'dyii','ヂョー'=>'dyoo','ヂュー'=>'dyuu',
+  'ツャー'=>'tsaa','ツェー'=>'tsee','ツィー'=>'tsii','ツョー'=>'tsoo','ツー'=>'tsuu',
+  'トァー'=>'twaa','トェー'=>'twee','トィー'=>'twii','トォー'=>'twoo','トゥー'=>'twuu',
+  'ドァー'=>'dwaa','ドェー'=>'dwee','ドィー'=>'dwii','ドォー'=>'dwoo','ドゥー'=>'dwuu',
+  'ウァー'=>'whaa','ウェー'=>'whee','ウィー'=>'whii','ウォー'=>'whoo','ウゥー'=>'whuu',
+  'ヴャー'=>'vyaa','ヴェー'=>'vyee','ヴィー'=>'vyii','ヴョー'=>'vyoo','ヴュー'=>'vyuu',
+  'ヴァー'=>'vaa','ヴェー'=>'vee','ヴィー'=>'vii','ヴォー'=>'voo','ヴー'=>'vuu',
+  'ウェー'=>'wee','ウィー'=>'wii',
+  'イェー'=>'yee',
+  'ティー'=>'tii',
+  'ヂィー'=>'dii',
+
+  // 3 character syllables - doubled consonants
+  'ッビャ'=>'bbya','ッビェ'=>'bbye','ッビィ'=>'bbyi','ッビョ'=>'bbyo','ッビュ'=>'bbyu',
+  'ッピャ'=>'ppya','ッピェ'=>'ppye','ッピィ'=>'ppyi','ッピョ'=>'ppyo','ッピュ'=>'ppyu',
+  'ッキャ'=>'kkya','ッキェ'=>'kkye','ッキィ'=>'kkyi','ッキョ'=>'kkyo','ッキュ'=>'kkyu',
+  'ッギャ'=>'ggya','ッギェ'=>'ggye','ッギィ'=>'ggyi','ッギョ'=>'ggyo','ッギュ'=>'ggyu',
+  'ッミャ'=>'mmya','ッミェ'=>'mmye','ッミィ'=>'mmyi','ッミョ'=>'mmyo','ッミュ'=>'mmyu',
+  'ッニャ'=>'nnya','ッニェ'=>'nnye','ッニィ'=>'nnyi','ッニョ'=>'nnyo','ッニュ'=>'nnyu',
+  'ッリャ'=>'rrya','ッリェ'=>'rrye','ッリィ'=>'rryi','ッリョ'=>'rryo','ッリュ'=>'rryu',
+  'ッシャ'=>'ssha','ッシェ'=>'sshe','ッシ'=>'sshi','ッショ'=>'ssho','ッシュ'=>'sshu',
+  'ッチャ'=>'ccha','ッチェ'=>'cche','ッチ'=>'cchi','ッチョ'=>'ccho','ッチュ'=>'cchu',
+  'ッティ'=>'tti',
+  'ッヂィ'=>'ddi',
+
+  // 3 character syllables - doubled vowel and consonants
+  'ッバー'=>'bbaa','ッベー'=>'bbee','ッビー'=>'bbii','ッボー'=>'bboo','ッブー'=>'bbuu',
+  'ッパー'=>'ppaa','ッペー'=>'ppee','ッピー'=>'ppii','ッポー'=>'ppoo','ップー'=>'ppuu',
+  'ッケー'=>'kkee','ッキー'=>'kkii','ッコー'=>'kkoo','ックー'=>'kkuu','ッカー'=>'kkaa',
+  'ッガー'=>'ggaa','ッゲー'=>'ggee','ッギー'=>'ggii','ッゴー'=>'ggoo','ッグー'=>'gguu',
+  'ッマー'=>'maa','ッメー'=>'mee','ッミー'=>'mii','ッモー'=>'moo','ッムー'=>'muu',
+  'ッナー'=>'nnaa','ッネー'=>'nnee','ッニー'=>'nnii','ッノー'=>'nnoo','ッヌー'=>'nnuu',
+  'ッラー'=>'rraa','ッレー'=>'rree','ッリー'=>'rrii','ッロー'=>'rroo','ッルー'=>'rruu',
+  'ッサー'=>'ssaa','ッセー'=>'ssee','ッシー'=>'sshii','ッソー'=>'ssoo','ッスー'=>'ssuu',
+  'ッザー'=>'zzaa','ッゼー'=>'zzee','ッジー'=>'jjii','ッゾー'=>'zzoo','ッズー'=>'zzuu',
+  'ッター'=>'ttaa','ッテー'=>'ttee','ッチー'=>'chii','ットー'=>'ttoo','ッツー'=>'ttsuu',
+  'ッダー'=>'ddaa','ッデー'=>'ddee','ッヂー'=>'ddii','ッドー'=>'ddoo','ッヅー'=>'dduu',
+
+  // 2 character syllables - normal
+  'ファ'=>'fa','フェ'=>'fe','フィ'=>'fi','フォ'=>'fo','フゥ'=>'fu',
+  // 'フャ'=>'fya','フェ'=>'fye','フィ'=>'fyi','フョ'=>'fyo','フュ'=>'fyu',
+  'フャ'=>'fa','フェ'=>'fe','フィ'=>'fi','フョ'=>'fo','フュ'=>'fu',
+  'ヒャ'=>'hya','ヒェ'=>'hye','ヒィ'=>'hyi','ヒョ'=>'hyo','ヒュ'=>'hyu',
+  'ビャ'=>'bya','ビェ'=>'bye','ビィ'=>'byi','ビョ'=>'byo','ビュ'=>'byu',
+  'ピャ'=>'pya','ピェ'=>'pye','ピィ'=>'pyi','ピョ'=>'pyo','ピュ'=>'pyu',
+  'キャ'=>'kya','キェ'=>'kye','キィ'=>'kyi','キョ'=>'kyo','キュ'=>'kyu',
+  'ギャ'=>'gya','ギェ'=>'gye','ギィ'=>'gyi','ギョ'=>'gyo','ギュ'=>'gyu',
+  'ミャ'=>'mya','ミェ'=>'mye','ミィ'=>'myi','ミョ'=>'myo','ミュ'=>'myu',
+  'ニャ'=>'nya','ニェ'=>'nye','ニィ'=>'nyi','ニョ'=>'nyo','ニュ'=>'nyu',
+  'リャ'=>'rya','リェ'=>'rye','リィ'=>'ryi','リョ'=>'ryo','リュ'=>'ryu',
+  'シャ'=>'sha','シェ'=>'she','ショ'=>'sho','シュ'=>'shu',
+  'ジャ'=>'ja','ジェ'=>'je','ジョ'=>'jo','ジュ'=>'ju',
+  'スァ'=>'swa','スェ'=>'swe','スィ'=>'swi','スォ'=>'swo','スゥ'=>'swu',
+  'デァ'=>'da','デェ'=>'de','ディ'=>'di','デォ'=>'do','デゥ'=>'du',
+  'チャ'=>'cha','チェ'=>'che','チ'=>'chi','チョ'=>'cho','チュ'=>'chu',
+  // 'ヂャ'=>'dya','ヂェ'=>'dye','ヂィ'=>'dyi','ヂョ'=>'dyo','ヂュ'=>'dyu',
+  'ツャ'=>'tsa','ツェ'=>'tse','ツィ'=>'tsi','ツョ'=>'tso','ツ'=>'tsu',
+  'トァ'=>'twa','トェ'=>'twe','トィ'=>'twi','トォ'=>'two','トゥ'=>'twu',
+  'ドァ'=>'dwa','ドェ'=>'dwe','ドィ'=>'dwi','ドォ'=>'dwo','ドゥ'=>'dwu',
+  'ウァ'=>'wha','ウェ'=>'whe','ウィ'=>'whi','ウォ'=>'who','ウゥ'=>'whu',
+  'ヴャ'=>'vya','ヴェ'=>'vye','ヴィ'=>'vyi','ヴョ'=>'vyo','ヴュ'=>'vyu',
+  'ヴァ'=>'va','ヴェ'=>'ve','ヴィ'=>'vi','ヴォ'=>'vo','ヴ'=>'vu',
+  'ウェ'=>'we','ウィ'=>'wi',
+  'イェ'=>'ye',
+  'ティ'=>'ti',
+  'ヂィ'=>'di',
+
+  // 2 character syllables - doubled vocal
+  'アー'=>'aa','エー'=>'ee','イー'=>'ii','オー'=>'oo','ウー'=>'uu',
+  'ダー'=>'daa','デー'=>'dee','ヂー'=>'dii','ドー'=>'doo','ヅー'=>'duu',
+  'ハー'=>'haa','ヘー'=>'hee','ヒー'=>'hii','ホー'=>'hoo','フー'=>'fuu',
+  'バー'=>'baa','ベー'=>'bee','ビー'=>'bii','ボー'=>'boo','ブー'=>'buu',
+  'パー'=>'paa','ペー'=>'pee','ピー'=>'pii','ポー'=>'poo','プー'=>'puu',
+  'ケー'=>'kee','キー'=>'kii','コー'=>'koo','クー'=>'kuu','カー'=>'kaa',
+  'ガー'=>'gaa','ゲー'=>'gee','ギー'=>'gii','ゴー'=>'goo','グー'=>'guu',
+  'マー'=>'maa','メー'=>'mee','ミー'=>'mii','モー'=>'moo','ムー'=>'muu',
+  'ナー'=>'naa','ネー'=>'nee','ニー'=>'nii','ノー'=>'noo','ヌー'=>'nuu',
+  'ラー'=>'raa','レー'=>'ree','リー'=>'rii','ロー'=>'roo','ルー'=>'ruu',
+  'サー'=>'saa','セー'=>'see','シー'=>'shii','ソー'=>'soo','スー'=>'suu',
+  'ザー'=>'zaa','ゼー'=>'zee','ジー'=>'jii','ゾー'=>'zoo','ズー'=>'zuu',
+  'ター'=>'taa','テー'=>'tee','チー'=>'chii','トー'=>'too','ツー'=>'tsuu',
+  'ワー'=>'waa','ヲー'=>'woo',
+  'ヤー'=>'yaa','ヨー'=>'yoo','ユー'=>'yuu',
+  'ヵー'=>'kaa','ヶー'=>'kee',
+  // old characters
+  'ヱー'=>'wee','ヰー'=>'wii',
+
+  // seperate katakana 'n'
+  'ンア'=>'n_a','ンエ'=>'n_e','ンイ'=>'n_i','ンオ'=>'n_o','ンウ'=>'n_u',
+  'ンヤ'=>'n_ya','ンヨ'=>'n_yo','ンユ'=>'n_yu',
+
+  // 2 character syllables - doubled consonants
+  'ッバ'=>'bba','ッベ'=>'bbe','ッビ'=>'bbi','ッボ'=>'bbo','ッブ'=>'bbu',
+  'ッパ'=>'ppa','ッペ'=>'ppe','ッピ'=>'ppi','ッポ'=>'ppo','ップ'=>'ppu',
+  'ッケ'=>'kke','ッキ'=>'kki','ッコ'=>'kko','ック'=>'kku','ッカ'=>'kka',
+  'ッガ'=>'gga','ッゲ'=>'gge','ッギ'=>'ggi','ッゴ'=>'ggo','ッグ'=>'ggu',
+  'ッマ'=>'ma','ッメ'=>'me','ッミ'=>'mi','ッモ'=>'mo','ッム'=>'mu',
+  'ッナ'=>'nna','ッネ'=>'nne','ッニ'=>'nni','ッノ'=>'nno','ッヌ'=>'nnu',
+  'ッラ'=>'rra','ッレ'=>'rre','ッリ'=>'rri','ッロ'=>'rro','ッル'=>'rru',
+  'ッサ'=>'ssa','ッセ'=>'sse','ッシ'=>'sshi','ッソ'=>'sso','ッス'=>'ssu',
+  'ッザ'=>'zza','ッゼ'=>'zze','ッジ'=>'jji','ッゾ'=>'zzo','ッズ'=>'zzu',
+  'ッタ'=>'tta','ッテ'=>'tte','ッチ'=>'cchi','ット'=>'tto','ッツ'=>'ttsu',
+  'ッダ'=>'dda','ッデ'=>'dde','ッヂ'=>'ddi','ッド'=>'ddo','ッヅ'=>'ddu',
+
+  // 1 character syllables
+  'ア'=>'a','エ'=>'e','イ'=>'i','オ'=>'o','ウ'=>'u','ン'=>'n',
+  'ハ'=>'ha','ヘ'=>'he','ヒ'=>'hi','ホ'=>'ho','フ'=>'fu',
+  'バ'=>'ba','ベ'=>'be','ビ'=>'bi','ボ'=>'bo','ブ'=>'bu',
+  'パ'=>'pa','ペ'=>'pe','ピ'=>'pi','ポ'=>'po','プ'=>'pu',
+  'ケ'=>'ke','キ'=>'ki','コ'=>'ko','ク'=>'ku','カ'=>'ka',
+  'ガ'=>'ga','ゲ'=>'ge','ギ'=>'gi','ゴ'=>'go','グ'=>'gu',
+  'マ'=>'ma','メ'=>'me','ミ'=>'mi','モ'=>'mo','ム'=>'mu',
+  'ナ'=>'na','ネ'=>'ne','ニ'=>'ni','ノ'=>'no','ヌ'=>'nu',
+  'ラ'=>'ra','レ'=>'re','リ'=>'ri','ロ'=>'ro','ル'=>'ru',
+  'サ'=>'sa','セ'=>'se','シ'=>'shi','ソ'=>'so','ス'=>'su',
+  'ザ'=>'za','ゼ'=>'ze','ジ'=>'ji','ゾ'=>'zo','ズ'=>'zu',
+  'タ'=>'ta','テ'=>'te','チ'=>'chi','ト'=>'to','ツ'=>'tsu',
+  'ダ'=>'da','デ'=>'de','ヂ'=>'di','ド'=>'do','ヅ'=>'du',
+  'ワ'=>'wa','ヲ'=>'wo',
+  'ヤ'=>'ya','ヨ'=>'yo','ユ'=>'yu',
+  'ヵ'=>'ka','ヶ'=>'ke',
+  // old characters
+  'ヱ'=>'we','ヰ'=>'wi',
+
+  //  convert what's left (probably only kicks in when something's missing above)
+  'ァ'=>'a','ェ'=>'e','ィ'=>'i','ォ'=>'o','ゥ'=>'u',
+  'ャ'=>'ya','ョ'=>'yo','ュ'=>'yu',
+
+  // special characters
+  '・'=>'_','、'=>'_',
+  'ー'=>'_', // when used with hiragana (seldom), this character would not be converted otherwise
+
+  // 'ラ'=>'la','レ'=>'le','リ'=>'li','ロ'=>'lo','ル'=>'lu',
+  // 'チャ'=>'cya','チェ'=>'cye','チィ'=>'cyi','チョ'=>'cyo','チュ'=>'cyu',
+  //'デャ'=>'dha','デェ'=>'dhe','ディ'=>'dhi','デョ'=>'dho','デュ'=>'dhu',
+  // 'リャ'=>'lya','リェ'=>'lye','リィ'=>'lyi','リョ'=>'lyo','リュ'=>'lyu',
+  // 'テャ'=>'tha','テェ'=>'the','ティ'=>'thi','テョ'=>'tho','テュ'=>'thu',
+  //'ファ'=>'fwa','フェ'=>'fwe','フィ'=>'fwi','フォ'=>'fwo','フゥ'=>'fwu',
+  //'チャ'=>'tya','チェ'=>'tye','チィ'=>'tyi','チョ'=>'tyo','チュ'=>'tyu',
+  // 'ジャ'=>'jya','ジェ'=>'jye','ジィ'=>'jyi','ジョ'=>'jyo','ジュ'=>'jyu',
+  // 'ジャ'=>'zha','ジェ'=>'zhe','ジィ'=>'zhi','ジョ'=>'zho','ジュ'=>'zhu',
+  //'ジャ'=>'zya','ジェ'=>'zye','ジィ'=>'zyi','ジョ'=>'zyo','ジュ'=>'zyu',
+  //'シャ'=>'sya','シェ'=>'sye','シィ'=>'syi','ショ'=>'syo','シュ'=>'syu',
+  //'シ'=>'ci','フ'=>'hu',シ'=>'si','チ'=>'ti','ツ'=>'tu','イ'=>'yi','ヂ'=>'dzi',
+
+  // "Greeklish"
+  'Γ'=>'G','Δ'=>'E','Θ'=>'Th','Λ'=>'L','Ξ'=>'X','Π'=>'P','Σ'=>'S','Φ'=>'F','Ψ'=>'Ps',
+  'γ'=>'g','δ'=>'e','θ'=>'th','λ'=>'l','ξ'=>'x','π'=>'p','σ'=>'s','φ'=>'f','ψ'=>'ps',
+
+  // Thai
+  'ก'=>'k','ข'=>'kh','ฃ'=>'kh','ค'=>'kh','ฅ'=>'kh','ฆ'=>'kh','ง'=>'ng','จ'=>'ch',
+  'ฉ'=>'ch','ช'=>'ch','ซ'=>'s','ฌ'=>'ch','ญ'=>'y','ฎ'=>'d','ฏ'=>'t','ฐ'=>'th',
+  'ฑ'=>'d','ฒ'=>'th','ณ'=>'n','ด'=>'d','ต'=>'t','ถ'=>'th','ท'=>'th','ธ'=>'th',
+  'น'=>'n','บ'=>'b','ป'=>'p','ผ'=>'ph','ฝ'=>'f','พ'=>'ph','ฟ'=>'f','ภ'=>'ph',
+  'ม'=>'m','ย'=>'y','ร'=>'r','ฤ'=>'rue','ฤๅ'=>'rue','ล'=>'l','ฦ'=>'lue',
+  'ฦๅ'=>'lue','ว'=>'w','ศ'=>'s','ษ'=>'s','ส'=>'s','ห'=>'h','ฬ'=>'l','ฮ'=>'h',
+  'ะ'=>'a','ั'=>'a','รร'=>'a','า'=>'a','ๅ'=>'a','ำ'=>'am','ํา'=>'am',
+  'ิ'=>'i','ี'=>'i','ึ'=>'ue','ี'=>'ue','ุ'=>'u','ู'=>'u',
+  'เ'=>'e','แ'=>'ae','โ'=>'o','อ'=>'o',
+  'ียะ'=>'ia','ีย'=>'ia','ือะ'=>'uea','ือ'=>'uea','ัวะ'=>'ua','ัว'=>'ua',
+  'ใ'=>'ai','ไ'=>'ai','ัย'=>'ai','าย'=>'ai','าว'=>'ao',
+  'ุย'=>'ui','อย'=>'oi','ือย'=>'ueai','วย'=>'uai',
+  'ิว'=>'io','็ว'=>'eo','ียว'=>'iao',
+  '่'=>'','้'=>'','๊'=>'','๋'=>'','็'=>'',
+  '์'=>'','๎'=>'','ํ'=>'','ฺ'=>'',
+  'ๆ'=>'2','๏'=>'o','ฯ'=>'-','๚'=>'-','๛'=>'-',
+  '๐'=>'0','๑'=>'1','๒'=>'2','๓'=>'3','๔'=>'4',
+  '๕'=>'5','๖'=>'6','๗'=>'7','๘'=>'8','๙'=>'9',
+
+  // Korean
+  'ㄱ'=>'k','ㅋ'=>'kh','ㄲ'=>'kk','ㄷ'=>'t','ㅌ'=>'th','ㄸ'=>'tt','ㅂ'=>'p',
+  'ㅍ'=>'ph','ㅃ'=>'pp','ㅈ'=>'c','ㅊ'=>'ch','ㅉ'=>'cc','ㅅ'=>'s','ㅆ'=>'ss',
+  'ㅎ'=>'h','ㅇ'=>'ng','ㄴ'=>'n','ㄹ'=>'l','ㅁ'=>'m', 'ㅏ'=>'a','ㅓ'=>'e','ㅗ'=>'o',
+  'ㅜ'=>'wu','ㅡ'=>'u','ㅣ'=>'i','ㅐ'=>'ay','ㅔ'=>'ey','ㅚ'=>'oy','ㅘ'=>'wa','ㅝ'=>'we',
+  'ㅟ'=>'wi','ㅙ'=>'way','ㅞ'=>'wey','ㅢ'=>'uy','ㅑ'=>'ya','ㅕ'=>'ye','ㅛ'=>'oy',
+  'ㅠ'=>'yu','ㅒ'=>'yay','ㅖ'=>'yey',
+);
+
+
diff --git a/sources/index.php b/sources/index.php
new file mode 100644
index 0000000..ad08077
--- /dev/null
+++ b/sources/index.php
@@ -0,0 +1,8 @@
+
+ */
+header("Location: doku.php");
diff --git a/sources/install.php b/sources/install.php
new file mode 100644
index 0000000..779084c
--- /dev/null
+++ b/sources/install.php
@@ -0,0 +1,622 @@
+
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/');
+if(!defined('DOKU_CONF')) define('DOKU_CONF',DOKU_INC.'conf/');
+if(!defined('DOKU_LOCAL')) define('DOKU_LOCAL',DOKU_INC.'conf/');
+
+require_once(DOKU_INC.'inc/PassHash.class.php');
+
+// check for error reporting override or set error reporting to sane values
+if (!defined('DOKU_E_LEVEL')) { error_reporting(E_ALL ^ E_NOTICE); }
+else { error_reporting(DOKU_E_LEVEL); }
+
+// 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);
+}
+if (function_exists('set_magic_quotes_runtime')) @set_magic_quotes_runtime(0);
+@ini_set('magic_quotes_sybase',0);
+
+// language strings
+require_once(DOKU_INC.'inc/lang/en/lang.php');
+if(isset($_REQUEST['l']) && !is_array($_REQUEST['l'])) {
+    $LC = preg_replace('/[^a-z\-]+/','',$_REQUEST['l']);
+}
+if(empty($LC)) $LC = 'en';
+if($LC && $LC != 'en' ) {
+    require_once(DOKU_INC.'inc/lang/'.$LC.'/lang.php');
+}
+
+// initialise variables ...
+$error = array();
+
+$dokuwiki_hash = array(
+    '2005-09-22'   => 'e33223e957b0b0a130d0520db08f8fb7',
+    '2006-03-05'   => '51295727f79ab9af309a2fd9e0b61acc',
+    '2006-03-09'   => '51295727f79ab9af309a2fd9e0b61acc',
+    '2006-11-06'   => 'b3a8af76845977c2000d85d6990dd72b',
+    '2007-05-24'   => 'd80f2740c84c4a6a791fd3c7a353536f',
+    '2007-06-26'   => 'b3ca19c7a654823144119980be73cd77',
+    '2008-05-04'   => '1e5c42eac3219d9e21927c39e3240aad',
+    '2009-02-14'   => 'ec8c04210732a14fdfce0f7f6eead865',
+    '2009-12-25'   => '993c4b2b385643efe5abf8e7010e11f4',
+    '2010-11-07'   => '7921d48195f4db21b8ead6d9bea801b8',
+    '2011-05-25'   => '4241865472edb6fa14a1227721008072',
+    '2011-11-10'   => 'b46ff19a7587966ac4df61cbab1b8b31',
+    '2012-01-25'   => '72c083c73608fc43c586901fd5dabb74',
+    '2012-09-10'   => 'eb0b3fc90056fbc12bac6f49f7764df3',
+    '2013-05-10'   => '7b62b75245f57f122d3e0f8ed7989623',
+    '2013-12-08'   => '263c76af309fbf083867c18a34ff5214',
+);
+
+
+// begin output
+header('Content-Type: text/html; charset=utf-8');
+?>
+
+
+
+    
+    <?php echo $lang['i_installer']?>
+    
+    
+
+
+    
        
+        
+        
+    
        
+    
        
+        
+    
        
+    
        
+
+    
        
+        \n";
+                include(DOKU_INC.'inc/lang/en/install.html');
+                print "
        \n";
+            }
+        ?>
+        
+    
+
+    
        
+        '.$lang['i_problems'].'
        ';
+                print_errors();
+                print_retry();
+            }elseif(!check_configs()){
+                echo '
        '.$lang['i_modified'].'
        ';
+                print_errors();
+            }elseif(check_data($_REQUEST['d'])){
+                // check_data has sanitized all input parameters
+                if(!store_data($_REQUEST['d'])){
+                    echo '
        '.$lang['i_failure'].'
        ';
+                    print_errors();
+                }else{
+                    echo '
        '.$lang['i_success'].'
        ';
+                }
+            }else{
+                print_errors();
+                print_form($_REQUEST['d']);
+            }
+        ?>
+    
        
+
+
+
        
+  driven by DokuWiki
+  powered by PHP
+
        
+
+
+
+    
        
+    
+    
        
+        
+
+        
        
+            
+
+            
        
+                
+                
+
+                
+                
+
+                
+                
+
+                
+                
+
+                
+                
+
+                
+                
+
+                
+            
        
+        
        
+
+        
        
+            
        
+             $lang['i_license_none'], 'url'=>''));
+            if(empty($d['license'])) $d['license'] = 'cc-by-sa';
+            foreach($license as $key => $lic){
+                echo '';
+            }
+            ?>
+        
        
+
+        
        
+            
        
+            
+        
        
+
+    
        
+    
        
+        
+    
        
+    
        
+    
+    
        
+      
        
+        
+        
+      
        
+    
        
+     '',
+        'acl'       => '1',
+        'superuser' => '',
+        'fullname'  => '',
+        'email'     => '',
+        'password'  => '',
+        'confirm'   => '',
+        'policy'    => '0',
+        'allowreg'  => '0',
+        'license'   => 'cc-by-sa'
+    );
+    global $lang;
+    global $error;
+
+    if(!is_array($d)) $d = array();
+    foreach($d as $k => $v) {
+        if(is_array($v))
+            unset($d[$k]);
+        else
+            $d[$k] = (string)$v;
+    }
+
+    //autolowercase the username
+    $d['superuser'] = isset($d['superuser']) ? strtolower($d['superuser']) : "";
+
+    $ok = false;
+
+    if(isset($_REQUEST['submit'])) {
+        $ok = true;
+
+        // check input
+        if(empty($d['title'])){
+            $error[] = sprintf($lang['i_badval'],$lang['i_wikiname']);
+            $ok      = false;
+        }
+        if(isset($d['acl'])){
+            if(!preg_match('/^[a-z0-9_]+$/',$d['superuser'])){
+                $error[] = sprintf($lang['i_badval'],$lang['i_superuser']);
+                $ok      = false;
+            }
+            if(empty($d['password'])){
+                $error[] = sprintf($lang['i_badval'],$lang['pass']);
+                $ok      = false;
+            }
+            elseif(!isset($d['confirm']) || $d['confirm'] != $d['password']){
+                $error[] = sprintf($lang['i_badval'],$lang['passchk']);
+                $ok      = false;
+            }
+            if(empty($d['fullname']) || strstr($d['fullname'],':')){
+                $error[] = sprintf($lang['i_badval'],$lang['fullname']);
+                $ok      = false;
+            }
+            if(empty($d['email']) || strstr($d['email'],':') || !strstr($d['email'],'@')){
+                $error[] = sprintf($lang['i_badval'],$lang['email']);
+                $ok      = false;
+            }
+        }
+    }
+    $d = array_merge($form_default, $d);
+    return $ok;
+}
+
+/**
+ * Writes the data to the config files
+ *
+ * @author  Chris Smith 
+ */
+function store_data($d){
+    global $LC;
+    $ok = true;
+    $d['policy'] = (int) $d['policy'];
+
+    // create local.php
+    $now    = gmdate('r');
+    $output = <<hash_smd5($d['password']);
+
+        // create users.auth.php
+        // --- user:SMD5password:Real Name:email:groups,comma,seperated
+        $output = join(":",array($d['superuser'], $pass, $d['fullname'], $d['email'], 'admin,user'));
+        $output = @file_get_contents(DOKU_CONF.'users.auth.php.dist')."\n$output\n";
+        $ok = $ok && fileWrite(DOKU_LOCAL.'users.auth.php', $output);
+
+        // create acl.auth.php
+        $output = <<
+# Don't modify the lines above
+#
+# Access Control Lists
+#
+# Auto-generated by install script
+# Date: $now
+
+EOT;
+        if($d['policy'] == 2){
+            $output .=  "*               @ALL          0\n";
+            $output .=  "*               @user         8\n";
+        }elseif($d['policy'] == 1){
+            $output .=  "*               @ALL          1\n";
+            $output .=  "*               @user         8\n";
+        }else{
+            $output .=  "*               @ALL          8\n";
+        }
+        $ok = $ok && fileWrite(DOKU_LOCAL.'acl.auth.php', $output);
+    }
+
+    // enable popularity submission
+    if($d['pop']){
+        @touch(DOKU_INC.'data/cache/autosubmit.txt');
+    }
+
+    // disable auth plugins til needed
+    $output = <<
+ */
+function fileWrite($filename, $data) {
+    global $error;
+    global $lang;
+
+    if (($fp = @fopen($filename, 'wb')) === false) {
+        $filename = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}/', $filename);
+        $error[]  = sprintf($lang['i_writeerr'],$filename);
+        return false;
+    }
+
+    if (!empty($data)) { fwrite($fp, $data);  }
+    fclose($fp);
+    return true;
+}
+
+
+/**
+ * check installation dependent local config files and tests for a known
+ * unmodified main config file
+ *
+ * @author      Chris Smith 
+ */
+function check_configs(){
+    global $error;
+    global $lang;
+    global $dokuwiki_hash;
+
+    $ok = true;
+
+    $config_files = array(
+        'local' => DOKU_LOCAL.'local.php',
+        'users' => DOKU_LOCAL.'users.auth.php',
+        'auth'  => DOKU_LOCAL.'acl.auth.php'
+    );
+
+    // main dokuwiki config file (conf/dokuwiki.php) must not have been modified
+    $installation_hash = md5(preg_replace("/(\015\012)|(\015)/","\012",
+                             @file_get_contents(DOKU_CONF.'dokuwiki.php')));
+    if (!in_array($installation_hash, $dokuwiki_hash)) {
+        $error[] = sprintf($lang['i_badhash'],$installation_hash);
+        $ok = false;
+    }
+
+    // configs shouldn't exist
+    foreach ($config_files as $file) {
+        if (@file_exists($file) && filesize($file)) {
+            $file    = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}/', $file);
+            $error[] = sprintf($lang['i_confexists'],$file);
+            $ok      = false;
+        }
+    }
+    return $ok;
+}
+
+
+/**
+ * Check other installation dir/file permission requirements
+ *
+ * @author      Chris Smith 
+ */
+function check_permissions(){
+    global $error;
+    global $lang;
+
+    $dirs = array(
+        'conf'        => DOKU_LOCAL,
+        'data'        => DOKU_INC.'data',
+        'pages'       => DOKU_INC.'data/pages',
+        'attic'       => DOKU_INC.'data/attic',
+        'media'       => DOKU_INC.'data/media',
+        'media_attic' => DOKU_INC.'data/media_attic',
+        'media_meta'  => DOKU_INC.'data/media_meta',
+        'meta'        => DOKU_INC.'data/meta',
+        'cache'       => DOKU_INC.'data/cache',
+        'locks'       => DOKU_INC.'data/locks',
+        'index'       => DOKU_INC.'data/index',
+        'tmp'         => DOKU_INC.'data/tmp'
+    );
+
+    $ok = true;
+    foreach($dirs as $dir){
+        if(!@file_exists("$dir/.") || !@is_writable($dir)){
+            $dir     = str_replace($_SERVER['DOCUMENT_ROOT'],'{DOCUMENT_ROOT}', $dir);
+            $error[] = sprintf($lang['i_permfail'],$dir);
+            $ok      = false;
+        }
+    }
+    return $ok;
+}
+
+/**
+ * Check the availability of functions used in DokuWiki and the PHP version
+ *
+ * @author Andreas Gohr 
+ */
+function check_functions(){
+    global $error;
+    global $lang;
+    $ok = true;
+
+    if(version_compare(phpversion(),'5.2.0','<')){
+        $error[] = sprintf($lang['i_phpver'],phpversion(),'5.2.0');
+        $ok = false;
+    }
+
+    $funcs = explode(' ','addslashes call_user_func chmod copy fgets '.
+                         'file file_exists fseek flush filesize ftell fopen '.
+                         'glob header ignore_user_abort ini_get mail mkdir '.
+                         'ob_start opendir parse_ini_file readfile realpath '.
+                         'rename rmdir serialize session_start unlink usleep '.
+                         'preg_replace file_get_contents htmlspecialchars_decode '.
+                         'spl_autoload_register stream_select fsockopen pack');
+
+    if (!function_exists('mb_substr')) {
+        $funcs[] = 'utf8_encode';
+        $funcs[] = 'utf8_decode';
+    }
+
+    foreach($funcs as $func){
+        if(!function_exists($func)){
+            $error[] = sprintf($lang['i_funcna'],$func);
+            $ok = false;
+        }
+    }
+    return $ok;
+}
+
+/**
+ * Print language selection
+ *
+ * @author Andreas Gohr 
+ */
+function langsel(){
+    global $lang;
+    global $LC;
+
+    $dir = DOKU_INC.'inc/lang';
+    $dh  = opendir($dir);
+    if(!$dh) return;
+
+    $langs = array();
+    while (($file = readdir($dh)) !== false) {
+        if(preg_match('/^[\._]/',$file)) continue;
+        if(is_dir($dir.'/'.$file) && @file_exists($dir.'/'.$file.'/lang.php')){
+            $langs[] = $file;
+        }
+    }
+    closedir($dh);
+    sort($langs);
+
+    echo '
        ';
+    echo $lang['i_chooselang'];
+    echo ':  ';
+    echo '';
+    echo '
        ';
+}
+
+/**
+ * Print global error array
+ *
+ * @author Andreas Gohr 
+ */
+function print_errors(){
+    global $error;
+    if(!empty($error)) {
+        echo '
          ';
+        foreach ($error as $err){
+            echo "
        • $err
          • ";
+        }
+        echo '
        ';
+    }
+}
+
+/**
+ * remove magic quotes recursivly
+ *
+ * @author Andreas Gohr 
+ */
+function remove_magic_quotes(&$array) {
+    foreach (array_keys($array) as $key) {
+        if (is_array($array[$key])) {
+            remove_magic_quotes($array[$key]);
+        }else {
+            $array[$key] = stripslashes($array[$key]);
+        }
+    }
+}
+
diff --git a/sources/lib/exe/ajax.php b/sources/lib/exe/ajax.php
new file mode 100644
index 0000000..6e2011c
--- /dev/null
+++ b/sources/lib/exe/ajax.php
@@ -0,0 +1,453 @@
+
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+require_once(DOKU_INC.'inc/init.php');
+//close session
+session_write_close();
+
+header('Content-Type: text/html; charset=utf-8');
+
+//call the requested function
+if($INPUT->post->has('call')){
+    $call = $INPUT->post->str('call');
+}else if($INPUT->get->has('call')){
+    $call = $INPUT->get->str('call');
+}else{
+    exit;
+}
+$callfn = 'ajax_'.$call;
+
+if(function_exists($callfn)){
+    $callfn();
+}else{
+    $evt = new Doku_Event('AJAX_CALL_UNKNOWN', $call);
+    if ($evt->advise_before()) {
+        print "AJAX call '".htmlspecialchars($call)."' unknown!\n";
+        exit;
+    }
+    $evt->advise_after();
+    unset($evt);
+}
+
+/**
+ * Searches for matching pagenames
+ *
+ * @author Andreas Gohr 
+ */
+function ajax_qsearch(){
+    global $conf;
+    global $lang;
+    global $INPUT;
+
+    $maxnumbersuggestions = 50;
+
+    $query = $INPUT->post->str('q');
+    if(empty($query)) $query = $INPUT->get->str('q');
+    if(empty($query)) return;
+
+    $query = urldecode($query);
+
+    $data = ft_pageLookup($query, true, useHeading('navigation'));
+
+    if(!count($data)) return;
+
+    print ''.$lang['quickhits'].'';
+    print '
          ';
+    $counter = 0;
+    foreach($data as $id => $title){
+        if (useHeading('navigation')) {
+            $name = $title;
+        } else {
+            $ns = getNS($id);
+            if($ns){
+                $name = noNS($id).' ('.$ns.')';
+            }else{
+                $name = $id;
+            }
+        }
+        echo '
        • ' . html_wikilink(':'.$id,$name) . '
          • ';
+
+        $counter ++;
+        if($counter > $maxnumbersuggestions) {
+            echo '
        • ...
          • ';
+            break;
+        }
+    }
+    print '
        ';
+}
+
+/**
+ * Support OpenSearch suggestions
+ *
+ * @link   http://www.opensearch.org/Specifications/OpenSearch/Extensions/Suggestions/1.0
+ * @author Mike Frysinger 
+ */
+function ajax_suggestions() {
+    global $conf;
+    global $lang;
+    global $INPUT;
+
+    $query = cleanID($INPUT->post->str('q'));
+    if(empty($query)) $query = cleanID($INPUT->get->str('q'));
+    if(empty($query)) return;
+
+    $data = array();
+    $data = ft_pageLookup($query);
+    if(!count($data)) return;
+    $data = array_keys($data);
+
+    // limit results to 15 hits
+    $data = array_slice($data, 0, 15);
+    $data = array_map('trim',$data);
+    $data = array_map('noNS',$data);
+    $data = array_unique($data);
+    sort($data);
+
+    /* now construct a json */
+    $suggestions = array(
+                        $query,  // the original query
+                        $data,   // some suggestions
+                        array(), // no description
+                        array()  // no urls
+                   );
+    $json = new JSON();
+
+    header('Content-Type: application/x-suggestions+json');
+    print $json->encode($suggestions);
+}
+
+/**
+ * Refresh a page lock and save draft
+ *
+ * Andreas Gohr 
+ */
+function ajax_lock(){
+    global $conf;
+    global $lang;
+    global $ID;
+    global $INFO;
+    global $INPUT;
+
+    $ID = cleanID($INPUT->post->str('id'));
+    if(empty($ID)) return;
+
+    $INFO = pageinfo();
+
+    if (!$INFO['writable']) {
+        echo 'Permission denied';
+        return;
+    }
+
+    if(!checklock($ID)){
+        lock($ID);
+        echo 1;
+    }
+
+    if($conf['usedraft'] && $INPUT->post->str('wikitext')){
+        $client = $_SERVER['REMOTE_USER'];
+        if(!$client) $client = clientIP(true);
+
+        $draft = array('id'     => $ID,
+                'prefix' => substr($INPUT->post->str('prefix'), 0, -1),
+                'text'   => $INPUT->post->str('wikitext'),
+                'suffix' => $INPUT->post->str('suffix'),
+                'date'   => $INPUT->post->int('date'),
+                'client' => $client,
+                );
+        $cname = getCacheName($draft['client'].$ID,'.draft');
+        if(io_saveFile($cname,serialize($draft))){
+            echo $lang['draftdate'].' '.dformat();
+        }
+    }
+
+}
+
+/**
+ * Delete a draft
+ *
+ * @author Andreas Gohr 
+ */
+function ajax_draftdel(){
+    global $INPUT;
+    $id = cleanID($INPUT->str('id'));
+    if(empty($id)) return;
+
+    $client = $_SERVER['REMOTE_USER'];
+    if(!$client) $client = clientIP(true);
+
+    $cname = getCacheName($client.$id,'.draft');
+    @unlink($cname);
+}
+
+/**
+ * Return subnamespaces for the Mediamanager
+ *
+ * @author Andreas Gohr 
+ */
+function ajax_medians(){
+    global $conf;
+    global $INPUT;
+
+    // wanted namespace
+    $ns  = cleanID($INPUT->post->str('ns'));
+    $dir  = utf8_encodeFN(str_replace(':','/',$ns));
+
+    $lvl = count(explode(':',$ns));
+
+    $data = array();
+    search($data,$conf['mediadir'],'search_index',array('nofiles' => true),$dir);
+    foreach(array_keys($data) as $item){
+        $data[$item]['level'] = $lvl+1;
+    }
+    echo html_buildlist($data, 'idx', 'media_nstree_item', 'media_nstree_li');
+}
+
+/**
+ * Return list of files for the Mediamanager
+ *
+ * @author Andreas Gohr 
+ */
+function ajax_medialist(){
+    global $conf;
+    global $NS;
+    global $INPUT;
+
+    $NS = cleanID($INPUT->post->str('ns'));
+    $sort = $INPUT->post->bool('recent') ? 'date' : 'natural';
+    if ($INPUT->post->str('do') == 'media') {
+        tpl_mediaFileList();
+    } else {
+        tpl_mediaContent(true, $sort);
+    }
+}
+
+/**
+ * Return the content of the right column
+ * (image details) for the Mediamanager
+ *
+ * @author Kate Arzamastseva 
+ */
+function ajax_mediadetails(){
+    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf, $INPUT;
+    $fullscreen = true;
+    require_once(DOKU_INC.'lib/exe/mediamanager.php');
+
+    if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
+    if (isset($IMG)) $image = $IMG;
+    if (isset($JUMPTO)) $image = $JUMPTO;
+    if (isset($REV) && !$JUMPTO) $rev = $REV;
+
+    html_msgarea();
+    tpl_mediaFileDetails($image, $rev);
+}
+
+/**
+ * Returns image diff representation for mediamanager
+ * @author Kate Arzamastseva 
+ */
+function ajax_mediadiff(){
+    global $NS;
+    global $INPUT;
+
+    if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
+    $NS = $INPUT->post->str('ns');
+    $auth = auth_quickaclcheck("$NS:*");
+    media_diff($image, $NS, $auth, true);
+}
+
+function ajax_mediaupload(){
+    global $NS, $MSG, $INPUT;
+
+    if ($_FILES['qqfile']['tmp_name']) {
+        $id = $INPUT->post->str('mediaid', $_FILES['qqfile']['name']);
+    } elseif ($INPUT->get->has('qqfile')) {
+        $id = $INPUT->get->str('qqfile');
+    }
+
+    $id = cleanID($id);
+
+    $NS = $INPUT->str('ns');
+    $ns = $NS.':'.getNS($id);
+
+    $AUTH = auth_quickaclcheck("$ns:*");
+    if($AUTH >= AUTH_UPLOAD) { io_createNamespace("$ns:xxx", 'media'); }
+
+    if ($_FILES['qqfile']['error']) unset($_FILES['qqfile']);
+
+    if ($_FILES['qqfile']['tmp_name']) $res = media_upload($NS, $AUTH, $_FILES['qqfile']);
+    if ($INPUT->get->has('qqfile')) $res = media_upload_xhr($NS, $AUTH);
+
+    if ($res) $result = array('success' => true,
+        'link' => media_managerURL(array('ns' => $ns, 'image' => $NS.':'.$id), '&'),
+        'id' => $NS.':'.$id, 'ns' => $NS);
+
+    if (!$result) {
+        $error = '';
+        if (isset($MSG)) {
+            foreach($MSG as $msg) $error .= $msg['msg'];
+        }
+        $result = array('error' => $msg['msg'], 'ns' => $NS);
+    }
+    $json = new JSON;
+    echo htmlspecialchars($json->encode($result), ENT_NOQUOTES);
+}
+
+function dir_delete($path) {
+    if (!is_string($path) || $path == "") return false;
+
+    if (is_dir($path) && !is_link($path)) {
+        if (!$dh = @opendir($path)) return false;
+
+        while ($f = readdir($dh)) {
+            if ($f == '..' || $f == '.') continue;
+            dir_delete("$path/$f");
+        }
+
+        closedir($dh);
+        return @rmdir($path);
+    } else {
+        return @unlink($path);
+    }
+
+    return false;
+}
+
+/**
+ * Return sub index for index view
+ *
+ * @author Andreas Gohr 
+ */
+function ajax_index(){
+    global $conf;
+    global $INPUT;
+
+    // wanted namespace
+    $ns  = cleanID($INPUT->post->str('idx'));
+    $dir  = utf8_encodeFN(str_replace(':','/',$ns));
+
+    $lvl = count(explode(':',$ns));
+
+    $data = array();
+    search($data,$conf['datadir'],'search_index',array('ns' => $ns),$dir);
+    foreach(array_keys($data) as $item){
+        $data[$item]['level'] = $lvl+1;
+    }
+    echo html_buildlist($data, 'idx', 'html_list_index', 'html_li_index');
+}
+
+/**
+ * List matching namespaces and pages for the link wizard
+ *
+ * @author Andreas Gohr 
+ */
+function ajax_linkwiz(){
+    global $conf;
+    global $lang;
+    global $INPUT;
+
+    $q  = ltrim(trim($INPUT->post->str('q')),':');
+    $id = noNS($q);
+    $ns = getNS($q);
+
+    $ns = cleanID($ns);
+    $id = cleanID($id);
+
+    $nsd  = utf8_encodeFN(str_replace(':','/',$ns));
+    $idd  = utf8_encodeFN(str_replace(':','/',$id));
+
+    $data = array();
+    if($q && !$ns){
+
+        // use index to lookup matching pages
+        $pages = array();
+        $pages = ft_pageLookup($id,true);
+
+        // result contains matches in pages and namespaces
+        // we now extract the matching namespaces to show
+        // them seperately
+        $dirs  = array();
+
+        foreach($pages as $pid => $title){
+            if(strpos(noNS($pid),$id) === false){
+                // match was in the namespace
+                $dirs[getNS($pid)] = 1; // assoc array avoids dupes
+            }else{
+                // it is a matching page, add it to the result
+                $data[] = array(
+                        'id'    => $pid,
+                        'title' => $title,
+                        'type'  => 'f',
+                        );
+            }
+            unset($pages[$pid]);
+        }
+        foreach($dirs as $dir => $junk){
+            $data[] = array(
+                    'id'   => $dir,
+                    'type' => 'd',
+                    );
+        }
+
+    }else{
+
+        $opts = array(
+                'depth' => 1,
+                'listfiles' => true,
+                'listdirs'  => true,
+                'pagesonly' => true,
+                'firsthead' => true,
+                'sneakyacl' => $conf['sneaky_index'],
+                );
+        if($id) $opts['filematch'] = '^.*\/'.$id;
+        if($id) $opts['dirmatch']  = '^.*\/'.$id;
+        search($data,$conf['datadir'],'search_universal',$opts,$nsd);
+
+        // add back to upper
+        if($ns){
+            array_unshift($data,array(
+                        'id'   => getNS($ns),
+                        'type' => 'u',
+                        ));
+        }
+    }
+
+    // fixme sort results in a useful way ?
+
+    if(!count($data)){
+        echo $lang['nothingfound'];
+        exit;
+    }
+
+    // output the found data
+    $even = 1;
+    foreach($data as $item){
+        $even *= -1; //zebra
+
+        if(($item['type'] == 'd' || $item['type'] == 'u') && $item['id']) $item['id'] .= ':';
+        $link = wl($item['id']);
+
+        echo '
        ';
+
+        if($item['type'] == 'u'){
+            $name = $lang['upperns'];
+        }else{
+            $name = htmlspecialchars($item['id']);
+        }
+
+        echo ''.$name.'';
+
+        if($item['title']){
+            echo ''.htmlspecialchars($item['title']).'';
+        }
+        echo '
        ';
+    }
+
+}
+
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/lib/exe/css.php b/sources/lib/exe/css.php
new file mode 100644
index 0000000..c96dedd
--- /dev/null
+++ b/sources/lib/exe/css.php
@@ -0,0 +1,589 @@
+
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching)
+if(!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT',1); // we gzip ourself here
+if(!defined('NL')) define('NL',"\n");
+require_once(DOKU_INC.'inc/init.php');
+
+// Main (don't run when UNIT test)
+if(!defined('SIMPLE_TEST')){
+    header('Content-Type: text/css; charset=utf-8');
+    css_out();
+}
+
+
+// ---------------------- functions ------------------------------
+
+/**
+ * Output all needed Styles
+ *
+ * @author Andreas Gohr 
+ */
+function css_out(){
+    global $conf;
+    global $lang;
+    global $config_cascade;
+    global $INPUT;
+
+    if ($INPUT->str('s') == 'feed') {
+        $mediatypes = array('feed');
+        $type = 'feed';
+    } else {
+        $mediatypes = array('screen', 'all', 'print');
+        $type = '';
+    }
+
+    // decide from where to get the template
+    $tpl = trim(preg_replace('/[^\w-]+/','',$INPUT->str('t')));
+    if(!$tpl) $tpl = $conf['template'];
+
+    // The generated script depends on some dynamic options
+    $cache = new cache('styles'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'].DOKU_BASE.$tpl.$type,'.css');
+
+    // load styl.ini
+    $styleini = css_styleini($tpl);
+
+    // if old 'default' userstyle setting exists, make it 'screen' userstyle for backwards compatibility
+    if (isset($config_cascade['userstyle']['default'])) {
+        $config_cascade['userstyle']['screen'] = $config_cascade['userstyle']['default'];
+    }
+
+    // cache influencers
+    $tplinc = tpl_basedir($tpl);
+    $cache_files = getConfigFiles('main');
+    $cache_files[] = $tplinc.'style.ini';
+    $cache_files[] = $tplinc.'style.local.ini'; // @deprecated
+    $cache_files[] = DOKU_CONF."tpl/$tpl/style.ini";
+    $cache_files[] = __FILE__;
+
+    // Array of needed files and their web locations, the latter ones
+    // are needed to fix relative paths in the stylesheets
+    $files = array();
+    foreach($mediatypes as $mediatype) {
+        $files[$mediatype] = array();
+        // load core styles
+        $files[$mediatype][DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/';
+        // load jQuery-UI theme
+        if ($mediatype == 'screen') {
+            $files[$mediatype][DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/';
+        }
+        // load plugin styles
+        $files[$mediatype] = array_merge($files[$mediatype], css_pluginstyles($mediatype));
+        // load template styles
+        if (isset($styleini['stylesheets'][$mediatype])) {
+            $files[$mediatype] = array_merge($files[$mediatype], $styleini['stylesheets'][$mediatype]);
+        }
+        // load user styles
+        if(isset($config_cascade['userstyle'][$mediatype])){
+            $files[$mediatype][$config_cascade['userstyle'][$mediatype]] = DOKU_BASE;
+        }
+
+        $cache_files = array_merge($cache_files, array_keys($files[$mediatype]));
+    }
+
+    // check cache age & handle conditional request
+    // This may exit if a cache can be used
+    http_cached($cache->cache,
+                $cache->useCache(array('files' => $cache_files)));
+
+    // start output buffering
+    ob_start();
+
+    // build the stylesheet
+    foreach ($mediatypes as $mediatype) {
+
+        // print the default classes for interwiki links and file downloads
+        if ($mediatype == 'screen') {
+            print '@media screen {';
+            css_interwiki();
+            css_filetypes();
+            print '}';
+        }
+
+        // load files
+        $css_content = '';
+        foreach($files[$mediatype] as $file => $location){
+            $display = str_replace(fullpath(DOKU_INC), '', fullpath($file));
+            $css_content .= "\n/* XXXXXXXXX $display XXXXXXXXX */\n";
+            $css_content .= css_loadfile($file, $location);
+        }
+        switch ($mediatype) {
+            case 'screen':
+                print NL.'@media screen { /* START screen styles */'.NL.$css_content.NL.'} /* /@media END screen styles */'.NL;
+                break;
+            case 'print':
+                print NL.'@media print { /* START print styles */'.NL.$css_content.NL.'} /* /@media END print styles */'.NL;
+                break;
+            case 'all':
+            case 'feed':
+            default:
+                print NL.'/* START rest styles */ '.NL.$css_content.NL.'/* END rest styles */'.NL;
+                break;
+        }
+    }
+    // end output buffering and get contents
+    $css = ob_get_contents();
+    ob_end_clean();
+
+    // apply style replacements
+    $css = css_applystyle($css, $styleini['replacements']);
+
+    // parse less
+    $css = css_parseless($css);
+
+    // compress whitespace and comments
+    if($conf['compress']){
+        $css = css_compress($css);
+    }
+
+    // embed small images right into the stylesheet
+    if($conf['cssdatauri']){
+        $base = preg_quote(DOKU_BASE,'#');
+        $css = preg_replace_callback('#(url\([ \'"]*)('.$base.')(.*?(?:\.(png|gif)))#i','css_datauri',$css);
+    }
+
+    http_cached_finish($cache->cache, $css);
+}
+
+/**
+ * Uses phpless to parse LESS in our CSS
+ *
+ * most of this function is error handling to show a nice useful error when
+ * LESS compilation fails
+ *
+ * @param $css
+ * @return string
+ */
+function css_parseless($css) {
+    $less = new lessc();
+    $less->importDir[] = DOKU_INC;
+
+    if (defined('DOKU_UNITTEST')){
+        $less->importDir[] = TMP_DIR;
+    }
+
+    try {
+        return $less->compile($css);
+    } catch(Exception $e) {
+        // get exception message
+        $msg = str_replace(array("\n", "\r", "'"), array(), $e->getMessage());
+
+        // try to use line number to find affected file
+        if(preg_match('/line: (\d+)$/', $msg, $m)){
+            $msg = substr($msg, 0, -1* strlen($m[0])); //remove useless linenumber
+            $lno = $m[1];
+
+            // walk upwards to last include
+            $lines = explode("\n", $css);
+            for($i=$lno-1; $i>=0; $i--){
+                if(preg_match('/\/(\* XXXXXXXXX )(.*?)( XXXXXXXXX \*)\//', $lines[$i], $m)){
+                    // we found it, add info to message
+                    $msg .= ' in '.$m[2].' at line '.($lno-$i);
+                    break;
+                }
+            }
+        }
+
+        // something went wrong
+        $error = 'A fatal error occured during compilation of the CSS files. '.
+            'If you recently installed a new plugin or template it '.
+            'might be broken and you should try disabling it again. ['.$msg.']';
+
+        echo ".dokuwiki:before {
+            content: '$error';
+            background-color: red;
+            display: block;
+            background-color: #fcc;
+            border-color: #ebb;
+            color: #000;
+            padding: 0.5em;
+        }";
+
+        exit;
+    }
+}
+
+/**
+ * Does placeholder replacements in the style according to
+ * the ones defined in a templates style.ini file
+ *
+ * This also adds the ini defined placeholders as less variables
+ * (sans the surrounding __ and with a ini_ prefix)
+ *
+ * @author Andreas Gohr 
+ */
+function css_applystyle($css, $replacements) {
+    // we convert ini replacements to LESS variable names
+    // and build a list of variable: value; pairs
+    $less = '';
+    foreach((array) $replacements as $key => $value) {
+        $lkey = trim($key, '_');
+        $lkey = '@ini_'.$lkey;
+        $less .= "$lkey: $value;\n";
+
+        $replacements[$key] = $lkey;
+    }
+
+    // we now replace all old ini replacements with LESS variables
+    $css = strtr($css, $replacements);
+
+    // now prepend the list of LESS variables as the very first thing
+    $css = $less.$css;
+    return $css;
+}
+
+/**
+ * Load style ini contents
+ *
+ * Loads and merges style.ini files from template and config and prepares
+ * the stylesheet modes
+ *
+ * @author Andreas Gohr 
+ * @param string $tpl the used template
+ * @return array with keys 'stylesheets' and 'replacements'
+ */
+function css_styleini($tpl) {
+    $stylesheets = array(); // mode, file => base
+    $replacements = array(); // placeholder => value
+
+    // load template's style.ini
+    $incbase = tpl_incdir($tpl);
+    $webbase = tpl_basedir($tpl);
+    $ini = $incbase.'style.ini';
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
+
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
+        }
+    }
+
+    // load template's style.local.ini
+    // @deprecated 2013-08-03
+    $ini = $incbase.'style.local.ini';
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
+
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
+        }
+    }
+
+    // load configs's style.ini
+    $webbase = DOKU_BASE;
+    $ini = DOKU_CONF."tpl/$tpl/style.ini";
+    $incbase = dirname($ini).'/';
+    if(file_exists($ini)){
+        $data = parse_ini_file($ini, true);
+
+        // stylesheets
+        if(is_array($data['stylesheets'])) foreach($data['stylesheets'] as $file => $mode){
+            $stylesheets[$mode][$incbase.$file] = $webbase;
+        }
+
+        // replacements
+        if(is_array($data['replacements'])){
+            $replacements = array_merge($replacements, css_fixreplacementurls($data['replacements'],$webbase));
+        }
+    }
+
+    return array(
+        'stylesheets' => $stylesheets,
+        'replacements' => $replacements
+    );
+}
+
+/**
+ * Amend paths used in replacement relative urls, refer FS#2879
+ *
+ * @author Chris Smith 
+ */
+function css_fixreplacementurls($replacements, $location) {
+    foreach($replacements as $key => $value) {
+        $replacements[$key] = preg_replace('#(url\([ \'"]*)(?!/|data:|http://|https://| |\'|")#','\\1'.$location,$value);
+    }
+    return $replacements;
+}
+
+/**
+ * Prints classes for interwikilinks
+ *
+ * Interwiki links have two classes: 'interwiki' and 'iw_$name>' where
+ * $name is the identifier given in the config. All Interwiki links get
+ * an default style with a default icon. If a special icon is available
+ * for an interwiki URL it is set in it's own class. Both classes can be
+ * overwritten in the template or userstyles.
+ *
+ * @author Andreas Gohr 
+ */
+function css_interwiki(){
+
+    // default style
+    echo 'a.interwiki {';
+    echo ' background: transparent url('.DOKU_BASE.'lib/images/interwiki.png) 0px 1px no-repeat;';
+    echo ' padding: 1px 0px 1px 16px;';
+    echo '}';
+
+    // additional styles when icon available
+    $iwlinks = getInterwiki();
+    foreach(array_keys($iwlinks) as $iw){
+        $class = preg_replace('/[^_\-a-z0-9]+/i','_',$iw);
+        if(@file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.png')){
+            echo "a.iw_$class {";
+            echo '  background-image: url('.DOKU_BASE.'lib/images/interwiki/'.$iw.'.png)';
+            echo '}';
+        }elseif(@file_exists(DOKU_INC.'lib/images/interwiki/'.$iw.'.gif')){
+            echo "a.iw_$class {";
+            echo '  background-image: url('.DOKU_BASE.'lib/images/interwiki/'.$iw.'.gif)';
+            echo '}';
+        }
+    }
+}
+
+/**
+ * Prints classes for file download links
+ *
+ * @author Andreas Gohr 
+ */
+function css_filetypes(){
+
+    // default style
+    echo '.mediafile {';
+    echo ' background: transparent url('.DOKU_BASE.'lib/images/fileicons/file.png) 0px 1px no-repeat;';
+    echo ' padding-left: 18px;';
+    echo ' padding-bottom: 1px;';
+    echo '}';
+
+    // additional styles when icon available
+    // scan directory for all icons
+    $exts = array();
+    if($dh = opendir(DOKU_INC.'lib/images/fileicons')){
+        while(false !== ($file = readdir($dh))){
+            if(preg_match('/([_\-a-z0-9]+(?:\.[_\-a-z0-9]+)*?)\.(png|gif)/i',$file,$match)){
+                $ext = strtolower($match[1]);
+                $type = '.'.strtolower($match[2]);
+                if($ext!='file' && (!isset($exts[$ext]) || $type=='.png')){
+                    $exts[$ext] = $type;
+                }
+            }
+        }
+        closedir($dh);
+    }
+    foreach($exts as $ext=>$type){
+        $class = preg_replace('/[^_\-a-z0-9]+/','_',$ext);
+        echo ".mf_$class {";
+        echo '  background-image: url('.DOKU_BASE.'lib/images/fileicons/'.$ext.$type.')';
+        echo '}';
+    }
+}
+
+/**
+ * Loads a given file and fixes relative URLs with the
+ * given location prefix
+ */
+function css_loadfile($file,$location=''){
+    $css_file = new DokuCssFile($file);
+    return $css_file->load($location);
+}
+
+/**
+ *  Helper class to abstract loading of css/less files
+ *
+ *  @author Chris Smith 
+ */
+class DokuCssFile {
+
+    protected $filepath;             // file system path to the CSS/Less file
+    protected $location;             // base url location of the CSS/Less file
+    private   $relative_path = null;
+
+    public function __construct($file) {
+        $this->filepath = $file;
+    }
+
+    /**
+     * Load the contents of the css/less file and adjust any relative paths/urls (relative to this file) to be
+     * relative to the dokuwiki root: the web root (DOKU_BASE) for most files; the file system root (DOKU_INC)
+     * for less files.
+     *
+     * @param   string   $location   base url for this file
+     * @return  string               the CSS/Less contents of the file
+     */
+    public function load($location='') {
+        if (!@file_exists($this->filepath)) return '';
+
+        $css = io_readFile($this->filepath);
+        if (!$location) return $css;
+
+        $this->location = $location;
+
+        $css = preg_replace_callback('#(url\( *)([\'"]?)(.*?)(\2)( *\))#',array($this,'replacements'),$css);
+        $css = preg_replace_callback('#(@import\s+)([\'"])(.*?)(\2)#',array($this,'replacements'),$css);
+
+        return $css;
+    }
+
+    /**
+     * Get the relative file system path of this file, relative to dokuwiki's root folder, DOKU_INC
+     *
+     * @return string   relative file system path
+     */
+    private function getRelativePath(){
+
+        if (is_null($this->relative_path)) {
+            $basedir = array(DOKU_INC);
+
+            // during testing, files may be found relative to a second base dir, TMP_DIR
+            if (defined('DOKU_UNITTEST')) {
+                $basedir[] = realpath(TMP_DIR);
+            }
+            $regex = '#^('.join('|',$basedir).')#';
+
+            $this->relative_path = preg_replace($regex, '', dirname($this->filepath));
+        }
+
+        return $this->relative_path;
+    }
+
+    /**
+     * preg_replace callback to adjust relative urls from relative to this file to relative
+     * to the appropriate dokuwiki root location as described in the code
+     *
+     * @param  array    see http://php.net/preg_replace_callback
+     * @return string   see http://php.net/preg_replace_callback
+     */
+    public function replacements($match) {
+
+        // not a relative url? - no adjustment required
+        if (preg_match('#^(/|data:|https?://)#',$match[3])) {
+            return $match[0];
+        }
+        // a less file import? - requires a file system location
+        else if (substr($match[3],-5) == '.less') {
+            if ($match[3]{0} != '/') {
+                $match[3] = $this->getRelativePath() . '/' . $match[3];
+            }
+        }
+        // everything else requires a url adjustment
+        else {
+            $match[3] = $this->location . $match[3];
+        }
+
+        return join('',array_slice($match,1));
+    }
+}
+
+/**
+ * Convert local image URLs to data URLs if the filesize is small
+ *
+ * Callback for preg_replace_callback
+ */
+function css_datauri($match){
+    global $conf;
+
+    $pre   = unslash($match[1]);
+    $base  = unslash($match[2]);
+    $url   = unslash($match[3]);
+    $ext   = unslash($match[4]);
+
+    $local = DOKU_INC.$url;
+    $size  = @filesize($local);
+    if($size && $size < $conf['cssdatauri']){
+        $data = base64_encode(file_get_contents($local));
+    }
+    if($data){
+        $url = 'data:image/'.$ext.';base64,'.$data;
+    }else{
+        $url = $base.$url;
+    }
+    return $pre.$url;
+}
+
+
+/**
+ * Returns a list of possible Plugin Styles (no existance check here)
+ *
+ * @author Andreas Gohr 
+ */
+function css_pluginstyles($mediatype='screen'){
+    global $lang;
+    $list = array();
+    $plugins = plugin_list();
+    foreach ($plugins as $p){
+        $list[DOKU_PLUGIN."$p/$mediatype.css"]  = DOKU_BASE."lib/plugins/$p/";
+        $list[DOKU_PLUGIN."$p/$mediatype.less"]  = DOKU_BASE."lib/plugins/$p/";
+        // alternative for screen.css
+        if ($mediatype=='screen') {
+            $list[DOKU_PLUGIN."$p/style.css"]  = DOKU_BASE."lib/plugins/$p/";
+            $list[DOKU_PLUGIN."$p/style.less"]  = DOKU_BASE."lib/plugins/$p/";
+        }
+    }
+    return $list;
+}
+
+/**
+ * Very simple CSS optimizer
+ *
+ * @author Andreas Gohr 
+ */
+function css_compress($css){
+    //strip comments through a callback
+    $css = preg_replace_callback('#(/\*)(.*?)(\*/)#s','css_comment_cb',$css);
+
+    //strip (incorrect but common) one line comments
+    $css = preg_replace('/(? 1em)
+    $css = preg_replace('/(?
+ */
+function css_comment_cb($matches){
+    if(strlen($matches[2]) > 4) return '';
+    return $matches[0];
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/exe/detail.php b/sources/lib/exe/detail.php
new file mode 100644
index 0000000..cd3f362
--- /dev/null
+++ b/sources/lib/exe/detail.php
@@ -0,0 +1,52 @@
+str('id'));
+
+// this makes some general info available as well as the info about the
+// "parent" page
+$INFO = array_merge(pageinfo(),mediainfo());
+
+$tmp = array();
+trigger_event('DETAIL_STARTED', $tmp);
+
+//close session
+session_write_close();
+
+if($conf['allowdebug'] && $INPUT->has('debug')){
+    print '
        ';
+    foreach(explode(' ','basedir userewrite baseurl useslash') as $x){
+        print '$'."conf['$x'] = '".$conf[$x]."';\n";
+    }
+    foreach(explode(' ','DOCUMENT_ROOT HTTP_HOST SCRIPT_FILENAME PHP_SELF '.
+                'REQUEST_URI SCRIPT_NAME PATH_INFO PATH_TRANSLATED') as $x){
+        print '$'."_SERVER['$x'] = '".$_SERVER[$x]."';\n";
+    }
+    print "getID('media'): ".getID('media')."\n";
+    print "getID('media',false): ".getID('media',false)."\n";
+    print '
        ';
+}
+
+$ERROR = false;
+// check image permissions
+$AUTH = auth_quickaclcheck($IMG);
+if($AUTH >= AUTH_READ){
+    // check if image exists
+    $SRC = mediaFN($IMG);
+    if(!@file_exists($SRC)){
+        //doesn't exist!
+        http_status(404);
+        $ERROR = 'File not found';
+    }
+}else{
+    // no auth
+    $ERROR = p_locale_xhtml('denied');
+}
+
+//start output and load template
+header('Content-Type: text/html; charset=utf-8');
+include(template('detail.php'));
+
diff --git a/sources/lib/exe/fetch.php b/sources/lib/exe/fetch.php
new file mode 100644
index 0000000..5967494
--- /dev/null
+++ b/sources/lib/exe/fetch.php
@@ -0,0 +1,99 @@
+
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC', dirname(__FILE__).'/../../');
+if (!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT', 1);
+require_once(DOKU_INC.'inc/init.php');
+session_write_close(); //close session
+
+require_once(DOKU_INC.'inc/fetch.functions.php');
+
+if (defined('SIMPLE_TEST')) {
+    $INPUT = new Input();
+}
+
+// BEGIN main
+    $mimetypes = getMimeTypes();
+
+    //get input
+    $MEDIA  = stripctl(getID('media', false)); // no cleaning except control chars - maybe external
+    $CACHE  = calc_cache($INPUT->str('cache'));
+    $WIDTH  = $INPUT->int('w');
+    $HEIGHT = $INPUT->int('h');
+    $REV    = & $INPUT->ref('rev');
+    //sanitize revision
+    $REV = preg_replace('/[^0-9]/', '', $REV);
+
+    list($EXT, $MIME, $DL) = mimetype($MEDIA, false);
+    if($EXT === false) {
+        $EXT  = 'unknown';
+        $MIME = 'application/octet-stream';
+        $DL   = true;
+    }
+
+    // check for permissions, preconditions and cache external files
+    list($STATUS, $STATUSMESSAGE) = checkFileStatus($MEDIA, $FILE, $REV, $WIDTH, $HEIGHT);
+
+    // prepare data for plugin events
+    $data = array(
+        'media'         => $MEDIA,
+        'file'          => $FILE,
+        'orig'          => $FILE,
+        'mime'          => $MIME,
+        'download'      => $DL,
+        'cache'         => $CACHE,
+        'ext'           => $EXT,
+        'width'         => $WIDTH,
+        'height'        => $HEIGHT,
+        'status'        => $STATUS,
+        'statusmessage' => $STATUSMESSAGE,
+        'ispublic'      => media_ispublic($MEDIA),
+    );
+
+    // handle the file status
+    $evt = new Doku_Event('FETCH_MEDIA_STATUS', $data);
+    if($evt->advise_before()) {
+        // redirects
+        if($data['status'] > 300 && $data['status'] <= 304) {
+            if (defined('SIMPLE_TEST')) return; //TestResponse doesn't recognize redirects
+            send_redirect($data['statusmessage']);
+        }
+        // send any non 200 status
+        if($data['status'] != 200) {
+            http_status($data['status'], $data['statusmessage']);
+        }
+        // die on errors
+        if($data['status'] > 203) {
+            print $data['statusmessage'];
+            if (defined('SIMPLE_TEST')) return;
+            exit;
+        }
+    }
+    $evt->advise_after();
+    unset($evt);
+
+    //handle image resizing/cropping
+    if((substr($MIME, 0, 5) == 'image') && $WIDTH) {
+        if($HEIGHT) {
+            $data['file'] = $FILE = media_crop_image($data['file'], $EXT, $WIDTH, $HEIGHT);
+        } else {
+            $data['file'] = $FILE = media_resize_image($data['file'], $EXT, $WIDTH, $HEIGHT);
+        }
+    }
+
+    // finally send the file to the client
+    $evt = new Doku_Event('MEDIA_SENDFILE', $data);
+    if($evt->advise_before()) {
+        sendFile($data['file'], $data['mime'], $data['download'], $data['cache'], $data['ispublic']);
+    }
+    // Do something after the download finished.
+    $evt->advise_after();  // will not be emitted on 304 or x-sendfile
+
+// END DO main
+
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/lib/exe/index.html b/sources/lib/exe/index.html
new file mode 100644
index 0000000..977f90e
--- /dev/null
+++ b/sources/lib/exe/index.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+nothing here...
+
+
+
+
+
diff --git a/sources/lib/exe/indexer.php b/sources/lib/exe/indexer.php
new file mode 100644
index 0000000..3ab1177
--- /dev/null
+++ b/sources/lib/exe/indexer.php
@@ -0,0 +1,208 @@
+
+ */
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+define('DOKU_DISABLE_GZIP_OUTPUT',1);
+require_once(DOKU_INC.'inc/init.php');
+session_write_close();  //close session
+if(!defined('NL')) define('NL',"\n");
+
+// keep running after browser closes connection
+@ignore_user_abort(true);
+
+// check if user abort worked, if yes send output early
+$defer = !@ignore_user_abort() || $conf['broken_iua'];
+$output = $INPUT->has('debug') && $conf['allowdebug'];
+if(!$defer && !$output){
+    sendGIF(); // send gif
+}
+
+$ID = cleanID($INPUT->str('id'));
+
+// Catch any possible output (e.g. errors)
+if(!$output) ob_start();
+else header('Content-Type: text/plain');
+
+// run one of the jobs
+$tmp = array(); // No event data
+$evt = new Doku_Event('INDEXER_TASKS_RUN', $tmp);
+if ($evt->advise_before()) {
+    runIndexer() or
+    runSitemapper() or
+    sendDigest() or
+    runTrimRecentChanges() or
+    runTrimRecentChanges(true) or
+    $evt->advise_after();
+}
+
+if(!$output) {
+    ob_end_clean();
+    if($defer) sendGIF();
+}
+
+exit;
+
+// --------------------------------------------------------------------
+
+/**
+ * Trims the recent changes cache (or imports the old changelog) as needed.
+ *
+ * @param media_changes If the media changelog shall be trimmed instead of
+ * the page changelog
+ *
+ * @author Ben Coburn 
+ */
+function runTrimRecentChanges($media_changes = false) {
+    global $conf;
+
+    echo "runTrimRecentChanges($media_changes): started".NL;
+
+    $fn = ($media_changes ? $conf['media_changelog'] : $conf['changelog']);
+
+    // Trim the Recent Changes
+    // Trims the recent changes cache to the last $conf['changes_days'] recent
+    // changes or $conf['recent'] items, which ever is larger.
+    // The trimming is only done once a day.
+    if (@file_exists($fn) &&
+        (@filemtime($fn.'.trimmed')+86400) 0) {
+              ksort($old_lines);
+              $out_lines = array_merge(array_slice($old_lines,-$extra),$out_lines);
+            }
+
+            // save trimmed changelog
+            io_saveFile($fn.'_tmp', implode('', $out_lines));
+            @unlink($fn);
+            if (!rename($fn.'_tmp', $fn)) {
+                // rename failed so try another way...
+                io_unlock($fn);
+                io_saveFile($fn, implode('', $out_lines));
+                @unlink($fn.'_tmp');
+            } else {
+                io_unlock($fn);
+            }
+            echo "runTrimRecentChanges($media_changes): finished".NL;
+            return true;
+    }
+
+    // nothing done
+    echo "runTrimRecentChanges($media_changes): finished".NL;
+    return false;
+}
+
+/**
+ * Runs the indexer for the current page
+ *
+ * @author Andreas Gohr 
+ */
+function runIndexer(){
+    global $ID;
+    global $conf;
+    print "runIndexer(): started".NL;
+
+    if(!$ID) return false;
+
+    // do the work
+    return idx_addPage($ID, true);
+}
+
+/**
+ * Builds a Google Sitemap of all public pages known to the indexer
+ *
+ * The map is placed in the root directory named sitemap.xml.gz - This
+ * file needs to be writable!
+ *
+ * @author Andreas Gohr
+ * @link   https://www.google.com/webmasters/sitemaps/docs/en/about.html
+ */
+function runSitemapper(){
+    print "runSitemapper(): started".NL;
+    $result = Sitemapper::generate() && Sitemapper::pingSearchEngines();
+    print 'runSitemapper(): finished'.NL;
+    return $result;
+}
+
+/**
+ * Send digest and list mails for all subscriptions which are in effect for the
+ * current page
+ *
+ * @author Adrian Lang 
+ */
+function sendDigest() {
+    global $conf;
+    global $ID;
+
+    echo 'sendDigest(): started'.NL;
+    if(!actionOK('subscribe')) {
+        echo 'sendDigest(): disabled'.NL;
+        return false;
+    }
+    $sub = new Subscription();
+    $sent = $sub->send_bulk($ID);
+
+    echo "sendDigest(): sent $sent mails".NL;
+    echo 'sendDigest(): finished'.NL;
+    return (bool) $sent;
+}
+
+/**
+ * Just send a 1x1 pixel blank gif to the browser
+ *
+ * @author Andreas Gohr 
+ * @author Harry Fuecks 
+ */
+function sendGIF(){
+    $img = base64_decode('R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAEALAAAAAABAAEAAAIBTAA7');
+    header('Content-Type: image/gif');
+    header('Content-Length: '.strlen($img));
+    header('Connection: Close');
+    print $img;
+    flush();
+    // Browser should drop connection after this
+    // Thinks it's got the whole image
+}
+
+//Setup VIM: ex: et ts=4 :
+// No trailing PHP closing tag - no output please!
+// See Note at http://www.php.net/manual/en/language.basic-syntax.instruction-separation.php
diff --git a/sources/lib/exe/js.php b/sources/lib/exe/js.php
new file mode 100644
index 0000000..040b887
--- /dev/null
+++ b/sources/lib/exe/js.php
@@ -0,0 +1,404 @@
+
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching)
+if(!defined('NL')) define('NL',"\n");
+if(!defined('DOKU_DISABLE_GZIP_OUTPUT')) define('DOKU_DISABLE_GZIP_OUTPUT',1); // we gzip ourself here
+require_once(DOKU_INC.'inc/init.php');
+
+// Main (don't run when UNIT test)
+if(!defined('SIMPLE_TEST')){
+    header('Content-Type: text/javascript; charset=utf-8');
+    js_out();
+}
+
+
+// ---------------------- functions ------------------------------
+
+/**
+ * Output all needed JavaScript
+ *
+ * @author Andreas Gohr 
+ */
+function js_out(){
+    global $conf;
+    global $lang;
+    global $config_cascade;
+
+    // The generated script depends on some dynamic options
+    $cache = new cache('scripts'.$_SERVER['HTTP_HOST'].$_SERVER['SERVER_PORT'],'.js');
+    $cache->_event = 'JS_CACHE_USE';
+
+    // load minified version for some files
+    $min = $conf['compress'] ? '.min' : '';
+
+    // array of core files
+    $files = array(
+                DOKU_INC."lib/scripts/jquery/jquery$min.js",
+                DOKU_INC.'lib/scripts/jquery/jquery.cookie.js',
+                DOKU_INC."lib/scripts/jquery/jquery-ui$min.js",
+                DOKU_INC."lib/scripts/jquery/jquery-migrate$min.js",
+                DOKU_INC."lib/scripts/fileuploader.js",
+                DOKU_INC."lib/scripts/fileuploaderextended.js",
+                DOKU_INC.'lib/scripts/helpers.js',
+                DOKU_INC.'lib/scripts/delay.js',
+                DOKU_INC.'lib/scripts/cookie.js',
+                DOKU_INC.'lib/scripts/script.js',
+                DOKU_INC.'lib/scripts/tw-sack.js',
+                DOKU_INC.'lib/scripts/qsearch.js',
+                DOKU_INC.'lib/scripts/tree.js',
+                DOKU_INC.'lib/scripts/index.js',
+                DOKU_INC.'lib/scripts/drag.js',
+                DOKU_INC.'lib/scripts/textselection.js',
+                DOKU_INC.'lib/scripts/toolbar.js',
+                DOKU_INC.'lib/scripts/edit.js',
+                DOKU_INC.'lib/scripts/editor.js',
+                DOKU_INC.'lib/scripts/locktimer.js',
+                DOKU_INC.'lib/scripts/linkwiz.js',
+                DOKU_INC.'lib/scripts/media.js',
+# deprecated                DOKU_INC.'lib/scripts/compatibility.js',
+# disabled for FS#1958                DOKU_INC.'lib/scripts/hotkeys.js',
+                DOKU_INC.'lib/scripts/behaviour.js',
+                DOKU_INC.'lib/scripts/page.js',
+                tpl_incdir().'script.js',
+            );
+
+    // add possible plugin scripts and userscript
+    $files   = array_merge($files,js_pluginscripts());
+    if(isset($config_cascade['userscript']['default'])){
+        $files[] = $config_cascade['userscript']['default'];
+    }
+
+    $cache_files = array_merge($files, getConfigFiles('main'));
+    $cache_files[] = __FILE__;
+
+    // check cache age & handle conditional request
+    // This may exit if a cache can be used
+    $cache_ok = $cache->useCache(array('files' => $cache_files));
+    http_cached($cache->cache, $cache_ok);
+
+    // start output buffering and build the script
+    ob_start();
+
+    $json = new JSON();
+    // add some global variables
+    print "var DOKU_BASE   = '".DOKU_BASE."';";
+    print "var DOKU_TPL    = '".tpl_basedir()."';";
+    print "var DOKU_COOKIE_PARAM = " . $json->encode(
+            array(
+                 'path' => empty($conf['cookiedir']) ? DOKU_REL : $conf['cookiedir'],
+                 'secure' => $conf['securecookie'] && is_ssl()
+            )).";";
+    // FIXME: Move those to JSINFO
+    print "var DOKU_UHN    = ".((int) useHeading('navigation')).";";
+    print "var DOKU_UHC    = ".((int) useHeading('content')).";";
+
+    // load JS specific translations
+    $lang['js']['plugins'] = js_pluginstrings();
+    $templatestrings = js_templatestrings();
+    if(!empty($templatestrings)) {
+        $lang['js']['template'] = $templatestrings;
+    }
+    echo 'LANG = '.$json->encode($lang['js']).";\n";
+
+    // load toolbar
+    toolbar_JSdefines('toolbar');
+
+    // load files
+    foreach($files as $file){
+        $ismin = (substr($file,-7) == '.min.js');
+        $debugjs = ($conf['allowdebug'] && strpos($file, DOKU_INC.'lib/scripts/') !== 0);
+
+        echo "\n\n/* XXXXXXXXXX begin of ".str_replace(DOKU_INC, '', $file) ." XXXXXXXXXX */\n\n";
+        if($ismin) echo "\n/* BEGIN NOCOMPRESS */\n";
+        if ($debugjs) echo "\ntry {\n";
+        js_load($file);
+        if ($debugjs) echo "\n} catch (e) {\n   logError(e, '".str_replace(DOKU_INC, '', $file)."');\n}\n";
+        if($ismin) echo "\n/* END NOCOMPRESS */\n";
+        echo "\n\n/* XXXXXXXXXX end of " . str_replace(DOKU_INC, '', $file) . " XXXXXXXXXX */\n\n";
+    }
+
+    // init stuff
+    if($conf['locktime'] != 0){
+        js_runonstart("dw_locktimer.init(".($conf['locktime'] - 60).",".$conf['usedraft'].")");
+    }
+    // init hotkeys - must have been done after init of toolbar
+# disabled for FS#1958    js_runonstart('initializeHotkeys()');
+
+    // end output buffering and get contents
+    $js = ob_get_contents();
+    ob_end_clean();
+
+    // compress whitespace and comments
+    if($conf['compress']){
+        $js = js_compress($js);
+    }
+
+    $js .= "\n"; // https://bugzilla.mozilla.org/show_bug.cgi?id=316033
+
+    http_cached_finish($cache->cache, $js);
+}
+
+/**
+ * Load the given file, handle include calls and print it
+ *
+ * @author Andreas Gohr 
+ */
+function js_load($file){
+    if(!@file_exists($file)) return;
+    static $loaded = array();
+
+    $data = io_readFile($file);
+    while(preg_match('#/\*\s*DOKUWIKI:include(_once)?\s+([\w\.\-_/]+)\s*\*/#',$data,$match)){
+        $ifile = $match[2];
+
+        // is it a include_once?
+        if($match[1]){
+            $base = utf8_basename($ifile);
+            if($loaded[$base]) continue;
+            $loaded[$base] = true;
+        }
+
+        if($ifile{0} != '/') $ifile = dirname($file).'/'.$ifile;
+
+        if(@file_exists($ifile)){
+            $idata = io_readFile($ifile);
+        }else{
+            $idata = '';
+        }
+        $data  = str_replace($match[0],$idata,$data);
+    }
+    echo "$data\n";
+}
+
+/**
+ * Returns a list of possible Plugin Scripts (no existance check here)
+ *
+ * @author Andreas Gohr 
+ */
+function js_pluginscripts(){
+    $list = array();
+    $plugins = plugin_list();
+    foreach ($plugins as $p){
+        $list[] = DOKU_PLUGIN."$p/script.js";
+    }
+    return $list;
+}
+
+/**
+ * Return an two-dimensional array with strings from the language file of each plugin.
+ *
+ * - $lang['js'] must be an array.
+ * - Nothing is returned for plugins without an entry for $lang['js']
+ *
+ * @author Gabriel Birke 
+ */
+function js_pluginstrings() {
+    global $conf;
+    $pluginstrings = array();
+    $plugins = plugin_list();
+    foreach ($plugins as $p){
+        if (isset($lang)) unset($lang);
+        if (@file_exists(DOKU_PLUGIN."$p/lang/en/lang.php")) {
+            include DOKU_PLUGIN."$p/lang/en/lang.php";
+        }
+        if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php")) {
+            include DOKU_PLUGIN."$p/lang/".$conf['lang']."/lang.php";
+        }
+        if (isset($lang['js'])) {
+            $pluginstrings[$p] = $lang['js'];
+        }
+    }
+    return $pluginstrings;
+}
+
+function js_templatestrings() {
+    global $conf;
+    $templatestrings = array();
+    if (@file_exists(tpl_incdir()."lang/en/lang.php")) {
+        include tpl_incdir()."lang/en/lang.php";
+    }
+    if (isset($conf['lang']) && $conf['lang']!='en' && @file_exists(tpl_incdir()."lang/".$conf['lang']."/lang.php")) {
+        include tpl_incdir()."lang/".$conf['lang']."/lang.php";
+    }
+    if (isset($lang['js'])) {
+        $templatestrings[$conf['template']] = $lang['js'];
+    }
+    return $templatestrings;
+}
+
+/**
+ * Escapes a String to be embedded in a JavaScript call, keeps \n
+ * as newline
+ *
+ * @author Andreas Gohr 
+ */
+function js_escape($string){
+    return str_replace('\\\\n','\\n',addslashes($string));
+}
+
+/**
+ * Adds the given JavaScript code to the window.onload() event
+ *
+ * @author Andreas Gohr 
+ */
+function js_runonstart($func){
+    echo "jQuery(function(){ $func; });".NL;
+}
+
+/**
+ * Strip comments and whitespaces from given JavaScript Code
+ *
+ * This is a port of Nick Galbreath's python tool jsstrip.py which is
+ * released under BSD license. See link for original code.
+ *
+ * @author Nick Galbreath 
+ * @author Andreas Gohr 
+ * @link   http://code.google.com/p/jsstrip/
+ */
+function js_compress($s){
+    $s = ltrim($s);     // strip all initial whitespace
+    $s .= "\n";
+    $i = 0;             // char index for input string
+    $j = 0;             // char forward index for input string
+    $line = 0;          // line number of file (close to it anyways)
+    $slen = strlen($s); // size of input string
+    $lch  = '';         // last char added
+    $result = '';       // we store the final result here
+
+    // items that don't need spaces next to them
+    $chars = "^&|!+\-*\/%=\?:;,{}()<>% \t\n\r'\"[]";
+
+    $regex_starters = array("(", "=", "[", "," , ":", "!");
+
+    $whitespaces_chars = array(" ", "\t", "\n", "\r", "\0", "\x0B");
+
+    while($i < $slen){
+        // skip all "boring" characters.  This is either
+        // reserved word (e.g. "for", "else", "if") or a
+        // variable/object/method (e.g. "foo.color")
+        while ($i < $slen && (strpos($chars,$s[$i]) === false) ){
+            $result .= $s{$i};
+            $i = $i + 1;
+        }
+
+        $ch = $s{$i};
+        // multiline comments (keeping IE conditionals)
+        if($ch == '/' && $s{$i+1} == '*' && $s{$i+2} != '@'){
+            $endC = strpos($s,'*/',$i+2);
+            if($endC === false) trigger_error('Found invalid /*..*/ comment', E_USER_ERROR);
+
+            // check if this is a NOCOMPRESS comment
+            if(substr($s, $i, $endC+2-$i) == '/* BEGIN NOCOMPRESS */'){
+                $endNC = strpos($s, '/* END NOCOMPRESS */', $endC+2);
+                if($endNC === false) trigger_error('Found invalid NOCOMPRESS comment', E_USER_ERROR);
+
+                // verbatim copy contents, trimming but putting it on its own line
+                $result .= "\n".trim(substr($s, $i + 22, $endNC - ($i + 22)))."\n"; // BEGIN comment = 22 chars
+                $i = $endNC + 20; // END comment = 20 chars
+            }else{
+                $i = $endC + 2;
+            }
+            continue;
+        }
+
+        // singleline
+        if($ch == '/' && $s{$i+1} == '/'){
+            $endC = strpos($s,"\n",$i+2);
+            if($endC === false) trigger_error('Invalid comment', E_USER_ERROR);
+            $i = $endC;
+            continue;
+        }
+
+        // tricky.  might be an RE
+        if($ch == '/'){
+            // rewind, skip white space
+            $j = 1;
+            while(in_array($s{$i-$j}, $whitespaces_chars)){
+                $j = $j + 1;
+            }
+            if( in_array($s{$i-$j}, $regex_starters) ){
+                // yes, this is an re
+                // now move forward and find the end of it
+                $j = 1;
+                while($s{$i+$j} != '/'){
+                    if($s{$i+$j} == '\\') $j = $j + 2;
+                    else $j++;
+                }
+                $result .= substr($s,$i,$j+1);
+                $i = $i + $j + 1;
+                continue;
+            }
+        }
+
+        // double quote strings
+        if($ch == '"'){
+            $j = 1;
+            while( $s{$i+$j} != '"' && ($i+$j < $slen)){
+                if( $s{$i+$j} == '\\' && ($s{$i+$j+1} == '"' || $s{$i+$j+1} == '\\') ){
+                    $j += 2;
+                }else{
+                    $j += 1;
+                }
+            }
+            $string  = substr($s,$i,$j+1);
+            // remove multiline markers:
+            $string  = str_replace("\\\n",'',$string);
+            $result .= $string;
+            $i = $i + $j + 1;
+            continue;
+        }
+
+        // single quote strings
+        if($ch == "'"){
+            $j = 1;
+            while( $s{$i+$j} != "'" && ($i+$j < $slen)){
+                if( $s{$i+$j} == '\\' && ($s{$i+$j+1} == "'" || $s{$i+$j+1} == '\\') ){
+                    $j += 2;
+                }else{
+                    $j += 1;
+                }
+            }
+            $string = substr($s,$i,$j+1);
+            // remove multiline markers:
+            $string  = str_replace("\\\n",'',$string);
+            $result .= $string;
+            $i = $i + $j + 1;
+            continue;
+        }
+
+        // whitespaces
+        if( $ch == ' ' || $ch == "\r" || $ch == "\n" || $ch == "\t" ){
+            // leading spaces
+            if($i+1 < $slen && (strpos($chars,$s[$i+1]) !== false)){
+                $i = $i + 1;
+                continue;
+            }
+            // trailing spaces
+            //  if this ch is space AND the last char processed
+            //  is special, then skip the space
+            $lch = substr($result,-1);
+            if($lch && (strpos($chars,$lch) !== false)){
+                $i = $i + 1;
+                continue;
+            }
+            // else after all of this convert the "whitespace" to
+            // a single space.  It will get appended below
+            $ch = ' ';
+        }
+
+        // other chars
+        $result .= $ch;
+        $i = $i + 1;
+    }
+
+    return trim($result);
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/exe/mediamanager.php b/sources/lib/exe/mediamanager.php
new file mode 100644
index 0000000..d94a24c
--- /dev/null
+++ b/sources/lib/exe/mediamanager.php
@@ -0,0 +1,123 @@
+str('msg1')) msg(hsc($INPUT->str('msg1')),1);
+    if($INPUT->str('err')) msg(hsc($INPUT->str('err')),-1);
+
+    global $DEL;
+    // get namespace to display (either direct or from deletion order)
+    if($INPUT->str('delete')){
+        $DEL = cleanID($INPUT->str('delete'));
+        $IMG = $DEL;
+        $NS  = getNS($DEL);
+    }elseif($INPUT->str('edit')){
+        $IMG = cleanID($INPUT->str('edit'));
+        $NS  = getNS($IMG);
+    }elseif($INPUT->str('img')){
+        $IMG = cleanID($INPUT->str('img'));
+        $NS  = getNS($IMG);
+    }else{
+        $NS = cleanID($INPUT->str('ns'));
+        $IMG = null;
+    }
+
+    global $INFO, $JSINFO;
+    $INFO = !empty($INFO) ? array_merge($INFO, mediainfo()) : mediainfo();
+    $JSINFO = array('id' => '', 'namespace' => '');
+    $AUTH = $INFO['perm'];    // shortcut for historical reasons
+
+    $tmp = array();
+    trigger_event('MEDIAMANAGER_STARTED', $tmp);
+    session_write_close();  //close session
+
+    // do not display the manager if user does not have read access
+    if($AUTH < AUTH_READ && !$fullscreen) {
+        http_status(403);
+        die($lang['accessdenied']);
+    }
+
+    // handle flash upload
+    if(isset($_FILES['Filedata'])){
+        $_FILES['upload'] =& $_FILES['Filedata'];
+        $JUMPTO = media_upload($NS,$AUTH);
+        if($JUMPTO == false){
+            http_status(400);
+            echo 'Upload failed';
+        }
+        echo 'ok';
+        exit;
+    }
+
+    // give info on PHP caught upload errors
+    if($_FILES['upload']['error']){
+        switch($_FILES['upload']['error']){
+            case 1:
+            case 2:
+                msg(sprintf($lang['uploadsize'],
+                    filesize_h(php_to_byte(ini_get('upload_max_filesize')))),-1);
+                break;
+            default:
+                msg($lang['uploadfail'].' ('.$_FILES['upload']['error'].')',-1);
+        }
+        unset($_FILES['upload']);
+    }
+
+    // handle upload
+    if($_FILES['upload']['tmp_name']){
+        $JUMPTO = media_upload($NS,$AUTH);
+        if($JUMPTO) $NS = getNS($JUMPTO);
+    }
+
+    // handle meta saving
+    if($IMG && @array_key_exists('save', $INPUT->arr('do'))){
+        $JUMPTO = media_metasave($IMG,$AUTH,$INPUT->arr('meta'));
+    }
+
+    if($IMG && ($INPUT->str('mediado') == 'save' || @array_key_exists('save', $INPUT->arr('mediado')))) {
+        $JUMPTO = media_metasave($IMG,$AUTH,$INPUT->arr('meta'));
+    }
+
+    if ($INPUT->int('rev') && $conf['mediarevisions']) $REV = $INPUT->int('rev');
+
+    if($INPUT->str('mediado') == 'restore' && $conf['mediarevisions']){
+        $JUMPTO = media_restore($INPUT->str('image'), $REV, $AUTH);
+    }
+
+    // handle deletion
+    if($DEL) {
+        $res = 0;
+        if(checkSecurityToken()) {
+            $res = media_delete($DEL,$AUTH);
+        }
+        if ($res & DOKU_MEDIA_DELETED) {
+            $msg = sprintf($lang['deletesucc'], noNS($DEL));
+            if ($res & DOKU_MEDIA_EMPTY_NS && !$fullscreen) {
+                // current namespace was removed. redirecting to root ns passing msg along
+                send_redirect(DOKU_URL.'lib/exe/mediamanager.php?msg1='.
+                        rawurlencode($msg).'&edid='.$INPUT->str('edid'));
+            }
+            msg($msg,1);
+        } elseif ($res & DOKU_MEDIA_INUSE) {
+            if(!$conf['refshow']) {
+                msg(sprintf($lang['mediainuse'],noNS($DEL)),0);
+            }
+        } else {
+            msg(sprintf($lang['deletefail'],noNS($DEL)),-1);
+        }
+    }
+    // finished - start output
+
+    if (!$fullscreen) {
+        header('Content-Type: text/html; charset=utf-8');
+        include(template('mediamanager.php'));
+    }
+
+/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
diff --git a/sources/lib/exe/opensearch.php b/sources/lib/exe/opensearch.php
new file mode 100644
index 0000000..98f5f52
--- /dev/null
+++ b/sources/lib/exe/opensearch.php
@@ -0,0 +1,38 @@
+
+ * @author     Andreas Gohr 
+ */
+
+if(!defined('DOKU_INC')) define('DOKU_INC',dirname(__FILE__).'/../../');
+if(!defined('NOSESSION')) define('NOSESSION',true); // we do not use a session or authentication here (better caching)
+if(!defined('NL')) define('NL',"\n");
+require_once(DOKU_INC.'inc/init.php');
+
+// try to be clever about the favicon location
+if(file_exists(DOKU_INC.'favicon.ico')){
+    $ico = DOKU_URL.'favicon.ico';
+}elseif(file_exists(tpl_incdir().'images/favicon.ico')){
+    $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/images/favicon.ico';
+}elseif(file_exists(tpl_incdir().'favicon.ico')){
+    $ico = DOKU_URL.'lib/tpl/'.$conf['template'].'/favicon.ico';
+}else{
+    $ico = DOKU_URL.'lib/tpl/dokuwiki/images/favicon.ico';
+}
+
+// output
+header('Content-Type: application/opensearchdescription+xml; charset=utf-8');
+echo ''.NL;
+echo ''.NL;
+echo '  '.htmlspecialchars($conf['title']).''.NL;
+echo '  '.$ico.''.NL;
+echo '  '.NL;
+echo '  '.NL;
+echo ''.NL;
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/exe/xmlrpc.php b/sources/lib/exe/xmlrpc.php
new file mode 100644
index 0000000..c09daa1
--- /dev/null
+++ b/sources/lib/exe/xmlrpc.php
@@ -0,0 +1,54 @@
+remote = new RemoteAPI();
+        $this->remote->setDateTransformation(array($this, 'toDate'));
+        $this->remote->setFileTransformation(array($this, 'toFile'));
+        $this->IXR_Server();
+    }
+
+    function call($methodname, $args){
+        try {
+            $result = $this->remote->call($methodname, $args);
+            return $result;
+        } catch (RemoteAccessDeniedException $e) {
+            if (!isset($_SERVER['REMOTE_USER'])) {
+                http_status(401);
+                return new IXR_Error(-32603, "server error. not authorized to call method $methodname");
+            } else {
+                http_status(403);
+                return new IXR_Error(-32604, "server error. forbidden to call the method $methodname");
+            }
+        } catch (RemoteException $e) {
+            return new IXR_Error($e->getCode(), $e->getMessage());
+        }
+    }
+
+    function toDate($data) {
+        return new IXR_Date($data);
+    }
+
+    function toFile($data) {
+        return new IXR_Base64($data);
+    }
+}
+
+$server = new dokuwiki_xmlrpc_server();
+
+// vim:ts=4:sw=4:et:
diff --git a/sources/lib/images/README b/sources/lib/images/README
new file mode 100644
index 0000000..e2788b4
--- /dev/null
+++ b/sources/lib/images/README
@@ -0,0 +1,6 @@
+
+Icons:      email.png, external-link.png, unc.png
+Icon set:   Dusseldorf
+Designer:   pc.de
+License:    Creative Commons Attribution License [http://creativecommons.org/licenses/by/3.0/]
+URL:        http://pc.de/icons/#Dusseldorf
diff --git a/sources/lib/images/_deprecated.txt b/sources/lib/images/_deprecated.txt
new file mode 100644
index 0000000..a347f8b
--- /dev/null
+++ b/sources/lib/images/_deprecated.txt
@@ -0,0 +1,2 @@
+
+(none)
diff --git a/sources/lib/images/admin/README b/sources/lib/images/admin/README
new file mode 100644
index 0000000..90bab95
--- /dev/null
+++ b/sources/lib/images/admin/README
@@ -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 --git a/sources/lib/images/admin/acl.png b/sources/lib/images/admin/acl.png
new file mode 100644
index 0000000..c8f610c
Binary files /dev/null and b/sources/lib/images/admin/acl.png differ
diff --git a/sources/lib/images/admin/config.png b/sources/lib/images/admin/config.png
new file mode 100644
index 0000000..3ec3923
Binary files /dev/null and b/sources/lib/images/admin/config.png differ
diff --git a/sources/lib/images/admin/plugin.png b/sources/lib/images/admin/plugin.png
new file mode 100644
index 0000000..f71124e
Binary files /dev/null and b/sources/lib/images/admin/plugin.png differ
diff --git a/sources/lib/images/admin/popularity.png b/sources/lib/images/admin/popularity.png
new file mode 100644
index 0000000..1939236
Binary files /dev/null and b/sources/lib/images/admin/popularity.png differ
diff --git a/sources/lib/images/admin/revert.png b/sources/lib/images/admin/revert.png
new file mode 100644
index 0000000..5304f1b
Binary files /dev/null and b/sources/lib/images/admin/revert.png differ
diff --git a/sources/lib/images/admin/usermanager.png b/sources/lib/images/admin/usermanager.png
new file mode 100644
index 0000000..898544c
Binary files /dev/null and b/sources/lib/images/admin/usermanager.png differ
diff --git a/sources/lib/images/blank.gif b/sources/lib/images/blank.gif
new file mode 100644
index 0000000..9935f82
Binary files /dev/null and b/sources/lib/images/blank.gif differ
diff --git a/sources/lib/images/bullet.png b/sources/lib/images/bullet.png
new file mode 100644
index 0000000..5e557b3
Binary files /dev/null and b/sources/lib/images/bullet.png differ
diff --git a/sources/lib/images/closed-rtl.png b/sources/lib/images/closed-rtl.png
new file mode 100644
index 0000000..caa027e
Binary files /dev/null and b/sources/lib/images/closed-rtl.png differ
diff --git a/sources/lib/images/closed.png b/sources/lib/images/closed.png
new file mode 100644
index 0000000..e3bd0f9
Binary files /dev/null and b/sources/lib/images/closed.png differ
diff --git a/sources/lib/images/diff.png b/sources/lib/images/diff.png
new file mode 100644
index 0000000..657b109
Binary files /dev/null and b/sources/lib/images/diff.png differ
diff --git a/sources/lib/images/email.png b/sources/lib/images/email.png
new file mode 100644
index 0000000..d1d4a5f
Binary files /dev/null and b/sources/lib/images/email.png differ
diff --git a/sources/lib/images/error.png b/sources/lib/images/error.png
new file mode 100644
index 0000000..7bd84f7
Binary files /dev/null and b/sources/lib/images/error.png differ
diff --git a/sources/lib/images/external-link.png b/sources/lib/images/external-link.png
new file mode 100644
index 0000000..a4d5de1
Binary files /dev/null and b/sources/lib/images/external-link.png differ
diff --git a/sources/lib/images/fileicons/7z.png b/sources/lib/images/fileicons/7z.png
new file mode 100644
index 0000000..52f7d5d
Binary files /dev/null and b/sources/lib/images/fileicons/7z.png differ
diff --git a/sources/lib/images/fileicons/audio.png b/sources/lib/images/fileicons/audio.png
new file mode 100644
index 0000000..9888325
Binary files /dev/null and b/sources/lib/images/fileicons/audio.png differ
diff --git a/sources/lib/images/fileicons/bz2.png b/sources/lib/images/fileicons/bz2.png
new file mode 100644
index 0000000..6ec2f98
Binary files /dev/null and b/sources/lib/images/fileicons/bz2.png differ
diff --git a/sources/lib/images/fileicons/c.png b/sources/lib/images/fileicons/c.png
new file mode 100644
index 0000000..6f57337
Binary files /dev/null and b/sources/lib/images/fileicons/c.png differ
diff --git a/sources/lib/images/fileicons/conf.png b/sources/lib/images/fileicons/conf.png
new file mode 100644
index 0000000..20c20fa
Binary files /dev/null and b/sources/lib/images/fileicons/conf.png differ
diff --git a/sources/lib/images/fileicons/cpp.png b/sources/lib/images/fileicons/cpp.png
new file mode 100644
index 0000000..6f2797d
Binary files /dev/null and b/sources/lib/images/fileicons/cpp.png differ
diff --git a/sources/lib/images/fileicons/cs.png b/sources/lib/images/fileicons/cs.png
new file mode 100644
index 0000000..d3afa11
Binary files /dev/null and b/sources/lib/images/fileicons/cs.png differ
diff --git a/sources/lib/images/fileicons/css.png b/sources/lib/images/fileicons/css.png
new file mode 100644
index 0000000..89c1537
Binary files /dev/null and b/sources/lib/images/fileicons/css.png differ
diff --git a/sources/lib/images/fileicons/csv.png b/sources/lib/images/fileicons/csv.png
new file mode 100644
index 0000000..b604453
Binary files /dev/null and b/sources/lib/images/fileicons/csv.png differ
diff --git a/sources/lib/images/fileicons/deb.png b/sources/lib/images/fileicons/deb.png
new file mode 100644
index 0000000..8fe5732
Binary files /dev/null and b/sources/lib/images/fileicons/deb.png differ
diff --git a/sources/lib/images/fileicons/doc.png b/sources/lib/images/fileicons/doc.png
new file mode 100644
index 0000000..79d8ff1
Binary files /dev/null and b/sources/lib/images/fileicons/doc.png differ
diff --git a/sources/lib/images/fileicons/docx.png b/sources/lib/images/fileicons/docx.png
new file mode 100644
index 0000000..79d8ff1
Binary files /dev/null and b/sources/lib/images/fileicons/docx.png differ
diff --git a/sources/lib/images/fileicons/file.png b/sources/lib/images/fileicons/file.png
new file mode 100644
index 0000000..8158a8a
Binary files /dev/null and b/sources/lib/images/fileicons/file.png differ
diff --git a/sources/lib/images/fileicons/gif.png b/sources/lib/images/fileicons/gif.png
new file mode 100644
index 0000000..1d9dd56
Binary files /dev/null and b/sources/lib/images/fileicons/gif.png differ
diff --git a/sources/lib/images/fileicons/gz.png b/sources/lib/images/fileicons/gz.png
new file mode 100644
index 0000000..48f1959
Binary files /dev/null and b/sources/lib/images/fileicons/gz.png differ
diff --git a/sources/lib/images/fileicons/htm.png b/sources/lib/images/fileicons/htm.png
new file mode 100644
index 0000000..d45e4c1
Binary files /dev/null and b/sources/lib/images/fileicons/htm.png differ
diff --git a/sources/lib/images/fileicons/html.png b/sources/lib/images/fileicons/html.png
new file mode 100644
index 0000000..d45e4c1
Binary files /dev/null and b/sources/lib/images/fileicons/html.png differ
diff --git a/sources/lib/images/fileicons/ico.png b/sources/lib/images/fileicons/ico.png
new file mode 100644
index 0000000..1d9dd56
Binary files /dev/null and b/sources/lib/images/fileicons/ico.png differ
diff --git a/sources/lib/images/fileicons/index.php b/sources/lib/images/fileicons/index.php
new file mode 100644
index 0000000..f90e7e6
--- /dev/null
+++ b/sources/lib/images/fileicons/index.php
@@ -0,0 +1,48 @@
+
+
+
+    filetype icons
+
+    
+
+
+
+
+
        
+ ';
+}
+?>
+
        
+
+
        
+ ';
+}
+?>
+
        
+
+
+
diff --git a/sources/lib/images/fileicons/java.png b/sources/lib/images/fileicons/java.png
new file mode 100644
index 0000000..c5f2fd0
Binary files /dev/null and b/sources/lib/images/fileicons/java.png differ
diff --git a/sources/lib/images/fileicons/jpeg.png b/sources/lib/images/fileicons/jpeg.png
new file mode 100644
index 0000000..1d9dd56
Binary files /dev/null and b/sources/lib/images/fileicons/jpeg.png differ
diff --git a/sources/lib/images/fileicons/jpg.png b/sources/lib/images/fileicons/jpg.png
new file mode 100644
index 0000000..1d9dd56
Binary files /dev/null and b/sources/lib/images/fileicons/jpg.png differ
diff --git a/sources/lib/images/fileicons/js.png b/sources/lib/images/fileicons/js.png
new file mode 100644
index 0000000..0c314eb
Binary files /dev/null and b/sources/lib/images/fileicons/js.png differ
diff --git a/sources/lib/images/fileicons/lua.png b/sources/lib/images/fileicons/lua.png
new file mode 100644
index 0000000..994c6e8
Binary files /dev/null and b/sources/lib/images/fileicons/lua.png differ
diff --git a/sources/lib/images/fileicons/mp3.png b/sources/lib/images/fileicons/mp3.png
new file mode 100644
index 0000000..411dad0
Binary files /dev/null and b/sources/lib/images/fileicons/mp3.png differ
diff --git a/sources/lib/images/fileicons/odc.png b/sources/lib/images/fileicons/odc.png
new file mode 100644
index 0000000..4d6676c
Binary files /dev/null and b/sources/lib/images/fileicons/odc.png differ
diff --git a/sources/lib/images/fileicons/odf.png b/sources/lib/images/fileicons/odf.png
new file mode 100644
index 0000000..cb88d68
Binary files /dev/null and b/sources/lib/images/fileicons/odf.png differ
diff --git a/sources/lib/images/fileicons/odg.png b/sources/lib/images/fileicons/odg.png
new file mode 100644
index 0000000..a07216f
Binary files /dev/null and b/sources/lib/images/fileicons/odg.png differ
diff --git a/sources/lib/images/fileicons/odi.png b/sources/lib/images/fileicons/odi.png
new file mode 100644
index 0000000..a07216f
Binary files /dev/null and b/sources/lib/images/fileicons/odi.png differ
diff --git a/sources/lib/images/fileicons/odp.png b/sources/lib/images/fileicons/odp.png
new file mode 100644
index 0000000..2f2574a
Binary files /dev/null and b/sources/lib/images/fileicons/odp.png differ
diff --git a/sources/lib/images/fileicons/ods.png b/sources/lib/images/fileicons/ods.png
new file mode 100644
index 0000000..4d6676c
Binary files /dev/null and b/sources/lib/images/fileicons/ods.png differ
diff --git a/sources/lib/images/fileicons/odt.png b/sources/lib/images/fileicons/odt.png
new file mode 100644
index 0000000..f9c126e
Binary files /dev/null and b/sources/lib/images/fileicons/odt.png differ
diff --git a/sources/lib/images/fileicons/ogg.png b/sources/lib/images/fileicons/ogg.png
new file mode 100644
index 0000000..0a21eae
Binary files /dev/null and b/sources/lib/images/fileicons/ogg.png differ
diff --git a/sources/lib/images/fileicons/pdf.png b/sources/lib/images/fileicons/pdf.png
new file mode 100644
index 0000000..029dcff
Binary files /dev/null and b/sources/lib/images/fileicons/pdf.png differ
diff --git a/sources/lib/images/fileicons/php.png b/sources/lib/images/fileicons/php.png
new file mode 100644
index 0000000..f81e405
Binary files /dev/null and b/sources/lib/images/fileicons/php.png differ
diff --git a/sources/lib/images/fileicons/pl.png b/sources/lib/images/fileicons/pl.png
new file mode 100644
index 0000000..92f3f97
Binary files /dev/null and b/sources/lib/images/fileicons/pl.png differ
diff --git a/sources/lib/images/fileicons/png.png b/sources/lib/images/fileicons/png.png
new file mode 100644
index 0000000..1d9dd56
Binary files /dev/null and b/sources/lib/images/fileicons/png.png differ
diff --git a/sources/lib/images/fileicons/ppt.png b/sources/lib/images/fileicons/ppt.png
new file mode 100644
index 0000000..b7afb22
Binary files /dev/null and b/sources/lib/images/fileicons/ppt.png differ
diff --git a/sources/lib/images/fileicons/pptx.png b/sources/lib/images/fileicons/pptx.png
new file mode 100644
index 0000000..b7afb22
Binary files /dev/null and b/sources/lib/images/fileicons/pptx.png differ
diff --git a/sources/lib/images/fileicons/ps.png b/sources/lib/images/fileicons/ps.png
new file mode 100644
index 0000000..40a80ba
Binary files /dev/null and b/sources/lib/images/fileicons/ps.png differ
diff --git a/sources/lib/images/fileicons/py.png b/sources/lib/images/fileicons/py.png
new file mode 100644
index 0000000..15a727c
Binary files /dev/null and b/sources/lib/images/fileicons/py.png differ
diff --git a/sources/lib/images/fileicons/rar.png b/sources/lib/images/fileicons/rar.png
new file mode 100644
index 0000000..c761a4f
Binary files /dev/null and b/sources/lib/images/fileicons/rar.png differ
diff --git a/sources/lib/images/fileicons/rb.png b/sources/lib/images/fileicons/rb.png
new file mode 100644
index 0000000..408f708
Binary files /dev/null and b/sources/lib/images/fileicons/rb.png differ
diff --git a/sources/lib/images/fileicons/rpm.png b/sources/lib/images/fileicons/rpm.png
new file mode 100644
index 0000000..5cf727d
Binary files /dev/null and b/sources/lib/images/fileicons/rpm.png differ
diff --git a/sources/lib/images/fileicons/rtf.png b/sources/lib/images/fileicons/rtf.png
new file mode 100644
index 0000000..99fe3d8
Binary files /dev/null and b/sources/lib/images/fileicons/rtf.png differ
diff --git a/sources/lib/images/fileicons/sql.png b/sources/lib/images/fileicons/sql.png
new file mode 100644
index 0000000..a7b0684
Binary files /dev/null and b/sources/lib/images/fileicons/sql.png differ
diff --git a/sources/lib/images/fileicons/swf.png b/sources/lib/images/fileicons/swf.png
new file mode 100644
index 0000000..ecc7309
Binary files /dev/null and b/sources/lib/images/fileicons/swf.png differ
diff --git a/sources/lib/images/fileicons/sxc.png b/sources/lib/images/fileicons/sxc.png
new file mode 100644
index 0000000..4d6676c
Binary files /dev/null and b/sources/lib/images/fileicons/sxc.png differ
diff --git a/sources/lib/images/fileicons/sxd.png b/sources/lib/images/fileicons/sxd.png
new file mode 100644
index 0000000..a07216f
Binary files /dev/null and b/sources/lib/images/fileicons/sxd.png differ
diff --git a/sources/lib/images/fileicons/sxi.png b/sources/lib/images/fileicons/sxi.png
new file mode 100644
index 0000000..2f2574a
Binary files /dev/null and b/sources/lib/images/fileicons/sxi.png differ
diff --git a/sources/lib/images/fileicons/sxw.png b/sources/lib/images/fileicons/sxw.png
new file mode 100644
index 0000000..f9c126e
Binary files /dev/null and b/sources/lib/images/fileicons/sxw.png differ
diff --git a/sources/lib/images/fileicons/tar.png b/sources/lib/images/fileicons/tar.png
new file mode 100644
index 0000000..a28c86f
Binary files /dev/null and b/sources/lib/images/fileicons/tar.png differ
diff --git a/sources/lib/images/fileicons/tgz.png b/sources/lib/images/fileicons/tgz.png
new file mode 100644
index 0000000..48f1959
Binary files /dev/null and b/sources/lib/images/fileicons/tgz.png differ
diff --git a/sources/lib/images/fileicons/txt.png b/sources/lib/images/fileicons/txt.png
new file mode 100644
index 0000000..bb94949
Binary files /dev/null and b/sources/lib/images/fileicons/txt.png differ
diff --git a/sources/lib/images/fileicons/wav.png b/sources/lib/images/fileicons/wav.png
new file mode 100644
index 0000000..c167f4f
Binary files /dev/null and b/sources/lib/images/fileicons/wav.png differ
diff --git a/sources/lib/images/fileicons/xls.png b/sources/lib/images/fileicons/xls.png
new file mode 100644
index 0000000..24911b8
Binary files /dev/null and b/sources/lib/images/fileicons/xls.png differ
diff --git a/sources/lib/images/fileicons/xlsx.png b/sources/lib/images/fileicons/xlsx.png
new file mode 100644
index 0000000..24911b8
Binary files /dev/null and b/sources/lib/images/fileicons/xlsx.png differ
diff --git a/sources/lib/images/fileicons/xml.png b/sources/lib/images/fileicons/xml.png
new file mode 100644
index 0000000..ae9831b
Binary files /dev/null and b/sources/lib/images/fileicons/xml.png differ
diff --git a/sources/lib/images/fileicons/zip.png b/sources/lib/images/fileicons/zip.png
new file mode 100644
index 0000000..fb8850c
Binary files /dev/null and b/sources/lib/images/fileicons/zip.png differ
diff --git a/sources/lib/images/history.png b/sources/lib/images/history.png
new file mode 100644
index 0000000..82a418d
Binary files /dev/null and b/sources/lib/images/history.png differ
diff --git a/sources/lib/images/icon-list.png b/sources/lib/images/icon-list.png
new file mode 100644
index 0000000..ecfeed9
Binary files /dev/null and b/sources/lib/images/icon-list.png differ
diff --git a/sources/lib/images/icon-sort.png b/sources/lib/images/icon-sort.png
new file mode 100644
index 0000000..c6403dd
Binary files /dev/null and b/sources/lib/images/icon-sort.png differ
diff --git a/sources/lib/images/index.html b/sources/lib/images/index.html
new file mode 100644
index 0000000..977f90e
--- /dev/null
+++ b/sources/lib/images/index.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+nothing here...
+
+
+
+
+
diff --git a/sources/lib/images/info.png b/sources/lib/images/info.png
new file mode 100644
index 0000000..121c733
Binary files /dev/null and b/sources/lib/images/info.png differ
diff --git a/sources/lib/images/interwiki.png b/sources/lib/images/interwiki.png
new file mode 100644
index 0000000..f957e71
Binary files /dev/null and b/sources/lib/images/interwiki.png differ
diff --git a/sources/lib/images/interwiki/amazon.de.gif b/sources/lib/images/interwiki/amazon.de.gif
new file mode 100644
index 0000000..a0d2cd4
Binary files /dev/null and b/sources/lib/images/interwiki/amazon.de.gif differ
diff --git a/sources/lib/images/interwiki/amazon.gif b/sources/lib/images/interwiki/amazon.gif
new file mode 100644
index 0000000..a0d2cd4
Binary files /dev/null and b/sources/lib/images/interwiki/amazon.gif differ
diff --git a/sources/lib/images/interwiki/amazon.uk.gif b/sources/lib/images/interwiki/amazon.uk.gif
new file mode 100644
index 0000000..a0d2cd4
Binary files /dev/null and b/sources/lib/images/interwiki/amazon.uk.gif differ
diff --git a/sources/lib/images/interwiki/callto.gif b/sources/lib/images/interwiki/callto.gif
new file mode 100644
index 0000000..60158c5
Binary files /dev/null and b/sources/lib/images/interwiki/callto.gif differ
diff --git a/sources/lib/images/interwiki/coral.gif b/sources/lib/images/interwiki/coral.gif
new file mode 100644
index 0000000..0f9f675
Binary files /dev/null and b/sources/lib/images/interwiki/coral.gif differ
diff --git a/sources/lib/images/interwiki/doku.gif b/sources/lib/images/interwiki/doku.gif
new file mode 100644
index 0000000..3ccf012
Binary files /dev/null and b/sources/lib/images/interwiki/doku.gif differ
diff --git a/sources/lib/images/interwiki/dokubug.gif b/sources/lib/images/interwiki/dokubug.gif
new file mode 100644
index 0000000..08c1ca1
Binary files /dev/null and b/sources/lib/images/interwiki/dokubug.gif differ
diff --git a/sources/lib/images/interwiki/google.gif b/sources/lib/images/interwiki/google.gif
new file mode 100644
index 0000000..3a28437
Binary files /dev/null and b/sources/lib/images/interwiki/google.gif differ
diff --git a/sources/lib/images/interwiki/paypal.gif b/sources/lib/images/interwiki/paypal.gif
new file mode 100644
index 0000000..633797f
Binary files /dev/null and b/sources/lib/images/interwiki/paypal.gif differ
diff --git a/sources/lib/images/interwiki/phpfn.gif b/sources/lib/images/interwiki/phpfn.gif
new file mode 100644
index 0000000..89ac1db
Binary files /dev/null and b/sources/lib/images/interwiki/phpfn.gif differ
diff --git a/sources/lib/images/interwiki/sb.gif b/sources/lib/images/interwiki/sb.gif
new file mode 100644
index 0000000..710e494
Binary files /dev/null and b/sources/lib/images/interwiki/sb.gif differ
diff --git a/sources/lib/images/interwiki/skype.gif b/sources/lib/images/interwiki/skype.gif
new file mode 100644
index 0000000..d9bd575
Binary files /dev/null and b/sources/lib/images/interwiki/skype.gif differ
diff --git a/sources/lib/images/interwiki/wp.gif b/sources/lib/images/interwiki/wp.gif
new file mode 100644
index 0000000..b07fd89
Binary files /dev/null and b/sources/lib/images/interwiki/wp.gif differ
diff --git a/sources/lib/images/interwiki/wpde.gif b/sources/lib/images/interwiki/wpde.gif
new file mode 100644
index 0000000..b07fd89
Binary files /dev/null and b/sources/lib/images/interwiki/wpde.gif differ
diff --git a/sources/lib/images/interwiki/wpes.gif b/sources/lib/images/interwiki/wpes.gif
new file mode 100644
index 0000000..b07fd89
Binary files /dev/null and b/sources/lib/images/interwiki/wpes.gif differ
diff --git a/sources/lib/images/interwiki/wpfr.gif b/sources/lib/images/interwiki/wpfr.gif
new file mode 100644
index 0000000..b07fd89
Binary files /dev/null and b/sources/lib/images/interwiki/wpfr.gif differ
diff --git a/sources/lib/images/interwiki/wpjp.gif b/sources/lib/images/interwiki/wpjp.gif
new file mode 100644
index 0000000..b07fd89
Binary files /dev/null and b/sources/lib/images/interwiki/wpjp.gif differ
diff --git a/sources/lib/images/interwiki/wpmeta.gif b/sources/lib/images/interwiki/wpmeta.gif
new file mode 100644
index 0000000..b07fd89
Binary files /dev/null and b/sources/lib/images/interwiki/wpmeta.gif differ
diff --git a/sources/lib/images/interwiki/wppl.gif b/sources/lib/images/interwiki/wppl.gif
new file mode 100644
index 0000000..b07fd89
Binary files /dev/null and b/sources/lib/images/interwiki/wppl.gif differ
diff --git a/sources/lib/images/larger.gif b/sources/lib/images/larger.gif
new file mode 100644
index 0000000..e137c92
Binary files /dev/null and b/sources/lib/images/larger.gif differ
diff --git a/sources/lib/images/license/badge/cc-by-nc-nd.png b/sources/lib/images/license/badge/cc-by-nc-nd.png
new file mode 100644
index 0000000..94aae9e
Binary files /dev/null and b/sources/lib/images/license/badge/cc-by-nc-nd.png differ
diff --git a/sources/lib/images/license/badge/cc-by-nc-sa.png b/sources/lib/images/license/badge/cc-by-nc-sa.png
new file mode 100644
index 0000000..51141f5
Binary files /dev/null and b/sources/lib/images/license/badge/cc-by-nc-sa.png differ
diff --git a/sources/lib/images/license/badge/cc-by-nc.png b/sources/lib/images/license/badge/cc-by-nc.png
new file mode 100644
index 0000000..aeb8cdc
Binary files /dev/null and b/sources/lib/images/license/badge/cc-by-nc.png differ
diff --git a/sources/lib/images/license/badge/cc-by-nd.png b/sources/lib/images/license/badge/cc-by-nd.png
new file mode 100644
index 0000000..6a2e59a
Binary files /dev/null and b/sources/lib/images/license/badge/cc-by-nd.png differ
diff --git a/sources/lib/images/license/badge/cc-by-sa.png b/sources/lib/images/license/badge/cc-by-sa.png
new file mode 100644
index 0000000..f0aa4aa
Binary files /dev/null and b/sources/lib/images/license/badge/cc-by-sa.png differ
diff --git a/sources/lib/images/license/badge/cc-by.png b/sources/lib/images/license/badge/cc-by.png
new file mode 100644
index 0000000..c7389b2
Binary files /dev/null and b/sources/lib/images/license/badge/cc-by.png differ
diff --git a/sources/lib/images/license/badge/cc-zero.png b/sources/lib/images/license/badge/cc-zero.png
new file mode 100644
index 0000000..fd3dff4
Binary files /dev/null and b/sources/lib/images/license/badge/cc-zero.png differ
diff --git a/sources/lib/images/license/badge/cc.png b/sources/lib/images/license/badge/cc.png
new file mode 100644
index 0000000..8ac73aa
Binary files /dev/null and b/sources/lib/images/license/badge/cc.png differ
diff --git a/sources/lib/images/license/badge/gnufdl.png b/sources/lib/images/license/badge/gnufdl.png
new file mode 100644
index 0000000..e929101
Binary files /dev/null and b/sources/lib/images/license/badge/gnufdl.png differ
diff --git a/sources/lib/images/license/badge/publicdomain.png b/sources/lib/images/license/badge/publicdomain.png
new file mode 100644
index 0000000..8148d03
Binary files /dev/null and b/sources/lib/images/license/badge/publicdomain.png differ
diff --git a/sources/lib/images/license/button/cc-by-nc-nd.png b/sources/lib/images/license/button/cc-by-nc-nd.png
new file mode 100644
index 0000000..ac58d86
Binary files /dev/null and b/sources/lib/images/license/button/cc-by-nc-nd.png differ
diff --git a/sources/lib/images/license/button/cc-by-nc-sa.png b/sources/lib/images/license/button/cc-by-nc-sa.png
new file mode 100644
index 0000000..a9d23c0
Binary files /dev/null and b/sources/lib/images/license/button/cc-by-nc-sa.png differ
diff --git a/sources/lib/images/license/button/cc-by-nc.png b/sources/lib/images/license/button/cc-by-nc.png
new file mode 100644
index 0000000..d936464
Binary files /dev/null and b/sources/lib/images/license/button/cc-by-nc.png differ
diff --git a/sources/lib/images/license/button/cc-by-nd.png b/sources/lib/images/license/button/cc-by-nd.png
new file mode 100644
index 0000000..3fc4908
Binary files /dev/null and b/sources/lib/images/license/button/cc-by-nd.png differ
diff --git a/sources/lib/images/license/button/cc-by-sa.png b/sources/lib/images/license/button/cc-by-sa.png
new file mode 100644
index 0000000..3c6270a
Binary files /dev/null and b/sources/lib/images/license/button/cc-by-sa.png differ
diff --git a/sources/lib/images/license/button/cc-by.png b/sources/lib/images/license/button/cc-by.png
new file mode 100644
index 0000000..867daae
Binary files /dev/null and b/sources/lib/images/license/button/cc-by.png differ
diff --git a/sources/lib/images/license/button/cc-zero.png b/sources/lib/images/license/button/cc-zero.png
new file mode 100644
index 0000000..251efcd
Binary files /dev/null and b/sources/lib/images/license/button/cc-zero.png differ
diff --git a/sources/lib/images/license/button/cc.png b/sources/lib/images/license/button/cc.png
new file mode 100644
index 0000000..9c49295
Binary files /dev/null and b/sources/lib/images/license/button/cc.png differ
diff --git a/sources/lib/images/license/button/gnufdl.png b/sources/lib/images/license/button/gnufdl.png
new file mode 100644
index 0000000..0b52ea1
Binary files /dev/null and b/sources/lib/images/license/button/gnufdl.png differ
diff --git a/sources/lib/images/license/button/publicdomain.png b/sources/lib/images/license/button/publicdomain.png
new file mode 100644
index 0000000..54ea38b
Binary files /dev/null and b/sources/lib/images/license/button/publicdomain.png differ
diff --git a/sources/lib/images/loading.gif b/sources/lib/images/loading.gif
new file mode 100644
index 0000000..35058e2
Binary files /dev/null and b/sources/lib/images/loading.gif differ
diff --git a/sources/lib/images/magnifier.png b/sources/lib/images/magnifier.png
new file mode 100644
index 0000000..89febff
Binary files /dev/null and b/sources/lib/images/magnifier.png differ
diff --git a/sources/lib/images/media_align_center.png b/sources/lib/images/media_align_center.png
new file mode 100644
index 0000000..807f9d9
Binary files /dev/null and b/sources/lib/images/media_align_center.png differ
diff --git a/sources/lib/images/media_align_left.png b/sources/lib/images/media_align_left.png
new file mode 100644
index 0000000..fa6cf33
Binary files /dev/null and b/sources/lib/images/media_align_left.png differ
diff --git a/sources/lib/images/media_align_noalign.png b/sources/lib/images/media_align_noalign.png
new file mode 100644
index 0000000..263e090
Binary files /dev/null and b/sources/lib/images/media_align_noalign.png differ
diff --git a/sources/lib/images/media_align_right.png b/sources/lib/images/media_align_right.png
new file mode 100644
index 0000000..33539db
Binary files /dev/null and b/sources/lib/images/media_align_right.png differ
diff --git a/sources/lib/images/media_link_direct.png b/sources/lib/images/media_link_direct.png
new file mode 100644
index 0000000..4350b80
Binary files /dev/null and b/sources/lib/images/media_link_direct.png differ
diff --git a/sources/lib/images/media_link_displaylnk.png b/sources/lib/images/media_link_displaylnk.png
new file mode 100644
index 0000000..5392756
Binary files /dev/null and b/sources/lib/images/media_link_displaylnk.png differ
diff --git a/sources/lib/images/media_link_lnk.png b/sources/lib/images/media_link_lnk.png
new file mode 100644
index 0000000..5ff4ee1
Binary files /dev/null and b/sources/lib/images/media_link_lnk.png differ
diff --git a/sources/lib/images/media_link_nolnk.png b/sources/lib/images/media_link_nolnk.png
new file mode 100644
index 0000000..c9378c7
Binary files /dev/null and b/sources/lib/images/media_link_nolnk.png differ
diff --git a/sources/lib/images/media_size_large.png b/sources/lib/images/media_size_large.png
new file mode 100644
index 0000000..012a418
Binary files /dev/null and b/sources/lib/images/media_size_large.png differ
diff --git a/sources/lib/images/media_size_medium.png b/sources/lib/images/media_size_medium.png
new file mode 100644
index 0000000..1469f51
Binary files /dev/null and b/sources/lib/images/media_size_medium.png differ
diff --git a/sources/lib/images/media_size_original.png b/sources/lib/images/media_size_original.png
new file mode 100644
index 0000000..f58d056
Binary files /dev/null and b/sources/lib/images/media_size_original.png differ
diff --git a/sources/lib/images/media_size_small.png b/sources/lib/images/media_size_small.png
new file mode 100644
index 0000000..a0aafa4
Binary files /dev/null and b/sources/lib/images/media_size_small.png differ
diff --git a/sources/lib/images/mediamanager.png b/sources/lib/images/mediamanager.png
new file mode 100644
index 0000000..822b845
Binary files /dev/null and b/sources/lib/images/mediamanager.png differ
diff --git a/sources/lib/images/minus.gif b/sources/lib/images/minus.gif
new file mode 100644
index 0000000..7e8cbd7
Binary files /dev/null and b/sources/lib/images/minus.gif differ
diff --git a/sources/lib/images/notify.png b/sources/lib/images/notify.png
new file mode 100644
index 0000000..c18ef10
Binary files /dev/null and b/sources/lib/images/notify.png differ
diff --git a/sources/lib/images/ns.png b/sources/lib/images/ns.png
new file mode 100644
index 0000000..c35e832
Binary files /dev/null and b/sources/lib/images/ns.png differ
diff --git a/sources/lib/images/open.png b/sources/lib/images/open.png
new file mode 100644
index 0000000..5f2d408
Binary files /dev/null and b/sources/lib/images/open.png differ
diff --git a/sources/lib/images/page.png b/sources/lib/images/page.png
new file mode 100644
index 0000000..b1b7ebe
Binary files /dev/null and b/sources/lib/images/page.png differ
diff --git a/sources/lib/images/plus.gif b/sources/lib/images/plus.gif
new file mode 100644
index 0000000..3da3b94
Binary files /dev/null and b/sources/lib/images/plus.gif differ
diff --git a/sources/lib/images/resizecol.png b/sources/lib/images/resizecol.png
new file mode 100644
index 0000000..b5aeec0
Binary files /dev/null and b/sources/lib/images/resizecol.png differ
diff --git a/sources/lib/images/smaller.gif b/sources/lib/images/smaller.gif
new file mode 100644
index 0000000..66d3a51
Binary files /dev/null and b/sources/lib/images/smaller.gif differ
diff --git a/sources/lib/images/smileys/delete.gif b/sources/lib/images/smileys/delete.gif
new file mode 100644
index 0000000..e94c68c
Binary files /dev/null and b/sources/lib/images/smileys/delete.gif differ
diff --git a/sources/lib/images/smileys/facepalm.gif b/sources/lib/images/smileys/facepalm.gif
new file mode 100644
index 0000000..5bebb20
Binary files /dev/null and b/sources/lib/images/smileys/facepalm.gif differ
diff --git a/sources/lib/images/smileys/fixme.gif b/sources/lib/images/smileys/fixme.gif
new file mode 100644
index 0000000..e191413
Binary files /dev/null and b/sources/lib/images/smileys/fixme.gif differ
diff --git a/sources/lib/images/smileys/icon_arrow.gif b/sources/lib/images/smileys/icon_arrow.gif
new file mode 100644
index 0000000..6771def
Binary files /dev/null and b/sources/lib/images/smileys/icon_arrow.gif differ
diff --git a/sources/lib/images/smileys/icon_biggrin.gif b/sources/lib/images/smileys/icon_biggrin.gif
new file mode 100644
index 0000000..aa29c14
Binary files /dev/null and b/sources/lib/images/smileys/icon_biggrin.gif differ
diff --git a/sources/lib/images/smileys/icon_confused.gif b/sources/lib/images/smileys/icon_confused.gif
new file mode 100644
index 0000000..0ea9ed2
Binary files /dev/null and b/sources/lib/images/smileys/icon_confused.gif differ
diff --git a/sources/lib/images/smileys/icon_cool.gif b/sources/lib/images/smileys/icon_cool.gif
new file mode 100644
index 0000000..3469ad4
Binary files /dev/null and b/sources/lib/images/smileys/icon_cool.gif differ
diff --git a/sources/lib/images/smileys/icon_cry.gif b/sources/lib/images/smileys/icon_cry.gif
new file mode 100644
index 0000000..25aea57
Binary files /dev/null and b/sources/lib/images/smileys/icon_cry.gif differ
diff --git a/sources/lib/images/smileys/icon_doubt.gif b/sources/lib/images/smileys/icon_doubt.gif
new file mode 100644
index 0000000..b4afc6d
Binary files /dev/null and b/sources/lib/images/smileys/icon_doubt.gif differ
diff --git a/sources/lib/images/smileys/icon_doubt2.gif b/sources/lib/images/smileys/icon_doubt2.gif
new file mode 100644
index 0000000..1f57eb9
Binary files /dev/null and b/sources/lib/images/smileys/icon_doubt2.gif differ
diff --git a/sources/lib/images/smileys/icon_eek.gif b/sources/lib/images/smileys/icon_eek.gif
new file mode 100644
index 0000000..276b01d
Binary files /dev/null and b/sources/lib/images/smileys/icon_eek.gif differ
diff --git a/sources/lib/images/smileys/icon_evil.gif b/sources/lib/images/smileys/icon_evil.gif
new file mode 100644
index 0000000..d756916
Binary files /dev/null and b/sources/lib/images/smileys/icon_evil.gif differ
diff --git a/sources/lib/images/smileys/icon_exclaim.gif b/sources/lib/images/smileys/icon_exclaim.gif
new file mode 100644
index 0000000..215b32e
Binary files /dev/null and b/sources/lib/images/smileys/icon_exclaim.gif differ
diff --git a/sources/lib/images/smileys/icon_frown.gif b/sources/lib/images/smileys/icon_frown.gif
new file mode 100644
index 0000000..d46caf7
Binary files /dev/null and b/sources/lib/images/smileys/icon_frown.gif differ
diff --git a/sources/lib/images/smileys/icon_fun.gif b/sources/lib/images/smileys/icon_fun.gif
new file mode 100644
index 0000000..6d3c442
Binary files /dev/null and b/sources/lib/images/smileys/icon_fun.gif differ
diff --git a/sources/lib/images/smileys/icon_idea.gif b/sources/lib/images/smileys/icon_idea.gif
new file mode 100644
index 0000000..41eaa06
Binary files /dev/null and b/sources/lib/images/smileys/icon_idea.gif differ
diff --git a/sources/lib/images/smileys/icon_kaddi.gif b/sources/lib/images/smileys/icon_kaddi.gif
new file mode 100644
index 0000000..56344bb
Binary files /dev/null and b/sources/lib/images/smileys/icon_kaddi.gif differ
diff --git a/sources/lib/images/smileys/icon_lol.gif b/sources/lib/images/smileys/icon_lol.gif
new file mode 100644
index 0000000..d1c20c0
Binary files /dev/null and b/sources/lib/images/smileys/icon_lol.gif differ
diff --git a/sources/lib/images/smileys/icon_mrgreen.gif b/sources/lib/images/smileys/icon_mrgreen.gif
new file mode 100644
index 0000000..fc5d916
Binary files /dev/null and b/sources/lib/images/smileys/icon_mrgreen.gif differ
diff --git a/sources/lib/images/smileys/icon_neutral.gif b/sources/lib/images/smileys/icon_neutral.gif
new file mode 100644
index 0000000..c82a974
Binary files /dev/null and b/sources/lib/images/smileys/icon_neutral.gif differ
diff --git a/sources/lib/images/smileys/icon_question.gif b/sources/lib/images/smileys/icon_question.gif
new file mode 100644
index 0000000..4e30924
Binary files /dev/null and b/sources/lib/images/smileys/icon_question.gif differ
diff --git a/sources/lib/images/smileys/icon_razz.gif b/sources/lib/images/smileys/icon_razz.gif
new file mode 100644
index 0000000..310655e
Binary files /dev/null and b/sources/lib/images/smileys/icon_razz.gif differ
diff --git a/sources/lib/images/smileys/icon_redface.gif b/sources/lib/images/smileys/icon_redface.gif
new file mode 100644
index 0000000..160c20f
Binary files /dev/null and b/sources/lib/images/smileys/icon_redface.gif differ
diff --git a/sources/lib/images/smileys/icon_rolleyes.gif b/sources/lib/images/smileys/icon_rolleyes.gif
new file mode 100644
index 0000000..502c5c1
Binary files /dev/null and b/sources/lib/images/smileys/icon_rolleyes.gif differ
diff --git a/sources/lib/images/smileys/icon_sad.gif b/sources/lib/images/smileys/icon_sad.gif
new file mode 100644
index 0000000..d46caf7
Binary files /dev/null and b/sources/lib/images/smileys/icon_sad.gif differ
diff --git a/sources/lib/images/smileys/icon_silenced.gif b/sources/lib/images/smileys/icon_silenced.gif
new file mode 100644
index 0000000..5f722e0
Binary files /dev/null and b/sources/lib/images/smileys/icon_silenced.gif differ
diff --git a/sources/lib/images/smileys/icon_smile.gif b/sources/lib/images/smileys/icon_smile.gif
new file mode 100644
index 0000000..df125e2
Binary files /dev/null and b/sources/lib/images/smileys/icon_smile.gif differ
diff --git a/sources/lib/images/smileys/icon_smile2.gif b/sources/lib/images/smileys/icon_smile2.gif
new file mode 100644
index 0000000..6b4909c
Binary files /dev/null and b/sources/lib/images/smileys/icon_smile2.gif differ
diff --git a/sources/lib/images/smileys/icon_surprised.gif b/sources/lib/images/smileys/icon_surprised.gif
new file mode 100644
index 0000000..aaa94f1
Binary files /dev/null and b/sources/lib/images/smileys/icon_surprised.gif differ
diff --git a/sources/lib/images/smileys/icon_twisted.gif b/sources/lib/images/smileys/icon_twisted.gif
new file mode 100644
index 0000000..eaec193
Binary files /dev/null and b/sources/lib/images/smileys/icon_twisted.gif differ
diff --git a/sources/lib/images/smileys/icon_wink.gif b/sources/lib/images/smileys/icon_wink.gif
new file mode 100644
index 0000000..78b6ad3
Binary files /dev/null and b/sources/lib/images/smileys/icon_wink.gif differ
diff --git a/sources/lib/images/smileys/index.php b/sources/lib/images/smileys/index.php
new file mode 100644
index 0000000..9a2905b
--- /dev/null
+++ b/sources/lib/images/smileys/index.php
@@ -0,0 +1,48 @@
+
+
+
+    simleys
+
+    
+
+
+
+
+
        
+ ';
+}
+?>
+
        
+
+
        
+ ';
+}
+?>
+
        
+
+
+
diff --git a/sources/lib/images/success.png b/sources/lib/images/success.png
new file mode 100644
index 0000000..9241adb
Binary files /dev/null and b/sources/lib/images/success.png differ
diff --git a/sources/lib/images/throbber.gif b/sources/lib/images/throbber.gif
new file mode 100644
index 0000000..27178a8
Binary files /dev/null and b/sources/lib/images/throbber.gif differ
diff --git a/sources/lib/images/toolbar/bold.png b/sources/lib/images/toolbar/bold.png
new file mode 100644
index 0000000..51ddb88
Binary files /dev/null and b/sources/lib/images/toolbar/bold.png differ
diff --git a/sources/lib/images/toolbar/chars.png b/sources/lib/images/toolbar/chars.png
new file mode 100644
index 0000000..bad37e5
Binary files /dev/null and b/sources/lib/images/toolbar/chars.png differ
diff --git a/sources/lib/images/toolbar/h.png b/sources/lib/images/toolbar/h.png
new file mode 100644
index 0000000..6a48cbb
Binary files /dev/null and b/sources/lib/images/toolbar/h.png differ
diff --git a/sources/lib/images/toolbar/h1.png b/sources/lib/images/toolbar/h1.png
new file mode 100644
index 0000000..85bd06e
Binary files /dev/null and b/sources/lib/images/toolbar/h1.png differ
diff --git a/sources/lib/images/toolbar/h2.png b/sources/lib/images/toolbar/h2.png
new file mode 100644
index 0000000..be2c600
Binary files /dev/null and b/sources/lib/images/toolbar/h2.png differ
diff --git a/sources/lib/images/toolbar/h3.png b/sources/lib/images/toolbar/h3.png
new file mode 100644
index 0000000..350da88
Binary files /dev/null and b/sources/lib/images/toolbar/h3.png differ
diff --git a/sources/lib/images/toolbar/h4.png b/sources/lib/images/toolbar/h4.png
new file mode 100644
index 0000000..bc1b703
Binary files /dev/null and b/sources/lib/images/toolbar/h4.png differ
diff --git a/sources/lib/images/toolbar/h5.png b/sources/lib/images/toolbar/h5.png
new file mode 100644
index 0000000..b6c263d
Binary files /dev/null and b/sources/lib/images/toolbar/h5.png differ
diff --git a/sources/lib/images/toolbar/hequal.png b/sources/lib/images/toolbar/hequal.png
new file mode 100644
index 0000000..da4e921
Binary files /dev/null and b/sources/lib/images/toolbar/hequal.png differ
diff --git a/sources/lib/images/toolbar/hminus.png b/sources/lib/images/toolbar/hminus.png
new file mode 100644
index 0000000..c00f702
Binary files /dev/null and b/sources/lib/images/toolbar/hminus.png differ
diff --git a/sources/lib/images/toolbar/hplus.png b/sources/lib/images/toolbar/hplus.png
new file mode 100644
index 0000000..6124b5c
Binary files /dev/null and b/sources/lib/images/toolbar/hplus.png differ
diff --git a/sources/lib/images/toolbar/hr.png b/sources/lib/images/toolbar/hr.png
new file mode 100644
index 0000000..de3a8a5
Binary files /dev/null and b/sources/lib/images/toolbar/hr.png differ
diff --git a/sources/lib/images/toolbar/image.png b/sources/lib/images/toolbar/image.png
new file mode 100644
index 0000000..70b12fc
Binary files /dev/null and b/sources/lib/images/toolbar/image.png differ
diff --git a/sources/lib/images/toolbar/italic.png b/sources/lib/images/toolbar/italic.png
new file mode 100644
index 0000000..d69e660
Binary files /dev/null and b/sources/lib/images/toolbar/italic.png differ
diff --git a/sources/lib/images/toolbar/link.png b/sources/lib/images/toolbar/link.png
new file mode 100644
index 0000000..01105b0
Binary files /dev/null and b/sources/lib/images/toolbar/link.png differ
diff --git a/sources/lib/images/toolbar/linkextern.png b/sources/lib/images/toolbar/linkextern.png
new file mode 100644
index 0000000..acc0c6f
Binary files /dev/null and b/sources/lib/images/toolbar/linkextern.png differ
diff --git a/sources/lib/images/toolbar/mono.png b/sources/lib/images/toolbar/mono.png
new file mode 100644
index 0000000..b91ad2e
Binary files /dev/null and b/sources/lib/images/toolbar/mono.png differ
diff --git a/sources/lib/images/toolbar/ol.png b/sources/lib/images/toolbar/ol.png
new file mode 100644
index 0000000..186f1fa
Binary files /dev/null and b/sources/lib/images/toolbar/ol.png differ
diff --git a/sources/lib/images/toolbar/sig.png b/sources/lib/images/toolbar/sig.png
new file mode 100644
index 0000000..72fdad0
Binary files /dev/null and b/sources/lib/images/toolbar/sig.png differ
diff --git a/sources/lib/images/toolbar/smiley.png b/sources/lib/images/toolbar/smiley.png
new file mode 100644
index 0000000..85036c1
Binary files /dev/null and b/sources/lib/images/toolbar/smiley.png differ
diff --git a/sources/lib/images/toolbar/strike.png b/sources/lib/images/toolbar/strike.png
new file mode 100644
index 0000000..e532d1f
Binary files /dev/null and b/sources/lib/images/toolbar/strike.png differ
diff --git a/sources/lib/images/toolbar/ul.png b/sources/lib/images/toolbar/ul.png
new file mode 100644
index 0000000..0088207
Binary files /dev/null and b/sources/lib/images/toolbar/ul.png differ
diff --git a/sources/lib/images/toolbar/underline.png b/sources/lib/images/toolbar/underline.png
new file mode 100644
index 0000000..fa27151
Binary files /dev/null and b/sources/lib/images/toolbar/underline.png differ
diff --git a/sources/lib/images/trash.png b/sources/lib/images/trash.png
new file mode 100644
index 0000000..350c5e1
Binary files /dev/null and b/sources/lib/images/trash.png differ
diff --git a/sources/lib/images/unc.png b/sources/lib/images/unc.png
new file mode 100644
index 0000000..a552d6e
Binary files /dev/null and b/sources/lib/images/unc.png differ
diff --git a/sources/lib/images/up.png b/sources/lib/images/up.png
new file mode 100644
index 0000000..b1eac91
Binary files /dev/null and b/sources/lib/images/up.png differ
diff --git a/sources/lib/images/wrap.gif b/sources/lib/images/wrap.gif
new file mode 100644
index 0000000..f2253e4
Binary files /dev/null and b/sources/lib/images/wrap.gif differ
diff --git a/sources/lib/index.html b/sources/lib/index.html
new file mode 100644
index 0000000..885c954
--- /dev/null
+++ b/sources/lib/index.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+nothing here...
+
+
+
+
+
diff --git a/sources/lib/plugins/acl/action.php b/sources/lib/plugins/acl/action.php
new file mode 100644
index 0000000..a7226f5
--- /dev/null
+++ b/sources/lib/plugins/acl/action.php
@@ -0,0 +1,88 @@
+
+ */
+
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * Register handler
+ */
+class action_plugin_acl extends DokuWiki_Action_Plugin {
+
+    /**
+     * Registers a callback function for a given event
+     *
+     * @param Doku_Event_Handler $controller DokuWiki's event controller object
+     * @return void
+     */
+    public function register(Doku_Event_Handler $controller) {
+
+        $controller->register_hook('AJAX_CALL_UNKNOWN', 'BEFORE', $this, 'handle_ajax_call_acl');
+
+    }
+
+    /**
+     * AJAX call handler for ACL plugin
+     *
+     * @param Doku_Event $event  event object by reference
+     * @param mixed $param  empty
+     * @return void
+     */
+
+    public function handle_ajax_call_acl(Doku_Event &$event, $param) {
+        if($event->data !== 'plugin_acl') {
+            return;
+        }
+        $event->stopPropagation();
+        $event->preventDefault();
+
+        global $ID;
+        global $INPUT;
+
+        if(!auth_isadmin()) {
+            echo 'for admins only';
+            return;
+        }
+        if(!checkSecurityToken()) {
+            echo 'CRSF Attack';
+            return;
+        }
+
+        $ID = getID();
+
+        /** @var $acl admin_plugin_acl */
+        $acl = plugin_load('admin', 'acl');
+        $acl->handle();
+
+        $ajax = $INPUT->str('ajax');
+        header('Content-Type: text/html; charset=utf-8');
+
+        if($ajax == 'info') {
+            $acl->_html_info();
+        } elseif($ajax == 'tree') {
+
+            $ns = $INPUT->str('ns');
+            if($ns == '*') {
+                $ns = '';
+            }
+            $ns = cleanID($ns);
+            $lvl = count(explode(':', $ns));
+            $ns = utf8_encodeFN(str_replace(':', '/', $ns));
+
+            $data = $acl->_get_tree($ns, $ns);
+
+            foreach(array_keys($data) as $item) {
+                $data[$item]['level'] = $lvl + 1;
+            }
+            echo html_buildlist(
+                $data, 'acl', array($acl, '_html_list_acl'),
+                array($acl, '_html_li_acl')
+            );
+        }
+    }
+}
diff --git a/sources/lib/plugins/acl/admin.php b/sources/lib/plugins/acl/admin.php
new file mode 100644
index 0000000..6c7c28f
--- /dev/null
+++ b/sources/lib/plugins/acl/admin.php
@@ -0,0 +1,817 @@
+
+ * @author     Anika Henke  (concepts)
+ * @author     Frank Schubert  (old version)
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * All DokuWiki plugins to extend the admin function
+ * need to inherit from this class
+ */
+class admin_plugin_acl extends DokuWiki_Admin_Plugin {
+    var $acl = null;
+    var $ns  = null;
+    /**
+     * The currently selected item, associative array with id and type.
+     * Populated from (in this order):
+     * $_REQUEST['current_ns']
+     * $_REQUEST['current_id']
+     * $ns
+     * $ID
+     */
+    var $current_item = null;
+    var $who = '';
+    var $usersgroups = array();
+    var $specials = array();
+
+    /**
+     * return prompt for admin menu
+     */
+    function getMenuText($language) {
+        return $this->getLang('admin_acl');
+    }
+
+    /**
+     * return sort order for position in admin menu
+     */
+    function getMenuSort() {
+        return 1;
+    }
+
+    /**
+     * handle user request
+     *
+     * Initializes internal vars and handles modifications
+     *
+     * @author Andreas Gohr 
+     */
+    function handle() {
+        global $AUTH_ACL;
+        global $ID;
+        global $auth;
+        global $config_cascade;
+        global $INPUT;
+
+        // fresh 1:1 copy without replacements
+        $AUTH_ACL = file($config_cascade['acl']['default']);
+
+        // namespace given?
+        if($INPUT->str('ns') == '*'){
+            $this->ns = '*';
+        }else{
+            $this->ns = cleanID($INPUT->str('ns'));
+        }
+
+        if ($INPUT->str('current_ns')) {
+            $this->current_item = array('id' => cleanID($INPUT->str('current_ns')), 'type' => 'd');
+        } elseif ($INPUT->str('current_id')) {
+            $this->current_item = array('id' => cleanID($INPUT->str('current_id')), 'type' => 'f');
+        } elseif ($this->ns) {
+            $this->current_item = array('id' => $this->ns, 'type' => 'd');
+        } else {
+            $this->current_item = array('id' => $ID, 'type' => 'f');
+        }
+
+        // user or group choosen?
+        $who = trim($INPUT->str('acl_w'));
+        if($INPUT->str('acl_t') == '__g__' && $who){
+            $this->who = '@'.ltrim($auth->cleanGroup($who),'@');
+        }elseif($INPUT->str('acl_t') == '__u__' && $who){
+            $this->who = ltrim($who,'@');
+            if($this->who != '%USER%' && $this->who != '%GROUP%'){ #keep wildcard as is
+                $this->who = $auth->cleanUser($this->who);
+            }
+        }elseif($INPUT->str('acl_t') &&
+                $INPUT->str('acl_t') != '__u__' &&
+                $INPUT->str('acl_t') != '__g__'){
+            $this->who = $INPUT->str('acl_t');
+        }elseif($who){
+            $this->who = $who;
+        }
+
+        // handle modifications
+        if($INPUT->has('cmd') && checkSecurityToken()){
+            $cmd = $INPUT->extract('cmd')->str('cmd');
+
+            // scope for modifications
+            if($this->ns){
+                if($this->ns == '*'){
+                    $scope = '*';
+                }else{
+                    $scope = $this->ns.':*';
+                }
+            }else{
+                $scope = $ID;
+            }
+
+            if($cmd == 'save' && $scope && $this->who && $INPUT->has('acl')){
+                // handle additions or single modifications
+                $this->_acl_del($scope, $this->who);
+                $this->_acl_add($scope, $this->who, $INPUT->int('acl'));
+            }elseif($cmd == 'del' && $scope && $this->who){
+                // handle single deletions
+                $this->_acl_del($scope, $this->who);
+            }elseif($cmd == 'update'){
+                $acl = $INPUT->arr('acl');
+
+                // handle update of the whole file
+                foreach($INPUT->arr('del') as $where => $names){
+                    // remove all rules marked for deletion
+                    foreach($names as $who)
+                        unset($acl[$where][$who]);
+                }
+                // prepare lines
+                $lines = array();
+                // keep header
+                foreach($AUTH_ACL as $line){
+                    if($line{0} == '#'){
+                        $lines[] = $line;
+                    }else{
+                        break;
+                    }
+                }
+                // re-add all rules
+                foreach($acl as $where => $opt){
+                    foreach($opt as $who => $perm){
+                        if ($who[0]=='@') {
+                            if ($who!='@ALL') {
+                                $who = '@'.ltrim($auth->cleanGroup($who),'@');
+                            }
+                        } elseif ($who != '%USER%' && $who != '%GROUP%'){ #keep wildcard as is
+                            $who = $auth->cleanUser($who);
+                        }
+                        $who = auth_nameencode($who,true);
+                        $lines[] = "$where\t$who\t$perm\n";
+                    }
+                }
+                // save it
+                io_saveFile($config_cascade['acl']['default'], join('',$lines));
+            }
+
+            // reload ACL config
+            $AUTH_ACL = file($config_cascade['acl']['default']);
+        }
+
+        // initialize ACL array
+        $this->_init_acl_config();
+    }
+
+    /**
+     * ACL Output function
+     *
+     * print a table with all significant permissions for the
+     * current id
+     *
+     * @author  Frank Schubert 
+     * @author  Andreas Gohr 
+     */
+    function html() {
+        echo '
        '.NL;
+        echo '
        '.$this->getLang('admin_acl').'
        '.NL;
+        echo '
        '.NL;
+
+        echo '
        '.NL;
+        $this->_html_explorer();
+        echo '
        '.NL;
+
+        echo '
        '.NL;
+        $this->_html_detail();
+        echo '
        '.NL;
+        echo '
        '.NL;
+
+        echo '
        ';
+        echo '
        '.$this->getLang('current').'
        '.NL;
+        echo '
        '.NL;
+        $this->_html_table();
+        echo '
        '.NL;
+
+        echo '
        '.NL;
+        echo '1)'.NL;
+        echo $this->getLang('p_include');
+        echo '
        ';
+
+        echo '
        '.NL;
+    }
+
+    /**
+     * returns array with set options for building links
+     *
+     * @author Andreas Gohr 
+     */
+    function _get_opts($addopts=null){
+        $opts = array(
+                    'do'=>'admin',
+                    'page'=>'acl',
+                );
+        if($this->ns) $opts['ns'] = $this->ns;
+        if($this->who) $opts['acl_w'] = $this->who;
+
+        if(is_null($addopts)) return $opts;
+        return array_merge($opts, $addopts);
+    }
+
+    /**
+     * Display a tree menu to select a page or namespace
+     *
+     * @author Andreas Gohr 
+     */
+    function _html_explorer(){
+        global $conf;
+        global $ID;
+        global $lang;
+
+        $ns  = $this->ns;
+        if(empty($ns)){
+            $ns = dirname(str_replace(':','/',$ID));
+            if($ns == '.') $ns ='';
+        }elseif($ns == '*'){
+            $ns ='';
+        }
+        $ns  = utf8_encodeFN(str_replace(':','/',$ns));
+
+        $data = $this->_get_tree($ns);
+
+        // wrap a list with the root level around the other namespaces
+        array_unshift($data, array( 'level' => 0, 'id' => '*', 'type' => 'd',
+                   'open' =>'true', 'label' => '['.$lang['mediaroot'].']'));
+
+        echo html_buildlist($data,'acl',
+                            array($this,'_html_list_acl'),
+                            array($this,'_html_li_acl'));
+
+    }
+
+    /**
+     * 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-1]['id'] == $data[$i]['id'] && $data[$i-1]['type'] == $data[$i]['type']) unset($data[$i]);
+        }
+        return $data;
+    }
+
+    /**
+     * usort callback
+     *
+     * Sorts the combined trees of media and page files
+     */
+    function _tree_sort($a,$b){
+        // handle the trivial cases first
+        if ($a['id'] == '') return -1;
+        if ($b['id'] == '') return 1;
+        // split up the id into parts
+        $a_ids = explode(':', $a['id']);
+        $b_ids = explode(':', $b['id']);
+        // now loop through the parts
+        while (count($a_ids) && count($b_ids)) {
+            // compare each level from upper to lower
+            // until a non-equal component is found
+            $cur_result = strcmp(array_shift($a_ids), array_shift($b_ids));
+            if ($cur_result) {
+                // if one of the components is the last component and is a file
+                // and the other one is either of a deeper level or a directory,
+                // the file has to come after the deeper level or directory
+                if (empty($a_ids) && $a['type'] == 'f' && (count($b_ids) || $b['type'] == 'd')) return 1;
+                if (empty($b_ids) && $b['type'] == 'f' && (count($a_ids) || $a['type'] == 'd')) return -1;
+                return $cur_result;
+            }
+        }
+        // The two ids seem to be equal. One of them might however refer
+        // to a page, one to a namespace, the namespace needs to be first.
+        if (empty($a_ids) && empty($b_ids)) {
+            if ($a['type'] == $b['type']) return 0;
+            if ($a['type'] == 'f') return 1;
+            return -1;
+        }
+        // Now the empty part is either a page in the parent namespace
+        // that obviously needs to be after the namespace
+        // Or it is the namespace that contains the other part and should be
+        // before that other part.
+        if (empty($a_ids)) return ($a['type'] == 'd') ? -1 : 1;
+        if (empty($b_ids)) return ($b['type'] == 'd') ? 1 : -1;
+    }
+
+    /**
+     * Display the current ACL for selected where/who combination with
+     * selectors and modification form
+     *
+     * @author Andreas Gohr 
+     */
+    function _html_detail(){
+        global $ID;
+
+        echo '
        '.NL;
+
+        echo '
        ';
+        echo $this->getLang('acl_perms').' ';
+        $inl =  $this->_html_select();
+        echo ''.NL;
+        echo ''.NL;
+        echo '
        '.NL;
+
+        echo '
        ';
+        $this->_html_info();
+        echo '
        ';
+
+        echo ''.NL;
+        echo ''.NL;
+        echo ''.NL;
+        echo ''.NL;
+        echo ''.NL;
+        echo '
        '.NL;
+    }
+
+    /**
+     * Print info and editor
+     */
+    function _html_info(){
+        global $ID;
+
+        if($this->who){
+            $current = $this->_get_exact_perm();
+
+            // explain current permissions
+            $this->_html_explain($current);
+            // load editor
+            $this->_html_acleditor($current);
+        }else{
+            echo '
        ';
+            if($this->ns){
+                printf($this->getLang('p_choose_ns'),hsc($this->ns));
+            }else{
+                printf($this->getLang('p_choose_id'),hsc($ID));
+            }
+            echo '
        ';
+
+            echo $this->locale_xhtml('help');
+        }
+    }
+
+    /**
+     * Display the ACL editor
+     *
+     * @author Andreas Gohr 
+     */
+    function _html_acleditor($current){
+        global $lang;
+
+        echo '
        ';
+        if(is_null($current)){
+            echo ''.$this->getLang('acl_new').'';
+        }else{
+            echo ''.$this->getLang('acl_mod').'';
+        }
+
+        echo $this->_html_checkboxes($current,empty($this->ns),'acl');
+
+        if(is_null($current)){
+            echo ''.NL;
+        }else{
+            echo ''.NL;
+            echo ''.NL;
+        }
+
+        echo '
        ';
+    }
+
+    /**
+     * Explain the currently set permissions in plain english/$lang
+     *
+     * @author Andreas Gohr 
+     */
+    function _html_explain($current){
+        global $ID;
+        global $auth;
+
+        $who = $this->who;
+        $ns  = $this->ns;
+
+        // prepare where to check
+        if($ns){
+            if($ns == '*'){
+                $check='*';
+            }else{
+                $check=$ns.':*';
+            }
+        }else{
+            $check = $ID;
+        }
+
+        // prepare who to check
+        if($who{0} == '@'){
+            $user   = '';
+            $groups = array(ltrim($who,'@'));
+        }else{
+            $user = $who;
+            $info = $auth->getUserData($user);
+            if($info === false){
+                $groups = array();
+            }else{
+                $groups = $info['grps'];
+            }
+        }
+
+        // check the permissions
+        $perm = auth_aclcheck($check,$user,$groups);
+
+        // build array of named permissions
+        $names = array();
+        if($perm){
+            if($ns){
+                if($perm >= AUTH_DELETE) $names[] = $this->getLang('acl_perm16');
+                if($perm >= AUTH_UPLOAD) $names[] = $this->getLang('acl_perm8');
+                if($perm >= AUTH_CREATE) $names[] = $this->getLang('acl_perm4');
+            }
+            if($perm >= AUTH_EDIT) $names[] = $this->getLang('acl_perm2');
+            if($perm >= AUTH_READ) $names[] = $this->getLang('acl_perm1');
+            $names = array_reverse($names);
+        }else{
+            $names[] = $this->getLang('acl_perm0');
+        }
+
+        // print permission explanation
+        echo '
        ';
+        if($user){
+            if($ns){
+                printf($this->getLang('p_user_ns'),hsc($who),hsc($ns),join(', ',$names));
+            }else{
+                printf($this->getLang('p_user_id'),hsc($who),hsc($ID),join(', ',$names));
+            }
+        }else{
+            if($ns){
+                printf($this->getLang('p_group_ns'),hsc(ltrim($who,'@')),hsc($ns),join(', ',$names));
+            }else{
+                printf($this->getLang('p_group_id'),hsc(ltrim($who,'@')),hsc($ID),join(', ',$names));
+            }
+        }
+        echo '
        ';
+
+        // add note if admin
+        if($perm == AUTH_ADMIN){
+            echo '
        '.$this->getLang('p_isadmin').'
        ';
+        }elseif(is_null($current)){
+            echo '
        '.$this->getLang('p_inherited').'
        ';
+        }
+    }
+
+
+    /**
+     * Item formatter for the tree view
+     *
+     * User function for html_buildlist()
+     *
+     * @author Andreas Gohr 
+     */
+    function _html_list_acl($item){
+        $ret = '';
+        // what to display
+        if($item['label']){
+            $base = $item['label'];
+        }else{
+            $base = ':'.$item['id'];
+            $base = substr($base,strrpos($base,':')+1);
+        }
+
+        // highlight?
+        if( ($item['type']== $this->current_item['type'] && $item['id'] == $this->current_item['id']))
+            $cl = ' cur';
+
+        // namespace or page?
+        if($item['type']=='d'){
+            if($item['open']){
+                $img   = DOKU_BASE.'lib/images/minus.gif';
+                $alt   = '−';
+            }else{
+                $img   = DOKU_BASE.'lib/images/plus.gif';
+                $alt   = '+';
+            }
+            $ret .= ''.$alt.'';
+            $ret .= '';
+            $ret .= $base;
+            $ret .= '';
+        }else{
+            $ret .= '';
+            $ret .= noNS($item['id']);
+            $ret .= '';
+        }
+        return $ret;
+    }
+
+
+    function _html_li_acl($item){
+        return '
      12. ';
+    }
+
+
+    /**
+     * Get current ACL settings as multidim array
+     *
+     * @author Andreas Gohr 
+     */
+    function _init_acl_config(){
+        global $AUTH_ACL;
+        global $conf;
+        $acl_config=array();
+        $usersgroups = array();
+
+        // get special users and groups
+        $this->specials[] = '@ALL';
+        $this->specials[] = '@'.$conf['defaultgroup'];
+        if($conf['manager'] != '!!not set!!'){
+            $this->specials = array_merge($this->specials,
+                                          array_map('trim',
+                                                    explode(',',$conf['manager'])));
+        }
+        $this->specials = array_filter($this->specials);
+        $this->specials = array_unique($this->specials);
+        sort($this->specials);
+
+        foreach($AUTH_ACL as $line){
+            $line = trim(preg_replace('/#.*$/','',$line)); //ignore comments
+            if(!$line) continue;
+
+            $acl = preg_split('/[ \t]+/',$line);
+            //0 is pagename, 1 is user, 2 is acl
+
+            $acl[1] = rawurldecode($acl[1]);
+            $acl_config[$acl[0]][$acl[1]] = $acl[2];
+
+            // store non-special users and groups for later selection dialog
+            $ug = $acl[1];
+            if(in_array($ug,$this->specials)) continue;
+            $usersgroups[] = $ug;
+        }
+
+        $usersgroups = array_unique($usersgroups);
+        sort($usersgroups);
+        ksort($acl_config);
+
+        $this->acl = $acl_config;
+        $this->usersgroups = $usersgroups;
+    }
+
+    /**
+     * Display all currently set permissions in a table
+     *
+     * @author Andreas Gohr 
+     */
+    function _html_table(){
+        global $lang;
+        global $ID;
+
+        echo '
        '.NL;
+        if($this->ns){
+            echo ''.NL;
+        }else{
+            echo ''.NL;
+        }
+        echo ''.NL;
+        echo ''.NL;
+        echo ''.NL;
+        echo ''.NL;
+        echo '
        ';
+        echo '';
+        echo '';
+        echo '';
+        echo '';
+        echo '';
+        echo '';
+        echo '';
+        foreach($this->acl as $where => $set){
+            foreach($set as $who => $perm){
+                echo '';
+                echo '';
+
+                echo '';
+
+                echo '';
+
+                echo '';
+                echo '';
+            }
+        }
+
+        echo '';
+        echo '';
+        echo '';
+        echo '
        '.$this->getLang('where').''.$this->getLang('who').''.$this->getLang('perm').'1)'.$lang['btn_delete'].'
        ';
+                if(substr($where,-1) == '*'){
+                    echo ''.hsc($where).'';
+                    $ispage = false;
+                }else{
+                    echo ''.hsc($where).'';
+                    $ispage = true;
+                }
+                echo '';
+                if($who{0} == '@'){
+                    echo ''.hsc($who).'';
+                }else{
+                    echo ''.hsc($who).'';
+                }
+                echo '';
+                echo $this->_html_checkboxes($perm,$ispage,'acl['.$where.']['.$who.']');
+                echo '';
+                echo '';
+                echo '
        ';
+        echo '';
+        echo '
        ';
+        echo '
        ';
+        echo '
        '.NL;
+    }
+
+
+    /**
+     * Returns the permission which were set for exactly the given user/group
+     * and page/namespace. Returns null if no exact match is available
+     *
+     * @author Andreas Gohr 
+     */
+    function _get_exact_perm(){
+        global $ID;
+        if($this->ns){
+            if($this->ns == '*'){
+                $check = '*';
+            }else{
+                $check = $this->ns.':*';
+            }
+        }else{
+            $check = $ID;
+        }
+
+        if(isset($this->acl[$check][$this->who])){
+            return $this->acl[$check][$this->who];
+        }else{
+            return null;
+        }
+    }
+
+    /**
+     * adds new acl-entry to conf/acl.auth.php
+     *
+     * @author  Frank Schubert 
+     */
+    function _acl_add($acl_scope, $acl_user, $acl_level){
+        global $config_cascade;
+        $acl_config = file_get_contents($config_cascade['acl']['default']);
+        $acl_user = auth_nameencode($acl_user,true);
+
+        // max level for pagenames is edit
+        if(strpos($acl_scope,'*') === false) {
+            if($acl_level > AUTH_EDIT) $acl_level = AUTH_EDIT;
+        }
+
+        $new_acl = "$acl_scope\t$acl_user\t$acl_level\n";
+
+        $new_config = $acl_config.$new_acl;
+
+        return io_saveFile($config_cascade['acl']['default'], $new_config);
+    }
+
+    /**
+     * remove acl-entry from conf/acl.auth.php
+     *
+     * @author  Frank Schubert 
+     */
+    function _acl_del($acl_scope, $acl_user){
+        global $config_cascade;
+        $acl_config = file($config_cascade['acl']['default']);
+        $acl_user = auth_nameencode($acl_user,true);
+
+        $acl_pattern = '^'.preg_quote($acl_scope,'/').'[ \t]+'.$acl_user.'[ \t]+[0-8].*$';
+
+        // save all non!-matching
+        $new_config = preg_grep("/$acl_pattern/", $acl_config, PREG_GREP_INVERT);
+
+        return io_saveFile($config_cascade['acl']['default'], join('',$new_config));
+    }
+
+    /**
+     * print the permission radio boxes
+     *
+     * @author  Frank Schubert 
+     * @author  Andreas Gohr 
+     */
+    function _html_checkboxes($setperm,$ispage,$name){
+        global $lang;
+
+        static $label = 0; //number labels
+        $ret = '';
+
+        if($ispage && $setperm > AUTH_EDIT) $setperm = AUTH_EDIT;
+
+        foreach(array(AUTH_NONE,AUTH_READ,AUTH_EDIT,AUTH_CREATE,AUTH_UPLOAD,AUTH_DELETE) as $perm){
+            $label += 1;
+
+            //general checkbox attributes
+            $atts = array( 'type'  => 'radio',
+                           'id'    => 'pbox'.$label,
+                           'name'  => $name,
+                           'value' => $perm );
+            //dynamic attributes
+            if(!is_null($setperm) && $setperm == $perm) $atts['checked']  = 'checked';
+            if($ispage && $perm > AUTH_EDIT){
+                $atts['disabled'] = 'disabled';
+                $class = ' class="disabled"';
+            }else{
+                $class = '';
+            }
+
+            //build code
+            $ret .= ''.NL;
+        }
+        return $ret;
+    }
+
+    /**
+     * Print a user/group selector (reusing already used users and groups)
+     *
+     * @author  Andreas Gohr 
+     */
+    function _html_select(){
+        $inlist = false;
+
+        if($this->who &&
+           !in_array($this->who,$this->usersgroups) &&
+           !in_array($this->who,$this->specials)){
+
+            if($this->who{0} == '@'){
+                $gsel = ' selected="selected"';
+            }else{
+                $usel   = ' selected="selected"';
+            }
+        }else{
+            $usel = '';
+            $gsel = '';
+            $inlist = true;
+        }
+
+        echo ''.NL;
+        return $inlist;
+    }
+}
diff --git a/sources/lib/plugins/acl/lang/af/lang.php b/sources/lib/plugins/acl/lang/af/lang.php
new file mode 100644
index 0000000..04d9b0a
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/af/lang.php
@@ -0,0 +1,10 @@
+acl|المستندات الرسمية عن ACL]] قد يساعدك على الفهم الكامل لطريقة عمل التحكم بالوصول في دوكو ويكي.
diff --git a/sources/lib/plugins/acl/lang/ar/lang.php b/sources/lib/plugins/acl/lang/ar/lang.php
new file mode 100644
index 0000000..4e44dab
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ar/lang.php
@@ -0,0 +1,38 @@
+
+ * @author Yaman Hokan 
+ * @author Usama Akkad 
+ * @author uahello@gmail.com
+ */
+$lang['admin_acl']             = 'إدارة قوائم التحكم بالدخول';
+$lang['acl_group']             = 'مجموعة';
+$lang['acl_user']              = 'مستخدم';
+$lang['acl_perms']             = 'ترخيص لـ';
+$lang['page']                  = 'صفحة';
+$lang['namespace']             = 'فضاء التسمية';
+$lang['btn_select']            = 'اختيار';
+$lang['p_user_id']             = 'المستخدم%s عنده حاليا الصلاحيات التالية على الصفحة%s: %s.';
+$lang['p_user_ns']             = 'المستخدم %s عنده حاليا الصلاحيات التالية في النطاق%s: %s.';
+$lang['p_group_id']            = 'أعضاء مجموعة%s عندهم حاليا الصلاحيات التالية على الصفحة page %s: %s.';
+$lang['p_group_ns']            = 'أعضاء مجموعة %s عندهم حاليا الصلاحيات التالية في النطاق %s: %s.';
+$lang['p_choose_id']           = 'رجاء مستخدما أو مجموعة في النموذج أعلاه لعرض أو تحرير اعداد الصلاحيات للصفحة%s.';
+$lang['p_choose_ns']           = 'رجاء Please أدخل مستخدما أو مجموعة في النموذج أعلاه لعرض أو تحرير اعداد الصلاحيات للنطاق%s.';
+$lang['p_inherited']           = 'لاحظ: هذه الصلاحيات لم تنشأ إراديا بل وُرثت من مجموعات أخرى أو نطاقات أعلى.';
+$lang['p_isadmin']             = 'لاحظ: المجموعة أو المستخدم المحدد عندهم دائما صلاحيات كاملة بسبب ضبطهم كمستخدمين متفوقين.';
+$lang['p_include']             = 'الصلاحيات الاعلى تتضمن الأخفض. صلاحيات الإنشاء ، والرفع، والحذف تطبق فقط على النطاقات، وليس على الصفحات.';
+$lang['current']               = 'قواعد ACL الحالية';
+$lang['where']                 = 'الصفحة/النطاق';
+$lang['who']                   = 'اسم المستخدم / المجموعة';
+$lang['perm']                  = 'التصاريح';
+$lang['acl_perm0']             = 'لا يوجد';
+$lang['acl_perm1']             = 'قراءة';
+$lang['acl_perm2']             = 'تحرير';
+$lang['acl_perm4']             = 'إنشاء';
+$lang['acl_perm8']             = 'تحميل';
+$lang['acl_perm16']            = 'مسح';
+$lang['acl_new']               = 'أضف أضافة جديدة';
+$lang['acl_mod']               = 'عدل المدخلة';
diff --git a/sources/lib/plugins/acl/lang/bg/help.txt b/sources/lib/plugins/acl/lang/bg/help.txt
new file mode 100644
index 0000000..2de4534
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/bg/help.txt
@@ -0,0 +1,11 @@
+=== Помощ ===
+
+От тук можете да добавяте и премахвате права за именни пространства и страници във вашето Wiki.
+
+Левият панел показва всички налични именни пространства и страници.
+
+Формата отгоре ви позволява да преглеждате и променяте правата на избран потребител или група.
+
+В таблицата отдолу са показани всички актуални правила за контрол на достъпа. Можете да я ползвате за бързо изтриване или промяна на множество правила.
+
+За да разберете как работи контрола на достъпа в DokuWiki трябва да прочетете [[doku>acl|документацията относно ACL]].
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/bg/lang.php b/sources/lib/plugins/acl/lang/bg/lang.php
new file mode 100644
index 0000000..9520175
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/bg/lang.php
@@ -0,0 +1,37 @@
+
+ * @author Viktor Usunov 
+ * @author Kiril 
+ */
+$lang['admin_acl']             = 'Управление на списъците за достъп';
+$lang['acl_group']             = 'Група';
+$lang['acl_user']              = 'Потребител';
+$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']             = 'Бележка: Избраната група или потребител има всички права, защото е определен за супер потребител.';
+$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 --git a/sources/lib/plugins/acl/lang/ca-valencia/help.txt b/sources/lib/plugins/acl/lang/ca-valencia/help.txt
new file mode 100644
index 0000000..87450d2
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ca-valencia/help.txt
@@ -0,0 +1,15 @@
+=== 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 l'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.
+
+Llegint la [[doku>acl|documentació oficial sobre ACL]] podrà
+comprendre millor com funciona el control d'accés en DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/ca-valencia/lang.php b/sources/lib/plugins/acl/lang/ca-valencia/lang.php
new file mode 100644
index 0000000..ef0ae92
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ca-valencia/lang.php
@@ -0,0 +1,37 @@
+
+ * @author Bernat Arlandis 
+ * @author Bernat Arlandis 
+ */
+$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 super-usuari.';
+$lang['p_include']             = 'Els permissos més alts inclouen als més baixos. Els permissos per a crear, enviar i borrar només valen per a espais de noms, pàgines no.';
+$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 entrada nova';
+$lang['acl_mod']               = 'Modificar entrada';
diff --git a/sources/lib/plugins/acl/lang/ca/help.txt b/sources/lib/plugins/acl/lang/ca/help.txt
new file mode 100644
index 0000000..d9bcc12
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ca/help.txt
@@ -0,0 +1,11 @@
+=== Ajuda ràpida ===
+
+En aquesta 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 us permet veure 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 hagin estat definides. Podeu utilitzar aquesta taula per suprimir o modificar ràpidament totes les regles que vulgueu.
+
+Llegir la [[doku>acl|documentació oficial sobre ACL]] us pot ajudar a entendre del tot com funciona el control d'accés en DokuWiki.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/ca/lang.php b/sources/lib/plugins/acl/lang/ca/lang.php
new file mode 100644
index 0000000..183db71
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ca/lang.php
@@ -0,0 +1,39 @@
+
+ * @author Carles Bellver 
+ * @author carles.bellver@gmail.com
+ * @author carles.bellver@cent.uji.es
+ * @author daniel@6temes.cat
+ */
+$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 veure 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 veure o editar els seus permisos en l\'espai %s.';
+$lang['p_inherited']           = 'Nota: aquests permisos no s\'han definit explícitament, sinó que són heretats d\'altres grups o d\'espais d\'ordre 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']               = 'Afegeix nova entrada';
+$lang['acl_mod']               = 'Modifica entrada';
diff --git a/sources/lib/plugins/acl/lang/cs/help.txt b/sources/lib/plugins/acl/lang/cs/help.txt
new file mode 100644
index 0000000..1dbc88a
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/cs/help.txt
@@ -0,0 +1,11 @@
+=== Nápověda: ===
+
+Na této stránce můžete přidávat a odebírat oprávnění na jmenné prostory a stránky Vaší wiki.
+
+Levý panel zobrazuje všechny dostupné jmenné prostory a stránky.
+
+Formulář výše umožňuje vidět a modifikovat oprávnění vybraného uživatele nebo skupiny.
+
+V tabulce uvedené níže jsou zobrazeny všechny aktuální pravidla pro řízení přístupu (oprávnění). Zde můžete rychle odebírat a měnit více položek (oprávnění) najednou.
+
+Pro detailnější nápovědu si přečtěte stránku [[doku>acl|oficiální dokumentaci ACL]], která Vám může pomoci plně pochopit princip, jak řízení přístupu na DokuWiki funguje.
diff --git a/sources/lib/plugins/acl/lang/cs/lang.php b/sources/lib/plugins/acl/lang/cs/lang.php
new file mode 100644
index 0000000..8031612
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/cs/lang.php
@@ -0,0 +1,44 @@
+
+ * @author Zbynek Krivka 
+ * @author tomas@valenta.cz
+ * @author Marek Sacha 
+ * @author Lefty 
+ * @author Vojta Beran 
+ * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
+ * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
+ */
+$lang['admin_acl']             = 'Správa přístupových práv';
+$lang['acl_group']             = 'Skupina';
+$lang['acl_user']              = 'Uživatel';
+$lang['acl_perms']             = 'Práva pro';
+$lang['page']                  = 'Stránka';
+$lang['namespace']             = 'Jmenný prostor';
+$lang['btn_select']            = 'Vybrat';
+$lang['p_user_id']             = 'Uživatel %s má nyní na stránku %s následující oprávnění: %s.';
+$lang['p_user_ns']             = 'Uživatel %s má nyní na jmenný prostor %s následující oprávnění: %s.';
+$lang['p_group_id']            = 'Členové skupiny %s mají nyní na stránku %s následující oprávnění: %s.';
+$lang['p_group_ns']            = 'Členové skupiny %s mají nyní na jmenný prostor %s následující oprávnění: %s.';
+$lang['p_choose_id']           = 'Prosím, vložte uživatele nebo skupinu ve formě uvedené výše, abyste mohli prohlížet a editovat množinu oprávnění pro stránku %s.';
+$lang['p_choose_ns']           = 'Prosím, vložte uživatele nebo skupinu ve formě uvedené výše, abyste mohli prohlížet a editovat množinu oprávnění pro jmenný prostor %s.';
+$lang['p_inherited']           = 'Poznámka: Tato oprávnění nebyla nastavena explicitně, ale jsou zděděna z jiné skupiny nebo z nadřazeného jmenného prostoru.';
+$lang['p_isadmin']             = 'Poznámka: Vybraná skupina nebo uživatel má vždy plná oprávnění, protože je nastaven jako správce (superuser).';
+$lang['p_include']             = 'Vyšší oprávnění zahrnují nižší oprávnění. Vytvořit, Nahrát a Smazat se vztahují jen k jmenným prostorů, nikoliv ke stránkám.';
+$lang['current']               = 'Aktuální ACL pravidla';
+$lang['where']                 = 'Stránka/Jmenný prostor';
+$lang['who']                   = 'Uživatel/Skupina';
+$lang['perm']                  = 'Oprávnění';
+$lang['acl_perm0']             = 'Žádné';
+$lang['acl_perm1']             = 'Čtení';
+$lang['acl_perm2']             = 'Úpravy';
+$lang['acl_perm4']             = 'Vytvoření';
+$lang['acl_perm8']             = 'Upload';
+$lang['acl_perm16']            = 'Mazání';
+$lang['acl_new']               = 'Přidat novou položku';
+$lang['acl_mod']               = 'Editovat položku';
diff --git a/sources/lib/plugins/acl/lang/da/help.txt b/sources/lib/plugins/acl/lang/da/help.txt
new file mode 100644
index 0000000..c8eedfc
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/da/help.txt
@@ -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.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/da/lang.php b/sources/lib/plugins/acl/lang/da/lang.php
new file mode 100644
index 0000000..2558795
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/da/lang.php
@@ -0,0 +1,45 @@
+
+ * @author Jon Bendtsen 
+ * @author Lars Næsbye Christensen 
+ * @author Kalle Sommer Nielsen 
+ * @author Esben Laursen 
+ * @author Harith 
+ * @author Daniel Ejsing-Duun 
+ * @author Erik Bjørn Pedersen 
+ * @author rasmus@kinnerup.com
+ * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig 
+ */
+$lang['admin_acl']             = 'Rettighedsadministration';
+$lang['acl_group']             = 'Gruppe';
+$lang['acl_user']              = 'Bruger';
+$lang['acl_perms']             = 'Rettigheder for';
+$lang['page']                  = 'Dokument';
+$lang['namespace']             = 'Navnerum';
+$lang['btn_select']            = 'Vælg';
+$lang['p_user_id']             = 'Bruger %s har følgende adgang på siden %s: %s';
+$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']                  = 'Rettigheder';
+$lang['acl_perm0']             = 'Ingen';
+$lang['acl_perm1']             = 'Læs';
+$lang['acl_perm2']             = 'Skriv';
+$lang['acl_perm4']             = 'Opret';
+$lang['acl_perm8']             = 'Overføre';
+$lang['acl_perm16']            = 'Slet';
+$lang['acl_new']               = 'Tilføj ny post';
+$lang['acl_mod']               = 'Ændre post';
diff --git a/sources/lib/plugins/acl/lang/de-informal/help.txt b/sources/lib/plugins/acl/lang/de-informal/help.txt
new file mode 100644
index 0000000..d7930f8
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/de-informal/help.txt
@@ -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 --git a/sources/lib/plugins/acl/lang/de-informal/lang.php b/sources/lib/plugins/acl/lang/de-informal/lang.php
new file mode 100644
index 0000000..35df13d
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/de-informal/lang.php
@@ -0,0 +1,42 @@
+
+ * @author Juergen Schwarzer 
+ * @author Marcel Metz 
+ * @author Matthias Schulte 
+ * @author Christian Wichmann 
+ * @author Pierre Corell 
+ * @author Frank Loizzi 
+ * @author Volker Bödker 
+ */
+$lang['admin_acl']             = 'Zugangsverwaltung';
+$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 Benutzer oder eine Gruppe in das Formular ein, um die Berechtigungen der Seite %s anzusehen oder zu bearbeiten.';
+$lang['p_choose_ns']           = 'Bitte gib einen Benutzer oder eine Gruppe in das Formular ein, um die Berechtigungen des Namenraumes %s anzusehen oder zu bearbeiten.';
+$lang['p_inherited']           = 'Hinweis: Diese Rechte wurden nicht explizit gesetzt, sondern von anderen Gruppen oder übergeordneten Namensräumen geerbt.';
+$lang['p_isadmin']             = 'Hinweis: Die gewählte Gruppe oder der Benutzer haben immer die vollen Rechte, weil sie als Superuser konfiguriert sind.';
+$lang['p_include']             = 'Höhere Rechte schließen kleinere mit ein. Hochlade- und Löschrechte sind nur für Namensräume, nicht für Seiten.';
+$lang['current']               = 'Momentane Zugriffsregeln';
+$lang['where']                 = 'Seite/Namensraum';
+$lang['who']                   = 'Benutzer/Gruppe';
+$lang['perm']                  = 'Rechte';
+$lang['acl_perm0']             = 'Keine';
+$lang['acl_perm1']             = 'Lesen';
+$lang['acl_perm2']             = 'Bearbeiten';
+$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 --git a/sources/lib/plugins/acl/lang/de/help.txt b/sources/lib/plugins/acl/lang/de/help.txt
new file mode 100644
index 0000000..2a3efe5
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/de/help.txt
@@ -0,0 +1,11 @@
+=== Kurzhilfe ===
+
+Auf dieser Seite können sie Zugriffsberechtigungen für Seiten und Namensräume festlegen und ändern.
+
+Die Liste links zeigt alle verfügbaren Namensräume und Seiten.
+
+Das Formular oben erlaubt Anzeige, Ändern und Hinzufügen von Zugriffsregeln für einen ausgewählten Benutzer oder eine Gruppe.
+
+In der Tabelle unten werden alle bestehenden Regeln aufgeführt und können dort modifiziert oder gelöscht werden.
+
+Für ein tiefergehendes Verständnis wie Zugriffsbeschränkungen in DokuWiki funktionieren, sollten Sie die [[doku>acl|offizielle Dokumentation]] lesen.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/de/lang.php b/sources/lib/plugins/acl/lang/de/lang.php
new file mode 100644
index 0000000..77de4b0
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/de/lang.php
@@ -0,0 +1,52 @@
+
+ * @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 Dirk Einecke 
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider 
+ * @author Robert Bogenschneider 
+ * @author Niels Lange 
+ * @author Christian Wichmann 
+ * @author Paul Lachewsky 
+ * @author Pierre Corell 
+ */
+$lang['admin_acl']             = 'Zugangsverwaltung';
+$lang['acl_group']             = 'Gruppe';
+$lang['acl_user']              = 'Benutzer';
+$lang['acl_perms']             = 'Berechtigungen für';
+$lang['page']                  = 'Seite';
+$lang['namespace']             = 'Namensraum';
+$lang['btn_select']            = 'Auswählen';
+$lang['p_user_id']             = 'Nutzer %s hat momentan folgende Berechtigungen für die Seite %s: %s.';
+$lang['p_user_ns']             = 'Nutzer %s hat momentan folgende Berechtigungen im Namensraum %s: %s.';
+$lang['p_group_id']            = 'Mitglieder der Gruppe %s haben momentan folgende Berechtigungen für die Seite %s: %s.';
+$lang['p_group_ns']            = 'Mitglieder der Gruppe %s haben momentan folgende Berechtigungen für den Namensraum %s: %s.';
+$lang['p_choose_id']           = 'Bitte geben Sie in obigem Formular eine einen Benutzer oder eine Gruppe an, um die Berechtigungen für die Seite %s zu sehen oder zu ändern.';
+$lang['p_choose_ns']           = 'Bitte geben Sie in obigem Formular eine einen Benutzer oder eine Gruppe an, um die Berechtigungen für den Namensraum %s zu sehen oder zu ändern.';
+$lang['p_inherited']           = 'Hinweis: Diese Berechtigungen wurden nicht explizit gesetzt, sondern von anderen Gruppen oder höher liegenden Namensräumen geerbt.';
+$lang['p_isadmin']             = 'Hinweis: Die ausgewählte Gruppe oder Benutzer haben immer alle Berechtigungen das sie als Superuser konfiguriert wurden.';
+$lang['p_include']             = 'Höhere Berechtigungen schließen niedrigere mit ein. Anlegen, Hochladen und Entfernen gilt nur für Namensräume, nicht für einzelne Seiten';
+$lang['current']               = 'Momentane Zugriffsregeln';
+$lang['where']                 = 'Seite/Namensraum';
+$lang['who']                   = 'Nutzer/Gruppe';
+$lang['perm']                  = 'Berechtigungen';
+$lang['acl_perm0']             = 'Keine';
+$lang['acl_perm1']             = 'Lesen';
+$lang['acl_perm2']             = 'Bearbeiten';
+$lang['acl_perm4']             = 'Anlegen';
+$lang['acl_perm8']             = 'Hochladen';
+$lang['acl_perm16']            = 'Entfernen';
+$lang['acl_new']               = 'Eintrag hinzufügen';
+$lang['acl_mod']               = 'Eintrag bearbeiten';
diff --git a/sources/lib/plugins/acl/lang/el/help.txt b/sources/lib/plugins/acl/lang/el/help.txt
new file mode 100644
index 0000000..ea2f816
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/el/help.txt
@@ -0,0 +1,10 @@
+=== Γρήγορη Βοήθεια: ===
+
+Στη σελίδα αυτή μπορείτε να προσθέσετε και αφαιρέσετε δικαιώματα πρόσβασης για φακέλους και σελίδες στο wiki σας.
+
+Το αριστερό πλαίσιο δείχνει όλους τους διαθέσιμους φακέλους και αρχεία.
+
+Η παραπάνω φόρμα επιτρέπει να δείτε και να τροποποιήσετε τα διακαιώματα μίας επιλεγμένης ομάδας χρηστών ή ενός χρήστη.
+
+Στον παρακάτω πίνακα εμφανίζονται όλοι οι τρέχοντες κανόνες παραχώρησης δικαιωμάτων πρόσβασης. Μπορείτε να τον χρησιμοποιήσετε ώστε να σβήσετε ή να τροποποιήσετε γρήγορα πολλαπλούς κανόνες.
+Διαβάζοντας την [[doku>acl|επίσημη τεκμηρίωση για τις Λίστες Δικαιωμάτων Πρόσβασης - ACL]] ίσως σας βοηθήσει να καταλάβετε πλήρως το πως αυτές εφαρμόζονται στην DokuWiki.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/el/lang.php b/sources/lib/plugins/acl/lang/el/lang.php
new file mode 100644
index 0000000..dc4a9f0
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/el/lang.php
@@ -0,0 +1,43 @@
+
+ * @author Anika Henke 
+ * @author Matthias Grimm 
+ * @author Thanos Massias 
+ * @author Αθανάσιος Νταής 
+ * @author Konstantinos Koryllos 
+ * @author George Petsagourakis 
+ * @author Petros Vidalis 
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
+ */
+$lang['admin_acl']             = 'Διαχείριση Δικαιωμάτων Πρόσβασης';
+$lang['acl_group']             = 'Ομάδα';
+$lang['acl_user']              = 'Χρήστης';
+$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 --git a/sources/lib/plugins/acl/lang/en/help.txt b/sources/lib/plugins/acl/lang/en/help.txt
new file mode 100644
index 0000000..e865bbb
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/en/help.txt
@@ -0,0 +1,9 @@
+=== Quick Help: ===
+
+On this page you can add and remove permissions for namespaces and pages in your wiki.
+  * The left pane displays all available namespaces and pages.
+  * The form above allows you to see and modify the permissions of a selected user or group.
+  * In the table below all currently set access control rules are shown. You can use it to quickly delete or change multiple rules.
+
+Reading the [[doku>acl|official documentation on ACL]] might help you to fully understand how access control works in DokuWiki.
+
diff --git a/sources/lib/plugins/acl/lang/en/lang.php b/sources/lib/plugins/acl/lang/en/lang.php
new file mode 100644
index 0000000..779614d
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/en/lang.php
@@ -0,0 +1,46 @@
+
+ * @author     Anika Henke 
+ * @author     Matthias Grimm 
+ */
+
+$lang['admin_acl']  = 'Access Control List Management';
+$lang['acl_group']  = 'Group';
+$lang['acl_user']   = 'User';
+$lang['acl_perms']  = 'Permissions for';
+$lang['page']       = 'Page';
+$lang['namespace']  = 'Namespace';
+
+$lang['btn_select']  = 'Select';
+
+$lang['p_user_id']    = 'User %s currently has the following permissions on page %s: %s.';
+$lang['p_user_ns']    = 'User %s currently has the following permissions in namespace %s: %s.';
+$lang['p_group_id']   = 'Members of group %s currently have the following permissions on page %s: %s.';
+$lang['p_group_ns']   = 'Members of group %s currently have the following permissions in namespace %s: %s.';
+
+$lang['p_choose_id']  = 'Please enter a user or group in the form above to view or edit the permissions set for the page %s.';
+$lang['p_choose_ns']  = 'Please enter a user or group in the form above to view or edit the permissions set for the namespace %s.';
+
+
+$lang['p_inherited']  = 'Note: Those permissions were not set explicitly but were inherited from other groups or higher namespaces.';
+$lang['p_isadmin']    = 'Note: The selected group or user has always full permissions because it is configured as superuser.';
+$lang['p_include']    = 'Higher permissions include lower ones. Create, Upload and Delete permissions only apply to namespaces, not pages.';
+
+$lang['current'] = 'Current ACL Rules';
+$lang['where'] = 'Page/Namespace';
+$lang['who']   = 'User/Group';
+$lang['perm']  = 'Permissions';
+
+$lang['acl_perm0']  = 'None';
+$lang['acl_perm1']  = 'Read';
+$lang['acl_perm2']  = 'Edit';
+$lang['acl_perm4']  = 'Create';
+$lang['acl_perm8']  = 'Upload';
+$lang['acl_perm16'] = 'Delete';
+$lang['acl_new']    = 'Add new Entry';
+$lang['acl_mod']    = 'Modify Entry';
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/lib/plugins/acl/lang/eo/help.txt b/sources/lib/plugins/acl/lang/eo/help.txt
new file mode 100644
index 0000000..488e84a
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/eo/help.txt
@@ -0,0 +1,11 @@
+=== Helpeto: ===
+
+En tiu ĉi paĝo vi povas aldoni kaj forigi rajtojn por nomspacoj kaj paĝoj en via vikio.
+
+La maldekstra panelo montras ĉiujn disponeblajn nomspacojn kaj paĝojn.
+
+La suba agordilo permesas al vi rigardi kaj modifi la rajtojn de elektita uzanto aŭ grupo.
+
+En la suba tabelo ĉiuj aktuale difinitaj alirkontrolaj reguloj estas montrataj. Vi povas uzi ĝin por rapide forigi aŭ ŝanĝi multoblajn regulojn.
+
+Legi la [[doku>acl|oficialan dokumentaron pri ACL]] povus helpi vin bone kompreni kiel alirkontrolo funkcias en DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/eo/lang.php b/sources/lib/plugins/acl/lang/eo/lang.php
new file mode 100644
index 0000000..a5f6073
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/eo/lang.php
@@ -0,0 +1,41 @@
+
+ * @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';
+$lang['acl_user']              = 'Uzanto';
+$lang['acl_perms']             = 'Rajtoj por';
+$lang['page']                  = 'Paĝo';
+$lang['namespace']             = 'Nomspaco';
+$lang['btn_select']            = 'Elekti';
+$lang['p_user_id']             = 'Uzanto %s aktuale havas la jenajn rajtojn en la paĝo %s: %s.';
+$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']           = 'Bonvolu enmeti uzanton aŭ grupon en la suban agordilon por rigardi aŭ redakti la aron da rajtoj por la paĝo %s.';
+$lang['p_choose_ns']           = 'Bonvolu enmeti uzanton aŭ grupon en la suban agordilon por rigardi aŭ redakti la aron da rajtoj por la nomspaco %s.';
+$lang['p_inherited']           = 'Rimarko: tiuj rajtoj ne estas rekte difinitaj, sed ili herediĝas el aliaj pli supraj 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.';
+$lang['current']               = 'Aktuala regularo ACL';
+$lang['where']                 = 'Paĝo/Nomspaco';
+$lang['who']                   = 'Uzanto/Grupo';
+$lang['perm']                  = 'Rajtoj';
+$lang['acl_perm0']             = 'Nenio';
+$lang['acl_perm1']             = 'Legi';
+$lang['acl_perm2']             = 'Redakti';
+$lang['acl_perm4']             = 'Krei';
+$lang['acl_perm8']             = 'Alŝuti';
+$lang['acl_perm16']            = 'Forigi';
+$lang['acl_new']               = 'Aldoni novan enmetaĵon';
+$lang['acl_mod']               = 'Modifi enmetaĵon';
diff --git a/sources/lib/plugins/acl/lang/es/help.txt b/sources/lib/plugins/acl/lang/es/help.txt
new file mode 100644
index 0000000..c683477
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/es/help.txt
@@ -0,0 +1,11 @@
+=== Ayuda rápida: ===
+
+En esta página puede agregar o retirar permisos para los espacios de nombres y páginas en su wiki.
+
+El panel de la izquierda muiestra todos los espacios de nombres y páginas
+
+El formulario inferior permite  ver y modificar los permisos del usuario o grupo elegido.
+
+En la tabla anterior se muestran todas  las reglas de control de acceso vigentes  Puede usarla para borrar o cambiar varias reglas rápidamente.
+
+Consultar el  [[doku>acl|official documentation on ACL]] puede ayudarle a entender completamente como el control de acceso trabaja en DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/es/lang.php b/sources/lib/plugins/acl/lang/es/lang.php
new file mode 100644
index 0000000..cf503d4
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/es/lang.php
@@ -0,0 +1,55 @@
+
+ * @author Oscar M. Lage 
+ * @author Gabriel Castillo 
+ * @author oliver@samera.com.py
+ * @author Enrico Nicoletto 
+ * @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 
+ * @author Victor Castelan 
+ * @author Mauro Javier Giamberardino 
+ * @author emezeta 
+ * @author Oscar Ciudad 
+ * @author Ruben Figols 
+ * @author Gerardo Zamudio 
+ * @author Mercè López mercelz@gmail.com
+ */
+$lang['admin_acl']             = 'Administración de lista de control de acceso';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Usuario';
+$lang['acl_perms']             = 'Permiso para';
+$lang['page']                  = 'Página';
+$lang['namespace']             = 'Espacio de nombres';
+$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 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']                 = 'Página/Espacio de nombres';
+$lang['who']                   = 'Usuario/Grupo';
+$lang['perm']                  = 'Permisos';
+$lang['acl_perm0']             = 'ninguno';
+$lang['acl_perm1']             = 'Leer';
+$lang['acl_perm2']             = 'Editar';
+$lang['acl_perm4']             = 'Crear';
+$lang['acl_perm8']             = 'Subir un fichero';
+$lang['acl_perm16']            = 'Borrar';
+$lang['acl_new']               = 'Agregar una nueva entrada';
+$lang['acl_mod']               = 'Modificar una entrada';
diff --git a/sources/lib/plugins/acl/lang/et/lang.php b/sources/lib/plugins/acl/lang/et/lang.php
new file mode 100644
index 0000000..bc4c73a
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/et/lang.php
@@ -0,0 +1,28 @@
+
+ * @author Aari Juhanson 
+ * @author Kaiko Kaur 
+ * @author kristian.kankainen@kuu.la
+ * @author Rivo Zängov 
+ */
+$lang['admin_acl']             = 'Ligipääsukontrolli nimekirja haldamine';
+$lang['acl_group']             = 'Grupp';
+$lang['acl_user']              = 'Kasutaja';
+$lang['acl_perms']             = 'Lubatud';
+$lang['page']                  = 'leht';
+$lang['namespace']             = 'alajaotus';
+$lang['btn_select']            = 'Vali';
+$lang['who']                   = 'Kasutaja/Grupp';
+$lang['perm']                  = 'Õigused';
+$lang['acl_perm0']             = 'Pole';
+$lang['acl_perm1']             = 'Lugemine';
+$lang['acl_perm2']             = 'Toimetamine';
+$lang['acl_perm4']             = 'Tekitamine';
+$lang['acl_perm8']             = 'Üles laadimine';
+$lang['acl_perm16']            = 'Kustuta';
+$lang['acl_new']               = 'Uue kirje lisamine';
+$lang['acl_mod']               = 'Muuda sissekannet';
diff --git a/sources/lib/plugins/acl/lang/eu/help.txt b/sources/lib/plugins/acl/lang/eu/help.txt
new file mode 100644
index 0000000..9e6070a
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/eu/help.txt
@@ -0,0 +1,11 @@
+=== Laguntza Bizkorra: ===
+
+Orri honetan wiki-ko orri eta izen-espazioen baimenak gehitu eta kendu ahal ditzakezu.
+
+Ezkerreko panelak eskuragarri dauden orri eta izen-espazioak erakusten ditu.
+
+Goiko formularioak aukeratutako erabiltzaile edo taldearen baimenak ikusi eta aldatzea ahalbidetzen dizu.
+
+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.
diff --git a/sources/lib/plugins/acl/lang/eu/lang.php b/sources/lib/plugins/acl/lang/eu/lang.php
new file mode 100644
index 0000000..b9285ff
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/eu/lang.php
@@ -0,0 +1,35 @@
+
+ * @author Zigor Astarbe 
+ */
+$lang['admin_acl']             = 'Atzipen Kontrol Listaren Kudeaketa';
+$lang['acl_group']             = 'Taldea';
+$lang['acl_user']              = 'Erabiltzailea';
+$lang['acl_perms']             = 'Baimenak honetarako:';
+$lang['page']                  = 'Orria';
+$lang['namespace']             = 'Izen-espazioa';
+$lang['btn_select']            = 'Aukeratu';
+$lang['p_user_id']             = '%s erabiltzaileak une honetan honako baimenak ditu %s orrian: %s.';
+$lang['p_user_ns']             = '%s erabiltzaileak une honetan honako baimenak ditu %s izen-espazioan: %s.';
+$lang['p_group_id']            = '%s taldeko kideek une honetan honako baimenak dituzte %s orrian: %s.';
+$lang['p_group_ns']            = '%s taldeko kideek une honetan honako baimenak dituzte %s izen-espazioan: %s.';
+$lang['p_choose_id']           = 'Mesedez sartu erabiltzaile edo taldea goiko formularioan %s orrian ezarritako baimenak ikusi edo aldatzeko.';
+$lang['p_choose_ns']           = 'Mesedez sartu erabiltzaile edo taldea goiko formularioan %s izen-espazioan ezarritako baimenak ikusi edo aldatzeko.';
+$lang['p_inherited']           = 'Oharra: Baimen horiek ez dira esplizituki jarriak, beste talde batzuetatik edo goragoko izen-espazioetatik heredatuak baizik.';
+$lang['p_isadmin']             = 'Oharra: Aukeratutako talde edo erabiltzaileak beti daika baimen osoa, supererabiltzaile gisa konfiguratuta  baitago.';
+$lang['p_include']             = 'Baimen handiagoek baimen txikiagoak barneratzen dituzte. Sortu, Igo eta Ezabatu baimenak izen-espazioei soilik aplikatzen zaizkie, ez orriei.';
+$lang['current']               = 'Uneko AKL Arauak';
+$lang['where']                 = 'Orria/Izen-espazioa';
+$lang['who']                   = 'Erabiltzailea/Taldea';
+$lang['perm']                  = 'Baimenak';
+$lang['acl_perm0']             = 'Inork';
+$lang['acl_perm1']             = 'Irakurri';
+$lang['acl_perm2']             = 'Editatu';
+$lang['acl_perm4']             = 'Sortu';
+$lang['acl_perm8']             = 'Igo';
+$lang['acl_perm16']            = 'Ezabatu';
+$lang['acl_new']               = 'Sarrera berri bat gehitu';
+$lang['acl_mod']               = 'Aldatu Sarrera';
diff --git a/sources/lib/plugins/acl/lang/fa/help.txt b/sources/lib/plugins/acl/lang/fa/help.txt
new file mode 100644
index 0000000..1ec797f
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/fa/help.txt
@@ -0,0 +1,11 @@
+=== راهنما: ===
+
+در این صفحه شما می‌توانید دسترسی صفحات و فضای‌نام‌ها را مدیریت کنید.
+
+در قسمت سمت راست، لیست تمام صفحات و فضای‌نام‌ها را مشاهده می‌کنید.
+
+در فرم بالا می‌توانید دسترسی‌های کاربران و گروه‌های مختلف را مشاهده و ویرایش کنید.
+
+در جدول زیر، تمامی قوانین مدیریتی را مشاهده می‌کنید. شما می‌توانید آن‌ها را حذف یا تعدادی از آن‌ها رو تغییر دهید.
+
+ممکن است خواندن [[doku>acl|مطلب رسمی در مورد مدیریت دسترسی‌ها]] شما را در درک بهتر این قسمت DokuWiki یاری کند.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/fa/lang.php b/sources/lib/plugins/acl/lang/fa/lang.php
new file mode 100644
index 0000000..24bebae
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/fa/lang.php
@@ -0,0 +1,41 @@
+
+ * @author omidmr@gmail.com
+ * @author Omid Mottaghi 
+ * @author Mohammad Reza Shoaei 
+ * @author Milad DZand 
+ * @author AmirH Hassaneini 
+ */
+$lang['admin_acl']             = 'مدیریت کنترل دسترسی‌ها';
+$lang['acl_group']             = 'گروه';
+$lang['acl_user']              = 'کاربر';
+$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']               = 'قوانین دسترسی فعلی';
+$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 --git a/sources/lib/plugins/acl/lang/fi/help.txt b/sources/lib/plugins/acl/lang/fi/help.txt
new file mode 100644
index 0000000..d821f2d
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/fi/help.txt
@@ -0,0 +1,11 @@
+=== Pika-apu: ===
+
+Tällä sivulla voit lisätä tai poistaa oikeuksia wikisi nimiavaruuksiin tai sivuihin.
+
+Vasen osa näyttää kaikki tarjolla olevat nimiavaruudet ja sivut.
+
+Yllä olevan kaavakkeen avulla voit katsoa ja muokata oikeuksia valitulle käyttäjälle ja ryhmälle.
+
+Alla olevassa taulukossa on näkyvissä päällä olevat pääsyoikeudet. Voit käyttää sitä muokataksesi tai poistaaksesi useita oikeuksia.
+
+[[doku>acl|Virallisen käyttöoikeus (ACL) dokumentaation]]  lukeminen voi helpottaa sinua täysin ymmärtämään mitän käyttöoikeudet toimivat DokuWikissä.
diff --git a/sources/lib/plugins/acl/lang/fi/lang.php b/sources/lib/plugins/acl/lang/fi/lang.php
new file mode 100644
index 0000000..50224df
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/fi/lang.php
@@ -0,0 +1,38 @@
+
+ * @author Teemu Mattila 
+ * @author Sami Olmari 
+ */
+$lang['admin_acl']             = 'Käyttöoikeudet (ACL)';
+$lang['acl_group']             = 'Ryhmä';
+$lang['acl_user']              = 'Käyttäjä';
+$lang['acl_perms']             = 'Oikeudet';
+$lang['page']                  = 'Sivu';
+$lang['namespace']             = 'Nimiavaruus';
+$lang['btn_select']            = 'Valitse';
+$lang['p_user_id']             = 'Käyttäjällä %s on tällä hetkellä seuraavat oikeudet sivulla %s: %s.';
+$lang['p_user_ns']             = 'Käyttäjällä %s on tällä hetkellä seuraavat oikeudet nimiavaruudessa %s: %s.';
+$lang['p_group_id']            = 'Ryhmän %s jäsenillä on tällä hetkellä seuraavat oikeudet sivulla %s: %s.';
+$lang['p_group_ns']            = 'Ryhmän %s jäsenillä on tällä hetkellä seuraavat oikeudet nimiavaruudessa %s: %s.';
+$lang['p_choose_id']           = 'Ole hyvä ja syötä ryhmän nimi yllä olevaan kaavakkeeseen katsoaksesi tai muokataksesi oikeuksia sivulle %s.';
+$lang['p_choose_ns']           = 'Ole hyvä ja syötä ryhmän nimi yllä olevaan kaavakkeeseen katsoaksesi tai muokataksesi oikeuksia nimiavaruuteen %s.';
+$lang['p_inherited']           = 'Huomaa: Oikeuksia ei ole erikseen asetettu, vaan ne on peritty toiselta ryhmältä tai ylemmältä nimiavaruudelta.';
+$lang['p_isadmin']             = 'Huomaa: Valitulla ryhmällä tai käyttäjällä on aina täydet oikeudet, koska se on määritelty pääkäyttäjäksi (Superuser)';
+$lang['p_include']             = 'Korkeammat oikeudet sisältävät matalammat. Luonti-, Lähetys- ja Poisto-oikeudet vaikuttavat vain nimiavaruuksiin, ei sivuihin.';
+$lang['current']               = 'Tämänhetkiset käyttöoikeudet (ACL)';
+$lang['where']                 = 'Sivu/Nimiavaruus';
+$lang['who']                   = 'Käyttäjä/Ryhmä';
+$lang['perm']                  = 'Oikeudet';
+$lang['acl_perm0']             = 'Ei mitään';
+$lang['acl_perm1']             = 'Luku';
+$lang['acl_perm2']             = 'Muokkaus';
+$lang['acl_perm4']             = 'Luonti';
+$lang['acl_perm8']             = 'Lähetys';
+$lang['acl_perm16']            = 'Poisto';
+$lang['acl_new']               = 'Lisää uusi';
+$lang['acl_mod']               = 'Muokkaa';
diff --git a/sources/lib/plugins/acl/lang/fr/help.txt b/sources/lib/plugins/acl/lang/fr/help.txt
new file mode 100644
index 0000000..0819784
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/fr/help.txt
@@ -0,0 +1,11 @@
+=== Aide rapide ===
+
+Cette page vous permet d'ajouter ou de supprimer des autorisations pour les catégories et les pages de votre wiki.
+
+Le panneau de gauche liste toutes les catégories et les pages disponibles.
+
+Le formulaire ci-dessus permet d'afficher et de modifier les autorisations d'un utilisateur ou d'un groupe sélectionné.
+
+Dans le tableau ci-dessous, toutes les listes de contrôle d'accès (ACL) actuelles sont affichées. Vous pouvez l'utiliser pour supprimer ou modifier rapidement plusieurs contrôles d'accès.
+
+La lecture de [[doku>fr:acl|la documentation officielle des contrôles d'accès]] pourra vous permettre de mieux comprendre le fonctionnement du contrôle d'accès dans DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/fr/lang.php b/sources/lib/plugins/acl/lang/fr/lang.php
new file mode 100644
index 0000000..dc17cf7
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/fr/lang.php
@@ -0,0 +1,57 @@
+
+ * @author Antoine Fixary 
+ * @author cumulus 
+ * @author Gwenn Gueguen 
+ * @author Guy Brand 
+ * @author Fabien Chabreuil 
+ * @author Stéphane Chamberland 
+ * @author Maurice A. LeBlanc 
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri 
+ * @author Erik Pedersen 
+ * @author olivier duperray 
+ * @author Vincent Feltz 
+ * @author Philippe Bajoit 
+ * @author Florian Gaub 
+ * @author Samuel Dorsaz samuel.dorsaz@novelion.net
+ * @author Johan Guilbaud 
+ * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
+ * @author Yannick Aure 
+ * @author Olivier DUVAL 
+ * @author Anael Mobilia 
+ * @author Bruno Veilleux 
+ */
+$lang['admin_acl']             = 'Gestion de la liste des contrôles d\'accès (ACL)';
+$lang['acl_group']             = 'Groupe';
+$lang['acl_user']              = 'Utilisateur';
+$lang['acl_perms']             = 'Autorisations pour';
+$lang['page']                  = 'Page';
+$lang['namespace']             = 'Catégorie';
+$lang['btn_select']            = 'Sélectionner';
+$lang['p_user_id']             = 'Autorisations actuelles de l\'utilisateur %s sur la page %s : %s.';
+$lang['p_user_ns']             = 'Autorisations actuelles de l\'utilisateur %s sur la catégorie %s : %s.';
+$lang['p_group_id']            = 'Autorisations actuelles des membres du groupe %s sur la page %s : %s.';
+$lang['p_group_ns']            = 'Autorisations actuelles des membres du groupe %s sur la catégorie %s : %s.';
+$lang['p_choose_id']           = 'Saisissez un nom d\'utilisateur ou de groupe dans le formulaire ci-dessous pour afficher ou éditer les autorisations relatives à la page %s.';
+$lang['p_choose_ns']           = 'Saisissez un nom d\'utilisateur ou de groupe dans le formulaire ci-dessous pour afficher ou éditer les autorisations relatives à la catégorie %s.';
+$lang['p_inherited']           = 'Note : ces autorisations n\'ont pas été explicitement définies mais sont héritées de groupes ou catégories supérieurs.';
+$lang['p_isadmin']             = 'Note : le groupe ou l\'utilisateur sélectionné dispose toujours de toutes les autorisations car il est paramétré en tant que super-utilisateur.';
+$lang['p_include']             = 'Les autorisations les plus élevées incluent les plus faibles. Création, Envoyer et Effacer ne s\'appliquent qu\'aux catégories, pas aux pages.';
+$lang['current']               = 'Contrôles d\'accès actuels';
+$lang['where']                 = 'Page/Catégorie';
+$lang['who']                   = 'Utilisateur/Groupe';
+$lang['perm']                  = 'Autorisations';
+$lang['acl_perm0']             = 'Aucune';
+$lang['acl_perm1']             = 'Lecture';
+$lang['acl_perm2']             = 'Écriture';
+$lang['acl_perm4']             = 'Création';
+$lang['acl_perm8']             = 'Envoyer';
+$lang['acl_perm16']            = 'Effacer';
+$lang['acl_new']               = 'Ajouter une nouvelle entrée';
+$lang['acl_mod']               = 'Modifier l\'entrée';
diff --git a/sources/lib/plugins/acl/lang/gl/help.txt b/sources/lib/plugins/acl/lang/gl/help.txt
new file mode 100644
index 0000000..593dcef
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/gl/help.txt
@@ -0,0 +1,11 @@
+=== Axuda Rápida: ===
+
+Nesta páxina podes engadir e eliminar permisos para os nomes de espazo e as páxinas do teu wiki.
+
+O panel da esquerda amosa todos os nomes de espazo e páxinas dispoñíbeis.
+
+O formulario de enriba permíteche ver e modificares os permisos do usuario ou grupo seleccionado.
+
+Na táboa de embaixo amósanse todas as regras de control de accesos estabelecidas. Podes empregala para mudares ou eliminares varias regras dun xeito rápido.
+
+A lectura da [[doku>acl|documentación oficial da ACL]] pode servirche de axuda para comprenderes como funciona o control de accesos no Dokuwiki.
diff --git a/sources/lib/plugins/acl/lang/gl/lang.php b/sources/lib/plugins/acl/lang/gl/lang.php
new file mode 100644
index 0000000..3325bfd
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/gl/lang.php
@@ -0,0 +1,36 @@
+
+ * @author Oscar M. Lage 
+ * @author Rodrigo Rega 
+ */
+$lang['admin_acl']             = 'Xestión da Lista de Control de Acceso (ACL)';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Usuario';
+$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['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_perm16']            = 'Eliminar';
+$lang['acl_new']               = 'Engadir nova Entrada';
+$lang['acl_mod']               = 'Modificar Entrada';
diff --git a/sources/lib/plugins/acl/lang/he/help.txt b/sources/lib/plugins/acl/lang/he/help.txt
new file mode 100644
index 0000000..33f2933
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/he/help.txt
@@ -0,0 +1,11 @@
+=== עזרה חפוזה: ===
+
+בדף זה ניתן להוסיף ולהסיר הרשאות למרחבי שמות ולדפים בויקי שלך.
+
+הצד השמאלי מציג את כל מרבי השמות והדפים הזמינים.
+
+הטופס מעלה מאפשר לך לראות ולשנות את ההרשאות של משתמש או קבוצה נבחרים.
+
+בטבלה מטה מוצגים כל כללי בקרת הגישה הנוכחיים. ניתן להשתמש בה כדי למחוק או לשנות מספר כללים במהירות.
+
+קריאת [[doku>acl|התיעוד הרשמי ל-ACL ACL]] יכולה לעזור לך להבין באופן מלא כיצד בקרת הגישה עובדת בדוקוויקי.
diff --git a/sources/lib/plugins/acl/lang/he/lang.php b/sources/lib/plugins/acl/lang/he/lang.php
new file mode 100644
index 0000000..6716081
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/he/lang.php
@@ -0,0 +1,37 @@
+
+ * @author Dotan Kamber 
+ * @author Moshe Kaplan 
+ * @author Yaron Yogev 
+ * @author Yaron Shahrabani 
+ */
+$lang['admin_acl']             = 'ניהול רשימת בקרת גישות';
+$lang['acl_group']             = 'קבוצה';
+$lang['acl_user']              = 'משתמש';
+$lang['acl_perms']             = 'הרשאות עבור';
+$lang['page']                  = 'דף';
+$lang['namespace']             = 'מרחב שמות';
+$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']             = 'לתשומת לבך: לקבוצה או המשתמש שנבחרו יש תמיד הרשאות מלאות בגלל הגדרתם כמשתמש-על.';
+$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 --git a/sources/lib/plugins/acl/lang/hi/lang.php b/sources/lib/plugins/acl/lang/hi/lang.php
new file mode 100644
index 0000000..d6f78ff
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/hi/lang.php
@@ -0,0 +1,7 @@
+
+ * @author yndesai@gmail.com
+ */
diff --git a/sources/lib/plugins/acl/lang/hr/help.txt b/sources/lib/plugins/acl/lang/hr/help.txt
new file mode 100644
index 0000000..4e7cfc3
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/hr/help.txt
@@ -0,0 +1,11 @@
+=== Brza Pomoć: ===
+
+Na ovoj stranici možeš dodavati i brisati dozvole za imenske prostore i stranice u svom wiki-u.
+
+Lijevi prozor prikazuje sve dostupne imenske prostore i stranice.
+
+Forma iznad ti omogućuje pregled i mijenjanje dozvola odabranom korisniku ili grupi.
+
+U tablici ispod prikazana su sva trenutno postavljena pravila kontrole pristupa. Koristite je za višestruko brisanje ili mijenjanje pravila.
+
+Čitanje [[doku>acl|službena dokumentacija o ACL]] može vam pomoći potpuno razumijeti kako kontrola pristupa radi u DokuWiki.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/hr/lang.php b/sources/lib/plugins/acl/lang/hr/lang.php
new file mode 100644
index 0000000..8c21f1b
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/hr/lang.php
@@ -0,0 +1,36 @@
+
+ * @author Dražen Odobašić 
+ * @author Dejan Igrec dejan.igrec@gmail.com
+ */
+$lang['admin_acl']             = 'Upravljanje listom kontrole pristupa';
+$lang['acl_group']             = 'Grupa';
+$lang['acl_user']              = 'Korisnik';
+$lang['acl_perms']             = 'Dozvole za';
+$lang['page']                  = 'Stranica';
+$lang['namespace']             = 'Imenski prostor';
+$lang['btn_select']            = 'Odaberi';
+$lang['p_user_id']             = 'Korisnik %s trenutno ima sljedeće dozvole na stranici %s: %s.';
+$lang['p_user_ns']             = 'Korisnik %s trenutno ima sljedeće dozvole u imenskom prostoru %s: %s.';
+$lang['p_group_id']            = 'Članovi grupe %s trenutno imaju sljedeće dozvole na stranici %s: %s.';
+$lang['p_group_ns']            = 'Članovi grupe %s trenutno imaju sljedeće dozvole u imenskom prostoru %s: %s.';
+$lang['p_choose_id']           = 'Molim unesti korisnika ili grupu u gornju formu za pregled ili uređivanje dozvola postavljenih za stranicu %s.';
+$lang['p_choose_ns']           = 'Molim unesti korisnika ili grupu u gornju formu za pregled ili uređivanje dozvola postavljenih za imenski prostor %s.';
+$lang['p_inherited']           = 'Napomena: Ove dozvole nisu postavljene eksplicitno već su naslijeđene od drugih grupa ili nadređenih imenskih prostora.';
+$lang['p_isadmin']             = 'Napomena: Odabrana grupa ili korisnik uvijek ima sve dozvole jer je postavljen kao superuser.';
+$lang['p_include']             = 'Više dozvole uključuju sve niže. Dozvole Kreiraj, Učitaj i Briši se primjenjuju samo na imenske prostore, ne stranice.';
+$lang['current']               = 'Trenutna ACL Pravila';
+$lang['where']                 = 'Stranica/Imenski prostor';
+$lang['who']                   = 'Korisnik/Grupa';
+$lang['perm']                  = 'Dozvole';
+$lang['acl_perm0']             = 'Ništa';
+$lang['acl_perm1']             = 'Čitaj';
+$lang['acl_perm2']             = 'Uredi';
+$lang['acl_perm4']             = 'Kreiraj';
+$lang['acl_perm8']             = 'Učitaj';
+$lang['acl_perm16']            = 'Briši';
+$lang['acl_new']               = 'Dodaj novi Zapis';
+$lang['acl_mod']               = 'Promijeni Zapis';
diff --git a/sources/lib/plugins/acl/lang/hu/help.txt b/sources/lib/plugins/acl/lang/hu/help.txt
new file mode 100644
index 0000000..57f16a3
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/hu/help.txt
@@ -0,0 +1,12 @@
+=== Hozzáférési lista (ACL) kezelő ===
+
+Ezen az oldalon jogokat oszthat és vehet el a wiki oldalakhoz és névterekhez.
+
+A bal oldalon látható az összes névtér és oldal.
+
+A felső form segít a kiválasztott felhasználó vagy csoport jogosultságainak megtekintésében vagy változtatásában.
+
+Az alsó táblázat mutatja az összes jelenleg érvényes hozzáférési szabályt. Ennek segítségével gyorsan törölhetők vagy megváltoztathatók a szabályok.
+
+A [[doku>acl|hivatalos ACL dokumentáció]] segíthet a DokuWiki hozzáférés-kezelés működésének megértésében.
+
diff --git a/sources/lib/plugins/acl/lang/hu/lang.php b/sources/lib/plugins/acl/lang/hu/lang.php
new file mode 100644
index 0000000..cc35243
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/hu/lang.php
@@ -0,0 +1,41 @@
+
+ * @author Siaynoq Mage 
+ * @author schilling.janos@gmail.com
+ * @author Szabó Dávid 
+ * @author Sándor TIHANYI 
+ * @author David Szabo 
+ * @author Marton Sebok 
+ */
+$lang['admin_acl']             = 'Hozzáférési lista (ACL) kezelő';
+$lang['acl_group']             = 'Csoport:';
+$lang['acl_user']              = 'Felhasználó:';
+$lang['acl_perms']             = 'Jogosultság ehhez:';
+$lang['page']                  = 'Oldal';
+$lang['namespace']             = 'Névtér';
+$lang['btn_select']            = 'Kiválaszt';
+$lang['p_user_id']             = 'A(z) %s felhasználónak jelenleg a következő jogosultsága van ezen az oldalon:  %s: %s.';
+$lang['p_user_ns']             = 'A(z) %s felhasználónak jelenleg a következő jogosultsága van ebben a névtérben: %s: %s.';
+$lang['p_group_id']            = 'A(z) %s csoport tagjainak jelenleg a következő jogosultsága van ezen az oldalon:  %s: %s.';
+$lang['p_group_ns']            = 'A(z) %s csoport tagjainak jelenleg a következő jogosultsága van ebben a névtérben: %s: %s.';
+$lang['p_choose_id']           = 'A felső űrlapon adjon meg egy felhasználót vagy csoportot, akinek a(z) %s oldalhoz beállított jogosultságait megtekinteni vagy változtatni szeretné.';
+$lang['p_choose_ns']           = 'A felső űrlapon adj meg egy felhasználót vagy csoportot, akinek a(z) %s névtérhez beállított jogosultságait megtekinteni vagy változtatni szeretnéd.';
+$lang['p_inherited']           = 'Megjegyzés: ezek a jogok nem itt lettek explicit beállítva, hanem öröklődtek egyéb csoportokból vagy felsőbb névterekből.';
+$lang['p_isadmin']             = 'Megjegyzés: a kiválasztott csoportnak vagy felhasználónak mindig teljes jogosultsága lesz, mert Adminisztrátornak van beállítva.';
+$lang['p_include']             = 'A magasabb szintű jogok tartalmazzák az alacsonyabbakat. A Létrehozás, Feltöltés és Törlés jogosultságok csak névterekre alkalmazhatók, az egyes oldalakra nem.';
+$lang['current']               = 'Jelenlegi hozzáférési szabályok';
+$lang['where']                 = 'Oldal/Névtér';
+$lang['who']                   = 'Felhasználó/Csoport';
+$lang['perm']                  = 'Jogosultságok';
+$lang['acl_perm0']             = 'Semmi';
+$lang['acl_perm1']             = 'Olvasás';
+$lang['acl_perm2']             = 'Szerkesztés';
+$lang['acl_perm4']             = 'Létrehozás';
+$lang['acl_perm8']             = 'Feltöltés';
+$lang['acl_perm16']            = 'Törlés';
+$lang['acl_new']               = 'Új bejegyzés hozzáadása';
+$lang['acl_mod']               = 'Bejegyzés módosítása';
diff --git a/sources/lib/plugins/acl/lang/ia/help.txt b/sources/lib/plugins/acl/lang/ia/help.txt
new file mode 100644
index 0000000..59f5764
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ia/help.txt
@@ -0,0 +1,11 @@
+=== Adjuta rapide: ===
+
+In iste pagina tu pote adder e remover permissiones pro spatios de nomines e paginas in tu wiki.
+
+Le columna sinistre presenta tote le spatios de nomines e paginas disponibile.
+
+Le formulario hic supra permitte vider e modificar le permissiones de un usator o gruppo seligite.
+
+In le tabella hic infra se monstra tote le regulas de controlo de accesso actualmente configurate. Tu pote usar lo pro rapidemente deler o modificar plure regulas.
+
+Es recommendate leger le [[doku>acl|documentation official super ACL]] pro comprender completemente como le controlo de accesso functiona in DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/ia/lang.php b/sources/lib/plugins/acl/lang/ia/lang.php
new file mode 100644
index 0000000..f7d0765
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ia/lang.php
@@ -0,0 +1,35 @@
+
+ * @author Martijn Dekker 
+ */
+$lang['admin_acl']             = 'Gestion de listas de controlo de accesso';
+$lang['acl_group']             = 'Gruppo';
+$lang['acl_user']              = 'Usator';
+$lang['acl_perms']             = 'Permissiones pro';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Spatio de nomines';
+$lang['btn_select']            = 'Seliger';
+$lang['p_user_id']             = 'Le usator %s ha actualmente le sequente permissiones in le pagina %s: %s.';
+$lang['p_user_ns']             = 'Le usator %s ha actualmente le sequente permissiones in le spatio de nomines %s: %s.';
+$lang['p_group_id']            = 'Le membros del gruppo %s a actualmente le sequente permissiones in le pagina %s: %s.';
+$lang['p_group_ns']            = 'Le membros del gruppo %s ha actualmente le sequente permissiones in le spatio de nomines %s: %s.';
+$lang['p_choose_id']           = 'Per favor entra un usator o gruppo in le formulario hic supra pro vider o modificar le permissiones configurate pro le pagina %s.';
+$lang['p_choose_ns']           = 'Per favor entra un usator o gruppo in le formulario hic supra pro vider o modificar le permissiones configurate pro le spatio de nomines %s.';
+$lang['p_inherited']           = 'Nota ben: Iste permissiones non ha essite configurate explicitemente ma ha essite hereditate de altere gruppos o de spatios de nomines superior.';
+$lang['p_isadmin']             = 'Nota ben: Le gruppo o usator seligite ha sempre permissiones integral proque es configurate como superusator.';
+$lang['p_include']             = 'Le permissiones superior include les inferior. Le permissiones de Crear, Incargar e Deler es solmente applicabile a spatios de nomines, non a paginas.';
+$lang['current']               = 'Regulas ACL actual';
+$lang['where']                 = 'Pagina/Spatio de nomines';
+$lang['who']                   = 'Usator/Gruppo';
+$lang['perm']                  = 'Permissiones';
+$lang['acl_perm0']             = 'Nulle';
+$lang['acl_perm1']             = 'Leger';
+$lang['acl_perm2']             = 'Modificar';
+$lang['acl_perm4']             = 'Crear';
+$lang['acl_perm8']             = 'Incargar';
+$lang['acl_perm16']            = 'Deler';
+$lang['acl_new']               = 'Adder nove entrata';
+$lang['acl_mod']               = 'Modificar entrata';
diff --git a/sources/lib/plugins/acl/lang/id-ni/lang.php b/sources/lib/plugins/acl/lang/id-ni/lang.php
new file mode 100644
index 0000000..d367340
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/id-ni/lang.php
@@ -0,0 +1,7 @@
+
+ * @author Yustinus Waruwu 
+ */
diff --git a/sources/lib/plugins/acl/lang/id/lang.php b/sources/lib/plugins/acl/lang/id/lang.php
new file mode 100644
index 0000000..6f619c5
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/id/lang.php
@@ -0,0 +1,21 @@
+
+ * @author Yustinus Waruwu 
+ */
+$lang['admin_acl']             = 'Manajemen Daftar Pengendali Akses';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'User';
+$lang['acl_perms']             = 'Ijin untuk';
+$lang['page']                  = 'Halaman';
+$lang['namespace']             = 'Namespace';
+$lang['btn_select']            = 'Pilih';
+$lang['acl_perm1']             = 'Baca';
+$lang['acl_perm2']             = 'Ubah';
+$lang['acl_perm4']             = 'Buat';
+$lang['acl_perm8']             = 'Upload';
+$lang['acl_perm16']            = 'Hapus';
+$lang['acl_new']               = 'Tambah Entry baru';
diff --git a/sources/lib/plugins/acl/lang/is/lang.php b/sources/lib/plugins/acl/lang/is/lang.php
new file mode 100644
index 0000000..b45faa8
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/is/lang.php
@@ -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 --git a/sources/lib/plugins/acl/lang/it/help.txt b/sources/lib/plugins/acl/lang/it/help.txt
new file mode 100644
index 0000000..8bf68e8
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/it/help.txt
@@ -0,0 +1,11 @@
+=== Breve Aiuto: ===
+
+In questa pagina puoi aggiungere e rimuovere permessi per categorie e pagine del tuo wiki.
+
+Il pannello di sinistra mostra tutte le categorie e le pagine disponibili.
+
+Il campo sopra ti permette di vedere e modificare i permessi di un utente o gruppo selezionato.
+
+Nella tabella sotto, sono riportate tutte le regole di controllo degli accessi attualmente impostate. Puoi utilizzarla per eliminare o cambiare al volo varie regole.
+
+Leggere la [[doku>acl|documentazione ufficale delle ACL]] può aiutarti a capire pienamente come funziona il controllo degli accessi in DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/it/lang.php b/sources/lib/plugins/acl/lang/it/lang.php
new file mode 100644
index 0000000..ba2d0fd
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/it/lang.php
@@ -0,0 +1,46 @@
+
+ * @author Roberto Bolli 
+ * @author Pietro Battiston toobaz@email.it
+ * @author Diego Pierotto ita.translations@tiscali.it
+ * @author ita.translations@tiscali.it
+ * @author Lorenzo Breda 
+ * @author snarchio@alice.it
+ * @author robocap 
+ * @author Osman Tekin osman.tekin93@hotmail.it
+ * @author Jacopo Corbetta 
+ * @author Matteo Pasotti 
+ * @author snarchio@gmail.com
+ */
+$lang['admin_acl']             = 'Gestione Lista Controllo Accessi (ACL)';
+$lang['acl_group']             = 'Gruppo';
+$lang['acl_user']              = 'Utente';
+$lang['acl_perms']             = 'Permessi per';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Categoria';
+$lang['btn_select']            = 'Seleziona';
+$lang['p_user_id']             = 'L\'utente %s attualmente ha i seguenti permessi sulla pagina %s: %s.';
+$lang['p_user_ns']             = 'L\'utente %s attualmente ha i seguenti permessi per la categoria %s: %s.';
+$lang['p_group_id']            = 'I membri del gruppo%s attualmente hanno i seguenti permessi sulla pagina %s: %s.';
+$lang['p_group_ns']            = 'I membri del gruppo%s attualmente hanno i seguenti permessi per la categoria %s: %s.';
+$lang['p_choose_id']           = 'Inserisci un utente o gruppo nel campo sopra per modificare i permessi impostati per la pagina %s.';
+$lang['p_choose_ns']           = 'Inserisci un utente o un gruppo nel campo sopra per modificare i permessi impostati per la categoria %s.';
+$lang['p_inherited']           = 'Nota: questi permessi non sono stati esplicitamente impostati, ma sono stati ereditati da altri gruppi o da categorie superiori.';
+$lang['p_isadmin']             = 'Nota: il gruppo o utente selezionato ha sempre tutti i permessi perché è configurato come amministratore.';
+$lang['p_include']             = 'I permessi più elevati includono i permessi inferiori. I permessi Crea, Carica ed Elimina si applicano soltanto alle categorie e non alle pagine.';
+$lang['current']               = 'Regole ACL attuali';
+$lang['where']                 = 'Pagina/Categoria';
+$lang['who']                   = 'Utente/Gruppo';
+$lang['perm']                  = 'Permessi';
+$lang['acl_perm0']             = 'Nessuno';
+$lang['acl_perm1']             = 'Lettura';
+$lang['acl_perm2']             = 'Modifica';
+$lang['acl_perm4']             = 'Crea';
+$lang['acl_perm8']             = 'Carica';
+$lang['acl_perm16']            = 'Elimina';
+$lang['acl_new']               = 'Aggiungi nuovo valore';
+$lang['acl_mod']               = 'Modifica valore';
diff --git a/sources/lib/plugins/acl/lang/ja/help.txt b/sources/lib/plugins/acl/lang/ja/help.txt
new file mode 100644
index 0000000..f7867f8
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ja/help.txt
@@ -0,0 +1,11 @@
+=== クイックヘルプ： ===
+
+このページでは、Wiki内の名前空間とページに対する権限を追加・削除することができます。
+
+左側のボックスには存在する名前空間とページが表示されています。
+
+上記のフォームを使って、選択したユーザーもしくはグループの権限を閲覧・変更することができます。
+
+以下のテープルには、現在設定されているアクセスコントロールのルールが表示されています。このテーブルを使って、複数のルールを素早く変更・削除することが可能です。
+
+DokuWikiのアクセスコントロールについては、[[doku>acl|official documentation on ACL]] をお読み下さい。
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/ja/lang.php b/sources/lib/plugins/acl/lang/ja/lang.php
new file mode 100644
index 0000000..61fc1ea
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ja/lang.php
@@ -0,0 +1,41 @@
+
+ * @author Yuji Takenaka 
+ * @author Ikuo Obataya 
+ * @author Daniel Dupriest 
+ * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
+ * @author Satoshi Sahara 
+ */
+$lang['admin_acl']             = 'アクセスコントロール管理';
+$lang['acl_group']             = 'グループ';
+$lang['acl_user']              = 'ユーザー';
+$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']             = '注意：選択したグループもしくはユーザーはスーパーユーザーであるため、全ての権限があります。';
+$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 --git a/sources/lib/plugins/acl/lang/kk/lang.php b/sources/lib/plugins/acl/lang/kk/lang.php
new file mode 100644
index 0000000..f21b931
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/kk/lang.php
@@ -0,0 +1,10 @@
+ko:acl|ACL 공식 문서]]를 읽어보시기 바랍니다.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/ko/lang.php b/sources/lib/plugins/acl/lang/ko/lang.php
new file mode 100644
index 0000000..34b93a9
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ko/lang.php
@@ -0,0 +1,44 @@
+
+ * @author Anika Henke 
+ * @author Matthias Grimm 
+ * @author jk Lee
+ * @author dongnak@gmail.com
+ * @author Song Younghwan 
+ * @author Seung-Chul Yoo 
+ * @author erial2@gmail.com
+ * @author Myeongjin 
+ * @author Garam 
+ */
+$lang['admin_acl']             = '접근 제어 목록 관리';
+$lang['acl_group']             = '그룹';
+$lang['acl_user']              = '사용자';
+$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']             = '참고: 슈퍼 사용자로 설정되어 있으므로 선택된 그룹이나 사용자는 언제나 모든 접근 권한을 가집니다.';
+$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 --git a/sources/lib/plugins/acl/lang/la/help.txt b/sources/lib/plugins/acl/lang/la/help.txt
new file mode 100644
index 0000000..553884c
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/la/help.txt
@@ -0,0 +1,11 @@
+=== Auxilium: ===
+
+Hic facultates generum paginarumque addere delereue potes.
+
+Tabella sinistra omnes paginas generaque ostendit.
+
+His campis mutare facultates electorum Sodalium Gregumque potes.
+
+In tabula omnes administrationis leges ostensae sunt. Delere quoque uel mutare plures leges potes.
+
+Si [[doku>acl|official documentation on ACL]] legas, maius auxilium in Vicem mutando habes.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/la/lang.php b/sources/lib/plugins/acl/lang/la/lang.php
new file mode 100644
index 0000000..941de1f
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/la/lang.php
@@ -0,0 +1,34 @@
+
+ */
+$lang['admin_acl']             = 'Administratio Indicis Custodiae Aditus';
+$lang['acl_group']             = 'Grex';
+$lang['acl_user']              = 'Sodalis';
+$lang['acl_perms']             = 'Facultas:';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Genus';
+$lang['btn_select']            = 'eligere';
+$lang['p_user_id']             = 'Sodalis %s nunc has facultates paginae "%s habes: %s.';
+$lang['p_user_ns']             = 'Sodalis %s nunc has facultates generis "%s habes: %s.';
+$lang['p_group_id']            = 'Socius\a gregis %s nunc has facultates paginae "%s habes: %s.';
+$lang['p_group_ns']            = 'Socius\a gregis %s nunc has facultates generis "%s habes: %s.';
+$lang['p_choose_id']           = 'Sodalis grexue in campo insere ut facultates paginae %s uideas.';
+$lang['p_choose_ns']           = 'Sodalis grexue in campo insere ut facultates generis %s uideas.';
+$lang['p_inherited']           = 'Caue: hae facultates et huic rei et aliis gregibus uel generibus legitimae sunt.';
+$lang['p_isadmin']             = 'Caue: electi greges semper plenum ius habent, eo quod ut magister\stra elegitur.';
+$lang['p_include']             = 'Maiores facultates minores includunt. Creandi, onerandi uel delendi facultates solum generibus, non paginis sunt.';
+$lang['current']               = 'Communes ICA leges';
+$lang['where']                 = 'Pagina/Genus';
+$lang['who']                   = 'Sodalis/Grex';
+$lang['perm']                  = 'Facultates';
+$lang['acl_perm0']             = 'Nihil';
+$lang['acl_perm1']             = 'Legere';
+$lang['acl_perm2']             = 'Recensere';
+$lang['acl_perm4']             = 'Creare';
+$lang['acl_perm8']             = 'Onerare';
+$lang['acl_perm16']            = 'Delere';
+$lang['acl_new']               = 'Nouom addere';
+$lang['acl_mod']               = 'Nouom recensere';
diff --git a/sources/lib/plugins/acl/lang/lb/help.txt b/sources/lib/plugins/acl/lang/lb/help.txt
new file mode 100644
index 0000000..e36ed37
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/lb/help.txt
@@ -0,0 +1,11 @@
+=== Séier Hëllef: ===
+
+Op dëser Säit kanns de Rechter fir Namespacen a Säiten an dengem Wiki setzen.
+
+Op der lénkser Säit hues de all d'Namespacen a Säiten.
+
+Am Formulär hei uewendriwwer kanns de d'Rechter vun dem ausgewielte Benotzer oder Grupp änneren
+
+An der Tabell hei ënnendrënner kanns de all d'Reegele gesinn déi de Moment gesat sinn. Du kanns se huelen fir Reegelen ze änneren oder ze läschen.
+
+Déi [[doku>acl|offiziell Dokumentatioun iwwert ACL]] hëlleft der besser ze verstoen wéi déi Reegelen am Dokuwiki funktionéieren.
diff --git a/sources/lib/plugins/acl/lang/lb/lang.php b/sources/lib/plugins/acl/lang/lb/lang.php
new file mode 100644
index 0000000..59acdf7
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/lb/lang.php
@@ -0,0 +1,6 @@
+
+ * @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['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 --git a/sources/lib/plugins/acl/lang/lv/help.txt b/sources/lib/plugins/acl/lang/lv/help.txt
new file mode 100644
index 0000000..f570d79
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/lv/help.txt
@@ -0,0 +1,11 @@
+=== Īsa palīdzība ===
+
+Šajā lapā var uzdot un noņemt tiesības uz lapām un nodaļām.
+
+Kreisajā pusē parādītas visas pieejamās nodaļas un lapas.
+
+Formā augšpusē var redzēt un grozīt norādītā lietotāja vai grupas tiesības .
+
+Apakšā tabulā  parādīts visu tiesību saraksts. To var lietot, lai ātri mainītu vairākus pieejas tiesību noteikumus.
+
+[[doku>acl|Officiālajos piekļuves tiesību noteikumu dokumentos]] var atrast izvērstu informāciju, kā darbojas DokuWiki sistēmas piekļuves tiesību kontrole.
diff --git a/sources/lib/plugins/acl/lang/lv/lang.php b/sources/lib/plugins/acl/lang/lv/lang.php
new file mode 100644
index 0000000..f478b32
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/lv/lang.php
@@ -0,0 +1,35 @@
+
+ */
+$lang['admin_acl']             = 'Piekļuves tiesību vadība';
+$lang['acl_group']             = 'Grupa';
+$lang['acl_user']              = 'Lietotājs';
+$lang['acl_perms']             = 'Tiesības';
+$lang['page']                  = 'Lapa';
+$lang['namespace']             = 'Nodaļa';
+$lang['btn_select']            = 'Izvēlēties';
+$lang['p_user_id']             = 'Lietotājam %s ir tiesības %s lapu %s .';
+$lang['p_user_ns']             = 'Lietotājam %s nodaļā %s ir tiesības %s.';
+$lang['p_group_id']            = 'Grupas %s biedriem ir tiesības %s lapu %s.';
+$lang['p_group_ns']            = 'Grupas %s biedriem ir tiesības %s nodaļu  %s: .';
+$lang['p_choose_id']           = 'Lūdzu ieraksti lietotāju vai grupu augstāk norādītajā laukā, lai skatītu vai labotu tiesības lapai %s.';
+$lang['p_choose_ns']           = 'Lūdzu ieraksti lietotāju vai grupu augstāk norādītajā laukā, lai skatītu vai labotu tiesības nodaļai %s.';
+$lang['p_inherited']           = 'Ievēro: Šīs tiesības nav tieši uzdotas, bet mantotas no citām grupām vai augstākām nodaļām. ';
+$lang['p_isadmin']             = 'Ievēro: Norādītajai grupai vai lietotājam vienmēr ir visas tiesības, jo tas konfigurēts kā superuser.';
+$lang['p_include']             = 'Augstāka atļauja iekļauj arī zemākās tiesības. Izveidošanas, augšupielādēšanas un dzēšanas tiesības attiecas tikai uz nodaļām, nevis lapām.';
+$lang['current']               = 'Patreizējo tiesību saraksts (ACL)';
+$lang['where']                 = 'Lapa/nodaļa';
+$lang['who']                   = 'Lietotājs/grupa';
+$lang['perm']                  = 'Tiesības';
+$lang['acl_perm0']             = 'nekādas';
+$lang['acl_perm1']             = 'lasīt';
+$lang['acl_perm2']             = 'labot';
+$lang['acl_perm4']             = 'izveidot';
+$lang['acl_perm8']             = 'augšupielādēt';
+$lang['acl_perm16']            = 'dzēst';
+$lang['acl_new']               = 'pievienot jaunu šķirkli';
+$lang['acl_mod']               = 'labot šķirkli';
diff --git a/sources/lib/plugins/acl/lang/mk/lang.php b/sources/lib/plugins/acl/lang/mk/lang.php
new file mode 100644
index 0000000..d576c3d
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/mk/lang.php
@@ -0,0 +1,22 @@
+
+ */
+$lang['acl_group']             = 'Група';
+$lang['acl_user']              = 'Корисник';
+$lang['acl_perms']             = 'Пермисии за';
+$lang['page']                  = 'Страница';
+$lang['btn_select']            = 'Избери';
+$lang['current']               = 'Моментални ACL правила';
+$lang['who']                   = 'Корисник/група';
+$lang['perm']                  = 'Пермисии';
+$lang['acl_perm0']             = 'Ништо';
+$lang['acl_perm1']             = 'Читај';
+$lang['acl_perm2']             = 'Уреди';
+$lang['acl_perm4']             = 'Креирај';
+$lang['acl_perm8']             = 'Качи';
+$lang['acl_perm16']            = 'Избриши';
+$lang['acl_new']               = 'Додај нов запис';
+$lang['acl_mod']               = 'Измени запис';
diff --git a/sources/lib/plugins/acl/lang/mr/help.txt b/sources/lib/plugins/acl/lang/mr/help.txt
new file mode 100644
index 0000000..e8aa13b
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/mr/help.txt
@@ -0,0 +1,12 @@
+=== त्वरित मदत ===
+
+या पानावर तुमची तुमच्या विकी मधील पाने किंवा नेमस्पेस वरील परवानग्या बदलू शकता.
+
+डाविकडील मार्जिन मधे सर्व उपलब्ध पाने आणि नेमस्पेस दाखवले आहेत.
+
+वरील फॉर्म वापरून तुमची निवडलेल्या सदस्य किंवा गटाच्या परवानग्या बदलू शकता.
+
+खालील टेबल मधे सध्या सेट असलेले नियम दिलेले आहेत.
+हे टेबल वापरून तुम्ही चटकन हे नियम बदलू शकता.
+
+[[doku>acl| ACL वरील अधिकृत माहितीसंग्रह ]] वाचून तुम्हाला डॉक्युविकिमधे परवानगीची व्यवस्था कशी काम करते ते नीट समजेल.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/mr/lang.php b/sources/lib/plugins/acl/lang/mr/lang.php
new file mode 100644
index 0000000..978df75
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/mr/lang.php
@@ -0,0 +1,37 @@
+
+ * @author Padmanabh Kulkarni
+ * @author shantanoo@gmail.com
+ */
+$lang['admin_acl']             = 'Access Control List  व्यवस्थापन';
+$lang['acl_group']             = 'गट';
+$lang['acl_user']              = 'सदस्य';
+$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']             = 'टीप : निवडलेल्या सदस्य किंवा गटाला कायम सर्व परवानग्या असतात कारण तो सुपर सदस्य म्हणुन सेट केला आहे.';
+$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 --git a/sources/lib/plugins/acl/lang/ms/lang.php b/sources/lib/plugins/acl/lang/ms/lang.php
new file mode 100644
index 0000000..77ad2a1
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ms/lang.php
@@ -0,0 +1,6 @@
+
+ * @author SarojKumar Dhakal 
+ * @author Saroj Dhakal
+ */
+$lang['admin_acl']             = 'एक्सेस कन्ट्रोल लिस्ट व्यवस्थापन';
+$lang['acl_group']             = 'समूह';
+$lang['acl_user']              = 'प्रोगकर्ता';
+$lang['acl_perms']             = 'को लागि अनुमति';
+$lang['page']                  = 'पृष्ठ';
+$lang['namespace']             = 'नेमस्पेस';
+$lang['btn_select']            = 'छान्नुहोस्';
+$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 --git a/sources/lib/plugins/acl/lang/nl/help.txt b/sources/lib/plugins/acl/lang/nl/help.txt
new file mode 100644
index 0000000..14c78e2
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/nl/help.txt
@@ -0,0 +1,8 @@
+=== Snelle hulp: ===
+
+Op deze pagina kun je bevoegdheden toevoegen en verwijderen voor namespaces en pagina's in je wiki.
+  * Het linkerpaneel geeft alle beschikbare namespaces en pagina's weer.
+  * In het formulier hierboven kun je bevoegdheden zien en aanpassen voor een selecteerde gebruiker of groep.
+  * In de tabel hieronder worden alle momenteel ingestelde toegangsregels weergegeven. Je kunt hier snel regels wijzigen of verwijderen.
+
+Lees de  [[doku>acl|documentatie over ACLs]] om de mogelijkheden volledig te begrijpen.
diff --git a/sources/lib/plugins/acl/lang/nl/lang.php b/sources/lib/plugins/acl/lang/nl/lang.php
new file mode 100644
index 0000000..abb81ae
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/nl/lang.php
@@ -0,0 +1,52 @@
+
+ * @author Jack van Klaren 
+ * @author Riny Heijdendael 
+ * @author Koen Huybrechts 
+ * @author Wouter Schoot 
+ * @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
+ * @author Marijn Hofstra 
+ * @author Timon Van Overveldt 
+ * @author Jeroen
+ * @author Ricardo Guijt 
+ * @author Gerrit 
+ * @author Gerrit Uitslag 
+ * @author Remon 
+ */
+$lang['admin_acl']             = 'Toegangsrechten';
+$lang['acl_group']             = 'Groep';
+$lang['acl_user']              = 'Gebruiker';
+$lang['acl_perms']             = 'Permissies voor';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Namespace';
+$lang['btn_select']            = 'Selecteer';
+$lang['p_user_id']             = 'Gebruiker %s heeft momenteel de volgende bevoegdheden op pagina %s: %s.';
+$lang['p_user_ns']             = 'Gebruiker %s heeft momenteel de volgende bevoegdheden op namespace %s: %s.';
+$lang['p_group_id']            = 'Leden van groep %s hebben momenteel de volgende bevoegdheden op pagina %s: %s.';
+$lang['p_group_ns']            = 'Leden van groep %s hebben momenteel de volgende bevoegdheden in namespace %s: %s.';
+$lang['p_choose_id']           = 'Vul een gebruiker of groep in in het bovenstaande formulier om de bevoegdheden te bekijken of te bewerken voor de pagina %s.';
+$lang['p_choose_ns']           = 'Vul een gebruiker of groep in in het bovenstaande formulier om de bevoegdheden te bekijken of te bewerken voor de namespace %s.';
+$lang['p_inherited']           = 'Let op: Deze permissies zijn niet expliciet ingesteld maar overerfd van andere groepen of hogere namespaces.';
+$lang['p_isadmin']             = 'Let op: De geselecteerde groep of gebruiker heeft altijd volledige toegangsrechten omdat hij als superuser geconfigureerd is.';
+$lang['p_include']             = 'Hogere permissies bevatten ook de lagere. Aanmaken, uploaden en verwijderen gelden alleen voor namespaces, niet voor pagina\'s.';
+$lang['current']               = 'Huidige ACL regels';
+$lang['where']                 = 'Pagina/Namespace';
+$lang['who']                   = 'Gebruiker/Groep';
+$lang['perm']                  = 'Bevoegdheden';
+$lang['acl_perm0']             = 'Geen';
+$lang['acl_perm1']             = 'Lezen';
+$lang['acl_perm2']             = 'Bewerken';
+$lang['acl_perm4']             = 'Aanmaken';
+$lang['acl_perm8']             = 'Uploaden';
+$lang['acl_perm16']            = 'Verwijderen';
+$lang['acl_new']               = 'Nieuwe regel toevoegen';
+$lang['acl_mod']               = 'Regel aanpassen';
diff --git a/sources/lib/plugins/acl/lang/no/help.txt b/sources/lib/plugins/acl/lang/no/help.txt
new file mode 100644
index 0000000..c3d3688
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/no/help.txt
@@ -0,0 +1,11 @@
+=== Hurtighjelp: ===
+
+På denne siden kan du legge til og fjerne tillatelser for navnerom og sider i din wiki.
+
+Venstre panel viser alle tilgjengelige navnerom og sider.
+
+Skjemaet over tillater deg å se og modifisere tillatelser for en valgt bruker eller gruppe.
+
+I tabellen nedenfor vises alle nærværende satte adgangskontroll-regler. Du kan bruke den til raskt å slette eller endre mange regler i slengen.
+
+Å lese  [[doku>acl|den offisielle dokumentasjonen for ACL]]  kan hjelpe deg å fullt ut forstå hvordan adgangskontroll fungerer i DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/no/lang.php b/sources/lib/plugins/acl/lang/no/lang.php
new file mode 100644
index 0000000..82cdd5e
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/no/lang.php
@@ -0,0 +1,49 @@
+
+ * @author Jorge Barrera Grandon 
+ * @author Thomas Nygreen 
+ * @author Arild Burud 
+ * @author Torkill Bruland 
+ * @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 
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Jon Bøe 
+ * @author Egil Hansen 
+ */
+$lang['admin_acl']             = 'Administrasjon av lister for adgangskontroll (ACL)';
+$lang['acl_group']             = 'Gruppe';
+$lang['acl_user']              = 'Bruker';
+$lang['acl_perms']             = 'Rettigheter for';
+$lang['page']                  = 'Side';
+$lang['namespace']             = 'Navnerom';
+$lang['btn_select']            = 'Velg';
+$lang['p_user_id']             = 'Bruker %s har for tiden følgende tillatelser i for siden  %s: %s.';
+$lang['p_user_ns']             = 'Bruker %s har for tiden følgende tillatelser i navnerom %s: %s.';
+$lang['p_group_id']            = 'Medlemmer av gruppe %s har for tiden følgende tillatelser i for siden %s: %s.';
+$lang['p_group_ns']            = 'Medlemmer av gruppe %s har for tiden følgende tillatelser i navnerom %s: %s.';
+$lang['p_choose_id']           = 'Før inn en bruker eller gruppe i skjemaet over for å vise eller redigere tillatelser satt for siden %s.';
+$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']               = 'Gjeldende ACL-regler';
+$lang['where']                 = 'Side/Navnerom';
+$lang['who']                   = 'Bruker/Gruppe';
+$lang['perm']                  = 'Rettigheter';
+$lang['acl_perm0']             = 'Ingen';
+$lang['acl_perm1']             = 'Lese';
+$lang['acl_perm2']             = 'Redigere';
+$lang['acl_perm4']             = 'Opprette';
+$lang['acl_perm8']             = 'Laste opp';
+$lang['acl_perm16']            = 'Slette';
+$lang['acl_new']               = 'Legg til ny oppføring';
+$lang['acl_mod']               = 'Endre oppføring';
diff --git a/sources/lib/plugins/acl/lang/pl/help.txt b/sources/lib/plugins/acl/lang/pl/help.txt
new file mode 100644
index 0000000..331fd2a
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/pl/help.txt
@@ -0,0 +1,11 @@
+=== Pomoc ===
+
+Na tej stronie możesz zmienić uprawnienia do stron i katalogów w wiki.
+
+Lewy panel pokazuje wszystkie dostępne katalogi i strony.
+
+Formularz powyżej pozwala wyświetlać uprawnienia wybranego użytkownika oraz grupy.
+
+W tabeli poniżej znajdują się wszystkie aktywne reguły dotyczące uprawnień.
+
+Więcej informacji na temat uprawnień w DokuWiki możesz znaleźć w [[doku>acl|oficjalnej dokumentacji uprawnień]].
diff --git a/sources/lib/plugins/acl/lang/pl/lang.php b/sources/lib/plugins/acl/lang/pl/lang.php
new file mode 100644
index 0000000..42ce7fd
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/pl/lang.php
@@ -0,0 +1,45 @@
+
+ * @author Mariusz Kujawski 
+ * @author Maciej Kurczewski 
+ * @author Sławomir Boczek 
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski 
+ * @author maros 
+ * @author Grzegorz Widła 
+ * @author Łukasz Chmaj 
+ * @author Begina Felicysym 
+ * @author Aoi Karasu 
+ */
+$lang['admin_acl']             = 'Zarządzanie uprawnieniami';
+$lang['acl_group']             = 'Grupa';
+$lang['acl_user']              = 'Użytkownik';
+$lang['acl_perms']             = 'Uprawnienia użytkownika';
+$lang['page']                  = 'Strona';
+$lang['namespace']             = 'Katalog';
+$lang['btn_select']            = 'Wybierz';
+$lang['p_user_id']             = 'Użytkownik %s posiada następujące uprawnienia do strony %s: %s.';
+$lang['p_user_ns']             = 'Użytkownik %s posiada następujące uprawnienia do katalogów %s: %s.';
+$lang['p_group_id']            = 'Członkowie grupy %s posiadają następujące uprawnienia do strony %s: %s.';
+$lang['p_group_ns']            = 'Członkowie grupy %s posiadają następujące uprawnienia do katalogu %s: %s.';
+$lang['p_choose_id']           = 'Podaj nazwę użytkownika lub grupy w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do strony %s.';
+$lang['p_choose_ns']           = 'Podaj nazwę użytkownika lub grupy w powyższym formularzu, by wyświetlić lub zmienić uprawnienia do katalogu %s.';
+$lang['p_inherited']           = 'Uwaga: Uprawnienia nie zostały nadane wprost ale są dziedziczone z grupy lub katalogu.';
+$lang['p_isadmin']             = 'Uwaga: Wybrana grupa lub użytkownika zawsze dysponuje pełnymi uprawnieniami ponieważ posiada uprawnienia administratora.';
+$lang['p_include']             = 'Szersze uprawnienia zawierają węższe. Tworzenie, przesyłanie plików oraz usuwanie mają znaczenie tylko dla katalogów, nie dla stron.';
+$lang['current']               = 'Aktywne reguły zarządzania uprawnieniami';
+$lang['where']                 = 'Strona/Katalog';
+$lang['who']                   = 'Użytkownik/Grupa';
+$lang['perm']                  = 'Uprawnienie';
+$lang['acl_perm0']             = 'Żadne';
+$lang['acl_perm1']             = 'Czytanie';
+$lang['acl_perm2']             = 'Zmiana';
+$lang['acl_perm4']             = 'Tworzenie';
+$lang['acl_perm8']             = 'Przesyłanie plików';
+$lang['acl_perm16']            = 'Usuwanie';
+$lang['acl_new']               = 'Dodaj nowy wpis';
+$lang['acl_mod']               = 'Zmień wpis';
diff --git a/sources/lib/plugins/acl/lang/pt-br/help.txt b/sources/lib/plugins/acl/lang/pt-br/help.txt
new file mode 100644
index 0000000..b2a49a9
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/pt-br/help.txt
@@ -0,0 +1,11 @@
+=== Ajuda rápida: ===
+
+Nessa página você pode adicionar e remover permissões para espaços de nomes e páginas do seu wiki.
+
+O painel à esquerda mostra todos os espaços de nomes e páginas disponíveis.
+
+O formulário acima permite a visualização e modificação das permissões de um determinado usuário ou grupo.
+
+Na tabela abaixo são exibidas todas as regras de controle de acesso definidas. Você pode usá-la para excluir ou mudar rapidamente várias regras.
+
+A leitura da [[doku>acl|documentação oficial sobre ACL]] pode ajudar a compreender melhor como o controle de acessos funciona no DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/pt-br/lang.php b/sources/lib/plugins/acl/lang/pt-br/lang.php
new file mode 100644
index 0000000..ef0ae6c
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/pt-br/lang.php
@@ -0,0 +1,51 @@
+
+ * @author Alauton/Loug
+ * @author Frederico Gonçalves Guimarães 
+ * @author Felipe Castro 
+ * @author Lucien Raven 
+ * @author Enrico Nicoletto 
+ * @author Flávio Veras 
+ * @author Jeferson Propheta 
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas 
+ * @author Frederico Guimarães 
+ * @author Jair Henrique 
+ * @author Luis Dantas 
+ * @author Sergio Motta sergio@cisne.com.br
+ * @author Isaias Masiero Filho 
+ * @author Balaco Baco 
+ * @author Victor Westmann 
+ */
+$lang['admin_acl']             = 'Administração da Lista de Controles de Acesso';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Usuário';
+$lang['acl_perms']             = 'Permissões para';
+$lang['page']                  = 'Página';
+$lang['namespace']             = 'Espaço de nomes';
+$lang['btn_select']            = 'Selecionar';
+$lang['p_user_id']             = 'O usuário %s possui as seguintes permissões na página %s: %s.';
+$lang['p_user_ns']             = 'O usuário %s possui as seguintes permissões no espaço de nomes %s: %s.';
+$lang['p_group_id']            = 'Os membros do grupo %s possuem as seguintes permissões na página %s: %s.';
+$lang['p_group_ns']            = 'Os membros do grupo %s possuem as seguintes permissões no espaço de nomes %s: %s.';
+$lang['p_choose_id']           = 'Por favor digite um usuário 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 usuário 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 usuário selecionado sempre tem permissões completas, porque ele está configurado como superusuário.';
+$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 atuais da ACL';
+$lang['where']                 = 'Página/Espaço de nomes';
+$lang['who']                   = 'Usuário/Grupo';
+$lang['perm']                  = 'Permissões';
+$lang['acl_perm0']             = 'Nenhuma';
+$lang['acl_perm1']             = 'Ler';
+$lang['acl_perm2']             = 'Editar';
+$lang['acl_perm4']             = 'Criar';
+$lang['acl_perm8']             = 'Enviar';
+$lang['acl_perm16']            = 'Excluir';
+$lang['acl_new']               = 'Adicionar nova entrada';
+$lang['acl_mod']               = 'Modificar a entrada';
diff --git a/sources/lib/plugins/acl/lang/pt/help.txt b/sources/lib/plugins/acl/lang/pt/help.txt
new file mode 100644
index 0000000..cf4619d
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/pt/help.txt
@@ -0,0 +1,9 @@
+=== Auxílio Rápido ===
+
+Nesta página podes adicionar e remover permissões para espaço de nomes e páginas no seu wiki.
+
+O painel esquerdo exibe todos os espaço de nomes e páginas. O formulario acima permite a visualização e modificar as permissões de um selecionado utilizador ou grupo.
+
+Na tabela inferior são exibidas todas as actuais regras de controle de acesso. Podes utilisá-la para excluir ou mudar rapidamente várias regras ao mesmo tempo.
+
+A leitura da [[doku>acl|documentação oficial acerca ACL]] pode ajudar a compreender melhor como o controle de acessos funciona no DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/pt/lang.php b/sources/lib/plugins/acl/lang/pt/lang.php
new file mode 100644
index 0000000..4c2114d
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/pt/lang.php
@@ -0,0 +1,40 @@
+
+ * @author José Monteiro 
+ * @author Enrico Nicoletto 
+ * @author Fil 
+ * @author André Neves 
+ * @author José Campos zecarlosdecampos@gmail.com
+ */
+$lang['admin_acl']             = 'Gestão de ACLs';
+$lang['acl_group']             = 'Grupo';
+$lang['acl_user']              = 'Utilizador';
+$lang['acl_perms']             = 'Permissão para';
+$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';
+$lang['perm']                  = 'Permissões';
+$lang['acl_perm0']             = 'Nenhum';
+$lang['acl_perm1']             = 'Ler';
+$lang['acl_perm2']             = 'Editar';
+$lang['acl_perm4']             = 'Criar';
+$lang['acl_perm8']             = 'Carregar';
+$lang['acl_perm16']            = 'Remover';
+$lang['acl_new']               = 'Adicionar nova entrada';
+$lang['acl_mod']               = 'Modificar Entrada';
diff --git a/sources/lib/plugins/acl/lang/ro/help.txt b/sources/lib/plugins/acl/lang/ro/help.txt
new file mode 100644
index 0000000..3f76261
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ro/help.txt
@@ -0,0 +1,11 @@
+=== Quick Help: ===
+
+Pe această pagină puteţi adăuga şi elimina autorizaţiile pentru spaţiile de nume şi paginile din wiki.
+
+Panoul din stânga afişează toate spaţiile de nume şi paginile disponibile.
+
+Formularul de sus vă permite să vedeţi şi să modificaţi autorizaţiile unui anume utilizator sau grup.
+
+In tabelul de jos sunt arătate toate regulile de control a accesului setate. Îl puteţi folosi pentru a şterge sau modifica rapid mai multe reguli.
+
+Consultarea [[doku>acl|official documentation on ACL]] vă poate ajuta să înţelegeţi deplin cum funcţionează controlul accesului în DocuWiki.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/ro/lang.php b/sources/lib/plugins/acl/lang/ro/lang.php
new file mode 100644
index 0000000..4d09321
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ro/lang.php
@@ -0,0 +1,42 @@
+
+ * @author s_baltariu@yahoo.com
+ * @author Emanuel-Emeric Andrasi 
+ * @author Emanuel-Emeric Andrași 
+ * @author Emanuel-Emeric Andraşi 
+ * @author Emanuel-Emeric Andrasi 
+ * @author Marius OLAR 
+ * @author Marius Olar 
+ * @author Emanuel-Emeric Andrași 
+ */
+$lang['admin_acl']             = 'Managementul Listei de Control a Accesului';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'Utilizator';
+$lang['acl_perms']             = 'Autorizare pentru';
+$lang['page']                  = 'Pagina';
+$lang['namespace']             = 'Spaţiu de nume';
+$lang['btn_select']            = 'Selectează';
+$lang['p_user_id']             = 'Utilizatorul %s are următoarele autorizaţii pe pagină %s: %s.';
+$lang['p_user_ns']             = 'Utilizatorul %s are următoarele autorizaţii pe spaţiul de nume %s: %s.';
+$lang['p_group_id']            = 'Membrii grupului %s au următoarele autorizaţii pe pagină %s: %s.';
+$lang['p_group_ns']            = 'Membrii grupului %s au următoarele autorizaţii pe spaţiul de nume %s: %s.';
+$lang['p_choose_id']           = 'Introduceţi un utilizator sau un grup în formularul de mai sus pentru a vizualiza sau edita autorizaţiile paginii %s.';
+$lang['p_choose_ns']           = 'Introduceţi un utilizator sau un grup în formularul de mai sus pentru a vizualiza sau edita autorizaţiile spaţiului de nume %s.';
+$lang['p_inherited']           = 'Notă: Aceste autorizaţii nu au fost setate explicit ci au fost moştenite de la alte grupuri sau spaţii de nume superioare ierarhic.';
+$lang['p_isadmin']             = 'Notă: Grupul sau utilizatorul selectat are intotdeauna toate autorizatiile întrucât este configurat ca superutilizator.';
+$lang['p_include']             = 'Permisiunile superioare le includ pe cele inferioare. Permisiunile de Creare, Upload şi Ştergere se aplică doar numelor de spaţiu, nu paginilor.';
+$lang['current']               = 'Reguli ACL actuale';
+$lang['where']                 = 'Pagină/Spaţiu de nume';
+$lang['who']                   = 'Utilizator/Grup';
+$lang['perm']                  = 'Autorizaţii';
+$lang['acl_perm0']             = 'Nici una';
+$lang['acl_perm1']             = 'Citire';
+$lang['acl_perm2']             = 'Editare';
+$lang['acl_perm4']             = 'Creare';
+$lang['acl_perm8']             = 'Încărcare';
+$lang['acl_perm16']            = 'Ştergere';
+$lang['acl_new']               = 'Adaugă intrare nouă';
+$lang['acl_mod']               = 'Modifică intrare';
diff --git a/sources/lib/plugins/acl/lang/ru/help.txt b/sources/lib/plugins/acl/lang/ru/help.txt
new file mode 100644
index 0000000..ecb2fe3
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ru/help.txt
@@ -0,0 +1,8 @@
+=== Краткая справка ===
+
+На этой странице вы можете добавить или удалить права доступа к пространствам имён и страницам своей вики.
+  * На панели слева отображены доступные пространства имён и страницы.
+  * Форма выше позволяет вам просмотреть и изменить права доступа для выбранного пользователя или группы.
+  * Текущие права доступа отображены в таблице ниже. Вы можете использовать её для быстрого удаления или изменения правил.
+
+Прочтение  [[doku>acl|официальной документации по ACL]] может помочь вам в полном понимании работы управления правами доступа в «ДокуВики».
diff --git a/sources/lib/plugins/acl/lang/ru/lang.php b/sources/lib/plugins/acl/lang/ru/lang.php
new file mode 100644
index 0000000..ff47406
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/ru/lang.php
@@ -0,0 +1,48 @@
+
+ * @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 
+ * @author Aleksey Osadchiy 
+ * @author Aleksandr Selivanov 
+ * @author Ladyko Andrey 
+ * @author Eugene 
+ * @author Johnny Utah 
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ */
+$lang['admin_acl']             = 'Управление списками контроля доступа';
+$lang['acl_group']             = 'Группа';
+$lang['acl_user']              = 'Пользователь';
+$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']             = 'Замечание: выбранный пользователь всегда имеет полные права, так как он является суперпользователем.';
+$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 --git a/sources/lib/plugins/acl/lang/sk/help.txt b/sources/lib/plugins/acl/lang/sk/help.txt
new file mode 100644
index 0000000..103a034
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sk/help.txt
@@ -0,0 +1,11 @@
+=== Krátka nápoveda: ===
+
+Na tejto stránke môžete pridávať alebo rušiť oprávnenia pre menné priestory a stránky vo Vašej wiki.
+
+Ľavý panel zobrazuje všetky dostupné menné priestory a stránky.
+
+Formulár zobrazený vyššie Vám dovoľuje prehliadať a meniť oprávnenia pre vybraného používateľa alebo skupinu.
+
+V tabuľke nižšie sú zobrazené všetky aktuálne prístupové pravidlá. Môžete v nej rýchlo rušiť alebo meniť viacero pravidiel súčasne.
+
+Prečítanie [[doku>acl|oficiálnej dokumentácie ACL]] Vám môže pomôcť plne pochopiť spôsob ako fungujú prístupové pravidlá (oprávnenia) v DokuWiki.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/sk/lang.php b/sources/lib/plugins/acl/lang/sk/lang.php
new file mode 100644
index 0000000..51837d4
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sk/lang.php
@@ -0,0 +1,38 @@
+
+ * @author Michal Mesko 
+ * @author exusik@gmail.com
+ * @author Martin Michalek 
+ */
+$lang['admin_acl']             = 'Správa zoznamu prístupových práv';
+$lang['acl_group']             = 'Skupina';
+$lang['acl_user']              = 'Užívateľ';
+$lang['acl_perms']             = 'Práva pre';
+$lang['page']                  = 'Stránka';
+$lang['namespace']             = 'Menný priestor';
+$lang['btn_select']            = 'Vybrať';
+$lang['p_user_id']             = 'Používateľ %s má aktuálne nasledujúce oprávnenia k stránke %s: %s.';
+$lang['p_user_ns']             = 'Používateľ %s má aktuálne nasledujúce oprávnenia v mennom priestore %s: %s.';
+$lang['p_group_id']            = 'Členovia skupiny %s majú aktuálne nasledujúce oprávnenia k stránke %s: %s.';
+$lang['p_group_ns']            = 'Členovia skupiny %s majú aktuálne nasledujúce oprávnenia v mennom priestore %s: %s.';
+$lang['p_choose_id']           = 'Prosím zadajte používateľa alebo skupinu do formulára zobrazeného vyššie, aby ste mohli prezerať alebo meniť oprávnenia k stránke %s.';
+$lang['p_choose_ns']           = 'Prosím zadajte používateľa alebo skupinu do formulára zobrazeného vyššie, aby ste mohli prezerať alebo meniť oprávnenia v mennom priestore %s.';
+$lang['p_inherited']           = 'Poznámka: Tieto oprávnenia neboli nastavené explicitne, ale boli odvodené z inej skupiny alebo nadradeného menného priestoru.';
+$lang['p_isadmin']             = 'Poznámka: Vybraná skupina alebo používateľ má vždy najvyššie oprávnenia, pretože je vedená/vedený ako správca.';
+$lang['p_include']             = 'Vyššie oprávnenia zahŕňajú nižšie. Oprávnenie Vytvoriť, Nahrať a Zmazať sa vzťahujú iba k menným priestorom, nie ku stránkam.';
+$lang['current']               = 'Aktuálne pravidlá prístupu (ACL)';
+$lang['where']                 = 'Stránka/Menný priestor';
+$lang['who']                   = 'Používateľ/Skupina';
+$lang['perm']                  = 'Povolenia';
+$lang['acl_perm0']             = 'Žiadne';
+$lang['acl_perm1']             = 'Čítať';
+$lang['acl_perm2']             = 'Zmeniť';
+$lang['acl_perm4']             = 'Vytvoriť';
+$lang['acl_perm8']             = 'Nahrať súbor';
+$lang['acl_perm16']            = 'Zmazať';
+$lang['acl_new']               = 'Pridať nový záznam';
+$lang['acl_mod']               = 'Upraviť záznam';
diff --git a/sources/lib/plugins/acl/lang/sl/help.txt b/sources/lib/plugins/acl/lang/sl/help.txt
new file mode 100644
index 0000000..ff096ae
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sl/help.txt
@@ -0,0 +1,11 @@
+=== Hitra pomoč ===
+
+Na tej strani je mogoče dodajati, odstranjevati in spreminjati dovoljenja za delo z wiki stranmi in imenskimi prostori.
+
+Na veli strani so izpisani vsi imenski prostori in strani.
+
+Na obrazcu zgoraj je mogoče pregledovati in spreminjati dovoljenja za izbranega uporabnika ali skupino.
+
+V preglednici spodaj so prikazana vsa pravila nadzora. Ta je mogoče hitro spreminjati ali brisati.
+
+Več podrobnosti o delovanju nadzora dostopa sistema DokuWiki je mogoče najti v [[doku>acl|uradni dokumentaciji ACL]].
diff --git a/sources/lib/plugins/acl/lang/sl/lang.php b/sources/lib/plugins/acl/lang/sl/lang.php
new file mode 100644
index 0000000..303b18c
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sl/lang.php
@@ -0,0 +1,38 @@
+
+ * @author Boštjan Seničar 
+ * @author Gregor Skumavc (grega.skumavc@gmail.com)
+ * @author Matej Urbančič (mateju@svn.gnome.org)
+ */
+$lang['admin_acl']             = 'Upravljanje dostopa';
+$lang['acl_group']             = 'Skupina';
+$lang['acl_user']              = 'Uporabnik';
+$lang['acl_perms']             = 'Dovoljenja za';
+$lang['page']                  = 'Stran';
+$lang['namespace']             = 'Imenski prostor';
+$lang['btn_select']            = 'Izberi';
+$lang['p_user_id']             = 'Uporabnik %s ima naslednja dovoljenja za stran %s: %s.';
+$lang['p_user_ns']             = 'Uporabnik %s ima naslednja dovoljenja za imenski prostor %s: %s.';
+$lang['p_group_id']            = 'Uporabniška skupina %s ima naslednja dovoljenja za stran %s: %s.';
+$lang['p_group_ns']            = 'Uporabniška skupina %s ima naslednja dovoljenja za imenski prostor %s: %s.';
+$lang['p_choose_id']           = 'Vnesite ime uporabnika ali skupine v zgornji obrazec za ogled ali urejanje dovoljenj za stran %s.';
+$lang['p_choose_ns']           = 'Vnesite ime uporabnika ali skupine v zgornji obrazec za ogled ali urejanje dovoljenj za imenski prostor %s.';
+$lang['p_inherited']           = 'Opomba: trenutna dovoljenja niso bila posebej določena, temveč so bila prevzeta iz drugih skupin ali višjih imenskih prostorov.';
+$lang['p_isadmin']             = 'Opomba: izbrana skupina ali uporabnik imajo vsa dovoljenja za spreminjanje, saj so določeni kot skrbniki sistema.';
+$lang['p_include']             = 'Višja dovoljenja vključujejo tudi nižja. ';
+$lang['current']               = 'Trenutna pravila dostopa';
+$lang['where']                 = 'Stran / Imenski prostor';
+$lang['who']                   = 'Uporabnik/Skupina';
+$lang['perm']                  = 'Dovoljenja';
+$lang['acl_perm0']             = 'Nič';
+$lang['acl_perm1']             = 'Preberi';
+$lang['acl_perm2']             = 'Uredi';
+$lang['acl_perm4']             = 'Ustvari';
+$lang['acl_perm8']             = 'Naloži';
+$lang['acl_perm16']            = 'Zbriši';
+$lang['acl_new']               = 'Dodaj nov zapis';
+$lang['acl_mod']               = 'Spremeni zapis';
diff --git a/sources/lib/plugins/acl/lang/sq/help.txt b/sources/lib/plugins/acl/lang/sq/help.txt
new file mode 100644
index 0000000..84a567f
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sq/help.txt
@@ -0,0 +1,11 @@
+=== Ndihmë e Shpejtë: ===
+
+Në këtë faqe mund të shtoni ose hiqni të drejta për hapësira emri dhe faqe në wiki-n tuaj.
+
+Paneli i majtë tregon të gjitha faqet dhe hapësirat e emrit të disponueshme.
+
+Forma më sipër ju lejon të shihni dhe ndryshoni lejet për një grup ose përdorues të përzgjedhur.
+
+Në tabelën më poshtë tregohen të gjitha rregullat e vendosjes së aksesit. Mund ta përdorni për të fshirë shpejt ose ndryshuar shumë rregulla njëkohësisht.
+
+Leximi i [[doku>acl|dokumentimit zyrtar mbi ACL]]  mund t'ju ndihmojë për të kuptuar plotësisht sesi funksionin Kontrolli i Aksesit në DokuWiki.
diff --git a/sources/lib/plugins/acl/lang/sq/lang.php b/sources/lib/plugins/acl/lang/sq/lang.php
new file mode 100644
index 0000000..30fc99b
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sq/lang.php
@@ -0,0 +1,34 @@
+%s momentalisht ka të drejtat e mëposhtme mbi faqen %s: %s.';
+$lang['p_user_ns']             = 'Përdoruesi %s momentalisht ka të drejtat e mëposhtme mbi hapësirën e emrit %s: %s.';
+$lang['p_group_id']            = 'Anëtarët e grupit %s momentalisht kanë të drejtat e mëposhtme mbi faqen %s: %s.';
+$lang['p_group_ns']            = 'Anëtarët e grupit %s momentalisht kanë të drejtat e mëposhtme mbi hapësirën e emrit %s: %s.';
+$lang['p_choose_id']           = 'Ju lutemi futni një përdorues ose grup në formën e mësipërme për të parë ose ndryshuar bashkësinë e të drejtave për faqen %s.';
+$lang['p_choose_ns']           = 'Ju lutemi futni një përdorues ose grup në formën e mësipërme për të parë ose ndryshuar bashkësinë e të drejtave për hapësirën e emrit %s.';
+$lang['p_inherited']           = 'Shënim: Ato të drejta nuk janë vendosur specifikisht por janë të trashëguara nga grupe të tjera ose hapësira emri më të larta.';
+$lang['p_isadmin']             = 'Shënim: Grupi ose përdoruesi i përzgjedhur ka gjithmonë të drejta të plota sepse është konfiguruar si superpërdorues.';
+$lang['p_include']             = 'Të drejtat më të larta i përfshijnë edhe ato më të ultat. Të drejtat Krijo, Ngarko dhe Fshi u aplikohen vetëm hapësirave të emrit, jo faqeve.';
+$lang['current']               = 'Rregullat aktuale ACL';
+$lang['where']                 = 'Faqe/Hapësirë Emri';
+$lang['who']                   = 'Përdorues/Grup';
+$lang['perm']                  = 'Të Drejta';
+$lang['acl_perm0']             = 'Asgjë';
+$lang['acl_perm1']             = 'Lexim';
+$lang['acl_perm2']             = 'Redaktim';
+$lang['acl_perm4']             = 'Krijim';
+$lang['acl_perm8']             = 'Ngarkim';
+$lang['acl_perm16']            = 'Fshi';
+$lang['acl_new']               = 'Shto Hyrje të re';
+$lang['acl_mod']               = 'Ndrysho Hyrje';
diff --git a/sources/lib/plugins/acl/lang/sr/help.txt b/sources/lib/plugins/acl/lang/sr/help.txt
new file mode 100644
index 0000000..0ec8921
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sr/help.txt
@@ -0,0 +1,11 @@
+=== Приручна помоћ: ===
+
+На овој страни можете додати или уклонити дозволе за странице и именске просторе на Вашем викију.
+
+Леви панел приказује све доступне именске просторе и странице.
+
+Формулар изнад омогућава приказ и измену дозвола за одабране кориснике или групе.
+
+У табели испод су приказане све тренутно постављене дозволе. Можете је користити за брзо брисање или измену више правила.
+
+Читање [[doku>acl|званичне документације о ACL]] Вам може помоћи у потпуном разумевању рада дозвола приступа у DokuWiki-ју.
diff --git a/sources/lib/plugins/acl/lang/sr/lang.php b/sources/lib/plugins/acl/lang/sr/lang.php
new file mode 100644
index 0000000..20fbb03
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sr/lang.php
@@ -0,0 +1,38 @@
+
+ * @author Иван Петровић petrovicivan@ubuntusrbija.org
+ * @author Ivan Petrovic 
+ * @author Miroslav Šolti 
+ */
+$lang['admin_acl']             = 'Управљање листом контроле приступа';
+$lang['acl_group']             = 'Група';
+$lang['acl_user']              = 'Корисник';
+$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']             = 'Напомена: Одабран корисник или група има увек пуне дозволе јер је постављен за суперкорисника.';
+$lang['p_include']             = 'Више дозволе укључују ниже. Дозволе одавања, слања и брисања ће бити примењене само на именске просторе, не и на стране.';
+$lang['current']               = 'Тренутна правила проступа';
+$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 --git a/sources/lib/plugins/acl/lang/sv/help.txt b/sources/lib/plugins/acl/lang/sv/help.txt
new file mode 100644
index 0000000..5ba770f
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sv/help.txt
@@ -0,0 +1,8 @@
+=== Hjälp ===
+På den här sidan kan du lägga till och ta bort åtkomsträttigheter för namnrymder och enstaka sidor i din wiki.
+
+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.
+
+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.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/sv/lang.php b/sources/lib/plugins/acl/lang/sv/lang.php
new file mode 100644
index 0000000..f226542
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/sv/lang.php
@@ -0,0 +1,47 @@
+
+ * @author Nicklas Henriksson 
+ * @author Håkan Sandell 
+ * @author Dennis Karlsson
+ * @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 mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$lang['admin_acl']             = 'Hantera behörighetslistan (ACL)';
+$lang['acl_group']             = 'Grupp';
+$lang['acl_user']              = 'Användare';
+$lang['acl_perms']             = 'Behörighet för';
+$lang['page']                  = 'Sida';
+$lang['namespace']             = 'Namnrymd';
+$lang['btn_select']            = 'Välj';
+$lang['p_user_id']             = 'Användaren %s har förnärvarande följande rättigheter på sidan %s: %s.';
+$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 %s.';
+$lang['p_choose_ns']           = 'Vänligen ange en användare eller grupp i formuläret ovan för att visa eller ändra rättigheterna för namnrymden %s.';
+$lang['p_inherited']           = 'Notering: De här rättigheterna är inte explicit satta utan var ärvda från andra grupper eller högre namnrymder.';
+$lang['p_isadmin']             = 'Notering: Den valda gruppen eller användaren har alltid fulla rättigheter på grund av att den är konfigurerad som superanvändare.';
+$lang['p_include']             = 'Högre rättigheter inkluderar lägre. Rättigheter för Skapa, Ladda upp och Radera är endast applicerbara namnrymder, inte sidor.';
+$lang['current']               = 'Nuvarande ACL regler';
+$lang['where']                 = 'Sida/Namnrymd';
+$lang['who']                   = 'Användare/Grupp';
+$lang['perm']                  = 'Rättigheter';
+$lang['acl_perm0']             = 'Inga';
+$lang['acl_perm1']             = 'Läsa';
+$lang['acl_perm2']             = 'Redigera';
+$lang['acl_perm4']             = 'Skapa';
+$lang['acl_perm8']             = 'Ladda upp';
+$lang['acl_perm16']            = 'Radera';
+$lang['acl_new']               = 'Lägg till ny behörighet';
+$lang['acl_mod']               = 'Ändra behörighet';
diff --git a/sources/lib/plugins/acl/lang/th/help.txt b/sources/lib/plugins/acl/lang/th/help.txt
new file mode 100644
index 0000000..52edca9
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/th/help.txt
@@ -0,0 +1,11 @@
+=== ตัวช่วยอย่างเร็ว ===
+
+ในหน้านี้คุณสามารถเพิ่มและถอดสิทธิ์สำหรับเนมสเปซ และเพจในวิกิของคุณ
+
+แถบด้านซ้ายจะแสดงรายชื่อเนมสเปซ และเพจที่มีอยู่ทั้งหมด
+
+แบบฟอร์มข้างบนอนุญาติให้คุณมองเห็น และแก้ไขสิทธิ์ของผู้ใช้หรือกลุ่มที่เลือกไว้ได้
+
+ในตารางด้านล่างได้แสดงกฏควบคุมการเข้าถึงทั้งหมดไว้ คุณสามารถใช้มันลบ หรือเปลี่ยนกฏครั้งละหลายๆตัวพร้อมกันได้อย่างรวดเร็ว
+
+การอ่าน [[doku>acl|official documentation on ACL]] น่าจะช่วยให้คุณเข้าใจวิธีควบคุมการเข้าถึงของโดกุวิกิได้อย่างถ่องแท้
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/th/lang.php b/sources/lib/plugins/acl/lang/th/lang.php
new file mode 100644
index 0000000..472c33c
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/th/lang.php
@@ -0,0 +1,27 @@
+
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Kittithat Arnontavilas 
+ * @author Thanasak Sompaisansin 
+ */
+$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 --git a/sources/lib/plugins/acl/lang/tr/help.txt b/sources/lib/plugins/acl/lang/tr/help.txt
new file mode 100644
index 0000000..b467c50
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/tr/help.txt
@@ -0,0 +1,11 @@
+=== Hızlı yardım: ===
+
+Bu sayfada Wiki'nizin namespace ve sayfaları için izinleri belirleyebilirsiniz.
+
+Soldaki kısım varolan namespace ve sayfaları listeler.
+
+Yukarıdaki kısım seçilen bir kullanıcı veya grup için izinleri görüp değiştirmenizi sağlar.
+
+Aşağıdaki tablo ise varolan erişim kontrol kurallarını gösterir. Bu tabloyu birden fazla kuralı hızlıca silip değiştirmek için kullanabilirsiniz.
+
+Resmi ACL dökümanını ([[doku>acl|official documentation on ACL]]) okuyarak erişim kontrolünün nasıl çalıştığını öğrenebilirsiniz.
diff --git a/sources/lib/plugins/acl/lang/tr/lang.php b/sources/lib/plugins/acl/lang/tr/lang.php
new file mode 100644
index 0000000..a9699a5
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/tr/lang.php
@@ -0,0 +1,40 @@
+
+ * @author Aydın Coşkuner 
+ * @author Cihan Kahveci 
+ * @author Yavuz Selim 
+ * @author Caleb Maclennan 
+ * @author farukerdemoncel@gmail.com
+ */
+$lang['admin_acl']             = 'Erişim Kontrol Listesi (ACL) Yönetimi';
+$lang['acl_group']             = 'Grup';
+$lang['acl_user']              = 'Kullanıcı';
+$lang['acl_perms']             = 'Şunun için yetkiler:';
+$lang['page']                  = 'Sayfa';
+$lang['namespace']             = 'Namespace';
+$lang['btn_select']            = 'Seç';
+$lang['p_user_id']             = '%s kullanıcısının şu anda %s sayfası için yetkisi: %s.';
+$lang['p_user_ns']             = '%s kullanıcısının şu anda %s namesapace\'i için yetkisi: %s.';
+$lang['p_group_id']            = '%s grubunun şu anda %s sayfası için yetkisi: %s.';
+$lang['p_group_ns']            = '%s grubunun şu anda %s namesapace\'i için yetkisi: %s.';
+$lang['p_choose_id']           = 'Lütfen %s sayfasına izin verilen yetkilerini görmek veya değiştirmek için yukarıdaki forma bir kullanıcı veya grup adı girin.';
+$lang['p_choose_ns']           = 'Lütfen %s namespace\'ie izin verilen yetkileri görmek veya değiştirmek için yukarıdaki forma bir kullanıcı veya grup adı girin.';
+$lang['p_inherited']           = 'Not: Bu izinler doğrudan ayarlanmadan başka grup veya üst namespace\'lerden gelmektedir.';
+$lang['p_isadmin']             = 'Not: Seçili grup veya kullanıcı, "Ana kullanıcı" olarak atandığından tüm izinlere sahiptir.';
+$lang['p_include']             = 'Üst seviye izinler alt izinleri içermektedir. Oluşturma, Yükleme ve Silme yetkisi sadece namespace\'e uygulanmaktadır. Bu yetki sayfalara uygulanmaz.';
+$lang['current']               = 'Şimdiki ACL(İzin Kontrol listesi) kuralları';
+$lang['where']                 = 'Sayfa/Namespace';
+$lang['who']                   = 'Kullanıcı/Grup';
+$lang['perm']                  = 'İzinler';
+$lang['acl_perm0']             = 'Yok';
+$lang['acl_perm1']             = 'Okuma';
+$lang['acl_perm2']             = 'Değiştirme';
+$lang['acl_perm4']             = 'Oluşturma';
+$lang['acl_perm8']             = 'Yükleme';
+$lang['acl_perm16']            = 'Silme';
+$lang['acl_new']               = 'Yeni giriş ekle';
+$lang['acl_mod']               = 'Eski girişi değiştirme';
diff --git a/sources/lib/plugins/acl/lang/uk/help.txt b/sources/lib/plugins/acl/lang/uk/help.txt
new file mode 100644
index 0000000..d16af0a
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/uk/help.txt
@@ -0,0 +1,11 @@
+=== Швидка довідка: ===
+
+На цій сторінці ви можете додавати чи знищувати права доступу для просторів імен чи сторінок вашої вікі.
+
+Ліва панель показує всі доступні простори імен і сторінки.
+
+Верхня форма дозволяє переглянути і редагувати права доступу для обраного користувача чи групи
+
+В таблиці знизу показані всі оголошені правила доступу. Можете її використовувати для швидкого знищення чи модифікації кількох правил.
+
+Додаткова допомога в [[doku>acl|офіційній документації по ACL]] допоможе вам більше зрозуміти як працює контроль доступу у ДокуВікі.
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/uk/lang.php b/sources/lib/plugins/acl/lang/uk/lang.php
new file mode 100644
index 0000000..97c66d8
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/uk/lang.php
@@ -0,0 +1,40 @@
+
+ * @author serg_stetsuk@ukr.net
+ * @author okunia@gmail.com
+ * @author Oleksandr Kunytsia 
+ * @author Uko uko@uar.net
+ * @author Ulrikhe Lukoie  .com
+ */
+$lang['admin_acl']             = 'Керування списками контролю доступу';
+$lang['acl_group']             = 'Група';
+$lang['acl_user']              = 'Користувач';
+$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']             = 'Зверніть увагу! Обрані група чи користувач завжди мають повні права доступу, оскільки вони є суперкористувачами.';
+$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 --git a/sources/lib/plugins/acl/lang/vi/help.txt b/sources/lib/plugins/acl/lang/vi/help.txt
new file mode 100644
index 0000000..816e5ee
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/vi/help.txt
@@ -0,0 +1,12 @@
+=== Trợ giúp nhanh: ===
+
+Trang này giúp bạn thêm hoặc xóa quyền được cấp cho 1 thư mục hoặc trang wiki của bạn.
+
+Của sổ bên trái hiển thị tất cả các thư mục và trang văn bản.
+
+Khung trên đây cho phép bạn xem và sửa quyền của một nhóm hoặc thành viên đã chọn.
+
+Bảng bên dưới hiển thị tất cả các quyền được cấp. Bạn có thể sửa hoặc hóa các quyền đó một cách nhanh chóng.
+
+Đọc [[doku>acl|tài liệu chính thức về ACL]] sẽ giúp bạn hiểu hơn về cách phân quyền ở DokuWiki.
+
diff --git a/sources/lib/plugins/acl/lang/vi/lang.php b/sources/lib/plugins/acl/lang/vi/lang.php
new file mode 100644
index 0000000..ddf764d
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/vi/lang.php
@@ -0,0 +1,44 @@
+
+ */
+
+$lang['admin_acl']  = 'Quản lý danh sách quyền truy cập';
+$lang['acl_group']  = 'Nhóm';
+$lang['acl_user']   = 'Thành viên';
+$lang['acl_perms']  = 'Cấp phép cho';
+$lang['page']       = 'Trang';
+$lang['namespace']  = 'Thư mục';
+
+$lang['btn_select']  = 'Chọn';
+
+$lang['p_user_id']    = 'Thành viên %s hiện tại được cấp phép cho trang %s: %s.';
+$lang['p_user_ns']    = 'Thành viên %s  hiện tại được cấp phép cho thư mục %s: %s.';
+$lang['p_group_id']   = 'Thành viên trong nhóm %s hiện tại được cấp phép cho trang %s: %s.';
+$lang['p_group_ns']   = 'Thành viên trong nhóm %s hiện tại được cấp phép cho thư mục %s: %s.';
+
+$lang['p_choose_id']  = 'Hãy nhập tên thành viên hoặc nhóm vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho trang %s.';
+$lang['p_choose_ns']  = 'Hãy nhập tên thành viên hoặc nhóm vào ô trên đây để xem hoặc sửa quyền đã thiết đặt cho thư mục %s.';
+
+
+$lang['p_inherited']  = 'Ghi chú: Có những quyền không được thể hiện ở đây nhưng nó được cấp phép từ những nhóm hoặc thư mục cấp cao.';
+$lang['p_isadmin']    = 'Ghi chú: Nhóm hoặc thành viên này luôn được cấp đủ quyền vì họ là Quản trị tối cao';
+$lang['p_include']    = 'Một số quyền thấp được thể hiện ở mức cao hơn. Quyền tạo, tải lên và xóa chỉ dành cho thư mục, không dành cho trang.';
+
+$lang['current'] = 'Danh sách quyền truy cập hiện tại';
+$lang['where'] = 'Trang/Thư mục';
+$lang['who']   = 'Thành viên/Nhóm';
+$lang['perm']  = 'Quyền';
+
+$lang['acl_perm0']  = 'Không';
+$lang['acl_perm1']  = 'Đọc';
+$lang['acl_perm2']  = 'Sửa';
+$lang['acl_perm4']  = 'Tạo';
+$lang['acl_perm8']  = 'Tải lên';
+$lang['acl_perm16'] = 'Xóa';
+$lang['acl_new']    = 'Thêm mục mới';
+$lang['acl_mod']    = 'Sửa';
+//Setup VIM: ex: et ts=2 :
diff --git a/sources/lib/plugins/acl/lang/zh-tw/help.txt b/sources/lib/plugins/acl/lang/zh-tw/help.txt
new file mode 100644
index 0000000..2d1c84b
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/zh-tw/help.txt
@@ -0,0 +1,11 @@
+=== 快速指南： ===
+
+你可以用這個頁面，為本 wiki 中的分類名稱或頁面增加或移除權限。
+
+左方面板顯示了所有分類名稱和頁面。
+
+上方表格允許你觀看及修改選取的使用者或群組的權限。
+
+下方表格顯示了目前所有的存取控制表 (ACL)，你可以用它快速刪除或更改多項規則。
+
+閱讀 [[doku>acl|official documentation on ACL]] 可以幫助你完整地了解 DokuWiki 存取控制的運作。
\ No newline at end of file
diff --git a/sources/lib/plugins/acl/lang/zh-tw/lang.php b/sources/lib/plugins/acl/lang/zh-tw/lang.php
new file mode 100644
index 0000000..a564353
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/zh-tw/lang.php
@@ -0,0 +1,44 @@
+
+ * @author Li-Jiun Huang 
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San 
+ * @author Li-Jiun Huang 
+ * @author Cheng-Wei Chien 
+ * @author Danny Lin 
+ * @author Shuo-Ting Jian 
+ * @author syaoranhinata@gmail.com
+ * @author Ichirou Uchiki 
+ */
+$lang['admin_acl']             = '管理存取控制表 (ACL)';
+$lang['acl_group']             = '群組';
+$lang['acl_user']              = '使用者';
+$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']             = '注意：選取的群組或使用者擁有完整權限，因為他或他們已成為超級使用者。';
+$lang['p_include']             = '較高的權限亦包含了較低的權限。新增、上傳與刪除權限只能套用至分類名稱，不能套用至頁面。';
+$lang['current']               = '目前的存取控制規則';
+$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 --git a/sources/lib/plugins/acl/lang/zh/help.txt b/sources/lib/plugins/acl/lang/zh/help.txt
new file mode 100644
index 0000000..526dcee
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/zh/help.txt
@@ -0,0 +1,11 @@
+=== 快速帮助 ===
+
+本页中您可以添加或移除命名空间或页面的权限。
+
+左边的窗格显示的是全部可用的命名空间和页面。
+
+您可以在上方的表格中查看并修改选定用户或组的权限。
+
+下方的表格中显示的是当前设置的全部访问控制规则。 您可以通过它快速删除或更改多条规则。
+
+参阅 [[doku>acl|official documentation on ACL]] 能帮助您完整地理解 DokuWiki 中的访问控制是如何工作的。
diff --git a/sources/lib/plugins/acl/lang/zh/lang.php b/sources/lib/plugins/acl/lang/zh/lang.php
new file mode 100644
index 0000000..029446c
--- /dev/null
+++ b/sources/lib/plugins/acl/lang/zh/lang.php
@@ -0,0 +1,46 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton guxd@163.com
+ * @author Simon zhan 
+ * @author mr.jinyi@gmail.com
+ * @author ben 
+ * @author lainme 
+ * @author caii 
+ * @author Hiphen Lee 
+ * @author caii, patent agent in China 
+ * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian 
+ */
+$lang['admin_acl']             = '访问控制列表（ACL）管理器';
+$lang['acl_group']             = '组';
+$lang['acl_user']              = '用户';
+$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']             = '请注意：选定的组或用户拥有完全权限，因为它被设定为超级用户。';
+$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 --git a/sources/lib/plugins/acl/pix/group.png b/sources/lib/plugins/acl/pix/group.png
new file mode 100644
index 0000000..d80eb26
Binary files /dev/null and b/sources/lib/plugins/acl/pix/group.png differ
diff --git a/sources/lib/plugins/acl/pix/ns.png b/sources/lib/plugins/acl/pix/ns.png
new file mode 100644
index 0000000..c35e832
Binary files /dev/null and b/sources/lib/plugins/acl/pix/ns.png differ
diff --git a/sources/lib/plugins/acl/pix/page.png b/sources/lib/plugins/acl/pix/page.png
new file mode 100644
index 0000000..b1b7ebe
Binary files /dev/null and b/sources/lib/plugins/acl/pix/page.png differ
diff --git a/sources/lib/plugins/acl/pix/user.png b/sources/lib/plugins/acl/pix/user.png
new file mode 100644
index 0000000..7b4a507
Binary files /dev/null and b/sources/lib/plugins/acl/pix/user.png differ
diff --git a/sources/lib/plugins/acl/plugin.info.txt b/sources/lib/plugins/acl/plugin.info.txt
new file mode 100644
index 0000000..029dc82
--- /dev/null
+++ b/sources/lib/plugins/acl/plugin.info.txt
@@ -0,0 +1,7 @@
+base   acl
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2013-02-17
+name   ACL Manager
+desc   Manage Page Access Control Lists
+url    http://dokuwiki.org/plugin:acl
diff --git a/sources/lib/plugins/acl/remote.php b/sources/lib/plugins/acl/remote.php
new file mode 100644
index 0000000..6d5201c
--- /dev/null
+++ b/sources/lib/plugins/acl/remote.php
@@ -0,0 +1,30 @@
+ array(
+                'args' => array('string','string','int'),
+                'return' => 'int',
+                'name' => 'addAcl',
+                'doc' => 'Adds a new ACL rule.'
+            ), 'delAcl' => array(
+                'args' => array('string','string'),
+                'return' => 'int',
+                'name' => 'delAcl',
+                'doc' => 'Delete an existing ACL rule.'
+            ),
+        );
+    }
+
+    function addAcl($scope, $user, $level){
+        $apa = plugin_load('admin', 'acl');
+        return $apa->_acl_add($scope, $user, $level);
+    }
+
+    function delAcl($scope, $user){
+        $apa = plugin_load('admin', 'acl');
+        return $apa->_acl_del($scope, $user);
+    }
+}
+
diff --git a/sources/lib/plugins/acl/script.js b/sources/lib/plugins/acl/script.js
new file mode 100644
index 0000000..58598b1
--- /dev/null
+++ b/sources/lib/plugins/acl/script.js
@@ -0,0 +1,121 @@
+/**
+ * ACL Manager AJAX enhancements
+ *
+ * @author Andreas Gohr 
+ */
+var dw_acl = {
+    /**
+     * Initialize the object and attach the event handlers
+     */
+    init: function () {
+        var $tree;
+
+        //FIXME only one underscore!!
+        if (jQuery('#acl_manager').length === 0) {
+            return;
+        }
+
+        jQuery('#acl__user select').change(dw_acl.userselhandler);
+        jQuery('#acl__user input[type=submit]').click(dw_acl.loadinfo);
+
+        $tree = jQuery('#acl__tree');
+        $tree.dw_tree({toggle_selector: 'img',
+                       load_data: function (show_sublist, $clicky) {
+                           // get the enclosed link and the edit form
+                           var $frm = jQuery('#acl__detail form');
+
+                           jQuery.post(
+                               DOKU_BASE + 'lib/exe/ajax.php',
+                               jQuery.extend(dw_acl.parseatt($clicky.parent().find('a')[0].search),
+                                             {call: 'plugin_acl',
+                                              ajax: 'tree',
+                                              current_ns: $frm.find('input[name=ns]').val(),
+                                              current_id: $frm.find('input[name=id]').val()}),
+                               show_sublist,
+                               'html'
+                           );
+                       },
+
+                       toggle_display: function ($clicky, opening) {
+                           $clicky.attr('src',
+                                        DOKU_BASE + 'lib/images/' +
+                                        (opening ? 'minus' : 'plus') + '.gif');
+                       }});
+        $tree.delegate('a', 'click', dw_acl.treehandler);
+    },
+
+    /**
+     * Handle user dropdown
+     *
+     * Hides or shows the user/group entry box depending on what was selected in the
+     * dropdown element
+     */
+    userselhandler: function () {
+        // make entry field visible/invisible
+        jQuery('#acl__user input').toggle(this.value === '__g__' ||
+                                          this.value === '__u__');
+        dw_acl.loadinfo();
+    },
+
+    /**
+     * Load the current permission info and edit form
+     */
+    loadinfo: function () {
+        jQuery('#acl__info')
+            .attr('role', 'alert')
+            .html('...')
+            .load(
+                DOKU_BASE + 'lib/exe/ajax.php',
+                jQuery('#acl__detail form').serialize() + '&call=plugin_acl&ajax=info'
+            );
+        return false;
+    },
+
+    /**
+     * parse URL attributes into a associative array
+     *
+     * @todo put into global script lib?
+     */
+    parseatt: function (str) {
+        if (str[0] === '?') {
+            str = str.substr(1);
+        }
+        var attributes = {};
+        var all = str.split('&');
+        for (var i = 0; i < all.length; i++) {
+            var att = all[i].split('=');
+            attributes[att[0]] = decodeURIComponent(att[1]);
+        }
+        return attributes;
+    },
+
+    /**
+     * Handles clicks to the tree nodes
+     */
+    treehandler: function () {
+        var $link, $frm;
+
+        $link = jQuery(this);
+
+            // remove highlighting
+            jQuery('#acl__tree a.cur').removeClass('cur');
+
+            // add new highlighting
+        $link.addClass('cur');
+
+            // set new page to detail form
+        $frm = jQuery('#acl__detail form');
+        if ($link.hasClass('wikilink1')) {
+            $frm.find('input[name=ns]').val('');
+            $frm.find('input[name=id]').val(dw_acl.parseatt($link[0].search).id);
+        } else if ($link.hasClass('idx_dir')) {
+            $frm.find('input[name=ns]').val(dw_acl.parseatt($link[0].search).ns);
+            $frm.find('input[name=id]').val('');
+            }
+        dw_acl.loadinfo();
+
+        return false;
+    }
+};
+
+jQuery(dw_acl.init);
diff --git a/sources/lib/plugins/acl/style.css b/sources/lib/plugins/acl/style.css
new file mode 100644
index 0000000..a53a034
--- /dev/null
+++ b/sources/lib/plugins/acl/style.css
@@ -0,0 +1,139 @@
+#acl__tree {
+    font-size: 90%;
+    width: 25%;
+    height: 300px;
+    float: left;
+    overflow: auto;
+    border: 1px solid __border__;
+    text-align: left;
+}
+[dir=rtl] #acl__tree {
+    float: right;
+    text-align: right;
+}
+
+#acl__tree a.cur {
+    background-color: __highlight__;
+    font-weight: bold;
+}
+
+#acl__tree ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
+}
+
+#acl__tree li {
+    padding-left: 1em;
+    list-style-image: none;
+}
+[dir=rtl] #acl__tree li {
+    padding-left: 0em;
+    padding-right: 1em;
+}
+
+#acl__tree ul img {
+    margin-right: 0.25em;
+    cursor: pointer;
+}
+[dir=rtl] #acl__tree ul img {
+    margin-left: 0.25em;
+    margin-right: 0em;
+}
+
+#acl__detail {
+    width: 73%;
+    height: 300px;
+    float: right;
+    overflow: auto;
+}
+[dir=rtl] #acl__detail {
+    float: left;
+}
+
+#acl__detail fieldset {
+    width: 90%;
+}
+
+#acl__detail div#acl__user {
+    border: 1px solid __border__;
+    padding: 0.5em;
+    margin-bottom: 0.6em;
+}
+
+#acl_manager table.inline {
+    width: 100%;
+    margin: 0;
+}
+
+#acl_manager table .check {
+    text-align: center;
+}
+
+#acl_manager table .action {
+    text-align: right;
+}
+
+#acl_manager .aclgroup {
+    background: transparent url(pix/group.png) 0px 1px no-repeat;
+    padding: 1px 0px 1px 18px;
+}
+[dir=rtl] #acl_manager .aclgroup {
+    background: transparent url(pix/group.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
+}
+
+#acl_manager .acluser {
+    background: transparent url(pix/user.png) 0px 1px no-repeat;
+    padding: 1px 0px 1px 18px;
+}
+[dir=rtl] #acl_manager .acluser {
+    background: transparent url(pix/user.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
+}
+
+#acl_manager .aclpage {
+    background: transparent url(pix/page.png) 0px 1px no-repeat;
+    padding: 1px 0px 1px 18px;
+}
+[dir=rtl] #acl_manager .aclpage {
+    background: transparent url(pix/page.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
+}
+
+#acl_manager .aclns {
+    background: transparent url(pix/ns.png) 0px 1px no-repeat;
+    padding: 1px 0px 1px 18px;
+}
+[dir=rtl] #acl_manager .aclns {
+    background: transparent url(pix/ns.png) right 1px no-repeat;
+    padding: 1px 18px 1px 0px;
+    display: inline-block; /* needed for IE7 */
+}
+
+#acl_manager label.disabled {
+    opacity: .5;
+    cursor: auto;
+}
+
+#acl_manager label {
+    text-align: left;
+    font-weight: normal;
+    display: inline;
+}
+
+#acl_manager table {
+    margin-left: 10%;
+    width: 80%;
+}
+
+#acl_manager table tr {
+    background-color: inherit;
+}
+
+#acl_manager table tr:hover {
+    background-color: __background_alt__;
+}
diff --git a/sources/lib/plugins/action.php b/sources/lib/plugins/action.php
new file mode 100644
index 0000000..4b5eef6
--- /dev/null
+++ b/sources/lib/plugins/action.php
@@ -0,0 +1,23 @@
+
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * All DokuWiki plugins to interfere with the event system
+ * need to inherit from this class
+ */
+class DokuWiki_Action_Plugin extends DokuWiki_Plugin {
+
+    /**
+     * Registers a callback function for a given event
+     */
+    public function register(Doku_Event_Handler $controller) {
+        trigger_error('register() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+}
diff --git a/sources/lib/plugins/admin.php b/sources/lib/plugins/admin.php
new file mode 100644
index 0000000..9a1fb9f
--- /dev/null
+++ b/sources/lib/plugins/admin.php
@@ -0,0 +1,46 @@
+
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * All DokuWiki plugins to extend the admin function
+ * need to inherit from this class
+ */
+class DokuWiki_Admin_Plugin extends DokuWiki_Plugin {
+
+    function getMenuText($language) {
+        $menutext = $this->getLang('menu');
+        if (!$menutext) {
+            $info = $this->getInfo();
+            $menutext = $info['name'].' ...';
+        }
+        return $menutext;
+    }
+
+    function getMenuSort() {
+        return 1000;
+    }
+
+    function handle() {
+        trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    function html() {
+        trigger_error('html() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    function forAdminOnly() {
+        return true;
+    }
+
+    function getTOC(){
+        return array();
+    }
+}
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/plugins/auth.php b/sources/lib/plugins/auth.php
new file mode 100644
index 0000000..dc66d63
--- /dev/null
+++ b/sources/lib/plugins/auth.php
@@ -0,0 +1,453 @@
+
+ * @author     Jan Schumann 
+ */
+class DokuWiki_Auth_Plugin extends DokuWiki_Plugin {
+    public $success = true;
+
+    /**
+     * Possible things an auth backend module may be able to
+     * do. The things a backend can do need to be set to true
+     * in the constructor.
+     */
+    protected $cando = array(
+        'addUser'      => false, // can Users be created?
+        'delUser'      => false, // can Users be deleted?
+        'modLogin'     => false, // can login names be changed?
+        'modPass'      => false, // can passwords be changed?
+        'modName'      => false, // can real names be changed?
+        'modMail'      => false, // can emails be changed?
+        'modGroups'    => false, // can groups be changed?
+        'getUsers'     => false, // can a (filtered) list of users be retrieved?
+        'getUserCount' => false, // can the number of users be retrieved?
+        'getGroups'    => false, // can a list of available groups be retrieved?
+        'external'     => false, // does the module do external auth checking?
+        'logout'       => true, // can the user logout again? (eg. not possible with HTTP auth)
+    );
+
+    /**
+     * Constructor.
+     *
+     * Carry out sanity checks to ensure the object is
+     * able to operate. Set capabilities in $this->cando
+     * array here
+     *
+     * For future compatibility, sub classes should always include a call
+     * to parent::__constructor() in their constructors!
+     *
+     * Set $this->success to false if checks fail
+     *
+     * @author  Christopher Smith 
+     */
+    public function __construct() {
+        // the base class constructor does nothing, derived class
+        // constructors do the real work
+    }
+
+    /**
+     * Available Capabilities. [ DO NOT OVERRIDE ]
+     *
+     * For introspection/debugging
+     *
+     * @author  Christopher Smith 
+     * @return  array
+     */
+    public function getCapabilities(){
+        return array_keys($this->cando);
+    }
+
+    /**
+     * Capability check. [ DO NOT OVERRIDE ]
+     *
+     * Checks the capabilities set in the $this->cando array and
+     * some pseudo capabilities (shortcutting access to multiple
+     * ones)
+     *
+     * ususal capabilities start with lowercase letter
+     * shortcut capabilities start with uppercase letter
+     *
+     * @author  Andreas Gohr 
+     * @param   string $cap the capability to check
+     * @return  bool
+     */
+    public function canDo($cap) {
+        switch($cap) {
+            case 'Profile':
+                // can at least one of the user's properties be changed?
+                return ($this->cando['modPass'] ||
+                    $this->cando['modName'] ||
+                    $this->cando['modMail']);
+                break;
+            case 'UserMod':
+                // can at least anything be changed?
+                return ($this->cando['modPass'] ||
+                    $this->cando['modName'] ||
+                    $this->cando['modMail'] ||
+                    $this->cando['modLogin'] ||
+                    $this->cando['modGroups'] ||
+                    $this->cando['modMail']);
+                break;
+            default:
+                // print a helping message for developers
+                if(!isset($this->cando[$cap])) {
+                    msg("Check for unknown capability '$cap' - Do you use an outdated Plugin?", -1);
+                }
+                return $this->cando[$cap];
+        }
+    }
+
+    /**
+     * Trigger the AUTH_USERDATA_CHANGE event and call the modification function. [ DO NOT OVERRIDE ]
+     *
+     * You should use this function instead of calling createUser, modifyUser or
+     * deleteUsers directly. The event handlers can prevent the modification, for
+     * example for enforcing a user name schema.
+     *
+     * @author Gabriel Birke 
+     * @param string $type   Modification type ('create', 'modify', 'delete')
+     * @param array  $params Parameters for the createUser, modifyUser or deleteUsers method. The content of this array depends on the modification type
+     * @return mixed Result from the modification function or false if an event handler has canceled the action
+     */
+    public function triggerUserMod($type, $params) {
+        $validTypes = array(
+            'create' => 'createUser',
+            'modify' => 'modifyUser',
+            'delete' => 'deleteUsers'
+        );
+        if(empty($validTypes[$type]))
+            return false;
+        $eventdata = array('type' => $type, 'params' => $params, 'modification_result' => null);
+        $evt       = new Doku_Event('AUTH_USER_CHANGE', $eventdata);
+        if($evt->advise_before(true)) {
+            $result                           = call_user_func_array(array($this, $validTypes[$type]), $params);
+            $evt->data['modification_result'] = $result;
+        }
+        $evt->advise_after();
+        unset($evt);
+        return $result;
+    }
+
+    /**
+     * Log off the current user [ OPTIONAL ]
+     *
+     * Is run in addition to the ususal logoff method. Should
+     * only be needed when trustExternal is implemented.
+     *
+     * @see     auth_logoff()
+     * @author  Andreas Gohr 
+     */
+    public function logOff() {
+    }
+
+    /**
+     * Do all authentication [ OPTIONAL ]
+     *
+     * Set $this->cando['external'] = true when implemented
+     *
+     * If this function is implemented it will be used to
+     * authenticate a user - all other DokuWiki internals
+     * will not be used for authenticating, thus
+     * implementing the checkPass() function is not needed
+     * anymore.
+     *
+     * The function can be used to authenticate against third
+     * party cookies or Apache auth mechanisms and replaces
+     * the auth_login() function
+     *
+     * The function will be called with or without a set
+     * username. If the Username is given it was called
+     * from the login form and the given credentials might
+     * need to be checked. If no username was given it
+     * the function needs to check if the user is logged in
+     * by other means (cookie, environment).
+     *
+     * The function needs to set some globals needed by
+     * DokuWiki like auth_login() does.
+     *
+     * @see     auth_login()
+     * @author  Andreas Gohr 
+     *
+     * @param   string  $user    Username
+     * @param   string  $pass    Cleartext Password
+     * @param   bool    $sticky  Cookie should not expire
+     * @return  bool             true on successful auth
+     */
+    public function trustExternal($user, $pass, $sticky = false) {
+        /* some example:
+
+        global $USERINFO;
+        global $conf;
+        $sticky ? $sticky = true : $sticky = false; //sanity check
+
+        // do the checking here
+
+        // set the globals if authed
+        $USERINFO['name'] = 'FIXME';
+        $USERINFO['mail'] = 'FIXME';
+        $USERINFO['grps'] = array('FIXME');
+        $_SERVER['REMOTE_USER'] = $user;
+        $_SESSION[DOKU_COOKIE]['auth']['user'] = $user;
+        $_SESSION[DOKU_COOKIE]['auth']['pass'] = $pass;
+        $_SESSION[DOKU_COOKIE]['auth']['info'] = $USERINFO;
+        return true;
+
+        */
+    }
+
+    /**
+     * Check user+password [ MUST BE OVERRIDDEN ]
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct
+     *
+     * May be ommited if trustExternal is used.
+     *
+     * @author  Andreas Gohr 
+     * @param   string $user the user name
+     * @param   string $pass the clear text password
+     * @return  bool
+     */
+    public function checkPass($user, $pass) {
+        msg("no valid authorisation system in use", -1);
+        return false;
+    }
+
+    /**
+     * Return user info [ MUST BE OVERRIDDEN ]
+     *
+     * 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
+     *
+     * @author  Andreas Gohr 
+     * @param   string $user the user name
+     * @return  array containing user data or false
+     */
+    public function getUserData($user) {
+        if(!$this->cando['external']) msg("no valid authorisation system in use", -1);
+        return false;
+    }
+
+    /**
+     * Create a new User [implement only where required/possible]
+     *
+     * Returns false if the user already exists, null when an error
+     * occurred and true if everything went well.
+     *
+     * The new user HAS TO be added to the default group by this
+     * function!
+     *
+     * Set addUser capability when implemented
+     *
+     * @author  Andreas Gohr 
+     * @param  string     $user
+     * @param  string     $pass
+     * @param  string     $name
+     * @param  string     $mail
+     * @param  null|array $grps
+     * @return bool|null
+     */
+    public function createUser($user, $pass, $name, $mail, $grps = null) {
+        msg("authorisation method does not allow creation of new users", -1);
+        return null;
+    }
+
+    /**
+     * Modify user data [implement only where required/possible]
+     *
+     * Set the mod* capabilities according to the implemented features
+     *
+     * @author  Chris Smith 
+     * @param   string $user    nick of the user to be changed
+     * @param   array  $changes array of field/value pairs to be changed (password will be clear text)
+     * @return  bool
+     */
+    public function modifyUser($user, $changes) {
+        msg("authorisation method does not allow modifying of user data", -1);
+        return false;
+    }
+
+    /**
+     * Delete one or more users [implement only where required/possible]
+     *
+     * Set delUser capability when implemented
+     *
+     * @author  Chris Smith 
+     * @param   array  $users
+     * @return  int    number of users deleted
+     */
+    public function deleteUsers($users) {
+        msg("authorisation method does not allow deleting of users", -1);
+        return false;
+    }
+
+    /**
+     * Return a count of the number of user which meet $filter criteria
+     * [should be implemented whenever retrieveUsers is implemented]
+     *
+     * Set getUserCount capability when implemented
+     *
+     * @author Chris Smith 
+     * @param  array $filter array of field/pattern pairs, empty array for no filter
+     * @return int
+     */
+    public function getUserCount($filter = array()) {
+        msg("authorisation method does not provide user counts", -1);
+        return 0;
+    }
+
+    /**
+     * Bulk retrieval of user data [implement only where required/possible]
+     *
+     * Set getUsers capability when implemented
+     *
+     * @author  Chris Smith 
+     * @param   int   $start     index of first user to be returned
+     * @param   int   $limit     max number of users to be returned
+     * @param   array $filter    array of field/pattern pairs, null for no filter
+     * @return  array list of userinfo (refer getUserData for internal userinfo details)
+     */
+    public function retrieveUsers($start = 0, $limit = -1, $filter = null) {
+        msg("authorisation method does not support mass retrieval of user data", -1);
+        return array();
+    }
+
+    /**
+     * Define a group [implement only where required/possible]
+     *
+     * Set addGroup capability when implemented
+     *
+     * @author  Chris Smith 
+     * @param   string $group
+     * @return  bool
+     */
+    public function addGroup($group) {
+        msg("authorisation method does not support independent group creation", -1);
+        return false;
+    }
+
+    /**
+     * Retrieve groups [implement only where required/possible]
+     *
+     * Set getGroups capability when implemented
+     *
+     * @author  Chris Smith 
+     * @param   int $start
+     * @param   int $limit
+     * @return  array
+     */
+    public function retrieveGroups($start = 0, $limit = 0) {
+        msg("authorisation method does not support group list retrieval", -1);
+        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
+     *
+     * @return bool
+     */
+    public 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
+     * @return string the cleaned username
+     */
+    public 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
+     * @return string the cleaned groupname
+     */
+    public 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['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
+     * on currently logged in users.
+     *
+     * To accommodate for this, the user manager plugin will touch a reference
+     * file whenever a change is submitted. This function compares the filetime
+     * of this reference file with the time stored in the session.
+     *
+     * This reference file mechanism does not reflect changes done directly in
+     * the backend's database through other means than the user manager plugin.
+     *
+     * Fast backends might want to return always false, to force rechecks on
+     * each page load. Others might want to use their own checking here. If
+     * unsure, do not override.
+     *
+     * @param  string $user - The username
+     * @author Andreas Gohr 
+     * @return bool
+     */
+    public function useSessionCache($user) {
+        global $conf;
+        return ($_SESSION[DOKU_COOKIE]['auth']['time'] >= @filemtime($conf['cachedir'].'/sessionpurge'));
+    }
+
+    /**
+     * Overrides the standard config loading to integrate old auth module style configs
+     *
+     * @deprecated 2012-11-09
+     */
+    public function loadConfig() {
+        global $conf;
+        $plugin  = $this->getPluginName();
+        $oldname = preg_replace('/^auth/', '', $plugin);
+
+        $default = $this->readDefaultSettings();
+        $oldconf = array();
+        if(isset($conf['auth'][$oldname])) $oldconf = (array) $conf['auth'][$oldname];
+        $conf['plugin'][$plugin] = array_merge($default, $oldconf, (array) $conf['plugin'][$plugin]);
+
+        $this->conf         =& $conf['plugin'][$plugin];
+        $this->configloaded = true;
+    }
+}
diff --git a/sources/lib/plugins/authad/adLDAP/adLDAP.php b/sources/lib/plugins/authad/adLDAP/adLDAP.php
new file mode 100644
index 0000000..c1f92ab
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/adLDAP.php
@@ -0,0 +1,951 @@
+ldapConnection) {
+            return $this->ldapConnection;   
+        }
+        return false;
+    }
+    
+    /**
+    * Get the bind status
+    * 
+    * @return bool
+    */
+    public function getLdapBind() {
+        return $this->ldapBind;
+    }
+    
+    /**
+    * Get the current base DN
+    * 
+    * @return string
+    */
+    public function getBaseDn() {
+        return $this->baseDn;   
+    }
+    
+    /**
+    * The group class
+    * 
+    * @var adLDAPGroups
+    */
+    protected $groupClass;
+    
+    /**
+    * Get the group class interface
+    * 
+    * @return adLDAPGroups
+    */
+    public function group() {
+        if (!$this->groupClass) {
+            $this->groupClass = new adLDAPGroups($this);
+        }   
+        return $this->groupClass;
+    }
+    
+    /**
+    * The user class
+    * 
+    * @var adLDAPUsers
+    */
+    protected $userClass;
+    
+    /**
+    * Get the userclass interface
+    * 
+    * @return adLDAPUsers
+    */
+    public function user() {
+        if (!$this->userClass) {
+            $this->userClass = new adLDAPUsers($this);
+        }   
+        return $this->userClass;
+    }
+    
+    /**
+    * The folders class
+    * 
+    * @var adLDAPFolders
+    */
+    protected $folderClass;
+    
+    /**
+    * Get the folder class interface
+    * 
+    * @return adLDAPFolders
+    */
+    public function folder() {
+        if (!$this->folderClass) {
+            $this->folderClass = new adLDAPFolders($this);
+        }   
+        return $this->folderClass;
+    }
+    
+    /**
+    * The utils class
+    * 
+    * @var adLDAPUtils
+    */
+    protected $utilClass;
+    
+    /**
+    * Get the utils class interface
+    * 
+    * @return adLDAPUtils
+    */
+    public function utilities() {
+        if (!$this->utilClass) {
+            $this->utilClass = new adLDAPUtils($this);
+        }   
+        return $this->utilClass;
+    }
+    
+    /**
+    * The contacts class
+    * 
+    * @var adLDAPContacts
+    */
+    protected $contactClass;
+    
+    /**
+    * Get the contacts class interface
+    * 
+    * @return adLDAPContacts
+    */
+    public function contact() {
+        if (!$this->contactClass) {
+            $this->contactClass = new adLDAPContacts($this);
+        }   
+        return $this->contactClass;
+    }
+    
+    /**
+    * The exchange class
+    * 
+    * @var adLDAPExchange
+    */
+    protected $exchangeClass;
+    
+    /**
+    * Get the exchange class interface
+    * 
+    * @return adLDAPExchange
+    */
+    public function exchange() {
+        if (!$this->exchangeClass) {
+            $this->exchangeClass = new adLDAPExchange($this);
+        }   
+        return $this->exchangeClass;
+    }
+    
+    /**
+    * The computers class
+    * 
+    * @var adLDAPComputers
+    */
+    protected $computersClass;
+    
+    /**
+    * Get the computers class interface
+    * 
+    * @return adLDAPComputers
+    */
+    public function computer() {
+        if (!$this->computerClass) {
+            $this->computerClass = new adLDAPComputers($this);
+        }   
+        return $this->computerClass;
+    }
+
+    /**
+    * Getters and Setters
+    */
+    
+    /**
+    * Set the account suffix
+    * 
+    * @param string $accountSuffix
+    * @return void
+    */
+    public function setAccountSuffix($accountSuffix)
+    {
+          $this->accountSuffix = $accountSuffix;
+    }
+
+    /**
+    * Get the account suffix
+    * 
+    * @return string
+    */
+    public function getAccountSuffix()
+    {
+          return $this->accountSuffix;
+    }
+    
+    /**
+    * Set the domain controllers array
+    * 
+    * @param array $domainControllers
+    * @return void
+    */
+    public function setDomainControllers(array $domainControllers)
+    {
+          $this->domainControllers = $domainControllers;
+    }
+
+    /**
+    * Get the list of domain controllers
+    * 
+    * @return void
+    */
+    public function getDomainControllers()
+    {
+          return $this->domainControllers;
+    }
+    
+    /**
+    * Sets the port number your domain controller communicates over
+    * 
+    * @param int $adPort
+    */
+    public function setPort($adPort) 
+    { 
+        $this->adPort = $adPort; 
+    } 
+    
+    /**
+    * Gets the port number your domain controller communicates over
+    * 
+    * @return int
+    */
+    public function getPort() 
+    { 
+        return $this->adPort; 
+    } 
+    
+    /**
+    * Set the username of an account with higher priviledges
+    * 
+    * @param string $adminUsername
+    * @return void
+    */
+    public function setAdminUsername($adminUsername)
+    {
+          $this->adminUsername = $adminUsername;
+    }
+
+    /**
+    * Get the username of the account with higher priviledges
+    * 
+    * This will throw an exception for security reasons
+    */
+    public function getAdminUsername()
+    {
+          throw new adLDAPException('For security reasons you cannot access the domain administrator account details');
+    }
+    
+    /**
+    * Set the password of an account with higher priviledges
+    * 
+    * @param string $adminPassword
+    * @return void
+    */
+    public function setAdminPassword($adminPassword)
+    {
+          $this->adminPassword = $adminPassword;
+    }
+
+    /**
+    * Get the password of the account with higher priviledges
+    * 
+    * This will throw an exception for security reasons
+    */
+    public function getAdminPassword()
+    {
+          throw new adLDAPException('For security reasons you cannot access the domain administrator account details');
+    }
+    
+    /**
+    * Set whether to detect the true primary group
+    * 
+    * @param bool $realPrimaryGroup
+    * @return void
+    */
+    public function setRealPrimaryGroup($realPrimaryGroup)
+    {
+          $this->realPrimaryGroup = $realPrimaryGroup;
+    }
+
+    /**
+    * Get the real primary group setting
+    * 
+    * @return bool
+    */
+    public function getRealPrimaryGroup()
+    {
+          return $this->realPrimaryGroup;
+    }
+    
+    /**
+    * Set whether to use SSL
+    * 
+    * @param bool $useSSL
+    * @return void
+    */
+    public function setUseSSL($useSSL)
+    {
+          $this->useSSL = $useSSL;
+          // Set the default port correctly 
+          if($this->useSSL) { 
+            $this->setPort(self::ADLDAP_LDAPS_PORT); 
+          }
+          else { 
+            $this->setPort(self::ADLDAP_LDAP_PORT); 
+          } 
+    }
+
+    /**
+    * Get the SSL setting
+    * 
+    * @return bool
+    */
+    public function getUseSSL()
+    {
+          return $this->useSSL;
+    }
+    
+    /**
+    * Set whether to use TLS
+    * 
+    * @param bool $useTLS
+    * @return void
+    */
+    public function setUseTLS($useTLS)
+    {
+          $this->useTLS = $useTLS;
+    }
+
+    /**
+    * Get the TLS setting
+    * 
+    * @return bool
+    */
+    public function getUseTLS()
+    {
+          return $this->useTLS;
+    }
+    
+    /**
+    * Set whether to use SSO
+    * Requires ldap_sasl_bind support. Be sure --with-ldap-sasl is used when configuring PHP otherwise this function will be undefined. 
+    * 
+    * @param bool $useSSO
+    * @return void
+    */
+    public function setUseSSO($useSSO)
+    {
+          if ($useSSO === true && !$this->ldapSaslSupported()) {
+              throw new adLDAPException('No LDAP SASL support for PHP.  See: http://www.php.net/ldap_sasl_bind');
+          }
+          $this->useSSO = $useSSO;
+    }
+
+    /**
+    * Get the SSO setting
+    * 
+    * @return bool
+    */
+    public function getUseSSO()
+    {
+          return $this->useSSO;
+    }
+    
+    /**
+    * Set whether to lookup recursive groups
+    * 
+    * @param bool $recursiveGroups
+    * @return void
+    */
+    public function setRecursiveGroups($recursiveGroups)
+    {
+          $this->recursiveGroups = $recursiveGroups;
+    }
+
+    /**
+    * Get the recursive groups setting
+    * 
+    * @return bool
+    */
+    public function getRecursiveGroups()
+    {
+          return $this->recursiveGroups;
+    }
+
+    /**
+    * Default Constructor
+    * 
+    * Tries to bind to the AD domain over LDAP or LDAPs
+    * 
+    * @param array $options Array of options to pass to the constructor
+    * @throws Exception - if unable to bind to Domain Controller
+    * @return bool
+    */
+    function __construct($options = array()) {
+        // You can specifically overide any of the default configuration options setup above
+        if (count($options) > 0) {
+            if (array_key_exists("account_suffix",$options)){ $this->accountSuffix = $options["account_suffix"]; }
+            if (array_key_exists("base_dn",$options)){ $this->baseDn = $options["base_dn"]; }
+            if (array_key_exists("domain_controllers",$options)){ 
+                if (!is_array($options["domain_controllers"])) { 
+                    throw new adLDAPException('[domain_controllers] option must be an array');
+                }
+                $this->domainControllers = $options["domain_controllers"]; 
+            }
+            if (array_key_exists("admin_username",$options)){ $this->adminUsername = $options["admin_username"]; }
+            if (array_key_exists("admin_password",$options)){ $this->adminPassword = $options["admin_password"]; }
+            if (array_key_exists("real_primarygroup",$options)){ $this->realPrimaryGroup = $options["real_primarygroup"]; }
+            if (array_key_exists("use_ssl",$options)){ $this->setUseSSL($options["use_ssl"]); }
+            if (array_key_exists("use_tls",$options)){ $this->useTLS = $options["use_tls"]; }
+            if (array_key_exists("recursive_groups",$options)){ $this->recursiveGroups = $options["recursive_groups"]; }
+            if (array_key_exists("ad_port",$options)){ $this->setPort($options["ad_port"]); } 
+            if (array_key_exists("sso",$options)) { 
+                $this->setUseSSO($options["sso"]);
+                if (!$this->ldapSaslSupported()) {
+                    $this->setUseSSO(false);
+                }
+            } 
+        }
+        
+        if ($this->ldapSupported() === false) {
+            throw new adLDAPException('No LDAP support for PHP.  See: http://www.php.net/ldap');
+        }
+
+        return $this->connect();
+    }
+
+    /**
+    * Default Destructor
+    * 
+    * Closes the LDAP connection
+    * 
+    * @return void
+    */
+    function __destruct() { 
+        $this->close(); 
+    }
+
+    /**
+    * Connects and Binds to the Domain Controller
+    * 
+    * @return bool
+    */
+    public function connect() 
+    {
+        // Connect to the AD/LDAP server as the username/password
+        $domainController = $this->randomController();
+        if ($this->useSSL) {
+            $this->ldapConnection = ldap_connect("ldaps://" . $domainController, $this->adPort);
+        } else {
+            $this->ldapConnection = ldap_connect($domainController, $this->adPort);
+        }
+               
+        // Set some ldap options for talking to AD
+        ldap_set_option($this->ldapConnection, LDAP_OPT_PROTOCOL_VERSION, 3);
+        ldap_set_option($this->ldapConnection, LDAP_OPT_REFERRALS, 0);
+        
+        if ($this->useTLS) {
+            ldap_start_tls($this->ldapConnection);
+        }
+               
+        // Bind as a domain admin if they've set it up
+        if ($this->adminUsername !== NULL && $this->adminPassword !== NULL) {
+            $this->ldapBind = @ldap_bind($this->ldapConnection, $this->adminUsername . $this->accountSuffix, $this->adminPassword);
+            if (!$this->ldapBind) {
+                if ($this->useSSL && !$this->useTLS) {
+                    // If you have problems troubleshooting, remove the @ character from the ldapldapBind 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->getLastError());
+                }
+                else {
+                    throw new adLDAPException('Bind to Active Directory failed. Check the login credentials and/or server details. AD said: ' . $this->getLastError());
+                }
+            }
+        }
+        if ($this->useSSO && $_SERVER['REMOTE_USER'] && $this->adminUsername === null && $_SERVER['KRB5CCNAME']) {
+            putenv("KRB5CCNAME=" . $_SERVER['KRB5CCNAME']);  
+            $this->ldapBind = @ldap_sasl_bind($this->ldapConnection, NULL, NULL, "GSSAPI"); 
+            if (!$this->ldapBind){ 
+                throw new adLDAPException('Rebind to Active Directory failed. AD said: ' . $this->getLastError()); 
+            }
+            else {
+                return true;
+            }
+        }
+                
+        
+        if ($this->baseDn == NULL) {
+            $this->baseDn = $this->findBaseDn();   
+        }
+        
+        return true;
+    }
+    
+    /**
+    * Closes the LDAP connection
+    * 
+    * @return void
+    */
+    public function close() {
+        if ($this->ldapConnection) {
+            @ldap_close($this->ldapConnection);
+        }
+    }
+    
+    /**
+    * 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 $preventRebind
+    * @return bool
+    */
+    public function authenticate($username, $password, $preventRebind = false) {
+        // Prevent null binding
+        if ($username === NULL || $password === NULL) { return false; } 
+        if (empty($username) || empty($password)) { return false; }
+        
+        // Allow binding over SSO for Kerberos
+        if ($this->useSSO && $_SERVER['REMOTE_USER'] && $_SERVER['REMOTE_USER'] == $username && $this->adminUsername === NULL && $_SERVER['KRB5CCNAME']) { 
+            putenv("KRB5CCNAME=" . $_SERVER['KRB5CCNAME']);
+            $this->ldapBind = @ldap_sasl_bind($this->ldapConnection, NULL, NULL, "GSSAPI");
+            if (!$this->ldapBind) {
+                throw new adLDAPException('Rebind to Active Directory failed. AD said: ' . $this->getLastError());
+            }
+            else {
+                return true;
+            }
+        }
+        
+        // Bind as the user        
+        $ret = true;
+        $this->ldapBind = @ldap_bind($this->ldapConnection, $username . $this->accountSuffix, $password);
+        if (!$this->ldapBind){ 
+            $ret = false; 
+        }
+        
+        // Cnce we've checked their details, kick back into admin mode if we have it
+        if ($this->adminUsername !== NULL && !$preventRebind) {
+            $this->ldapBind = @ldap_bind($this->ldapConnection, $this->adminUsername . $this->accountSuffix , $this->adminPassword);
+            if (!$this->ldapBind){
+                // This should never happen in theory
+                throw new adLDAPException('Rebind to Active Directory failed. AD said: ' . $this->getLastError());
+            } 
+        } 
+        
+        return $ret;
+    }
+    
+    /**
+    * Find the Base DN of your domain controller
+    * 
+    * @return string
+    */
+    public function findBaseDn() 
+    {
+        $namingContext = $this->getRootDse(array('defaultnamingcontext'));   
+        return $namingContext[0]['defaultnamingcontext'][0];
+    }
+    
+    /**
+    * Get the RootDSE properties from a domain controller
+    * 
+    * @param array $attributes The attributes you wish to query e.g. defaultnamingcontext
+    * @return array
+    */
+    public function getRootDse($attributes = array("*", "+")) {
+        if (!$this->ldapBind){ return (false); }
+        
+        $sr = @ldap_read($this->ldapConnection, NULL, 'objectClass=*', $attributes);
+        $entries = @ldap_get_entries($this->ldapConnection, $sr);
+        return $entries;
+    }
+
+    /**
+    * 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 getLastError() {
+        return @ldap_error($this->ldapConnection);
+    }
+    
+    /**
+    * Detect LDAP support in php
+    * 
+    * @return bool
+    */    
+    protected function ldapSupported()
+    {
+        if (!function_exists('ldap_connect')) {
+            return false;   
+        }
+        return true;
+    }
+    
+    /**
+    * Detect ldap_sasl_bind support in PHP
+    * 
+    * @return bool
+    */
+    protected function ldapSaslSupported()
+    {
+        if (!function_exists('ldap_sasl_bind')) {
+            return false;
+        }
+        return true;
+    }
+    
+    /**
+    * Schema
+    * 
+    * @param array $attributes Attributes to be queried
+    * @return array
+    */    
+    public 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->user()->encodePassword($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"]; }
+        if ($attributes["homephone"]){ $mod["homephone"][0]=$attributes["homephone"]; }
+        
+        // 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"]; }
+        if ($attributes["exchange_policyexclude"]){ $mod["msExchPoliciesExcluded"][0]=$attributes["exchange_policyexclude"]; }
+        if ($attributes["exchange_policyinclude"]){ $mod["msExchPoliciesIncluded"][0]=$attributes["exchange_policyinclude"]; }       
+        if ($attributes["exchange_addressbook"]){ $mod["showInAddressBook"][0]=$attributes["exchange_addressbook"]; }    
+        if ($attributes["exchange_altrecipient"]){ $mod["altRecipient"][0]=$attributes["exchange_altrecipient"]; } 
+        if ($attributes["exchange_deliverandredirect"]){ $mod["deliverAndRedirect"][0]=$attributes["exchange_deliverandredirect"]; }    
+        
+        // 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);
+    }
+    
+    /**
+    * 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);   
+        }
+    }
+    
+    /**
+    * Select a random domain controller from your domain controller array
+    * 
+    * @return string
+    */
+    protected function randomController() 
+    {
+        mt_srand(doubleval(microtime()) * 100000000); // For older PHP versions
+        /*if (sizeof($this->domainControllers) > 1) {
+            $adController = $this->domainControllers[array_rand($this->domainControllers)]; 
+            // Test if the controller is responding to pings
+            $ping = $this->pingController($adController); 
+            if ($ping === false) { 
+                // Find the current key in the domain controllers array
+                $key = array_search($adController, $this->domainControllers);
+                // Remove it so that we don't end up in a recursive loop
+                unset($this->domainControllers[$key]);
+                // Select a new controller
+                return $this->randomController(); 
+            }
+            else { 
+                return ($adController); 
+            }
+        } */
+        return $this->domainControllers[array_rand($this->domainControllers)];
+    }  
+    
+    /** 
+    * Test basic connectivity to controller 
+    * 
+    * @return bool
+    */ 
+    protected function pingController($host) {
+        $port = $this->adPort; 
+        fsockopen($host, $port, $errno, $errstr, 10); 
+        if ($errno > 0) {
+            return false;
+        }
+        return true;
+    }
+
+}
+
+/**
+* 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 {}
+
+?>
\ No newline at end of file
diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPComputers.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPComputers.php
new file mode 100644
index 0000000..aabd88f
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPComputers.php
@@ -0,0 +1,153 @@
+adldap = $adldap;
+    }
+    
+    /**
+    * Get information about a specific computer. Returned in a raw array format from AD
+    * 
+    * @param string $computerName The name of the computer
+    * @param array $fields Attributes to return
+    * @return array
+    */
+    public function info($computerName, $fields = NULL)
+    {
+        if ($computerName === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+
+        $filter = "(&(objectClass=computer)(cn=" . $computerName . "))";
+        if ($fields === NULL) { 
+            $fields = array("memberof","cn","displayname","dnshostname","distinguishedname","objectcategory","operatingsystem","operatingsystemservicepack","operatingsystemversion"); 
+        }
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+        
+        return $entries;
+    }
+    
+    /**
+    * Find information about the computers. Returned in a raw array format from AD
+    * 
+    * @param string $computerName The name of the computer
+    * @param array $fields Array of parameters to query
+    * @return mixed
+    */
+    public function infoCollection($computerName, $fields = NULL)
+    {
+        if ($computerName === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        $info = $this->info($computerName, $fields);
+        
+        if ($info !== false) {
+            $collection = new adLDAPComputerCollection($info, $this->adldap);
+            return $collection;
+        }
+        return false;
+    }
+    
+    /**
+    * Check if a computer is in a group
+    * 
+    * @param string $computerName The name of the computer
+    * @param string $group The group to check
+    * @param bool $recursive Whether to check recursively
+    * @return array
+    */
+    public function inGroup($computerName, $group, $recursive = NULL)
+    {
+        if ($computerName === NULL) { return false; }
+        if ($group === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } // use the default option if they haven't set it
+
+        //get a list of the groups
+        $groups = $this->groups($computerName, array("memberof"), $recursive);
+
+        //return true if the specified group is in the group list
+        if (in_array($group, $groups)){ 
+            return true; 
+        }
+
+        return false;
+    }
+    
+    /**
+    * Get the groups a computer is in
+    * 
+    * @param string $computerName The name of the computer
+    * @param bool $recursive Whether to check recursively
+    * @return array
+    */
+    public function groups($computerName, $recursive = NULL)
+    {
+        if ($computerName === NULL) { return false; }
+        if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } //use the default option if they haven't set it
+        if (!$this->adldap->getLdapBind()){ return false; }
+
+        //search the directory for their information
+        $info = @$this->info($computerName, array("memberof", "primarygroupid"));
+        $groups = $this->adldap->utilities()->niceNames($info[0]["memberof"]); //presuming the entry returned is our guy (unique usernames)
+
+        if ($recursive === true) {
+            foreach ($groups as $id => $groupName){
+              $extraGroups = $this->adldap->group()->recursiveGroups($groupName);
+              $groups = array_merge($groups, $extraGroups);
+            }
+        }
+
+        return $groups;
+    }
+    
+}
+?>
\ No newline at end of file
diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPContacts.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPContacts.php
new file mode 100644
index 0000000..42a0d75
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPContacts.php
@@ -0,0 +1,294 @@
+adldap = $adldap;
+    }
+    
+    //*****************************************************************************************************************
+    // 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 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->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->adldap->getLdapConnection(), "CN=" . $this->adldap->utilities()->escapeCharacters($add["cn"][0]) . ", " . $container . "," . $this->adldap->getBaseDn(), $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 groups($distinguishedName, $recursive = NULL)
+    {
+        if ($distinguishedName === NULL) { return false; }
+        if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } //use the default option if they haven't set it
+        if (!$this->adldap->getLdapBind()){ return false; }
+        
+        // Search the directory for their information
+        $info = @$this->info($distinguishedName, array("memberof", "primarygroupid"));
+        $groups = $this->adldap->utilities()->niceNames($info[0]["memberof"]); //presuming the entry returned is our contact
+
+        if ($recursive === true){
+            foreach ($groups as $id => $groupName){
+                $extraGroups = $this->adldap->group()->recursiveGroups($groupName);
+                $groups = array_merge($groups, $extraGroups);
+            }
+        }
+        
+        return $groups;
+    }
+    
+    /**
+    * Get contact information. Returned in a raw array format from AD
+    * 
+    * @param string $distinguisedname The full DN of a contact
+    * @param array $fields Attributes to be returned
+    * @return array
+    */
+    public function info($distinguishedName, $fields = NULL)
+    {
+        if ($distinguishedName === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+
+        $filter = "distinguishedName=" . $distinguishedName;
+        if ($fields === NULL) { 
+            $fields = array("distinguishedname", "mail", "memberof", "department", "displayname", "telephonenumber", "primarygroupid", "objectsid"); 
+        }
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $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->adldap->getRealPrimaryGroup() && isset($entries[0]["primarygroupid"][0]) && isset($entries[0]["primarygroupid"][0])){
+                //$entries[0]["memberof"][]=$this->group_cn($entries[0]["primarygroupid"][0]);
+                $entries[0]["memberof"][] = $this->adldap->group()->getPrimaryGroup($entries[0]["primarygroupid"][0], $entries[0]["objectsid"][0]);
+            } else {
+                $entries[0]["memberof"][] = "CN=Domain Users,CN=Users," . $this->adldap->getBaseDn();
+            }
+        }
+        
+        $entries[0]["memberof"]["count"]++;
+        return $entries;
+    }
+    
+    /**
+    * Find information about the contacts. Returned in a raw array format from AD
+    * 
+    * @param string $distinguishedName The full DN of a contact 
+    * @param array $fields Array of parameters to query
+    * @return mixed
+    */
+    public function infoCollection($distinguishedName, $fields = NULL)
+    {
+        if ($distinguishedName === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        $info = $this->info($distinguishedName, $fields);
+        
+        if ($info !== false) {
+            $collection = new adLDAPContactCollection($info, $this->adldap);
+            return $collection;
+        }
+        return false;
+    }
+    
+    /**
+    * 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 inGroup($distinguisedName, $group, $recursive = NULL)
+    {
+        if ($distinguisedName === NULL) { return false; }
+        if ($group === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } //use the default option if they haven't set it
+        
+        // Get a list of the groups
+        $groups = $this->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 modify($distinguishedName, $attributes) {
+        if ($distinguishedName === NULL) { return "Missing compulsory field [distinguishedname]"; }
+        
+        // Translate the update to the LDAP schema                
+        $mod = $this->adldap->adldap_schema($attributes);
+        
+        // Check to see if this is an enabled status update
+        if (!$mod) { 
+            return false; 
+        }
+        
+        // Do the update
+        $result = ldap_modify($this->adldap->getLdapConnection(), $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 delete($distinguishedName) 
+    {
+        $result = $this->folder()->delete($distinguishedName);
+        if ($result != true) { 
+            return false; 
+        }       
+        return true;
+    }
+    
+    /**
+    * Return a list of all contacts
+    * 
+    * @param bool $includeDescription 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($includeDescription = false, $search = "*", $sorted = true) {
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        // Perform the search and grab all their details
+        $filter = "(&(objectClass=contact)(cn=" . $search . "))";
+        $fields = array("displayname","distinguishedname");           
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+        $usersArray = array();
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($includeDescription && strlen($entries[$i]["displayname"][0])>0){
+                $usersArray[$entries[$i]["distinguishedname"][0]] = $entries[$i]["displayname"][0];
+            } elseif ($includeDescription){
+                $usersArray[$entries[$i]["distinguishedname"][0]] = $entries[$i]["distinguishedname"][0];
+            } else {
+                array_push($usersArray, $entries[$i]["distinguishedname"][0]);
+            }
+        }
+        if ($sorted) { 
+            asort($usersArray); 
+        }
+        return $usersArray;
+    }
+    
+    /**
+    * 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 contactMailEnable($distinguishedName, $emailAddress, $mailNickname = NULL){
+        return $this->adldap->exchange()->contactMailEnable($distinguishedName, $emailAddress, $mailNickname);
+    }
+    
+    
+}
+?>
diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPExchange.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPExchange.php
new file mode 100644
index 0000000..d70aac7
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPExchange.php
@@ -0,0 +1,390 @@
+adldap = $adldap;
+    }
+    
+    /**
+    * 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 $mdbUseDefaults Indicates whether the store should use the default quota, rather than the per-mailbox quota.
+    * @param string $baseDn Specify an alternative base_dn for the Exchange storage group
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function createMailbox($username, $storageGroup, $emailAddress, $mailNickname=NULL, $useDefaults=TRUE, $baseDn=NULL, $isGUID=false)
+    {
+        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 ($baseDn === NULL) {
+            $baseDn = $this->adldap->getBaseDn();   
+        }
+        
+        $container = "CN=" . implode(",CN=", $storageGroup);
+        
+        if ($mailNickname === NULL) { 
+            $mailNickname = $username; 
+        }
+        $mdbUseDefaults = $this->adldap->utilities()->boolToString($useDefaults);
+        
+        $attributes = array(
+            'exchange_homemdb'=>$container.",".$baseDn,
+            'exchange_proxyaddress'=>'SMTP:' . $emailAddress,
+            'exchange_mailnickname'=>$mailNickname,
+            'exchange_usedefaults'=>$mdbUseDefaults
+        );
+        $result = $this->adldap->user()->modify($username, $attributes, $isGUID);
+        if ($result == false) { 
+            return false; 
+        }
+        return true;
+    }
+    
+    /**
+    * Add an X400 address to Exchange
+    * See http://tools.ietf.org/html/rfc1685 for more information.
+    * An X400 Address looks similar to this X400:c=US;a= ;p=Domain;o=Organization;s=Doe;g=John;
+    * 
+    * @param string $username The username of the user to add the X400 to to
+    * @param string $country Country
+    * @param string $admd Administration Management Domain
+    * @param string $pdmd Private Management Domain (often your AD domain)
+    * @param string $org Organization
+    * @param string $surname Surname
+    * @param string $givenName Given name
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function addX400($username, $country, $admd, $pdmd, $org, $surname, $givenName, $isGUID=false) 
+    {
+        if ($username === NULL){ return "Missing compulsory field [username]"; }     
+        
+        $proxyValue = 'X400:';
+            
+        // Find the dn of the user
+        $user = $this->adldap->user()->info($username, array("cn","proxyaddresses"), $isGUID);
+        if ($user[0]["dn"] === NULL) { return false; }
+        $userDn = $user[0]["dn"];
+        
+        // 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 . 'c=' . $country . ';a=' . $admd . ';p=' . $pdmd . ';o=' . $org . ';s=' . $surname . ';g=' . $givenName . ';';
+       
+        // Translate the update to the LDAP schema                
+        $add = $this->adldap->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->adldap->getLdapConnection(), $userDn, $add);
+        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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function addAddress($username, $emailAddress, $default = FALSE, $isGUID = 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->adldap->user()->info($username, array("cn","proxyaddresses"), $isGUID);
+        if ($user[0]["dn"] === NULL){ return false; }
+        $userDn = $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;$iadldap->getLdapConnection(), $userDn, $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->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->adldap->getLdapConnection(), $userDn,$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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function deleteAddress($username, $emailAddress, $isGUID=false) 
+    {
+        if ($username === NULL) { return "Missing compulsory field [username]"; }     
+        if ($emailAddress === NULL) { return "Missing compulsory fields [emailAddress]"; }
+        
+        // Find the dn of the user
+        $user = $this->adldap->user()->info($username, array("cn","proxyaddresses"), $isGUID);
+        if ($user[0]["dn"] === NULL) { return false; }
+        $userDn = $user[0]["dn"];
+        
+        if (is_array($user[0]["proxyaddresses"])) {
+            $mod = array();
+            for ($i=0;$iadldap->getLdapConnection(), $userDn,$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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function primaryAddress($username, $emailAddress, $isGUID = false) 
+    {
+        if ($username === NULL) { return "Missing compulsory field [username]"; }     
+        if ($emailAddress === NULL) { return "Missing compulsory fields [emailAddress]"; }
+        
+        // Find the dn of the user
+        $user = $this->adldap->user()->info($username, array("cn","proxyaddresses"), $isGUID);
+        if ($user[0]["dn"] === NULL){ return false; }
+        $userDn = $user[0]["dn"];
+        
+        if (is_array($user[0]["proxyaddresses"])) {
+            $modAddresses = array();
+            for ($i=0;$iadldap->getLdapConnection(), $userDn, $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 contactMailEnable($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->adldap->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->adldap_schema($attributes);
+        
+        // Check to see if this is an enabled status update
+        if (!$mod) { return false; }
+        
+        // Do the update
+        $result = ldap_modify($this->adldap->getLdapConnection(), $distinguishedName, $mod);
+        if ($result == false) { return false; }
+        
+        return true;
+    }
+    
+    /**
+    * Returns a list of Exchange Servers in the ConfigurationNamingContext of the domain
+    * 
+    * @param array $attributes An array of the AD attributes you wish to return
+    * @return array
+    */
+    public function servers($attributes = array('cn','distinguishedname','serialnumber')) 
+    {
+        if (!$this->adldap->getLdapBind()){ return false; }
+        
+        $configurationNamingContext = $this->adldap->getRootDse(array('configurationnamingcontext'));
+        $sr = @ldap_search($this->adldap->getLdapConnection(), $configurationNamingContext[0]['configurationnamingcontext'][0],'(&(objectCategory=msExchExchangeServer))', $attributes);
+        $entries = @ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+        return $entries;
+    }
+    
+    /**
+    * Returns a list of Storage Groups in Exchange for a given mail server
+    * 
+    * @param string $exchangeServer The full DN of an Exchange server.  You can use exchange_servers() to find the DN for your server
+    * @param array $attributes An array of the AD attributes you wish to return
+    * @param bool $recursive If enabled this will automatically query the databases within a storage group
+    * @return array
+    */
+    public function storageGroups($exchangeServer, $attributes = array('cn','distinguishedname'), $recursive = NULL) 
+    {
+        if (!$this->adldap->getLdapBind()){ return false; }
+        if ($exchangeServer === NULL) { return "Missing compulsory field [exchangeServer]"; }
+        if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); }
+
+        $filter = '(&(objectCategory=msExchStorageGroup))';
+        $sr = @ldap_search($this->adldap->getLdapConnection(), $exchangeServer, $filter, $attributes);
+        $entries = @ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+        if ($recursive === true) {
+            for ($i=0; $i<$entries['count']; $i++) {
+                $entries[$i]['msexchprivatemdb'] = $this->storageDatabases($entries[$i]['distinguishedname'][0]);       
+            }
+        }
+        
+        return $entries;
+    }
+    
+    /**
+    * Returns a list of Databases within any given storage group in Exchange for a given mail server
+    * 
+    * @param string $storageGroup The full DN of an Storage Group.  You can use exchange_storage_groups() to find the DN 
+    * @param array $attributes An array of the AD attributes you wish to return
+    * @return array
+    */
+    public function storageDatabases($storageGroup, $attributes = array('cn','distinguishedname','displayname')) {
+        if (!$this->adldap->getLdapBind()){ return false; }
+        if ($storageGroup === NULL) { return "Missing compulsory field [storageGroup]"; }
+        
+        $filter = '(&(objectCategory=msExchPrivateMDB))';
+        $sr = @ldap_search($this->adldap->getLdapConnection(), $storageGroup, $filter, $attributes);
+        $entries = @ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+        return $entries;
+    }
+}
+?>
\ No newline at end of file
diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPFolders.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPFolders.php
new file mode 100644
index 0000000..67b1474
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPFolders.php
@@ -0,0 +1,179 @@
+adldap = $adldap;
+    }
+    
+    /**
+    * 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
+    */
+    public function delete($dn){ 
+        $result = ldap_delete($this->adldap->getLdapConnection(), $dn);
+        if ($result != true) { 
+            return false; 
+        }
+        return true;
+    }
+    
+    /**
+    * Returns a folder listing for a specific OU
+    * See http://adldap.sourceforge.net/wiki/doku.php?id=api_folder_functions
+    * 
+    * @param array $folderName An array to the OU you wish to list. 
+    *                           If set to NULL will list the root, strongly recommended to set 
+    *                           $recursive to false in that instance!
+    * @param string $dnType The type of record to list.  This can be ADLDAP_FOLDER or ADLDAP_CONTAINER.
+    * @param bool $recursive Recursively search sub folders
+    * @param bool $type Specify a type of object to search for
+    * @return array
+    */
+    public function listing($folderName = NULL, $dnType = adLDAP::ADLDAP_FOLDER, $recursive = NULL, $type = NULL) 
+    {
+        if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } //use the default option if they haven't set it
+        if (!$this->adldap->getLdapBind()) { return false; }
+
+        $filter = '(&';
+        if ($type !== NULL) {
+            switch ($type) {
+                case 'contact':
+                    $filter .= '(objectClass=contact)';
+                    break;
+                case 'computer':
+                    $filter .= '(objectClass=computer)';
+                    break;
+                case 'group':
+                    $filter .= '(objectClass=group)';
+                    break;
+                case 'folder':
+                    $filter .= '(objectClass=organizationalUnit)';
+                    break;
+                case 'container':
+                    $filter .= '(objectClass=container)';
+                    break;
+                case 'domain':
+                    $filter .= '(objectClass=builtinDomain)';
+                    break;
+                default:
+                    $filter .= '(objectClass=user)';
+                    break;   
+            }
+        }
+        else {
+            $filter .= '(objectClass=*)';   
+        }
+        // If the folder name is null then we will search the root level of AD
+        // This requires us to not have an OU= part, just the base_dn
+        $searchOu = $this->adldap->getBaseDn();
+        if (is_array($folderName)) {
+            $ou = $dnType . "=" . implode("," . $dnType . "=", $folderName);
+            $filter .= '(!(distinguishedname=' . $ou . ',' . $this->adldap->getBaseDn() . ')))';
+            $searchOu = $ou . ',' . $this->adldap->getBaseDn();
+        }
+        else {
+            $filter .= '(!(distinguishedname=' . $this->adldap->getBaseDn() . ')))';
+        }
+
+        if ($recursive === true) {
+            $sr = ldap_search($this->adldap->getLdapConnection(), $searchOu, $filter, array('objectclass', 'distinguishedname', 'samaccountname'));
+            $entries = @ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+            if (is_array($entries)) {
+                return $entries;
+            }
+        }
+        else {
+            $sr = ldap_list($this->adldap->getLdapConnection(), $searchOu, $filter, array('objectclass', 'distinguishedname', 'samaccountname'));
+            $entries = @ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+            if (is_array($entries)) {
+                return $entries;
+            }
+        }
+        
+        return false;
+    }
+
+    /**
+    * Create an organizational unit
+    * 
+    * @param array $attributes Default attributes of the ou
+    * @return bool
+    */
+    public function create($attributes)
+    {
+        if (!is_array($attributes)){ return "Attributes must be an array"; }
+        if (!is_array($attributes["container"])) { return "Container attribute must be an array."; }
+        if (!array_key_exists("ou_name",$attributes)) { return "Missing compulsory field [ou_name]"; }
+        if (!array_key_exists("container",$attributes)) { return "Missing compulsory field [container]"; }
+        
+        $attributes["container"] = array_reverse($attributes["container"]);
+
+        $add=array();
+        $add["objectClass"] = "organizationalUnit";
+        $add["OU"] = $attributes['ou_name'];
+        $containers = "";
+        if (count($attributes['container']) > 0) {
+            $containers = "OU=" . implode(",OU=", $attributes["container"]) . ",";
+        }
+
+        $containers = "OU=" . implode(",OU=", $attributes["container"]);
+        $result = ldap_add($this->adldap->getLdapConnection(), "OU=" . $add["OU"] . ", " . $containers . $this->adldap->getBaseDn(), $add);
+        if ($result != true) { 
+            return false; 
+        }
+        
+        return true;
+    }
+    
+}
+
+?>
\ No newline at end of file
diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPGroups.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPGroups.php
new file mode 100644
index 0000000..94bc048
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPGroups.php
@@ -0,0 +1,631 @@
+adldap = $adldap;
+    }
+    
+    /**
+    * Add a group to a group
+    * 
+    * @param string $parent The parent group name
+    * @param string $child The child group name
+    * @return bool
+    */
+    public function addGroup($parent,$child){
+
+        // Find the parent group's dn
+        $parentGroup = $this->ginfo($parent, array("cn"));
+        if ($parentGroup[0]["dn"] === NULL){
+            return false; 
+        }
+        $parentDn = $parentGroup[0]["dn"];
+        
+        // Find the child group's dn
+        $childGroup = $this->info($child, array("cn"));
+        if ($childGroup[0]["dn"] === NULL){ 
+            return false; 
+        }
+        $childDn = $childGroup[0]["dn"];
+                
+        $add = array();
+        $add["member"] = $childDn;
+        
+        $result = @ldap_mod_add($this->adldap->getLdapConnection(), $parentDn, $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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function addUser($group, $user, $isGUID = false)
+    {
+        // 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
+        $userDn = $this->adldap->user()->dn($user, $isGUID);
+        if ($userDn === false) { 
+            return false; 
+        }
+        
+        // Find the group's dn
+        $groupInfo = $this->info($group, array("cn"));
+        if ($groupInfo[0]["dn"] === NULL) { 
+            return false; 
+        }
+        $groupDn = $groupInfo[0]["dn"];
+        
+        $add = array();
+        $add["member"] = $userDn;
+        
+        $result = @ldap_mod_add($this->adldap->getLdapConnection(), $groupDn, $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 $contactDn The DN of the contact to add
+    * @return bool
+    */
+    public function addContact($group, $contactDn)
+    {
+        // 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
+        $groupInfo = $this->info($group, array("cn"));
+        if ($groupInfo[0]["dn"] === NULL) { 
+            return false; 
+        }
+        $groupDn = $groupInfo[0]["dn"];
+        
+        $add = array();
+        $add["member"] = $contactDn;
+        
+        $result = @ldap_mod_add($this->adldap->getLdapConnection(), $groupDn, $add);
+        if ($result == false) { 
+            return false; 
+        }
+        return true;
+    }
+
+    /**
+    * Create a group
+    * 
+    * @param array $attributes Default attributes of the group
+    * @return bool
+    */
+    public function 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->adldap->getLdapConnection(), "CN=" . $add["cn"] . ", " . $container . "," . $this->adldap->getBaseDn(), $add);
+        if ($result != true) { 
+            return false; 
+        }
+        return true;
+    }
+    
+    /**
+    * Delete a group account 
+    * 
+    * @param string $group The group to delete (please be careful here!) 
+    * 
+    * @return array 
+    */
+    public function delete($group) {
+        if (!$this->adldap->getLdapBind()){ return false; }
+        if ($group === null){ return "Missing compulsory field [group]"; }
+        
+        $groupInfo = $this->info($group, array("*"));
+        $dn = $groupInfo[0]['distinguishedname'][0]; 
+        $result = $this->adldap->folder()->delete($dn); 
+        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 removeGroup($parent , $child)
+    {
+    
+        // Find the parent dn
+        $parentGroup = $this->info($parent, array("cn"));
+        if ($parentGroup[0]["dn"] === NULL) { 
+            return false; 
+        }
+        $parentDn = $parentGroup[0]["dn"];
+        
+        // Find the child dn
+        $childGroup = $this->info($child, array("cn"));
+        if ($childGroup[0]["dn"] === NULL) { 
+            return false; 
+        }
+        $childDn = $childGroup[0]["dn"];
+        
+        $del = array();
+        $del["member"] = $childDn;
+        
+        $result = @ldap_mod_del($this->adldap->getLdapConnection(), $parentDn, $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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function removeUser($group, $user, $isGUID = false)
+    {
+    
+        // Find the parent dn
+        $groupInfo = $this->info($group, array("cn"));
+        if ($groupInfo[0]["dn"] === NULL){ 
+            return false; 
+        }
+        $groupDn = $groupInfo[0]["dn"];
+        
+        // Find the users dn
+        $userDn = $this->adldap->user()->dn($user, $isGUID);
+        if ($userDn === false) {
+            return false; 
+        }
+
+        $del = array();
+        $del["member"] = $userDn;
+        
+        $result = @ldap_mod_del($this->adldap->getLdapConnection(), $groupDn, $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 $contactDn The DN of a contact to remove from the group
+    * @return bool
+    */
+    public function removeContact($group, $contactDn)
+    {
+    
+        // Find the parent dn
+        $groupInfo = $this->info($group, array("cn"));
+        if ($groupInfo[0]["dn"] === NULL) { 
+            return false; 
+        }
+        $groupDn = $groupInfo[0]["dn"];
+    
+        $del = array();
+        $del["member"] = $contactDn;
+        
+        $result = @ldap_mod_del($this->adldap->getLdapConnection(), $groupDn, $del);
+        if ($result == false) { 
+            return false; 
+        }
+        return true;
+    }
+    
+    /**
+    * Return a list of groups in a group
+    * 
+    * @param string $group The group to query
+    * @param bool $recursive Recursively get groups
+    * @return array
+    */
+    public function inGroup($group, $recursive = NULL)
+    {
+        if (!$this->adldap->getLdapBind()){ return false; }
+        if ($recursive === NULL){ $recursive = $this->adldap->getRecursiveGroups(); } // Use the default option if they haven't set it 
+        
+        // Search the directory for the members of a group
+        $info = $this->info($group, array("member","cn"));
+        $groups = $info[0]["member"];
+        if (!is_array($groups)) {
+            return false;   
+        }
+ 
+        $groupArray = array();
+
+        for ($i=0; $i<$groups["count"]; $i++){ 
+             $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($groups[$i]) . "))";
+             $fields = array("samaccountname", "distinguishedname", "objectClass");
+             $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+             $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+             // not a person, look for a group  
+             if ($entries['count'] == 0 && $recursive == true) {  
+                $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($groups[$i]) . "))";  
+                $fields = array("distinguishedname");  
+                $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);  
+                $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);  
+                if (!isset($entries[0]['distinguishedname'][0])) {
+                    continue;  
+                }
+                $subGroups = $this->inGroup($entries[0]['distinguishedname'][0], $recursive);  
+                if (is_array($subGroups)) {
+                    $groupArray = array_merge($groupArray, $subGroups); 
+                    $groupArray = array_unique($groupArray);  
+                }
+                continue;  
+             } 
+
+             $groupArray[] = $entries[0]['distinguishedname'][0];
+        }
+        return $groupArray;
+    }
+    
+    /**
+    * Return a list of members in a group
+    * 
+    * @param string $group The group to query
+    * @param bool $recursive Recursively get group members
+    * @return array
+    */
+    public function members($group, $recursive = NULL)
+    {
+        if (!$this->adldap->getLdapBind()){ return false; }
+        if ($recursive === NULL){ $recursive = $this->adldap->getRecursiveGroups(); } // Use the default option if they haven't set it 
+        // Search the directory for the members of a group
+        $info = $this->info($group, array("member","cn"));
+        $users = $info[0]["member"];
+        if (!is_array($users)) {
+            return false;   
+        }
+ 
+        $userArray = array();
+
+        for ($i=0; $i<$users["count"]; $i++){ 
+             $filter = "(&(objectCategory=person)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($users[$i]) . "))";
+             $fields = array("samaccountname", "distinguishedname", "objectClass");
+             $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+             $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+             // not a person, look for a group  
+             if ($entries['count'] == 0 && $recursive == true) {  
+                $filter = "(&(objectCategory=group)(distinguishedName=" . $this->adldap->utilities()->ldapSlashes($users[$i]) . "))";  
+                $fields = array("samaccountname");  
+                $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);  
+                $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);  
+                if (!isset($entries[0]['samaccountname'][0])) {
+                    continue;  
+                }
+                $subUsers = $this->members($entries[0]['samaccountname'][0], $recursive);  
+                if (is_array($subUsers)) {
+                    $userArray = array_merge($userArray, $subUsers); 
+                    $userArray = array_unique($userArray);  
+                }
+                continue;  
+             } 
+             else if ($entries['count'] == 0) {   
+                continue; 
+             } 
+
+             if ((!isset($entries[0]['samaccountname'][0]) || $entries[0]['samaccountname'][0] === NULL) && $entries[0]['distinguishedname'][0] !== NULL) {
+                 $userArray[] = $entries[0]['distinguishedname'][0];
+             }
+             else if ($entries[0]['samaccountname'][0] !== NULL) {
+                $userArray[] = $entries[0]['samaccountname'][0];
+             }
+        }
+        return $userArray;
+    }
+    
+    /**
+    * Group Information.  Returns an array of raw information about a group.
+    * The group name is case sensitive
+    * 
+    * @param string $groupName The group name to retrieve info about
+    * @param array $fields Fields to retrieve
+    * @return array
+    */
+    public function info($groupName, $fields = NULL)
+    {
+        if ($groupName === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        if (stristr($groupName, '+')) {
+            $groupName = stripslashes($groupName);   
+        }
+        
+        $filter = "(&(objectCategory=group)(name=" . $this->adldap->utilities()->ldapSlashes($groupName) . "))";
+        if ($fields === NULL) { 
+            $fields = array("member","memberof","cn","description","distinguishedname","objectcategory","samaccountname"); 
+        }
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+        return $entries;
+    }
+    
+    /**
+    * Group Information.  Returns an collection
+    * The group name is case sensitive
+    * 
+    * @param string $groupName The group name to retrieve info about
+    * @param array $fields Fields to retrieve
+    * @return adLDAPGroupCollection
+    */
+    public function infoCollection($groupName, $fields = NULL)
+    {
+        if ($groupName === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        $info = $this->info($groupName, $fields);
+        if ($info !== false) {
+            $collection = new adLDAPGroupCollection($info, $this->adldap);
+            return $collection;
+        }
+        return false;
+    }
+    
+    /**
+    * Return a complete list of "groups in groups"
+    * 
+    * @param string $group The group to get the list from
+    * @return array
+    */
+    public function recursiveGroups($group)
+    {
+        if ($group === NULL) { return false; }
+
+        $stack = array(); 
+        $processed = array(); 
+        $retGroups = array(); 
+     
+        array_push($stack, $group); // Initial Group to Start with 
+        while (count($stack) > 0) {
+            $parent = array_pop($stack);
+            array_push($processed, $parent);
+            
+            $info = $this->info($parent, array("memberof"));
+            
+            if (isset($info[0]["memberof"]) && is_array($info[0]["memberof"])) {
+                $groups = $info[0]["memberof"]; 
+                if ($groups) {
+                    $groupNames = $this->adldap->utilities()->niceNames($groups);  
+                    $retGroups = array_merge($retGroups, $groupNames); //final groups to return
+                    foreach ($groupNames as $id => $groupName) { 
+                        if (!in_array($groupName, $processed)) {
+                            array_push($stack, $groupName);
+                        }
+                    }
+                }
+            }
+        }
+        
+        return $retGroups;
+    }
+    
+    /**
+    * Returns a complete list of the groups in AD based on a SAM Account Type  
+    * 
+    * @param string $sAMAaccountType The account type to return
+    * @param bool $includeDescription Whether to return a description
+    * @param string $search Search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function search($sAMAaccountType = adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP, $includeDescription = false, $search = "*", $sorted = true) {
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        $filter = '(&(objectCategory=group)';
+        if ($sAMAaccountType !== null) {
+            $filter .= '(samaccounttype='. $sAMAaccountType .')';
+        }
+        $filter .= '(cn=' . $search . '))';
+        // Perform the search and grab all their details
+        $fields = array("samaccountname", "description");
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+        $groupsArray = array();        
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($includeDescription && strlen($entries[$i]["description"][0]) > 0 ) {
+                $groupsArray[$entries[$i]["samaccountname"][0]] = $entries[$i]["description"][0];
+            }
+            else if ($includeDescription){
+                $groupsArray[$entries[$i]["samaccountname"][0]] = $entries[$i]["samaccountname"][0];
+            }
+            else {
+                array_push($groupsArray, $entries[$i]["samaccountname"][0]);
+            }
+        }
+        if ($sorted) { 
+            asort($groupsArray); 
+        }
+        return $groupsArray;
+    }
+    
+    /**
+    * Returns a complete list of all groups in AD
+    * 
+    * @param bool $includeDescription Whether to return a description
+    * @param string $search Search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function all($includeDescription = false, $search = "*", $sorted = true){
+        $groupsArray = $this->search(null, $includeDescription, $search, $sorted);
+        return $groupsArray;
+    }
+    
+    /**
+    * Returns a complete list of security groups in AD
+    * 
+    * @param bool $includeDescription Whether to return a description
+    * @param string $search Search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function allSecurity($includeDescription = false, $search = "*", $sorted = true){
+        $groupsArray = $this->search(adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP, $includeDescription, $search, $sorted);
+        return $groupsArray;
+    }
+    
+    /**
+    * Returns a complete list of distribution lists in AD
+    * 
+    * @param bool $includeDescription Whether to return a description
+    * @param string $search Search parameters
+    * @param bool $sorted Whether to sort the results
+    * @return array
+    */
+    public function allDistribution($includeDescription = false, $search = "*", $sorted = true){
+        $groupsArray = $this->search(adLDAP::ADLDAP_DISTRIBUTION_GROUP, $includeDescription, $search, $sorted);
+        return $groupsArray;
+    }
+    
+    /**
+    * 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 mixed
+    */
+    public function getPrimaryGroup($gid, $usersid)
+    {
+        if ($gid === NULL || $usersid === NULL) { return false; }
+        $sr = false;
+
+        $gsid = substr_replace($usersid, pack('V',$gid), strlen($usersid)-4,4);
+        $filter = '(objectsid=' . $this->adldap->utilities()->getTextSID($gsid).')';
+        $fields = array("samaccountname","distinguishedname");
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+        if (isset($entries[0]['distinguishedname'][0])) {
+            return $entries[0]['distinguishedname'][0];
+        }
+        return false;
+     }
+     
+     /**
+    * 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
+    */
+    public function cn($gid){    
+        if ($gid === NULL) { return false; }
+        $sr = false;
+        $r = '';
+        
+        $filter = "(&(objectCategory=group)(samaccounttype=" . adLDAP::ADLDAP_SECURITY_GLOBAL_GROUP . "))";
+        $fields = array("primarygrouptoken", "samaccountname", "distinguishedname");
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+        
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($entries[$i]["primarygrouptoken"][0] == $gid) {
+                $r = $entries[$i]["distinguishedname"][0];
+                $i = $entries["count"];
+            }
+        }
+
+        return $r;
+    }
+}
+?>
diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php
new file mode 100644
index 0000000..839fd59
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPUsers.php
@@ -0,0 +1,682 @@
+adldap = $adldap;
+    }
+    
+    /**
+    * 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, $preventRebind = false) {
+        return $this->adldap->authenticate($username, $password, $preventRebind);
+    }
+    
+    /**
+    * 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 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->adldap->getUseSSL() && !$this->adldap->getUseTLS())){ 
+            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->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->accountControl($control_options);
+        
+        // Determine the container
+        $attributes["container"] = array_reverse($attributes["container"]);
+        $container = "OU=" . implode(", OU=",$attributes["container"]);
+
+        // Add the entry
+        $result = @ldap_add($this->adldap->getLdapConnection(), "CN=" . $add["cn"][0] . ", " . $container . "," . $this->adldap->getBaseDn(), $add);
+        if ($result != true) { 
+            return false; 
+        }
+        
+        return true;
+    }
+    
+    /**
+    * Account control options
+    *
+    * @param array $options The options to convert to int 
+    * @return int
+    */
+    protected function accountControl($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;
+    }
+    
+    /**
+    * Delete a user account
+    * 
+    * @param string $username The username to delete (please be careful here!)
+    * @param bool $isGUID Is the username a GUID or a samAccountName
+    * @return array
+    */
+    public function delete($username, $isGUID = false) 
+    {      
+        $userinfo = $this->info($username, array("*"), $isGUID);
+        $dn = $userinfo[0]['distinguishedname'][0];
+        $result = $this->adldap->folder()->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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return array
+    */
+    public function groups($username, $recursive = NULL, $isGUID = false)
+    {
+        if ($username === NULL) { return false; }
+        if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } // Use the default option if they haven't set it
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        // Search the directory for their information
+        $info = @$this->info($username, array("memberof", "primarygroupid"), $isGUID);
+        $groups = $this->adldap->utilities()->niceNames($info[0]["memberof"]); // Presuming the entry returned is our guy (unique usernames)
+
+        if ($recursive === true){
+            foreach ($groups as $id => $groupName){
+                $extraGroups = $this->adldap->group()->recursiveGroups($groupName);
+                $groups = array_merge($groups, $extraGroups);
+            }
+        }
+        
+        return $groups;
+    }
+    
+    /**
+    * Find information about the users. Returned in a raw array format from AD
+    * 
+    * @param string $username The username to query
+    * @param array $fields Array of parameters to query
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return array
+    */
+    public function info($username, $fields = NULL, $isGUID = false)
+    {
+        if ($username === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+
+        if ($isGUID === true) {
+            $username = $this->adldap->utilities()->strGuidToHex($username);
+            $filter = "objectguid=" . $username;
+        }
+        else if (strstr($username, "@")) {
+             $filter = "userPrincipalName=" . $username;
+        }
+        else {
+             $filter = "samaccountname=" . $username;
+        }
+        $filter = "(&(objectCategory=person)({$filter}))";
+        if ($fields === NULL) { 
+            $fields = array("samaccountname","mail","memberof","department","displayname","telephonenumber","primarygroupid","objectsid"); 
+        }
+        if (!in_array("objectsid", $fields)) {
+            $fields[] = "objectsid";
+        }
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+        
+        if (isset($entries[0])) {
+            if ($entries[0]['count'] >= 1) {
+                if (in_array("memberof", $fields)) {
+                    // AD does not return the primary group in the ldap query, we may need to fudge it
+                    if ($this->adldap->getRealPrimaryGroup() && isset($entries[0]["primarygroupid"][0]) && isset($entries[0]["objectsid"][0])){
+                        //$entries[0]["memberof"][]=$this->group_cn($entries[0]["primarygroupid"][0]);
+                        $entries[0]["memberof"][] = $this->adldap->group()->getPrimaryGroup($entries[0]["primarygroupid"][0], $entries[0]["objectsid"][0]);
+                    } else {
+                        $entries[0]["memberof"][] = "CN=Domain Users,CN=Users," . $this->adldap->getBaseDn();
+                    }
+                    if (!isset($entries[0]["memberof"]["count"])) {
+                        $entries[0]["memberof"]["count"] = 0;
+                    }
+                    $entries[0]["memberof"]["count"]++;
+                }
+            }
+            
+            return $entries;
+        }
+        return false;
+    }
+    
+    /**
+    * Find information about the users. Returned in a raw array format from AD
+    * 
+    * @param string $username The username to query
+    * @param array $fields Array of parameters to query
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return mixed
+    */
+    public function infoCollection($username, $fields = NULL, $isGUID = false)
+    {
+        if ($username === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        $info = $this->info($username, $fields, $isGUID);
+        
+        if ($info !== false) {
+            $collection = new adLDAPUserCollection($info, $this->adldap);
+            return $collection;
+        }
+        return false;
+    }
+    
+    /**
+    * 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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function inGroup($username, $group, $recursive = NULL, $isGUID = false)
+    {
+        if ($username === NULL) { return false; }
+        if ($group === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        if ($recursive === NULL) { $recursive = $this->adldap->getRecursiveGroups(); } // Use the default option if they haven't set it
+        
+        // Get a list of the groups
+        $groups = $this->groups($username, $recursive, $isGUID);
+        
+        // Return true if the specified group is in the group list
+        if (in_array($group, $groups)) { 
+            return true; 
+        }
+
+        return false;
+    }
+    
+    /**
+    * Determine a user's password expiry date
+    * 
+    * @param string $username The username to query
+    * @param book $isGUID Is the username passed a GUID or a samAccountName
+    * @requires bcmath http://www.php.net/manual/en/book.bc.php
+    * @return array
+    */
+    public function passwordExpiry($username, $isGUID = false) 
+    {
+        if ($username === NULL) { return "Missing compulsory field [username]"; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        if (!function_exists('bcmod')) { throw new adLDAPException("Missing function support [bcmod] http://www.php.net/manual/en/book.bc.php"); };
+        
+        $userInfo = $this->info($username, array("pwdlastset", "useraccountcontrol"), $isGUID);
+        $pwdLastSet = $userInfo[0]['pwdlastset'][0];
+        $status = array();
+        
+        if ($userInfo[0]['useraccountcontrol'][0] == '66048') {
+            // Password does not expire
+            return "Does not expire";
+        }
+        if ($pwdLastSet === '0') {
+            // Password has already expired
+            return "Password has expired";
+        }
+        
+         // Password expiry in AD can be calculated from TWO values:
+         //   - User's own pwdLastSet attribute: stores the last time the password was changed
+         //   - Domain's maxPwdAge attribute: how long passwords last in the domain
+         //
+         // Although Microsoft chose to use a different base and unit for time measurements.
+         // This function will convert them to Unix timestamps
+         $sr = ldap_read($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), 'objectclass=*', array('maxPwdAge'));
+         if (!$sr) {
+             return false;
+         }
+         $info = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+         $maxPwdAge = $info[0]['maxpwdage'][0];
+         
+
+         // See MSDN: http://msdn.microsoft.com/en-us/library/ms974598.aspx
+         //
+         // pwdLastSet contains the number of 100 nanosecond intervals since January 1, 1601 (UTC), 
+         // stored in a 64 bit integer. 
+         //
+         // The number of seconds between this date and Unix epoch is 11644473600.
+         //
+         // maxPwdAge is stored as a large integer that represents the number of 100 nanosecond
+         // intervals from the time the password was set before the password expires.
+         //
+         // We also need to scale this to seconds but also this value is a _negative_ quantity!
+         //
+         // If the low 32 bits of maxPwdAge are equal to 0 passwords do not expire
+         //
+         // Unfortunately the maths involved are too big for PHP integers, so I've had to require
+         // BCMath functions to work with arbitrary precision numbers.
+         if (bcmod($maxPwdAge, 4294967296) === '0') {
+            return "Domain does not expire passwords";
+        }
+        
+        // Add maxpwdage and pwdlastset and we get password expiration time in Microsoft's
+        // time units.  Because maxpwd age is negative we need to subtract it.
+        $pwdExpire = bcsub($pwdLastSet, $maxPwdAge);
+    
+        // Convert MS's time to Unix time
+        $status['expiryts'] = bcsub(bcdiv($pwdExpire, '10000000'), '11644473600');
+        $status['expiryformat'] = date('Y-m-d H:i:s', bcsub(bcdiv($pwdExpire, '10000000'), '11644473600'));
+        
+        return $status;
+    }
+    
+    /**
+    * 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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function modify($username, $attributes, $isGUID = false)
+    {
+        if ($username === NULL) { return "Missing compulsory field [username]"; }
+        if (array_key_exists("password", $attributes) && !$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) { 
+            throw new adLDAPException('SSL/TLS must be configured on your webserver and enabled in the class to set passwords.');
+        }
+
+        // Find the dn of the user
+        $userDn = $this->dn($username, $isGUID);
+        if ($userDn === false) { 
+            return false; 
+        }
+        
+        // Translate the update to the LDAP schema                
+        $mod = $this->adldap->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"]){ 
+                $controlOptions = array("NORMAL_ACCOUNT"); 
+            }
+            else { 
+                $controlOptions = array("NORMAL_ACCOUNT", "ACCOUNTDISABLE"); 
+            }
+            $mod["userAccountControl"][0] = $this->accountControl($controlOptions);
+        }
+
+        // Do the update
+        $result = @ldap_modify($this->adldap->getLdapConnection(), $userDn, $mod);
+        if ($result == false) { 
+            return false; 
+        }
+        
+        return true;
+    }
+    
+    /**
+    * Disable a user account
+    * 
+    * @param string $username The username to disable
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function disable($username, $isGUID = false)
+    {
+        if ($username === NULL) { return "Missing compulsory field [username]"; }
+        $attributes = array("enabled" => 0);
+        $result = $this->modify($username, $attributes, $isGUID);
+        if ($result == false) { return false; }
+        
+        return true;
+    }
+    
+    /**
+    * Enable a user account
+    * 
+    * @param string $username The username to enable
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function enable($username, $isGUID = false)
+    {
+        if ($username === NULL) { return "Missing compulsory field [username]"; }
+        $attributes = array("enabled" => 1);
+        $result = $this->modify($username, $attributes, $isGUID);
+        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
+    * @param bool $isGUID Is the username passed a GUID or a samAccountName
+    * @return bool
+    */
+    public function password($username, $password, $isGUID = false)
+    {
+        if ($username === NULL) { return false; }
+        if ($password === NULL) { return false; }
+        if (!$this->adldap->getLdapBind()) { return false; }
+        if (!$this->adldap->getUseSSL() && !$this->adldap->getUseTLS()) { 
+            throw new adLDAPException('SSL must be configured on your webserver and enabled in the class to set passwords.');
+        }
+        
+        $userDn = $this->dn($username, $isGUID);
+        if ($userDn === false) { 
+            return false; 
+        }
+                
+        $add=array();
+        $add["unicodePwd"][0] = $this->encodePassword($password);
+        
+        $result = @ldap_mod_replace($this->adldap->getLdapConnection(), $userDn, $add);
+        if ($result === false){
+            $err = ldap_errno($this->adldap->getLdapConnection());
+            if ($err) {
+                $msg = 'Error ' . $err . ': ' . ldap_err2str($err) . '.';
+                if($err == 53) {
+                    $msg .= ' Your password might not match the password policy.';
+                }
+                throw new adLDAPException($msg);
+            }
+            else {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    /**
+    * Encode a password for transmission over LDAP
+    *
+    * @param string $password The password to encode
+    * @return string
+    */
+    public function encodePassword($password)
+    {
+        $password="\"".$password."\"";
+        $encoded="";
+        for ($i=0; $i info($username, array("cn"), $isGUID);
+        if ($user[0]["dn"] === NULL) { 
+            return false; 
+        }
+        $userDn = $user[0]["dn"];
+        return $userDn;
+    }
+    
+    /**
+    * Return a list of all users in AD
+    * 
+    * @param bool $includeDescription Return a description of the user
+    * @param string $search Search parameter
+    * @param bool $sorted Sort the user accounts
+    * @return array
+    */
+    public function all($includeDescription = false, $search = "*", $sorted = true)
+    {
+        if (!$this->adldap->getLdapBind()) { return false; }
+        
+        // Perform the search and grab all their details
+        $filter = "(&(objectClass=user)(samaccounttype=" . adLDAP::ADLDAP_NORMAL_ACCOUNT .")(objectCategory=person)(cn=" . $search . "))";
+        $fields = array("samaccountname","displayname");
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+        $usersArray = array();
+        for ($i=0; $i<$entries["count"]; $i++){
+            if ($includeDescription && strlen($entries[$i]["displayname"][0])>0){
+                $usersArray[$entries[$i]["samaccountname"][0]] = $entries[$i]["displayname"][0];
+            } elseif ($includeDescription){
+                $usersArray[$entries[$i]["samaccountname"][0]] = $entries[$i]["samaccountname"][0];
+            } else {
+                array_push($usersArray, $entries[$i]["samaccountname"][0]);
+            }
+        }
+        if ($sorted) { 
+            asort($usersArray); 
+        }
+        return $usersArray;
+    }
+    
+    /**
+    * Converts a username (samAccountName) to a GUID
+    * 
+    * @param string $username The username to query
+    * @return string
+    */
+    public function usernameToGuid($username) 
+    {
+        if (!$this->adldap->getLdapBind()){ return false; }
+        if ($username === null){ return "Missing compulsory field [username]"; }
+        
+        $filter = "samaccountname=" . $username; 
+        $fields = array("objectGUID"); 
+        $sr = @ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields); 
+        if (ldap_count_entries($this->adldap->getLdapConnection(), $sr) > 0) { 
+            $entry = @ldap_first_entry($this->adldap->getLdapConnection(), $sr); 
+            $guid = @ldap_get_values_len($this->adldap->getLdapConnection(), $entry, 'objectGUID'); 
+            $strGUID = $this->adldap->utilities()->binaryToText($guid[0]);          
+            return $strGUID; 
+        }
+        return false; 
+    }
+    
+    /**
+    * Return a list of all users in AD that have a specific value in a field
+    *
+    * @param bool $includeDescription Return a description of the user
+    * @param string $searchField Field to search search for
+    * @param string $searchFilter Value to search for in the specified field
+    * @param bool $sorted Sort the user accounts
+    * @return array
+    */
+    public function find($includeDescription = false, $searchField = false, $searchFilter = false, $sorted = true){
+        if (!$this->adldap->getLdapBind()){ return false; }
+          
+        // Perform the search and grab all their details
+        $searchParams = "";
+        if ($searchField) {
+            $searchParams = "(" . $searchField . "=" . $searchFilter . ")";
+        }                           
+        $filter = "(&(objectClass=user)(samaccounttype=" . adLDAP::ADLDAP_NORMAL_ACCOUNT .")(objectCategory=person)" . $searchParams . ")";
+        $fields = array("samaccountname","displayname");
+        $sr = ldap_search($this->adldap->getLdapConnection(), $this->adldap->getBaseDn(), $filter, $fields);
+        $entries = ldap_get_entries($this->adldap->getLdapConnection(), $sr);
+
+        $usersArray = array();
+        for ($i=0; $i < $entries["count"]; $i++) {
+            if ($includeDescription && strlen($entries[$i]["displayname"][0]) > 0) {
+                $usersArray[$entries[$i]["samaccountname"][0]] = $entries[$i]["displayname"][0];
+            }
+            else if ($includeDescription) {
+                $usersArray[$entries[$i]["samaccountname"][0]] = $entries[$i]["samaccountname"][0];
+            }
+            else {
+                array_push($usersArray, $entries[$i]["samaccountname"][0]);
+            }
+        }
+        if ($sorted){ 
+          asort($usersArray); 
+        }
+        return ($usersArray);
+    }
+    
+    /**
+    * Move a user account to a different OU
+    *
+    * @param string $username The username to move (please be careful here!)
+    * @param array $container The container or containers to move the user to (please be careful here!).
+    * accepts containers in 1. parent 2. child order
+    * @return array
+    */
+    public function move($username, $container) 
+    {
+        if (!$this->adldap->getLdapBind()) { return false; }
+        if ($username === null) { return "Missing compulsory field [username]"; }
+        if ($container === null) { return "Missing compulsory field [container]"; }
+        if (!is_array($container)) { return "Container must be an array"; }
+        
+        $userInfo = $this->info($username, array("*"));
+        $dn = $userInfo[0]['distinguishedname'][0];
+        $newRDn = "cn=" . $username;
+        $container = array_reverse($container);
+        $newContainer = "ou=" . implode(",ou=",$container);
+        $newBaseDn = strtolower($newContainer) . "," . $this->adldap->getBaseDn();
+        $result = @ldap_rename($this->adldap->getLdapConnection(), $dn, $newRDn, $newBaseDn, true);
+        if ($result !== true) {
+            return false;
+        }
+        return true;
+    }
+    
+    /**
+    * Get the last logon time of any user as a Unix timestamp
+    * 
+    * @param string $username
+    * @return long $unixTimestamp
+    */
+    public function getLastLogon($username) {
+        if (!$this->adldap->getLdapBind()) { return false; }
+        if ($username === null) { return "Missing compulsory field [username]"; }
+        $userInfo = $this->info($username, array("lastLogonTimestamp"));
+        $lastLogon = adLDAPUtils::convertWindowsTimeToUnixTime($userInfo[0]['lastLogonTimestamp'][0]);
+        return $lastLogon;
+    }
+    
+}
+?>
diff --git a/sources/lib/plugins/authad/adLDAP/classes/adLDAPUtils.php b/sources/lib/plugins/authad/adLDAP/classes/adLDAPUtils.php
new file mode 100644
index 0000000..5e86441
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/classes/adLDAPUtils.php
@@ -0,0 +1,264 @@
+adldap = $adldap;
+    }
+    
+    
+    /**
+    * Take an LDAP query and return the nice names, without all the LDAP prefixes (eg. CN, DN)
+    *
+    * @param array $groups
+    * @return array
+    */
+    public function niceNames($groups)
+    {
+
+        $groupArray = 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);
+                $groupArray[] = substr($bits[0], 3, (strlen($bits[0])-3));
+            }
+        }
+        return $groupArray;    
+    }
+    
+    /**
+    * Escape characters for use in an ldap_create function
+    * 
+    * @param string $str
+    * @return string
+    */
+    public function escapeCharacters($str) {
+        $str = str_replace(",", "\,", $str);
+        return $str;
+    }
+    
+    /**
+    * Escape strings for the use in LDAP filters
+    * 
+    * DEVELOPERS SHOULD BE DOING PROPER FILTERING IF THEY'RE ACCEPTING USER INPUT
+    * Ported from Perl's Net::LDAP::Util escape_filter_value
+    *
+    * @param string $str The string the parse
+    * @author Port by Andreas Gohr 
+    * @return string
+    */
+    public function ldapSlashes($str){
+        return preg_replace('/([\x00-\x1F\*\(\)\\\\])/e',
+                            '"\\\\\".join("",unpack("H2","$1"))',
+                            $str);
+    }
+    
+    /**
+    * Converts a string GUID to a hexdecimal value so it can be queried
+    * 
+    * @param string $strGUID A string representation of a GUID
+    * @return string
+    */
+    public function strGuidToHex($strGUID) 
+    {
+        $strGUID = str_replace('-', '', $strGUID);
+
+        $octet_str = '\\' . substr($strGUID, 6, 2);
+        $octet_str .= '\\' . substr($strGUID, 4, 2);
+        $octet_str .= '\\' . substr($strGUID, 2, 2);
+        $octet_str .= '\\' . substr($strGUID, 0, 2);
+        $octet_str .= '\\' . substr($strGUID, 10, 2);
+        $octet_str .= '\\' . substr($strGUID, 8, 2);
+        $octet_str .= '\\' . substr($strGUID, 14, 2);
+        $octet_str .= '\\' . substr($strGUID, 12, 2);
+        //$octet_str .= '\\' . substr($strGUID, 16, strlen($strGUID));
+        for ($i=16; $i<=(strlen($strGUID)-2); $i++) {
+            if (($i % 2) == 0) {
+                $octet_str .= '\\' . substr($strGUID, $i, 2);
+            }
+        }
+        
+        return $octet_str;
+    }
+    
+    /**
+    * Convert a binary SID to a text SID
+    * 
+    * @param string $binsid A Binary SID
+    * @return string
+    */
+     public 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->littleEndian(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
+    */
+     public function littleEndian($hex) 
+     {
+        $result = '';
+        for ($x = strlen($hex) - 2; $x >= 0; $x = $x - 2) {
+            $result .= substr($hex, $x, 2);
+        }
+        return $result;
+     }
+     
+     /**
+    * Converts a binary attribute to a string
+    * 
+    * @param string $bin A binary LDAP attribute
+    * @return string
+    */
+    public function binaryToText($bin) 
+    {
+        $hex_guid = bin2hex($bin); 
+        $hex_guid_to_guid_str = ''; 
+        for($k = 1; $k <= 4; ++$k) { 
+            $hex_guid_to_guid_str .= substr($hex_guid, 8 - 2 * $k, 2); 
+        } 
+        $hex_guid_to_guid_str .= '-'; 
+        for($k = 1; $k <= 2; ++$k) { 
+            $hex_guid_to_guid_str .= substr($hex_guid, 12 - 2 * $k, 2); 
+        } 
+        $hex_guid_to_guid_str .= '-'; 
+        for($k = 1; $k <= 2; ++$k) { 
+            $hex_guid_to_guid_str .= substr($hex_guid, 16 - 2 * $k, 2); 
+        } 
+        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 16, 4); 
+        $hex_guid_to_guid_str .= '-' . substr($hex_guid, 20); 
+        return strtoupper($hex_guid_to_guid_str);   
+    }
+    
+    /**
+    * Converts a binary GUID to a string GUID
+    * 
+    * @param string $binaryGuid The binary GUID attribute to convert
+    * @return string
+    */
+    public function decodeGuid($binaryGuid) 
+    {
+        if ($binaryGuid === null){ return "Missing compulsory field [binaryGuid]"; }
+        
+        $strGUID = $this->binaryToText($binaryGuid);          
+        return $strGUID; 
+    }
+    
+    /**
+    * Convert a boolean value to a string
+    * You should never need to call this yourself
+    *
+    * @param bool $bool Boolean value
+    * @return string
+    */
+    public function boolToStr($bool) 
+    {
+        return ($bool) ? 'TRUE' : 'FALSE';
+    }
+    
+    /**
+    * Convert 8bit characters e.g. accented characters to UTF8 encoded characters
+    */
+    public 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);   
+        }
+    }  
+    
+    /**
+    * Get the current class version number
+    * 
+    * @return string
+    */
+    public function getVersion() {
+        return self::ADLDAP_VERSION;
+    }
+    
+    /**
+    * Round a Windows timestamp down to seconds and remove the seconds between 1601-01-01 and 1970-01-01
+    * 
+    * @param long $windowsTime
+    * @return long $unixTime
+    */
+    public static function convertWindowsTimeToUnixTime($windowsTime) {
+      $unixTime = round($windowsTime / 10000000) - 11644477200; 
+      return $unixTime; 
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/sources/lib/plugins/authad/adLDAP/collections/adLDAPCollection.php b/sources/lib/plugins/authad/adLDAP/collections/adLDAPCollection.php
new file mode 100644
index 0000000..433d39f
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/collections/adLDAPCollection.php
@@ -0,0 +1,137 @@
+setInfo($info);   
+        $this->adldap = $adldap;
+    }
+    
+    /**
+    * Set the raw info array from Active Directory
+    * 
+    * @param array $info
+    */
+    public function setInfo(array $info) 
+    {
+        if ($this->info && sizeof($info) >= 1) {
+            unset($this->info);
+        }
+        $this->info = $info;   
+    }
+    
+    /**
+    * Magic get method to retrieve data from the raw array in a formatted way
+    * 
+    * @param string $attribute
+    * @return mixed
+    */
+    public function __get($attribute)
+    {
+        if (isset($this->info[0]) && is_array($this->info[0])) {
+            foreach ($this->info[0] as $keyAttr => $valueAttr) {
+                if (strtolower($keyAttr) == strtolower($attribute)) {
+                    if ($this->info[0][strtolower($attribute)]['count'] == 1) {
+                        return $this->info[0][strtolower($attribute)][0];   
+                    }
+                    else {
+                        $array = array();
+                        foreach ($this->info[0][strtolower($attribute)] as $key => $value) {
+                            if ((string)$key != 'count') {
+                                $array[$key] = $value;
+                            } 
+                        }  
+                        return $array;   
+                    }
+                }   
+            }
+        }
+        else {
+            return NULL;   
+        }
+    }    
+    
+    /**
+    * Magic set method to update an attribute
+    * 
+    * @param string $attribute
+    * @param string $value
+    * @return bool
+    */
+    abstract public function __set($attribute, $value);
+    
+    /** 
+    * Magic isset method to check for the existence of an attribute 
+    * 
+    * @param string $attribute 
+    * @return bool 
+    */ 
+    public function __isset($attribute) {
+        if (isset($this->info[0]) && is_array($this->info[0])) { 
+            foreach ($this->info[0] as $keyAttr => $valueAttr) { 
+                if (strtolower($keyAttr) == strtolower($attribute)) { 
+                    return true; 
+                } 
+            } 
+        } 
+        return false; 
+     } 
+}
+?>
diff --git a/sources/lib/plugins/authad/adLDAP/collections/adLDAPComputerCollection.php b/sources/lib/plugins/authad/adLDAP/collections/adLDAPComputerCollection.php
new file mode 100644
index 0000000..09f82ca
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/collections/adLDAPComputerCollection.php
@@ -0,0 +1,46 @@
+
diff --git a/sources/lib/plugins/authad/adLDAP/collections/adLDAPContactCollection.php b/sources/lib/plugins/authad/adLDAP/collections/adLDAPContactCollection.php
new file mode 100644
index 0000000..a9efad5
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/collections/adLDAPContactCollection.php
@@ -0,0 +1,46 @@
+
diff --git a/sources/lib/plugins/authad/adLDAP/collections/adLDAPGroupCollection.php b/sources/lib/plugins/authad/adLDAP/collections/adLDAPGroupCollection.php
new file mode 100644
index 0000000..ef4af8d
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/collections/adLDAPGroupCollection.php
@@ -0,0 +1,46 @@
+
diff --git a/sources/lib/plugins/authad/adLDAP/collections/adLDAPUserCollection.php b/sources/lib/plugins/authad/adLDAP/collections/adLDAPUserCollection.php
new file mode 100644
index 0000000..63fce5f
--- /dev/null
+++ b/sources/lib/plugins/authad/adLDAP/collections/adLDAPUserCollection.php
@@ -0,0 +1,46 @@
+
diff --git a/sources/lib/plugins/authad/auth.php b/sources/lib/plugins/authad/auth.php
new file mode 100644
index 0000000..e1d758f
--- /dev/null
+++ b/sources/lib/plugins/authad/auth.php
@@ -0,0 +1,549 @@
+
+ * @link    http://www.nosq.com/blog/2005/08/ldap-activedirectory-and-dokuwiki/
+ * @author  Andreas Gohr 
+ * @author  Jan Schumann 
+ */
+class auth_plugin_authad extends DokuWiki_Auth_Plugin {
+
+    /**
+     * @var array hold connection data for a specific AD domain
+     */
+    protected $opts = array();
+
+    /**
+     * @var array open connections for each AD domain, as adLDAP objects
+     */
+    protected $adldap = array();
+
+    /**
+     * @var bool message state
+     */
+    protected $msgshown = false;
+
+    /**
+     * @var array user listing cache
+     */
+    protected $users = array();
+
+    /**
+     * @var array filter patterns for listing users
+     */
+    protected $_pattern = array();
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        global $INPUT;
+        parent::__construct();
+
+        // we load the config early to modify it a bit here
+        $this->loadConfig();
+
+        // additional information fields
+        if(isset($this->conf['additional'])) {
+            $this->conf['additional'] = str_replace(' ', '', $this->conf['additional']);
+            $this->conf['additional'] = explode(',', $this->conf['additional']);
+        } else $this->conf['additional'] = array();
+
+        // ldap extension is needed
+        if(!function_exists('ldap_connect')) {
+            if($this->conf['debug'])
+                msg("AD Auth: PHP LDAP extension not found.", -1);
+            $this->success = false;
+            return;
+        }
+
+        // Prepare SSO
+        if(!empty($_SERVER['REMOTE_USER'])) {
+
+            // make sure the right encoding is used
+            if($this->getConf('sso_charset')) {
+                $_SERVER['REMOTE_USER'] = iconv($this->getConf('sso_charset'), 'UTF-8', $_SERVER['REMOTE_USER']);
+            } elseif(!utf8_check($_SERVER['REMOTE_USER'])) {
+                $_SERVER['REMOTE_USER'] = utf8_encode($_SERVER['REMOTE_USER']);
+            }
+
+            // trust the incoming user
+            if($this->conf['sso']) {
+                $_SERVER['REMOTE_USER'] = $this->cleanUser($_SERVER['REMOTE_USER']);
+
+                // we need to simulate a login
+                if(empty($_COOKIE[DOKU_COOKIE])) {
+                    $INPUT->set('u', $_SERVER['REMOTE_USER']);
+                    $INPUT->set('p', 'sso_only');
+                }
+            }
+        }
+
+        // other can do's are changed in $this->_loadServerConfig() base on domain setup
+        $this->cando['modName'] = true;
+        $this->cando['modMail'] = true;
+    }
+
+    /**
+     * Load domain config on capability check
+     *
+     * @param string $cap
+     * @return bool
+     */
+    public function canDo($cap) {
+        //capabilities depend on config, which may change depending on domain
+        $domain = $this->_userDomain($_SERVER['REMOTE_USER']);
+        $this->_loadServerConfig($domain);
+        return parent::canDo($cap);
+    }
+
+    /**
+     * 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 
+     * @param string $user
+     * @param string $pass
+     * @return  bool
+     */
+    public function checkPass($user, $pass) {
+        if($_SERVER['REMOTE_USER'] &&
+            $_SERVER['REMOTE_USER'] == $user &&
+            $this->conf['sso']
+        ) return true;
+
+        $adldap = $this->_adldap($this->_userDomain($user));
+        if(!$adldap) return false;
+
+        return $adldap->authenticate($this->_userName($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 address of the user
+     * grps    array   list of groups the user is in
+     *
+     * This AD specific function returns the following
+     * addional fields:
+     *
+     * dn         string    distinguished name (DN)
+     * uid        string    samaccountname
+     * lastpwd    int       timestamp of the date when the password was set
+     * expires    true      if the password expires
+     * expiresin  int       seconds until the password expires
+     * any fields specified in the 'additional' config option
+     *
+     * @author  James Van Lommel 
+     * @param string $user
+     * @return array
+     */
+    public function getUserData($user) {
+        global $conf;
+        global $lang;
+        global $ID;
+        $adldap = $this->_adldap($this->_userDomain($user));
+        if(!$adldap) return false;
+
+        if($user == '') return array();
+
+        $fields = array('mail', 'displayname', 'samaccountname', 'lastpwd', 'pwdlastset', 'useraccountcontrol');
+
+        // add additional fields to read
+        $fields = array_merge($fields, $this->conf['additional']);
+        $fields = array_unique($fields);
+        $fields = array_filter($fields);
+
+        //get info for given user
+        $result = $adldap->user()->info($this->_userName($user), $fields);
+        if($result == false){
+            return array();
+        }
+
+        //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'];
+        //last password set (Windows counts from January 1st 1601)
+        $info['lastpwd'] = $result[0]['pwdlastset'][0] / 10000000 - 11644473600;
+        //will it expire?
+        $info['expires'] = !($result[0]['useraccountcontrol'][0] & 0x10000); //ADS_UF_DONT_EXPIRE_PASSWD
+
+        // additional information
+        foreach($this->conf['additional'] as $field) {
+            if(isset($result[0][strtolower($field)])) {
+                $info[$field] = $result[0][strtolower($field)][0];
+            }
+        }
+
+        // handle ActiveDirectory memberOf
+        $info['grps'] = $adldap->user()->groups($this->_userName($user),(bool) $this->opts['recursive_groups']);
+
+        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'];
+        }
+
+        // add the user's domain to the groups
+        $domain = $this->_userDomain($user);
+        if($domain && !in_array("domain-$domain", (array) $info['grps'])) {
+            $info['grps'][] = $this->cleanGroup("domain-$domain");
+        }
+
+        // check expiry time
+        if($info['expires'] && $this->conf['expirywarn']){
+            $expiry = $adldap->user()->passwordExpiry($user);
+            if(is_array($expiry)){
+                $info['expiresat'] = $expiry['expiryts'];
+                $info['expiresin'] = round(($info['expiresat'] - time())/(24*60*60));
+
+                // if this is the current user, warn him (once per request only)
+                if(($_SERVER['REMOTE_USER'] == $user) &&
+                    ($info['expiresin'] <= $this->conf['expirywarn']) &&
+                    !$this->msgshown
+                ) {
+                    $msg = sprintf($lang['authpwdexpire'], $info['expiresin']);
+                    if($this->canDo('modPass')) {
+                        $url = wl($ID, array('do'=> 'profile'));
+                        $msg .= ' '.$lang['btn_profile'].'';
+                    }
+                    msg($msg);
+                    $this->msgshown = true;
+                }
+            }
+        }
+
+        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)
+     * @param string $group
+     * @return string
+     */
+    public function cleanGroup($group) {
+        $group = str_replace('\\', '', $group);
+        $group = str_replace('#', '', $group);
+        $group = preg_replace('[\s]', '_', $group);
+        $group = utf8_strtolower(trim($group));
+        return $group;
+    }
+
+    /**
+     * Sanitize user names
+     *
+     * Normalizes domain parts, does not modify the user name itself (unlike cleanGroup)
+     *
+     * @author Andreas Gohr 
+     * @param string $user
+     * @return string
+     */
+    public function cleanUser($user) {
+        $domain = '';
+
+        // get NTLM or Kerberos domain part
+        list($dom, $user) = explode('\\', $user, 2);
+        if(!$user) $user = $dom;
+        if($dom) $domain = $dom;
+        list($user, $dom) = explode('@', $user, 2);
+        if($dom) $domain = $dom;
+
+        // clean up both
+        $domain = utf8_strtolower(trim($domain));
+        $user   = utf8_strtolower(trim($user));
+
+        // is this a known, valid domain? if not discard
+        if(!is_array($this->conf[$domain])) {
+            $domain = '';
+        }
+
+        // reattach domain
+        if($domain) $user = "$user@$domain";
+        return $user;
+    }
+
+    /**
+     * Most values in LDAP are case-insensitive
+     *
+     * @return bool
+     */
+    public function isCaseSensitive() {
+        return false;
+    }
+
+    /**
+     * Bulk retrieval of user data
+     *
+     * @author  Dominik Eckelmann 
+     * @param   int   $start     index of first user to be returned
+     * @param   int   $limit     max number of users to be returned
+     * @param   array $filter    array of field/pattern pairs, null for no filter
+     * @return  array userinfo (refer getUserData for internal userinfo details)
+     */
+    public function retrieveUsers($start = 0, $limit = -1, $filter = array()) {
+        $adldap = $this->_adldap(null);
+        if(!$adldap) return false;
+
+        if($this->users === null) {
+            //get info for given user
+            $result = $adldap->user()->all();
+            if (!$result) return array();
+            $this->users = array_fill_keys($result, false);
+        }
+
+        $i     = 0;
+        $count = 0;
+        $this->_constructPattern($filter);
+        $result = array();
+
+        foreach($this->users as $user => &$info) {
+            if($i++ < $start) {
+                continue;
+            }
+            if($info === false) {
+                $info = $this->getUserData($user);
+            }
+            if($this->_filter($user, $info)) {
+                $result[$user] = $info;
+                if(($limit >= 0) && (++$count >= $limit)) break;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Modify user data
+     *
+     * @param   string $user      nick of the user to be changed
+     * @param   array  $changes   array of field/value pairs to be changed
+     * @return  bool
+     */
+    public function modifyUser($user, $changes) {
+        $return = true;
+        $adldap = $this->_adldap($this->_userDomain($user));
+        if(!$adldap) return false;
+
+        // password changing
+        if(isset($changes['pass'])) {
+            try {
+                $return = $adldap->user()->password($this->_userName($user),$changes['pass']);
+            } catch (adLDAPException $e) {
+                if ($this->conf['debug']) msg('AD Auth: '.$e->getMessage(), -1);
+                $return = false;
+            }
+            if(!$return) msg('AD Auth: failed to change the password. Maybe the password policy was not met?', -1);
+        }
+
+        // changing user data
+        $adchanges = array();
+        if(isset($changes['name'])) {
+            // get first and last name
+            $parts                     = explode(' ', $changes['name']);
+            $adchanges['surname']      = array_pop($parts);
+            $adchanges['firstname']    = join(' ', $parts);
+            $adchanges['display_name'] = $changes['name'];
+        }
+        if(isset($changes['mail'])) {
+            $adchanges['email'] = $changes['mail'];
+        }
+        if(count($adchanges)) {
+            try {
+                $return = $return & $adldap->user()->modify($this->_userName($user),$adchanges);
+            } catch (adLDAPException $e) {
+                if ($this->conf['debug']) msg('AD Auth: '.$e->getMessage(), -1);
+                $return = false;
+            }
+        }
+
+        return $return;
+    }
+
+    /**
+     * Initialize the AdLDAP library and connect to the server
+     *
+     * When you pass null as domain, it will reuse any existing domain.
+     * Eg. the one of the logged in user. It falls back to the default
+     * domain if no current one is available.
+     *
+     * @param string|null $domain The AD domain to use
+     * @return adLDAP|bool true if a connection was established
+     */
+    protected function _adldap($domain) {
+        if(is_null($domain) && is_array($this->opts)) {
+            $domain = $this->opts['domain'];
+        }
+
+        $this->opts = $this->_loadServerConfig((string) $domain);
+        if(isset($this->adldap[$domain])) return $this->adldap[$domain];
+
+        // connect
+        try {
+            $this->adldap[$domain] = new adLDAP($this->opts);
+            return $this->adldap[$domain];
+        } catch(adLDAPException $e) {
+            if($this->conf['debug']) {
+                msg('AD Auth: '.$e->getMessage(), -1);
+            }
+            $this->success         = false;
+            $this->adldap[$domain] = null;
+        }
+        return false;
+    }
+
+    /**
+     * Get the domain part from a user
+     *
+     * @param $user
+     * @return string
+     */
+    public function _userDomain($user) {
+        list(, $domain) = explode('@', $user, 2);
+        return $domain;
+    }
+
+    /**
+     * Get the user part from a user
+     *
+     * @param $user
+     * @return string
+     */
+    public function _userName($user) {
+        list($name) = explode('@', $user, 2);
+        return $name;
+    }
+
+    /**
+     * Fetch the configuration for the given AD domain
+     *
+     * @param string $domain current AD domain
+     * @return array
+     */
+    protected function _loadServerConfig($domain) {
+        // prepare adLDAP standard configuration
+        $opts = $this->conf;
+
+        $opts['domain'] = $domain;
+
+        // add possible domain specific configuration
+        if($domain && is_array($this->conf[$domain])) foreach($this->conf[$domain] as $key => $val) {
+            $opts[$key] = $val;
+        }
+
+        // handle multiple AD servers
+        $opts['domain_controllers'] = explode(',', $opts['domain_controllers']);
+        $opts['domain_controllers'] = array_map('trim', $opts['domain_controllers']);
+        $opts['domain_controllers'] = array_filter($opts['domain_controllers']);
+
+        // compatibility with old option name
+        if(empty($opts['admin_username']) && !empty($opts['ad_username'])) $opts['admin_username'] = $opts['ad_username'];
+        if(empty($opts['admin_password']) && !empty($opts['ad_password'])) $opts['admin_password'] = $opts['ad_password'];
+
+        // we can change the password if SSL is set
+        if($opts['use_ssl'] || $opts['use_tls']) {
+            $this->cando['modPass'] = true;
+        } else {
+            $this->cando['modPass'] = false;
+        }
+
+        // adLDAP expects empty user/pass as NULL, we're less strict FS#2781
+        if(empty($opts['admin_username'])) $opts['admin_username'] = null;
+        if(empty($opts['admin_password'])) $opts['admin_password'] = null;
+
+        // user listing needs admin priviledges
+        if(!empty($opts['admin_username']) && !empty($opts['admin_password'])) {
+            $this->cando['getUsers'] = true;
+        } else {
+            $this->cando['getUsers'] = false;
+        }
+
+        return $opts;
+    }
+
+    /**
+     * Check provided user and userinfo for matching patterns
+     *
+     * The patterns are set up with $this->_constructPattern()
+     *
+     * @author Chris Smith 
+     * @param string $user
+     * @param array  $info
+     * @return bool
+     */
+    protected function _filter($user, $info) {
+        foreach($this->_pattern as $item => $pattern) {
+            if($item == 'user') {
+                if(!preg_match($pattern, $user)) return false;
+            } else if($item == 'grps') {
+                if(!count(preg_grep($pattern, $info['grps']))) return false;
+            } else {
+                if(!preg_match($pattern, $info[$item])) return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Create a pattern for $this->_filter()
+     *
+     * @author Chris Smith 
+     * @param array $filter
+     */
+    protected function _constructPattern($filter) {
+        $this->_pattern = array();
+        foreach($filter as $item => $pattern) {
+            $this->_pattern[$item] = '/'.str_replace('/', '\/', $pattern).'/i'; // allow regex characters
+        }
+    }
+}
diff --git a/sources/lib/plugins/authad/conf/default.php b/sources/lib/plugins/authad/conf/default.php
new file mode 100644
index 0000000..6fb4c91
--- /dev/null
+++ b/sources/lib/plugins/authad/conf/default.php
@@ -0,0 +1,15 @@
+ 'danger');
+$meta['base_dn']            = array('string','_caution' => 'danger');
+$meta['domain_controllers'] = array('string','_caution' => 'danger');
+$meta['sso']                = array('onoff','_caution' => 'danger');
+$meta['sso_charset']        = array('string','_caution' => 'danger');
+$meta['admin_username']     = array('string','_caution' => 'danger');
+$meta['admin_password']     = array('password','_caution' => 'danger');
+$meta['real_primarygroup']  = array('onoff','_caution' => 'danger');
+$meta['use_ssl']            = array('onoff','_caution' => 'danger');
+$meta['use_tls']            = array('onoff','_caution' => 'danger');
+$meta['debug']              = array('onoff','_caution' => 'security');
+$meta['expirywarn']         = array('numeric', '_min'=>0,'_caution' => 'danger');
+$meta['additional']         = array('string','_caution' => 'danger');
diff --git a/sources/lib/plugins/authad/lang/bg/settings.php b/sources/lib/plugins/authad/lang/bg/settings.php
new file mode 100644
index 0000000..877810c
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/bg/settings.php
@@ -0,0 +1,18 @@
+
+ */
+$lang['account_suffix']     = 'Наставка на акаунта Ви. Например @някакъв.домейн.org';
+$lang['base_dn']            = 'Вашият основен DN. Например DC=моят,DC=домейн,DC=org';
+$lang['domain_controllers'] = 'Domain controller списък, разделете сървърите със запетая. Например сървър1.домейн.org,сървър2.домейн.org';
+$lang['admin_username']     = 'Привилегирован Active Directory потребител с достъп до данните на останалите потребители. Не е задължително, но е необходимо за някои функционалности като изпращането на имейл за абонаменти.';
+$lang['admin_password']     = 'Паролата на горния потребител.';
+$lang['sso']                = 'Да се ползва ли еднократно вписване чрез Kerberos или NTLM?';
+$lang['real_primarygroup']  = 'Да се извлича ли истинската група вместо да се предполага "Domain Users" (по-бавно)';
+$lang['use_ssl']            = 'Ползване на SSL свързаност? Не отбелязвайте TLS (по-долу) ако включите опцията.';
+$lang['use_tls']            = 'Ползване на TLS свързаност? Не отбелязвайте SSL (по-горе) ако включите опцията.';
+$lang['debug']              = 'Показване на допълнителна debug информация при грешка?';
+$lang['expirywarn']         = 'Предупреждаване на потребителите Х дни преди изтичане валидността на паролата им. Въведете 0 за изключване.';
+$lang['additional']         = 'Списък с допълнителни AD атрибути за извличане от потребителските данни (разделяйте ги със запетая). Ползва се от няколко приставки.';
\ No newline at end of file
diff --git a/sources/lib/plugins/authad/lang/cs/settings.php b/sources/lib/plugins/authad/lang/cs/settings.php
new file mode 100644
index 0000000..28222d3
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/cs/settings.php
@@ -0,0 +1,19 @@
+@moje.domena.org';
+$lang['base_dn']               = 'Vaše doménové jméno DN. tj. DC=moje,DC=domena,DC=org';
+$lang['domain_controllers']    = 'Čárkou oddělenových kontrol=rů, tj. srv1.domena.org,srv2.domena.org';
+$lang['admin_username']        = 'Privilegovaný uživatel Active Directory s přístupem ke všem datům. Volitelně, ale nutné pro určité akce typu zasílání mailů.';
+$lang['admin_password']        = 'Heslo uživatele výše';
+$lang['sso']                   = 'Chcete přihlašování Single-Sign-On pomocí jádra Kerberos nebo NTLM ( autentizační protokol obvyklý ve Windows)?';
+$lang['real_primarygroup']     = 'Má být zjištěna primární skupina namísto vyhodnocení hodnoty "doménoví uživatelé" (pomalejší)';
+$lang['use_ssl']               = 'Použít spojení SSL? Pokud ano, nevyužívejte TLS níže.';
+$lang['use_tls']               = 'Použít spojení TLS? Pokud ano, nevyužívejte SSL výše.';
+$lang['debug']                 = 'Zobrazit dodatečné debugovací výstupy při chybách?';
+$lang['expirywarn']            = 'Dny mezi varováním o vyprčšení hesla uživatele a jeho vypršením. 0 znaší vypnuto.';
+$lang['additional']            = 'Čárkou oddělený seznam dodatečných atributů získávaných z uživatelských dat. Využito některými pluginy.';
diff --git a/sources/lib/plugins/authad/lang/da/settings.php b/sources/lib/plugins/authad/lang/da/settings.php
new file mode 100644
index 0000000..f50abf1
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/da/settings.php
@@ -0,0 +1,20 @@
+
+ * @author Jens Hyllegaard 
+ */
+$lang['account_suffix']        = 'Dit konto suffiks. F.eks. @mit.domæne.dk';
+$lang['base_dn']               = 'Dit grund DN. F.eks. DC=mit,DC=domæne,DC=dk';
+$lang['domain_controllers']    = 'En kommasepareret liste over domænecontrollere. F.eks. srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = 'En privilegeret Active Directory bruger med adgang til alle andre brugeres data. Valgfri, men skal bruges til forskellige handlinger såsom at sende abonnement e-mails.';
+$lang['admin_password']        = 'Kodeordet til den ovenstående bruger.';
+$lang['sso']                   = 'Bør Single-Sign-On via Kerberos eller NTLM bruges?';
+$lang['real_primarygroup']     = 'Bør den korrekte primære gruppe findes i stedet for at antage "Domain Users" (langsommere)';
+$lang['use_ssl']               = 'Benyt SSL forbindelse? hvis ja, vælg ikke TLS herunder.';
+$lang['use_tls']               = 'Benyt TLS forbindelse? hvis ja, vælg ikke SSL herover.';
+$lang['debug']                 = 'Vis yderligere debug output ved fejl?';
+$lang['expirywarn']            = 'Dage før brugere skal advares om udløben adgangskode. 0 for at deaktivere.';
+$lang['additional']            = 'En kommasepareret liste over yderligere AD attributter der skal hentes fra brugerdata. Brug af nogen udvidelser.';
diff --git a/sources/lib/plugins/authad/lang/de-informal/settings.php b/sources/lib/plugins/authad/lang/de-informal/settings.php
new file mode 100644
index 0000000..782cf7c
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/de-informal/settings.php
@@ -0,0 +1,21 @@
+
+ * @author Matthias Schulte 
+ * @author Volker Bödker 
+ */
+$lang['account_suffix']        = 'Dein Account-Suffix. Z.B. @my.domain.org';
+$lang['base_dn']               = 'Dein Base-DN. Z.B. DC=my,DC=domain,DC=org';
+$lang['domain_controllers']    = 'Eine Komma-separierte Liste von Domänen-Controllern. Z.B. srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = 'Ein privilegierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.';
+$lang['admin_password']        = 'Das Passwort des obigen Benutzers.';
+$lang['sso']                   = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?';
+$lang['real_primarygroup']     = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)';
+$lang['use_ssl']               = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.';
+$lang['use_tls']               = 'TLS-Verbindung benutzen? Falls ja, SSL oberhalb nicht aktivieren.';
+$lang['debug']                 = 'Zusätzliche Debug-Informationen bei Fehlern anzeigen?';
+$lang['expirywarn']            = 'Tage im Voraus um Benutzer über ablaufende Passwörter zu informieren. 0 zum Ausschalten.';
+$lang['additional']            = 'Eine Komma-separierte Liste von zusätzlichen AD-Attributen, die von den Benutzerobjekten abgefragt werden. Wird von einigen Plugins benutzt.';
diff --git a/sources/lib/plugins/authad/lang/de/settings.php b/sources/lib/plugins/authad/lang/de/settings.php
new file mode 100644
index 0000000..8105fb6
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/de/settings.php
@@ -0,0 +1,23 @@
+
+ * @author Matthias Schulte 
+ * @author Ben Fey 
+ * @author Jonas Gröger 
+ */
+$lang['account_suffix']        = 'Ihr Account-Suffix. Z. B. @my.domain.org';
+$lang['base_dn']               = 'Ihr Base-DN. Z. B. DC=my,DC=domain,DC=org';
+$lang['domain_controllers']    = 'Eine Komma-separierte Liste von Domänen-Controllern. Z. B. srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = 'Ein priviligierter Active Directory-Benutzer mit Zugriff zu allen anderen Benutzerdaten. Optional, aber wird benötigt für Aktionen wie z. B. dass Senden von Benachrichtigungs-Mails.';
+$lang['admin_password']        = 'Das Passwort des obigen Benutzers.';
+$lang['sso']                   = 'Soll Single-Sign-On via Kerberos oder NTLM benutzt werden?';
+$lang['sso_charset']           = 'Der Zeichensatz, mit dem der Server den Kerberos- oder NTLM-Benutzernamen versendet. Leer lassen für UTF-8 oder latin-1. Benötigt die iconv-Erweiterung.';
+$lang['real_primarygroup']     = 'Soll die echte primäre Gruppe aufgelöst werden anstelle der Annahme "Domain Users" (langsamer)';
+$lang['use_ssl']               = 'SSL-Verbindung benutzen? Falls ja, TLS unterhalb nicht aktivieren.';
+$lang['use_tls']               = 'TLS-Verbindung benutzen? Falls ja, SSL oberhalb nicht aktivieren.';
+$lang['debug']                 = 'Zusätzliche Debug-Informationen bei Fehlern anzeigen?';
+$lang['expirywarn']            = 'Tage im Voraus um Benutzer über ablaufende Passwörter zu informieren. 0 zum Ausschalten.';
+$lang['additional']            = 'Eine Komma-separierte Liste von zusätzlichen AD-Attributen, die von den Benutzerobjekten abgefragt werden. Wird von einigen Plugins benutzt.';
diff --git a/sources/lib/plugins/authad/lang/el/settings.php b/sources/lib/plugins/authad/lang/el/settings.php
new file mode 100644
index 0000000..9bf23ea
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/el/settings.php
@@ -0,0 +1,8 @@
+
+ */
+$lang['admin_password']        = 'Ο κωδικός του παραπάνω χρήστη.';
diff --git a/sources/lib/plugins/authad/lang/en/settings.php b/sources/lib/plugins/authad/lang/en/settings.php
new file mode 100644
index 0000000..92e9ac4
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/en/settings.php
@@ -0,0 +1,15 @@
+@my.domain.org';
+$lang['base_dn']            = 'Your base DN. Eg. DC=my,DC=domain,DC=org';
+$lang['domain_controllers'] = 'A comma separated list of Domain controllers. Eg. srv1.domain.org,srv2.domain.org';
+$lang['admin_username']     = 'A privileged Active Directory user with access to all other user\'s data. Optional, but needed for certain actions like sending subscription mails.';
+$lang['admin_password']     = 'The password of the above user.';
+$lang['sso']                = 'Should Single-Sign-On via Kerberos or NTLM be used?';
+$lang['sso_charset']        = 'The charset your webserver will pass the Kerberos or NTLM username in. Empty for UTF-8 or latin-1. Requires the iconv extension.';
+$lang['real_primarygroup']  = 'Should the real primary group be resolved instead of assuming "Domain Users" (slower).';
+$lang['use_ssl']            = 'Use SSL connection? If used, do not enable TLS below.';
+$lang['use_tls']            = 'Use TLS connection? If used, do not enable SSL above.';
+$lang['debug']              = 'Display additional debugging output on errors?';
+$lang['expirywarn']         = 'Days in advance to warn user about expiring password. 0 to disable.';
+$lang['additional']         = 'A comma separated list of additional AD attributes to fetch from user data. Used by some plugins.';
diff --git a/sources/lib/plugins/authad/lang/eo/settings.php b/sources/lib/plugins/authad/lang/eo/settings.php
new file mode 100644
index 0000000..11640eb
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/eo/settings.php
@@ -0,0 +1,20 @@
+
+ */
+$lang['account_suffix']        = 'Via konto-aldonaĵo, ekz. @mia.domajno.lando';
+$lang['base_dn']               = 'Via baza DN, ekz. DC=mia,DC=domajno,DC=lando';
+$lang['domain_controllers']    = 'Komodisigita listo de domajno-serviloj, ekz. srv1.domajno.lando,srv2.domajno.lando';
+$lang['admin_username']        = 'Privilegiita Aktiv-Dosieruja uzanto kun aliro al ĉiuj uzantaj datumoj. Libervole, sed necesa por iuj agadoj kiel sendi abonan retpoŝton.';
+$lang['admin_password']        = 'La pasvorto de tiu uzanto.';
+$lang['sso']                   = 'Ĉu uzi Sola Aliro tra Kerberos aŭ NTLM?';
+$lang['sso_charset']           = 'Per kiu karaktraro via retservilo pludonas uzantonomojn al Kerberos aŭ NTLM? Malplena por UTF-8 aŭ latin-1. Bezonas iconv-aldonaĵon.';
+$lang['real_primarygroup']     = 'Ĉu trovi la veran ĉefan grupon anstataŭ supozi "Domajnuzantoj" (pli malrapida)?';
+$lang['use_ssl']               = 'Ĉu uzi SSL-konekton? Se jes, ne aktivigu TLS sube.';
+$lang['use_tls']               = 'Ĉu uzi TLS-konekton? Se jes, ne aktivigu SSL supre.';
+$lang['debug']                 = 'Ĉu montri aldonajn informojn dum eraroj?';
+$lang['expirywarn']            = 'Tagoj da antaŭaverto pri malvalidiĝonta pasvorto. 0 por malebligi.';
+$lang['additional']            = 'Komodisigita listo de aldonaj AD-atributoj por preni el uzantaj datumoj. Uzita de iuj kromaĵoj.';
diff --git a/sources/lib/plugins/authad/lang/es/settings.php b/sources/lib/plugins/authad/lang/es/settings.php
new file mode 100644
index 0000000..98b7805
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/es/settings.php
@@ -0,0 +1,15 @@
+
+ * @author Antonio Bueno 
+ */
+$lang['account_suffix']        = 'Su cuenta, sufijo. Ejem.  @ my.domain.org ';
+$lang['base_dn']               = 'Su base DN. Ejem. DC=my,DC=dominio,DC=org';
+$lang['domain_controllers']    = 'Una lista separada por coma de los controladores de dominios. Ejem. srv1.dominio.org,srv2.dominio.org';
+$lang['admin_username']        = 'Un usuario con privilegios de Active Directory con acceso a los datos de cualquier otro usuario. Opcional, pero es necesario para determinadas acciones como el envío de suscripciones de correos electrónicos.';
+$lang['admin_password']        = 'La contraseña del usuario anterior.';
+$lang['sso']                   = 'En caso de inicio de sesión usará ¿Kerberos o NTLM?';
+$lang['sso_charset']           = 'La codificación con que tu servidor web pasará el nombre de usuario Kerberos o NTLM. Si es UTF-8 o latin-1 dejar en blanco. Requiere la extensión iconv.';
diff --git a/sources/lib/plugins/authad/lang/fi/settings.php b/sources/lib/plugins/authad/lang/fi/settings.php
new file mode 100644
index 0000000..e2f432f
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/fi/settings.php
@@ -0,0 +1,9 @@
+
+ */
+$lang['debug']                 = 'Näytä lisää debug-koodia virheistä?';
+$lang['expirywarn']            = 'Montako päivää etukäteen varoitetaan salasanan vanhenemissta. 0 poistaa.';
diff --git a/sources/lib/plugins/authad/lang/fr/settings.php b/sources/lib/plugins/authad/lang/fr/settings.php
new file mode 100644
index 0000000..d05390e
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/fr/settings.php
@@ -0,0 +1,19 @@
+
+ */
+$lang['account_suffix']        = 'Le suffixe de votre compte. Ex.: @mon.domaine.org';
+$lang['base_dn']               = 'Votre nom de domaine de base. DC=mon,DC=domaine,DC=org';
+$lang['domain_controllers']    = 'Une liste de contrôleurs de domaine séparés par des virgules. Ex.: srv1.domaine.org,srv2.domaine.org';
+$lang['admin_username']        = 'Un utilisateur Active Directory avec accès aux données de tous les autres utilisateurs. Facultatif, mais nécessaire pour certaines actions telles que l\'envoi de courriels d\'abonnement.';
+$lang['admin_password']        = 'Le mot de passe de l\'utilisateur ci-dessus.';
+$lang['sso']                   = 'Est-ce que la connexion unique (Single-Sign-On) par Kerberos ou NTLM doit être utilisée?';
+$lang['real_primarygroup']     = 'Est-ce que le véritable groupe principal doit être résolu au lieu de présumer "Domain Users" (plus lent)?';
+$lang['use_ssl']               = 'Utiliser une connexion SSL? Si utilisée, n\'activez pas TLS ci-dessous.';
+$lang['use_tls']               = 'Utiliser une connexion TLS? Si utilisée, n\'activez pas SSL ci-dessus.';
+$lang['debug']                 = 'Afficher des informations de débogage supplémentaires pour les erreurs?';
+$lang['expirywarn']            = 'Jours d\'avance pour l\'avertissement envoyé aux utilisateurs lorsque leur mot de passe va expirer. 0 pour désactiver.';
+$lang['additional']            = 'Une liste séparée par des virgules d\'attributs AD supplémentaires à récupérer dans les données utilisateur. Utilisée par certains modules.';
diff --git a/sources/lib/plugins/authad/lang/hu/settings.php b/sources/lib/plugins/authad/lang/hu/settings.php
new file mode 100644
index 0000000..1510e17
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/hu/settings.php
@@ -0,0 +1,19 @@
+
+ */
+$lang['account_suffix']        = 'Felhasználói azonosító végződése, pl. @my.domain.org.';
+$lang['base_dn']               = 'Bázis DN, pl. DC=my,DC=domain,DC=org.';
+$lang['domain_controllers']    = 'Tartománykezelők listája vesszővel elválasztva, pl. srv1.domain.org,srv2.domain.org.';
+$lang['admin_username']        = 'Privilegizált AD felhasználó, aki az összes feéhasználó adatait elérheti. Elhagyható, de bizonyos funkciókhoz, például a feliratkozási e-mailek kiküldéséhez szükséges.';
+$lang['admin_password']        = 'Ehhez tartozó jelszó.';
+$lang['sso']                   = 'Single-Sign-On Kerberos-szal vagy NTML használata?';
+$lang['real_primarygroup']     = 'A valódi elsődleges csoport feloldása a "Tartományfelhasználók" csoport használata helyett? (lassabb)';
+$lang['use_ssl']               = 'SSL használata? Ha használjuk, tiltsuk le a TLS-t!';
+$lang['use_tls']               = 'TLS használata? Ha használjuk, tiltsuk le az SSL-t!';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['expirywarn']            = 'Felhasználók értesítése ennyi nappal a jelszavuk lejárata előtt. 0 a funkció kikapcsolásához.';
+$lang['additional']            = 'Vesszővel elválasztott lista a további AD attribútumok lekéréshez. Néhány plugin használhatja.';
diff --git a/sources/lib/plugins/authad/lang/it/settings.php b/sources/lib/plugins/authad/lang/it/settings.php
new file mode 100644
index 0000000..2d68dad
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/it/settings.php
@@ -0,0 +1,18 @@
+
+ */
+$lang['account_suffix']        = 'Il suffisso del tuo account. Eg. @my.domain.org';
+$lang['base_dn']               = 'Il tuo DN. base Eg. DC=my,DC=domain,DC=org';
+$lang['domain_controllers']    = 'Elenco separato da virgole di Domain Controllers. Eg. srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = 'Utente privilegiato di Active Directory con accesso ai dati di tutti gli utenti. Opzionale ma necessario per alcune attività come mandare email di iscrizione.';
+$lang['admin_password']        = 'La password dell\'utente soprascritto.';
+$lang['sso']                   = 'Deve essere usato Single-Sign-On via Kerberos oppure NTLM?';
+$lang['use_ssl']               = 'Usare la connessione SSL? Se usata, non abilitare TSL qui sotto.';
+$lang['use_tls']               = 'Usare la connessione TSL? Se usata, non abilitare SSL qui sopra.';
+$lang['debug']                 = 'Visualizzare output addizionale di debug per gli errori?';
+$lang['expirywarn']            = 'Giorni di preavviso per la scadenza della password dell\'utente. 0 per disabilitare.';
+$lang['additional']            = 'Valori separati da virgola di attributi AD addizionali da caricare dai dati utente. Usato da alcuni plugin.';
diff --git a/sources/lib/plugins/authad/lang/ja/settings.php b/sources/lib/plugins/authad/lang/ja/settings.php
new file mode 100644
index 0000000..f308249
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/ja/settings.php
@@ -0,0 +1,20 @@
+
+ * @author Hideaki SAWADA 
+ */
+$lang['account_suffix']        = 'アカウントの接尾語。例：@my.domain.org';
+$lang['base_dn']               = 'ベースDN。例：DC=my,DC=domain,DC=org';
+$lang['domain_controllers']    = 'ドメインコントローラのカンマ区切り一覧。例：srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = '全ユーザーデータへのアクセス権のある特権Active Directoryユーザー。任意ですが、メール通知の登録等の特定の動作に必要。';
+$lang['admin_password']        = '上記ユーザーのパスワード';
+$lang['sso']                   = 'Kerberos か NTLM を使ったシングルサインオン（SSO）をしますか？';
+$lang['real_primarygroup']     = '"Domain Users" を仮定する代わりに本当のプライマリグループを解決する（低速）';
+$lang['use_ssl']               = 'SSL接続を使用しますか？使用した場合、下のSSLを有効にしないでください。';
+$lang['use_tls']               = 'TLS接続を使用しますか？使用した場合、上のSSLを有効にしないでください。';
+$lang['debug']                 = 'エラー時に追加のデバッグ出力を表示する？';
+$lang['expirywarn']            = '何日前からパスワードの有効期限をユーザーに警告する。0 の場合は無効';
+$lang['additional']            = 'ユーザデータから取得する追加AD属性のカンマ区切り一覧。いくつかのプラグインが使用する。';
diff --git a/sources/lib/plugins/authad/lang/ko/settings.php b/sources/lib/plugins/authad/lang/ko/settings.php
new file mode 100644
index 0000000..b104371
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/ko/settings.php
@@ -0,0 +1,21 @@
+
+ * @author Garam 
+ */
+$lang['account_suffix']        = '계정 접미어. 예를 들어 @my.domain.org';
+$lang['base_dn']               = '기본 DN. 예를 들어 DC=my,DC=domain,DC=org';
+$lang['domain_controllers']    = '도메인 컨트롤러의 쉼표로 구분한 목록. 예를 들어 srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = '다른 모든 사용자의 데이터에 접근할 수 있는 권한이 있는 Active Directory 사용자. 선택적이지만 구독 메일을 보내는 등의 특정 작업에 필요합니다.';
+$lang['admin_password']        = '위 사용자의 비밀번호.';
+$lang['sso']                   = 'Kerberos나 NTLM을 통해 Single-Sign-On을 사용해야 합니까?';
+$lang['sso_charset']           = '당신의 웹서버의 문자집합은 Kerberos나 NTLM 사용자 이름으로 전달됩니다. UTF-8이나 라린-1이 비어 있습니다. icov 확장 기능이 필요합니다.';
+$lang['real_primarygroup']     = '실제 기본 그룹은 "도메인 사용자"를 가정하는 대신 해결될 것입니다. (느림)';
+$lang['use_ssl']               = 'SSL 연결을 사용합니까? 사용한다면 아래 TLS을 활성화하지 마세요.';
+$lang['use_tls']               = 'TLS 연결을 사용합니까? 사용한다면 위 SSL을 활성화하지 마세요.';
+$lang['debug']                 = '오류에 대한 추가적인 디버그 정보를 보이겠습니까?';
+$lang['expirywarn']            = '미리 비밀번호 만료를 사용자에게 경고할 날짜. 0일 경우 비활성화합니다.';
+$lang['additional']            = '사용자 데이터에서 가져올 추가적인 AD 속성의 쉼표로 구분한 목록. 일부 플러그인이 사용합니다.';
diff --git a/sources/lib/plugins/authad/lang/lv/settings.php b/sources/lib/plugins/authad/lang/lv/settings.php
new file mode 100644
index 0000000..ced5dab
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/lv/settings.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/authad/lang/nl/settings.php b/sources/lib/plugins/authad/lang/nl/settings.php
new file mode 100644
index 0000000..591d729
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/nl/settings.php
@@ -0,0 +1,21 @@
+
+ * @author Gerrit Uitslag 
+ */
+$lang['account_suffix']        = 'Je account domeinnaam. Bijv @mijn.domein.org';
+$lang['base_dn']               = 'Je basis DN. Bijv. DC=mijn,DC=domein,DC=org';
+$lang['domain_controllers']    = 'Eeen kommagescheiden lijst van domeinservers. Bijv. srv1.domein.org,srv2.domein.org';
+$lang['admin_username']        = 'Een geprivilegeerde Active Directory gebruiker die bij alle gebruikersgegevens kan komen. Dit is optioneel maar kan nodig zijn voor bepaalde acties, zoals het versturen van abonnementsmailtjes.';
+$lang['admin_password']        = 'Het wachtwoord van bovenstaande gebruiker.';
+$lang['sso']                   = 'Wordt voor Single-Sign-on Kerberos of NTLM gebruikt?';
+$lang['sso_charset']           = 'Het tekenset waarin je webserver de Kerberos of NTLM gebruikersnaam doorsturen. Leeglaten voor UTF-8 of latin-1. Vereist de iconv extensie.';
+$lang['real_primarygroup']     = 'Moet de echte primaire groep worden opgezocht in plaats van het aannemen van "Domeingebruikers" (langzamer)';
+$lang['use_ssl']               = 'SSL verbinding gebruiken? Zo ja, activeer dan niet de TLS optie hieronder.';
+$lang['use_tls']               = 'TLS verbinding gebruiken? Zo ja, activeer dan niet de SSL verbinding hierboven.';
+$lang['debug']                 = 'Aanvullende debug informatie tonen bij fouten?';
+$lang['expirywarn']            = 'Waarschuwingstermijn voor vervallen wachtwoord. 0 om te deactiveren.';
+$lang['additional']            = 'Een kommagescheiden lijst van extra AD attributen van de gebruiker. Wordt gebruikt door sommige plugins.';
diff --git a/sources/lib/plugins/authad/lang/pl/settings.php b/sources/lib/plugins/authad/lang/pl/settings.php
new file mode 100644
index 0000000..ad051b0
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/pl/settings.php
@@ -0,0 +1,13 @@
+
+ */
+$lang['account_suffix']        = 'Przyrostek twojej nazwy konta np. @my.domain.org';
+$lang['base_dn']               = 'Twoje bazowe DN. Na przykład: DC=my,DC=domain,DC=org';
+$lang['admin_password']        = 'Hasło dla powyższego użytkownika.';
+$lang['use_ssl']               = 'Użyć połączenie SSL? Jeśli tak to nie aktywuj TLS poniżej.';
+$lang['use_tls']               = 'Użyć połączenie TLS? Jeśli tak to nie aktywuj SSL powyżej.';
+$lang['expirywarn']            = 'Dni poprzedzających powiadomienie użytkownika o wygasającym haśle. 0 aby wyłączyć.';
diff --git a/sources/lib/plugins/authad/lang/pt-br/settings.php b/sources/lib/plugins/authad/lang/pt-br/settings.php
new file mode 100644
index 0000000..cdc7480
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/pt-br/settings.php
@@ -0,0 +1,22 @@
+
+ * @author Frederico Guimarães 
+ * @author Juliano Marconi Lanigra 
+ */
+$lang['account_suffix']        = 'Sufixo de sua conta. Eg. @meu.domínio.org';
+$lang['base_dn']               = 'Sua base DN. Eg. DC=meu,DC=domínio,DC=org';
+$lang['domain_controllers']    = 'Uma lista de controles de domínios separada por vírgulas. Eg. srv1.domínio.org,srv2.domínio.org';
+$lang['admin_username']        = 'Um usuário do Active Directory com privilégios para acessar os dados de todos os outros usuários. Opcional, mas necessário para realizar certas ações, tais como enviar mensagens de assinatura.';
+$lang['admin_password']        = 'A senha do usuário acima.';
+$lang['sso']                   = 'Usar Single-Sign-On através do Kerberos ou NTLM?';
+$lang['sso_charset']           = 'A codificação de caracteres que seu servidor web passará o nome de usuário Kerberos ou NTLM. Vazio para UTF-8 ou latin-1. Requere a extensão iconv.';
+$lang['real_primarygroup']     = 'O grupo primário real deve ser resolvido ao invés de assumirmos como "Usuários do Domínio" (mais lento)';
+$lang['use_ssl']               = 'Usar conexão SSL? Se usar, não habilitar TLS abaixo.';
+$lang['use_tls']               = 'Usar conexão TLS? se usar, não habilitar SSL acima.';
+$lang['debug']                 = 'Mostrar saída adicional de depuração em mensagens de erros?';
+$lang['expirywarn']            = 'Dias com antecedência para avisar o usuário de uma senha que vai expirar. 0 para desabilitar.';
+$lang['additional']            = 'Uma lista separada de vírgulas de atributos adicionais AD para pegar dados de usuários. Usados por alguns plugins.';
diff --git a/sources/lib/plugins/authad/lang/pt/settings.php b/sources/lib/plugins/authad/lang/pt/settings.php
new file mode 100644
index 0000000..45eff5e
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/pt/settings.php
@@ -0,0 +1,12 @@
+
+ */
+$lang['admin_password']        = 'A senha para o utilizador acima.';
+$lang['sso']                   = 'Deve ser usado o Single-Sign-On via Kerberos ou NTLM?';
+$lang['use_ssl']               = 'Usar ligação SSL? Se usada, não ative TLS abaixo.';
+$lang['use_tls']               = 'Usar ligação TLS? Se usada, não ative SSL abaixo.';
+$lang['expirywarn']            = 'Número de dias de avanço para avisar o utilizador da expiração da senha. 0 para desativar.';
diff --git a/sources/lib/plugins/authad/lang/ru/settings.php b/sources/lib/plugins/authad/lang/ru/settings.php
new file mode 100644
index 0000000..6854e09
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/ru/settings.php
@@ -0,0 +1,13 @@
+
+ * @author Artur 
+ */
+$lang['admin_password']        = 'Пароль для указанного пользователя.';
+$lang['sso']                   = 'Использовать SSO (Single-Sign-On) через Kerberos или NTLM?';
+$lang['use_ssl']               = 'Использовать SSL? Если да, то не включайте TLS.';
+$lang['use_tls']               = 'Использовать TLS? Если да, то не включайте SSL.';
diff --git a/sources/lib/plugins/authad/lang/sk/settings.php b/sources/lib/plugins/authad/lang/sk/settings.php
new file mode 100644
index 0000000..b7d822f
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/sk/settings.php
@@ -0,0 +1,20 @@
+
+ */
+$lang['account_suffix']        = 'Prípona používateľského účtu. Napr. @my.domain.org';
+$lang['base_dn']               = 'Vaše base DN. Napr. DC=my,DC=domain,DC=org';
+$lang['domain_controllers']    = 'Zoznam doménových radičov oddelených čiarkou. Napr. srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = 'Privilegovaný používateľ Active Directory s prístupom ku všetkým dátam ostatných používateľov. Nepovinné nastavenie, ale potrebné pre určité akcie ako napríklad zasielanie mailov o zmenách.';
+$lang['admin_password']        = 'Heslo vyššie uvedeného používateľa.';
+$lang['sso']                   = 'Použiť Single-Sign-On cez Kerberos alebo NTLM?';
+$lang['sso_charset']           = 'Znaková sada, v ktorej bude webserver prenášať meno Kerberos or NTLM používateľa. Prázne pole znamená UTF-8 alebo latin-1. Vyžaduje iconv rozšírenie.';
+$lang['real_primarygroup']     = 'Použiť skutočnú primárnu skupinu používateľa namiesto "Doménoví používatelia" (pomalšie).';
+$lang['use_ssl']               = 'Použiť SSL pripojenie? Ak áno, nepovoľte TLS nižšie.';
+$lang['use_tls']               = 'Použiť TLS pripojenie? Ak áno, nepovoľte SSL vyššie.';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie pri chybe?';
+$lang['expirywarn']            = 'Počet dní pred uplynutím platnosti hesla, počas ktorých používateľ dostáva upozornenie. 0 deaktivuje túto voľbu.';
+$lang['additional']            = 'Zoznam dodatočných AD atribútov oddelených čiarkou získaných z údajov používateľa. Používané niektorými pluginmi.';
diff --git a/sources/lib/plugins/authad/lang/sv/settings.php b/sources/lib/plugins/authad/lang/sv/settings.php
new file mode 100644
index 0000000..17eb523
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/sv/settings.php
@@ -0,0 +1,12 @@
+min.domän.org';
+$lang['admin_password']        = 'Lösenord för användare ovan.';
+$lang['sso']                   = 'Ska Single-Sign-On via Kerberos eller NTLM användas?';
+$lang['use_ssl']               = 'Använda SSL anslutning? Om använd, möjliggör inte TLS nedan.';
+$lang['use_tls']               = 'Använda TLS anslutning? Om använd, möjliggör inte SSL ovan.';
diff --git a/sources/lib/plugins/authad/lang/zh-tw/settings.php b/sources/lib/plugins/authad/lang/zh-tw/settings.php
new file mode 100644
index 0000000..bd5d941
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/zh-tw/settings.php
@@ -0,0 +1,19 @@
+@my.domain.org';
+$lang['base_dn']               = '您的基本識別名。如： DC=my,DC=domain,DC=org';
+$lang['domain_controllers']    = '以逗號分隔的域名控制器列表。如： srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = 'Active Directory 的特權使用者，可以查看所有使用者的數據。(非必要，但對發送訂閱郵件等活動來說，這是必須的。)';
+$lang['admin_password']        = '上述使用者的密碼。';
+$lang['sso']                   = '是否使用 Kerberos 或 NTLM 的單一登入系統 (Single-Sign-On)？';
+$lang['real_primarygroup']     = '是否視作真正的主要群組，而不是假設為網域使用者 (比較慢)';
+$lang['use_ssl']               = '使用 SSL 連接嗎？如果要使用，請不要啟用下方的 TLS。';
+$lang['use_tls']               = '使用 TLS 連接嗎？如果要使用，請不要啟用上方的 SSL。';
+$lang['debug']                 = '有錯誤時，顯示額外除錯資訊嗎？';
+$lang['expirywarn']            = '提前多少天警告使用者密碼即將到期。輸入0表示停用。';
+$lang['additional']            = '從使用者數據中取得額外 AD 屬性列表，以供某些附加元件使用。列表以逗號分隔。';
diff --git a/sources/lib/plugins/authad/lang/zh/settings.php b/sources/lib/plugins/authad/lang/zh/settings.php
new file mode 100644
index 0000000..84bdc1e
--- /dev/null
+++ b/sources/lib/plugins/authad/lang/zh/settings.php
@@ -0,0 +1,19 @@
+
+ */
+$lang['account_suffix']        = '您的账户后缀。例如 @my.domain.org';
+$lang['base_dn']               = '您的基本分辨名。例如 DC=my,DC=domain,DC=org';
+$lang['domain_controllers']    = '逗号分隔的域名控制器列表。例如 srv1.domain.org,srv2.domain.org';
+$lang['admin_username']        = '一个活动目录的特权用户，可以查看其他所有用户的数据。可选，但对某些活动例如发送订阅邮件是必须的。';
+$lang['admin_password']        = '上述用户的密码。';
+$lang['sso']                   = '是否使用经由 Kerberos 和 NTLM 的 Single-Sign-On？';
+$lang['real_primarygroup']     = ' 是否解析真实的主要组，而不是假设为“域用户” (较慢)';
+$lang['use_ssl']               = '使用 SSL 连接？如果是，不要激活下面的 TLS。';
+$lang['use_tls']               = '使用 TLS 连接？如果是 ，不要激活上面的 SSL。';
+$lang['debug']                 = '有错误时显示额外的调试信息？';
+$lang['expirywarn']            = '提前多少天警告用户密码即将到期。0 则禁用。';
+$lang['additional']            = '需要从用户数据中获取的额外 AD 属性的列表，以逗号分隔。用于某些插件。';
diff --git a/sources/lib/plugins/authad/plugin.info.txt b/sources/lib/plugins/authad/plugin.info.txt
new file mode 100644
index 0000000..3af1ddf
--- /dev/null
+++ b/sources/lib/plugins/authad/plugin.info.txt
@@ -0,0 +1,7 @@
+base   authad
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2013-04-25
+name   Active Directory Auth Plugin
+desc   Provides user authentication against a Microsoft Active Directory
+url    http://www.dokuwiki.org/plugin:authad
diff --git a/sources/lib/plugins/authldap/auth.php b/sources/lib/plugins/authldap/auth.php
new file mode 100644
index 0000000..31e2c51
--- /dev/null
+++ b/sources/lib/plugins/authldap/auth.php
@@ -0,0 +1,540 @@
+
+ * @author    Chris Smith 
+ * @author    Jan Schumann 
+ */
+class auth_plugin_authldap extends DokuWiki_Auth_Plugin {
+    /* @var resource $con holds the LDAP connection*/
+    protected $con = null;
+
+    /* @var int $bound What type of connection does already exist? */
+    protected $bound = 0; // 0: anonymous, 1: user, 2: superuser
+
+    /* @var array $users User data cache */
+    protected $users = null;
+
+    /* @var array $_pattern User filter pattern */
+    protected $_pattern = null;
+
+    /**
+     * Constructor
+     */
+    public function __construct() {
+        parent::__construct();
+
+        // ldap extension is needed
+        if(!function_exists('ldap_connect')) {
+            $this->_debug("LDAP err: PHP LDAP extension not found.", -1, __LINE__, __FILE__);
+            $this->success = false;
+            return;
+        }
+
+        // auth_ldap currently just handles authentication, so no
+        // capabilities are set
+    }
+
+    /**
+     * Check user+password
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct by trying to bind
+     * to the LDAP server
+     *
+     * @author  Andreas Gohr 
+     * @param string $user
+     * @param string $pass
+     * @return  bool
+     */
+    public function checkPass($user, $pass) {
+        // reject empty password
+        if(empty($pass)) return false;
+        if(!$this->_openLDAP()) return false;
+
+        // indirect user bind
+        if($this->getConf('binddn') && $this->getConf('bindpw')) {
+            // use superuser credentials
+            if(!@ldap_bind($this->con, $this->getConf('binddn'), $this->getConf('bindpw'))) {
+                $this->_debug('LDAP bind as superuser: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                return false;
+            }
+            $this->bound = 2;
+        } else if($this->getConf('binddn') &&
+            $this->getConf('usertree') &&
+            $this->getConf('userfilter')
+        ) {
+            // special bind string
+            $dn = $this->_makeFilter(
+                $this->getConf('binddn'),
+                array('user'=> $user, 'server'=> $this->getConf('server'))
+            );
+
+        } else if(strpos($this->getConf('usertree'), '%{user}')) {
+            // direct user bind
+            $dn = $this->_makeFilter(
+                $this->getConf('usertree'),
+                array('user'=> $user, 'server'=> $this->getConf('server'))
+            );
+
+        } else {
+            // Anonymous bind
+            if(!@ldap_bind($this->con)) {
+                msg("LDAP: can not bind anonymously", -1);
+                $this->_debug('LDAP anonymous bind: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                return false;
+            }
+        }
+
+        // Try to bind to with the dn if we have one.
+        if(!empty($dn)) {
+            // User/Password bind
+            if(!@ldap_bind($this->con, $dn, $pass)) {
+                $this->_debug("LDAP: bind with $dn failed", -1, __LINE__, __FILE__);
+                $this->_debug('LDAP user dn bind: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                return false;
+            }
+            $this->bound = 1;
+            return true;
+        } else {
+            // See if we can find the user
+            $info = $this->getUserData($user, true);
+            if(empty($info['dn'])) {
+                return false;
+            } else {
+                $dn = $info['dn'];
+            }
+
+            // Try to bind with the dn provided
+            if(!@ldap_bind($this->con, $dn, $pass)) {
+                $this->_debug("LDAP: bind with $dn failed", -1, __LINE__, __FILE__);
+                $this->_debug('LDAP user bind: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                return false;
+            }
+            $this->bound = 1;
+            return true;
+        }
+    }
+
+    /**
+     * Return user info
+     *
+     * Returns info about the given user needs to contain
+     * at least these fields:
+     *
+     * name string  full name of the user
+     * mail string  email addres of the user
+     * grps array   list of groups the user is in
+     *
+     * This LDAP specific function returns the following
+     * addional fields:
+     *
+     * dn     string  distinguished name (DN)
+     * uid    string  Posix User ID
+     * inbind bool    for internal use - avoid loop in binding
+     *
+     * @author  Andreas Gohr 
+     * @author  Trouble
+     * @author  Dan Allen 
+     * @author  
+     * @author  Stephane Chazelas 
+     *
+     * @param   string $user
+     * @param   bool   $inbind authldap specific, true if in bind phase
+     * @return  array containing user data or false
+     */
+    public function getUserData($user, $inbind = false) {
+        global $conf;
+        if(!$this->_openLDAP()) return false;
+
+        // force superuser bind if wanted and not bound as superuser yet
+        if($this->getConf('binddn') && $this->getConf('bindpw') && $this->bound < 2) {
+            // use superuser credentials
+            if(!@ldap_bind($this->con, $this->getConf('binddn'), $this->getConf('bindpw'))) {
+                $this->_debug('LDAP bind as superuser: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                return false;
+            }
+            $this->bound = 2;
+        } elseif($this->bound == 0 && !$inbind) {
+            // in some cases getUserData is called outside the authentication workflow
+            // eg. for sending email notification on subscribed pages. This data might not
+            // be accessible anonymously, so we try to rebind the current user here
+            list($loginuser, $loginsticky, $loginpass) = auth_getCookie();
+            if($loginuser && $loginpass) {
+                $loginpass = auth_decrypt($loginpass, auth_cookiesalt(!$loginsticky, true));
+                $this->checkPass($loginuser, $loginpass);
+            }
+        }
+
+        $info['user']   = $user;
+        $info['server'] = $this->getConf('server');
+
+        //get info for given user
+        $base = $this->_makeFilter($this->getConf('usertree'), $info);
+        if($this->getConf('userfilter')) {
+            $filter = $this->_makeFilter($this->getConf('userfilter'), $info);
+        } else {
+            $filter = "(ObjectClass=*)";
+        }
+
+        $sr     = $this->_ldapsearch($this->con, $base, $filter, $this->getConf('userscope'));
+        $result = @ldap_get_entries($this->con, $sr);
+        $this->_debug('LDAP user search: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+        $this->_debug('LDAP search at: '.htmlspecialchars($base.' '.$filter), 0, __LINE__, __FILE__);
+
+        // Don't accept more or less than one response
+        if(!is_array($result) || $result['count'] != 1) {
+            return false; //user not found
+        }
+
+        $user_result = $result[0];
+        ldap_free_result($sr);
+
+        // general user info
+        $info['dn']   = $user_result['dn'];
+        $info['gid']  = $user_result['gidnumber'][0];
+        $info['mail'] = $user_result['mail'][0];
+        $info['name'] = $user_result['cn'][0];
+        $info['grps'] = array();
+
+        // overwrite if other attribs are specified.
+        if(is_array($this->getConf('mapping'))) {
+            foreach($this->getConf('mapping') as $localkey => $key) {
+                if(is_array($key)) {
+                    // use regexp to clean up user_result
+                    list($key, $regexp) = each($key);
+                    if($user_result[$key]) foreach($user_result[$key] as $grpkey => $grp) {
+                        if($grpkey !== 'count' && preg_match($regexp, $grp, $match)) {
+                            if($localkey == 'grps') {
+                                $info[$localkey][] = $match[1];
+                            } else {
+                                $info[$localkey] = $match[1];
+                            }
+                        }
+                    }
+                } else {
+                    $info[$localkey] = $user_result[$key][0];
+                }
+            }
+        }
+        $user_result = array_merge($info, $user_result);
+
+        //get groups for given user if grouptree is given
+        if($this->getConf('grouptree') || $this->getConf('groupfilter')) {
+            $base   = $this->_makeFilter($this->getConf('grouptree'), $user_result);
+            $filter = $this->_makeFilter($this->getConf('groupfilter'), $user_result);
+            $sr     = $this->_ldapsearch($this->con, $base, $filter, $this->getConf('groupscope'), array($this->getConf('groupkey')));
+            $this->_debug('LDAP group search: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+            $this->_debug('LDAP search at: '.htmlspecialchars($base.' '.$filter), 0, __LINE__, __FILE__);
+
+            if(!$sr) {
+                msg("LDAP: Reading group memberships failed", -1);
+                return false;
+            }
+            $result = ldap_get_entries($this->con, $sr);
+            ldap_free_result($sr);
+
+            if(is_array($result)) foreach($result as $grp) {
+                if(!empty($grp[$this->getConf('groupkey')][0])) {
+                    $this->_debug('LDAP usergroup: '.htmlspecialchars($grp[$this->getConf('groupkey')][0]), 0, __LINE__, __FILE__);
+                    $info['grps'][] = $grp[$this->getConf('groupkey')][0];
+                }
+            }
+        }
+
+        // always add the default group to the list of groups
+        if(!$info['grps'] or !in_array($conf['defaultgroup'], $info['grps'])) {
+            $info['grps'][] = $conf['defaultgroup'];
+        }
+        return $info;
+    }
+
+    /**
+     * Most values in LDAP are case-insensitive
+     *
+     * @return bool
+     */
+    public function isCaseSensitive() {
+        return false;
+    }
+
+    /**
+     * Bulk retrieval of user data
+     *
+     * @author  Dominik Eckelmann 
+     * @param   int   $start     index of first user to be returned
+     * @param   int   $limit     max number of users to be returned
+     * @param   array $filter  array of field/pattern pairs, null for no filter
+     * @return  array of userinfo (refer getUserData for internal userinfo details)
+     */
+    function retrieveUsers($start = 0, $limit = -1, $filter = array()) {
+        if(!$this->_openLDAP()) return false;
+
+        if(is_null($this->users)) {
+            // Perform the search and grab all their details
+            if($this->getConf('userfilter')) {
+                $all_filter = str_replace('%{user}', '*', $this->getConf('userfilter'));
+            } else {
+                $all_filter = "(ObjectClass=*)";
+            }
+            $sr          = ldap_search($this->con, $this->getConf('usertree'), $all_filter);
+            $entries     = ldap_get_entries($this->con, $sr);
+            $users_array = array();
+            for($i = 0; $i < $entries["count"]; $i++) {
+                array_push($users_array, $entries[$i]["uid"][0]);
+            }
+            asort($users_array);
+            $result = $users_array;
+            if(!$result) return array();
+            $this->users = array_fill_keys($result, false);
+        }
+        $i     = 0;
+        $count = 0;
+        $this->_constructPattern($filter);
+        $result = array();
+
+        foreach($this->users as $user => &$info) {
+            if($i++ < $start) {
+                continue;
+            }
+            if($info === false) {
+                $info = $this->getUserData($user);
+            }
+            if($this->_filter($user, $info)) {
+                $result[$user] = $info;
+                if(($limit >= 0) && (++$count >= $limit)) break;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Make LDAP filter strings.
+     *
+     * Used by auth_getUserData to make the filter
+     * strings for grouptree and groupfilter
+     *
+     * @author  Troels Liebe Bentsen 
+     * @param   string $filter ldap search filter with placeholders
+     * @param   array  $placeholders placeholders to fill in
+     * @return  string
+     */
+    protected function _makeFilter($filter, $placeholders) {
+        preg_match_all("/%{([^}]+)/", $filter, $matches, PREG_PATTERN_ORDER);
+        //replace each match
+        foreach($matches[1] as $match) {
+            //take first element if array
+            if(is_array($placeholders[$match])) {
+                $value = $placeholders[$match][0];
+            } else {
+                $value = $placeholders[$match];
+            }
+            $value  = $this->_filterEscape($value);
+            $filter = str_replace('%{'.$match.'}', $value, $filter);
+        }
+        return $filter;
+    }
+
+    /**
+     * return true if $user + $info match $filter criteria, false otherwise
+     *
+     * @author Chris Smith 
+     *
+     * @param  string $user the user's login name
+     * @param  array  $info the user's userinfo array
+     * @return bool
+     */
+    protected  function _filter($user, $info) {
+        foreach($this->_pattern as $item => $pattern) {
+            if($item == 'user') {
+                if(!preg_match($pattern, $user)) return false;
+            } else if($item == 'grps') {
+                if(!count(preg_grep($pattern, $info['grps']))) return false;
+            } else {
+                if(!preg_match($pattern, $info[$item])) return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Set the filter pattern
+     *
+     * @author Chris Smith 
+     *
+     * @param $filter
+     * @return void
+     */
+    protected function _constructPattern($filter) {
+        $this->_pattern = array();
+        foreach($filter as $item => $pattern) {
+            $this->_pattern[$item] = '/'.str_replace('/', '\/', $pattern).'/i'; // allow regex characters
+        }
+    }
+
+    /**
+     * Escape a string to be used in a LDAP filter
+     *
+     * Ported from Perl's Net::LDAP::Util escape_filter_value
+     *
+     * @author Andreas Gohr
+     * @param  string $string
+     * @return string
+     */
+    protected function _filterEscape($string) {
+        return preg_replace(
+            '/([\x00-\x1F\*\(\)\\\\])/e',
+            '"\\\\\".join("",unpack("H2","$1"))',
+            $string
+        );
+    }
+
+    /**
+     * Opens a connection to the configured LDAP server and sets the wanted
+     * option on the connection
+     *
+     * @author  Andreas Gohr 
+     */
+    protected function _openLDAP() {
+        if($this->con) return true; // connection already established
+
+        $this->bound = 0;
+
+        $port    = $this->getConf('port');
+        $bound   = false;
+        $servers = explode(',', $this->getConf('server'));
+        foreach($servers as $server) {
+            $server    = trim($server);
+            $this->con = @ldap_connect($server, $port);
+            if(!$this->con) {
+                continue;
+            }
+
+            /*
+             * When OpenLDAP 2.x.x is used, ldap_connect() will always return a resource as it does
+             * not actually connect but just initializes the connecting parameters. The actual
+             * connect happens with the next calls to ldap_* funcs, usually with ldap_bind().
+             *
+             * So we should try to bind to server in order to check its availability.
+             */
+
+            //set protocol version and dependend options
+            if($this->getConf('version')) {
+                if(!@ldap_set_option(
+                    $this->con, LDAP_OPT_PROTOCOL_VERSION,
+                    $this->getConf('version')
+                )
+                ) {
+                    msg('Setting LDAP Protocol version '.$this->getConf('version').' failed', -1);
+                    $this->_debug('LDAP version set: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                } else {
+                    //use TLS (needs version 3)
+                    if($this->getConf('starttls')) {
+                        if(!@ldap_start_tls($this->con)) {
+                            msg('Starting TLS failed', -1);
+                            $this->_debug('LDAP TLS set: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                        }
+                    }
+                    // needs version 3
+                    if($this->getConf('referrals')) {
+                        if(!@ldap_set_option(
+                            $this->con, LDAP_OPT_REFERRALS,
+                            $this->getConf('referrals')
+                        )
+                        ) {
+                            msg('Setting LDAP referrals to off failed', -1);
+                            $this->_debug('LDAP referal set: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                        }
+                    }
+                }
+            }
+
+            //set deref mode
+            if($this->getConf('deref')) {
+                if(!@ldap_set_option($this->con, LDAP_OPT_DEREF, $this->getConf('deref'))) {
+                    msg('Setting LDAP Deref mode '.$this->getConf('deref').' failed', -1);
+                    $this->_debug('LDAP deref set: '.htmlspecialchars(ldap_error($this->con)), 0, __LINE__, __FILE__);
+                }
+            }
+            /* As of PHP 5.3.0 we can set timeout to speedup skipping of invalid servers */
+            if(defined('LDAP_OPT_NETWORK_TIMEOUT')) {
+                ldap_set_option($this->con, LDAP_OPT_NETWORK_TIMEOUT, 1);
+            }
+
+            if($this->getConf('binddn') && $this->getConf('bindpw')) {
+                $bound = @ldap_bind($this->con, $this->getConf('binddn'), $this->getConf('bindpw'));
+                $this->bound = 2;
+            } else {
+                $bound = @ldap_bind($this->con);
+            }
+            if($bound) {
+                break;
+            }
+        }
+
+        if(!$bound) {
+            msg("LDAP: couldn't connect to LDAP server", -1);
+            return false;
+        }
+
+        $this->cando['getUsers'] = true;
+        return true;
+    }
+
+    /**
+     * Wraps around ldap_search, ldap_list or ldap_read depending on $scope
+     *
+     * @author Andreas Gohr 
+     * @param resource $link_identifier
+     * @param string   $base_dn
+     * @param string   $filter
+     * @param string   $scope can be 'base', 'one' or 'sub'
+     * @param null     $attributes
+     * @param int      $attrsonly
+     * @param int      $sizelimit
+     * @param int      $timelimit
+     * @param int      $deref
+     * @return resource
+     */
+    protected function _ldapsearch($link_identifier, $base_dn, $filter, $scope = 'sub', $attributes = null,
+                         $attrsonly = 0, $sizelimit = 0) {
+        if(is_null($attributes)) $attributes = array();
+
+        if($scope == 'base') {
+            return @ldap_read(
+                $link_identifier, $base_dn, $filter, $attributes,
+                $attrsonly, $sizelimit
+            );
+        } elseif($scope == 'one') {
+            return @ldap_list(
+                $link_identifier, $base_dn, $filter, $attributes,
+                $attrsonly, $sizelimit
+            );
+        } else {
+            return @ldap_search(
+                $link_identifier, $base_dn, $filter, $attributes,
+                $attrsonly, $sizelimit
+            );
+        }
+    }
+
+    /**
+     * Wrapper around msg() but outputs only when debug is enabled
+     *
+     * @param string $message
+     * @param int    $err
+     * @param int    $line
+     * @param string $file
+     * @return void
+     */
+    protected function _debug($message, $err, $line, $file) {
+        if(!$this->getConf('debug')) return;
+        msg($message, $err, $line, $file);
+    }
+
+}
diff --git a/sources/lib/plugins/authldap/conf/default.php b/sources/lib/plugins/authldap/conf/default.php
new file mode 100644
index 0000000..2c295ee
--- /dev/null
+++ b/sources/lib/plugins/authldap/conf/default.php
@@ -0,0 +1,20 @@
+ 'danger');
+$meta['port']        = array('numeric','_caution' => 'danger');
+$meta['usertree']    = array('string','_caution' => 'danger');
+$meta['grouptree']   = array('string','_caution' => 'danger');
+$meta['userfilter']  = array('string','_caution' => 'danger');
+$meta['groupfilter'] = array('string','_caution' => 'danger');
+$meta['version']     = array('numeric','_caution' => 'danger');
+$meta['starttls']    = array('onoff','_caution' => 'danger');
+$meta['referrals']   = array('onoff','_caution' => 'danger');
+$meta['deref']       = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'danger');
+$meta['binddn']      = array('string','_caution' => 'danger');
+$meta['bindpw']      = array('password','_caution' => 'danger');
+//$meta['mapping']['name']  unsupported in config manager
+//$meta['mapping']['grps']  unsupported in config manager
+$meta['userscope']   = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['groupscope']  = array('multichoice','_choices' => array('sub','one','base'),'_caution' => 'danger');
+$meta['groupkey']    = array('string','_caution' => 'danger');
+$meta['debug']       = array('onoff','_caution' => 'security');
diff --git a/sources/lib/plugins/authldap/lang/bg/settings.php b/sources/lib/plugins/authldap/lang/bg/settings.php
new file mode 100644
index 0000000..644672c
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/bg/settings.php
@@ -0,0 +1,19 @@
+
+ */
+$lang['server']                = 'Вашият LDAP сървър. Име на хоста (localhost) или целият URL адрес (ldap://сървър.tld:389)';
+$lang['port']                  = 'Порт на LDAP  сървъра, ако не сте въвели целия URL адрес по-горе';
+$lang['usertree']              = 'Къде да се търси за потребителски акаунти. Например ou=People, dc=server, dc=tld';
+$lang['grouptree']             = 'Къде да се търси за потребителски групи. Например ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = 'LDAP филтър за търсене на потребителски акаунти. Например (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'LDAP филтър за търсене на потребителски групи. Например (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'Коя версия на протокола да се ползва? Вероятно ще се наложи да зададете 3';
+$lang['starttls']              = 'Ползване на TLS свързаност?';
+$lang['referrals']             = 'Да бъдат ли следвани препратките (препращанията)?';
+$lang['bindpw']                = 'Парола за горния потребител';
+$lang['userscope']             = 'Ограничаване на обхвата за търсене на потребители';
+$lang['groupscope']            = 'Ограничаване на обхвата за търсене на потребителски групи';
+$lang['debug']                 = 'Показване на допълнителна debug информация при грешка';
\ No newline at end of file
diff --git a/sources/lib/plugins/authldap/lang/cs/settings.php b/sources/lib/plugins/authldap/lang/cs/settings.php
new file mode 100644
index 0000000..20491f1
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/cs/settings.php
@@ -0,0 +1,22 @@
+localhost) nebo plně kvalifikovaný popis URL (ldap://server.tld:389)';
+$lang['port']                  = 'Port serveru LDAP. Pokud není, bude využito URL výše';
+$lang['usertree']              = 'Kde najít uživatelské účty, tj. ou=Lide, dc=server, dc=tld';
+$lang['grouptree']             = 'Kde najít uživatelské skupiny, tj. ou=Skupina, dc=server, dc=tld';
+$lang['userfilter']            = 'Filter LDAPu pro vyhledávání uživatelských účtů, tj. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'Filter LDAPu pro vyhledávání uživatelských skupin, tj. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'Verze použitého protokolu. Můžete potřebovat jej nastavit na 3';
+$lang['starttls']              = 'Využít spojení TLS?';
+$lang['referrals']             = 'Přeposílat odkazy?';
+$lang['binddn']                = 'Doménový název DN volitelně připojeného uživatele, pokus anonymní připojení není vyhovující, tj.  cn=admin, dc=muj, dc=domov';
+$lang['bindpw']                = 'Heslo uživatele výše';
+$lang['userscope']             = 'Omezení rozsahu vyhledávání uživatele';
+$lang['groupscope']            = 'Omezení rozsahu vyhledávání skupiny';
+$lang['groupkey']              = 'Atribut šlenství uživatele ve skupinách (namísto standardních AD skupin), tj. skupina z oddělení nebo telefonní číslo';
+$lang['debug']                 = 'Zobrazit dodatečné debugovací informace';
diff --git a/sources/lib/plugins/authldap/lang/da/settings.php b/sources/lib/plugins/authldap/lang/da/settings.php
new file mode 100644
index 0000000..b736504
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/da/settings.php
@@ -0,0 +1,15 @@
+
+ * @author soer9648 
+ */
+$lang['server']                = 'Din LDAP server. Enten værtsnavn (localhost) eller fuld kvalificeret URL (ldap://server.tld:389)';
+$lang['port']                  = 'LDAP server port, hvis der ikke er angivet en komplet URL ovenfor.';
+$lang['usertree']              = 'Hvor findes brugerkonti. F.eks. ou=Personer, dc=server, dc=tld';
+$lang['grouptree']             = 'Hvor findes brugergrupper. F.eks. ou=Grupper, dc=server, dc=tld';
+$lang['starttls']              = 'Benyt TLS forbindelser?';
+$lang['bindpw']                = 'Kodeord til ovenstående bruger';
+$lang['debug']                 = 'Vis yderligere debug output ved fejl';
diff --git a/sources/lib/plugins/authldap/lang/de-informal/settings.php b/sources/lib/plugins/authldap/lang/de-informal/settings.php
new file mode 100644
index 0000000..bdac7dd
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/de-informal/settings.php
@@ -0,0 +1,28 @@
+
+ * @author Volker Bödker 
+ */
+$lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (localhost) oder als FQDN (ldap://server.tld:389).';
+$lang['port']                  = 'Port des LDAP-Servers, falls kein Port angegeben wurde.';
+$lang['usertree']              = 'Zweig, in dem die die Benutzeraccounts gespeichert sind. Zum Beispiel: ou=People, dc=server, dc=tld.';
+$lang['grouptree']             = 'Zweig, in dem die Benutzergruppen gespeichert sind. Zum Beispiel:  ou=Group, dc=server, dc=tld.';
+$lang['userfilter']            = 'LDAP-Filter, um die Benutzeraccounts zu suchen. Zum Beispiel: (&(uid=%{user})(objectClass=posixAccount)).';
+$lang['groupfilter']           = 'LDAP-Filter, um die Benutzergruppen zu suchen. Zum Beispiel:  (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user}))).';
+$lang['version']               = 'Zu verwendende Protokollversion von LDAP.';
+$lang['starttls']              = 'Verbindung über TLS aufbauen?';
+$lang['referrals']             = 'Weiterverfolgen von LDAP-Referrals (Verweise)?';
+$lang['deref']                 = 'Wie sollen Aliasse derefernziert werden?';
+$lang['binddn']                = 'DN eines optionalen Benutzers, wenn der anonyme Zugriff nicht ausreichend ist. Zum Beispiel: cn=admin, dc=my, dc=home.';
+$lang['bindpw']                = 'Passwort des angegebenen Benutzers.';
+$lang['userscope']             = 'Die Suchweite nach Benutzeraccounts.';
+$lang['groupscope']            = 'Die Suchweite nach Benutzergruppen.';
+$lang['groupkey']              = 'Gruppieren der Benutzeraccounts anhand eines beliebigen Benutzerattributes z. B. Telefonnummer oder Abteilung, anstelle der Standard-Gruppen).';
+$lang['debug']                 = 'Debug-Informationen beim Auftreten von Fehlern anzeigen?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NIEMALS';
+$lang['deref_o_1']             = 'LDAP_DEREF_SUCHEN';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDEN';
+$lang['deref_o_3']             = 'LDAP_DEREF_IMMER';
diff --git a/sources/lib/plugins/authldap/lang/de/settings.php b/sources/lib/plugins/authldap/lang/de/settings.php
new file mode 100644
index 0000000..d788da8
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/de/settings.php
@@ -0,0 +1,28 @@
+
+ * @author christian studer 
+ */
+$lang['server']                = 'Adresse zum LDAP-Server. Entweder als Hostname (localhost) oder als FQDN (ldap://server.tld:389).';
+$lang['port']                  = 'Port des LDAP-Servers, falls kein Port angegeben wurde.';
+$lang['usertree']              = 'Zweig, in dem die die Benutzeraccounts gespeichert sind. Zum Beispiel: ou=People, dc=server, dc=tld.';
+$lang['grouptree']             = 'Zweig, in dem die Benutzergruppen gespeichert sind. Zum Beispiel:  ou=Group, dc=server, dc=tld.';
+$lang['userfilter']            = 'LDAP-Filter, um die Benutzeraccounts zu suchen. Zum Beispiel: (&(uid=%{user})(objectClass=posixAccount)).';
+$lang['groupfilter']           = 'LDAP-Filter, um die Benutzergruppen zu suchen. Zum Beispiel:  (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user}))).';
+$lang['version']               = 'Zu verwendende Protokollversion von LDAP.';
+$lang['starttls']              = 'Verbindung über TLS aufbauen?';
+$lang['referrals']             = 'Weiterverfolgen von LDAP-Referrals (Verweise)?';
+$lang['deref']                 = 'Wie sollen Aliase aufgelöst werden?';
+$lang['binddn']                = 'DN eines optionalen Benutzers, wenn der anonyme Zugriff nicht ausreichend ist. Zum Beispiel: cn=admin, dc=my, dc=home.';
+$lang['bindpw']                = 'Passwort des angegebenen Benutzers.';
+$lang['userscope']             = 'Die Suchweite nach Benutzeraccounts.';
+$lang['groupscope']            = 'Die Suchweite nach Benutzergruppen.';
+$lang['groupkey']              = 'Gruppieren der Benutzeraccounts anhand eines beliebigen Benutzerattributes z. B. Telefonnummer oder Abteilung, anstelle der Standard-Gruppen).';
+$lang['debug']                 = 'Debug-Informationen beim Auftreten von Fehlern anzeigen?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/en/settings.php b/sources/lib/plugins/authldap/lang/en/settings.php
new file mode 100644
index 0000000..b73166a
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/en/settings.php
@@ -0,0 +1,23 @@
+localhost) or full qualified URL (ldap://server.tld:389)';
+$lang['port']        = 'LDAP server port if no full URL was given above';
+$lang['usertree']    = 'Where to find the user accounts. Eg. ou=People, dc=server, dc=tld';
+$lang['grouptree']   = 'Where to find the user groups. Eg. ou=Group, dc=server, dc=tld';
+$lang['userfilter']  = 'LDAP filter to search for user accounts. Eg. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter'] = 'LDAP filter to search for groups. Eg. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']     = 'The protocol version to use. You may need to set this to 3';
+$lang['starttls']    = 'Use TLS connections?';
+$lang['referrals']   = 'Shall referrals be followed?';
+$lang['deref']       = 'How to dereference aliases?';
+$lang['binddn']      = 'DN of an optional bind user if anonymous bind is not sufficient. Eg. cn=admin, dc=my, dc=home';
+$lang['bindpw']      = 'Password of above user';
+$lang['userscope']   = 'Limit search scope for user search';
+$lang['groupscope']  = 'Limit search scope for group search';
+$lang['groupkey']    = 'Group membership from any user attribute (instead of standard AD groups) e.g. group from department or telephone number';
+$lang['debug']       = 'Display additional debug information on errors';
+
+
+$lang['deref_o_0']   = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']   = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']   = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']   = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/eo/settings.php b/sources/lib/plugins/authldap/lang/eo/settings.php
new file mode 100644
index 0000000..07b46c8
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/eo/settings.php
@@ -0,0 +1,27 @@
+
+ */
+$lang['server']                = 'Via LDAP-servilo. Aŭ servila nomo (localhost) aŭ plene detala URL (ldap://servilo.lando:389)';
+$lang['port']                  = 'LDAP-servila pordego, se vi supre ne indikis la plenan URL';
+$lang['usertree']              = 'Kie trovi uzantajn kontojn, ekz. ou=Personoj, dc=servilo, dc=lando';
+$lang['grouptree']             = 'Kie trovi uzantogrupojn, ekz. ou=Grupo, dc=servilo, dc=lando';
+$lang['userfilter']            = 'LDAP-filtrilo por serĉi uzantokontojn, ekz. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'LDAP-filtrilo por serĉi grupojn, ekz. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'La uzenda protokolversio. Eble necesas indiki 3';
+$lang['starttls']              = 'Ĉu uzi TLS-konektojn?';
+$lang['referrals']             = 'Ĉu sekvi referencojn?';
+$lang['deref']                 = 'Kiel dereferencigi kromnomojn?';
+$lang['binddn']                = 'DN de opcie bindita uzanto, se anonima bindado ne sufiĉas, ekz. cn=admin, dc=mia, dc=hejmo';
+$lang['bindpw']                = 'Pasvorto de tiu uzanto';
+$lang['userscope']             = 'Limigi serĉospacon de uzantaj serĉoj';
+$lang['groupscope']            = 'Limigi serĉospacon por grupaj serĉoj';
+$lang['groupkey']              = 'Grupa membreco de iu uzanta atributo (anstataŭ standardaj AD-grupoj), ekz. grupo de departemento aŭ telefonnumero';
+$lang['debug']                 = 'Ĉu montri aldonajn erarinformojn?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/es/settings.php b/sources/lib/plugins/authldap/lang/es/settings.php
new file mode 100644
index 0000000..f8c3ad0
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/es/settings.php
@@ -0,0 +1,13 @@
+
+ */
+$lang['starttls']              = 'Usar conexiones TLS?';
+$lang['debug']                 = 'Mostrar información adicional para depuración de errores';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/fi/settings.php b/sources/lib/plugins/authldap/lang/fi/settings.php
new file mode 100644
index 0000000..b15d8c6
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/fi/settings.php
@@ -0,0 +1,11 @@
+
+ */
+$lang['starttls']              = 'Käytä TLS yhteyttä';
+$lang['bindpw']                = 'Ylläolevan käyttäjän salasana';
+$lang['userscope']             = 'Etsi vain käyttäjiä';
+$lang['groupscope']            = 'Etsi vain ryhmiä';
diff --git a/sources/lib/plugins/authldap/lang/fr/settings.php b/sources/lib/plugins/authldap/lang/fr/settings.php
new file mode 100644
index 0000000..dc47507
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/fr/settings.php
@@ -0,0 +1,28 @@
+
+ * @author schplurtz 
+ */
+$lang['server']                = 'Votre serveur LDAP. Soit le nom d\'hôte (localhost) ou l\'URL complète (ldap://serveur.dom:389)';
+$lang['port']                  = 'Port du serveur LDAP si l\'URL complète n\'a pas été indiquée ci-dessus';
+$lang['usertree']              = 'Où trouver les comptes utilisateur. Ex.: ou=Utilisateurs, dc=serveur, dc=dom';
+$lang['grouptree']             = 'Où trouver les groupes d\'utilisateurs. Ex.: ou=Groupes, dc=serveur, dc=dom';
+$lang['userfilter']            = 'Filtre LDAP pour rechercher les comptes utilisateur. Ex.: (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'Filtre LDAP pour rechercher les groupes. Ex.: (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'La version de protocole à utiliser. Il se peut que vous deviez utiliser 3';
+$lang['starttls']              = 'Utiliser les connexions TLS?';
+$lang['referrals']             = 'Suivre les références?';
+$lang['deref']                 = 'Comment déréférencer les alias ?';
+$lang['binddn']                = 'Nom de domaine d\'un utilisateur de connexion facultatif si une connexion anonyme n\'est pas suffisante. Ex. : cn=admin, dc=mon, dc=accueil';
+$lang['bindpw']                = 'Mot de passe de l\'utilisateur ci-dessus.';
+$lang['userscope']             = 'Limiter la portée de recherche d\'utilisateurs';
+$lang['groupscope']            = 'Limiter la portée de recherche de groupes';
+$lang['groupkey']              = 'Affiliation aux groupes à partir de n\'importe quel attribut utilisateur (au lieu des groupes AD standards), p. ex. groupes par département ou numéro de téléphone';
+$lang['debug']                 = 'Afficher des informations de bégogage supplémentaires pour les erreurs';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/hu/settings.php b/sources/lib/plugins/authldap/lang/hu/settings.php
new file mode 100644
index 0000000..041f827
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/hu/settings.php
@@ -0,0 +1,27 @@
+
+ */
+$lang['server']                = 'LDAP-szerver. Hosztnév (localhost) vagy abszolút URL portszámmal (ldap://server.tld:389)';
+$lang['port']                  = 'LDAP-szerver port, ha nem URL lett megadva';
+$lang['usertree']              = 'Hol találom a felhasználókat? Pl. ou=People, dc=server, dc=tld';
+$lang['grouptree']             = 'Hol találom a csoportokat? Pl. ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = 'LDAP szűrő a felhasználók kereséséhez, pl. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'LDAP szűrő a csoportok kereséséhez, pl. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'A használt protokollverzió. Valószínűleg a 3 megfelelő';
+$lang['starttls']              = 'TLS használata?';
+$lang['referrals']             = 'Hivatkozások követése?';
+$lang['deref']                 = 'Hogyan fejtsük vissza az aliasokat?';
+$lang['binddn']                = 'Egy hozzáféréshez használt felhasználó DN-je, ha nincs névtelen hozzáférés. Pl. cn=admin, dc=my, dc=home';
+$lang['bindpw']                = 'Ehhez tartozó jelszó.';
+$lang['userscope']             = 'A keresési tartomány korlátozása erre a felhasználókra való keresésnél';
+$lang['groupscope']            = 'A keresési tartomány korlátozása erre a csoportokra való keresésnél';
+$lang['groupkey']              = 'Csoport meghatározása a következő attribútumból (az alapértelmezett AD csoporttagság helyett), pl. a szervezeti egység vagy a telefonszám';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/it/settings.php b/sources/lib/plugins/authldap/lang/it/settings.php
new file mode 100644
index 0000000..eba7cde
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/it/settings.php
@@ -0,0 +1,19 @@
+
+ * @author Claudio Lanconelli 
+ */
+$lang['server']                = 'Il tuo server LDAP. Inserire o l\'hostname (localhost) oppure un URL completo (ldap://server.tld:389)';
+$lang['port']                  = 'Porta del server LDAP se non è stato fornito un URL completo più sopra.';
+$lang['usertree']              = 'Dove cercare l\'account utente. Eg. ou=People, dc=server, dc=tld';
+$lang['grouptree']             = 'Dove cercare i gruppi utente. Eg. ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = 'Filtro per cercare l\'account utente LDAP. Eg. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'Filtro per cercare i gruppi LDAP. Eg. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'Versione protocollo da usare. Pu3';
+$lang['starttls']              = 'Usare la connessione TSL?';
+$lang['userscope']             = 'Limita il contesto di ricerca per la ricerca degli utenti';
+$lang['groupscope']            = 'Limita il contesto di ricerca per la ricerca dei gruppi';
+$lang['debug']                 = 'In caso di errori mostra ulteriori informazioni di debug';
diff --git a/sources/lib/plugins/authldap/lang/ja/settings.php b/sources/lib/plugins/authldap/lang/ja/settings.php
new file mode 100644
index 0000000..6dec9a5
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/ja/settings.php
@@ -0,0 +1,24 @@
+
+ * @author Hideaki SAWADA 
+ * @author Hideaki SAWADA 
+ */
+$lang['server']                = 'LDAPサーバー。ホスト名（localhostldap://server.tld:389）';
+$lang['port']                  = '上記が完全修飾URLでない場合、LDAPサーバーポート';
+$lang['usertree']              = 'ユーザーアカウントを探す場所。例：ou=People, dc=server, dc=tld';
+$lang['grouptree']             = 'ユーザーグループを探す場所。例：ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = 'ユーザーアカウントを探すためのLDAP抽出条件。例：(&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'グループを探すLDAP抽出条件。例：(&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = '使用するプロトコルのバージョン。3を設定する必要がある場合があります。';
+$lang['starttls']              = 'TLS接続を使用しますか？';
+$lang['binddn']                = '匿名バインドでは不十分な場合、オプションバインドユーザーのDN。例：cn=admin, dc=my, dc=home';
+$lang['bindpw']                = '上記ユーザーのパスワード';
+$lang['debug']                 = 'エラーに関して追加のデバッグ情報を表示する。';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/ko/settings.php b/sources/lib/plugins/authldap/lang/ko/settings.php
new file mode 100644
index 0000000..ae8dc7a
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/ko/settings.php
@@ -0,0 +1,27 @@
+
+ */
+$lang['server']                = 'LDAP 서버. 호스트 이름(localhost)이나 전체 자격 URL(ldap://server.tld:389) 중 하나';
+$lang['port']                  = '위에 주어진 전체 URL이 없을 때의 LDAP 서버 포트';
+$lang['usertree']              = '사용자 계정을 찾을 장소. 예를 들어 ou=People, dc=server, dc=tld';
+$lang['grouptree']             = '사용자 그룹을 찾을 장소. 예를 들어 ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = '사용자 계정을 찾을 LDAP 필터. 예를 들어 (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = '그룹을 찾을 LDAP 필터. 예를 들어 (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = '사용할 프로토콜 버전. 3으로 설정해야 할 수도 있습니다';
+$lang['starttls']              = 'TLS 연결을 사용하겠습니까?';
+$lang['referrals']             = '참고(referrals)를 허용하겠습니까? ';
+$lang['deref']                 = '어떻게 별명을 간접 참고하겠습니까?';
+$lang['binddn']                = '익명 바인드가 충분하지 않으면 선택적인 바인드 사용자의 DN. 예를 들어 cn=admin, dc=my, dc=home';
+$lang['bindpw']                = '위 사용자의 비밀번호';
+$lang['userscope']             = '사용자 검색에 대한 검색 범위 제한';
+$lang['groupscope']            = '그룹 검색에 대한 검색 범위 제한';
+$lang['groupkey']              = '(표준 AD 그룹 대신) 사용자 속성에서 그룹 구성원. 예를 들어 부서나 전화에서 그룹';
+$lang['debug']                 = '오류에 대한 추가적인 디버그 정보를 보이기';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/lv/settings.php b/sources/lib/plugins/authldap/lang/lv/settings.php
new file mode 100644
index 0000000..ced5dab
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/lv/settings.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/authldap/lang/nl/settings.php b/sources/lib/plugins/authldap/lang/nl/settings.php
new file mode 100644
index 0000000..193d1a3
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/nl/settings.php
@@ -0,0 +1,28 @@
+
+ * @author Remon 
+ */
+$lang['server']                = 'Je LDAP server. Of de servernaam (localhost) of de volledige URL (ldap://server.tld:389)';
+$lang['port']                  = 'LDAP server poort als bij de entry hierboven geen volledige URL is opgegeven';
+$lang['usertree']              = 'Locatie van de gebruikersaccounts. Bijv. ou=Personen,dc=server,dc=tld';
+$lang['grouptree']             = 'Locatie van de gebruikersgroepen. Bijv. ou=Group,dc=server,dc=tld';
+$lang['userfilter']            = 'LDAP gebruikersfilter. Bijv. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'LDAP groepsfilter. Bijv. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'Te gebruiken protocolversie. Mogelijk dat dit ingesteld moet worden op 3';
+$lang['starttls']              = 'Gebruik maken van TLS verbindingen?';
+$lang['referrals']             = 'Moeten verwijzingen worden gevolgd?';
+$lang['deref']                 = 'Hoe moeten de verwijzing van aliases worden bepaald?';
+$lang['binddn']                = 'DN van een optionele bind gebruiker als anonieme bind niet genoeg is. Bijv. cn=beheer, dc=mijn, dc=thuis';
+$lang['bindpw']                = 'Wachtwoord van bovenstaande gebruiker';
+$lang['userscope']             = 'Beperken scope van zoekfuncties voor gebruikers';
+$lang['groupscope']            = 'Beperken scope van zoekfuncties voor groepen';
+$lang['groupkey']              = 'Groepslidmaatschap van enig gebruikersattribuut (in plaats van standaard AD groepen), bijv. groep van afdeling of telefoonnummer';
+$lang['debug']                 = 'Tonen van aanvullende debuginformatie bij fouten';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/pl/settings.php b/sources/lib/plugins/authldap/lang/pl/settings.php
new file mode 100644
index 0000000..084521e
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/pl/settings.php
@@ -0,0 +1,8 @@
+
+ * @author Frederico Guimarães 
+ */
+$lang['server']                = 'Seu servidor LDAP. Ou hostname (localhost) ou uma URL completa (ldap://server.tld:389)';
+$lang['port']                  = 'Porta LDAP do servidor se nenhuma URL completa tiver sido fornecida acima';
+$lang['usertree']              = 'Onde encontrar as contas de usuários. Eg. ou=Pessoas, dc=servidor, dc=tld';
+$lang['grouptree']             = 'Onde encontrar os grupos de usuários. Eg. ou=Pessoas, dc=servidor, dc=tld';
+$lang['userfilter']            = 'Filtro LDAP para pesquisar por contas de usuários. Ex. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'Filtro LDAP para pesquisar por grupos. Ex. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'A versão do protocolo para usar. Você talvez deva definir isto para 3';
+$lang['starttls']              = 'Usar conexões TLS?';
+$lang['referrals']             = 'Permitir que as referências sejam seguidas?';
+$lang['deref']                 = 'Como dereferenciar os aliases?';
+$lang['binddn']                = 'DN de um vínculo opcional de usuário se vínculo anônimo não for suficiente. Eg. cn=admin, dc=my, dc=home';
+$lang['bindpw']                = 'Senha do usuário acima';
+$lang['userscope']             = 'Limitar escopo da busca para busca de usuário';
+$lang['groupscope']            = 'Limitar escopo da busca para busca de grupo';
+$lang['groupkey']              = 'Membro de grupo vem de qualquer atributo do usuário (ao invés de grupos padrões AD) e.g. departamento de grupo ou número de telefone';
+$lang['debug']                 = 'Mostrar informações adicionais de depuração em erros';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/pt/settings.php b/sources/lib/plugins/authldap/lang/pt/settings.php
new file mode 100644
index 0000000..a2ccf87
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/pt/settings.php
@@ -0,0 +1,18 @@
+
+ */
+$lang['server']                = 'O seu servidor de LDAP. Ou hostname (localhost) ou URL qualificado completo (ldap://servidor.tld:389)';
+$lang['port']                  = 'Porta de servidor de LDAP se o URL completo não foi fornecido acima';
+$lang['usertree']              = 'Onde encontrar as contas de utilizador. Por exemplo ou=Pessoas, dc=servidor, dc=tld';
+$lang['grouptree']             = 'Onde encontrar os grupos de utilizadores. Por exemplo code>ou=Grupo, dc=servidor, dc=tld';
+$lang['userfilter']            = 'Filtro LDAP para procurar por contas de utilizador. Por exemplo (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'Filtro LDAP para procurar por grupos. Por exemplo (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'A versão do protocolo a utilizar. Pode precisar de alterar isto para 3';
+$lang['starttls']              = 'Usar ligações TLS?';
+$lang['referrals']             = 'Referrals devem ser seguidos?';
+$lang['bindpw']                = 'Senha do utilizador acima';
+$lang['debug']                 = 'Mostrar informação adicional de debug aquando de erros';
diff --git a/sources/lib/plugins/authldap/lang/ru/settings.php b/sources/lib/plugins/authldap/lang/ru/settings.php
new file mode 100644
index 0000000..70ad7b6
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/ru/settings.php
@@ -0,0 +1,9 @@
+
+ */
+$lang['bindpw']                = 'Пароль для указанного пользователя.';
diff --git a/sources/lib/plugins/authldap/lang/sk/settings.php b/sources/lib/plugins/authldap/lang/sk/settings.php
new file mode 100644
index 0000000..c44f07e
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/sk/settings.php
@@ -0,0 +1,27 @@
+
+ */
+$lang['server']                = 'LDAP server. Adresa (localhost) alebo úplné URL (ldap://server.tld:389)';
+$lang['port']                  = 'Port LDAP servera, ak nebolo vyššie zadané úplné URL';
+$lang['usertree']              = 'Umiestnenie účtov používateľov. Napr. ou=People, dc=server, dc=tld';
+$lang['grouptree']             = 'Umiestnenie skupín používateľov. Napr. ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = 'LDAP filter pre vyhľadávanie používateľských účtov. Napr. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'LDAP filter pre vyhľadávanie skupín. Napr. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'Použitá verzia protokolu. Možno bude potrebné nastaviť na hodnotu 3';
+$lang['starttls']              = 'Použiť TLS pripojenie?';
+$lang['referrals']             = 'Majú byť nasledované odkazy na používateľov (referrals)?';
+$lang['deref']                 = 'Ako previesť aliasy?';
+$lang['binddn']                = 'DN prípadného priradenia používateľa, ak anonymné priradenie nie je dostatočné. Napr. cn=admin, dc=my, dc=home';
+$lang['bindpw']                = 'Heslo vyššie uvedeného používateľa';
+$lang['userscope']             = 'Obmedzenie oblasti pri vyhľadávaní používateľa';
+$lang['groupscope']            = 'Obmedzenie oblasti pri vyhľadávaní skupiny';
+$lang['groupkey']              = 'Príslušnost k skupine určená z daného atribútu používateľa (namiesto štandardnej AD skupiny) napr. skupiny podľa oddelenia alebo telefónneho čísla';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie pri chybe';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/sv/settings.php b/sources/lib/plugins/authldap/lang/sv/settings.php
new file mode 100644
index 0000000..d984004
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/sv/settings.php
@@ -0,0 +1,19 @@
+
+ */
+$lang['server']                = 'Din LDAO server. Antingen värdnamn (localhost) eller giltig full URL (ldap://server.tld:389)';
+$lang['port']                  = 'LDAP server port, om det inte angavs full URL ovan';
+$lang['usertree']              = 'Specificera var användarkonton finns. T.ex. ou=Användare, dc=server, dc=tld';
+$lang['grouptree']             = 'Specificera var grupper finns. T.ex. ou=Grupp, dc=server, dc=tld';
+$lang['userfilter']            = 'LDAP filter för att söka efter användarkonton. T.ex. (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = 'LDAP filter för att söka efter grupper. T.ex. (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = 'Version av protokoll att använda. Du kan behöva sätta detta till 3';
+$lang['starttls']              = 'Använd TLS-anslutningar';
+$lang['bindpw']                = 'Lösenord för användare ovan';
+$lang['groupkey']              = 'Gruppmedlemskap från något användarattribut (istället för standard AD grupp) t.ex. grupp från avdelning eller telefonnummer';
+$lang['debug']                 = 'Visa ytterligare felsökningsinformation vid fel';
diff --git a/sources/lib/plugins/authldap/lang/zh-tw/settings.php b/sources/lib/plugins/authldap/lang/zh-tw/settings.php
new file mode 100644
index 0000000..7e35ef6
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/zh-tw/settings.php
@@ -0,0 +1,26 @@
+localhost) 或完整的 URL (ldap://server.tld:389)';
+$lang['port']                  = 'LDAP 伺服器端口 (若上方沒填寫完整的 URL)';
+$lang['usertree']              = '到哪裏尋找使用者帳號？如： ou=People, dc=server, dc=tld';
+$lang['grouptree']             = '到哪裏尋找使用者群組？如： ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = '用於搜索使用者賬號的 LDAP 篩選器。如： (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = '用於搜索群組的 LDAP 篩選器。例如 (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = '使用的通訊協定版本。您可能要設置為 3';
+$lang['starttls']              = '使用 TLS 連接嗎？';
+$lang['referrals']             = '是否允許引用 (referrals)？';
+$lang['binddn']                = '非必要綁定使用者 (optional bind user) 的 DN (匿名綁定不能滿足要求時使用)。如： cn=admin, dc=my, dc=home';
+$lang['bindpw']                = '上述使用者的密碼';
+$lang['userscope']             = '限制使用者搜索的範圍';
+$lang['groupscope']            = '限制群組搜索的範圍';
+$lang['groupkey']              = '以其他使用者屬性 (而非標準 AD 群組) 來把使用者分組，例如以部門或電話號碼分類';
+$lang['debug']                 = '有錯誤時，顯示額外除錯資訊';
+
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/lang/zh/settings.php b/sources/lib/plugins/authldap/lang/zh/settings.php
new file mode 100644
index 0000000..77c2c69
--- /dev/null
+++ b/sources/lib/plugins/authldap/lang/zh/settings.php
@@ -0,0 +1,26 @@
+
+ */
+$lang['server']                = '您的 LDAP 服务器。填写主机名 (localhost) 或者完整的 URL (ldap://server.tld:389)';
+$lang['port']                  = 'LDAP 服务器端口 (如果上面没有给出完整的 URL)';
+$lang['usertree']              = '何处查找用户账户。例如 ou=People, dc=server, dc=tld';
+$lang['grouptree']             = '何处查找用户组。例如 ou=Group, dc=server, dc=tld';
+$lang['userfilter']            = '用于搜索用户账户的 LDAP 筛选器。例如 (&(uid=%{user})(objectClass=posixAccount))';
+$lang['groupfilter']           = '用于搜索组的 LDAP 筛选器。例如 (&(objectClass=posixGroup)(|(gidNumber=%{gid})(memberUID=%{user})))';
+$lang['version']               = '使用的协议版本。您或许需要设置为 3';
+$lang['starttls']              = '使用 TLS 连接？';
+$lang['referrals']             = '是否允许引用 (referrals)？';
+$lang['binddn']                = '一个可选的绑定用户的 DN (如果匿名绑定不满足要求)。例如 cn=admin, dc=my, dc=home';
+$lang['bindpw']                = '上述用户的密码';
+$lang['userscope']             = '限制用户搜索的范围';
+$lang['groupscope']            = '限制组搜索的范围';
+$lang['groupkey']              = '根据任何用户属性得来的组成员(而不是标准的 AD 组)，例如根据部门或者电话号码得到的组。';
+$lang['debug']                 = '有错误时显示额外的调试信息';
+$lang['deref_o_0']             = 'LDAP_DEREF_NEVER';
+$lang['deref_o_1']             = 'LDAP_DEREF_SEARCHING';
+$lang['deref_o_2']             = 'LDAP_DEREF_FINDING';
+$lang['deref_o_3']             = 'LDAP_DEREF_ALWAYS';
diff --git a/sources/lib/plugins/authldap/plugin.info.txt b/sources/lib/plugins/authldap/plugin.info.txt
new file mode 100644
index 0000000..0d0b13f
--- /dev/null
+++ b/sources/lib/plugins/authldap/plugin.info.txt
@@ -0,0 +1,7 @@
+base   authldap
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2013-04-19
+name   LDAP Auth Plugin
+desc   Provides user authentication against an LDAP server
+url    http://www.dokuwiki.org/plugin:authldap
diff --git a/sources/lib/plugins/authmysql/auth.php b/sources/lib/plugins/authmysql/auth.php
new file mode 100644
index 0000000..036644a
--- /dev/null
+++ b/sources/lib/plugins/authmysql/auth.php
@@ -0,0 +1,975 @@
+
+ * @author     Chris Smith 
+ * @author     Matthias Grimm 
+ * @author     Jan Schumann 
+ */
+class auth_plugin_authmysql extends DokuWiki_Auth_Plugin {
+    /** @var resource holds the database connection */
+    protected $dbcon = 0;
+    /** @var int database version*/
+    protected $dbver = 0;
+    /** @var int database revision */
+    protected $dbrev = 0;
+    /** @var int database subrevision */
+    protected $dbsub = 0;
+
+    /**
+     * Constructor
+     *
+     * checks if the mysql interface is available, otherwise it will
+     * set the variable $success of the basis class to false
+     *
+     * @author Matthias Grimm 
+     */
+    public function __construct() {
+        parent::__construct();
+
+        if(!function_exists('mysql_connect')) {
+            $this->_debug("MySQL err: PHP MySQL extension not found.", -1, __LINE__, __FILE__);
+            $this->success = false;
+            return;
+        }
+
+        // set capabilities based upon config strings set
+        if(!$this->getConf('server') || !$this->getConf('user') || !$this->getConf('database')) {
+            $this->_debug("MySQL err: insufficient configuration.", -1, __LINE__, __FILE__);
+
+            $this->success = false;
+            return;
+        }
+
+        $this->cando['addUser']   = $this->_chkcnf(
+            array(
+                 'getUserInfo',
+                 'getGroups',
+                 'addUser',
+                 'getUserID',
+                 'getGroupID',
+                 'addGroup',
+                 'addUserGroup'
+            ), true
+        );
+        $this->cando['delUser']   = $this->_chkcnf(
+            array(
+                 'getUserID',
+                 'delUser',
+                 'delUserRefs'
+            ), true
+        );
+        $this->cando['modLogin']  = $this->_chkcnf(
+            array(
+                 'getUserID',
+                 'updateUser',
+                 'UpdateTarget'
+            ), true
+        );
+        $this->cando['modPass']   = $this->cando['modLogin'];
+        $this->cando['modName']   = $this->cando['modLogin'];
+        $this->cando['modMail']   = $this->cando['modLogin'];
+        $this->cando['modGroups'] = $this->_chkcnf(
+            array(
+                 'getUserID',
+                 'getGroups',
+                 'getGroupID',
+                 'addGroup',
+                 'addUserGroup',
+                 'delGroup',
+                 'getGroupID',
+                 'delUserGroup'
+            ), true
+        );
+        /* getGroups is not yet supported
+           $this->cando['getGroups']    = $this->_chkcnf(array('getGroups',
+           'getGroupID'),false); */
+        $this->cando['getUsers']     = $this->_chkcnf(
+            array(
+                 'getUsers',
+                 'getUserInfo',
+                 'getGroups'
+            ), false
+        );
+        $this->cando['getUserCount'] = $this->_chkcnf(array('getUsers'), false);
+
+        if($this->getConf('debug') >= 2) {
+            $candoDebug = '';
+            foreach($this->cando as $cd => $value) {
+                if($value) { $value = 'yes'; } else { $value = 'no'; }
+                $candoDebug .= $cd . ": " . $value . " | ";
+            }
+            $this->_debug("authmysql cando: " . $candoDebug, 0, __LINE__, __FILE__);
+        }
+    }
+
+    /**
+     * Check if the given config strings are set
+     *
+     * @author  Matthias Grimm 
+     * @param   array $keys
+     * @param   bool  $wop is this a check for a write operation?
+     * @return  bool
+     */
+    protected function _chkcnf($keys, $wop = false) {
+        foreach($keys as $key) {
+            if(!$this->getConf($key)) return false;
+        }
+
+        /* write operation and lock array filled with tables names? */
+        if($wop && (!is_array($this->getConf('TablesToLock')) ||
+            !count($this->getConf('TablesToLock')))
+        ) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Checks if the given user exists and the given plaintext password
+     * is correct. Furtheron it might be checked wether the user is
+     * member of the right group
+     *
+     * Depending on which SQL string is defined in the config, password
+     * checking is done here (getpass) or by the database (passcheck)
+     *
+     * @param  string $user user who would like access
+     * @param  string $pass user's clear text password to check
+     * @return bool
+     *
+     * @author  Andreas Gohr 
+     * @author  Matthias Grimm 
+     */
+    public function checkPass($user, $pass) {
+        global $conf;
+        $rc = false;
+
+        if($this->_openDB()) {
+            $sql    = str_replace('%{user}', $this->_escape($user), $this->getConf('checkPass'));
+            $sql    = str_replace('%{pass}', $this->_escape($pass), $sql);
+            $sql    = str_replace('%{dgroup}', $this->_escape($conf['defaultgroup']), $sql);
+            $result = $this->_queryDB($sql);
+
+            if($result !== false && count($result) == 1) {
+                if($this->getConf('forwardClearPass') == 1)
+                    $rc = true;
+                else
+                    $rc = auth_verifyPassword($pass, $result[0]['pass']);
+            }
+            $this->_closeDB();
+        }
+        return $rc;
+    }
+
+    /**
+     * Return user info
+     *
+     * @author  Andreas Gohr 
+     * @author  Matthias Grimm 
+     *
+     * @param string $user user login to get data for
+     * @return array|bool
+     */
+    public function getUserData($user) {
+        if($this->_openDB()) {
+            $this->_lockTables("READ");
+            $info = $this->_getUserInfo($user);
+            $this->_unlockTables();
+            $this->_closeDB();
+        } else
+            $info = false;
+        return $info;
+    }
+
+    /**
+     * Create a new User. Returns false if the user already exists,
+     * null when an error occurred and true if everything went well.
+     *
+     * The new user will be added to the default group by this
+     * function if grps are not specified (default behaviour).
+     *
+     * @author  Andreas Gohr 
+     * @author  Chris Smith 
+     * @author  Matthias Grimm 
+     *
+     * @param string $user  nick of the user
+     * @param string $pwd   clear text password
+     * @param string $name  full name of the user
+     * @param string $mail  email address
+     * @param array  $grps  array of groups the user should become member of
+     * @return bool|null
+     */
+    public function createUser($user, $pwd, $name, $mail, $grps = null) {
+        global $conf;
+
+        if($this->_openDB()) {
+            if(($info = $this->_getUserInfo($user)) !== false)
+                return false; // user already exists
+
+            // set defaultgroup if no groups were given
+            if($grps == null)
+                $grps = array($conf['defaultgroup']);
+
+            $this->_lockTables("WRITE");
+            $pwd = $this->getConf('forwardClearPass') ? $pwd : auth_cryptPassword($pwd);
+            $rc  = $this->_addUser($user, $pwd, $name, $mail, $grps);
+            $this->_unlockTables();
+            $this->_closeDB();
+            if($rc) return true;
+        }
+        return null; // return error
+    }
+
+    /**
+     * Modify user data
+     *
+     * An existing user dataset will be modified. Changes are given in an array.
+     *
+     * The dataset update will be rejected if the user name should be changed
+     * to an already existing one.
+     *
+     * The password must be provides unencrypted. Pasword cryption is done
+     * automatically if configured.
+     *
+     * If one or more groups could't be updated, an error would be set. In
+     * this case the dataset might already be changed and we can't rollback
+     * the changes. Transactions would be really usefull here.
+     *
+     * modifyUser() may be called without SQL statements defined that are
+     * needed to change group membership (for example if only the user profile
+     * should be modified). In this case we asure that we don't touch groups
+     * even $changes['grps'] is set by mistake.
+     *
+     * @author  Chris Smith 
+     * @author  Matthias Grimm 
+     *
+     * @param   string $user    nick of the user to be changed
+     * @param   array  $changes array of field/value pairs to be changed (password will be clear text)
+     * @return  bool   true on success, false on error
+     */
+    public function modifyUser($user, $changes) {
+        $rc = false;
+
+        if(!is_array($changes) || !count($changes))
+            return true; // nothing to change
+
+        if($this->_openDB()) {
+            $this->_lockTables("WRITE");
+
+            if(($uid = $this->_getUserID($user))) {
+                $rc = $this->_updateUserInfo($changes, $uid);
+
+                if($rc && isset($changes['grps']) && $this->cando['modGroups']) {
+                    $groups = $this->_getGroups($user);
+                    $grpadd = array_diff($changes['grps'], $groups);
+                    $grpdel = array_diff($groups, $changes['grps']);
+
+                    foreach($grpadd as $group)
+                        if(($this->_addUserToGroup($user, $group, 1)) == false)
+                            $rc = false;
+
+                    foreach($grpdel as $group)
+                        if(($this->_delUserFromGroup($user, $group)) == false)
+                            $rc = false;
+                }
+            }
+
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $rc;
+    }
+
+    /**
+     * [public function]
+     *
+     * Remove one or more users from the list of registered users
+     *
+     * @param   array  $users   array of users to be deleted
+     * @return  int             the number of users deleted
+     *
+     * @author  Christopher Smith 
+     * @author  Matthias Grimm 
+     */
+    function deleteUsers($users) {
+        $count = 0;
+
+        if($this->_openDB()) {
+            if(is_array($users) && count($users)) {
+                $this->_lockTables("WRITE");
+                foreach($users as $user) {
+                    if($this->_delUser($user))
+                        $count++;
+                }
+                $this->_unlockTables();
+            }
+            $this->_closeDB();
+        }
+        return $count;
+    }
+
+    /**
+     * Counts users which meet certain $filter criteria.
+     *
+     * @author  Matthias Grimm 
+     *
+     * @param  array $filter  filter criteria in item/pattern pairs
+     * @return int count of found users
+     */
+    public function getUserCount($filter = array()) {
+        $rc = 0;
+
+        if($this->_openDB()) {
+            $sql = $this->_createSQLFilter($this->getConf('getUsers'), $filter);
+
+            if($this->dbver >= 4) {
+                $sql = substr($sql, 6); /* remove 'SELECT' or 'select' */
+                $sql = "SELECT SQL_CALC_FOUND_ROWS".$sql." LIMIT 1";
+                $this->_queryDB($sql);
+                $result = $this->_queryDB("SELECT FOUND_ROWS()");
+                $rc     = $result[0]['FOUND_ROWS()'];
+            } else if(($result = $this->_queryDB($sql)))
+                $rc = count($result);
+
+            $this->_closeDB();
+        }
+        return $rc;
+    }
+
+    /**
+     * Bulk retrieval of user data
+     *
+     * @author  Matthias Grimm 
+     *
+     * @param  int          $first  index of first user to be returned
+     * @param  int          $limit  max number of users to be returned
+     * @param  array|string $filter array of field/pattern pairs
+     * @return  array userinfo (refer getUserData for internal userinfo details)
+     */
+    public function retrieveUsers($first = 0, $limit = 10, $filter = array()) {
+        $out = array();
+
+        if($this->_openDB()) {
+            $this->_lockTables("READ");
+            $sql = $this->_createSQLFilter($this->getConf('getUsers'), $filter);
+            $sql .= " ".$this->getConf('SortOrder')." LIMIT $first, $limit";
+            $result = $this->_queryDB($sql);
+
+            if(!empty($result)) {
+                foreach($result as $user)
+                    if(($info = $this->_getUserInfo($user['user'])))
+                        $out[$user['user']] = $info;
+            }
+
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $out;
+    }
+
+    /**
+     * Give user membership of a group
+     *
+     * @author  Matthias Grimm 
+     *
+     * @param   string $user
+     * @param   string $group
+     * @return  bool   true on success, false on error
+     */
+    protected function joinGroup($user, $group) {
+        $rc = false;
+
+        if($this->_openDB()) {
+            $this->_lockTables("WRITE");
+            $rc = $this->_addUserToGroup($user, $group);
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $rc;
+    }
+
+    /**
+     * Remove user from a group
+     *
+     * @author  Matthias Grimm 
+     *
+     * @param   string $user  user that leaves a group
+     * @param   string $group group to leave
+     * @return  bool
+     */
+    protected function leaveGroup($user, $group) {
+        $rc = false;
+
+        if($this->_openDB()) {
+            $this->_lockTables("WRITE");
+            $rc  = $this->_delUserFromGroup($user, $group);
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $rc;
+    }
+
+    /**
+     * MySQL is case-insensitive
+     */
+    public function isCaseSensitive() {
+        return false;
+    }
+
+    /**
+     * Adds a user to a group.
+     *
+     * If $force is set to true non existing groups would be created.
+     *
+     * The database connection must already be established. Otherwise
+     * this function does nothing and returns 'false'. It is strongly
+     * recommended to call this function only after all participating
+     * tables (group and usergroup) have been locked.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param   string $user    user to add to a group
+     * @param   string $group   name of the group
+     * @param   bool   $force   create missing groups
+     * @return  bool   true on success, false on error
+     */
+    protected function _addUserToGroup($user, $group, $force = false) {
+        $newgroup = 0;
+
+        if(($this->dbcon) && ($user)) {
+            $gid = $this->_getGroupID($group);
+            if(!$gid) {
+                if($force) { // create missing groups
+                    $sql      = str_replace('%{group}', $this->_escape($group), $this->getConf('addGroup'));
+                    $gid      = $this->_modifyDB($sql);
+                    $newgroup = 1; // group newly created
+                }
+                if(!$gid) return false; // group didn't exist and can't be created
+            }
+
+            $sql = $this->getConf('addUserGroup');
+            if(strpos($sql, '%{uid}') !== false) {
+                $uid = $this->_getUserID($user);
+                $sql = str_replace('%{uid}', $this->_escape($uid), $sql);
+            }
+            $sql = str_replace('%{user}', $this->_escape($user), $sql);
+            $sql = str_replace('%{gid}', $this->_escape($gid), $sql);
+            $sql = str_replace('%{group}', $this->_escape($group), $sql);
+            if($this->_modifyDB($sql) !== false) return true;
+
+            if($newgroup) { // remove previously created group on error
+                $sql = str_replace('%{gid}', $this->_escape($gid), $this->getConf('delGroup'));
+                $sql = str_replace('%{group}', $this->_escape($group), $sql);
+                $this->_modifyDB($sql);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Remove user from a group
+     *
+     * @author  Matthias Grimm 
+     *
+     * @param   string $user  user that leaves a group
+     * @param   string $group group to leave
+     * @return  bool   true on success, false on error
+     */
+    protected function _delUserFromGroup($user, $group) {
+        $rc = false;
+
+        if(($this->dbcon) && ($user)) {
+            $sql = $this->getConf('delUserGroup');
+            if(strpos($sql, '%{uid}') !== false) {
+                $uid = $this->_getUserID($user);
+                $sql = str_replace('%{uid}', $this->_escape($uid), $sql);
+            }
+            $gid = $this->_getGroupID($group);
+            if($gid) {
+                $sql = str_replace('%{user}', $this->_escape($user), $sql);
+                $sql = str_replace('%{gid}', $this->_escape($gid), $sql);
+                $sql = str_replace('%{group}', $this->_escape($group), $sql);
+                $rc  = $this->_modifyDB($sql) == 0 ? true : false;
+            }
+        }
+        return $rc;
+    }
+
+    /**
+     * Retrieves a list of groups the user is a member off.
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * false.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param  string $user user whose groups should be listed
+     * @return bool|array false on error, all groups on success
+     */
+    protected function _getGroups($user) {
+        $groups = array();
+
+        if($this->dbcon) {
+            $sql    = str_replace('%{user}', $this->_escape($user), $this->getConf('getGroups'));
+            $result = $this->_queryDB($sql);
+
+            if($result !== false && count($result)) {
+                foreach($result as $row)
+                    $groups[] = $row['group'];
+            }
+            return $groups;
+        }
+        return false;
+    }
+
+    /**
+     * Retrieves the user id of a given user name
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * false.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param  string $user user whose id is desired
+     * @return mixed  user id
+     */
+    protected function _getUserID($user) {
+        if($this->dbcon) {
+            $sql    = str_replace('%{user}', $this->_escape($user), $this->getConf('getUserID'));
+            $result = $this->_queryDB($sql);
+            return $result === false ? false : $result[0]['id'];
+        }
+        return false;
+    }
+
+    /**
+     * Adds a new User to the database.
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * false.
+     *
+     * @author  Andreas Gohr 
+     * @author  Chris Smith 
+     * @author  Matthias Grimm 
+     *
+     * @param  string $user  login of the user
+     * @param  string $pwd   encrypted password
+     * @param  string $name  full name of the user
+     * @param  string $mail  email address
+     * @param  array  $grps  array of groups the user should become member of
+     * @return bool
+     */
+    protected function _addUser($user, $pwd, $name, $mail, $grps) {
+        if($this->dbcon && is_array($grps)) {
+            $sql = str_replace('%{user}', $this->_escape($user), $this->getConf('addUser'));
+            $sql = str_replace('%{pass}', $this->_escape($pwd), $sql);
+            $sql = str_replace('%{name}', $this->_escape($name), $sql);
+            $sql = str_replace('%{email}', $this->_escape($mail), $sql);
+            $uid = $this->_modifyDB($sql);
+            $gid = false;
+            $group = '';
+
+            if($uid) {
+                foreach($grps as $group) {
+                    $gid = $this->_addUserToGroup($user, $group, 1);
+                    if($gid === false) break;
+                }
+
+                if($gid !== false){
+                    return true;
+                } else {
+                    /* remove the new user and all group relations if a group can't
+                     * be assigned. Newly created groups will remain in the database
+                     * and won't be removed. This might create orphaned groups but
+                     * is not a big issue so we ignore this problem here.
+                     */
+                    $this->_delUser($user);
+                    $this->_debug("MySQL err: Adding user '$user' to group '$group' failed.", -1, __LINE__, __FILE__);
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Deletes a given user and all his group references.
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * false.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param  string $user user whose id is desired
+     * @return bool
+     */
+    protected function _delUser($user) {
+        if($this->dbcon) {
+            $uid = $this->_getUserID($user);
+            if($uid) {
+                $sql = str_replace('%{uid}', $this->_escape($uid), $this->getConf('delUserRefs'));
+                $this->_modifyDB($sql);
+                $sql = str_replace('%{uid}', $this->_escape($uid), $this->getConf('delUser'));
+                $sql = str_replace('%{user}', $this->_escape($user), $sql);
+                $this->_modifyDB($sql);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * getUserInfo
+     *
+     * Gets the data for a specific user The database connection
+     * must already be established for this function to work.
+     * Otherwise it will return 'false'.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param  string $user  user's nick to get data for
+     * @return bool|array false on error, user info on success
+     */
+    protected function _getUserInfo($user) {
+        $sql    = str_replace('%{user}', $this->_escape($user), $this->getConf('getUserInfo'));
+        $result = $this->_queryDB($sql);
+        if($result !== false && count($result)) {
+            $info         = $result[0];
+            $info['grps'] = $this->_getGroups($user);
+            return $info;
+        }
+        return false;
+    }
+
+    /**
+     * Updates the user info in the database
+     *
+     * Update a user data structure in the database according changes
+     * given in an array. The user name can only be changes if it didn't
+     * exists already. If the new user name exists the update procedure
+     * will be aborted. The database keeps unchanged.
+     *
+     * The database connection has already to be established for this
+     * function to work. Otherwise it will return 'false'.
+     *
+     * The password will be crypted if necessary.
+     *
+     * @param  array $changes  array of items to change as pairs of item and value
+     * @param  mixed $uid      user id of dataset to change, must be unique in DB
+     * @return bool true on success or false on error
+     *
+     * @author Matthias Grimm 
+     */
+    protected function _updateUserInfo($changes, $uid) {
+        $sql = $this->getConf('updateUser')." ";
+        $cnt = 0;
+        $err = 0;
+
+        if($this->dbcon) {
+            foreach($changes as $item => $value) {
+                if($item == 'user') {
+                    if(($this->_getUserID($changes['user']))) {
+                        $err = 1; /* new username already exists */
+                        break; /* abort update */
+                    }
+                    if($cnt++ > 0) $sql .= ", ";
+                    $sql .= str_replace('%{user}', $value, $this->getConf('UpdateLogin'));
+                } else if($item == 'name') {
+                    if($cnt++ > 0) $sql .= ", ";
+                    $sql .= str_replace('%{name}', $value, $this->getConf('UpdateName'));
+                } else if($item == 'pass') {
+                    if(!$this->getConf('forwardClearPass'))
+                        $value = auth_cryptPassword($value);
+                    if($cnt++ > 0) $sql .= ", ";
+                    $sql .= str_replace('%{pass}', $value, $this->getConf('UpdatePass'));
+                } else if($item == 'mail') {
+                    if($cnt++ > 0) $sql .= ", ";
+                    $sql .= str_replace('%{email}', $value, $this->getConf('UpdateEmail'));
+                }
+            }
+
+            if($err == 0) {
+                if($cnt > 0) {
+                    $sql .= " ".str_replace('%{uid}', $uid, $this->getConf('UpdateTarget'));
+                    if(get_class($this) == 'auth_mysql') $sql .= " LIMIT 1"; //some PgSQL inheritance comp.
+                    $this->_modifyDB($sql);
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Retrieves the group id of a given group name
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * false.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param  string $group   group name which id is desired
+     * @return mixed group id
+     */
+    protected function _getGroupID($group) {
+        if($this->dbcon) {
+            $sql    = str_replace('%{group}', $this->_escape($group), $this->getConf('getGroupID'));
+            $result = $this->_queryDB($sql);
+            return $result === false ? false : $result[0]['id'];
+        }
+        return false;
+    }
+
+    /**
+     * Opens a connection to a database and saves the handle for further
+     * usage in the object. The successful call to this functions is
+     * essential for most functions in this object.
+     *
+     * @author Matthias Grimm 
+     *
+     * @return bool
+     */
+    protected function _openDB() {
+        if(!$this->dbcon) {
+            $con = @mysql_connect($this->getConf('server'), $this->getConf('user'), $this->getConf('password'));
+            if($con) {
+                if((mysql_select_db($this->getConf('database'), $con))) {
+                    if((preg_match('/^(\d+)\.(\d+)\.(\d+).*/', mysql_get_server_info($con), $result)) == 1) {
+                        $this->dbver = $result[1];
+                        $this->dbrev = $result[2];
+                        $this->dbsub = $result[3];
+                    }
+                    $this->dbcon = $con;
+                    if($this->getConf('charset')) {
+                        mysql_query('SET CHARACTER SET "'.$this->getConf('charset').'"', $con);
+                    }
+                    return true; // connection and database successfully opened
+                } else {
+                    mysql_close($con);
+                    $this->_debug("MySQL err: No access to database {$this->getConf('database')}.", -1, __LINE__, __FILE__);
+                }
+            } else {
+                $this->_debug(
+                    "MySQL err: Connection to {$this->getConf('user')}@{$this->getConf('server')} not possible.",
+                    -1, __LINE__, __FILE__
+                );
+            }
+
+            return false; // connection failed
+        }
+        return true; // connection already open
+    }
+
+    /**
+     * Closes a database connection.
+     *
+     * @author Matthias Grimm 
+     */
+    protected function _closeDB() {
+        if($this->dbcon) {
+            mysql_close($this->dbcon);
+            $this->dbcon = 0;
+        }
+    }
+
+    /**
+     * Sends a SQL query to the database and transforms the result into
+     * an associative array.
+     *
+     * This function is only able to handle queries that returns a
+     * table such as SELECT.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param string $query  SQL string that contains the query
+     * @return array with the result table
+     */
+    protected function _queryDB($query) {
+        if($this->getConf('debug') >= 2) {
+            msg('MySQL query: '.hsc($query), 0, __LINE__, __FILE__);
+        }
+
+        $resultarray = array();
+        if($this->dbcon) {
+            $result = @mysql_query($query, $this->dbcon);
+            if($result) {
+                while(($t = mysql_fetch_assoc($result)) !== false)
+                    $resultarray[] = $t;
+                mysql_free_result($result);
+                return $resultarray;
+            }
+            $this->_debug('MySQL err: '.mysql_error($this->dbcon), -1, __LINE__, __FILE__);
+        }
+        return false;
+    }
+
+    /**
+     * Sends a SQL query to the database
+     *
+     * This function is only able to handle queries that returns
+     * either nothing or an id value such as INPUT, DELETE, UPDATE, etc.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param string $query  SQL string that contains the query
+     * @return int|bool insert id or 0, false on error
+     */
+    protected function _modifyDB($query) {
+        if($this->getConf('debug') >= 2) {
+            msg('MySQL query: '.hsc($query), 0, __LINE__, __FILE__);
+        }
+
+        if($this->dbcon) {
+            $result = @mysql_query($query, $this->dbcon);
+            if($result) {
+                $rc = mysql_insert_id($this->dbcon); //give back ID on insert
+                if($rc !== false) return $rc;
+            }
+            $this->_debug('MySQL err: '.mysql_error($this->dbcon), -1, __LINE__, __FILE__);
+        }
+        return false;
+    }
+
+    /**
+     * Locked a list of tables for exclusive access so that modifications
+     * to the database can't be disturbed by other threads. The list
+     * could be set with $conf['plugin']['authmysql']['TablesToLock'] = array()
+     *
+     * If aliases for tables are used in SQL statements, also this aliases
+     * must be locked. For eg. you use a table 'user' and the alias 'u' in
+     * some sql queries, the array must looks like this (order is important):
+     *   array("user", "user AS u");
+     *
+     * MySQL V3 is not able to handle transactions with COMMIT/ROLLBACK
+     * so that this functionality is simulated by this function. Nevertheless
+     * it is not as powerful as transactions, it is a good compromise in safty.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param string $mode  could be 'READ' or 'WRITE'
+     * @return bool
+     */
+    protected function _lockTables($mode) {
+        if($this->dbcon) {
+            $ttl = $this->getConf('TablesToLock');
+            if(is_array($ttl) && !empty($ttl)) {
+                if($mode == "READ" || $mode == "WRITE") {
+                    $sql = "LOCK TABLES ";
+                    $cnt = 0;
+                    foreach($ttl as $table) {
+                        if($cnt++ != 0) $sql .= ", ";
+                        $sql .= "$table $mode";
+                    }
+                    $this->_modifyDB($sql);
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Unlock locked tables. All existing locks of this thread will be
+     * abrogated.
+     *
+     * @author Matthias Grimm 
+     */
+    protected function _unlockTables() {
+        if($this->dbcon) {
+            $this->_modifyDB("UNLOCK TABLES");
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Transforms the filter settings in an filter string for a SQL database
+     * The database connection must already be established, otherwise the
+     * original SQL string without filter criteria will be returned.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param  string $sql     SQL string to which the $filter criteria should be added
+     * @param  array $filter  array of filter criteria as pairs of item and pattern
+     * @return string SQL string with attached $filter criteria on success, original SQL string on error
+     */
+    protected function _createSQLFilter($sql, $filter) {
+        $SQLfilter = "";
+        $cnt       = 0;
+
+        if($this->dbcon) {
+            foreach($filter as $item => $pattern) {
+                $tmp = '%'.$this->_escape($pattern).'%';
+                if($item == 'user') {
+                    if($cnt++ > 0) $SQLfilter .= " AND ";
+                    $SQLfilter .= str_replace('%{user}', $tmp, $this->getConf('FilterLogin'));
+                } else if($item == 'name') {
+                    if($cnt++ > 0) $SQLfilter .= " AND ";
+                    $SQLfilter .= str_replace('%{name}', $tmp, $this->getConf('FilterName'));
+                } else if($item == 'mail') {
+                    if($cnt++ > 0) $SQLfilter .= " AND ";
+                    $SQLfilter .= str_replace('%{email}', $tmp, $this->getConf('FilterEmail'));
+                } else if($item == 'grps') {
+                    if($cnt++ > 0) $SQLfilter .= " AND ";
+                    $SQLfilter .= str_replace('%{group}', $tmp, $this->getConf('FilterGroup'));
+                }
+            }
+
+            // we have to check SQLfilter here and must not use $cnt because if
+            // any of cnf['Filter????'] is not defined, a malformed SQL string
+            // would be generated.
+
+            if(strlen($SQLfilter)) {
+                $glue = strpos(strtolower($sql), "where") ? " AND " : " WHERE ";
+                $sql  = $sql.$glue.$SQLfilter;
+            }
+        }
+
+        return $sql;
+    }
+
+    /**
+     * Escape a string for insertion into the database
+     *
+     * @author Andreas Gohr 
+     *
+     * @param  string  $string The string to escape
+     * @param  boolean $like   Escape wildcard chars as well?
+     * @return string
+     */
+    protected function _escape($string, $like = false) {
+        if($this->dbcon) {
+            $string = mysql_real_escape_string($string, $this->dbcon);
+        } else {
+            $string = addslashes($string);
+        }
+        if($like) {
+            $string = addcslashes($string, '%_');
+        }
+        return $string;
+    }
+
+    /**
+     * Wrapper around msg() but outputs only when debug is enabled
+     *
+     * @param string $message
+     * @param int    $err
+     * @param int    $line
+     * @param string $file
+     * @return void
+     */
+    protected function _debug($message, $err, $line, $file) {
+        if(!$this->getConf('debug')) return;
+        msg($message, $err, $line, $file);
+    }
+}
diff --git a/sources/lib/plugins/authmysql/conf/default.php b/sources/lib/plugins/authmysql/conf/default.php
new file mode 100644
index 0000000..427bea2
--- /dev/null
+++ b/sources/lib/plugins/authmysql/conf/default.php
@@ -0,0 +1,34 @@
+ 'danger');
+$meta['user']             = array('string','_caution' => 'danger');
+$meta['password']         = array('password','_caution' => 'danger');
+$meta['database']         = array('string','_caution' => 'danger');
+$meta['charset']          = array('string','_caution' => 'danger');
+$meta['debug']            = array('multichoice','_choices' => array(0,1,2),'_caution' => 'security');
+$meta['forwardClearPass'] = array('onoff','_caution' => 'danger');
+$meta['TablesToLock']     = array('array','_caution' => 'danger');
+$meta['checkPass']        = array('','_caution' => 'danger');
+$meta['getUserInfo']      = array('','_caution' => 'danger');
+$meta['getGroups']        = array('','_caution' => 'danger');
+$meta['getUsers']         = array('','_caution' => 'danger');
+$meta['FilterLogin']      = array('string','_caution' => 'danger');
+$meta['FilterName']       = array('string','_caution' => 'danger');
+$meta['FilterEmail']      = array('string','_caution' => 'danger');
+$meta['FilterGroup']      = array('string','_caution' => 'danger');
+$meta['SortOrder']        = array('string','_caution' => 'danger');
+$meta['addUser']          = array('','_caution' => 'danger');
+$meta['addGroup']         = array('','_caution' => 'danger');
+$meta['addUserGroup']     = array('','_caution' => 'danger');
+$meta['delGroup']         = array('','_caution' => 'danger');
+$meta['getUserID']        = array('','_caution' => 'danger');
+$meta['delUser']          = array('','_caution' => 'danger');
+$meta['delUserRefs']      = array('','_caution' => 'danger');
+$meta['updateUser']       = array('string','_caution' => 'danger');
+$meta['UpdateLogin']      = array('string','_caution' => 'danger');
+$meta['UpdatePass']       = array('string','_caution' => 'danger');
+$meta['UpdateEmail']      = array('string','_caution' => 'danger');
+$meta['UpdateName']       = array('string','_caution' => 'danger');
+$meta['UpdateTarget']     = array('string','_caution' => 'danger');
+$meta['delUserGroup']     = array('','_caution' => 'danger');
+$meta['getGroupID']       = array('','_caution' => 'danger');
\ No newline at end of file
diff --git a/sources/lib/plugins/authmysql/lang/bg/settings.php b/sources/lib/plugins/authmysql/lang/bg/settings.php
new file mode 100644
index 0000000..fcc7f62
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/bg/settings.php
@@ -0,0 +1,17 @@
+
+ */
+$lang['server']                = 'Вашият MySQL сървър';
+$lang['user']                  = 'MySQL потребителско име';
+$lang['password']              = 'Парола за горния потребител';
+$lang['database']              = 'Име на базата от данни';
+$lang['charset']               = 'Набор от знаци, който се ползва в базата от данни';
+$lang['debug']                 = 'Показване на допълнителна debug информация';
+
+
+$lang['debug_o_0'] = 'не';
+$lang['debug_o_1'] = 'само при грешка';
+$lang['debug_o_2'] = 'за всяко SQL запитване';
\ No newline at end of file
diff --git a/sources/lib/plugins/authmysql/lang/cs/settings.php b/sources/lib/plugins/authmysql/lang/cs/settings.php
new file mode 100644
index 0000000..350c323
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/cs/settings.php
@@ -0,0 +1,42 @@
+
+ * @author soer9648 
+ */
+$lang['server']                = 'Din MySQL server';
+$lang['user']                  = 'MySQL brugernavn';
+$lang['password']              = 'Kodeord til ovenstående bruger';
+$lang['database']              = 'Database der skal benyttes';
+$lang['charset']               = 'Tegnsæt benyttet i database';
+$lang['checkPass']             = 'SQL-sætning til at kontrollere kodeord';
+$lang['getUserInfo']           = 'SQL-sætning til at hente brugerinformation';
+$lang['getUsers']              = 'SQL-sætning til at liste alle brugere';
+$lang['addUser']               = 'SQL-sætning til at tilføje en ny bruger';
+$lang['addGroup']              = 'SQL-sætning til at tilføje en ny gruppe';
+$lang['addUserGroup']          = 'SQL-sætning til at tilføje en bruger til en eksisterende gruppe';
+$lang['delGroup']              = 'SQL-sætning til at fjerne en gruppe';
+$lang['delUser']               = 'SQL-sætning til at slette en bruger';
+$lang['delUserRefs']           = 'SQL-sætning til at fjerne en bruger fra alle grupper';
+$lang['updateUser']            = 'SQL-sætning til at opdatere en brugerprofil';
+$lang['debug']                 = 'Vis yderligere debug output';
+$lang['debug_o_0']             = 'ingen';
+$lang['debug_o_1']             = 'kun ved fejl';
+$lang['debug_o_2']             = 'alle SQL forespørgsler';
diff --git a/sources/lib/plugins/authmysql/lang/de-informal/settings.php b/sources/lib/plugins/authmysql/lang/de-informal/settings.php
new file mode 100644
index 0000000..d8d2778
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/de-informal/settings.php
@@ -0,0 +1,43 @@
+
+ * @author Volker Bödker 
+ */
+$lang['server']                = 'MySQL-Server';
+$lang['user']                  = 'Benutzername für den Zugriff auf den MySQL-Server.';
+$lang['password']              = 'Passwort des angegebenen Benutzers.';
+$lang['database']              = 'Zu verwendende Datenbank.';
+$lang['charset']               = 'Verwendetes Character-Set in der Datenbank.';
+$lang['debug']                 = 'Debug-Informationen anzeigen?';
+$lang['forwardClearPass']      = 'Passwort der DokuWiki-Benutzer im Klartext an die Datenbank übergeben? (Im Normalfall wird die passcrypt-Option angewendet.)';
+$lang['TablesToLock']          = 'Eine Komma-separierte Liste von Tabellen, die vor Schreiboperationen gesperrt werden müssen.';
+$lang['checkPass']             = 'SQL-Kommando zum Überprüfen von Passwörtern.';
+$lang['getUserInfo']           = 'SQL-Kommando um Benutzerinformationen auszulesen.';
+$lang['getGroups']             = 'SQL-Kommando um Gruppen eines Benutzers auszulesen.';
+$lang['getUsers']              = 'SQL-Kommando um alle Benutzer auszulesen.';
+$lang['FilterLogin']           = 'SQL-Bedingung um Benutzer anhand ihres Anmeldenamens zu filtern.';
+$lang['FilterName']            = 'SQL-Bedingung um Benutzer anhand ihres Namens zu filtern.';
+$lang['FilterEmail']           = 'SQL-Bedingung um Benutzer anhand ihrer E-Mail-Adresse zu filtern.';
+$lang['FilterGroup']           = 'SQL-Bedingung um Benutzer anhand ihrer Gruppenzugehörigkeit zu filtern.';
+$lang['SortOrder']             = 'SQL-Bedingung um anhand der die Benutzerliste sortiert wird.';
+$lang['addUser']               = 'SQL-Kommando um einen neuen Benutzer anzulegen.';
+$lang['addGroup']              = 'SQL-Kommando um eine neue Gruppe anzulegen.';
+$lang['addUserGroup']          = 'SQL-Kommando um einen Benutzer zu einer Gruppe hinzuzufügen.';
+$lang['delGroup']              = 'SQL-Kommando um eine Gruppe zu löschen.';
+$lang['getUserID']             = 'SQL-Kommando um den Primärschlüssel des Benutzers auszulesen.';
+$lang['delUser']               = 'SQL-Kommando um einen Benutzer zu löschen.';
+$lang['delUserRefs']           = 'SQL-Kommando um einen Benutzer aus allen Gruppen zu entfernen.';
+$lang['updateUser']            = 'SQL-Kommando um das Profil eines Benutzers zu aktualisieren.';
+$lang['UpdateLogin']           = 'SQL-Bedingung um den Anmeldenamen eines Benutzers zu ändern.';
+$lang['UpdatePass']            = 'SQL-Bedingung um das Passwort eines Benutzers zu ändern.';
+$lang['UpdateEmail']           = 'SQL-Bedingung um die E-Mail-Adresse eines Benutzers zu ändern.';
+$lang['UpdateName']            = 'SQL-Bedingung um den Namen eines Benutzers zu ändern.';
+$lang['UpdateTarget']          = 'SQL-Bedingung zur eindeutigen Identifikation des Benutzers.';
+$lang['delUserGroup']          = 'SQL-Kommando um einen Benutzer aus einer angegeben Gruppe zu entfernen.';
+$lang['getGroupID']            = 'SQL-Kommando um den Primärschlüssel einer Gruppe auszulesen.';
+$lang['debug_o_0']             = 'Keine.';
+$lang['debug_o_1']             = 'Nur Fehler.';
+$lang['debug_o_2']             = 'Alle SQL-Abfragen.';
diff --git a/sources/lib/plugins/authmysql/lang/de/settings.php b/sources/lib/plugins/authmysql/lang/de/settings.php
new file mode 100644
index 0000000..90e0ee5
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/de/settings.php
@@ -0,0 +1,42 @@
+
+ */
+$lang['server']                = 'MySQL-Server';
+$lang['user']                  = 'Benutzername für den Zugriff auf den MySQL-Server.';
+$lang['password']              = 'Passwort des angegebenen Benutzers.';
+$lang['database']              = 'Zu verwendende Datenbank.';
+$lang['charset']               = 'Verwendetes Character-Set in der Datenbank.';
+$lang['debug']                 = 'Debug-Informationen anzeigen?';
+$lang['forwardClearPass']      = 'Passwort der DokuWiki-Benutzer im Klartext an die Datenbank übergeben? (Im Normalfall wird die passcrypt-Option angewendet.)';
+$lang['TablesToLock']          = 'Eine Komma-separierte Liste von Tabellen, die vor Schreiboperationen gesperrt werden müssen.';
+$lang['checkPass']             = 'SQL-Kommando zum Überprüfen von Passwörtern.';
+$lang['getUserInfo']           = 'SQL-Kommando um Benutzerinformationen auszulesen.';
+$lang['getGroups']             = 'SQL-Kommando um Gruppen eines Benutzers auszulesen.';
+$lang['getUsers']              = 'SQL-Kommando um alle Benutzer auszulesen.';
+$lang['FilterLogin']           = 'SQL-Bedingung um Benutzer anhand ihres Anmeldenamens zu filtern.';
+$lang['FilterName']            = 'SQL-Bedingung um Benutzer anhand ihres Namens zu filtern.';
+$lang['FilterEmail']           = 'SQL-Bedingung um Benutzer anhand ihrer E-Mail-Adresse zu filtern.';
+$lang['FilterGroup']           = 'SQL-Bedingung um Benutzer anhand ihrer Gruppenzugehörigkeit zu filtern.';
+$lang['SortOrder']             = 'SQL-Bedingung um anhand der die Benutzerliste sortiert wird.';
+$lang['addUser']               = 'SQL-Kommando um einen neuen Benutzer anzulegen.';
+$lang['addGroup']              = 'SQL-Kommando um eine neue Gruppe anzulegen.';
+$lang['addUserGroup']          = 'SQL-Kommando um einen Benutzer zu einer Gruppe hinzuzufügen.';
+$lang['delGroup']              = 'SQL-Kommando um eine Gruppe zu löschen.';
+$lang['getUserID']             = 'SQL-Kommando um den Primärschlüssel des Benutzers auszulesen.';
+$lang['delUser']               = 'SQL-Kommando um einen Benutzer zu löschen.';
+$lang['delUserRefs']           = 'SQL-Kommando um einen Benutzer aus allen Gruppen zu entfernen.';
+$lang['updateUser']            = 'SQL-Kommando um das Profil eines Benutzers zu aktualisieren.';
+$lang['UpdateLogin']           = 'SQL-Bedingung um den Anmeldenamen eines Benutzers zu ändern.';
+$lang['UpdatePass']            = 'SQL-Bedingung um das Passwort eines Benutzers zu ändern.';
+$lang['UpdateEmail']           = 'SQL-Bedingung um die E-Mail-Adresse eines Benutzers zu ändern.';
+$lang['UpdateName']            = 'SQL-Bedingung um den Namen eines Benutzers zu ändern.';
+$lang['UpdateTarget']          = 'SQL-Bedingung zur eindeutigen Identifikation des Benutzers.';
+$lang['delUserGroup']          = 'SQL-Kommando um einen Benutzer aus einer angegeben Gruppe zu entfernen.';
+$lang['getGroupID']            = 'SQL-Kommando um den Primärschlüssel einer Gruppe auszulesen.';
+$lang['debug_o_0']             = 'Keine.';
+$lang['debug_o_1']             = 'Nur Fehler.';
+$lang['debug_o_2']             = 'Alle SQL-Abfragen.';
diff --git a/sources/lib/plugins/authmysql/lang/en/settings.php b/sources/lib/plugins/authmysql/lang/en/settings.php
new file mode 100644
index 0000000..b95f397
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/en/settings.php
@@ -0,0 +1,39 @@
+
+ */
+$lang['server']                = 'Tu servidor MySQL';
+$lang['user']                  = 'Nombre de usuario MySQL';
+$lang['database']              = 'Base de datos a usar';
+$lang['charset']               = 'Codificación usada en la base de datos';
+$lang['debug']                 = 'Mostrar información adicional para depuración de errores';
diff --git a/sources/lib/plugins/authmysql/lang/fi/settings.php b/sources/lib/plugins/authmysql/lang/fi/settings.php
new file mode 100644
index 0000000..d3aa13e
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/fi/settings.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/authmysql/lang/fr/settings.php b/sources/lib/plugins/authmysql/lang/fr/settings.php
new file mode 100644
index 0000000..d69c8d4
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/fr/settings.php
@@ -0,0 +1,42 @@
+
+ */
+$lang['server']                = 'Votre serveur MySQL';
+$lang['user']                  = 'Nom d\'utilisateur MySQL';
+$lang['password']              = 'Mot de passe pour l\'utilisateur ci-dessus';
+$lang['database']              = 'Base de données à utiliser';
+$lang['charset']               = 'Jeu de caractères utilisé dans la base de données';
+$lang['debug']                 = 'Afficher des informations de débogage supplémentaires';
+$lang['forwardClearPass']      = 'Passer les mots de passe aux requêtes SQL ci-dessous en cleartext plutôt qu\'avec l\'option passcrypt';
+$lang['TablesToLock']          = 'Liste séparée par des virgules des tables devant être verrouillées par les opérations d\'écriture';
+$lang['checkPass']             = 'Requête SQL pour la vérification des mots de passe';
+$lang['getUserInfo']           = 'Requête SQL pour la récupération des informations d\'un utilisateur';
+$lang['getGroups']             = 'Requête SQL pour la récupération des groupes d\'un utilisateur';
+$lang['getUsers']              = 'Requête SQL pour énumérer tous les utilisateurs';
+$lang['FilterLogin']           = 'Clause SQL pour filtrer les utilisateurs par identifiant';
+$lang['FilterName']            = 'Clause SQL pour filtrer les utilisateurs par nom complet';
+$lang['FilterEmail']           = 'Clause SQL pour filtrer les utilisateurs par adresse électronique';
+$lang['FilterGroup']           = 'Clause SQL pour filtrer les utilisateurs par groupes';
+$lang['SortOrder']             = 'Clause SQL pour trier les utilisateurs';
+$lang['addUser']               = 'Requête SQL pour ajouter un nouvel utilisateur';
+$lang['addGroup']              = 'Requête SQL pour ajouter un nouveau groupe';
+$lang['addUserGroup']          = 'Requête SQL pour ajouter un utilisateur à un groupe existant';
+$lang['delGroup']              = 'Requête SQL pour retirer un groupe';
+$lang['getUserID']             = 'Requête SQL pour obtenir la clé primaire d\'un utilisateur';
+$lang['delUser']               = 'Requête SQL pour supprimer un utilisateur';
+$lang['delUserRefs']           = 'Requête SQL pour retirer un utilisateur de tous les groupes';
+$lang['updateUser']            = 'Requête SQL pour mettre à jour le profil d\'un utilisateur';
+$lang['UpdateLogin']           = 'Clause de mise à jour pour mettre à jour l\'identifiant d\'un utilisateur';
+$lang['UpdatePass']            = 'Clause de mise à jour pour mettre à jour le mot de passe d\'un utilisateur';
+$lang['UpdateEmail']           = 'Clause de mise à jour pour mettre à jour l\'adresse électronique d\'un utilisateur';
+$lang['UpdateName']            = 'Clause de mise à jour pour mettre à jour le nom complet d\'un utilisateur';
+$lang['UpdateTarget']          = 'Clause de limite pour identifier l\'utilisateur durant une mise à jour';
+$lang['delUserGroup']          = 'Requête SQL pour retirer un utilisateur d\'un groupe donné';
+$lang['getGroupID']            = 'Requête SQL pour obtenir la clé primaire d\'un groupe donné';
+$lang['debug_o_0']             = 'aucun';
+$lang['debug_o_1']             = 'sur erreur seulement';
+$lang['debug_o_2']             = 'toutes les requêtes SQL';
diff --git a/sources/lib/plugins/authmysql/lang/hu/settings.php b/sources/lib/plugins/authmysql/lang/hu/settings.php
new file mode 100644
index 0000000..4edceae
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/hu/settings.php
@@ -0,0 +1,42 @@
+
+ */
+$lang['server']                = 'MySQL-szerver';
+$lang['user']                  = 'MySQL felhasználónév';
+$lang['password']              = 'Ehhez a jelszó';
+$lang['database']              = 'Adatbázis';
+$lang['charset']               = 'Az adatbázisban használt karakterkészlet';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['forwardClearPass']      = 'A jelszó nyílt szövegben való átadása a következő SQL utasításokban a passcrypt opció használata helyett';
+$lang['TablesToLock']          = 'Az íráskor zárolandó táblák vesszővel elválasztott listája';
+$lang['checkPass']             = 'SQL utasítás a jelszavak ellenőrzéséhez';
+$lang['getUserInfo']           = 'SQL utasítás a felhasználói információk lekérdezéséhez';
+$lang['getGroups']             = 'SQL utasítás egy felhasználó csoporttagságainak lekérdezéséhez';
+$lang['getUsers']              = 'SQL utasítás a felhasználók listázásához';
+$lang['FilterLogin']           = 'SQL kifejezés a felhasználók azonosító alapú szűréséhez';
+$lang['FilterName']            = 'SQL kifejezés a felhasználók név alapú szűréséhez';
+$lang['FilterEmail']           = 'SQL kifejezés a felhasználók e-mail cím alapú szűréséhez';
+$lang['FilterGroup']           = 'SQL kifejezés a felhasználók csoporttagság alapú szűréséhez';
+$lang['SortOrder']             = 'SQL kifejezés a felhasználók rendezéséhez';
+$lang['addUser']               = 'SQL utasítás új felhasználó hozzáadásához';
+$lang['addGroup']              = 'SQL utasítás új csoport hozzáadásához';
+$lang['addUserGroup']          = 'SQL utasítás egy felhasználó egy meglévő csoporthoz való hozzáadásához';
+$lang['delGroup']              = 'SQL utasítás egy csoport törléséhez';
+$lang['getUserID']             = 'SQL utasítás egy felhasználó elsődleges kulcsának lekérdezéséhez';
+$lang['delUser']               = 'SQL utasítás egy felhasználó törléséhez';
+$lang['delUserRefs']           = 'SQL utasítás egy felhasználó eltávolításához az összes csoportból';
+$lang['updateUser']            = 'SQL utasítás egy felhasználó profiljának frissítéséhez';
+$lang['UpdateLogin']           = 'SQL kifejezés a felhasználó azonosítójának frissítéséhez';
+$lang['UpdatePass']            = 'SQL kifejezés a felhasználó jelszavának frissítéséhez';
+$lang['UpdateEmail']           = 'SQL kifejezés a felhasználó e-mail címének frissítéséhez';
+$lang['UpdateName']            = 'SQL kifejezés a felhasználó nevének frissítéséhez';
+$lang['UpdateTarget']          = 'SQL kifejezés a felhasználó kiválasztásához az adatok frissítésekor';
+$lang['delUserGroup']          = 'SQL utasítás egy felhasználó eltávolításához egy adott csoportból';
+$lang['getGroupID']            = 'SQL utasítás egy csoport elsődleges kulcsának lekérdezéséhez';
+$lang['debug_o_0']             = 'nem';
+$lang['debug_o_1']             = 'csak hiba esetén';
+$lang['debug_o_2']             = 'minden SQL-lekérdezésnél';
diff --git a/sources/lib/plugins/authmysql/lang/it/settings.php b/sources/lib/plugins/authmysql/lang/it/settings.php
new file mode 100644
index 0000000..e493ec7
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/it/settings.php
@@ -0,0 +1,8 @@
+
+ */
+$lang['debug']                 = 'Mostra ulteriori informazioni di debug';
diff --git a/sources/lib/plugins/authmysql/lang/ja/settings.php b/sources/lib/plugins/authmysql/lang/ja/settings.php
new file mode 100644
index 0000000..e5d5689
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/ja/settings.php
@@ -0,0 +1,42 @@
+
+ */
+$lang['server']                = 'MySQL のホスト名';
+$lang['user']                  = 'MySQL 接続用ユーザー名';
+$lang['password']              = 'MySQL 接続用ユーザーのパスワード';
+$lang['database']              = '使用するデータベース名';
+$lang['charset']               = 'データベースの文字コード';
+$lang['debug']                 = 'デバック情報を表示する';
+$lang['forwardClearPass']      = '以下で定義する SQL ステートメントにおいて, パスワード変数 %{pass} を平文とする(DokiWiki側で暗号化しない)';
+$lang['TablesToLock']          = '書き込み時にロックするテーブル（コンマ区切りで列挙）';
+$lang['checkPass']             = 'パスワードの照合に用いる SQL ステートメント';
+$lang['getUserInfo']           = 'ユーザー情報の取得に用いる SQL ステートメント';
+$lang['getGroups']             = 'ユーザーが所属する全てのグループの取得に用いる SQL ステートメント';
+$lang['getUsers']              = 'ユーザーリストを取得する SQL ステートメント';
+$lang['FilterLogin']           = 'ユーザーリストをログイン名で絞り込む SQL 句';
+$lang['FilterName']            = 'ユーザーリストをフルネームで絞り込む SQL 句';
+$lang['FilterEmail']           = 'ユーザーリストをメールアドレスで絞り込む SQL 句';
+$lang['FilterGroup']           = 'ユーザーリストを所属グループで絞り込む SQL 句';
+$lang['SortOrder']             = 'ユーザーリストのソート方法を指定する SQL 句';
+$lang['addUser']               = '新規ユーザーを追加する SQL ステートメント';
+$lang['addGroup']              = '新規グループを追加する SQL ステートメント';
+$lang['addUserGroup']          = 'ユーザーをグループに配属する SQL ステートメント';
+$lang['delGroup']              = 'グループを削除する SQL ステートメント';
+$lang['getUserID']             = 'ユーザーIDの取得に用いる SQL ステートメント';
+$lang['delUser']               = 'ユーザーを削除する SQL ステートメント';
+$lang['delUserRefs']           = 'ユーザーのグループ所属を全て取り消す SQL ステートメント';
+$lang['updateUser']            = 'ユーザー情報を変更する SQL ステートメント';
+$lang['UpdateLogin']           = '変更後のログイン名を指定する SQL 句';
+$lang['UpdatePass']            = '変更後のパスワードを指定する SQL 句';
+$lang['UpdateEmail']           = '変更後のメールアドレスを指定する SQL 句';
+$lang['UpdateName']            = '変更後のフルネームを指定する SQL 句';
+$lang['UpdateTarget']          = '変更対象のユーザを特定するための SQL 句';
+$lang['delUserGroup']          = 'ユーザーをグループから除名する SQL ステートメント';
+$lang['getGroupID']            = 'グループIDの取得に用いる SQL ステートメント';
+$lang['debug_o_0']             = '表示しない';
+$lang['debug_o_1']             = 'エラー発生時のみ表示';
+$lang['debug_o_2']             = '全ての SQLクエリで表示';
diff --git a/sources/lib/plugins/authmysql/lang/ko/settings.php b/sources/lib/plugins/authmysql/lang/ko/settings.php
new file mode 100644
index 0000000..b3479ad
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/ko/settings.php
@@ -0,0 +1,43 @@
+
+ * @author Garam 
+ */
+$lang['server']                = 'MySQL 서버';
+$lang['user']                  = 'MySQL 사용자 이름';
+$lang['password']              = '위 사용자의 비밀번호';
+$lang['database']              = '사용할 데이터베이스';
+$lang['charset']               = '데이터베이스에 사용하는 문자 집합';
+$lang['debug']                 = '추가적인 디버그 정보 보이기';
+$lang['forwardClearPass']      = 'passcrypt 옵션을 사용하는 대신 아래 SQL 문에 일반 텍스트로 사용자 비밀번호를 전달';
+$lang['TablesToLock']          = '쓰기 작업에 잠궈야 하는 테이블의 쉼표로 구분한 목록';
+$lang['checkPass']             = '비밀번호를 확인하기 위한 SQL 문';
+$lang['getUserInfo']           = '사용자 정보를 가져오기 위한 SQL 문';
+$lang['getGroups']             = '사용자의 그룹 구성원을 가져오기 위한 SQL 문';
+$lang['getUsers']              = '모든 사용자를 나타낼 SQL 문';
+$lang['FilterLogin']           = '로그인 이름별로 사용자를 필터하기 위한 SQL 조항';
+$lang['FilterName']            = '전체 이름별로 사용자를 필터하기 위한 SQL 조항';
+$lang['FilterEmail']           = '이메일 주소별로 사용자를 필터하기 위한 SQL 조항';
+$lang['FilterGroup']           = '그룹 구성원별로 사용자를 필터하기 위한 SQL 조항';
+$lang['SortOrder']             = '사용자를 정렬할 SQL 조항';
+$lang['addUser']               = '새 사용자를 추가할 SQL 문';
+$lang['addGroup']              = '새 그룹을 추가할 SQL 문';
+$lang['addUserGroup']          = '기존 그룹에 사용자를 추가할 SQL 문';
+$lang['delGroup']              = '그룹을 제거할 SQL 문';
+$lang['getUserID']             = '사용자의 기본 키를 얻을 SQL 문';
+$lang['delUser']               = '사용자를 삭제할 SQL 문';
+$lang['delUserRefs']           = '모든 그룹에서 사용자를 제거할 SQL 문';
+$lang['updateUser']            = '사용자 프로필을 업데이트할 SQL 문';
+$lang['UpdateLogin']           = '사용자의 로그인 이름을 업데이트하기 위한 Update 조항';
+$lang['UpdatePass']            = '사용자의 비밀번호를 업데이트하기 위한 Update 조항';
+$lang['UpdateEmail']           = '사용자의 이메일 주소를 업데이트하기 위한 Update 조항';
+$lang['UpdateName']            = '사용자의 전체 이름을 업데이트하기 위한 Update 조항';
+$lang['UpdateTarget']          = '업데이트할 때 사용자를 식별할 Limit 조항';
+$lang['delUserGroup']          = '주어진 그룹에서 사용자를 제거할 SQL 문';
+$lang['getGroupID']            = '주어진 그룹의 기본 키를 얻을 SQL 문';
+$lang['debug_o_0']             = '없음';
+$lang['debug_o_1']             = '오류에만';
+$lang['debug_o_2']             = '모든 SQL 쿼리';
diff --git a/sources/lib/plugins/authmysql/lang/lv/settings.php b/sources/lib/plugins/authmysql/lang/lv/settings.php
new file mode 100644
index 0000000..ced5dab
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/lv/settings.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/authmysql/lang/nl/settings.php b/sources/lib/plugins/authmysql/lang/nl/settings.php
new file mode 100644
index 0000000..9848f20
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/nl/settings.php
@@ -0,0 +1,42 @@
+
+ */
+$lang['server']                = 'De MySQL server';
+$lang['user']                  = 'MySql gebruikersnaam';
+$lang['password']              = 'Wachtwoord van bovenstaande gebruiker';
+$lang['database']              = 'Te gebruiken database';
+$lang['charset']               = 'Tekenset voor database';
+$lang['debug']                 = 'Tonen aanvullende debuginformatie';
+$lang['forwardClearPass']      = 'Wachtwoorden als leesbare tekst in SQL commando\'s opnemen in plaats van versleutelde tekens';
+$lang['TablesToLock']          = 'Kommagescheiden lijst van tabellen die gelocked moeten worden bij schrijfacties';
+$lang['checkPass']             = 'SQL commando voor het verifiëren van wachtwoorden';
+$lang['getUserInfo']           = 'SQL commando voor het ophalen van gebruikersinformatie';
+$lang['getGroups']             = 'SQL commando voor het ophalen van groepslidmaatschappen';
+$lang['getUsers']              = 'SQL commando voor het tonen van alle gebruikers';
+$lang['FilterLogin']           = 'SQL clausule voor het filteren van gebruikers op inlognaam';
+$lang['FilterName']            = 'SQL clausule voor het filteren van gebruikers op volledige naam';
+$lang['FilterEmail']           = 'SQL clausule voor het filteren van gebruikers op e-mailadres';
+$lang['FilterGroup']           = 'SQL clausule voor het filteren van gebruikers op groepslidmaatschap';
+$lang['SortOrder']             = 'SQL clausule voor het sorteren van gebruikers';
+$lang['addUser']               = 'SQL commando om een nieuwe gebruiker toe te voegen';
+$lang['addGroup']              = 'SQL commando om een nieuwe groep toe te voegen';
+$lang['addUserGroup']          = 'SQL commando om een gebruiker aan een bestaande groep toe te voegen';
+$lang['delGroup']              = 'SQL commando om een groep te verwijderen';
+$lang['getUserID']             = 'SQL commando om de de primaire sleutel van een gebruiker op te halen';
+$lang['delUser']               = 'SQL commando om een gebruiker te verwijderen';
+$lang['delUserRefs']           = 'SQL commando om een gebruiker uit alle groepen te verwijderen';
+$lang['updateUser']            = 'SQL commando om een gebruikersprofiel bij te werken';
+$lang['UpdateLogin']           = 'Bijwerkcommando om de inlognaam van de gebruiker bij te werken';
+$lang['UpdatePass']            = 'Bijwerkcommando om het wachtwoord van de gebruiker bij te werken';
+$lang['UpdateEmail']           = 'Bijwerkcommando om het e-mailadres van de gebruiker bij te werken';
+$lang['UpdateName']            = 'Bijwerkcommando om de volledige naam van de gebruiker bij te werken';
+$lang['UpdateTarget']          = 'Beperkingsclausule om de gebruiker te identificeren voor bijwerken';
+$lang['delUserGroup']          = 'SQL commando om een gebruiker uit een bepaalde groep te verwijderen';
+$lang['getGroupID']            = 'SQL commando om de primaire sletel van een bepaalde groep op te halen';
+$lang['debug_o_0']             = 'geen';
+$lang['debug_o_1']             = 'alleen bij fouten';
+$lang['debug_o_2']             = 'alle SQL queries';
diff --git a/sources/lib/plugins/authmysql/lang/pl/settings.php b/sources/lib/plugins/authmysql/lang/pl/settings.php
new file mode 100644
index 0000000..5ae6bf1
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/pl/settings.php
@@ -0,0 +1,11 @@
+
+ * @author Frederico Guimarães 
+ */
+$lang['server']                = 'Seu servidor MySQL';
+$lang['user']                  = 'usuário MySQL';
+$lang['password']              = 'Senha do usuário acima';
+$lang['database']              = 'Base de dados para usar';
+$lang['charset']               = 'Codificação de caracter usado na base de dados';
+$lang['debug']                 = 'Mostrar informações adicionais de depuração';
+$lang['forwardClearPass']      = 'Passar senhas de usuários como texto puro para comandos SQL abaixo, ao invés de usar opção passcrypt';
+$lang['TablesToLock']          = 'Lista separada por vírgulas para tabelas que devem estar travadas em operações de escrita';
+$lang['checkPass']             = 'Comandos SQL para verificar senhas';
+$lang['getUserInfo']           = 'Comando SQL para obter informações de usuário';
+$lang['getGroups']             = 'Comando SQL para obter as credenciais de grupo de um usuário';
+$lang['getUsers']              = 'Comando SQL para listar todos os usuários';
+$lang['FilterLogin']           = 'Comando SQL para filtrar usuários pelo login';
+$lang['FilterName']            = 'Cláusula SQL para filtrar usuários por nome completo';
+$lang['FilterEmail']           = 'Cláusula SQL para filtrar usuários por endereço de email';
+$lang['FilterGroup']           = 'Cláusula SQL para filtrar usuários por membros de grupos';
+$lang['SortOrder']             = 'Cláusula SQL para ordenar usuários';
+$lang['addUser']               = 'Comando SQL para adicionar um novo usuário';
+$lang['addGroup']              = 'Comando SQL para adicionar um novo grupo';
+$lang['addUserGroup']          = 'Comando SQL para adicionar um usuário a um determinado grupo';
+$lang['delGroup']              = 'Comando SQL para remover um grupo';
+$lang['getUserID']             = 'Comando SQL para obter a chave primária de um usuário';
+$lang['delUser']               = 'Comando SQL para apagar um usuário';
+$lang['delUserRefs']           = 'Comando SQL para apagar um usuário de todos os grupos';
+$lang['updateUser']            = 'Comando SQL para atualizar perfil de usuário';
+$lang['UpdateLogin']           = 'Comando SQL para atualizar o login de um usuário';
+$lang['UpdatePass']            = 'Cláusula de atualização para atualizar senha de usuário';
+$lang['UpdateEmail']           = 'Cláusula de atualização para atualizar email do usuário';
+$lang['UpdateName']            = 'Cláusula de atualização para atualizar nome completo do usuário';
+$lang['UpdateTarget']          = 'Limitar cláusula para identificar usuário quando estiver atualizando';
+$lang['delUserGroup']          = 'Comando SQL para remover um usuário de um grupo determinado';
+$lang['getGroupID']            = 'Comando SQL para obter a chave primária de um grupo determinado';
+$lang['debug_o_0']             = 'nenhum';
+$lang['debug_o_1']             = 'apenas em erros';
+$lang['debug_o_2']             = 'todas as queries SQL';
diff --git a/sources/lib/plugins/authmysql/lang/pt/settings.php b/sources/lib/plugins/authmysql/lang/pt/settings.php
new file mode 100644
index 0000000..0c7f303
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/pt/settings.php
@@ -0,0 +1,23 @@
+
+ */
+$lang['server']                = 'O seu servidor de MySQL';
+$lang['user']                  = 'Utilizador MySQL';
+$lang['password']              = 'Senha para o utilizador acima';
+$lang['database']              = 'Base de dados a usar';
+$lang['debug']                 = 'Mostrar informação adicional de debug';
+$lang['FilterLogin']           = 'Cláusula SQL para filtrar utilizadores por tipo de login';
+$lang['FilterName']            = 'Cláusula SQL para filtrar utilizadores por nome completo';
+$lang['FilterEmail']           = 'Cláusula SQL para filtrar utilizadores por endereço de email';
+$lang['FilterGroup']           = 'Cláusula SQL para filtrar utilizadores por pertença a grupo';
+$lang['SortOrder']             = 'Cláusula SQL para ordenar utilizadores';
+$lang['UpdateLogin']           = 'Cláusula de atualização para atualizar o nome de login do utilizador';
+$lang['UpdatePass']            = 'Cláusula de atualização para atualizar a senha do utilizador';
+$lang['UpdateEmail']           = 'Cláusula de atualização para atualizar o endereço de email do utilizador';
+$lang['UpdateName']            = 'Cláusula de atualização para atualizar o nome completo do utilizador';
+$lang['debug_o_0']             = 'nenhum';
+$lang['debug_o_1']             = 'só aquando de erros';
diff --git a/sources/lib/plugins/authmysql/lang/ru/settings.php b/sources/lib/plugins/authmysql/lang/ru/settings.php
new file mode 100644
index 0000000..2d8f478
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/ru/settings.php
@@ -0,0 +1,43 @@
+
+ */
+$lang['server']                = 'Ваш MySQL-сервер';
+$lang['user']                  = 'Имя пользователя MySQL';
+$lang['password']              = 'Пароль пользователя MySQL';
+$lang['database']              = 'Имя базы данных';
+$lang['charset']               = 'Используемый набор символов в базе данных';
+$lang['debug']                 = 'Отображение дополнительной отладочной информации';
+$lang['forwardClearPass']      = 'Передача пароля пользователя открытым текстом, вместо зашифрованной формы в используемом выражении SQL';
+$lang['TablesToLock']          = 'Имена таблиц (через запятую), которые необходимо ограничение для записи';
+$lang['checkPass']             = 'Выражение SQL, осуществляющее проверку пароля';
+$lang['getUserInfo']           = 'Выражение SQL, осуществляющее извлечение информации о пользователе';
+$lang['getGroups']             = 'Выражение SQL, осуществляющее извлечение информации о членстве пользователе в группах';
+$lang['getUsers']              = 'Выражение SQL, осуществляющее извлечение полного списка пользователей';
+$lang['FilterLogin']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по логину';
+$lang['FilterName']            = 'Выражение SQL, осуществляющее фильтрацию пользователей по полному имени';
+$lang['FilterEmail']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по адресу электронной почты';
+$lang['FilterGroup']           = 'Выражение SQL, осуществляющее фильтрацию пользователей согласно членству в группе';
+$lang['SortOrder']             = 'Выражение SQL, осуществляющее сортировку пользователей';
+$lang['addUser']               = 'Выражение SQL, осуществляющее добавление нового пользователя';
+$lang['addGroup']              = 'Выражение SQL, осуществляющее добавление новой группы';
+$lang['addUserGroup']          = 'Выражение SQL, осуществляющее добавление пользователя в существующую группу';
+$lang['delGroup']              = 'Выражение SQL, осуществляющее удаление группы';
+$lang['getUserID']             = 'Выражение SQL, обеспечивающее получение первичного ключа пользователя';
+$lang['delUser']               = 'Выражение SQL, осуществляющее удаление пользователя';
+$lang['delUserRefs']           = 'Выражение SQL, осуществляющее удаление пользователя из всех групп';
+$lang['updateUser']            = 'Выражение SQL, осуществляющее обновление профиля пользователя';
+$lang['UpdateLogin']           = 'Условие для обновления имени пользователя';
+$lang['UpdatePass']            = 'Условие для обновления пароля пользователя';
+$lang['UpdateEmail']           = 'Условие для обновления адреса электронной почты пользователя';
+$lang['UpdateName']            = 'Условие для обновления полного имени пользователя';
+$lang['UpdateTarget']          = 'Условие для идентификации пользователя при обновлении';
+$lang['delUserGroup']          = 'Выражение SQL, осуществляющее удаление пользователя из указанной группы';
+$lang['getGroupID']            = 'Выражение SQL, обеспечивающее получение первичного ключа указанной группы';
+$lang['debug_o_0']             = 'ни один из вариантов';
+$lang['debug_o_1']             = 'только при возникновении ошибок';
+$lang['debug_o_2']             = 'все SQL-запросы';
diff --git a/sources/lib/plugins/authmysql/lang/sk/settings.php b/sources/lib/plugins/authmysql/lang/sk/settings.php
new file mode 100644
index 0000000..d7e8cb2
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/sk/settings.php
@@ -0,0 +1,42 @@
+
+ */
+$lang['server']                = 'MySQL server';
+$lang['user']                  = 'Meno používateľa MySQL';
+$lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
+$lang['database']              = 'Použiť databázu';
+$lang['charset']               = 'Znaková sada databázy';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
+$lang['forwardClearPass']      = 'Posielať heslo ako nezakódovaný text nižšie uvedenému SQL príkazu namiesto použitia kódovania';
+$lang['TablesToLock']          = 'Zoznam tabuliek oddelených čiarkou, ktoré by mali byť uzamknuté pri operáciách zápisu';
+$lang['checkPass']             = 'SQL príkaz pre kontrolu hesla';
+$lang['getUserInfo']           = 'SQL príkaz pre získanie informácií o používateľovi';
+$lang['getGroups']             = 'SQL príkaz pre získanie informácií o skupinách používateľa';
+$lang['getUsers']              = 'SQL príkaz pre získanie zoznamu používateľov';
+$lang['FilterLogin']           = 'SQL podmienka pre filtrovanie používateľov podľa prihlasovacieho mena';
+$lang['FilterName']            = 'SQL podmienka pre filtrovanie používateľov podľa mena a priezviska';
+$lang['FilterEmail']           = 'SQL podmienka pre filtrovanie používateľov podľa emailovej adresy';
+$lang['FilterGroup']           = 'SQL podmienka pre filtrovanie používateľov podľa skupiny';
+$lang['SortOrder']             = 'SQL podmienka pre usporiadenia používateľov';
+$lang['addUser']               = 'SQL príkaz pre pridanie nového používateľa';
+$lang['addGroup']              = 'SQL príkaz pre pridanie novej skupiny';
+$lang['addUserGroup']          = 'SQL príkaz pre pridanie používateľa do existujúcej skupiny';
+$lang['delGroup']              = 'SQL príkaz pre zrušenie skupiny';
+$lang['getUserID']             = 'SQL príkaz pre získanie primárneho klúča používateľa';
+$lang['delUser']               = 'SQL príkaz pre zrušenie používateľa';
+$lang['delUserRefs']           = 'SQL príkaz pre vyradenie používateľa zo všetkých skupín';
+$lang['updateUser']            = 'SQL príkaz pre aktualizáciu informácií o používateľovi';
+$lang['UpdateLogin']           = 'SQL podmienka pre aktualizáciu prihlasovacieho mena používateľa';
+$lang['UpdatePass']            = 'SQL podmienka pre aktualizáciu hesla používateľa';
+$lang['UpdateEmail']           = 'SQL podmienka pre aktualizáciu emailovej adresy používateľa';
+$lang['UpdateName']            = 'SQL podmienka pre aktualizáciu mena a priezviska používateľa';
+$lang['UpdateTarget']          = 'Podmienka identifikácie používateľa pri aktualizácii';
+$lang['delUserGroup']          = 'SQL príkaz pre vyradenie používateľa z danej skupiny';
+$lang['getGroupID']            = 'SQL príkaz pre získanie primárneho kľúča skupiny';
+$lang['debug_o_0']             = 'žiadne';
+$lang['debug_o_1']             = 'iba pri chybách';
+$lang['debug_o_2']             = 'všetky SQL dopyty';
diff --git a/sources/lib/plugins/authmysql/lang/sl/settings.php b/sources/lib/plugins/authmysql/lang/sl/settings.php
new file mode 100644
index 0000000..5e82816
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/sl/settings.php
@@ -0,0 +1,11 @@
+
+ */
+$lang['database']              = 'Podatkovna zbirka za uporabo';
+$lang['debug_o_0']             = 'brez';
+$lang['debug_o_1']             = 'le ob napakah';
+$lang['debug_o_2']             = 'vse poizvedbe SQL';
diff --git a/sources/lib/plugins/authmysql/lang/sv/settings.php b/sources/lib/plugins/authmysql/lang/sv/settings.php
new file mode 100644
index 0000000..420e443
--- /dev/null
+++ b/sources/lib/plugins/authmysql/lang/sv/settings.php
@@ -0,0 +1,26 @@
+
+ */
+$lang['server']                = '您的 MySQL 服务器';
+$lang['user']                  = 'MySQL 用户名';
+$lang['password']              = '上述用户的密码';
+$lang['database']              = '使用的数据库';
+$lang['charset']               = '数据库中使用的字符集';
+$lang['debug']                 = '显示额外调试信息';
+$lang['forwardClearPass']      = '将用户密码以明文形式传送给下面的 SQL 语句，而不使用 passcrypt 密码加密选项';
+$lang['TablesToLock']          = '在写操作时需要锁定的数据表列表，以逗号分隔';
+$lang['checkPass']             = '检查密码的 SQL 语句';
+$lang['getUserInfo']           = '获取用户信息的 SQL 语句';
+$lang['getGroups']             = '或许用户的组成员身份的 SQL 语句';
+$lang['getUsers']              = '列出所有用户的 SQL 语句';
+$lang['FilterLogin']           = '根据登录名筛选用户的 SQL 子句';
+$lang['FilterName']            = '根据全名筛选用户的 SQL 子句';
+$lang['FilterEmail']           = '根据电子邮件地址筛选用户的 SQL 子句';
+$lang['FilterGroup']           = '根据组成员身份筛选用户的 SQL 子句';
+$lang['SortOrder']             = '对用户排序的 SQL 子句';
+$lang['addUser']               = '添加新用户的 SQL 语句';
+$lang['addGroup']              = '添加新组的 SQL 语句';
+$lang['addUserGroup']          = '将用户添加到现有组的 SQL 语句';
+$lang['delGroup']              = '删除组的 SQL 语句';
+$lang['getUserID']             = '获取用户主键的 SQL 语句';
+$lang['delUser']               = '删除用户的 SQL 语句';
+$lang['delUserRefs']           = '从所有组中删除一个用户的 SQL 语句';
+$lang['updateUser']            = '更新用户信息的 SQL 语句';
+$lang['UpdateLogin']           = '更新用户登录名的 Update 子句';
+$lang['UpdatePass']            = '更新用户密码的 Update 子句';
+$lang['UpdateEmail']           = '更新用户电子邮件地址的 Update 子句';
+$lang['UpdateName']            = '更新用户全名的 Update 子句';
+$lang['UpdateTarget']          = '更新时识别用户的 Limit 子句';
+$lang['delUserGroup']          = '从指定组删除用户的 SQL 语句';
+$lang['getGroupID']            = '获取指定组主键的 SQL 语句';
+$lang['debug_o_0']             = '无';
+$lang['debug_o_1']             = '仅在有错误时';
+$lang['debug_o_2']             = '所有 SQL 查询';
diff --git a/sources/lib/plugins/authmysql/plugin.info.txt b/sources/lib/plugins/authmysql/plugin.info.txt
new file mode 100644
index 0000000..3e889d1
--- /dev/null
+++ b/sources/lib/plugins/authmysql/plugin.info.txt
@@ -0,0 +1,7 @@
+base   authmysql
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2013-02-16
+name   MYSQL Auth Plugin
+desc   Provides user authentication against a MySQL database
+url    http://www.dokuwiki.org/plugin:authmysql
diff --git a/sources/lib/plugins/authpgsql/auth.php b/sources/lib/plugins/authpgsql/auth.php
new file mode 100644
index 0000000..3f8ff32
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/auth.php
@@ -0,0 +1,418 @@
+
+ * @author     Chris Smith 
+ * @author     Matthias Grimm 
+ * @author     Jan Schumann 
+ */
+class auth_plugin_authpgsql extends auth_plugin_authmysql {
+
+    /**
+     * Constructor
+     *
+     * checks if the pgsql interface is available, otherwise it will
+     * set the variable $success of the basis class to false
+     *
+     * @author Matthias Grimm 
+     * @author Andreas Gohr 
+     */
+    public function __construct() {
+        // we don't want the stuff the MySQL constructor does, but the grandparent might do something
+        DokuWiki_Auth_Plugin::__construct();
+
+        if(!function_exists('pg_connect')) {
+            $this->_debug("PgSQL err: PHP Postgres extension not found.", -1, __LINE__, __FILE__);
+            $this->success = false;
+            return;
+        }
+
+        $this->loadConfig();
+
+        // set capabilities based upon config strings set
+        if(empty($this->conf['user']) ||
+            empty($this->conf['password']) || empty($this->conf['database'])
+        ) {
+            $this->_debug("PgSQL err: insufficient configuration.", -1, __LINE__, __FILE__);
+            $this->success = false;
+            return;
+        }
+
+        $this->cando['addUser']   = $this->_chkcnf(
+            array(
+                 'getUserInfo',
+                 'getGroups',
+                 'addUser',
+                 'getUserID',
+                 'getGroupID',
+                 'addGroup',
+                 'addUserGroup'
+            )
+        );
+        $this->cando['delUser']   = $this->_chkcnf(
+            array(
+                 'getUserID',
+                 'delUser',
+                 'delUserRefs'
+            )
+        );
+        $this->cando['modLogin']  = $this->_chkcnf(
+            array(
+                 'getUserID',
+                 'updateUser',
+                 'UpdateTarget'
+            )
+        );
+        $this->cando['modPass']   = $this->cando['modLogin'];
+        $this->cando['modName']   = $this->cando['modLogin'];
+        $this->cando['modMail']   = $this->cando['modLogin'];
+        $this->cando['modGroups'] = $this->_chkcnf(
+            array(
+                 'getUserID',
+                 'getGroups',
+                 'getGroupID',
+                 'addGroup',
+                 'addUserGroup',
+                 'delGroup',
+                 'getGroupID',
+                 'delUserGroup'
+            )
+        );
+        /* getGroups is not yet supported
+           $this->cando['getGroups']    = $this->_chkcnf(array('getGroups',
+           'getGroupID')); */
+        $this->cando['getUsers']     = $this->_chkcnf(
+            array(
+                 'getUsers',
+                 'getUserInfo',
+                 'getGroups'
+            )
+        );
+        $this->cando['getUserCount'] = $this->_chkcnf(array('getUsers'));
+    }
+
+    /**
+     * Check if the given config strings are set
+     *
+     * @author  Matthias Grimm 
+     *
+     * @param   array $keys
+     * @param   bool  $wop
+     * @return  bool
+     */
+    protected function _chkcnf($keys, $wop = false) {
+        foreach($keys as $key) {
+            if(empty($this->conf[$key])) return false;
+        }
+        return true;
+    }
+
+    /**
+     * Counts users which meet certain $filter criteria.
+     *
+     * @author  Matthias Grimm 
+     *
+     * @param  array  $filter  filter criteria in item/pattern pairs
+     * @return int count of found users.
+     */
+    public function getUserCount($filter = array()) {
+        $rc = 0;
+
+        if($this->_openDB()) {
+            $sql = $this->_createSQLFilter($this->conf['getUsers'], $filter);
+
+            // no equivalent of SQL_CALC_FOUND_ROWS in pgsql?
+            if(($result = $this->_queryDB($sql))) {
+                $rc = count($result);
+            }
+            $this->_closeDB();
+        }
+        return $rc;
+    }
+
+    /**
+     * Bulk retrieval of user data
+     *
+     * @author  Matthias Grimm 
+     *
+     * @param   int   $first     index of first user to be returned
+     * @param   int   $limit     max number of users to be returned
+     * @param   array $filter    array of field/pattern pairs
+     * @return  array userinfo (refer getUserData for internal userinfo details)
+     */
+    public function retrieveUsers($first = 0, $limit = 10, $filter = array()) {
+        $out = array();
+
+        if($this->_openDB()) {
+            $this->_lockTables("READ");
+            $sql = $this->_createSQLFilter($this->conf['getUsers'], $filter);
+            $sql .= " ".$this->conf['SortOrder']." LIMIT $limit OFFSET $first";
+            $result = $this->_queryDB($sql);
+
+            foreach($result as $user)
+                if(($info = $this->_getUserInfo($user['user'])))
+                    $out[$user['user']] = $info;
+
+            $this->_unlockTables();
+            $this->_closeDB();
+        }
+        return $out;
+    }
+
+    // @inherit function joinGroup($user, $group)
+    // @inherit function leaveGroup($user, $group) {
+
+    /**
+     * Adds a user to a group.
+     *
+     * If $force is set to true non existing groups would be created.
+     *
+     * The database connection must already be established. Otherwise
+     * this function does nothing and returns 'false'.
+     *
+     * @author Matthias Grimm 
+     * @author Andreas Gohr   
+     *
+     * @param   string $user    user to add to a group
+     * @param   string $group   name of the group
+     * @param   bool   $force   create missing groups
+     * @return  bool   true on success, false on error
+     */
+    protected function _addUserToGroup($user, $group, $force = false) {
+        $newgroup = 0;
+
+        if(($this->dbcon) && ($user)) {
+            $gid = $this->_getGroupID($group);
+            if(!$gid) {
+                if($force) { // create missing groups
+                    $sql = str_replace('%{group}', addslashes($group), $this->conf['addGroup']);
+                    $this->_modifyDB($sql);
+                    //group should now exists try again to fetch it
+                    $gid      = $this->_getGroupID($group);
+                    $newgroup = 1; // group newly created
+                }
+            }
+            if(!$gid) return false; // group didn't exist and can't be created
+
+            $sql = $this->conf['addUserGroup'];
+            if(strpos($sql, '%{uid}') !== false) {
+                $uid = $this->_getUserID($user);
+                $sql = str_replace('%{uid}', addslashes($uid), $sql);
+            }
+            $sql = str_replace('%{user}', addslashes($user), $sql);
+            $sql = str_replace('%{gid}', addslashes($gid), $sql);
+            $sql = str_replace('%{group}', addslashes($group), $sql);
+            if($this->_modifyDB($sql) !== false) return true;
+
+            if($newgroup) { // remove previously created group on error
+                $sql = str_replace('%{gid}', addslashes($gid), $this->conf['delGroup']);
+                $sql = str_replace('%{group}', addslashes($group), $sql);
+                $this->_modifyDB($sql);
+            }
+        }
+        return false;
+    }
+
+    // @inherit function _delUserFromGroup($user $group)
+    // @inherit function _getGroups($user)
+    // @inherit function _getUserID($user)
+
+    /**
+     * Adds a new User to the database.
+     *
+     * The database connection must already be established
+     * for this function to work. Otherwise it will return
+     * 'false'.
+     *
+     * @param  string $user  login of the user
+     * @param  string $pwd   encrypted password
+     * @param  string $name  full name of the user
+     * @param  string $mail  email address
+     * @param  array  $grps  array of groups the user should become member of
+     * @return bool
+     *
+     * @author  Andreas Gohr 
+     * @author  Chris Smith 
+     * @author  Matthias Grimm 
+     */
+    protected function _addUser($user, $pwd, $name, $mail, $grps) {
+        if($this->dbcon && is_array($grps)) {
+            $sql = str_replace('%{user}', addslashes($user), $this->conf['addUser']);
+            $sql = str_replace('%{pass}', addslashes($pwd), $sql);
+            $sql = str_replace('%{name}', addslashes($name), $sql);
+            $sql = str_replace('%{email}', addslashes($mail), $sql);
+            if($this->_modifyDB($sql)) {
+                $uid = $this->_getUserID($user);
+            } else {
+                return false;
+            }
+
+            $group = '';
+            $gid = false;
+
+            if($uid) {
+                foreach($grps as $group) {
+                    $gid = $this->_addUserToGroup($user, $group, 1);
+                    if($gid === false) break;
+                }
+
+                if($gid !== false){
+                    return true;
+                } else {
+                    /* remove the new user and all group relations if a group can't
+                     * be assigned. Newly created groups will remain in the database
+                     * and won't be removed. This might create orphaned groups but
+                     * is not a big issue so we ignore this problem here.
+                     */
+                    $this->_delUser($user);
+                    $this->_debug("PgSQL err: Adding user '$user' to group '$group' failed.", -1, __LINE__, __FILE__);
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Opens a connection to a database and saves the handle for further
+     * usage in the object. The successful call to this functions is
+     * essential for most functions in this object.
+     *
+     * @author Matthias Grimm 
+     *
+     * @return bool
+     */
+    protected function _openDB() {
+        if(!$this->dbcon) {
+            $dsn = $this->conf['server'] ? 'host='.$this->conf['server'] : '';
+            $dsn .= ' port='.$this->conf['port'];
+            $dsn .= ' dbname='.$this->conf['database'];
+            $dsn .= ' user='.$this->conf['user'];
+            $dsn .= ' password='.$this->conf['password'];
+
+            $con = @pg_connect($dsn);
+            if($con) {
+                $this->dbcon = $con;
+                return true; // connection and database successfully opened
+            } else {
+                $this->_debug(
+                        "PgSQL err: Connection to {$this->conf['user']}@{$this->conf['server']} not possible.",
+                        -1, __LINE__, __FILE__
+                    );
+            }
+            return false; // connection failed
+        }
+        return true; // connection already open
+    }
+
+    /**
+     * Closes a database connection.
+     *
+     * @author Matthias Grimm 
+     */
+    protected function _closeDB() {
+        if($this->dbcon) {
+            pg_close($this->dbcon);
+            $this->dbcon = 0;
+        }
+    }
+
+    /**
+     * Sends a SQL query to the database and transforms the result into
+     * an associative array.
+     *
+     * This function is only able to handle queries that returns a
+     * table such as SELECT.
+     *
+     * @author Matthias Grimm 
+     *
+     * @param  string $query  SQL string that contains the query
+     * @return array the result table
+     */
+    protected function _queryDB($query) {
+        $resultarray = array();
+        if($this->dbcon) {
+            $result = @pg_query($this->dbcon, $query);
+            if($result) {
+                while(($t = pg_fetch_assoc($result)) !== false)
+                    $resultarray[] = $t;
+                pg_free_result($result);
+                return $resultarray;
+            } else{
+                $this->_debug('PgSQL err: '.pg_last_error($this->dbcon), -1, __LINE__, __FILE__);
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Executes an update or insert query. This differs from the
+     * MySQL one because it does NOT return the last insertID
+     *
+     * @author Andreas Gohr 
+     */
+    protected function _modifyDB($query) {
+        if($this->dbcon) {
+            $result = @pg_query($this->dbcon, $query);
+            if($result) {
+                pg_free_result($result);
+                return true;
+            }
+            $this->_debug('PgSQL err: '.pg_last_error($this->dbcon), -1, __LINE__, __FILE__);
+        }
+        return false;
+    }
+
+    /**
+     * Start a transaction
+     *
+     * @author Matthias Grimm 
+     *
+     * @param string $mode  could be 'READ' or 'WRITE'
+     * @return bool
+     */
+    protected function _lockTables($mode) {
+        if($this->dbcon) {
+            $this->_modifyDB('BEGIN');
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Commit a transaction
+     *
+     * @author Matthias Grimm 
+     */
+    protected function _unlockTables() {
+        if($this->dbcon) {
+            $this->_modifyDB('COMMIT');
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Escape a string for insertion into the database
+     *
+     * @author Andreas Gohr 
+     *
+     * @param  string  $string The string to escape
+     * @param  bool    $like   Escape wildcard chars as well?
+     * @return string
+     */
+    protected function _escape($string, $like = false) {
+        $string = pg_escape_string($string);
+        if($like) {
+            $string = addcslashes($string, '%_');
+        }
+        return $string;
+    }
+}
\ No newline at end of file
diff --git a/sources/lib/plugins/authpgsql/conf/default.php b/sources/lib/plugins/authpgsql/conf/default.php
new file mode 100644
index 0000000..7f78280
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/conf/default.php
@@ -0,0 +1,33 @@
+ 'danger');
+$meta['port']             = array('numeric','_caution' => 'danger');
+$meta['user']             = array('string','_caution' => 'danger');
+$meta['password']         = array('password','_caution' => 'danger');
+$meta['database']         = array('string','_caution' => 'danger');
+$meta['debug']            = array('onoff','_caution' => 'security');
+$meta['forwardClearPass'] = array('onoff','_caution' => 'danger');
+$meta['checkPass']        = array('','_caution' => 'danger');
+$meta['getUserInfo']      = array('','_caution' => 'danger');
+$meta['getGroups']        = array('');
+$meta['getUsers']         = array('','_caution' => 'danger');
+$meta['FilterLogin']      = array('string','_caution' => 'danger');
+$meta['FilterName']       = array('string','_caution' => 'danger');
+$meta['FilterEmail']      = array('string','_caution' => 'danger');
+$meta['FilterGroup']      = array('string','_caution' => 'danger');
+$meta['SortOrder']        = array('string','_caution' => 'danger');
+$meta['addUser']          = array('','_caution' => 'danger');
+$meta['addGroup']         = array('','_caution' => 'danger');
+$meta['addUserGroup']     = array('','_caution' => 'danger');
+$meta['delGroup']         = array('','_caution' => 'danger');
+$meta['getUserID']        = array('','_caution' => 'danger');
+$meta['delUser']          = array('','_caution' => 'danger');
+$meta['delUserRefs']      = array('','_caution' => 'danger');
+$meta['updateUser']       = array('string','_caution' => 'danger');
+$meta['UpdateLogin']      = array('string','_caution' => 'danger');
+$meta['UpdatePass']       = array('string','_caution' => 'danger');
+$meta['UpdateEmail']      = array('string','_caution' => 'danger');
+$meta['UpdateName']       = array('string','_caution' => 'danger');
+$meta['UpdateTarget']     = array('string','_caution' => 'danger');
+$meta['delUserGroup']     = array('','_caution' => 'danger');
+$meta['getGroupID']       = array('','_caution' => 'danger');
\ No newline at end of file
diff --git a/sources/lib/plugins/authpgsql/lang/bg/settings.php b/sources/lib/plugins/authpgsql/lang/bg/settings.php
new file mode 100644
index 0000000..0defdc4
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/bg/settings.php
@@ -0,0 +1,12 @@
+
+ */
+$lang['server']                = 'Вашият PostgreSQL сървър';
+$lang['port']                  = 'Порт за PostgreSQL сървъра';
+$lang['user']                  = 'PostgreSQL потребител';
+$lang['password']              = 'Парола за горния потребител';
+$lang['database']              = 'Име на базата от данни';
+$lang['debug']                 = 'Показване на допълнителна debug информация';
\ No newline at end of file
diff --git a/sources/lib/plugins/authpgsql/lang/cs/settings.php b/sources/lib/plugins/authpgsql/lang/cs/settings.php
new file mode 100644
index 0000000..aec7eec
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/cs/settings.php
@@ -0,0 +1,38 @@
+
+ * @author soer9648 
+ */
+$lang['server']                = 'Din PostgresSQL server';
+$lang['port']                  = 'Din PostgresSQL servers port';
+$lang['password']              = 'Kodeord til ovenstående bruger';
+$lang['database']              = 'Database der skal benyttes';
+$lang['debug']                 = 'Vis yderligere debug output';
+$lang['checkPass']             = 'SQL-sætning til at kontrollere kodeord';
+$lang['getUsers']              = 'SQL-sætning til at liste alle brugere';
+$lang['addUser']               = 'SQL-sætning til at tilføje en ny bruger';
+$lang['addGroup']              = 'SQL-sætning til at tilføje en ny gruppe';
+$lang['addUserGroup']          = 'SQL-sætning til at tilføje en bruger til en eksisterende gruppe';
+$lang['delGroup']              = 'SQL-sætning til at fjerne en gruppe';
+$lang['delUser']               = 'SQL-sætning til at slette en bruger';
+$lang['delUserRefs']           = 'SQL-sætning til at fjerne en bruger fra alle grupper';
+$lang['updateUser']            = 'SQL-sætning til at opdatere en brugerprofil';
diff --git a/sources/lib/plugins/authpgsql/lang/de-informal/settings.php b/sources/lib/plugins/authpgsql/lang/de-informal/settings.php
new file mode 100644
index 0000000..3e3a0dc
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/de-informal/settings.php
@@ -0,0 +1,39 @@
+
+ * @author Volker Bödker 
+ */
+$lang['server']                = 'PostgreSQL-Server';
+$lang['port']                  = 'Port des PostgreSQL-Servers.';
+$lang['user']                  = 'Benutzername für den Zugriff auf den PostgreSQL-Server.';
+$lang['password']              = 'Passwort des angegebenen Benutzers.';
+$lang['database']              = 'Zu verwendende Datenbank.';
+$lang['debug']                 = 'Debug-Informationen anzeigen?';
+$lang['forwardClearPass']      = 'Passwort der DokuWiki-Benutzer im Klartext an die Datenbank übergeben? (Im Normalfall wird die passcrypt-Option angewendet.)';
+$lang['checkPass']             = 'SQL-Kommando zum Überprüfen von Passwörtern.';
+$lang['getUserInfo']           = 'SQL-Kommando um Benutzerinformationen auszulesen.';
+$lang['getGroups']             = 'SQL-Kommando um Gruppen eines Benutzers auszulesen.';
+$lang['getUsers']              = 'SQL-Kommando um alle Benutzer auszulesen.';
+$lang['FilterLogin']           = 'SQL-Bedingung um Benutzer anhand ihres Anmeldenamens zu filtern.';
+$lang['FilterName']            = 'SQL-Bedingung um Benutzer anhand ihres Namens zu filtern.';
+$lang['FilterEmail']           = 'SQL-Bedingung um Benutzer anhand ihrer E-Mail-Adresse zu filtern.';
+$lang['FilterGroup']           = 'SQL-Bedingung um Benutzer anhand ihrer Gruppenzugehörigkeit zu filtern.';
+$lang['SortOrder']             = 'SQL-Bedingung um anhand der die Benutzerliste sortiert wird.';
+$lang['addUser']               = 'SQL-Kommando um einen neuen Benutzer anzulegen.';
+$lang['addGroup']              = 'SQL-Kommando um eine neue Gruppe anzulegen.';
+$lang['addUserGroup']          = 'SQL-Kommando um einen Benutzer zu einer Gruppe hinzuzufügen.';
+$lang['delGroup']              = 'SQL-Kommando um eine Gruppe zu löschen.';
+$lang['getUserID']             = 'SQL-Kommando um den Primärschlüssel des Benutzers auszulesen.';
+$lang['delUser']               = 'SQL-Kommando um einen Benutzer zu löschen.';
+$lang['delUserRefs']           = 'SQL-Kommando um einen Benutzer aus allen Gruppen zu entfernen.';
+$lang['updateUser']            = 'SQL-Kommando um das Profil eines Benutzers zu aktualisieren.';
+$lang['UpdateLogin']           = 'SQL-Bedingung um den Anmeldenamen eines Benutzers zu ändern.';
+$lang['UpdatePass']            = 'SQL-Bedingung um das Passwort eines Benutzers zu ändern.';
+$lang['UpdateEmail']           = 'SQL-Bedingung um die E-Mail-Adresse eines Benutzers zu ändern.';
+$lang['UpdateName']            = 'SQL-Bedingung um den Namen eines Benutzers zu ändern.';
+$lang['UpdateTarget']          = 'SQL-Bedingung zur eindeutigen Identifikation des Benutzers.';
+$lang['delUserGroup']          = 'SQL-Kommando um einen Benutzer aus einer angegeben Gruppe zu entfernen.';
+$lang['getGroupID']            = 'SQL-Kommando um den Primärschlüssel einer Gruppe auszulesen.';
diff --git a/sources/lib/plugins/authpgsql/lang/de/settings.php b/sources/lib/plugins/authpgsql/lang/de/settings.php
new file mode 100644
index 0000000..061f56e
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/de/settings.php
@@ -0,0 +1,38 @@
+
+ */
+$lang['server']                = 'PostgreSQL-Server';
+$lang['port']                  = 'Port des PostgreSQL-Servers.';
+$lang['user']                  = 'Benutzername für den Zugriff auf den PostgreSQL-Server.';
+$lang['password']              = 'Passwort des angegebenen Benutzers.';
+$lang['database']              = 'Zu verwendende Datenbank.';
+$lang['debug']                 = 'Debug-Informationen anzeigen?';
+$lang['forwardClearPass']      = 'Passwort der DokuWiki-Benutzer im Klartext an die Datenbank übergeben? (Im Normalfall wird die passcrypt-Option angewendet.)';
+$lang['checkPass']             = 'SQL-Kommando zum Überprüfen von Passwörtern.';
+$lang['getUserInfo']           = 'SQL-Kommando um Benutzerinformationen auszulesen.';
+$lang['getGroups']             = 'SQL-Kommando um Gruppen eines Benutzers auszulesen.';
+$lang['getUsers']              = 'SQL-Kommando um alle Benutzer auszulesen.';
+$lang['FilterLogin']           = 'SQL-Bedingung um Benutzer anhand ihres Anmeldenamens zu filtern.';
+$lang['FilterName']            = 'SQL-Bedingung um Benutzer anhand ihres Namens zu filtern.';
+$lang['FilterEmail']           = 'SQL-Bedingung um Benutzer anhand ihrer E-Mail-Adresse zu filtern.';
+$lang['FilterGroup']           = 'SQL-Bedingung um Benutzer anhand ihrer Gruppenzugehörigkeit zu filtern.';
+$lang['SortOrder']             = 'SQL-Bedingung um anhand der die Benutzerliste sortiert wird.';
+$lang['addUser']               = 'SQL-Kommando um einen neuen Benutzer anzulegen.';
+$lang['addGroup']              = 'SQL-Kommando um eine neue Gruppe anzulegen.';
+$lang['addUserGroup']          = 'SQL-Kommando um einen Benutzer zu einer Gruppe hinzuzufügen.';
+$lang['delGroup']              = 'SQL-Kommando um eine Gruppe zu löschen.';
+$lang['getUserID']             = 'SQL-Kommando um den Primärschlüssel des Benutzers auszulesen.';
+$lang['delUser']               = 'SQL-Kommando um einen Benutzer zu löschen.';
+$lang['delUserRefs']           = 'SQL-Kommando um einen Benutzer aus allen Gruppen zu entfernen.';
+$lang['updateUser']            = 'SQL-Kommando um das Profil eines Benutzers zu aktualisieren.';
+$lang['UpdateLogin']           = 'SQL-Bedingung um den Anmeldenamen eines Benutzers zu ändern.';
+$lang['UpdatePass']            = 'SQL-Bedingung um das Passwort eines Benutzers zu ändern.';
+$lang['UpdateEmail']           = 'SQL-Bedingung um die E-Mail-Adresse eines Benutzers zu ändern.';
+$lang['UpdateName']            = 'SQL-Bedingung um den Namen eines Benutzers zu ändern.';
+$lang['UpdateTarget']          = 'SQL-Bedingung zur eindeutigen Identifikation des Benutzers.';
+$lang['delUserGroup']          = 'SQL-Kommando um einen Benutzer aus einer angegeben Gruppe zu entfernen.';
+$lang['getGroupID']            = 'SQL-Kommando um den Primärschlüssel einer Gruppe auszulesen.';
diff --git a/sources/lib/plugins/authpgsql/lang/en/settings.php b/sources/lib/plugins/authpgsql/lang/en/settings.php
new file mode 100644
index 0000000..cfb2686
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/en/settings.php
@@ -0,0 +1,33 @@
+
+ */
diff --git a/sources/lib/plugins/authpgsql/lang/fr/settings.php b/sources/lib/plugins/authpgsql/lang/fr/settings.php
new file mode 100644
index 0000000..9e47107
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/fr/settings.php
@@ -0,0 +1,38 @@
+
+ */
+$lang['server']                = 'Votre serveur PostgreSQL';
+$lang['port']                  = 'Le port de votre serveur PostgreSQL';
+$lang['user']                  = 'Nom d\'utilisateur PostgreSQL';
+$lang['password']              = 'Mot de passe pour l\'utilisateur ci-dessus';
+$lang['database']              = 'Base de données à utiliser';
+$lang['debug']                 = 'Afficher des informations de débogage supplémentaires';
+$lang['forwardClearPass']      = 'Passer les mots de passe aux requêtes SQL ci-dessous en cleartext plutôt qu\'avec l\'option passcrypt';
+$lang['checkPass']             = 'Requête SQL pour la vérification des mots de passe';
+$lang['getUserInfo']           = 'Requête SQL pour la récupération des informations d\'un utilisateur';
+$lang['getGroups']             = 'Requête SQL pour la récupération des groupes d\'un utilisateur';
+$lang['getUsers']              = 'Requête SQL pour énumérer tous les utilisateurs';
+$lang['FilterLogin']           = 'Clause SQL pour filtrer les utilisateurs par identifiant';
+$lang['FilterName']            = 'Clause SQL pour filtrer les utilisateurs par nom complet';
+$lang['FilterEmail']           = 'Clause SQL pour filtrer les utilisateurs par adresse électronique';
+$lang['FilterGroup']           = 'Clause SQL pour filtrer les utilisateurs par groupes';
+$lang['SortOrder']             = 'Clause SQL pour trier les utilisateurs';
+$lang['addUser']               = 'Requête SQL pour ajouter un nouvel utilisateur';
+$lang['addGroup']              = 'Requête SQL pour ajouter un nouveau groupe';
+$lang['addUserGroup']          = 'Requête SQL pour ajouter un utilisateur à un groupe existant';
+$lang['delGroup']              = 'Requête SQL pour retirer un groupe';
+$lang['getUserID']             = 'Requête SQL pour obtenir la clé primaire d\'un utilisateur';
+$lang['delUser']               = 'Requête SQL pour supprimer un utilisateur';
+$lang['delUserRefs']           = 'Requête SQL pour retirer un utilisateur de tous les groupes';
+$lang['updateUser']            = 'Requête SQL pour mettre à jour le profil d\'un utilisateur';
+$lang['UpdateLogin']           = 'Clause de mise à jour pour mettre à jour l\'identifiant d\'un utilisateur';
+$lang['UpdatePass']            = 'Clause de mise à jour pour mettre à jour le mot de passe d\'un utilisateur';
+$lang['UpdateEmail']           = 'Clause de mise à jour pour mettre à jour l\'adresse électronique d\'un utilisateur';
+$lang['UpdateName']            = 'Clause de mise à jour pour mettre à jour le nom complet d\'un utilisateur';
+$lang['UpdateTarget']          = 'Clause de limite pour identifier l\'utilisateur durant une mise à jour';
+$lang['delUserGroup']          = 'Requête SQL pour retirer un utilisateur d\'un groupe donné';
+$lang['getGroupID']            = 'Requête SQL pour obtenir la clé primaire d\'un groupe donné';
diff --git a/sources/lib/plugins/authpgsql/lang/hu/settings.php b/sources/lib/plugins/authpgsql/lang/hu/settings.php
new file mode 100644
index 0000000..ff62a70
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/hu/settings.php
@@ -0,0 +1,38 @@
+
+ */
+$lang['server']                = 'PostgreSQL-szerver';
+$lang['port']                  = 'PostgreSQL-port';
+$lang['user']                  = 'PostgreSQL felhasználónév';
+$lang['password']              = 'Ehhez a jelszó';
+$lang['database']              = 'Adatbázis';
+$lang['debug']                 = 'Debug-üzenetek megjelenítése?';
+$lang['forwardClearPass']      = 'A jelszó nyílt szövegben való átadása a következő SQL utasításokban a passcrypt opció használata helyett';
+$lang['checkPass']             = 'SQL utasítás a jelszavak ellenőrzéséhez';
+$lang['getUserInfo']           = 'SQL utasítás a felhasználói információk lekérdezéséhez';
+$lang['getGroups']             = 'SQL utasítás egy felhasználó csoporttagságainak lekérdezéséhez';
+$lang['getUsers']              = 'SQL utasítás a felhasználók listázásához';
+$lang['FilterLogin']           = 'SQL kifejezés a felhasználók azonosító alapú szűréséhez';
+$lang['FilterName']            = 'SQL kifejezés a felhasználók név alapú szűréséhez';
+$lang['FilterEmail']           = 'SQL kifejezés a felhasználók e-mail cím alapú szűréséhez';
+$lang['FilterGroup']           = 'SQL kifejezés a felhasználók csoporttagság alapú szűréséhez';
+$lang['SortOrder']             = 'SQL kifejezés a felhasználók rendezéséhez';
+$lang['addUser']               = 'SQL utasítás új felhasználó hozzáadásához';
+$lang['addGroup']              = 'SQL utasítás új csoport hozzáadásához';
+$lang['addUserGroup']          = 'SQL utasítás egy felhasználó egy meglévő csoporthoz való hozzáadásához';
+$lang['delGroup']              = 'SQL utasítás egy csoport törléséhez';
+$lang['getUserID']             = 'SQL utasítás egy felhasználó elsődleges kulcsának lekérdezéséhez';
+$lang['delUser']               = 'SQL utasítás egy felhasználó törléséhez';
+$lang['delUserRefs']           = 'SQL utasítás egy felhasználó eltávolításához az összes csoportból';
+$lang['updateUser']            = 'SQL utasítás egy felhasználó profiljának frissítéséhez';
+$lang['UpdateLogin']           = 'SQL kifejezés a felhasználó azonosítójának frissítéséhez';
+$lang['UpdatePass']            = 'SQL kifejezés a felhasználó jelszavának frissítéséhez';
+$lang['UpdateEmail']           = 'SQL kifejezés a felhasználó e-mail címének frissítéséhez';
+$lang['UpdateName']            = 'SQL kifejezés a felhasználó nevének frissítéséhez';
+$lang['UpdateTarget']          = 'SQL kifejezés a felhasználó kiválasztásához az adatok frissítésekor';
+$lang['delUserGroup']          = 'SQL utasítás egy felhasználó eltávolításához egy adott csoportból';
+$lang['getGroupID']            = 'SQL utasítás egy csoport elsődleges kulcsának lekérdezéséhez';
diff --git a/sources/lib/plugins/authpgsql/lang/it/settings.php b/sources/lib/plugins/authpgsql/lang/it/settings.php
new file mode 100644
index 0000000..10ae72f
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/it/settings.php
@@ -0,0 +1,5 @@
+
+ */
+$lang['server']                = 'PostgreSQL のサーバー名';
+$lang['port']                  = 'PostgreSQL サーバーのポート番号';
+$lang['user']                  = 'PostgreSQL 接続用ユーザー名';
+$lang['password']              = 'PostgreSQL 接続用ユーザーのパスワード';
+$lang['database']              = '使用するデータベース名';
+$lang['debug']                 = 'デバック情報を表示する';
+$lang['forwardClearPass']      = '以下で定義する SQL ステートメントにおいて, パスワード変数 %{pass} を平文とする(DokiWiki側で暗号化しない)';
+$lang['checkPass']             = 'パスワードの照合に用いる SQL ステートメント';
+$lang['getUserInfo']           = 'ユーザー情報の取得に用いる SQL ステートメント';
+$lang['getGroups']             = 'ユーザーが所属する全てのグループの取得に用いる SQL ステートメント';
+$lang['getUsers']              = 'ユーザーリストを取得する SQL ステートメント';
+$lang['FilterLogin']           = 'ユーザーリストをログイン名で絞り込む SQL 句';
+$lang['FilterName']            = 'ユーザーリストをフルネームで絞り込む SQL 句';
+$lang['FilterEmail']           = 'ユーザーリストをメールアドレスで絞り込む SQL 句';
+$lang['FilterGroup']           = 'ユーザーリストを所属グループで絞り込む SQL 句';
+$lang['SortOrder']             = 'ユーザーリストのソート方法を指定する SQL 句';
+$lang['addUser']               = '新規ユーザーを追加する SQL ステートメント';
+$lang['addGroup']              = '新規グループを追加する SQL ステートメント';
+$lang['addUserGroup']          = 'ユーザーをグループに配属する SQL ステートメント';
+$lang['delGroup']              = 'グループを削除する SQL ステートメント';
+$lang['getUserID']             = 'ユーザーIDの取得に用いる SQL ステートメン';
+$lang['delUser']               = 'ユーザーを削除する SQL ステートメント';
+$lang['delUserRefs']           = 'ユーザーのグループ所属を全て取り消す SQL ステートメント';
+$lang['updateUser']            = 'ユーザー情報を変更する SQL ステートメント';
+$lang['UpdateLogin']           = '変更後のログイン名を指定する SQL 句';
+$lang['UpdatePass']            = '変更後のパスワードを指定する SQL 句';
+$lang['UpdateEmail']           = '変更後のメールアドレスを指定する SQL 句';
+$lang['UpdateName']            = '変更後のフルネームを指定する SQL 句';
+$lang['UpdateTarget']          = '変更対象のユーザを特定するための SQL 句';
+$lang['delUserGroup']          = 'ユーザーをグループから除名する SQL ステートメント';
+$lang['getGroupID']            = 'グループIDの取得に用いる SQL ステートメント';
diff --git a/sources/lib/plugins/authpgsql/lang/ko/settings.php b/sources/lib/plugins/authpgsql/lang/ko/settings.php
new file mode 100644
index 0000000..bdf38b3
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/ko/settings.php
@@ -0,0 +1,39 @@
+
+ * @author Garam 
+ */
+$lang['server']                = 'PostgreSQL 서버';
+$lang['port']                  = 'PostgreSQL 서버의 포트';
+$lang['user']                  = 'PostgreSQL 사용자 이름';
+$lang['password']              = '위 사용자의 비밀번호';
+$lang['database']              = '사용할 데이터베이스';
+$lang['debug']                 = '추가적인 디버그 정보 보이기';
+$lang['forwardClearPass']      = 'passcrypt 옵션을 사용하는 대신 아래 SQL 문에 일반 텍스트로 사용자 비밀번호를 전달';
+$lang['checkPass']             = '비밀번호를 확인하기 위한 SQL 문';
+$lang['getUserInfo']           = '사용자 정보를 가져오기 위한 SQL 문';
+$lang['getGroups']             = '사용자의 그룹 구성원을 가져오기 위한 SQL 문';
+$lang['getUsers']              = '모든 사용자를 나타낼 SQL 문';
+$lang['FilterLogin']           = '로그인 이름별로 사용자를 필터하기 위한 SQL 조항';
+$lang['FilterName']            = '전체 이름별로 사용자를 필터하기 위한 SQL 조항';
+$lang['FilterEmail']           = '이메일 주소별로 사용자를 필터하기 위한 SQL 조항';
+$lang['FilterGroup']           = '그룹 구성원별로 사용자를 필터하기 위한 SQL 조항';
+$lang['SortOrder']             = '사용자를 정렬할 SQL 조항';
+$lang['addUser']               = '새 사용자를 추가할 SQL 문';
+$lang['addGroup']              = '새 그룹을 추가할 SQL 문';
+$lang['addUserGroup']          = '기존 그룹에 사용자를 추가할 SQL 문';
+$lang['delGroup']              = '그룹을 제거할 SQL 문';
+$lang['getUserID']             = '사용자의 기본 키를 얻을 SQL 문';
+$lang['delUser']               = '사용자를 삭제할 SQL 문';
+$lang['delUserRefs']           = '모든 그룹에서 사용자를 제거할 SQL 문';
+$lang['updateUser']            = '사용자 프로필을 업데이트할 SQL 문';
+$lang['UpdateLogin']           = '사용자의 로그인 이름을 업데이트하기 위한 Update 조항';
+$lang['UpdatePass']            = '사용자의 비밀번호를 업데이트하기 위한 Update 조항';
+$lang['UpdateEmail']           = '사용자의 이메일 주소를 업데이트하기 위한 Update 조항';
+$lang['UpdateName']            = '사용자의 전체 이름을 업데이트하기 위한 Update 조항';
+$lang['UpdateTarget']          = '업데이트할 때 사용자를 식별할 Limit 조항';
+$lang['delUserGroup']          = '주어진 그룹에서 사용자를 제거할 SQL 문';
+$lang['getGroupID']            = '주어진 그룹의 기본 키를 얻을 SQL 문';
diff --git a/sources/lib/plugins/authpgsql/lang/lv/settings.php b/sources/lib/plugins/authpgsql/lang/lv/settings.php
new file mode 100644
index 0000000..ced5dab
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/lv/settings.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/authpgsql/lang/nl/settings.php b/sources/lib/plugins/authpgsql/lang/nl/settings.php
new file mode 100644
index 0000000..3faa787
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/nl/settings.php
@@ -0,0 +1,38 @@
+
+ */
+$lang['server']                = 'Je PostgreSQL server';
+$lang['port']                  = 'Je PostgreSQL server poort';
+$lang['user']                  = 'PostgreSQL gebruikersnaam';
+$lang['password']              = 'Wachtwoord voor bovenstaande gebruiker';
+$lang['database']              = 'Te gebruiken database';
+$lang['debug']                 = 'Tonen aanvullende debuginformatie';
+$lang['forwardClearPass']      = 'Wachtwoorden als leesbare tekst in SQL commando\'s opnemen in plaats van versleuteld';
+$lang['checkPass']             = 'SQL commando voor het verifiëren van wachtwoorden';
+$lang['getUserInfo']           = 'SQL commando voor het ophalen van gebruikersinformatie';
+$lang['getGroups']             = 'SQL commando voor het ophalen van groepslidmaatschappen van gebruikers';
+$lang['getUsers']              = 'SQL commando voor het tonen van alle gebruikers';
+$lang['FilterLogin']           = 'SQL commando voor het filteren van gebruikers op inlognaam';
+$lang['FilterName']            = 'SQL commando voor het filteren van gebruikers op volledige naam';
+$lang['FilterEmail']           = 'SQL commando voor het filteren van gebruikers op e-mailadres';
+$lang['FilterGroup']           = 'SQL commando voor het filteren van gebruikers op groepslidmaatschap';
+$lang['SortOrder']             = 'SQL commando voor het sorteren van gebruikers';
+$lang['addUser']               = 'SQL commando voor het toevoegen van een nieuwe gebruiker';
+$lang['addGroup']              = 'SQL commando voor het toevoegen van een nieuwe groep';
+$lang['addUserGroup']          = 'SQL commando voor toevoegen van een gebruiker aan een bestaande groep';
+$lang['delGroup']              = 'SQL commando voor het verwijderen van een groep';
+$lang['getUserID']             = 'SQL commando om de primaire sleutel van een gebruiker op te halen';
+$lang['delUser']               = 'SQL commando voor het verwijderen van een gebruiker';
+$lang['delUserRefs']           = 'SQL commando om een gebruiker uit alle groepen te verwijderen';
+$lang['updateUser']            = 'SQL commando om een gebruikersprofiel bij te werken';
+$lang['UpdateLogin']           = 'SQL commando om een inlognaam bij te werken';
+$lang['UpdatePass']            = 'SQL commando om een wachtwoord bij te werken';
+$lang['UpdateEmail']           = 'SQL commando om een e-mailadres bij te werken';
+$lang['UpdateName']            = 'SQL commando om een volledige naam bij te werken';
+$lang['UpdateTarget']          = 'Beperkingsclausule om de gebruiker te identificeren bij het bijwerken';
+$lang['delUserGroup']          = 'SQL commando om een gebruiker uit een bepaalde groep te verwijderen';
+$lang['getGroupID']            = 'SQL commando om de primaire sleutel van een bepaalde groep op te halen';
diff --git a/sources/lib/plugins/authpgsql/lang/pl/settings.php b/sources/lib/plugins/authpgsql/lang/pl/settings.php
new file mode 100644
index 0000000..37afb25
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/pl/settings.php
@@ -0,0 +1,5 @@
+
+ * @author Frederico Guimarães 
+ */
+$lang['server']                = 'Seu servidor PostgreSQL';
+$lang['port']                  = 'Sua porta do servidor PostgreSQL';
+$lang['user']                  = 'Nome de usuário PostgreSQL';
+$lang['password']              = 'Senha do usuário acima';
+$lang['database']              = 'Base de dados para usar';
+$lang['debug']                 = 'Mostrar informações adicionais de depuração';
+$lang['forwardClearPass']      = 'Transmitir senhas de usuário como texto puro para comandos SQL abaixo, ao invés de usar a opção passcrypt';
+$lang['checkPass']             = 'Comando SQL para verificar senhas';
+$lang['getUserInfo']           = 'Comando SQL para obter informações do usuário';
+$lang['getGroups']             = 'Comando SQL para obter as credenciais de um usuário de um determinado grupo';
+$lang['getUsers']              = 'Comando SQL para listar todos os usuários';
+$lang['FilterLogin']           = 'Cláusula SQL para filtrar usuários pelo nome de login';
+$lang['FilterName']            = 'Cláusula SQL para filtrar usuários pelo nome completo';
+$lang['FilterEmail']           = 'Cláusula SQL para filtrar usuários pelo endereço de email';
+$lang['FilterGroup']           = 'Cláusula SQL para filtrar usuários pelo grupo que pertencem';
+$lang['SortOrder']             = 'Comando SQL para adicionar novo grupo';
+$lang['addUser']               = 'Comando SQL para adicionar novo usuário';
+$lang['addGroup']              = 'Comando SQL para adicionar novo grupo';
+$lang['addUserGroup']          = 'Comando SQL para adicionar um usuário a um grupo existente';
+$lang['delGroup']              = 'Comando SQL para remover um grupo';
+$lang['getUserID']             = 'Comando SQL para obter chave primária de usuário';
+$lang['delUser']               = 'Comando SQL para apagar usuário';
+$lang['delUserRefs']           = 'Comando SQL para remover um usuário de todos os grupos';
+$lang['updateUser']            = 'Comando SQL para atualizar perfil de usuário';
+$lang['UpdateLogin']           = 'Atualizar cláusula para atualizar o login do usuário';
+$lang['UpdatePass']            = 'Atualizar cláusula para atualizar a senha do usuário';
+$lang['UpdateEmail']           = 'Atualizar cláusula para atualizar o endereço de email';
+$lang['UpdateName']            = 'Atualizar cláusula para atualizar o nome completo do usuário';
+$lang['UpdateTarget']          = 'Limitar cláusula para identificar quando um usuário estiver atualizando';
+$lang['delUserGroup']          = 'Comando SQL para remover um usuário de um determinado grupo';
+$lang['getGroupID']            = 'Comando SQL para obter a chave primária de um determinado grupo';
diff --git a/sources/lib/plugins/authpgsql/lang/pt/settings.php b/sources/lib/plugins/authpgsql/lang/pt/settings.php
new file mode 100644
index 0000000..b33b811
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/pt/settings.php
@@ -0,0 +1,22 @@
+
+ */
+$lang['server']                = 'O seu servidor PostgreSQL';
+$lang['port']                  = 'A porta do seu servidor PostgreSQL';
+$lang['user']                  = 'Nome de utilizador PostgreSQL';
+$lang['password']              = 'Senha do utilizador acima';
+$lang['database']              = 'Base de dados a usar';
+$lang['debug']                 = 'Mostrar informação adicional de debug';
+$lang['FilterLogin']           = 'Cláusula SQL para filtrar utilizadores por nome de login';
+$lang['FilterName']            = 'Cláusula SQL para filtrar utilizadores por nome completo';
+$lang['FilterEmail']           = 'Cláusula SQL para filtrar utilizadores por endereço de email';
+$lang['FilterGroup']           = 'Cláusula SQL para filtrar utilizadores por pertença a grupo';
+$lang['SortOrder']             = 'Cláusula SQL para ordenar utilizadores';
+$lang['UpdateLogin']           = 'Cláusula de atualização para atualizar o nome de login do utilizador';
+$lang['UpdatePass']            = 'Cláusula de atualização para atualizar a senha do utilizador';
+$lang['UpdateEmail']           = 'Cláusula de atualização para atualizar o endereço de email do utilizador';
+$lang['UpdateName']            = 'Cláusula de atualização para atualizar o nome completo do utilizador';
diff --git a/sources/lib/plugins/authpgsql/lang/ru/settings.php b/sources/lib/plugins/authpgsql/lang/ru/settings.php
new file mode 100644
index 0000000..48dd2a8
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/ru/settings.php
@@ -0,0 +1,32 @@
+
+ */
+$lang['server']                = 'Ваш PostgreSQL-сервер';
+$lang['port']                  = 'Порт вашего PostgreSQL-сервера';
+$lang['user']                  = 'Имя пользователя PostgreSQL';
+$lang['password']              = 'Пароль для указанного пользователя.';
+$lang['database']              = 'Имя базы данных';
+$lang['checkPass']             = 'Выражение SQL, осуществляющее проверку пароля';
+$lang['getUserInfo']           = 'Выражение SQL, осуществляющее извлечение информации о пользователе';
+$lang['getGroups']             = 'Выражение SQL, осуществляющее извлечение информации о членстве пользователе в группах';
+$lang['getUsers']              = 'Выражение SQL, осуществляющее извлечение полного списка пользователей';
+$lang['FilterLogin']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по логину';
+$lang['FilterName']            = 'Выражение SQL, осуществляющее фильтрацию пользователей по полному имени';
+$lang['FilterEmail']           = 'Выражение SQL, осуществляющее фильтрацию пользователей по адресу электронной почты';
+$lang['FilterGroup']           = 'Выражение SQL, осуществляющее фильтрацию пользователей согласно членству в группе';
+$lang['SortOrder']             = 'Выражение SQL, осуществляющее сортировку пользователей';
+$lang['addUser']               = 'Выражение SQL, осуществляющее добавление нового пользователя';
+$lang['addGroup']              = 'Выражение SQL, осуществляющее добавление новой группы';
+$lang['addUserGroup']          = 'Выражение SQL, осуществляющее добавление пользователя в существующую группу';
+$lang['delGroup']              = 'Выражение SQL, осуществляющее удаление группы';
+$lang['getUserID']             = 'Выражение SQL, обеспечивающее получение первичного ключа пользователя';
+$lang['delUser']               = 'Выражение SQL, осуществляющее удаление пользователя';
+$lang['delUserRefs']           = 'Выражение SQL, осуществляющее удаление пользователя из всех группы';
+$lang['updateUser']            = 'Выражение SQL, осуществляющее обновление профиля пользователя';
+$lang['delUserGroup']          = 'Выражение SQL, осуществляющее удаление пользователя из указанной группы';
+$lang['getGroupID']            = 'Выражение SQL, обеспечивающее получение первичного ключа указанной группы';
diff --git a/sources/lib/plugins/authpgsql/lang/sk/settings.php b/sources/lib/plugins/authpgsql/lang/sk/settings.php
new file mode 100644
index 0000000..861d123
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/sk/settings.php
@@ -0,0 +1,38 @@
+
+ */
+$lang['server']                = 'PostgreSQL server';
+$lang['port']                  = 'Port PostgreSQL servera';
+$lang['user']                  = 'Meno používateľa PostgreSQL';
+$lang['password']              = 'Heslo pre vyššie uvedeného používateľa';
+$lang['database']              = 'Použiť databázu';
+$lang['debug']                 = 'Zobraziť doplňujúce ladiace informácie';
+$lang['forwardClearPass']      = 'Posielať heslo ako nezakódovaný text nižšie uvedenému SQL príkazu namiesto použitia kódovania';
+$lang['checkPass']             = 'SQL príkaz pre kontrolu hesla';
+$lang['getUserInfo']           = 'SQL príkaz pre získanie informácií o používateľovi';
+$lang['getGroups']             = 'SQL príkaz pre získanie informácií o skupinách používateľa';
+$lang['getUsers']              = 'SQL príkaz pre získanie zoznamu používateľov';
+$lang['FilterLogin']           = 'SQL podmienka pre filtrovanie používateľov podľa prihlasovacieho mena';
+$lang['FilterName']            = 'SQL podmienka pre filtrovanie používateľov podľa mena a priezviska';
+$lang['FilterEmail']           = 'SQL podmienka pre filtrovanie používateľov podľa emailovej adresy';
+$lang['FilterGroup']           = 'SQL podmienka pre filtrovanie používateľov podľa skupiny';
+$lang['SortOrder']             = 'SQL podmienka pre usporiadenia používateľov';
+$lang['addUser']               = 'SQL príkaz pre pridanie nového používateľa';
+$lang['addGroup']              = 'SQL príkaz pre pridanie novej skupiny';
+$lang['addUserGroup']          = 'SQL príkaz pre pridanie používateľa do existujúcej skupiny';
+$lang['delGroup']              = 'SQL príkaz pre zrušenie skupiny';
+$lang['getUserID']             = 'SQL príkaz pre získanie primárneho klúča používateľa';
+$lang['delUser']               = 'SQL príkaz pre zrušenie používateľa';
+$lang['delUserRefs']           = 'SQL príkaz pre vyradenie používateľa zo všetkých skupín';
+$lang['updateUser']            = 'SQL príkaz pre aktualizáciu informácií o používateľovi';
+$lang['UpdateLogin']           = 'SQL podmienka pre aktualizáciu prihlasovacieho mena používateľa';
+$lang['UpdatePass']            = 'SQL podmienka pre aktualizáciu hesla používateľa';
+$lang['UpdateEmail']           = 'SQL podmienka pre aktualizáciu emailovej adresy používateľa';
+$lang['UpdateName']            = 'SQL podmienka pre aktualizáciu mena a priezviska používateľa';
+$lang['UpdateTarget']          = 'Podmienka identifikácie používateľa pri aktualizácii';
+$lang['delUserGroup']          = 'SQL príkaz pre vyradenie používateľa z danej skupiny';
+$lang['getGroupID']            = 'SQL príkaz pre získanie primárneho kľúča skupiny';
diff --git a/sources/lib/plugins/authpgsql/lang/sl/settings.php b/sources/lib/plugins/authpgsql/lang/sl/settings.php
new file mode 100644
index 0000000..4c369ab
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/sl/settings.php
@@ -0,0 +1,8 @@
+
+ */
+$lang['database']              = 'Podatkovna zbirka za uporabo';
diff --git a/sources/lib/plugins/authpgsql/lang/sv/settings.php b/sources/lib/plugins/authpgsql/lang/sv/settings.php
new file mode 100644
index 0000000..7da2e82
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/lang/sv/settings.php
@@ -0,0 +1,29 @@
+
+ */
+$lang['server']                = '您的 PostgreSQL 服务器';
+$lang['port']                  = '您的 PostgreSQL 服务器端口';
+$lang['user']                  = 'PostgreSQL 用户名';
+$lang['password']              = '上述用户的密码';
+$lang['database']              = '使用的数据库';
+$lang['debug']                 = '显示额外调试信息';
+$lang['forwardClearPass']      = '将用户密码以明文形式传送给下面的 SQL 语句，而不使用 passcrypt 密码加密选项';
+$lang['checkPass']             = '检查密码的 SQL 语句';
+$lang['getUserInfo']           = '获取用户信息的 SQL 语句';
+$lang['getGroups']             = '获取用户的组成员身份的 SQL 语句';
+$lang['getUsers']              = '列出所有用户的 SQL 语句';
+$lang['FilterLogin']           = '根据登录名筛选用户的 SQL 子句';
+$lang['FilterName']            = '根据全名筛选用户的 SQL 子句';
+$lang['FilterEmail']           = '根据电子邮件地址筛选用户的 SQL 子句';
+$lang['FilterGroup']           = '根据组成员身份筛选用户的 SQL 子句';
+$lang['SortOrder']             = '对用户排序的 SQL 子句';
+$lang['addUser']               = '添加新用户的 SQL 语句';
+$lang['addGroup']              = '添加新组的 SQL 语句';
+$lang['addUserGroup']          = '将用户添加到现有组的 SQL 语句';
+$lang['delGroup']              = '删除组的 SQL 语句';
+$lang['getUserID']             = '获取用户主键的 SQL 语句';
+$lang['delUser']               = '删除用户的 SQL 语句';
+$lang['delUserRefs']           = '从所有组中删除一个用户的 SQL 语句';
+$lang['updateUser']            = '更新用户信息的 SQL 语句';
+$lang['UpdateLogin']           = '更新用户登录名的 Update 子句';
+$lang['UpdatePass']            = '更新用户密码的 Update 子句';
+$lang['UpdateEmail']           = '更新用户电子邮件地址的 Update 子句';
+$lang['UpdateName']            = '更新用户全名的 Update 子句';
+$lang['UpdateTarget']          = '更新时识别用户的 Limit 子句';
+$lang['delUserGroup']          = '从指定组删除用户的 SQL 语句';
+$lang['getGroupID']            = '获取指定组主键的 SQL 语句';
diff --git a/sources/lib/plugins/authpgsql/plugin.info.txt b/sources/lib/plugins/authpgsql/plugin.info.txt
new file mode 100644
index 0000000..aecab91
--- /dev/null
+++ b/sources/lib/plugins/authpgsql/plugin.info.txt
@@ -0,0 +1,7 @@
+base   authpgsql
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2013-02-16
+name   PostgreSQL Auth Plugin
+desc   Provides user authentication against a PostgreSQL database
+url    http://www.dokuwiki.org/plugin:authpgsql
diff --git a/sources/lib/plugins/authplain/auth.php b/sources/lib/plugins/authplain/auth.php
new file mode 100644
index 0000000..8c4ce0d
--- /dev/null
+++ b/sources/lib/plugins/authplain/auth.php
@@ -0,0 +1,354 @@
+
+ * @author     Chris Smith 
+ * @author     Jan Schumann 
+ */
+class auth_plugin_authplain extends DokuWiki_Auth_Plugin {
+    /** @var array user cache */
+    protected $users = null;
+
+    /** @var array filter pattern */
+    protected $_pattern = array();
+
+    /**
+     * Constructor
+     *
+     * Carry out sanity checks to ensure the object is
+     * able to operate. Set capabilities.
+     *
+     * @author  Christopher Smith 
+     */
+    public function __construct() {
+        parent::__construct();
+        global $config_cascade;
+
+        if(!@is_readable($config_cascade['plainauth.users']['default'])) {
+            $this->success = false;
+        } else {
+            if(@is_writable($config_cascade['plainauth.users']['default'])) {
+                $this->cando['addUser']   = true;
+                $this->cando['delUser']   = true;
+                $this->cando['modLogin']  = true;
+                $this->cando['modPass']   = true;
+                $this->cando['modName']   = true;
+                $this->cando['modMail']   = true;
+                $this->cando['modGroups'] = true;
+            }
+            $this->cando['getUsers']     = true;
+            $this->cando['getUserCount'] = true;
+        }
+    }
+
+    /**
+     * Check user+password
+     *
+     * Checks if the given user exists and the given
+     * plaintext password is correct
+     *
+     * @author  Andreas Gohr 
+     * @param string $user
+     * @param string $pass
+     * @return  bool
+     */
+    public function checkPass($user, $pass) {
+        $userinfo = $this->getUserData($user);
+        if($userinfo === false) return false;
+
+        return auth_verifyPassword($pass, $this->users[$user]['pass']);
+    }
+
+    /**
+     * Return user info
+     *
+     * Returns info about the given user needs to contain
+     * at least these fields:
+     *
+     * name string  full name of the user
+     * mail string  email addres of the user
+     * grps array   list of groups the user is in
+     *
+     * @author  Andreas Gohr 
+     * @param string $user
+     * @return array|bool
+     */
+    public function getUserData($user) {
+        if($this->users === null) $this->_loadUserData();
+        return isset($this->users[$user]) ? $this->users[$user] : false;
+    }
+
+    /**
+     * Create a new User
+     *
+     * Returns false if the user already exists, null when an error
+     * occurred and true if everything went well.
+     *
+     * The new user will be added to the default group by this
+     * function if grps are not specified (default behaviour).
+     *
+     * @author  Andreas Gohr 
+     * @author  Chris Smith 
+     *
+     * @param string $user
+     * @param string $pwd
+     * @param string $name
+     * @param string $mail
+     * @param array  $grps
+     * @return bool|null|string
+     */
+    public function createUser($user, $pwd, $name, $mail, $grps = null) {
+        global $conf;
+        global $config_cascade;
+
+        // user mustn't already exist
+        if($this->getUserData($user) !== false) return false;
+
+        $pass = auth_cryptPassword($pwd);
+
+        // set default group if no groups specified
+        if(!is_array($grps)) $grps = array($conf['defaultgroup']);
+
+        // prepare user line
+        $groups   = join(',', $grps);
+        $userline = join(':', array($user, $pass, $name, $mail, $groups))."\n";
+
+        if(io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) {
+            $this->users[$user] = compact('pass', 'name', 'mail', 'grps');
+            return $pwd;
+        }
+
+        msg(
+            'The '.$config_cascade['plainauth.users']['default'].
+                ' file is not writable. Please inform the Wiki-Admin', -1
+        );
+        return null;
+    }
+
+    /**
+     * Modify user data
+     *
+     * @author  Chris Smith 
+     * @param   string $user      nick of the user to be changed
+     * @param   array  $changes   array of field/value pairs to be changed (password will be clear text)
+     * @return  bool
+     */
+    public function modifyUser($user, $changes) {
+        global $ACT;
+        global $config_cascade;
+
+        // sanity checks, user must already exist and there must be something to change
+        if(($userinfo = $this->getUserData($user)) === false) return false;
+        if(!is_array($changes) || !count($changes)) return true;
+
+        // update userinfo with new data, remembering to encrypt any password
+        $newuser = $user;
+        foreach($changes as $field => $value) {
+            if($field == 'user') {
+                $newuser = $value;
+                continue;
+            }
+            if($field == 'pass') $value = auth_cryptPassword($value);
+            $userinfo[$field] = $value;
+        }
+
+        $groups   = join(',', $userinfo['grps']);
+        $userline = join(':', array($newuser, $userinfo['pass'], $userinfo['name'], $userinfo['mail'], $groups))."\n";
+
+        if(!$this->deleteUsers(array($user))) {
+            msg('Unable to modify user data. Please inform the Wiki-Admin', -1);
+            return false;
+        }
+
+        if(!io_saveFile($config_cascade['plainauth.users']['default'], $userline, true)) {
+            msg('There was an error modifying your user data. You should register again.', -1);
+            // FIXME, user has been deleted but not recreated, should force a logout and redirect to login page
+            $ACT = 'register';
+            return false;
+        }
+
+        $this->users[$newuser] = $userinfo;
+        return true;
+    }
+
+    /**
+     * Remove one or more users from the list of registered users
+     *
+     * @author  Christopher Smith 
+     * @param   array  $users   array of users to be deleted
+     * @return  int             the number of users deleted
+     */
+    public function deleteUsers($users) {
+        global $config_cascade;
+
+        if(!is_array($users) || empty($users)) return 0;
+
+        if($this->users === null) $this->_loadUserData();
+
+        $deleted = array();
+        foreach($users as $user) {
+            if(isset($this->users[$user])) $deleted[] = preg_quote($user, '/');
+        }
+
+        if(empty($deleted)) return 0;
+
+        $pattern = '/^('.join('|', $deleted).'):/';
+        io_deleteFromFile($config_cascade['plainauth.users']['default'], $pattern, true);
+
+        // reload the user list and count the difference
+        $count = count($this->users);
+        $this->_loadUserData();
+        $count -= count($this->users);
+        return $count;
+    }
+
+    /**
+     * Return a count of the number of user which meet $filter criteria
+     *
+     * @author  Chris Smith 
+     *
+     * @param array $filter
+     * @return int
+     */
+    public function getUserCount($filter = array()) {
+
+        if($this->users === null) $this->_loadUserData();
+
+        if(!count($filter)) return count($this->users);
+
+        $count = 0;
+        $this->_constructPattern($filter);
+
+        foreach($this->users as $user => $info) {
+            $count += $this->_filter($user, $info);
+        }
+
+        return $count;
+    }
+
+    /**
+     * Bulk retrieval of user data
+     *
+     * @author  Chris Smith 
+     *
+     * @param   int   $start index of first user to be returned
+     * @param   int   $limit max number of users to be returned
+     * @param   array $filter array of field/pattern pairs
+     * @return  array userinfo (refer getUserData for internal userinfo details)
+     */
+    public function retrieveUsers($start = 0, $limit = 0, $filter = array()) {
+
+        if($this->users === null) $this->_loadUserData();
+
+        ksort($this->users);
+
+        $i     = 0;
+        $count = 0;
+        $out   = array();
+        $this->_constructPattern($filter);
+
+        foreach($this->users as $user => $info) {
+            if($this->_filter($user, $info)) {
+                if($i >= $start) {
+                    $out[$user] = $info;
+                    $count++;
+                    if(($limit > 0) && ($count >= $limit)) break;
+                }
+                $i++;
+            }
+        }
+
+        return $out;
+    }
+
+    /**
+     * Only valid pageid's (no namespaces) for usernames
+     *
+     * @param string $user
+     * @return string
+     */
+    public function cleanUser($user) {
+        global $conf;
+        return cleanID(str_replace(':', $conf['sepchar'], $user));
+    }
+
+    /**
+     * Only valid pageid's (no namespaces) for groupnames
+     *
+     * @param string $group
+     * @return string
+     */
+    public function cleanGroup($group) {
+        global $conf;
+        return cleanID(str_replace(':', $conf['sepchar'], $group));
+    }
+
+    /**
+     * Load all user data
+     *
+     * loads the user file into a datastructure
+     *
+     * @author  Andreas Gohr 
+     */
+    protected function _loadUserData() {
+        global $config_cascade;
+
+        $this->users = array();
+
+        if(!@file_exists($config_cascade['plainauth.users']['default'])) return;
+
+        $lines = file($config_cascade['plainauth.users']['default']);
+        foreach($lines as $line) {
+            $line = preg_replace('/#.*$/', '', $line); //ignore comments
+            $line = trim($line);
+            if(empty($line)) continue;
+
+            $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]);
+            $this->users[$row[0]]['mail'] = $row[3];
+            $this->users[$row[0]]['grps'] = $groups;
+        }
+    }
+
+    /**
+     * return true if $user + $info match $filter criteria, false otherwise
+     *
+     * @author   Chris Smith 
+     *
+     * @param string $user User login
+     * @param array  $info User's userinfo array
+     * @return bool
+     */
+    protected function _filter($user, $info) {
+        foreach($this->_pattern as $item => $pattern) {
+            if($item == 'user') {
+                if(!preg_match($pattern, $user)) return false;
+            } else if($item == 'grps') {
+                if(!count(preg_grep($pattern, $info['grps']))) return false;
+            } else {
+                if(!preg_match($pattern, $info[$item])) return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * construct a filter pattern
+     *
+     * @param array $filter
+     */
+    protected function _constructPattern($filter) {
+        $this->_pattern = array();
+        foreach($filter as $item => $pattern) {
+            $this->_pattern[$item] = '/'.str_replace('/', '\/', $pattern).'/i'; // allow regex characters
+        }
+    }
+}
\ No newline at end of file
diff --git a/sources/lib/plugins/authplain/plugin.info.txt b/sources/lib/plugins/authplain/plugin.info.txt
new file mode 100644
index 0000000..b63ee53
--- /dev/null
+++ b/sources/lib/plugins/authplain/plugin.info.txt
@@ -0,0 +1,7 @@
+base   authplain
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2012-11-09
+name   Plain Auth Plugin
+desc   Provides user authentication against DokuWiki's local password storage
+url    http://www.dokuwiki.org/plugin:authplain
diff --git a/sources/lib/plugins/config/admin.php b/sources/lib/plugins/config/admin.php
new file mode 100644
index 0000000..835d277
--- /dev/null
+++ b/sources/lib/plugins/config/admin.php
@@ -0,0 +1,360 @@
+
+ * @author     Ben Coburn 
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+define('CM_KEYMARKER','____');            // used for settings with multiple dimensions of array indices
+
+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
+
+/**
+ * All DokuWiki plugins to extend the admin function
+ * need to inherit from this class
+ */
+class admin_plugin_config extends DokuWiki_Admin_Plugin {
+
+    var $_file = PLUGIN_METADATA;
+    var $_config = null;
+    var $_input = null;
+    var $_changed = false;          // set to true if configuration has altered
+    var $_error = false;
+    var $_session_started = false;
+    var $_localised_prompts = false;
+
+    function getMenuSort() { return 100; }
+
+    /**
+     * handle user request
+     */
+    function handle() {
+        global $ID, $INPUT;
+
+        if (!$this->_restore_session()) return $this->_close_session();
+        if ($INPUT->int('save') != 1) return $this->_close_session();
+        if (!checkSecurityToken()) return $this->_close_session();
+
+        if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
+
+        // don't go any further if the configuration is locked
+        if ($this->_config->_locked) return $this->_close_session();
+
+        $this->_input = $INPUT->arr('config');
+
+        while (list($key) = each($this->_config->setting)) {
+            $input = isset($this->_input[$key]) ? $this->_input[$key] : null;
+            if ($this->_config->setting[$key]->update($input)) {
+                $this->_changed = true;
+            }
+            if ($this->_config->setting[$key]->error()) $this->_error = true;
+        }
+
+        if ($this->_changed  && !$this->_error) {
+            $this->_config->save_settings($this->getPluginName());
+
+            // save state & force a page reload to get the new settings to take effect
+            $_SESSION['PLUGIN_CONFIG'] = array('state' => 'updated', 'time' => time());
+            $this->_close_session();
+            send_redirect(wl($ID,array('do'=>'admin','page'=>'config'),true,'&'));
+            exit();
+        } elseif(!$this->_error) {
+            $this->_config->touch_settings(); // just touch to refresh cache
+        }
+
+        $this->_close_session();
+    }
+
+    /**
+     * output appropriate html
+     */
+    function html() {
+        $allow_debug = $GLOBALS['conf']['allowdebug']; // avoid global $conf; here.
+        global $lang;
+        global $ID;
+
+        if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
+        $this->setupLocale(true);
+
+        print $this->locale_xhtml('intro');
+
+        ptln('
        ');
+
+        if ($this->_config->locked)
+            ptln('
        '.$this->getLang('locked').'
        ');
+        elseif ($this->_error)
+            ptln('
        '.$this->getLang('error').'
        ');
+        elseif ($this->_changed)
+            ptln('
        '.$this->getLang('updated').'
        ');
+
+        // POST to script() instead of wl($ID) so config manager still works if
+        // rewrite config is broken. Add $ID as hidden field to remember
+        // current ID in most cases.
+        ptln('
        ');
+        ptln('
        ');
+        formSecurityToken();
+        $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki'));
+
+        $undefined_settings = array();
+        $in_fieldset = false;
+        $first_plugin_fieldset = true;
+        $first_template_fieldset = true;
+        foreach($this->_config->setting as $setting) {
+            if (is_a($setting, 'setting_hidden')) {
+                // skip hidden (and undefined) settings
+                if ($allow_debug && is_a($setting, 'setting_undefined')) {
+                    $undefined_settings[] = $setting;
+                } else {
+                    continue;
+                }
+            } else if (is_a($setting, 'setting_fieldset')) {
+                // config setting group
+                if ($in_fieldset) {
+                    ptln('  ');
+                    ptln('  
        ');
+                    ptln('  ');
+                } else {
+                    $in_fieldset = true;
+                }
+                if ($first_plugin_fieldset && substr($setting->_key, 0, 10)=='plugin'.CM_KEYMARKER) {
+                    $this->_print_h1('plugin_settings', $this->getLang('_header_plugin'));
+                    $first_plugin_fieldset = false;
+                } else if ($first_template_fieldset && substr($setting->_key, 0, 7)=='tpl'.CM_KEYMARKER) {
+                    $this->_print_h1('template_settings', $this->getLang('_header_template'));
+                    $first_template_fieldset = false;
+                }
+                ptln('  
        ');
+                ptln('  '.$setting->prompt($this).'');
+                ptln('  
        ');
+                ptln('  ');
+            } else {
+                // config settings
+                list($label,$input) = $setting->html($this, $this->_error);
+
+                $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('      '.$input.'');
+                ptln('    ');
+            }
+        }
+
+        ptln('  
        ');
+                ptln('        '.$setting->_out_key(true, true).'');
+                ptln('        '.$icon.$label);
+                ptln('      
        ');
+        ptln('  
        ');
+        if ($in_fieldset) {
+            ptln('  
        ');
+        }
+
+        // show undefined settings list
+        if ($allow_debug && !empty($undefined_settings)) {
+            function _setting_natural_comparison($a, $b) { return strnatcmp($a->_key, $b->_key); }
+            usort($undefined_settings, '_setting_natural_comparison');
+            $this->_print_h1('undefined_settings', $this->getLang('_header_undefined'));
+            ptln('
        ');
+            ptln('
        ');
+            ptln('');
+            $undefined_setting_match = array();
+            foreach($undefined_settings as $setting) {
+                if (preg_match('/^(?:plugin|tpl)'.CM_KEYMARKER.'.*?'.CM_KEYMARKER.'(.*)$/', $setting->_key, $undefined_setting_match)) {
+                    $undefined_setting_key = $undefined_setting_match[1];
+                } else {
+                    $undefined_setting_key = $setting->_key;
+                }
+                ptln('  ');
+                ptln('    ');
+                ptln('    ');
+                ptln('  ');
+            }
+            ptln('
        $'.$this->_config->_name.'[\''.$setting->_out_key().'\']'.$this->getLang('_msg_'.get_class($setting)).'
        ');
+            ptln('
        ');
+            ptln('
        ');
+        }
+
+        // finish up form
+        ptln('
        ');
+        ptln('  ');
+        ptln('  ');
+
+        if (!$this->_config->locked) {
+            ptln('  ');
+            ptln('  ');
+            ptln('  ');
+        }
+
+        ptln('
        ');
+
+        ptln('');
+        ptln('');
+    }
+
+    /**
+     * @return boolean   true - proceed with handle, false - don't proceed
+     */
+    function _restore_session() {
+
+        // dokuwiki closes the session before act_dispatch. $_SESSION variables are all set,
+        // however they can't be changed without starting the session again
+        if (!headers_sent()) {
+            session_start();
+            $this->_session_started = true;
+        }
+
+        if (!isset($_SESSION['PLUGIN_CONFIG'])) return true;
+
+        $session = $_SESSION['PLUGIN_CONFIG'];
+        unset($_SESSION['PLUGIN_CONFIG']);
+
+        // still valid?
+        if (time() - $session['time'] > 120) return true;
+
+        switch ($session['state']) {
+            case 'updated' :
+                $this->_changed = true;
+                return false;
+        }
+
+        return true;
+    }
+
+    function _close_session() {
+      if ($this->_session_started) session_write_close();
+    }
+
+    function setupLocale($prompts=false) {
+
+        parent::setupLocale();
+        if (!$prompts || $this->_localised_prompts) return;
+
+        $this->_setup_localised_plugin_prompts();
+        $this->_localised_prompts = true;
+
+    }
+
+    function _setup_localised_plugin_prompts() {
+        global $conf;
+
+        $langfile   = '/lang/'.$conf['lang'].'/settings.php';
+        $enlangfile = '/lang/en/settings.php';
+
+        if ($dh = opendir(DOKU_PLUGIN)) {
+            while (false !== ($plugin = readdir($dh))) {
+                if ($plugin == '.' || $plugin == '..' || $plugin == 'tmp' || $plugin == 'config') continue;
+                if (is_file(DOKU_PLUGIN.$plugin)) continue;
+
+                if (@file_exists(DOKU_PLUGIN.$plugin.$enlangfile)){
+                    $lang = array();
+                    @include(DOKU_PLUGIN.$plugin.$enlangfile);
+                    if ($conf['lang'] != 'en') @include(DOKU_PLUGIN.$plugin.$langfile);
+                    foreach ($lang as $key => $value){
+                        $this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
+                    }
+                }
+
+                // fill in the plugin name if missing (should exist for plugins with settings)
+                if (!isset($this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'])) {
+                    $this->lang['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'] =
+                      ucwords(str_replace('_', ' ', $plugin));
+                }
+            }
+            closedir($dh);
+      }
+
+        // the same for the active template
+        $tpl = $conf['template'];
+
+        if (@file_exists(tpl_incdir().$enlangfile)){
+            $lang = array();
+            @include(tpl_incdir().$enlangfile);
+            if ($conf['lang'] != 'en') @include(tpl_incdir().$langfile);
+            foreach ($lang as $key => $value){
+                $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
+            }
+        }
+
+        // fill in the template name if missing (should exist for templates with settings)
+        if (!isset($this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'])) {
+            $this->lang['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] =
+              ucwords(str_replace('_', ' ', $tpl));
+        }
+
+        return true;
+    }
+
+    /**
+     * Generates a two-level table of contents for the config plugin.
+     *
+     * @author Ben Coburn 
+     */
+    function getTOC() {
+        if (is_null($this->_config)) { $this->_config = new configuration($this->_file); }
+        $this->setupLocale(true);
+
+        $allow_debug = $GLOBALS['conf']['allowdebug']; // avoid global $conf; here.
+
+        // gather toc data
+        $has_undefined = false;
+        $toc = array('conf'=>array(), 'plugin'=>array(), 'template'=>null);
+        foreach($this->_config->setting as $setting) {
+            if (is_a($setting, 'setting_fieldset')) {
+                if (substr($setting->_key, 0, 10)=='plugin'.CM_KEYMARKER) {
+                    $toc['plugin'][] = $setting;
+                } else if (substr($setting->_key, 0, 7)=='tpl'.CM_KEYMARKER) {
+                    $toc['template'] = $setting;
+                } else {
+                    $toc['conf'][] = $setting;
+                }
+            } else if (!$has_undefined && is_a($setting, 'setting_undefined')) {
+                $has_undefined = true;
+            }
+        }
+
+        // build toc
+        $t = array();
+
+        $t[] = html_mktocitem('configuration_manager', $this->getLang('_configuration_manager'), 1);
+        $t[] = html_mktocitem('dokuwiki_settings', $this->getLang('_header_dokuwiki'), 1);
+        foreach($toc['conf'] as $setting) {
+            $name = $setting->prompt($this);
+            $t[] = html_mktocitem($setting->_key, $name, 2);
+        }
+        if (!empty($toc['plugin'])) {
+            $t[] = html_mktocitem('plugin_settings', $this->getLang('_header_plugin'), 1);
+        }
+        foreach($toc['plugin'] as $setting) {
+            $name = $setting->prompt($this);
+            $t[] = html_mktocitem($setting->_key, $name, 2);
+        }
+        if (isset($toc['template'])) {
+            $t[] = html_mktocitem('template_settings', $this->getLang('_header_template'), 1);
+            $setting = $toc['template'];
+            $name = $setting->prompt($this);
+            $t[] = html_mktocitem($setting->_key, $name, 2);
+        }
+        if ($has_undefined && $allow_debug) {
+            $t[] = html_mktocitem('undefined_settings', $this->getLang('_header_undefined'), 1);
+        }
+
+        return $t;
+    }
+
+    function _print_h1($id, $text) {
+        ptln('
        '.$text.'
        ');
+    }
+
+
+}
diff --git a/sources/lib/plugins/config/images/danger.png b/sources/lib/plugins/config/images/danger.png
new file mode 100644
index 0000000..7bd84f7
Binary files /dev/null and b/sources/lib/plugins/config/images/danger.png differ
diff --git a/sources/lib/plugins/config/images/security.png b/sources/lib/plugins/config/images/security.png
new file mode 100644
index 0000000..1800f8e
Binary files /dev/null and b/sources/lib/plugins/config/images/security.png differ
diff --git a/sources/lib/plugins/config/images/warning.png b/sources/lib/plugins/config/images/warning.png
new file mode 100644
index 0000000..c5e482f
Binary files /dev/null and b/sources/lib/plugins/config/images/warning.png differ
diff --git a/sources/lib/plugins/config/lang/af/lang.php b/sources/lib/plugins/config/lang/af/lang.php
new file mode 100644
index 0000000..cf71576
--- /dev/null
+++ b/sources/lib/plugins/config/lang/af/lang.php
@@ -0,0 +1,23 @@
+config]]. لمعلومات اكثر عن هذه الاضافة انظر [[doku>plugin:config]].
+
+الاعدادات الظاهرة بخلفية حمراء فاتحة اعدادات محمية ولا يمكن تغييرها بهذه الاضافة. الاعدادات الظاهرة بخلفية زرقاء هي القيم الافتراضية والاعدادات الظاهرة بخلفية بيضاء خصصت لهذا التثبيت محليا. الاعدادات الزرقاء والبيضاء يمكن تغييرها.
+
+تأكد من ضغط زر **SAVE** قبل ترك الصفحة وإلا ستضيع تعديلاتك.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/ar/lang.php b/sources/lib/plugins/config/lang/ar/lang.php
new file mode 100644
index 0000000..66bb424
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ar/lang.php
@@ -0,0 +1,192 @@
+
+ * @author Usama Akkad 
+ * @author uahello@gmail.com
+ */
+$lang['menu']                  = 'الإعدادات';
+$lang['error']                 = 'لم تحدث الاعدادات بسبب قيمة غير صالحة، رجاء راجع تغييراتك ثم ارسلها.
+
        القيم الخاطئة ستظهر محاطة بحدود حمراء.';
+$lang['updated']               = 'رفعت الاعدادات بنجاح.';
+$lang['nochoice']              = '(لا خيارات اخرى متاحة)';
+$lang['locked']                = 'تعذر تحديث ملف الاعدادات، إن لم يكن ذلك مقصودا، 
        
+تأكد من صحة اسم و صلاحيات ملف الاعدادات المحلي.';
+$lang['danger']                = 'خطر: تغيير هذا الخيار قد يؤدي إلى تعذر الوصول للويكي و قائمة الاعدادات.';
+$lang['warning']               = 'تحذير: تغييرهذا الخيار قد يؤدي لسلوك غير متوقع.';
+$lang['security']              = 'تحذير أمني: تغيير هذا الخيار قد يؤدي إلى مخاطرة أمنية.';
+$lang['_configuration_manager'] = 'مدير الاعدادات';
+$lang['_header_dokuwiki']      = 'اعدادات دوكو ويكي';
+$lang['_header_plugin']        = 'اعدادات الملحقات';
+$lang['_header_template']      = 'اعدادات القوالب';
+$lang['_header_undefined']     = 'اعدادات غير محددة';
+$lang['_basic']                = 'اعدادات اساسية';
+$lang['_display']              = 'اعدادات العرض';
+$lang['_authentication']       = 'اعدادات المواثقة';
+$lang['_anti_spam']            = 'اعدادات مضاد النفاية';
+$lang['_editing']              = 'اعدادات التحرير';
+$lang['_links']                = 'اعدادات الروابط';
+$lang['_media']                = 'اعدادات الوسائط';
+$lang['_notifications']        = 'اعدادات التنبيه';
+$lang['_advanced']             = 'اعدادات متقدمة';
+$lang['_network']              = 'اعدادات الشبكة';
+$lang['_msg_setting_undefined'] = 'لا بيانات إعدادات.';
+$lang['_msg_setting_no_class'] = 'لا صنف إعدادات.';
+$lang['_msg_setting_no_default'] = 'لا قيمة افتراضية.';
+$lang['title']                 = 'عنوان الويكي';
+$lang['start']                 = 'اسم صفحة البداية';
+$lang['lang']                  = 'لغة الواجهة';
+$lang['template']              = 'القالب';
+$lang['tagline']               = 'Tagline (في حال دعم القالب له)
+';
+$lang['sidebar']               = 'اسم صفحة الشريط الجانبي (في حال دعم القالب له). تركه فارغا يعطل الشريط الجانبي.';
+$lang['license']               = 'تحت أي رخصة تريد اصدار المحتوى؟';
+$lang['savedir']               = 'دليل حفظ البيانات';
+$lang['basedir']               = 'مسار الخادوم (مثال. /dokuwiki/) اترك فارغا للاكتشاف التلقائي.';
+$lang['baseurl']               = 'عنوان الخادوم (مثال. http://www.yourserver.com). اترك فارغا للاكتشاف التلقائي.';
+$lang['cookiedir']             = 'مسار الكعكات. اترك فارغا لاستخدام baseurl.';
+$lang['dmode']                 = 'نمط انشاء المجلدات';
+$lang['fmode']                 = 'نمط انشاء الملفات';
+$lang['allowdebug']            = 'مكّن التنقيح عطّلها إن لم تكن بحاجلة لها!';
+$lang['recent']                = 'أحدث التغييرات';
+$lang['recent_days']           = 'مدة إبقاء أحدث التغييرات (ايام)';
+$lang['breadcrumbs']           = 'عدد العناقيد للزيارات';
+$lang['youarehere']            = 'عناقيد هرمية';
+$lang['fullpath']              = 'اظهر المحتوى الكامل للصفحات في ';
+$lang['typography']            = 'اعمل استبدالات طبوغرافية';
+$lang['dformat']               = 'تنسيق التاريخ (انظر وظيفة PHP,s strftime)';
+$lang['signature']             = 'التوقيع';
+$lang['showuseras']            = 'الذي يعرض لاظهار المستخدم الذي قام بآخر تحرير لصفحة';
+$lang['toptoclevel']           = 'المستوى الأعلى لمحتويات الجدول';
+$lang['tocminheads']           = 'الحد الأدنى من الترويسات لبناء جدول المحتويات';
+$lang['maxtoclevel']           = 'المستوى الأقصى لمحتويات الجدول';
+$lang['maxseclevel']           = 'المستوى الأقصى لتحرير القسم';
+$lang['camelcase']             = 'استخدم CamelCase للروابط';
+$lang['deaccent']              = 'نظّف اسماء الصفحات';
+$lang['useheading']            = 'استخدم اول ترويسة كأسم للصفحة';
+$lang['sneaky_index']          = 'افتراضيا، ستعرض دوكو ويكي كل اسماء النطاقات في عرض الفهرس. تفعيل هذا الخيار سيخفي مالا يملك المستخدم صلاحية قراءته. قد يؤدي هذا إلى اخفاء نطاقات فرعية متاحة. وقد يؤدي لجعل صفحة الفهرس معطلة في بعض اعدادات ACL.';
+$lang['hidepages']             = 'أخف الصفحات المنطبق عليها (تعابير شرطية)';
+$lang['useacl']                = 'استخدم قائمة التحم بالوصول';
+$lang['autopasswd']            = 'ولد كلمات سر تلقائيا';
+$lang['authtype']              = 'آلية المواثقة';
+$lang['passcrypt']             = 'نمط تشفير كلمة السر';
+$lang['defaultgroup']          = 'المجموعة الافتراضية';
+$lang['superuser']             = 'مجموعة المستخدم المتفوق أو مستخدم أو قائمة مفصولة بالفاصلة مستخدم1،@مجموعة، مستخدم2 صلاحيتهم الوصول الكامل لكل الصفحات و الوظائف بغض النظر عن اعدادات ACL';
+$lang['manager']               = 'مجموعة المدراء أو مستخدم أو قائمة مفصولة بالفاصلة مستخدم1،@مجموعة، مستخدم2 صلاحيتهم بعض الوظائف الادارية';
+$lang['profileconfirm']        = 'اكد تغيير اللاحة بكلمة المرور';
+$lang['rememberme']            = 'اسمح بكعكات الدخول الدائم (تذكرني)';
+$lang['disableactions']        = 'عطّل اجراءات دوكو ويكي';
+$lang['disableactions_check']  = 'تحقق';
+$lang['disableactions_subscription'] = 'اشترك/الغ الاشتراك';
+$lang['disableactions_wikicode'] = 'اعرض المصدر/صدّر صرفا';
+$lang['disableactions_other']  = 'اجراءات أخرى (مفصولة بالفاصلة)';
+$lang['auth_security_timeout'] = 'زمن انتهاء أمان المواثقة (ثوان)';
+$lang['securecookie']          = 'هل يفرض على كعكات التصفح المعدة عبر HTTPS ان ترسل فقط عبر HTTPS من قبل المتصفح؟ عطل هذا إن كان الولوج للويكي مؤمنا فقط عبر SSL لكن تصفح الويكي غير مؤمن.';
+$lang['remote']                = 'مكّن نظام API البعيد. يسمح هذا لبرامج أخرى بالوصول للويكي عبر XML-RPC أو آليات أخرى.';
+$lang['remoteuser']            = 'احصر الوصول البعيد ل API لمستخدمين ومجموعات يفصل بينها بالفاصلة هنا. اترك فارغا لتمكين الجميع.';
+$lang['usewordblock']          = 'احجز الغثاء بناء على قائمة كلمات';
+$lang['relnofollow']           = 'استخدم rel="nofollow" للروابط الخارجية';
+$lang['indexdelay']            = 'التأخير قبل الفهرسة (ثوان)';
+$lang['mailguard']             = 'عناوين بريدية مبهمة';
+$lang['iexssprotect']          = 'تحقق الملفات المرفوعة من احتمال وجود أكواد جافاسكربت أو HTML ضارة';
+$lang['usedraft']              = 'احفظ المسودة تلقائيا أثناء التحرير';
+$lang['htmlok']                = 'مكّن تضمين HTML';
+$lang['phpok']                 = 'مكّن تضمين PHP';
+$lang['locktime']              = 'الحد الأعظمي لقفل الملف (ثوان)';
+$lang['cachetime']             = 'الحد الأعظم لعمر المخُبأ (ثوان)';
+$lang['target____wiki']        = 'النافذة الهدف للروابط الداخلية';
+$lang['target____interwiki']   = 'النافذة الهدف للروابط الممرة interwiki';
+$lang['target____extern']      = 'النافذة الهدف للروابط الخارجية';
+$lang['target____media']       = 'النافذة الهدف لروابط الوسائط';
+$lang['target____windows']     = 'النافذة الهدف لروابط النوافذ';
+$lang['mediarevisions']        = 'تفعيل إصدارات الوسائط؟';
+$lang['refcheck']              = 'التحقق من مرجع الوسائط';
+$lang['gdlib']                 = 'اصدار مكتبة GD';
+$lang['im_convert']            = 'المسار إلى اداة تحويل ImageMagick';
+$lang['jpg_quality']           = 'دقة ضغط JPG (0-100)';
+$lang['fetchsize']             = 'الحجم الأعظمي (بايت) ل fetch.php لتنزيله من الخارج';
+$lang['subscribers']           = 'مكن دعم اشتراك الصفحة';
+$lang['subscribe_time']        = 'المهلة بعد ارسال قوائم الاشتراكات والملخصات (ثوان); هذا يجب أن يكون أقل من الوقت المخصص في أيام أحدث التغييرات.';
+$lang['notify']                = 'ارسل تنبيهات التغيير لهذا البريد';
+$lang['registernotify']        = 'ارسل بيانات عن المستخدمين المسجلين جديدا لهذا البريد';
+$lang['mailfrom']              = 'البريد الالكتروني ليستخدم للرسائل الآلية';
+$lang['mailprefix']            = 'بادئة موضوع البريد لتستخدم مع الرسائل الآلية';
+$lang['sitemap']               = 'ولد خرائط موقع جوجل (أيام)';
+$lang['rss_type']              = 'نوع تلقيمات XML';
+$lang['rss_linkto']            = 'تلقيمات XML توصل إلى';
+$lang['rss_content']           = 'مالذي يعرض في عناصر تلقيمات XML؟';
+$lang['rss_update']            = 'تحديث تلقيم XML (ثوان)';
+$lang['rss_show_summary']      = 'تلقيم XML يظهر ملخصا في العنوان';
+$lang['rss_media']             = 'مانوع التغييرات التي ستدرج في تغذية XML؟';
+$lang['updatecheck']           = 'تحقق من التحديثات و تنبيهات الأمان؟ دوكو ويكي ستحتاج للاتصال ب update.dokuwiki.org لأجل ذلك';
+$lang['userewrite']            = 'استعمل عناوين URLs جميلة';
+$lang['useslash']              = 'استخدم الشرطة كفاصل النطاق في العناوين';
+$lang['sepchar']               = 'فاصل كلمة اسم الصفحة';
+$lang['canonical']             = 'استخدم العناوين الشائعة كاملة';
+$lang['fnencode']              = 'نظام ترميز اسماء الملفات بغير الأسكي.';
+$lang['autoplural']            = 'تحقق من صيغ الجمع في الروابط';
+$lang['compression']           = 'طريقة الغضط لملفات attic';
+$lang['gzip_output']           = 'استخدم ترميز-محتوى gzip ل xhtml';
+$lang['compress']              = 'رُص مخرجات CSS و جافا سكربت';
+$lang['cssdatauri']            = 'الحجم بالبايتات للصور المذكورة في CSS التي ستُضمن في صفحة-التنسيق لخفض طلبات HTTP. لن تعمل هذه التقنية في IE 7 أو أقل! 400 إلى 600 بايت تعد قيمة جيدة. اضبط إلى 0 لتعطلها.';
+$lang['send404']               = 'ارسل "HTTP 404/Page Not Found" للصفحات غير الموجودة';
+$lang['broken_iua']            = 'هل الوظيفة ignore_user_abort معطلة على جهازك؟ قد يؤدي ذلك لتعطيل فهرسة البحث. IIS+PHP/CGI تعرف بأنها لاتعمل. أنظر العلة 852 لمزيد من المعلومات.';
+$lang['xsendfile']             = 'استخدم ترويسة X-Sendfile لتمكين خادم الوب من تقديم ملفات ثابتة؟ يجب أن يكون خادم الوب داعما له.';
+$lang['renderer_xhtml']        = 'المحرك ليستخدم لمخرجات الويكي الأساسية وفق (xhtml).';
+$lang['renderer__core']        = '%s (نواة دوكو ويكي)';
+$lang['renderer__plugin']      = '%s (ملحق)';
+$lang['proxy____host']         = 'اسم خادوم الوكيل';
+$lang['proxy____port']         = 'منفذ الوكيل';
+$lang['proxy____user']         = 'اسم مستخدم الوكيل';
+$lang['proxy____pass']         = 'كلمة سر الوكيل';
+$lang['proxy____ssl']          = 'استخدم ssl للاتصال بالوكيل';
+$lang['proxy____except']       = 'تعبير شرطي لمقابلة العناوين التي ستتجاوز البروكسي.';
+$lang['safemodehack']          = 'مكّن hack الوضع الآمن';
+$lang['ftp____host']           = 'خادوم FTP ل hack الوضع الآمن';
+$lang['ftp____port']           = 'منفذ FTP ل hack الوضع الآمن';
+$lang['ftp____user']           = 'اسم مستخدم FTP ل hack الوضع الآمن';
+$lang['ftp____pass']           = 'كلمة سر FTP ل hack الوضع الآمن';
+$lang['ftp____root']           = 'دليل الجذر ل FTP لأجل hack الوضع الآمن';
+$lang['license_o_']            = 'غير مختار';
+$lang['typography_o_0']        = 'لاشيء';
+$lang['typography_o_1']        = 'استبعاد الاقتباس المفرد';
+$lang['typography_o_2']        = 'تضمين علامات اقتباس مفردة (قد لا يعمل دائما)';
+$lang['userewrite_o_0']        = 'لاشيء';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'دو';
+$lang['deaccent_o_0']          = 'معطل';
+$lang['deaccent_o_1']          = 'أزل اللهجة';
+$lang['deaccent_o_2']          = 'اجعلها لاتينية';
+$lang['gdlib_o_0']             = 'مكتبة GD غير متوفرة';
+$lang['gdlib_o_1']             = 'الاصدار 1.x';
+$lang['gdlib_o_2']             = 'اكتشاف تلقائي';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$lang['rss_type_o_rss1']       = 'RSS 1.0';
+$lang['rss_type_o_rss2']       = 'RSS 2.0';
+$lang['rss_type_o_atom']       = 'أتوم 0.3';
+$lang['rss_type_o_atom1']      = 'أتوم 1.0';
+$lang['rss_content_o_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']  = 'الصفحة الحالية';
+$lang['compression_o_0']       = 'لا شيء';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'لا تستخدم';
+$lang['xsendfile_o_1']         = 'ترويسة lighttpd مملوكة (قبل الاصدار 1.5)';
+$lang['xsendfile_o_2']         = 'ترويسة X-Sendfile قياسية';
+$lang['xsendfile_o_3']         = 'ترويسة Nginx X-Accel-Redirect مملوكة';
+$lang['showuseras_o_loginname'] = 'اسم الدخول';
+$lang['showuseras_o_username'] = 'اسم المستخدم الكامل';
+$lang['showuseras_o_email']    = 'عنوان بريد المستخدم (مبهم تبعا لاعدادات حارس_البريد)';
+$lang['showuseras_o_email_link'] = 'عنوان بريد المستخدم كـ مالتيو: رابط';
+$lang['useheading_o_0']        = 'أبدا';
+$lang['useheading_o_navigation'] = 'التنقل فقط';
+$lang['useheading_o_content']  = 'محتوى الويكي فقط';
+$lang['useheading_o_1']        = 'دائما';
+$lang['readdircache']          = 'المدة القصوى لتخزين ';
diff --git a/sources/lib/plugins/config/lang/bg/intro.txt b/sources/lib/plugins/config/lang/bg/intro.txt
new file mode 100644
index 0000000..db09e68
--- /dev/null
+++ b/sources/lib/plugins/config/lang/bg/intro.txt
@@ -0,0 +1,7 @@
+====== Диспечер на настройките ======
+
+От тук можете да управлявате настройките на вашето Dokuwiki. За отделните настройки вижте [[doku>config]]. За повече информация относно тази приставка вижте  [[doku>plugin:config]].
+
+Настройките изобразени със светло червен фон са защитени и не могат да бъдат променяни с тази приставка. Настройките показани със син фон са стандартните стойности, а настройките с бял фон са били настроени локално за тази конкретна инсталация. Можете да променяте както сините, така и белите настройки.
+
+Не забравяйте да натиснете бутона **ЗАПИС** преди да напуснете страницата, в противен случай промените няма да бъдат приложени.
diff --git a/sources/lib/plugins/config/lang/bg/lang.php b/sources/lib/plugins/config/lang/bg/lang.php
new file mode 100644
index 0000000..d0df38c
--- /dev/null
+++ b/sources/lib/plugins/config/lang/bg/lang.php
@@ -0,0 +1,259 @@
+
+ * @author Viktor Usunov 
+ * @author Kiril 
+ */
+
+// 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']       = 'Настройки';
+
+$lang['error']      = 'Обновяването на настройките не е възможно, поради невалидна стойност, моля, прегледайте промените си и пробвайте отново.
+                       
        Неверните стойности ще бъдат обградени с червена рамка.';
+$lang['updated']    = 'Обновяването на настройките е успешно.';
+$lang['nochoice']   = '(няма друг възможен избор)';
+$lang['locked']     = 'Обновяването на файла с настройките не е възможно, ако това не е нарочно, проверете,
        
+                       дали името на локалния файл с настройки и правата са верни.';
+
+$lang['danger']     = 'Внимание: промяна на опцията може да направи Wiki-то и менюто за настройване недостъпни.';
+$lang['warning']    = 'Предупреждение: промяна на опцията може предизвика нежелани последици.';
+$lang['security']   = 'Предупреждение: промяна на опцията може да представлява риск за сигурността.';
+
+/* --- Config Setting Headers --- */
+$lang['_configuration_manager'] = 'Диспечер на настройките'; //same as heading in intro.txt
+$lang['_header_dokuwiki'] = 'Настройки на DokuWiki';
+$lang['_header_plugin']  = 'Настройки на приставки';
+$lang['_header_template'] = 'Настройки на шаблона';
+$lang['_header_undefined'] = 'Неопределени настройки';
+
+/* --- Config Setting Groups --- */
+$lang['_basic'] = 'Основни настройки';
+$lang['_display'] = 'Настройки за изобразяване';
+$lang['_authentication'] = 'Настройки за удостоверяване';
+$lang['_anti_spam'] = 'Настройки за борба със SPAM-ма';
+$lang['_editing'] = 'Настройки за редактиране';
+$lang['_links'] = 'Настройки на препратките';
+$lang['_media'] = 'Настройки на медията';
+$lang['_notifications'] = 'Настройки за известяване';
+$lang['_syndication']   = 'Настройки на RSS емисиите';
+$lang['_advanced'] = 'Допълнителни настройки';
+$lang['_network'] = 'Мрежови настройки';
+
+/* --- Undefined Setting Messages --- */
+$lang['_msg_setting_undefined'] = 'Няма метаданни за настройките.';
+$lang['_msg_setting_no_class'] = 'Няма клас настройки.';
+$lang['_msg_setting_no_default'] = 'Няма стандартна стойност.';
+
+/* -------------------- Config Options --------------------------- */
+
+/* Basic Settings */
+$lang['title']      = 'Заглавие за Wiki-то, тоест името';
+$lang['start']      = 'Име на началната страница';
+$lang['lang']       = 'Език на интерфейса';
+$lang['template']   = 'Шаблон (определя вида на страниците)';
+$lang['tagline']    = 'Подзаглавие - изобразява се под името на Wiki-то (ако се поддържа от шаблона)';
+$lang['sidebar']    = 'Име на страницата за страничната лента (ако се поддържа от шаблона). Оставите ли полето празно лентата ще бъде изключена';
+$lang['license']    = 'Под какъв лиценз да бъде публикувано съдържанието?';
+$lang['savedir']    = 'Директория за записване на данните';
+$lang['basedir']    = 'Главна директория (напр. /dokuwiki/). Оставете празно, за да бъде засечена автоматично.';
+$lang['baseurl']    = 'URL адрес (напр. http://www.yourserver.com). Оставете празно, за да бъде засечен автоматично.';
+$lang['cookiedir']  = 'Път за бисквитките. Оставите ли полето празно ще се ползва горния URL адрес.';
+$lang['dmode']      = 'Режим (права) за създаване на директории';
+$lang['fmode']      = 'Режим (права) за създаване на файлове';
+$lang['allowdebug'] = 'Включване на режи debug - изключете, ако не е нужен!';
+
+/* Display Settings */
+$lang['recent']      = 'Скорошни промени - брой еленти на страница';
+$lang['recent_days'] = 'Колко от скорошните промени да се пазят (дни)';
+$lang['breadcrumbs'] = 'Брой на следите. За изключване на функцията задайте 0.';
+$lang['youarehere']  = 'Йерархични следи (в този случай можете да изключите горната опция)';
+$lang['fullpath']    = 'Показване на пълния път до страниците в долния колонтитул.';
+$lang['typography']  = 'Замяна на последователност от символи с типографски еквивалент';
+$lang['dformat']     = 'Формат на датата (виж. strftime функцията на PHP)';
+$lang['signature']   = 'Подпис - какво да внася бутона "Вмъкване на подпис" от редактора';
+$lang['showuseras']  = 'Какво да се показва за потребителя, който последно е променил дадена страницата';
+$lang['toptoclevel'] = 'Главно ниво (заглавие) за съдържанието';
+$lang['tocminheads'] = 'Минимален брой заглавия, определящ дали да бъде създадено съдържание';
+$lang['maxtoclevel'] = 'Максимален брой нива (заглавия) за включване в съдържанието';
+$lang['maxseclevel'] = 'Максимален брой нива предоставяни за самостоятелно редактиране';
+$lang['camelcase']   = 'Ползване на CamelCase за линкове';
+$lang['deaccent']    = 'Почистване имената на страниците (на файловете)';
+$lang['useheading']  = 'Ползване на първото заглавие за име на страница';
+$lang['sneaky_index'] = 'Стандартно DokuWiki ще показва всички именни пространства в индекса. Опцията скрива тези, за които потребителят няма права за четене. Това може да доведе и до скриване на иначе достъпни подименни пространства. С определени настройки на списъците за контрол на достъпа (ACL) може да направи индекса неизползваем. ';
+$lang['hidepages']   = 'Скриване на страниците съвпадащи с този регулярен израз(regular expressions)';
+
+/* Authentication Settings */
+$lang['useacl']      = 'Ползване на списъци за достъп';
+$lang['autopasswd']  = 'Автоматично генериране на пароли, на нови потребители и пращане по пощата';
+$lang['authtype']    = 'Метод за удостоверяване';
+$lang['passcrypt']   = 'Метод за криптиране на паролите';
+$lang['defaultgroup']= 'Стандартна група';
+$lang['superuser']   = 'Супер потребител -  група, потребител или списък със стойности разделени чрез запетая (user1,@group1,user2) с пълен достъп до всички страници и функции без значение от настройките на списъците за достъп (ACL)';
+$lang['manager']     = 'Управител - група, потребител или списък със стойности разделени чрез запетая (user1,@group1,user2) с достъп до определени управленски функции ';
+$lang['profileconfirm'] = 'Потвърждаване на промени в профила с парола';
+$lang['rememberme'] = 'Ползване на постоянни бисквитки за вписване (за функцията "Запомни ме")';
+$lang['disableactions'] = 'Изключване функции на DokuWiki';
+$lang['disableactions_check'] = 'Проверка';
+$lang['disableactions_subscription'] = 'Абониране/Отписване';
+$lang['disableactions_wikicode'] = 'Преглед на кода/Експортиране на оригинална версия';
+$lang['disableactions_other'] = 'Други действия (разделени със запетая)';
+$lang['auth_security_timeout'] = 'Автоматично проверяване на удостоверяването всеки (сек)';
+$lang['securecookie'] = 'Да се изпращат ли бисквитките зададени чрез HTTPS, само чрез HTTPS от браузъра? Изключете опцията, когато SSL се ползва само за вписване, а четенето е без SSL.';
+$lang['remote']      = 'Включване на системата за отдалечен API достъп. Това ще позволи на приложения да се свързват с DokuWiki чрез XML-RPC или друг механизъм.';
+$lang['remoteuser']  = 'Ограничаване на отдалечения API достъп - активиране само за следните групи и потребители (отделени със запетая). Ако оставите полето празно всеки ще има достъп достъп.';
+
+/* Anti-Spam Settings */
+$lang['usewordblock']    = 'Блокиране на SPAM въз основа на на списък от думи';
+$lang['relnofollow']     = 'Ползване на rel="nofollow" за външни препратки';
+$lang['indexdelay']      = 'Забавяне преди индексиране (сек)';
+$lang['mailguard']       = 'Промяна на адресите на ел. поща (във форма непозволяваща пращането на SPAM)';
+$lang['iexssprotect']    = 'Проверяване на качените файлове за вероятен зловреден JavaScript и HTML код';
+
+/* Editing Settings */
+$lang['usedraft']   = 'Автоматично запазване на чернова по време на редактиране';
+$lang['htmlok']     = 'Разрешаване вграждането на HTML код';
+$lang['phpok']      = 'Разрешаване вграждането на PHP код';
+$lang['locktime']   = 'Макс. период за съхраняване на заключените файлове (сек)';
+$lang['cachetime']  = 'Макс. период за съхраняване на кеша (сек)';
+
+/* Link settings */
+$lang['target____wiki']      = 'Прозорец за вътрешни препратки';
+$lang['target____interwiki'] = 'Прозорец за препратки към други Wiki сайтове';
+$lang['target____extern']    = 'Прозорец за външни препратки';
+$lang['target____media']     = 'Прозорец за медийни препратки';
+$lang['target____windows']   = 'Прозорец за препратки към Windows';
+
+/* Media Settings */
+$lang['mediarevisions'] = 'Да се пазят ли стари версии на качените файлове (Mediarevisions)?';
+$lang['refcheck']    = 'Проверка за препратка към медия, преди да бъде изтрита';
+$lang['gdlib']       = 'Версия на GD Lib';
+$lang['im_convert']  = 'Път до инструмента за трансформация на ImageMagick';
+$lang['jpg_quality'] = 'Качество на JPG компресията (0-100)';
+$lang['fetchsize']   = 'Максимален размер (байтове), който fetch.php може да сваля';
+
+/* Notification Settings */
+$lang['subscribers'] = 'Включване на поддръжката за абониране към страници';
+$lang['subscribe_time'] = 'Време след което абонаментните списъци и обобщения се изпращат (сек); Трябва да е по-малко от времето определено в recent_days.';
+$lang['notify']      = 'Пращане на съобщения за промени по страниците на следната eл. поща';
+$lang['registernotify'] = 'Пращане на информация за нови потребители на следната ел. поща';
+$lang['mailfrom']    = 'Ел. поща, която да се ползва за автоматично изпращане на ел. писма';
+$lang['mailprefix']  = 'Представка за темите (поле subject) на автоматично изпращаните ел. писма';
+$lang['htmlmail']    = 'Изпращане на по-добре изглеждащи, но по-големи по-размер HTML ел. писма. Изключете ако желаете писмата да се изпращат като чист текст.';
+
+/* Syndication Settings */
+$lang['sitemap']     = 'Генериране на Google sitemap (дни)';
+$lang['rss_type']    = 'Тип на XML емисията';
+$lang['rss_linkto']  = 'XML емисията препраща към';
+$lang['rss_content'] = 'Какво да показват елементите на XML емисията?';
+$lang['rss_update']  = 'Интервал на актуализиране на XML емисията (сек)';
+$lang['rss_show_summary'] = 'Показване на обобщение в заглавието на XML емисията';
+$lang['rss_media']   = 'Кой тип промени да се включват в XML мисията?';
+
+/* Advanced Options */
+$lang['updatecheck'] = 'Проверяване за за нови версии и предупреждения за сигурността? Необходимо е Dokiwiki да може да се свързва със update.dokuwiki.org за тази функционалност.';
+$lang['userewrite']  = 'Ползване на nice URL адреси';
+$lang['useslash']    = 'Ползване на наклонена черта за разделител на именните пространства в URL';
+$lang['sepchar']     = 'Разделител между думите в имената на страници';
+$lang['canonical']   = 'Ползване на напълно уеднаквени URL адреси (абсолютни адреси - http://server/path)';
+$lang['fnencode']    = 'Метод за кодиране на не-ASCII именуваните файлове.';
+$lang['autoplural']  = 'Проверяване за множествено число в препратките';
+$lang['compression'] = 'Метод за компресия на attic файлове';
+$lang['gzip_output'] = 'Кодиране на съдържанието с gzip за xhtml';
+$lang['compress']    = 'Компактен CSS и javascript изглед';
+$lang['cssdatauri']  = 'Максимален размер, в байтове, до който изображенията посочени в .CSS файл ще бъдат вграждани в стила (stylesheet), за да се намали броя на HTTP заявките. Техниката не работи за версиите на IE преди 8! Препоръчителни стойности: 400 до 600 байта. Въведете 0 за изключване.';
+$lang['send404']     = 'Пращане на "HTTP 404/Page Not Found" за несъществуващи страници';
+$lang['broken_iua']  = 'Отметнете, ако ignore_user_abort функцията не работи. Може да попречи на търсенето в страниците. Знае се, че комбинацията IIS+PHP/CGI е лоша. Вижте  Грешка 852 за повече информация.';
+$lang['xsendfile']   = 'Ползване на Х-Sendfile header, за да може уебсървъра да дава статични файлове? Вашият уебсървър трябва да го поддържа.';
+$lang['renderer_xhtml']   = 'Представяне на основните изходни данни (xhtml) от Wiki-то с';
+$lang['renderer__core']   = '%s (ядрото на DokuWiki)';
+$lang['renderer__plugin'] = '%s (приставка)';
+
+/* Network Options */
+$lang['dnslookups'] = 'DokuWiki ще търси имената на хостовете, на отдалечени IP адреси, от които потребители редактират страници. НЕ е желателно да ползвате опцията ако имате бавен или неработещ DNS сървър.';
+
+/* Proxy Options */
+$lang['proxy____host']   = 'Име на прокси сървър';
+$lang['proxy____port']   = 'Порт за проксито';
+$lang['proxy____user']   = 'Потребител за проксито';
+$lang['proxy____pass']   = 'Парола за проксито';
+$lang['proxy____ssl']    = 'Ползване на SSL при свързване с проксито';
+$lang['proxy____except'] = 'Регулярен израз определящ за кои URL адреси да не се ползва прокси сървър.';
+
+/* Safemode Hack */
+$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';
+
+/* License Options */
+$lang['license_o_']      = 'Нищо не е избрано';
+
+/* typography options */
+$lang['typography_o_0']  = 'без';
+$lang['typography_o_1']  = 'с изключение на единични кавички';
+$lang['typography_o_2']  = 'включително единични кавички (не винаги работи)';
+
+/* userewrite options */
+$lang['userewrite_o_0']  = 'без';
+$lang['userewrite_o_1']  = 'файлът .htaccess';
+$lang['userewrite_o_2']  = 'вътрешно от DokuWiki ';
+
+/* deaccent options */
+$lang['deaccent_o_0']    = 'изключено';
+$lang['deaccent_o_1']    = 'премахване на акценти';
+$lang['deaccent_o_2']    = 'транслитерация';
+
+/* gdlib options */
+$lang['gdlib_o_0']       = 'GD Lib не е достъпна';
+$lang['gdlib_o_1']       = 'Версия 1.x';
+$lang['gdlib_o_2']       = 'Автоматично разпознаване';
+
+/* rss_type options */
+$lang['rss_type_o_rss']   = 'RSS версия 0.91';
+$lang['rss_type_o_rss1']  = 'RSS версия 1.0';
+$lang['rss_type_o_rss2']  = 'RSS версия 2.0';
+$lang['rss_type_o_atom']  = 'Atom версия 0.3';
+$lang['rss_type_o_atom1'] = 'Atom версия 1.0';
+
+/* rss_content options */
+$lang['rss_content_o_abstract'] = 'Извлечение';
+$lang['rss_content_o_diff']     = 'Обединени разлики';
+$lang['rss_content_o_htmldiff'] = 'Таблица с разликите в HTML формат';
+$lang['rss_content_o_html']     = 'Цялото съдържание на HTML страницата';
+
+/* rss_linkto options */
+$lang['rss_linkto_o_diff']     = 'изглед на разликите';
+$lang['rss_linkto_o_page']     = 'променената страница';
+$lang['rss_linkto_o_rev']      = 'списък на версиите';
+$lang['rss_linkto_o_current']  = 'текущата страница';
+
+/* compression options */
+$lang['compression_o_0']   = 'без';
+$lang['compression_o_gz']  = 'gzip';
+$lang['compression_o_bz2'] = 'bz2';
+
+/* xsendfile header */
+$lang['xsendfile_o_0'] = 'без';
+$lang['xsendfile_o_1'] = 'Специфичен lighttpd header (преди версия 1.5)';
+$lang['xsendfile_o_2'] = 'Стандартен X-Sendfile header';
+$lang['xsendfile_o_3'] = 'Специфичен Nginx X-Accel-Redirect header за пренасочване';
+
+/* Display user info */
+$lang['showuseras_o_loginname']  = 'Име за вписване';
+$lang['showuseras_o_username']   = 'Пълно потребителско име';
+$lang['showuseras_o_email']      = 'Ел, поща (променени според настройките на mailguard)';
+$lang['showuseras_o_email_link'] = 'Ел. поща под формата на връзка тип mailto:';
+
+/* useheading options */
+$lang['useheading_o_0']  = 'Никога';
+$lang['useheading_o_navigation'] = 'Само за навигация';
+$lang['useheading_o_content'] = 'Само за съдържанието на Wiki-то';
+$lang['useheading_o_1'] = 'Винаги';
+
+$lang['readdircache'] = 'Максимален период за съхраняване кеша на readdir (сек)';
diff --git a/sources/lib/plugins/config/lang/ca-valencia/intro.txt b/sources/lib/plugins/config/lang/ca-valencia/intro.txt
new file mode 100644
index 0000000..40729e5
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ca-valencia/intro.txt
@@ -0,0 +1,10 @@
+====== Gestor de configuració ======
+
+Controle des d'esta pàgina els ajusts de DokuWiki.
+Per a obtindre ajuda sobre cada ajust vaja a [[doku>config]].
+Per a més informació al voltant d'este plúgin vaja a [[doku>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.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/ca-valencia/lang.php b/sources/lib/plugins/config/lang/ca-valencia/lang.php
new file mode 100644
index 0000000..b6ceadd
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ca-valencia/lang.php
@@ -0,0 +1,177 @@
+
+ * @author Bernat Arlandis 
+ * @author Bernat Arlandis 
+ */
+$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.
+
        Els valors incorrectes es mostraran en una vora roja.';
+$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.';
+$lang['danger']                = 'Perill: canviant esta opció pot fer inaccessibles el wiki i el menú de configuració.';
+$lang['warning']               = 'Advertència: canviar esta opció pot causar un comportament imprevist.';
+$lang['security']              = 'Advertència de seguritat: canviar esta opció pot presentar un risc de seguritat.';
+$lang['_configuration_manager'] = 'Gestor de configuració';
+$lang['_header_dokuwiki']      = 'Ajusts de DokuWiki';
+$lang['_header_plugin']        = 'Configuració de plúgins';
+$lang['_header_template']      = 'Configuració de plantilles';
+$lang['_header_undefined']     = 'Atres configuracions';
+$lang['_basic']                = 'Ajusts bàsics';
+$lang['_display']              = 'Ajusts de visualisació';
+$lang['_authentication']       = 'Ajusts d\'autenticació';
+$lang['_anti_spam']            = 'Ajusts 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';
+$lang['_msg_setting_undefined'] = 'Ajust sense informació.';
+$lang['_msg_setting_no_class'] = 'Ajust sense classe.';
+$lang['_msg_setting_no_default'] = 'Sense valor predeterminat.';
+$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['license']               = '¿Baix quina llicència deuen publicar-se els continguts?';
+$lang['fullpath']              = 'Mostrar en el peu 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['tocminheads']           = 'Número mínim de titulars que generen una TDC';
+$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 titular per al nom de pàgina';
+$lang['refcheck']              = 'Comprovar referències a mijos';
+$lang['allowdebug']            = 'Permetre depurar (¡desactivar quan no es necessite!)';
+$lang['usewordblock']          = 'Bloquejar spam basant-se en una llista de paraules';
+$lang['indexdelay']            = 'Retart abans 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';
+$lang['showuseras']            = 'Qué mostrar quan aparega l\'últim usuari que ha editat la pàgina';
+$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']             = 'Super-usuari - 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_wikicode'] = 'Vore font/exportar còdic';
+$lang['disableactions_other']  = 'Atres accions (separades per comes)';
+$lang['sneaky_index']          = 'Normalment, DokuWiki mostra tots els espais de noms en la vista d\'índex. Activant esta opció s\'ocultaran aquells per als que l\'usuari no tinga permís de llectura. Açò pot ocultar subespais accessibles i inutilisar l\'índex per a certes configuracions del ACL.';
+$lang['auth_security_timeout'] = 'Temps de seguritat màxim per a l\'autenticació (segons)';
+$lang['securecookie']          = '¿El navegador deuria enviar per HTTPS només les galletes que s\'han generat per HTTPS? Desactive esta opció quan utilise SSL només en la pàgina d\'inici de sessió.';
+$lang['updatecheck']           = '¿Buscar actualisacions i advertències de seguritat? DokuWiki necessita conectar a update.dokuwiki.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 edite';
+$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 a la ferramenta de conversió ImageMagick';
+$lang['jpg_quality']           = 'Calitat de compressió JPG (0-100)';
+$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çalat X-Sendfile per a que el servidor web servixca archius estàtics? El servidor web ho ha d\'admetre.';
+$lang['renderer_xhtml']        = 'Visualisador a utilisar per a l\'eixida principal del wiki (xhtml)';
+$lang['renderer__core']        = '%s (dokuwiki core)';
+$lang['renderer__plugin']      = '%s (plúgin)';
+$lang['rememberme']            = 'Permetre recordar permanentment la sessió (recordar-me)';
+$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']           = 'Quànts canvis recents guardar (dies)';
+$lang['rss_show_summary']      = 'Que el canal XML mostre el sumari en el títul';
+$lang['target____wiki']        = 'Finestra destí per a vínculs interns';
+$lang['target____interwiki']   = 'Finestra destí per a vínculs d\'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';
+$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';
+$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';
+$lang['license_o_']            = 'Cap triada';
+$lang['typography_o_0']        = 'cap';
+$lang['typography_o_1']        = 'Excloure cometes simples';
+$lang['typography_o_2']        = 'Incloure cometes simples (podria no funcionar sempre)';
+$lang['userewrite_o_0']        = 'cap';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'Interna de DokuWiki';
+$lang['deaccent_o_0']          = 'desactivat';
+$lang['deaccent_o_1']          = 'llevar accents';
+$lang['deaccent_o_2']          = 'romanisar';
+$lang['gdlib_o_0']             = 'GD Lib no està disponible';
+$lang['gdlib_o_1']             = 'Versió 1.x';
+$lang['gdlib_o_2']             = 'Autodetecció';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$lang['rss_type_o_rss1']       = 'RSS 1.0';
+$lang['rss_type_o_rss2']       = 'RSS 2.0';
+$lang['rss_type_o_atom']       = 'Atom 0.3';
+$lang['rss_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = 'Abstracte';
+$lang['rss_content_o_diff']    = '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';
+$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';
+$lang['compression_o_0']       = 'cap';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'No utilisar';
+$lang['xsendfile_o_1']         = 'Encapçalat propietari lighttpd (abans de la versió 1.5)';
+$lang['xsendfile_o_2']         = 'Encapçalat Standard X-Sendfile';
+$lang['xsendfile_o_3']         = 'Encapçalat propietari Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Nom d\'inici de sessió';
+$lang['showuseras_o_username'] = 'Nom complet de l\'usuari';
+$lang['showuseras_o_email']    = 'Direcció de correu de l\'usuari (oculta segons la configuració)';
+$lang['showuseras_o_email_link'] = 'Direcció de correu de l\'usuari com un víncul mailto:';
+$lang['useheading_o_0']        = 'Mai';
+$lang['useheading_o_navigation'] = 'Només navegació';
+$lang['useheading_o_content']  = 'Només contingut del wiki';
+$lang['useheading_o_1']        = 'Sempre';
diff --git a/sources/lib/plugins/config/lang/ca/intro.txt b/sources/lib/plugins/config/lang/ca/intro.txt
new file mode 100644
index 0000000..9ce4e66
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ca/intro.txt
@@ -0,0 +1,7 @@
+====== Gestió de la configuració ======
+
+Utilitzeu aquesta 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 aquest connector en [[doku>plugin:config]].
+
+Els paràmetres que es visualitzen sobre fons vermell clar estan protegits i no es poden modificar amb aquest connector. Els paràmetres que es visualitzen sobre fons blau tenen valors per defecte. Els de fons blanc s'han configurat localment per a aquesta instal·lació. Tant els blaus com els blanc es poden modificar.
+
+Recordeu que cal prémer el botó **DESA** abans de sortir d'aquesta pàgina, o si no es perdrien els canvis.
diff --git a/sources/lib/plugins/config/lang/ca/lang.php b/sources/lib/plugins/config/lang/ca/lang.php
new file mode 100644
index 0000000..a53a859
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ca/lang.php
@@ -0,0 +1,183 @@
+
+ * @author carles.bellver@gmail.com
+ * @author carles.bellver@cent.uji.es
+ * @author Carles Bellver 
+ * @author daniel@6temes.cat
+ */
+$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 vermell.';
+$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 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';
+$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['_notifications']        = 'Paràmetres de notificació';
+$lang['_syndication']          = 'Paràmetres de sindicació';
+$lang['_advanced']             = 'Paràmetres avançats';
+$lang['_network']              = 'Paràmetres de xarxa';
+$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['title']                 = 'Títol del wiki';
+$lang['start']                 = 'Nom de la pàgina d\'inici';
+$lang['lang']                  = 'Idioma';
+$lang['template']              = 'Plantilla';
+$lang['tagline']               = 'Lema (si la plantilla ho suporta)';
+$lang['sidebar']               = 'Nom de la barra lateral (si la plantilla ho suporta). Si ho deixeu buit, la barra lateral es deshabilitarà.';
+$lang['license']               = 'Amb quina llicència voleu publicar el contingut?';
+$lang['savedir']               = 'Directori per desar les dades';
+$lang['basedir']               = 'Directori base';
+$lang['baseurl']               = 'URL base';
+$lang['cookiedir']             = 'Adreça per a les galetes. Si ho deixeu en blanc, es farà servir la URL base.';
+$lang['dmode']                 = 'Mode de creació de directoris';
+$lang['fmode']                 = 'Mode de creació de fitxers';
+$lang['allowdebug']            = 'Permet depuració inhabiliteu si no és necessari';
+$lang['recent']                = 'Canvis recents';
+$lang['recent_days']           = 'Quantitat de canvis recents que es mantenen (dies)';
+$lang['breadcrumbs']           = 'Nombre d\'engrunes';
+$lang['youarehere']            = 'Camí d\'engrunes jeràrquic';
+$lang['fullpath']              = 'Mostra el camí complet de les pàgines al peu';
+$lang['typography']            = 'Substitucions tipogràfiques';
+$lang['dformat']               = 'Format de data (vg. la funció PHP strftime)';
+$lang['signature']             = 'Signatura';
+$lang['showuseras']            = 'Què cal visualitzar quan es mostra el darrer usuari que ha editat la pàgina';
+$lang['toptoclevel']           = 'Nivell superior per a la taula de continguts';
+$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['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['hidepages']             = 'Oculta pàgines coincidents (expressions regulars)';
+$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['rememberme']            = 'Permet galetes de sessió permanents ("recorda\'m")';
+$lang['disableactions']        = 'Inhabilita accions DokuWiki';
+$lang['disableactions_check']  = 'Revisa';
+$lang['disableactions_subscription'] = 'Subscripció/cancel·lació';
+$lang['disableactions_wikicode'] = 'Mostra/exporta font';
+$lang['disableactions_other']  = 'Altres accions (separades per comes)';
+$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['usewordblock']          = 'Bloca brossa per llista de paraules';
+$lang['relnofollow']           = 'Utilitza rel="nofollow" en enllaços externs';
+$lang['indexdelay']            = 'Retard abans d\'indexar (segons)';
+$lang['mailguard']             = 'Ofusca les adreces de correu';
+$lang['iexssprotect']          = 'Comprova codi HTML o Javascript maligne en els fitxers penjats';
+$lang['usedraft']              = 'Desa automàticament un esborrany mentre s\'edita';
+$lang['htmlok']                = 'Permet HTML incrustat';
+$lang['phpok']                 = 'Permet PHP incrustat';
+$lang['locktime']              = 'Durada màxima dels fitxers de bloqueig (segons)';
+$lang['cachetime']             = 'Durada màxima de la memòria cau (segons)';
+$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['refcheck']              = 'Comprova la referència en els fitxers de mitjans';
+$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['fetchsize']             = 'Mida màxima (bytes) que fetch.php pot baixar d\'un lloc extern';
+$lang['subscribers']           = 'Habilita la subscripció a pàgines';
+$lang['notify']                = 'Envia notificacions de canvis a aquesta adreça de correu';
+$lang['registernotify']        = 'Envia informació sobre nous usuaris registrats a aquesta adreça de correu';
+$lang['mailfrom']              = 'Adreça de correu remitent per a missatges automàtics';
+$lang['sitemap']               = 'Genera mapa del lloc en format Google (dies)';
+$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['rss_show_summary']      = 'Mostra resum en els títols del canal XML';
+$lang['updatecheck']           = 'Comprova actualitzacions i avisos de seguretat. DokuWiki necessitarà contactar amb update.dokuwiki.org per utilitzar aquesta característica.';
+$lang['userewrite']            = 'Utilitza URL nets';
+$lang['useslash']              = 'Utilitza la barra / com a separador d\'espais en els URL';
+$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['gzip_output']           = 'Codifica contingut xhtml com a gzip';
+$lang['compress']              = 'Sortida CSS i Javascript compacta';
+$lang['send404']               = 'Envia "HTTP 404/Page Not Found" per a les pàgines inexistents';
+$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['renderer_xhtml']        = 'Renderitzador que cal utilitzar per a la sortida principal (xhtml) del wiki';
+$lang['renderer__core']        = '%s (ànima del dokuwiki)';
+$lang['renderer__plugin']      = '%s (connector)';
+$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 --git a/sources/lib/plugins/config/lang/cs/intro.txt b/sources/lib/plugins/config/lang/cs/intro.txt
new file mode 100644
index 0000000..63381b8
--- /dev/null
+++ b/sources/lib/plugins/config/lang/cs/intro.txt
@@ -0,0 +1,8 @@
+====== Správa nastavení ======
+
+Tuto stránku můžete používat ke správě nastavení vaší instalace DokuWiki. Nápovědu pro konkrétní položky nastavení naleznete na [[doku>config]]. Pro další detaily o tomto pluginu viz [[doku>plugin:config]].
+
+Položky se světle červeným pozadím jsou chráněné a nelze je upravovat tímto pluginem.  Položky s modrým pozadím jsou výchozí hodnoty a položky s bílým pozadím byly nastaveny lokálně v této konkrétní instalaci. Modré i bílé položky je možné upravovat.
+
+Než opustíte tuto stránku, nezapomeňte stisknout tlačítko **Uložit**, jinak budou změny ztraceny.
+
diff --git a/sources/lib/plugins/config/lang/cs/lang.php b/sources/lib/plugins/config/lang/cs/lang.php
new file mode 100644
index 0000000..289c458
--- /dev/null
+++ b/sources/lib/plugins/config/lang/cs/lang.php
@@ -0,0 +1,209 @@
+
+ * @author Zbynek Krivka 
+ * @author tomas@valenta.cz
+ * @author Marek Sacha 
+ * @author Lefty 
+ * @author Vojta Beran 
+ * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
+ * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
+ */
+$lang['menu']                  = 'Správa nastavení';
+$lang['error']                 = 'Nastavení nebyla změněna kvůli alespoň jedné neplatné položce,
+zkontrolujte prosím své úpravy a odešlete je znovu.
        
+Neplatné hodnoty se zobrazí v červeném rámečku.';
+$lang['updated']               = 'Nastavení byla úspěšně upravena.';
+$lang['nochoice']              = '(nejsou k dispozici žádné další volby)';
+$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ů';
+$lang['_header_template']      = 'Nastavení šablon';
+$lang['_header_undefined']     = 'Další nastavení';
+$lang['_basic']                = 'Základní nastavení';
+$lang['_display']              = 'Nastavení zobrazení';
+$lang['_authentication']       = 'Nastavení autentizace';
+$lang['_anti_spam']            = 'Protispamová nastavení';
+$lang['_editing']              = 'Nastavení editace';
+$lang['_links']                = 'Nastavení odkazů';
+$lang['_media']                = 'Nastavení médií';
+$lang['_notifications']        = 'Nastavení upozornění';
+$lang['_syndication']          = 'Nastavení syndikace';
+$lang['_advanced']             = 'Pokročilá nastavení';
+$lang['_network']              = 'Nastavení sítě';
+$lang['_msg_setting_undefined'] = 'Chybí metadata položky.';
+$lang['_msg_setting_no_class'] = 'Chybí třída položky.';
+$lang['_msg_setting_no_default'] = 'Chybí výchozí hodnota položky.';
+$lang['title']                 = 'Název celé wiki';
+$lang['start']                 = 'Název úvodní stránky';
+$lang['lang']                  = 'Jazyk';
+$lang['template']              = 'Šablona';
+$lang['tagline']               = 'Slogan (pokud ho šablona podporuje)';
+$lang['sidebar']               = 'Jméno stránky s obsahem postranní lišty (pokud ho šablona podporuje). Prázdné pole postranní lištu deaktivuje.';
+$lang['license']               = 'Pod jakou licencí má být tento obsah publikován?';
+$lang['savedir']               = 'Adresář pro ukládání dat';
+$lang['basedir']               = 'Kořenový adresář (např. /dokuwiki/). Pro autodetekci nechte prázdné.';
+$lang['baseurl']               = 'Kořenové URL (např. http://www.yourserver.com). Pro autodetekci nechte prázdné.';
+$lang['cookiedir']             = 'Cesta pro cookie. Není-li vyplněno, použije se kořenové URL.';
+$lang['dmode']                 = 'Přístupová práva pro vytváření adresářů';
+$lang['fmode']                 = 'Přístupová práva pro vytváření souborů';
+$lang['allowdebug']            = 'Povolit debugování. Vypněte, pokud to nepotřebujete!';
+$lang['recent']                = 'Počet položek v nedávných změnách';
+$lang['recent_days']           = 'Jak staré nedávné změny zobrazovat (ve dnech)';
+$lang['breadcrumbs']           = 'Počet odkazů na navštívené stránky';
+$lang['youarehere']            = 'Hierarchická "drobečková" navigace';
+$lang['fullpath']              = 'Ukazovat plnou cestu ke stránkám v patičce';
+$lang['typography']            = 'Provádět typografické nahrazování';
+$lang['dformat']               = 'Formát data (viz PHP funkci strftime)';
+$lang['signature']             = 'Podpis';
+$lang['showuseras']            = 'Co se má přesně zobrazit, když se ukazuje uživatel, který naposledy editoval stránku';
+$lang['toptoclevel']           = 'Nejvyšší úroveň, kterou začít automaticky generovaný obsah';
+$lang['tocminheads']           = 'Nejnižší počet hlavních nadpisů, aby se vygeneroval obsah';
+$lang['maxtoclevel']           = 'Maximální počet úrovní v automaticky generovaném obsahu';
+$lang['maxseclevel']           = 'Nejnižší úroveň pro editaci i po sekcích';
+$lang['camelcase']             = 'Používat CamelCase v odkazech';
+$lang['deaccent']              = 'Čistit názvy stránek';
+$lang['useheading']            = 'Používat první nadpis jako název stránky';
+$lang['sneaky_index']          = 'Ve výchozím nastavení DokuWiki zobrazuje v indexu všechny
+jmenné prostory. Zapnutím této volby se skryjí ty jmenné prostory,
+k nimž uživatel nemá právo pro čtení, což může ale způsobit, že
+vnořené jmenné prostory, k nimž právo má, budou přesto skryty.
+To může mít za následek, že index bude při některých
+nastaveních ACL nepoužitelný.';
+$lang['hidepages']             = 'Skrýt stránky odpovídající vzoru (regulární výrazy)';
+$lang['useacl']                = 'Používat přístupová práva (ACL)';
+$lang['autopasswd']            = 'Generovat hesla automaticky';
+$lang['authtype']              = 'Metoda autentizace';
+$lang['passcrypt']             = 'Metoda šifrování hesel';
+$lang['defaultgroup']          = 'Výchozí skupina';
+$lang['superuser']             = 'Superuživatel - skupina nebo uživatel s plnými právy pro přístup ke všem stránkách bez ohledu na nastavení ACL';
+$lang['manager']               = 'Manažer - skupina nebo uživatel s přístupem k některým správcovským funkcím';
+$lang['profileconfirm']        = 'Potvrdit změny v profilu zadáním hesla';
+$lang['rememberme']            = 'Povolit trvaté přihlašovací cookies (zapamatuj si mě)';
+$lang['disableactions']        = 'Vypnout DokuWiki akce';
+$lang['disableactions_check']  = 'Zkontrolovat';
+$lang['disableactions_subscription'] = 'Přihlásit se/Odhlásit se ze seznamu pro odběr změn';
+$lang['disableactions_wikicode'] = 'Prohlížet zdrojové kódy/Export wiki textu';
+$lang['disableactions_other']  = 'Další akce (oddělené čárkou)';
+$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? Vypněte 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['remote']                = 'Zapne API systému, umožňující jiným aplikacím vzdálený přístup k wiki pomoci XML-RPC nebo jiných mechanizmů.';
+$lang['remoteuser']            = 'Omezit přístup k API na tyto uživatelské skupiny či uživatele (seznam oddělený čárkami). Prázdné pole povolí přístup všem.';
+$lang['usewordblock']          = 'Blokovat spam za použití seznamu známých spamových slov';
+$lang['relnofollow']           = 'Používat rel="nofollow" na externí odkazy';
+$lang['indexdelay']            = 'Časová prodleva před indexací (v sekundách)';
+$lang['mailguard']             = 'Metoda "zamaskování" emailových adres';
+$lang['iexssprotect']          = 'Zkontrolovat nahrané soubory vůči možnému škodlivému JavaScriptu či HTML';
+$lang['usedraft']              = 'Během editace ukládat koncept automaticky';
+$lang['htmlok']                = 'Povolit vložené HTML';
+$lang['phpok']                 = 'Povolit vložené PHP';
+$lang['locktime']              = 'Maximální životnost zámkových souborů (v sekundách)';
+$lang['cachetime']             = 'Maximální životnost cache (v sekundách)';
+$lang['target____wiki']        = 'Cílové okno pro interní odkazy';
+$lang['target____interwiki']   = 'Cílové okno pro interwiki odkazy';
+$lang['target____extern']      = 'Cílové okno pro externí odkazy';
+$lang['target____media']       = 'Cílové okno pro odkazy na média';
+$lang['target____windows']     = 'Cílové okno pro odkazy na windows sdílení';
+$lang['mediarevisions']        = 'Aktivovat revize souborů';
+$lang['refcheck']              = 'Kontrolovat odkazy na média (před vymazáním)';
+$lang['gdlib']                 = 'Verze GD knihovny';
+$lang['im_convert']            = 'Cesta k nástroji convert z balíku ImageMagick';
+$lang['jpg_quality']           = 'Kvalita komprese JPEG (0-100)';
+$lang['fetchsize']             = 'Maximální velikost souboru (v bajtech), co ještě fetch.php bude stahovat z externích zdrojů';
+$lang['subscribers']           = 'Možnost přihlásit se k odběru novinek stránky';
+$lang['subscribe_time']        = 'Časový interval v sekundách, ve kterém jsou posílány změny a souhrny změn. Interval by neměl být kratší než čas uvedený v recent_days.';
+$lang['notify']                = 'Posílat oznámení o změnách na následující emailovou adresu';
+$lang['registernotify']        = 'Posílat informace o nově registrovaných uživatelích na tuto mailovou adresu';
+$lang['mailfrom']              = 'E-mailová adresa, která se bude používat pro automatické maily';
+$lang['mailprefix']            = 'Předpona předmětu e-mailu, která se bude používat pro automatické maily';
+$lang['htmlmail']              = 'Posílat emaily v HTML (hezčí ale větší). Při vypnutí budou posílány jen textové emaily.';
+$lang['sitemap']               = 'Generovat Google sitemap (interval ve dnech)';
+$lang['rss_type']              = 'Typ XML kanálu';
+$lang['rss_linkto']            = 'XML kanál odkazuje na';
+$lang['rss_content']           = 'Co zobrazovat v položkách XML kanálu?';
+$lang['rss_update']            = 'Interval aktualizace XML kanálu (v sekundách)';
+$lang['rss_show_summary']      = 'XML kanál ukazuje souhrn v titulku';
+$lang['rss_media']             = 'Jaký typ změn má být uveden v kanálu XML';
+$lang['updatecheck']           = 'Kontrolovat aktualizace a bezpečnostní varování? DokuWiki potřebuje pro tuto funkci přístup k update.dokuwiki.org';
+$lang['userewrite']            = 'Používat "pěkná" URL';
+$lang['useslash']              = 'Používat lomítko jako oddělovač jmenných prostorů v URL';
+$lang['sepchar']               = 'Znak pro oddělování slov v názvech stránek';
+$lang['canonical']             = 'Používat plně kanonická URL';
+$lang['fnencode']              = 'Metoda pro kódování ne-ASCII názvů souborů';
+$lang['autoplural']            = 'Kontrolovat plurálové tvary v odkazech';
+$lang['compression']           = 'Metoda komprese pro staré verze';
+$lang['gzip_output']           = 'Používat pro xhtml Content-Encoding gzip';
+$lang['compress']              = 'Zahustit CSS a JavaScript výstup';
+$lang['cssdatauri']            = 'Velikost [v bajtech] obrázků odkazovaných v CSS souborech, které budou pro ušetření HTTP požadavku vestavěny do stylu. Tato technika nefunguje v IE 7 a starším. Doporučená hodnota je mezi 400 a 600 bajty. Pro vypnutí nastavte na 0.';
+$lang['send404']               = 'Posílat "HTTP 404/Page Not Found" pro neexistují stránky';
+$lang['broken_iua']            = 'Je na vašem systému funkce ignore_user_abort porouchaná? To může způsobovat nefunkčnost vyhledávacího indexu. O kombinaci IIS+PHP/CGI je známo, že nefunguje správně. Viz Bug 852 pro více informací.';
+$lang['xsendfile']             = 'Používat X-Sendfile hlavničky pro download statických souborů z webserveru? Je však požadována podpora této funkce na straně Vašeho webserveru.';
+$lang['renderer_xhtml']        = 'Vykreslovací jádro pro hlavní (xhtml) výstup wiki';
+$lang['renderer__core']        = '%s (jádro DokuWiki)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['dnslookups']            = 'DokuWiki zjišťuje DNS jména pro vzdálené IP adresy uživatelů, kteří editují stránky. Pokud máte pomalý, nebo nefunkční DNS server, nebo nepotřebujete tuto funkci, tak tuto volbu zrušte.';
+$lang['proxy____host']         = 'Název proxy serveru';
+$lang['proxy____port']         = 'Proxy port';
+$lang['proxy____user']         = 'Proxy uživatelské jméno';
+$lang['proxy____pass']         = 'Proxy heslo';
+$lang['proxy____ssl']          = 'Použít SSL při připojení k proxy';
+$lang['proxy____except']       = 'Regulární výrazy pro URL, pro které bude přeskočena proxy.';
+$lang['safemodehack']          = 'Zapnout safemode hack';
+$lang['ftp____host']           = 'FTP server pro safemode hack';
+$lang['ftp____port']           = 'FTP port pro safemode hack';
+$lang['ftp____user']           = 'FTP uživatelské jméno pro safemode hack';
+$lang['ftp____pass']           = 'FTP heslo pro safemode hack';
+$lang['ftp____root']           = 'FTP kořenový adresář pro safemode hack';
+$lang['license_o_']            = 'Nic nevybráno';
+$lang['typography_o_0']        = 'vypnuto';
+$lang['typography_o_1']        = 'Pouze uvozovky';
+$lang['typography_o_2']        = 'Všechny typy uvozovek a apostrofů (nemusí vždy fungovat)';
+$lang['userewrite_o_0']        = 'vypnuto';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'interní metoda DokuWiki';
+$lang['deaccent_o_0']          = 'vypnuto';
+$lang['deaccent_o_1']          = 'odstranit diakritiku';
+$lang['deaccent_o_2']          = 'převést na latinku';
+$lang['gdlib_o_0']             = 'GD knihovna není k dispozici';
+$lang['gdlib_o_1']             = 'Verze 1.x';
+$lang['gdlib_o_2']             = 'Autodetekce';
+$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'] = 'Abstraktní';
+$lang['rss_content_o_diff']    = 'Sjednocený Diff';
+$lang['rss_content_o_htmldiff'] = 'diff tabulka v HTML formátu';
+$lang['rss_content_o_html']    = 'Úplný HTML obsah stránky';
+$lang['rss_linkto_o_diff']     = 'přehled změn';
+$lang['rss_linkto_o_page']     = 'stránku samotnou';
+$lang['rss_linkto_o_rev']      = 'seznam revizí';
+$lang['rss_linkto_o_current']  = 'nejnovější revize';
+$lang['compression_o_0']       = 'vypnuto';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'nepoužívat';
+$lang['xsendfile_o_1']         = 'Proprietární hlavička lighttpd (před releasem 1.5)';
+$lang['xsendfile_o_2']         = 'Standardní hlavička X-Sendfile';
+$lang['xsendfile_o_3']         = 'Proprietární hlavička Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Přihlašovací jméno';
+$lang['showuseras_o_username'] = 'Celé jméno uživatele';
+$lang['showuseras_o_email']    = 'E-mailová adresa uživatele ("zamaskována" aktuálně nastavenou metodou)';
+$lang['showuseras_o_email_link'] = 'E-mailová adresa uživatele jako mailto: odkaz';
+$lang['useheading_o_0']        = 'Nikdy';
+$lang['useheading_o_navigation'] = 'Pouze pro navigaci';
+$lang['useheading_o_content']  = 'Pouze pro wiki obsah';
+$lang['useheading_o_1']        = 'Vždy';
+$lang['readdircache']          = 'Maximální stáří readdir cache (sec)';
diff --git a/sources/lib/plugins/config/lang/da/intro.txt b/sources/lib/plugins/config/lang/da/intro.txt
new file mode 100644
index 0000000..f20961b
--- /dev/null
+++ b/sources/lib/plugins/config/lang/da/intro.txt
@@ -0,0 +1,8 @@
+====== Opsætningsstyring ======
+
+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 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, for at du ikke mister dine ændringer.
+
diff --git a/sources/lib/plugins/config/lang/da/lang.php b/sources/lib/plugins/config/lang/da/lang.php
new file mode 100644
index 0000000..59a602e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/da/lang.php
@@ -0,0 +1,198 @@
+
+ * @author Kalle Sommer Nielsen 
+ * @author Esben Laursen 
+ * @author Harith 
+ * @author Daniel Ejsing-Duun 
+ * @author Erik Bjørn Pedersen 
+ * @author rasmus@kinnerup.com
+ * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig 
+ */
+$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 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']        = 'Udvidelsesindstillinger';
+$lang['_header_template']      = 'Skabelonindstillinger';
+$lang['_header_undefined']     = 'Ikke satte indstillinger';
+$lang['_basic']                = 'Grundindstillinger';
+$lang['_display']              = 'Synlighedsindstillinger';
+$lang['_authentication']       = 'Bekræftelsesindstillinger';
+$lang['_anti_spam']            = 'Trafikkontrolsindstillinger';
+$lang['_editing']              = 'Redigeringsindstillinger';
+$lang['_links']                = 'Henvisningsindstillinger';
+$lang['_media']                = 'Medieindstillinger';
+$lang['_notifications']        = 'Notificeringsindstillinger';
+$lang['_advanced']             = 'Avancerede indstillinger';
+$lang['_network']              = 'Netværksindstillinger';
+$lang['_msg_setting_undefined'] = 'Ingen indstillingsmetadata.';
+$lang['_msg_setting_no_class'] = 'Ingen indstillingsklasse.';
+$lang['_msg_setting_no_default'] = 'Ingen standardværdi.';
+$lang['title']                 = 'Wiki titel';
+$lang['start']                 = 'Startsidens navn';
+$lang['lang']                  = 'Sprog';
+$lang['template']              = 'Skabelon';
+$lang['tagline']               = 'Tagline (hvis templaten understøtter det)';
+$lang['sidebar']               = 'Sidebar side navne (hvis templaten understøtter det).';
+$lang['license']               = 'Under hvilken licens skal dit indhold frigives?';
+$lang['savedir']               = 'Katalog til opbevaring af data';
+$lang['basedir']               = 'Grundkatalog';
+$lang['baseurl']               = 'Grundadresse';
+$lang['cookiedir']             = 'Cookie sti.  Hvis tom, bruges baseurl.';
+$lang['dmode']                 = 'Katalogoprettelsestilstand';
+$lang['fmode']                 = 'Filoprettelsestilstand';
+$lang['allowdebug']            = 'Tillad fejlretning slå fra hvis unødvendig!';
+$lang['recent']                = 'Nylige ændringer';
+$lang['recent_days']           = 'Hvor mange nye ændringer der skal beholdes (dage)';
+$lang['breadcrumbs']           = 'Stilængde';
+$lang['youarehere']            = 'Hierarkisk sti';
+$lang['fullpath']              = 'Vis den fulde sti til siderne i bundlinjen';
+$lang['typography']            = 'Typografiske erstatninger';
+$lang['dformat']               = 'Datoformat (se PHP\'s strftime-funktion)';
+$lang['signature']             = 'Underskrift';
+$lang['showuseras']            = 'Hvad skal vises når den sidste bruger, der har ændret siden, fremstilles';
+$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['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['hidepages']             = 'Skjul lignende sider (almindelige udtryk)';
+$lang['useacl']                = 'Benyt adgangskontrollister';
+$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 kodeord';
+$lang['rememberme']            = 'Tillad varige datafiler for brugernavne (husk mig)';
+$lang['disableactions']        = 'Slå DokuWiki-muligheder fra';
+$lang['disableactions_check']  = 'Tjek';
+$lang['disableactions_subscription'] = 'Tliføj/Fjern opskrivning';
+$lang['disableactions_wikicode'] = 'Vis kilde/Eksporter grundkode';
+$lang['disableactions_other']  = 'Andre muligheder (kommasepareret)';
+$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['remote']                = 'Aktivér fjern APIet.  Dette tillader andre programmer at tilgå wikien via XML-RPC eller andre mekanismer.';
+$lang['remoteuser']            = 'Begræns fjern API adgang til den kommaseparerede liste af grupper eller brugere angivet her.  Efterlad tom for at give adgang til alle.';
+$lang['usewordblock']          = 'Hindr uønsket brug med en ordliste';
+$lang['relnofollow']           = 'Brug rel="nofollow" til udadgående henvisninger';
+$lang['indexdelay']            = 'Tidsforsinkelse før katalogisering (sek.)';
+$lang['mailguard']             = 'Slør elektroniske adresser';
+$lang['iexssprotect']          = 'Gennemse oplagte filer for mulig skadelig JavaScript- eller HTML-kode.';
+$lang['usedraft']              = 'Gem automatisk en kladde under redigering';
+$lang['htmlok']                = 'Tillad indlejret HTML';
+$lang['phpok']                 = 'Tillad indlejret PHP';
+$lang['locktime']              = 'Længste levetid for låsefiler (sek)';
+$lang['cachetime']             = 'Længste levetid for "cache" (sek)';
+$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['mediarevisions']        = 'Akvtivér media udgaver?';
+$lang['refcheck']              = 'Mediehenvisningerkontrol';
+$lang['gdlib']                 = 'Udgave af GD Lib';
+$lang['im_convert']            = 'Sti til ImageMagick\'s omdannerværktøj';
+$lang['jpg_quality']           = 'JPG komprimeringskvalitet (0-100)';
+$lang['fetchsize']             = 'Største antal (bytes) fetch.php må hente udefra';
+$lang['subscribers']           = 'Slå understøttelse af abonnement på sider til';
+$lang['subscribe_time']        = 'Tid der går før abonnementlister og nyhedsbreve er sendt (i sekunder). Denne værdi skal være mindre end den tid specificeret under recent_days.';
+$lang['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['mailprefix']            = 'Præfiks på email subject for automastiske mails.  Efterlad blank for at bruge wiki titlen.';
+$lang['htmlmail']              = 'Send pænere, men større HTML multipart mails.  Deaktivér for at sende rene tekst mails.';
+$lang['sitemap']               = 'Generer Google-"sitemap" (dage)';
+$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['rss_show_summary']      = 'XML-liste vis referat i overskriften';
+$lang['rss_media']             = 'Hvilke ændringer skal vises i XML listen?';
+$lang['updatecheck']           = 'Kig efter opdateringer og sikkerhedsadvarsler? DokuWiki er nødt til at kontakte update.dokuwiki.org for at tilgå denne funktion.';
+$lang['userewrite']            = 'Brug pæne netadresser';
+$lang['useslash']              = 'Brug skråstreg som navnerumsdeler i netadresser';
+$lang['sepchar']               = 'Orddelingstegn til sidenavne';
+$lang['canonical']             = 'Benyt fuldt kanoniske netadresser';
+$lang['fnencode']              = 'Metode for indkodning af ikke ASCII filnavne';
+$lang['autoplural']            = 'Tjek for flertalsendelser i henvisninger';
+$lang['compression']           = 'Pakningsmetode for attic-filer';
+$lang['gzip_output']           = 'Benyt gzip-Content-Encoding (indholdskryptering) til XHTML';
+$lang['compress']              = 'Komprimer CSS- og JavaScript-filer';
+$lang['send404']               = 'Send "HTTP 404/Page Not Found" for ikke-eksisterende sider';
+$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['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['proxy____except']       = 'Regular expression til at matche URL\'er for hvilke proxier der skal ignores';
+$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']        = '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 indre';
+$lang['deaccent_o_0']          = 'fra';
+$lang['deaccent_o_1']          = 'fjern accenttegn';
+$lang['deaccent_o_2']          = 'romaniser';
+$lang['gdlib_o_0']             = 'GD Lib ikke tilstede';
+$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" (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';
+$lang['rss_linkto_o_current']  = 'den nuværende side';
+$lang['compression_o_0']       = 'ingen';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'brug ikke';
+$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 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';
+$lang['readdircache']          = 'Maksimum alder for readdir hukommelse (sek)';
diff --git a/sources/lib/plugins/config/lang/de-informal/intro.txt b/sources/lib/plugins/config/lang/de-informal/intro.txt
new file mode 100644
index 0000000..df9845e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/de-informal/intro.txt
@@ -0,0 +1,7 @@
+===== Konfigurations-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 Erweiterungen siehe [[doku>plugin:config]].
+
+Einstellungen die mit einem hellroten Hintergrund angezeigt werden, können mit dieser Erweiterung nicht verändert werden. Einstellungen mit einem blauen Hintergrund sind Standardwerte und Einstellungen mit einem weißen Hintergrund wurden lokal gesetzt für diese Installation. Sowohl blaue als auch weiße Einstellungen können angepasst werden.
+
+Denke dran **Speichern** zu drücken bevor du die Seite verlässt, andernfalls werden deine Änderungen nicht übernommen.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/de-informal/lang.php b/sources/lib/plugins/config/lang/de-informal/lang.php
new file mode 100644
index 0000000..7a17ace
--- /dev/null
+++ b/sources/lib/plugins/config/lang/de-informal/lang.php
@@ -0,0 +1,200 @@
+
+ * @author Juergen Schwarzer 
+ * @author Marcel Metz 
+ * @author Matthias Schulte 
+ * @author Christian Wichmann 
+ * @author Pierre Corell 
+ * @author Frank Loizzi 
+ * @author Mateng Schimmerlos 
+ * @author Volker Bödker 
+ * @author Matthias Schulte 
+ */
+$lang['menu']                  = 'Konfiguration';
+$lang['error']                 = 'Konfiguration wurde nicht aktualisiert auf Grund eines ungültigen Wertes. Bitte überprüfe deine Änderungen und versuche es erneut.
        Die/der ungültige(n) Wert(e) werden durch eine rote Umrandung hervorgehoben.';
+$lang['updated']               = 'Konfiguration erfolgreich aktualisiert.';
+$lang['nochoice']              = '(keine andere Option möglich)';
+$lang['locked']                = 'Die Konfigurationsdatei kann nicht aktualisiert werden. Wenn dies unbeabsichtigt ist stelle sicher, dass der Name und die Zugriffsrechte der Konfigurationsdatei richtig sind.';
+$lang['danger']                = '**Achtung**: Eine Änderung dieser Einstellung kann dein Wiki und das Einstellungsmenü unerreichbar machen.';
+$lang['warning']               = 'Achtung: Eine Änderungen dieser Option kann zu unbeabsichtigtem Verhalten führen.';
+$lang['security']              = 'Sicherheitswarnung: Eine Änderungen dieser Option können ein Sicherheitsrisiko bedeuten.';
+$lang['_configuration_manager'] = 'Konfigurations-Manager';
+$lang['_header_dokuwiki']      = 'DokuWiki';
+$lang['_header_plugin']        = 'Plugin';
+$lang['_header_template']      = 'Template';
+$lang['_header_undefined']     = 'Unbekannte Werte';
+$lang['_basic']                = 'Basis';
+$lang['_display']              = 'Darstellung';
+$lang['_authentication']       = 'Authentifizierung';
+$lang['_anti_spam']            = 'Anti-Spam';
+$lang['_editing']              = 'Bearbeitung';
+$lang['_links']                = 'Links';
+$lang['_media']                = 'Medien';
+$lang['_notifications']        = 'Benachrichtigung';
+$lang['_syndication']          = 'Syndication (RSS)';
+$lang['_advanced']             = 'Erweitert';
+$lang['_network']              = 'Netzwerk';
+$lang['_msg_setting_undefined'] = 'Keine Konfigurationsmetadaten.';
+$lang['_msg_setting_no_class'] = 'Keine Konfigurationsklasse.';
+$lang['_msg_setting_no_default'] = 'Kein Standardwert.';
+$lang['title']                 = 'Wiki Titel';
+$lang['start']                 = 'Name der Startseite';
+$lang['lang']                  = 'Sprache';
+$lang['template']              = 'Vorlage';
+$lang['tagline']               = 'Tag-Linie (nur, wenn vom Template unterstützt)';
+$lang['sidebar']               = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt), ein leeres Feld deaktiviert die Sidebar';
+$lang['license']               = 'Unter welcher Lizenz sollte Ihr Inhalt veröffentlicht werden?';
+$lang['savedir']               = 'Ordner zum Speichern von Daten';
+$lang['basedir']               = 'Installationsverzeichnis';
+$lang['baseurl']               = 'Installationspfad (URL)';
+$lang['cookiedir']             = 'Cookie Pfad. Leer lassen, um die Standard-Url zu belassen.';
+$lang['dmode']                 = 'Zugriffsrechte bei Verzeichniserstellung';
+$lang['fmode']                 = 'Zugriffsrechte bei Dateierstellung';
+$lang['allowdebug']            = 'Debug-Ausgaben erlauben Abschalten wenn nicht benötigt!';
+$lang['recent']                = 'letzte Änderungen';
+$lang['recent_days']           = 'Wie viele Änderungen sollen vorgehalten werden? (Tage)';
+$lang['breadcrumbs']           = 'Anzahl der Einträge im "Krümelpfad"';
+$lang['youarehere']            = 'Hierarchische Pfadnavigation verwenden';
+$lang['fullpath']              = 'Zeige vollen Pfad der Datei in Fußzeile an';
+$lang['typography']            = 'Mach drucktechnische Ersetzungen';
+$lang['dformat']               = 'Datumsformat (siehe PHPs strftime Funktion)';
+$lang['signature']             = 'Signatur';
+$lang['showuseras']            = 'Was angezeigt werden soll, wenn der Benutzer, der zuletzt eine Seite bearbeitet hat, angezeigt wird';
+$lang['toptoclevel']           = 'Inhaltsverzeichnis bei dieser Überschriftengröße beginnen';
+$lang['tocminheads']           = 'Mindestanzahl der Überschriften die entscheidet, ob ein Inhaltsverzeichnis erscheinen soll';
+$lang['maxtoclevel']           = 'Maximale Überschriftengröße für Inhaltsverzeichnis';
+$lang['maxseclevel']           = 'Abschnitte bis zu dieser Stufe einzeln editierbar machen';
+$lang['camelcase']             = 'CamelCase-Verlinkungen verwenden';
+$lang['deaccent']              = 'Seitennamen bereinigen';
+$lang['useheading']            = 'Erste Überschrift als Seitennamen verwenden';
+$lang['sneaky_index']          = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Indexansicht an. Bei Aktivierung dieser Einstellung werden alle Namensräume versteckt, in welchen der Benutzer keine Leserechte hat. Dies könnte dazu führen, dass lesbare Unternamensräume versteckt werden. Dies kann die Indexansicht bei bestimmten Zugangskontrolleinstellungen unbenutzbar machen.';
+$lang['hidepages']             = 'Seiten verstecken (Regulärer Ausdruck)';
+$lang['useacl']                = 'Benutze Zugangskontrollliste';
+$lang['autopasswd']            = 'Automatisch erzeugte Passwörter';
+$lang['authtype']              = 'Authentifizierungsmethode';
+$lang['passcrypt']             = 'Passwortverschlüsselungsmethode';
+$lang['defaultgroup']          = 'Standardgruppe';
+$lang['superuser']             = 'Administrator - Eine Gruppe oder Benutzer mit vollem Zugriff auf alle Seiten und Administrationswerkzeuge.';
+$lang['manager']               = 'Manager - Eine Gruppe oder Benutzer mit Zugriff auf einige Administrationswerkzeuge.';
+$lang['profileconfirm']        = 'Änderungen am Benutzerprofil mit Passwort bestätigen';
+$lang['rememberme']            = 'Permanente Login-Cookies erlauben (Auf diesem Computer eingeloggt bleiben)';
+$lang['disableactions']        = 'Deaktiviere DokuWiki\'s Zugriffe';
+$lang['disableactions_check']  = 'Check';
+$lang['disableactions_subscription'] = 'Bestellen/Abbestellen';
+$lang['disableactions_wikicode'] = 'Zeige Quelle/Exportiere Rohdaten';
+$lang['disableactions_profile_delete'] = 'Eigenes Benutzerprofil löschen';
+$lang['disableactions_other']  = 'Weitere Aktionen (durch Komma getrennt)';
+$lang['auth_security_timeout'] = 'Zeitüberschreitung bei der Authentifizierung (Sekunden)';
+$lang['securecookie']          = 'Sollen Cookies, die via HTTPS gesetzt wurden nur per HTTPS versendet werden? Deaktiviere diese Option, wenn nur der Login deines Wikis mit SSL gesichert ist, aber das Betrachten des Wikis ungesichert geschieht.';
+$lang['remote']                = 'Aktiviert den externen API-Zugang. Diese Option erlaubt es externen Anwendungen von außen auf die XML-RPC-Schnittstelle oder anderweitigen Schnittstellen zuzugreifen.';
+$lang['remoteuser']            = 'Zugriff auf die externen Schnittstellen durch kommaseparierte Angabe von Benutzern oder Gruppen einschränken. Ein leeres Feld erlaubt Zugriff für jeden.';
+$lang['usewordblock']          = 'Blockiere Spam basierend auf der Wortliste';
+$lang['relnofollow']           = 'rel="nofollow" verwenden';
+$lang['indexdelay']            = 'Zeit bevor Suchmaschinenindexierung erlaubt ist';
+$lang['mailguard']             = 'E-Mail-Adressen schützen';
+$lang['iexssprotect']          = 'Hochgeladene Dateien auf bösartigen JavaScript- und HTML-Code untersuchen';
+$lang['usedraft']              = 'Speichere automatisch Entwürfe während der Bearbeitung';
+$lang['htmlok']                = 'Erlaube eingebettetes HTML';
+$lang['phpok']                 = 'Erlaube eingebettetes PHP';
+$lang['locktime']              = 'Maximales Alter für Seitensperren (Sekunden)';
+$lang['cachetime']             = 'Maximale Cachespeicherung (Sekunden)';
+$lang['target____wiki']        = 'Zielfenstername für interne Links';
+$lang['target____interwiki']   = 'Zielfenstername für InterWiki-Links';
+$lang['target____extern']      = 'Zielfenstername für externe Links';
+$lang['target____media']       = 'Zielfenstername für Medienlinks';
+$lang['target____windows']     = 'Zielfenstername für Windows-Freigaben-Links';
+$lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
+$lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
+$lang['gdlib']                 = 'GD Lib Version';
+$lang['im_convert']            = 'Pfad zu ImageMagicks-Konvertierwerkzeug';
+$lang['jpg_quality']           = 'JPEG Kompressionsqualität (0-100)';
+$lang['fetchsize']             = 'Maximale Größe (in Bytes), die fetch.php von extern herunterladen darf';
+$lang['subscribers']           = 'E-Mail-Abos zulassen';
+$lang['subscribe_time']        = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.';
+$lang['notify']                = 'Sende Änderungsbenachrichtigungen an diese E-Mail-Adresse.';
+$lang['registernotify']        = 'Sende Information bei neu registrierten Benutzern an diese E-Mail-Adresse.';
+$lang['mailfrom']              = 'Absenderadresse für automatisch erzeugte E-Mails';
+$lang['mailprefix']            = 'Präfix für E-Mail-Betreff beim automatischen Versand von Benachrichtigungen';
+$lang['htmlmail']              = 'Versendet optisch angenehmere, aber größere E-Mails im HTML-Format (multipart). Deaktivieren, um Text-Mails zu versenden.';
+$lang['sitemap']               = 'Erzeuge Google Sitemaps (Tage)';
+$lang['rss_type']              = 'XML-Feed-Format';
+$lang['rss_linkto']            = 'XML-Feed verlinken auf';
+$lang['rss_content']           = 'Was soll in XML-Feedinhalten angezeigt werden?';
+$lang['rss_update']            = 'Aktualisierungsintervall für XML-Feeds (Sekunden)';
+$lang['rss_show_summary']      = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen';
+$lang['rss_media']             = 'Welche Änderungen sollen im XML-Feed angezeigt werden?';
+$lang['updatecheck']           = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.';
+$lang['userewrite']            = 'Benutze schöne URLs';
+$lang['useslash']              = 'Benutze Schrägstrich als Namensraumtrenner in URLs';
+$lang['sepchar']               = 'Worttrenner für Seitennamen in URLs';
+$lang['canonical']             = 'Immer Links mit vollständigen URLs erzeugen';
+$lang['fnencode']              = 'Methode um nicht-ASCII Dateinamen zu kodieren.';
+$lang['autoplural']            = 'Bei Links automatisch nach vorhandenen Pluralformen suchen';
+$lang['compression']           = 'Komprimierungsmethode für alte Seitenrevisionen';
+$lang['gzip_output']           = 'Seiten mit gzip komprimiert ausliefern';
+$lang['compress']              = 'JavaScript und Stylesheets komprimieren';
+$lang['cssdatauri']            = 'Größe in Bytes, bis zu der Bilder in css-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE 7 und älter! 400 bis 600 Bytes sind gute Werte. Setze 0 für inaktive Funktion.';
+$lang['send404']               = 'Sende "HTTP 404/Seite nicht gefunden" für nicht existierende Seiten';
+$lang['broken_iua']            = 'Falls die Funktion ignore_user_abort auf deinem System nicht funktioniert, könnte der Such-Index nicht funktionieren. IIS+PHP/CGI ist bekannt dafür. Siehe auch Bug 852.';
+$lang['xsendfile']             = 'Den X-Sendfile-Header nutzen, um Dateien direkt vom Webserver ausliefern zu lassen? Dein Webserver muss dies unterstützen!';
+$lang['renderer_xhtml']        = 'Standard-Renderer für die normale (XHTML) Wiki-Ausgabe.';
+$lang['renderer__core']        = '%s (DokuWiki Kern)';
+$lang['renderer__plugin']      = '%s (Erweiterung)';
+$lang['dnslookups']            = 'DokuWiki löst die IP-Adressen von Benutzern zu deren Hostnamen auf. Wenn du einen langsamen, unbrauchbaren DNS-Server verwendest oder die Funktion nicht benötigst, dann sollte diese Option deaktivert sein.';
+$lang['proxy____host']         = 'Proxyadresse';
+$lang['proxy____port']         = 'Proxyport';
+$lang['proxy____user']         = 'Benutzername für den Proxy';
+$lang['proxy____pass']         = 'Passwort von dem Proxybenutzer';
+$lang['proxy____ssl']          = 'SSL verwenden um auf den Proxy zu zugreifen';
+$lang['proxy____except']       = 'Regulärer Ausdruck um Adressen zu beschreiben, für die kein Proxy verwendet werden soll';
+$lang['safemodehack']          = 'Aktiviere safemode Hack';
+$lang['ftp____host']           = 'FTP Server für safemode Hack';
+$lang['ftp____port']           = 'FTP Port für safemode Hack';
+$lang['ftp____user']           = 'FTP Benutzername für safemode Hack';
+$lang['ftp____pass']           = 'FTP Passwort für safemode Hack';
+$lang['ftp____root']           = 'FTP Wurzelverzeichnis für Safemodehack';
+$lang['license_o_']            = 'Nichts ausgewählt';
+$lang['typography_o_0']        = 'nichts';
+$lang['typography_o_1']        = 'ohne einfache Anführungszeichen';
+$lang['typography_o_2']        = 'mit einfachen Anführungszeichen (funktioniert nicht immer)';
+$lang['userewrite_o_0']        = 'nichts';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki intern';
+$lang['deaccent_o_0']          = 'aus';
+$lang['deaccent_o_1']          = 'Entferne Akzente';
+$lang['deaccent_o_2']          = 'romanisieren';
+$lang['gdlib_o_0']             = 'GD lib ist nicht verfügbar';
+$lang['gdlib_o_1']             = 'Version 1.x';
+$lang['gdlib_o_2']             = 'Autoerkennung';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$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'] = 'Zusammenfassung';
+$lang['rss_content_o_diff']    = 'Vereinigtes Diff';
+$lang['rss_content_o_htmldiff'] = 'HTML formatierte Diff-Tabelle';
+$lang['rss_content_o_html']    = 'Vollständiger HTML-Inhalt';
+$lang['rss_linkto_o_diff']     = 'Ansicht der Unterschiede';
+$lang['rss_linkto_o_page']     = 'geänderte Seite';
+$lang['rss_linkto_o_rev']      = 'Liste der Revisionen';
+$lang['rss_linkto_o_current']  = 'Die aktuelle Seite';
+$lang['compression_o_0']       = 'nichts';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'Nicht benutzen';
+$lang['xsendfile_o_1']         = 'Proprietärer lighttpd-Header (vor Release 1.5)';
+$lang['xsendfile_o_2']         = 'Standard X-Sendfile-Header';
+$lang['xsendfile_o_3']         = 'Proprietärer Nginx X-Accel-Redirect-Header';
+$lang['showuseras_o_loginname'] = 'Login-Name';
+$lang['showuseras_o_username'] = 'Voller Name des Benutzers';
+$lang['showuseras_o_email']    = 'E-Mail-Adresse des Benutzers (je nach Mailguard-Einstellung verschleiert)';
+$lang['showuseras_o_email_link'] = 'E-Mail-Adresse des Benutzers als mailto:-Link';
+$lang['useheading_o_0']        = 'Niemals';
+$lang['useheading_o_navigation'] = 'Nur Navigation';
+$lang['useheading_o_content']  = 'Nur Wiki-Inhalt';
+$lang['useheading_o_1']        = 'Immer';
+$lang['readdircache']          = 'Maximales Alter des readdir-Caches (Sekunden)';
diff --git a/sources/lib/plugins/config/lang/de/intro.txt b/sources/lib/plugins/config/lang/de/intro.txt
new file mode 100644
index 0000000..b79b5f8
--- /dev/null
+++ b/sources/lib/plugins/config/lang/de/intro.txt
@@ -0,0 +1,10 @@
+====== Konfigurations-Manager ======
+
+Dieses Plugin hilft Ihnen bei der Konfiguration von DokuWiki. Hilfe zu den einzelnen Einstellungen finden Sie unter [[doku>config]]. Mehr Information zu diesem Plugin ist unter [[doku>plugin:config]] erhältlich.
+
+Einstellungen mit einem hellroten Hintergrund sind gesichert und können nicht mit diesem Plugin verändert werden, Einstellungen mit hellblauem Hintergrund sind Voreinstellungen, weiß hinterlegte Felder zeigen lokal veränderte Werte an. Sowohl die blauen als auch die weißen Felder können verändert werden.
+
+Bitte vergessen Sie nicht **Speichern** zu drücken bevor Sie die Seite verlassen, andernfalls gehen Ihre Änderungen verloren.
+
+
+
diff --git a/sources/lib/plugins/config/lang/de/lang.php b/sources/lib/plugins/config/lang/de/lang.php
new file mode 100644
index 0000000..e55081a
--- /dev/null
+++ b/sources/lib/plugins/config/lang/de/lang.php
@@ -0,0 +1,206 @@
+
+ * @author Michael Klier 
+ * @author Leo Moll 
+ * @author Florian Anderiasch 
+ * @author Robin Kluth 
+ * @author Arne Pelka 
+ * @author Dirk Einecke 
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider 
+ * @author Niels Lange 
+ * @author Christian Wichmann 
+ * @author Paul Lachewsky 
+ * @author Pierre Corell 
+ * @author Matthias Schulte 
+ * @author Mateng Schimmerlos 
+ */
+$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.';
+$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, ob 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'] = 'Konfigurations-Manager';
+$lang['_header_dokuwiki']      = 'DokuWiki';
+$lang['_header_plugin']        = 'Plugin';
+$lang['_header_template']      = 'Template';
+$lang['_header_undefined']     = 'Unbekannte Werte';
+$lang['_basic']                = 'Basis';
+$lang['_display']              = 'Darstellung';
+$lang['_authentication']       = 'Authentifizierung';
+$lang['_anti_spam']            = 'Anti-Spam';
+$lang['_editing']              = 'Bearbeitung';
+$lang['_links']                = 'Links';
+$lang['_media']                = 'Medien';
+$lang['_notifications']        = 'Benachrichtigung';
+$lang['_syndication']          = 'Syndication (RSS)';
+$lang['_advanced']             = 'Erweitertet';
+$lang['_network']              = 'Netzwerk';
+$lang['_msg_setting_undefined'] = 'Keine Konfigurationsmetadaten.';
+$lang['_msg_setting_no_class'] = 'Keine Konfigurationsklasse.';
+$lang['_msg_setting_no_default'] = 'Kein Standardwert.';
+$lang['fmode']                 = 'Berechtigungen für neue Dateien';
+$lang['dmode']                 = 'Berechtigungen für neue Verzeichnisse';
+$lang['lang']                  = 'Sprache';
+$lang['basedir']               = 'Installationsverzeichnis';
+$lang['baseurl']               = 'Installationspfad (URL)';
+$lang['savedir']               = 'Speicherverzeichnis';
+$lang['cookiedir']             = 'Cookiepfad. Frei lassen, um den gleichen Pfad wie "baseurl" zu benutzen.';
+$lang['start']                 = 'Startseitenname';
+$lang['title']                 = 'Titel des Wikis';
+$lang['template']              = 'Designvorlage (Template)';
+$lang['tagline']               = 'Tag-Linie (nur, wenn vom Template unterstützt)';
+$lang['sidebar']               = 'Name der Sidebar-Seite (nur, wenn vom Template unterstützt), ein leeres Feld deaktiviert die Sidebar';
+$lang['license']               = 'Unter welcher Lizenz sollen Ihre Inhalte veröffentlicht werden?';
+$lang['fullpath']              = 'Den kompletten Dateipfad im Footer anzeigen';
+$lang['recent']                = 'Anzahl der Einträge in der Änderungsliste';
+$lang['breadcrumbs']           = 'Anzahl der Einträge im "Krümelpfad"';
+$lang['youarehere']            = 'Hierarchische Pfadnavigation verwenden';
+$lang['typography']            = 'Typographische Ersetzungen';
+$lang['htmlok']                = 'HTML erlauben';
+$lang['phpok']                 = 'PHP erlauben';
+$lang['dformat']               = 'Datumsformat (Siehe PHP strftime Funktion)';
+$lang['signature']             = 'Signatur';
+$lang['toptoclevel']           = 'Inhaltsverzeichnis bei dieser Überschriftengröße beginnen';
+$lang['tocminheads']           = 'Mindestanzahl der Überschriften die entscheidet, ob ein Inhaltsverzeichnis erscheinen soll';
+$lang['maxtoclevel']           = 'Maximale Überschriftengröße für Inhaltsverzeichnis';
+$lang['maxseclevel']           = 'Abschnitte bis zu dieser Stufe einzeln editierbar machen';
+$lang['camelcase']             = 'CamelCase-Verlinkungen verwenden';
+$lang['deaccent']              = 'Seitennamen bereinigen';
+$lang['useheading']            = 'Erste Überschrift als Seitennamen verwenden';
+$lang['refcheck']              = 'Auf Verwendung beim Löschen von Media-Dateien testen';
+$lang['allowdebug']            = 'Debug-Ausgaben erlauben Abschalten wenn nicht benötigt!';
+$lang['mediarevisions']        = 'Media-Revisionen (ältere Versionen) aktivieren?';
+$lang['usewordblock']          = 'Spam-Blocking benutzen';
+$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['useacl']                = 'Zugangskontrolle verwenden';
+$lang['autopasswd']            = 'Passwort automatisch generieren';
+$lang['authtype']              = 'Authentifizierungsmechanismus';
+$lang['passcrypt']             = 'Verschlüsselungsmechanismus';
+$lang['defaultgroup']          = 'Standardgruppe';
+$lang['superuser']             = 'Administrator - Eine Gruppe oder Benutzer mit vollem Zugriff auf alle Seiten und Administrationswerkzeuge.';
+$lang['manager']               = 'Manager - Eine Gruppe oder Benutzer mit Zugriff auf einige Administrationswerkzeuge.';
+$lang['profileconfirm']        = 'Profiländerung nur nach Passwortbestätigung';
+$lang['disableactions']        = 'DokuWiki-Aktionen deaktivieren';
+$lang['disableactions_check']  = 'Check';
+$lang['disableactions_subscription'] = 'Seiten-Abonnements';
+$lang['disableactions_wikicode'] = 'Quelltext betrachten/exportieren';
+$lang['disableactions_profile_delete'] = 'Eigenes Benutzerprofil löschen';
+$lang['disableactions_other']  = 'Andere Aktionen (durch Komma getrennt)';
+$lang['sneaky_index']          = 'Standardmäßig zeigt DokuWiki alle Namensräume in der Übersicht. Wenn diese Option aktiviert wird, werden alle Namensräume, für die der Benutzer keine Lese-Rechte hat, nicht angezeigt. Dies kann unter Umständen dazu führen, das lesbare Unter-Namensräume nicht angezeigt werden und macht die Übersicht evtl. unbrauchbar in Kombination mit bestimmten ACL Einstellungen.';
+$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['remote']                = 'Aktiviert den externen API-Zugang. Diese Option erlaubt es externen Anwendungen von außen auf die XML-RPC-Schnittstelle oder anderweitigen Schnittstellen zu zugreifen.';
+$lang['remoteuser']            = 'Zugriff auf die externen Schnittstellen durch kommaseparierte Angabe von Benutzern oder Gruppen einschränken. Ein leeres Feld erlaubt Zugriff für jeden.';
+$lang['updatecheck']           = 'Automatisch auf Updates und Sicherheitswarnungen prüfen? DokuWiki muss sich dafür mit update.dokuwiki.org verbinden.';
+$lang['userewrite']            = 'URL rewriting';
+$lang['useslash']              = 'Schrägstrich (/) als Namensraumtrenner in URLs verwenden';
+$lang['usedraft']              = 'Während des Bearbeitens automatisch Zwischenentwürfe speichern';
+$lang['sepchar']               = 'Worttrenner für Seitennamen in URLs';
+$lang['canonical']             = 'Immer Links mit vollständigen URLs erzeugen';
+$lang['fnencode']              = 'Methode um nicht-ASCII Dateinamen zu kodieren.';
+$lang['autoplural']            = 'Bei Links automatisch nach vorhandenen Pluralformen suchen';
+$lang['compression']           = 'Komprimierungsmethode für alte Seitenrevisionen';
+$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 Benutzer an diese E-Mail-Adresse senden';
+$lang['mailfrom']              = 'Absender-E-Mail-Adresse für automatische Mails';
+$lang['mailprefix']            = 'Präfix für E-Mail-Betreff beim automatischen Versand von Benachrichtigungen';
+$lang['htmlmail']              = 'Versendet optisch angenehmere, aber größere E-Mails im HTML-Format (multipart). Deaktivieren, um Text-Mails zu versenden.';
+$lang['gzip_output']           = 'Seiten mit gzip komprimiert ausliefern';
+$lang['gdlib']                 = 'GD Lib Version';
+$lang['im_convert']            = 'Pfad zum ImageMagicks-Konvertierwerkzeug';
+$lang['jpg_quality']           = 'JPEG Kompressionsqualität (0-100)';
+$lang['subscribers']           = 'E-Mail-Abos zulassen';
+$lang['subscribe_time']        = 'Zeit nach der Zusammenfassungs- und Änderungslisten-E-Mails verschickt werden; Dieser Wert sollte kleiner als die in recent_days konfigurierte Zeit sein.';
+$lang['compress']              = 'JavaScript und Stylesheets komprimieren';
+$lang['cssdatauri']            = 'Größe in Bytes, bis zu der Bilder in CSS-Dateien referenziert werden können, um HTTP-Anfragen zu minimieren. Diese Technik funktioniert nicht im IE 7 und älter!  Empfohlene Einstellung: 400 to 600 Bytes. Setzen Sie die Einstellung auf 0 um die Funktion zu deaktivieren.';
+$lang['hidepages']             = 'Seiten verstecken (Regulärer Ausdruck)';
+$lang['send404']               = 'Bei nicht vorhandenen Seiten mit 404 Fehlercode antworten';
+$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['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_linkto']            = 'XML-Feed verlinken auf';
+$lang['rss_content']           = 'Welche Inhalte sollen im XML-Feed dargestellt werden?';
+$lang['rss_update']            = 'XML-Feed Aktualisierungsintervall (Sekunden)';
+$lang['recent_days']           = 'Wie viele letzte Änderungen sollen einsehbar bleiben? (Tage)';
+$lang['rss_show_summary']      = 'Bearbeitungs-Zusammenfassung im XML-Feed anzeigen';
+$lang['rss_media']             = 'Welche Änderungen sollen im XML-Feed angezeigt werden?';
+$lang['target____wiki']        = 'Zielfenster für interne Links (target Attribut)';
+$lang['target____interwiki']   = 'Zielfenster für InterWiki-Links (target Attribut)';
+$lang['target____extern']      = 'Zielfenster für Externe Links (target Attribut)';
+$lang['target____media']       = 'Zielfenster für (Bild-)Dateien (target Attribut)';
+$lang['target____windows']     = 'Zielfenster für Windows Freigaben (target Attribut)';
+$lang['dnslookups']            = 'DokuWiki löst die IP-Adressen von Benutzern zu deren Hostnamen auf. Wenn du einen langsamen, unbrauchbaren DNS-Server verwendest oder die Funktion nicht benötigst, dann sollte diese Option deaktiviert sein.';
+$lang['proxy____host']         = 'Proxy-Server';
+$lang['proxy____port']         = 'Proxy-Port';
+$lang['proxy____user']         = 'Proxy Benutzername';
+$lang['proxy____pass']         = 'Proxy Passwort';
+$lang['proxy____ssl']          = 'SSL bei Verbindung zum Proxy verwenden';
+$lang['proxy____except']       = 'Regulärer Ausdruck um Adressen zu beschreiben, für die kein Proxy verwendet werden soll';
+$lang['safemodehack']          = 'Safemodehack verwenden';
+$lang['ftp____host']           = 'FTP-Host für Safemodehack';
+$lang['ftp____port']           = 'FTP-Port für Safemodehack';
+$lang['ftp____user']           = 'FTP Benutzername für Safemodehack';
+$lang['ftp____pass']           = 'FTP Passwort für Safemodehack';
+$lang['ftp____root']           = 'FTP Wurzelverzeichnis für Safemodehack';
+$lang['license_o_']            = 'Keine gewählt';
+$lang['typography_o_0']        = 'keine';
+$lang['typography_o_1']        = 'ohne einfache Anführungszeichen';
+$lang['typography_o_2']        = 'mit einfachen Anführungszeichen (funktioniert nicht immer)';
+$lang['userewrite_o_0']        = 'keines';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki';
+$lang['deaccent_o_0']          = 'aus';
+$lang['deaccent_o_1']          = 'Akzente und Umlaute umwandeln';
+$lang['deaccent_o_2']          = 'Umschrift';
+$lang['gdlib_o_0']             = 'GD Lib nicht verfügbar';
+$lang['gdlib_o_1']             = 'Version 1.x';
+$lang['gdlib_o_2']             = 'Automatisch finden';
+$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 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';
+$lang['rss_linkto_o_current']  = 'Aktuelle Seite';
+$lang['compression_o_0']       = 'keine';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'nicht benutzen';
+$lang['xsendfile_o_1']         = 'Proprietärer lighttpd-Header (vor Release 1.5)';
+$lang['xsendfile_o_2']         = 'Standard X-Sendfile-Header';
+$lang['xsendfile_o_3']         = 'Proprietärer Nginx X-Accel-Redirect-Header';
+$lang['showuseras_o_loginname'] = 'Login-Name';
+$lang['showuseras_o_username'] = 'Vollständiger Name des Benutzers';
+$lang['showuseras_o_email']    = 'E-Mail-Adresse des Benutzers (je nach Mailguard-Einstellung verschleiert)';
+$lang['showuseras_o_email_link'] = 'E-Mail-Adresse des Benutzers als mailto:-Link';
+$lang['useheading_o_0']        = 'Nie';
+$lang['useheading_o_navigation'] = 'Nur Navigation';
+$lang['useheading_o_content']  = 'Nur Wikiinhalt';
+$lang['useheading_o_1']        = 'Immer';
+$lang['readdircache']          = 'Maximales Alter des readdir-Caches (Sekunden)';
diff --git a/sources/lib/plugins/config/lang/el/intro.txt b/sources/lib/plugins/config/lang/el/intro.txt
new file mode 100644
index 0000000..f106367
--- /dev/null
+++ b/sources/lib/plugins/config/lang/el/intro.txt
@@ -0,0 +1,7 @@
+====== Ρυθμίσεις ======
+
+Χρησιμοποιήστε αυτή την σελίδα για να ρυθμίσετε την λειτουργία του Dokuwiki σας. Για βοήθεια σχετικά με τις ρυθμίσεις δείτε την σελίδα [[doku>config]]. Για περισσότερες λεπτομέρειες σχετικά με αυτή την επέκταση δείτε την σελίδα [[doku>plugin:config]].
+
+Οι ρυθμίσεις που εμφανίζονται σε απαλό κόκκινο φόντο είναι κλειδωμένες και δεν μπορούν να τροποποιηθούν μέσω αυτής της επέκτασης. Οι ρυθμίσεις που εμφανίζονται σε μπλε φόντο είναι οι προεπιλεγμένες ενώ οι ρυθμίσεις που εμφανίζονται σε λευκό φόντο είναι αυτές που διαφέρουν από τις προεπιλεγμένες. Και οι ρυθμίσεις που εμφανίζονται σε μπλε φόντο και οι ρυθμίσεις που εμφανίζονται σε λευκό φόντο μπορούν να τροποποιηθούν.
+
+Θυμηθείτε να επιλέξετε **Αποθήκευση** αφού κάνετε τις αλλαγές που θέλετε.
diff --git a/sources/lib/plugins/config/lang/el/lang.php b/sources/lib/plugins/config/lang/el/lang.php
new file mode 100644
index 0000000..4c24e06
--- /dev/null
+++ b/sources/lib/plugins/config/lang/el/lang.php
@@ -0,0 +1,201 @@
+
+ * @author Thanos Massias 
+ * @author Αθανάσιος Νταής 
+ * @author Konstantinos Koryllos 
+ * @author George Petsagourakis 
+ * @author Petros Vidalis 
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
+ */
+$lang['menu']                  = 'Ρυθμίσεις';
+$lang['error']                 = 'Οι ρυθμίσεις σας δεν έγιναν δεκτές λόγω λανθασμένης τιμής κάποιας ρύθμισης. Διορθώστε την λάθος τιμή και προσπαθήστε ξανά.
+                                      
        Η λανθασμένη τιμή υποδεικνύεται με κόκκινο πλαίσιο.';
+$lang['updated']               = 'Επιτυχής τροποποίηση ρυθμίσεων.';
+$lang['nochoice']              = '(δεν υπάρχουν άλλες διαθέσιμες επιλογές)';
+$lang['locked']                = 'Το αρχείο ρυθμίσεων δεν μπορεί να τροποποιηθεί. 
        Εάν αυτό δεν είναι επιθυμητό, διορθώστε τα δικαιώματα πρόσβασης του αρχείου ρυθμίσεων';
+$lang['danger']                = 'Κίνδυνος: Η αλλαγή αυτής της επιλογής θα μπορούσε να αποτρέψει την πρόσβαση στο wiki και στις ρυθμίσεις του.';
+$lang['warning']               = 'Προσοχή: Η αλλαγή αυτής της επιλογής θα μπορούσε να προκαλέσει ανεπιθύμητη συμπεριφορά.';
+$lang['security']              = 'Προσοχή: Η αλλαγή αυτής της επιλογής θα μπορούσε να προκαλέσει προβλήματα ασφαλείας.';
+$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']            = 'Ρυθμίσεις Anti-Spam';
+$lang['_editing']              = 'Ρυθμίσεις Σύνταξης σελίδων';
+$lang['_links']                = 'Ρυθμίσεις Συνδέσμων';
+$lang['_media']                = 'Ρυθμίσεις Αρχείων';
+$lang['_notifications']        = 'Ρυθμίσεις ενημερώσεων';
+$lang['_syndication']          = 'Ρυθμίσεις σύνδεσης';
+$lang['_advanced']             = 'Ρυθμίσεις για Προχωρημένους';
+$lang['_network']              = 'Ρυθμίσεις Δικτύου';
+$lang['_msg_setting_undefined'] = 'Δεν έχουν οριστεί metadata.';
+$lang['_msg_setting_no_class'] = 'Δεν έχει οριστεί κλάση.';
+$lang['_msg_setting_no_default'] = 'Δεν υπάρχει τιμή εξ ορισμού.';
+$lang['title']                 = 'Τίτλος Wiki';
+$lang['start']                 = 'Ονομασία αρχικής σελίδας';
+$lang['lang']                  = 'Γλώσσα';
+$lang['template']              = 'Πρότυπο προβολής';
+$lang['tagline']               = 'Tagline';
+$lang['sidebar']               = 'Sidebar page name';
+$lang['license']               = 'Κάτω από ποια άδεια θέλετε να δημοσιευτεί το υλικό σας?';
+$lang['savedir']               = 'Φάκελος για την αποθήκευση δεδομένων';
+$lang['basedir']               = 'Αρχικός Φάκελος';
+$lang['baseurl']               = 'Αρχικό URL';
+$lang['cookiedir']             = 'Διαδρομή cookie. Αφήστε την κενή για την χρησιμοποίηση της αρχικής URL.';
+$lang['dmode']                 = 'Δικαιώματα πρόσβασης δημιουργούμενων φακέλων';
+$lang['fmode']                 = 'Δικαιώματα πρόσβασης δημιουργούμενων αρχείων';
+$lang['allowdebug']            = 'Δεδομένα εκσφαλμάτωσης (debug) απενεργοποιήστε τα εάν δεν τα έχετε ανάγκη!';
+$lang['recent']                = 'Αριθμός πρόσφατων αλλαγών ανά σελίδα';
+$lang['recent_days']           = 'Πόσο παλιές αλλαγές να εμφανίζονται (ημέρες)';
+$lang['breadcrumbs']           = 'Αριθμός συνδέσμων ιστορικού';
+$lang['youarehere']            = 'Εμφάνιση ιεραρχικής προβολής τρέχουσας σελίδας';
+$lang['fullpath']              = 'Εμφάνιση πλήρους διαδρομής σελίδας στην υποκεφαλίδα';
+$lang['typography']            = 'Μετατροπή ειδικών χαρακτήρων στο τυπογραφικό ισοδύναμό τους';
+$lang['dformat']               = 'Μορφή ημερομηνίας (βλέπε την strftime function της PHP)';
+$lang['signature']             = 'Υπογραφή';
+$lang['showuseras']            = 'Τι να εμφανίζεται όταν φαίνεται ο χρήστης που τροποποίησε τελευταίος μία σελίδα';
+$lang['toptoclevel']           = 'Ανώτατο επίπεδο πίνακα περιεχομένων σελίδας';
+$lang['tocminheads']           = 'Ελάχιστος αριθμός κεφαλίδων για την δημιουργία πίνακα περιεχομένων - TOC';
+$lang['maxtoclevel']           = 'Μέγιστο επίπεδο για πίνακα περιεχομένων σελίδας';
+$lang['maxseclevel']           = 'Μέγιστο επίπεδο για εμφάνιση της επιλογής τροποποίησης επιπέδου';
+$lang['camelcase']             = 'Χρήση CamelCase στους συνδέσμους';
+$lang['deaccent']              = 'Αφαίρεση σημείων στίξης από ονόματα σελίδων';
+$lang['useheading']            = 'Χρήση κεφαλίδας πρώτου επιπέδου σαν τίτλο συνδέσμων';
+$lang['sneaky_index']          = 'Εξ ορισμού, η εφαρμογή DokuWiki δείχνει όλους τους φακέλους στην προβολή Καταλόγου. Ενεργοποιώντας αυτή την επιλογή, δεν θα εμφανίζονται οι φάκελοι για τους οποίους ο χρήστης δεν έχει δικαιώματα ανάγνωσης αλλά και οι υπο-φάκελοί τους ανεξαρτήτως δικαιωμάτων πρόσβασης.';
+$lang['hidepages']             = 'Φίλτρο απόκρυψης σελίδων (regular expressions)';
+$lang['useacl']                = 'Χρήση Λίστας Δικαιωμάτων Πρόσβασης (ACL)';
+$lang['autopasswd']            = 'Αυτόματη δημιουργία κωδικού χρήστη';
+$lang['authtype']              = 'Τύπος πιστοποίησης στοιχείων χρήστη';
+$lang['passcrypt']             = 'Μέθοδος κρυπτογράφησης κωδικού χρήστη';
+$lang['defaultgroup']          = 'Προεπιλεγμένη ομάδα χρηστών';
+$lang['superuser']             = 'Υπερ-χρήστης - μία ομάδα ή ένας χρήστης με πλήρη δικαιώματα πρόσβασης σε όλες τις σελίδες και όλες τις λειτουργίες ανεξάρτητα από τις ρυθμίσεις των Λιστών Δικαιωμάτων Πρόσβασης (ACL)';
+$lang['manager']               = 'Διαχειριστής - μία ομάδα ή ένας χρήστης με δικαιώματα πρόσβασης σε ορισμένες από τις λειτουργίες της εφαρμογής';
+$lang['profileconfirm']        = 'Να απαιτείται ο κωδικός χρήστη για την επιβεβαίωση αλλαγών στο προφίλ χρήστη';
+$lang['rememberme']            = 'Να επιτρέπονται τα cookies λογαρισμού χρήστη αορίστου χρόνου (Απομνημόνευση στοιχείων λογαριασμού)';
+$lang['disableactions']        = 'Απενεργοποίηση λειτουργιών DokuWiki';
+$lang['disableactions_check']  = 'Έλεγχος';
+$lang['disableactions_subscription'] = 'Εγγραφή/Διαγραφή χρήστη';
+$lang['disableactions_wikicode'] = 'Προβολή κώδικα σελίδας';
+$lang['disableactions_other']  = 'Άλλες λειτουργίες (διαχωρίστε τις με κόμμα)';
+$lang['auth_security_timeout'] = 'Διάρκεια χρόνου για ασφάλεια πιστοποίησης (δευτερόλεπτα)';
+$lang['securecookie']          = 'Τα cookies που έχουν οριστεί μέσω HTTPS πρέπει επίσης να αποστέλλονται μόνο μέσω HTTPS από τον φυλλομετρητή? Απενεργοποιήστε αυτή την επιλογή όταν μόνο η είσοδος στο wiki σας διασφαλίζεται μέσω SSL αλλά η περιήγηση γίνεται και χωρίς αυτό.';
+$lang['remote']                = 'Ενεργοποίησης απομακρυσμένης προγραμματιστικής διεπαφής εφαρμογών (API). Με αυτό τον τρόπο επιτρέπεται η πρόσβαση στο wiki με το XML-RPC ή με άλλα πρωτόκολλα επικοινωνίας.';
+$lang['remoteuser']            = 'Απενεργοποίησης απομακρυσμένης προγραμματιστικής διεπαφής εφαρμογών (API). Αφήστε το κενό για να είναι δυνατή η πρόσβαση στον οποιοδήποτε.';
+$lang['usewordblock']          = 'Χρήστη λίστα απαγορευμένων λέξεων για καταπολέμηση του spam';
+$lang['relnofollow']           = 'Χρήση rel="nofollow"';
+$lang['indexdelay']            = 'Χρόνος αναμονής προτού επιτραπεί σε μηχανές αναζήτησης να ευρετηριάσουν μια τροποποιημένη σελίδα (sec)';
+$lang['mailguard']             = 'Κωδικοποίηση e-mail διευθύνσεων';
+$lang['iexssprotect']          = 'Έλεγχος μεταφορτώσεων για πιθανώς επικίνδυνο κώδικα JavaScript ή HTML';
+$lang['usedraft']              = 'Αυτόματη αποθήκευση αντιγράφων κατά την τροποποίηση σελίδων';
+$lang['htmlok']                = 'Να επιτρέπεται η ενσωμάτωση HTML';
+$lang['phpok']                 = 'Να επιτρέπεται η ενσωμάτωση PHP';
+$lang['locktime']              = 'Μέγιστος χρόνος κλειδώματος αρχείου υπό τροποποίηση (sec)';
+$lang['cachetime']             = 'Μέγιστη ηλικία cache (sec)';
+$lang['target____wiki']        = 'Παράθυρο-στόχος για εσωτερικούς συνδέσμους';
+$lang['target____interwiki']   = 'Παράθυρο-στόχος για συνδέσμους interwiki';
+$lang['target____extern']      = 'Παράθυρο-στόχος για εξωτερικούς σθνδέσμους';
+$lang['target____media']       = 'Παράθυρο-στόχος για συνδέσμους αρχείων';
+$lang['target____windows']     = 'Παράθυρο-στόχος για συνδέσμους σε Windows shares';
+$lang['mediarevisions']        = 'Ενεργοποίηση Mediarevisions;';
+$lang['refcheck']              = 'Πριν τη διαγραφή ενός αρχείου να ελέγχεται η ύπαρξη σελίδων που το χρησιμοποιούν';
+$lang['gdlib']                 = 'Έκδοση βιβλιοθήκης GD';
+$lang['im_convert']            = 'Διαδρομή προς το εργαλείο μετατροπής εικόνων του ImageMagick';
+$lang['jpg_quality']           = 'Ποιότητα συμπίεσης JPG (0-100)';
+$lang['fetchsize']             = 'Μέγιστο μέγεθος (σε bytes) εξωτερικού αρχείου που επιτρέπεται να μεταφέρει η fetch.php';
+$lang['subscribers']           = 'Να επιτρέπεται η εγγραφή στην ενημέρωση αλλαγών σελίδας';
+$lang['subscribe_time']        = 'Χρόνος μετά τον οποίο οι λίστες ειδοποιήσεων και τα συνοπτικά θα αποστέλλονται (δευτερόλεπτα). Αυτό θα πρέπει να είναι μικρότερο από τον χρόνο που έχει η ρύθμιση recent_days.';
+$lang['notify']                = 'Αποστολή ενημέρωσης για αλλαγές σε αυτή την e-mail διεύθυνση';
+$lang['registernotify']        = 'Αποστολή ενημερωτικών μηνυμάτων σε αυτή την e-mail διεύθυνση κατά την εγγραφή νέων χρηστών';
+$lang['mailfrom']              = 'e-mail διεύθυνση αποστολέα για μηνύματα από την εφαρμογή';
+$lang['mailprefix']            = 'Πρόθεμα θέματος που να χρησιμοποιείται για τα αυτόματα μηνύματα ηλεκτρονικού ταχυδρομείου.';
+$lang['htmlmail']              = 'Αποστολή οπτικά καλύτερου, αλλά μεγαλύτερου σε μέγεθος email με χρήση HTML. Απενεργοποιήστε το για αποστέλλονται μόνο email απλού κειμένου.';
+$lang['sitemap']               = 'Δημιουργία Google sitemap (ημέρες)';
+$lang['rss_type']              = 'Τύπος XML feed';
+$lang['rss_linkto']            = 'Τύπος συνδέσμων στο XML feed';
+$lang['rss_content']           = 'Τι να εμφανίζεται στα XML feed items?';
+$lang['rss_update']            = 'Χρόνος ανανέωσης XML feed (sec)';
+$lang['rss_show_summary']      = 'Να εμφανίζεται σύνοψη του XML feed στον τίτλο';
+$lang['rss_media']             = 'Τι είδους αλλαγές πρέπει να εμφανίζονται στο XLM feed;';
+$lang['updatecheck']           = 'Έλεγχος για ύπαρξη νέων εκδόσεων και ενημερώσεων ασφαλείας της εφαρμογής? Απαιτείται η σύνδεση με το update.dokuwiki.org για να λειτουργήσει σωστά αυτή η επιλογή.';
+$lang['userewrite']            = 'Χρήση ωραίων URLs';
+$lang['useslash']              = 'Χρήση slash σαν διαχωριστικό φακέλων στα URLs';
+$lang['sepchar']               = 'Διαχωριστικός χαρακτήρας για κανονικοποίηση ονόματος σελίδας';
+$lang['canonical']             = 'Πλήρη και κανονικοποιημένα URLs';
+$lang['fnencode']              = 'Μέθοδος κωδικοποίησης για ονόματα αρχείων μη-ASCII';
+$lang['autoplural']            = 'Ταίριασμα πληθυντικού στους συνδέσμους';
+$lang['compression']           = 'Μέθοδος συμπίεσης για αρχεία attic';
+$lang['gzip_output']           = 'Χρήση gzip Content-Encoding για την xhtml';
+$lang['compress']              = 'Συμπίεση αρχείων CSS και javascript';
+$lang['cssdatauri']            = 'Το μέγεθος σε bytes στο οποίο οι εικόνες που αναφέρονται σε CSS αρχεία θα πρέπει να είναι ενσωματωμένες για τη μείωση των απαιτήσεων μιας κεφαλίδας αίτησης HTTP . Αυτή η τεχνική δεν θα λειτουργήσει σε IE <8!  400  με  600  bytes είναι μια καλή τιμή. Ορίστε την τιμή  0  για να το απενεργοποιήσετε.';
+$lang['send404']               = 'Αποστολή "HTTP 404/Page Not Found" για σελίδες που δεν υπάρχουν';
+$lang['broken_iua']            = 'Η συνάρτηση ignore_user_abort δεν λειτουργεί σωστά στο σύστημά σας? Σε αυτή την περίπτωση μπορεί να μην δουλεύει σωστά η λειτουργία Καταλόγου. Ο συνδυασμός IIS+PHP/CGI είναι γνωστό ότι έχει τέτοιο πρόβλημα. Δείτε και Bug 852 για λεπτομέρειες.';
+$lang['xsendfile']             = 'Χρήση της κεφαλίδας X-Sendfile από τον εξυπηρετητή κατά την φόρτωση στατικών αρχείων? Ο εξυπηρετητής σας πρέπει να υποστηρίζει αυτή την δυνατότητα.';
+$lang['renderer_xhtml']        = 'Πρόγραμμα δημιουργίας βασικής (xhtml) εξόδου wiki.';
+$lang['renderer__core']        = '%s (βασικός κώδικας dokuwiki)';
+$lang['renderer__plugin']      = '%s (επέκταση)';
+$lang['dnslookups']            = 'Το DokuWiki θα ψάξει τα ονόματα υπολογιστών που αντιστοιχούν σε διευθύνσεις IP των χρηστών που γράφουν στις σελίδες. Αν ο DNS είναι αργός, δεν δουλεύει ή δεν χρειάζεστε αυτή την λειτουργία, απενεργοποιήστε την.';
+$lang['proxy____host']         = 'Διακομιστής Proxy';
+$lang['proxy____port']         = 'Θύρα Proxy';
+$lang['proxy____user']         = 'Όνομα χρήστη Proxy';
+$lang['proxy____pass']         = 'Κωδικός χρήστη Proxy';
+$lang['proxy____ssl']          = 'Χρήση ssl για σύνδεση με διακομιστή Proxy';
+$lang['proxy____except']       = 'Regular expression για να πιάνει τα URLs για τα οποία θα παρακάμπτεται το proxy.';
+$lang['safemodehack']          = 'Ενεργοποίηση safemode hack';
+$lang['ftp____host']           = 'Διακομιστής FTP για safemode hack';
+$lang['ftp____port']           = 'Θύρα FTP για safemode hack';
+$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['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 στο σύστημα';
+$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_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = 'Περίληψη';
+$lang['rss_content_o_diff']    = 'Ενοποιημένο Diff';
+$lang['rss_content_o_htmldiff'] = 'HTML διαμορφωμένος πίνακας diff';
+$lang['rss_content_o_html']    = 'Περιεχόμενο Σελίδας μόνο με HTML';
+$lang['rss_linkto_o_diff']     = 'προβολή αλλαγών';
+$lang['rss_linkto_o_page']     = 'τροποποιημένη σελίδα';
+$lang['rss_linkto_o_rev']      = 'εκδόσεις σελίδας';
+$lang['rss_linkto_o_current']  = 'τρέχουσα σελίδα';
+$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']        = 'Πάντα';
+$lang['readdircache']          = 'Μέγιστος χρόνος διατήρησης για το cache του readdir (δευτερόλεπτα)';
diff --git a/sources/lib/plugins/config/lang/en/intro.txt b/sources/lib/plugins/config/lang/en/intro.txt
new file mode 100644
index 0000000..7cf46ce
--- /dev/null
+++ b/sources/lib/plugins/config/lang/en/intro.txt
@@ -0,0 +1,9 @@
+====== Configuration Manager ======
+
+Use this page to control the settings of your DokuWiki installation.  For help on individual settings refer to [[doku>config]]. For more details about this plugin see [[doku>plugin:config]].
+
+Settings shown with a light red background are protected and can not be altered with this plugin. Settings shown with a blue background are the default values and settings shown with a white background have been set locally for this particular installation.  Both blue and white settings can be altered.
+
+Remember to press the **Save** button before leaving this page otherwise your changes will be lost.
+
+
diff --git a/sources/lib/plugins/config/lang/en/lang.php b/sources/lib/plugins/config/lang/en/lang.php
new file mode 100644
index 0000000..cdef85a
--- /dev/null
+++ b/sources/lib/plugins/config/lang/en/lang.php
@@ -0,0 +1,259 @@
+
+ * @author     Matthias Schulte 
+ */
+
+// 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']       = 'Configuration Settings';
+
+$lang['error']      = 'Settings not updated due to an invalid value, please review your changes and resubmit.
+                       
        The incorrect value(s) will be shown surrounded by a red border.';
+$lang['updated']    = 'Settings updated successfully.';
+$lang['nochoice']   = '(no other choices available)';
+$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';
+$lang['_header_plugin'] = 'Plugin';
+$lang['_header_template'] = 'Template';
+$lang['_header_undefined'] = 'Undefined Settings';
+
+/* --- Config Setting Groups --- */
+$lang['_basic'] = 'Basic';
+$lang['_display'] = 'Display';
+$lang['_authentication'] = 'Authentication';
+$lang['_anti_spam'] = 'Anti-Spam';
+$lang['_editing'] = 'Editing';
+$lang['_links'] = 'Links';
+$lang['_media'] = 'Media';
+$lang['_notifications'] = 'Notification';
+$lang['_syndication']   = 'Syndication (RSS)';
+$lang['_advanced'] = 'Advanced';
+$lang['_network'] = 'Network';
+
+/* --- Undefined Setting Messages --- */
+$lang['_msg_setting_undefined'] = 'No setting metadata.';
+$lang['_msg_setting_no_class'] = 'No setting class.';
+$lang['_msg_setting_no_default'] = 'No default value.';
+
+/* -------------------- Config Options --------------------------- */
+
+/* Basic Settings */
+$lang['title']       = 'Wiki title aka. your wiki\'s name';
+$lang['start']       = 'Page name to use as the starting point for each namespace';
+$lang['lang']        = 'Interface language';
+$lang['template']    = 'Template aka. the design of the wiki.';
+$lang['tagline']     = 'Tagline (if template supports it)';
+$lang['sidebar']     = 'Sidebar page name (if template supports it), empty field disables the sidebar';
+$lang['license']     = 'Under which license should your content be released?';
+$lang['savedir']     = 'Directory for saving data';
+$lang['basedir']     = 'Server path (eg. /dokuwiki/). Leave blank for autodetection.';
+$lang['baseurl']     = 'Server URL (eg. http://www.yourserver.com). Leave blank for autodetection.';
+$lang['cookiedir']   = 'Cookie path. Leave blank for using baseurl.';
+$lang['dmode']       = 'Directory creation mode';
+$lang['fmode']       = 'File creation mode';
+$lang['allowdebug']  = 'Allow debug. Disable if not needed!';
+
+/* Display Settings */
+$lang['recent']      = 'Number of entries per page in the recent changes';
+$lang['recent_days'] = 'How many recent changes to keep (days)';
+$lang['breadcrumbs'] = 'Number of "trace" breadcrumbs. Set to 0 to disable.';
+$lang['youarehere']  = 'Use hierarchical breadcrumbs (you probably want to disable the above option then)';
+$lang['fullpath']    = 'Reveal full path of pages in the footer';
+$lang['typography']  = 'Do typographical replacements';
+$lang['dformat']     = 'Date format (see PHP\'s strftime function)';
+$lang['signature']   = 'What to insert with the signature button in the editor';
+$lang['showuseras']  = 'What to display when showing the user that last edited a page';
+$lang['toptoclevel'] = 'Top level for table of contents';
+$lang['tocminheads'] = 'Minimum amount of headlines that determines whether the TOC is built';
+$lang['maxtoclevel'] = 'Maximum level for table of contents';
+$lang['maxseclevel'] = 'Maximum section edit level';
+$lang['camelcase']   = 'Use CamelCase for links';
+$lang['deaccent']    = 'How to clean pagenames';
+$lang['useheading']  = 'Use first heading for pagenames';
+$lang['sneaky_index'] = 'By default, DokuWiki will show all namespaces in the sitemap. Enabling this option will hide those where the user doesn\'t have read permissions. This might result in hiding of accessable subnamespaces which may make the index unusable with certain ACL setups.';
+$lang['hidepages']   = 'Hide pages matching this regular expression from search, the sitemap and other automatic indexes';
+
+/* Authentication Settings */
+$lang['useacl']      = 'Use access control lists';
+$lang['autopasswd']  = 'Autogenerate passwords';
+$lang['authtype']    = 'Authentication backend';
+$lang['passcrypt']   = 'Password encryption method';
+$lang['defaultgroup']= 'Default group, all new users will be placed in this group';
+$lang['superuser']   = 'Superuser - group, user or comma separated list user1,@group1,user2 with full access to all pages and functions regardless of the ACL settings';
+$lang['manager']     = 'Manager - group, user or comma separated list user1,@group1,user2 with access to certain management functions';
+$lang['profileconfirm'] = 'Confirm profile changes with password';
+$lang['rememberme'] = 'Allow permanent login cookies (remember me)';
+$lang['disableactions'] = 'Disable DokuWiki actions';
+$lang['disableactions_check'] = 'Check';
+$lang['disableactions_subscription'] = 'Subscribe/Unsubscribe';
+$lang['disableactions_wikicode'] = 'View source/Export Raw';
+$lang['disableactions_profile_delete'] = 'Delete Own Account';
+$lang['disableactions_other'] = 'Other actions (comma separated)';
+$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['remote']      = 'Enable the remote API system. This allows other applications to access the wiki via XML-RPC or other mechanisms.';
+$lang['remoteuser']  = 'Restrict remote API access to the comma separated groups or users given here. Leave empty to give access to everyone.';
+
+/* Anti-Spam Settings */
+$lang['usewordblock']= 'Block spam based on wordlist';
+$lang['relnofollow'] = 'Use rel="nofollow" on external links';
+$lang['indexdelay']  = 'Time delay before indexing (sec)';
+$lang['mailguard']   = 'Obfuscate email addresses';
+$lang['iexssprotect']= 'Check uploaded files for possibly malicious JavaScript or HTML code';
+
+/* Editing Settings */
+$lang['usedraft']    = 'Automatically save a draft while editing';
+$lang['htmlok']      = 'Allow embedded HTML';
+$lang['phpok']       = 'Allow embedded PHP';
+$lang['locktime']    = 'Maximum age for lock files (sec)';
+$lang['cachetime']   = 'Maximum age for cache (sec)';
+
+/* Link settings */
+$lang['target____wiki']      = 'Target window for internal links';
+$lang['target____interwiki'] = 'Target window for interwiki links';
+$lang['target____extern']    = 'Target window for external links';
+$lang['target____media']     = 'Target window for media links';
+$lang['target____windows']   = 'Target window for windows links';
+
+/* Media Settings */
+$lang['mediarevisions'] = 'Enable Mediarevisions?';
+$lang['refcheck']    = 'Check if a media file is still in use before deleting it';
+$lang['gdlib']       = 'GD Lib version';
+$lang['im_convert']  = 'Path to ImageMagick\'s convert tool';
+$lang['jpg_quality'] = 'JPG compression quality (0-100)';
+$lang['fetchsize']   = 'Maximum size (bytes) fetch.php may download from external URLs, eg. to cache and resize external images.';
+
+/* Notification Settings */
+$lang['subscribers'] = 'Allow users to subscribe to page changes by email';
+$lang['subscribe_time'] = 'Time after which subscription lists and digests are sent (sec); This should be smaller than the time specified in recent_days.';
+$lang['notify']      = 'Always send change notifications to this email address';
+$lang['registernotify'] = 'Always send info on newly registered users to this email address';
+$lang['mailfrom']    = 'Sender email address to use for automatic mails';
+$lang['mailprefix']  = 'Email subject prefix to use for automatic mails. Leave blank to use the wiki title';
+$lang['htmlmail']    = 'Send better looking, but larger in size HTML multipart emails. Disable for plain text only mails.';
+
+/* Syndication Settings */
+$lang['sitemap']     = 'Generate Google sitemap this often (in days). 0 to disable';
+$lang['rss_type']    = 'XML feed type';
+$lang['rss_linkto']  = 'XML feed links to';
+$lang['rss_content'] = 'What to display in the XML feed items?';
+$lang['rss_update']  = 'XML feed update interval (sec)';
+$lang['rss_show_summary'] = 'XML feed show summary in title';
+$lang['rss_media']   = 'What kind of changes should be listed in the XML feed?';
+
+/* Advanced Options */
+$lang['updatecheck'] = 'Check for updates and security warnings? DokuWiki needs to contact update.dokuwiki.org for this feature.';
+$lang['userewrite']  = 'Use nice URLs';
+$lang['useslash']    = 'Use slash as namespace separator in URLs';
+$lang['sepchar']     = 'Page name word separator';
+$lang['canonical']   = 'Use fully canonical URLs';
+$lang['fnencode']    = 'Method for encoding non-ASCII filenames.';
+$lang['autoplural']  = 'Check for plural forms in links';
+$lang['compression'] = 'Compression method for attic files';
+$lang['gzip_output'] = 'Use gzip Content-Encoding for xhtml';
+$lang['compress']    = 'Compact CSS and javascript output';
+$lang['cssdatauri']  = 'Size in bytes up to which images referenced in CSS files should be embedded right into the stylesheet to reduce HTTP request header overhead. This technique won\'t work in IE 7 and below! 400 to 600 bytes is a good value. Set 0 to disable.';
+$lang['send404']     = 'Send "HTTP 404/Page Not Found" for non existing pages';
+$lang['broken_iua']  = 'Is the ignore_user_abort function broken on your system? This could cause a non working search index. IIS+PHP/CGI is known to be broken. See Bug 852 for more info.';
+$lang['xsendfile']   = 'Use the X-Sendfile header to let the webserver deliver static files? Your webserver needs to support this.';
+$lang['renderer_xhtml']   = 'Renderer to use for main (xhtml) wiki output';
+$lang['renderer__core']   = '%s (dokuwiki core)';
+$lang['renderer__plugin'] = '%s (plugin)';
+
+/* Network Options */
+$lang['dnslookups'] = 'DokuWiki will lookup hostnames for remote IP addresses of users editing pages. If you have a slow or non working DNS server or don\'t want this feature, disable this option';
+
+/* Proxy Options */
+$lang['proxy____host']    = 'Proxy servername';
+$lang['proxy____port']    = 'Proxy port';
+$lang['proxy____user']    = 'Proxy user name';
+$lang['proxy____pass']    = 'Proxy password';
+$lang['proxy____ssl']     = 'Use SSL to connect to proxy';
+$lang['proxy____except']  = 'Regular expression to match URLs for which the proxy should be skipped.';
+
+/* Safemode Hack */
+$lang['safemodehack'] = 'Enable safemode hack';
+$lang['ftp____host'] = 'FTP server for safemode hack';
+$lang['ftp____port'] = 'FTP port for safemode hack';
+$lang['ftp____user'] = 'FTP user name for safemode hack';
+$lang['ftp____pass'] = 'FTP password for safemode hack';
+$lang['ftp____root'] = 'FTP root directory for safemode hack';
+
+/* License Options */
+$lang['license_o_'] = 'None chosen';
+
+/* typography options */
+$lang['typography_o_0'] = 'none';
+$lang['typography_o_1'] = 'excluding single quotes';
+$lang['typography_o_2'] = 'including single quotes (might not always work)';
+
+/* userewrite options */
+$lang['userewrite_o_0'] = 'none';
+$lang['userewrite_o_1'] = '.htaccess';
+$lang['userewrite_o_2'] = 'DokuWiki internal';
+
+/* deaccent options */
+$lang['deaccent_o_0'] = 'off';
+$lang['deaccent_o_1'] = 'remove accents';
+$lang['deaccent_o_2'] = 'romanize';
+
+/* gdlib options */
+$lang['gdlib_o_0'] = 'GD Lib not available';
+$lang['gdlib_o_1'] = 'Version 1.x';
+$lang['gdlib_o_2'] = 'Autodetection';
+
+/* rss_type options */
+$lang['rss_type_o_rss']   = 'RSS 0.91';
+$lang['rss_type_o_rss1']  = 'RSS 1.0';
+$lang['rss_type_o_rss2']  = 'RSS 2.0';
+$lang['rss_type_o_atom']  = 'Atom 0.3';
+$lang['rss_type_o_atom1'] = 'Atom 1.0';
+
+/* rss_content options */
+$lang['rss_content_o_abstract'] = 'Abstract';
+$lang['rss_content_o_diff']     = 'Unified Diff';
+$lang['rss_content_o_htmldiff'] = 'HTML formatted diff table';
+$lang['rss_content_o_html']     = 'Full HTML page content';
+
+/* rss_linkto options */
+$lang['rss_linkto_o_diff']    = 'difference view';
+$lang['rss_linkto_o_page']    = 'the revised page';
+$lang['rss_linkto_o_rev']     = 'list of revisions';
+$lang['rss_linkto_o_current'] = 'the current page';
+
+/* compression options */
+$lang['compression_o_0']   = 'none';
+$lang['compression_o_gz']  = 'gzip';
+$lang['compression_o_bz2'] = 'bz2';
+
+/* xsendfile header */
+$lang['xsendfile_o_0'] = "don't use";
+$lang['xsendfile_o_1'] = 'Proprietary lighttpd header (before release 1.5)';
+$lang['xsendfile_o_2'] = 'Standard X-Sendfile header';
+$lang['xsendfile_o_3'] = 'Proprietary Nginx X-Accel-Redirect header';
+
+/* Display user info */
+$lang['showuseras_o_loginname']  = 'Login name';
+$lang['showuseras_o_username']   = "User's full name";
+$lang['showuseras_o_email']      = "User's e-mail addresss (obfuscated according to mailguard setting)";
+$lang['showuseras_o_email_link'] = "User's e-mail addresss as a mailto: link";
+
+/* useheading options */
+$lang['useheading_o_0'] = 'Never';
+$lang['useheading_o_navigation'] = 'Navigation Only';
+$lang['useheading_o_content'] = 'Wiki Content Only';
+$lang['useheading_o_1'] = 'Always';
+
+$lang['readdircache'] = 'Maximum age for readdir cache (sec)';
diff --git a/sources/lib/plugins/config/lang/eo/intro.txt b/sources/lib/plugins/config/lang/eo/intro.txt
new file mode 100644
index 0000000..5ed2f0e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/eo/intro.txt
@@ -0,0 +1,7 @@
+====== Administrilo de Agordoj ======
+
+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 helruĝ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 iam difiniĝis por tiu ĉi specifa instalo. Ambaŭ blua kaj blanka difinoj povas esti modifataj.
+
+Memoru premi la butonon **Registri** antaŭ ol eliri tiun ĉi paĝon, male viaj modifoj perdiĝus.
diff --git a/sources/lib/plugins/config/lang/eo/lang.php b/sources/lib/plugins/config/lang/eo/lang.php
new file mode 100644
index 0000000..440d771
--- /dev/null
+++ b/sources/lib/plugins/config/lang/eo/lang.php
@@ -0,0 +1,199 @@
+
+ * @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: bonvolu revizii viajn ŝanĝojn kaj resubmeti ilin.
+
        La malkorekta(j) valoro(j) estas ĉirkaŭita(j) de ruĝa kadro.';
+$lang['updated']               = 'La difinoj sukcese ĝisdatiĝis.';
+$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['danger']                = 'Danĝero: ŝanĝi 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 aŭdvidaĵoj';
+$lang['_notifications']        = 'Sciigaj agordoj';
+$lang['_syndication']          = 'Kunhavigaj agordoj';
+$lang['_advanced']             = 'Fakaj difinoj';
+$lang['_network']              = 'Difinoj por reto';
+$lang['_msg_setting_undefined'] = 'Neniu difinanta metadatumaro.';
+$lang['_msg_setting_no_class'] = 'Neniu difinanta klaso.';
+$lang['_msg_setting_no_default'] = 'Neniu apriora valoro.';
+$lang['title']                 = 'Titolo de la vikio';
+$lang['start']                 = 'Nomo de la hejmpaĝo';
+$lang['lang']                  = 'Lingvo';
+$lang['template']              = 'Ŝablono';
+$lang['tagline']               = 'Moto (se la ŝablono antaûvidas tion)';
+$lang['sidebar']               = 'Nomo de la flanka paĝo  (se la ŝablono antaûvidas tion), malplena kampo malebligas la flankan paĝon';
+$lang['license']               = 'Laŭ kiu permesilo via enhavo devus esti publikigita?';
+$lang['savedir']               = 'Dosierujo por konservi datumaron';
+$lang['basedir']               = 'Baza dosierujo';
+$lang['baseurl']               = 'Baza URL';
+$lang['cookiedir']             = 'Kuketopado. Lasu malplena por uzi baseurl.';
+$lang['dmode']                 = 'Reĝimo de dosierujo-kreado';
+$lang['fmode']                 = 'Reĝimo de dosiero-kreado';
+$lang['allowdebug']            = 'Ebligi kodumpurigadon malebligu se ne necese!<;/b>';
+$lang['recent']                = 'Freŝaj ŝanĝoj';
+$lang['recent_days']           = 'Kiom da freŝaj ŝanĝoj por teni (tagoj)';
+$lang['breadcrumbs']           = 'Nombro da paderoj';
+$lang['youarehere']            = 'Hierarkiaj paderoj';
+$lang['fullpath']              = 'Montri la kompletan padon de la paĝoj en la piedlinio';
+$lang['typography']            = 'Fari tipografiajn anstataŭigojn';
+$lang['dformat']               = 'Formato de datoj (vidu la PHP-an funkcion strftime)';
+$lang['signature']             = 'Subskribo';
+$lang['showuseras']            = 'Kiel indiki la lastan redaktinton';
+$lang['toptoclevel']           = 'Supera nivelo por la enhavtabelo';
+$lang['tocminheads']           = 'Minimuma kvanto da ĉeftitoloj, kiu difinas ĉu la TOC estas kreata.';
+$lang['maxtoclevel']           = 'Maksimuma nivelo por la enhavtabelo';
+$lang['maxseclevel']           = 'Maksimuma nivelo por redakti sekciojn';
+$lang['camelcase']             = 'Uzi KamelUsklecon por ligiloj';
+$lang['deaccent']              = 'Netaj paĝnomoj';
+$lang['useheading']            = 'Uzi unuan titolon por paĝnomoj';
+$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. Tiel la indekso estus neuzebla por kelkaj agordoj de ACL.';
+$lang['hidepages']             = 'Kaŝi kongruantajn paĝojn (laŭ regulaj esprimoj)';
+$lang['useacl']                = 'Uzi alirkontrolajn listojn';
+$lang['autopasswd']            = 'Aŭtomate krei pasvortojn';
+$lang['authtype']              = 'Tipo de identiĝo';
+$lang['passcrypt']             = 'Metodo por ĉifri pasvortojn';
+$lang['defaultgroup']          = 'Antaŭdifinita grupo';
+$lang['superuser']             = 'Superanto - grupo, uzanto aŭ listo (disigita 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['rememberme']            = 'Permesi longdaŭran ensalutajn kuketojn (rememoru min)';
+$lang['disableactions']        = 'Malebligi DokuWiki-ajn agojn';
+$lang['disableactions_check']  = 'Kontroli';
+$lang['disableactions_subscription'] = 'Aliĝi/Malaliĝi';
+$lang['disableactions_wikicode'] = 'Rigardi vikitekston/Eksporti fontotekston';
+$lang['disableactions_other']  = 'Aliaj agoj (disigita per komoj)';
+$lang['auth_security_timeout'] = 'Sekureca tempolimo por aŭtentigo (sekundoj)';
+$lang['securecookie']          = 'Ĉu kuketoj difinitaj per HTTPS sendiĝu de la foliumilo nur 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['remote']                = 'Ebligu la traretan API-sistemon. Tio ebligas al aliaj aplikaĵoj aliri la vikion pere de XML-RPC aũ aliaj mekanismoj.';
+$lang['remoteuser']            = 'Limigi traretan API-aliron al la komodisigitaj grupoj aũ uzantoj indikitaj jene. Lasu malplena por ebligi aliron al ĉiu ajn.';
+$lang['usewordblock']          = 'Bloki spamon surbaze de vortlisto';
+$lang['relnofollow']           = 'Uzi rel="nofollow" kun eksteraj ligiloj';
+$lang['indexdelay']            = 'Prokrasto antaŭ ol indeksi (en sekundoj)';
+$lang['mailguard']             = 'Nebuligi retadresojn';
+$lang['iexssprotect']          = 'Ekzameni elŝutaĵojn kontraŭ eblaj malicaj ĴavaSkripto aŭ HTML-a kodumaĵo';
+$lang['usedraft']              = 'Aŭtomate konservi skizon dum redaktado';
+$lang['htmlok']                = 'Ebligi enmeton de HTML-aĵoj';
+$lang['phpok']                 = 'Ebligi enmeton de PHP-aĵoj';
+$lang['locktime']              = 'Maksimuma aĝo por serurdosieroj (sek.)';
+$lang['cachetime']             = 'Maksimuma aĝo por provizmemoro (sek.)';
+$lang['target____wiki']        = 'Parametro "target" (celo) por internaj ligiloj';
+$lang['target____interwiki']   = 'Parametro "target" (celo) por intervikiaj ligiloj';
+$lang['target____extern']      = 'Parametro "target" (celo) por eksteraj ligiloj';
+$lang['target____media']       = 'Parametro "target" (celo) por aŭdvidaĵaj ligiloj';
+$lang['target____windows']     = 'Parametro "target" (celo) por Vindozaj ligiloj';
+$lang['mediarevisions']        = 'Ĉu ebligi reviziadon de aŭdvidaĵoj?';
+$lang['refcheck']              = 'Kontrolo por referencoj al aŭdvidaĵoj';
+$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['fetchsize']             = 'Maksimuma grandeco (bitokoj), kiun fetch.php rajtas elŝuti el ekstere';
+$lang['subscribers']           = 'Ebligi subtenon de avizoj pri ŝanĝoj sur paĝoj';
+$lang['subscribe_time']        = 'Tempo, post kiu abonlistoj kaj kolektaĵoj sendiĝas (sek); Tio estu pli malgranda ol la tempo indikita en recent_days.';
+$lang['notify']                = 'Sendi avizojn pri ŝanĝoj al tiu ĉi retadreso';
+$lang['registernotify']        = 'Sendi informon pri ĵusaj aliĝintoj al tiu ĉi retadreso';
+$lang['mailfrom']              = 'Retadreso uzota por aŭtomataj retmesaĝoj ';
+$lang['mailprefix']            = 'Retpoŝta temo-prefikso por uzi en aŭtomataj mesaĝoj';
+$lang['htmlmail']              = 'Sendi pli bele aspektajn, sed pli grandajn plurpartajn HTML-retpoŝtaĵojn. Malebligu por ricevi pure tekstajn mesaĝojn.';
+$lang['sitemap']               = 'Krei Guglan paĝarmapon "sitemap" (po kiom tagoj)';
+$lang['rss_type']              = 'XML-a tipo de novaĵ-fluo';
+$lang['rss_linkto']            = 'La novaĵ-fluo de XML ligiĝas al';
+$lang['rss_content']           = 'Kion montri en la XML-aj novaĵ-flueroj?';
+$lang['rss_update']            = 'Intertempo por ĝisdatigi XML-an novaĵ-fluon (sek.)';
+$lang['rss_show_summary']      = 'XML-a novaĵ-fluo montras resumon en la titolo';
+$lang['rss_media']             = 'Kiaj ŝangoj estu montrataj en la XML-fluo?';
+$lang['updatecheck']           = 'Ĉu kontroli aktualigojn kaj sekurecajn avizojn? DokuWiki bezonas kontakti update.dokuwiki.org por tiu ĉi trajto.';
+$lang['userewrite']            = 'Uzi netajn URL-ojn';
+$lang['useslash']              = 'Uzi frakcistrekon kiel disigsignaĵon por nomspacoj en URL-oj';
+$lang['sepchar']               = 'Disigsignaĵo de vortoj en paĝnomoj';
+$lang['canonical']             = 'Uzi tute evidentajn URL-ojn';
+$lang['fnencode']              = 'Kodiga metodo por ne-ASCII-aj dosiernomoj.';
+$lang['autoplural']            = 'Kontroli pluralajn formojn en ligiloj';
+$lang['compression']           = 'Kompaktigmetodo por arkivaj dosieroj';
+$lang['gzip_output']           = 'Uzi gzip-an enhav-enkodigon por XHTML';
+$lang['compress']              = 'Kompaktigi CSS-ajn kaj ĵavaskriptajn elmetojn';
+$lang['cssdatauri']            = 'Grandeco en bitokoj, ĝis kiom en CSS-dosieroj referencitaj bildoj enmetiĝu rekte en la stilfolion por malgrandigi vanan HTTP-kapan trafikon. Tiu tekniko ne funkcias en IE 7 aŭ pli frua!
+400 ĝis 600 bitokoj estas bona grandeco. Indiku 0 por malebligi enmeton.';
+$lang['send404']               = 'Sendi la mesaĝon "HTTP 404/Paĝo ne trovita" por ne ekzistantaj paĝoj';
+$lang['broken_iua']            = 'Ĉu la funkcio "ignore_user_abort" difektas en via sistemo? Tio povus misfunkciigi la serĉindekson. IIS+PHP/CGI estas konata kiel fuŝaĵo. Vidu Cimon 852 por pli da informoj.';
+$lang['xsendfile']             = 'Ĉu uzi la kaplinion X-Sendfile por ebligi al la retservilo liveri fiksajn dosierojn? Via retservilo subtenu tion.';
+$lang['renderer_xhtml']        = 'Prezentilo por la ĉefa vikia rezulto (xhtml)';
+$lang['renderer__core']        = '%s (DokuWiki-a kerno)';
+$lang['renderer__plugin']      = '%s (kromaĵo)';
+$lang['dnslookups']            = 'DokuWiki rigardos servilajn nomojn por paĝmodifoj tra fremdaj IP-adresoj. Se vi havas malrapidan aũ nefunkciantan DNS-servilon aũ malŝatas tiun trajton, malebligu tiun opcion';
+$lang['proxy____host']         = 'Retservilnomo 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['proxy____except']       = 'Regula esprimo por URL-oj, kiujn la servilo preterrigardu.';
+$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 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 elektita';
+$lang['typography_o_0']        = 'nenio';
+$lang['typography_o_1']        = 'Nur duoblaj citiloj';
+$lang['typography_o_2']        = 'Ĉiaj citiloj (eble ne ĉiam funkcios)';
+$lang['userewrite_o_0']        = 'nenio';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'Interne de DokuWiki';
+$lang['deaccent_o_0']          = 'ne';
+$lang['deaccent_o_1']          = 'forigi supersignojn';
+$lang['deaccent_o_2']          = 'latinigi';
+$lang['gdlib_o_0']             = 'GD-Lib ne disponeblas';
+$lang['gdlib_o_1']             = 'Versio 1.x';
+$lang['gdlib_o_2']             = 'Aŭtomata detekto';
+$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'] = 'Resumo';
+$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';
+$lang['rss_linkto_o_page']     = 'la reviziita paĝo';
+$lang['rss_linkto_o_rev']      = 'listo de revizioj';
+$lang['rss_linkto_o_current']  = 'la aktuala paĝo';
+$lang['compression_o_0']       = 'nenio';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'ne uzi';
+$lang['xsendfile_o_1']         = 'Propra kaplinio "lighttpd" (antaŭ versio 1.5)';
+$lang['xsendfile_o_2']         = 'Ordinara kaplinio X-Sendfile';
+$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 nebuligo)';
+$lang['showuseras_o_email_link'] = 'Retadreso de uzanto kiel mailto:-ligilo';
+$lang['useheading_o_0']        = 'Neniam';
+$lang['useheading_o_navigation'] = 'Nur foliumado';
+$lang['useheading_o_content']  = 'Nur vikia enhavo';
+$lang['useheading_o_1']        = 'Ĉiam';
+$lang['readdircache']          = 'Maksimuma daŭro de la dosieruja kaŝmemoro (sekundoj)';
diff --git a/sources/lib/plugins/config/lang/es/intro.txt b/sources/lib/plugins/config/lang/es/intro.txt
new file mode 100644
index 0000000..0b42c6b
--- /dev/null
+++ b/sources/lib/plugins/config/lang/es/intro.txt
@@ -0,0 +1,7 @@
+====== Administrador de configuración ======
+
+Usa esta página para controlar los parámetros de tu instalación de Dokuwiki. Ayuda sobre [[doku>config|parámetros individuales]]. Más detalles sobre este [[doku>plugin:config|plugin]].
+
+Los parámetros que se muestran sobre un fondo rosado están protegidos y no pueden ser modificados usando este plugin. Los parámetros que se muestran sobre un fondo azul tienen los valores por defecto, y los parámetros mostrados sobre un fondo blanco han sido establecidos para esta instalación en particular. Tanto los parámetros sobre fondo azul y los que están sobre fondo blanco pueden ser modificados.
+
+Recuerda cliquear el boton **Guardar** antes de abandonar la página, sino se perderán los cambios que hayas hecho.
diff --git a/sources/lib/plugins/config/lang/es/lang.php b/sources/lib/plugins/config/lang/es/lang.php
new file mode 100644
index 0000000..847b326
--- /dev/null
+++ b/sources/lib/plugins/config/lang/es/lang.php
@@ -0,0 +1,211 @@
+
+ * @author Oscar M. Lage 
+ * @author Gabriel Castillo 
+ * @author oliver@samera.com.py
+ * @author Enrico Nicoletto 
+ * @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 
+ * @author Victor Castelan 
+ * @author Mauro Javier Giamberardino 
+ * @author emezeta 
+ * @author Oscar Ciudad 
+ * @author Ruben Figols 
+ * @author Gerardo Zamudio 
+ * @author Mercè López mercelz@gmail.com
+ */
+$lang['menu']                  = 'Parámetros de configuración';
+$lang['error']                 = 'Los parámetros no han sido actualizados a causa de un valor inválido, por favor revise los cambios y re-envíe el formulario. 
         Los valores incorrectos se mostrarán con un marco rojo alrededor.';
+$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';
+$lang['_header_template']      = 'Parámetros de Plantillas';
+$lang['_header_undefined']     = 'Parámetros sin categoría';
+$lang['_basic']                = 'Parámetros Básicos';
+$lang['_display']              = 'Parámetros de Presentación';
+$lang['_authentication']       = 'Parámetros de Autenticación';
+$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 Medios';
+$lang['_notifications']        = 'Configuración de notificaciones';
+$lang['_syndication']          = 'Configuración de sindicación';
+$lang['_advanced']             = 'Parámetros Avanzados';
+$lang['_network']              = 'Parámetros de Red';
+$lang['_msg_setting_undefined'] = 'Sin parámetros de metadata.';
+$lang['_msg_setting_no_class'] = 'Sin clase establecida.';
+$lang['_msg_setting_no_default'] = 'Sin valor por defecto.';
+$lang['title']                 = 'Título del wiki';
+$lang['start']                 = 'Nombre de la página inicial';
+$lang['lang']                  = 'Idioma';
+$lang['template']              = 'Plantilla';
+$lang['tagline']               = 'Lema (si la plantilla lo soporta)';
+$lang['sidebar']               = 'Nombre de la barra lateral (si la plantilla lo soporta), un campo vacío la desactiva';
+$lang['license']               = '¿Bajo qué licencia será liberado tu contenido?';
+$lang['savedir']               = 'Directorio para guardar los datos';
+$lang['basedir']               = 'Directorio de base';
+$lang['baseurl']               = 'URL de base';
+$lang['cookiedir']             = 'Ruta para las Cookie. Dejar en blanco para usar la ruta básica.';
+$lang['dmode']                 = 'Modo de creación de directorios';
+$lang['fmode']                 = 'Modo de creación de ficheros';
+$lang['allowdebug']            = 'Permitir debug deshabilítelo si no lo necesita!';
+$lang['recent']                = 'Cambios recientes';
+$lang['recent_days']           = 'Cuántos cambios recientes mantener (días)';
+$lang['breadcrumbs']           = 'Número de pasos de traza';
+$lang['youarehere']            = 'Traza jerárquica';
+$lang['fullpath']              = 'Mostrar ruta completa en el pie de página';
+$lang['typography']            = 'Realizar reemplazos tipográficos';
+$lang['dformat']               = 'Formato de fecha (ver la función de PHP strftime)';
+$lang['signature']             = 'Firma';
+$lang['showuseras']            = 'Qué ver al mostrar el último usuario que editó una página';
+$lang['toptoclevel']           = 'Nivel superior para la tabla de contenidos';
+$lang['tocminheads']           = 'La cantidad mínima de titulares que determina si el TOC es construido';
+$lang['maxtoclevel']           = 'Máximo nivel para la tabla de contenidos';
+$lang['maxseclevel']           = 'Máximo nivel para edición de sección';
+$lang['camelcase']             = 'Usar CamelCase para enlaces';
+$lang['deaccent']              = 'Nombres de páginas "limpios"';
+$lang['useheading']            = 'Usar el primer encabezado para nombres de páginas';
+$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['hidepages']             = 'Ocultar páginas con coincidencias (expresiones regulares)';
+$lang['useacl']                = 'Usar listas de control de acceso (ACL)';
+$lang['autopasswd']            = 'Autogenerar contraseñas';
+$lang['authtype']              = 'Método de Autenticación';
+$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 o usuario con acceso a ciertas tareas de mantenimiento';
+$lang['profileconfirm']        = 'Confirmar cambios en perfil con contraseña';
+$lang['rememberme']            = 'Permitir cookies para acceso permanente (recordarme)';
+$lang['disableactions']        = 'Deshabilitar acciones DokuWiki';
+$lang['disableactions_check']  = 'Controlar';
+$lang['disableactions_subscription'] = 'Suscribirse/Cancelar suscripción';
+$lang['disableactions_wikicode'] = 'Ver la fuente/Exportar en formato raw';
+$lang['disableactions_other']  = 'Otras acciones (separadas por coma)';
+$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 con SSL la entrada, pero no la navegación de su wiki.';
+$lang['remote']                = 'Activar el sistema API remoto. Esto permite a otras aplicaciones acceder al wiki a traves de XML-RPC u otros mecanismos.';
+$lang['remoteuser']            = 'Restringir el acceso remoto por API a los grupos o usuarios separados por comas que se dan aquí. Dejar en blanco para dar acceso a todo el mundo.';
+$lang['usewordblock']          = 'Bloquear spam usando una lista de palabras';
+$lang['relnofollow']           = 'Usar rel="nofollow" en enlaces externos';
+$lang['indexdelay']            = 'Intervalo de tiempo antes de indexar (segundos)';
+$lang['mailguard']             = 'Ofuscar direcciones de correo electrónico';
+$lang['iexssprotect']          = 'Comprobar posible código malicioso (JavaScript ó HTML) en archivos subidos';
+$lang['usedraft']              = 'Guardar automáticamente un borrador mientras se edita';
+$lang['htmlok']                = 'Permitir HTML embebido';
+$lang['phpok']                 = 'Permitir PHP embebido';
+$lang['locktime']              = 'Edad máxima para archivos de bloqueo (segundos)';
+$lang['cachetime']             = 'Edad máxima para caché (segundos)';
+$lang['target____wiki']        = 'Ventana para enlaces internos';
+$lang['target____interwiki']   = 'Ventana para enlaces interwikis';
+$lang['target____extern']      = 'Ventana para enlaces externos';
+$lang['target____media']       = 'Ventana para enlaces a medios';
+$lang['target____windows']     = 'Ventana para enlaces a ventanas';
+$lang['mediarevisions']        = '¿Habilitar Mediarevisions?';
+$lang['refcheck']              = 'Control de referencia a medios';
+$lang['gdlib']                 = 'Versión de GD Lib';
+$lang['im_convert']            = 'Ruta a la herramienta de conversión de ImageMagick';
+$lang['jpg_quality']           = 'Calidad de compresión de JPG (0-100)';
+$lang['fetchsize']             = 'Tamaño máximo (bytes) que fetch.php puede descargar de sitios externos';
+$lang['subscribers']           = 'Habilitar soporte para suscripción a páginas';
+$lang['subscribe_time']        = 'Tiempo después que alguna lista de suscripción fue enviada (seg); Debe ser menor que el tiempo especificado en días recientes.';
+$lang['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';
+$lang['mailfrom']              = 'Dirección de correo electrónico para emails automáticos';
+$lang['mailprefix']            = 'Asunto por defecto que se utilizará en mails automáticos.';
+$lang['htmlmail']              = 'Enviar correos electronicos en HTML con mejor aspecto pero mayor peso. Desactivar para enviar correos electronicos en texto plano.';
+$lang['sitemap']               = 'Generar sitemap de Google (días)';
+$lang['rss_type']              = 'Tipo de resumen (feed) XML';
+$lang['rss_linkto']            = 'Feed XML enlaza a';
+$lang['rss_content']           = '¿Qué mostrar en los items del archivo XML?';
+$lang['rss_update']            = 'Intervalo de actualización de feed XML (segundos)';
+$lang['rss_show_summary']      = 'Feed XML muestra el resumen en el título';
+$lang['rss_media']             = '¿Qué tipo de cambios deberían aparecer en el feed XML?';
+$lang['updatecheck']           = '¿Comprobar actualizaciones y advertencias de seguridad? Esta característica requiere que DokuWiki se conecte a update.dokuwiki.org.';
+$lang['userewrite']            = 'Usar URLs bonitas';
+$lang['useslash']              = 'Usar barra (/) como separador de espacios de nombres en las URLs';
+$lang['sepchar']               = 'Separador de palabras en nombres de páginas';
+$lang['canonical']             = 'Usar URLs totalmente canónicas';
+$lang['fnencode']              = 'Método para codificar nombres de archivo no-ASCII.';
+$lang['autoplural']            = 'Controlar plurales en enlaces';
+$lang['compression']           = 'Método de compresión para archivos en el ático';
+$lang['gzip_output']           = 'Usar gzip Content-Encoding para xhtml';
+$lang['compress']              = 'Compactar la salida de CSS y javascript';
+$lang['cssdatauri']            = 'Tamaño en bytes hasta el cual las imágenes referenciadas en archivos CSS deberían ir incrustadas en la hoja de estilos para reducir el número de cabeceras de petición HTTP. ¡Esta técnica no funcionará en IE < 8! De 400 a 600 bytes es un valor adecuado. Establezca 0 para deshabilitarlo.';
+$lang['send404']               = 'Enviar "HTTP 404/Page Not Found" para páginas no existentes';
+$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']             = '¿Utilizar la cabecera X-Sendfile para permitirle al servidor web enviar archivos estáticos? Su servidor web necesita tener la capacidad para hacerlo.';
+$lang['renderer_xhtml']        = 'Visualizador a usar para salida (xhtml) principal del wiki';
+$lang['renderer__core']        = '%s (núcleo dokuwiki)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['dnslookups']            = 'DokuWiki buscara los hostnames para usuarios editando las páginas con IP remota. Si usted tiene un servidor DNS bastante lento o que no funcione, favor de desactivar esta opción.';
+$lang['proxy____host']         = 'Nombre del servidor Proxy';
+$lang['proxy____port']         = 'Puerto del servidor Proxy';
+$lang['proxy____user']         = 'Nombre de usuario para el servidor Proxy';
+$lang['proxy____pass']         = 'Contraseña para el servidor Proxy';
+$lang['proxy____ssl']          = 'Usar ssl para conectarse al servidor Proxy';
+$lang['proxy____except']       = 'Expresiones regulares para encontrar URLs que el proxy debería omitir.';
+$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['license_o_']            = 'No se eligió ninguna';
+$lang['typography_o_0']        = 'ninguno';
+$lang['typography_o_1']        = 'Dobles comillas solamente';
+$lang['typography_o_2']        = 'Todas las comillas (puede ser que no siempre funcione)';
+$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['gdlib_o_0']             = 'GD Lib no está disponible';
+$lang['gdlib_o_1']             = 'Versión 1.x';
+$lang['gdlib_o_2']             = 'Autodetección';
+$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'] = 'Resumen';
+$lang['rss_content_o_diff']    = 'Diferencias unificadas';
+$lang['rss_content_o_htmldiff'] = 'Tabla de diferencias en formato HTML';
+$lang['rss_content_o_html']    = 'Página que solo contiene código HTML';
+$lang['rss_linkto_o_diff']     = 'ver las diferencias';
+$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_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$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_link'] = 'Dirección de correo de usuario como enlace de envío de correo';
+$lang['useheading_o_0']        = 'Nunca';
+$lang['useheading_o_navigation'] = 'Solamente Navegación';
+$lang['useheading_o_content']  = 'Contenido wiki solamente';
+$lang['useheading_o_1']        = 'Siempre';
+$lang['readdircache']          = 'Tiempo máximo para la cache readdir (en segundos)';
diff --git a/sources/lib/plugins/config/lang/et/lang.php b/sources/lib/plugins/config/lang/et/lang.php
new file mode 100644
index 0000000..cce679f
--- /dev/null
+++ b/sources/lib/plugins/config/lang/et/lang.php
@@ -0,0 +1,30 @@
+
+ */
+$lang['menu']                  = 'Seadete haldamine';
+$lang['_configuration_manager'] = 'Seadete haldamine';
+$lang['_basic']                = 'Peamised seaded';
+$lang['_display']              = 'Näitamise seaded';
+$lang['_authentication']       = 'Audentimise seaded';
+$lang['_anti_spam']            = 'Spämmitõrje seaded';
+$lang['_editing']              = 'Muutmise seaded';
+$lang['_links']                = 'Lingi seaded';
+$lang['_media']                = 'Meedia seaded';
+$lang['_advanced']             = 'Laiendatud seaded';
+$lang['_network']              = 'Võrgu seaded';
+$lang['title']                 = 'Wiki pealkiri';
+$lang['template']              = 'Kujundus';
+$lang['recent']                = 'Viimased muudatused';
+$lang['signature']             = 'Allkiri';
+$lang['defaultgroup']          = 'Vaikimisi grupp';
+$lang['disableactions_check']  = 'Kontrolli';
+$lang['compression_o_0']       = 'pole';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'ära kasuta';
+$lang['useheading_o_0']        = 'Mitte kunagi';
+$lang['useheading_o_1']        = 'Alati';
diff --git a/sources/lib/plugins/config/lang/eu/intro.txt b/sources/lib/plugins/config/lang/eu/intro.txt
new file mode 100644
index 0000000..17edb3e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/eu/intro.txt
@@ -0,0 +1,7 @@
+====== Konfigurazio Kudeatzailea ======
+
+Erabili orri hau zure DokiWiki instalazioaren aukerak kontrolatzeko. Aukera zehatzei buruz laguntza eskuratzeko ikusi [[doku>config]]. Plugin honi buruzko xehetasun gehiago eskuratzeko ikusi [[doku>plugin:config]].
+
+Atzealde gorri argi batez erakusten diren aukerak babestuak daude eta ezin dira plugin honekin aldatu. Atzealde urdin batez erakusten diren aukerak balio lehenetsiak dira eta atzealde zuriz erakutsiak modu lokalean ezarriak izan dira instalazio honentzat. Aukera urdin eta zuriak aldatuak izan daitezke.
+
+Gogoratu **GORDE** botoia sakatzeaz orri hau utzi baino lehen, bestela zure aldaketak galdu egingo baitira.
diff --git a/sources/lib/plugins/config/lang/eu/lang.php b/sources/lib/plugins/config/lang/eu/lang.php
new file mode 100644
index 0000000..2b67a49
--- /dev/null
+++ b/sources/lib/plugins/config/lang/eu/lang.php
@@ -0,0 +1,183 @@
+
+ * @author Zigor Astarbe 
+ */
+$lang['menu']                  = 'Konfigurazio Ezarpenak';
+$lang['error']                 = 'Ezarpenak ez dira eguneratu balio oker bat dela eta, mesedez errepasatu aldaketak eta berriz bidali. 
        Balio okerra(k) ertz gorriz inguratuak erakutsiko dira. ';
+$lang['updated']               = 'Ezarpenak arrakastaz eguneratuak.';
+$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';
+$lang['_header_template']      = 'Txantiloi Ezarpenak';
+$lang['_header_undefined']     = 'Zehaztu gabeko Ezarpenak';
+$lang['_basic']                = 'Oinarrizko Ezarpenak';
+$lang['_display']              = 'Aurkezpen Ezarpenak';
+$lang['_authentication']       = 'Kautotze Ezarpenak';
+$lang['_anti_spam']            = 'Anti-Spam Ezarpenak';
+$lang['_editing']              = 'Edizio Ezarpenak';
+$lang['_links']                = 'Esteken Ezarpenak';
+$lang['_media']                = 'Multimedia Ezarpenak';
+$lang['_notifications']        = 'Abisuen ezarpenak';
+$lang['_syndication']          = 'Sindikazio ezarpenak';
+$lang['_advanced']             = 'Ezarpen Aurreratuak';
+$lang['_network']              = 'Sare Ezarpenak';
+$lang['_msg_setting_undefined'] = 'Ezarpen metadaturik ez.';
+$lang['_msg_setting_no_class'] = 'Ezarpen klaserik ez.';
+$lang['_msg_setting_no_default'] = 'Balio lehenetsirik ez.';
+$lang['title']                 = 'Wiki-aren izenburua';
+$lang['start']                 = 'Hasiera orriaren izena';
+$lang['lang']                  = 'Hizkuntza';
+$lang['template']              = 'Txantiloia';
+$lang['license']               = 'Zein lizentziapean argitaratu beharko lirateke edukiak?';
+$lang['savedir']               = 'Datuak gordetzeko direktorioa';
+$lang['basedir']               = 'Oinarri direktorioa';
+$lang['baseurl']               = 'Oinarri URLa';
+$lang['dmode']                 = 'Direktorio sortze modua';
+$lang['fmode']                 = 'Fitxategi sortze modua';
+$lang['allowdebug']            = 'Baimendu debug-a ezgaitu behar ez bada!';
+$lang['recent']                = 'Azken aldaketak';
+$lang['recent_days']           = 'Zenbat azken aldaketa gordeko dira (egunak)';
+$lang['breadcrumbs']           = 'Arrasto pauso kopurua';
+$lang['youarehere']            = 'Arrasto pauso hierarkikoak';
+$lang['fullpath']              = 'Orri oinean orrien bide osoa erakutsi';
+$lang['typography']            = 'Ordezkapen tipografikoak egin';
+$lang['dformat']               = 'Data formatua (ikusi PHPren strftime funtzioa)';
+$lang['signature']             = 'Sinadura';
+$lang['showuseras']            = 'Zer azaldu orri bat editatu duen azken erabiltzailea erakusterakoan';
+$lang['toptoclevel']           = 'Eduki taularen goiko maila';
+$lang['tocminheads']           = 'Gutxiengo izenburu kopuru minimoa Edukien Taula-ren sortu dadin.';
+$lang['maxtoclevel']           = 'Eduki taularen maila maximoa';
+$lang['maxseclevel']           = 'Sekzio edizio mailaren maximoa';
+$lang['camelcase']             = 'Estekentzat CamelCase erabili';
+$lang['deaccent']              = 'Orri izen garbiak';
+$lang['useheading']            = 'Erabili lehen izenburua orri izen moduan';
+$lang['sneaky_index']          = 'Lehenespenez, DokuWiki-k izen-espazio guztiak indize bistan erakutsiko ditu. Aukera hau gaituta, erabiltzaieak irakurtzeko baimenik ez dituen izen-espazioak ezkutatuko dira. Honek atzigarriak diren azpi izen-espazioak ezkutatzen ditu. Agian honek indizea erabili ezin ahal izatea eragingo du AKL ezarpen batzuetan.';
+$lang['hidepages']             = 'Ezkutatu kointzidentziak dituzten orriak (espresio erregularrak)';
+$lang['useacl']                = 'Erabili atzipen kontrol listak';
+$lang['autopasswd']            = 'Pasahitzak automatikoki sortu';
+$lang['authtype']              = 'Kautotze backend-a';
+$lang['passcrypt']             = 'Pasahitz enkriptatze metodoa';
+$lang['defaultgroup']          = 'Talde lehenetsia';
+$lang['superuser']             = 'Supererabiltzailea - taldea, erabiltzailea edo komaz bereiztutako zerrenda user1,@group1,user2 orri eta funtzio guztietara atzipen osoarekin, AKL-ren ezarpenetan zehaztutakoa kontutan hartu gabe';
+$lang['manager']               = 'Kudeatzailea - talde, erabiltzaile edo komaz bereiztutako zerrenda user1,@group1,user2 kudeatze funtzio zehatz batzuetara atzipenarekin';
+$lang['profileconfirm']        = 'Profil aldaketak pasahitzaz berretsi';
+$lang['rememberme']            = 'Baimendu saio hasiera cookie iraunkorrak (gogoratu iezaidazu)';
+$lang['disableactions']        = 'DokuWiki ekintzak ezgaitu';
+$lang['disableactions_check']  = 'Egiaztatu';
+$lang['disableactions_subscription'] = 'Harpidetu/Harpidetza utzi';
+$lang['disableactions_wikicode'] = 'Ikusi iturburua/Esportatu Raw';
+$lang['disableactions_other']  = 'Beste ekintzak (komaz bereiztuak)';
+$lang['auth_security_timeout'] = 'Kautotze Segurtasun Denbora-Muga (segunduak)';
+$lang['securecookie']          = 'HTTPS bidez ezarritako cookie-ak HTTPS bidez bakarrik bidali beharko lituzke nabigatzaileak? Ezgaitu aukera hau bakarrik saio hasierak SSL bidezko segurtasuna badu baina wiki-areb nabigazioa modu ez seguruan egiten bada. ';
+$lang['usewordblock']          = 'Blokeatu spam-a hitz zerrenda batean oinarrituta';
+$lang['relnofollow']           = 'Erabili rel="nofollow" kanpo esteketan';
+$lang['indexdelay']            = 'Denbora atzerapena indexatu baino lehen (seg)';
+$lang['mailguard']             = 'Ezkutatu posta-e helbidea';
+$lang['iexssprotect']          = 'Egiaztatu igotako fitxategiak JavaScript edo HTML kode maltzurra detektatzeko';
+$lang['usedraft']              = 'Automatikoki zirriborroa gorde editatze garaian';
+$lang['htmlok']                = 'Enbotatutako HTMLa baimendu';
+$lang['phpok']                 = 'Enbotatutako PHPa baimendu';
+$lang['locktime']              = 'Adin maximoa lock fitxategientzat (seg)';
+$lang['cachetime']             = 'Adin maximoa cachearentzat (seg)';
+$lang['target____wiki']        = 'Barne estekentzat helburu leihoa';
+$lang['target____interwiki']   = 'Interwiki estekentzat helburu leihoa';
+$lang['target____extern']      = 'Kanpo estekentzat helburu leihoa';
+$lang['target____media']       = 'Multimedia estekentzat helburu leihoa';
+$lang['target____windows']     = 'Leihoen estekentzat helburu leihoa';
+$lang['mediarevisions']        = 'Media rebisioak gaitu?';
+$lang['refcheck']              = 'Multimedia erreferentzia kontrolatu';
+$lang['gdlib']                 = 'GD Lib bertsioa';
+$lang['im_convert']            = 'ImageMagick-en aldaketa tresnara bidea';
+$lang['jpg_quality']           = 'JPG konprimitze kalitatea (0-100)';
+$lang['fetchsize']             = 'Kanpo esteketatik fetch.php-k deskargatu dezakeen tamaina maximoa (byteak)';
+$lang['subscribers']           = 'Gaitu orri harpidetza euskarria';
+$lang['subscribe_time']        = 'Harpidetza zerrendak eta laburpenak bidali aurretik pasa beharreko denbora (seg); Denbora honek, recent_days-en ezarritakoa baino txikiagoa behar luke.';
+$lang['notify']                = 'Aldaketen jakinarazpenak posta-e helbide honetara bidali';
+$lang['registernotify']        = 'Erregistratu berri diren erabiltzaileei buruzko informazioa post-e helbide honetara bidali';
+$lang['mailfrom']              = 'Posta automatikoentzat erabiliko den posta-e helbidea';
+$lang['mailprefix']            = 'Posta automatikoen gaientzat erabili beharreko aurrizkia';
+$lang['sitemap']               = 'Sortu Google gune-mapa (egunak)';
+$lang['rss_type']              = 'XML jario mota';
+$lang['rss_linkto']            = 'XML jarioak hona estekatzen du';
+$lang['rss_content']           = 'Zer erakutsi XML jarioetan?';
+$lang['rss_update']            = 'XML jarioaren eguneratze tartea (seg)';
+$lang['rss_show_summary']      = 'XML jarioak laburpena erakusten du izenburuan';
+$lang['updatecheck']           = 'Konprobatu eguneratze eta segurtasun oharrak? DokuWiki-k honetarako update.dokuwiki.org kontaktatu behar du.';
+$lang['userewrite']            = 'Erabili URL politak';
+$lang['useslash']              = 'Erabili barra (/) izen-espazio banatzaile moduan URLetan';
+$lang['sepchar']               = 'Orri izenaren hitz banatzailea';
+$lang['canonical']             = 'Erabili URL erabat kanonikoak';
+$lang['fnencode']              = 'Non-ASCII fitxategi izenak kodetzeko metodoa.';
+$lang['autoplural']            = 'Kontrolatu forma pluralak esteketan';
+$lang['compression']           = 'Trinkotze metodoa attic fitxategientzat';
+$lang['gzip_output']           = 'Gzip Eduki-Kodeketa erabili xhtml-rentzat';
+$lang['compress']              = 'Trinkotu CSS eta javascript irteera';
+$lang['send404']               = 'Bidali "HTTP 404/Ez Da Orria Aurkitu" existitzen ez diren orrientzat';
+$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['renderer_xhtml']        = 'Erabiliko den errenderizatzailea wiki irteera (xhtml) nagusiarentzat';
+$lang['renderer__core']        = '%s (dokuwiki-ren nukleoa)';
+$lang['renderer__plugin']      = '%s (plugina)';
+$lang['proxy____host']         = 'Proxy zerbitzari izena';
+$lang['proxy____port']         = 'Proxy portua';
+$lang['proxy____user']         = 'Proxyaren erabiltzaile izena';
+$lang['proxy____pass']         = 'Proxyaren pasahitza ';
+$lang['proxy____ssl']          = 'Erabili SSL Proxyra konektatzeko';
+$lang['proxy____except']       = 'URLak detektatzeko espresio erregularra, zeinentzat Proxy-a sahiestu beharko litzatekeen.';
+$lang['safemodehack']          = 'Gaitu modu segurua hack-a';
+$lang['ftp____host']           = 'FTP zerbitzaria modu seguruarentzat';
+$lang['ftp____port']           = 'FTP portua modu seguruarentzat';
+$lang['ftp____user']           = 'FTP erabiltzailea modu seguruarentzat';
+$lang['ftp____pass']           = 'FTP pasahitza modu seguruarentzat';
+$lang['ftp____root']           = 'FTP erro direktorioa modu seguruarentzat';
+$lang['license_o_']            = 'Bat ere ez hautaturik';
+$lang['typography_o_0']        = 'ezer';
+$lang['typography_o_1']        = 'Komatxo bikoitzak bakarrik';
+$lang['typography_o_2']        = 'Komatxo guztiak (gerta daiteke beti ez funtzionatzea)';
+$lang['userewrite_o_0']        = 'ezer';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWikiren barnekoa';
+$lang['deaccent_o_0']          = 'Izalita';
+$lang['deaccent_o_1']          = 'azentu-markak kendu';
+$lang['deaccent_o_2']          = 'erromanizatu ';
+$lang['gdlib_o_0']             = 'GD Lib ez dago eskuragarri';
+$lang['gdlib_o_1']             = '1.x bertsioa';
+$lang['gdlib_o_2']             = 'Automatikoki detektatu';
+$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'] = 'Laburpena';
+$lang['rss_content_o_diff']    = 'Bateratutako Diferentziak';
+$lang['rss_content_o_htmldiff'] = 'HTML formatuko diferentzia taula';
+$lang['rss_content_o_html']    = 'Orri edukia guztiz HTML';
+$lang['rss_linkto_o_diff']     = 'Desberdintasunak ikusi';
+$lang['rss_linkto_o_page']     = 'Berrikusitako orria';
+$lang['rss_linkto_o_rev']      = 'Berrikuspen zerrenda';
+$lang['rss_linkto_o_current']  = 'Uneko orria';
+$lang['compression_o_0']       = 'ezer';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'ez erabili';
+$lang['xsendfile_o_1']         = 'Jabegodun lighttpd goiburua (1.5 bertsioa baino lehen)';
+$lang['xsendfile_o_2']         = 'X-Sendfile goiburu estandarra';
+$lang['xsendfile_o_3']         = 'Jabegodun Nginx X-Accel-Redirect goiburua';
+$lang['showuseras_o_loginname'] = 'Saio izena';
+$lang['showuseras_o_username'] = 'Erabiltzailearen izen osoa';
+$lang['showuseras_o_email']    = 'Erabiltzailearen posta-e helbidea (ezkutatua posta babeslearen aukeren arabera)';
+$lang['showuseras_o_email_link'] = 'Erabiltzailearen posta-e helbidea mailto: esteka moduan';
+$lang['useheading_o_0']        = 'Inoiz';
+$lang['useheading_o_navigation'] = 'Nabigazioa Bakarrik';
+$lang['useheading_o_content']  = 'Wiki Edukia Bakarrik';
+$lang['useheading_o_1']        = 'Beti';
+$lang['readdircache']          = 'Aintzintasun maximoa readdir cache-rentzat (seg)';
diff --git a/sources/lib/plugins/config/lang/fa/intro.txt b/sources/lib/plugins/config/lang/fa/intro.txt
new file mode 100644
index 0000000..f5b6ba2
--- /dev/null
+++ b/sources/lib/plugins/config/lang/fa/intro.txt
@@ -0,0 +1,8 @@
+====== تنظیمات پیکربندی ======
+
+از این صفحه برای مدیریت تنظیمات DokuWiki استفاده کنید. برای راهنمایی بیش‌تر به [[doku>config]] مراجعه نماید.
+برای جزییات در مورد این افزونه نیز می‌توانید به [[doku>plugin:config]] مراجعه کنید.
+
+تنظیماتی که با پیش‌زمینه‌ی قرمز مشخص شده‌اند، غیرقابل تغییر می‌باشند. تنظیماتی که به پیش‌زمینه‌ی آبی مشخص شده‌اند نیز حامل مقادیر پیش‌فرض می‌باشند و تنظیماتی که پیش‌زمینه‌ی سفید دارند به طور محلی برای این سیستم تنظیم شده‌اند. تمامی مقادیر آبی و سفید قابلیت تغییر دارند.
+
+به یاد داشته باشید که قبل از ترک صفحه، دکمه‌ی **ذخیره** را بفشارید، در غیر این صورت تنظیمات شما از بین خواهد رفت.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/fa/lang.php b/sources/lib/plugins/config/lang/fa/lang.php
new file mode 100644
index 0000000..dd97f71
--- /dev/null
+++ b/sources/lib/plugins/config/lang/fa/lang.php
@@ -0,0 +1,197 @@
+
+ * @author omidmr@gmail.com
+ * @author Omid Mottaghi 
+ * @author Mohammad Reza Shoaei 
+ * @author Milad DZand 
+ * @author AmirH Hassaneini 
+ */
+$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']        = 'تنظیمات افزونه';
+$lang['_header_template']      = 'تنظیمات قالب';
+$lang['_header_undefined']     = 'تنظیمات تعریف نشده';
+$lang['_basic']                = 'تنظیمات مقدماتی';
+$lang['_display']              = 'تنظیمات نمایش';
+$lang['_authentication']       = 'تنظیمات معتبرسازی';
+$lang['_anti_spam']            = 'تنظیمات ضد-اسپم';
+$lang['_editing']              = 'تنظیمات ویرایش';
+$lang['_links']                = 'تنظیمات پیوند';
+$lang['_media']                = 'تنظیمات رسانه‌ها (فایل‌ها)';
+$lang['_notifications']        = 'تنظیمات آگاه سازی';
+$lang['_syndication']          = 'تنظیمات پیوند';
+$lang['_advanced']             = 'تنظیمات پیشرفته';
+$lang['_network']              = 'تنظیمات شبکه';
+$lang['_msg_setting_undefined'] = 'داده‌نمایی برای تنظیمات وجود ندارد';
+$lang['_msg_setting_no_class'] = 'هیچ دسته‌ای برای تنظیمات وجود ندارد.';
+$lang['_msg_setting_no_default'] = 'بدون مقدار پیش‌فرض';
+$lang['title']                 = 'عنوان ویکی';
+$lang['start']                 = 'نام صفحه‌ی آغازین';
+$lang['lang']                  = 'زبان';
+$lang['template']              = 'قالب';
+$lang['tagline']               = 'خط تگ (اگر قالب از آن پشتیبانی می کند)';
+$lang['sidebar']               = 'نام نوار صفحه کناری (اگر قالب از آن پشتیبانی می کند) ، فیلد خالی نوار کناری غیر فعال خواهد کرد.';
+$lang['license']               = 'لایسنس مطالب ویکی';
+$lang['savedir']               = 'شاخه‌ی ذخیره‌سازی داده‌ها';
+$lang['basedir']               = 'شاخه‌ی اصلی';
+$lang['baseurl']               = 'آدرس اصلی';
+$lang['cookiedir']             = 'مسیر کوکی ها. برای استفاده از آدرس پایه ، آن را خالی بگذارید.';
+$lang['dmode']                 = 'زبان';
+$lang['fmode']                 = 'دسترسی پیش‌فرض فایل‌ها در زمان ایجاد';
+$lang['allowdebug']            = 'امکان کرم‌زدایی (debug) اگر نیازی ندارید، غیرفعال کنید';
+$lang['recent']                = 'تغییرات اخیر';
+$lang['recent_days']           = 'چند تغییر در خوراک نمایش داده شود به روز';
+$lang['breadcrumbs']           = 'تعداد ردپاها';
+$lang['youarehere']            = 'ردپای درختی';
+$lang['fullpath']              = 'نمایش دادن مسیر کامل صفحات در پایین صفحه';
+$lang['typography']            = 'جای‌گزاری متن‌ها انجام شود';
+$lang['dformat']               = 'فرمت تاریخ (راهنمای تابع strftime را مشاهده کنید)';
+$lang['signature']             = 'امضا';
+$lang['showuseras']            = 'چگونه آخرین کاربر ویرایش کننده، یک صفحه نمایش داده شود';
+$lang['toptoclevel']           = 'بیشترین عمق برای «فهرست مطالب»';
+$lang['tocminheads']           = 'حداقل مقدار عنوان‌های یک صفحه، برای تشخیص این‌که «فهرست مطالب» (TOC) ایجاد شود';
+$lang['maxtoclevel']           = 'حداکثر عمق «فهرست مطالب»';
+$lang['maxseclevel']           = 'بیش‌ترین سطح ویرایش بخش‌ها';
+$lang['camelcase']             = 'از «حالت شتری» (CamelCase) برای پیوندها استفاده شود';
+$lang['deaccent']              = 'تمیز کردن نام صفحات';
+$lang['useheading']            = 'استفاده از اولین عنوان برای نام صفحه';
+$lang['sneaky_index']          = 'به طور پیش‌فرض، DokuWiki در فهرست تمامی فضای‌نام‌ها را نمایش می‌دهد. فعال کردن این گزینه، مواردی را که کاربر حق خواندنشان را ندارد مخفی می‌کند. این گزینه ممکن است باعث دیده نشدن زیرفضای‌نام‌هایی شود که دسترسی خواندن به آن‌ها وجود دارد. و ممکن است باعث شود که فهرست در حالاتی از دسترسی‌ها، غیرقابل استفاده شود.';
+$lang['hidepages']             = 'مخفی کردن صفحات با فرمت زیر (از عبارات منظم استفاده شود)';
+$lang['useacl']                = 'استفاده از مدیریت دسترسی‌ها';
+$lang['autopasswd']            = 'ایجاد خودکار گذرواژه‌ها';
+$lang['authtype']              = 'روش معتبرسازی';
+$lang['passcrypt']             = 'روش کد کردن گذرواژه';
+$lang['defaultgroup']          = 'گروه پیش‌فرض';
+$lang['superuser']             = 'کاربر اصلی - گروه، کاربر یا لیستی که توسط ویرگول جدا شده از کاربرها و گروه‌ها (مثل user1,@group1,user2) با دسترسی کامل به همه‌ی صفحات و امکانات سیستم، فارغ از دسترسی‌های آن کاربر.';
+$lang['manager']               = 'مدیر - گروه، کاربر یا لیستی که توسط ویرگول جدا شده از کاربرها و گروه‌ها (مثل user1,@group1,user2) با دسترسی‌های خاص به بخش‌های متفاوت';
+$lang['profileconfirm']        = 'تغییرات پروفایل با وارد کردن گذرواژه تایید شود';
+$lang['rememberme']            = 'امکان ورود دایم، توسط کوکی، وجود داشته باشد (مرا به خاطر بسپار)';
+$lang['disableactions']        = 'غیرفعال کردن فعالیت‌های DokuWiki';
+$lang['disableactions_check']  = 'بررسی';
+$lang['disableactions_subscription'] = 'عضویت/عدم عضویت';
+$lang['disableactions_wikicode'] = 'نمایش سورس/برون‌بری خام';
+$lang['disableactions_other']  = 'فعالیت‌های دیگر (با ویرگول انگلیسی «,» از هم جدا کنید)';
+$lang['auth_security_timeout'] = 'زمان انقضای معتبرسازی به ثانیه';
+$lang['securecookie']          = 'آیا کوکی‌ها باید با قرارداد HTTPS ارسال شوند؟ این گزینه را زمانی که فقط صفحه‌ی ورود ویکی‌تان با SSL امن شده است، اما ویکی را ناامن مرور می‌کنید، غیرفعال نمایید.';
+$lang['remote']                = 'سیستم API راه دور را فعال کنید . این به سایر کاربردها اجازه می دهد که به ویکی از طریق XML-RPC یا سایر مکانیزم ها دسترسی داشته باشند.';
+$lang['remoteuser']            = 'محدود کردن دسترسی API راه دور به گروه های جدا شده با ویرگول یا کاربران داده شده در این جا. برای دادن دسترسی به همه این فیلد را خالی بگذارید.';
+$lang['usewordblock']          = 'اسپم‌ها را براساس لیست کلمات مسدود کن';
+$lang['relnofollow']           = 'از «rel=nofollow» در پیوندهای خروجی استفاده شود';
+$lang['indexdelay']            = 'مقدار تاخیر پیش از فهرست‌بندی (ثانیه)';
+$lang['mailguard']             = 'مبهم کردن آدرس‌های ایمیل';
+$lang['iexssprotect']          = 'بررسی کردن فایل‌های ارسال شده را برای کدهای HTML یا JavaScript مخرب';
+$lang['usedraft']              = 'ایجاد خودکار چرک‌نویس در زمان نگارش';
+$lang['htmlok']                = 'امکان افزودن HTML باشد';
+$lang['phpok']                 = 'امکان افزودن PHP باشد';
+$lang['locktime']              = 'بیشینه‌ی زمان قفل شدن فایل‌ها به ثانیه';
+$lang['cachetime']             = 'بیشینه‌ی زمان حافظه‌ی موقت (cache) به ثانیه';
+$lang['target____wiki']        = 'پنجره‌ی هدف در پیوند‌های داخلی';
+$lang['target____interwiki']   = 'پنجره‌ی هدف در پیوند‌های داخل ویکی';
+$lang['target____extern']      = 'پنجره‌ی هدف در پیوند‌های خارجی';
+$lang['target____media']       = 'پنجره‌ی هدف در پیوند‌های رسانه‌ها';
+$lang['target____windows']     = 'پنجره‌ی هدف در پیوند‌های پنجره‌ای';
+$lang['mediarevisions']        = 'تجدید نظر رسانه ، فعال؟';
+$lang['refcheck']              = 'بررسی کردن مرجع رسانه‌ها';
+$lang['gdlib']                 = 'نگارش کتاب‌خانه‌ی GD';
+$lang['im_convert']            = 'مسیر ابزار convert از برنامه‌ی ImageMagick';
+$lang['jpg_quality']           = 'کیفیت فشرده سازی JPEG (از 0 تا 100)';
+$lang['fetchsize']             = 'بیشینه‌ی حجمی که فایل fetch.php می‌تواند دریافت کند (به بایت)';
+$lang['subscribers']           = 'توانایی عضویت در صفحات باشد';
+$lang['subscribe_time']        = 'زمان مورد نیاز برای ارسال خبر نامه ها (ثانیه); این مقدار می بایست کمتر زمانی باشد که در recent_days تعریف شده است.';
+$lang['notify']                = 'تغییرات به این ایمیل ارسال شود';
+$lang['registernotify']        = 'اطلاعات کاربران تازه وارد به این ایمیل ارسال شود';
+$lang['mailfrom']              = 'آدرس ایمیلی که برای ایمیل‌های خودکار استفاده می‌شود';
+$lang['mailprefix']            = 'پیشوند تیتر ایمیل (جهت ایمیل های خودکار)';
+$lang['htmlmail']              = 'فرستادن با ظاهر بهتر ، امّا با اندازه بیشتر در ایمیل های چند قسمتی HTML.
+برای استفاده از ایمیل متنی ، غیر فعال کنید.';
+$lang['sitemap']               = 'تولید کردن نقشه‌ی سایت توسط گوگل (روز)';
+$lang['rss_type']              = 'نوع خوراک';
+$lang['rss_linkto']            = 'خوراک به کجا لینک شود';
+$lang['rss_content']           = 'چه چیزی در تکه‌های خوراک نمایش داده شود؟';
+$lang['rss_update']            = 'زمان به روز رسانی خوراک به ثانیه';
+$lang['rss_show_summary']      = 'خوراک مختصری از مطلب را در عنوان نمایش دهد';
+$lang['rss_media']             = 'چه نوع تغییراتی باید در خوراک XML لیست شود؟';
+$lang['updatecheck']           = 'هشدارهای به روز رسانی و امنیتی بررسی شود؟ برای این‌کار DokuWiki با سرور update.dokuwiki.org تماس خواهد گرفت.';
+$lang['userewrite']            = 'از زیباکننده‌ی آدرس‌ها استفاده شود';
+$lang['useslash']              = 'از اسلش «/» برای جداکننده‌ی آدرس فضای‌نام‌ها استفاده شود';
+$lang['sepchar']               = 'کلمه‌ی جداکننده‌ی نام صفحات';
+$lang['canonical']             = 'استفاده از آدرس‌های استاندارد';
+$lang['fnencode']              = 'روش تغییر نام فایل‌هایی با فرمتی غیر از اسکی';
+$lang['autoplural']            = 'بررسی جمع بودن در پیوندها';
+$lang['compression']           = 'روش فشرده‌سازی برای فایل‌های خُرد';
+$lang['gzip_output']           = 'استفاده از gzip برای xhtmlها';
+$lang['compress']              = 'فشرده‌سازی کد‌های CSS و JavaScript';
+$lang['cssdatauri']            = 'اندازه بایت هایی که تصاویر ارجاع شده به فایل های CSS باید به درستی درون stylesheet جایگذاری شود تا سربار سرایند درخواست HTTP را کاهش دهد. این روش در IE 7 و پایین تر کار نمی کند! مقادیر 400 تا 600 بایت مقدار خوبی است. برای غیر فعال کردن 0 قرار دهید.';
+$lang['send404']               = 'ارسال «HTTP 404/Page Not Found» برای صفحاتی که وجود ندارند';
+$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 (افزونه)';
+$lang['dnslookups']            = 'DokuWiki نام هاست ها را برای آدرسهای IP یِ صفحات ویرایشی کاربران ، جستجو می کند. اگر یک سرور DNS کند یا نا کارامد دارید یا این ویژگی را نمی خواهید ، این گزینه را غیر فعال کنید.';
+$lang['proxy____host']         = 'آدرس سرور پروکسی';
+$lang['proxy____port']         = 'پورت پروکسی';
+$lang['proxy____user']         = 'نام کاربری پروکسی';
+$lang['proxy____pass']         = 'گذرواژهي پروکسی';
+$lang['proxy____ssl']          = 'استفاده از SSL برای اتصال به پروکسی';
+$lang['proxy____except']       = 'عبارت منظم برای تطبیق با URLها برای این‌که دریابیم که از روی  چه پروکسی‌ای باید بپریم!';
+$lang['safemodehack']          = 'فعال کردن safemode hack';
+$lang['ftp____host']           = 'آدرس FTP برای safemode hack';
+$lang['ftp____port']           = 'پورت FTP برای safemode hack';
+$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';
+$lang['typography_o_2']        = 'به همراه داشتن single-quote (ممکن است همیشه کار نکند)';
+$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']          = 'لاتین کردن (romanize)';
+$lang['gdlib_o_0']             = 'کتاب‌خانه‌ی GD موجود نیست';
+$lang['gdlib_o_1']             = 'نسخه‌ی 1.X';
+$lang['gdlib_o_2']             = 'انتخاب خودکار';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$lang['rss_type_o_rss1']       = 'RSS 1.0';
+$lang['rss_type_o_rss2']       = 'RSS 2.0';
+$lang['rss_type_o_atom']       = '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']  = 'صفحه‌ی کنونی';
+$lang['compression_o_0']       = 'هیچ';
+$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']    = 'آدرس ایمیل کاربران (با تنظیمات «نگهبان ایمیل» مبهم می‌شود)';
+$lang['showuseras_o_email_link'] = 'نمایش ایمیل کاربران با افزودن mailto';
+$lang['useheading_o_0']        = 'هرگز';
+$lang['useheading_o_navigation'] = 'فقط ناوبری (navigation)';
+$lang['useheading_o_content']  = 'فقط محتویات ویکی';
+$lang['useheading_o_1']        = 'همیشه';
+$lang['readdircache']          = 'بیش‌ترین عمر برای حافظه‌ی موقت readdir (ثانیه)';
diff --git a/sources/lib/plugins/config/lang/fi/intro.txt b/sources/lib/plugins/config/lang/fi/intro.txt
new file mode 100644
index 0000000..f6eedb5
--- /dev/null
+++ b/sources/lib/plugins/config/lang/fi/intro.txt
@@ -0,0 +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ä löytyy sivulta [[doku>plugin:config]].
+
+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.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/fi/lang.php b/sources/lib/plugins/config/lang/fi/lang.php
new file mode 100644
index 0000000..9fd3fba
--- /dev/null
+++ b/sources/lib/plugins/config/lang/fi/lang.php
@@ -0,0 +1,196 @@
+
+ * @author Teemu Mattila 
+ * @author Sami Olmari 
+ */
+$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 
        
+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';
+$lang['_header_template']      = 'Sivumallin asetukset';
+$lang['_header_undefined']     = 'Määritetelettömät asetukset';
+$lang['_basic']                = 'Perusasetukset';
+$lang['_display']              = 'Näyttöasetukset';
+$lang['_authentication']       = 'Sisäänkirjoittautumisen asetukset';
+$lang['_anti_spam']            = 'Anti-Spam asetukset';
+$lang['_editing']              = 'Sivumuokkauksen asetukset';
+$lang['_links']                = 'Linkkien asetukset';
+$lang['_media']                = 'Media-asetukset';
+$lang['_notifications']        = 'Ilmoitus-asetukset';
+$lang['_syndication']          = 'Syöteasetukset';
+$lang['_advanced']             = 'Lisäasetukset';
+$lang['_network']              = 'Verkkoasetukset';
+$lang['_msg_setting_undefined'] = 'Ei asetusten metadataa.';
+$lang['_msg_setting_no_class'] = 'Ei asetusluokkaa.';
+$lang['_msg_setting_no_default'] = 'Ei oletusarvoa';
+$lang['title']                 = 'Wikin nimi';
+$lang['start']                 = 'Alkusivun nimi';
+$lang['lang']                  = 'Kieli';
+$lang['template']              = 'Sivumalli';
+$lang['tagline']               = 'Apuotsikko - slogan sivustonimen yhteysteen (jos template käyttää)';
+$lang['sidebar']               = 'Sivupalkin sivunimi (jos template tukee sitä), tyhjä arvo poistaa sivupalkin';
+$lang['license']               = 'Millä lisenssillä sisältö pitäisi julkaista?';
+$lang['savedir']               = 'Hakemisto tietojen tallennukseen.';
+$lang['basedir']               = 'Perushakemisto';
+$lang['baseurl']               = 'Perus URL';
+$lang['cookiedir']             = 'Cookien path. Jätä tyhjäksi käyttääksesi baseurl arvoa';
+$lang['dmode']                 = 'Hakemiston luontioikeudet';
+$lang['fmode']                 = 'Tiedoston luontioikeudet';
+$lang['allowdebug']            = 'Salli debuggaus pois, jos ei tarvita!';
+$lang['recent']                = 'Viime muutokset';
+$lang['recent_days']           = 'Montako edellistä muutosta säilytetään (päiviä)';
+$lang['breadcrumbs']           = 'Leivänmurujen määrä';
+$lang['youarehere']            = 'Hierarkkiset leivänmurut';
+$lang['fullpath']              = 'Näytä sivun koko polku sivun alareunassa';
+$lang['typography']            = 'Tee typografiset korvaukset';
+$lang['dformat']               = 'Päivämäärän muoto (katso PHPn strftime funktiota)';
+$lang['signature']             = 'Allekirjoitus';
+$lang['showuseras']            = 'Mitä näytetään, kun kerrotaan viimeisen editoijan tiedot';
+$lang['toptoclevel']           = 'Ylätason sisällysluettelo';
+$lang['tocminheads']           = 'Pienin otsikkorivien määrä, jotta sisällysluettelo tehdään';
+$lang['maxtoclevel']           = 'Sisällysluettelon suurin syvyys';
+$lang['maxseclevel']           = 'Kappale-editoinnin suurin syvyys.';
+$lang['camelcase']             = 'Käytä CamelCase linkkejä';
+$lang['deaccent']              = 'Siivoa sivun nimet';
+$lang['useheading']            = 'Käytä ensimmäistä otsikkoriviä sivun nimenä.';
+$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['hidepages']             = 'Piilota seuraavat sivut (säännönmukainen lauseke)';
+$lang['useacl']                = 'Käytä käyttöoikeuksien hallintaa';
+$lang['autopasswd']            = 'Luo salasana automaattisesti';
+$lang['authtype']              = 'Autentikointijärjestelmä';
+$lang['passcrypt']             = 'Salasanan suojausmenetelmä';
+$lang['defaultgroup']          = 'Oletusryhmä';
+$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['rememberme']            = 'Salli pysyvät kirjautumis-cookiet (muista minut)';
+$lang['disableactions']        = 'Estä DokuWiki-toimintojen käyttö';
+$lang['disableactions_check']  = 'Tarkista';
+$lang['disableactions_subscription'] = 'Tilaa/Peruuta tilaus';
+$lang['disableactions_wikicode'] = 'Näytä lähdekoodi/Vie raakana';
+$lang['disableactions_other']  = 'Muut toiminnot (pilkulla erotettuna)';
+$lang['auth_security_timeout'] = 'Autentikoinnin aikakatkaisu (sekunteja)';
+$lang['securecookie']          = 'Lähetetäänkö HTTPS:n kautta asetetut evästetiedot HTTPS-yhteydellä? Kytke pois, jos vain wikisi kirjautuminen on suojattu SSL:n avulla, mutta muuten wikiä käytetään ilman suojausta.';
+$lang['remote']                = 'Kytke "remote API" käyttöön. Tämä sallii muiden sovellusten päästä wikiin XML-RPC:n avulla';
+$lang['remoteuser']            = 'Salli "remote API" pääsy vain pilkulla erotetuille ryhmille tai käyttäjille tässä. Jätä tyhjäksi, jos haluat sallia käytön kaikille.';
+$lang['usewordblock']          = 'Estä spam sanalistan avulla';
+$lang['relnofollow']           = 'Käytä rel="nofollow" ulkoisille linkeille';
+$lang['indexdelay']            = 'Aikaraja indeksoinnille (sek)';
+$lang['mailguard']             = 'Häivytä email osoite';
+$lang['iexssprotect']          = 'Tarkista lähetetyt tiedostot pahojen javascript- ja html-koodien varalta';
+$lang['usedraft']              = 'Tallenna vedos muokkaustilassa automaattisesti ';
+$lang['htmlok']                = 'Salli upotettu HTML';
+$lang['phpok']                 = 'Salli upotettu PHP';
+$lang['locktime']              = 'Lukitustiedostojen maksimi-ikä (sek)';
+$lang['cachetime']             = 'Välimuisti-tiedostojen maksimi-ikä (sek)';
+$lang['target____wiki']        = 'Kohdeikkuna sisäisissä linkeissä';
+$lang['target____interwiki']   = 'Kohdeikkuna interwiki-linkeissä';
+$lang['target____extern']      = 'Kohdeikkuna ulkoisissa linkeissä';
+$lang['target____media']       = 'Kohdeikkuna media-linkeissä';
+$lang['target____windows']     = 'Kohdeikkuna Windows-linkeissä';
+$lang['mediarevisions']        = 'Otetaan käyttään Media-versiointi';
+$lang['refcheck']              = 'Mediaviitteen tarkistus';
+$lang['gdlib']                 = 'GD Lib versio';
+$lang['im_convert']            = 'ImageMagick-muunnostyökalun polku';
+$lang['jpg_quality']           = 'JPG pakkauslaatu (0-100)';
+$lang['fetchsize']             = 'Suurin koko (bytejä), jonka fetch.php voi ladata ulkopuolisesta lähteestä';
+$lang['subscribers']           = 'Salli tuki sivujen tilaamiselle';
+$lang['subscribe_time']        = 'Aika jonka jälkeen tilauslinkit ja yhteenveto lähetetään (sek). Tämän pitäisi olla pienempi, kuin recent_days aika.';
+$lang['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['mailprefix']            = 'Etuliite automaattisesti lähetettyihin dähköposteihin';
+$lang['htmlmail']              = 'Lähetä paremman näköisiä, mutta isompia HTML multipart sähköposteja. Ota pois päältä, jos haluat vain tekstimuotoisia posteja.';
+$lang['sitemap']               = 'Luo Google sitemap (päiviä)';
+$lang['rss_type']              = 'XML-syötteen tyyppi';
+$lang['rss_linkto']            = 'XML-syöte kytkeytyy';
+$lang['rss_content']           = 'Mitä XML-syöte näyttää?';
+$lang['rss_update']            = 'XML-syötteen päivitystahti (sek)';
+$lang['rss_show_summary']      = 'XML-syöte näyttää yhteenvedon otsikossa';
+$lang['rss_media']             = 'Millaiset muutokset pitäisi olla mukana XML-syötteessä.';
+$lang['updatecheck']           = 'Tarkista päivityksiä ja turvavaroituksia? Tätä varten DokuWikin pitää ottaa yhteys update.dokuwiki.orgiin.';
+$lang['userewrite']            = 'Käytä siivottuja URLeja';
+$lang['useslash']              = 'Käytä kauttaviivaa nimiavaruuksien erottimena URL-osoitteissa';
+$lang['sepchar']               = 'Sivunimen sanaerotin';
+$lang['canonical']             = 'Käytä kanonisoituja URLeja';
+$lang['fnencode']              = 'Muita kuin ASCII merkkejä sisältävien tiedostonimien koodaustapa.';
+$lang['autoplural']            = 'Etsi monikkomuotoja linkeistä';
+$lang['compression']           = 'Attic-tiedostojen pakkausmenetelmä';
+$lang['gzip_output']           = 'Käytä gzip "Content-Encoding"-otsaketta xhtml-tiedostojen lähettämiseen';
+$lang['compress']              = 'Pakkaa CSS ja javascript';
+$lang['cssdatauri']            = 'Maksimikoko tavuina jossa kuvat joihin viitataan CSS-tiedostoista olisi sisällytettynä suoraan tyylitiedostoon jotta HTTP-kyselyjen kaistaa saataisiin kutistettua. Tämä tekniikka ei toimi IE versiossa aikasempi kuin 8! 400:sta 600:aan tavua on hyvä arvo. Aseta 0 kytkeäksesi ominaisuuden pois.';
+$lang['send404']               = 'Lähetä "HTTP 404/Page Not Found" puuttuvista sivuista';
+$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['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['dnslookups']            = 'DokuWiki tarkistaa sivun päivittäjän koneen IP-osoitteen isäntänimen. Kytke pois, jos käytät hidasta tai toimimatonta DNS-palvelinta, tai et halua tätä ominaisuutta.';
+$lang['proxy____host']         = 'Proxy-palvelimen nimi';
+$lang['proxy____port']         = 'Proxy portti';
+$lang['proxy____user']         = 'Proxy käyttäjän nimi';
+$lang['proxy____pass']         = 'Proxy salasana';
+$lang['proxy____ssl']          = 'Käytä ssl-yhteyttä kytkeytyäksesi proxy-palvelimeen';
+$lang['proxy____except']       = 'Säännönmukainen lause, URLiin, jolle proxy ohitetaan.';
+$lang['safemodehack']          = 'Käytä safemode kiertoa';
+$lang['ftp____host']           = 'FTP-palvelin safemode kiertoa varten';
+$lang['ftp____port']           = 'FTP-portti safemode kiertoa varten';
+$lang['ftp____user']           = 'FTP-käyttäjä safemode kiertoa varten';
+$lang['ftp____pass']           = 'FTP-salasana safemode kiertoa varten';
+$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']        = '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';
+$lang['userewrite_o_2']        = 'DokuWikin sisäinen';
+$lang['deaccent_o_0']          = 'pois';
+$lang['deaccent_o_1']          = 'Poista aksenttimerkit';
+$lang['deaccent_o_2']          = 'translitteroi';
+$lang['gdlib_o_0']             = 'GD Lib ei ole saatavilla';
+$lang['gdlib_o_1']             = 'Versio 1.x';
+$lang['gdlib_o_2']             = 'Automaattitunnistus';
+$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'] = 'Yhteenveto';
+$lang['rss_content_o_diff']    = 'Yhdistetty erot';
+$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';
+$lang['rss_linkto_o_rev']      = 'versiolista';
+$lang['rss_linkto_o_current']  = 'nykyinen sivu';
+$lang['compression_o_0']       = 'ei mitään';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'älä käytä';
+$lang['xsendfile_o_1']         = 'Oma lighttpd otsikko (ennen 1.5 julkaisua)';
+$lang['xsendfile_o_2']         = 'Standardi X-sendfile header';
+$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_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_1']        = 'Aina';
+$lang['readdircache']          = 'Maksimiaika readdir cachelle (sek)';
diff --git a/sources/lib/plugins/config/lang/fr/intro.txt b/sources/lib/plugins/config/lang/fr/intro.txt
new file mode 100644
index 0000000..3d71f61
--- /dev/null
+++ b/sources/lib/plugins/config/lang/fr/intro.txt
@@ -0,0 +1,9 @@
+====== Gestionnaire de configuration ======
+
+Utilisez cette page pour contrôler les paramètres de votre installation de DokuWiki. Pour de l'aide sur chaque paramètre, reportez vous à [[doku>fr:config]]. Pour plus de détails concernant cette extension, reportez vous à [[doku>fr:plugin:config]].
+
+Les paramètres affichés sur un fond rouge sont protégés et ne peuvent être modifiés avec cette extension. Les paramètres affichés sur un fond bleu sont les valeurs par défaut et les valeurs spécifiquement définies pour votre installation sont affichées sur un fond blanc. Seuls les paramètres sur fond bleu ou blanc peuvent être modifiés.
+
+N'oubliez pas d'utiliser le bouton **ENREGISTRER** avant de quitter cette page, sinon vos modifications ne seront pas prises en compte !
+
+
diff --git a/sources/lib/plugins/config/lang/fr/lang.php b/sources/lib/plugins/config/lang/fr/lang.php
new file mode 100644
index 0000000..e92144b
--- /dev/null
+++ b/sources/lib/plugins/config/lang/fr/lang.php
@@ -0,0 +1,209 @@
+
+ * @author Delassaux Julien 
+ * @author Maurice A. LeBlanc 
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri 
+ * @author Erik Pedersen 
+ * @author olivier duperray 
+ * @author Vincent Feltz 
+ * @author Philippe Bajoit 
+ * @author Florian Gaub 
+ * @author Samuel Dorsaz samuel.dorsaz@novelion.net
+ * @author Johan Guilbaud 
+ * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
+ * @author Yannick Aure 
+ * @author Olivier DUVAL 
+ * @author Anael Mobilia 
+ * @author Bruno Veilleux 
+ */
+$lang['menu']                  = 'Paramètres de configuration';
+$lang['error']                 = 'Paramètres non modifiés en raison d\'une valeur invalide, vérifiez vos réglages puis réessayez. 
        Les valeurs erronées sont entourées d\'une bordure rouge.';
+$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 autorisations du fichier sont correctes.';
+$lang['danger']                = 'Danger : modifier cette option pourrait rendre inaccessibles 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 de DokuWiki';
+$lang['_header_plugin']        = 'Paramètres des extensions';
+$lang['_header_template']      = 'Paramètres des modèles';
+$lang['_header_undefined']     = 'Paramètres indéfinis';
+$lang['_basic']                = 'Paramètres de base';
+$lang['_display']              = 'Paramètres d\'affichage';
+$lang['_authentication']       = 'Paramètres d\'authentification';
+$lang['_anti_spam']            = 'Paramètres anti-spam';
+$lang['_editing']              = 'Paramètres d\'édition';
+$lang['_links']                = 'Paramètres des liens';
+$lang['_media']                = 'Paramètres des médias';
+$lang['_notifications']        = 'Paramètres de notification';
+$lang['_syndication']          = 'Paramètres de syndication';
+$lang['_advanced']             = 'Paramètres avancés';
+$lang['_network']              = 'Paramètres réseaux';
+$lang['_msg_setting_undefined'] = 'Pas de définition de métadonnées';
+$lang['_msg_setting_no_class'] = 'Pas de définition de paramètres.';
+$lang['_msg_setting_no_default'] = 'Pas de valeur par défaut.';
+$lang['title']                 = 'Titre du wiki (nom du wiki)';
+$lang['start']                 = 'Nom de la page d\'accueil à utiliser pour toutes les catégories';
+$lang['lang']                  = 'Langue de l\'interface';
+$lang['template']              = 'Modèle (rendu visuel du wiki)';
+$lang['tagline']               = 'Descriptif du site (si le modèle supporte cette fonctionnalité)';
+$lang['sidebar']               = 'Nom du panneau latéral (si le modèle supporte cette fonctionnalité). Laisser le champ vide désactive le panneau latéral.';
+$lang['license']               = 'Sous quelle licence doit-être placé le contenu ?';
+$lang['savedir']               = 'Répertoire d\'enregistrement des données';
+$lang['basedir']               = 'Répertoire de base du serveur (par exemple : /dokuwiki/). Laisser vide pour une détection automatique.';
+$lang['baseurl']               = 'URL de base du site (par exemple http://www.example.com). Laisser vide pour une détection automatique.';
+$lang['cookiedir']             = 'Chemin des cookies. Laissez vide pour utiliser l\'URL de base.';
+$lang['dmode']                 = 'Mode de création des répertoires';
+$lang['fmode']                 = 'Mode de création des fichiers';
+$lang['allowdebug']            = 'Debug (Ne l\'activez que si vous en avez besoin !)';
+$lang['recent']                = 'Nombre de lignes à afficher - par page - pour les derniers changements';
+$lang['recent_days']           = 'Signaler les pages modifiées depuis (en jours)';
+$lang['breadcrumbs']           = 'Nombre de traces à afficher. 0 désactive cette fonctionnalité.';
+$lang['youarehere']            = 'Utiliser des traces hiérarchiques (vous voulez probablement désactiver l\'option ci-dessus)';
+$lang['fullpath']              = 'Afficher le chemin complet des pages dans le pied de page';
+$lang['typography']            = 'Effectuer des améliorations typographiques';
+$lang['dformat']               = 'Format de date (cf. fonction strftime de PHP)';
+$lang['signature']             = 'Données à insérer lors de l\'utilisation du bouton « signature » dans l\'éditeur';
+$lang['showuseras']            = 'Données à afficher concernant le dernier utilisateur ayant modifié une page';
+$lang['toptoclevel']           = 'Niveau le plus haut à afficher dans la table des matières';
+$lang['tocminheads']           = 'Nombre minimum de titres pour qu\'une table des matières soit affichée';
+$lang['maxtoclevel']           = 'Niveau maximum pour figurer dans la table des matières';
+$lang['maxseclevel']           = 'Niveau maximum pour modifier des sections';
+$lang['camelcase']             = 'Utiliser l\'affichage «CamelCase » pour les liens';
+$lang['deaccent']              = 'Retirer les accents dans les noms de pages';
+$lang['useheading']            = 'Utiliser le titre de premier niveau pour le nom de la page';
+$lang['sneaky_index']          = 'Par défaut, DokuWiki affichera toutes les catégories dans la vue par index. Activer cette option permet de cacher les catégories pour lesquelles l\'utilisateur n\'a pas l\'autorisation de lecture. Il peut en résulter le masquage de sous-catégories accessibles. Ceci peut rendre l\'index inutilisable avec certains contrôles d\'accès.';
+$lang['hidepages']             = 'Cacher les pages correspondant à (expression régulière)';
+$lang['useacl']                = 'Utiliser les listes de contrôle d\'accès (ACL)';
+$lang['autopasswd']            = 'Auto-générer les mots de passe';
+$lang['authtype']              = 'Mécanisme d\'authentification';
+$lang['passcrypt']             = 'Méthode de chiffrement des mots de passe';
+$lang['defaultgroup']          = 'Groupe par défaut : tous les nouveaux utilisateurs y seront affectés';
+$lang['superuser']             = 'Super-utilisateur : groupe, utilisateur ou liste séparée par des virgules utilisateur1,@groupe1,utilisateur2 ayant un accès complet à toutes les pages quelque soit le paramétrage des contrôle d\'accès';
+$lang['manager']               = 'Manager:- groupe, utilisateur ou liste séparée par des virgules utilisateur1,@groupe1,utilisateur2 ayant accès à certaines fonctionnalités de gestion';
+$lang['profileconfirm']        = 'Confirmer les modifications de profil par la saisie du mot de passe ';
+$lang['rememberme']            = 'Permettre de conserver de manière permanente les cookies de connexion (mémoriser)';
+$lang['disableactions']        = 'Actions à désactiver dans DokuWiki';
+$lang['disableactions_check']  = 'Vérifier';
+$lang['disableactions_subscription'] = 'Abonnement aux pages';
+$lang['disableactions_wikicode'] = 'Afficher le texte source';
+$lang['disableactions_other']  = 'Autres actions (séparées par des virgules)';
+$lang['auth_security_timeout'] = 'Délai d\'expiration de sécurité (secondes)';
+$lang['securecookie']          = 'Les cookies définis via HTTPS doivent-ils n\'être envoyé par le navigateur que via HTTPS ? Désactivez cette option lorsque seule la connexion à votre wiki est sécurisée avec SSL et que la navigation sur le wiki est effectuée de manière non sécurisée.';
+$lang['remote']                = 'Active l\'API système distante. Ceci permet à d\'autres applications d\'accéder au wiki via XML-RPC ou d\'autres mécanismes.';
+$lang['remoteuser']            = 'Restreindre l\'accès à l\'API à une liste de groupes ou d\'utilisateurs (séparés par une virgule). Laisser vide pour donner l\'accès tout le monde.';
+$lang['usewordblock']          = 'Bloquer le spam selon les mots utilisés';
+$lang['relnofollow']           = 'Utiliser l\'attribut « rel="nofollow" » sur les liens extérieurs';
+$lang['indexdelay']            = 'Délai avant l\'indexation (secondes)';
+$lang['mailguard']             = 'Cacher les adresses de courriel';
+$lang['iexssprotect']          = 'Vérifier, dans les fichiers envoyés, la présence de code JavaScript ou HTML malveillant';
+$lang['usedraft']              = 'Enregistrer automatiquement un brouillon pendant l\'édition';
+$lang['htmlok']                = 'Permettre l\'utilisation de code HTML dans les pages';
+$lang['phpok']                 = 'Permettre l\'utilisation de code PHP dans les pages';
+$lang['locktime']              = 'Âge maximum des fichiers de blocage (secondes)';
+$lang['cachetime']             = 'Âge maximum d\'un fichier en cache (secondes)';
+$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 média';
+$lang['target____windows']     = 'Cible pour liens vers partages Windows';
+$lang['mediarevisions']        = 'Activer les révisions (gestion de versions) des médias';
+$lang['refcheck']              = 'Vérifier si un média est toujours utilisé avant de le supprimer';
+$lang['gdlib']                 = 'Version de la librairie GD';
+$lang['im_convert']            = 'Chemin vers l\'outil de conversion ImageMagick';
+$lang['jpg_quality']           = 'Qualité de la compression JPEG (0-100)';
+$lang['fetchsize']             = 'Taille maximale (en octets) que fetch.php peut télécharger depuis une URL tierce (par exemple pour conserver en cache et redimensionner une image tierce)';
+$lang['subscribers']           = 'Activer l\'abonnement aux pages';
+$lang['subscribe_time']        = 'Délai après lequel les listes d\'abonnement et résumés sont expédiés (en secondes). Devrait être plus petit que le délai précisé dans recent_days.';
+$lang['notify']                = 'Notifier systématiquement les modifications à cette adresse de courriel';
+$lang['registernotify']        = 'Notifier systématiquement les nouveaux utilisateurs enregistrés à cette adresse de courriel';
+$lang['mailfrom']              = 'Adresse de courriel de l\'expéditeur des notifications par courriel du wiki';
+$lang['mailprefix']            = 'Préfixe à utiliser dans les objets des courriels automatiques. Laisser vide pour utiliser le titre du wiki';
+$lang['htmlmail']              = 'Envoyer des courriel HTML multipart (visuellement plus agréable, mais plus lourd). Désactiver pour utiliser uniquement des courriel plain text';
+$lang['sitemap']               = 'Fréquence de génération du sitemap Google (jours). 0 pour désactiver';
+$lang['rss_type']              = 'Type de flux XML (RSS)';
+$lang['rss_linkto']            = 'Lien du flux XML vers';
+$lang['rss_content']           = 'Quel contenu afficher dans le flux XML?';
+$lang['rss_update']            = 'Fréquence de mise à jour du flux XML (secondes)';
+$lang['rss_show_summary']      = 'Le flux XML affiche le résumé dans le titre';
+$lang['rss_media']             = 'Quels types de changements doivent être listés dans le flux XML?';
+$lang['updatecheck']           = 'Vérifier les mises à jour et alertes de sécurité? DokuWiki doit pouvoir contacter update.dokuwiki.org';
+$lang['userewrite']            = 'Utiliser des URL esthétiques';
+$lang['useslash']              = 'Utiliser « / » comme séparateur de catégories dans les URL';
+$lang['sepchar']               = 'Séparateur de mots dans les noms de page';
+$lang['canonical']             = 'Utiliser des URL canoniques';
+$lang['fnencode']              = 'Méthode pour l\'encodage des fichiers non-ASCII';
+$lang['autoplural']            = 'Rechercher les formes plurielles dans les liens';
+$lang['compression']           = 'Méthode de compression pour les fichiers attic';
+$lang['gzip_output']           = 'Utiliser gzip pour le Content-Encoding du XHTML';
+$lang['compress']              = 'Compresser les flux CSS et JavaScript';
+$lang['cssdatauri']            = 'Taille maximale en octets pour inclure dans les feuilles de styles CSS les images qui y sont référencées. Cette technique réduit le nombre de requêtes HTTP. Cette fonctionnalité ne fonctionne qu\'à partir de la version 8 d\'Internet Explorer! Nous recommandons une valeur entre 400 et 600. 0 pour désactiver.';
+$lang['send404']               = 'Renvoyer « HTTP 404/Page Not Found » pour les pages inexistantes';
+$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\'informations.';
+$lang['xsendfile']             = 'Utiliser l\'en-tête X-Sendfile pour permettre au serveur web de délivrer les fichiers statiques ? Votre serveur web doit supporter cette fonctionnalité.';
+$lang['renderer_xhtml']        = 'Moteur de rendu du format de sortie principal (XHTML)';
+$lang['renderer__core']        = '%s (cœur de DokuWiki)';
+$lang['renderer__plugin']      = '%s (extension)';
+$lang['dnslookups']            = 'DokuWiki effectuera une résolution du nom d\'hôte sur les adresses IP des utilisateurs modifiant des pages. Si vous ne possédez pas de serveur DNS, que ce dernier est lent ou que vous ne souhaitez pas utiliser cette fonctionnalité : désactivez-la.';
+$lang['proxy____host']         = 'Mandataire (proxy) - Hôte';
+$lang['proxy____port']         = 'Mandataire - Port';
+$lang['proxy____user']         = 'Mandataire - Identifiant';
+$lang['proxy____pass']         = 'Mandataire - Mot de passe';
+$lang['proxy____ssl']          = 'Mandataire - Utilisation de SSL';
+$lang['proxy____except']       = 'Mandataire - Expression régulière de test des URLs pour lesquelles le mandataire (proxy) ne doit pas être utilisé.';
+$lang['safemodehack']          = 'Activer l\'option Mode sans échec';
+$lang['ftp____host']           = 'FTP / Mode sans échec - Serveur hôte';
+$lang['ftp____port']           = 'FTP / Mode sans échec - Port';
+$lang['ftp____user']           = 'FTP / Mode sans échec - Identifiant';
+$lang['ftp____pass']           = 'FTP / Mode sans échec - Mot de passe';
+$lang['ftp____root']           = 'FTP / Mode sans échec - Répertoire racine';
+$lang['license_o_']            = 'Aucune choisie';
+$lang['typography_o_0']        = 'aucun';
+$lang['typography_o_1']        = 'guillemets uniquement';
+$lang['typography_o_2']        = 'tout signe typographique (peut ne pas fonctionner)';
+$lang['userewrite_o_0']        = 'aucun';
+$lang['userewrite_o_1']        = 'Fichier .htaccess';
+$lang['userewrite_o_2']        = 'Interne à DokuWiki';
+$lang['deaccent_o_0']          = 'off';
+$lang['deaccent_o_1']          = 'supprimer les accents';
+$lang['deaccent_o_2']          = 'convertir en caractères latins';
+$lang['gdlib_o_0']             = 'Librairie GD non disponible';
+$lang['gdlib_o_1']             = 'version 1.x';
+$lang['gdlib_o_2']             = 'auto-détectée';
+$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'] = 'Résumé';
+$lang['rss_content_o_diff']    = 'Diff. unifié';
+$lang['rss_content_o_htmldiff'] = 'Diff. formaté en table HTML';
+$lang['rss_content_o_html']    = 'page complète au format HTML';
+$lang['rss_linkto_o_diff']     = 'liste des différences';
+$lang['rss_linkto_o_page']     = 'page révisée';
+$lang['rss_linkto_o_rev']      = 'liste des révisions';
+$lang['rss_linkto_o_current']  = 'page actuelle';
+$lang['compression_o_0']       = 'aucune';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'ne pas utiliser';
+$lang['xsendfile_o_1']         = 'Entête propriétaire lighttpd (avant la version 1.5)';
+$lang['xsendfile_o_2']         = 'Entête standard X-Sendfile';
+$lang['xsendfile_o_3']         = 'En-tête propriétaire Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Identifiant de l\'utilisateur';
+$lang['showuseras_o_username'] = 'Nom de l\'utilisateur';
+$lang['showuseras_o_email']    = 'Courriel de l\'utilisateur (brouillé suivant les paramètres de brouillage sélectionnés)';
+$lang['showuseras_o_email_link'] = 'Courriel de l\'utilisateur en tant que lien mailto:';
+$lang['useheading_o_0']        = 'Jamais';
+$lang['useheading_o_navigation'] = 'Navigation seulement';
+$lang['useheading_o_content']  = 'Contenu du wiki seulement';
+$lang['useheading_o_1']        = 'Toujours';
+$lang['readdircache']          = 'Durée de vie maximale du cache pour readdir (sec)';
diff --git a/sources/lib/plugins/config/lang/gl/intro.txt b/sources/lib/plugins/config/lang/gl/intro.txt
new file mode 100644
index 0000000..cafe28e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/gl/intro.txt
@@ -0,0 +1,7 @@
+====== Xestor de Configuración ======
+
+Usa esta páxina para controlares a configuración da túa instalación do Dokuwiki.  Para atopares axuda verbo de cada opción da configuración vai a [[doku>config]]. Para obteres pormenores desta extensión bota un ollo a [[doku>plugin:config]].
+
+As opcións que amosan un fondo de cor vermella clara están protexidas e non poden ser alteradas con esta extensión. As opcións que amosan un fondo de cor azul son valores predeterminados e as opcións que teñen fondo branco foron configuradas de xeito local para esta instalación en concreto. Ámbalas dúas, as opcións azuis e brancas, poden ser alteradas.
+
+Lembra premer no boton **GARDAR** denantes de saíres desta páxina ou, en caso contrario, os teus trocos perderanse.
diff --git a/sources/lib/plugins/config/lang/gl/lang.php b/sources/lib/plugins/config/lang/gl/lang.php
new file mode 100644
index 0000000..44942cc
--- /dev/null
+++ b/sources/lib/plugins/config/lang/gl/lang.php
@@ -0,0 +1,194 @@
+
+ * @author Oscar M. Lage 
+ * @author Rodrigo Rega 
+ */
+$lang['menu']                  = 'Opcións de Configuración';
+$lang['error']                 = 'Configuración non actualizada debido a un valor inválido, por favor revisa os teus trocos e volta envialos de novo.
+
        O(s) valor(es) incorrecto(s) amosanse cinguidos por un borde vermello.';
+$lang['updated']               = 'Configuración actualizada correctamente.';
+$lang['nochoice']              = '(non hai outras escollas dispoñibles)';
+$lang['locked']                = 'Non se puido actualizar o arquivo de configuración, se non ocorre como debería ser, 
        
+asegúrate de que o nome do arquivo de configuración local e os permisos son correctos.';
+$lang['danger']                = 'Perigo: mudando esta opción podes facer inaccesíbeis o teu wiki e máis o menú de configuración.';
+$lang['warning']               = 'Ollo: mudando esta opción poden aparecer comportamentos do aplicativo non agardados.';
+$lang['security']              = 'Aviso de seguranza: mudando esta opción poden aparecer riscos de seguranza.';
+$lang['_configuration_manager'] = 'Xestor de Configuración';
+$lang['_header_dokuwiki']      = 'Configuración do DokuWiki';
+$lang['_header_plugin']        = 'Configuración de Extensións';
+$lang['_header_template']      = 'Configuración de Sobreplanta';
+$lang['_header_undefined']     = 'Configuración Indefinida';
+$lang['_basic']                = 'Configuración Básica';
+$lang['_display']              = 'Configuración de Visualización';
+$lang['_authentication']       = 'Configuración de Autenticación';
+$lang['_anti_spam']            = 'Configuración de Anti-Correo-lixo';
+$lang['_editing']              = 'Configuración de Edición';
+$lang['_links']                = 'Configuración de Ligazóns';
+$lang['_media']                = 'Configuración de Media';
+$lang['_notifications']        = 'Opcións de Notificación';
+$lang['_syndication']          = 'Opcións de Sindicación';
+$lang['_advanced']             = 'Configuración Avanzada';
+$lang['_network']              = 'Configuración de Rede';
+$lang['_msg_setting_undefined'] = 'Non hai configuración de metadatos.';
+$lang['_msg_setting_no_class'] = 'Non hai configuración de clase.';
+$lang['_msg_setting_no_default'] = 'Non hai valor predeterminado.';
+$lang['title']                 = 'Título do Wiki';
+$lang['start']                 = 'Nome da páxina inicial';
+$lang['lang']                  = 'Idioma';
+$lang['template']              = 'Sobreplanta';
+$lang['tagline']               = 'Tagline (si a plantilla o soporta)';
+$lang['sidebar']               = 'Nome de páxina da barra lateral (si a platilla o soporta), o campo en baleiro deshabilita a barra lateral';
+$lang['license']               = 'Baixo de que licenza será ceibado o teu contido?';
+$lang['savedir']               = 'Directorio no que se gardarán os datos';
+$lang['basedir']               = 'Directorio base';
+$lang['baseurl']               = 'URL base';
+$lang['cookiedir']             = 'Ruta das cookies. Deixar en blanco para usar a url de base.';
+$lang['dmode']                 = 'Modo de creación de directorios';
+$lang['fmode']                 = 'Modo de creación de arquivos';
+$lang['allowdebug']            = 'Permitir o depurado desactívao se non o precisas!';
+$lang['recent']                = 'Trocos recentes';
+$lang['recent_days']           = 'Número de trocos recentes a manter (días)';
+$lang['breadcrumbs']           = 'Número de niveis da estrutura de navegación';
+$lang['youarehere']            = 'Niveis xerárquicos da estrutura de navegación';
+$lang['fullpath']              = 'Amosar a ruta completa das páxinas no pé das mesmas';
+$lang['typography']            = 'Facer substitucións tipográficas';
+$lang['dformat']               = 'Formato de Data (bótalle un ollo á función strftime do PHP)';
+$lang['signature']             = 'Sinatura';
+$lang['showuseras']            = 'Que amosar cando se informe do usuario que fixo a última modificación dunha páxina';
+$lang['toptoclevel']           = 'Nivel superior para a táboa de contidos';
+$lang['tocminheads']           = 'Cantidade mínima de liñas de cabeceira que determinará se a TDC vai ser xerada';
+$lang['maxtoclevel']           = 'Nivel máximo para a táboa de contidos';
+$lang['maxseclevel']           = 'Nivel máximo de edición da sección';
+$lang['camelcase']             = 'Utilizar CamelCase para as ligazóns';
+$lang['deaccent']              = 'Limpar nomes de páxina';
+$lang['useheading']            = 'Utilizar a primeira cabeceira para os nomes de páxina';
+$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['hidepages']             = 'Agochar páxinas que coincidan (expresións regulares)';
+$lang['useacl']                = 'Utilizar lista de control de acceso';
+$lang['autopasswd']            = 'Xerar 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['rememberme']            = 'Permitir cookies permanentes de inicio de sesión (lembrarme)';
+$lang['disableactions']        = 'Desactivar accións do DokuWiki';
+$lang['disableactions_check']  = 'Comprobar';
+$lang['disableactions_subscription'] = 'Subscribir/Desubscribir';
+$lang['disableactions_wikicode'] = 'Ver fonte/Exportar Datos Raw';
+$lang['disableactions_other']  = 'Outras accións (separadas por comas)';
+$lang['auth_security_timeout'] = 'Tempo Límite de Seguridade de Autenticación (segundos)';
+$lang['securecookie']          = 'Deben enviarse só vía HTTPS polo navegador as cookies configuradas vía HTTPS? Desactiva esta opción cando só o inicio de sesión do teu wiki estea asegurado con SSL pero a navegación do mesmo se faga de xeito inseguro.';
+$lang['remote']                = 'Permite o uso do sistema API remoto. Isto permite a outras aplicacións acceder ao wiki mediante XML-RPC ou outros mecanismos.';
+$lang['remoteuser']            = 'Restrinxe o uso remoto da API aos grupos ou usuarios indicados, separados por comas. Deixar baleiro para dar acceso a todo o mundo.';
+$lang['usewordblock']          = 'Bloquear correo-lixo segundo unha lista de verbas';
+$lang['relnofollow']           = 'Utilizar rel="nofollow" nas ligazóns externas';
+$lang['indexdelay']            = 'Retardo denantes de indexar (seg)';
+$lang['mailguard']             = 'Ofuscar enderezos de correo-e';
+$lang['iexssprotect']          = 'Comprobar arquivos subidos na procura de posíbel código JavaScript ou HTML malicioso';
+$lang['usedraft']              = 'Gardar un borrador automaticamente no tempo da edición';
+$lang['htmlok']                = 'Permitir a inserción de HTML';
+$lang['phpok']                 = 'Permitir a inserción de PHP';
+$lang['locktime']              = 'Tempo máximo para o bloqueo de arquivos (seg.)';
+$lang['cachetime']             = 'Tempo máximo para a caché (seg.)';
+$lang['target____wiki']        = 'Fiestra de destino para as ligazóns internas';
+$lang['target____interwiki']   = 'Fiestra de destino para as ligazóns interwiki';
+$lang['target____extern']      = 'Fiestra de destino para as ligazóns externas';
+$lang['target____media']       = 'Fiestra de destino para as ligazóns de media';
+$lang['target____windows']     = 'Fiestra de destino para as ligazóns de fiestras';
+$lang['mediarevisions']        = 'Habilitar revisións dos arquivos-media?';
+$lang['refcheck']              = 'Comprobar a referencia media';
+$lang['gdlib']                 = 'Versión da Libraría GD';
+$lang['im_convert']            = 'Ruta deica a ferramenta de conversión ImageMagick';
+$lang['jpg_quality']           = 'Calidade de compresión dos JPG (0-100)';
+$lang['fetchsize']             = 'Tamaño máximo (en bytes) que pode descargar fetch.php dende fontes externas';
+$lang['subscribers']           = 'Activar posibilidade de subscrición á páxina';
+$lang['subscribe_time']        = 'Tempo despois do cal se enviarán os resumos e listas de subscrición (seg.): isto debe ser inferior ao tempo especificado en recent_days.';
+$lang['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['mailprefix']            = 'Prefixo de asunto de correo-e para as mensaxes automáticas';
+$lang['htmlmail']              = 'Enviar correos electrónicos HTML multiparte máis estéticos, pero máis grande en tamaño. Deshabilitar para mandar correos electrónicos en texto claro.';
+$lang['sitemap']               = 'Xerar mapa do sitio co Google (días)';
+$lang['rss_type']              = 'Tipo de corrente RSS XML';
+$lang['rss_linkto']            = 'A corrente XML liga para';
+$lang['rss_content']           = 'Que queres amosar nos elementos da corrente XML?';
+$lang['rss_update']            = 'Intervalo de actualización da corrente XML (seg.)';
+$lang['rss_show_summary']      = 'Amosar sumario no título da corrente XML';
+$lang['rss_media']             = 'Qué tipo de cambios deben ser listados no feed XML?';
+$lang['updatecheck']           = 'Comprobar se hai actualizacións e avisos de seguridade? O DokuWiki precisa contactar con update.dokuwiki.org para executar esta característica.';
+$lang['userewrite']            = 'Utilizar URLs amigábeis';
+$lang['useslash']              = 'Utilizar a barra inclinada (/) como separador de nome de espazo nos URLs';
+$lang['sepchar']               = 'Verba separadora do nome de páxina';
+$lang['canonical']             = 'Utilizar URLs completamente canónicos';
+$lang['fnencode']              = 'Método para codificar os nomes de arquivo non-ASCII.';
+$lang['autoplural']            = 'Comprobar formas plurais nas ligazóns';
+$lang['compression']           = 'Método de compresión para arquivos attic';
+$lang['gzip_output']           = 'Utilizar Contido-Codificación gzip para o xhtml';
+$lang['compress']              = 'Saída compacta de CSS e Javascript';
+$lang['cssdatauri']            = 'Tamaño en bytes ata o cal as imaxes referenciadas nos CSS serán incrustadas na folla de estilos para disminuir o tamaño das cabeceiras das solicitudes HTTP. Esta técnica non funcionará en IE 7 ou anteriores! entre 400 e 600 bytes é un valor axeitado. Establecer a 0 para deshabilitar.';
+$lang['send404']               = 'Enviar "HTTP 404/Páxina non atopada" para as páxinas inexistentes';
+$lang['broken_iua']            = 'Rachou a función ignore_user_abort no teu sistema? Isto podería causar que o índice de procura non funcione. Coñécese que o IIS+PHP/CGI ráchaa. Bótalle un ollo ao Bug 852 para obter máis información.';
+$lang['xsendfile']             = 'Empregar a cabeceira X-Sendfile para que o servidor web envie arquivos estáticos? O teu servidor web precisa soportar isto.';
+$lang['renderer_xhtml']        = 'Intérprete a empregar para a saída principal (XHTML) do Wiki';
+$lang['renderer__core']        = '%s (núcleo do Dokuwiki)';
+$lang['renderer__plugin']      = '%s (extensión)';
+$lang['dnslookups']            = 'DokuWiki resolverá os nomes de host das direccións IP dos usuarios que editan as páxinas. Si contas un servidor DNS lento, que non funciona ou non che interesa esta característica, deshabilita esta opción';
+$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['proxy____except']       = 'Expresión regular para atopar URLs que deban ser omitidas polo Proxy.';
+$lang['safemodehack']          = 'Activar hack de modo seguro (safemode)';
+$lang['ftp____host']           = 'Servidor FTP para o hack de modo seguro (safemode)';
+$lang['ftp____port']           = 'Porto FTP para o hack de modo seguro(safemode)';
+$lang['ftp____user']           = 'Nome de usuario FTP para o hack de modo seguro(safemode)';
+$lang['ftp____pass']           = 'Contrasinal FTP para o hack de modo seguro(safemode)';
+$lang['ftp____root']           = 'Directorio raigaña do FTP para o hack de modo seguro(safemode)';
+$lang['license_o_']            = 'Non se escolleu nada';
+$lang['typography_o_0']        = 'ningunha';
+$lang['typography_o_1']        = 'Só dobres aspas';
+$lang['typography_o_2']        = 'Todas as aspas (pode que non funcione sempre)';
+$lang['userewrite_o_0']        = 'ningún';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'Interno do DokuWiki';
+$lang['deaccent_o_0']          = 'desconectado';
+$lang['deaccent_o_1']          = 'Eliminar acentos';
+$lang['deaccent_o_2']          = 'romanizar';
+$lang['gdlib_o_0']             = 'Libraría GD non dispoñíbel';
+$lang['gdlib_o_1']             = 'Versión 1.x';
+$lang['gdlib_o_2']             = 'Detección automática';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$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_diff']    = 'Formato Unified Diff';
+$lang['rss_content_o_htmldiff'] = 'Táboa diff formatada en HTML';
+$lang['rss_content_o_html']    = 'Contido HTML completo da páxina';
+$lang['rss_linkto_o_diff']     = 'vista de diferenzas';
+$lang['rss_linkto_o_page']     = 'a páxina revisada';
+$lang['rss_linkto_o_rev']      = 'listaxe de revisións';
+$lang['rss_linkto_o_current']  = 'a páxina actual';
+$lang['compression_o_0']       = 'ningunha';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'non o empregues';
+$lang['xsendfile_o_1']         = 'Cabeceira lighttpd propietaria (denantes da versión 1.5)';
+$lang['xsendfile_o_2']         = 'Cabeceira X-Sendfile estándar';
+$lang['xsendfile_o_3']         = 'Cabeceira X-Accel-Redirect propia de Nginx';
+$lang['showuseras_o_loginname'] = 'Nome de inicio de sesión';
+$lang['showuseras_o_username'] = 'Nome completo do usuario';
+$lang['showuseras_o_email']    = 'Enderezo de correo-e do usuario (ofuscado segundo a configuración mailguard)';
+$lang['showuseras_o_email_link'] = 'Enderezo de correo-e do usuario como ligazón mailto:';
+$lang['useheading_o_0']        = 'Endexamais';
+$lang['useheading_o_navigation'] = 'Só Navegación';
+$lang['useheading_o_content']  = 'Só Contido do Wiki';
+$lang['useheading_o_1']        = 'Sempre';
+$lang['readdircache']          = 'Edad máxima para o directorio de caché (seg)';
diff --git a/sources/lib/plugins/config/lang/he/intro.txt b/sources/lib/plugins/config/lang/he/intro.txt
new file mode 100644
index 0000000..010c690
--- /dev/null
+++ b/sources/lib/plugins/config/lang/he/intro.txt
@@ -0,0 +1,9 @@
+====== מנהל תצורה ======
+
+ניתן להשתמש בדף זה לשליטה על הגדרות התקנת ה-Dokuwiki שלך.  לעזרה בנוגע להגדרות ספציפיות ניתן לפנות אל [[doku>config]]. למידע נוסף אודות תוסף זה ניתן לפנות אל [[doku>plugin:config]].
+
+הגדרות עם רקע אדום-בהיר מוגנות ואין אפשרות לשנותן עם תוסף זה. הגדרות עם רקע כחול הן בעלות ערך ברירת המחדל והגדרות עם רקע לבן הוגדרו באופן מקומי עבור התקנה זו. ההגדרות בעלות הרקעים הכחול והלבן הן ברות שינוי.
+
+יש לזכור ללחוץ על כפתור ה**שמירה** טרם עזיבת דף זה פן יאבדו השינויים.
+
+
diff --git a/sources/lib/plugins/config/lang/he/lang.php b/sources/lib/plugins/config/lang/he/lang.php
new file mode 100644
index 0000000..bddfd90
--- /dev/null
+++ b/sources/lib/plugins/config/lang/he/lang.php
@@ -0,0 +1,165 @@
+
+ * @author Dotan Kamber 
+ * @author Moshe Kaplan 
+ * @author Yaron Yogev 
+ * @author Yaron Shahrabani 
+ */
+$lang['menu']                  = 'הגדרות תצורה';
+$lang['error']                 = 'ההגדרות לא עודכנו בגלל ערך לא תקף, נא לעיין בשינויים ולשלוח שנית.
+                       
        הערכים שאינם נכונים יסומנו בגבול אדום.';
+$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['_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']             = 'השתמש בראשיות גדולות לקישורים';
+$lang['deaccent']              = 'נקה שמות דפים';
+$lang['useheading']            = 'השתמש בכותרת הראשונה לשם הדף';
+$lang['refcheck']              = 'בדוק שיוך מדיה';
+$lang['allowdebug']            = 'אפשר דיבוג יש לבטל אם אין צורך!';
+$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']             = 'משתמש-על';
+$lang['manager']               = 'מנהל - קבוצה, משתמש או רשימה מופרדת בפסיקים משתמש1, @קבוצה1, משתמש2 עם גישה לפעולות ניהול מסוימות.';
+$lang['profileconfirm']        = 'אשר שינוי פרופילים עם סיסמה';
+$lang['disableactions']        = 'בטל פעולות DokuWiki';
+$lang['disableactions_check']  = 'בדיקה';
+$lang['disableactions_subscription'] = 'הרשמה/הסרה מרשימה';
+$lang['disableactions_wikicode'] = 'הצגת המקור/יצוא גולמי';
+$lang['disableactions_other']  = 'פעולות אחרות (מופרדות בפסיק)';
+$lang['sneaky_index']          = 'כברירת מחדל, דוקוויקי יציג את כל מרחבי השמות בתצוגת תוכן הענינים. בחירה באפשרות זאת תסתיר את אלו שבהם למשתמש אין הרשאות קריאה. התוצאה עלולה להיות הסתרת תת מרחבי שמות אליהם יש למשתמש גישה. באופן זה תוכן הענינים עלול להפוך לחסר תועלת עם הגדרות ACL מסוימות';
+$lang['auth_security_timeout'] = 'מגבלת אבטח פסק הזמן להזדהות (שניות)';
+$lang['updatecheck']           = 'בדיקת עידכוני אבטחה והתראות? על DokuWiki להתקשר אל update.dokuwiki.org לצורך כך.';
+$lang['userewrite']            = 'השתמש בכתובות URL יפות';
+$lang['useslash']              = 'השתמש בלוכסן להגדרת מרחבי שמות בכתובות';
+$lang['usedraft']              = 'שמור טיוטות באופן אוטומטי בעת עריכה';
+$lang['sepchar']               = 'מפריד בין מילות שם-דף';
+$lang['canonical']             = 'השתמש בכתובות URL מלאות';
+$lang['autoplural']            = 'בדוק לצורת רבים בקישורים';
+$lang['compression']           = 'אופן דחיסת קבצים ב-attic';
+$lang['cachetime']             = 'גיל מירבי לזכרון מטמון (שניות)';
+$lang['locktime']              = 'גיל מירבי לקבצי נעילה (שניות)';
+$lang['fetchsize']             = 'גודל הקובץ המירבי (bytes) ש-fetch.php יכול להוריד מבחוץ';
+$lang['notify']                = 'שלח התראות על שינויים לכתובת דוא"ל זו';
+$lang['registernotify']        = 'שלח מידע על משתמשים רשומים חדשים לכתובת דוא"ל זו';
+$lang['mailfrom']              = 'כתובת הדוא"ל לשימוש בדברי דוא"ל אוטומטיים';
+$lang['gzip_output']           = 'השתמש בקידוד תוכן של gzip עבור xhtml';
+$lang['gdlib']                 = 'גרסת ספרית ה-GD';
+$lang['im_convert']            = 'נתיב לכלי ה-convert של ImageMagick';
+$lang['jpg_quality']           = 'איכות הדחיסה של JPG (0-100)';
+$lang['subscribers']           = 'התר תמיכה ברישום לדפים';
+$lang['compress']              = 'פלט קומפקטי של CSS ו-javascript';
+$lang['hidepages']             = 'הסתר דפים תואמים (ביטויים רגולריים)';
+$lang['send404']               = 'שלח "HTTP 404/Page Not Found" עבור דפים שאינם קיימים';
+$lang['sitemap']               = 'צור מפת אתר של Google (ימים)';
+$lang['broken_iua']            = 'האם הפעולה ignore_user_abort תקולה במערכת שלך? הדבר עלול להביא לתוכן חיפוש שאינו תקין. IIS+PHP/CGI ידוע כתקול. ראה את באג 852 למידע נוסף';
+$lang['xsendfile']             = 'להשתמש בכותר X-Sendfile כדי לאפשר לשרת לספק קבצים סטטיים? על השרת שלך לתמוך באפשרות זאת.';
+$lang['renderer_xhtml']        = 'מחולל לשימוש עבור פלט הויקי העיקרי (xhtml)';
+$lang['renderer__core']        = '%s (ליבת דוקוויקי)';
+$lang['renderer__plugin']      = '%s (הרחבות)';
+$lang['rss_type']              = 'סוג פלט XML';
+$lang['rss_linkto']            = 'פלט ה-XML מקשר אל';
+$lang['rss_content']           = 'מה להציג בפרטי פלט ה-XML';
+$lang['rss_update']            = 'פלט ה-XML מתעדכן כל (שניות)';
+$lang['recent_days']           = 'כמה שינויים אחרונים לשמור (ימים)';
+$lang['rss_show_summary']      = 'פלט ה-XML מציג תקציר בכותרת';
+$lang['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 אינה זמינה';
+$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_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']  = 'הדף הנוכחי';
+$lang['compression_o_0']       = 'ללא';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'אל תשתמש';
+$lang['xsendfile_o_1']         = 'כותר lighttpd קנייני (לפני גרסה 1.5)';
+$lang['xsendfile_o_2']         = 'כותר X-Sendfile רגיל';
+$lang['xsendfile_o_3']         = 'כותר Nginx X-Accel-Redirect קנייני';
+$lang['useheading_o_navigation'] = 'ניווט בלבד';
+$lang['useheading_o_1']        = 'תמיד';
diff --git a/sources/lib/plugins/config/lang/hi/lang.php b/sources/lib/plugins/config/lang/hi/lang.php
new file mode 100644
index 0000000..a224fdf
--- /dev/null
+++ b/sources/lib/plugins/config/lang/hi/lang.php
@@ -0,0 +1,14 @@
+
+ * @author yndesai@gmail.com
+ */
+$lang['sepchar']               = 'पृष्ठ का नाम शब्द प्रथक्कर';
+$lang['sitemap']               = 'गूगल का सूचना पटल नक्शा बनायें (दिन)';
+$lang['license_o_']            = 'कुछ नहीं चुना';
+$lang['typography_o_0']        = 'कुछ नहीं';
+$lang['showuseras_o_username'] = 'उपयोगकर्ता का पूर्ण नाम';
+$lang['useheading_o_0']        = 'कभी नहीं';
+$lang['useheading_o_1']        = 'हमेशा';
diff --git a/sources/lib/plugins/config/lang/hr/lang.php b/sources/lib/plugins/config/lang/hr/lang.php
new file mode 100644
index 0000000..96f1d6a
--- /dev/null
+++ b/sources/lib/plugins/config/lang/hr/lang.php
@@ -0,0 +1,8 @@
+
+ * @author Dražen Odobašić 
+ * @author Dejan Igrec dejan.igrec@gmail.com
+ */
diff --git a/sources/lib/plugins/config/lang/hu/intro.txt b/sources/lib/plugins/config/lang/hu/intro.txt
new file mode 100644
index 0000000..b6b9149
--- /dev/null
+++ b/sources/lib/plugins/config/lang/hu/intro.txt
@@ -0,0 +1,9 @@
+====== Beállító központ ======
+
+Ezzel az oldallal finomhangolhatod a DokuWiki rendszeredet. Az egyes beállításokhoz [[doku>config|itt]] kaphatsz segítséget. A bővítmények (pluginek) beállításaihoz [[doku>plugin:config|ezt]] az oldalt látogasd meg.
+
+A világospiros hátterű beállítások védettek, ezzel a bővítménnyel nem módosíthatóak.
+
+A kék hátterű beállítások az alapértelmezett értékek, a fehér hátterűek módosítva lettek ebben a rendszerben. Mindkét hátterű beállítások módosíthatóak.
+
+Ne felejtsd a **Mentés** gombot megnyomni, mielőtt elhagyod az oldalt, különben a módosításaid elvesznek!
diff --git a/sources/lib/plugins/config/lang/hu/lang.php b/sources/lib/plugins/config/lang/hu/lang.php
new file mode 100644
index 0000000..6f774bf
--- /dev/null
+++ b/sources/lib/plugins/config/lang/hu/lang.php
@@ -0,0 +1,198 @@
+
+ * @author Siaynoq Mage 
+ * @author schilling.janos@gmail.com
+ * @author Szabó Dávid 
+ * @author Sándor TIHANYI 
+ * @author David Szabo 
+ * @author Marton Sebok 
+ */
+$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.
+
        A helytelen érték(ek)et piros kerettel jelöljük.';
+$lang['updated']               = 'A módosítások sikeresen beállítva.';
+$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';
+$lang['_header_template']      = 'Sablon beállítások';
+$lang['_header_undefined']     = 'Nem definiált értékek';
+$lang['_basic']                = 'Alap beállítások';
+$lang['_display']              = 'Megjelenítés beállításai';
+$lang['_authentication']       = 'Azonosítás beállításai';
+$lang['_anti_spam']            = 'Anti-Spam beállítások';
+$lang['_editing']              = 'Szerkesztési beállítások';
+$lang['_links']                = 'Link beállítások';
+$lang['_media']                = 'Média beállítások';
+$lang['_notifications']        = 'Értesítési beállítások';
+$lang['_syndication']          = 'Hírfolyam beállítások';
+$lang['_advanced']             = 'Haladó beállítások';
+$lang['_network']              = 'Hálózati beállítások';
+$lang['_msg_setting_undefined'] = 'Nincs beállított metaadat.';
+$lang['_msg_setting_no_class'] = 'Nincs beállított osztály.';
+$lang['_msg_setting_no_default'] = 'Nincs alapértelmezett érték.';
+$lang['title']                 = 'Wiki neve';
+$lang['start']                 = 'Kezdőoldal neve';
+$lang['lang']                  = 'Nyelv';
+$lang['template']              = 'Sablon';
+$lang['tagline']               = 'Lábléc (ha a sablon támogatja)';
+$lang['sidebar']               = 'Oldalsáv oldal neve (ha a sablon támogatja), az üres mező letiltja az oldalsáv megjelenítését';
+$lang['license']               = 'Milyen licenc alatt érhető el a tartalom?';
+$lang['savedir']               = 'Könyvtár az adatok mentésére';
+$lang['basedir']               = 'Báziskönyvtár (pl. /dokuwiki/). Hagyd üresen az automatikus beállításhoz!';
+$lang['baseurl']               = 'Báziscím (pl. http://www.yourserver.com). Hagyd üresen az automatikus beállításhoz!';
+$lang['cookiedir']             = 'Sütik címe. Hagy üresen a báziscím használatához!';
+$lang['dmode']                 = 'Könyvtár létrehozási maszk';
+$lang['fmode']                 = 'Fájl létrehozási maszk';
+$lang['allowdebug']            = 'Debug üzemmód Kapcsold ki, hacsak biztos nem szükséges!';
+$lang['recent']                = 'Utolsó változatok száma';
+$lang['recent_days']           = 'Hány napig tartsuk meg a korábbi változatokat?';
+$lang['breadcrumbs']           = 'Nyomvonal elemszám';
+$lang['youarehere']            = 'Hierarchikus nyomvonal';
+$lang['fullpath']              = 'Az oldalak teljes útvonalának mutatása a láblécben';
+$lang['typography']            = 'Legyen-e tipográfiai csere';
+$lang['dformat']               = 'Dátum formázás (lásd a PHP strftime függvényt)';
+$lang['signature']             = 'Aláírás';
+$lang['showuseras']            = 'A felhasználó melyik adatát mutassunk az utolsó változtatás adatainál?';
+$lang['toptoclevel']           = 'A tartalomjegyzék felső szintje';
+$lang['tocminheads']           = 'Legalább ennyi címsor hatására generálódjon tartalomjegyzék';
+$lang['maxtoclevel']           = 'A tartalomjegyzék mélysége';
+$lang['maxseclevel']           = 'A szakasz-szerkesztés maximális szintje';
+$lang['camelcase']             = 'CamelCase használata hivatkozásként';
+$lang['deaccent']              = 'Oldalnevek ékezettelenítése';
+$lang['useheading']            = 'Az első fejléc legyen az oldalnév';
+$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['hidepages']             = 'Az itt megadott oldalak elrejtése (reguláris kifejezés)';
+$lang['useacl']                = 'Hozzáférési listák (ACL) használata';
+$lang['autopasswd']            = 'Jelszavak automatikus generálása';
+$lang['authtype']              = 'Authentikációs háttérrendszer';
+$lang['passcrypt']             = 'Jelszó titkosítási módszer';
+$lang['defaultgroup']          = 'Alapértelmezett csoport';
+$lang['superuser']             = 'Adminisztrátor - csoport vagy felhasználó, aki teljes hozzáférési joggal rendelkezik az oldalakhoz és funkciókhoz, a hozzáférési jogosultságoktól függetlenül';
+$lang['manager']               = 'Menedzser - csoport vagy felhasználó, aki bizonyos menedzsment funkciókhoz hozzáfér';
+$lang['profileconfirm']        = 'Beállítások változtatásának megerősítése jelszóval';
+$lang['rememberme']            = 'Állandó sütik engedélyezése (az "emlékezz rám" funkcióhoz)';
+$lang['disableactions']        = 'Bizonyos DokuWiki tevékenységek (action) tiltása';
+$lang['disableactions_check']  = 'Ellenőrzés';
+$lang['disableactions_subscription'] = 'Feliratkozás/Leiratkozás';
+$lang['disableactions_wikicode'] = 'Forrás megtekintése/Nyers adat exportja';
+$lang['disableactions_other']  = 'Egyéb tevékenységek (vesszővel elválasztva)';
+$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['remote']                = 'Távoli API engedélyezése. Ezzel más alkalmazások XML-RPC-n keresztül hozzáférhetnek a wikihez.';
+$lang['remoteuser']            = 'A távoli API hozzáférés korlátozása a következő felhasználókra vagy csoportokra. Hagyd üresen, ha mindenki számára elérhető!';
+$lang['usewordblock']          = 'Szólista alapú spam-szűrés';
+$lang['relnofollow']           = 'rel="nofollow" beállítás használata külső hivatkozásokra';
+$lang['indexdelay']            = 'Várakozás indexelés előtt (másodperc)';
+$lang['mailguard']             = 'Email címek olvashatatlanná tétele címgyűjtők számára';
+$lang['iexssprotect']          = 'Feltöltött fájlok ellenőrzése kártékony JavaScript vagy HTML kód elkerülésére';
+$lang['usedraft']              = 'Piszkozat automatikus mentése szerkesztés alatt';
+$lang['htmlok']                = 'Beágyazott HTML engedélyezése';
+$lang['phpok']                 = 'Beágyazott PHP engedélyezése';
+$lang['locktime']              = 'Oldal-zárolás maximális időtartama (másodperc)';
+$lang['cachetime']             = 'A gyorsítótár maximális élettartama (másodperc)';
+$lang['target____wiki']        = 'Cél-ablak belső hivatkozásokhoz';
+$lang['target____interwiki']   = 'Cél-ablak interwiki hivatkozásokhoz';
+$lang['target____extern']      = 'Cél-ablak külső hivatkozásokhoz';
+$lang['target____media']       = 'Cél-ablak média-fájl hivatkozásokhoz';
+$lang['target____windows']     = 'Cél-ablak Windows hivatkozásokhoz';
+$lang['mediarevisions']        = 'Médiafájlok verziókövetésének engedélyezése';
+$lang['refcheck']              = 'Médiafájlok hivatkozásainak ellenőrzése';
+$lang['gdlib']                 = 'GD Lib verzió';
+$lang['im_convert']            = 'Útvonal az ImageMagick csomag convert parancsához';
+$lang['jpg_quality']           = 'JPG tömörítés minősége (0-100)';
+$lang['fetchsize']             = 'Maximális méret (bájtban), amit a fetch.php letölthet kívülről';
+$lang['subscribers']           = 'Oldalváltozás-listára feliratkozás engedélyezése';
+$lang['subscribe_time']        = 'Az értesítések kiküldésének késleltetése (másodperc); Érdemes kisebbet választani, mint a változások megőrzésének maximális ideje.';
+$lang['notify']                = 'Az oldal-változásokat erre az e-mail címre küldje';
+$lang['registernotify']        = 'Értesítés egy újonnan regisztrált felhasználóról erre az e-mail címre';
+$lang['mailfrom']              = 'Az automatikusan küldött levelekben használt e-mail cím';
+$lang['mailprefix']            = 'Előtag az automatikus e-mailek tárgyában';
+$lang['htmlmail']              = 'Szebb, de nagyobb méretű HTML multipart e-mailek küldése. Tiltsd le a nyers szöveges üzenetekhez!';
+$lang['sitemap']               = 'Hány naponként generáljunk Google sitemap-ot?';
+$lang['rss_type']              = 'XML hírfolyam típus';
+$lang['rss_linkto']            = 'XML hírfolyam hivatkozás';
+$lang['rss_content']           = 'Mit mutassunk az XML hírfolyam elemekben?';
+$lang['rss_update']            = 'Hány másodpercenként frissítsük az XML hírfolyamot?';
+$lang['rss_show_summary']      = 'A hírfolyam címébe összefoglaló helyezése';
+$lang['rss_media']             = 'Milyen változások legyenek felsorolva az XML hírfolyamban?';
+$lang['updatecheck']           = 'Frissítések és biztonsági figyelmeztetések figyelése. Ehhez a DokuWikinek kapcsolatba kell lépnie a update.dokuwiki.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';
+$lang['sepchar']               = 'Szó elválasztó az oldalnevekben';
+$lang['canonical']             = 'Teljesen kanonikus URL-ek használata';
+$lang['fnencode']              = 'A nem ASCII fájlnevek dekódolási módja';
+$lang['autoplural']            = 'Többes szám ellenőrzés a hivatkozásokban (angol)';
+$lang['compression']           = 'Tömörítés használata a törölt lapokhoz';
+$lang['gzip_output']           = 'gzip tömörítés használata xhtml-hez (Content-Encoding)';
+$lang['compress']              = 'CSS és JavaScript fájlok tömörítése';
+$lang['cssdatauri']            = 'Mérethatár bájtokban, ami alatti CSS-ben hivatkozott fájlok közvetlenül beágyazódjanak a stíluslapba. Ez IE 7-ben és alatta nem fog működni! 400-600 bájt ideális érték. Állítsd 0-ra a beágyazás kikapcsolásához!';
+$lang['send404']               = '"HTTP 404/Page Not Found" küldése nemlétező oldalak esetén';
+$lang['broken_iua']            = 'Az ignore_user_abort függvény hibát dob a rendszereden? Ez nem működő keresési indexet eredményezhet. Az IIS+PHP/CGI összeállításról tudjuk, hogy hibát dob. Lásd a Bug 852 oldalt a további infóért.';
+$lang['xsendfile']             = 'Használjuk az X-Sendfile fejlécet, hogy a webszerver statikus állományokat tudjon küldeni? A webszervernek is támogatnia kell ezt a funkciót.';
+$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)';
+$lang['dnslookups']            = 'A DokuWiki megpróbál hosztneveket keresni a távoli IP-címekhez. Amennyiben lassú, vagy nem működő DNS-szervered van vagy csak nem szeretnéd ezt a funkciót, tiltsd le ezt az opciót!';
+$lang['proxy____host']         = 'Proxy-szerver neve';
+$lang['proxy____port']         = 'Proxy port';
+$lang['proxy____user']         = 'Proxy felhasználó név';
+$lang['proxy____pass']         = 'Proxy jelszó';
+$lang['proxy____ssl']          = 'SSL használata a proxyhoz csatlakozáskor';
+$lang['proxy____except']       = 'URL szabály azokra a webcímekre, amit szeretnél, hogy ne kezeljen a proxy.';
+$lang['safemodehack']          = 'A PHP safemode beállítás megkerülésének engedélyezése';
+$lang['ftp____host']           = 'FTP szerver a safemode megkerüléshez';
+$lang['ftp____port']           = 'FTP port a safemode megkerüléshez';
+$lang['ftp____user']           = 'FTP felhasználó név a safemode megkerüléshez';
+$lang['ftp____pass']           = 'FTP jelszó a safemode megkerüléshez';
+$lang['ftp____root']           = 'FTP gyökérkönyvtár a safemode megkerüléshez';
+$lang['license_o_']            = 'Nincs kiválasztva';
+$lang['typography_o_0']        = 'nem';
+$lang['typography_o_1']        = 'Csak a dupla idézőjelet';
+$lang['typography_o_2']        = 'Minden idézőjelet (előfordulhat, hogy nem mindig működik)';
+$lang['userewrite_o_0']        = 'nem';
+$lang['userewrite_o_1']        = '.htaccess-szel';
+$lang['userewrite_o_2']        = 'DokuWiki saját módszerével';
+$lang['deaccent_o_0']          = 'kikapcsolva';
+$lang['deaccent_o_1']          = 'ékezetek eltávolítása';
+$lang['deaccent_o_2']          = 'távirati stílus';
+$lang['gdlib_o_0']             = 'GD Lib nem elérhető';
+$lang['gdlib_o_1']             = 'Version 1.x';
+$lang['gdlib_o_2']             = 'Auto felismerés';
+$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'] = 'Kivonat';
+$lang['rss_content_o_diff']    = 'Unified diff formátum';
+$lang['rss_content_o_htmldiff'] = 'HTML formázott változás tábla';
+$lang['rss_content_o_html']    = 'Teljes HTML oldal tartalom';
+$lang['rss_linkto_o_diff']     = 'a változás nézetre';
+$lang['rss_linkto_o_page']     = 'az átdolgozott oldalra';
+$lang['rss_linkto_o_rev']      = 'a változatok listájára';
+$lang['rss_linkto_o_current']  = 'a jelenlegi oldalra';
+$lang['compression_o_0']       = 'nincs tömörítés';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'nincs használatban';
+$lang['xsendfile_o_1']         = 'Lighttpd saját fejléc (1.5-ös verzió előtti)';
+$lang['xsendfile_o_2']         = 'Standard X-Sendfile fejléc';
+$lang['xsendfile_o_3']         = 'Nginx saját X-Accel-Redirect fejléce';
+$lang['showuseras_o_loginname'] = 'Azonosító';
+$lang['showuseras_o_username'] = 'Teljes név';
+$lang['showuseras_o_email']    = 'E-mail cím (olvashatatlanná téve az e-mailcím védelem beállítása szerint)';
+$lang['showuseras_o_email_link'] = 'E-mail cím mailto: linkként';
+$lang['useheading_o_0']        = 'Soha';
+$lang['useheading_o_navigation'] = 'Csak navigációhoz';
+$lang['useheading_o_content']  = 'Csak Wiki tartalomhoz';
+$lang['useheading_o_1']        = 'Mindig';
+$lang['readdircache']          = 'A könyvtár olvasás gyorsítótárának maximális tárolási ideje (másodperc)';
diff --git a/sources/lib/plugins/config/lang/ia/intro.txt b/sources/lib/plugins/config/lang/ia/intro.txt
new file mode 100644
index 0000000..37b970c
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ia/intro.txt
@@ -0,0 +1,7 @@
+====== Gestion de configurationes ======
+
+Usa iste pagina pro controlar le configurationes de tu installation de DokuWiki. Pro adjuta re configurationes individual, refere te a [[doku>config]].
+
+Le configurationes monstrate super un fundo rubie clar es protegite e non pote esser alterate con iste plug-in. Le configurationes monstrate super un fundo blau es le valores predefinite e le configurationes monstrate super un fundo blanc ha essite definite localmente pro iste particular installation. Le configurationes blau e blanc pote esser alterate.
+
+Rememora de premer le button **SALVEGUARDAR** ante de quitar iste pagina, alteremente tu modificationes essera perdite.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/ia/lang.php b/sources/lib/plugins/config/lang/ia/lang.php
new file mode 100644
index 0000000..c343003
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ia/lang.php
@@ -0,0 +1,175 @@
+
+ * @author Martijn Dekker 
+ */
+$lang['menu']                  = 'Configurationes';
+$lang['error']                 = 'Le configurationes non poteva esser actualisate a causa de un valor invalide; per favor revide tu cambiamentos e resubmitte los.
        Le valor(es) incorrecte essera monstrate circumferite per un bordo rubie.';
+$lang['updated']               = 'Actualisation del configurationes succedite.';
+$lang['nochoice']              = '(nulle altere option disponibile)';
+$lang['locked']                = 'Le file de configuration non pote esser actualisate; si isto non es intentional, 
         assecura te que le nomine e permissiones del file local de configuration es correcte.';
+$lang['danger']                = 'Periculo: Cambiar iste option pote render tu wiki e le menu de configuration inaccessibile!';
+$lang['warning']               = 'Attention: Cambiar iste option pote causar functionamento indesirate.';
+$lang['security']              = 'Advertimento de securitate: Cambiar iste option pote causar un risco de securitate.';
+$lang['_configuration_manager'] = 'Gestion de configurationes';
+$lang['_header_dokuwiki']      = 'Configurationes de DokuWiki';
+$lang['_header_plugin']        = 'Configurationes de plug-ins';
+$lang['_header_template']      = 'Configurationes de patronos';
+$lang['_header_undefined']     = 'Configurationes non definite';
+$lang['_basic']                = 'Configurationes de base';
+$lang['_display']              = 'Configurationes de visualisation';
+$lang['_authentication']       = 'Configurationes de authentication';
+$lang['_anti_spam']            = 'Configurationes anti-spam';
+$lang['_editing']              = 'Configurationes de modification';
+$lang['_links']                = 'Configurationes de ligamines';
+$lang['_media']                = 'Configurationes de multimedia';
+$lang['_advanced']             = 'Configurationes avantiate';
+$lang['_network']              = 'Configurationes de rete';
+$lang['_msg_setting_undefined'] = 'Nulle metadatos de configuration.';
+$lang['_msg_setting_no_class'] = 'Nulle classe de configuration.';
+$lang['_msg_setting_no_default'] = 'Nulle valor predefinite.';
+$lang['fmode']                 = 'Permissiones al creation de files';
+$lang['dmode']                 = 'Permissiones al creation de directorios';
+$lang['lang']                  = 'Lingua del interfacie';
+$lang['basedir']               = 'Cammino al servitor (p.ex.. /dokuwiki/). Lassa vacue pro autodetection.';
+$lang['baseurl']               = 'URL del servitor (p.ex. http://www.yourserver.com). Lassa vacue pro autodetection.';
+$lang['savedir']               = 'Directorio pro salveguardar datos';
+$lang['start']                 = 'Nomine del pagina initial';
+$lang['title']                 = 'Titulo del wiki';
+$lang['template']              = 'Patrono';
+$lang['license']               = 'Sub qual licentia debe tu contento esser publicate?';
+$lang['fullpath']              = 'Revelar le cammino complete del paginas in le pede';
+$lang['recent']                = 'Modificationes recente';
+$lang['breadcrumbs']           = 'Numero de micas de pan';
+$lang['youarehere']            = 'Micas de pan hierarchic';
+$lang['typography']            = 'Face substitutiones typographic';
+$lang['htmlok']                = 'Permitter incorporation de HTML';
+$lang['phpok']                 = 'Permitter incorporation de PHP';
+$lang['dformat']               = 'Formato del datas (vide le function strftime de PHP)';
+$lang['signature']             = 'Signatura';
+$lang['toptoclevel']           = 'Nivello principal pro tabula de contento';
+$lang['tocminheads']           = 'Numero minimal de titulos requirite pro inserer tabula de contento';
+$lang['maxtoclevel']           = 'Nivello maximal pro tabula de contento';
+$lang['maxseclevel']           = 'Nivello maximal pro modification de sectiones';
+$lang['camelcase']             = 'Usar CamelCase pro ligamines';
+$lang['deaccent']              = 'Nomines nette de paginas';
+$lang['useheading']            = 'Usar le prime titulo como nomine de pagina';
+$lang['refcheck']              = 'Verification de referentias multimedia';
+$lang['allowdebug']            = 'Permitter debugging disactiva si non necessari!';
+$lang['usewordblock']          = 'Blocar spam a base de lista de parolas';
+$lang['indexdelay']            = 'Retardo ante generation de indice (secundas)';
+$lang['relnofollow']           = 'Usar rel="nofollow" pro ligamines externe';
+$lang['mailguard']             = 'Offuscar adresses de e-mail';
+$lang['iexssprotect']          = 'Verificar files incargate pro codice HTML o JavaScript possibilemente malitiose';
+$lang['showuseras']            = 'Como monstrar le usator que faceva le ultime modification de un pagina';
+$lang['useacl']                = 'Usar listas de controlo de accesso';
+$lang['autopasswd']            = 'Automaticamente generar contrasignos';
+$lang['authtype']              = 'Servicio de authentication';
+$lang['passcrypt']             = 'Methodo de cryptographia de contrasignos';
+$lang['defaultgroup']          = 'Gruppo predefinite';
+$lang['superuser']             = 'Superusator: le gruppo, usator o lista separate per commas ("usator1,@gruppo1,usator2") con accesso integral a tote le paginas e functiones sin reguardo del ACL';
+$lang['manager']               = 'Administrator: le gruppo, usator o lista separate per commas ("usator1,@gruppo1,usator2") con accesso a certe functiones administrative';
+$lang['profileconfirm']        = 'Confirmar modificationes del profilo con contrasigno';
+$lang['disableactions']        = 'Disactivar actiones DokuWiki';
+$lang['disableactions_check']  = 'Verificar';
+$lang['disableactions_subscription'] = 'Subscriber/Cancellar subscription';
+$lang['disableactions_wikicode'] = 'Vider codice-fonte/Exportar texto crude';
+$lang['disableactions_other']  = 'Altere actiones (separate per commas)';
+$lang['sneaky_index']          = 'Normalmente, DokuWiki monstra tote le spatios de nomines in le vista del indice. Si iste option es active, illos ubi le usator non ha le permission de lectura essera celate. Isto pote resultar in le celamento de subspatios de nomines accessibile. Isto pote render le indice inusabile con certe configurationes de ACL.';
+$lang['auth_security_timeout'] = 'Expiration pro securitate de authentication (secundas)';
+$lang['securecookie']          = 'Debe le cookies definite via HTTPS solmente esser inviate via HTTPS per le navigator? Disactiva iste option si solmente le apertura de sessiones a tu wiki es protegite con SSL ma le navigation del wiki es facite sin securitate.';
+$lang['updatecheck']           = 'Verificar si existe actualisationes e advertimentos de securitate? DokuWiki debe contactar update.dokuwiki.org pro exequer iste function.';
+$lang['userewrite']            = 'Usar URLs nette';
+$lang['useslash']              = 'Usar le barra oblique ("/") como separator de spatios de nomines in URLs';
+$lang['usedraft']              = 'Automaticamente salveguardar un version provisori durante le modification';
+$lang['sepchar']               = 'Separator de parolas in nomines de paginas';
+$lang['canonical']             = 'Usar URLs completemente canonic';
+$lang['autoplural']            = 'Verificar si il ha formas plural in ligamines';
+$lang['compression']           = 'Methodo de compression pro files a mansarda';
+$lang['cachetime']             = 'Etate maximal pro le cache (secundas)';
+$lang['locktime']              = 'Etate maximal pro le files de serratura (secundas)';
+$lang['fetchsize']             = 'Numero maximal de bytes per file que fetch.php pote discargar de sitos externe';
+$lang['notify']                = 'Inviar notificationes de cambios a iste adresse de e-mail';
+$lang['registernotify']        = 'Inviar informationes super usatores novemente registrate a iste adresse de e-mail';
+$lang['mailfrom']              = 'Adresse de e-mail a usar pro messages automatic';
+$lang['gzip_output']           = 'Usar Content-Encoding gzip pro xhtml';
+$lang['gdlib']                 = 'Version de GD Lib';
+$lang['im_convert']            = 'Cammino al programma "convert" de ImageMagick';
+$lang['jpg_quality']           = 'Qualitate del compression JPEG (0-100)';
+$lang['subscribers']           = 'Activar le possibilitate de subscriber se al paginas';
+$lang['subscribe_time']        = 'Tempore post le qual le listas de subscription e le digestos es inviate (in secundas); isto debe esser minor que le tempore specificate in recent_days.';
+$lang['compress']              = 'Compactar le output CSS e JavaScript';
+$lang['hidepages']             = 'Celar paginas correspondente (expressiones regular)';
+$lang['send404']               = 'Inviar "HTTP 404/Pagina non trovate" pro paginas non existente';
+$lang['sitemap']               = 'Generar mappa de sito Google (dies)';
+$lang['broken_iua']            = 'Es le function ignore_user_abort defectuose in tu systema? Isto pote resultar in un indice de recerca que non functiona. Vide Bug 852 pro plus info.';
+$lang['xsendfile']             = 'Usar le capite X-Sendfile pro lassar le servitor web livrar files static? Tu navigator del web debe supportar isto.';
+$lang['renderer_xhtml']        = 'Renditor a usar pro le output wiki principal (xhtml)';
+$lang['renderer__core']        = '%s (nucleo dokuwiki)';
+$lang['renderer__plugin']      = '%s (plug-in)';
+$lang['rememberme']            = 'Permitter cookies de session permanente (memorar me)';
+$lang['rss_type']              = 'Typo de syndication XML';
+$lang['rss_linkto']            = 'Syndication XML liga verso';
+$lang['rss_content']           = 'Que monstrar in le entratas de syndication XML?';
+$lang['rss_update']            = 'Intervallo de actualisation pro syndicationes XML (secundas)';
+$lang['recent_days']           = 'Retener quante modificationes recente? (dies)';
+$lang['rss_show_summary']      = 'Monstrar summario in titulo de syndication XML';
+$lang['target____wiki']        = 'Fenestra de destination pro ligamines interne';
+$lang['target____interwiki']   = 'Fenestra de destination pro ligamines interwiki';
+$lang['target____extern']      = 'Fenestra de destination pro ligamines externe';
+$lang['target____media']       = 'Fenestra de destination pro ligamines multimedia';
+$lang['target____windows']     = 'Fenestra de destination pro ligamines a fenestras';
+$lang['proxy____host']         = 'Nomine de servitor proxy';
+$lang['proxy____port']         = 'Porto del proxy';
+$lang['proxy____user']         = 'Nomine de usator pro le proxy';
+$lang['proxy____pass']         = 'Contrasigno pro le proxy';
+$lang['proxy____ssl']          = 'Usar SSL pro connecter al proxy';
+$lang['safemodehack']          = 'Permitter truco de modo secur';
+$lang['ftp____host']           = 'Servitor FTP pro truco de modo secur';
+$lang['ftp____port']           = 'Porto FTP pro truco de modo secur';
+$lang['ftp____user']           = 'Nomine de usator FTP pro truco de modo secur';
+$lang['ftp____pass']           = 'Contrasigno FTP pro truco de modo secur';
+$lang['ftp____root']           = 'Directorio radice FTP pro truco de modo securr';
+$lang['license_o_']            = 'Nihil seligite';
+$lang['typography_o_0']        = 'nulle';
+$lang['typography_o_1']        = 'excludente ';
+$lang['typography_o_2']        = 'includente virgulettas singule (pote non sempre functionar)';
+$lang['userewrite_o_0']        = 'nulle';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'interne a DokuWIki';
+$lang['deaccent_o_0']          = 'disactivate';
+$lang['deaccent_o_1']          = 'remover accentos';
+$lang['deaccent_o_2']          = 'romanisar';
+$lang['gdlib_o_0']             = 'GD Lib non disponibile';
+$lang['gdlib_o_1']             = 'Version 1.x';
+$lang['gdlib_o_2']             = 'Autodetection';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$lang['rss_type_o_rss1']       = 'RSS 1.0';
+$lang['rss_type_o_rss2']       = 'RSS 2.0';
+$lang['rss_type_o_atom']       = 'Atom 0.3';
+$lang['rss_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = 'Abstracte';
+$lang['rss_content_o_diff']    = 'In formato Unified Diff';
+$lang['rss_content_o_htmldiff'] = 'Tabella de diff in formato HTML';
+$lang['rss_content_o_html']    = 'Contento complete del pagina in HTML';
+$lang['rss_linkto_o_diff']     = 'vista de differentias';
+$lang['rss_linkto_o_page']     = 'le pagina revidite';
+$lang['rss_linkto_o_rev']      = 'lista de versiones';
+$lang['rss_linkto_o_current']  = 'le pagina actual';
+$lang['compression_o_0']       = 'nulle';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'non usar';
+$lang['xsendfile_o_1']         = 'Capite proprietari "lighttpd" (ante version 1.5)';
+$lang['xsendfile_o_2']         = 'Capite standard "X-Sendfile"';
+$lang['xsendfile_o_3']         = 'Capite proprietari "X-Accel-Redirect" de Nginx';
+$lang['showuseras_o_loginname'] = 'Nomine de usator';
+$lang['showuseras_o_username'] = 'Nomine real del usator';
+$lang['showuseras_o_email']    = 'Adresse de e-mail del usator (offuscate secundo le configuration de Mailguard)';
+$lang['showuseras_o_email_link'] = 'Adresse de e-mail del usator como ligamine "mailto:"';
+$lang['useheading_o_0']        = 'Nunquam';
+$lang['useheading_o_navigation'] = 'Navigation solmente';
+$lang['useheading_o_content']  = 'Contento wiki solmente';
+$lang['useheading_o_1']        = 'Sempre';
diff --git a/sources/lib/plugins/config/lang/id-ni/intro.txt b/sources/lib/plugins/config/lang/id-ni/intro.txt
new file mode 100644
index 0000000..cd77caa
--- /dev/null
+++ b/sources/lib/plugins/config/lang/id-ni/intro.txt
@@ -0,0 +1,7 @@
+====== Fakake famöfö'ö ======
+
+Plugin da'e itolo ba wangehaogö fakake moroi ba DokuWiki. Fanolo bawamöfö'ö tesöndra tou [[doku>config]]. Lala wangiila Plugin tanöbö'ö tesöndra tou ba [[doku>plugin:config]].
+
+Famöfö'ö zura furi la'a soyo no laproteksi, lötesöndra bakha ba Plugin andre. Famöfö'ö zura furi la'a sobalau ya'ia wamöfö'ö sito'ölö...
+
+Böi olifu ndra'ugö ba wofetugö **Irö'ö** fatua lö öröi fakake wamöfö'ö soguna bawangirö'ö wamöfö'ö safuria.
diff --git a/sources/lib/plugins/config/lang/id-ni/lang.php b/sources/lib/plugins/config/lang/id-ni/lang.php
new file mode 100644
index 0000000..7b7e14c
--- /dev/null
+++ b/sources/lib/plugins/config/lang/id-ni/lang.php
@@ -0,0 +1,68 @@
+
+ * @author Yustinus Waruwu 
+ */
+$lang['renderer_xhtml']        = 'Fake Renderer ba zito\'ölö (XHTML) Wiki-output.';
+$lang['renderer__core']        = '%s (dokuwiki core)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['rss_type']              = 'Tipe XML feed';
+$lang['rss_linkto']            = 'XML feed links khö';
+$lang['rss_content']           = 'Hadia wangoromaö nifake ba XML-Feed?';
+$lang['rss_update']            = 'XML feed (sec) inötö wamohouni';
+$lang['recent_days']           = 'Hawa\'oya laforoma\'ö moroi bazibohou? (Hari)';
+$lang['rss_show_summary']      = 'XML feed foromaö summary ba title';
+$lang['target____wiki']        = 'Lala window ba internal links';
+$lang['target____interwiki']   = 'Lala window ba interwiki links';
+$lang['target____extern']      = 'Lala window ba external links';
+$lang['target____media']       = 'Lala window ba media links';
+$lang['target____windows']     = 'Lala window ba windows links';
+$lang['proxy____host']         = 'Töi server proxy';
+$lang['proxy____port']         = 'Port proxy';
+$lang['proxy____user']         = 'Töi proxy';
+$lang['proxy____pass']         = 'Kode proxy';
+$lang['proxy____ssl']          = 'Fake ssl ba connect awö Proxy';
+$lang['safemodehack']          = 'Orifi safemode hack';
+$lang['ftp____host']           = 'FTP server khö safemode hack';
+$lang['ftp____port']           = 'FTP port khö safemode hack';
+$lang['ftp____user']           = 'Töi FTP khö safemode hack';
+$lang['ftp____pass']           = 'FTP kode khö safemode hack';
+$lang['ftp____root']           = 'FTP root directory for safemode hack';
+$lang['typography_o_0']        = 'lö\'ö';
+$lang['typography_o_1']        = 'Ha sitombua kutip';
+$lang['typography_o_2']        = 'Fefu nikutip (itataria lömohalöwö)';
+$lang['userewrite_o_0']        = 'lö\'ö';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki bakha';
+$lang['deaccent_o_0']          = 'ofolai';
+$lang['deaccent_o_1']          = 'heta aksen';
+$lang['deaccent_o_2']          = 'romanize';
+$lang['gdlib_o_0']             = 'GD Lib lötesöndra';
+$lang['gdlib_o_1']             = 'Versi 1.x';
+$lang['gdlib_o_2']             = 'Otomatis';
+$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'] = 'Abstrak';
+$lang['rss_content_o_diff']    = 'Unified Diff';
+$lang['rss_content_o_htmldiff'] = 'HTML formatted diff table';
+$lang['rss_content_o_html']    = 'Fefu HTML format diff table';
+$lang['rss_linkto_o_diff']     = 'foromaö difference';
+$lang['rss_linkto_o_page']     = 'Refisi nga\'örö';
+$lang['rss_linkto_o_rev']      = 'Daftar nihaogö';
+$lang['rss_linkto_o_current']  = 'Nga\'örö safuria';
+$lang['compression_o_0']       = 'Lö\'ö';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'böi fake';
+$lang['xsendfile_o_1']         = 'Proprieteri lighttpd Header (furi Release 1.5)';
+$lang['xsendfile_o_2']         = 'Standar X-Sendfile header';
+$lang['xsendfile_o_3']         = 'Proprieteri Nginx X-Accel-Redirect header';
+$lang['showuseras_o_loginname'] = 'Töi';
+$lang['showuseras_o_username'] = 'Töi safönu';
+$lang['showuseras_o_email']    = 'Fake döi imele (obfuscated according to mailguard setting)';
+$lang['showuseras_o_email_link'] = 'Fake döi imele sifao mailto: link';
diff --git a/sources/lib/plugins/config/lang/id/intro.txt b/sources/lib/plugins/config/lang/id/intro.txt
new file mode 100644
index 0000000..296206d
--- /dev/null
+++ b/sources/lib/plugins/config/lang/id/intro.txt
@@ -0,0 +1,5 @@
+====== Manajemen Konfigurasi ======
+
+Gunakan halaman ini untuk mengatur konfigurasi instalasi DokuWiki Anda. Untuk bantuan dalam konfigurasi, silahkan lihat di [[doku>config]]. Unuk mengetahui lebih lanjut tentang plugin in silahkan lihat [[doku>plugin:config]].
+
+Konfigurasi dengan warna merah dilindungi dan tidak bisa diubah dengan plugin ini. Konfigurasi dengan warna biru adalah nilai default, dan konfigurasi dengan latar putih telah diset khusus untuk instalasi ini. Konfigurasi berwarna putih atau b
diff --git a/sources/lib/plugins/config/lang/id/lang.php b/sources/lib/plugins/config/lang/id/lang.php
new file mode 100644
index 0000000..c3d4859
--- /dev/null
+++ b/sources/lib/plugins/config/lang/id/lang.php
@@ -0,0 +1,7 @@
+
+ * @author Yustinus Waruwu 
+ */
diff --git a/sources/lib/plugins/config/lang/is/lang.php b/sources/lib/plugins/config/lang/is/lang.php
new file mode 100644
index 0000000..a99b39c
--- /dev/null
+++ b/sources/lib/plugins/config/lang/is/lang.php
@@ -0,0 +1,57 @@
+
+ * @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['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 --git a/sources/lib/plugins/config/lang/it/intro.txt b/sources/lib/plugins/config/lang/it/intro.txt
new file mode 100644
index 0000000..617e8c7
--- /dev/null
+++ b/sources/lib/plugins/config/lang/it/intro.txt
@@ -0,0 +1,9 @@
+====== Configurazione Wiki ======
+
+Usa questa pagina per gestire la configurazione della tua installazione DokuWiki. Per la guida sulle singole impostazioni fai riferimento alla pagina [[doku>config|Configurazione]]. Per ulteriori dettagli su questo plugin vedi [[doku>plugin:config|Plugin di configurazione]].
+
+Le impostazioni con lo sfondo rosso chiaro sono protette e non possono essere modificate con questo plugin. Le impostazioni con lo sfondo blu contengono i valori predefiniti, e le impostazioni con lo sfondo bianco sono relative solo a questa particolare installazione. Sia le impostazioni su sfondo blu che quelle su sfondo bianco possono essere modificate.
+
+Ricordati di premere il pulsante **SALVA** prima di lasciare questa pagina altrimenti le modifiche andranno perse.
+
+
diff --git a/sources/lib/plugins/config/lang/it/lang.php b/sources/lib/plugins/config/lang/it/lang.php
new file mode 100644
index 0000000..7a831c8
--- /dev/null
+++ b/sources/lib/plugins/config/lang/it/lang.php
@@ -0,0 +1,204 @@
+
+ * @author Silvia Sargentoni 
+ * @author Pietro Battiston toobaz@email.it
+ * @author Diego Pierotto ita.translations@tiscali.it
+ * @author ita.translations@tiscali.it
+ * @author Lorenzo Breda 
+ * @author snarchio@alice.it
+ * @author robocap 
+ * @author Osman Tekin osman.tekin93@hotmail.it
+ * @author Jacopo Corbetta 
+ * @author Matteo Pasotti 
+ * @author snarchio@gmail.com
+ */
+$lang['menu']                  = 'Configurazione Wiki';
+$lang['error']                 = 'Impostazioni non aggiornate a causa di un valore non corretto, controlla le modifiche apportate e salva di nuovo.
+
        I valori non corretti sono evidenziati da un riquadro rosso.';
+$lang['updated']               = 'Aggiornamento impostazioni riuscito.';
+$lang['nochoice']              = '(nessun\'altra scelta disponibile)';
+$lang['locked']                = 'Il file di configurazione non può essere aggiornato, se questo non è intenzionale, 
        
+assicurati che il nome e i permessi del file contenente la configurazione locale siano corretti.';
+$lang['danger']                = 'Attenzione: cambiare questa opzione può rendere inaccessibile il wiki e il menu di configurazione.';
+$lang['warning']               = 'Avviso: cambiare questa opzione può causare comportamenti indesiderati.';
+$lang['security']              = 'Avviso di sicurezza: vambiare questa opzione può esporre a rischi di sicurezza.';
+$lang['_configuration_manager'] = 'Configurazione Wiki';
+$lang['_header_dokuwiki']      = 'Impostazioni DokuWiki';
+$lang['_header_plugin']        = 'Impostazioni Plugin';
+$lang['_header_template']      = 'Impostazioni Modello';
+$lang['_header_undefined']     = 'Impostazioni non definite';
+$lang['_basic']                = 'Impostazioni Base';
+$lang['_display']              = 'Impostazioni Visualizzazione';
+$lang['_authentication']       = 'Impostazioni Autenticazione';
+$lang['_anti_spam']            = 'Impostazioni Anti-Spam';
+$lang['_editing']              = 'Impostazioni Modifica';
+$lang['_links']                = 'Impostazioni Collegamenti';
+$lang['_media']                = 'Impostazioni File';
+$lang['_notifications']        = 'Impostazioni di notifica';
+$lang['_syndication']          = 'Impostazioni di collaborazione';
+$lang['_advanced']             = 'Impostazioni Avanzate';
+$lang['_network']              = 'Impostazioni Rete';
+$lang['_msg_setting_undefined'] = 'Nessun metadato definito.';
+$lang['_msg_setting_no_class'] = 'Nessuna classe definita.';
+$lang['_msg_setting_no_default'] = 'Nessun valore predefinito.';
+$lang['title']                 = 'Titolo del wiki';
+$lang['start']                 = 'Nome della pagina iniziale';
+$lang['lang']                  = 'Lingua';
+$lang['template']              = 'Modello';
+$lang['tagline']               = 'Tagline (se il template lo supporta)';
+$lang['sidebar']               = 'Nome pagina in barra laterale (se il template lo supporta), il campo vuoto disabilita la barra laterale';
+$lang['license']               = 'Sotto quale licenza vorresti rilasciare il tuo contenuto?';
+$lang['savedir']               = 'Directory per il salvataggio dei dati';
+$lang['basedir']               = 'Directory di base';
+$lang['baseurl']               = 'URL di base';
+$lang['cookiedir']             = 'Percorso cookie. Lascia in bianco per usare baseurl.';
+$lang['dmode']                 = 'Permessi per le nuove directory';
+$lang['fmode']                 = 'Permessi per i nuovi file';
+$lang['allowdebug']            = 'Abilita il debug (disabilitare se non serve!)';
+$lang['recent']                = 'Ultime modifiche';
+$lang['recent_days']           = 'Quante modifiche recenti tenere (giorni)';
+$lang['breadcrumbs']           = 'Numero di breadcrumb';
+$lang['youarehere']            = 'Breadcrumb gerarchici';
+$lang['fullpath']              = 'Mostra il percorso completo delle pagine';
+$lang['typography']            = 'Abilita la sostituzione tipografica';
+$lang['dformat']               = 'Formato delle date (vedi la funzione strftime di PHP)';
+$lang['signature']             = 'Firma';
+$lang['showuseras']            = 'Cosa visualizzare quando si mostra l\'ultimo utente che ha modificato una pagina';
+$lang['toptoclevel']           = 'Livello superiore per l\'indice';
+$lang['tocminheads']           = 'Ammontare minimo di intestazioni che determinano la creazione del TOC';
+$lang['maxtoclevel']           = 'Numero massimo di livelli per l\'indice';
+$lang['maxseclevel']           = 'Livello massimo per le sezioni modificabili';
+$lang['camelcase']             = 'Usa CamelCase per i collegamenti';
+$lang['deaccent']              = 'Pulizia dei nomi di pagina';
+$lang['useheading']            = 'Usa la prima intestazione come nome di pagina';
+$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['hidepages']             = 'Nascondi le pagine che soddisfano la condizione (inserire un\'espressione regolare)';
+$lang['useacl']                = 'Usa lista di controllo accessi (ACL)';
+$lang['autopasswd']            = 'Genera password in automatico';
+$lang['authtype']              = 'Sistema di autenticazione';
+$lang['passcrypt']             = 'Metodo di cifratura password';
+$lang['defaultgroup']          = 'Gruppo predefinito';
+$lang['superuser']             = 'Amministratore - gruppo, utente o elenco di utenti separati da virgole (user1,@group1,user2) con accesso completo a tutte le pagine e le funzioni che riguardano le  impostazioni ACL';
+$lang['manager']               = 'Gestore - gruppo, utente o elenco di utenti separati da virgole (user1,@group1,user2) con accesso a determinate funzioni di gestione';
+$lang['profileconfirm']        = 'Richiedi la password per modifiche al profilo';
+$lang['rememberme']            = 'Permetti i cookies di accesso permanenti (ricordami)';
+$lang['disableactions']        = 'Disabilita azioni DokuWiki';
+$lang['disableactions_check']  = 'Controlla';
+$lang['disableactions_subscription'] = 'Sottoscrivi/Rimuovi sottoscrizione';
+$lang['disableactions_wikicode'] = 'Mostra sorgente/Esporta Raw';
+$lang['disableactions_other']  = 'Altre azioni (separate da virgola)';
+$lang['auth_security_timeout'] = 'Tempo di sicurezza per l\'autenticazione (secondi)';
+$lang['securecookie']          = 'Devono i cookies impostati tramite HTTPS essere inviati al browser solo tramite HTTPS? Disattiva questa opzione solo quando l\'accesso al tuo wiki viene effettuato con il protocollo SSL ma la navigazione del wiki non risulta sicura.';
+$lang['remote']                = 'Abilita il sistema di API remoto. Questo permette ad altre applicazioni di accedere al wiki tramite XML-RPC o altri meccanismi.';
+$lang['remoteuser']            = 'Restringi l\'accesso dell\'aPI remota ai gruppi o utenti qui specificati separati da virgola. Lascia vuoto per dare accesso a chiunque.';
+$lang['usewordblock']          = 'Blocca lo spam in base alla blacklist';
+$lang['relnofollow']           = 'Usa rel="nofollow" nei collegamenti esterni';
+$lang['indexdelay']            = 'Intervallo di tempo prima dell\'indicizzazione';
+$lang['mailguard']             = 'Oscuramento indirizzi email';
+$lang['iexssprotect']          = 'Controlla i file caricati in cerca di possibile codice JavaScript o HTML maligno.';
+$lang['usedraft']              = 'Salva una bozza in automatico in fase di modifica';
+$lang['htmlok']                = 'Consenti HTML incorporato';
+$lang['phpok']                 = 'Consenti PHP incorporato';
+$lang['locktime']              = 'Durata dei file di lock (sec)';
+$lang['cachetime']             = 'Durata della cache (sec)';
+$lang['target____wiki']        = 'Finestra di destinazione per i collegamenti interni';
+$lang['target____interwiki']   = 'Finestra di destinazione per i collegamenti interwiki';
+$lang['target____extern']      = 'Finestra di destinazione per i collegamenti esterni';
+$lang['target____media']       = 'Finestra di destinazione per i collegamenti ai file';
+$lang['target____windows']     = 'Finestra di destinazione per i collegamenti alle risorse condivise';
+$lang['mediarevisions']        = 'Abilita Mediarevisions?';
+$lang['refcheck']              = 'Controlla i riferimenti ai file';
+$lang['gdlib']                 = 'Versione GD Lib ';
+$lang['im_convert']            = 'Percorso per il convertitore di ImageMagick';
+$lang['jpg_quality']           = 'Qualità di compressione JPG (0-100)';
+$lang['fetchsize']             = 'Dimensione massima (bytes) scaricabile da fetch.php da extern';
+$lang['subscribers']           = 'Abilita la sottoscrizione alle pagine';
+$lang['subscribe_time']        = 'Tempo dopo il quale le liste di sottoscrizione e i riassunti vengono inviati (sec); Dovrebbe essere inferiore al tempo specificato in recent_days.';
+$lang['notify']                = 'Invia notifiche sulle modifiche a questo indirizzo';
+$lang['registernotify']        = 'Invia informazioni sui nuovi utenti registrati a questo indirizzo email';
+$lang['mailfrom']              = 'Mittente per le mail automatiche';
+$lang['mailprefix']            = 'Prefisso da inserire nell\'oggetto delle mail automatiche';
+$lang['htmlmail']              = 'Invia email HTML multipart più gradevoli ma più ingombranti in dimensione. Disabilita per mail in puro testo.';
+$lang['sitemap']               = 'Genera una sitemap Google (giorni)';
+$lang['rss_type']              = 'Tipo di feed XML';
+$lang['rss_linkto']            = 'Collega i feed XML a';
+$lang['rss_content']           = 'Cosa mostrare negli elementi dei feed XML?';
+$lang['rss_update']            = 'Intervallo di aggiornamento dei feed XML (sec)';
+$lang['rss_show_summary']      = 'I feed XML riportano un sommario nel titolo';
+$lang['rss_media']             = 'Quale tipo di cambiamento dovrebbe essere elencato nel feed XML?';
+$lang['updatecheck']           = 'Controllare aggiornamenti e avvisi di sicurezza? DokuWiki deve contattare update.dokuwiki.org per questa funzione.';
+$lang['userewrite']            = 'Usa il rewrite delle URL';
+$lang['useslash']              = 'Usa la barra rovescia (slash) come separatore nelle URL';
+$lang['sepchar']               = 'Separatore di parole nei nomi di pagina';
+$lang['canonical']             = 'Usa URL canoniche';
+$lang['fnencode']              = 'Metodo per codificare i filenames non-ASCII.';
+$lang['autoplural']            = 'Controlla il plurale nei collegamenti';
+$lang['compression']           = 'Usa la compressione per i file dell\'archivio';
+$lang['gzip_output']           = 'Usa il Content-Encoding gzip per xhtml';
+$lang['compress']              = 'Comprimi i file CSS e javascript';
+$lang['cssdatauri']            = 'Dimensione massima in byte di un\'immagine che può essere integrata nel CSS per ridurre l\'overhead delle richieste HTTP. Questa tecnica non funziona con IE7 e precedenti! Da 400 a 600 bytes è un buon valore. Impostare a 0 per disabilitare.';
+$lang['send404']               = 'Invia "HTTP 404/Pagina non trovata" per le pagine inesistenti';
+$lang['broken_iua']            = 'La funzione ignore_user_abort non funziona sul tuo sistema? Questo potrebbe far sì che l\'indice di ricerca sia inutilizzabile. È noto che nella configurazione IIS+PHP/CGI non funziona. Vedi ilBug 852 per maggiori informazioni.';
+$lang['xsendfile']             = 'Usare l\'header X-Sendfile per permettere al webserver di fornire file statici? Questa funzione deve essere supportata dal tuo webserver.';
+$lang['renderer_xhtml']        = 'Renderer da usare per la visualizzazione del wiki (xhtml)';
+$lang['renderer__core']        = '%s (dokuwiki)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['dnslookups']            = 'Dokuwiki farà il lookup dei nomi host per ricavare l\'indirizzo IP remoto degli utenti che modificano le pagine. Se hai un DNS lento o non funzionante o se non vuoi questa funzione, disabilita l\'opzione';
+$lang['proxy____host']         = 'Nome server proxy';
+$lang['proxy____port']         = 'Porta proxy';
+$lang['proxy____user']         = 'Nome utente proxy';
+$lang['proxy____pass']         = 'Password proxy';
+$lang['proxy____ssl']          = 'Usa SSL per connetterti al proxy';
+$lang['proxy____except']       = 'Espressioni regolari per far corrispondere le URLs per i quali i proxy dovrebbero essere ommessi.';
+$lang['safemodehack']          = 'Abilita safemode hack';
+$lang['ftp____host']           = 'Server FTP per safemode hack';
+$lang['ftp____port']           = 'Porta FTP per safemode hack';
+$lang['ftp____user']           = 'Nome utente FTP per safemode hack';
+$lang['ftp____pass']           = 'Password FTP per safemode hack';
+$lang['ftp____root']           = 'Directory principale FTP per safemode hack';
+$lang['license_o_']            = 'Nessuna scelta';
+$lang['typography_o_0']        = 'nessuno';
+$lang['typography_o_1']        = 'Solo virgolette';
+$lang['typography_o_2']        = 'Tutti (potrebbe non funzionare sempre)';
+$lang['userewrite_o_0']        = 'nessuno';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki';
+$lang['deaccent_o_0']          = 'disabilitata';
+$lang['deaccent_o_1']          = 'rimuovi gli accenti';
+$lang['deaccent_o_2']          = 'romanizza';
+$lang['gdlib_o_0']             = 'GD Lib non disponibile';
+$lang['gdlib_o_1']             = 'Versione 1.x';
+$lang['gdlib_o_2']             = 'Rileva automaticamente';
+$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'] = 'Sunto';
+$lang['rss_content_o_diff']    = 'Diff unificata';
+$lang['rss_content_o_htmldiff'] = 'Tabella delle diff formattata HTML';
+$lang['rss_content_o_html']    = 'Tutto il contenuto della pagina in HTML';
+$lang['rss_linkto_o_diff']     = 'vista differenze';
+$lang['rss_linkto_o_page']     = 'pagina revisionata';
+$lang['rss_linkto_o_rev']      = 'elenco revisioni';
+$lang['rss_linkto_o_current']  = 'pagina attuale';
+$lang['compression_o_0']       = 'nessuna';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'non usare';
+$lang['xsendfile_o_1']         = 'Header proprietario lighttpd (prima della versione 1.5)';
+$lang['xsendfile_o_2']         = 'Header standard X-Sendfile';
+$lang['xsendfile_o_3']         = 'Header proprietario Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Nome utente';
+$lang['showuseras_o_username'] = 'Nome completo dell\'utente';
+$lang['showuseras_o_email']    = 'Indirizzo email dell\'utente (offuscato in base alle impostazioni di sicurezza posta)';
+$lang['showuseras_o_email_link'] = 'Indirizzo email dell\'utente come collegamento mailto:';
+$lang['useheading_o_0']        = 'Mai';
+$lang['useheading_o_navigation'] = 'Solo navigazione';
+$lang['useheading_o_content']  = 'Solo contenuto wiki';
+$lang['useheading_o_1']        = 'Sempre';
+$lang['readdircache']          = 'Tempo massimo per le readdir cache (sec)';
diff --git a/sources/lib/plugins/config/lang/ja/intro.txt b/sources/lib/plugins/config/lang/ja/intro.txt
new file mode 100644
index 0000000..0c45471
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ja/intro.txt
@@ -0,0 +1,9 @@
+====== 設定管理 ======
+
+この画面で、Dokuwikiの設定を管理することが出来ます。 個々の設定に関しては [[doku>config]] を参照してください。 このプラグインに関する詳細な情報は [[doku>plugin:config]] を参照してください。
+
+背景が薄い赤になっている場合、その設定は変更することが出来ません。 背景が青の値はデフォルト、背景が白の値は現在の設定となっており、 どちらの値も変更が可能です。
+
+設定の変更後は必ず **保存** ボタンを押して変更を確定してください。 ボタンを押さなかった場合、変更は破棄されます。
+
+
diff --git a/sources/lib/plugins/config/lang/ja/lang.php b/sources/lib/plugins/config/lang/ja/lang.php
new file mode 100644
index 0000000..e8cf822
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ja/lang.php
@@ -0,0 +1,199 @@
+
+ * @author Christopher Smith 
+ * @author Ikuo Obataya 
+ * @author Daniel Dupriest 
+ * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
+ * @author Satoshi Sahara 
+ */
+$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']        = 'プラグイン';
+$lang['_header_template']      = 'テンプレート';
+$lang['_header_undefined']     = 'その他';
+$lang['_basic']                = '基本';
+$lang['_display']              = '表示';
+$lang['_authentication']       = '認証';
+$lang['_anti_spam']            = 'スパム対策';
+$lang['_editing']              = '編集';
+$lang['_links']                = 'リンク';
+$lang['_media']                = 'メディア';
+$lang['_notifications']        = '通知設定';
+$lang['_syndication']          = 'RSS配信設定';
+$lang['_advanced']             = '高度な設定';
+$lang['_network']              = 'ネットワーク';
+$lang['_msg_setting_undefined'] = '設定のためのメタデータがありません。';
+$lang['_msg_setting_no_class'] = '設定クラスがありません。';
+$lang['_msg_setting_no_default'] = '初期値が設定されていません。';
+$lang['title']                 = 'WIKIタイトル';
+$lang['start']                 = 'スタートページ名';
+$lang['lang']                  = '使用言語';
+$lang['template']              = 'テンプレート';
+$lang['tagline']               = 'キャッチフレーズ (テンプレートが対応していれば)';
+$lang['sidebar']               = 'サイドバー用ページ名 (テンプレートが対応していれば)。空欄でサイドバー無効。';
+$lang['license']               = '作成した内容をどのライセンスでリリースしますか？';
+$lang['savedir']               = '保存ディレクトリ';
+$lang['basedir']               = 'サーバのパス (例: /dokuwiki/)。空欄にすると自動的に検出します。';
+$lang['baseurl']               = 'サーバの URL (例: http://www.yourserver.com)。空欄にすると自動的に検出します。';
+$lang['cookiedir']             = 'Cookie のパス。空欄にすると baseurl を使用します。';
+$lang['dmode']                 = 'フォルダ作成マスク';
+$lang['fmode']                 = 'ファイル作成マスク';
+$lang['allowdebug']            = 'デバッグモード（必要で無いときは無効にしてください）';
+$lang['recent']                = '最近の変更表示数';
+$lang['recent_days']           = '最近の変更とする期間（日数）';
+$lang['breadcrumbs']           = 'トレース（パンくず）表示数';
+$lang['youarehere']            = '現在位置を表示';
+$lang['fullpath']              = 'ページのフッターに絶対パスを表示';
+$lang['typography']            = 'タイポグラフィー変換';
+$lang['dformat']               = '日付フォーマット（PHPのstrftime関数を参照）';
+$lang['signature']             = '署名';
+$lang['showuseras']            = '最終編集者の情報として表示する内容';
+$lang['toptoclevel']           = '目次 トップレベル見出し';
+$lang['tocminheads']           = '目次を生成するための最小見出し数';
+$lang['maxtoclevel']           = '目次 表示限度見出し';
+$lang['maxseclevel']           = '編集可能見出し';
+$lang['camelcase']             = 'キャメルケースリンク';
+$lang['deaccent']              = 'ページ名アクセント';
+$lang['useheading']            = '最初の見出しをページ名とする';
+$lang['sneaky_index']          = 'デフォルトでは索引にすべての名前空間を表示しますが、この機能はユーザーに閲覧権限のない名前空間を非表示にします。ただし、閲覧が可能な副名前空間まで表示されなくなるため、ACLの設定が適正でない場合は索引機能が使えなくなる場合があります。';
+$lang['hidepages']             = '検索、サイトマップ、その他の自動インデックスの結果に表示しないページ（Regex）';
+$lang['useacl']                = 'アクセス管理を行う（ACL）';
+$lang['autopasswd']            = 'パスワードの自動生成（ACL）';
+$lang['authtype']              = '認証方法（ACL）';
+$lang['passcrypt']             = '暗号化方法（ACL）';
+$lang['defaultgroup']          = 'デフォルトグループ（ACL）';
+$lang['superuser']             = 'スーパーユーザー（ACL）';
+$lang['manager']               = 'マネージャー（特定の管理機能を使用可能なユーザーもしくはグループ）';
+$lang['profileconfirm']        = 'プロフィール変更時に現在のパスワードを要求（ACL）';
+$lang['rememberme']            = 'ログイン用クッキーを永久に保持することを許可（ログインを保持）';
+$lang['disableactions']        = 'DokuWiki の動作を無効にする';
+$lang['disableactions_check']  = 'チェック';
+$lang['disableactions_subscription'] = '登録 / 解除';
+$lang['disableactions_wikicode'] = 'ソース閲覧 / 生データ出力';
+$lang['disableactions_other']  = 'その他の動作（カンマ区切り）';
+$lang['auth_security_timeout'] = '認証タイムアウト設定（秒）';
+$lang['securecookie']          = 'クッキーをHTTPSにてセットする場合は、ブラウザよりHTTPS経由で送信された場合にみに制限しますか？ログインのみをSSLで行う場合は、この機能を無効にしてください。';
+$lang['remote']                = 'リモートAPIを有効化します。有効化するとXML-RPCまたは他の手段でwikiにアプリケーションがアクセスすることを許可します。';
+$lang['remoteuser']            = 'カンマ区切りで書かれたグループ名、またはユーザ名だけにリモートAPIへのアクセスを許可します。空白の場合は、すべてのユーザにアクセスを許可します。';
+$lang['usewordblock']          = '単語リストに基づくスパムブロック';
+$lang['relnofollow']           = 'rel="nofollow"を付加';
+$lang['indexdelay']            = 'インデックスを許可（何秒後）';
+$lang['mailguard']             = 'メールアドレス保護';
+$lang['iexssprotect']          = 'アップロードファイルに悪意のあるJavaScriptやHTMLが含まれていないかチェックする';
+$lang['usedraft']              = '編集中の自動保存（ドラフト）機能を使用';
+$lang['htmlok']                = 'HTML埋め込み';
+$lang['phpok']                 = 'PHP埋め込み';
+$lang['locktime']              = 'ファイルロック期限（秒）';
+$lang['cachetime']             = 'キャッシュ保持時間（秒）';
+$lang['target____wiki']        = '内部リンクの表示先';
+$lang['target____interwiki']   = 'InterWikiリンクの表示先';
+$lang['target____extern']      = '外部リンクの表示先';
+$lang['target____media']       = 'メディアリンクの表示先';
+$lang['target____windows']     = 'Windowsリンクの表示先';
+$lang['mediarevisions']        = 'メディアファイルの履歴を有効にしますか?';
+$lang['refcheck']              = 'メディア参照元チェック';
+$lang['gdlib']                 = 'GDlibバージョン';
+$lang['im_convert']            = 'ImageMagick変換ツールへのパス';
+$lang['jpg_quality']           = 'JPG圧縮品質（0-100）';
+$lang['fetchsize']             = '外部からのダウンロード最大サイズ';
+$lang['subscribers']           = '更新通知機能';
+$lang['subscribe_time']        = '購読リストと概要を送信する期間（秒）。「最近の変更とする期間」で指定した期間より小さくしてください。';
+$lang['notify']                = '変更を通知するメールアドレス';
+$lang['registernotify']        = '新規ユーザー登録を通知するメールアドレス';
+$lang['mailfrom']              = 'メール送信時の送信元アドレス';
+$lang['mailprefix']            = '自動メールの題名に使用する接頭語';
+$lang['htmlmail']              = 'メールをテキスト形式ではなく、HTML形式で送信する。';
+$lang['sitemap']               = 'Googleサイトマップ作成頻度（日数）';
+$lang['rss_type']              = 'RSSフィード形式';
+$lang['rss_linkto']            = 'RSS内リンク先';
+$lang['rss_content']           = 'XMLフィードに何を表示させますか？';
+$lang['rss_update']            = 'RSSフィードの更新間隔（秒）';
+$lang['rss_show_summary']      = 'フィードのタイトルにサマリーを表示';
+$lang['rss_media']             = 'XMLフィードで、どんな種類の変更を記載するか';
+$lang['updatecheck']           = 'DokuWikiの更新とセキュリティに関する情報をチェックしますか？ この機能は update.dokuwiki.org への接続が必要です。';
+$lang['userewrite']            = 'URLの書き換え';
+$lang['useslash']              = 'URL上の名前空間の区切りにスラッシュを使用';
+$lang['sepchar']               = 'ページ名の単語区切り文字';
+$lang['canonical']             = 'canonical URL（正準URL）を使用';
+$lang['fnencode']              = '非アスキーファイル名のエンコーディング方法';
+$lang['autoplural']            = '自動複数形処理';
+$lang['compression']           = 'アーカイブファイルの圧縮方法';
+$lang['gzip_output']           = 'xhtmlに対するコンテンツ圧縮（gzip）を使用';
+$lang['compress']              = 'CSSとJavaScriptを圧縮';
+$lang['cssdatauri']            = 'HTTP リクエスト数によるオーバーヘッドを減らすため、CSS ファイルから参照される画像ファイルのサイズがここで指定するバイト数以内の場合は CSS ファイル内に Data URI として埋め込みます。このテクニックは IE7 以下では動作しません! 400 から 600 バイトがちょうどよい値です。0 を指定すると埋め込み処理は行われません。';
+$lang['send404']               = '文書が存在しないページに"HTTP404/Page Not Found"を使用';
+$lang['broken_iua']            = 'ignore_user_abort関数が破損している恐れがあります。そのため、検索インデックスが動作しない可能性があります。IIS+PHP/CGIの組み合わせで破損することが判明しています。詳しくはBug 852を参照してください。';
+$lang['xsendfile']             = 'ウェブサーバーが静的ファイルを生成するために X-Sendfile ヘッダーを使用しますか？なお、この機能をウェブサーバーがサポートしている必要があります。';
+$lang['renderer_xhtml']        = 'Wikiの出力（xhtml）にレンダラーを使用する';
+$lang['renderer__core']        = '%s （Dokuwikiコア）';
+$lang['renderer__plugin']      = '%s （プラグイン）';
+$lang['dnslookups']            = 'ページを編集しているユーザーのIPアドレスからホスト名を逆引きする。利用できるDNSサーバーがない、あるいはこの機能が不要な場合にはオフにします。';
+$lang['proxy____host']         = 'プロキシ - サーバー名';
+$lang['proxy____port']         = 'プロキシ - ポート';
+$lang['proxy____user']         = 'プロキシ - ユーザー名';
+$lang['proxy____pass']         = 'プロキシ - パスワード';
+$lang['proxy____ssl']          = 'プロキシへの接続にsslを使用';
+$lang['proxy____except']       = 'スキップするプロキシのURL正規表現';
+$lang['safemodehack']          = 'セーフモード対策を行う';
+$lang['ftp____host']           = 'FTP サーバー名（セーフモード対策）';
+$lang['ftp____port']           = 'FTP ポート（セーフモード対策）';
+$lang['ftp____user']           = 'FTP ユーザー名（セーフモード対策）';
+$lang['ftp____pass']           = 'FTP パスワード（セーフモード対策）';
+$lang['ftp____root']           = 'FTP ルートディレクトリ（セーフモード対策）';
+$lang['license_o_']            = '選択されていません';
+$lang['typography_o_0']        = '変換しない';
+$lang['typography_o_1']        = '二重引用符（ダブルクオート）のみ';
+$lang['typography_o_2']        = 'すべての引用符（動作しない場合があります）';
+$lang['userewrite_o_0']        = '使用しない';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWikiによる設定';
+$lang['deaccent_o_0']          = '指定しない';
+$lang['deaccent_o_1']          = 'アクセントを除去';
+$lang['deaccent_o_2']          = 'ローマナイズ';
+$lang['gdlib_o_0']             = 'GDを利用できません';
+$lang['gdlib_o_1']             = 'バージョン 1.x';
+$lang['gdlib_o_2']             = '自動検出';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$lang['rss_type_o_rss1']       = 'RSS 1.0';
+$lang['rss_type_o_rss2']       = 'RSS 2.0';
+$lang['rss_type_o_atom']       = 'Atom 0.3';
+$lang['rss_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = '概要';
+$lang['rss_content_o_diff']    = '差分（Unified Diff）';
+$lang['rss_content_o_htmldiff'] = '差分（HTML形式）';
+$lang['rss_content_o_html']    = '完全なHTMLページ';
+$lang['rss_linkto_o_diff']     = '変更点のリスト';
+$lang['rss_linkto_o_page']     = '変更されたページ';
+$lang['rss_linkto_o_rev']      = 'リビジョンのリスト';
+$lang['rss_linkto_o_current']  = '現在のページ';
+$lang['compression_o_0']       = '圧縮しない';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = '使用しない';
+$lang['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']    = 'ユーザーのメールアドレス（メールガード設定による難読化）';
+$lang['showuseras_o_email_link'] = 'ユーザーのメールアドレスをリンクにする';
+$lang['useheading_o_0']        = '使用しない';
+$lang['useheading_o_navigation'] = 'ナビゲーションのみ';
+$lang['useheading_o_content']  = 'Wikiの内容のみ';
+$lang['useheading_o_1']        = '常に使用する';
+$lang['readdircache']          = 'readdir キャッシュの最大保持期間（秒）';
diff --git a/sources/lib/plugins/config/lang/kk/lang.php b/sources/lib/plugins/config/lang/kk/lang.php
new file mode 100644
index 0000000..dde5b95
--- /dev/null
+++ b/sources/lib/plugins/config/lang/kk/lang.php
@@ -0,0 +1,6 @@
+ko:config]]를 참고하세요. 이 플러그인에 대한 자세한 내용은 [[doku>ko:plugin:config]]를 참고하세요.
+
+밝은 빨간색 배경으로 보이는 설정은 이 플러그인에서 바꿀 수 없도록 보호되어 있습니다. 파란색 배경으로 보이는 설정은 기본값이며 하얀색 배경으로 보이는 설정은 특수한 설치를 위해 로컬로 설정되어 있습니다. 파란색과 하얀색 배경으로 된 설정은 바꿀 수 있습니다.
+
+이 페이지를 떠나기 전에 **저장** 버튼을 누르지 않으면 바뀜이 사라지는 것에 주의하세요.
+
+
diff --git a/sources/lib/plugins/config/lang/ko/lang.php b/sources/lib/plugins/config/lang/ko/lang.php
new file mode 100644
index 0000000..0cdaca9
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ko/lang.php
@@ -0,0 +1,199 @@
+
+ * @author Seung-Chul Yoo 
+ * @author erial2@gmail.com
+ * @author Myeongjin 
+ */
+$lang['menu']                  = '환경 설정';
+$lang['error']                 = '잘못된 값 때문에 설정을 바꿀 수 없습니다. 바뀜을 검토하고 확인을 누르세요.
+
        잘못된 값은 빨간 선으로 둘러싸여 있습니다.';
+$lang['updated']               = '설정이 성공적으로 바뀌었습니다.';
+$lang['nochoice']              = '(다른 선택이 불가능합니다)';
+$lang['locked']                = '환경 설정 파일을 바꿀 수 없습니다. 의도한 행동이 아니라면,
        
+파일 이름과 권한이 맞는지 확인하세요.';
+$lang['danger']                = '위험: 이 옵션을 잘못 바꾸면 환경 설정 메뉴를 사용할 수 없을 수도 있습니다.';
+$lang['warning']               = '경고: 이 옵션을 잘못 바꾸면 잘못 동작할 수 있습니다.';
+$lang['security']              = '보안 경고: 이 옵션은 보안에 위험이 있을 수 있습니다.';
+$lang['_configuration_manager'] = '환경 설정 관리자';
+$lang['_header_dokuwiki']      = '도쿠위키 설정';
+$lang['_header_plugin']        = '플러그인 설정';
+$lang['_header_template']      = '템플릿 설정';
+$lang['_header_undefined']     = '정의되지 않은 설정';
+$lang['_basic']                = '기본 설정';
+$lang['_display']              = '화면 표시 설정';
+$lang['_authentication']       = '인증 설정';
+$lang['_anti_spam']            = '스팸 방지 설정';
+$lang['_editing']              = '편집 설정';
+$lang['_links']                = '링크 설정';
+$lang['_media']                = '미디어 설정';
+$lang['_notifications']        = '알림 설정';
+$lang['_syndication']          = '신디케이션 설정';
+$lang['_advanced']             = '고급 설정';
+$lang['_network']              = '네트워크 설정';
+$lang['_msg_setting_undefined'] = '설정된 메타데이터가 없습니다.';
+$lang['_msg_setting_no_class'] = '설정된 클래스가 없습니다.';
+$lang['_msg_setting_no_default'] = '기본값이 없습니다.';
+$lang['title']                 = '위키 제목 (위키 이름)';
+$lang['start']                 = '각 이름공간에서 사용할 시작 문서 이름';
+$lang['lang']                  = '인터페이스 언어';
+$lang['template']              = '템플릿 (위키 디자인)';
+$lang['tagline']               = '태그 라인 (템플릿이 지원할 때에 한함)';
+$lang['sidebar']               = '사이드바 문서 이름 (템플릿이 지원할 때에 한함), 비워두면 사이드바를 비활성화';
+$lang['license']               = '내용에 어떤 라이선스를 적용하겠습니까?';
+$lang['savedir']               = '데이터 저장 디렉터리';
+$lang['basedir']               = '서버 경로 (예를 들어 /dokuwiki/). 자동 감지를 하려면 비우세요.';
+$lang['baseurl']               = '서버 URL (예를 들어 http://www.yourserver.com). 자동 감지를 하려면 비우세요.';
+$lang['cookiedir']             = '쿠키 위치. 비워두면 기본 URL 위치로 지정됩니다.';
+$lang['dmode']                 = '디렉터리 만들기 모드';
+$lang['fmode']                 = '파일 만들기 모드';
+$lang['allowdebug']            = '디버그 허용 필요하지 않으면 비활성화하세요!';
+$lang['recent']                = '최근 바뀐 문서당 항목 수';
+$lang['recent_days']           = '최근 바뀐 문서 기준 시간 (일)';
+$lang['breadcrumbs']           = '위치 "추적" 수. 0으로 설정하면 비활성화합니다.';
+$lang['youarehere']            = '계층형 위치 추적 (다음 위의 옵션을 비활성화하게 됩니다)';
+$lang['fullpath']              = '문서 하단에 전체 경로 보여주기';
+$lang['typography']            = '기호 대체';
+$lang['dformat']               = '날짜 형식 (PHP strftime 기능 참고)';
+$lang['signature']             = '편집기에서 서명 버튼을 누를 때 넣을 내용';
+$lang['showuseras']            = '마지막에 문서를 편집한 사용자를 보여줄지 여부';
+$lang['toptoclevel']           = '목차 최상위 항목';
+$lang['tocminheads']           = '목차 표시 여부를 결정할 최소한의 문단 제목 항목의 수';
+$lang['maxtoclevel']           = '목차 최대 단계';
+$lang['maxseclevel']           = '문단 최대 편집 단계';
+$lang['camelcase']             = '링크에 CamelCase 사용';
+$lang['deaccent']              = '문서 이름을 지우는 방법';
+$lang['useheading']            = '문서 이름으로 첫 문단 제목 사용';
+$lang['sneaky_index']          = '기본적으로 도쿠위키는 색인 목록에 모든 이름공간을 보여줍니다.
+이 옵션을 설정하면 사용자가 읽기 권한을 가지고 있지 않은 이름공간은 보여주지 않습니다. 접근 가능한 하위 이름공간을 보이지 않게 설정하면 자동으로 설정됩니다. 특정 ACL 설정은 색인 사용이 불가능하게 할 수도 있습니다.';
+$lang['hidepages']             = '검색, 사이트맵과 기타 자동 색인에서 정규 표현식과 일치하는 문서 숨기기';
+$lang['useacl']                = '접근 제어 목록 (ACL) 사용';
+$lang['autopasswd']            = '자동으로 만들어진 비밀번호';
+$lang['authtype']              = '인증 백-엔드';
+$lang['passcrypt']             = '비밀번호 암호화 방법';
+$lang['defaultgroup']          = '기본 그룹, 모든 새 사용자는 이 그룹에 속합니다';
+$lang['superuser']             = '슈퍼 유저 - ACL 설정과 상관없이 모든 문서와 기능에 대한 전체 접근 권한을 가진 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
+$lang['manager']               = '관리자 - 관리 기능을 사용할 수 있는 그룹이나 사용자 또는 사용자1,@그룹1,사용자2 쉼표로 구분한 목록';
+$lang['profileconfirm']        = '개인 정보를 바꿀 때 비밀번호 다시 확인';
+$lang['rememberme']            = '항상 로그인 정보 저장 허용 (기억하기)';
+$lang['disableactions']        = '도쿠위키 활동 비활성화';
+$lang['disableactions_check']  = '검사';
+$lang['disableactions_subscription'] = '구독 신청/구독 취소';
+$lang['disableactions_wikicode'] = '원본 보기/원본 내보내기';
+$lang['disableactions_other']  = '다른 활동 (쉼표로 구분)';
+$lang['auth_security_timeout'] = '인증 보안 초과 시간 (초)';
+$lang['securecookie']          = 'HTTPS로 보내진 쿠키는 HTTPS에만 적용 할까요? 위키의 로그인 페이지만 SSL로 암호화하고 위키 문서는 그렇지 않은 경우 비활성화 합니다.';
+$lang['remote']                = '원격 API를 활성화 합니다. 이 항목을 허용하면 XML-RPC 및 기타 메커니즘을 통해 다른 어플리케이션으로 접근 가능합니다.';
+$lang['remoteuser']            = '이 항목에 입력된 쉼표로 나눠진 그룹이나 사용자에게 원격 API 접근을 제한합니다. 빈칸으로 두면 모두에게 허용합니다.';
+$lang['usewordblock']          = '금지 단어를 사용해 스팸 막기';
+$lang['relnofollow']           = '바깥 링크에 rel="nofollow" 사용';
+$lang['indexdelay']            = '색인 연기 시간 (초)';
+$lang['mailguard']             = '이메일 주소를 알아볼 수 없게 하기';
+$lang['iexssprotect']          = '올린 파일의 악성 자바스크립트, HTML 코드 가능성 여부를 검사';
+$lang['usedraft']              = '편집하는 동안 자동으로 문서 초안 저장';
+$lang['htmlok']                = 'HTML 내장 허용';
+$lang['phpok']                 = 'PHP 내장 허용';
+$lang['locktime']              = '최대 파일 잠금 시간(초)';
+$lang['cachetime']             = '최대 캐시 생존 시간 (초)';
+$lang['target____wiki']        = '안쪽 링크에 대한 타겟 창';
+$lang['target____interwiki']   = '인터위키 링크에 대한 타겟 창';
+$lang['target____extern']      = '바깥 링크에 대한 타겟 창';
+$lang['target____media']       = '미디어 링크에 대한 타겟 창';
+$lang['target____windows']     = '창 링크에 대한 타겟 창';
+$lang['mediarevisions']        = '미디어 판 관리를 사용하겠습니까?';
+$lang['refcheck']              = '미디어 파일을 삭제하기 전에 사용하고 있는지 검사';
+$lang['gdlib']                 = 'GD 라이브러리 버전';
+$lang['im_convert']            = 'ImageMagick 변환 도구 위치';
+$lang['jpg_quality']           = 'JPG 압축 품질 (0-100)';
+$lang['fetchsize']             = 'fetch.php가 바깥에서 다운로드할 수도 있는 최대 크기 (바이트)';
+$lang['subscribers']           = '사용자가 이메일로 문서 바뀜에 구독하도록 허용';
+$lang['subscribe_time']        = '구독 목록과 요약이 보내질 경과 시간 (초); recent_days에서 설정된 시간보다 작아야 합니다.';
+$lang['notify']                = '항상 이 이메일 주소로 바뀜 알림을 보냄';
+$lang['registernotify']        = '항상 새 사용자한테 이 이메일 주소로 정보를 보냄';
+$lang['mailfrom']              = '자동으로 보내지는 메일 발신자';
+$lang['mailprefix']            = '자동으로 보내지는 메일의 제목 말머리 내용. 비웠을 경우 위키 제목 사용';
+$lang['htmlmail']              = '용량은 조금 더 크지만 보기 좋은 HTML 태그가 포함된 메일을 보냅니다. 텍스트만의 메일을 보내려면 비활성화하세요.';
+$lang['sitemap']               = '구글 사이트맵 생성 날짜 빈도. 0일 경우 비활성화합니다';
+$lang['rss_type']              = 'XML 피드 타입';
+$lang['rss_linkto']            = 'XML 피드 링크 정보';
+$lang['rss_content']           = 'XML 피드 항목에 표시되는 내용은 무엇입니까?';
+$lang['rss_update']            = 'XML 피드 업데이트 주기 (초)';
+$lang['rss_show_summary']      = 'XML 피드 제목에서 요약 보여주기';
+$lang['rss_media']             = '어떤 규격으로 XML 피드를 받아보시겠습니까?';
+$lang['updatecheck']           = '업데이트와 보안 문제를 검사할까요? 이 기능을 사용하려면 도쿠위키를 update.dokuwiki.org에 연결해야 합니다.';
+$lang['userewrite']            = '멋진 URL 사용';
+$lang['useslash']              = 'URL에서 이름 구분자로 슬래시 문자 사용';
+$lang['sepchar']               = '문서 이름 단어 구분자';
+$lang['canonical']             = '완전한 canonical URL 사용';
+$lang['fnencode']              = 'ASCII가 아닌 파일 이름을 인코딩 하는 방법.';
+$lang['autoplural']            = '링크 연결시 복수 양식 검사';
+$lang['compression']           = '첨부 파일 압축 방법 선택';
+$lang['gzip_output']           = 'xhml 내용 gzip 압축 사용';
+$lang['compress']              = '최적화된 CSS, 자바스크립트 출력';
+$lang['cssdatauri']            = '그림이 렌더링될 최대 용량 크기를 CSS에 규정해야 HTTP 요청 헤더 오버헤드 크기를 감소시킬 수 있습니다. 이 기술은 IE 7 이하에서는 작동하지 않습니다! 400에서 600 정도면 좋은 효율을 가져옵니다. 0로 지정할 경우 비활성화 됩니다.';
+$lang['send404']               = '존재하지 않는 페이지에 대해 "HTTP 404/페이지를 찾을 수 없습니다" 응답';
+$lang['broken_iua']            = '설치된 시스템에서 ignore_user_abort 기능에 문제가 있습니까? 문제가 있다면 검색 색인이 정상적으로 동작하지 않습니다. 이 기능이 IIS+PHP/CGI에서 문제가 있는 것으로 알려졌습니다. 자세한 정보는 버그 852를 참고하시기 바랍니다.';
+$lang['xsendfile']             = '웹 서버가 정적 파일을 제공하도록 X-Sendfile 헤더를 사용하겠습니까? 웹 서버가 이 기능을 지원해야 합니다.';
+$lang['renderer_xhtml']        = '주 (xhtml) 위키 출력 처리기';
+$lang['renderer__core']        = '%s (도쿠위키 내부)';
+$lang['renderer__plugin']      = '%s (플러그인)';
+$lang['dnslookups']            = '이 옵션을 활성화하면 도쿠위키가 문서를 편집하는 사용자의 호스트 네임과 원격 IP 주소를 확인합니다. 서버가 느리거나, DNS를 운영하지 않거나 이 기능을 원치 않으면 비활성화하세요';
+$lang['proxy____host']         = '프록시 서버 이름';
+$lang['proxy____port']         = '프록시 서버 포트';
+$lang['proxy____user']         = '프록시 사용자 이름';
+$lang['proxy____pass']         = '프록시 비밀번호';
+$lang['proxy____ssl']          = '프록시 연결시 SSL 사용';
+$lang['proxy____except']       = '프록시 설정이 무시될 URL주소의 정규 표현식';
+$lang['safemodehack']          = 'safemode hack기능 사용';
+$lang['ftp____host']           = 'safemode hack의 FTP 서버';
+$lang['ftp____port']           = 'safemode hack의 FTP 포트';
+$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']        = '모든 가능한 인용 부호 (동작 안될 수도 있음)';
+$lang['userewrite_o_0']        = '사용 안함';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = '도쿠위키 내부 기능';
+$lang['deaccent_o_0']          = '끄기';
+$lang['deaccent_o_1']          = '악센트 제거';
+$lang['deaccent_o_2']          = '라틴문자화';
+$lang['gdlib_o_0']             = 'GD 라이브러리 사용 불가';
+$lang['gdlib_o_1']             = '버전 1.x';
+$lang['gdlib_o_2']             = '자동 인식';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$lang['rss_type_o_rss1']       = 'RSS 1.0';
+$lang['rss_type_o_rss2']       = 'RSS 2.0';
+$lang['rss_type_o_atom']       = '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']  = '현재 문서 보기';
+$lang['compression_o_0']       = '없음';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = '사용 불가';
+$lang['xsendfile_o_1']         = '비공개 lighttpd 헤더 (1.5 이전 버전)';
+$lang['xsendfile_o_2']         = '표준 X-Sendfile 헤더';
+$lang['xsendfile_o_3']         = '비공개 Nginx X-Accel-Redirect 헤더';
+$lang['showuseras_o_loginname'] = '로그인 이름';
+$lang['showuseras_o_username'] = '사용자의 전체 이름';
+$lang['showuseras_o_email']    = '사용자의 이메일 주소 (메일 주소 설정에 따라 안보일 수 있음)';
+$lang['showuseras_o_email_link'] = 'mailto: link로 표현될 사용자 이메일 주소';
+$lang['useheading_o_0']        = '아니오';
+$lang['useheading_o_navigation'] = '둘러보기에만';
+$lang['useheading_o_content']  = '위키 내용에만';
+$lang['useheading_o_1']        = '항상';
+$lang['readdircache']          = 'readdir 캐시를 위한 최대 시간 (초)';
diff --git a/sources/lib/plugins/config/lang/la/intro.txt b/sources/lib/plugins/config/lang/la/intro.txt
new file mode 100644
index 0000000..573d34a
--- /dev/null
+++ b/sources/lib/plugins/config/lang/la/intro.txt
@@ -0,0 +1,7 @@
+====== Optionum Administratio ======
+
+In hac pagina administratoris optiones mutare et inspicere potes. Auxilia in pagina [[doku>config|conformationis]] sunt, si singulas res uidere uis, i ad paginam [[doku>plugin:config|conformationis]].
+
+Optiones ostensae rubro colore tutae et non nunc mutabiles sunt. Optiones ostensae caeruleo colore praecipuae sunt et optiones ostensae in area alba singulares huic uici sunt. Et caerulae et albae optiones mutabiles sunt.
+
+Memento premere **SERVA** ante quam nouam paginam eas: si hoc non facias, mutata amissa sunt.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/la/lang.php b/sources/lib/plugins/config/lang/la/lang.php
new file mode 100644
index 0000000..100f064
--- /dev/null
+++ b/sources/lib/plugins/config/lang/la/lang.php
@@ -0,0 +1,176 @@
+
+ */
+$lang['menu']                  = 'Optiones Administrationis';
+$lang['error']                 = 'Optiones non nouatae ob errores: rursum temptat. Errores rubro colore signati sunt.';
+$lang['updated']               = 'Optiones feliciter nouatae.';
+$lang['nochoice']              = '(nulla optio est)';
+$lang['locked']                = 'Optio documenti non nouata est, 
         optiones et facultates documenti inspicis.';
+$lang['danger']                = 'CAVE: si has optiones mutabis, in administrationis indicem non inire potes.';
+$lang['warning']               = 'CAVE: si hae optiones mutabis, graues errores erunt.';
+$lang['security']              = 'CAVE: si hae optiones mutabis, graues errores erunt.';
+$lang['_configuration_manager'] = 'Optionum administratio';
+$lang['_header_dokuwiki']      = 'Vicis Optiones';
+$lang['_header_plugin']        = 'Addendorum Optiones';
+$lang['_header_template']      = 'Vicis Formae Optiones';
+$lang['_header_undefined']     = 'Variae Optiones';
+$lang['_basic']                = 'Praecipuae Optiones';
+$lang['_display']              = 'Speciei Optiones';
+$lang['_authentication']       = 'Confirmationis Optiones';
+$lang['_anti_spam']            = 'In Mala Optiones';
+$lang['_editing']              = 'Recensendi Optiones';
+$lang['_links']                = 'Nexi Optiones';
+$lang['_media']                = 'Visiuorum Optiones';
+$lang['_advanced']             = 'Maiores Optiones';
+$lang['_network']              = 'Interretis Optiones';
+$lang['_msg_setting_undefined'] = 'Res codicum sine optionibus.';
+$lang['_msg_setting_no_class'] = 'Classes sine optionibus';
+$lang['_msg_setting_no_default'] = 'Nihil';
+$lang['fmode']                 = 'Documentum creandum ratio';
+$lang['dmode']                 = 'Scrinia creandam ratio';
+$lang['lang']                  = 'Linguae optiones';
+$lang['basedir']               = 'Computatoris seruitoris domicilium (ex. /dokuwiki/). Nihil scribere si id machinatione agnoscere uis.';
+$lang['baseurl']               = 'Computatoris seruitoris VRL (ex. http://www.yourserver.com). Nihil scribere si id machinatione agnoscere uis.';
+$lang['savedir']               = 'Documentorum seruatorum domicilium';
+$lang['start']                 = 'Nomen paginae dominicae';
+$lang['title']                 = 'Vicis titulus';
+$lang['template']              = 'Vicis forma';
+$lang['license']               = 'Sub quibus legibus uicem creare uin?';
+$lang['fullpath']              = 'Totum domicilium paginae in pedibus scribis.';
+$lang['recent']                = 'Extremae mutationes';
+$lang['breadcrumbs']           = 'Numerus uestigiorum';
+$lang['youarehere']            = 'Ordo uestigiorum';
+$lang['typography']            = 'Signa supponentes';
+$lang['htmlok']                = 'HTML aptum facere';
+$lang['phpok']                 = 'PHP aptum facere';
+$lang['dformat']               = 'Forma diei (uide paginam de diebus)';
+$lang['signature']             = 'Subscriptio';
+$lang['toptoclevel']           = 'Gradus maior tabularum argumentorum';
+$lang['tocminheads']           = 'Minimus numerus capitum';
+$lang['maxtoclevel']           = 'Maximus numerus tabularum argumentorum';
+$lang['maxseclevel']           = 'Maxima pars gradus recensendi';
+$lang['camelcase']             = 'SignaContinua nexis apta facere';
+$lang['deaccent']              = 'Titulus paginarum abrogare';
+$lang['useheading']            = 'Capite primo ut titulo paginae uti';
+$lang['refcheck']              = 'Documenta uisiua inspicere';
+$lang['allowdebug']            = 'ineptum facias si non necessarium! aptum facere';
+$lang['usewordblock']          = 'Malum interretiale ob uerba delere';
+$lang['indexdelay']            = 'Tempus transitum in ordinando (sec)';
+$lang['relnofollow']           = 'rel="nofollow" externis nexis uti';
+$lang['mailguard']             = 'Cursus interretiales abscondere';
+$lang['iexssprotect']          = 'Documenta nouata ob mala JavaScript uel HTML inspicere';
+$lang['showuseras']            = 'Quid, cum Sodalem, qui extremus paginam recensuit, ostendat, scribere';
+$lang['useacl']                = 'Aditus inspectionis indicibus uti';
+$lang['autopasswd']            = 'Tessera machinatione generata';
+$lang['authtype']              = 'Confirmationis finis';
+$lang['passcrypt']             = 'Ratio tesserae tuendae';
+$lang['defaultgroup']          = 'Grex communis';
+$lang['superuser']             = 'Magister\stra - grex, Sodalis uel index diuisus a uigulis sodalis1,@grex,sodalis2 cum plenis facultatibus sine ICA optionum termino';
+$lang['manager']               = 'Administrator - grex, Sodalis uel index diuisus a uigulis sodalis1,@grex,sodalis2 cum certis facultatibus';
+$lang['profileconfirm']        = 'Mutationes tessera confirmanda sunt';
+$lang['disableactions']        = 'Vicis actiones ineptas facere';
+$lang['disableactions_check']  = 'Inspicere';
+$lang['disableactions_subscription'] = 'Inscribe/Delere';
+$lang['disableactions_wikicode'] = 'Fontem uidere/Rudem transcribere';
+$lang['disableactions_other']  = 'Aliae actiones (uirgulis diuisae)';
+$lang['sneaky_index']          = 'Hic uicis omnia genera in indice inserit. Si ineptam hanc optionem facias, solum ea, quae Sodales uidere possunt, in indice erunt. Hoc suggreges et suggenera abscondere potest.';
+$lang['auth_security_timeout'] = 'Confirmationis Tempus (secundis)';
+$lang['securecookie']          = 'Formulae HTTPS mittine solum per HTTPS possunt? Ineptam hanc optio facias, si accessus uicis tutus est, sed interretis non.';
+$lang['updatecheck']           = 'Nouationes et fiducias inspicerene? Hic uicis connectere update.dokuwiki.org debes.';
+$lang['userewrite']            = 'VRL formosis uti';
+$lang['useslash']              = 'Repagula in URL, ut genera diuidas, uti';
+$lang['usedraft']              = 'Propositum in recensione machinatione seruatur';
+$lang['sepchar']               = 'Signum, quod paginas diuidit';
+$lang['canonical']             = 'VRL perfecto uti';
+$lang['fnencode']              = 'Ratio quae nomen documentorum non-ASCII codificit';
+$lang['autoplural']            = 'Pluralia in nexis inspicere';
+$lang['compression']           = 'Ratio compressionis documentis "attic"';
+$lang['cachetime']             = 'Maximum tempus formulis (sec)';
+$lang['locktime']              = 'Maximum tempus documentis inclusis (sec)';
+$lang['fetchsize']             = 'Maximum pondus (bytes), quod fetch.php ab externis onerare potest';
+$lang['notify']                = 'Adnotationis mutationes ad hunc cursum mittere';
+$lang['registernotify']        = 'De nouis Sodalibus ad hunc cursum notas mittere';
+$lang['mailfrom']              = 'Cursus interretialis, quo in cursibus uti';
+$lang['gzip_output']           = 'gzip Argumentum-Codificans xhtml uti';
+$lang['gdlib']                 = 'GD Lib forma';
+$lang['im_convert']            = 'Domicilium machinae ImageMagick\'s';
+$lang['jpg_quality']           = 'JPG compressio colorum (0-100)';
+$lang['subscribers']           = 'Inscriptionis paginarum auxilium aptus facere';
+$lang['subscribe_time']        = 'Tempus post quod inscriptionum index et summa missa sunt (sec); Hic minor quam tempus declaratum fortasse est.';
+$lang['compress']              = 'CSS et javascript dimissio';
+$lang['hidepages']             = 'Paginas congruentes abscondere (uerba regularia)';
+$lang['send404']               = 'Mitte "HTTP 404/ Pagina non reperta" si paginae non sunt.';
+$lang['sitemap']               = 'Google formam situs gignere (dies)';
+$lang['broken_iua']            = 'ignore_user_abort functio inepta estne? Hoc indicem quaestionum, quae non aptae sunt, creare non potest. IIS+PHP/CGI ineptum est. Vide Bug 852';
+$lang['xsendfile']             = 'X-Sendfile utine ut seruitor interretialis documenta firma creet? Tuus seruitor interretialis hunc pati debes.';
+$lang['renderer_xhtml']        = 'Quid dimittere ut hoc in principio uicis (xhtml) utaris';
+$lang['renderer__core']        = '%s (uicis nucleus)';
+$lang['renderer__plugin']      = '%s (addenda)';
+$lang['rememberme']            = 'Formulas aditus aptas facere (memento me)';
+$lang['rss_type']              = 'XML summae genus';
+$lang['rss_linkto']            = 'XML summae connectio';
+$lang['rss_content']           = 'Quid in XML summis uidere?';
+$lang['rss_update']            = 'XML summae renouationis interuallum temporis';
+$lang['recent_days']           = 'Numerus mutationum recentium tenendorum (dies)';
+$lang['rss_show_summary']      = 'XML summa titulos ostendit';
+$lang['target____wiki']        = 'Fenestra nexis internis';
+$lang['target____interwiki']   = 'Fenestra nexis inter uicem';
+$lang['target____extern']      = 'Fenestra nexis externis';
+$lang['target____media']       = 'Fenestra nexis uisiuis';
+$lang['target____windows']     = 'Fenestra nexis fenestrarum';
+$lang['proxy____host']         = 'Proxis seruitoris nomen';
+$lang['proxy____port']         = 'Proxis portus';
+$lang['proxy____user']         = 'Proxis nomen sodalis';
+$lang['proxy____pass']         = 'Proxis tessera';
+$lang['proxy____ssl']          = 'SSL ut connectas uti';
+$lang['proxy____except']       = 'Verba, ut VRL inspicias, quibus Proxis non agnoscitur.';
+$lang['safemodehack']          = 'Ad tempus conseruatio apta facere';
+$lang['ftp____host']           = 'FTP computator seruitor ad tempus seruatis';
+$lang['ftp____port']           = 'FTP ianua ad tempus seruatis';
+$lang['ftp____user']           = 'FTP Sodalis ad tempus seruatis';
+$lang['ftp____pass']           = 'FTP tessera ad tempus seruatis';
+$lang['ftp____root']           = 'FTP domicilium ad tempus seruatis';
+$lang['license_o_']            = 'Nihil electum';
+$lang['typography_o_0']        = 'neuter';
+$lang['typography_o_1']        = 'sine singulis uirgulis';
+$lang['typography_o_2']        = 'cum singulis uirgulis';
+$lang['userewrite_o_0']        = 'neuter';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki domesticus';
+$lang['deaccent_o_0']          = 'ex';
+$lang['deaccent_o_1']          = 'accentum tollere';
+$lang['deaccent_o_2']          = 'Latinis litteris';
+$lang['gdlib_o_0']             = 'GD Lib inepta';
+$lang['gdlib_o_1']             = 'Forma 1.x';
+$lang['gdlib_o_2']             = 'Machinatione inspicere';
+$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'] = 'Summa';
+$lang['rss_content_o_diff']    = 'Comparatio una';
+$lang['rss_content_o_htmldiff'] = 'Tabulae HTML formatae comparatae';
+$lang['rss_content_o_html']    = 'Pagina cum HTML';
+$lang['rss_linkto_o_diff']     = 'discrimina uidere';
+$lang['rss_linkto_o_page']     = 'pagina recensita';
+$lang['rss_linkto_o_rev']      = 'recensionum index';
+$lang['rss_linkto_o_current']  = 'hic pagina';
+$lang['compression_o_0']       = 'neuter';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'Noli uti';
+$lang['xsendfile_o_2']         = 'Praecipuus X-Sendfile';
+$lang['xsendfile_o_3']         = 'Proprietarius Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Sodalis nomen';
+$lang['showuseras_o_username'] = 'Sodalis nomen uerum';
+$lang['showuseras_o_email']    = 'Sodalis cursus interretialis (absconditus ut is tueratur)';
+$lang['showuseras_o_email_link'] = 'Sodalis cursus interretialis ut mailto: nexum';
+$lang['useheading_o_0']        = 'Numquam';
+$lang['useheading_o_navigation'] = 'Solum adspicere';
+$lang['useheading_o_content']  = 'Solum uicis argumentum';
+$lang['useheading_o_1']        = 'Semper';
+$lang['readdircache']          = 'Maximum tempus readdir (sec)';
diff --git a/sources/lib/plugins/config/lang/lb/intro.txt b/sources/lib/plugins/config/lang/lb/intro.txt
new file mode 100644
index 0000000..964ee85
--- /dev/null
+++ b/sources/lib/plugins/config/lang/lb/intro.txt
@@ -0,0 +1,7 @@
+====== Konfiguratioun ======
+
+Dëses Plugin hëlleft der bei der Konfiguratioun vun DokuWiki. Hëllef zu deenen eenzelnen Astellungen fënns de ënner [[doku>config]]. Méi Informatiounen zu dësem Plugin kriss de ënner [[doku>plugin:config]].
+
+Astellungen mat engem hellrouden Hannergrond si geséchert a kënnen net mat dësem Plugin verännert ginn. Astellungen mat hellbloem Hannergrond si Virastellungen, wäiss hannerluechte Felder weisen lokal verännert Werter un. Souwuel dié blo wéi och déi wäiss Felder kënne verännert ginn.
+
+Vergiess w.e.g. net **Späicheren** ze drécken iers de d'Säit verléiss, anescht ginn all deng Ännerungen verluer.
diff --git a/sources/lib/plugins/config/lang/lb/lang.php b/sources/lib/plugins/config/lang/lb/lang.php
new file mode 100644
index 0000000..59acdf7
--- /dev/null
+++ b/sources/lib/plugins/config/lang/lb/lang.php
@@ -0,0 +1,6 @@
+config]]. Daugiau informacijos apie šį priedą [[doku>plugin:config]].
+
+Nustatymai raudoname fone yra apsaugoti nuo pakeitimų ir negali būti pakeisti šio įrankio pagalba. Nustatymai mėlyname fone nustatyti pagal nutylėjimą, o baltame fone nustatyti lokaliai būtent šiai instaliacijai. Nustatymai mėlyname ir baltame fone gali būti keičiami.
+
+Prieš paliekant ši puslapį, nepamirškite išsaugoti pakeitimus, tai galite padaryti nuspaudę **SAVE** mygtuką, kitu atveju pakeitimai nebus išsaugoti.
diff --git a/sources/lib/plugins/config/lang/lt/lang.php b/sources/lib/plugins/config/lang/lt/lang.php
new file mode 100644
index 0000000..eff7f0e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/lt/lang.php
@@ -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 --git a/sources/lib/plugins/config/lang/lv/intro.txt b/sources/lib/plugins/config/lang/lv/intro.txt
new file mode 100644
index 0000000..e4d8d45
--- /dev/null
+++ b/sources/lib/plugins/config/lang/lv/intro.txt
@@ -0,0 +1,7 @@
+====== Konfigurācijas vednis ======
+
+Lapā var uzdot DokuWiki instalācijas iestatījumus. Palīdzību par atsevišķiem iestatījumiem meklēt [[doku>config]]. Sīkākas ziņas par šo moduli skatīt  [[doku>plugin:config]].
+
+Ar sarkanu fonu parādītie iestatījumi ir aizsargāti un ar šo moduli nav labojami. Ar zilu fonu parādītie iestatījumi ir noklusētās vērtības, bet uz balta fona parādīti programmas lokālie iestatījumi . Gan zilos, gan baltos var labot.
+
+Pirms aizej no šīs lapas, atceries nopsiest pogu **SAGLABĀT**, lai nezustu veiktās izmaiņas.
diff --git a/sources/lib/plugins/config/lang/lv/lang.php b/sources/lib/plugins/config/lang/lv/lang.php
new file mode 100644
index 0000000..aa692c1
--- /dev/null
+++ b/sources/lib/plugins/config/lang/lv/lang.php
@@ -0,0 +1,181 @@
+
+ */
+$lang['menu']                  = 'Konfigurācijas iestatījumi.';
+$lang['error']                 = 'Iestatījumi nav saglabāti, jo uzdotas aplamas vērtības. Lūdzu pārskatīt izmaiņas un saglabāt atkārtoti.
+
         Aplamās vērtības izceltas sarkanā rāmī.';
+$lang['updated']               = 'Iestatījumi veiksmīgi saglabāti.';
+$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ījumi';
+$lang['_header_undefined']     = 'Citi iestatījumi';
+$lang['_basic']                = 'Pamatiestatījumi';
+$lang['_display']              = 'Izskata iestatījumi';
+$lang['_authentication']       = 'Autentifikācija';
+$lang['_anti_spam']            = 'Pretspama iestatījumi';
+$lang['_editing']              = 'Labošanas iestatījumi';
+$lang['_links']                = 'Saišu iestatījumi';
+$lang['_media']                = 'Mēdiju iestatījumi';
+$lang['_notifications']        = 'Brīdinājumu iestatījumi';
+$lang['_advanced']             = 'Smalkāka iestatīšana';
+$lang['_network']              = 'Tīkla 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['title']                 = 'Wiki virsraksts';
+$lang['start']                 = 'Sākumlapas vārds';
+$lang['lang']                  = 'Valoda';
+$lang['template']              = 'Šablons';
+$lang['license']               = 'Ar kādu licenci saturs tiks publicēts?';
+$lang['savedir']               = 'Direktorija datu glabāšanai';
+$lang['basedir']               = 'Saknes direktorija';
+$lang['baseurl']               = 'Saknes adrese (URL)';
+$lang['dmode']                 = 'Tiesības izveidotajām direktorijām';
+$lang['fmode']                 = 'Tiesības izveidotajiem failiem';
+$lang['allowdebug']            = 'Ieslēgt atkļūdošanu. Izslēdz!';
+$lang['recent']                = 'Jaunākie grozījumi';
+$lang['recent_days']           = 'Cik dienas glabāt jaunākās izmaiņas';
+$lang['breadcrumbs']           = 'Apmeklējumu vēstures garums';
+$lang['youarehere']            = 'Rādīt "tu atrodies šeit"';
+$lang['fullpath']              = 'Norādīt kājenē pilnu lapas ceļu';
+$lang['typography']            = 'Veikt tipogrāfijas aizvietošanu';
+$lang['dformat']               = 'Datuma formāts (sk. PHP strftime funkciju)';
+$lang['signature']             = 'Paraksts';
+$lang['showuseras']            = 'Kā rādīt pēdējo lietotāju, ka labojis lapu';
+$lang['toptoclevel']           = 'Satura rādītāja pirmais līmenis';
+$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';
+$lang['deaccent']              = 'Lapu nosaukumu transliterācija';
+$lang['useheading']            = 'Izmantot pirmo virsrakstu lapu nosaukumiem';
+$lang['sneaky_index']          = 'Pēc noklusētā DokuWiki lapu sarakstā parāda visu nodaļu lapas. Ieslēdzot šo parametru, noslēps tās nodaļas, kuras apmeklētājam nav tiesības lasīt. Bet tad  tiks arī paslēptas dziļākas, bet atļautas nodaļas. Atsevišķos pieejas tiesību konfigurācijas gadījumos lapu saraksts var nedarboties.';
+$lang['hidepages']             = 'Slēpt lapas (regulāras izteiksmes)';
+$lang['useacl']                = 'Izmantot piekļuves tiesības';
+$lang['autopasswd']            = 'Automātiski ģenerēt paroles';
+$lang['authtype']              = 'Autentifikācijas mehānisms';
+$lang['passcrypt']             = 'Paroļu šifrēšanas metode';
+$lang['defaultgroup']          = 'Noklusētā grupa';
+$lang['superuser']             = 'Administrators - grupa, lietotājs vai to saraksts ( piem.: user1,@group1,user2), kam ir pilnas tiesības.';
+$lang['manager']               = 'Pārziņi - grupa, lietotājs vai to saraksts ( piem.: user1,@group1,user2), kam ir pieeja pie dažām administrēšanas funkcijām.';
+$lang['profileconfirm']        = 'Profila labošanai vajag paroli';
+$lang['rememberme']            = 'Atļaut pastāvīgas ielogošanās sīkdatnes ("atceries mani")';
+$lang['disableactions']        = 'Bloķēt Dokuwiki darbības';
+$lang['disableactions_check']  = 'atzīmēt';
+$lang['disableactions_subscription'] = 'abonēt/atteikties';
+$lang['disableactions_wikicode'] = 'skatīt/eksportēt izejtekstu';
+$lang['disableactions_other']  = 'citas darbības (atdalīt ar komatiem)';
+$lang['auth_security_timeout'] = 'Autorizācijas drošības intervāls (sekundēs)';
+$lang['securecookie']          = 'Vai pa HTTPS sūtāmās sīkdatnes sūtīt tikai pa HTTPS? Atslēdz šo iespēju, kad tikai pieteikšanās wiki sistēmā notiek pa SSL šifrētu savienojumu, bet skatīšana  - pa nešifrētu.';
+$lang['usewordblock']          = 'Bloķēt spamu pēc slikto vārdu saraksta.';
+$lang['relnofollow']           = 'rel="nofollow" ārējām saitēm';
+$lang['indexdelay']            = 'Laika aizture pirms indeksācijas (sekundēs)';
+$lang['mailguard']             = 'Slēpt epasta adreses';
+$lang['iexssprotect']          = 'Pārbaudīt, vai augšupielādētajā failā nav nav potenciāli bīstamā JavaScript vai HTML koda.';
+$lang['usedraft']              = 'Labojot automātiski saglabāt melnrakstu';
+$lang['htmlok']                = 'Atļaut iekļautu HTTP';
+$lang['phpok']                 = 'Atļaut iekļautu PHP';
+$lang['locktime']              = 'Bloķēšanas failu maksimālais vecums';
+$lang['cachetime']             = 'Bufera maksimālais vecums (sek)';
+$lang['target____wiki']        = 'Kur atvērt iekšējās saites';
+$lang['target____interwiki']   = 'Kur atvērt saites strap wiki';
+$lang['target____extern']      = 'Kur atvērt ārējās saites';
+$lang['target____media']       = 'Kur atvērt mēdiju saites';
+$lang['target____windows']     = 'Kur atvērt saites uz tīkla mapēm';
+$lang['refcheck']              = 'Pārbaudīt saites uz mēdiju failiem';
+$lang['gdlib']                 = 'GD Lib versija';
+$lang['im_convert']            = 'Ceļš uz ImageMagick convert rīku';
+$lang['jpg_quality']           = 'JPG saspiešanas kvalitāte';
+$lang['fetchsize']             = 'Maksimālais faila apjoms baitos, ko fetch.php var ielādēt no interneta.';
+$lang['subscribers']           = 'Atļaut abonēt izmaiņas';
+$lang['subscribe_time']        = 'Pēc cik ilga laika izsūtīt abonētos sarakstus un kopsavilkumus (sekundes); jābūt mazākam par laiku, kas norādīts "recent_days".';
+$lang['notify']                = 'Nosūtīt izmaiņu paziņojumu uz epasta adresi';
+$lang['registernotify']        = 'Nosūtīt paziņojumu par jauniem lietotājiem uz epasta adresi';
+$lang['mailfrom']              = 'Epasta adrese automātiskajiem paziņojumiem';
+$lang['mailprefix']            = 'E-pasta temata prefikss automātiskajiem paziņojumiem';
+$lang['sitemap']               = 'Lapas karte priekš Google (dienas)';
+$lang['rss_type']              = 'XML barotnes veids';
+$lang['rss_linkto']            = 'XML barotnes uz ';
+$lang['rss_content']           = 'Ko attēlot XML barotnē?';
+$lang['rss_update']            = 'XML barotnes atjaunošanas intervāls (sec)';
+$lang['rss_show_summary']      = 'Rādīt visrakstos XML barotnes kopsavilkumu ';
+$lang['updatecheck']           = 'Pārbaudīt, vai pieejami atjauninājumi un drošības brīdinājumi? Dokuwiki sazināsies ar update.dokuwiki.org';
+$lang['userewrite']            = 'Ērti lasāmas adreses (URL)';
+$lang['useslash']              = 'Lietot slīpiņu  par URL atdalītāju';
+$lang['sepchar']               = 'Lapas nosaukuma vārdu atdalītājs';
+$lang['canonical']             = 'Lietot kanoniskus URL';
+$lang['fnencode']              = 'Ne ASCII failvārdu kodēšanas metode:';
+$lang['autoplural']            = 'Automātisks daudzskaitlis';
+$lang['compression']           = 'Saspiešanas metode vecajiem failiem';
+$lang['gzip_output']           = 'Lietot gzip Content-Encoding priekš xhtml';
+$lang['compress']              = 'Saspiest CSS un javascript failus';
+$lang['send404']               = 'Par neesošām lapām atbildēt "HTTP 404/Page Not Found" ';
+$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['renderer_xhtml']        = 'Galveno (xhtml) wiki saturu renderēt ar ';
+$lang['renderer__core']        = '%s (dokuwiki kodols)';
+$lang['renderer__plugin']      = '%s (modulis)';
+$lang['proxy____host']         = 'Proxy servera vārds';
+$lang['proxy____port']         = 'Proxy ports';
+$lang['proxy____user']         = 'Proxy lietotāja vārds';
+$lang['proxy____pass']         = 'Proxy parole';
+$lang['proxy____ssl']          = 'Lietot SSL savienojumu ar proxy';
+$lang['proxy____except']       = 'Regulārā izteiksme tiem URL, kam nevar lietot proxy.';
+$lang['safemodehack']          = 'Lietot safemode apeju';
+$lang['ftp____host']           = 'FTP serveris safemode apejai';
+$lang['ftp____port']           = 'FTP ports safemode apejai';
+$lang['ftp____user']           = 'FTP lietotājvārds safemode apejai';
+$lang['ftp____pass']           = 'FTP parole safemode apejai';
+$lang['ftp____root']           = 'FTP saknes diektorija safemode apejai';
+$lang['license_o_']            = 'Ar nekādu';
+$lang['typography_o_0']        = 'neko';
+$lang['typography_o_1']        = 'tikai dubultpēdiņas';
+$lang['typography_o_2']        = 'visas pēdiņas (ne vienmēr strādā)';
+$lang['userewrite_o_0']        = 'nē';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki līdzekļi';
+$lang['deaccent_o_0']          = 'nē';
+$lang['deaccent_o_1']          = 'atmest diakritiku';
+$lang['deaccent_o_2']          = 'pārrakstīt latīņu burtiem';
+$lang['gdlib_o_0']             = 'GD Lib nav pieejama';
+$lang['gdlib_o_1']             = 'versija 1.x';
+$lang['gdlib_o_2']             = 'noteikt automātiksi';
+$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'] = 'Abstract';
+$lang['rss_content_o_diff']    = 'apvienotu diff';
+$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';
+$lang['rss_linkto_o_rev']      = 'grozījumu sarakstu';
+$lang['rss_linkto_o_current']  = 'patreizējo lapu';
+$lang['compression_o_0']       = 'nav';
+$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';
+$lang['readdircache']          = 'Maksimālais readdir kesš dzīves laiks (sek.)';
diff --git a/sources/lib/plugins/config/lang/mk/lang.php b/sources/lib/plugins/config/lang/mk/lang.php
new file mode 100644
index 0000000..6d4530f
--- /dev/null
+++ b/sources/lib/plugins/config/lang/mk/lang.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/config/lang/mr/intro.txt b/sources/lib/plugins/config/lang/mr/intro.txt
new file mode 100644
index 0000000..12ada73
--- /dev/null
+++ b/sources/lib/plugins/config/lang/mr/intro.txt
@@ -0,0 +1,10 @@
+====== कॉन्फिगरेशन व्यवस्थापक ====== 
+
+तुमच्या डॉक्युविकीची सेटिंग बदलान्यासाथी हे पान वापरा.
+विशिष्ठ सेटिंग विषयी माहिती पाहिजे असल्यास [[doku>config]] पहा.
+प्लगिन विषयी अधिक माहितीसाठी [[doku>plugin:config]] पहा.
+हलक्या लाल पार्श्वभूमिमधे दाखवलेले सेटिंग सुरक्षित आहेत व या प्लगिन द्वारा बदलता येणार नाहीत.
+निळ्या पार्श्वभूमीमधे दाखवलेले सेटिंग आपोआप सेट होणार्या किमती आहेत आणि पांढर्या पार्श्वभूमीमधे 
+दाखवलेले सेटिंग या इन्स्टॉलेशनसाठी ख़ास सेट केलेले आहेत. निळे आणि पांढरे दोन्ही सेटिंग बदलता येतील.
+
+ह्या पानावरून बाहर जाण्याआधी "Save" चे बटन क्लिक करायला विसरू नका नाहीतर सर्व बदल नाहीसे होतील.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/mr/lang.php b/sources/lib/plugins/config/lang/mr/lang.php
new file mode 100644
index 0000000..172c47e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/mr/lang.php
@@ -0,0 +1,177 @@
+
+ * @author Padmanabh Kulkarni
+ * @author shantanoo@gmail.com
+ */
+$lang['menu']                  = 'कॉन्फिगरेशन सेटिंग';
+$lang['error']                 = 'चुकीचा शब्द टाकल्यामुळे सेटिंग अद्ययावत केलेली नाहीत. कृपया तुमचे बदल परत तपासा आणि परत सबमिट करा. 
         चुकीच्या शब्दांभोवती लाल बॉर्डर दाखवली जाईल.';
+$lang['updated']               = 'सेटिंग अद्ययावत केली आहेत.';
+$lang['nochoice']              = '( इतर काही पर्याय नाहीत )';
+$lang['locked']                = 'सेटिंगची फाइल अद्ययावत करू शकलो नाही. जर हे सहेतुक नसेल तर, 
        
+सेटिंग च्या फाइल चे नाव व त्यावरील परवानग्या बरोबर असल्याची खात्री करा.';
+$lang['danger']                = 'सावधान : हा पर्याय बदलल्यास तुमची विकी आणि तिचे कॉनफिगरेशन निकामी होऊ शकते.';
+$lang['warning']               = 'सावघान: येथील पर्याय बदल्यास, अनपेक्षीत गोष्टी होऊ शकतात.';
+$lang['security']              = 'सुरक्षा संबंधी सूचना : हा पर्याय बदलल्यास तुमची साईट असुरक्षित होऊ शकते.';
+$lang['_configuration_manager'] = 'कॉन्फिगरेशन व्यवस्थापक';
+$lang['_header_dokuwiki']      = 'डॉक्युविकि सेटिंग';
+$lang['_header_plugin']        = 'प्लगिन सेटिंग';
+$lang['_header_template']      = 'टेम्पलेट (नमुना) सेटिंग';
+$lang['_header_undefined']     = 'अनिश्चित सेटिंग';
+$lang['_basic']                = 'पायाभूत सेटिंग';
+$lang['_display']              = 'डिसप्ले सेटिंग';
+$lang['_authentication']       = 'अधिकृत करण्याविषयी सेटिंग';
+$lang['_anti_spam']            = 'भंकस-विरोधी सेटिंग';
+$lang['_editing']              = 'संपादन सेटिंग';
+$lang['_links']                = 'लिंक सेटिंग';
+$lang['_media']                = 'दृक्श्राव्य माध्यम सेटिंग';
+$lang['_advanced']             = 'सविस्तर सेटिंग';
+$lang['_network']              = 'नेटवर्क सेटिंग';
+$lang['_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['license']               = 'कुठल्या लायसंसच्या अंतर्गत तुमचा मजकूर रिलीज़ केला गेला पाहिजे ?';
+$lang['fullpath']              = 'पानांचा पूर्ण पत्ता फूटर मधे दाखव';
+$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']             = 'लिंकसाठी कॅमलकेस वापरा.';
+$lang['deaccent']              = 'सरळ्सोट पृष्ठ नाम';
+$lang['useheading']            = 'पहिलं शीर्षक पृष्ठ नाम म्हणुन वापरा';
+$lang['refcheck']              = 'दृक्श्राव्य माध्यमाचा संदर्भ तपासा';
+$lang['allowdebug']            = 'डिबगची परवानगी  गरज नसल्यास बंद ठेवा !';
+$lang['usewordblock']          = 'भंकस मजकूर थोपवण्यासाठी शब्दसमुह वापरा';
+$lang['indexdelay']            = 'सूचीकरणापूर्वीचा अवकाश ( सेकंदात )';
+$lang['relnofollow']           = 'बाह्य लिन्कसाठी rel=nofollow  वापरा';
+$lang['mailguard']             = 'ईमेल दुर्बोध करा';
+$lang['iexssprotect']          = 'अपलोड केलेल्या फाइल हानिकारक जावास्क्रिप्ट किंवा HTML साठी तपासा';
+$lang['showuseras']            = 'पानाचं शेवटचं संपादन करणार्या सदस्याला काय दाखवायचं';
+$lang['useacl']                = 'ACL  वापरा';
+$lang['autopasswd']            = 'पासवर्ड आपोआप बनवा';
+$lang['authtype']              = 'अधिकृत करण्याच्या व्यवस्थेचे बॅक-एंड';
+$lang['passcrypt']             = 'पासवर्ड गुप्त ठेवण्याची पद्धत';
+$lang['defaultgroup']          = 'डिफॉल्ट गट';
+$lang['superuser']             = 'सुपर सदस्य - गट, सदस्य किंवा स्वल्पविरामाने अलग केलेली यादी ( उदा. सदस्य१, गट१, सदस्य२ ) ज्यांना ACL च्या सेटिंग व्यतिरिक्त सर्व पानांवर पूर्ण हक्क असतो.';
+$lang['manager']               = 'व्यवस्थापक - गट, सदस्य किंवा स्वल्पविरामाने अलग केलेली यादी ( उदा. सदस्य१, गट१, सदस्य२ ) ज्यांना व्यवस्थापनाच्या निवडक सुविधा उपलब्ध असतात.';
+$lang['profileconfirm']        = 'प्रोफाइल मधील बदल पासवर्ड वापरून नक्की करा';
+$lang['disableactions']        = 'डॉक्युविकीच्या क्रिया बंद ठेवा';
+$lang['disableactions_check']  = 'तपासा';
+$lang['disableactions_subscription'] = 'सब्सक्राईब / अन्-सब्सक्राईब';
+$lang['disableactions_wikicode'] = 'स्त्रोत पहा / कच्च्या स्वरूपात एक्सपोर्ट करा';
+$lang['disableactions_other']  = 'इतर क्रिया ( स्वल्पविरामाने अलग केलेल्या )';
+$lang['sneaky_index']          = 'सूची दृश्यामधे डिफॉल्ट स्वरूपात डॉक्युविकी सगळे नेमस्पेस दाखवते. हा पर्याय चालू केल्यास सदस्याला वाचण्याची परवानगी नसलेले नेमस्पेस दिसणार नाहीत. यामुळे परवानगी असलेले उप - नेमस्पेस न दिसण्याची शक्यता आहे. यामुळे काही विशिष्ठ ACL सेटिंगसाठी सूची वापरता येण्यासारखी राहणार नाही.';
+$lang['auth_security_timeout'] = 'अधिकृत करण्याच्या प्रक्रियेची कालमर्यादा';
+$lang['securecookie']          = 'HTTPS वापरून सेट केलेले कूकीज ब्राउजरने HTTPS द्वाराच पाठवले पाहिजेत का? जर तुमच्या विकीचं फ़क्त लॉगिन पानच SSL वापरून सुरक्षित केलं असेल व पानांचं ब्राउजिंग असुरक्षित असेल तर हा पर्याय चालू करू नका.';
+$lang['updatecheck']           = 'अपडेट आणि सुरक्षिततेविशयी सूचनान्वर पाळत ठेऊ का? या सुविधेसाठी डॉक्युविकीला update.dokuwiki.org शी संपर्क साधावा लागेल.';
+$lang['userewrite']            = 'छान छान URL वापर';
+$lang['useslash']              = 'URL  मधे नेमस्पेस अलग करण्यासाठी \'/\' चिह्न वापरा';
+$lang['usedraft']              = 'संपादन करताना मसुदा आपोआप सुरक्षित करा';
+$lang['sepchar']               = 'पानाच्या नावातील शब्द अलग करण्याचे चिह्न';
+$lang['canonical']             = 'पूर्णपणे सुटसुटीत URL वापरा';
+$lang['autoplural']            = 'लिंकमधिल अनेकवचने तपासा';
+$lang['compression']           = 'अडगळीतल्या फाइल संकुचित करण्याची पद्धत';
+$lang['cachetime']             = 'कॅशचे जास्तीतजास्त वयोमान ( सेकंदात )';
+$lang['locktime']              = 'लॉक फाइलचे जास्तीतजास्त वयोमान ( सेकंदात )';
+$lang['fetchsize']             = 'बाह्य स्त्रोताकडून जास्तीतजास्त किती डाउनलोड fecth.php  करू शकतो ( बाइट्स मधे )';
+$lang['notify']                = 'बदलाच्या सूचना ह्या ईमेल वर पाठवा';
+$lang['registernotify']        = 'नवीन नोंदणी केलेल्या सदस्यांची माहिती ह्या ईमेल वर पाठवा';
+$lang['mailfrom']              = 'आपोआप ईमेल पाठवण्यासाठी वापरायचा ईमेल';
+$lang['gzip_output']           = 'xhtml साठी gzip Content-encoding  वापरा';
+$lang['gdlib']                 = 'gzip लायब्ररीची आवृत्ती';
+$lang['im_convert']            = 'ImageMagik च्या परिवर्तन करणार्या टूलचा पाथ';
+$lang['jpg_quality']           = 'JPG संकुचित करण्याचा दर्जा ( १ - १०० )';
+$lang['subscribers']           = 'पानाची पुरवणी देण्याची सुविधा चालू करा';
+$lang['compress']              = 'CSS आणि जावास्क्रिप्टचे आउट्पुट संकुचित करा';
+$lang['hidepages']             = 'समान पाने लपवा';
+$lang['send404']               = 'अस्तित्वात नसलेल्या पानांसाठी "HTTP 404/Page not found" संदेश पाठवा';
+$lang['sitemap']               = 'गूगल साईट-मॅप बनवा';
+$lang['broken_iua']            = 'ignore_user_abort फंक्शन तुमच्या सिस्टम वर चालत नाही का? यामुळे शोध सूची निकामी होऊ शकते. IIS + PHP/CGI वर हे काम करत नाही हे नक्की झाले आहे. अधिक माहितीसाठी बग ८५२ पहा.';
+$lang['xsendfile']             = 'सर्वर कडून स्थिर फाइल पाठवली जाण्यासाठी X-Sendfile शीर्षक ( header ) वापरू का ? तुमच्या वेब सर्वर मधे ही सुविधा असली पाहिजे.';
+$lang['renderer_xhtml']        = 'मुख्य ( xhtml ) विकी आउट्पुट साथी वापरायचा चित्रक ( renderer )';
+$lang['renderer__core']        = '%s (डॉक्युविकीचा मूलभूत)';
+$lang['renderer__plugin']      = '%s (प्लगिन)';
+$lang['rememberme']            = 'कायमच्या लॉगिन कुकीजला परवानगी दया ( लक्षात ठेवा )';
+$lang['rss_type']              = 'XML पुरवणीचा प्रकार';
+$lang['rss_linkto']            = 'XML पुरवणीची लिंक येथे जाते';
+$lang['rss_content']           = 'XML पुरवणीतल्या मुद्द्यामधे काय काय दाखवायचं?';
+$lang['rss_update']            = 'XML पुरवणी अद्ययावत करण्याचा कालखंड ( सेकंदात )';
+$lang['recent_days']           = 'किती अलीकडील बदल ठेवायचे? ( दिवसात )';
+$lang['rss_show_summary']      = 'XML पुरावानीच्या शीर्षकात सारांश दाखवा';
+$lang['target____wiki']        = 'अंतर्गत लिंकसाठीची विंडो';
+$lang['target____interwiki']   = 'आंतरविकि लिंकसाठीची विंडो';
+$lang['target____extern']      = 'बाह्य लिंकसाठीची विंडो';
+$lang['target____media']       = 'दृक्श्राव्य लिंकसाठीची विंडो';
+$lang['target____windows']     = 'विंडो लिंकसाठीची विंडो';
+$lang['proxy____host']         = 'छद्म ( proxy ) सर्वरचे नाव';
+$lang['proxy____port']         = 'छद्म ( proxy ) सर्वरचे पोर्ट';
+$lang['proxy____user']         = 'छद्म ( proxy ) सर्वरचे सदस्यनाम';
+$lang['proxy____pass']         = 'छद्म ( proxy ) सर्वरचा पासवर्ड';
+$lang['proxy____ssl']          = 'छद्म सर्वरला संपर्क साधण्यासाठी SSL वापरा';
+$lang['safemodehack']          = 'सेफमोड़ हॅक चालू करा';
+$lang['ftp____host']           = 'सेफमोड़ हॅक साठी FTP सर्वर';
+$lang['ftp____port']           = 'सेफमोड़ हॅक साठी FTP पोर्ट';
+$lang['ftp____user']           = 'सेफमोड़ हॅक साठी FTP सदस्यनाम';
+$lang['ftp____pass']           = 'सेफमोड़ हॅक साठी FTP पासवर्ड';
+$lang['ftp____root']           = 'सेफमोड़ हॅक साठी FTP मूळ डिरेक्टरी';
+$lang['license_o_']            = 'काही निवडले नाही';
+$lang['typography_o_0']        = 'काही नाही';
+$lang['typography_o_1']        = 'फक्त दुहेरी अवतरण चिह्न';
+$lang['typography_o_2']        = 'सर्व प्रकारची अवतरण चिन्हे ( नेहेमी चालेलच असं नाही )';
+$lang['userewrite_o_0']        = 'कुठेही नाही';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'डॉक्युविकी अंतर्गत';
+$lang['deaccent_o_0']          = 'बंद';
+$lang['deaccent_o_1']          = 'एक्सेंट काढून टाका';
+$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';
+$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']  = 'सद्य पान';
+$lang['compression_o_0']       = 'काही नाही';
+$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']         = ' Nginx चा प्रोप्रायटरी Accel-Redirect शीर्षक';
+$lang['showuseras_o_loginname'] = 'लॉगिन  नाम';
+$lang['showuseras_o_username'] = 'सदस्याचे पूर्ण नाव';
+$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 --git a/sources/lib/plugins/config/lang/ms/lang.php b/sources/lib/plugins/config/lang/ms/lang.php
new file mode 100644
index 0000000..77ad2a1
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ms/lang.php
@@ -0,0 +1,6 @@
+
+ * @author SarojKumar Dhakal 
+ * @author Saroj Dhakal
+ */
+$lang['nochoice']              = '(अरु विकल्पहरु अनुपलव्ध)';
+$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['_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['license']               = 'कुन प्रमाण पत्रको आधारमा सामग्री प्रकाशन गरिनु पर्छ ?';
+$lang['fullpath']              = 'पष्ठको पूरा बाटो निम्नशिर्षकमा देखाउने';
+$lang['recent']                = 'हालैको परिवर्तन';
+$lang['htmlok']                = 'इम्बेडगरिएको HTML खुला गर्नुहोस ।';
+$lang['phpok']                 = 'इम्बेडगरिएको PHP खुला गर्नुहोस ।';
+$lang['signature']             = 'दस्तखत';
+$lang['renderer__core']        = '	%s (dokuwiki core)';
+$lang['renderer__plugin']      = '	%s (plugin)';
+$lang['rss_type']              = 'XML फिड प्रकार';
+$lang['rss_linkto']            = 'को XML फिड';
+$lang['gdlib_o_1']             = 'संस्करण १.x';
+$lang['gdlib_o_2']             = 'आफै पत्तालगाउनु होस् ';
+$lang['rss_type_o_rss']        = 'आरसस ०॒.९१';
+$lang['rss_type_o_rss1']       = 'आरसस १.०';
+$lang['rss_type_o_rss2']       = 'आरसस २.०';
+$lang['rss_type_o_atom']       = 'एटम ०.३';
+$lang['rss_type_o_atom1']      = 'एटम १.०';
+$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_rev']      = 'पुन:संस्करण सुची';
+$lang['rss_linkto_o_current']  = 'चालु पृष्ठ';
+$lang['compression_o_0']       = 'कुनै पनि होइन ';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'प्रयोग नगर्नुहोस्';
+$lang['showuseras_o_loginname'] = 'प्रवेश नाम';
+$lang['showuseras_o_username'] = 'प्रयोगकर्ताको पूरा नाम';
+$lang['useheading_o_0']        = 'कहिले पनि ';
+$lang['useheading_o_content']  = 'विकी विषयवस्तु मात्र';
+$lang['useheading_o_1']        = 'सधैँ';
diff --git a/sources/lib/plugins/config/lang/nl/intro.txt b/sources/lib/plugins/config/lang/nl/intro.txt
new file mode 100644
index 0000000..3814b70
--- /dev/null
+++ b/sources/lib/plugins/config/lang/nl/intro.txt
@@ -0,0 +1,9 @@
+====== Configuratie Manager ======
+
+Gebruik deze pagina om de instellingen van je DokuWiki te bekijken en/of te wijzigen. Voor hulp over specifieke instellingen kun je kijken op  [[doku>config]]. Voor meer informatie over deze plugin zie [[doku>plugin:config]].
+
+Instellingen met een rode achtergond kunnen niet worden gewijzigd met deze plugin. Instellingen met een blauwe achtergrond hebben de default waarde, en instellingen met een witte achtergrond zijn lokaal gewijzigd voor deze specifieke installatie. Zowel blauwe als witte instellingen kunnen worden gewijzigd.
+
+Vergeet niet op **Opslaan** te drukken alvorens de pagina te verlaten, anders gaan je wijzigingen verloren.
+
+
diff --git a/sources/lib/plugins/config/lang/nl/lang.php b/sources/lib/plugins/config/lang/nl/lang.php
new file mode 100644
index 0000000..14c8f9b
--- /dev/null
+++ b/sources/lib/plugins/config/lang/nl/lang.php
@@ -0,0 +1,203 @@
+
+ * @author Wouter Schoot 
+ * @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
+ * @author Marijn Hofstra 
+ * @author Timon Van Overveldt 
+ * @author Jeroen
+ * @author Ricardo Guijt 
+ * @author Gerrit 
+ */
+$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';
+$lang['_header_template']      = 'Sjabloon-instellingen';
+$lang['_header_undefined']     = 'Ongedefinieerde instellingen';
+$lang['_basic']                = 'Basisinstellingen';
+$lang['_display']              = 'Beeldinstellingen';
+$lang['_authentication']       = 'Authenticatie-instellingen';
+$lang['_anti_spam']            = 'Anti-spaminstellingen';
+$lang['_editing']              = 'Pagina-wijzigingsinstellingen';
+$lang['_links']                = 'Link-instellingen';
+$lang['_media']                = 'Media-instellingen';
+$lang['_notifications']        = 'Meldingsinstellingen';
+$lang['_syndication']          = 'Syndication-instellingen';
+$lang['_advanced']             = 'Geavanceerde instellingen';
+$lang['_network']              = 'Netwerkinstellingen';
+$lang['_msg_setting_undefined'] = 'Geen metadata voor deze instelling.';
+$lang['_msg_setting_no_class'] = 'Geen class voor deze instelling.';
+$lang['_msg_setting_no_default'] = 'Geen standaard waarde.';
+$lang['title']                 = 'Titel van de wiki';
+$lang['start']                 = 'Naam startpagina';
+$lang['lang']                  = 'Taal';
+$lang['template']              = 'Sjabloon ofwel het design van de wiki.';
+$lang['tagline']               = 'Ondertitel (als het sjabloon dat ondersteunt)';
+$lang['sidebar']               = 'Zijbalk-paginanaam (als het sjabloon dat ondersteunt), leeg veld betekent geen zijbalk';
+$lang['license']               = 'Onder welke licentie zou je tekst moeten worden gepubliceerd?';
+$lang['savedir']               = 'Directory om data op te slaan';
+$lang['basedir']               = 'Basisdirectory';
+$lang['baseurl']               = 'Basis-URL';
+$lang['cookiedir']             = 'Cookie pad. Laat leeg om de basis URL te gebruiken.';
+$lang['dmode']                 = 'Directory-aanmaak-modus (directory creation mode)';
+$lang['fmode']                 = 'Bestandaanmaak-modus (file creation mode)';
+$lang['allowdebug']            = 'Debug toestaan uitzetten indien niet noodzakelijk!';
+$lang['recent']                = 'Het aantal regels in Recente wijzigingen';
+$lang['recent_days']           = 'Hoeveel recente wijzigingen bewaren (dagen)';
+$lang['breadcrumbs']           = 'Aantal broodkruimels. Zet dit op 0 om uit te schakelen.';
+$lang['youarehere']            = 'Gebruik hiërarchische broodkruimels (waarschijnlijk wil je dan de optie hierboven uitschakelen)';
+$lang['fullpath']              = 'Volledig pad van pagina\'s in de footer weergeven';
+$lang['typography']            = 'Breng typografische wijzigingen aan';
+$lang['dformat']               = 'Datum formaat (zie de PHP strftime functie)';
+$lang['signature']             = 'Tekst die ingevoegd wordt met de Handtekening-knop in het bewerkvenster.';
+$lang['showuseras']            = 'Hoe de gebruiker die de pagina het laatst wijzigde weergeven';
+$lang['toptoclevel']           = 'Bovenste niveau voor inhoudsopgave';
+$lang['tocminheads']           = 'Minimum aantal koppen dat bepaald of een index gemaakt wordt';
+$lang['maxtoclevel']           = 'Laagste niveau voor inhoudsopgave';
+$lang['maxseclevel']           = 'Laagste sectiewijzigingsniveau';
+$lang['camelcase']             = 'CamelCase gebruiken voor links';
+$lang['deaccent']              = 'Paginanamen ontdoen van vreemde tekens';
+$lang['useheading']            = 'Eerste kopje voor paginanaam gebruiken';
+$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['hidepages']             = 'Verberg deze pagina\'s in zoekresultaten, de index en andere automatische indexen (regular expressions)';
+$lang['useacl']                = 'Gebruik access control lists';
+$lang['autopasswd']            = 'Zelf wachtwoorden genereren';
+$lang['authtype']              = 'Authenticatiemechanisme';
+$lang['passcrypt']             = 'Encryptie-methode voor wachtwoord ';
+$lang['defaultgroup']          = 'Standaardgroep, alle nieuwe gebruikers worden hierin geplaatst';
+$lang['superuser']             = 'Superuser - een groep of gebruiker of kommalijst (gebruiker1,@groep1,gebruiker2) met volledige toegang tot alle pagina\'s en functies, ongeacht de ACL instellingen';
+$lang['manager']               = 'Beheerder - een groep of gebruiker of kommalijst (gebruiker1,@groep1,gebruiker2) met toegang tot bepaalde beheersfunctionaliteit';
+$lang['profileconfirm']        = 'Bevestig profielwijzigingen met wachtwoord';
+$lang['rememberme']            = 'Permanente login cookie toestaan (onthoud mij)';
+$lang['disableactions']        = 'Aangevinkte DokuWiki-akties uitschakelen';
+$lang['disableactions_check']  = 'Controleer';
+$lang['disableactions_subscription'] = 'Inschrijven/opzeggen';
+$lang['disableactions_wikicode'] = 'Bron bekijken/exporteer rauw';
+$lang['disableactions_other']  = 'Andere akties (gescheiden door komma\'s)';
+$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['remote']                = 'Activeer het remote API-systeem. Hiermee kunnen andere applicaties de wiki benaderen via XML-RPC of andere mechanismen.';
+$lang['remoteuser']            = 'Beperk toegang tot de remote API tot deze komma-lijst van groepen of gebruikers. Leeg betekent toegang voor iedereen.';
+$lang['usewordblock']          = 'Blokkeer spam op basis van woordenlijst';
+$lang['relnofollow']           = 'Gebruik rel="nofollow" voor externe links';
+$lang['indexdelay']            = 'Uitstel voor indexeren (sec)';
+$lang['mailguard']             = 'E-mailadressen onherkenbaar maken';
+$lang['iexssprotect']          = 'Controleer geüploade bestanden op mogelijk schadelijke JavaScript of HTML code';
+$lang['usedraft']              = 'Sla automatisch een concept op tijdens het wijzigen';
+$lang['htmlok']                = 'Embedded HTML toestaan';
+$lang['phpok']                 = 'Embedded PHP toestaan';
+$lang['locktime']              = 'Maximum leeftijd voor lockbestanden (sec)';
+$lang['cachetime']             = 'Maximum leeftijd voor cache (sec)';
+$lang['target____wiki']        = 'Doelvenster voor interne links';
+$lang['target____interwiki']   = 'Doelvenster voor interwiki-links';
+$lang['target____extern']      = 'Doelvenster voor externe links';
+$lang['target____media']       = 'Doelvenster voor medialinks';
+$lang['target____windows']     = 'Doelvenster voor windows links';
+$lang['mediarevisions']        = 'Mediarevisies activeren?';
+$lang['refcheck']              = 'Controleer of er verwijzingen bestaan naar een mediabestand voor het wijderen';
+$lang['gdlib']                 = 'Versie GD Lib ';
+$lang['im_convert']            = 'Path naar ImageMagick\'s convert tool';
+$lang['jpg_quality']           = 'JPG compressiekwaliteit (0-100)';
+$lang['fetchsize']             = 'Maximum grootte (bytes) die fetch.php mag downloaden van externe URLs, bijv. voor cachen of herschalen van externe afbeeldingen.';
+$lang['subscribers']           = 'Ondersteuning pagina-inschrijving aanzetten';
+$lang['subscribe_time']        = 'Inschrijvingsmeldingen en samenvattingen worden na deze tijdsduur (in seconden) verzonden. Deze waarde dient kleiner te zijn dan de tijd ingevuld bij "Hoeveel recente wijzigingen bewaren (dagen)"';
+$lang['notify']                = 'Stuur altijd e-mailnotificaties naar dit adres';
+$lang['registernotify']        = 'Stuur altijd informatie over nieuw geregistreerde gebruikers naar dit e-mailadres';
+$lang['mailfrom']              = 'E-mailadres van afzender voor automatische e-mail';
+$lang['mailprefix']            = 'Te gebruiken voorvoegsel voor onderwerp automatische email. Leeglaten gebruik de wikititel.';
+$lang['htmlmail']              = 'Zend multipart HTML e-mail. Dit ziet er beter uit, maar is groter. Uitschakelen betekent e-mail in platte tekst.';
+$lang['sitemap']               = 'Genereer Google sitemap (dagen). 0 betekent uitschakelen.';
+$lang['rss_type']              = 'XML feed type';
+$lang['rss_linkto']            = 'XML feed linkt naar';
+$lang['rss_content']           = 'Wat moet er in de XML feed items weergegeven worden?';
+$lang['rss_update']            = 'XML feed verversingsinterval (sec)';
+$lang['rss_show_summary']      = 'XML feed samenvatting in titel weergeven';
+$lang['rss_media']             = 'Welk type verandering moet in de XML feed worden weergegeven?';
+$lang['updatecheck']           = 'Controleer op nieuwe versies en beveiligingswaarschuwingen? DokuWiki moet hiervoor contact opnemen met update.dokuwiki.org.';
+$lang['userewrite']            = 'Gebruik nette URL\'s';
+$lang['useslash']              = 'Gebruik slash (/) als scheiding tussen namepaces in URL\'s';
+$lang['sepchar']               = 'Woordscheider in paginanamen';
+$lang['canonical']             = 'Herleid URL\'s tot hun basisvorm';
+$lang['fnencode']              = 'Methode om niet-ASCII bestandsnamen te coderen.';
+$lang['autoplural']            = 'Controleer op meervoudsvormen in links';
+$lang['compression']           = 'Compressiemethode voor attic-bestanden';
+$lang['gzip_output']           = 'Gebruik gzip Content-Encoding voor xhtml';
+$lang['compress']              = 'Compacte CSS en javascript output';
+$lang['cssdatauri']            = 'Maximale omvang in bytes van in CSS gelinkte afbeeldingen die bij de stylesheet moeten worden ingesloten ter reductie van de HTTP request header overhead. Deze techniek werkt niet in IE7 en ouder! 400 tot 600 is een geschikte omvang. Stel de omvang in op 0 om deze functionaliteit uit te schakelen.';
+$lang['send404']               = 'Stuur "HTTP 404/Page Not Found" voor niet-bestaande pagina\'s';
+$lang['broken_iua']            = 'Is de ignore_user_abort functie onbruikbaar op uw systeem? Dit kan een onbruikbare zoekindex tot gevolg hebben. IIS+PHP/CGI staat hier bekend om. Zie Bug 852 voor meer informatie.';
+$lang['xsendfile']             = 'Gebruik de X-Sendfile header om de webserver statische content te laten versturen? De webserver moet dit wel ondersteunen.';
+$lang['renderer_xhtml']        = 'Weergavesysteem voor de standaard (xhtml) wiki-uitvoer';
+$lang['renderer__core']        = '%s (dokuwiki core)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['dnslookups']            = 'DokuWiki zoekt de hostnamen van IP-adressen van gebruikers die pagina wijzigen op. Schakel deze optie uit als je geen of een langzame DNS server hebt.';
+$lang['proxy____host']         = 'Proxy server';
+$lang['proxy____port']         = 'Proxy port';
+$lang['proxy____user']         = 'Proxy gebruikersnaam';
+$lang['proxy____pass']         = 'Proxy wachtwoord';
+$lang['proxy____ssl']          = 'Gebruik SSL om een verbinding te maken met de proxy';
+$lang['proxy____except']       = 'Reguliere expressie om URL\'s te bepalen waarvoor de proxy overgeslagen moet worden.';
+$lang['safemodehack']          = 'Safemode hack aanzetten';
+$lang['ftp____host']           = 'FTP server voor safemode hack';
+$lang['ftp____port']           = 'FTP port voor safemode hack';
+$lang['ftp____user']           = 'FTP gebruikersnaam voor safemode hack';
+$lang['ftp____pass']           = 'FTP wachtwoord voor safemode hack';
+$lang['ftp____root']           = 'FTP root directory voor safemode hack';
+$lang['license_o_']            = 'Geen gekozen';
+$lang['typography_o_0']        = 'geen';
+$lang['typography_o_1']        = 'Alleen dubbele aanhalingstekens';
+$lang['typography_o_2']        = 'Alle aanhalingstekens (functioneert mogelijk niet altijd)';
+$lang['userewrite_o_0']        = 'geen';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki intern';
+$lang['deaccent_o_0']          = 'uit';
+$lang['deaccent_o_1']          = 'accenten verwijderen';
+$lang['deaccent_o_2']          = 'romaniseer';
+$lang['gdlib_o_0']             = 'GD Lib niet beschikbaar';
+$lang['gdlib_o_1']             = 'Version 1.x';
+$lang['gdlib_o_2']             = 'Autodetectie';
+$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'] = 'Abstract';
+$lang['rss_content_o_diff']    = 'Unified Diff';
+$lang['rss_content_o_htmldiff'] = 'Diff-tabel in HTML';
+$lang['rss_content_o_html']    = 'Volledige pagina-inhoud in HTML';
+$lang['rss_linkto_o_diff']     = 'verschillen';
+$lang['rss_linkto_o_page']     = 'de gewijzigde pagina';
+$lang['rss_linkto_o_rev']      = 'lijst van revisies';
+$lang['rss_linkto_o_current']  = 'de huidige pagina';
+$lang['compression_o_0']       = 'geen';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'niet gebruiken';
+$lang['xsendfile_o_1']         = 'Merkgebonden lighttpd header (voor release 1.5)';
+$lang['xsendfile_o_2']         = 'Standaard X-Sendfile header';
+$lang['xsendfile_o_3']         = 'Merkgebonden Nginx X-Accel-Redirect header';
+$lang['showuseras_o_loginname'] = 'Loginnaam';
+$lang['showuseras_o_username'] = 'Volledige naam';
+$lang['showuseras_o_email']    = 'E-mailadres (onherkenbaar gemaakt volgens mailguard-instelling)';
+$lang['showuseras_o_email_link'] = 'E-mailadres als mailto: link';
+$lang['useheading_o_0']        = 'Nooit';
+$lang['useheading_o_navigation'] = 'Alleen navigatie';
+$lang['useheading_o_content']  = 'Alleen wiki inhoud';
+$lang['useheading_o_1']        = 'Altijd';
+$lang['readdircache']          = 'Maximale leeftijd voor readdir cache (in seconden)';
diff --git a/sources/lib/plugins/config/lang/no/intro.txt b/sources/lib/plugins/config/lang/no/intro.txt
new file mode 100644
index 0000000..c1310cc
--- /dev/null
+++ b/sources/lib/plugins/config/lang/no/intro.txt
@@ -0,0 +1,7 @@
+====== Konfigurasjonsinnstillinger ======
+
+Bruk denne siden for å kontrollere innstillingene for din DokuWiki. For hjelp om hver enkelt innstilling, se [[doku>config]]. For mer detaljer om denne innstillingssiden, se [[doku>plugin:config]].
+
+Innstillinger vist med lys rød bakgrunn er beskyttet og kan ikke endres på denne siden. Innstillinger vist med blå bakgrunn er standardverdier og innstillinger med hvit bakgrunn har blitt satt lokalt for denne installasjonen. Både blå og hvite innstillinger kan endres.
+
+Husk å trykke på **Lagre**-knappen før du forlater siden. Hvis ikke går endringene tapt.
diff --git a/sources/lib/plugins/config/lang/no/lang.php b/sources/lib/plugins/config/lang/no/lang.php
new file mode 100644
index 0000000..f048a0f
--- /dev/null
+++ b/sources/lib/plugins/config/lang/no/lang.php
@@ -0,0 +1,198 @@
+
+ * @author Arild Burud 
+ * @author Torkill Bruland 
+ * @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 
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Jon Bøe 
+ * @author Egil Hansen 
+ */
+$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.
+
        Ugyldige verdier er omgitt av en rød ramme.';
+$lang['updated']               = 'Innstillingene ble oppdatert.';
+$lang['nochoice']              = '(ingen andre mulige valg)';
+$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 utilsiktet atferd.
+
+';
+$lang['security']              = 'Sikkerhetsadvarsel: Endring av dette valget kan innebære en sikkerhetsrisiko.';
+$lang['_configuration_manager'] = 'Konfigurasjonsinnstillinger';
+$lang['_header_dokuwiki']      = 'Innstillinger for DokuWiki';
+$lang['_header_plugin']        = 'Innstillinger for tillegg';
+$lang['_header_template']      = 'Innstillinger for maler';
+$lang['_header_undefined']     = 'Udefinerte innstillinger';
+$lang['_basic']                = 'Grunnleggende innstillinger';
+$lang['_display']              = 'Innstillinger for visning av sider';
+$lang['_authentication']       = 'Innstillinger for autentisering';
+$lang['_anti_spam']            = 'Anti-Spam innstillinger';
+$lang['_editing']              = 'Innstillinger for redigering';
+$lang['_links']                = 'Innstillinger for lenker';
+$lang['_media']                = 'Innstillinger for mediafiler';
+$lang['_advanced']             = 'Avanserte innstillinger';
+$lang['_network']              = 'Nettverksinnstillinger';
+$lang['_msg_setting_undefined'] = 'Ingen innstillingsmetadata';
+$lang['_msg_setting_no_class'] = 'Ingen innstillingsklasse';
+$lang['_msg_setting_no_default'] = 'Ingen standard verdi';
+$lang['fmode']                 = 'Rettigheter for nye filer';
+$lang['dmode']                 = 'Rettigheter for nye mapper';
+$lang['lang']                  = 'Språk';
+$lang['basedir']               = 'Grunnkatalog';
+$lang['baseurl']               = 'Grunn-nettadresse';
+$lang['savedir']               = 'Mappe for lagring av data';
+$lang['cookiedir']             = 'Sti for informasjonskapsler. La stå blankt for å bruke grunn-nettadressa.';
+$lang['start']                 = 'Sidenavn på forsiden';
+$lang['title']                 = 'Navn på Wikien';
+$lang['template']              = 'Mal';
+$lang['license']               = 'Under hvilken lisens skal ditt innhold utgis?';
+$lang['fullpath']              = 'Vis full sti til sider i bunnteksten';
+$lang['recent']                = 'Siste endringer';
+$lang['breadcrumbs']           = 'Antall nylig besøkte sider som vises';
+$lang['youarehere']            = 'Vis hvor i hvilke(t) navnerom siden er';
+$lang['typography']            = 'Gjør typografiske erstatninger';
+$lang['htmlok']                = 'Tillat HTML';
+$lang['phpok']                 = 'Tillat PHP';
+$lang['dformat']               = 'Datoformat (se PHPs datofunksjon)';
+$lang['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 KamelKasse til lenke automatisk';
+$lang['deaccent']              = 'Rensk sidenavn';
+$lang['useheading']            = 'Bruk første overskrift som tittel';
+$lang['refcheck']              = 'Sjekk referanser før mediafiler slettes';
+$lang['allowdebug']            = 'Tillat feilsøking skru av om det ikke behøves!';
+$lang['mediarevisions']        = 'Slå på mediaversjonering?';
+$lang['usewordblock']          = 'Blokker søppel basert på ordliste';
+$lang['indexdelay']            = 'Forsinkelse før indeksering (sekunder)';
+$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, 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';
+$lang['disableactions_subscription'] = 'Meld på/av';
+$lang['disableactions_wikicode'] = 'Vis kildekode/eksporter rådata';
+$lang['disableactions_other']  = 'Andre kommandoer (kommaseparert)';
+$lang['sneaky_index']          = 'DokuWiki vil som standard vise alle navnerom i innholdsfortegnelsen. Hvis du skrur på dette alternativet vil brukere bare se de navnerommene der de har lesetilgang. Dette kan føre til at tilgjengelige undernavnerom skjules. Det kan gjøre innholdsfortegnelsen ubrukelig med enkelte ACL-oppsett.';
+$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['updatecheck']           = 'Se etter oppdateringer og sikkerhetsadvarsler? Denne funksjonen er avhengig av å kontakte update.dokuwiki.org.';
+$lang['userewrite']            = 'Bruk pene URLer';
+$lang['useslash']              = 'Bruk / som skilletegn mellom navnerom i URLer';
+$lang['usedraft']              = 'Lagre kladd automatisk under redigering';
+$lang['sepchar']               = 'Skilletegn mellom ord i sidenavn';
+$lang['canonical']             = 'Bruk fulle URLer (i stedet for relative)';
+$lang['fnencode']              = 'Metode for å kode ikke-ASCII-filnavn';
+$lang['autoplural']            = 'Se etter flertallsformer i lenker';
+$lang['compression']           = 'Metode for komprimering av gamle filer';
+$lang['cachetime']             = 'Maksimal alder på hurtiglager (sekunder)';
+$lang['locktime']              = 'Maksimal alder på låsefiler (sekunder)';
+$lang['fetchsize']             = 'Maksimal størrelse (byter) fetch.php kan laste eksternt';
+$lang['notify']                = 'Send meldinger om endringer denne e-postadressen';
+$lang['registernotify']        = 'Send info om nylig registrerte brukere til denne e-postadressen';
+$lang['mailfrom']              = 'Avsenderadresse for automatiske e-poster';
+$lang['mailprefix']            = 'Prefiks for emne i automatiske e-poster ';
+$lang['gzip_output']           = 'Bruk gzip Content-Encoding for XHTML';
+$lang['gdlib']                 = 'Versjon av libGD';
+$lang['im_convert']            = 'Sti til ImageMagicks konverteringsverktøy';
+$lang['jpg_quality']           = 'JPEG-kvalitet (0-100)';
+$lang['subscribers']           = 'Åpne for abonnement på endringer av en side';
+$lang['subscribe_time']        = 'Hvor lenge det skal gå mellom utsending av e-poster med endringer (i sekunder). Denne verdien bør være mindre enn verdien i recent_days.';
+$lang['compress']              = 'Kompakt CSS og JavaScript';
+$lang['cssdatauri']            = 'Opp til denne størrelsen (i bytes) skal bilder som er vist til i CSS-filer kodes direkte inn i fila for å redusere antall HTTP-forespørsler. Denne teknikken fungerer ikke i IE < 8! Mellom 400 og 600 bytes er fornuftige verdier. Bruk 0 for å skru av funksjonen.';
+$lang['hidepages']             = 'Skjul sider fra automatiske lister (regulære uttrykk)';
+$lang['send404']               = 'Send "HTTP 404/Page Not Found" for ikke-eksisterende sider';
+$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['renderer_xhtml']        = 'Renderer til bruk for wiki-output (XHTML)';
+$lang['renderer__core']        = '%s (dokuwikikjerne)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['rememberme']            = 'Tillat permanente informasjonskapsler for innlogging (husk meg)';
+$lang['rss_type']              = 'Type XML-feed';
+$lang['rss_linkto']            = 'XML-feed lenker til';
+$lang['rss_content']           = 'Hva skal vises i XML-feed elementer?';
+$lang['rss_update']            = 'Intervall for oppdatering av XML-feed (sekunder)';
+$lang['recent_days']           = 'Hvor lenge skal nylige endringer beholdes (dager)';
+$lang['rss_show_summary']      = 'Vis redigeringskommentar i tittelen på elementer i XML-feed ';
+$lang['target____wiki']        = 'Mål for interne linker';
+$lang['target____interwiki']   = 'Mål for interwiki-lenker';
+$lang['target____extern']      = 'Mål for eksterne lenker';
+$lang['target____media']       = 'Mål for lenker til mediafiler';
+$lang['target____windows']     = 'Mål for lenker til nettverksstasjoner i Windows';
+$lang['proxy____host']         = 'Navn på proxyserver';
+$lang['proxy____port']         = 'Proxyport';
+$lang['proxy____user']         = 'Brukernavn på proxyserver';
+$lang['proxy____pass']         = 'Passord på proxyserver';
+$lang['proxy____ssl']          = 'Bruk SSL for å koble til proxyserver';
+$lang['proxy____except']       = 'Regulært uttrykk for URLer som ikke trenger en proxy.';
+$lang['safemodehack']          = 'Bruk safemode-hack';
+$lang['ftp____host']           = 'FTP-server for safemode-hack';
+$lang['ftp____port']           = 'FTP-port for safemode-hack';
+$lang['ftp____user']           = 'FTP-brukernavn for safemode-hack';
+$lang['ftp____pass']           = 'FTP-passord for safemode-hack';
+$lang['ftp____root']           = 'FTP-rotmappe for safemode-hack';
+$lang['license_o_']            = 'Ingen valgt';
+$lang['typography_o_0']        = 'ingen';
+$lang['typography_o_1']        = 'Kun doble anførselstegn';
+$lang['typography_o_2']        = 'Alle anførselstegn (virker ikke alltid)';
+$lang['userewrite_o_0']        = 'ingen';
+$lang['userewrite_o_1']        = 'Apache (.htaccess)';
+$lang['userewrite_o_2']        = 'DokuWiki internt';
+$lang['deaccent_o_0']          = 'av';
+$lang['deaccent_o_1']          = 'fjern aksenter';
+$lang['deaccent_o_2']          = 'bytt til kun latinske bokstaver';
+$lang['gdlib_o_0']             = 'GD lib ikke tilgjengelig';
+$lang['gdlib_o_1']             = 'Versjon 1.x';
+$lang['gdlib_o_2']             = 'Automatisk oppdaging';
+$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'] = 'Ingress';
+$lang['rss_content_o_diff']    = 'Forent Diff';
+$lang['rss_content_o_htmldiff'] = 'HTML-formatert diff-tabell';
+$lang['rss_content_o_html']    = 'Full HTML sideinnhold';
+$lang['rss_linkto_o_diff']     = 'endringsvisning';
+$lang['rss_linkto_o_page']     = 'den endrede siden';
+$lang['rss_linkto_o_rev']      = 'liste over endringer';
+$lang['rss_linkto_o_current']  = 'den nåværende siden';
+$lang['compression_o_0']       = 'ingen';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'ikke bruk';
+$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 e-postadresse (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';
+$lang['readdircache']          = 'Maksimal alder for mellomlagring av mappen med søkeindekser (sekunder)';
diff --git a/sources/lib/plugins/config/lang/pl/intro.txt b/sources/lib/plugins/config/lang/pl/intro.txt
new file mode 100644
index 0000000..72c0e1c
--- /dev/null
+++ b/sources/lib/plugins/config/lang/pl/intro.txt
@@ -0,0 +1,9 @@
+====== Menadżer konfiguracji ======
+
+Na tej stronie można zmienić ustawienia tej instalacji DokuWiki. W celu uzyskania pomocy na temat ustawień zajrzyj na stronę o [[doku>config|konfiguracji]]. W celu uzyskania informacji o tej wtyczce zajrzyj na stronę o [[doku>plugin:config|wtyczce]].
+
+Ustawienia w kolorze jasnoczerwonym są chronione i nie mogą być zmienioną z użyciem tej wtyczki. Ustawienia w kolorze niebieskim mają domyślne wartości. Ustawienia w kolorze białym są specyficzne dla tej instalacji. Ustawienia w kolorach niebieskim i białym mogą być zmienione.
+
+W celu zapisania nowej konfiguracji naciśnij **zapisz** przed opuszczeniem tej strony.
+
+
diff --git a/sources/lib/plugins/config/lang/pl/lang.php b/sources/lib/plugins/config/lang/pl/lang.php
new file mode 100644
index 0000000..9a7cc49
--- /dev/null
+++ b/sources/lib/plugins/config/lang/pl/lang.php
@@ -0,0 +1,202 @@
+
+ * @author Mariusz Kujawski 
+ * @author Maciej Kurczewski 
+ * @author Sławomir Boczek 
+ * @author Piotr JANKOWSKI 
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski 
+ * @author maros 
+ * @author Grzegorz Widła 
+ * @author Łukasz Chmaj 
+ * @author Begina Felicysym 
+ * @author Aoi Karasu 
+ */
+$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 konfiguracji.';
+$lang['warning']               = 'Ostrzeżenie: Zmiana tej opcji może spowodować nieporządane skutki.';
+$lang['security']              = 'Alert bezpieczeństwa: Zmiana tej opcji może obniżyć bezpieczeństwo.';
+$lang['_configuration_manager'] = 'Menadżer konfiguracji';
+$lang['_header_dokuwiki']      = 'Ustawienia DokuWiki';
+$lang['_header_plugin']        = 'Ustawienia wtyczek';
+$lang['_header_template']      = 'Ustawienia motywu';
+$lang['_header_undefined']     = 'Inne ustawienia';
+$lang['_basic']                = 'Podstawowe';
+$lang['_display']              = 'Wygląd';
+$lang['_authentication']       = 'Autoryzacja';
+$lang['_anti_spam']            = 'Spam';
+$lang['_editing']              = 'Edycja';
+$lang['_links']                = 'Odnośniki';
+$lang['_media']                = 'Media';
+$lang['_notifications']        = 'Ustawienia powiadomień';
+$lang['_syndication']          = 'Ustawienia RSS';
+$lang['_advanced']             = 'Zaawansowane';
+$lang['_network']              = 'Sieć';
+$lang['_msg_setting_undefined'] = 'Brak danych o ustawieniu.';
+$lang['_msg_setting_no_class'] = 'Brak kategorii ustawień.';
+$lang['_msg_setting_no_default'] = 'Brak wartości domyślnej.';
+$lang['title']                 = 'Tytuł wiki';
+$lang['start']                 = 'Tytuł strony początkowej';
+$lang['lang']                  = 'Język';
+$lang['template']              = 'Motyw';
+$lang['tagline']               = 'Motto (jeśli szablon daje taką możliwość)';
+$lang['sidebar']               = 'Nazwa strony paska bocznego (jeśli szablon je obsługuje), puste pole wyłącza pasek boczny';
+$lang['license']               = 'Pod jaką licencją publikować treści wiki?';
+$lang['savedir']               = 'Katalog z danymi';
+$lang['basedir']               = 'Katalog główny';
+$lang['baseurl']               = 'Główny URL';
+$lang['cookiedir']             = 'Ścieżka plików ciasteczek. Zostaw puste by użyć baseurl.';
+$lang['dmode']                 = 'Tryb tworzenia katalogu';
+$lang['fmode']                 = 'Tryb tworzenia pliku';
+$lang['allowdebug']            = 'Debugowanie (niebezpieczne!)';
+$lang['recent']                = 'Ilość ostatnich zmian';
+$lang['recent_days']           = 'Ilość ostatnich zmian (w dniach)';
+$lang['breadcrumbs']           = 'Długość śladu';
+$lang['youarehere']            = 'Ślad według struktury';
+$lang['fullpath']              = 'Wyświetlanie pełnych ścieżek';
+$lang['typography']            = 'Konwersja cudzysłowu, myślników itp.';
+$lang['dformat']               = 'Format daty';
+$lang['signature']             = 'Podpis';
+$lang['showuseras']            = 'Sposób wyświetlania nazwy użytkownika, który ostatnio edytował stronę';
+$lang['toptoclevel']           = 'Minimalny poziom spisu treści';
+$lang['tocminheads']           = 'Minimalna liczba nagłówków niezbędna do wytworzenia spisu treści.';
+$lang['maxtoclevel']           = 'Maksymalny poziom spisu treści';
+$lang['maxseclevel']           = 'Maksymalny poziom podziału na sekcje edycyjne';
+$lang['camelcase']             = 'Bikapitalizacja odnośników (CamelCase)';
+$lang['deaccent']              = 'Podmieniaj znaki spoza ASCII w nazwach';
+$lang['useheading']            = 'Pierwszy nagłówek jako tytuł';
+$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['hidepages']             = 'Ukrywanie stron pasujących do wzorca (wyrażenie regularne)';
+$lang['useacl']                = 'Kontrola uprawnień ACL';
+$lang['autopasswd']            = 'Automatyczne generowanie haseł';
+$lang['authtype']              = 'Typ autoryzacji';
+$lang['passcrypt']             = 'Kodowanie hasła';
+$lang['defaultgroup']          = 'Domyślna grupa';
+$lang['superuser']             = 'Administrator - grupa lub użytkownik z pełnymi uprawnieniami';
+$lang['manager']               = 'Menadżer - grupa lub użytkownik z uprawnieniami do zarządzania wiki';
+$lang['profileconfirm']        = 'Potwierdzanie zmiany profilu hasłem';
+$lang['rememberme']            = 'Pozwól na ciasteczka automatycznie logujące (pamiętaj mnie)';
+$lang['disableactions']        = 'Wyłącz akcje DokuWiki';
+$lang['disableactions_check']  = 'Sprawdzanie';
+$lang['disableactions_subscription'] = 'Subskrypcje';
+$lang['disableactions_wikicode'] = 'Pokazywanie źródeł';
+$lang['disableactions_other']  = 'Inne akcje (oddzielone przecinkiem)';
+$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['remote']                = 'Włącz API zdalnego dostępu. Pozwoli to innym aplikacjom na dostęp do wiki poprzez XML-RPC lub inne mechanizmy.';
+$lang['remoteuser']            = 'Ogranicz dostęp poprzez API zdalnego dostępu do podanych grup lub użytkowników, oddzielonych przecinkami. Pozostaw to pole puste by pozwolić na dostęp be ograniczeń.';
+$lang['usewordblock']          = 'Blokowanie spamu na podstawie słów';
+$lang['relnofollow']           = 'Nagłówek rel="nofollow" dla odnośników zewnętrznych';
+$lang['indexdelay']            = 'Okres indeksowania w sekundach';
+$lang['mailguard']             = 'Utrudnianie odczytu adresów e-mail';
+$lang['iexssprotect']          = 'Wykrywanie złośliwego kodu JavaScript i HTML w plikach';
+$lang['usedraft']              = 'Automatyczne zapisywanie szkicu podczas edycji';
+$lang['htmlok']                = 'Wstawki HTML';
+$lang['phpok']                 = 'Wstawki PHP';
+$lang['locktime']              = 'Maksymalny wiek blokad w sekundach';
+$lang['cachetime']             = 'Maksymalny wiek cache w sekundach';
+$lang['target____wiki']        = 'Okno docelowe odnośników wewnętrznych';
+$lang['target____interwiki']   = 'Okno docelowe odnośników do innych wiki';
+$lang['target____extern']      = 'Okno docelowe odnośników zewnętrznych';
+$lang['target____media']       = 'Okno docelowe odnośników do plików';
+$lang['target____windows']     = 'Okno docelowe odnośników zasobów Windows';
+$lang['mediarevisions']        = 'Włączyć wersjonowanie multimediów?';
+$lang['refcheck']              = 'Sprawdzanie odwołań przed usunięciem pliku';
+$lang['gdlib']                 = 'Wersja biblioteki GDLib';
+$lang['im_convert']            = 'Ścieżka do programu imagemagick';
+$lang['jpg_quality']           = 'Jakość kompresji JPG (0-100)';
+$lang['fetchsize']             = 'Maksymalny rozmiar pliku (w bajtach) jaki można pobrać z zewnątrz';
+$lang['subscribers']           = 'Subskrypcja';
+$lang['subscribe_time']        = 'Czas po którym są wysyłane listy subskrypcji i streszczenia (sek.); Powinna być to wartość większa niż podana w zmiennej recent_days.';
+$lang['notify']                = 'Wysyłanie powiadomień na adres e-mail';
+$lang['registernotify']        = 'Prześlij informacje o nowych użytkownikach na adres e-mail';
+$lang['mailfrom']              = 'Adres e-mail tego wiki';
+$lang['mailprefix']            = 'Prefiks tematu e-mail do automatycznych wiadomości';
+$lang['htmlmail']              = 'Wysyłaj wiadomości e-mail w formacie HTML, które wyglądają lepiej, lecz ich rozmiar jest większy. Wyłącz wysyłanie wiadomości zawierających tekst niesformatowany.';
+$lang['sitemap']               = 'Okres generowania Google Sitemap (w dniach)';
+$lang['rss_type']              = 'Typ RSS';
+$lang['rss_linkto']            = 'Odnośniki w RSS';
+$lang['rss_content']           = 'Rodzaj informacji wyświetlanych w RSS ';
+$lang['rss_update']            = 'Okres aktualizacji RSS (w sekundach)';
+$lang['rss_show_summary']      = 'Podsumowanie w tytule';
+$lang['rss_media']             = 'Rodzaj zmian wyświetlanych w RSS';
+$lang['updatecheck']           = 'Sprawdzanie aktualizacji i bezpieczeństwa. DokuWiki będzie kontaktować się z serwerem update.dokuwiki.org.';
+$lang['userewrite']            = 'Proste adresy URL';
+$lang['useslash']              = 'Używanie ukośnika jako separatora w adresie URL';
+$lang['sepchar']               = 'Znak rozdzielający wyrazy nazw';
+$lang['canonical']             = 'Kanoniczne adresy URL';
+$lang['fnencode']              = 'Metoda kodowana nazw pików bez użycia ASCII.';
+$lang['autoplural']            = 'Automatyczne tworzenie liczby mnogiej';
+$lang['compression']           = 'Metoda kompresji dla usuniętych plików';
+$lang['gzip_output']           = 'Używaj kodowania GZIP dla zawartości XHTML';
+$lang['compress']              = 'Kompresja arkuszy CSS i plików JavaScript';
+$lang['cssdatauri']            = 'Rozmiar w bajtach, poniżej którego odwołania do obrazów w plikach CSS powinny być osadzone bezpośrednio w arkuszu stylów by zmniejszyć ogólne żądania nagłówków HTTP. Technika ta nie działa w IE 7 i poniżej! 400 do 600 bajtów jest dobrą wartością. Ustaw 0 aby wyłączyć.';
+$lang['send404']               = 'Nagłówek "HTTP 404/Page Not Found" dla nieistniejących stron';
+$lang['broken_iua']            = 'Czy funkcja "ignore_user_abort" działa? Jeśli nie, może to powodować problemy z indeksem przeszukiwania. Funkcja nie działa przy konfiguracji oprogramowania IIS+PHP/CGI. Szczegółowe informacje: Bug 852.';
+$lang['xsendfile']             = 'Użyj nagłówka HTTP X-Sendfile w celu przesyłania statycznych plików. Serwer HTTP musi obsługiwać ten nagłówek.';
+$lang['renderer_xhtml']        = 'Mechanizm renderowania głównej treści strony (xhtml)';
+$lang['renderer__core']        = '%s (dokuwiki)';
+$lang['renderer__plugin']      = '%s (wtyczka)';
+$lang['dnslookups']            = 'DokiWiki wyszuka nazwy hostów dla zdalnych adresów IP użytkowników edytujących strony. Jeśli twój serwer DNS działa zbyt wolno, uległ awarii lub nie chcesz używać wyszukiwania, wyłącz tę opcję.';
+$lang['proxy____host']         = 'Proxy - serwer';
+$lang['proxy____port']         = 'Proxy - port';
+$lang['proxy____user']         = 'Proxy - nazwa użytkownika';
+$lang['proxy____pass']         = 'Proxy - hasło';
+$lang['proxy____ssl']          = 'Proxy - SSL';
+$lang['proxy____except']       = 'Wyrażenie regularne określające adresy URL, do których nie należy używać proxy.';
+$lang['safemodehack']          = 'Bezpieczny tryb (przez FTP)';
+$lang['ftp____host']           = 'FTP - serwer';
+$lang['ftp____port']           = 'FTP - port';
+$lang['ftp____user']           = 'FTP - nazwa użytkownika';
+$lang['ftp____pass']           = 'FTP - hasło';
+$lang['ftp____root']           = 'FTP - katalog główny';
+$lang['license_o_']            = 'Nie wybrano żadnej';
+$lang['typography_o_0']        = 'brak';
+$lang['typography_o_1']        = 'tylko podwójne cudzysłowy';
+$lang['typography_o_2']        = 'wszystkie cudzysłowy (nie działa we wszystkich przypadkach)';
+$lang['userewrite_o_0']        = 'brak';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'dokuwiki';
+$lang['deaccent_o_0']          = 'zostaw oryginalną pisownię';
+$lang['deaccent_o_1']          = 'usuń litery';
+$lang['deaccent_o_2']          = 'zamień na ASCII';
+$lang['gdlib_o_0']             = 'biblioteka GDLib niedostępna';
+$lang['gdlib_o_1']             = 'wersja 1.x';
+$lang['gdlib_o_2']             = 'automatyczne wykrywanie';
+$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'] = 'Streszczenie';
+$lang['rss_content_o_diff']    = 'Różnice';
+$lang['rss_content_o_htmldiff'] = 'Różnice w postaci HTML';
+$lang['rss_content_o_html']    = 'Pełna strona w postaci HTML';
+$lang['rss_linkto_o_diff']     = 'różnice';
+$lang['rss_linkto_o_page']     = 'zmodyfikowana strona';
+$lang['rss_linkto_o_rev']      = 'lista zmian';
+$lang['rss_linkto_o_current']  = 'aktualna strona';
+$lang['compression_o_0']       = 'brak';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'nie używaj';
+$lang['xsendfile_o_1']         = 'Specyficzny nagłówek lightttpd (poniżej wersji 1.5)';
+$lang['xsendfile_o_2']         = 'Standardowy nagłówek HTTP X-Sendfile';
+$lang['xsendfile_o_3']         = 'Specyficzny nagłówek Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Login użytkownika';
+$lang['showuseras_o_username'] = 'Pełne nazwisko użytkownika';
+$lang['showuseras_o_email']    = 'E-mail użytkownika (ukrywanie według ustawień mailguard)';
+$lang['showuseras_o_email_link'] = 'Adresy e-mail użytkowników w formie linku mailto:';
+$lang['useheading_o_0']        = 'Nigdy';
+$lang['useheading_o_navigation'] = 'W nawigacji';
+$lang['useheading_o_content']  = 'W treści';
+$lang['useheading_o_1']        = 'Zawsze';
+$lang['readdircache']          = 'Maksymalny czas dla bufora readdir (w sek).';
diff --git a/sources/lib/plugins/config/lang/pt-br/intro.txt b/sources/lib/plugins/config/lang/pt-br/intro.txt
new file mode 100644
index 0000000..850ba25
--- /dev/null
+++ b/sources/lib/plugins/config/lang/pt-br/intro.txt
@@ -0,0 +1,7 @@
+====== Gerenciador de Configurações ======
+
+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 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 configurações serão perdidas.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/pt-br/lang.php b/sources/lib/plugins/config/lang/pt-br/lang.php
new file mode 100644
index 0000000..795ee81
--- /dev/null
+++ b/sources/lib/plugins/config/lang/pt-br/lang.php
@@ -0,0 +1,206 @@
+
+ * @author Felipe Castro 
+ * @author Lucien Raven 
+ * @author Enrico Nicoletto 
+ * @author Flávio Veras 
+ * @author Jeferson Propheta 
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas 
+ * @author Frederico Guimarães 
+ * @author Jair Henrique 
+ * @author Luis Dantas 
+ * @author Sergio Motta sergio@cisne.com.br
+ * @author Isaias Masiero Filho 
+ * @author Balaco Baco 
+ * @author Victor Westmann 
+ */
+$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['updated']               = 'As configurações foram atualizadas com sucesso.';
+$lang['nochoice']              = '(nenhuma outra opção disponível)';
+$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';
+$lang['_header_template']      = 'Configurações de modelos';
+$lang['_header_undefined']     = 'Configurações indefinidas';
+$lang['_basic']                = 'Configurações básicas';
+$lang['_display']              = 'Configurações de exibição';
+$lang['_authentication']       = 'Configurações de autenticação';
+$lang['_anti_spam']            = 'Configurações do anti-spam';
+$lang['_editing']              = 'Configurações de edição';
+$lang['_links']                = 'Configurações de link';
+$lang['_media']                = 'Configurações de mídia';
+$lang['_notifications']        = 'Configurações de notificação';
+$lang['_syndication']          = 'Configurações de sindicância';
+$lang['_advanced']             = 'Configurações avançadas';
+$lang['_network']              = 'Configurações de rede';
+$lang['_msg_setting_undefined'] = 'Nenhum metadado configurado.';
+$lang['_msg_setting_no_class'] = 'Nenhuma classe definida.';
+$lang['_msg_setting_no_default'] = 'Nenhum valor padrão.';
+$lang['title']                 = 'Título do wiki';
+$lang['start']                 = 'Nome da página inicial';
+$lang['lang']                  = 'Idioma';
+$lang['template']              = 'Modelo, ou a aparência do wiki.';
+$lang['tagline']               = 'Slogan (caso o modelo suporte isso)';
+$lang['sidebar']               = 'Nome da página da barra lateral (caso o modelo suporte isso). Deixe em branco para desabilitar a barra lateral.';
+$lang['license']               = 'Sob qual licença o seu conteúdo deve ser disponibilizado?';
+$lang['savedir']               = 'Diretório para salvar os dados';
+$lang['basedir']               = 'Diretório base';
+$lang['baseurl']               = 'URL base';
+$lang['cookiedir']             = 'Caminhos dos cookies. Deixe em branco para usar a url base.';
+$lang['dmode']                 = 'Modo de criação do diretório';
+$lang['fmode']                 = 'Modo de criação do arquivo';
+$lang['allowdebug']            = 'Habilitar a depuração (desabilite se não for necessário!)';
+$lang['recent']                = 'Modificações recentes';
+$lang['recent_days']           = 'Quantas mudanças recentes devem ser mantidas (dias)?';
+$lang['breadcrumbs']           = 'Número de elementos na trilha de páginas visitadas';
+$lang['youarehere']            = 'Trilha hierárquica';
+$lang['fullpath']              = 'Indica o caminho completo das páginas no rodapé';
+$lang['typography']            = 'Efetuar modificações tipográficas';
+$lang['dformat']               = 'Formato da data (veja a função strftime do PHP)';
+$lang['signature']             = 'Assinatura';
+$lang['showuseras']            = 'O que exibir quando mostrar o usuário que editou a página pela última vez';
+$lang['toptoclevel']           = 'Nível mais alto para a tabela de conteúdos';
+$lang['tocminheads']           = 'Quantidade mínima de cabeçalhos para a construção da tabela de conteúdos.';
+$lang['maxtoclevel']           = 'Nível máximo para entrar na tabela de conteúdos';
+$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['sneaky_index']          = 'Por padrão, o DokuWiki irá exibir todos os espaços de nomes na visualização do índice. Ao habilitar essa opção, serão escondidos aqueles que o usuário não tiver permissão de leitura. Isso pode resultar na omissão de subespaços de nomes, tornando o índice inútil para certas configurações de ACL.';
+$lang['hidepages']             = 'Esconder páginas correspondentes (expressão regular)';
+$lang['useacl']                = 'Usar listas de controle de acesso';
+$lang['autopasswd']            = 'Gerar senhas automaticamente';
+$lang['authtype']              = 'Método de autenticação';
+$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['profileconfirm']        = 'Confirmar mudanças no perfil com a senha';
+$lang['rememberme']            = 'Permitir cookies de autenticação permanentes ("Lembre-se de mim")';
+$lang['disableactions']        = 'Desabilitar as ações do DokuWiki';
+$lang['disableactions_check']  = 'Verificação';
+$lang['disableactions_subscription'] = 'Monitoramento';
+$lang['disableactions_wikicode'] = 'Ver a fonte/Exportar sem processamento';
+$lang['disableactions_other']  = 'Outras ações (separadas por vírgula)';
+$lang['auth_security_timeout'] = 'Tempo limite de segurança para autenticações (seg)';
+$lang['securecookie']          = 'Os cookies definidos via HTTPS devem ser enviados para o navegador somente via HTTPS? Desabilite essa opção quando somente a autenticação do seu wiki for realizada de maneira segura via SSL e a navegação, de maneira insegura.';
+$lang['remote']                = 'Habilitar o sistema de API remota. Isso permite que outras aplicações acessem o wiki via XML-RPC ou outros mecanismos.';
+$lang['remoteuser']            = 'Restringir o acesso à API remota aos grupos ou usuários definidos aqui (separados por vírgulas). Deixe em branco para permitir o acesso a qualquer um.';
+$lang['usewordblock']          = 'Bloquear spam baseado em lista de palavras';
+$lang['relnofollow']           = 'Usar rel="nofollow" em links externos';
+$lang['indexdelay']            = 'Tempo de espera antes da indexação (seg)';
+$lang['mailguard']             = 'Obscurecer endereços de e-mail';
+$lang['iexssprotect']          = 'Verificar a existência de possíveis códigos maliciosos em HTML ou JavaScript nos arquivos enviados';
+$lang['usedraft']              = 'Salvar o rascunho automaticamente durante a edição';
+$lang['htmlok']                = 'Permitir incorporação de HTML';
+$lang['phpok']                 = 'Permitir incorporação de PHP';
+$lang['locktime']              = 'Tempo máximo para o bloqueio de arquivos (seg)';
+$lang['cachetime']             = 'Tempo máximo para o cache (seg)';
+$lang['target____wiki']        = 'Parâmetro "target" para links internos';
+$lang['target____interwiki']   = 'Parâmetro "target" para links interwiki';
+$lang['target____extern']      = 'Parâmetro "target" para links externos';
+$lang['target____media']       = 'Parâmetro "target" para links de mídia';
+$lang['target____windows']     = 'Parâmetro "target" para links do Windows';
+$lang['mediarevisions']        = 'Habilitar revisões de mídias?';
+$lang['refcheck']              = 'Verificação de referência da mídia';
+$lang['gdlib']                 = 'Versão da biblioteca "GD Lib"';
+$lang['im_convert']            = 'Caminho para a ferramenta de conversão ImageMagick';
+$lang['jpg_quality']           = 'Qualidade de compressão do JPG (0-100)';
+$lang['fetchsize']             = 'Tamanho máximo (em bytes) que o "fetch.php" pode transferir do exterior';
+$lang['subscribers']           = 'Habilitar o suporte ao monitoramento de páginas';
+$lang['subscribe_time']        = 'Tempo de espera antes do envio das listas e mensagens de monitoramento (segundos); este tempo deve ser menor que o especificado no parâmetro recent_days';
+$lang['notify']                = 'Enviar notificações de mudança para esse endereço de e-mail';
+$lang['registernotify']        = 'Enviar informações de usuários registrados para esse endereço de e-mail';
+$lang['mailfrom']              = 'Endereço de e-mail a ser utilizado para mensagens automáticas';
+$lang['mailprefix']            = 'Prefixo do assunto dos e-mails de envio automático';
+$lang['htmlmail']              = 'Enviar e-mail HTML multipartes, que têm uma aparência melhor, mas um tamanho maior. Desabilite para enviar e-mails em texto puro.';
+$lang['sitemap']               = 'Gerar Google Sitemap (dias)';
+$lang['rss_type']              = 'Tipo de fonte XML';
+$lang['rss_linkto']            = 'Os links da fonte XML apontam para';
+$lang['rss_content']           = 'O que deve ser exibido nos itens da fonte XML?';
+$lang['rss_update']            = 'Intervalo de atualização da fonte XML (seg)';
+$lang['rss_show_summary']      = 'Resumo de exibição da fonte XML no título';
+$lang['rss_media']             = 'Que tipo de alterações devem ser listadas na fonte XML?';
+$lang['updatecheck']           = 'Verificar atualizações e avisos de segurança? O DokuWiki precisa contactar o "splitbrain.org" para efetuar esse recurso.';
+$lang['userewrite']            = 'Usar URLs "limpas"';
+$lang['useslash']              = 'Usar a barra como separador de espaços de nomes nas URLs';
+$lang['sepchar']               = 'Separador de palavras no nome da página';
+$lang['canonical']             = 'Usar URLs absolutas (http://servidor/caminho)';
+$lang['fnencode']              = 'Método de codificação não-ASCII de nome de arquivos.';
+$lang['autoplural']            = 'Verificar formas plurais nos links';
+$lang['compression']           = 'Método de compressão para arquivos antigos';
+$lang['gzip_output']           = 'Usar "Content-Encoding" do gzip para o código xhtml';
+$lang['compress']              = 'Compactar as saídas de CSS e JavaScript';
+$lang['cssdatauri']            = 'Tamanho máximo em bytes para o qual as imagens referenciadas em arquivos CSS devam ser incorporadas na folha de estilos (o arquivo CSS) para reduzir o custo dos pedidos HTTP. Essa técnica não funcionará na versões do IE < 8!  Valores de 400 a 600 são bons. Defina o valor 0 para desativar.';
+$lang['send404']               = 'Enviar "HTTP 404/Página não encontrada" para páginas não existentes';
+$lang['broken_iua']            = 'A função "ignore_user_abort" 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 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['dnslookups']            = 'O DokuWiki procurará pelo nome de host dos endereços IP remotos dos usuários que estão editando as páginas. Caso você tenha um DNS lento, ele não esteja funcionando ou, ainda, você não queira esse recurso, desabilite essa opção.';
+$lang['proxy____host']         = 'Nome do servidor proxy';
+$lang['proxy____port']         = 'Porta do proxy';
+$lang['proxy____user']         = 'Nome de usuário do proxy';
+$lang['proxy____pass']         = 'Senha do proxy';
+$lang['proxy____ssl']          = 'Usar SSL para conectar ao proxy';
+$lang['proxy____except']       = 'Expressões regulares de URL para excessão de proxy.';
+$lang['safemodehack']          = 'Habilitar o contorno de segurança';
+$lang['ftp____host']           = 'Servidor FTP para o contorno de segurança';
+$lang['ftp____port']           = 'Porta do FTP para o contorno de segurança';
+$lang['ftp____user']           = 'Nome do usuário FTP para o contorno de segurança';
+$lang['ftp____pass']           = 'Senha do usuário FTP para o contorno de segurança';
+$lang['ftp____root']           = 'Diretório raiz do FTP para o contorno de segurança';
+$lang['license_o_']            = 'Nenhuma escolha';
+$lang['typography_o_0']        = 'nenhuma';
+$lang['typography_o_1']        = 'excluir aspas simples';
+$lang['typography_o_2']        = 'incluir aspas simples (nem sempre funciona)';
+$lang['userewrite_o_0']        = 'não';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'interno do DokuWiki';
+$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_1']             = 'versão 1.x';
+$lang['gdlib_o_2']             = 'detecção 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'] = 'resumo';
+$lang['rss_content_o_diff']    = 'diff unificado';
+$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']     = 'página revisada';
+$lang['rss_linkto_o_rev']      = 'lista de revisões';
+$lang['rss_linkto_o_current']  = 'página atual';
+$lang['compression_o_0']       = 'nenhum';
+$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 usuário';
+$lang['showuseras_o_username'] = 'nome completo do usuário';
+$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_navigation'] = 'somente a navegação';
+$lang['useheading_o_content']  = 'somente o conteúdo do wiki';
+$lang['useheading_o_1']        = 'sempre';
+$lang['readdircache']          = 'Tempo máximo para cache readdir (segundos)';
diff --git a/sources/lib/plugins/config/lang/pt/intro.txt b/sources/lib/plugins/config/lang/pt/intro.txt
new file mode 100644
index 0000000..2010dad
--- /dev/null
+++ b/sources/lib/plugins/config/lang/pt/intro.txt
@@ -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.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/pt/lang.php b/sources/lib/plugins/config/lang/pt/lang.php
new file mode 100644
index 0000000..7a9111c
--- /dev/null
+++ b/sources/lib/plugins/config/lang/pt/lang.php
@@ -0,0 +1,184 @@
+
+ * @author Enrico Nicoletto 
+ * @author Fil 
+ * @author André Neves 
+ * @author José Campos zecarlosdecampos@gmail.com
+ */
+$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';
+$lang['_header_template']      = 'Parâmetros das Templates';
+$lang['_header_undefined']     = 'Parâmetros não definidos';
+$lang['_basic']                = 'Configurações Básicas';
+$lang['_display']              = 'Configuração de Apresentação';
+$lang['_authentication']       = 'Configuração de Autenticação';
+$lang['_anti_spam']            = 'Configuração Anti-Spam';
+$lang['_editing']              = 'Configuração de Edição';
+$lang['_links']                = 'Configuração de Ligações';
+$lang['_media']                = 'Configuração de Media';
+$lang['_advanced']             = 'Configurações Avançadas';
+$lang['_network']              = 'Configuração de Rede';
+$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.';
+$lang['lang']                  = 'Idioma';
+$lang['basedir']               = 'Pasta Base';
+$lang['baseurl']               = 'URL Base';
+$lang['savedir']               = 'Pasta para guardar dados';
+$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';
+$lang['youarehere']            = 'Breadcrumbs hierárquicas';
+$lang['typography']            = 'Executar substituições tipográficas';
+$lang['htmlok']                = 'Permitir embeber HTML';
+$lang['phpok']                 = 'Permitir embeber PHP';
+$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['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_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['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['fnencode']              = 'Método de codificar nomes de ficheiro não-ASCII.';
+$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['mailprefix']            = 'Prefixo 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['subscribe_time']        = 'Tempo após o qual as listas de subscrição e "digests" são enviados (seg.); Isto deve ser inferior ao tempo especificado em recent_days.';
+$lang['compress']              = 'Compactar as saídas de CSS e JavaScript';
+$lang['cssdatauri']            = 'Tamanho em bytes até ao qual as imagens referenciadas em ficheiros CSS devem ser embutidas diretamente no CSS para reduzir a carga de pedidos HTTP extra. Esta técnica não funciona em IE 7 e abaixo! 400 a 600 bytes é um bom valor. Escolher 0 para desativar.';
+$lang['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['proxy____except']       = 'Expressão regular para condizer URLs para os quais o proxy deve ser saltado.';
+$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';
+$lang['userewrite_o_0']        = 'nenhum';
+$lang['userewrite_o_1']        = '.htaccess';
+$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';
+$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'] = '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';
+$lang['rss_linkto_o_current']  = 'página actual';
+$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';
+$lang['readdircache']          = 'Idade máxima para a cache de "readdir" (seg)';
diff --git a/sources/lib/plugins/config/lang/ro/intro.txt b/sources/lib/plugins/config/lang/ro/intro.txt
new file mode 100644
index 0000000..f5cbbe8
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ro/intro.txt
@@ -0,0 +1,7 @@
+====== Manager Configurare ======
+
+Folosiţi această pagină pentru a controla setările instalării DokuWiki. Pentru ajutor la probleme punctuale, consultaţi [[doku>config]]. Pentru mai multe detalii privind acest plugin, consultaţi [[doku>plugin:config]].
+
+Setările pe un fond roşu-deschis sunt protejate şi nu pot fi modificate cu acest plugin. Setările pe un fond albastru sunt valori implicite iar cele pe fond alb au fost setate local pentru această instalare individualizată. Setările pe fond albastru şi alb pot fi modificate.
+
+Nu uitaţi să apăsaţi butonul **SALVEAZĂ** înainte de a părăsi această pagină; altfel, modificările aduse se vor pierde.
diff --git a/sources/lib/plugins/config/lang/ro/lang.php b/sources/lib/plugins/config/lang/ro/lang.php
new file mode 100644
index 0000000..e95c551
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ro/lang.php
@@ -0,0 +1,194 @@
+
+ * @author s_baltariu@yahoo.com
+ * @author Emanuel-Emeric Andrasi 
+ * @author Emanuel-Emeric Andrași 
+ * @author Emanuel-Emeric Andraşi 
+ * @author Emanuel-Emeric Andrasi 
+ * @author Marius OLAR 
+ * @author Marius Olar 
+ * @author Emanuel-Emeric Andrași 
+ */
+$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';
+$lang['_header_template']      = 'Setări Şabloane';
+$lang['_header_undefined']     = 'Setări Nedefinite';
+$lang['_basic']                = 'Setări de Bază';
+$lang['_display']              = 'Setări Afişare';
+$lang['_authentication']       = 'Setări Autentificare';
+$lang['_anti_spam']            = 'Setări Anti-Spam';
+$lang['_editing']              = 'Setări Editare';
+$lang['_links']                = 'Setări Legături';
+$lang['_media']                = 'Setări Media';
+$lang['_advanced']             = 'Setări Avansate';
+$lang['_network']              = 'Setări Reţea';
+$lang['_msg_setting_undefined'] = 'Nesetat metadata';
+$lang['_msg_setting_no_class'] = 'Nesetat class';
+$lang['_msg_setting_no_default'] = 'Nici o valoare implicită';
+$lang['fmode']                 = 'Mod creare fişier';
+$lang['dmode']                 = 'Mod creare director';
+$lang['lang']                  = 'Limbă';
+$lang['basedir']               = 'Director bază';
+$lang['baseurl']               = 'URL bază ';
+$lang['savedir']               = 'Director pentru salvarea datelor';
+$lang['cookiedir']             = 'Cale Cookie. Lăsați gol pentru a utiliza baseurl.';
+$lang['start']                 = 'Numele paginii de start';
+$lang['title']                 = 'Titlul wiki';
+$lang['template']              = 'Şablon';
+$lang['tagline']               = 'Slogan (dacă templateul suportă opțiunea)';
+$lang['sidebar']               = 'Numele paginii barei laterale (dacă templateul suportă opțiunea), câmpul lăsat gol dezactivează bara laterală';
+$lang['license']               = 'Sub ce licenţă va fi publicat conţinutul?';
+$lang['fullpath']              = 'Arată calea completă a paginii în subsol';
+$lang['recent']                = 'Modificări recente';
+$lang['breadcrumbs']           = 'Numărul de "urme" lăsate';
+$lang['youarehere']            = 'Structura ierarhică a "urmelor" lăsate';
+$lang['typography']            = 'Fă înlocuiri topografice';
+$lang['htmlok']                = 'Permite intercalare cod HTML';
+$lang['phpok']                 = 'Permite intercalare cod PHP';
+$lang['dformat']               = 'Format dată (vezi funcţia PHP strftime)';
+$lang['signature']             = 'Semnătura';
+$lang['toptoclevel']           = 'Primul nivel pentru cuprins';
+$lang['tocminheads']           = 'Numărul minim de titluri ce determină dacă se alcătuieşte Tabelul de Cuprins (TOC)';
+$lang['maxtoclevel']           = 'Nivelul maxim pentru cuprins';
+$lang['maxseclevel']           = 'Nivelul maxim de editare al secţiunii';
+$lang['camelcase']             = 'Foloseşte CamelCase pentru legături';
+$lang['deaccent']              = 'numedepagină curate';
+$lang['useheading']            = 'Foloseşte primul titlu pentru numele paginii';
+$lang['refcheck']              = 'Verificare referinţă media';
+$lang['allowdebug']            = 'Permite depanarea dezactivaţi dacă cu e necesar!';
+$lang['mediarevisions']        = 'Activare Revizii Media?';
+$lang['usewordblock']          = 'Blochează spam-ul pe baza listei de cuvinte';
+$lang['indexdelay']            = 'Timpul de întârziere înainte de indexare (sec)';
+$lang['relnofollow']           = 'Folosiţi rel="nofollow" pentru legăturile externe';
+$lang['mailguard']             = 'Adrese de email acoperite';
+$lang['iexssprotect']          = 'Verifică fişierele încărcate pentru posibil cod periculos JavaScript sau HTML';
+$lang['showuseras']            = 'Ce se afişează la indicarea utilizatorului care a editat ultimul o pagină';
+$lang['useacl']                = 'Utilizează liste de control al accesului';
+$lang['autopasswd']            = 'Parole autogenerate';
+$lang['authtype']              = 'Autentificare backend';
+$lang['passcrypt']             = 'Metoda de criptare a parolei';
+$lang['defaultgroup']          = 'Grup implicit';
+$lang['superuser']             = 'Superuser - un grup sau un utilizator cu acces complet la toate paginile şi funcţiile indiferent de setările ACL';
+$lang['manager']               = 'Manager - un grup sau un utilizator cu acces la anumite funcţii de management';
+$lang['profileconfirm']        = 'Confirmă schimbarea profilului cu parola';
+$lang['disableactions']        = 'Dezactivează acţiunile DokuWiki';
+$lang['disableactions_check']  = 'Verifică';
+$lang['disableactions_subscription'] = 'Subscrie/Anulează subscrierea';
+$lang['disableactions_wikicode'] = 'Vizualizează sursa/Export Raw';
+$lang['disableactions_other']  = 'Alte acţiuni (separate prin virgulă)';
+$lang['sneaky_index']          = 'Implicit, DokuWiki va arăta toate numele de spaţii la vizualizarea indexului. Activând această opţiune vor fi ascunse acelea la care utilizatorul nu are drepturi de citire. Aceasta poate determina ascunderea sub-numelor de spaţii accesibile. Aceasta poate face index-ul  inutilizabil cu anumite setări ale ACL';
+$lang['auth_security_timeout'] = 'Timpul de expirare al Autentificării Securizate (secunde)';
+$lang['securecookie']          = 'Cookies-urile setate via HTTPS să fie trimise doar via HTTPS de către browser? Dezactivaţi această opţiune numai când login-ul wiki-ului este securizat cu SSL dar navigarea wiki-ului se realizează nesecurizat.';
+$lang['remote']                = 'Activează sistemul remote API. Acesta permite altor aplicații să acceseze wiki-ul via XML-RPC sau alte mecanisme.';
+$lang['remoteuser']            = 'Restricționează accesul sistemului remote API la grupurile sau utilizatorii următori (separați prin virgulă). Lăsați câmpul gol pentru a da acces către toți.';
+$lang['updatecheck']           = 'Verificare actualizări şi avertismente privind securitatea? DokuWiki trebuie să contacteze update.dokuwiki.org pentru această facilitate.';
+$lang['userewrite']            = 'Folosire URL-uri "nice"';
+$lang['useslash']              = 'Foloseşte slash-ul ca separator de spaţii de nume în URL-uri';
+$lang['usedraft']              = 'Salvează automat o schiţă în timpul editării';
+$lang['sepchar']               = 'Separator cuvinte în numele paginii';
+$lang['canonical']             = 'Foloseşte URL-uri canonice';
+$lang['fnencode']              = 'Metoda de encodare a numelor fişierelor non-ASCII.';
+$lang['autoplural']            = 'Verifică formele de plural în legături';
+$lang['compression']           = 'Metoda de criptare a fişierelor pod';
+$lang['cachetime']             = 'Durata maximă pentru cache (secunde)';
+$lang['locktime']              = 'Durata maximă pentru blocarea fişierelor (secunde)';
+$lang['fetchsize']             = 'Dimensiunea maximă (byte) pe care fetch.php poate să descarce din exterior';
+$lang['notify']                = 'Trimite notificări privind modificările pe această adresă de email';
+$lang['registernotify']        = 'Trimite informare noilor utilizatori înregistraţi pe această adresă de email';
+$lang['mailfrom']              = 'Adresa de email utilizată pentru mailuri automate';
+$lang['mailprefix']            = 'Prefix subiect e-mail de folosit pentru mail-uri automate';
+$lang['gzip_output']           = 'Foloseşte gzip pentru codarea conţinutului xhtml';
+$lang['gdlib']                 = 'Versiunea GD Lib';
+$lang['im_convert']            = 'Calea către instrumentul de conversie ImageMagick';
+$lang['jpg_quality']           = 'Calitatea compresiei JPG (0-100)';
+$lang['subscribers']           = 'Activează suportul pentru subscrierea paginii';
+$lang['subscribe_time']        = 'Timpul după care lista de abonare şi digestie sunt trimise (sec); Aceasta ar trebui să fie mai mic decât timpul specificat în recent_days.';
+$lang['compress']              = 'Compactează codul CSS şi javascript produs';
+$lang['cssdatauri']            = 'Dimensiunea în octeți până la care imaginile regasite în fișierele CSS ar trebui să fie incluse direct în stylesheet pentru a reduce supraîncărcarea antetului cererii HTTP. Această tehnică nu va funcționa în IE < 8! 400 până la 600 octeți sunt suficienți. Introduceți 0 pentru a dezactiva această opțiune.';
+$lang['hidepages']             = 'Ascunde paginile pereche (expresii regulate)';
+$lang['send404']               = 'Trimite mesajul "HTTP 404/Page Not Found" pentru paginile inexistente';
+$lang['sitemap']               = 'Generează Google sitemap (zile)';
+$lang['broken_iua']            = 'Funcţia ignore_user_abort nu funcţionează pe sistemul dumneavoastră? Aceasta poate determina nefuncţionarea indexului de căutare. IIS+PHP/CGI sunt cunoscute ca fiind nefuncţionale. Mai multe detalii găsiţi la Bug 852';
+$lang['xsendfile']             = 'Folosiţi header-ul X-Send pentru a-i permite serverului web să trimită fişiere statice? Serverul web trebuie să permită aceasta.';
+$lang['renderer_xhtml']        = 'Motorul de randare principal folosit pentru afişarea wiki în format xhtml';
+$lang['renderer__core']        = '%s (nucleu dokuwiki)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['rememberme']            = 'Permiteţi cookies permanente la login (ţine-mă minte)';
+$lang['rss_type']              = 'Tip flux XML';
+$lang['rss_linkto']            = 'Fluxul XML se leagă la';
+$lang['rss_content']           = 'Ce să afişez în obiectele fluxurilor XML';
+$lang['rss_update']            = 'Intervalul de actualizare a fluxului XML (sec)';
+$lang['recent_days']           = 'Câte modificări recente să se păstreze?';
+$lang['rss_show_summary']      = 'Fluxul XML arată rezumat în titlu';
+$lang['rss_media']             = 'Ce fel de modificări ar trebui afișate în fluxul XML?';
+$lang['target____wiki']        = 'Fereastra ţintă pentru legăturile interne';
+$lang['target____interwiki']   = 'Fereastra ţintă pentru legăturile interwiki';
+$lang['target____extern']      = 'Fereastra ţintă pentru legăturile externe';
+$lang['target____media']       = 'Fereastra ţintă pentru legăturile media';
+$lang['target____windows']     = 'Fereastra ţintă pentru legăturile windows';
+$lang['proxy____host']         = 'Nume server Proxy';
+$lang['proxy____port']         = 'Port Proxy';
+$lang['proxy____user']         = 'Nume utilizator Proxy';
+$lang['proxy____pass']         = 'Parolă Proxy';
+$lang['proxy____ssl']          = 'Foloseşte SSL pentru conectare la Proxy';
+$lang['proxy____except']       = 'Expresie regulară de potrivit cu URL-uri pentru care proxy-ul trebuie păsuit.';
+$lang['safemodehack']          = 'Activează safemode hack';
+$lang['ftp____host']           = 'Server FTP pentru safemode hack';
+$lang['ftp____port']           = 'Port FTP pentru safemode hack';
+$lang['ftp____user']           = 'Nume utilizator pentru safemode hack';
+$lang['ftp____pass']           = 'Parolă FTP pentru safemode hack';
+$lang['ftp____root']           = 'Director rădăcină FTP pentru safemode hack';
+$lang['license_o_']            = 'Nici una aleasă';
+$lang['typography_o_0']        = 'nimic';
+$lang['typography_o_1']        = 'Numai ghilimele duble';
+$lang['typography_o_2']        = 'Toate ghilimelele (s-ar putea să nu fucţioneze întotdeauna)';
+$lang['userewrite_o_0']        = 'nimic';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki intern';
+$lang['deaccent_o_0']          = 'închis';
+$lang['deaccent_o_1']          = 'înlătură accentele';
+$lang['deaccent_o_2']          = 'romanizează';
+$lang['gdlib_o_0']             = 'biblioteca GD Lib nu este disponibilă';
+$lang['gdlib_o_1']             = 'Versiunea 1.x';
+$lang['gdlib_o_2']             = 'Detectare automată';
+$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'] = 'Abstract';
+$lang['rss_content_o_diff']    = 'Diferenţe unificate';
+$lang['rss_content_o_htmldiff'] = 'Tabel diferenţe în format HTML';
+$lang['rss_content_o_html']    = 'Conţinut pagină complet HTML';
+$lang['rss_linkto_o_diff']     = 'vizualizare diferenţe';
+$lang['rss_linkto_o_page']     = 'pagina revizuită';
+$lang['rss_linkto_o_rev']      = 'lista revizuirilor';
+$lang['rss_linkto_o_current']  = 'pagina curentă';
+$lang['compression_o_0']       = 'nici una';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'nu se foloseşte';
+$lang['xsendfile_o_1']         = 'Header proprietar lighttpd (înaintea versiunii 1.5)';
+$lang['xsendfile_o_2']         = 'Header standard X-Sendfile';
+$lang['xsendfile_o_3']         = 'Header proprietar Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Numele de login';
+$lang['showuseras_o_username'] = 'Numele complet al utilizatorului';
+$lang['showuseras_o_email']    = 'Adresa de e-mail a utilizatorului (mascată conform setărilor de protecţie)';
+$lang['showuseras_o_email_link'] = 'Adresa de e-mail a utilizatorului ca mailto: link';
+$lang['useheading_o_0']        = 'Niciodată';
+$lang['useheading_o_navigation'] = 'Doar navigare';
+$lang['useheading_o_content']  = 'Doar conţinutul Wiki';
+$lang['useheading_o_1']        = 'Întotdeauna';
+$lang['readdircache']          = 'Vârsta maximă depozitare readdir (sec)';
diff --git a/sources/lib/plugins/config/lang/ru/intro.txt b/sources/lib/plugins/config/lang/ru/intro.txt
new file mode 100644
index 0000000..a629d93
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ru/intro.txt
@@ -0,0 +1,9 @@
+====== Настройки вики ======
+
+Здесь вы можете изменить настройки своей «ДокуВики». Для справки по поводу конкретных опций смотрите [[doku>config]]. Дополнительные детали об этом плагине доступны здесь: [[doku>plugin:config]].
+
+Настройки, отображаемые на светло-красном фоне, защищены от изменений и не могут быть отредактированы с помощью этого плагина.  Голубым фоном отмечены настройки со значениями по умолчанию, а белым фоном — настройки, которые были локально изменены для этой конкретной «ДокуВики». Как голубые, так и белые настройки доступны для изменения.
+
+Не забудьте нажать кнопку «**Сохранить**» перед тем, как покинуть эту страницу, иначе все ваши изменения будут потеряны.
+
+
diff --git a/sources/lib/plugins/config/lang/ru/lang.php b/sources/lib/plugins/config/lang/ru/lang.php
new file mode 100644
index 0000000..596ad4e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/ru/lang.php
@@ -0,0 +1,204 @@
+
+ * @author Andrew Pleshakov 
+ * @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 
+ * @author Aleksey Osadchiy 
+ * @author Aleksandr Selivanov 
+ * @author Ladyko Andrey 
+ * @author Eugene 
+ * @author Johnny Utah 
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ */
+$lang['menu']                  = 'Настройки вики';
+$lang['error']                 = 'Настройки не были сохранены из-за ошибки в одном из значений. Пожалуйста, проверьте свои изменения и попробуйте ещё раз.
        Неправильные значения будут обведены красной рамкой.';
+$lang['updated']               = 'Настройки успешно сохранены.';
+$lang['nochoice']              = '(нет других вариантов)';
+$lang['locked']                = 'Файл настройки недоступен для изменения. Если это не специально, 
        убедитесь, что файл локальной настройки имеет правильное имя и права доступа.';
+$lang['danger']                = 'Внимание: изменение этой опции может сделать вашу вики и меню конфигурации недоступными.';
+$lang['warning']               = 'Предостережение: изменение этой опции может вызвать непредсказуемое поведение.';
+$lang['security']              = 'Предостережение по безопасности: изменение этой опции может вызвать риск, связанный с безопасностью.';
+$lang['_configuration_manager'] = 'Настройки вики';
+$lang['_header_dokuwiki']      = 'Параметры «ДокуВики»';
+$lang['_header_plugin']        = 'Параметры плагинов';
+$lang['_header_template']      = 'Параметры шаблонов';
+$lang['_header_undefined']     = 'Прочие параметры';
+$lang['_basic']                = 'Основные параметры';
+$lang['_display']              = 'Параметры отображения';
+$lang['_authentication']       = 'Параметры аутентификации';
+$lang['_anti_spam']            = 'Параметры блокировки спама';
+$lang['_editing']              = 'Параметры правки';
+$lang['_links']                = 'Параметры ссылок';
+$lang['_media']                = 'Параметры медиафайлов';
+$lang['_notifications']        = 'Параметры уведомлений';
+$lang['_syndication']          = 'Настройки синдикаций';
+$lang['_advanced']             = 'Тонкая настройка';
+$lang['_network']              = 'Параметры сети';
+$lang['_msg_setting_undefined'] = 'Не найдены метаданные настроек.';
+$lang['_msg_setting_no_class'] = 'Не найден класс настроек.';
+$lang['_msg_setting_no_default'] = 'Не задано значение по умолчанию.';
+$lang['title']                 = 'Название вики';
+$lang['start']                 = 'Имя стартовой страницы';
+$lang['lang']                  = 'Язык';
+$lang['template']              = 'Шаблон';
+$lang['tagline']               = 'Слоган (если поддерживается шаблоном)';
+$lang['sidebar']               = 'Боковая панель, пустое поле отключает боковую панель.';
+$lang['license']               = 'На условиях какой лицензии будет предоставляться содержимое вики?';
+$lang['savedir']               = 'Директория для данных';
+$lang['basedir']               = 'Корневая директория (например, /dokuwiki/). Оставьте пустым для автоопределения.';
+$lang['baseurl']               = 'Корневой адрес (URL) (например, http://www.yourserver.ru). Оставьте пустым для автоопределения.';
+$lang['cookiedir']             = 'Cookie директория. Оставьте пустым для автоопределения.';
+$lang['dmode']                 = 'Права для создаваемых директорий';
+$lang['fmode']                 = 'Права для создаваемых файлов';
+$lang['allowdebug']            = 'Включить отладку (отключите!)';
+$lang['recent']                = 'Недавние изменения (кол-во)';
+$lang['recent_days']           = 'На сколько дней назад сохранять недавние изменения';
+$lang['breadcrumbs']           = 'Вы посетили (кол-во)';
+$lang['youarehere']            = 'Показывать «Вы находитесь здесь»';
+$lang['fullpath']              = 'Полный путь к документу';
+$lang['typography']            = 'Типографские символы';
+$lang['dformat']               = 'Формат даты и времени';
+$lang['signature']             = 'Шаблон подписи';
+$lang['showuseras']            = 'Что отображать при показе пользователя, редактировавшего страницу последним';
+$lang['toptoclevel']           = 'Мин. уровень в содержании';
+$lang['tocminheads']           = 'Мин. количество заголовков, при котором будет составлено содержание';
+$lang['maxtoclevel']           = 'Макс. уровень в содержании';
+$lang['maxseclevel']           = 'Макс. уровень для правки';
+$lang['camelcase']             = 'Использовать ВикиРегистр для ссылок';
+$lang['deaccent']              = 'Транслитерация в именах страниц';
+$lang['useheading']            = 'Первый заголовок вместо имени';
+$lang['sneaky_index']          = 'По умолчанию, «ДокуВики» показывает в индексе страниц все пространства имён. Включение этой опции скроет пространства имён, для которых пользователь не имеет прав чтения. Это может привести к скрытию доступных вложенных пространств имён и потере функциональности индекса страниц при некоторых конфигурациях прав доступа.';
+$lang['hidepages']             = 'Скрыть страницы (рег. выражение)';
+$lang['useacl']                = 'Использовать списки прав доступа';
+$lang['autopasswd']            = 'Автогенерация паролей';
+$lang['authtype']              = 'Механизм аутентификации';
+$lang['passcrypt']             = 'Метод шифрования пароля';
+$lang['defaultgroup']          = 'Группа по умолчанию';
+$lang['superuser']             = 'Суперпользователь — группа или пользователь с полным доступом ко всем страницам и функциям администрирования, независимо от установок ACL. Перечень разделяйте запятыми: user1,@group1,user2';
+$lang['manager']               = 'Менеджер — группа или пользователь с доступом к определённым функциям управления. Перечень разделяйте запятыми: user1,@group1,user2';
+$lang['profileconfirm']        = 'Пароль для изменения профиля';
+$lang['rememberme']            = 'Разрешить перманентные куки (cookies) для входа («запомнить меня»)';
+$lang['disableactions']        = 'Заблокировать операции «ДокуВики»';
+$lang['disableactions_check']  = 'Проверка';
+$lang['disableactions_subscription'] = 'Подписка/Отмена подписки';
+$lang['disableactions_wikicode'] = 'Показ/экспорт исходного текста';
+$lang['disableactions_other']  = 'Другие операции (через запятую)';
+$lang['auth_security_timeout'] = 'Интервал для безопасности авторизации (сек.)';
+$lang['securecookie']          = 'Должны ли куки (cookies), выставленные через HTTPS, отправляться браузером только через HTTPS. Отключите эту опцию в случае, когда только логин вашей вики передаётся через SSL, а обычный просмотр осуществляется в небезопасном режиме.';
+$lang['remote']                = 'Включить систему API для подключений. Это позволит другим приложениям получить доступ к вики через XML-RPC или другие механизмы.';
+$lang['remoteuser']            = 'Дать права для удаленного API доступа пользователям указанным тут (разделять запятыми). Оставьте это поле пустым что бы открыть доступ всем.';
+$lang['usewordblock']          = 'Блокировать спам по ключевым словам';
+$lang['relnofollow']           = 'rel="nofollow" для внешних ссылок';
+$lang['indexdelay']            = 'Задержка перед индексированием';
+$lang['mailguard']             = 'Кодировать адреса электронной почты';
+$lang['iexssprotect']          = 'Проверять закачанные файлы на наличие потенциально опасного кода JavaScript или HTML';
+$lang['usedraft']              = 'Автоматически сохранять черновик во время правки';
+$lang['htmlok']                = 'Разрешить HTML';
+$lang['phpok']                 = 'Разрешить PHP';
+$lang['locktime']              = 'Время блокировки страницы (сек.)';
+$lang['cachetime']             = 'Время жизни кэш-файла (сек.)';
+$lang['target____wiki']        = 'target для внутренних ссылок';
+$lang['target____interwiki']   = 'target для ссылок между вики';
+$lang['target____extern']      = 'target для внешних ссылок';
+$lang['target____media']       = 'target для ссылок на медиафайлы';
+$lang['target____windows']     = 'target для ссылок на сетевые каталоги';
+$lang['mediarevisions']        = 'Включение версий медиафайлов';
+$lang['refcheck']              = 'Проверять ссылки на медиафайлы';
+$lang['gdlib']                 = 'Версия LibGD';
+$lang['im_convert']            = 'Путь к ImageMagick';
+$lang['jpg_quality']           = 'Качество сжатия JPG (0–100). Значение по умолчанию — 70.';
+$lang['fetchsize']             = 'Максимальный размер файла (в байтах), который fetch.php может скачивать с внешнего источника';
+$lang['subscribers']           = 'Разрешить подписку на изменения';
+$lang['subscribe_time']        = 'Интервал рассылки подписок и сводок (сек.). Должен быть меньше, чем значение, указанное в recent_days.';
+$lang['notify']                = 'Электронный адрес для извещений';
+$lang['registernotify']        = 'Посылать информацию о новых зарегистрированных пользователях на этот электронный адрес';
+$lang['mailfrom']              = 'Электронный адрес вики (От:)';
+$lang['mailprefix']            = 'Префикс используемый для автоматического письма станет темой сообщений';
+$lang['sitemap']               = 'Число дней, через которое нужно создавать (обновлять) карту сайта для поисковиков (Гугл, Яндекс и др.)';
+$lang['rss_type']              = 'Тип RSS';
+$lang['rss_linkto']            = 'Ссылки в RSS';
+$lang['rss_content']           = 'Что отображать в строках XML-ленты?';
+$lang['rss_update']            = 'Интервал обновления XML-ленты (сек.)';
+$lang['rss_show_summary']      = 'Показывать краткую выдержку в заголовках XML-ленты';
+$lang['rss_media']             = 'Какие изменения должны быть отображены в XML?';
+$lang['updatecheck']           = 'Проверять наличие обновлений и предупреждений о безопасности? Для этого «ДокуВики» потребуется связываться с сайтом splitbrain.org.';
+$lang['userewrite']            = 'Удобочитаемые адреса (URL)';
+$lang['useslash']              = 'Использовать слэш';
+$lang['sepchar']               = 'Разделитель слов в имени страницы';
+$lang['canonical']             = 'Полные канонические адреса (URL)';
+$lang['fnencode']              = 'Метод кодирования имён файлов, записанных не ASCII-символами.';
+$lang['autoplural']            = 'Автоматическое мн. число';
+$lang['compression']           = 'Метод сжатия для архивных файлов';
+$lang['gzip_output']           = 'Использовать gzip-сжатие для xhtml';
+$lang['compress']              = 'Сжимать файлы CSS и javascript';
+$lang['cssdatauri']            = 'Размер в байтах до которого изображения, указанные в CSS-файлах, должны быть встроены прямо в таблицу стилей, для уменьшения избычтоных HTTP-запросов. Этот метод не будет работать в IE версии 7 и ниже! Установка от 400 до 600 байт является хорошим показателем. Установите 0, чтобы отключить.';
+$lang['send404']               = 'Посылать «HTTP404/Page Not Found»';
+$lang['broken_iua']            = 'Возможно, функция ignore_user_abort не работает в вашей системе? Это может привести к потере функциональности индексирования поиска. Эта проблема присутствует, например, в IIS+PHP/CGI. Для дополнительной информации смотрите баг 852.';
+$lang['xsendfile']             = 'Используете заголовок X-Sendfile для загрузки файлов на веб-сервер? Ваш веб-сервер должен поддерживать это.';
+$lang['renderer_xhtml']        = 'Обработчик основного (xhtml) вывода вики';
+$lang['renderer__core']        = '%s (ядро dokuwiki)';
+$lang['renderer__plugin']      = '%s (плагин)';
+$lang['dnslookups']            = 'DokuWiki ищет DNS имена пользователей редактирующих страницы. Если у вас нет DNS сервера или он работает медленно, рекомендуем отключить эту опцию.';
+$lang['proxy____host']         = 'proxy-адрес';
+$lang['proxy____port']         = 'proxy-порт';
+$lang['proxy____user']         = 'proxy-имя пользователя';
+$lang['proxy____pass']         = 'proxy-пароль';
+$lang['proxy____ssl']          = 'proxy-ssl';
+$lang['proxy____except']       = 'Регулярное выражение для адресов (URL), для которых прокси должен быть пропущен.';
+$lang['safemodehack']          = 'Включить обход safemode (хак)';
+$lang['ftp____host']           = 'ftp-адрес';
+$lang['ftp____port']           = 'ftp-порт';
+$lang['ftp____user']           = 'ftp-имя пользователя';
+$lang['ftp____pass']           = 'ftp-пароль';
+$lang['ftp____root']           = 'ftp-корневая директория';
+$lang['license_o_']            = 'Не выбрано';
+$lang['typography_o_0']        = 'нет';
+$lang['typography_o_1']        = 'Только двойные кавычки';
+$lang['typography_o_2']        = 'Все кавычки (может не всегда работать)';
+$lang['userewrite_o_0']        = '(нет)';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'средствами «ДокуВики»';
+$lang['deaccent_o_0']          = 'отключить';
+$lang['deaccent_o_1']          = 'убирать только диакр. знаки';
+$lang['deaccent_o_2']          = 'полная транслитерация';
+$lang['gdlib_o_0']             = 'LibGD недоступна';
+$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_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = 'Абстрактный';
+$lang['rss_content_o_diff']    = 'Объединённый diff';
+$lang['rss_content_o_htmldiff'] = 'HTML-форматированная таблица diff';
+$lang['rss_content_o_html']    = 'Полное содержимое HTML-страницы';
+$lang['rss_linkto_o_diff']     = 'отличия от текущей';
+$lang['rss_linkto_o_page']     = 'текст страницы';
+$lang['rss_linkto_o_rev']      = 'история правок';
+$lang['rss_linkto_o_current']  = 'текущая версия';
+$lang['compression_o_0']       = 'без сжатия';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'не используется';
+$lang['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']        = 'Всегда';
+$lang['readdircache']          = 'Максимальное время жизни кэша readdir (сек.)';
diff --git a/sources/lib/plugins/config/lang/sk/intro.txt b/sources/lib/plugins/config/lang/sk/intro.txt
new file mode 100644
index 0000000..5de62a3
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sk/intro.txt
@@ -0,0 +1,7 @@
+====== Správa konfigurácie ======
+
+Túto stránku môžete používať na zmenu nastavení Vašej DokuWiki inštalácie. Popis jednotlivých nastavení je uvedený v [[doku>config]]. Viac detailov o tomto plugine nájdete v [[doku>plugin:config]].
+
+Nastavenia zobrazené na červenom pozadí sú neprístupné a nemôžu byť týmto pluginom zmenené. Nastavenia s modrým pozadím obsahujú prednastavené hodnoty a nastavenia s bielym pozadím boli nastavené lokálne pre túto konkrétnu inštaláciu. Nastavenia s modrým a bielym pozadím môžu byť zmenené.
+
+Nezabudnite stlačiť tlačidlo **Uložiť** pred opustením stránky, inak budú vaše zmeny stratené.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/sk/lang.php b/sources/lib/plugins/config/lang/sk/lang.php
new file mode 100644
index 0000000..46e4081
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sk/lang.php
@@ -0,0 +1,193 @@
+
+ * @author exusik@gmail.com
+ * @author Martin Michalek 
+ */
+$lang['menu']                  = 'Nastavenia konfigurácie';
+$lang['error']                 = 'Nastavenia neboli aktualizované kvôli neplatnej hodnote, prosím skontrolujte vaše zmeny a znovu ich pošlite. 
        Nesprávna hodnota(y) bude ohraničená červeným okrajom.';
+$lang['updated']               = 'Nastavenia úspešne aktualizované.';
+$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';
+$lang['_header_template']      = 'Nastavenia šablóny';
+$lang['_header_undefined']     = 'Nešpecifikované nastavenia';
+$lang['_basic']                = 'Základné nastavenia';
+$lang['_display']              = 'Nastavenia zobrazovania';
+$lang['_authentication']       = 'Nastavenia zabezpečenia';
+$lang['_anti_spam']            = 'Nastavenia anti-spamu';
+$lang['_editing']              = 'Nastavenia úprav';
+$lang['_links']                = 'Nastavenia odkazov';
+$lang['_media']                = 'Nastavenia médií';
+$lang['_notifications']        = 'Nastavenie upozornení';
+$lang['_syndication']          = 'Nastavenie poskytovania obsahu';
+$lang['_advanced']             = 'Rozšírené nastavenia';
+$lang['_network']              = 'Nastavenia siete';
+$lang['_msg_setting_undefined'] = 'Nenastavené metadata.';
+$lang['_msg_setting_no_class'] = 'Nenastavená trieda.';
+$lang['_msg_setting_no_default'] = 'Žiadna predvolená hodnota.';
+$lang['title']                 = 'Názov wiki';
+$lang['start']                 = 'Názov štartovacej stránky';
+$lang['lang']                  = 'Jazyk';
+$lang['template']              = 'Šablóna';
+$lang['tagline']               = 'Slogan (ak ho šablóna podporuje)';
+$lang['sidebar']               = 'Meno bočného panela (ak ho šablóna podporuje), prázdne pole deaktivuje bočný panel';
+$lang['license']               = 'Pod ktorou licenciou bude publikovaný obsah stránky?';
+$lang['savedir']               = 'Adresár pre ukladanie dát';
+$lang['basedir']               = 'Hlavný adresár (napr. /dokuwiki/). Prázdna hodnota znamená použitie autodetekcie.';
+$lang['baseurl']               = 'Adresa servera (napr. http://www.yourserver.com). Prázdna hodnota znamená použitie autodetekcie.';
+$lang['cookiedir']             = 'Cesta k cookies. Prázdna hodnota znamená použitie adresy servera.';
+$lang['dmode']                 = 'Spôsob vytvárania adresárov';
+$lang['fmode']                 = 'Spôsob vytvárania súborov';
+$lang['allowdebug']            = 'Povoliť ladenie chýb deaktivujte, ak nie je potrebné!';
+$lang['recent']                = 'Posledné zmeny';
+$lang['recent_days']           = 'Koľko posledných zmien uchovávať (dni)';
+$lang['breadcrumbs']           = 'Počet záznamov histórie';
+$lang['youarehere']            = 'Nachádzate sa';
+$lang['fullpath']              = 'Zobrazovať plnú cestu k stránkam v pätičke';
+$lang['typography']            = 'Vykonať typografické zmeny';
+$lang['dformat']               = 'Formát dátumu (pozri funkciu PHP strftime)';
+$lang['signature']             = 'Podpis';
+$lang['showuseras']            = 'Čo použiť pri zobrazení používateľa, ktorý posledný upravoval stránku';
+$lang['toptoclevel']           = 'Najvyššia úroveň pre generovanie obsahu.';
+$lang['tocminheads']           = 'Minimálny počet nadpisov pre generovanie obsahu';
+$lang['maxtoclevel']           = 'Maximálna úroveň pre generovanie obsahu.';
+$lang['maxseclevel']           = 'Maximálna úroveň sekcie pre editáciu';
+$lang['camelcase']             = 'Použiť CamelCase pre odkazy';
+$lang['deaccent']              = 'Upraviť názvy stránok';
+$lang['useheading']            = 'Použiť nadpis pre názov stránky';
+$lang['sneaky_index']          = 'DokuWiki implicitne ukazuje v indexe všetky menné priestory. Povolením tejto voľby sa nezobrazia menné priestory, ku ktorým nemá používateľ právo na čítanie. Dôsledkom môže byť nezobrazenie vnorených prístupných menných priestorov. Táto voľba môže mať za následok nepoužiteľnosť indexu s určitými ACL nastaveniami.';
+$lang['hidepages']             = 'Skryť zodpovedajúce stránky (regulárne výrazy)';
+$lang['useacl']                = 'Použiť kontrolu prístupu (ACL)';
+$lang['autopasswd']            = 'Autogenerovanie hesla';
+$lang['authtype']              = 'Systém autentifikácie (back-end)';
+$lang['passcrypt']             = 'Spôsob šifrovania hesiel';
+$lang['defaultgroup']          = 'Predvolená skupina';
+$lang['superuser']             = 'Správca - skupina, používateľ alebo čiarkou oddelený zoznam "pouzivatel1,@skupina1,pouzivatel2" s plným prístupom ku všetkým stránkam a funkciám nezávisle od ACL nastavení';
+$lang['manager']               = 'Manažér - skupina, používateľ alebo čiarkou oddelený zoznam "pouzivatel1,@skupina1,pouzivatel2" s prístupom k vybraným správcovským funkciám';
+$lang['profileconfirm']        = 'Potvrdzovať zmeny profilu heslom';
+$lang['rememberme']            = 'Povoliť trvalé prihlasovacie cookies (zapamätaj si ma)';
+$lang['disableactions']        = 'Zakázať DokuWiki akcie';
+$lang['disableactions_check']  = 'Skontrolovať';
+$lang['disableactions_subscription'] = 'Povoliť/Zrušiť informovanie o zmenách stránky';
+$lang['disableactions_wikicode'] = 'Pozrieť zdroj/Exportovať zdroj';
+$lang['disableactions_other']  = 'Iné akcie (oddelené čiarkou)';
+$lang['auth_security_timeout'] = 'Časový limit pri prihlasovaní (v sekundách)';
+$lang['securecookie']          = 'Mal by prehliadač posielať cookies nastavené cez HTTPS posielať iba cez HTTPS (bezpečné) pripojenie? Vypnite túto voľbu iba v prípade, ak je prihlasovanie do Vašej wiki zabezpečené SSL, ale prezeranie wiki je nezabezpečené.';
+$lang['remote']                = 'Povolenie vzdialeného API. Umožnuje iným aplikáciám pristupovať k wiki cez XML-RPC alebo iným spôsobom.';
+$lang['remoteuser']            = 'Obmedzenie použitia vzdialeného API skupinám alebo používateľom oddelených čiarkami. Prázdne pole poskytuje prístup pre každého používateľa.';
+$lang['usewordblock']          = 'Blokovať spam na základe zoznamu známych slov';
+$lang['relnofollow']           = 'Používať rel="nofollow" pre externé odkazy';
+$lang['indexdelay']            = 'Časové oneskorenie pred indexovaním (sek)';
+$lang['mailguard']             = 'Zamaskovať e-mailovú adresu';
+$lang['iexssprotect']          = 'Kontrolovať nahraté súbory na prítomnosť nebezpečného JavaScript alebo HTML kódu';
+$lang['usedraft']              = 'Automaticky ukladať koncept počas úpravy stránky';
+$lang['htmlok']                = 'Umožniť vkladanie HTML';
+$lang['phpok']                 = 'Umožniť vkladanie PHP';
+$lang['locktime']              = 'Maximálne trvanie blokovacích súborov (sek)';
+$lang['cachetime']             = 'Maximálne trvanie cache (sek)';
+$lang['target____wiki']        = 'Cieľové okno (target) pre interné odkazy';
+$lang['target____interwiki']   = 'Cieľové okno (target) pre interwiki odkazy';
+$lang['target____extern']      = 'Cieľové okno (target) pre externé odkazy';
+$lang['target____media']       = 'Cieľové okno (target) pre media odkazy';
+$lang['target____windows']     = 'Cieľové okno (target) pre windows odkazy';
+$lang['mediarevisions']        = 'Povoliť verzie súborov?';
+$lang['refcheck']              = 'Kontrolovať odkazy na médiá (pred vymazaním)';
+$lang['gdlib']                 = 'Verzia GD Lib';
+$lang['im_convert']            = 'Cesta k ImageMagick convert tool';
+$lang['jpg_quality']           = 'Kvalita JPG kompresie (0-100)';
+$lang['fetchsize']             = 'Maximálna veľkosť (v bajtoch) pri sťahovaní z externých zdrojov';
+$lang['subscribers']           = 'Povoliť podporu informovania o zmenách stránky';
+$lang['subscribe_time']        = 'Časový inteval, po uplynutí ktorého sú zasielané informácie o zmenách stránky alebo menného priestoru (sek); hodnota by mala byť menšia ako čas zadaný pri položke recent_days.';
+$lang['notify']                = 'Posielať upozornenia na zmeny na túto e-mailovú adresu';
+$lang['registernotify']        = 'Posielať informáciu o nových užívateľoch na túto e-mailovú adresu';
+$lang['mailfrom']              = 'E-mailová adresa na automatické e-maily';
+$lang['mailprefix']            = 'Prefix predmetu emailovej spravy zasielanej automaticky';
+$lang['htmlmail']              = 'Posielanie lepšie vyzerajúceho ale objemnejšieho HTML mailu. Deaktivovaním sa budú posielať iba textové maily.';
+$lang['sitemap']               = 'Generovať Google sitemap (dni)';
+$lang['rss_type']              = 'Typ XML feedu';
+$lang['rss_linkto']            = 'XML zdroj odkazuje na';
+$lang['rss_content']           = 'Čo zobrazovať v XML feede?';
+$lang['rss_update']            = 'Časový interval obnovy XML feedu (sek.)';
+$lang['rss_show_summary']      = 'XML zdroj ukáže prehľad v názve';
+$lang['rss_media']             = 'Aký typ zmien by mal byť zobrazený v XML feede?';
+$lang['updatecheck']           = 'Kontrolovať aktualizácie a bezpečnostné upozornenia? DokuWiki potrebuje pre túto funkciu prístup k update.dokuwiki.org.';
+$lang['userewrite']            = 'Používať nice URLs';
+$lang['useslash']              = 'Používať lomku (/) ako oddeľovač v URL';
+$lang['sepchar']               = 'Oddeľovač slov v názvoch stránok';
+$lang['canonical']             = 'Používať plne kanonické URL názvy';
+$lang['fnencode']              = 'Spôsob kódovania non-ASCII mien súborov.';
+$lang['autoplural']            = 'Kontrolovať množné číslo v odkazoch';
+$lang['compression']           = 'Metóda kompresie pre staré verzie stránok';
+$lang['gzip_output']           = 'Používať gzip Content-Encoding pre xhtml';
+$lang['compress']              = 'Komprimovať CSS a javascript výstup';
+$lang['cssdatauri']            = 'Veľkosť v bytoch, do ktorej by mali byť obrázky s odkazom v CSS vložené priamo do štýlu z dôvodu obmedzenia HTTP požiadaviek. Tento postup nefunguje v IE verzie 7 a nižšie! Vhodná hodnota je od 400 do 600 bytov. Hodnota 0 deaktivuje túto metódu.';
+$lang['send404']               = 'Poslať "HTTP 404/Page Not Found" pre neexistujúce stránky';
+$lang['broken_iua']            = 'Je vo Vašom systéme funkcia ignore_user_abort poškodená? Môže to mať za následok nefunkčnosť vyhľadávania v indexe. IIS+PHP/CGI je známy tým, že nefunguje správne. Pozrite Bug 852 pre dalšie informácie.';
+$lang['xsendfile']             = 'Používať X-Sendfile hlavičku pre doručenie statických súborov webserverom? Webserver musí túto funkcionalitu podporovať.';
+$lang['renderer_xhtml']        = 'Používané vykresľovacie jadro pre hlavný (xhtml) wiki výstup';
+$lang['renderer__core']        = '%s (dokuwiki jadro)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['dnslookups']            = 'DokuWiki hľadá mená vzdialených IP adries používateľov editujúcich stránky. Ak máte pomalý alebo nefunkčný DNS server alebo nechcete túto možnosť, deaktivujte túto voľbu';
+$lang['proxy____host']         = 'Proxy server - názov';
+$lang['proxy____port']         = 'Proxy server - port';
+$lang['proxy____user']         = 'Proxy server - užívateľské meno';
+$lang['proxy____pass']         = 'Proxy server - heslo';
+$lang['proxy____ssl']          = 'Proxy server - použiť SSL';
+$lang['proxy____except']       = 'Regulárny výraz popisujúci URL odkazy, pre ktoré by proxy nemala byť použitá.';
+$lang['safemodehack']          = 'Povoliť "safemode hack"';
+$lang['ftp____host']           = 'FTP server pre "safemode hack"';
+$lang['ftp____port']           = 'FTP port pre "safemode hack"';
+$lang['ftp____user']           = 'FTP používateľ pre "safemode hack"';
+$lang['ftp____pass']           = 'FTP heslo pre "safemode hack"';
+$lang['ftp____root']           = 'FTP hlavný adresár pre "safemode hack"';
+$lang['license_o_']            = 'žiadna';
+$lang['typography_o_0']        = 'žiadne';
+$lang['typography_o_1']        = 'okrem jednoduchých úvodzoviek';
+$lang['typography_o_2']        = 'vrátane jednoduchých úvodzoviek (nemusí to vždy fungovať)';
+$lang['userewrite_o_0']        = 'žiadne';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki interné';
+$lang['deaccent_o_0']          = 'vypnuté';
+$lang['deaccent_o_1']          = 'odstrániť diakritiku';
+$lang['deaccent_o_2']          = 'romanizovať (do latinky)';
+$lang['gdlib_o_0']             = 'GD Lib nie je dostupná';
+$lang['gdlib_o_1']             = 'Verzia 1.x';
+$lang['gdlib_o_2']             = 'Autodetekcia';
+$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']    = 'Normalizovaný Diff';
+$lang['rss_content_o_htmldiff'] = 'Tabuľka zmien v HTML formáte';
+$lang['rss_content_o_html']    = 'Obsah stránky v HTML formáte';
+$lang['rss_linkto_o_diff']     = 'prehľad zmien';
+$lang['rss_linkto_o_page']     = 'upravená stránka';
+$lang['rss_linkto_o_rev']      = 'zoznam zmien';
+$lang['rss_linkto_o_current']  = 'aktuálna stránka';
+$lang['compression_o_0']       = 'žiadna';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'nepoužívať';
+$lang['xsendfile_o_1']         = 'Proprietárna lighttpd hlavička (pre vydaním 1.5)';
+$lang['xsendfile_o_2']         = 'Štandardná X-Sendfile hlavička';
+$lang['xsendfile_o_3']         = 'Proprietárna Nginx X-Accel-Redirect hlavička';
+$lang['showuseras_o_loginname'] = 'Prihlasovacie meno';
+$lang['showuseras_o_username'] = 'Celé meno používateľa';
+$lang['showuseras_o_email']    = 'E-mailová adresa používateľa (zamaskovaná podľa nastavenia)';
+$lang['showuseras_o_email_link'] = 'E-mailová adresa používateľa vo forme odkazu mailto:';
+$lang['useheading_o_0']        = 'Nikdy';
+$lang['useheading_o_navigation'] = 'Iba navigácia';
+$lang['useheading_o_content']  = 'Iba Wiki obsah';
+$lang['useheading_o_1']        = 'Vždy';
+$lang['readdircache']          = 'Maximálne trvanie readdir cache (sek)';
diff --git a/sources/lib/plugins/config/lang/sl/intro.txt b/sources/lib/plugins/config/lang/sl/intro.txt
new file mode 100644
index 0000000..506cd34
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sl/intro.txt
@@ -0,0 +1,7 @@
+====== Splošne nastavitve ======
+
+Na tej strani je mogoče spreminjati nastavitve sistema DokuWiki. Pomoč o posameznih nastavitvah je na voljo med [[doku>config|nastavitvami]]. Več podrobnosti o vstavku je na voljo na [[doku>plugin:config|nastavitvami vstavka]].
+
+Nastavitve označene s svetlo rdečim ozadjem so zaščitene in jih s tem vstavkom ni mogoče spreminjati. Nastavitve označene s svetlo modrim ozadjem so privzete vrednosti in nastavitve z belim ozadjem so tiste, ki so bile določene krajevno posebej za to nastavitev. Spreminjati je mogoče vrednosti označene z modrimi in belim ozadjem.
+
+Spremembe je treba **shraniti**, da se uveljavijo, sicer se spremembe prezrejo.
diff --git a/sources/lib/plugins/config/lang/sl/lang.php b/sources/lib/plugins/config/lang/sl/lang.php
new file mode 100644
index 0000000..fe334db
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sl/lang.php
@@ -0,0 +1,186 @@
+
+ * @author Boštjan Seničar 
+ * @author Gregor Skumavc (grega.skumavc@gmail.com)
+ * @author Matej Urbančič (mateju@svn.gnome.org)
+ */
+$lang['menu']                  = 'Splošne nastavitve';
+$lang['error']                 = 'Nastavitve niso shranjene zaradi neveljavne vrednosti.
        Neveljavna vrednost je označena z rdečim robom vnosnega polja.';
+$lang['updated']               = 'Nastavitve so uspešno posodobljene.';
+$lang['nochoice']              = '(ni drugih možnosti na voljo)';
+$lang['locked']                = 'Nastavitvene datoteke ni mogoče posodobiti.
        Preverite dovoljenja za spreminjanje in ime nastavitvene datoteke.';
+$lang['danger']                = 'Opozorilo: spreminjanje te možnosti lahko povzroči težave v delovanju sistema wiki.';
+$lang['warning']               = 'Opozorilo: spreminjanje te možnosti lahko vpliva na pravilno delovanje sistema wiki.';
+$lang['security']              = 'Varnostno opozorilo: spreminjanje te možnosti lahko vpliva na varnost sistema.';
+$lang['_configuration_manager'] = 'Upravljalnik nastavitev';
+$lang['_header_dokuwiki']      = 'Nastavitve DokuWiki';
+$lang['_header_plugin']        = 'Nastavitve vstavkov';
+$lang['_header_template']      = 'Nastavitve predlog';
+$lang['_header_undefined']     = 'Neopredeljene nastavitve';
+$lang['_basic']                = 'Osnovne nastavitve';
+$lang['_display']              = 'Nastavitve prikazovanja';
+$lang['_authentication']       = 'Nastavitve overjanja';
+$lang['_anti_spam']            = 'Nastavitve neželenih sporočil (Anti-Spam)';
+$lang['_editing']              = 'Nastavitve urejanja';
+$lang['_links']                = 'Nastavitve povezav';
+$lang['_media']                = 'Predstavne nastavitve';
+$lang['_advanced']             = 'Napredne nastavitve';
+$lang['_network']              = 'Omrežne nastavitve';
+$lang['_msg_setting_undefined'] = 'Ni nastavitvenih metapodatkov.';
+$lang['_msg_setting_no_class'] = 'Ni nastavitvenega razreda.';
+$lang['_msg_setting_no_default'] = 'Ni privzete vrednosti.';
+$lang['fmode']                 = 'Način ustvarjanja datotek';
+$lang['dmode']                 = 'Način ustvarjanja map';
+$lang['lang']                  = 'Jezik vmesnika';
+$lang['basedir']               = 'Pot do strežnika (npr. /dokuwiki/). Prazno polje določa samodejno zaznavanje';
+$lang['baseurl']               = 'Naslov URL strežnika (npr. http://www.streznik.si). Prazno polje določa samodejno zaznavanje';
+$lang['savedir']               = 'Mapa za shranjevanje podatkov';
+$lang['cookiedir']             = 'Pot do piškotka. Prazno polje določa uporabo osnovnega naslova (baseurl)';
+$lang['start']                 = 'Ime začetne strani wiki';
+$lang['title']                 = 'Naslov Wiki spletišča';
+$lang['template']              = 'Predloga';
+$lang['tagline']               = 'Označna vrstica (ob podpori predloge)';
+$lang['sidebar']               = 'Ime strani stranske vrstice (ob podpori predloge); prazno polje onemogoči stransko vrstico.';
+$lang['license']               = 'Pod pogoji katerega dovoljenja je objavljena vsebina?';
+$lang['fullpath']              = 'Pokaži polno pot strani v nogi strani';
+$lang['recent']                = 'Nedavne spremembe';
+$lang['breadcrumbs']           = 'Število drobtinic poti';
+$lang['youarehere']            = 'Hierarhične drobtinice poti';
+$lang['typography']            = 'Omogoči tipografske zamenjave';
+$lang['htmlok']                = 'Dovoli vstavljeno kodo HTML';
+$lang['phpok']                 = 'Dovoli vstavljeno kodo PHP';
+$lang['dformat']               = 'Oblika zapisa časa (funkcija PHP strftime)';
+$lang['signature']             = 'Podpis';
+$lang['toptoclevel']           = 'Vrhnja raven kazala';
+$lang['tocminheads']           = 'Najmanjše število naslovov za izgradnjo kazala';
+$lang['maxtoclevel']           = 'Najvišja raven kazala';
+$lang['maxseclevel']           = 'Največja raven urejanja odseka';
+$lang['camelcase']             = 'Uporabi EnoBesedni zapisa za povezave';
+$lang['deaccent']              = 'Počisti imena strani';
+$lang['useheading']            = 'Uporabi prvi naslov za ime strani';
+$lang['refcheck']              = 'Preverjanje sklica predstavnih datotek';
+$lang['allowdebug']            = 'Dovoli razhroščevanje (po potrebi!)';
+$lang['mediarevisions']        = 'Ali naj se omogočijo objave predstavnih vsebin?';
+$lang['usewordblock']          = 'Zaustavi neželeno besedilo glede na seznam besed';
+$lang['indexdelay']            = 'Časovni zamik pred ustvarjanjem kazala (v sekundah)';
+$lang['relnofollow']           = 'Uporabni možnost rel="nofollow" pri zunanjih povezavah';
+$lang['mailguard']             = 'Šifriraj elektronske naslove';
+$lang['iexssprotect']          = 'Preveri poslane datoteke za zlonamerno kodo JavaScript ali HTML';
+$lang['showuseras']            = 'Kaj prikazati za prikaz uporabnika, ki je zadnji urejal stran';
+$lang['useacl']                = 'Uporabi seznam nadzora dostopa (ACL)';
+$lang['autopasswd']            = 'Samodejno ustvari gesla';
+$lang['authtype']              = 'Ozadnji način overitve';
+$lang['passcrypt']             = 'Način šifriranja gesel';
+$lang['defaultgroup']          = 'Privzeta skupina';
+$lang['superuser']             = 'Skrbnik - skupina, uporabnik ali z vejico ločen seznam uporabnik1,@skupina1,uporabnik2 s polnim dostopom do vseh strani in možnosti, neodvisno od nastavitev nadzora dostopa ACL';
+$lang['manager']               = 'Upravljavec - skupina, uporabnik ali z vejico ločen seznam uporabnik1,@skupina1,uporabnik2 z dovoljenji za dostop do nekaterih možnosti upravljanja';
+$lang['profileconfirm']        = 'Potrdi spremembe profila z geslom';
+$lang['disableactions']        = 'Onemogoči dejanja DokuWiki';
+$lang['disableactions_check']  = 'Preveri';
+$lang['disableactions_subscription'] = 'Naročanje/Preklic naročnine';
+$lang['disableactions_wikicode'] = 'Pogled izvorne kode/Surovi izvoz';
+$lang['disableactions_other']  = 'Druga dejanja (z vejico ločen seznam)';
+$lang['sneaky_index']          = 'Privzeto pokaže sistem DokuWiki vse imenske prostore v pogledu kazala. Z omogočanjem te možnosti bodo skriti vsi imenski prostori, v katere prijavljen uporabnik nima dovoljenj dostopa. S tem je mogoče preprečiti dostop do podrejenih strani. Možnost lahko vpliva na uporabnost nastavitev nadzora dostopa ACL.';
+$lang['auth_security_timeout'] = 'Varnostna časovna omejitev overitve (v sekundah)';
+$lang['securecookie']          = 'Ali naj se piškotki poslani preko varne povezave HTTPS v brskalniku pošiljajo le preko HTTPS? Onemogočanje možnosti je priporočljivo le takrat, ko je prijava varovana s protokolom  SSL, brskanje po strani pa ni posebej zavarovano.';
+$lang['updatecheck']           = 'Ali naj sistem preveri za posodobitve in varnostna opozorila.';
+$lang['userewrite']            = 'Uporabi olepšan zapis naslovov URL';
+$lang['useslash']              = 'Uporabi poševnico kot ločilnik imenskih prostorov v naslovih URL';
+$lang['usedraft']              = 'Samodejno shrani osnutek med urejanjem strani';
+$lang['sepchar']               = 'Ločilnik besed imen strani';
+$lang['canonical']             = 'Uporabi polni kanonični zapis naslova URL';
+$lang['fnencode']              = 'Način kodiranja ne-ASCII imen datotek.';
+$lang['autoplural']            = 'Preveri množinske oblike povezav';
+$lang['compression']           = 'Način stiskanja za arhivirane datoteke';
+$lang['cachetime']             = 'Največja dovoljena starost predpomnilnika (v sekundah)';
+$lang['locktime']              = 'Največja dovoljena starost datotek zaklepa (v sekundah)';
+$lang['fetchsize']             = 'največja dovoljena velikost zunanjega prejemanja z datoteko fetch.php (v bajtih)';
+$lang['notify']                = 'Pošlji obvestila o spremembah na določen elektronski naslov';
+$lang['registernotify']        = 'Pošlji obvestila o novih vpisanih uporabnikih na določen elektronski naslov';
+$lang['mailfrom']              = 'Elektronski naslov za samodejno poslana sporočila';
+$lang['mailprefix']            = 'Predpona zadeve elektronskega sporočila za samodejna sporočila.';
+$lang['gzip_output']           = 'Uporabi stiskanje gzip vsebine za xhtml';
+$lang['gdlib']                 = 'Različica GD Lib';
+$lang['im_convert']            = 'Pot do orodja za pretvarjanje slik ImageMagick';
+$lang['jpg_quality']           = 'Kakovost stiskanja datotek JPG (0-100)';
+$lang['subscribers']           = 'Omogoči podporo naročanju na strani';
+$lang['subscribe_time']        = 'Čas po katerem so poslani povzetki sprememb (v sekundah); Vrednost mora biti krajša od časa, ki je določen z nedavno_dni.';
+$lang['compress']              = 'Združi odvod CSS in JavaScript v brskalniku';
+$lang['cssdatauri']            = 'Velikost sklicanih slik v bajtih, ki so navedene v datotekah CSS za zmanjšanje zahtev osveževanja strežnika HTTP. Ta možnost ni podprta v brskalniku MS IE 7 in nižjih različicah! Ustrezne vrednosti so 400 do 600 bajtov. Vrednost 0 onemogoči možnost.';
+$lang['hidepages']             = 'Skrij skladne strani (logični izraz)';
+$lang['send404']               = 'Pošlji "HTTP 404/Strani ni mogoče najti" pri dostopu do neobstoječih strani';
+$lang['sitemap']               = 'Ustvari Google kazalo strani (v dnevih)';
+$lang['broken_iua']            = 'Ali je možnost ignore_user_abort okvarjena na sistemu? Napaka lahko vpliva na delovanje iskalnika. Napake so pogoste ob uporabi IIS+PHP/CGI. Več o tem si je mogoče prebrati v poročilu o hrošču 852.';
+$lang['xsendfile']             = 'Uporabi glavo X-Sendfile za prejemanje statičnih datotek. Spletni strežnik mora možnost podpirati.';
+$lang['renderer_xhtml']        = 'Izrisovalnik za odvod Wiki strani (xhtml)';
+$lang['renderer__core']        = '%s (jedro dokuwiki)';
+$lang['renderer__plugin']      = '%s (vstavek)';
+$lang['rememberme']            = 'Dovoli trajne prijavne piškotke (trajno pomnenje prijave)';
+$lang['rss_type']              = 'Vrsta virov XML';
+$lang['rss_linkto']            = 'XML viri so povezani z';
+$lang['rss_content']           = 'Kaj prikazati med predmeti virov XML?';
+$lang['rss_update']            = 'Časovni razmik posodobitve virov XML (v sekundah)';
+$lang['recent_days']           = 'Koliko nedavnih sprememb naj se ohrani (v dnevih)';
+$lang['rss_show_summary']      = 'Viri XML so povzeti v naslovu';
+$lang['target____wiki']        = 'Ciljno okno za notranje povezave';
+$lang['target____interwiki']   = 'Ciljno okno za notranje wiki povezave';
+$lang['target____extern']      = 'Ciljno okno za zunanje povezave';
+$lang['target____media']       = 'Ciljno okno za predstavne povezave';
+$lang['target____windows']     = 'Ciljno okno za povezave oken';
+$lang['proxy____host']         = 'Ime posredniškega strežnika';
+$lang['proxy____port']         = 'Vrata posredniškega strežnika';
+$lang['proxy____user']         = 'Uporabniško ime posredniškega strežnika';
+$lang['proxy____pass']         = 'Geslo posredniškega strežnika';
+$lang['proxy____ssl']          = 'Uporabi varno povezavo SSL za povezavo z posredniškim strežnikom';
+$lang['proxy____except']       = 'Logični izrazi morajo biti skladni z naslovi URL, ki gredo mimo posredniškega strežnika.';
+$lang['safemodehack']          = 'Omogoči obhod načina SafeMode PHP';
+$lang['ftp____host']           = 'Strežnik FTP za obhod načina SafeMode';
+$lang['ftp____port']           = 'Vrata strežnika FTP za obhod načina SafeMode';
+$lang['ftp____user']           = 'Uporabniško ime za FTP za obhod načina SafeMode';
+$lang['ftp____pass']           = 'Geslo za strežnik FTP za obhod načina SafeMode';
+$lang['ftp____root']           = 'Korenska mapa FTP za obhod načina SafeMode';
+$lang['license_o_']            = 'Ni izbranega dovoljenja';
+$lang['typography_o_0']        = 'brez';
+$lang['typography_o_1']        = 'izloči enojne narekovaje';
+$lang['typography_o_2']        = 'z enojnimi narekovaji (lahko včasih ne deluje)';
+$lang['userewrite_o_0']        = 'brez';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'notranji DokuWiki';
+$lang['deaccent_o_0']          = 'onemogočeno';
+$lang['deaccent_o_1']          = 'odstrani naglasne oznake';
+$lang['deaccent_o_2']          = 'pretvori v romanski zapis';
+$lang['gdlib_o_0']             = 'Knjižnica GD Lib ni na voljo';
+$lang['gdlib_o_1']             = 'Različica 1.x';
+$lang['gdlib_o_2']             = 'Samodejno zaznavanje';
+$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'] = 'Povzetek';
+$lang['rss_content_o_diff']    = 'Poenotena primerjava';
+$lang['rss_content_o_htmldiff'] = 'HTML oblikovana preglednica primerjave';
+$lang['rss_content_o_html']    = 'Polna HTML vsebina strani';
+$lang['rss_linkto_o_diff']     = 'primerjalni pogled';
+$lang['rss_linkto_o_page']     = 'pregledana stran';
+$lang['rss_linkto_o_rev']      = 'seznam pregledovanj';
+$lang['rss_linkto_o_current']  = 'trenutna stran';
+$lang['compression_o_0']       = 'brez';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'ne uporabi';
+$lang['xsendfile_o_1']         = 'lastniška glava lighttpd (pred različico 1.5)';
+$lang['xsendfile_o_2']         = 'običajna glava X-Sendfile';
+$lang['xsendfile_o_3']         = 'lastniška glava Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'Prijavno ime';
+$lang['showuseras_o_username'] = 'Polno ime uporabnika';
+$lang['showuseras_o_email']    = 'Elektronski naslov uporabnika (šifriran po določilih varovanja)';
+$lang['showuseras_o_email_link'] = 'Elektronski naslov uporabnika kot povezava mailto:';
+$lang['useheading_o_0']        = 'nikoli';
+$lang['useheading_o_navigation'] = 'le za krmarjenje';
+$lang['useheading_o_content']  = 'le za vsebino Wiki';
+$lang['useheading_o_1']        = 'vedno';
+$lang['readdircache']          = 'Največja dovoljena starost predpomnilnika prebranih map (v sekundah)';
diff --git a/sources/lib/plugins/config/lang/sq/intro.txt b/sources/lib/plugins/config/lang/sq/intro.txt
new file mode 100644
index 0000000..687b497
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sq/intro.txt
@@ -0,0 +1,7 @@
+====== Menaxheri Konfigurimit ======
+
+Përdoreni këtë faqe për të kontrolluar kuadrot e instalimit të DokuWiki-t tuaj. Për ndihmë mbi kuadro individuale referojuni  [[doku>config]]. Për më tepër detaje rreth këtij plugin-i shih [[doku>plugin:config]].
+
+Kuadrot e treguara me një backgroudn me një ngjyrë të kuqe të lehtë janë të mbrojtura dhe nuk mund të ndryshohen me këtë plugin. Kuadrot e treguara me një background blu janë vlerat default dhe kuadrot e treguara me një background të bardhë janë vendosur lokalisht për këtë instalim të caktuar. Si kuadrot blu, ashtu edhe ato të bardhë mund të ndryshohen.
+
+Kujtohuni të shtypni butonin **Ruaj** para se të dilni nga kjo faqe ose ndryshimet tuaja do të humbasin.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/sq/lang.php b/sources/lib/plugins/config/lang/sq/lang.php
new file mode 100644
index 0000000..a6f3087
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sq/lang.php
@@ -0,0 +1,175 @@
+Vlerat e pasakta tregohen të rrethuara nga një kornizë e kuqe.';
+$lang['updated']               = 'Kuadrot u përditësuan me sukses.';
+$lang['nochoice']              = '(asnjë zgjedhje tjetër e disponueshme)';
+$lang['locked']                = 'Skedari i kuadrove nuk mund të përditësohet, nëse kjo është e paqëllimshme, 
         sigurohuni që emri i skedarit të kuadrove lokale dhe të drejtat të jenë të sakta.';
+$lang['danger']                = 'Rrezik: Ndrishimi i kësaj alternative mund ta bëjë wiki-n dhe menunë tuaj të konfigurimit të pa aksesueshme.';
+$lang['warning']               = 'Paralajmërim: Ndryshimi i kësaj alternative mund të shkaktojë sjellje të padëshiruara.';
+$lang['security']              = 'Paralajmërim Sigurie: Ndryshimi i kësaj alternative mund të paraqesë një rrezik në siguri.';
+$lang['_configuration_manager'] = 'Menaxhuesi i Kuadrove';
+$lang['_header_dokuwiki']      = 'Kuadrot e DokuWiki-t';
+$lang['_header_plugin']        = 'Kuadrot e Plugin-eve';
+$lang['_header_template']      = 'Kuadrot e Template-eve';
+$lang['_header_undefined']     = 'Kuadro të Papërcaktuara';
+$lang['_basic']                = 'Kuadro Elementare';
+$lang['_display']              = 'Kuadrot e Shfaqjes';
+$lang['_authentication']       = 'Kuadrot e Autentikimit';
+$lang['_anti_spam']            = 'Kuadrot Anti-Spam';
+$lang['_editing']              = 'Kuadrot e Redaktimit';
+$lang['_links']                = 'Kuadrot e Link-eve';
+$lang['_media']                = 'Kuadrot e Medias';
+$lang['_advanced']             = 'Kuadro të Avancuara';
+$lang['_network']              = 'Kuadrot e Rrjetit';
+$lang['_msg_setting_undefined'] = 'Metadata pa kuadro.';
+$lang['_msg_setting_no_class'] = 'Klasë pa kuadro.';
+$lang['_msg_setting_no_default'] = 'Asnjë vlerë default.';
+$lang['fmode']                 = 'Mënyra krijim skedari';
+$lang['dmode']                 = 'Mënyra krijim dosjeje.';
+$lang['lang']                  = 'Gjuha e ndërfaqes';
+$lang['basedir']               = 'Path-i i Serverit (psh /dokuwiki/). Lëre bosh për ta gjetur automatikisht.';
+$lang['baseurl']               = 'URL-ja serverit (psh http://www.serveriyt.com). Lëre bosh për ta gjetur automatikisht.';
+$lang['savedir']               = 'Direktoria për të ruajtur të dhënat';
+$lang['start']                 = 'Emri i faqes së fillimit';
+$lang['title']                 = 'Titulli i Wiki-t';
+$lang['template']              = 'Template';
+$lang['license']               = 'Nën cilën liçensë duhet të vihet përmbajtja juar?';
+$lang['fullpath']              = 'Trego adresën e plotë të faqeve në footer.';
+$lang['recent']                = 'Ndryshimet më të fundit';
+$lang['breadcrumbs']           = 'Numri i gjurmëve';
+$lang['youarehere']            = 'Gjurmë hierarkike';
+$lang['typography']            = 'Bëj zëvendësime tipografike';
+$lang['htmlok']                = 'Lejo HTML të ngulitura';
+$lang['phpok']                 = 'Lejo PHP të ngulitura';
+$lang['dformat']               = 'Formati i Datës (shiko funksionin strftime e PHP-së)';
+$lang['signature']             = 'Firma';
+$lang['toptoclevel']           = 'Niveli i Kreut për tabelën e përmbajtjes';
+$lang['tocminheads']           = 'Sasia minimum e titrave që përcaktojnë nëse TOC ndërtohet ose jo';
+$lang['maxtoclevel']           = 'Niveli maksimum për tabelën e përmbajtjes';
+$lang['maxseclevel']           = 'Niveli maksimum për redaktim të seksionit';
+$lang['camelcase']             = 'Përdor CamelCase (shkronja e parë e çdo fjale është kapitale) për linke-t';
+$lang['deaccent']              = 'Emra faqesh të pastër';
+$lang['useheading']            = 'Përdor titra të nivelit të parë për faqet e emrave';
+$lang['refcheck']              = 'Kontroll për referim mediash';
+$lang['allowdebug']            = 'Lejo debug çaktivizoje nëse nuk nevojitet!';
+$lang['usewordblock']          = 'Blloko spam-in duke u bazuar mbi listë fjalësh';
+$lang['indexdelay']            = 'Vonesa në kohë para index-imit (sekonda)';
+$lang['relnofollow']           = 'Përdor rel="nofollow" në linke të jashtëm';
+$lang['mailguard']             = 'Errëso adresat e email-it';
+$lang['iexssprotect']          = 'Kontrollo skedarët e ngarkuar për kod të mundshëm dashakeqës JavaScript ose HTML';
+$lang['showuseras']            = 'Cfarë të shfaqësh kur t\'i tregosh përdoruesit faqen e fundit të redaktuar';
+$lang['useacl']                = 'Përdor lista kontrolli të aksesit';
+$lang['autopasswd']            = 'Autogjenero fjalëkalime';
+$lang['authtype']              = 'Backend autentikimi';
+$lang['passcrypt']             = 'Metoda e enkriptimit të fjalëkalimit';
+$lang['defaultgroup']          = 'Grupi default';
+$lang['superuser']             = 'Superpërdorues - grup, përdorues ose listë e ndarë me presje user1, @group1,user2 me akses të plotë në të gjitha faqet dhe funksionet pavarësisht kuadrove të ACL';
+$lang['manager']               = 'Menaxher - grup, përdorues ose listë e ndarë me presje user1,@group1,user2 me akses në disa funksione të caktuara menaxhimi';
+$lang['profileconfirm']        = 'Konfirmo ndryshimet ne profil me fjalëkalim';
+$lang['disableactions']        = 'Caktivizo veprimet e DokuWiki-it';
+$lang['disableactions_check']  = 'Kontrollo';
+$lang['disableactions_subscription'] = 'Abonohu/Fshi Abonim';
+$lang['disableactions_wikicode'] = 'Shiku kodin burim/ Eksportoje të Papërpunuar';
+$lang['disableactions_other']  = 'Veprime të tjera (të ndarë me presje)';
+$lang['sneaky_index']          = 'Vetiu DokuWiki tregon të gjithë hapësirat e emrit në shikimin e index-it. Aktivizimi i kësaj alternative do të fshehë ato ku përdoruesi nuk ka të drejta leximi. Kjo mund të përfundojë në fshehje të nënhapësirave të emrit të aksesueshme. Kjo mund ta bëjë index-in të papërdorshëm me disa konfigurime të caktuara të ACL-së.';
+$lang['auth_security_timeout'] = 'Koha e Përfundimit për Autentikim (sekonda)';
+$lang['securecookie']          = 'A duhet që cookies të vendosura nëpërmjet HTTPS të dërgohen vetëm nëpërmjet HTTPS nga shfletuesit? Caktivizojeni këtë alternativë kur vetëm hyrja në wiki-n tuaj sigurohet me SSL por shfletimi i wiki-t bëhet në mënyrë të pasigurtë.';
+$lang['updatecheck']           = 'Kontrollo për përditësime dhe paralajmërime sigurie? DokuWiki duhet të kontaktojë me update.dokuwiki.org për këtë veti.';
+$lang['userewrite']            = 'Përdor URL të këndshme.';
+$lang['useslash']              = 'Përdor / si ndarës të hapësirave të emrit në URL';
+$lang['usedraft']              = 'Ruaj automatikisht një skicë gjatë redaktimit';
+$lang['sepchar']               = 'Fjala ndarëse për emrin e faqes';
+$lang['canonical']             = 'Përdor URL kanonike të plota';
+$lang['autoplural']            = 'Kontrollo për forma shumës në link-e';
+$lang['compression']           = 'Metoda kompresimit për skedarët atikë';
+$lang['cachetime']             = 'Mosha maksimale për cache (sekonda)';
+$lang['locktime']              = 'Mosha maksimale për kyçjen e skedarëve (sekonda)';
+$lang['fetchsize']             = 'Madhësia maksimale (bytes) që fetch.php mund të shkarkojë nga jashtë';
+$lang['notify']                = 'Dërgo lajmërim për ndryshime te kjo adresë email-i';
+$lang['registernotify']        = 'Dërgo info për përdoruesit e sapo regjistruar te kjo adresë email-i';
+$lang['mailfrom']              = 'Adresa e email-it që do të përdoret për dërgimin e email-eve automatikë';
+$lang['gzip_output']           = 'Përdor gzip Content-Encoding për xhtml';
+$lang['gdlib']                 = 'Versioni i GD Lib';
+$lang['im_convert']            = 'Path-i për tek mjeti i konvertimit ImageMagick';
+$lang['jpg_quality']           = 'Cilësia e kompresimit JPG (0-100)';
+$lang['subscribers']           = 'Aktivizo suportin për abonim faqesh';
+$lang['subscribe_time']        = 'Koha pas së cilës listat e abonimeve dhe konsumimet dërgohen (sekonda); Kjo duhet të jetë më e vogël se koha e specifikuar në ditët më të fundit';
+$lang['compress']              = 'Kompaktëso daljet CSS dhe JavaScript ';
+$lang['hidepages']             = 'Fshi faqet që përkojnë (shprehjet e rregullta)';
+$lang['send404']               = 'Dërgo "HTTP 404/Page Not Found" për faqe që nuk ekzistojnë';
+$lang['sitemap']               = 'Gjenero Google sitemap (ditë)';
+$lang['broken_iua']            = 'Funksioni ignore_user_abort është i prishur në sistemin tuaj? Kjo mund të shkaktojë një indeks kërkimi jo funksional. IIS+PHP/CGI njihen si të prishura. Shiko Bug 852 për më shumë info.';
+$lang['xsendfile']             = 'Përdor kokën X-Sendfile për të lejuar webserver-in të dërgojë skedarë statikë? Kjo duhet të suportohet nga webserver-i juaj.';
+$lang['renderer_xhtml']        = 'Riprodhuesi i përdorur për daljen wiki kryesore (xhtml)';
+$lang['renderer__core']        = '%s (dokuwiki core)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['rememberme']            = 'Lejo cookies hyrjeje të përhershme (më kujto mua)';
+$lang['rss_type']              = 'Tipi feed XML';
+$lang['rss_linkto']            = 'XML feed lidhet me';
+$lang['rss_content']           = 'Cfarë të shfaqësh në objektet XML feed?';
+$lang['rss_update']            = 'Intervali i përditësimit XML feed (sekonda)';
+$lang['recent_days']           = 'Sa ndryshime të fundit duhen mbajtur (ditë)';
+$lang['rss_show_summary']      = 'XML feed trego përmbledhjen në titull';
+$lang['target____wiki']        = 'Dritarja target për link-e të brendshëm';
+$lang['target____interwiki']   = 'Dritarja target për link-e interwiki';
+$lang['target____extern']      = 'Dritarja target për link-e të jashtme';
+$lang['target____media']       = 'Dritarja target për link-e mediash';
+$lang['target____windows']     = 'Dritarja target për link-e windows-i';
+$lang['proxy____host']         = 'Emri i serverit të proxy-t';
+$lang['proxy____port']         = 'Porta e proxy-t';
+$lang['proxy____user']         = 'Emri i përdoruesit për proxy-n';
+$lang['proxy____pass']         = 'Fjalëkalimi proxy-t';
+$lang['proxy____ssl']          = 'Përdor SSL për tu lidhur me proxy-n';
+$lang['safemodehack']          = 'Aktivizo hack në safemode';
+$lang['ftp____host']           = 'Server FTP për safemode hack';
+$lang['ftp____port']           = 'Porta FTP për safemode hack';
+$lang['ftp____user']           = 'Emri përdoruesit për safemode hack';
+$lang['ftp____pass']           = 'Fjalëkalimi FTP për safemode hack';
+$lang['ftp____root']           = 'Direktoria rrënjë për safemode hack';
+$lang['license_o_']            = 'Nuk u zgjodh asgjë';
+$lang['typography_o_0']        = 'Asgjë';
+$lang['typography_o_1']        = 'përjashtim i thonjëzave teke';
+$lang['typography_o_2']        = 'përfshirje e thonjëzave teke (nuk punon gjithmonë) ';
+$lang['userewrite_o_0']        = 'asgjë';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'Brendësia DokuWiki';
+$lang['deaccent_o_0']          = 'fikur';
+$lang['deaccent_o_1']          = 'hiq theksin';
+$lang['deaccent_o_2']          = 'romanizo';
+$lang['gdlib_o_0']             = 'GD Lib nuk është e disponueshme';
+$lang['gdlib_o_1']             = 'Versioni 1.x';
+$lang['gdlib_o_2']             = 'Dallim automatik';
+$lang['rss_type_o_rss']        = 'RSS 0.91';
+$lang['rss_type_o_rss1']       = 'RSS 1.0';
+$lang['rss_type_o_rss2']       = 'RSS 2.0';
+$lang['rss_type_o_atom']       = 'Atom 0.3';
+$lang['rss_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = 'Abstrakte';
+$lang['rss_content_o_diff']    = 'Ndryshime të njësuara';
+$lang['rss_content_o_htmldiff'] = 'Tabelë ndryshimesh e formatuar në HTML';
+$lang['rss_content_o_html']    = 'Përmbajtje e plotë faqeje HTML';
+$lang['rss_linkto_o_diff']     = 'shikimi ndryshimit';
+$lang['rss_linkto_o_page']     = 'faqja e rishikuar';
+$lang['rss_linkto_o_rev']      = 'lista e rishikimeve';
+$lang['rss_linkto_o_current']  = 'faqja aktuale';
+$lang['compression_o_0']       = 'asgjë';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'mos e përdor';
+$lang['xsendfile_o_1']         = 'Proprietary lighttpd header (para lëshimit 1.5)';
+$lang['xsendfile_o_2']         = 'X-Sendfile header standard';
+$lang['xsendfile_o_3']         = 'Proprietary Nginx X-Accel-Redirect header';
+$lang['showuseras_o_loginname'] = 'Emri hyrjes';
+$lang['showuseras_o_username'] = 'Emri i plotë i përdoruesit';
+$lang['showuseras_o_email']    = 'Adresa e email-it e përdoruesit (errësuar sipas kuadros mailguard)';
+$lang['showuseras_o_email_link'] = 'Adresa email e përdoruesit si një mailto: link';
+$lang['useheading_o_0']        = 'Kurrë';
+$lang['useheading_o_navigation'] = 'Vetëm për Navigim';
+$lang['useheading_o_content']  = 'Vetëm për Përmbajtje Wiki';
+$lang['useheading_o_1']        = 'Gjithmonë';
diff --git a/sources/lib/plugins/config/lang/sr/intro.txt b/sources/lib/plugins/config/lang/sr/intro.txt
new file mode 100644
index 0000000..0ee76ed
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sr/intro.txt
@@ -0,0 +1,7 @@
+====== Управљач подешавањима ======
+
+Ову страну користите за контролу подешавања вашег DokuWiki-ја. За помоћ о индивидуалним поставкама погледајте [[doku>config]]. За више информација о додацима погледајте [[doku>plugin:config]].
+
+Подешавања која имају светло црвену позадину су заштићена и не могу се мењати овим додатком. Подешавања која имају светло плаву позадину су подразумеване вредности и подешавања са белом позадином су локална за ову вики инсталацију. И плава и бела подешавања се могу мењати.
+
+Не заборавите да притиснете дугме **Сачувај** када завршите са изменама, у супротном ће ваше измене бити изгубљене.
diff --git a/sources/lib/plugins/config/lang/sr/lang.php b/sources/lib/plugins/config/lang/sr/lang.php
new file mode 100644
index 0000000..1c3250e
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sr/lang.php
@@ -0,0 +1,179 @@
+
+ * @author Miroslav Šolti 
+ */
+$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']        = 'Подешавања за додатке';
+$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['_msg_setting_undefined'] = 'Нема метаподатака подешавања';
+$lang['_msg_setting_no_class'] = 'Нема класе подешавања';
+$lang['_msg_setting_no_default'] = 'Нема подразумеване вредности';
+$lang['fmode']                 = 'Начин прављења датотека';
+$lang['dmode']                 = 'Начин прављења фасцикла';
+$lang['lang']                  = 'Језик';
+$lang['basedir']               = 'Основна фасцикла';
+$lang['baseurl']               = 'Основни УРЛ';
+$lang['savedir']               = 'Фасцикла у којој ће се чувати подаци';
+$lang['start']                 = 'Назив почетне странице';
+$lang['title']                 = 'Назив викија';
+$lang['template']              = 'Шаблон';
+$lang['license']               = 'Под којом лиценцом желите да ваш материјал буде објављен?';
+$lang['fullpath']              = 'Објави целу путању странице у заглављу на дну стране';
+$lang['recent']                = 'Последње промене';
+$lang['breadcrumbs']           = 'Број пређених корака (страница)';
+$lang['youarehere']            = 'Хиерархијске кораке (странице)';
+$lang['typography']            = 'Уради типографске замене';
+$lang['htmlok']                = 'Дозволи угњежђени ХТМЛ';
+$lang['phpok']                 = 'Дозволи угњежђени ПХП';
+$lang['dformat']               = 'Облик датума (погледајте ПХПову strftime функцију)';
+$lang['signature']             = 'Потпис';
+$lang['toptoclevel']           = 'Највиши ниво за садржај';
+$lang['tocminheads']           = 'Минималан број наслова који одређују да ли ће Садржај бити направљен';
+$lang['maxtoclevel']           = 'Максимални ниво за садржај';
+$lang['maxseclevel']           = 'Максималан број секција које се мењају';
+$lang['camelcase']             = 'Користи CamelCase за линкове';
+$lang['deaccent']              = 'Чисти имена страница';
+$lang['useheading']            = 'Преузми наслов првог нивоа за назив странице';
+$lang['refcheck']              = 'Провери референце медијских датотека';
+$lang['allowdebug']            = 'Укључи дебаговање искључи ако није потребно!';
+$lang['usewordblock']          = 'Блокирај спам на основу листе речи';
+$lang['indexdelay']            = 'Одлагање индексирања (секунде)';
+$lang['relnofollow']           = 'Користи rel="nofollow" за спољне линкове';
+$lang['mailguard']             = 'Замутити Е-адресе';
+$lang['iexssprotect']          = 'Провера потенцијално малициозног кода у Јаваскрипт или ХТМЛ коду';
+$lang['showuseras']            = 'Шта приказати за исписивање корисника који је последњи вршио измене';
+$lang['useacl']                = 'Користи листу права приступа';
+$lang['autopasswd']            = 'Аутогенерисане лозинки';
+$lang['authtype']              = 'Позадински систем аутентификације';
+$lang['passcrypt']             = 'Метода енкрипције лозинки';
+$lang['defaultgroup']          = 'Подразумевана група';
+$lang['superuser']             = 'Суперкорисник - група, корисник или зарезом одвојена листа корисника корисник1,@група1,корисник2 са отвореним проступом свим страницама и функцијама без обзира на поставке Контроле приступа';
+$lang['manager']               = 'Управник - група, корисник или зарезом одвојена листа корисника корисник1,@група1,корисник2 са отвореним проступом неким функцијама за управљање';
+$lang['profileconfirm']        = 'Потврди промене у профилу куцањем лозинке';
+$lang['disableactions']        = 'Искључи DokuWiki наредбе';
+$lang['disableactions_check']  = 'Провера';
+$lang['disableactions_subscription'] = 'Претплата';
+$lang['disableactions_wikicode'] = 'Прикажи извор/Извези сирово';
+$lang['disableactions_other']  = 'Остале наредбе (раздвојене зарезом)';
+$lang['sneaky_index']          = 'По инсталацији DokuWiki ће у индексу приказати све именске просторе. Укључивањем ове опције именски простори у којима корисник нема право читања ће бити сакривени. Консеквенца је да ће и доступни подпростори бити сакривени. Ово доводи до неупотребљивости Права приступа у неким поставкама.';
+$lang['auth_security_timeout'] = 'Временска пауза у аутентификацији (секунде)';
+$lang['securecookie']          = 'Да ли колачићи који су постављени преко ХТТПС треба слати веб читачу само преко ХТТПС? Искључите ову опцију само ако је пријављивање на вики заштићено ССЛом а остали део викија незаштићен.';
+$lang['updatecheck']           = 'Провера надоградњи и сигурносних упозорења? Dokuwiki мора да контактира update.dokuwiki.org ради добијања информација.';
+$lang['userewrite']            = 'Направи леп УРЛ';
+$lang['useslash']              = 'Користи косу црту у УРЛу за раздвајање именских простора ';
+$lang['usedraft']              = 'Аутоматски сачувај скицу у току писања измена';
+$lang['sepchar']               = 'Раздвајање речи у називу странице';
+$lang['canonical']             = 'Користи правилне УРЛове';
+$lang['fnencode']              = 'Метод кодирања не-ASCII имена фајлова:';
+$lang['autoplural']            = 'Провери облик множине у линковима';
+$lang['compression']           = 'Метод компресије за attic датотеке';
+$lang['cachetime']             = 'Максимално трајање оставе (сек)';
+$lang['locktime']              = 'МАксимално трајање закључавања датотека (сек)';
+$lang['fetchsize']             = 'Максимална величина (у бајтима) коју може да преузме fetch.php од споља';
+$lang['notify']                = 'Пошаљи обавештења о променама на ову е-адресу';
+$lang['registernotify']        = 'Пошаљи обавештење о новорегистрованим корисницима на ову е-адресу';
+$lang['mailfrom']              = 'Е-адреса која се користи као пошиљаоц за аутоматске е-поруке';
+$lang['gzip_output']           = 'Користи гзип шифрирање за иксХТМЛ';
+$lang['gdlib']                 = 'ГД Либ верзија';
+$lang['im_convert']            = 'Путања до алатке за коверзију ИмиџМеџик ';
+$lang['jpg_quality']           = 'ЈПГ квалитет компресије (0-100)';
+$lang['subscribers']           = 'Укључи могућност претплате за странице';
+$lang['subscribe_time']        = 'Време након ког се спискови претплатника и сижеи шаљу (у секундама); Ова цифра би требало да буде мања од цифре наведене под recent_days';
+$lang['compress']              = 'Сажимај ЦСС и јаваскрипт';
+$lang['hidepages']             = 'Сакриј подударне странице (на основу регуларних израза)';
+$lang['send404']               = 'Пошаљи поруку "ХТТП 404/Страница не постоји" за непостојеће странице';
+$lang['sitemap']               = 'Генериши Гугл мапу сајта (дан)';
+$lang['broken_iua']            = 'Да ли је функција ignore_user_abort function не ради на вашем систему? Ово може проузроковати неиндексирање података за претрагу. ИИС+ПХП/ЦГИ је често ван функције. Погледајте баг 852 за више информација.';
+$lang['xsendfile']             = 'Користи заглавље X-Sendfile да би веб сервер могао да испоручује статичке датотеке? Веб сервер треба да подржава ову функцију.';
+$lang['renderer_xhtml']        = 'Исцртавање користи главни (xhtml) вики испис';
+$lang['renderer__core']        = '%s (dokuwiki језгро)';
+$lang['renderer__plugin']      = '%s (додатак)';
+$lang['rememberme']            = 'Дозволи стални колачић за пријављивање (запамти ме)';
+$lang['rss_type']              = 'Врста ИксМЛ довода';
+$lang['rss_linkto']            = 'ИксМЛ довод линкује на';
+$lang['rss_content']           = 'Шта треба приказати у ИксМЛ доводу?';
+$lang['rss_update']            = 'ИксМЛ';
+$lang['recent_days']           = 'Колико последњих промена чувати (дани)';
+$lang['rss_show_summary']      = 'ИксМЛ довод приказује збир у наслову';
+$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']          = 'Користи ССЛ за повезивање са посредником (проксијем)';
+$lang['proxy____except']       = 'Редован израз који би требало да се подудара са веб адресом странице за коју треба прескочити посредника (прокси).';
+$lang['safemodehack']          = 'Укључи преправку за безбедни режим';
+$lang['ftp____host']           = 'ФТП сервер за безбедни режим';
+$lang['ftp____port']           = 'ФТП порт за безбедни режим';
+$lang['ftp____user']           = 'ФТП корисничко име за безбедни режим';
+$lang['ftp____pass']           = 'ФТП лозинка за безбедни режим';
+$lang['ftp____root']           = 'ФТП основна фасцикла за безбедни режим';
+$lang['license_o_']            = 'Није одабрано';
+$lang['typography_o_0']        = 'не';
+$lang['typography_o_1']        = 'Само дупли наводници';
+$lang['typography_o_2']        = 'Сви наводници (неће увек радити)';
+$lang['userewrite_o_0']        = 'не';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'DokuWiki интерно';
+$lang['deaccent_o_0']          = 'искључено';
+$lang['deaccent_o_1']          = 'уклони акценте';
+$lang['deaccent_o_2']          = 'романизуј';
+$lang['gdlib_o_0']             = 'ГД Либ није доступан';
+$lang['gdlib_o_1']             = 'Верзија 1.*';
+$lang['gdlib_o_2']             = 'Аутопроналажење';
+$lang['rss_type_o_rss']        = 'РСС 0.91';
+$lang['rss_type_o_rss1']       = 'РСС 1.0';
+$lang['rss_type_o_rss2']       = 'РСС 2.0';
+$lang['rss_type_o_atom']       = 'Атом 0.3';
+$lang['rss_type_o_atom1']      = 'Атом 1.0';
+$lang['rss_content_o_abstract'] = 'Издвојити';
+$lang['rss_content_o_diff']    = 'Једностране разлике';
+$lang['rss_content_o_htmldiff'] = 'ХТМЛ форматирана табела разлика';
+$lang['rss_content_o_html']    = 'ХТМЛ садржај странице';
+$lang['rss_linkto_o_diff']     = 'приказ разлика';
+$lang['rss_linkto_o_page']     = 'исправљена страница';
+$lang['rss_linkto_o_rev']      = 'листа исправки';
+$lang['rss_linkto_o_current']  = 'тренутна страница';
+$lang['compression_o_0']       = 'не';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'не';
+$lang['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']        = 'Увек';
+$lang['readdircache']          = 'Максимално време трајања за readdir cache (у секундама)';
diff --git a/sources/lib/plugins/config/lang/sv/intro.txt b/sources/lib/plugins/config/lang/sv/intro.txt
new file mode 100644
index 0000000..8887d4a
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sv/intro.txt
@@ -0,0 +1,9 @@
+====== Hantera inställningar ======
+
+Använd den här sidan för att göra inställningar i din Dokuwiki. För hjälp angående specifika inställningar, se [[doku>config]]. För mer detaljer om den här insticksmodulen, se [[doku>plugin:config]].
+
+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 kommer ändringarna att gå förlorade.
+
+
diff --git a/sources/lib/plugins/config/lang/sv/lang.php b/sources/lib/plugins/config/lang/sv/lang.php
new file mode 100644
index 0000000..74f5950
--- /dev/null
+++ b/sources/lib/plugins/config/lang/sv/lang.php
@@ -0,0 +1,197 @@
+
+ * @author Nicklas Henriksson 
+ * @author Håkan Sandell 
+ * @author Dennis Karlsson
+ * @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 
+ * @author mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$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.
+                       
        Felaktiga värden är omgivna av en röd ram.';
+$lang['updated']               = 'Inställningarna uppdaterade.';
+$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';
+$lang['_header_template']      = 'Inställningar för mallar';
+$lang['_header_undefined']     = 'Odefinierade inställningar';
+$lang['_basic']                = 'Grundläggande inställningar';
+$lang['_display']              = 'Inställningar för presentation';
+$lang['_authentication']       = 'Inställningar för autentisering';
+$lang['_anti_spam']            = 'Inställningar för anti-spam';
+$lang['_editing']              = 'Inställningar för redigering';
+$lang['_links']                = 'Inställningar för länkar';
+$lang['_media']                = 'Inställningar för medier';
+$lang['_notifications']        = 'Noterings inställningar';
+$lang['_syndication']          = 'Syndikats inställningar';
+$lang['_advanced']             = 'Avancerade inställningar';
+$lang['_network']              = 'Nätverksinställningar';
+$lang['_msg_setting_undefined'] = 'Ingen inställningsmetadata.';
+$lang['_msg_setting_no_class'] = 'Ingen inställningsklass.';
+$lang['_msg_setting_no_default'] = 'Inget standardvärde.';
+$lang['title']                 = 'Wikins namn';
+$lang['start']                 = 'Startsidans namn';
+$lang['lang']                  = 'Språk';
+$lang['template']              = 'Mall';
+$lang['license']               = 'Under vilken licens skall ditt innehåll publiceras?';
+$lang['savedir']               = 'Katalog för att spara data';
+$lang['basedir']               = 'Grundkatalog';
+$lang['baseurl']               = 'Grund-webbadress';
+$lang['cookiedir']             = 'Cookie sökväg. Lämna blankt för att använda basurl.';
+$lang['dmode']                 = 'Filskydd för nya kataloger';
+$lang['fmode']                 = 'Filskydd för nya filer';
+$lang['allowdebug']            = 'Tillåt felsökning stäng av om det inte behövs!';
+$lang['recent']                = 'Antal poster under "Nyligen ändrat"';
+$lang['recent_days']           = 'Hur många ändringar som ska sparas (dagar)';
+$lang['breadcrumbs']           = 'Antal spår';
+$lang['youarehere']            = 'Hierarkiska spår';
+$lang['fullpath']              = 'Visa fullständig sökväg i sidfoten';
+$lang['typography']            = 'Aktivera typografiska ersättningar';
+$lang['dformat']               = 'Datumformat (se PHP:s strftime-funktion)';
+$lang['signature']             = 'Signatur';
+$lang['showuseras']            = 'Vad som skall visas när man visar den användare som senast redigerade en sida';
+$lang['toptoclevel']           = 'Toppnivå för innehållsförteckning';
+$lang['tocminheads']           = 'Minimalt antal rubriker för att avgöra om innehållsförteckning byggs';
+$lang['maxtoclevel']           = 'Maximal nivå för innehållsförteckning';
+$lang['maxseclevel']           = 'Maximal nivå för redigering av rubriker';
+$lang['camelcase']             = 'Använd CamelCase för länkar';
+$lang['deaccent']              = 'Rena sidnamn';
+$lang['useheading']            = 'Använda första rubriken som sidnamn';
+$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['hidepages']             = 'Dölj matchande sidor (reguljära uttryck)';
+$lang['useacl']                = 'Använd behörighetslista (ACL)';
+$lang['autopasswd']            = 'Autogenerera lösenord';
+$lang['authtype']              = 'System för autentisering';
+$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['profileconfirm']        = 'Bekräfta ändringarna i profilen med lösenordet';
+$lang['rememberme']            = 'Tillåt permanenta inloggningscookies (kom ihåg mig)';
+$lang['disableactions']        = 'Stäng av funktioner i DokuWiki';
+$lang['disableactions_check']  = 'Kontroll';
+$lang['disableactions_subscription'] = 'Prenumerera/Säg upp prenumeration';
+$lang['disableactions_wikicode'] = 'Visa källkod/Exportera råtext';
+$lang['disableactions_other']  = 'Andra funktioner (kommaseparerade)';
+$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['usewordblock']          = 'Blockera spam baserat på ordlista';
+$lang['relnofollow']           = 'Använd rel="nofollow" för externa länkar';
+$lang['indexdelay']            = 'Tidsfördröjning före indexering (sek)';
+$lang['mailguard']             = 'Koda e-postadresser';
+$lang['iexssprotect']          = 'Kontrollera om uppladdade filer innehåller eventuellt skadlig JavaScript eller HTML-kod';
+$lang['usedraft']              = 'Spara utkast automatiskt under redigering';
+$lang['htmlok']                = 'Tillåt inbäddad HTML';
+$lang['phpok']                 = 'Tillåt inbäddad PHP';
+$lang['locktime']              = 'Maximal livslängd för fillåsning (sek)';
+$lang['cachetime']             = 'Maximal livslängd för cache (sek)';
+$lang['target____wiki']        = 'Målfönster för interna länkar';
+$lang['target____interwiki']   = 'Målfönster för interwiki-länkar';
+$lang['target____extern']      = 'Målfönster för externa länkar';
+$lang['target____media']       = 'Målfönster för medialänkar';
+$lang['target____windows']     = 'Målfönster för windowslänkar';
+$lang['refcheck']              = 'Kontrollera referenser till mediafiler';
+$lang['gdlib']                 = 'Version av GD-biblioteket';
+$lang['im_convert']            = 'Sökväg till ImageMagicks konverteringsverktyg';
+$lang['jpg_quality']           = 'Kvalitet för JPG-komprimering (0-100)';
+$lang['fetchsize']             = 'Maximal storlek (bytes) som fetch.php får ladda ned  externt';
+$lang['subscribers']           = 'Aktivera stöd för prenumeration på ändringar';
+$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';
+$lang['mailprefix']            = 'Prefix i början på ämnesraden vid automatiska e-postmeddelanden';
+$lang['sitemap']               = 'Skapa Google sitemap (dagar)';
+$lang['rss_type']              = 'Typ av XML-flöde';
+$lang['rss_linkto']            = 'XML-flöde pekar på';
+$lang['rss_content']           = 'Vad ska visas för saker i XML-flödet?';
+$lang['rss_update']            = 'Uppdateringsintervall för XML-flöde (sek)';
+$lang['rss_show_summary']      = 'XML-flöde visar sammanfattning i rubriken';
+$lang['rss_media']             = 'Vilka ändringar ska listas i XML flödet?';
+$lang['updatecheck']           = 'Kontrollera uppdateringar och säkerhetsvarningar? DokuWiki behöver kontakta update.dokuwiki.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';
+$lang['sepchar']               = 'Ersätt blanktecken i webbadresser med';
+$lang['canonical']             = 'Använd fullständiga webbadresser';
+$lang['fnencode']              = 'Metod för kodning av icke-ASCII filnamn.';
+$lang['autoplural']            = 'Leta efter pluralformer av länkar';
+$lang['compression']           = 'Metod för komprimering av gamla versioner';
+$lang['gzip_output']           = 'Använd gzip Content-Encoding för xhtml';
+$lang['compress']              = 'Komprimera CSS och javascript';
+$lang['send404']               = 'Skicka "HTTP 404/Page Not Found" för sidor som inte finns';
+$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['renderer_xhtml']        = 'Generera för användning i huvudwikipresentation (xhtml)';
+$lang['renderer__core']        = '%s (dokuwiki core)';
+$lang['renderer__plugin']      = '%s (plugin)';
+$lang['proxy____host']         = 'Proxyserver';
+$lang['proxy____port']         = 'Proxyport';
+$lang['proxy____user']         = 'Användarnamn för proxy';
+$lang['proxy____pass']         = 'Lösenord för proxy';
+$lang['proxy____ssl']          = 'Använd ssl för anslutning till proxy';
+$lang['proxy____except']       = 'Regular expression för matchning av URL som proxy ska hoppa över.';
+$lang['safemodehack']          = 'Aktivera safemode hack';
+$lang['ftp____host']           = 'FTP-server för safemode hack';
+$lang['ftp____port']           = 'FTP-port för safemode hack';
+$lang['ftp____user']           = 'FTP-användarnamn för safemode hack';
+$lang['ftp____pass']           = 'FTP-lösenord för safemode hack';
+$lang['ftp____root']           = 'FTP-rotkatalog för safemode hack';
+$lang['license_o_']            = 'Ingen vald';
+$lang['typography_o_0']        = 'Inga';
+$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';
+$lang['deaccent_o_0']          = 'av';
+$lang['deaccent_o_1']          = 'ta bort accenter';
+$lang['deaccent_o_2']          = 'romanisera';
+$lang['gdlib_o_0']             = 'GD-bibliotek inte tillgängligt';
+$lang['gdlib_o_1']             = 'Version 1.x';
+$lang['gdlib_o_2']             = 'Automatisk detektering';
+$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 formaterad diff tabell';
+$lang['rss_content_o_html']    = 'Sidans innehåll i full HTML';
+$lang['rss_linkto_o_diff']     = 'lista på skillnader';
+$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']       = '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 (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';
+$lang['showuseras_o_email']    = 'Användarens e-postadress (obfuskerad enligt inställningarna i mailguard)';
+$lang['showuseras_o_email_link'] = 'Användarens e-postadress som mailto: länk';
+$lang['useheading_o_0']        = 'Aldrig';
+$lang['useheading_o_navigation'] = 'Endst navigering';
+$lang['useheading_o_content']  = 'Endast innehåll i wiki';
+$lang['useheading_o_1']        = 'Alltid';
+$lang['readdircache']          = 'Max ålder för readdir cache (sek)';
diff --git a/sources/lib/plugins/config/lang/th/lang.php b/sources/lib/plugins/config/lang/th/lang.php
new file mode 100644
index 0000000..68ee8b8
--- /dev/null
+++ b/sources/lib/plugins/config/lang/th/lang.php
@@ -0,0 +1,104 @@
+
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Arthit Suriyawongkul 
+ * @author Kittithat Arnontavilas 
+ * @author Thanasak Sompaisansin 
+ */
+$lang['menu']                  = 'ตั้งค่าการปรับแต่ง';
+$lang['updated']               = 'การปรับแต่งค่าถูกบันทึกเรียบร้อย';
+$lang['_configuration_manager'] = 'จัดการการปรับตั้งค่า';
+$lang['_header_dokuwiki']      = 'การตั้งค่า DokuWiki';
+$lang['_header_plugin']        = 'การตั้งค่า Plugin';
+$lang['_header_template']      = 'การตั้งค่าเทมเพลต';
+$lang['_basic']                = 'การตั้งค่าพื้นฐาน';
+$lang['_display']              = 'การตั้งค่าการแสดงผล';
+$lang['_authentication']       = 'การตั้งค่าสิทธิ์การเข้าถึง';
+$lang['_anti_spam']            = 'การตั้งค่าป้องกันสแปม';
+$lang['_editing']              = 'การตั้งค่าการแก้ไขปรับปรุง';
+$lang['_links']                = 'การตั้งค่าลิงก์';
+$lang['_media']                = 'การตั้งค่าภาพ-เสียง';
+$lang['_advanced']             = 'การตั้งค่าขั้นสูง';
+$lang['_network']              = 'การตั้งค่าเครือข่าย';
+$lang['lang']                  = 'ภาษา';
+$lang['basedir']               = 'ไดเรคทอรีพื้นฐาน';
+$lang['baseurl']               = 'URL พื้นฐาน';
+$lang['savedir']               = 'ไดเรคทอรีที่บันทึกข้อมูล';
+$lang['start']                 = 'ชื่อหน้าเริ่มต้น';
+$lang['recent']                = 'การเปลี่ยนแปลงล่าสุด';
+$lang['htmlok']                = 'อนุญาตให้ใช้ HTML';
+$lang['phpok']                 = 'อนุญาตให้ใช้ PHP';
+$lang['signature']             = 'ลายเซนต์';
+$lang['usewordblock']          = 'คำที่จะถือว่าเป็นสแปม';
+$lang['relnofollow']           = 'ใช้ rel="nofollow" สำหรับลิงก์ภายนอก';
+$lang['autopasswd']            = 'สร้างรหัสผ่านให้อัตโนมัติ';
+$lang['passcrypt']             = 'กระบวนการเข้ารหัส สำหรับเก็บบันทึกรหัสผ่าน';
+$lang['defaultgroup']          = 'กลุ่มมาตรฐาน';
+$lang['profileconfirm']        = 'ใส่รหัสผ่านเพื่อยืนยันการเปลี่ยนแปลงข้อมูล';
+$lang['disableactions_check']  = 'ตรวจสอบ';
+$lang['auth_security_timeout'] = 'ระยะเวลาที่จะตัดการเชื่อมต่อแบบการใช้งานด้วยสิทธิ์ผู้ใช้ (วินาที)';
+$lang['userewrite']            = 'แสดงที่อยู่เว็บ (URL) แบบอ่านเข้าใจง่าย';
+$lang['cachetime']             = 'ระยะเวลาสำหรับการเก็บแคช (วินาที)';
+$lang['locktime']              = 'ระยะเวลานานสุด ที่จะล็อคไม่ให้แก้ไขไฟล์ (วินาที)';
+$lang['fetchsize']             = 'ขนาดไฟล์ใหญ่สุด (bytes) fetch.php ที่จะดาวน์โหลดจากภายนอก';
+$lang['notify']                = 'ส่งการแจ้งเตือนไปยังที่อยู่อีเมลนี้';
+$lang['gzip_output']           = 'ใช้ gzip Content-Encoding สำหรับ xhtml';
+$lang['gdlib']                 = 'เลขรุ่นของ GD Library';
+$lang['compress']              = 'บีบย่อ CSS และ javascript (เพื่อให้แสดงหน้าเว็บเร็วขึ้น)';
+$lang['hidepages']             = 'ซ่อนหน้าที่เข้ากันได้ (regular expressions)';
+$lang['send404']               = 'ให้แสดง "HTTP 404/Page Not Found" เมื่อไม่พบข้อมูลหน้านั้น';
+$lang['sitemap']               = 'สร้าง กูเกิ้ล ไซต์แมพ (จำนวนวัน)';
+$lang['renderer__core']        = '%s (แกนหลักของ dokuwiki)';
+$lang['renderer__plugin']      = '%s (โปรแกรมเสริม - plugin)';
+$lang['rememberme']            = 'อนุญาตให้จดจำการ login แบบถาวร';
+$lang['rss_type']              = 'ชนิดของ XML feed';
+$lang['rss_linkto']            = 'ลิงก์เชื่อมโยงไปยัง XML feed';
+$lang['rss_content']           = 'ต้องการให้มีอะไรแสดงอยู่ใน XML feed บ้าง?';
+$lang['rss_update']            = 'ความถี่ในการอัพเดท XML feed (เป็นวินาที)';
+$lang['recent_days']           = 'จำนวนวันที่เก็บรายการที่ถูกแก้ไขล่าสุด';
+$lang['rss_show_summary']      = 'ไตเติ้ลของบทสรุปย่อของ XML feed';
+$lang['target____wiki']        = 'เปิดแสดงลิงก์ภายใน ในหน้าเว็บแบบใด';
+$lang['target____interwiki']   = 'เปิดแสดงลิงก์ interwiki ในหน้าเว็บแบบใด';
+$lang['target____extern']      = 'เปิดแสดงลิงก์ภายนอก ในหน้าเว็บแบบใด';
+$lang['target____media']       = 'เปิดแสดงลิงก์ของมีเดีย ในหน้าเว็บแบบใด';
+$lang['target____windows']     = 'เปิดแสดงลิงก์ของวินโดวส์ ในหน้าเว็บแบบใด';
+$lang['proxy____host']         = 'ชื่อ server ของ proxy';
+$lang['proxy____port']         = 'port ของ proxy';
+$lang['proxy____user']         = 'user name ของ proxy';
+$lang['proxy____pass']         = 'รหัสผ่านของ proxy';
+$lang['proxy____ssl']          = 'ใช้ ssl ในการเชื่อมต่อกับ proxy';
+$lang['license_o_']            = 'ไม่ถูกเลือก';
+$lang['typography_o_0']        = 'ไม่มี';
+$lang['typography_o_1']        = 'ไม่รวมเครื่องหมายอัญประกาศเดี่ยว';
+$lang['typography_o_2']        = 'รวมเครื่องหมายอัญประกาศเดี่ยว (อาจใช้ไม่ได้ในบางครั้ง)';
+$lang['userewrite_o_0']        = 'ไม่มี';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['deaccent_o_0']          = 'ปิด';
+$lang['gdlib_o_1']             = 'Version 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_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = 'บทคัดย่อ';
+$lang['rss_content_o_html']    = 'หน้าเนื้อหาแบบแสดง HTML เต็มรูปแบบ';
+$lang['rss_linkto_o_diff']     = 'มุมมองที่แตกต่าง';
+$lang['rss_linkto_o_rev']      = 'รายการของการปรับแก้ไข';
+$lang['rss_linkto_o_current']  = 'หน้าปัจจุบัน';
+$lang['compression_o_0']       = 'ไม่มีการบีบอัด';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'ไม่ใช้';
+$lang['xsendfile_o_2']         = 'หัวเอกสารแบบ Standard X-Sendfile';
+$lang['xsendfile_o_3']         = 'หัวเอกสารแบบ Proprietary Nginx X-Accel-Redirect';
+$lang['showuseras_o_loginname'] = 'ชื่อผู้ใช้';
+$lang['showuseras_o_username'] = 'ชื่อ-นามสกุล';
+$lang['showuseras_o_email_link'] = 'อีเมลของผู้ใช้ ที่จะปรากฏ ณ mailto: link';
+$lang['useheading_o_0']        = 'ไม่เลย';
+$lang['useheading_o_navigation'] = 'เฉพาะตัวนำทาง';
+$lang['useheading_o_content']  = 'เฉพาะเนื้อหาวิกิ';
+$lang['useheading_o_1']        = 'เสมอ';
diff --git a/sources/lib/plugins/config/lang/tr/intro.txt b/sources/lib/plugins/config/lang/tr/intro.txt
new file mode 100644
index 0000000..4a96542
--- /dev/null
+++ b/sources/lib/plugins/config/lang/tr/intro.txt
@@ -0,0 +1,7 @@
+====== Site Ayarları Yönetimi ======
+
+Bu sayfayı DokuWiki kurulumunun ayarlarını değiştirmek için kullanabilirsiniz. Ayarların ayrıntıları için [[doku>config]] sayfasını kullanınız. Bu eklenti ile ilgili daha ayrıntılı bilgi için [[doku>plugin:config]] sayfasına bakınız.
+
+Açık kırmızı renkle gösterilenler bu eklenti ile değiştirilemez. Mavi ile gösterilenler varsayılan değerlerdir. Beyaz altyazı ile gösterilenler is bu kuruluma özel değiştirilmiş ayarlardır. Mavi ve beyaz ayarlar değiştirilebilir.
+
+Değişiklik yapmanız durumunda **Kaydet** tuşuna basmayı unutmayınız. Aksi takdirde sayfayı kapattığınızda tüm ayarlar silinecektir.
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/tr/lang.php b/sources/lib/plugins/config/lang/tr/lang.php
new file mode 100644
index 0000000..cb610f4
--- /dev/null
+++ b/sources/lib/plugins/config/lang/tr/lang.php
@@ -0,0 +1,133 @@
+
+ * @author Cihan Kahveci 
+ * @author Yavuz Selim 
+ * @author Caleb Maclennan 
+ * @author farukerdemoncel@gmail.com
+ */
+$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.
+
        Yanlış değer(ler) kırmızı çerçeve içinde gösterilecektir.';
+$lang['updated']               = 'Ayarlar başarıyla güncellendi.';
+$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ı';
+$lang['_header_template']      = 'Şablon (Template) Ayarları';
+$lang['_header_undefined']     = 'Tanımsız Ayarlar';
+$lang['_basic']                = 'Ana Ayarlar';
+$lang['_display']              = 'Gösterim Ayarları';
+$lang['_authentication']       = 'Onaylama Ayarları';
+$lang['_anti_spam']            = 'Spam Engelleme Ayarları';
+$lang['_editing']              = 'Sayfa Yazımı Ayarları';
+$lang['_links']                = 'Bağlantı Ayarları';
+$lang['_media']                = 'Medya Ayarları';
+$lang['_advanced']             = 'Gelişmiş Ayarlar';
+$lang['_network']              = 'Ağ 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['title']                 = 'Wiki başlığı';
+$lang['start']                 = 'Ana sayfa adı';
+$lang['lang']                  = 'Dil';
+$lang['template']              = 'Şablon (Template)';
+$lang['license']               = 'İçeriğinizi hangi lisans altında yayınlansın?';
+$lang['savedir']               = 'Verileri kaydetmek için kullanılacak klasör';
+$lang['basedir']               = 'Kök dizin';
+$lang['baseurl']               = 'Kök URL';
+$lang['dmode']                 = 'Klasör oluşturma yetkisi';
+$lang['fmode']                 = 'Dosya oluşturma yetkisi';
+$lang['allowdebug']            = 'Yanlış ayıklamasına izin ver lazım değilse etkisiz kıl!';
+$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['fullpath']              = 'sayfaların tüm patikasını (full path) göster';
+$lang['typography']            = 'Tipografik değiştirmeleri yap';
+$lang['dformat']               = 'Tarih biçimi (PHP\'nin strftime fonksiyonuna bakın)';
+$lang['signature']             = 'İmza';
+$lang['showuseras']            = 'Bir sayfayı en son düzenleyen kullanıcıya ne gösterilsin';
+$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['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['usewordblock']          = 'Wordlistesine göre spam engelle';
+$lang['relnofollow']           = 'Dışsal linkler rel="nofollow" kullan';
+$lang['indexdelay']            = 'Indekslemeden evvel zaman gecikmesi (saniye)';
+$lang['mailguard']             = 'Email adreslerini karart';
+$lang['iexssprotect']          = 'Yüklenmiş dosyaları muhtemel kötu niyetli JavaScript veya HTML koduna kontrol et';
+$lang['htmlok']                = 'Gömülü HTML koduna izin ver';
+$lang['phpok']                 = 'Gömülü PHP koduna izin ver';
+$lang['refcheck']              = 'Araç kaynak denetimi';
+$lang['gdlib']                 = 'GD Lib sürümü';
+$lang['jpg_quality']           = 'JPG sıkıştırma kalitesi [0-100]';
+$lang['mailfrom']              = 'Otomatik e-postalar için kullanılacak e-posta adresi';
+$lang['sitemap']               = 'Google site haritası oluştur (gün)';
+$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['canonical']             = 'Tamolarak kurallara uygun URL\'leri kullan';
+$lang['renderer__core']        = '%s (dokuwiki çekirdeği)';
+$lang['renderer__plugin']      = '%s (eklenti)';
+$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 --git a/sources/lib/plugins/config/lang/uk/intro.txt b/sources/lib/plugins/config/lang/uk/intro.txt
new file mode 100644
index 0000000..87abe1b
--- /dev/null
+++ b/sources/lib/plugins/config/lang/uk/intro.txt
@@ -0,0 +1,7 @@
+====== Налаштування Вікі ======
+
+Використовуйте цю сторінку для налаштування ДокуВікі. Для довідок щодо конкретних параметрів дивіться [[doku>config]]. Для більш детальної інформації про цей доданок дивіться [[doku>plugin:config]].
+
+Параметри, що виділені червоним кольором тла захищені та не можуть бути змінені за допомогою цього доданка. Параметри, з синім кольором тла мають значення по замовчуванню, а параметри з білим тлом були встановлені для цієї локальної інсталяції. Сині та білі параметри можуть бути змінені.
+
+Не забувайте натискати кнопку **ЗБЕРЕГТИ** до того, як покинути цю сторінку, інакше всі зміни буде втрачено.
diff --git a/sources/lib/plugins/config/lang/uk/lang.php b/sources/lib/plugins/config/lang/uk/lang.php
new file mode 100644
index 0000000..dea9203
--- /dev/null
+++ b/sources/lib/plugins/config/lang/uk/lang.php
@@ -0,0 +1,188 @@
+
+ * @author serg_stetsuk@ukr.net
+ * @author okunia@gmail.com
+ * @author Oleksandr Kunytsia 
+ * @author Uko uko@uar.net
+ * @author Ulrikhe Lukoie  .com
+ * @author Kate Arzamastseva pshns@ukr.net
+ */
+$lang['menu']                  = 'Налаштування Вікі';
+$lang['error']                 = 'Параметри не збережено через помилкові значення. Будь ласка, перегляньте ваші зміни та спробуйте ще раз
+
        Помилкові значення будуть виділені червоною рамкою.';
+$lang['updated']               = 'Параметри успішно збережено.';
+$lang['nochoice']              = '(інших варіантів не існує)';
+$lang['locked']                = 'Неможливо записати файл налаштувань. Переконайтеся, 
        
+що ім\'я та права доступу для локального файлу вказано правильно.';
+$lang['danger']                = 'УВАГА! Зміна цього параметру може призвести до недоступності вашої Вікі та меню конфігурації.';
+$lang['warning']               = 'УВАГА! Зміна цього параметру може призвести до непередбачуваних наслідків.';
+$lang['security']              = 'УВАГА! Зміна цього параметру може призвести до послаблення безпеки вашої Вікі.';
+$lang['_configuration_manager'] = 'Управління конфігурацією';
+$lang['_header_dokuwiki']      = 'Налаштування ДокуВікі';
+$lang['_header_plugin']        = 'Налаштування Доданків';
+$lang['_header_template']      = 'Налаштування шаблонів';
+$lang['_header_undefined']     = 'Невизначені налаштування';
+$lang['_basic']                = 'Базові налаштування';
+$lang['_display']              = 'Налаштування відображення';
+$lang['_authentication']       = 'Налаштування автентифікації';
+$lang['_anti_spam']            = 'Налаштування Анти-спаму';
+$lang['_editing']              = 'Налаштування редагування';
+$lang['_links']                = 'Налаштування посилань';
+$lang['_media']                = 'Налаштування медіа';
+$lang['_notifications']        = 'Налаштування сповіщень';
+$lang['_advanced']             = 'Розширені налаштування';
+$lang['_network']              = 'Налаштування мережі';
+$lang['_msg_setting_undefined'] = 'Немає метаданих параметру.';
+$lang['_msg_setting_no_class'] = 'Немає класу параметру.';
+$lang['_msg_setting_no_default'] = 'Немає значення за замовчуванням.';
+$lang['title']                 = 'Назва Вікі';
+$lang['start']                 = 'Назва стартової сторінки';
+$lang['lang']                  = 'Мова';
+$lang['template']              = 'Шаблон';
+$lang['license']               = 'Під якою ліцензією слід публікувати вміст?';
+$lang['savedir']               = 'Папка для збереження даних';
+$lang['basedir']               = 'Коренева папка';
+$lang['baseurl']               = 'Кореневий URL';
+$lang['dmode']                 = 'Права для створених папок';
+$lang['fmode']                 = 'Права для створених файлів';
+$lang['allowdebug']            = 'Дозволити відлагодження вимкніть, якщо не потрібно!';
+$lang['recent']                = 'Останні зміни';
+$lang['recent_days']           = 'Скільки останніх змін пам\'ятати (дні)';
+$lang['breadcrumbs']           = 'Ви відвідали (кількість сторінок, що показується)';
+$lang['youarehere']            = 'Показувати "Ви тут"';
+$lang['fullpath']              = 'Повний шлях до документу';
+$lang['typography']            = 'Замінювати типографські символи';
+$lang['dformat']               = 'Формат дати (дивіться функцію strftime PHP)';
+$lang['signature']             = 'Підпис';
+$lang['showuseras']            = 'Що вказувати при відображенні користувача, який востаннє редагував сторінку';
+$lang['toptoclevel']           = 'Мінімальний рівень для змісту';
+$lang['tocminheads']           = 'Мінімальна кількість заголовків, необхідна для створення таблиці змісту';
+$lang['maxtoclevel']           = 'Максимальний рівень для таблиці змісту';
+$lang['maxseclevel']           = 'Максимальний рівень секції для редагування';
+$lang['camelcase']             = 'Використовувати CamelCase';
+$lang['deaccent']              = 'Транслітерація в іменах сторінок';
+$lang['useheading']            = 'Першій заголовок замість імені';
+$lang['sneaky_index']          = 'За замовчуванням, ДокуВікі показує всі простори імен в змісті. Активація цієї опції сховає ті простори, де користувач не має прав на читання. Результатом може бути неможливість доступу до певних відкритих просторів імен. Це зробить неможливим використання змісту при певних конфігураціях.';
+$lang['hidepages']             = 'Ховати сторінки (regular expressions)';
+$lang['useacl']                = 'Використовувати ACL';
+$lang['autopasswd']            = 'Автоматичне створення паролів';
+$lang['authtype']              = 'Аутентифікація';
+$lang['passcrypt']             = 'Метод шифрування паролів';
+$lang['defaultgroup']          = 'Група за замовчуванням';
+$lang['superuser']             = 'Суперкористувач';
+$lang['manager']               = 'Менеджер - група, користувач чи розділений комами список user1,@group1,user2 з правами до певних функцій керування';
+$lang['profileconfirm']        = 'Підтверджувати зміни профілю паролем';
+$lang['rememberme']            = 'Дозволити постійні файли cookies для входу (Запам\'ятати мене)';
+$lang['disableactions']        = 'Заборонити дії ДокуВікі';
+$lang['disableactions_check']  = 'Перевірити';
+$lang['disableactions_subscription'] = 'Підписатись/Відписатись';
+$lang['disableactions_wikicode'] = 'Переглянути код/Експорт';
+$lang['disableactions_other']  = 'Інші дії (розділені комами)';
+$lang['auth_security_timeout'] = 'Таймаут аутентифікації (в секундах)';
+$lang['securecookie']          = 'Чи повинен браузер надсилати файли cookies тільки через HTTPS? Вимкніть цей параметр, лише тоді, якщо вхід до Вікі захищено SSL, але перегляд сторінок відбувається у незахищеному режимі.';
+$lang['usewordblock']          = 'Блокувати спам по списку слів';
+$lang['relnofollow']           = 'Використовувати rel="nofollow"';
+$lang['indexdelay']            = 'Затримка перед індексацією';
+$lang['mailguard']             = 'Кодувати адреси e-mail';
+$lang['iexssprotect']          = 'Перевірте оновлені файли на можливі заборонені Javascript чи HTML коди';
+$lang['usedraft']              = 'Автоматично зберігати чернетку при редагуванні';
+$lang['htmlok']                = 'Дозволити HTML';
+$lang['phpok']                 = 'Дозволити PHP';
+$lang['locktime']              = 'Час блокування (сек)';
+$lang['cachetime']             = 'Максимальний вік кешу (сек)';
+$lang['target____wiki']        = 'Target для внутрішніх посилань';
+$lang['target____interwiki']   = 'Target для інтерВікі-посилань';
+$lang['target____extern']      = 'Target для зовнішніх посилань';
+$lang['target____media']       = 'Target для медіа-посилань';
+$lang['target____windows']     = 'Target для посилань на мережеві папки';
+$lang['refcheck']              = 'Перевіряти посилання на медіа-файлі';
+$lang['gdlib']                 = 'Версія GD Lib';
+$lang['im_convert']            = 'Шлях до ImageMagick';
+$lang['jpg_quality']           = 'Якість компресії JPG (0-100)';
+$lang['fetchsize']             = 'Максимальний розмір (в байтах), що fetch.php може завантажувати з зовні';
+$lang['subscribers']           = 'Підписка на зміни';
+$lang['subscribe_time']        = 'Час, після якого список підписки та дайджести будуть надіслані (сек.); Має бути меншим за час, вказаний у перемінній recent_days';
+$lang['notify']                = 'E-mail для сповіщень';
+$lang['registernotify']        = 'Надсилати інформацію про нових користувачів на цю адресу';
+$lang['mailfrom']              = 'E-mail для автоматичних повідомлень';
+$lang['mailprefix']            = 'Префікс теми повідомлення, що використовується в автоматичній розсилці електронних листів';
+$lang['sitemap']               = 'Створювати мапу сайту для Google (дні)';
+$lang['rss_type']              = 'тип RSS';
+$lang['rss_linkto']            = 'посилання в RSS';
+$lang['rss_content']           = 'Що відображати в пунктах XML-feed';
+$lang['rss_update']            = 'Інтервал оновлення RSS (сек)';
+$lang['rss_show_summary']      = 'Показувати підсумки змін в заголовку XML-feed';
+$lang['updatecheck']           = 'Перевірити наявність оновлень чи попереджень безпеки? Для цього ДокуВікі необхідно зв\'язатися зі update.dokuwiki.org.';
+$lang['userewrite']            = 'Красиві URL';
+$lang['useslash']              = 'Слеш, як розділювач просторів імен в URL';
+$lang['sepchar']               = 'Розділювач слів у імені сторінки';
+$lang['canonical']             = 'Канонічні URL';
+$lang['fnencode']              = 'Метод для кодування імен файлів, що містять не ASCII символи.';
+$lang['autoplural']            = 'Перевіряти множину у посиланнях';
+$lang['compression']           = 'Метод стиснення attic файлів';
+$lang['gzip_output']           = 'Використовувати gzip, як Content-Encoding для xhtml';
+$lang['compress']              = 'Стискати файли CSS та javascript';
+$lang['send404']               = 'Надсилати "HTTP 404/Сторінка не знайдена " для неіснуючих сторінок';
+$lang['broken_iua']            = 'У вашій системі зіпсована функція ignore_user_abort? Це може зіпсувати пошукову систему. IIS+PHP/CGI не працює. Дивіться Bug 852 для отримання додаткової інформації';
+$lang['xsendfile']             = 'Використовувати заголовок X-Sendfile для доставки статичних файлів веб сервером? Ваш веб сервер повинен підтримувати цю функцію.';
+$lang['renderer_xhtml']        = 'Транслятор (Renderer) для основного виводу wiki (xhtml)';
+$lang['renderer__core']        = '%s (ядро докуВікі)';
+$lang['renderer__plugin']      = '%s (доданок)';
+$lang['proxy____host']         = 'Адреса Proxy';
+$lang['proxy____port']         = 'Порт Proxy';
+$lang['proxy____user']         = 'Користувач Proxy';
+$lang['proxy____pass']         = 'Пароль Proxy';
+$lang['proxy____ssl']          = 'Використовувати ssl для з\'єднання з Proxy';
+$lang['proxy____except']       = 'Регулярний вираз для веб-адреси, яку проксі-сервер пропустить.';
+$lang['safemodehack']          = 'Увімкнути хак safemode';
+$lang['ftp____host']           = 'FTP-сервер для хаку safemode';
+$lang['ftp____port']           = 'FTP-порт для хаку safemode';
+$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']        = 'Всі лапки (може не завжди працювати)';
+$lang['userewrite_o_0']        = 'немає';
+$lang['userewrite_o_1']        = '.htaccess';
+$lang['userewrite_o_2']        = 'Засобами ДокуВікі';
+$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_type_o_atom1']      = 'Atom 1.0';
+$lang['rss_content_o_abstract'] = 'Короткий зміст';
+$lang['rss_content_o_diff']    = 'Уніфіковані зміни (diff)';
+$lang['rss_content_o_htmldiff'] = 'Таблиця змін у форматі HTML';
+$lang['rss_content_o_html']    = 'Повний зміст сторінки HTML';
+$lang['rss_linkto_o_diff']     = 'перегляд відмінностей';
+$lang['rss_linkto_o_page']     = 'текст сторінки';
+$lang['rss_linkto_o_rev']      = 'перелік ревізій';
+$lang['rss_linkto_o_current']  = 'поточна сторінка';
+$lang['compression_o_0']       = 'немає';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = 'не використовувати';
+$lang['xsendfile_o_1']         = 'Фірмовий заголовок lighthttpd (до версії 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 користувача (прихована відповідно до налаштувань)';
+$lang['showuseras_o_email_link'] = 'E-mail користувача як посилання mailto:';
+$lang['useheading_o_0']        = 'Ніколи';
+$lang['useheading_o_navigation'] = 'Лише для навігації';
+$lang['useheading_o_content']  = 'Лише у змісті';
+$lang['useheading_o_1']        = 'Завжди';
+$lang['readdircache']          = 'Максимальний вік для файлів кешу (сек.)';
diff --git a/sources/lib/plugins/config/lang/vi/lang.php b/sources/lib/plugins/config/lang/vi/lang.php
new file mode 100644
index 0000000..2933d88
--- /dev/null
+++ b/sources/lib/plugins/config/lang/vi/lang.php
@@ -0,0 +1,5 @@
+config]]，查看每個獨立設定的相關訊息。要知道更多設定管理器的資訊，請瀏覽 [[doku>plugin:config]]。
+
+淡紅色背景的項目是受到保護的，不能通過這管理器更改。藍色背景的項目是系統的預設值，白色背景的項目是您更改過的。藍色和白色的設定項目都可以更改。
+
+離開本頁之前，不要忘記點擊最下面的 **儲存** 按鈕，否則您的修改不會生效。
\ No newline at end of file
diff --git a/sources/lib/plugins/config/lang/zh-tw/lang.php b/sources/lib/plugins/config/lang/zh-tw/lang.php
new file mode 100644
index 0000000..cc2c28c
--- /dev/null
+++ b/sources/lib/plugins/config/lang/zh-tw/lang.php
@@ -0,0 +1,199 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San 
+ * @author Li-Jiun Huang 
+ * @author Cheng-Wei Chien 
+ * @author Danny Lin
+ * @author Shuo-Ting Jian 
+ * @author syaoranhinata@gmail.com
+ * @author Ichirou Uchiki 
+ */
+$lang['menu']                  = '系統設定';
+$lang['error']                 = '因為含有不合規格的設定值，故未能更新設定。請檢查您的更改並重新送出。
+
        不正確的設定值，會以紅色方框包住。';
+$lang['updated']               = '設定已更新。';
+$lang['nochoice']              = '(無其他可用選項)';
+$lang['locked']                = '設定檔無法更新，若非故意，請確認本地檔名及權限正確。';
+$lang['danger']                = '危險：改變此選項，可能使您無法存取本 wiki 及設定選單。';
+$lang['warning']               = '警告：改變此選項可能導致不可預期的行為。';
+$lang['security']              = '安全性警告：改變此選項可能造成安全風險。';
+$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['_notifications']        = '提醒設定';
+$lang['_syndication']          = '聚合設定';
+$lang['_advanced']             = '進階設定';
+$lang['_network']              = '網路設定';
+$lang['_msg_setting_undefined'] = '設定的後設數據不存在。';
+$lang['_msg_setting_no_class'] = '設定的分類不存在。';
+$lang['_msg_setting_no_default'] = '無預設值';
+$lang['title']                 = '本 wiki 的標題';
+$lang['start']                 = '開始頁面的名稱';
+$lang['lang']                  = '語系';
+$lang['template']              = '樣板';
+$lang['tagline']               = '副標題 (若樣板支援此功能)';
+$lang['sidebar']               = '側欄的頁面名稱 (若樣板支援此功能) 。若把它留空，則會停用側欄';
+$lang['license']               = '您希望您的內容採用哪種授權方式？';
+$lang['savedir']               = '儲存資料的目錄';
+$lang['basedir']               = '根目錄';
+$lang['baseurl']               = '根路徑 (URL)';
+$lang['cookiedir']             = 'Cookie 路徑。設定空白則使用 baseurl。';
+$lang['dmode']                 = '目錄建立模式';
+$lang['fmode']                 = '檔案建立模式';
+$lang['allowdebug']            = '允許除錯 (不需要請停用！)';
+$lang['recent']                = '最近更新';
+$lang['recent_days']           = '儲存多少天內的變更';
+$lang['breadcrumbs']           = '導覽路徑數量。輸入0表示停用。';
+$lang['youarehere']            = '顯示階層式導覽路徑 (若要用此功能，建議停用上方的選項)';
+$lang['fullpath']              = '顯示完整的路徑於頁面底部';
+$lang['typography']            = '進行字元替換';
+$lang['dformat']               = '日期格式 (參見 PHP 的 strftime 函數)';
+$lang['signature']             = '簽名';
+$lang['showuseras']            = '將最後編輯頁面的使用者顯示為：';
+$lang['toptoclevel']           = '目錄表的最上層級';
+$lang['tocminheads']           = '決定是否建立目錄表的最少標題數量';
+$lang['maxtoclevel']           = '目錄表顯示的最大層級';
+$lang['maxseclevel']           = '可編輯段落的最大層級';
+$lang['camelcase']             = '對連結使用 CamelCase';
+$lang['deaccent']              = '清理頁面名稱';
+$lang['useheading']            = '使用第一個標題作頁面名稱';
+$lang['sneaky_index']          = '預設情況下，DokuWiki 會在索引頁會顯示所有分類名稱。啟用此選項，會隱藏使用者沒有閱讀權限的頁面，但也可能將他可以閱讀的子頁面一併隱藏。在特定 ACL 設定下，這可能導致索引無法使用。';
+$lang['hidepages']             = '隱藏匹配的界面 (正規式)';
+$lang['useacl']                = '使用存取控制名單';
+$lang['autopasswd']            = '自動產生密碼';
+$lang['authtype']              = '認證後台管理方式';
+$lang['passcrypt']             = '密碼加密方式';
+$lang['defaultgroup']          = '預設群組';
+$lang['superuser']             = '超級使用者 —— 不論 ACL 如何設定，都能訪問所有頁面與功能的群組或使用者';
+$lang['manager']               = '管理員 —— 能訪問相應管理功能的群組或使用者';
+$lang['profileconfirm']        = '修改個人資料時需要確認密碼';
+$lang['rememberme']            = '允許自動登入 (記住我)';
+$lang['disableactions']        = '停用的 DokuWiki 動作';
+$lang['disableactions_check']  = '檢查';
+$lang['disableactions_subscription'] = '訂閱/取消訂閱';
+$lang['disableactions_wikicode'] = '檢視原始碼/匯出原始檔';
+$lang['disableactions_other']  = '其他功能 (逗號分隔)';
+$lang['auth_security_timeout'] = '安全認證的計時 (秒)';
+$lang['securecookie']          = 'HTTPS 頁面設定的 cookie 是否只能由瀏覽器經 HTTPS 傳送？取消此選項後，只有登入本 wiki 才會受 SSL 保護，瀏覽時則不受保護。';
+$lang['remote']                = '啟用遠程 API 系统。這允許其他程式經 XML-RPC 或其他機制來訪問本 wiki 。';
+$lang['remoteuser']            = '將遠程 API 的訪問權限，限制在指定的群組或使用者中。以逗號分隔群組或使用者。留空表示允許任何人訪問。';
+$lang['usewordblock']          = '根據字詞表阻擋垃圾訊息';
+$lang['relnofollow']           = '外部連結使用 rel="nofollow"';
+$lang['indexdelay']            = '建立索引前的延遲時間 (秒)';
+$lang['mailguard']             = '自動弄亂使用者的電郵地址，以作保護';
+$lang['iexssprotect']          = '檢查上傳的檔案中是否隱含惡意的 JavaScript 或 HTML 碼';
+$lang['usedraft']              = '編輯時自動儲存草稿';
+$lang['htmlok']                = '允許嵌入式 HTML';
+$lang['phpok']                 = '允許嵌入式 PHP';
+$lang['locktime']              = '檔案的最大鎖定時間 (秒)';
+$lang['cachetime']             = '緩存的最大存在時間 (秒)';
+$lang['target____wiki']        = '內部連結的目標視窗';
+$lang['target____interwiki']   = 'Wiki間互連的目標視窗';
+$lang['target____extern']      = '外部連結的目標視窗';
+$lang['target____media']       = '媒體連結的目標視窗';
+$lang['target____windows']     = 'Windows 連結的目標視窗';
+$lang['mediarevisions']        = '啟用媒體修訂歷史嗎？';
+$lang['refcheck']              = '媒體連結檢查';
+$lang['gdlib']                 = 'GD Lib 版本';
+$lang['im_convert']            = 'ImageMagick 的轉換工具路徑';
+$lang['jpg_quality']           = 'JPG 壓縮品質(0-100)';
+$lang['fetchsize']             = 'fetch.php 可以從外部下載的最大檔案尺寸 (bytes)';
+$lang['subscribers']           = '啟用頁面訂閱';
+$lang['subscribe_time']        = '訂閱列表和摘要發送的時間間隔 (秒)；這個值應該小於指定的最近更改保留時間 (recent_days)。';
+$lang['notify']                = '寄送變更通知信到這個電郵地址';
+$lang['registernotify']        = '寄送新使用者註冊資訊到這個電郵地址';
+$lang['mailfrom']              = '自動發送郵件時使用的郵件地址';
+$lang['mailprefix']            = '自動發送郵件時使用的標題前綴';
+$lang['htmlmail']              = '發送更加美觀，但體積會更大的 HTML 多部份電郵。若停用它，表示只發送純文字電郵。';
+$lang['sitemap']               = '產生 Google 網站地圖 (以多少天計算) 。輸入0表示停用';
+$lang['rss_type']              = 'XML feed 類型';
+$lang['rss_linkto']            = 'XML feed 連結到';
+$lang['rss_content']           = 'XML feed 項目中顯示什麼呢？';
+$lang['rss_update']            = 'XML feed 更新間隔時間 (秒)';
+$lang['rss_show_summary']      = '於標題中顯示簡要的 XML feed';
+$lang['rss_media']             = '在 XML feed 中應列出哪些變更？';
+$lang['updatecheck']           = '檢查更新與安全性警告？DokuWiki 需要聯繫 update.dokuwiki.org 才能使用此功能。';
+$lang['userewrite']            = '使用好看的 URL';
+$lang['useslash']              = '在 URL 中使用斜線作分類名稱的分隔字元';
+$lang['sepchar']               = '頁面名稱中單字的分隔字元';
+$lang['canonical']             = '使用最典型的 URL';
+$lang['fnencode']              = '非 ASCII 文件名稱的編輯方法。';
+$lang['autoplural']            = '檢查複數形式的連結 (英文)';
+$lang['compression']           = 'attic 文件的壓縮方式';
+$lang['gzip_output']           = '對 xhtml 使用 gzip 內容編碼';
+$lang['compress']              = '壓縮 CSS 與 JavaScript 的輸出';
+$lang['cssdatauri']            = '假如 CSS 中所引用的圖片小於該數字大小(bytes)，圖片將被直接嵌入 CSS 中，以減少 HTTP Request 的發送。 IE 7 及以下的版本並不支援此功能。推薦把此數值設定成 400 至 600 bytes 之間。若輸入 0 則停用此功能。';
+$lang['send404']               = '存取不存在的頁面時送出 "HTTP 404/Page Not Found"';
+$lang['broken_iua']            = 'ignore_user_abort 功能失效了？這有可能導致搜索索引不可用。IIS+PHP/CGI 已損壞。請參閱 Bug 852 獲取更多訊息。';
+$lang['xsendfile']             = '使用 X-Sendfile 頭讓網頁伺服器發送狀態文件？您的網頁伺服器需要支持該功能。';
+$lang['renderer_xhtml']        = '主要 wiki 輸出 (xhtml) 的渲染器';
+$lang['renderer__core']        = '%s (dokuwiki 核心)';
+$lang['renderer__plugin']      = '%s (附加元件)';
+$lang['dnslookups']            = 'Dokuwiki 將查詢使用者編輯頁面的遠程 IP 位址主機名稱。若您的 DNS 伺服器速度較慢、失效，或者您不想要此功能，请停用此選項';
+$lang['proxy____host']         = 'Proxy 伺服器名稱';
+$lang['proxy____port']         = 'Proxy 連接埠';
+$lang['proxy____user']         = 'Proxy 使用者名稱';
+$lang['proxy____pass']         = 'Proxy 密碼';
+$lang['proxy____ssl']          = '使用 SSL 連接到 Proxy';
+$lang['proxy____except']       = '比對 proxy 代理時應跳過的地址的正規式。';
+$lang['safemodehack']          = '啟用 Safemode Hack';
+$lang['ftp____host']           = 'Safemode Hack 的 FTP 伺服器';
+$lang['ftp____port']           = 'Safemode Hack 的 FTP 端口';
+$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']        = '包括單引號 (未必能運作)';
+$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_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']  = '目前頁面';
+$lang['compression_o_0']       = '無';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = '不使用';
+$lang['xsendfile_o_1']         = '專有 lighttpd 標頭 (1.5 發佈前)';
+$lang['xsendfile_o_2']         = '標準 X-Sendfile 標頭';
+$lang['xsendfile_o_3']         = '專有 Nginx X-Accel-Redirect 標頭';
+$lang['showuseras_o_loginname'] = '登入名稱';
+$lang['showuseras_o_username'] = '完整姓名';
+$lang['showuseras_o_email']    = '使用者的電郵地址 (根據郵件監控設定混淆化)';
+$lang['showuseras_o_email_link'] = '使用者的電郵地址標示成 mailto: 連結';
+$lang['useheading_o_0']        = '永不';
+$lang['useheading_o_navigation'] = '僅導覽';
+$lang['useheading_o_content']  = '僅本 wiki 內容';
+$lang['useheading_o_1']        = '總是';
+$lang['readdircache']          = 'readdir 緩存的最大存在時間 (秒)';
diff --git a/sources/lib/plugins/config/lang/zh/intro.txt b/sources/lib/plugins/config/lang/zh/intro.txt
new file mode 100644
index 0000000..a7db4ed
--- /dev/null
+++ b/sources/lib/plugins/config/lang/zh/intro.txt
@@ -0,0 +1,9 @@
+====== 配置管理器 ======
+
+使用本页中的内容来控制您的 Dokuwiki 设置。  每个单独设置的相关信息请参阅 [[doku>config]]。 配置管理器的更多信息请参阅 [[doku>plugin:config]]。
+
+淡红色背景的项目被保护，不能通过这个管理器更改。 蓝色背景的项目是系统的默认值，白色背景的项目是您作出更改的项目。蓝色和白色的设置项目都可以更改。
+
+离开本页之前不要忘记点击最后的 **保存** 按钮，否则您做的修改不会生效。
+
+
diff --git a/sources/lib/plugins/config/lang/zh/lang.php b/sources/lib/plugins/config/lang/zh/lang.php
new file mode 100644
index 0000000..364ad3f
--- /dev/null
+++ b/sources/lib/plugins/config/lang/zh/lang.php
@@ -0,0 +1,205 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton guxd@163.com
+ * @author Simon zhan 
+ * @author mr.jinyi@gmail.com
+ * @author ben 
+ * @author lainme 
+ * @author caii 
+ * @author Hiphen Lee 
+ * @author caii, patent agent in China 
+ * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian 
+ */
+$lang['menu']                  = '配置设置';
+$lang['error']                 = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。
+                       
        非法参数会用红框包围显示。';
+$lang['updated']               = '设置更新成功。';
+$lang['nochoice']              = '（没有其他可用选项）';
+$lang['locked']                = '设置文件无法更新。如果这是您没有意料到的，
        
+                       请确保本地设置文件的名称和权限设置正确。';
+$lang['danger']                = '危险：更改这个选项可能会使用你的Wiki页面和配置菜单无法进入。';
+$lang['warning']               = '注意：更改这个选项可能会造成未知结果。';
+$lang['security']              = '安全提示：更改这个选项可能会有安全隐患。';
+$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['_notifications']        = '通知设置';
+$lang['_syndication']          = '聚合设置';
+$lang['_advanced']             = '高级设置';
+$lang['_network']              = '网络设置';
+$lang['_msg_setting_undefined'] = '设置的元数据不存在。';
+$lang['_msg_setting_no_class'] = '设置的分类不存在。';
+$lang['_msg_setting_no_default'] = '设置的默认值不存在。';
+$lang['title']                 = '维基站点的标题';
+$lang['start']                 = '开始页面的名称';
+$lang['lang']                  = '语言';
+$lang['template']              = '模版';
+$lang['tagline']               = '副标题 （如果模板支持此功能）';
+$lang['sidebar']               = '侧边栏的页面名称 （如果模板支持此功能），留空以禁用侧边栏';
+$lang['license']               = '您愿意让你贡献的内容在何种许可方式下发布？';
+$lang['savedir']               = '保存数据的目录';
+$lang['basedir']               = '根目录';
+$lang['baseurl']               = '根路径（URL）';
+$lang['cookiedir']             = 'Cookie 路径。留空以使用 baseurl。';
+$lang['dmode']                 = '文件夹的创建模式';
+$lang['fmode']                 = '文件的创建模式';
+$lang['allowdebug']            = '允许调试 如果您不需要调试，请勿勾选！';
+$lang['recent']                = '最近更新';
+$lang['recent_days']           = '保留多少天的最近更改（天）';
+$lang['breadcrumbs']           = '显示“足迹”的数量';
+$lang['youarehere']            = '显示“您在这里”';
+$lang['fullpath']              = '在页面底部显示完整路径';
+$lang['typography']            = '进行字符替换';
+$lang['dformat']               = '日期格式（参见 PHP 的 strftime 功能）';
+$lang['signature']             = '签名样式';
+$lang['showuseras']            = '显示用户为';
+$lang['toptoclevel']           = '目录的最顶层';
+$lang['tocminheads']           = '头条数目的最小数目，这将用于决定是否创建目录列表（TOC）';
+$lang['maxtoclevel']           = '目录的最多层次';
+$lang['maxseclevel']           = '段落编辑的最多层次';
+$lang['camelcase']             = '对链接使用 CamelCase';
+$lang['deaccent']              = '清理页面名称';
+$lang['useheading']            = '使用“标题 H1”作为页面名称';
+$lang['sneaky_index']          = '默认情况下，DokuWiki 在索引页会显示所有 namespace。启用该选项能隐藏那些用户没有权限阅读的页面。但也可能将用户能够阅读的子页面一并隐藏。这有可能导致在特定 ACL 设置下，索引功能不可用。';
+$lang['hidepages']             = '隐藏匹配的界面（正则表达式）';
+$lang['useacl']                = '使用访问控制列表（ACL）';
+$lang['autopasswd']            = '自动生成密码';
+$lang['authtype']              = '认证后台管理方式';
+$lang['passcrypt']             = '密码加密方法';
+$lang['defaultgroup']          = '默认组';
+$lang['superuser']             = '超级用户 - 不论 ACL 如何设置，都能访问所有页面与功能的用户组/用户';
+$lang['manager']               = '管理员 - 能访问相应管理功能的用户组/用户';
+$lang['profileconfirm']        = '更新个人信息时需要输入当前密码';
+$lang['rememberme']            = '允许在本地机长期保留登录cookies信息（记住我）';
+$lang['disableactions']        = '停用 DokuWiki 功能';
+$lang['disableactions_check']  = '检查';
+$lang['disableactions_subscription'] = '订阅/退订';
+$lang['disableactions_wikicode'] = '查看源文件/导出源文件';
+$lang['disableactions_other']  = '其他功能（用英文逗号分隔）';
+$lang['auth_security_timeout'] = '认证安全超时（秒）';
+$lang['securecookie']          = '要让浏览器须以HTTPS方式传送在HTTPS会话中设置的cookies吗？请只在登录过程为SSL加密而浏览维基为明文的情况下打开此选项。';
+$lang['remote']                = '激活远程 API 系统。这允许其他程序通过 XML-RPC 或其他机制来访问维基。';
+$lang['remoteuser']            = '将远程 API 的访问权限限制在指定的组或用户中，以逗号分隔。留空则允许任何人访问。';
+$lang['usewordblock']          = '根据 wordlist 阻止垃圾评论';
+$lang['relnofollow']           = '对外部链接使用 rel="nofollow" 标签';
+$lang['indexdelay']            = '构建索引前的时间延滞（秒）';
+$lang['mailguard']             = '弄乱邮件地址（保护用户的邮件地址）';
+$lang['iexssprotect']          = '检验上传的文件以避免可能存在的恶意 JavaScript 或 HTML 代码';
+$lang['usedraft']              = '编辑时自动保存一份草稿';
+$lang['htmlok']                = '允许嵌入式 HTML';
+$lang['phpok']                 = '允许嵌入式 PHP';
+$lang['locktime']              = '独有编辑权/文件锁定的最长时间（秒）';
+$lang['cachetime']             = '缓存的最长时间（秒）';
+$lang['target____wiki']        = '内部链接的目标窗口';
+$lang['target____interwiki']   = 'Interwiki 链接的目标窗口';
+$lang['target____extern']      = '外部链接的目标窗口';
+$lang['target____media']       = '媒体文件链接的目标窗口';
+$lang['target____windows']     = 'Windows 链接的目标窗口';
+$lang['mediarevisions']        = '激活媒体修订历史？';
+$lang['refcheck']              = '检查媒体与页面的挂钩情况';
+$lang['gdlib']                 = 'GD 库版本';
+$lang['im_convert']            = 'ImageMagick 转换工具的路径';
+$lang['jpg_quality']           = 'JPG 压缩质量（0-100）';
+$lang['fetchsize']             = 'fetch.php 能从外部下载的最大文件大小（字节）';
+$lang['subscribers']           = '启用页面订阅支持';
+$lang['subscribe_time']        = '订阅列表和摘要发送的时间间隔（秒）；这应当小于指定的最近更改保留时间（recent_days）。
+';
+$lang['notify']                = '发送更改通知给这个邮件地址';
+$lang['registernotify']        = '发送新注册用户的信息给这个邮件地址';
+$lang['mailfrom']              = '自动发送邮件时使用的邮件地址';
+$lang['mailprefix']            = '自动发送邮件时使用的邮件地址前缀';
+$lang['htmlmail']              = '发送更加美观，但体积更大的 HTML 多部分邮件。禁用则发送纯文本邮件。';
+$lang['sitemap']               = '生成 Google sitemap（天）';
+$lang['rss_type']              = 'XML feed 类型';
+$lang['rss_linkto']            = 'XML feed 链接到';
+$lang['rss_content']           = 'XML feed 项目中显示什么呢？';
+$lang['rss_update']            = 'XML feed 升级间隔（秒）';
+$lang['rss_show_summary']      = 'XML feed 在标题中显示摘要';
+$lang['rss_media']             = '在 XML 源中应该列出何种类型的更改？';
+$lang['updatecheck']           = '自动检查更新并接收安全警告吗？开启该功能后 DokuWiki 将自动访问 splitbrain.org。';
+$lang['userewrite']            = '使用更整洁的 URL';
+$lang['useslash']              = '在 URL 中使用斜杠作为命名空间的分隔符';
+$lang['sepchar']               = '页面名称中的单词分隔符';
+$lang['canonical']             = '使用完全标准的 URL';
+$lang['fnencode']              = '非 ASCII 文件名的编码方法。';
+$lang['autoplural']            = '在链接中检查多种格式';
+$lang['compression']           = 'attic 文件的压缩方式';
+$lang['gzip_output']           = '对 xhtml 使用 gzip 内容编码';
+$lang['compress']              = '使 CSS 和 javascript 的输出更紧密';
+$lang['cssdatauri']            = '字节数。CSS 文件引用的图片若小于该字节，则被直接嵌入样式表中来减少 HTTP 请求头的开销。这个技术在 IE 中不起作用。400 到 600 字节是不错的值。设置为 0 则禁用。';
+$lang['send404']               = '发送 "HTTP 404/页面没有找到" 错误信息给不存在的页面';
+$lang['broken_iua']            = 'ignore_user_abort 功能失效了？这有可能导致搜索索引不可用。IIS+PHP/CGI 已损坏。请参阅 Bug 852 获取更多信息。';
+$lang['xsendfile']             = '使用 X-Sendfile 头让服务器发送状态文件？您的服务器需要支持该功能。';
+$lang['renderer_xhtml']        = '主维基页面 (xhtml) 输出使用的渲染';
+$lang['renderer__core']        = '%s（DokuWiki 内核）';
+$lang['renderer__plugin']      = '%s（插件）';
+$lang['dnslookups']            = 'Dokuwiki 将会查询用户编辑页面的远程 IP 地址的主机名。如果您的 DNS 服务器比较缓慢或者不工作，或者您不想要这个功能，请禁用此选项。';
+$lang['proxy____host']         = '代理服务器的名称';
+$lang['proxy____port']         = '代理服务器的端口';
+$lang['proxy____user']         = '代理服务器的用户名';
+$lang['proxy____pass']         = '代理服务器的密码';
+$lang['proxy____ssl']          = '使用 SSL 连接到代理服务器';
+$lang['proxy____except']       = '用来匹配代理应跳过的地址的正则表达式。';
+$lang['safemodehack']          = '启用 Safemode Hack';
+$lang['ftp____host']           = 'Safemode Hack 的 FTP 服务器';
+$lang['ftp____port']           = 'Safemode Hack 的 FTP 端口';
+$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']        = '所有引号（不一定能正常运行）';
+$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 库不可用';
+$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_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']  = '当前页面';
+$lang['compression_o_0']       = '无';
+$lang['compression_o_gz']      = 'gzip';
+$lang['compression_o_bz2']     = 'bz2';
+$lang['xsendfile_o_0']         = '不要使用';
+$lang['xsendfile_o_1']         = '专有 lighttpd 头（1.5 发布前）';
+$lang['xsendfile_o_2']         = '标准 X-Sendfile 头';
+$lang['xsendfile_o_3']         = '专有 Nginx X-Accel-Redirect 头';
+$lang['showuseras_o_loginname'] = '登录名';
+$lang['showuseras_o_username'] = '用户全名';
+$lang['showuseras_o_email']    = '用户的电子邮箱（按邮箱保护设置加扰）';
+$lang['showuseras_o_email_link'] = '以mailto：形式显示用户的电子邮箱';
+$lang['useheading_o_0']        = '从不';
+$lang['useheading_o_navigation'] = '仅限导航';
+$lang['useheading_o_content']  = '仅限维基内容内';
+$lang['useheading_o_1']        = '一直';
+$lang['readdircache']          = 'readdir缓存的最长寿命（秒）';
diff --git a/sources/lib/plugins/config/plugin.info.txt b/sources/lib/plugins/config/plugin.info.txt
new file mode 100644
index 0000000..510be3b
--- /dev/null
+++ b/sources/lib/plugins/config/plugin.info.txt
@@ -0,0 +1,7 @@
+base   config
+author Christopher Smith
+email  chris@jalakai.co.uk
+date   2013-02-24
+name   Configuration Manager
+desc   Manage Dokuwiki's Configuration Settings
+url    http://dokuwiki.org/plugin:config
diff --git a/sources/lib/plugins/config/settings/config.class.php b/sources/lib/plugins/config/settings/config.class.php
new file mode 100644
index 0000000..05f8470
--- /dev/null
+++ b/sources/lib/plugins/config/settings/config.class.php
@@ -0,0 +1,1129 @@
+
+ * @author  Ben Coburn 
+ */
+
+
+if(!defined('CM_KEYMARKER')) define('CM_KEYMARKER','____');
+
+if (!class_exists('configuration')) {
+
+    class configuration {
+
+        var $_name = 'conf';           // name of the config variable found in the files (overridden by $config['varname'])
+        var $_format = 'php';          // format of the config file, supported formats - php (overridden by $config['format'])
+        var $_heading = '';            // heading string written at top of config file - don't include comment indicators
+        var $_loaded = false;          // set to true after configuration files are loaded
+        var $_metadata = array();      // holds metadata describing the settings
+        var $setting = array();        // array of setting objects
+        var $locked = false;           // configuration is considered locked if it can't be updated
+        var $show_disabled_plugins = false;
+
+        // configuration filenames
+        var $_default_files  = array();
+        var $_local_files = array();      // updated configuration is written to the first file
+        var $_protected_files = array();
+
+        var $_plugin_list = null;
+
+        /**
+         * constructor
+         */
+        function configuration($datafile) {
+            global $conf, $config_cascade;
+
+            if (!@file_exists($datafile)) {
+                msg('No configuration metadata found at - '.htmlspecialchars($datafile),-1);
+                return;
+            }
+            $meta = array();
+            include($datafile);
+
+            if (isset($config['varname'])) $this->_name = $config['varname'];
+            if (isset($config['format'])) $this->_format = $config['format'];
+            if (isset($config['heading'])) $this->_heading = $config['heading'];
+
+            $this->_default_files = $config_cascade['main']['default'];
+            $this->_local_files = $config_cascade['main']['local'];
+            $this->_protected_files = $config_cascade['main']['protected'];
+
+            $this->locked = $this->_is_locked();
+            $this->_metadata = array_merge($meta, $this->get_plugintpl_metadata($conf['template']));
+            $this->retrieve_settings();
+        }
+
+        function retrieve_settings() {
+            global $conf;
+            $no_default_check = array('setting_fieldset', 'setting_undefined', 'setting_no_class');
+
+            if (!$this->_loaded) {
+                $default = array_merge($this->get_plugintpl_default($conf['template']), $this->_read_config_group($this->_default_files));
+                $local = $this->_read_config_group($this->_local_files);
+                $protected = $this->_read_config_group($this->_protected_files);
+
+                $keys = array_merge(array_keys($this->_metadata),array_keys($default), array_keys($local), array_keys($protected));
+                $keys = array_unique($keys);
+
+                $param = null;
+                foreach ($keys as $key) {
+                    if (isset($this->_metadata[$key])) {
+                        $class = $this->_metadata[$key][0];
+
+                        if($class && class_exists('setting_'.$class)){
+                            $class = 'setting_'.$class;
+                        } else {
+                            if($class != '') {
+                                $this->setting[] = new setting_no_class($key,$param);
+                            }
+                            $class = 'setting';
+                        }
+
+                        $param = $this->_metadata[$key];
+                        array_shift($param);
+                    } else {
+                        $class = 'setting_undefined';
+                        $param = null;
+                    }
+
+                    if (!in_array($class, $no_default_check) && !isset($default[$key])) {
+                        $this->setting[] = new setting_no_default($key,$param);
+                    }
+
+                    $this->setting[$key] = new $class($key,$param);
+                    $this->setting[$key]->initialize($default[$key],$local[$key],$protected[$key]);
+                }
+
+                $this->_loaded = true;
+            }
+        }
+
+        function save_settings($id, $header='', $backup=true) {
+            global $conf;
+
+            if ($this->locked) return false;
+
+            // write back to the last file in the local config cascade
+            $file = end($this->_local_files);
+
+            // backup current file (remove any existing backup)
+            if (@file_exists($file) && $backup) {
+                if (@file_exists($file.'.bak')) @unlink($file.'.bak');
+                if (!io_rename($file, $file.'.bak')) return false;
+            }
+
+            if (!$fh = @fopen($file, 'wb')) {
+                io_rename($file.'.bak', $file);     // problem opening, restore the backup
+                return false;
+            }
+
+            if (empty($header)) $header = $this->_heading;
+
+            $out = $this->_out_header($id,$header);
+
+            foreach ($this->setting as $setting) {
+                $out .= $setting->out($this->_name, $this->_format);
+            }
+
+            $out .= $this->_out_footer();
+
+            @fwrite($fh, $out);
+            fclose($fh);
+            if($conf['fperm']) chmod($file, $conf['fperm']);
+            return true;
+        }
+
+        /**
+         * Update last modified time stamp of the config file
+         */
+        function touch_settings(){
+            if ($this->locked) return false;
+            $file = end($this->_local_files);
+            return @touch($file);
+        }
+
+        function _read_config_group($files) {
+            $config = array();
+            foreach ($files as $file) {
+                $config = array_merge($config, $this->_read_config($file));
+            }
+
+            return $config;
+        }
+
+        /**
+         * return an array of config settings
+         */
+        function _read_config($file) {
+
+            if (!$file) return array();
+
+            $config = array();
+
+            if ($this->_format == 'php') {
+
+                if(@file_exists($file)){
+                    $contents = @php_strip_whitespace($file);
+                }else{
+                    $contents = '';
+                }
+                $pattern = '/\$'.$this->_name.'\[[\'"]([^=]+)[\'"]\] ?= ?(.*?);(?=[^;]*(?:\$'.$this->_name.'|$))/s';
+                $matches=array();
+                preg_match_all($pattern,$contents,$matches,PREG_SET_ORDER);
+
+                for ($i=0; $i'\\','\\\''=>'\'','\\"'=>'"'));
+                        }
+
+                        $value = $arr;
+                    }else{
+                        // remove quotes from quoted strings & unescape escaped data
+                        $value = preg_replace('/^(\'|")(.*)(?'\\','\\\''=>'\'','\\"'=>'"'));
+                    }
+
+                    $config[$key] = $value;
+                }
+            }
+
+            return $config;
+        }
+
+        function _out_header($id, $header) {
+            $out = '';
+            if ($this->_format == 'php') {
+                $out .= '<'.'?php'."\n".
+                      "/*\n".
+                      " * ".$header."\n".
+                      " * Auto-generated by ".$id." plugin\n".
+                      " * Run for user: ".$_SERVER['REMOTE_USER']."\n".
+                      " * Date: ".date('r')."\n".
+                      " */\n\n";
+            }
+
+            return $out;
+        }
+
+        function _out_footer() {
+            $out = '';
+            if ($this->_format == 'php') {
+                $out .= "\n// end auto-generated content\n";
+            }
+
+            return $out;
+        }
+
+        // configuration is considered locked if there is no local settings filename
+        // or the directory its in is not writable or the file exists and is not writable
+        function _is_locked() {
+            if (!$this->_local_files) return true;
+
+            $local = $this->_local_files[0];
+
+            if (!is_writable(dirname($local))) return true;
+            if (@file_exists($local) && !is_writable($local)) return true;
+
+            return false;
+        }
+
+        /**
+         * not used ... conf's contents are an array!
+         * reduce any multidimensional settings to one dimension using CM_KEYMARKER
+         */
+        function _flatten($conf,$prefix='') {
+
+            $out = array();
+
+            foreach($conf as $key => $value) {
+                if (!is_array($value)) {
+                    $out[$prefix.$key] = $value;
+                    continue;
+                }
+
+                $tmp = $this->_flatten($value,$prefix.$key.CM_KEYMARKER);
+                $out = array_merge($out,$tmp);
+            }
+
+            return $out;
+        }
+
+        function get_plugin_list() {
+            if (is_null($this->_plugin_list)) {
+                $list = plugin_list('',$this->show_disabled_plugins);
+
+                // remove this plugin from the list
+                $idx = array_search('config',$list);
+                unset($list[$idx]);
+
+                trigger_event('PLUGIN_CONFIG_PLUGINLIST',$list);
+                $this->_plugin_list = $list;
+            }
+
+            return $this->_plugin_list;
+        }
+
+        /**
+         * load metadata for plugin and template settings
+         */
+        function get_plugintpl_metadata($tpl){
+            $file     = '/conf/metadata.php';
+            $class    = '/conf/settings.class.php';
+            $metadata = array();
+
+            foreach ($this->get_plugin_list() as $plugin) {
+                $plugin_dir = plugin_directory($plugin);
+                if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
+                    $meta = array();
+                    @include(DOKU_PLUGIN.$plugin_dir.$file);
+                    @include(DOKU_PLUGIN.$plugin_dir.$class);
+                    if (!empty($meta)) {
+                        $metadata['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.'plugin_settings_name'] = array('fieldset');
+                    }
+                    foreach ($meta as $key => $value){
+                        if ($value[0]=='fieldset') { continue; } //plugins only get one fieldset
+                        $metadata['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
+                    }
+                }
+            }
+
+            // the same for the active template
+            if (@file_exists(tpl_incdir().$file)){
+                $meta = array();
+                @include(tpl_incdir().$file);
+                @include(tpl_incdir().$class);
+                if (!empty($meta)) {
+                    $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.'template_settings_name'] = array('fieldset');
+                }
+                foreach ($meta as $key => $value){
+                    if ($value[0]=='fieldset') { continue; } //template only gets one fieldset
+                    $metadata['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
+                }
+            }
+
+            return $metadata;
+        }
+
+        /**
+         * load default settings for plugins and templates
+         */
+        function get_plugintpl_default($tpl){
+            $file    = '/conf/default.php';
+            $default = array();
+
+            foreach ($this->get_plugin_list() as $plugin) {
+                $plugin_dir = plugin_directory($plugin);
+                if (@file_exists(DOKU_PLUGIN.$plugin_dir.$file)){
+                    $conf = $this->_read_config(DOKU_PLUGIN.$plugin_dir.$file);
+                    foreach ($conf as $key => $value){
+                        $default['plugin'.CM_KEYMARKER.$plugin.CM_KEYMARKER.$key] = $value;
+                    }
+                }
+            }
+
+            // the same for the active template
+            if (@file_exists(tpl_incdir().$file)){
+                $conf = $this->_read_config(tpl_incdir().$file);
+                foreach ($conf as $key => $value){
+                    $default['tpl'.CM_KEYMARKER.$tpl.CM_KEYMARKER.$key] = $value;
+                }
+            }
+
+            return $default;
+        }
+
+    }
+}
+
+if (!class_exists('setting')) {
+    class setting {
+
+        var $_key = '';
+        var $_default = null;
+        var $_local = null;
+        var $_protected = null;
+
+        var $_pattern = '';
+        var $_error = false;            // only used by those classes which error check
+        var $_input = null;             // only used by those classes which error check
+        var $_caution = null;           // used by any setting to provide an alert along with the setting
+                                        // valid alerts, 'warning', 'danger', 'security'
+                                        // images matching the alerts are in the plugin's images directory
+
+        static protected $_validCautions = array('warning','danger','security');
+
+        function setting($key, $params=null) {
+            $this->_key = $key;
+
+            if (is_array($params)) {
+                foreach($params as $property => $value) {
+                    $this->$property = $value;
+                }
+            }
+        }
+
+        /**
+         * receives current values for the setting $key
+         */
+        function initialize($default, $local, $protected) {
+            if (isset($default)) $this->_default = $default;
+            if (isset($local)) $this->_local = $local;
+            if (isset($protected)) $this->_protected = $protected;
+        }
+
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          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->_pattern && !preg_match($this->_pattern,$input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
+
+            $this->_local = $input;
+            return true;
+        }
+
+        /**
+         * @return   array(string $label_html, string $input_html)
+         */
+        function html(&$plugin, $echo=false) {
+            $value = '';
+            $disable = '';
+
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = 'disabled="disabled"';
+            } else {
+                if ($echo && $this->_error) {
+                    $value = $this->_input;
+                } else {
+                    $value = is_null($this->_local) ? $this->_default : $this->_local;
+                }
+            }
+
+            $key = htmlspecialchars($this->_key);
+            $value = formText($value);
+
+            $label = '';
+            $input = '';
+            return array($label,$input);
+        }
+
+        /**
+         * generate string to save setting value to file according to $fmt
+         */
+        function out($var, $fmt='php') {
+
+            if ($this->is_protected()) return '';
+            if (is_null($this->_local) || ($this->_default == $this->_local)) return '';
+
+            $out = '';
+
+            if ($fmt=='php') {
+                $tr = array("\\" => '\\\\', "'" => '\\\'');
+
+                $out =  '$'.$var."['".$this->_out_key()."'] = '".strtr( cleanText($this->_local), $tr)."';\n";
+            }
+
+            return $out;
+        }
+
+        function prompt(&$plugin) {
+            $prompt = $plugin->getLang($this->_key);
+            if (!$prompt) $prompt = htmlspecialchars(str_replace(array('____','_'),' ',$this->_key));
+            return $prompt;
+        }
+
+        function is_protected() { return !is_null($this->_protected); }
+        function is_default() { return !$this->is_protected() && is_null($this->_local); }
+        function error() { return $this->_error; }
+
+        function caution() {
+            if (!empty($this->_caution)) {
+                if (!in_array($this->_caution, setting::$_validCautions)) {
+                    trigger_error('Invalid caution string ('.$this->_caution.') in metadata for setting "'.$this->_key.'"', E_USER_WARNING);
+                    return false;
+                }
+                return $this->_caution;
+            }
+            // compatibility with previous cautionList
+            // TODO: check if any plugins use; remove
+            if (!empty($this->_cautionList[$this->_key])) {
+                $this->_caution = $this->_cautionList[$this->_key];
+                unset($this->_cautionList);
+
+                return $this->caution();
+            }
+            return false;
+        }
+
+        function _out_key($pretty=false,$url=false) {
+            if($pretty){
+                $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);
+            }
+        }
+    }
+}
+
+
+if (!class_exists('setting_array')) {
+    class setting_array extends setting {
+
+        /**
+         * Create an array from a string
+         *
+         * @param $string
+         * @return array
+         */
+        protected function _from_string($string){
+            $array = explode(',', $string);
+            $array = array_map('trim', $array);
+            $array = array_filter($array);
+            $array = array_unique($array);
+            return $array;
+        }
+
+        /**
+         * Create a string from an array
+         *
+         * @param $array
+         * @return string
+         */
+        protected function _from_array($array){
+            return join(', ', (array) $array);
+        }
+
+        /**
+         * update setting with user provided value $input
+         * if value fails error check, save it
+         *
+         * @param string $input
+         * @return bool true if changed, false otherwise (incl. on error)
+         */
+        function update($input) {
+            if (is_null($input)) return false;
+            if ($this->is_protected()) return false;
+
+            $input = $this->_from_string($input);
+
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
+
+            foreach($input as $item){
+                if ($this->_pattern && !preg_match($this->_pattern,$item)) {
+                    $this->_error = true;
+                    $this->_input = $input;
+                    return false;
+                }
+            }
+
+            $this->_local = $input;
+            return true;
+        }
+
+        protected function _escape($string) {
+            $tr = array("\\" => '\\\\', "'" => '\\\'');
+            return "'".strtr( cleanText($string), $tr)."'";
+        }
+
+        /**
+         * generate string to save setting value to file according to $fmt
+         */
+        function out($var, $fmt='php') {
+
+            if ($this->is_protected()) return '';
+            if (is_null($this->_local) || ($this->_default == $this->_local)) return '';
+
+            $out = '';
+
+            if ($fmt=='php') {
+                $vals = array_map(array($this, '_escape'), $this->_local);
+                $out =  '$'.$var."['".$this->_out_key()."'] = array(".join(', ',$vals).");\n";
+            }
+
+            return $out;
+        }
+
+        function html(&$plugin, $echo=false) {
+            $value = '';
+            $disable = '';
+
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = 'disabled="disabled"';
+            } else {
+                if ($echo && $this->_error) {
+                    $value = $this->_input;
+                } else {
+                    $value = is_null($this->_local) ? $this->_default : $this->_local;
+                }
+            }
+
+            $key = htmlspecialchars($this->_key);
+            $value = htmlspecialchars($this->_from_array($value));
+
+            $label = '';
+            $input = '';
+            return array($label,$input);
+        }
+    }
+}
+
+if (!class_exists('setting_string')) {
+    class setting_string extends setting {
+        function html(&$plugin, $echo=false) {
+            $value = '';
+            $disable = '';
+
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = 'disabled="disabled"';
+            } else {
+                if ($echo && $this->_error) {
+                    $value = $this->_input;
+                } else {
+                    $value = is_null($this->_local) ? $this->_default : $this->_local;
+                }
+            }
+
+            $key = htmlspecialchars($this->_key);
+            $value = htmlspecialchars($value);
+
+            $label = '';
+            $input = '';
+            return array($label,$input);
+        }
+    }
+}
+
+if (!class_exists('setting_password')) {
+    class setting_password extends setting_string {
+
+        var $_code = 'plain';  // mechanism to be used to obscure passwords
+
+        function update($input) {
+            if ($this->is_protected()) return false;
+            if (!$input) return false;
+
+            if ($this->_pattern && !preg_match($this->_pattern,$input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
+
+            $this->_local = conf_encodeString($input,$this->_code);
+            return true;
+        }
+
+        function html(&$plugin, $echo=false) {
+
+            $value = '';
+            $disable = $this->is_protected() ? 'disabled="disabled"' : '';
+
+            $key = htmlspecialchars($this->_key);
+
+            $label = '';
+            $input = '';
+            return array($label,$input);
+        }
+    }
+}
+
+if (!class_exists('setting_email')) {
+
+    class setting_email extends setting_string {
+        var $_multiple = false;
+        var $_placeholders = false;
+
+        /**
+         * update setting with user provided value $input
+         * if value fails error check, save it
+         *
+         * @return boolean 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($input === ''){
+                $this->_local = $input;
+                return true;
+            }
+            $mail = $input;
+
+            if($this->_placeholders){
+                // replace variables with pseudo values
+                $mail = str_replace('@USER@','joe',$mail);
+                $mail = str_replace('@NAME@','Joe Schmoe',$mail);
+                $mail = str_replace('@MAIL@','joe@example.com',$mail);
+            }
+
+            // multiple mail addresses?
+            if ($this->_multiple) {
+                $mails = array_filter(array_map('trim', explode(',', $mail)));
+            } else {
+                $mails = array($mail);
+            }
+
+            // check them all
+            foreach ($mails as $mail) {
+                // only check the address part
+                if(preg_match('#(.*?)<(.*?)>#', $mail, $matches)){
+                    $addr = $matches[2];
+                }else{
+                    $addr = $mail;
+                }
+
+                if (!mail_isvalid($addr)) {
+                    $this->_error = true;
+                    $this->_input = $input;
+                    return false;
+                }
+            }
+
+            $this->_local = $input;
+            return true;
+        }
+    }
+}
+
+/**
+ * @deprecated 2013-02-16
+ */
+if (!class_exists('setting_richemail')) {
+    class setting_richemail extends setting_email {
+        function update($input) {
+            $this->_placeholders = true;
+            return parent::update($input);
+        }
+    }
+}
+
+
+if (!class_exists('setting_numeric')) {
+    class setting_numeric extends setting_string {
+        // This allows for many PHP syntax errors...
+        // var $_pattern = '/^[-+\/*0-9 ]*$/';
+        // much more restrictive, but should eliminate syntax errors.
+        var $_pattern = '/^[-+]? *[0-9]+ *(?:[-+*] *[0-9]+ *)*$/';
+        var $_min = null;
+        var $_max = null;
+
+        function update($input) {
+            $local = $this->_local;
+            $valid = parent::update($input);
+            if ($valid && !(is_null($this->_min) && is_null($this->_max))) {
+                $numeric_local = (int) eval('return '.$this->_local.';');
+                if ((!is_null($this->_min) && $numeric_local < $this->_min) ||
+                    (!is_null($this->_max) && $numeric_local > $this->_max)) {
+                    $this->_error = true;
+                    $this->_input = $input;
+                    $this->_local = $local;
+                    $valid = false;
+                }
+            }
+            return $valid;
+        }
+
+        function out($var, $fmt='php') {
+
+            if ($this->is_protected()) return '';
+            if (is_null($this->_local) || ($this->_default == $this->_local)) return '';
+
+            $out = '';
+
+            if ($fmt=='php') {
+                $local = $this->_local === '' ? "''" : $this->_local;
+                $out .=  '$'.$var."['".$this->_out_key()."'] = ".$local.";\n";
+            }
+
+            return $out;
+        }
+    }
+}
+
+if (!class_exists('setting_numericopt')) {
+    class setting_numericopt extends setting_numeric {
+        // just allow an empty config
+        var $_pattern = '/^(|[-]?[0-9]+(?:[-+*][0-9]+)*)$/';
+    }
+}
+
+if (!class_exists('setting_onoff')) {
+    class setting_onoff extends setting_numeric {
+
+        function html(&$plugin, $echo = false) {
+            $value = '';
+            $disable = '';
+
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = ' disabled="disabled"';
+            } else {
+                $value = is_null($this->_local) ? $this->_default : $this->_local;
+            }
+
+            $key = htmlspecialchars($this->_key);
+            $checked = ($value) ? ' checked="checked"' : '';
+
+            $label = '';
+            $input = '
        ';
+            return array($label,$input);
+        }
+
+        function update($input) {
+            if ($this->is_protected()) return false;
+
+            $input = ($input) ? 1 : 0;
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
+
+            $this->_local = $input;
+            return true;
+        }
+    }
+}
+
+if (!class_exists('setting_multichoice')) {
+    class setting_multichoice extends setting_string {
+        var $_choices = array();
+
+        function html(&$plugin, $echo = false) {
+            $value = '';
+            $disable = '';
+            $nochoice = '';
+
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = ' disabled="disabled"';
+            } else {
+                $value = is_null($this->_local) ? $this->_default : $this->_local;
+            }
+
+            // ensure current value is included
+            if (!in_array($value, $this->_choices)) {
+                $this->_choices[] = $value;
+            }
+            // disable if no other choices
+            if (!$this->is_protected() && count($this->_choices) <= 1) {
+                $disable = ' disabled="disabled"';
+                $nochoice = $plugin->getLang('nochoice');
+            }
+
+            $key = htmlspecialchars($this->_key);
+
+            $label = '';
+
+            $input = "
        \n";
+            $input .= ' $nochoice \n";
+            $input .= "
        \n";
+
+            return array($label,$input);
+        }
+
+        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 (!in_array($input, $this->_choices)) return false;
+
+            $this->_local = $input;
+            return true;
+        }
+    }
+}
+
+
+if (!class_exists('setting_dirchoice')) {
+    class setting_dirchoice extends setting_multichoice {
+
+        var $_dir = '';
+
+        function initialize($default,$local,$protected) {
+
+            // populate $this->_choices with a list of directories
+            $list = array();
+
+            if ($dh = @opendir($this->_dir)) {
+                while (false !== ($entry = readdir($dh))) {
+                    if ($entry == '.' || $entry == '..') continue;
+                    if ($this->_pattern && !preg_match($this->_pattern,$entry)) continue;
+
+                    $file = (is_link($this->_dir.$entry)) ? readlink($this->_dir.$entry) : $this->_dir.$entry;
+                    if (is_dir($file)) $list[] = $entry;
+                }
+                closedir($dh);
+            }
+            sort($list);
+            $this->_choices = $list;
+
+            parent::initialize($default,$local,$protected);
+        }
+    }
+}
+
+
+if (!class_exists('setting_hidden')) {
+    class setting_hidden extends setting {
+        // Used to explicitly ignore a setting in the configuration manager.
+    }
+}
+
+if (!class_exists('setting_fieldset')) {
+    class setting_fieldset extends setting {
+        // A do-nothing class used to detect the 'fieldset' type.
+        // Used to start a new settings "display-group".
+    }
+}
+
+if (!class_exists('setting_undefined')) {
+    class setting_undefined extends setting_hidden {
+        // A do-nothing class used to detect settings with no metadata entry.
+        // Used internaly to hide undefined settings, and generate the undefined settings list.
+    }
+}
+
+if (!class_exists('setting_no_class')) {
+    class setting_no_class extends setting_undefined {
+        // A do-nothing class used to detect settings with a missing setting class.
+        // Used internaly to hide undefined settings, and generate the undefined settings list.
+    }
+}
+
+if (!class_exists('setting_no_default')) {
+    class setting_no_default extends setting_undefined {
+        // A do-nothing class used to detect settings with no default value.
+        // Used internaly to hide undefined settings, and generate the undefined settings list.
+    }
+}
+
+if (!class_exists('setting_multicheckbox')) {
+    class setting_multicheckbox extends setting_string {
+
+        var $_choices = array();
+        var $_combine = array();
+
+        function update($input) {
+            if ($this->is_protected()) return false;
+
+            // split any combined values + convert from array to comma separated string
+            $input = ($input) ? $input : array();
+            $input = $this->_array2str($input);
+
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
+
+            if ($this->_pattern && !preg_match($this->_pattern,$input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
+
+            $this->_local = $input;
+            return true;
+        }
+
+        function html(&$plugin, $echo=false) {
+
+            $value = '';
+            $disable = '';
+
+            if ($this->is_protected()) {
+                $value = $this->_protected;
+                $disable = 'disabled="disabled"';
+            } else {
+                if ($echo && $this->_error) {
+                    $value = $this->_input;
+                } else {
+                    $value = is_null($this->_local) ? $this->_default : $this->_local;
+                }
+            }
+
+            $key = htmlspecialchars($this->_key);
+
+            // convert from comma separated list into array + combine complimentary actions
+            $value = $this->_str2array($value);
+            $default = $this->_str2array($this->_default);
+
+            $input = '';
+            foreach ($this->_choices as $choice) {
+                $idx = array_search($choice, $value);
+                $idx_default = array_search($choice,$default);
+
+                $checked = ($idx !== false) ? 'checked="checked"' : '';
+
+                // ideally this would be handled using a second class of "default", however IE6 does not
+                // correctly support CSS selectors referencing multiple class names on the same element
+                // (e.g. .default.selection).
+                $class = (($idx !== false) == (false !== $idx_default)) ? " selectiondefault" : "";
+
+                $prompt = ($plugin->getLang($this->_key.'_'.$choice) ?
+                                $plugin->getLang($this->_key.'_'.$choice) : htmlspecialchars($choice));
+
+                $input .= '
        '."\n";
+                $input .= '\n";
+                $input .= '\n";
+                $input .= "
        \n";
+
+                // remove this action from the disabledactions array
+                if ($idx !== false) unset($value[$idx]);
+                if ($idx_default !== false) unset($default[$idx_default]);
+            }
+
+            // handle any remaining values
+            $other = join(',',$value);
+
+            $class = (count($default == count($value)) && (count($value) == count(array_intersect($value,$default)))) ?
+                            " selectiondefault" : "";
+
+            $input .= '
        '."\n";
+            $input .= '\n";
+            $input .= '\n";
+            $input .= "
        \n";
+
+            $label = '';
+            return array($label,$input);
+        }
+
+        /**
+         * convert comma separated list to an array and combine any complimentary values
+         */
+        function _str2array($str) {
+            $array = explode(',',$str);
+
+            if (!empty($this->_combine)) {
+                foreach ($this->_combine as $key => $combinators) {
+                    $idx = array();
+                    foreach ($combinators as $val) {
+                        if  (($idx[] = array_search($val, $array)) === false) break;
+                    }
+
+                    if (count($idx) && $idx[count($idx)-1] !== false) {
+                        foreach ($idx as $i) unset($array[$i]);
+                        $array[] = $key;
+                    }
+                }
+            }
+
+            return $array;
+        }
+
+        /**
+         * convert array of values + other back to a comma separated list, incl. splitting any combined values
+         */
+        function _array2str($input) {
+
+            // handle other
+            $other = trim($input['other']);
+            $other = !empty($other) ? explode(',',str_replace(' ','',$input['other'])) : array();
+            unset($input['other']);
+
+            $array = array_unique(array_merge($input, $other));
+
+            // deconstruct any combinations
+            if (!empty($this->_combine)) {
+                foreach ($this->_combine as $key => $combinators) {
+
+                    $idx = array_search($key,$array);
+                    if ($idx !== false) {
+                        unset($array[$idx]);
+                        $array = array_merge($array, $combinators);
+                    }
+                }
+            }
+
+            return join(',',array_unique($array));
+        }
+    }
+}
+
+if (!class_exists('setting_regex')){
+    class setting_regex extends setting_string {
+
+        var $_delimiter = '/';    // regex delimiter to be used in testing input
+        var $_pregflags = 'ui';   // regex pattern modifiers to be used in testing input
+
+        /**
+         * update changed setting with user provided value $input
+         * - if changed value fails error check, save it to $this->_input (to allow echoing later)
+         * - if changed value passes error check, set $this->_local to the new value
+         *
+         * @param  mixed   $input   the new value
+         * @return boolean          true if changed, false otherwise (incl. on error)
+         */
+        function update($input) {
+
+            // let parent do basic checks, value, not changed, etc.
+            $local = $this->_local;
+            if (!parent::update($input)) return false;
+            $this->_local = $local;
+
+            // see if the regex compiles and runs (we don't check for effectiveness)
+            $regex = $this->_delimiter . $input . $this->_delimiter . $this->_pregflags;
+            $lastError = error_get_last();
+            $ok = @preg_match($regex,'testdata');
+            if (preg_last_error() != PREG_NO_ERROR || error_get_last() != $lastError) {
+                $this->_input = $input;
+                $this->_error = true;
+                return false;
+            }
+
+            $this->_local = $input;
+            return true;
+        }
+    }
+}
diff --git a/sources/lib/plugins/config/settings/config.metadata.php b/sources/lib/plugins/config/settings/config.metadata.php
new file mode 100644
index 0000000..f9dabfe
--- /dev/null
+++ b/sources/lib/plugins/config/settings/config.metadata.php
@@ -0,0 +1,227 @@
+] = array(, => );
+ *
+ *     is the handler class name without the "setting_" prefix
+ *
+ * Defined classes:
+ *   Generic (source: settings/config.class.php)
+ *   -------------------------------------------
+ *   ''             - default class ('setting'), textarea, minimal input validation, setting output in quotes
+ *   'string'       - single line text input, minimal input validation, setting output in quotes
+ *   'numeric'      - text input, accepts numbers and arithmetic operators, setting output without quotes
+ *                    if given the '_min' and '_max' parameters are used for validation
+ *   'numericopt'   - like above, but accepts empty values
+ *   'onoff'        - checkbox input, setting output  0|1
+ *   'multichoice'  - select input (single choice), setting output with quotes, required _choices parameter
+ *   'email'        - text input, input must conform to email address format, supports optional '_multiple'
+ *                    parameter for multiple comma separated email addresses
+ *   'password'     - password input, minimal input validation, setting output text in quotes, maybe encoded
+ *                    according to the _code parameter
+ *   'dirchoice'    - as multichoice, selection choices based on folders found at location specified in _dir
+ *                    parameter (required). A pattern can be used to restrict the folders to only those which
+ *                    match the pattern.
+ *   'multicheckbox'- a checkbox for each choice plus an "other" string input, config file setting is a comma
+ *                    separated list of checked choices
+ *   'fieldset'     - used to group configuration settings, but is not itself a setting. To make this clear in
+ *                    the language files the keys for this type should start with '_'.
+ *   'array'        - a simple (one dimensional) array of string values, shown as comma separated list in the
+ *                    config manager but saved as PHP array(). Values may not contain commas themselves.
+ *                    _pattern matching on the array values supported.
+ *   'regex'        - regular expression string, normally without delimiters; as for string, in addition tested
+ *                    to see if will compile & run as a regex.  in addition to _pattern, also accepts _delimiter
+ *                    (default '/') and _pregflags (default 'ui')
+ *
+ *  Single Setting (source: settings/extra.class.php)
+ *  -------------------------------------------------
+ *   'savedir'     - as 'setting', input tested against initpath() (inc/init.php)
+ *   'sepchar'     - as multichoice, selection constructed from string of valid values
+ *   'authtype'    - as 'setting', input validated against a valid php file at expected location for auth files
+ *   'im_convert'  - as 'setting', input must exist and be an im_convert module
+ *   'disableactions' - as 'setting'
+ *   'compression' - no additional parameters. checks php installation supports possible compression alternatives
+ *   'licence'     - as multichoice, selection constructed from licence strings in language files
+ *   'renderer'    - as multichoice, selection constructed from enabled renderer plugins which canRender()
+ *   'authtype'    - as multichoice, selection constructed from the enabled auth plugins
+ *
+ *  Any setting commented or missing will use 'setting' class - text input, minimal validation, quoted output
+ *
+ * Defined parameters:
+ *   '_caution'    - no value (default) or 'warning', 'danger', 'security'. display an alert along with the setting
+ *   '_pattern'    - string, a preg pattern. input is tested against this pattern before being accepted
+ *                   optional all classes, except onoff & multichoice which ignore it
+ *   '_choices'    - array of choices. used to populate a selection box. choice will be replaced by a localised
+ *                   language string, indexed by  _o_, if one exists
+ *                   required by 'multichoice' & 'multicheckbox' classes, ignored by others
+ *   '_dir'        - location of directory to be used to populate choice list
+ *                   required by 'dirchoice' class, ignored by other classes
+ *   '_combine'    - complimentary output setting values which can be combined into a single display checkbox
+ *                   optional for 'multicheckbox', ignored by other classes
+ *   '_code'       - encoding method to use, accepted values: 'base64','uuencode','plain'.  defaults to plain.
+ *   '_min'        - minimum numeric value, optional for 'numeric' and 'numericopt', ignored by others
+ *   '_max'        - maximum numeric value, optional for 'numeric' and 'numericopt', ignored by others
+ *   '_delimiter'  - string, default '/', a single character used as a delimiter for testing regex input values
+ *   '_pregflags'  - string, default 'ui', valid preg pattern modifiers used when testing regex input values, for more
+ *                   information see http://uk1.php.net/manual/en/reference.pcre.pattern.modifiers.php
+ *   '_multiple'   - bool, allow multiple comma separated email values; optional for 'email', ignored by others
+ *
+ * @author    Chris Smith 
+ */
+// ---------------[ settings for settings ]------------------------------
+$config['format']  = 'php';      // format of setting files, supported formats: php
+$config['varname'] = 'conf';     // name of the config variable, sans $
+
+// this string is written at the top of the rewritten settings file,
+// !! do not include any comment indicators !!
+// this value can be overriden when calling save_settings() method
+$config['heading'] = 'Dokuwiki\'s Main Configuration File - Local Settings';
+
+// test value (FIXME, remove before publishing)
+//$meta['test']     = array('multichoice','_choices' => array(''));
+
+// --------------[ setting metadata ]------------------------------------
+// - for description of format and fields see top of file
+// - order the settings in the order you wish them to appear
+// - any settings not mentioned will come after the last setting listed and
+//   will use the default class with no parameters
+
+$meta['_basic']   = array('fieldset');
+$meta['title']    = array('string');
+$meta['start']    = array('string','_caution' => 'warning','_pattern' => '!^[^:;/]+$!'); // don't accept namespaces
+$meta['lang']     = array('dirchoice','_dir' => DOKU_INC.'inc/lang/');
+$meta['template'] = array('dirchoice','_dir' => DOKU_INC.'lib/tpl/','_pattern' => '/^[\w-]+$/');
+$meta['tagline']  = array('string');
+$meta['sidebar']  = array('string');
+$meta['license']  = array('license');
+$meta['savedir']  = array('savedir','_caution' => 'danger');
+$meta['basedir']  = array('string','_caution' => 'danger');
+$meta['baseurl']  = array('string','_caution' => 'danger');
+$meta['cookiedir'] = array('string','_caution' => 'danger');
+$meta['dmode']    = array('numeric','_pattern' => '/0[0-7]{3,4}/'); // only accept octal representation
+$meta['fmode']    = array('numeric','_pattern' => '/0[0-7]{3,4}/'); // only accept octal representation
+$meta['allowdebug']  = array('onoff','_caution' => 'security');
+
+$meta['_display']    = array('fieldset');
+$meta['recent']      = array('numeric');
+$meta['recent_days'] = array('numeric');
+$meta['breadcrumbs'] = array('numeric','_min' => 0);
+$meta['youarehere']  = array('onoff');
+$meta['fullpath']    = array('onoff','_caution' => 'security');
+$meta['typography']  = array('multichoice','_choices' => array(0,1,2));
+$meta['dformat']     = array('string');
+$meta['signature']   = array('string');
+$meta['showuseras']  = array('multichoice','_choices' => array('loginname','username','email','email_link'));
+$meta['toptoclevel'] = array('multichoice','_choices' => array(1,2,3,4,5));   // 5 toc levels
+$meta['tocminheads'] = array('multichoice','_choices' => array(0,1,2,3,4,5,10,15,20));
+$meta['maxtoclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5));
+$meta['maxseclevel'] = array('multichoice','_choices' => array(0,1,2,3,4,5)); // 0 for no sec edit buttons
+$meta['camelcase']   = array('onoff','_caution' => 'warning');
+$meta['deaccent']    = array('multichoice','_choices' => array(0,1,2),'_caution' => 'warning');
+$meta['useheading']  = array('multichoice','_choices' => array(0,'navigation','content',1));
+$meta['sneaky_index'] = array('onoff');
+$meta['hidepages']   = array('regex');
+
+$meta['_authentication'] = array('fieldset');
+$meta['useacl']      = array('onoff','_caution' => 'danger');
+$meta['autopasswd']  = array('onoff');
+$meta['authtype']    = array('authtype','_caution' => 'danger');
+$meta['passcrypt']   = array('multichoice','_choices' => array('smd5','md5','apr1','sha1','ssha','lsmd5','crypt','mysql','my411','kmd5','pmd5','hmd5','mediawiki','bcrypt','djangomd5','djangosha1','sha512'));
+$meta['defaultgroup']= array('string');
+$meta['superuser']   = array('string','_caution' => 'danger');
+$meta['manager']     = array('string');
+$meta['profileconfirm'] = array('onoff');
+$meta['rememberme'] = array('onoff');
+$meta['disableactions'] = array('disableactions',
+                                '_choices' => array('backlink','index','recent','revisions','search','subscription','register','resendpwd','profile','profile_delete','edit','wikicode','check'),
+                                '_combine' => array('subscription' => array('subscribe','unsubscribe'), 'wikicode' => array('source','export_raw')));
+$meta['auth_security_timeout'] = array('numeric');
+$meta['securecookie'] = array('onoff');
+$meta['remote']       = array('onoff','_caution' => 'security');
+$meta['remoteuser']   = array('string');
+
+$meta['_anti_spam']  = array('fieldset');
+$meta['usewordblock']= array('onoff');
+$meta['relnofollow'] = array('onoff');
+$meta['indexdelay']  = array('numeric');
+$meta['mailguard']   = array('multichoice','_choices' => array('visible','hex','none'));
+$meta['iexssprotect']= array('onoff','_caution' => 'security');
+
+$meta['_editing']    = array('fieldset');
+$meta['usedraft']    = array('onoff');
+$meta['htmlok']      = array('onoff','_caution' => 'security');
+$meta['phpok']       = array('onoff','_caution' => 'security');
+$meta['locktime']    = array('numeric');
+$meta['cachetime']   = array('numeric');
+
+$meta['_links']    = array('fieldset');
+$meta['target____wiki']      = array('string');
+$meta['target____interwiki'] = array('string');
+$meta['target____extern']    = array('string');
+$meta['target____media']     = array('string');
+$meta['target____windows']   = array('string');
+
+$meta['_media']      = array('fieldset');
+$meta['mediarevisions']  = array('onoff');
+$meta['gdlib']       = array('multichoice','_choices' => array(0,1,2));
+$meta['im_convert']  = array('im_convert');
+$meta['jpg_quality'] = array('numeric','_pattern' => '/^100$|^[1-9]?[0-9]$/');  //(0-100)
+$meta['fetchsize']   = array('numeric');
+$meta['refcheck']    = array('onoff');
+
+$meta['_notifications'] = array('fieldset');
+$meta['subscribers']    = array('onoff');
+$meta['subscribe_time'] = array('numeric');
+$meta['notify']         = array('email', '_multiple' => true);
+$meta['registernotify'] = array('email', '_multiple' => true);
+$meta['mailfrom']       = array('email', '_placeholders' => true);
+$meta['mailprefix']     = array('string');
+$meta['htmlmail']       = array('onoff');
+
+$meta['_syndication'] = array('fieldset');
+$meta['sitemap']     = array('numeric');
+$meta['rss_type']    = array('multichoice','_choices' => array('rss','rss1','rss2','atom','atom1'));
+$meta['rss_linkto']  = array('multichoice','_choices' => array('diff','page','rev','current'));
+$meta['rss_content'] = array('multichoice','_choices' => array('abstract','diff','htmldiff','html'));
+$meta['rss_media']   = array('multichoice','_choices' => array('both','pages','media'));
+$meta['rss_update']  = array('numeric');
+$meta['rss_show_summary'] = array('onoff');
+
+$meta['_advanced']   = array('fieldset');
+$meta['updatecheck'] = array('onoff');
+$meta['userewrite']  = array('multichoice','_choices' => array(0,1,2),'_caution' => 'danger');
+$meta['useslash']    = array('onoff');
+$meta['sepchar']     = array('sepchar','_caution' => 'warning');
+$meta['canonical']   = array('onoff');
+$meta['fnencode']    = array('multichoice','_choices' => array('url','safe','utf-8'),'_caution' => 'warning');
+$meta['autoplural']  = array('onoff');
+$meta['compress']    = array('onoff');
+$meta['cssdatauri']  = array('numeric','_pattern' => '/^\d+$/');
+$meta['gzip_output'] = array('onoff');
+$meta['send404']     = array('onoff');
+$meta['compression'] = array('compression','_caution' => 'warning');
+$meta['broken_iua']  = array('onoff');
+$meta['xsendfile']   = array('multichoice','_choices' => array(0,1,2,3),'_caution' => 'warning');
+$meta['renderer_xhtml'] = array('renderer','_format' => 'xhtml','_choices' => array('xhtml'),'_caution' => 'warning');
+$meta['readdircache'] = array('numeric');
+
+$meta['_network']    = array('fieldset');
+$meta['dnslookups']  = array('onoff');
+$meta['proxy____host'] = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i');
+$meta['proxy____port'] = array('numericopt');
+$meta['proxy____user'] = array('string');
+$meta['proxy____pass'] = array('password','_code' => 'base64');
+$meta['proxy____ssl']  = array('onoff');
+$meta['proxy____except'] = array('string');
+$meta['safemodehack'] = array('onoff');
+$meta['ftp____host']  = array('string','_pattern' => '#^(|[a-z0-9\-\.+]+)$#i');
+$meta['ftp____port']  = array('numericopt');
+$meta['ftp____user']  = array('string');
+$meta['ftp____pass']  = array('password','_code' => 'base64');
+$meta['ftp____root']  = array('string');
+
diff --git a/sources/lib/plugins/config/settings/extra.class.php b/sources/lib/plugins/config/settings/extra.class.php
new file mode 100644
index 0000000..83de802
--- /dev/null
+++ b/sources/lib/plugins/config/settings/extra.class.php
@@ -0,0 +1,209 @@
+
+ */
+
+if (!class_exists('setting_sepchar')) {
+    class setting_sepchar extends setting_multichoice {
+
+        function setting_sepchar($key,$param=null) {
+            $str = '_-.';
+            for ($i=0;$i_choices[] = $str{$i};
+
+            // call foundation class constructor
+            $this->setting($key,$param);
+        }
+    }
+}
+
+if (!class_exists('setting_savedir')) {
+    class setting_savedir extends setting_string {
+
+        function update($input) {
+            if ($this->is_protected()) return false;
+
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
+
+            if (!init_path($input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
+
+            $this->_local = $input;
+            return true;
+        }
+    }
+}
+
+if (!class_exists('setting_authtype')) {
+    class setting_authtype extends setting_multichoice {
+
+        function initialize($default,$local,$protected) {
+            global $plugin_controller;
+
+            // retrieve auth types provided by plugins
+            foreach ($plugin_controller->getList('auth') as $plugin) {
+                $this->_choices[] = $plugin;
+            }
+
+            parent::initialize($default,$local,$protected);
+        }
+
+        function update($input) {
+            global $plugin_controller;
+
+            // is an update possible/requested?
+            $local = $this->_local;                       // save this, parent::update() may change it
+            if (!parent::update($input)) return false;    // nothing changed or an error caught by parent
+            $this->_local = $local;                       // restore original, more error checking to come
+
+            // attempt to load the plugin
+            $auth_plugin = $plugin_controller->load('auth', $input);
+
+            // @TODO: throw an error in plugin controller instead of returning null
+            if (is_null($auth_plugin)) {
+                $this->_error = true;
+                msg('Cannot load Auth Plugin "' . $input . '"', -1);
+                return false;
+            }
+
+            // verify proper instantiation (is this really a plugin?) @TODO use instanceof? implement interface?
+            if (is_object($auth_plugin) && !method_exists($auth_plugin, 'getPluginName')) {
+                $this->_error = true;
+                msg('Cannot create Auth Plugin "' . $input . '"', -1);
+                return false;
+            }
+
+            // did we change the auth type? logout
+            global $conf;
+            if($conf['authtype'] != $input) {
+                msg('Authentication system changed. Please re-login.');
+                auth_logoff();
+            }
+
+            $this->_local = $input;
+            return true;
+        }
+    }
+}
+
+if (!class_exists('setting_im_convert')) {
+    class setting_im_convert extends setting_string {
+
+        function update($input) {
+            if ($this->is_protected()) return false;
+
+            $input = trim($input);
+
+            $value = is_null($this->_local) ? $this->_default : $this->_local;
+            if ($value == $input) return false;
+
+            if ($input && !@file_exists($input)) {
+                $this->_error = true;
+                $this->_input = $input;
+                return false;
+            }
+
+            $this->_local = $input;
+            return true;
+        }
+    }
+}
+
+if (!class_exists('setting_disableactions')) {
+    class setting_disableactions extends setting_multicheckbox {
+
+        function html(&$plugin, $echo=false) {
+            global $lang;
+
+            // make some language adjustments (there must be a better way)
+            // transfer some DokuWiki language strings to the plugin
+            if (!$plugin->localised) $this->setupLocale();
+            $plugin->lang[$this->_key.'_revisions'] = $lang['btn_revs'];
+
+            foreach ($this->_choices as $choice)
+              if (isset($lang['btn_'.$choice])) $plugin->lang[$this->_key.'_'.$choice] = $lang['btn_'.$choice];
+
+            return parent::html($plugin, $echo);
+        }
+    }
+}
+
+if (!class_exists('setting_compression')) {
+    class setting_compression extends setting_multichoice {
+
+        var $_choices = array('0');      // 0 = no compression, always supported
+
+        function initialize($default,$local,$protected) {
+
+            // populate _choices with the compression methods supported by this php installation
+            if (function_exists('gzopen')) $this->_choices[] = 'gz';
+            if (function_exists('bzopen')) $this->_choices[] = 'bz2';
+
+            parent::initialize($default,$local,$protected);
+        }
+    }
+}
+
+if (!class_exists('setting_license')) {
+    class setting_license extends setting_multichoice {
+
+        var $_choices = array('');      // none choosen
+
+        function initialize($default,$local,$protected) {
+            global $license;
+
+            foreach($license as $key => $data){
+                $this->_choices[] = $key;
+                $this->lang[$this->_key.'_o_'.$key] = $data['name'];
+            }
+
+            parent::initialize($default,$local,$protected);
+        }
+    }
+}
+
+
+if (!class_exists('setting_renderer')) {
+    class setting_renderer extends setting_multichoice {
+        var $_prompts = array();
+
+        function initialize($default,$local,$protected) {
+            $format = $this->_format;
+
+            foreach (plugin_list('renderer') as $plugin) {
+                $renderer = plugin_load('renderer',$plugin);
+                if (method_exists($renderer,'canRender') && $renderer->canRender($format)) {
+                    $this->_choices[] = $plugin;
+
+                    $info = $renderer->getInfo();
+                    $this->_prompts[$plugin] = $info['name'];
+                }
+            }
+
+            parent::initialize($default,$local,$protected);
+        }
+
+        function html(&$plugin, $echo=false) {
+
+            // make some language adjustments (there must be a better way)
+            // transfer some plugin names to the config plugin
+            if (!$plugin->localised) $this->setupLocale();
+
+            foreach ($this->_choices as $choice) {
+                if (!isset($plugin->lang[$this->_key.'_o_'.$choice])) {
+                    if (!isset($this->_prompts[$choice])) {
+                        $plugin->lang[$this->_key.'_o_'.$choice] = sprintf($plugin->lang['renderer__core'],$choice);
+                    } else {
+                        $plugin->lang[$this->_key.'_o_'.$choice] = sprintf($plugin->lang['renderer__plugin'],$this->_prompts[$choice]);
+                    }
+                }
+            }
+            return parent::html($plugin, $echo);
+        }
+    }
+}
diff --git a/sources/lib/plugins/config/style.css b/sources/lib/plugins/config/style.css
new file mode 100644
index 0000000..054021e
--- /dev/null
+++ b/sources/lib/plugins/config/style.css
@@ -0,0 +1,167 @@
+/* plugin:configmanager */
+#config__manager div.success,
+#config__manager div.error,
+#config__manager div.info {
+  background-position: 0.5em;
+  padding: 0.5em;
+  text-align: center;
+}
+
+#config__manager fieldset {
+  margin: 1em;
+  width: auto;
+  margin-bottom: 2em;
+  background-color: __background_alt__;
+  color: __text__;
+  padding: 0 1em;
+}
+[dir=rtl] #config__manager fieldset {
+    clear: both;
+}
+#config__manager legend {
+    font-size: 1.25em;
+}
+
+#config__manager form { }
+#config__manager table {
+    margin: 1em 0;
+    width: 100%;
+}
+
+#config__manager fieldset td {
+    text-align: left;
+}
+[dir=rtl] #config__manager fieldset td {
+    text-align: right;
+}
+#config__manager fieldset td.value {
+    /* fixed data column width */
+    width: 31em;
+}
+
+[dir=rtl] #config__manager label {
+    text-align: right;
+}
+[dir=rtl] #config__manager td.value input.checkbox {
+    float: right;
+    padding-left: 0;
+    padding-right: 0.7em;
+}
+[dir=rtl] #config__manager td.value label {
+    float: left;
+}
+
+#config__manager td.label {
+    padding: 0.8em 0 0.6em 1em;
+    vertical-align: top;
+}
+[dir=rtl] #config__manager td.label {
+    padding: 0.8em 1em 0.6em 0;
+}
+
+#config__manager td.label label {
+    clear: left;
+    display: block;
+}
+[dir=rtl] #config__manager td.label label {
+    clear: right;
+}
+#config__manager td.label img {
+    padding: 0 10px;
+    vertical-align: middle;
+    float: right;
+}
+[dir=rtl] #config__manager td.label img {
+    float: left;
+}
+
+#config__manager td.label span.outkey {
+    font-size: 70%;
+    margin-top: -1.7em;
+    margin-left: -1em;
+    display: block;
+    background-color: __background__;
+    color: __text_neu__;
+    float: left;
+    padding: 0 0.1em;
+    position: relative;
+    z-index: 1;
+}
+[dir=rtl] #config__manager td.label span.outkey {
+    float: right;
+    margin-right: 1em;
+}
+
+#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;
+    height: 4em;
+}
+
+#config__manager td textarea.edit:focus {
+    height: 10em;
+}
+
+#config__manager tr .input,
+#config__manager tr input,
+#config__manager tr textarea,
+#config__manager tr select {
+  background-color: #fff;
+  color: #000;
+}
+
+#config__manager tr.default .input,
+#config__manager tr.default input,
+#config__manager tr.default textarea,
+#config__manager tr.default select,
+#config__manager .selectiondefault {
+  background-color: #ccddff;
+  color: #000;
+}
+
+#config__manager tr.protected .input,
+#config__manager tr.protected input,
+#config__manager tr.protected textarea,
+#config__manager tr.protected select,
+#config__manager tr.protected .selection {
+  background-color: #ffcccc!important;
+  color: #000 !important;
+}
+
+#config__manager td.error  { background-color: red; color: #000; }
+
+#config__manager .selection {
+  width: 14.8em;
+  float: left;
+  margin: 0 0.3em 2px 0;
+}
+[dir=rtl] #config__manager .selection {
+  width: 14.8em;
+  float: right;
+  margin: 0 0 2px 0.3em;
+}
+
+#config__manager .selection label {
+  float: right;
+  width: 14em;
+  font-size: 90%;
+}
+
+
+#config__manager .other {
+  clear: both;
+  padding-top: 0.5em;
+}
+
+#config__manager .other label {
+  padding-left: 2px;
+  font-size: 90%;
+}
+
+/* end plugin:configmanager */
diff --git a/sources/lib/plugins/index.html b/sources/lib/plugins/index.html
new file mode 100644
index 0000000..977f90e
--- /dev/null
+++ b/sources/lib/plugins/index.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+nothing here...
+
+
+
+
+
diff --git a/sources/lib/plugins/info/plugin.info.txt b/sources/lib/plugins/info/plugin.info.txt
new file mode 100644
index 0000000..0537436
--- /dev/null
+++ b/sources/lib/plugins/info/plugin.info.txt
@@ -0,0 +1,7 @@
+base info
+author Andreas Gohr
+email andi@splitbrain.org
+date 2013-02-16
+name Info Plugin
+desc Displays information about various DokuWiki internals
+url http://dokuwiki.org/plugin:info
diff --git a/sources/lib/plugins/info/syntax.php b/sources/lib/plugins/info/syntax.php
new file mode 100644
index 0000000..f8c6eb4
--- /dev/null
+++ b/sources/lib/plugins/info/syntax.php
@@ -0,0 +1,270 @@
+
+ * @author     Esther Brunner 
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * All DokuWiki plugins to extend the parser/rendering mechanism
+ * need to inherit from this class
+ */
+class syntax_plugin_info extends DokuWiki_Syntax_Plugin {
+
+    /**
+     * What kind of syntax are we?
+     */
+    function getType(){
+        return 'substition';
+    }
+
+    /**
+     * What about paragraphs?
+     */
+    function getPType(){
+        return 'block';
+    }
+
+    /**
+     * Where to sort in?
+     */
+    function getSort(){
+        return 155;
+    }
+
+
+    /**
+     * Connect pattern to lexer
+     */
+    function connectTo($mode) {
+        $this->Lexer->addSpecialPattern('~~INFO:\w+~~',$mode,'plugin_info');
+    }
+
+
+    /**
+     * Handle the match
+     */
+    function handle($match, $state, $pos, Doku_Handler &$handler){
+        $match = substr($match,7,-2); //strip ~~INFO: from start and ~~ from end
+        return array(strtolower($match));
+    }
+
+    /**
+     * Create output
+     */
+    function render($format, Doku_Renderer &$renderer, $data) {
+        if($format == 'xhtml'){
+            /** @var Doku_Renderer_xhtml $renderer */
+            //handle various info stuff
+            switch ($data[0]){
+                case 'syntaxmodes':
+                    $renderer->doc .= $this->_syntaxmodes_xhtml();
+                    break;
+                case 'syntaxtypes':
+                    $renderer->doc .= $this->_syntaxtypes_xhtml();
+                    break;
+                case 'syntaxplugins':
+                    $this->_plugins_xhtml('syntax', $renderer);
+                    break;
+                case 'adminplugins':
+                    $this->_plugins_xhtml('admin', $renderer);
+                    break;
+                case 'actionplugins':
+                    $this->_plugins_xhtml('action', $renderer);
+                    break;
+                case 'rendererplugins':
+                    $this->_plugins_xhtml('renderer', $renderer);
+                    break;
+                case 'helperplugins':
+                    $this->_plugins_xhtml('helper', $renderer);
+                    break;
+                case 'authplugins':
+                    $this->_plugins_xhtml('auth', $renderer);
+                    break;
+                case 'remoteplugins':
+                    $this->_plugins_xhtml('remote', $renderer);
+                    break;
+                case 'helpermethods':
+                    $this->_helpermethods_xhtml($renderer);
+                    break;
+                default:
+                    $renderer->doc .= "no info about ".htmlspecialchars($data[0]);
+            }
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * list all installed plugins
+     *
+     * uses some of the original renderer methods
+     */
+    function _plugins_xhtml($type, Doku_Renderer &$renderer){
+        global $lang;
+        $renderer->doc .= '
          ';
+
+        $plugins = plugin_list($type);
+        $plginfo = array();
+
+        // remove subparts
+        foreach($plugins as $p){
+            if (!$po = plugin_load($type,$p)) continue;
+            list($name,$part) = explode('_',$p,2);
+            $plginfo[$name] = $po->getInfo();
+        }
+
+        // list them
+        foreach($plginfo as $info){
+            $renderer->doc .= '
        • ';
+            $renderer->externallink($info['url'],$info['name']);
+            $renderer->doc .= ' ';
+            $renderer->doc .= ''.$info['date'].'';
+            $renderer->doc .= ' ';
+            $renderer->doc .= $lang['by'];
+            $renderer->doc .= ' ';
+            $renderer->emaillink($info['email'],$info['author']);
+            $renderer->doc .= '
          ';
+            $renderer->doc .= strtr(hsc($info['desc']),array("\n"=>"
          "));
+            $renderer->doc .= '
          • ';
+            unset($po);
+        }
+
+        $renderer->doc .= '
        ';
+    }
+
+    /**
+     * list all installed plugins
+     *
+     * uses some of the original renderer methods
+     */
+    function _helpermethods_xhtml(Doku_Renderer &$renderer){
+        $plugins = plugin_list('helper');
+        foreach($plugins as $p){
+            if (!$po = plugin_load('helper',$p)) continue;
+
+            if (!method_exists($po, 'getMethods')) continue;
+            $methods = $po->getMethods();
+            $info = $po->getInfo();
+
+            $hid = $this->_addToTOC($info['name'], 2, $renderer);
+            $doc = '
        '.hsc($info['name']).'
        ';
+            $doc .= '
        ';
+            $doc .= '
        '.strtr(hsc($info['desc']), array("\n"=>"
        ")).'
        ';
+            $doc .= '
        $'.$p." = plugin_load('helper', '".$p."');
        ";
+            $doc .= '
        ';
+            foreach ($methods as $method){
+                $title = '$'.$p.'->'.$method['name'].'()';
+                $hid = $this->_addToTOC($title, 3, $renderer);
+                $doc .= '
        '.hsc($title).'
        ';
+                $doc .= '
        ';
+                $doc .= '
        ';
+                $doc .= '';
+                if ($method['params']){
+                    $c = count($method['params']);
+                    $doc .= '';
+                }
+                if ($method['return']){
+                    $doc .= '';
+                }
+                $doc .= '
        Description'.$method['desc'].
+                    '
        Parameters';
+                    $params = array();
+                    foreach ($method['params'] as $desc => $type){
+                        $params[] = hsc($desc).''.hsc($type);
+                    }
+                    $doc .= join($params, '
        ').'
        Return value'.hsc(key($method['return'])).
+                        ''.hsc(current($method['return'])).'
        ';
+                $doc .= '
        ';
+            }
+            unset($po);
+
+            $renderer->doc .= $doc;
+        }
+    }
+
+    /**
+     * lists all known syntax types and their registered modes
+     */
+    function _syntaxtypes_xhtml(){
+        global $PARSER_MODES;
+        $doc  = '';
+
+        $doc .= '
        ';
+        foreach($PARSER_MODES as $mode => $modes){
+            $doc .= '';
+            $doc .= '';
+            $doc .= '';
+            $doc .= '';
+        }
+        $doc .= '
        ';
+            $doc .= $mode;
+            $doc .= '';
+            $doc .= join(', ',$modes);
+            $doc .= '
        ';
+        return $doc;
+    }
+
+    /**
+     * lists all known syntax modes and their sorting value
+     */
+    function _syntaxmodes_xhtml(){
+        $modes = p_get_parsermodes();
+
+        $compactmodes = array();
+        foreach($modes as $mode){
+            $compactmodes[$mode['sort']][] = $mode['mode'];
+        }
+        $doc  = '';
+        $doc .= '
        ';
+
+        foreach($compactmodes as $sort => $modes){
+            $rowspan = '';
+            if(count($modes) > 1) {
+                $rowspan = ' rowspan="'.count($modes).'"';
+            }
+
+            foreach($modes as $index => $mode) {
+                $doc .= '';
+                $doc .= '';
+
+                if($index === 0) {
+                    $doc .= '';
+                }
+                $doc .= '';
+            }
+        }
+
+        $doc .= '
        ';
+                $doc .= $mode;
+                $doc .= '';
+                    $doc .= $sort;
+                    $doc .= '
        ';
+        return $doc;
+    }
+
+    /**
+     * Adds a TOC item
+     */
+    function _addToTOC($text, $level, Doku_Renderer &$renderer){
+        global $conf;
+
+        if (($level >= $conf['toptoclevel']) && ($level <= $conf['maxtoclevel'])){
+            /** @var $renderer Doku_Renderer_xhtml */
+            $hid  = $renderer->_headerToLink($text, 'true');
+            $renderer->toc[] = array(
+                'hid'   => $hid,
+                'title' => $text,
+                'type'  => 'ul',
+                'level' => $level - $conf['toptoclevel'] + 1
+            );
+        }
+        return $hid;
+    }
+}
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/plugins/plugin/admin.php b/sources/lib/plugins/plugin/admin.php
new file mode 100644
index 0000000..3f019d5
--- /dev/null
+++ b/sources/lib/plugins/plugin/admin.php
@@ -0,0 +1,137 @@
+
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+// todo
+// - maintain a history of file modified
+// - allow a plugin to contain extras to be copied to the current template (extra/tpl/)
+// - to images (lib/images/) [ not needed, should go in lib/plugin/images/ ]
+
+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');
+
+/**
+ * All DokuWiki plugins to extend the admin function
+ * need to inherit from this class
+ */
+class admin_plugin_plugin extends DokuWiki_Admin_Plugin {
+
+    var $disabled = 0;
+    var $plugin = '';
+    var $cmd = '';
+
+    /**
+     * @var ap_manage
+     */
+    var $handler = null;
+
+    var $functions = array('delete','update',/*'settings',*/'info');  // require a plugin name
+    var $commands = array('manage','download','enable');              // don't require a plugin name
+    var $plugin_list = array();
+
+    var $msg = '';
+    var $error = '';
+
+    function admin_plugin_plugin() {
+        $this->disabled = plugin_isdisabled('plugin');
+    }
+
+    /**
+     * return sort order for position in admin menu
+     */
+    function getMenuSort() {
+        return 20;
+    }
+
+    /**
+     * handle user request
+     */
+    function handle() {
+        global $INPUT;
+        // enable direct access to language strings
+        $this->setupLocale();
+
+        $fn = $INPUT->param('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;
+        @require_once(DOKU_PLUGIN."/plugin/classes/$class.class.php");
+        if (!class_exists($class)){
+            $class = 'ap_manage';
+        }
+
+        $this->handler = new $class($this, $this->plugin);
+        $this->msg = $this->handler->process();
+
+    }
+
+    /**
+     * 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('
        ');
+    }
+
+    /**
+     * 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 $this->plugin_list;
+    }
+
+}
+
+
+
+
+
+
diff --git a/sources/lib/plugins/plugin/classes/ap_delete.class.php b/sources/lib/plugins/plugin/classes/ap_delete.class.php
new file mode 100644
index 0000000..581a629
--- /dev/null
+++ b/sources/lib/plugins/plugin/classes/ap_delete.class.php
@@ -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(sprintf($this->lang['deleted'],$this->plugin));
+            $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 --git a/sources/lib/plugins/plugin/classes/ap_download.class.php b/sources/lib/plugins/plugin/classes/ap_download.class.php
new file mode 100644
index 0000000..3cc4558
--- /dev/null
+++ b/sources/lib/plugins/plugin/classes/ap_download.class.php
@@ -0,0 +1,288 @@
+str('url');
+        $this->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) {
+        // 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, 0)) {
+            $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(sprintf($this->lang['packageinstalled'], count($this->downloaded), join(',',$this->downloaded)),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'] = utf8_basename($conf['base']);
+                    if(!$info['base']) $info['base'] = utf8_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'] = utf8_basename($conf['base']);
+                    if(!$info['base']) $info['base'] = utf8_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'))) {
+            switch($ext){
+                case 'bz':
+                    $compress_type = Tar::COMPRESS_BZIP;
+                    break;
+                case 'gz':
+                    $compress_type = Tar::COMPRESS_GZIP;
+                    break;
+                default:
+                    $compress_type = Tar::COMPRESS_NONE;
+            }
+
+            $tar = new Tar();
+            try {
+                $tar->open($file, $compress_type);
+                $tar->extract($target);
+                return true;
+            }catch(Exception $e){
+                if($conf['allowdebug']){
+                    msg('Tar Error: '.$e->getMessage().' ['.$e->getFile().':'.$e->getLine().']',-1);
+                }
+                return false;
+            }
+        } else if ($ext == 'zip') {
+
+            $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 boolean|string 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 --git a/sources/lib/plugins/plugin/classes/ap_enable.class.php b/sources/lib/plugins/plugin/classes/ap_enable.class.php
new file mode 100644
index 0000000..a25c7ed
--- /dev/null
+++ b/sources/lib/plugins/plugin/classes/ap_enable.class.php
@@ -0,0 +1,51 @@
+enabled = $INPUT->arr('enabled');
+
+        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 --git a/sources/lib/plugins/plugin/classes/ap_info.class.php b/sources/lib/plugins/plugin/classes/ap_info.class.php
new file mode 100644
index 0000000..89b78fa
--- /dev/null
+++ b/sources/lib/plugins/plugin/classes/ap_info.class.php
@@ -0,0 +1,143 @@
+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'],false,true)) === null) continue;
+
+            $compname = explode('_',$component['name']);
+            if($compname[1]){
+                $compname = '['.$compname[1].']';
+            }else{
+                $compname = '';
+            }
+
+            $this->details[] = array_merge(
+                                    $obj->getInfo(),
+                                    array(
+                                        'type' => $component['type'],
+                                        'compname' => $compname
+                                    ));
+            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'].' '.$info['compname'])."
        ",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 --git a/sources/lib/plugins/plugin/classes/ap_manage.class.php b/sources/lib/plugins/plugin/classes/ap_manage.class.php
new file mode 100644
index 0000000..48be630
--- /dev/null
+++ b/sources/lib/plugins/plugin/classes/ap_manage.class.php
@@ -0,0 +1,202 @@
+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 $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('      
        ');
+
+            $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 $config_cascade;
+
+        // expire dokuwiki caches
+        // touching local.php expires wiki page, JS and CSS caches
+        @touch(reset($config_cascade['main']['local']));
+
+        // update latest plugin date - FIXME
+        global $ID;
+        send_redirect(wl($ID,array('do'=>'admin','page'=>'plugin'),true, '&'));
+    }
+
+    /**
+     * 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' :
+                $url = $data[0];
+                $date = date('r');
+                if (!$fp = @fopen($file, 'r+')) return;
+                $buffer = "";
+                while (($line = fgets($fp)) !== false) {
+                    $urlFound = strpos($line,"url");
+                    if($urlFound !== false) $line="url=$url\n";
+                    $buffer .= $line;
+                }
+                $buffer .= "updated=$date\n";
+                fseek($fp, 0);
+                fwrite($fp, $buffer);
+                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) && !is_link($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);
+        }
+        return @unlink($path);
+    }
+
+
+}
diff --git a/sources/lib/plugins/plugin/classes/ap_update.class.php b/sources/lib/plugins/plugin/classes/ap_update.class.php
new file mode 100644
index 0000000..5d7f6cb
--- /dev/null
+++ b/sources/lib/plugins/plugin/classes/ap_update.class.php
@@ -0,0 +1,36 @@
+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 --git a/sources/lib/plugins/plugin/lang/af/lang.php b/sources/lib/plugins/plugin/lang/af/lang.php
new file mode 100644
index 0000000..669fdd5
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/af/lang.php
@@ -0,0 +1,13 @@
+plugins|إضافات]] دوكو ويكي. لتتمكن من تنزيل و تثبيت الإضافات يجب أن يكون دليل الاضافات قابلا للكتابة من خادوم الوب.
+
diff --git a/sources/lib/plugins/plugin/lang/ar/lang.php b/sources/lib/plugins/plugin/lang/ar/lang.php
new file mode 100644
index 0000000..aae58fd
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ar/lang.php
@@ -0,0 +1,54 @@
+
+ * @author Usama Akkad 
+ * @author uahello@gmail.com
+ */
+$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_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، تحقق من اذونات الملف.';
+$lang['packageinstalled']      = 'حزمة الإضافة (%d plugin(s): %s) ثبتت بنجاج.';
diff --git a/sources/lib/plugins/plugin/lang/bg/admin_plugin.txt b/sources/lib/plugins/plugin/lang/bg/admin_plugin.txt
new file mode 100644
index 0000000..bad73e1
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/bg/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Управление на приставките ======
+
+От тази страница можете на управлявате [[doku>plugins|приставките]] на Dokuwiki. За да свалите и инсталирате приставка, е необходимо писането в директорията .../lib/plugins/ да е позволено на сървъра.
diff --git a/sources/lib/plugins/plugin/lang/bg/lang.php b/sources/lib/plugins/plugin/lang/bg/lang.php
new file mode 100644
index 0000000..09ac352
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/bg/lang.php
@@ -0,0 +1,54 @@
+
+ * @author Viktor Usunov 
+ * @author Kiril 
+ */
+$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: вероятно дискът е пълен или правата за достъп до файловете са грешни. Може да доведе до частично инсталирана приставка и да причини нестабилно функциониране на wiki-то ви.';
+$lang['error_delete']          = 'Възникна грешка при изтриването на приставката %s.  Най-вероятната причина е в правата за достъп до файл или директория';
+$lang['enabled']               = 'Приставката %s е включена.';
+$lang['notenabled']            = 'Приставката %s не може да бъде включена, моля проверете правата за файловете.';
+$lang['disabled']              = 'Приставката %s е изключена.';
+$lang['notdisabled']           = 'Приставката %s не е изключена, моля проверете правата за файловете.';
+$lang['packageinstalled']      = 'Пакетът е инсталиран успешно (%d приставка: %s).';
diff --git a/sources/lib/plugins/plugin/lang/ca-valencia/admin_plugin.txt b/sources/lib/plugins/plugin/lang/ca-valencia/admin_plugin.txt
new file mode 100644
index 0000000..6b5a958
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ca-valencia/admin_plugin.txt
@@ -0,0 +1,4 @@
+====== Gestor de plúgins ======
+
+Des d'esta pàgina pot gestionar tot lo relacionat en els [[doku>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 --git a/sources/lib/plugins/plugin/lang/ca-valencia/lang.php b/sources/lib/plugins/plugin/lang/ca-valencia/lang.php
new file mode 100644
index 0000000..3fbdb13
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ca-valencia/lang.php
@@ -0,0 +1,53 @@
+
+ * @author Bernat Arlandis 
+ * @author Bernat Arlandis 
+ */
+$lang['menu']                  = 'Gestor de plúgins';
+$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';
+$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.';
+$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']                  = 'Classe:';
+$lang['desc']                  = 'Descripció:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
+$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 a partir 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 copiant archius a l\'instalar archius del plúgin %s: el disc podria estar ple o els permissos d\'accés a l\'archiu estar mal. El plúgin podria haver quedat 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';
+$lang['enabled']               = 'Plúgin %s activat.';
+$lang['notenabled']            = 'No s\'ha pogut activar el plúgin %s, comprove els permissos dels archius.';
+$lang['disabled']              = 'Plúgin %s desactivat.';
+$lang['notdisabled']           = 'No s\'ha pogut desactivar el plúgin %s, comprove els permissos dels archius.';
diff --git a/sources/lib/plugins/plugin/lang/ca/admin_plugin.txt b/sources/lib/plugins/plugin/lang/ca/admin_plugin.txt
new file mode 100644
index 0000000..c21e3f5
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ca/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Gestió de connectors ======
+
+En aquesta 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 tingui permís d'escriptura en la carpeta de connectors.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/ca/lang.php b/sources/lib/plugins/plugin/lang/ca/lang.php
new file mode 100644
index 0000000..5c79336
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ca/lang.php
@@ -0,0 +1,55 @@
+
+ * @author carles.bellver@gmail.com
+ * @author carles.bellver@cent.uji.es
+ * @author Carles Bellver 
+ * @author daniel@6temes.cat
+ */
+$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']            = 'Desa';
+$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']                = 'Aquest 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.';
+$lang['packageinstalled']      = 'El paquet del connector (%d plugins(s): %s) s\'ha instal·lat correctament.';
diff --git a/sources/lib/plugins/plugin/lang/cs/admin_plugin.txt b/sources/lib/plugins/plugin/lang/cs/admin_plugin.txt
new file mode 100644
index 0000000..6ebf1e7
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/cs/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Správa pluginů ======
+
+Na této stránce lze spravovat pluginy DokuWiki [[doku>plugins|plugins]]. Aby bylo možné stahovat a instalovat pluginy, musí mít webový server přístup pro zápis do adresáře //plugin//.
diff --git a/sources/lib/plugins/plugin/lang/cs/lang.php b/sources/lib/plugins/plugin/lang/cs/lang.php
new file mode 100644
index 0000000..fb8b6cc
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/cs/lang.php
@@ -0,0 +1,65 @@
+
+ * @author Zbynek Krivka 
+ * @author Bohumir Zamecnik 
+ * @author tomas@valenta.cz
+ * @author Marek Sacha 
+ * @author Lefty 
+ * @author Vojta Beran 
+ * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
+ * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
+ * @author Zbyněk Křivka 
+ * @author Gerrit Uitslag 
+ */
+$lang['menu']                  = 'Správa pluginů';
+$lang['download']              = 'Stáhnout a instalovat plugin';
+$lang['manage']                = 'Seznam instalovaných pluginů';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'aktualizovat';
+$lang['btn_delete']            = 'smazat';
+$lang['btn_settings']          = 'nastavení';
+$lang['btn_download']          = 'Stáhnout';
+$lang['btn_enable']            = 'Uložit';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalován:';
+$lang['lastupdate']            = 'Poslední aktualizace:';
+$lang['source']                = 'Zdroj:';
+$lang['unknown']               = 'neznámý';
+$lang['updating']              = 'Aktualizuji ...';
+$lang['updated']               = 'Modul %s úspěšně aktualizován';
+$lang['updates']               = 'Následující pluginy byly úspěšně aktualizovány';
+$lang['update_none']           = 'Žádné aktualizace nenalezeny.';
+$lang['deleting']              = 'Probíhá mazání ...';
+$lang['deleted']               = 'Plugin %s smazán.';
+$lang['downloading']           = 'Stahuji ...';
+$lang['downloaded']            = 'Plugin %s nainstalován';
+$lang['downloads']             = 'Následující pluginy byly úspěšně instalovány:';
+$lang['download_none']         = 'Žádné pluginy nebyly nenalezeny, nebo se vyskytla nějaká chyba při
+stahování a instalaci.';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Součásti';
+$lang['noinfo']                = 'Plugin nevrátil žádné informace. Může být poškozen nebo špatný.';
+$lang['name']                  = 'Jméno:';
+$lang['date']                  = 'Datum:';
+$lang['type']                  = 'Typ:';
+$lang['desc']                  = 'Popis:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Nastala neznámá chyba.';
+$lang['error_download']        = 'Nelze stáhnout soubor s pluginem: %s';
+$lang['error_badurl']          = 'URL je zřejmě chybná - nelze z ní určit název souboru';
+$lang['error_dircreate']       = 'Nelze vytvořit dočasný adresář ke stažení dat';
+$lang['error_decompress']      = 'Správce pluginů nemůže rozbalit stažený soubor. Toto může být způsobeno chybou při stahování. Můžete se pokusit stahování opakovat. Chyba může být také v kompresním formátu souboru. V tom případě bude nutné stáhnout a nainstalovat plugin ručně.';
+$lang['error_copy']            = 'Došlo k chybě při instalaci pluginu %s. Je možné, že na disku není volné místo, nebo mohou být špatně nastavena přístupová práva. Pozor, mohlo dojít k částečné a tudíž chybné instalaci pluginu a tím může být ohrožena stabilita wiki.';
+$lang['error_delete']          = 'Došlo k chybě při pokusu o smazání pluginu %s. Nejspíše je chyba v nastavení přístupových práv k některým souborům či adresářům.';
+$lang['enabled']               = 'Plugin %s aktivován.';
+$lang['notenabled']            = 'Plugin %s nelze aktivovat, zkontrolujte práva k souborům.';
+$lang['disabled']              = 'Plugin %s deaktivován.';
+$lang['notdisabled']           = 'Plugin %s nelze deaktivovat, zkontrolujte práva k souborům.';
+$lang['packageinstalled']      = 'Balíček pluginů (%d plugin(ů): %s) úspěšně nainstalován.';
diff --git a/sources/lib/plugins/plugin/lang/da/admin_plugin.txt b/sources/lib/plugins/plugin/lang/da/admin_plugin.txt
new file mode 100644
index 0000000..300b661
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/da/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== Udvidelsesstyring ======
+
+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 --git a/sources/lib/plugins/plugin/lang/da/lang.php b/sources/lib/plugins/plugin/lang/da/lang.php
new file mode 100644
index 0000000..07077ea
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/da/lang.php
@@ -0,0 +1,61 @@
+
+ * @author Kalle Sommer Nielsen 
+ * @author Esben Laursen 
+ * @author Harith 
+ * @author Daniel Ejsing-Duun 
+ * @author Erik Bjørn Pedersen 
+ * @author rasmus@kinnerup.com
+ * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig 
+ * @author Jens Hyllegaard 
+ */
+$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']          = 'Hent';
+$lang['btn_enable']            = 'Gem';
+$lang['url']                   = 'URL-adresse';
+$lang['installed']             = 'Tilføjet:';
+$lang['lastupdate']            = 'Sidst opdateret:';
+$lang['source']                = 'Kilde:';
+$lang['unknown']               = 'ukendt';
+$lang['updating']              = 'Opdaterer ...';
+$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']               = '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']                = 'Denne udvidelse videregav ingen oplysninger. Den kan være fejlagtig.';
+$lang['name']                  = 'Navn:';
+$lang['date']                  = 'Dato:';
+$lang['type']                  = 'Type:';
+$lang['desc']                  = 'Beskrivelse:';
+$lang['author']                = 'Programmør:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'En ukendt fejl opstod.';
+$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.';
+$lang['packageinstalled']      = 'Plugin pakke (%d plugin(s): %s) installeret korrekt.';
diff --git a/sources/lib/plugins/plugin/lang/de-informal/admin_plugin.txt b/sources/lib/plugins/plugin/lang/de-informal/admin_plugin.txt
new file mode 100644
index 0000000..576797d
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/de-informal/admin_plugin.txt
@@ -0,0 +1,3 @@
+===== Erweiterungsmanagement =====
+
+Auf dieser Seite kannst du alles anpassen was mit den DokuWiki [[doku>plugins|Erweiterungen]] zu tun hat. Der Ordner der Erweiterungen muss für den Webserver beschreibbar sein, um Erweiterungen herunterladen und installieren zu können. 
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/de-informal/lang.php b/sources/lib/plugins/plugin/lang/de-informal/lang.php
new file mode 100644
index 0000000..8f1cea5
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/de-informal/lang.php
@@ -0,0 +1,59 @@
+
+ * @author Juergen Schwarzer 
+ * @author Marcel Metz 
+ * @author Matthias Schulte 
+ * @author Christian Wichmann 
+ * @author Pierre Corell 
+ * @author Frank Loizzi 
+ * @author Volker Bödker 
+ */
+$lang['menu']                  = 'Plugins verwalten';
+$lang['download']              = 'Herunterladen und installieren einer neuen Erweiterung';
+$lang['manage']                = 'Installierte Erweiterungen';
+$lang['btn_info']              = 'Information';
+$lang['btn_update']            = 'aktualisieren';
+$lang['btn_delete']            = 'löschen';
+$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']              = 'Lösche...';
+$lang['deleted']               = 'Erweiterung %s wurde gelöscht.';
+$lang['downloading']           = 'Herunterladen...';
+$lang['downloaded']            = 'Erweiterung %s wurde erfolgreich installiert';
+$lang['downloads']             = 'Die folgenden Erweiterungen wurden erfolgreich installiert:';
+$lang['download_none']         = 'Keine Erweiterungen gefunden oder es trat ein unbekanntest Problem beim Herunterladen und Installieren auf.';
+$lang['plugin']                = 'Erweiterung:';
+$lang['components']            = 'Komponenten';
+$lang['noinfo']                = 'Diese Erweiterung gab keine Information zurück - sie 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 die Erweiterung %s auf: Die Festplatte könnte voll oder die Zugriffsrechte verweigert worden sein. Dies führt zu einer teilweise installierten Erweiterung und belässt dein Wiki in einem instabilen Zustand.';
+$lang['error_delete']          = 'Es trat ein Fehler beim Löschen der Erweiterung %s auf. Die wahrscheinlichste Ursache ist eine unzureichende Datei- oder Ordnerzugriffserlaubnis.';
+$lang['enabled']               = 'Erweiterung %s aktiviert.';
+$lang['notenabled']            = 'Erweiterung %s konnte nicht aktiviert werden. Überprüfen sie die Zugriffsberechtigung der Datei.';
+$lang['disabled']              = 'Erweiterung %s deaktiviert.';
+$lang['notdisabled']           = 'Erweiterung %s konnte nicht deaktiviert werden - überprüfe Dateiberechtigungen';
+$lang['packageinstalled']      = 'Plugin-Paket (%d Plugin(s): %s) erfolgreich installiert.';
diff --git a/sources/lib/plugins/plugin/lang/de/admin_plugin.txt b/sources/lib/plugins/plugin/lang/de/admin_plugin.txt
new file mode 100644
index 0000000..f3b2caa
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/de/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== Verwaltung der Plugins ======
+
+Auf dieser Seite kannst du alles machen, was mit DokuWiki [[doku>plugins|Plugins]] zu tun hat. Um Plugins automatisch herunterladen und installieren zu können, muss der Webserver im Plugin-Ordner schreiben dürfen.
+
+
diff --git a/sources/lib/plugins/plugin/lang/de/lang.php b/sources/lib/plugins/plugin/lang/de/lang.php
new file mode 100644
index 0000000..f414860
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/de/lang.php
@@ -0,0 +1,66 @@
+
+ * @author Andreas Gohr 
+ * @author Michael Klier 
+ * @author Leo Moll 
+ * @author Florian Anderiasch 
+ * @author Robin Kluth 
+ * @author Arne Pelka 
+ * @author Dirk Einecke 
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider 
+ * @author Robert Bogenschneider 
+ * @author Niels Lange 
+ * @author Christian Wichmann 
+ * @author Paul Lachewsky 
+ * @author Pierre Corell 
+ */
+$lang['menu']                  = 'Plugins verwalten';
+$lang['download']              = 'Neues Plugin herunterladen und installieren';
+$lang['manage']                = 'Installierte Plugins';
+$lang['btn_info']              = 'Info';
+$lang['btn_update']            = 'Update';
+$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 Version:';
+$lang['source']                = 'Quelle:';
+$lang['unknown']               = 'unbekannt';
+$lang['updating']              = 'Lade Update ...';
+$lang['updated']               = 'Update von Plugin %s erfolgreich installiert';
+$lang['updates']               = 'Die folgenden Plugins wurden erfolgreich aktualisiert';
+$lang['update_none']           = 'Keine Updates gefunden.';
+$lang['deleting']              = 'Löschen ...';
+$lang['deleted']               = 'Plugin %s gelöscht.';
+$lang['downloading']           = 'Lade herunter ...';
+$lang['downloaded']            = 'Plugin %s erfolgreich installiert';
+$lang['downloads']             = 'Die folgenden Plugins wurden erfolgreich installiert:';
+$lang['download_none']         = 'Keine Plugins gefunden oder es trat ein Fehler beim Herunterladen auf.';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Komponenten';
+$lang['noinfo']                = 'Dieses Plugin liefert keine Informationen, möglicherweise ist es fehlerhaft.';
+$lang['name']                  = 'Name:';
+$lang['date']                  = 'Datum:';
+$lang['type']                  = 'Typ:';
+$lang['desc']                  = 'Beschreibung:';
+$lang['author']                = 'Entwickler:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Ein unbekannter Fehler ist aufgetreten.';
+$lang['error_download']        = 'Konnte das Plugin %s nicht herunterladen';
+$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_delete']          = 'Es gab einem Fehler beim Versuch das Plugin zu löschen %s. Dies liegt wahrscheinlich an fehlenden Dateiberechtigungen.';
+$lang['enabled']               = 'Plugin %s wurde aktiviert.';
+$lang['notenabled']            = 'Plugin %s konnte nicht aktiviert werden, überprüfen Sie die Dateirechte.';
+$lang['disabled']              = 'Plugin %s wurde deaktiviert.';
+$lang['notdisabled']           = 'Plugin %s konnte nicht deaktiviert werden, überprüfen Sie die Dateirechte.';
+$lang['packageinstalled']      = 'Plugin-Paket (%d Plugin(s): %s) erfolgreich installiert.';
diff --git a/sources/lib/plugins/plugin/lang/el/admin_plugin.txt b/sources/lib/plugins/plugin/lang/el/admin_plugin.txt
new file mode 100644
index 0000000..8b29293
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/el/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== Διαχείριση Επεκτάσεων ======
+
+Σε αυτή την σελίδα μπορείτε να διαχειριστείτε τις [[doku>plugins|επεκτάσεις]] του Dokuwiki σας. Για να μπορέσετε να εγκαταστήσετε νέες επεκτάσεις, ο αντίστοιχος φάκελος συστήματος θα πρέπει να είναι εγγράψιμος από τον χρήστη κάτω από τον οποίο εκτελείται η εφαρμογή του εξυπηρετητή σας.
+
+
diff --git a/sources/lib/plugins/plugin/lang/el/lang.php b/sources/lib/plugins/plugin/lang/el/lang.php
new file mode 100644
index 0000000..f50e26c
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/el/lang.php
@@ -0,0 +1,58 @@
+
+ * @author Thanos Massias 
+ * @author Αθανάσιος Νταής 
+ * @author Konstantinos Koryllos 
+ * @author George Petsagourakis 
+ * @author Petros Vidalis 
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
+ */
+$lang['menu']                  = 'Διαχείριση Επεκτάσεων';
+$lang['download']              = 'Κατεβάστε και εγκαταστήστε μια νέα επέκταση (plugin)';
+$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 είναι μάλλον λανθασμένο - είναι αδύνατον να εξαχθεί το όνομα αρχείου από αυτό το URL';
+$lang['error_dircreate']       = 'Δεν είναι δυνατή η δημιουργία ενός προσωρινού φακέλου αποθήκευσης των μεταφορτώσεων';
+$lang['error_decompress']      = 'Δεν είναι δυνατή η αποσυμπίεση των μεταφορτώσεων. Αυτό μπορεί να οφείλεται σε μερική λήψη των μεταφορτώσεων, οπότε θα πρέπει να επαναλάβετε την διαδικασία ή το σύστημά σας δεν μπορεί να διαχειριστεί το συγκεκριμένο είδος συμπίεσης, οπότε θα πρέπει να εγκαταστήσετε την επέκταση χειροκίνητα.';
+$lang['error_copy']            = 'Εμφανίστηκε ένα σφάλμα αντιγραφής αρχείων κατά την διάρκεια εγκατάστασης της επέκτασης %s: ο δίσκος μπορεί να είναι γεμάτος ή να μην είναι σωστά ρυθμισμένα τα δικαιώματα πρόσβασης. Αυτό το γεγονός μπορεί να οδήγησε σε μερική εγκατάσταση της επέκτασης και άρα η DokuWiki εγκατάστασή σας να εμφανίσει προβλήματα σταθερότητας.';
+$lang['error_delete']          = 'Εμφανίστηκε ένα σφάλμα κατά την διαδικασία διαγραφής της επέκτασης %s.  Η πιθανότερη αιτία είναι να μην είναι σωστά ρυθμισμένα τα δικαιώματα πρόσβασης.';
+$lang['enabled']               = 'Η επέκταση %s ενεργοποιήθηκε.';
+$lang['notenabled']            = 'Η επέκταση %s δεν μπορεί να ενεργοποιηθεί. Ελέγξτε τα δικαιώματα πρόσβασης.';
+$lang['disabled']              = 'Η επέκταση %s απενεργοποιήθηκε.';
+$lang['notdisabled']           = 'Η επέκταση %s δεν μπορεί να απενεργοποιηθεί. Ελέγξτε τα δικαιώματα πρόσβασης.';
+$lang['packageinstalled']      = 'Το πακέτο της επέκτασης (%d επέκταση(εις): %s) εγκαστήθηκε επιτυχημένα.';
diff --git a/sources/lib/plugins/plugin/lang/en/admin_plugin.txt b/sources/lib/plugins/plugin/lang/en/admin_plugin.txt
new file mode 100644
index 0000000..cb23b1e
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/en/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== Plugin Management ======
+
+On this page you can manage everything to do with Dokuwiki [[doku>plugins|plugins]]. To be able to download and install a plugin your plugin folder must be writeable by the webserver.
+
+
diff --git a/sources/lib/plugins/plugin/lang/en/lang.php b/sources/lib/plugins/plugin/lang/en/lang.php
new file mode 100644
index 0000000..87570a7
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/en/lang.php
@@ -0,0 +1,78 @@
+
+ */
+
+$lang['menu'] = 'Manage Plugins';
+
+// custom language strings for the plugin
+$lang['download'] = "Download and install a new plugin";
+$lang['manage'] = "Installed Plugins";
+
+$lang['btn_info'] = 'info';
+$lang['btn_update'] = 'update';
+$lang['btn_delete'] = 'delete';
+$lang['btn_settings'] = 'settings';
+$lang['btn_download'] = 'Download';
+$lang['btn_enable'] = 'Save';
+
+$lang['url']              = 'URL';
+
+$lang['installed']        = 'Installed:';
+$lang['lastupdate']       = 'Last updated:';
+$lang['source']           = 'Source:';
+$lang['unknown']          = 'unknown';
+
+// ..ing = header message
+// ..ed = success message
+
+$lang['updating']         = 'Updating ...';
+$lang['updated']          = 'Plugin %s updated successfully';
+$lang['updates']          = 'The following plugins have been updated successfully';
+$lang['update_none']      = 'No updates found.';
+
+$lang['deleting']         = 'Deleting ...';
+$lang['deleted']          = 'Plugin %s deleted.';
+
+$lang['downloading']      = 'Downloading ...';
+$lang['downloaded']       = 'Plugin %s installed successfully';
+$lang['downloads']        = 'The following plugins have been installed successfully:';
+$lang['download_none']    = 'No plugins found, or there has been an unknown problem during downloading and installing.';
+
+// info titles
+$lang['plugin']           = 'Plugin:';
+$lang['components']       = 'Components';
+$lang['noinfo']           = 'This plugin returned no information, it may be invalid.';
+$lang['name']             = 'Name:';
+$lang['date']             = 'Date:';
+$lang['type']             = 'Type:';
+$lang['desc']             = 'Description:';
+$lang['author']           = 'Author:';
+$lang['www']              = 'Web:';
+
+// error messages
+$lang['error']            = 'An unknown error occurred.';
+$lang['error_download']   = 'Unable to download the plugin file: %s';
+$lang['error_badurl']     = 'Suspect bad url - unable to determine file name from the url';
+$lang['error_dircreate']  = 'Unable to create temporary folder to receive download';
+$lang['error_decompress'] = 'The plugin manager was unable to decompress the downloaded file. '.
+                            'This maybe as a result of a bad download, in which case you should try again; '.
+                            'or the compression format may be unknown, in which case you will need to '.
+                            'download and install the plugin manually.';
+$lang['error_copy']       = 'There was a file copy error while attempting to install files for plugin '.
+                            '%s: the disk could be full or file access permissions may be incorrect. '.
+                            'This may have resulted in a partially installed plugin and leave your wiki '.
+                            'installation unstable.';
+$lang['error_delete']     = 'There was an error while attempting to delete plugin %s.  '.
+                            'The most probably cause is insufficient file or directory access permissions';
+
+$lang['enabled']          = 'Plugin %s enabled.';
+$lang['notenabled']       = 'Plugin %s could not be enabled, check file permissions.';
+$lang['disabled']         = 'Plugin %s disabled.';
+$lang['notdisabled']      = 'Plugin %s could not be disabled, check file permissions.';
+$lang['packageinstalled'] = 'Plugin package (%d plugin(s): %s) successfully installed.';
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/plugins/plugin/lang/eo/admin_plugin.txt b/sources/lib/plugins/plugin/lang/eo/admin_plugin.txt
new file mode 100644
index 0000000..c97dddf
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/eo/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Administrado de Kromaĵoj ======
+
+En tiu ĉi paĝo vi povas administri ĉion pri DokuWiki-aj [[doku>plugins|kromaĵoj]]. Por sukcesi elŝuti kaj instali kromaĵon, via dosierujo de kromaĵoj devas esti konservebla por la retservilo.
diff --git a/sources/lib/plugins/plugin/lang/eo/lang.php b/sources/lib/plugins/plugin/lang/eo/lang.php
new file mode 100644
index 0000000..624246a
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/eo/lang.php
@@ -0,0 +1,60 @@
+
+ * @author Felipe Castro 
+ * @author Felipe Castro 
+ * @author Felipo Kastro 
+ * @author Erik Pedersen 
+ * @author Erik Pedersen 
+ * @author Robert BOGENSCHNEIDER 
+ * @author Robert Bogenschneider 
+ * @author Robert Bogenschneider 
+ */
+$lang['menu']                  = 'Administri Kromaĵojn';
+$lang['download']              = 'Elŝuti kaj instali novan kromaĵon';
+$lang['manage']                = 'Instalitaj kromaĵoj';
+$lang['btn_info']              = 'Info';
+$lang['btn_update']            = 'Ĝisdatigo';
+$lang['btn_delete']            = 'Forigi';
+$lang['btn_settings']          = 'agordoj';
+$lang['btn_download']          = 'Elŝuti';
+$lang['btn_enable']            = 'Konservi';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalite:';
+$lang['lastupdate']            = 'Laste ĝisdatigite:';
+$lang['source']                = 'Fonto:';
+$lang['unknown']               = 'nekonate';
+$lang['updating']              = 'Ĝisdatiganta ...';
+$lang['updated']               = 'Kromaĵo %s estas sukcese ĝisdatigita';
+$lang['updates']               = 'Jenaj kromaĵoj estas sukcese ĝisdatigitaj';
+$lang['update_none']           = 'Neniu ĝisdatigo troviĝas.';
+$lang['deleting']              = 'Foriganta ...';
+$lang['deleted']               = 'Kromaĵo %s estas forigita.';
+$lang['downloading']           = 'Elŝutanta ...';
+$lang['downloaded']            = 'La kromaĵo %s estas sukcese instalita';
+$lang['downloads']             = 'Jenaj kromaĵoj estas sukcese instalitaj:';
+$lang['download_none']         = 'Neniu kromaĵo troveblas, aŭ eble okazis nekonata problemo dum elŝuto kaj instalo.';
+$lang['plugin']                = 'Kromaĵo:';
+$lang['components']            = 'Komponantoj';
+$lang['noinfo']                = 'Tiu ĉi kromaĵo liveris neniun informon: eble ĝi ne validas.';
+$lang['name']                  = 'Nomo:';
+$lang['date']                  = 'Dato:';
+$lang['type']                  = 'Tipo:';
+$lang['desc']                  = 'Priskribo:';
+$lang['author']                = 'Aŭtoro:';
+$lang['www']                   = 'Retpaĝo:';
+$lang['error']                 = 'Nekonata eraro okazis.';
+$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 provu refoje; aŭ eble la kompakta formato ne estas konata, tiaokaze elŝutu kaj instalu 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. Verŝajne 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.';
+$lang['disabled']              = 'La kromaĵo %s estas malebligita.';
+$lang['notdisabled']           = 'La kromaĵo %s ne povis esti malebligita, kontrolu dosier-permesojn.';
+$lang['packageinstalled']      = 'Kromaĵa pakaĵo (%d kromaĵo(j): %s) sukcese instalita.';
diff --git a/sources/lib/plugins/plugin/lang/es/admin_plugin.txt b/sources/lib/plugins/plugin/lang/es/admin_plugin.txt
new file mode 100644
index 0000000..973789f
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/es/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Administración de Plugin (agregados) ======
+
+En esta página tu puedes administrar todo lo que tenga que ver con los [[doku>plugins|plugins]] de Dokuwiki.  Para poder descargar e instalar un plugin el usuario correspondiente al servidor de web debe poder escribir en el directorio de plugins.
diff --git a/sources/lib/plugins/plugin/lang/es/lang.php b/sources/lib/plugins/plugin/lang/es/lang.php
new file mode 100644
index 0000000..0ec3928
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/es/lang.php
@@ -0,0 +1,72 @@
+
+ * @author Oscar M. Lage 
+ * @author Gabriel Castillo 
+ * @author oliver@samera.com.py
+ * @author Enrico Nicoletto 
+ * @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 
+ * @author Victor Castelan 
+ * @author Mauro Javier Giamberardino 
+ * @author emezeta 
+ * @author Oscar Ciudad 
+ * @author Ruben Figols 
+ * @author Gerardo Zamudio 
+ * @author Mercè López mercelz@gmail.com
+ */
+$lang['menu']                  = 'Administración de Plugins';
+$lang['download']              = 'Descargar e instalar un nuevo plugin';
+$lang['manage']                = 'Plugins instalados';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'actualizar';
+$lang['btn_delete']            = 'borrar';
+$lang['btn_settings']          = 'configuraciones';
+$lang['btn_download']          = 'Descargar';
+$lang['btn_enable']            = 'Guardar';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalado:';
+$lang['lastupdate']            = 'Última actualización:';
+$lang['source']                = 'Origen:';
+$lang['unknown']               = 'desconocido';
+$lang['updating']              = 'Actualizando ...';
+$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 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';
+$lang['noinfo']                = 'Este plugin no devolvió información, puede ser inválido.';
+$lang['name']                  = 'Nombre:';
+$lang['date']                  = 'Fecha:';
+$lang['type']                  = 'Tipo:';
+$lang['desc']                  = 'Descripción:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Ha ocurrido un error desconocido.';
+$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 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.';
+$lang['notenabled']            = 'Plugin %s no puede ser habilitado, verifica los permisos del archivo.';
+$lang['disabled']              = 'Plugin %s deshabilitado.';
+$lang['notdisabled']           = 'Plugin %s no puede ser deshabilitado, verifica los permisos de archivo.';
+$lang['packageinstalled']      = 'Plugin (%d plugin(s): %s) instalado exitosamente.';
diff --git a/sources/lib/plugins/plugin/lang/et/lang.php b/sources/lib/plugins/plugin/lang/et/lang.php
new file mode 100644
index 0000000..088acf3
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/et/lang.php
@@ -0,0 +1,32 @@
+
+ */
+$lang['manage']                = 'Paigaldatud pluginad';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'uuenda';
+$lang['btn_delete']            = 'kustuta';
+$lang['btn_settings']          = 'seaded';
+$lang['btn_download']          = 'Lae alla';
+$lang['btn_enable']            = 'Salvesta';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Paigaldatud:';
+$lang['lastupdate']            = 'Viimati uuendatud:';
+$lang['source']                = 'Allikas:';
+$lang['unknown']               = 'tundmatu';
+$lang['updating']              = 'Uuendamine ...';
+$lang['update_none']           = 'Uuendusi ei leitud.';
+$lang['deleting']              = 'Kustutamine ...';
+$lang['deleted']               = 'Plugin %s on kustutatud.';
+$lang['downloading']           = 'Allalaadimine ...';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Komponendid';
+$lang['name']                  = 'Nimi:';
+$lang['date']                  = 'Kuupäev';
+$lang['type']                  = 'Tüüp:';
+$lang['desc']                  = 'Kirjeldus:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Veeb:';
diff --git a/sources/lib/plugins/plugin/lang/eu/admin_plugin.txt b/sources/lib/plugins/plugin/lang/eu/admin_plugin.txt
new file mode 100644
index 0000000..367cf37
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/eu/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Plugin Kudeaketa ======
+
+Orri honetan Dokuwiki [[doku>plugins|plugin-ekin]] erlazionatutako edozer kudeatu dezakezu. Plugin-en bat deskargatu eta instalatu ahal izateko, plugin-en direktorioak web zerbitzariarengatik idazgarria izan behar du.
diff --git a/sources/lib/plugins/plugin/lang/eu/lang.php b/sources/lib/plugins/plugin/lang/eu/lang.php
new file mode 100644
index 0000000..2fc07fe
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/eu/lang.php
@@ -0,0 +1,52 @@
+
+ * @author Zigor Astarbe 
+ */
+$lang['menu']                  = 'Plugin-ak Kudeatu';
+$lang['download']              = 'Plugin berri bat deskargatu eta instalatu';
+$lang['manage']                = 'Instalatutako Plugin-ak';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'eguneratu';
+$lang['btn_delete']            = 'ezabatu';
+$lang['btn_settings']          = 'ezarpenak';
+$lang['btn_download']          = 'Deskargatu';
+$lang['btn_enable']            = 'Gorde';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalatua:';
+$lang['lastupdate']            = 'Azken aldiz eguneratua:';
+$lang['source']                = 'Iturria:';
+$lang['unknown']               = 'ezezaguna';
+$lang['updating']              = 'Eguneratzen ...';
+$lang['updated']               = 'Arrakastaz eguneratu da %s plugin-a';
+$lang['updates']               = 'Ondorengo plugin-ak ondo eguneratu dira';
+$lang['update_none']           = 'Ez da eguneraketarik aurkitu.';
+$lang['deleting']              = 'Ezabatzen ...';
+$lang['deleted']               = '%s plugin-a ezabatua.';
+$lang['downloading']           = 'Deskargatzen ...';
+$lang['downloaded']            = '%s Plugin-a arrakastaz instalatua';
+$lang['downloads']             = 'Ondorengo plugin-ak arrakastaz instalatu dira:';
+$lang['download_none']         = 'Ez da plugin-ik aurkitu, edo arazo ezezagunen bat egon da deskargatu eta instalatzerako garaian.';
+$lang['plugin']                = 'Plugin-a:';
+$lang['components']            = 'Osagaiak';
+$lang['noinfo']                = 'Plugin honek ez du informaziorik itzuli, agian ez da erabilgarria.';
+$lang['name']                  = 'izena:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Mota:';
+$lang['desc']                  = 'Deskribapena:';
+$lang['author']                = 'Egilea:';
+$lang['www']                   = 'Web-gunea:';
+$lang['error']                 = 'Akats ezezagun bat gertatu da.';
+$lang['error_download']        = 'Ezin izan da plugin-aren honako fitxategia deskargatu: %s';
+$lang['error_badurl']          = 'Ustezko url okerra - ezin izan da fitxategi izena url-tik zehaztu';
+$lang['error_dircreate']       = 'Ezin izan da aldiroko karpeta sortu deskarga jasotzeko';
+$lang['error_decompress']      = 'Plugin kudeatzaileak ezin izan du deskargatutako fitxategia erauzi. Deskarga oker baten ondorioa izan daiteke, eta hala bada berriz saiatu beharko zenuke; edo agian trinkotze formatua ezezaguna da, hala izanik plugin-a eskuz deskargatu eta instalatu beharko zenuelarik.';
+$lang['error_copy']            = 'Fitxategi kopia akats bat egon da %s plugin-arentzat fitxategiak instalatzen saiatzean: diska betea egon liteke edo fitxategi atzipen baimena okerra izan daiteke. Honek partzialki instalatutako plugin bat eta wiki instalazioa ezegonkor utzi dezake.';
+$lang['error_delete']          = 'Akats bat gertatu da %s plugin-a ezabatzeko saiakera egitean. Arrazoia ziurrenik fitxategi edo direktorio atzipen baimen nahikoak ez izatea da.';
+$lang['enabled']               = '%s Plugin-a gaitua.';
+$lang['notenabled']            = '%s Plugin-a ezin izan da gaitu, egiaztatu fitxategi baimenak.';
+$lang['disabled']              = '%s Plugin-a ezgaitua.';
+$lang['notdisabled']           = '%s Plugin-a ezin izan da ezgaitu, egiaztatu fitxategi baimenak. ';
+$lang['packageinstalled']      = 'Plugin paketea (%d plugin(s): %s) arrakastaz instalatua izan da.';
diff --git a/sources/lib/plugins/plugin/lang/fa/admin_plugin.txt b/sources/lib/plugins/plugin/lang/fa/admin_plugin.txt
new file mode 100644
index 0000000..cd11fb4
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/fa/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== مدیریت افزونه‌ها ======
+
+در این صفحه شما می‌توانید [[doku>plugins|افزونه‌های]] Dokuwiki را مدیریت کنید. برای امکان دریافت و نصب افزونه‌ها، باید به شاخه‌ی افزونه‌ها (lib/plugin) دسترسی نوشتن برای وب‌سرور را محیا کنید.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/fa/lang.php b/sources/lib/plugins/plugin/lang/fa/lang.php
new file mode 100644
index 0000000..0a8fadb
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/fa/lang.php
@@ -0,0 +1,58 @@
+
+ * @author omidmr@gmail.com
+ * @author Omid Mottaghi 
+ * @author Mohammad Reza Shoaei 
+ * @author Milad DZand 
+ * @author AmirH Hassaneini 
+ */
+$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_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 قابلیت غیرفعال کردن ندارد، دسترسی‌ها را چک کنید.';
+$lang['packageinstalled']      = 'بسته افزونه (%d افزونه: %s) به درستی نصب شد.';
diff --git a/sources/lib/plugins/plugin/lang/fi/admin_plugin.txt b/sources/lib/plugins/plugin/lang/fi/admin_plugin.txt
new file mode 100644
index 0000000..9cdfa1c
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/fi/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Liitännäisten hallinta ======
+
+Tällä sivulla voit hallita DokuWikin [[doku>plugins|liitännäisiä]]. Voidaksesi ladata ja asentaa liitännäisiä pitää web-palvelimella olla kirjoitusoikeudet  plugin hakemistoon.
diff --git a/sources/lib/plugins/plugin/lang/fi/lang.php b/sources/lib/plugins/plugin/lang/fi/lang.php
new file mode 100644
index 0000000..f51746f
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/fi/lang.php
@@ -0,0 +1,55 @@
+
+ * @author Teemu Mattila 
+ * @author Sami Olmari 
+ */
+$lang['menu']                  = 'Ylläpidä liitännäisiä';
+$lang['download']              = 'Lataa ja asenna uusi liitännäinen';
+$lang['manage']                = 'Asennetut liitännäiset';
+$lang['btn_info']              = 'tietoa';
+$lang['btn_update']            = 'päivitä';
+$lang['btn_delete']            = 'poista';
+$lang['btn_settings']          = 'asetukset';
+$lang['btn_download']          = 'Lataa';
+$lang['btn_enable']            = 'Tallenna';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Asennettu:';
+$lang['lastupdate']            = 'Päivitetty viimeksi:';
+$lang['source']                = 'Lähde:';
+$lang['unknown']               = 'tuntematon';
+$lang['updating']              = 'Päivitetään ...';
+$lang['updated']               = 'Liitännäinen %s päivitetty onnistuneesti';
+$lang['updates']               = 'Seuraavat liitännäiset on päivitetty onnistuneesti';
+$lang['update_none']           = 'Päivityksiä ei löytynyt';
+$lang['deleting']              = 'Poistetaan ...';
+$lang['deleted']               = 'Liitännäinen %s poistettu.';
+$lang['downloading']           = 'Ladataan ...';
+$lang['downloaded']            = 'Liitännäinen %s asennettu onnistuneesti';
+$lang['downloads']             = 'Seuraavat liitännäiset on asennettu onnistuneesti';
+$lang['download_none']         = 'Liitännäisiä ei löytynyt tai on tapahtunut joku tuntematon virhe latauksen ja asennuksen aikana.';
+$lang['plugin']                = 'Liitännäinen:';
+$lang['components']            = 'Osa';
+$lang['noinfo']                = 'Liitännäinen ei palauttanut mitään tietoa ja se voi olla epäkelpo.';
+$lang['name']                  = 'Nimi:';
+$lang['date']                  = 'Päiväys:';
+$lang['type']                  = 'Tyyppi:';
+$lang['desc']                  = 'Kuvaus:';
+$lang['author']                = 'Tekijä:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Tapahtui tuntematon virhe.';
+$lang['error_download']        = 'Liitännäistiedoston %s latauksessa tapahtui tuntematon virhe.';
+$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.';
+$lang['error_delete']          = 'Liitännäisen %s poistossa tapahtui virhe. Todennäköisin syy on puutteelliset tiedoston tai hakemiston oikeudet';
+$lang['enabled']               = 'Liitännäinen %s käytössä';
+$lang['notenabled']            = 'Liitännäistä %s ei voitu ottaa käyttöön. Tarkista tiedostojen oikeudet.';
+$lang['disabled']              = 'Liitännäinen %s pois käytössä';
+$lang['notdisabled']           = 'Liitännäistä %s ei voitu ottaa pois käytöstä. Tarkista tiedostojen oikeudet.';
+$lang['packageinstalled']      = 'Pluginpaketti (%d plugin: %s:) asennettu onnistuneesti.';
diff --git a/sources/lib/plugins/plugin/lang/fr/admin_plugin.txt b/sources/lib/plugins/plugin/lang/fr/admin_plugin.txt
new file mode 100644
index 0000000..b7beba2
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/fr/admin_plugin.txt
@@ -0,0 +1,4 @@
+====== Gestion des extensions ======
+
+Cette page vous permet de gérer tout ce qui a trait aux [[doku>fr:plugins|extensions]] de DokuWiki. Pour pouvoir télécharger et installer un module, le répertoire « ''plugin'' » doit être accessible en écriture pour le serveur web.
+
diff --git a/sources/lib/plugins/plugin/lang/fr/lang.php b/sources/lib/plugins/plugin/lang/fr/lang.php
new file mode 100644
index 0000000..0592f3c
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/fr/lang.php
@@ -0,0 +1,69 @@
+
+ * @author Delassaux Julien 
+ * @author Maurice A. LeBlanc 
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri 
+ * @author Erik Pedersen 
+ * @author olivier duperray 
+ * @author Vincent Feltz 
+ * @author Philippe Bajoit 
+ * @author Florian Gaub 
+ * @author Samuel Dorsaz samuel.dorsaz@novelion.net
+ * @author Johan Guilbaud 
+ * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
+ * @author Yannick Aure 
+ * @author Olivier DUVAL 
+ * @author Anael Mobilia 
+ * @author Bruno Veilleux 
+ */
+$lang['menu']                  = 'Gestion des extensions';
+$lang['download']              = 'Télécharger et installer une nouvelle extension';
+$lang['manage']                = 'Extensions installées';
+$lang['btn_info']              = 'Info';
+$lang['btn_update']            = 'Mettre à jour';
+$lang['btn_delete']            = 'Supprimer';
+$lang['btn_settings']          = 'Paramètres';
+$lang['btn_download']          = 'Télécharger';
+$lang['btn_enable']            = 'Enregistrer';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Installé :';
+$lang['lastupdate']            = 'Dernière mise à jour :';
+$lang['source']                = 'Source :';
+$lang['unknown']               = 'inconnu';
+$lang['updating']              = 'Mise à jour…';
+$lang['updated']               = 'Extension %s mise à jour avec succès';
+$lang['updates']               = 'Les extensions suivantes ont été mises à jour avec succès';
+$lang['update_none']           = 'Aucune mise à jour n\'a été trouvée.';
+$lang['deleting']              = 'Suppression…';
+$lang['deleted']               = 'Extension %s supprimée.';
+$lang['downloading']           = 'Téléchargement…';
+$lang['downloaded']            = 'Extension %s installée avec succès';
+$lang['downloads']             = 'Les extensions suivantes ont été installées avec succès :';
+$lang['download_none']         = 'Aucune extension n\'a été trouvée, ou un problème inconnu est survenu durant le téléchargement et l\'installation.';
+$lang['plugin']                = 'Extension :';
+$lang['components']            = 'Composants';
+$lang['noinfo']                = 'Cette extension n\'a transmis aucune information, elle pourrait être invalide.';
+$lang['name']                  = 'Nom :';
+$lang['date']                  = 'Date :';
+$lang['type']                  = 'Type :';
+$lang['desc']                  = 'Description :';
+$lang['author']                = 'Auteur :';
+$lang['www']                   = 'Site web :';
+$lang['error']                 = 'Une erreur inconnue est survenue.';
+$lang['error_download']        = 'Impossible de télécharger le fichier de l\'extension : %s';
+$lang['error_badurl']          = 'URL suspecte : impossible de déterminer le nom du fichier à partir de l\'URL';
+$lang['error_dircreate']       = 'Impossible de créer le répertoire temporaire pour effectuer le téléchargement';
+$lang['error_decompress']      = 'Le gestionnaire d\'extensions 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 l\'extension manuellement.';
+$lang['error_copy']            = 'Une erreur de copie est survenue lors de l\'installation des fichiers de l\'extension %s : le disque est peut-être plein ou les autorisations d\'accès sont incorrects. Il a pu en résulter une installation partielle de l\'extension et laisser votre installation du wiki instable.';
+$lang['error_delete']          = 'Une erreur est survenue lors de la suppression de l\'extension %s. La raison la plus probable est l\'insuffisance des autorisations sur les fichiers ou les répertoires.';
+$lang['enabled']               = 'Extension %s activée.';
+$lang['notenabled']            = 'L\'extension %s n\'a pas pu être activée, vérifiez les autorisations des fichiers.';
+$lang['disabled']              = 'Extension %s désactivée.';
+$lang['notdisabled']           = 'L\'extension %s n\'a pas pu être désactivée, vérifiez les autorisations des fichiers.';
+$lang['packageinstalled']      = 'Ensemble d\'extensions (%d extension(s): %s) installé avec succès.';
diff --git a/sources/lib/plugins/plugin/lang/gl/admin_plugin.txt b/sources/lib/plugins/plugin/lang/gl/admin_plugin.txt
new file mode 100644
index 0000000..216285a
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/gl/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Xestión de Extensións ======
+
+Nesta páxina podes xestionar todas as accións posíbeis cos [[doku>plugins|extensións]] do DokuWiki. Para poder descargar e instalar unha extensión, o teu cartafol de extensións debe ser escribíbel polo servidor web.
diff --git a/sources/lib/plugins/plugin/lang/gl/lang.php b/sources/lib/plugins/plugin/lang/gl/lang.php
new file mode 100644
index 0000000..b3da440
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/gl/lang.php
@@ -0,0 +1,53 @@
+
+ * @author Oscar M. Lage 
+ * @author Rodrigo Rega 
+ */
+$lang['menu']                  = 'Xestionar Extensións';
+$lang['download']              = 'Descargar e instalar unha nova extensión';
+$lang['manage']                = 'Extensións Instalados';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'actualización';
+$lang['btn_delete']            = 'eliminar';
+$lang['btn_settings']          = 'configuración';
+$lang['btn_download']          = 'Descargar';
+$lang['btn_enable']            = 'Gardar';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalado:';
+$lang['lastupdate']            = 'Última actualización:';
+$lang['source']                = 'Fonte:';
+$lang['unknown']               = 'descoñecido';
+$lang['updating']              = 'Actualizando...';
+$lang['updated']               = 'Actualizouse correctamente a extensión %s';
+$lang['updates']               = 'Actualizáronse correctamente as seguintes extensións';
+$lang['update_none']           = 'Non se atoparon actualizacións.';
+$lang['deleting']              = 'Eliminando...';
+$lang['deleted']               = 'Eliminado a extensión %s.';
+$lang['downloading']           = 'Descargando...';
+$lang['downloaded']            = 'Instalouse correctamente a extensión %s';
+$lang['downloads']             = 'Instaláronse correctamente as seguintes extensións:';
+$lang['download_none']         = 'Non se atoparon extensións, ou aconteceu un problema descoñecido durante a descarga e instalación.';
+$lang['plugin']                = 'Extensión:';
+$lang['components']            = 'Compoñentes';
+$lang['noinfo']                = 'Esta extensión non devolveu información ningunha. Pode que non sexa válida.';
+$lang['name']                  = 'Nome:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Tipo:';
+$lang['desc']                  = 'Descrición:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Houbo un erro descoñecido.';
+$lang['error_download']        = 'Non se puido descargar o arquivo de extensión: %s';
+$lang['error_badurl']          = 'URL posiblemente incorrecto - non se puido determinar o nome do arquivo mediante o URL';
+$lang['error_dircreate']       = 'Non se puido crear un cartafol temporal para recibir a descarga';
+$lang['error_decompress']      = 'O xestor de extensións non foi quen de descomprimir o arquivo descargado. Isto podería ser causado por unha descarga corrupta, polo que, en tal caso, podes tentalo de novo; ou pode que o formato de compresión sexa descoñecido, co que precisarás descargar e instalar a extensión de xeito manual.';
+$lang['error_copy']            = 'Houbo un erro de copia de arquivo ao tentar instalar a extensión %s: pode que o disco estea cheo ou que os permisos de acceso sexan incorrectos. Isto podería dar lugar a unha instalación parcial da extensión e facer que a túa instalación do wiki se volva inestable.';
+$lang['error_delete']          = 'Houbo un erro ao tentar eliminar a extensión %s. O máis probable é que sexa causado por permisos de acceso ao arquivo ou directorio insuficientes.';
+$lang['enabled']               = 'Extensión %s activado.';
+$lang['notenabled']            = 'A extensión %s non puido ser activada, comproba os permisos de arquivo.';
+$lang['disabled']              = 'Extensión %s desactivada.';
+$lang['notdisabled']           = 'A extensión %s non puido ser desactivada, comproba os permisos de arquivo.';
+$lang['packageinstalled']      = 'Paquete de extensión (%d plugin(s): %s) instalado axeitadamente.';
diff --git a/sources/lib/plugins/plugin/lang/he/admin_plugin.txt b/sources/lib/plugins/plugin/lang/he/admin_plugin.txt
new file mode 100644
index 0000000..206d368
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/he/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== ניהול הרחבות ======
+
+בדף זה ניתן לנהל כל דבר הקשור ל[[doku>plugins|הרחבות]] של DokuWiki. כדי שניתן יהיה להוריד ולהתקין הרחבה על תיקית ה-plugins שלך להיות ברת כתיבה על ידי שרת הרשת.
+
+
diff --git a/sources/lib/plugins/plugin/lang/he/lang.php b/sources/lib/plugins/plugin/lang/he/lang.php
new file mode 100644
index 0000000..7753c23
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/he/lang.php
@@ -0,0 +1,55 @@
+
+ * @author Dotan Kamber 
+ * @author Moshe Kaplan 
+ * @author Yaron Yogev 
+ * @author Yaron Shahrabani 
+ */
+$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']          = 'כנראה כתובת שגויה - כשל בקביעת שם הקובץ מהכתובת';
+$lang['error_dircreate']       = 'כשל ביצירת תיקיה זמנית לקבלת ההורדה';
+$lang['error_decompress']      = 'מנהל ההרחבות כשל בפרישת הקובץ שהורד. יתכן כי זו תוצאה של הורדה תקולה ובמקרה זה עליך לנסות שנית; או שיתכן כי תסדיר הכיווץ אינו ידוע, במקרה זה יהיה עליך להוריד ולהתקין את ההרחבה ידנית.';
+$lang['error_copy']            = 'חלה שגיאה בהעתקת הקובץ בניסיון להתקין קבצים להרחבה %s: ייתכן כי הדיסק מלא או שהרשאות הגישה לקבצים שגויות. יתכן כי בשל כך נוצרה התקנה חלקית של ההרחבה שתשאיר את התקנת הויקי שלך לא יציבה.';
+$lang['error_delete']          = 'חלה שגיאה בעת ניסיון למחיקת ההרחבה %s.  הסיבה הסבירה ביותר היא הרשאות גישה לקבצים ולספריות שאינן מספקות';
+$lang['enabled']               = 'תוסף %s מופעל.';
+$lang['notenabled']            = 'לא ניתן להפעיל את התוסף %s, בדוק הרשאות קבצים.';
+$lang['disabled']              = 'תוסף %s מושבת.';
+$lang['notdisabled']           = 'לא ניתן להשבית את התוסף %s, בדוק הרשאות קבצים.';
diff --git a/sources/lib/plugins/plugin/lang/hi/lang.php b/sources/lib/plugins/plugin/lang/hi/lang.php
new file mode 100644
index 0000000..89d27ce
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/hi/lang.php
@@ -0,0 +1,12 @@
+
+ * @author yndesai@gmail.com
+ */
+$lang['unknown']               = 'अज्ञात';
+$lang['date']                  = 'दिनांक:';
+$lang['author']                = 'लेखक:';
+$lang['error']                 = 'अज्ञात त्रुटि हुइ';
diff --git a/sources/lib/plugins/plugin/lang/hr/lang.php b/sources/lib/plugins/plugin/lang/hr/lang.php
new file mode 100644
index 0000000..96f1d6a
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/hr/lang.php
@@ -0,0 +1,8 @@
+
+ * @author Dražen Odobašić 
+ * @author Dejan Igrec dejan.igrec@gmail.com
+ */
diff --git a/sources/lib/plugins/plugin/lang/hu/admin_plugin.txt b/sources/lib/plugins/plugin/lang/hu/admin_plugin.txt
new file mode 100644
index 0000000..afa08d3
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/hu/admin_plugin.txt
@@ -0,0 +1,4 @@
+====== Bővítménykezelő ======
+
+Ezen az oldalon a Dokuwiki [[doku>plugins|bővítményeivel]] kapcsolatos teendőket láthatod el. A webszervernek tudni kell írnia a //plugin// könyvtárat, hogy új bővítményeket tudj ezen a felületen keresztül letölteni és telepíteni.
+
diff --git a/sources/lib/plugins/plugin/lang/hu/lang.php b/sources/lib/plugins/plugin/lang/hu/lang.php
new file mode 100644
index 0000000..b8fa2cd
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/hu/lang.php
@@ -0,0 +1,58 @@
+
+ * @author Siaynoq Mage 
+ * @author schilling.janos@gmail.com
+ * @author Szabó Dávid 
+ * @author Sándor TIHANYI 
+ * @author David Szabo 
+ * @author Marton Sebok 
+ */
+$lang['menu']                  = 'Bővítménykezelő';
+$lang['download']              = 'Új bővítmény letöltése és telepítése';
+$lang['manage']                = 'Telepített bővítmények';
+$lang['btn_info']              = 'infó';
+$lang['btn_update']            = 'frissítés';
+$lang['btn_delete']            = 'törlés';
+$lang['btn_settings']          = 'beállítások';
+$lang['btn_download']          = 'Letöltés';
+$lang['btn_enable']            = 'Mentés';
+$lang['url']                   = 'Cím';
+$lang['installed']             = 'Telepítve:';
+$lang['lastupdate']            = 'Utolsó frissítés:';
+$lang['source']                = 'Forrás:';
+$lang['unknown']               = 'ismeretlen';
+$lang['updating']              = 'Frissítés...';
+$lang['updated']               = 'A %s bővítmény frissítése sikeres';
+$lang['updates']               = 'A következő bővítmények frissítése sikeres:';
+$lang['update_none']           = 'Nem találtam újabb verziót.';
+$lang['deleting']              = 'Törlés...';
+$lang['deleted']               = 'A %s bővítményt eltávolítva.';
+$lang['downloading']           = 'Letöltés...';
+$lang['downloaded']            = 'A %s bővítmény telepítése sikeres.';
+$lang['downloads']             = 'A következő bővítmények telepítése sikeres.';
+$lang['download_none']         = 'Nem találtam bővítményt vagy ismeretlen hiba történt a letöltés/telepítés közben.';
+$lang['plugin']                = 'Bővítmény:';
+$lang['components']            = 'Részek';
+$lang['noinfo']                = 'Ez a bővítmény nem tartalmaz információt, lehet, hogy hibás.';
+$lang['name']                  = 'Név:';
+$lang['date']                  = 'Dátum:';
+$lang['type']                  = 'Típus:';
+$lang['desc']                  = 'Leírás:';
+$lang['author']                = 'Szerző:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Ismeretlen hiba lépett fel.';
+$lang['error_download']        = 'Nem tudom letölteni a fájlt a bővítményhez: %s';
+$lang['error_badurl']          = 'Feltehetően rossz URL - nem tudom meghatározni a fájlnevet az URL-ből.';
+$lang['error_dircreate']       = 'Nem tudom létrehozni az átmeneti könyvtárat a letöltéshez.';
+$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ágai 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ágai 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ájlhozzáférési jogosultságokat.';
+$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ájlhozzáférési jogosultságokat.';
+$lang['packageinstalled']      = 'A bővítménycsomag(ok) feltelepült(ek): %d plugin(s): %s';
diff --git a/sources/lib/plugins/plugin/lang/ia/admin_plugin.txt b/sources/lib/plugins/plugin/lang/ia/admin_plugin.txt
new file mode 100644
index 0000000..c7f758c
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ia/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Gestion de plug-ins ======
+
+In iste pagina tu pote gerer omne cosas con relation al [[doku>plugins|plug-ins]] de DokuWiki. Pro poter discargar e installar un plug-in, le directorio de plug-ins debe permitter le accesso de scriptura al servitor web.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/ia/lang.php b/sources/lib/plugins/plugin/lang/ia/lang.php
new file mode 100644
index 0000000..523f858
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ia/lang.php
@@ -0,0 +1,51 @@
+
+ * @author Martijn Dekker 
+ */
+$lang['menu']                  = 'Gestion de plug-ins';
+$lang['download']              = 'Discargar e installar un nove plug-in';
+$lang['manage']                = 'Plug-ins installate';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'actualisar';
+$lang['btn_delete']            = 'deler';
+$lang['btn_settings']          = 'configurationes';
+$lang['btn_download']          = 'Discargar';
+$lang['btn_enable']            = 'Salveguardar';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Installate:';
+$lang['lastupdate']            = 'Ultime actualisation:';
+$lang['source']                = 'Origine:';
+$lang['unknown']               = 'incognite';
+$lang['updating']              = 'Actualisation…';
+$lang['updated']               = 'Actualisation del plug-in %s succedite';
+$lang['updates']               = 'Le sequente plug-ins ha essite actualisate con successo';
+$lang['update_none']           = 'Nulle actualisation trovate.';
+$lang['deleting']              = 'Deletion…';
+$lang['deleted']               = 'Le plug-in %s ha essite delite.';
+$lang['downloading']           = 'Discargamento…';
+$lang['downloaded']            = 'Installation del plug-in %s succedite.';
+$lang['downloads']             = 'Le sequente plug-ins ha essite installate con successo:';
+$lang['download_none']         = 'Nulle plug-in trovate, o il ha occurrite un problema incognite durante le discargamento e installation.';
+$lang['plugin']                = 'Plug-in:';
+$lang['components']            = 'Componentes';
+$lang['noinfo']                = 'Iste plug-in retornava nulle information; illo pote esser invalide.';
+$lang['name']                  = 'Nomine:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Typo:';
+$lang['desc']                  = 'Description:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Un error incognite ha occurrite.';
+$lang['error_download']        = 'Impossibile discargar le file del plug-in: %s';
+$lang['error_badurl']          = 'URL probabilemente invalide; impossibile determinar le nomine del file ex le URL';
+$lang['error_dircreate']       = 'Impossibile crear le dossier temporari pro reciper le discargamento';
+$lang['error_decompress']      = 'Le gestor de plug-ins non poteva decomprimer le file discargate. Isto pote esser le resultato de un discargamento defectuose, in le qual caso tu deberea probar lo de novo; o le formato de compression pote esser incognite, in le qual caso tu debe discargar e installar le plug-in manualmente.';
+$lang['error_copy']            = 'Il occurreva un error durante le tentativa de installar files pro le plugin %s: le disco pote esser plen o le permissiones de accesso a files pote esser incorrecte. Isto pote haber resultate in un plug-in partialmente installate e lassar tu installation del wiki instabile.';
+$lang['error_delete']          = 'Il occurreva un error durante le tentativa de deler le plug-in %s. Le causa le plus probabile es insufficiente permissiones de files o directorios.';
+$lang['enabled']               = 'Plug-in %s activate.';
+$lang['notenabled']            = 'Le plug-in %s non poteva esser activate; verifica le permissiones de accesso a files.';
+$lang['disabled']              = 'Plug-in %s disactivate.';
+$lang['notdisabled']           = 'Le plug-in %s non poteva esser disactivate; verifica le permissiones de accesso a files.';
diff --git a/sources/lib/plugins/plugin/lang/id-ni/lang.php b/sources/lib/plugins/plugin/lang/id-ni/lang.php
new file mode 100644
index 0000000..d367340
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/id-ni/lang.php
@@ -0,0 +1,7 @@
+
+ * @author Yustinus Waruwu 
+ */
diff --git a/sources/lib/plugins/plugin/lang/id/lang.php b/sources/lib/plugins/plugin/lang/id/lang.php
new file mode 100644
index 0000000..2653b07
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/id/lang.php
@@ -0,0 +1,32 @@
+
+ * @author Yustinus Waruwu 
+ */
+$lang['btn_info']              = 'Info';
+$lang['btn_update']            = 'Baharui';
+$lang['btn_delete']            = 'Hapus';
+$lang['btn_settings']          = 'Pengaturan';
+$lang['btn_download']          = 'Unduh';
+$lang['btn_enable']            = 'Simpan';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instal';
+$lang['lastupdate']            = 'Pembaharuan terakhir:';
+$lang['source']                = 'Sumber:';
+$lang['unknown']               = 'Tidak kenal';
+$lang['updating']              = 'Terbaharui ...';
+$lang['update_none']           = 'Tidak ditemukan pembaharuan';
+$lang['deleting']              = 'Terhapus ...';
+$lang['deleted']               = 'Hapus Plugin %s.';
+$lang['downloading']           = 'Unduh ...';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Komponen';
+$lang['name']                  = 'Nama:';
+$lang['date']                  = 'Tanggal:';
+$lang['type']                  = 'Tipe:';
+$lang['desc']                  = 'Penjelasan:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
diff --git a/sources/lib/plugins/plugin/lang/is/lang.php b/sources/lib/plugins/plugin/lang/is/lang.php
new file mode 100644
index 0000000..0ef1243
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/is/lang.php
@@ -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 --git a/sources/lib/plugins/plugin/lang/it/admin_plugin.txt b/sources/lib/plugins/plugin/lang/it/admin_plugin.txt
new file mode 100644
index 0000000..5591f08
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/it/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Gestione Plugin ======
+
+In questa pagina puoi gestire tutto ciò che riguarda i [[doku>plugins|plugin]] di DokuWiki. Per poter scaricare e installare un plugin, il webserver deve avere accesso in scrittura alla directory dei plugin.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/it/lang.php b/sources/lib/plugins/plugin/lang/it/lang.php
new file mode 100644
index 0000000..186bf97
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/it/lang.php
@@ -0,0 +1,63 @@
+
+ * @author Silvia Sargentoni 
+ * @author Pietro Battiston toobaz@email.it
+ * @author Diego Pierotto ita.translations@tiscali.it
+ * @author ita.translations@tiscali.it
+ * @author Lorenzo Breda 
+ * @author snarchio@alice.it
+ * @author robocap 
+ * @author Osman Tekin osman.tekin93@hotmail.it
+ * @author Jacopo Corbetta 
+ * @author Matteo Pasotti 
+ * @author snarchio@gmail.com
+ */
+$lang['menu']                  = 'Gestione Plugin';
+$lang['download']              = 'Scarica e installa un nuovo plugin';
+$lang['manage']                = 'Plugin installati';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'aggiorna';
+$lang['btn_delete']            = 'elimina';
+$lang['btn_settings']          = 'configurazione';
+$lang['btn_download']          = 'Scarica';
+$lang['btn_enable']            = 'Salva';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Installato:';
+$lang['lastupdate']            = 'Ultimo aggiornamento:';
+$lang['source']                = 'Origine:';
+$lang['unknown']               = 'sconosciuto';
+$lang['updating']              = 'Aggiornamento in corso ...';
+$lang['updated']               = 'Aggiornamento plugin %s riuscito';
+$lang['updates']               = 'Aggiornamento dei seguenti plugin riuscito:';
+$lang['update_none']           = 'Nessun aggiornamento trovato.';
+$lang['deleting']              = 'Eliminazione in corso ...';
+$lang['deleted']               = 'Plugin %s eliminato.';
+$lang['downloading']           = 'Scaricamento in corso ...';
+$lang['downloaded']            = 'Installazione plugin %s riuscita';
+$lang['downloads']             = 'Installazione dei seguenti plugin riuscita:';
+$lang['download_none']         = 'Nessun plugin trovato, oppure si è verificato un problema sconosciuto durante il download e l\'installazione.';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Componenti';
+$lang['noinfo']                = 'Questo plugin non ha fornito alcuna informazione, potrebbe non essere valido.';
+$lang['name']                  = 'Nome:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Tipo:';
+$lang['desc']                  = 'Descrizione:';
+$lang['author']                = 'Autore:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Si è verificato un errore sconosciuto.';
+$lang['error_download']        = 'Impossibile scaricare il plugin: %s';
+$lang['error_badurl']          = 'Possibile URL non corretta - impossibile determinare il nome del file dalla URL fornita';
+$lang['error_dircreate']       = 'Impossibile creare la directory temporanea dove scaricare il file';
+$lang['error_decompress']      = 'Impossibile decomprimere il file scaricato. Questo potrebbe essere il risultato di un download incompleto, in tal caso dovresti provare di nuovo; oppure il formato di compressione potrebbe essere sconosciuto, in questo caso è necessario scaricare e installare il plugin manualmente.';
+$lang['error_copy']            = 'Si è verificato un errore nella copia di un file durante l\'installazione del plugin %s: il disco potrebbe essere pieno oppure i permessi di accesso al file potrebbero non essere corretti. Il plugin potrebbe essere stato installato solo parzialmente, questo potrebbe causare instabilità al sistema.';
+$lang['error_delete']          = 'Si è verificato un errore durante l\'eliminazione del plugin %s.  Molto probabilmente i permessi di acesso ai file o alla directory non sono sufficienti';
+$lang['enabled']               = 'Plugin %s abilitato.';
+$lang['notenabled']            = 'Impossibile abilitare il plugin %s, verifica i permessi dei file.';
+$lang['disabled']              = 'Plugin %s disabilitato.';
+$lang['notdisabled']           = 'Impossibile disabilitare il plugin %s, verifica i permessi dei file.';
+$lang['packageinstalled']      = 'Pacchetto plugin (%d plugin(s): %s) installato con successo.';
diff --git a/sources/lib/plugins/plugin/lang/ja/admin_plugin.txt b/sources/lib/plugins/plugin/lang/ja/admin_plugin.txt
new file mode 100644
index 0000000..c3b8535
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ja/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== プラグイン管理 ======
+
+この画面で、DokuWikiで使用するプラグイン [[doku>plugins|plugins]] の管理を行うことが出来ます。 プラグインをダウンロード・インストールするためには、サーバー内のプラグイン用フォルダーを 書き込み可にしておく必要があります。
+
+
diff --git a/sources/lib/plugins/plugin/lang/ja/lang.php b/sources/lib/plugins/plugin/lang/ja/lang.php
new file mode 100644
index 0000000..d66e109
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ja/lang.php
@@ -0,0 +1,58 @@
+
+ * @author Christopher Smith 
+ * @author Ikuo Obataya 
+ * @author Daniel Dupriest 
+ * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
+ * @author Satoshi Sahara 
+ */
+$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：ディスク容量や書き込みの権限を確認してください。このエラーによりプラグインのインストールが完全に行われず、Wikiが不安定な状態です。';
+$lang['error_delete']          = 'プラグインの削除中にエラーが発生しました %s。プラグインが不完全なファイルであったか、ディレクトリの権限が正しくないことが原因であると考えられます。';
+$lang['enabled']               = 'プラグイン %s が有効です。';
+$lang['notenabled']            = 'プラグイン %s を有効にすることができません。権限を確認してください。';
+$lang['disabled']              = 'プラグイン %s が無効です。';
+$lang['notdisabled']           = 'プラグイン %s を無効にすることができません。権限を確認してください。';
+$lang['packageinstalled']      = 'プラグインパッケージ（%d plugin(s): %s）は正しくインストールされました。';
diff --git a/sources/lib/plugins/plugin/lang/kk/lang.php b/sources/lib/plugins/plugin/lang/kk/lang.php
new file mode 100644
index 0000000..dde5b95
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/kk/lang.php
@@ -0,0 +1,6 @@
+ko:plugins|플러그인]]에 관련된 모든 관리를 할 수 있습니다. 플러그인을 다운로드하고 설치하기 위해서는 웹 서버가 플러그인 폴더에 대해 쓰기 권한이 있어야 합니다.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/ko/lang.php b/sources/lib/plugins/plugin/lang/ko/lang.php
new file mode 100644
index 0000000..4cd1ae3
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ko/lang.php
@@ -0,0 +1,58 @@
+
+ * @author Seung-Chul Yoo 
+ * @author erial2@gmail.com
+ * @author Myeongjin 
+ * @author Garam 
+ */
+$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 같습니다 - URL에서 파일 이름을 알 수 없습니다';
+$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 플러그인을 비활성화할 수 없습니다. 파일 권한을 확인하하세요.';
+$lang['packageinstalled']      = '플러그인 패키지(플러그인 %d개: %s)가 성공적으로 설치되었습니다.';
diff --git a/sources/lib/plugins/plugin/lang/la/admin_plugin.txt b/sources/lib/plugins/plugin/lang/la/admin_plugin.txt
new file mode 100644
index 0000000..2a41977
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/la/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Addendorum Administratio ======
+
+In hac pagina omnia uicis [[doku>plugins|plugins]] mutare et administrare potes. Vt addenda capere et his uti, in scrinio addendorum scribere et legere potest.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/la/lang.php b/sources/lib/plugins/plugin/lang/la/lang.php
new file mode 100644
index 0000000..cd2d81c
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/la/lang.php
@@ -0,0 +1,50 @@
+
+ */
+$lang['menu']                  = 'Addendorum administratio';
+$lang['download']              = 'Noua addenda cape';
+$lang['manage']                = 'Addenta in usu';
+$lang['btn_info']              = 'Notae';
+$lang['btn_update']            = 'Nouare';
+$lang['btn_delete']            = 'Delere';
+$lang['btn_settings']          = 'Optiones';
+$lang['btn_download']          = 'Capere';
+$lang['btn_enable']            = 'Seruare';
+$lang['url']                   = 'VRL';
+$lang['installed']             = 'In usu:';
+$lang['lastupdate']            = 'Extrema renouatio:';
+$lang['source']                = 'Fons:';
+$lang['unknown']               = 'Ignotum';
+$lang['updating']              = 'Nouans...';
+$lang['updated']               = 'Addenda %s nouata feliciter';
+$lang['updates']               = 'Hae addenda nouata feliciter sunt';
+$lang['update_none']           = 'Nulla renouatio inuenta';
+$lang['deleting']              = 'Delens...';
+$lang['deleted']               = 'Addenda %s deleta.';
+$lang['downloading']           = 'Capens ...';
+$lang['downloaded']            = 'Addenda %s recte in usu';
+$lang['downloads']             = 'Hae addenda feliciter in usu:';
+$lang['download_none']         = 'Nulla addenda reperta aut errores in capiendo sunt.';
+$lang['plugin']                = 'Addenda:';
+$lang['components']            = 'Partes';
+$lang['noinfo']                = 'Addenda alias notas non habent.';
+$lang['name']                  = 'Nomen:';
+$lang['date']                  = 'Dies:';
+$lang['type']                  = 'Genus:';
+$lang['desc']                  = 'Descriptio:';
+$lang['author']                = 'Auctor:';
+$lang['www']                   = 'Situs interretialis:';
+$lang['error']                 = 'Error ignotus.';
+$lang['error_download']        = 'Addenda quae non renouantur: %s';
+$lang['error_badurl']          = 'VRL malum';
+$lang['error_dircreate']       = 'Scrinium temporaneum non creatur, sic nihil capi potest';
+$lang['error_decompress']      = 'Addendorum administrator nouare non potest. Rursum capere nouationes temptat aut manu addenda noua.';
+$lang['error_copy']            = 'Exemplar malum in scrinio addendorum %s est: facultates documenti scrinique fortasse illegitimae sunt. Hic accidit cum addenda partim nouata sunt.';
+$lang['error_delete']          = 'Addenda %s non delentur.';
+$lang['enabled']               = 'Addenda %s apta facta.';
+$lang['notenabled']            = 'Addenda %s quae apta fieri non possunt.';
+$lang['disabled']              = 'Addenda %s non in usu.';
+$lang['notdisabled']           = 'Addenda %s quae inepta fieri non possunt.';
diff --git a/sources/lib/plugins/plugin/lang/lb/admin_plugin.txt b/sources/lib/plugins/plugin/lang/lb/admin_plugin.txt
new file mode 100644
index 0000000..223de10
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/lb/admin_plugin.txt
@@ -0,0 +1,4 @@
+====== Plugin Management ======
+
+Op dëser Säit kanns de alles verwalte wat mat Dokuwiki [[doku>plugins|Pluginen]] ze dinn huet. Fir e Plugin kënnen z'installéieren, muss däi Pluginverzeechnës vum Webserver schreiwbar sinn.
+
diff --git a/sources/lib/plugins/plugin/lang/lb/lang.php b/sources/lib/plugins/plugin/lang/lb/lang.php
new file mode 100644
index 0000000..59acdf7
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/lb/lang.php
@@ -0,0 +1,6 @@
+plugins|plugins]]. Tam kad parsiųsti ir įdiegti kokį nors priedą jūsų web serveris privalo turėti įrašymo teises priedų kataloge.
diff --git a/sources/lib/plugins/plugin/lang/lt/lang.php b/sources/lib/plugins/plugin/lang/lt/lang.php
new file mode 100644
index 0000000..c5b2fa1
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/lt/lang.php
@@ -0,0 +1,13 @@
+
+ */
+$lang['name']                  = 'Vardas:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Tipas:';
+$lang['desc']                  = 'Aprašas:';
+$lang['author']                = 'Autorius:';
+$lang['www']                   = 'Tinklapis:';
diff --git a/sources/lib/plugins/plugin/lang/lv/admin_plugin.txt b/sources/lib/plugins/plugin/lang/lv/admin_plugin.txt
new file mode 100644
index 0000000..8033506
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/lv/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Moduļu pārvaldīšana ======
+
+Šajā lapā varat pārvaldīt visu, kas saistīts ar Dokuwiki [[doku>plugins|moduļiem]]. Lai varētu lejupielādēt un uzstādīt moduļus, to direktorijai serverī vajag rakstīšanas tiesības.
diff --git a/sources/lib/plugins/plugin/lang/lv/lang.php b/sources/lib/plugins/plugin/lang/lv/lang.php
new file mode 100644
index 0000000..9a87278
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/lv/lang.php
@@ -0,0 +1,51 @@
+
+ */
+$lang['menu']                  = 'Moduļu pārvaldība';
+$lang['download']              = 'Lejupielādēt un instalēt jaunu moduli.';
+$lang['manage']                = 'Instalētie moduļi';
+$lang['btn_info']              = 'uzziņa';
+$lang['btn_update']            = 'atjaunināt';
+$lang['btn_delete']            = 'dzēst';
+$lang['btn_settings']          = 'parametri';
+$lang['btn_download']          = 'Lejupielādēt';
+$lang['btn_enable']            = 'Saglabāt';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalēts:';
+$lang['lastupdate']            = 'Atjaunināts:';
+$lang['source']                = 'Avots:';
+$lang['unknown']               = 'nav zināms';
+$lang['updating']              = 'Atjauninu...';
+$lang['updated']               = 'Modulis %s veiksmīgi atjaunināts';
+$lang['updates']               = 'Veiksmīgi atjaunināti moduļi:';
+$lang['update_none']           = 'Jauninājums nav atrasts';
+$lang['deleting']              = 'Dzēšu...';
+$lang['deleted']               = 'Modulis %s dzēsts';
+$lang['downloading']           = 'Lejupielādēju...';
+$lang['downloaded']            = 'Modulis %s veiksmīgi instalēts';
+$lang['downloads']             = 'Veiksmīgi instalēti moduļi: ';
+$lang['download_none']         = 'Neviens modulis nav atrasts vai arī gadījusies nezinām kļūme lejupielādes un instalācijas gaitā.';
+$lang['plugin']                = 'Modulis:';
+$lang['components']            = 'Sastāvdaļas';
+$lang['noinfo']                = 'Modulis nesniedz informāciju, tas varbūt ir bojāts.';
+$lang['name']                  = 'Nosaukums:';
+$lang['date']                  = 'Datums:';
+$lang['type']                  = 'Tips:';
+$lang['desc']                  = 'Apraksts:';
+$lang['author']                = 'Autors:';
+$lang['www']                   = 'Mājaslapa:';
+$lang['error']                 = 'Gadījās nezināma kļūme.';
+$lang['error_download']        = 'Nevar lejupielādēt moduļa failu %s';
+$lang['error_badurl']          = 'Aizdomas par aplamu URL - jo no tā nevar noteikt faila vārdu.';
+$lang['error_dircreate']       = 'Nevar izveidot pagaidu direktoriju, kur saglabāt lejupielādēto. ';
+$lang['error_decompress']      = 'Moduļu pārvaldnieks nevar atspiest lejupielādēto failu. Vai nu neizdevusi es lejupielāde, mēģiniet atkārtot, vai arī nezinām arhīva formāts un tad  modulis jāielādē un jāinstalē tev pašam.';
+$lang['error_copy']            = 'Faila kopēšanas kļūda instalējot moduli%s: disks pārpildīts vai aplamas piekļuves tiesības. Rezultātā var iegūt daļēji instalētu moduli un nestabilu Wiki sistēmu.';
+$lang['error_delete']          = 'Kļūme dzēšot moduli %s. Ticamākais iemesls ir direktorijas pieejas tiesību trūkums. ';
+$lang['enabled']               = 'Modulis %s pieslēgts.';
+$lang['notenabled']            = 'Moduli %s nevar pieslēgt, pārbaudi failu tiesības.';
+$lang['disabled']              = 'Modulis %s atslēgts.';
+$lang['notdisabled']           = 'Moduli %s nevar atslēgt, pārbaudi failu tiesības.';
+$lang['packageinstalled']      = 'Moduļu paka (pavisam kopā %d: %s) veiksmīgi uzstādīti.';
diff --git a/sources/lib/plugins/plugin/lang/mk/lang.php b/sources/lib/plugins/plugin/lang/mk/lang.php
new file mode 100644
index 0000000..747d616
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/mk/lang.php
@@ -0,0 +1,43 @@
+
+ */
+$lang['menu']                  = 'Уреди ги приклучоците';
+$lang['download']              = 'Симни и инсталирај нов приклучок';
+$lang['manage']                = 'Инсталирани приклучоци';
+$lang['btn_info']              = 'информации';
+$lang['btn_update']            = 'ажурирај';
+$lang['btn_delete']            = 'избриши';
+$lang['btn_settings']          = 'поставувања';
+$lang['btn_download']          = 'Симни';
+$lang['btn_enable']            = 'Зачувај';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Инсталирани:';
+$lang['lastupdate']            = 'Последно ажурирани:';
+$lang['source']                = 'Извор:';
+$lang['unknown']               = 'непознат';
+$lang['updating']              = 'Ажурирам...';
+$lang['updated']               = 'Приклучокот %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['enabled']               = 'Приклучокот %s е овозможен.';
+$lang['disabled']              = 'Приклучокот %s е оневозможен.';
diff --git a/sources/lib/plugins/plugin/lang/mr/admin_plugin.txt b/sources/lib/plugins/plugin/lang/mr/admin_plugin.txt
new file mode 100644
index 0000000..a925a56
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/mr/admin_plugin.txt
@@ -0,0 +1,4 @@
+====== प्लगिन व्यवस्थापन ======
+
+या पानावर तुम्ही डॉक्युविकि [[doku>plugins|प्लगिन]] च्या सर्व बाबींची व्यवस्था लावू शकता.
+प्लगिन डाउनलोड व इन्स्टॉल करण्यासाठी तुमच्या प्लगिन फोल्डरवर तुमच्या वेबसर्वरला लेखनाची परवानगी असली पाहिजे. 
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/mr/lang.php b/sources/lib/plugins/plugin/lang/mr/lang.php
new file mode 100644
index 0000000..3f81739
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/mr/lang.php
@@ -0,0 +1,53 @@
+
+ * @author Padmanabh Kulkarni
+ * @author shantanoo@gmail.com
+ */
+$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 - URL  वरून फाइलचे नाव ठरवता आले नाही.';
+$lang['error_dircreate']       = 'डाउनलोड साठवण्यासाठी तात्पुरता फोल्डर तयार करू शकलो नाही';
+$lang['error_decompress']      = 'प्लगिन व्यवस्थापक डाउनलोड केलेली फाइल विस्तारित करू शकला नाही. हे कदाचित डाउनलोड नीट न झाल्यामुळे असावं; असे असल्यास तुमची परत डाउनलोड करण्याचा प्रयत्न करू शकता; किंवा प्लगिन संक्षिप्त करण्यास वापरलेली पद्धत अनाकलनीय आहे; तसे असल्यास तुम्हाला स्वतः प्लगिन डाउनलोड व इन्स्टॉल करावा लागेल.';
+$lang['error_copy']            = '%s प्लगिनसाठी फाइल इन्स्टॉल करताना फाइल कॉपी करू शकलो नाही : डिस्क भरली असेल किंवा फाइल वरील परवानग्या बरोबर नसतील. यामुळे प्लगिन अर्धवट इन्स्टॉल जाला असण्याची व त्यामुळे तुमची विकी ख़राब होण्याची शक्यता आहे.';
+$lang['error_delete']          = '%s प्लगिन डिलीट करताना काही चूक झाली आहे. फाइल किंवा डिरेक्टरी वरील परवानग्या बरोबर नसणे हे याचं मुख्य कारण असू शकतं.';
+$lang['enabled']               = '%s प्लगइन चालू केला.';
+$lang['notenabled']            = '%s प्लगइन चालू करू शकलो नाही, फाइलच्या परवानग्या तपासा.';
+$lang['disabled']              = '%s प्लगइन बंद केला.';
+$lang['notdisabled']           = '%s प्लगइन बंद करू शकलो नाही, फाइलच्या परवानग्या तपासा.';
diff --git a/sources/lib/plugins/plugin/lang/ms/lang.php b/sources/lib/plugins/plugin/lang/ms/lang.php
new file mode 100644
index 0000000..77ad2a1
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ms/lang.php
@@ -0,0 +1,6 @@
+
+ * @author SarojKumar Dhakal 
+ * @author Saroj Dhakal
+ */
+$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 - Url बाट फाइल नाम निश्चित गर्न असमर्थ ।';
+$lang['error_dircreate']       = 'डाउनलोड प्राप्त गर्नको निमि्त्त अस्थाइ फोल्डर निर्माण गर्न असमर्थ ।';
diff --git a/sources/lib/plugins/plugin/lang/nl/admin_plugin.txt b/sources/lib/plugins/plugin/lang/nl/admin_plugin.txt
new file mode 100644
index 0000000..36731b0
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/nl/admin_plugin.txt
@@ -0,0 +1,3 @@
+===== Pluginmanager =====
+
+Op deze pagina kunt u alle DokuWiki [[doku>plugins|plugins]] beheren. Om plugins te kunnen downloaden en installeren, moet de plugin-directory schrijfbaar zijn voor de webserver.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/nl/lang.php b/sources/lib/plugins/plugin/lang/nl/lang.php
new file mode 100644
index 0000000..2836c70
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/nl/lang.php
@@ -0,0 +1,64 @@
+
+ * @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
+ * @author Marijn Hofstra 
+ * @author Timon Van Overveldt 
+ * @author Jeroen
+ * @author Ricardo Guijt 
+ * @author Gerrit 
+ * @author Remon 
+ */
+$lang['menu']                  = 'Plugins beheren';
+$lang['download']              = 'Download en installeer een nieuwe plugin';
+$lang['manage']                = 'Geïnstalleerde plugins';
+$lang['btn_info']              = 'informatie';
+$lang['btn_update']            = 'bijwerken';
+$lang['btn_delete']            = 'verwijderen';
+$lang['btn_settings']          = 'instellingen';
+$lang['btn_download']          = 'Download';
+$lang['btn_enable']            = 'Opslaan';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Geïnstalleerd:';
+$lang['lastupdate']            = 'Laatst bijgewerkt:';
+$lang['source']                = 'Bron:';
+$lang['unknown']               = 'onbekend';
+$lang['updating']              = 'Bijwerken ...';
+$lang['updated']               = 'Plugin %s succesvol bijgewerkt';
+$lang['updates']               = 'De volgende plugins zijn succesvol bijgewerkt';
+$lang['update_none']           = 'Geen updates gevonden.';
+$lang['deleting']              = 'Verwijderen ...';
+$lang['deleted']               = 'Plugin %s verwijderd.';
+$lang['downloading']           = 'Bezig met downloaden ...';
+$lang['downloaded']            = 'Plugin %s succesvol geïnstalleerd';
+$lang['downloads']             = 'De volgende plugins zijn succesvol geïnstalleerd:';
+$lang['download_none']         = 'Geen plugins gevonden, of er is een onbekende fout opgetreden tijdens het downloaden en installeren.';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Onderdelen';
+$lang['noinfo']                = 'Deze plugin gaf geen informatie terug, misschien is hij defect.';
+$lang['name']                  = 'Naam:';
+$lang['date']                  = 'Datum:';
+$lang['type']                  = 'Type:';
+$lang['desc']                  = 'Omschrijving:';
+$lang['author']                = 'Auteur:';
+$lang['www']                   = 'Weblocatie:';
+$lang['error']                 = 'Er is een onbekende fout opgetreden.';
+$lang['error_download']        = 'Kan het volgende plugin bestand niet downloaden: %s';
+$lang['error_badurl']          = 'Vermoedelijk onjuiste url - kan de bestandsnaam niet uit de url afleiden';
+$lang['error_dircreate']       = 'Kan geen tijdelijke directory aanmaken voor de download';
+$lang['error_decompress']      = 'De pluginmanager kan het gedownloade bestand niet uitpakken. Dit kan het resultaat zijn van een mislukte download: probeer het opnieuw; of het compressieformaat is onbekend: in dat geval moet je de plugin handmatig downloaden en installeren.';
+$lang['error_copy']            = 'Er was een probleem met het kopiëren van een bestand tijdens de installatie van plugin %s: de schijf kan vol zijn of onjuiste toegangsrechten hebben. Dit kan tot gevolg hebben dat de plugin slechts gedeeltelijk geïnstalleerd is en kan de wiki onstabiel maken.';
+$lang['error_delete']          = 'Er is een probleem opgetreden tijdens het verwijderen van plugin %s. De meest voorkomende oorzaak is onjuiste toegangsrechten op bestanden of directory\'s.';
+$lang['enabled']               = 'Plugin %s ingeschakeld.';
+$lang['notenabled']            = 'Plugin %s kon niet worden ingeschakeld, controleer bestandsrechten.';
+$lang['disabled']              = 'Plugin %s uitgeschakeld.';
+$lang['notdisabled']           = 'Plugin %s kon niet worden uitgeschakeld, controleer bestandsrechten.';
+$lang['packageinstalled']      = 'Plugin package (%d plugin(s): %s) succesvol geïnstalleerd.';
diff --git a/sources/lib/plugins/plugin/lang/no/admin_plugin.txt b/sources/lib/plugins/plugin/lang/no/admin_plugin.txt
new file mode 100644
index 0000000..1765b67
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/no/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Behandle programtillegg ======
+
+På denne siden kan du behandle alt som har å gjøre med DokuWikis [[doku>plugins|tillegg]]. For å kunne laste ned og installere et tillegg må webserveren ha skrivetilgang til mappen for tillegg.
diff --git a/sources/lib/plugins/plugin/lang/no/lang.php b/sources/lib/plugins/plugin/lang/no/lang.php
new file mode 100644
index 0000000..2b890f9
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/no/lang.php
@@ -0,0 +1,64 @@
+
+ * @author Arild Burud 
+ * @author Torkill Bruland 
+ * @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 
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Jon Bøe 
+ * @author Egil Hansen 
+ */
+$lang['menu']                  = 'Behandle programtillegg';
+$lang['download']              = 'Last ned og installer et programtillegg';
+$lang['manage']                = 'Installerte programtillegg';
+$lang['btn_info']              = 'informasjon';
+$lang['btn_update']            = 'oppdater';
+$lang['btn_delete']            = 'slett';
+$lang['btn_settings']          = 'innstillinger';
+$lang['btn_download']          = 'Last ned';
+$lang['btn_enable']            = 'Lagre';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Installert:';
+$lang['lastupdate']            = 'Sist oppdatert:';
+$lang['source']                = 'Kilde:';
+$lang['unknown']               = 'ukjent';
+$lang['updating']              = 'Oppdaterer ...';
+$lang['updated']               = 'Tillegget %s er oppdatert';
+$lang['updates']               = 'Følgende programtillegg har blitt oppdatert';
+$lang['update_none']           = 'Ingen oppdateringer funnet.';
+$lang['deleting']              = 'Sletter ...';
+$lang['deleted']               = 'Tillegget %s ble slettet.';
+$lang['downloading']           = 'Laster ned ...';
+$lang['downloaded']            = 'Tillegget %s ble installert';
+$lang['downloads']             = 'De følgende tilleggene ble installert';
+$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']                = 'Tillegget ga ikke noe informasjon. Det kan være ugyldig.';
+$lang['name']                  = 'Navn:';
+$lang['date']                  = 'Dato:';
+$lang['type']                  = 'Type:';
+$lang['desc']                  = 'Beskrivelse:';
+$lang['author']                = 'Forfatter:';
+$lang['www']                   = 'Nett:';
+$lang['error']                 = 'En ukjent feil oppstod.';
+$lang['error_download']        = 'Klarte ikke å laste ned tillegget i filen: %s';
+$lang['error_badurl']          = 'Mistenker feil URL - klarte ikke å finne filnavnet i URLen';
+$lang['error_dircreate']       = 'Klarte ikke å lage en midlertidig mappe for å laste ned';
+$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.';
+$lang['packageinstalled']      = 'Installasjonen av tilleggspakka (%d tillegg: %s) var vellykka';
diff --git a/sources/lib/plugins/plugin/lang/pl/admin_plugin.txt b/sources/lib/plugins/plugin/lang/pl/admin_plugin.txt
new file mode 100644
index 0000000..f010481
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/pl/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== Menadżer wtyczek ======
+
+Na tej stronie możesz zarządzać wszystkim co jest związane z [[doku>plugins|wtyczkami]] Dokuwiki. Aby móc ściągnąć i zainstalować wtyczkę, serwer WWW musi mieć prawo do zapisu w katalogu ''plugins''.
+
+
diff --git a/sources/lib/plugins/plugin/lang/pl/lang.php b/sources/lib/plugins/plugin/lang/pl/lang.php
new file mode 100644
index 0000000..eae91f3
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/pl/lang.php
@@ -0,0 +1,63 @@
+
+ * @author Grzegorz Żur 
+ * @author Mariusz Kujawski 
+ * @author Maciej Kurczewski 
+ * @author Sławomir Boczek 
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski 
+ * @author maros 
+ * @author Grzegorz Widła 
+ * @author Łukasz Chmaj 
+ * @author Begina Felicysym 
+ * @author Aoi Karasu 
+ */
+$lang['menu']                  = 'Menadżer wtyczek';
+$lang['download']              = 'Ściągnij i zainstaluj nową wtyczkę';
+$lang['manage']                = 'Zainstalowane Wtyczki';
+$lang['btn_info']              = 'Informacje';
+$lang['btn_update']            = 'Aktualizuj';
+$lang['btn_delete']            = 'Usuń';
+$lang['btn_settings']          = 'Ustawienia';
+$lang['btn_download']          = 'Pobierz';
+$lang['btn_enable']            = 'Zapisz';
+$lang['url']                   = 'Adres URL';
+$lang['installed']             = 'Instalacja:';
+$lang['lastupdate']            = 'Ostatnio zaktualizowana:';
+$lang['source']                = 'Źródło:';
+$lang['unknown']               = 'nieznane';
+$lang['updating']              = 'Aktualizuję...';
+$lang['updated']               = 'Aktualizacja wtyczki %s pomyślnie ściągnięta';
+$lang['updates']               = 'Aktualizacje następujących wtyczek zostały pomyślnie ściągnięte';
+$lang['update_none']           = 'Nie znaleziono aktualizacji.';
+$lang['deleting']              = 'Usuwam...';
+$lang['deleted']               = 'Wtyczka %s usunięta.';
+$lang['downloading']           = 'Pobieram...';
+$lang['downloaded']            = 'Wtyczka %s pomyślnie zainstalowana';
+$lang['downloads']             = 'Następujące wtyczki zostały pomyślnie zainstalowane:';
+$lang['download_none']         = 'Nie znaleziono wtyczek lub wystąpił nieznany problem podczas ściągania i instalacji.';
+$lang['plugin']                = 'Wtyczka:';
+$lang['components']            = 'Składniki';
+$lang['noinfo']                = 'Ta wtyczka nie zwróciła żadnych informacji, może być niepoprawna.';
+$lang['name']                  = 'Nazwa:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Typ:';
+$lang['desc']                  = 'Opis:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'WWW:';
+$lang['error']                 = 'Wystąpił nieznany błąd.';
+$lang['error_download']        = 'Nie powiodło się ściągnięcie pliku wtyczki: %s';
+$lang['error_badurl']          = 'Prawdopodobnie zły url - nie da się ustalić nazwy pliku na podstawie urla';
+$lang['error_dircreate']       = 'Nie powiodło się stworzenie tymczasowego katalogu na pobrane pliki';
+$lang['error_decompress']      = 'Menadżer wtyczek nie był w stanie rozpakować ściągniętego pliku. Może to być spowodowane przez nieudany transfer (w takim przypadku powinieneś spróbować ponownie) lub nieznany format kompresji (w takim przypadku będziesz musiał ściągnąć i zainstalować wtyczkę ręcznie).';
+$lang['error_copy']            = 'Wystąpił błąd podczas kopiowania pliku w trakcie instalacji wtyczki %s: być może dysk jest pełny lub prawa dostępu są niepoprawne. Efektem może być częściowo zainstalowana wtyczka co może spowodować niestabilność Twojej instalacji wiki.';
+$lang['error_delete']          = 'Wystąpił błąd przy próbie usunięcia wtyczki %s. Prawdopodobną przyczyną są niewystarczające uprawnienia do katalogu.';
+$lang['enabled']               = 'Wtyczka %s włączona.';
+$lang['notenabled']            = 'Nie udało się uruchomić wtyczki %s, sprawdź uprawnienia dostępu do plików.';
+$lang['disabled']              = 'Wtyczka %s wyłączona.';
+$lang['notdisabled']           = 'Nie udało się wyłączyć wtyczki %s, sprawdź uprawnienia dostępu do plików.';
+$lang['packageinstalled']      = 'Pakiet wtyczek (%d wtyczki: %s) zainstalowany pomyślnie.';
diff --git a/sources/lib/plugins/plugin/lang/pt-br/admin_plugin.txt b/sources/lib/plugins/plugin/lang/pt-br/admin_plugin.txt
new file mode 100644
index 0000000..9e49f51
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/pt-br/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Gerenciamento de Plug-ins ======
+
+Nesta 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.
diff --git a/sources/lib/plugins/plugin/lang/pt-br/lang.php b/sources/lib/plugins/plugin/lang/pt-br/lang.php
new file mode 100644
index 0000000..c025188
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/pt-br/lang.php
@@ -0,0 +1,66 @@
+
+ * @author Felipe Castro 
+ * @author Lucien Raven 
+ * @author Enrico Nicoletto 
+ * @author Flávio Veras 
+ * @author Jeferson Propheta 
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas 
+ * @author Frederico Guimarães 
+ * @author Jair Henrique 
+ * @author Luis Dantas 
+ * @author Sergio Motta sergio@cisne.com.br
+ * @author Isaias Masiero Filho 
+ * @author Balaco Baco 
+ * @author Victor Westmann 
+ */
+$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';
+$lang['btn_settings']          = 'configurações';
+$lang['btn_download']          = 'Baixar';
+$lang['btn_enable']            = 'Salvar';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalação:';
+$lang['lastupdate']            = 'Última atualização:';
+$lang['source']                = 'Fonte:';
+$lang['unknown']               = 'desconhecida';
+$lang['updating']              = 'Atualizando...';
+$lang['updated']               = 'O plug-in %s foi atualizado com sucesso';
+$lang['updates']               = 'Os seguintes plug-ins foram atualizados com sucesso';
+$lang['update_none']           = 'Não foi encontrada nenhuma atualização.';
+$lang['deleting']              = 'Excluindo...';
+$lang['deleted']               = 'O plug-in %s foi excluído.';
+$lang['downloading']           = 'Baixando...';
+$lang['downloaded']            = 'O plug-in %s foi instalado com sucesso';
+$lang['downloads']             = 'Os seguintes plug-ins foram instalados com sucesso:';
+$lang['download_none']         = 'O plug-in não foi encontrado ou então ocorreu um problema desconhecido durante a transferência e instalação.';
+$lang['plugin']                = 'Plug-in:';
+$lang['components']            = 'Componentes';
+$lang['noinfo']                = 'Esse plug-in não retornou nenhuma informação. Ele pode ser inválido.';
+$lang['name']                  = 'Nome:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Tipo:';
+$lang['desc']                  = 'Descrição:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Ocorreu um erro desconhecido.';
+$lang['error_download']        = 'Não foi possível baixar o arquivo de plug-in: %s';
+$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 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.';
+$lang['packageinstalled']      = 'O pacote do plugin (%d plugin(s): %s) foi instalado com sucesso.';
diff --git a/sources/lib/plugins/plugin/lang/pt/admin_plugin.txt b/sources/lib/plugins/plugin/lang/pt/admin_plugin.txt
new file mode 100644
index 0000000..2cc4701
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/pt/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Gestor de Plugins ======
+
+Nesta página pode gerir tudo o que tenha a haver com [[doku>plugins|plugins]] DokuWiki. Atenção que a pasta que contém os plugins precisa de ter permissões de escrita para se poder efectuar o download.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/pt/lang.php b/sources/lib/plugins/plugin/lang/pt/lang.php
new file mode 100644
index 0000000..aa6b2e2
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/pt/lang.php
@@ -0,0 +1,56 @@
+
+ * @author Enrico Nicoletto 
+ * @author Fil 
+ * @author André Neves 
+ * @author José Campos zecarlosdecampos@gmail.com
+ */
+$lang['menu']                  = 'Gerir Plugins';
+$lang['download']              = 'Descarregar e instalar um novo plugin';
+$lang['manage']                = 'Plugins Instalados';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'actualizar';
+$lang['btn_delete']            = 'remover';
+$lang['btn_settings']          = 'configurações';
+$lang['btn_download']          = 'Descarregar';
+$lang['btn_enable']            = 'Guardar';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalado em:';
+$lang['lastupdate']            = 'Actualizado em:';
+$lang['source']                = 'Fonte:';
+$lang['unknown']               = 'desconhecida';
+$lang['updating']              = 'Actualizando ...';
+$lang['updated']               = 'Plugin %s actualizado com sucesso.';
+$lang['updates']               = 'Os seguintes plguins foram actualizados com sucesso:';
+$lang['update_none']           = 'Não foram encontradas actualizações.';
+$lang['deleting']              = 'Removendo ...';
+$lang['deleted']               = 'Plugin %s removido.';
+$lang['downloading']           = 'Descarregando ...';
+$lang['downloaded']            = 'Plugin %s instalado com sucesso.';
+$lang['downloads']             = 'Os seguintes plguins foram instalados com sucesso:';
+$lang['download_none']         = 'Nenhum plugin encontrado ou ocorreu um problema ao descarregar ou instalar.';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Componentes';
+$lang['noinfo']                = 'Este plugin não retornou qualquer informação, pode estar inválido.';
+$lang['name']                  = 'Nome:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Tipo:';
+$lang['desc']                  = 'Descrição:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Sítio:';
+$lang['error']                 = 'Ocorreu um erro desconhecido.';
+$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.';
+$lang['packageinstalled']      = 'Pacote de Plugins (%d plugin(s): %s) instalado com sucesso.';
diff --git a/sources/lib/plugins/plugin/lang/ro/admin_plugin.txt b/sources/lib/plugins/plugin/lang/ro/admin_plugin.txt
new file mode 100644
index 0000000..a2956e4
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ro/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Managementul Plugin-urilor ======
+
+In această pagină puteţi administra orice  [[doku>plugins|plugin]] Dokuwiki. Pentru a descărca şi instala un plugin, directorul acestora trebuie să ofere webserver-ului acces la scriere.
diff --git a/sources/lib/plugins/plugin/lang/ro/lang.php b/sources/lib/plugins/plugin/lang/ro/lang.php
new file mode 100644
index 0000000..c57647e
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ro/lang.php
@@ -0,0 +1,59 @@
+
+ * @author s_baltariu@yahoo.com
+ * @author Emanuel-Emeric Andrasi 
+ * @author Emanuel-Emeric Andrași 
+ * @author Emanuel-Emeric Andraşi 
+ * @author Emanuel-Emeric Andrasi 
+ * @author Marius OLAR 
+ * @author Marius Olar 
+ * @author Emanuel-Emeric Andrași 
+ */
+$lang['menu']                  = 'Administrează plugin-uri';
+$lang['download']              = 'Descarcă şi instalează un nou plugin';
+$lang['manage']                = 'Plugin-uri instalate';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'actualizare';
+$lang['btn_delete']            = 'ştergere';
+$lang['btn_settings']          = 'setări';
+$lang['btn_download']          = 'Descarcă';
+$lang['btn_enable']            = 'Salvează';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Instalat:';
+$lang['lastupdate']            = 'Ultima actualizare:';
+$lang['source']                = 'Sursa:';
+$lang['unknown']               = 'necunoscut';
+$lang['updating']              = 'Se actualizează ...';
+$lang['updated']               = 'Plugin-ul %s a fost actualizat cu succes';
+$lang['updates']               = 'Următoarele plugin-uri au fost actualizate cu succes';
+$lang['update_none']           = 'Nu a fost găsită nici o actualizare.';
+$lang['deleting']              = 'Se şterge ...';
+$lang['deleted']               = 'Plugin-ul %s a fost şters.';
+$lang['downloading']           = 'Se descarcă ...';
+$lang['downloaded']            = 'Plugin-ul %s a fost instalat cu succes';
+$lang['downloads']             = 'Următoarele plugin-uri au fost instalate cu succes';
+$lang['download_none']         = 'Nici un plugin nu a fost găsit, sau o problemă necunoscută a apărut în timpul descărcării şi instalării.';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Componente';
+$lang['noinfo']                = 'Acest plugin nu a furnizat nici o informaţie; ar putea fi invalid.';
+$lang['name']                  = 'Nume:';
+$lang['date']                  = 'Data:';
+$lang['type']                  = 'Tip:';
+$lang['desc']                  = 'Descriere:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'A intervenit o eroare necunoscută.';
+$lang['error_download']        = 'Nu a fost posibilă descărcarea plugin-ului: %s';
+$lang['error_badurl']          = 'url suspectat ca fiind eronat - nu a putut fi determinat numele fişierului din url';
+$lang['error_dircreate']       = 'Nu a putut fi creat directorul temporar pentru descărcarea fişierului';
+$lang['error_decompress']      = 'Administratorul de plugin-uri nu a putut dezarhiva fişierul descărcat. Aceasta se poate datora unei erori la descărcare, caz în care trebuie să încercaţi din nou; sau formatul de arhivare este necunoscut, caz în care va trebui să descărcaţi şi să instalaţi plugin-ul manual.';
+$lang['error_copy']            = 'O eroare la copiere a apărut la instalarea fişierelor plugin-ului %s: discul poate fi plin sau drepturile de acces ale fişierelor sunt incorecte. Aceasta poate avea ca rezultat o instalare parţială a plugin-ului şi o instabilitate a instalării wiki.';
+$lang['error_delete']          = 'O eroare a apărut la ştergerea plugin-ului %s. Cea mai probabilă cauză sunt drepturile de acces insuficiente ale fişierului sau directorului.';
+$lang['enabled']               = 'Plugin %s activat.';
+$lang['notenabled']            = 'Plugin-ul %s nu poate fi activat, verificaţi permisiunile fişierului.';
+$lang['disabled']              = 'Plugin %s dezactivat.';
+$lang['notdisabled']           = 'Plugin-ul %s nu poate fi dezactivat, verificaţi permisiunile fişierului.';
+$lang['packageinstalled']      = 'Pachet modul (%d modul(e): %s) instalat cu succes.';
diff --git a/sources/lib/plugins/plugin/lang/ru/admin_plugin.txt b/sources/lib/plugins/plugin/lang/ru/admin_plugin.txt
new file mode 100644
index 0000000..3e00e41
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ru/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== Управление плагинами ======
+
+Здесь вы можете делать всё, что связано с [[doku>plugins|плагинами]] «ДокуВики». Для того, чтобы скачивать и устанавливать плагины, директория плагинов должна быть доступна для записи веб-сервером.
+
+
diff --git a/sources/lib/plugins/plugin/lang/ru/lang.php b/sources/lib/plugins/plugin/lang/ru/lang.php
new file mode 100644
index 0000000..b933f77
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/ru/lang.php
@@ -0,0 +1,66 @@
+
+ * @author Andrew Pleshakov 
+ * @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 
+ * @author Aleksey Osadchiy 
+ * @author Aleksandr Selivanov 
+ * @author Ladyko Andrey 
+ * @author Eugene 
+ * @author Johnny Utah 
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ */
+$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_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. Проверьте системные права доступа к файлам.';
+$lang['packageinstalled']      = 'Пакет (%d плагин(а): %s) успешно установлен.';
diff --git a/sources/lib/plugins/plugin/lang/sk/admin_plugin.txt b/sources/lib/plugins/plugin/lang/sk/admin_plugin.txt
new file mode 100644
index 0000000..ad3ae7f
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sk/admin_plugin.txt
@@ -0,0 +1,4 @@
+====== Správa pluginov ======
+
+Na tejto stránke je možné spravovať [[doku>plugins|pluginy]] Dokuwiki. Aby bolo možné sťahovať a inštalovať pluginy, musí mať webový server prístup pre zápis do adresára //plugin//.
+
diff --git a/sources/lib/plugins/plugin/lang/sk/lang.php b/sources/lib/plugins/plugin/lang/sk/lang.php
new file mode 100644
index 0000000..35c07cf
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sk/lang.php
@@ -0,0 +1,55 @@
+
+ * @author Michal Mesko 
+ * @author exusik@gmail.com
+ * @author Martin Michalek 
+ */
+$lang['menu']                  = 'Správa pluginov';
+$lang['download']              = 'Stiahnuť a nainštalovať plugin';
+$lang['manage']                = 'Nainštalované pluginy';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'aktualizovať';
+$lang['btn_delete']            = 'zmazať';
+$lang['btn_settings']          = 'nastavenia';
+$lang['btn_download']          = 'Stiahnuť';
+$lang['btn_enable']            = 'Uložiť';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Nainštalovaný:';
+$lang['lastupdate']            = 'Aktualizovaný:';
+$lang['source']                = 'Zdroj:';
+$lang['unknown']               = 'neznámy';
+$lang['updating']              = 'Aktualizuje sa ...';
+$lang['updated']               = 'Plugin %s bol úspešne aktualizovaný';
+$lang['updates']               = 'Nasledujúce pluginy bol úspešne aktualizované:';
+$lang['update_none']           = 'Neboli nájdené žiadne aktualizácie.';
+$lang['deleting']              = 'Vymazáva sa ...';
+$lang['deleted']               = 'Plugin %s bol zmazaný.';
+$lang['downloading']           = 'Sťahuje sa ...';
+$lang['downloaded']            = 'Plugin %s bol úspešne stiahnutý';
+$lang['downloads']             = 'Nasledujúce pluginy bol úspešne stiahnuté:';
+$lang['download_none']         = 'Neboli nájdené žiadne pluginy alebo nastal neznámy problém počas sťahovania a inštalácie pluginov.';
+$lang['plugin']                = 'Plugin:';
+$lang['components']            = 'Súčasti';
+$lang['noinfo']                = 'Tento plugin neobsahuje žiadne informácie, je možné, že je chybný.';
+$lang['name']                  = 'názov:';
+$lang['date']                  = 'Dátum:';
+$lang['type']                  = 'Typ:';
+$lang['desc']                  = 'Popis:';
+$lang['author']                = 'Autor:';
+$lang['www']                   = 'Web:';
+$lang['error']                 = 'Nastala neznáma chyba.';
+$lang['error_download']        = 'Nie je možné stiahnuť súbor pluginu: %s';
+$lang['error_badurl']          = 'Pravdepodobne zlá url adresa - nie je možné z nej určiť meno súboru';
+$lang['error_dircreate']       = 'Nie je možné vytvoriť dočasný adresár pre uloženie sťahovaného súboru';
+$lang['error_decompress']      = 'Správca pluginov nedokáže dekomprimovať stiahnutý súbor. Môže to byť dôsledok zlého stiahnutia, v tom prípade to skúste znovu, alebo môže ísť o neznámy formát súboru, v tom prípade musíte stiahnuť a nainštalovať plugin manuálne.';
+$lang['error_copy']            = 'Nastala chyba kopírovania súboru počas pokusu inštalovať súbory pluginu%s: disk môže byť plný alebo prístupové práva k súboru môžu byť nesprávne. Toto môže mať za následok čiastočne nainštalovanie pluginu a nestabilitu vašej DokuWiki.';
+$lang['error_delete']          = 'Nastala chyba počas pokusu o zmazanie pluginu %s.  Najpravdepodobnejším dôvodom môžu byť nedostatočné prístupové práva pre súbor alebo adresár';
+$lang['enabled']               = 'Plugin %s aktivovaný.';
+$lang['notenabled']            = 'Plugin %s nemôže byť aktivovaný, skontrolujte prístupové práva.';
+$lang['disabled']              = 'Plugin %s deaktivovaný.';
+$lang['notdisabled']           = 'Plugin %s nemôže byť deaktivovaný, skontrolujte prístupové práva.';
+$lang['packageinstalled']      = 'Plugin package (%d plugin(s): %s) úspešne inštalovaný.';
diff --git a/sources/lib/plugins/plugin/lang/sl/admin_plugin.txt b/sources/lib/plugins/plugin/lang/sl/admin_plugin.txt
new file mode 100644
index 0000000..5fd02e1
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sl/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Upravljanje vstavkov ======
+
+Na tej strani je mogoče spreminjati in prilagajati nastavitve DokuWiki [[doku>plugins|vstavkov]]. Za prejemanje in nameščanje vstavkov v ustrezne mape, morajo imeti te določena ustrezna dovoljenja za pisanje spletnega strežnika.
diff --git a/sources/lib/plugins/plugin/lang/sl/lang.php b/sources/lib/plugins/plugin/lang/sl/lang.php
new file mode 100644
index 0000000..e205c57
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sl/lang.php
@@ -0,0 +1,55 @@
+
+ * @author Boštjan Seničar 
+ * @author Gregor Skumavc (grega.skumavc@gmail.com)
+ * @author Matej Urbančič (mateju@svn.gnome.org)
+ */
+$lang['menu']                  = 'Upravljanje vstavkov';
+$lang['download']              = 'Prejmi in namesti nov vstavek';
+$lang['manage']                = 'Nameščeni vstavki';
+$lang['btn_info']              = 'Podrobnosti';
+$lang['btn_update']            = 'Posodobi';
+$lang['btn_delete']            = 'Izbriši';
+$lang['btn_settings']          = 'Nastavitve';
+$lang['btn_download']          = 'Prejmi';
+$lang['btn_enable']            = 'Shrani';
+$lang['url']                   = 'URL';
+$lang['installed']             = 'Nameščeno:';
+$lang['lastupdate']            = 'Nazadnje posodobljeno:';
+$lang['source']                = 'Vir:';
+$lang['unknown']               = 'neznano';
+$lang['updating']              = 'Posodabljanje ...';
+$lang['updated']               = 'Vstavek %s je uspešno posodobljen';
+$lang['updates']               = 'Navedeni vstavki so uspešno posodobljeni';
+$lang['update_none']           = 'Posodobitev ni mogoče najti.';
+$lang['deleting']              = 'Brisanje ...';
+$lang['deleted']               = 'Vstavek %s je izbrisan.';
+$lang['downloading']           = 'Prejemanje ...';
+$lang['downloaded']            = 'Vstavek %s je uspešno nameščen';
+$lang['downloads']             = 'Navedeni vstavki so uspešno nameščeni:';
+$lang['download_none']         = 'Vstavkov ni mogoče najti ali pa je prišlo do napake med prejemanjem in nameščanjem.';
+$lang['plugin']                = 'Vstavek:';
+$lang['components']            = 'Sestavni deli';
+$lang['noinfo']                = 'Vstavek nima vpisanih podrobnih podatkov, kar pomeni, da je morda neveljaven.';
+$lang['name']                  = 'Ime:';
+$lang['date']                  = 'Datum:';
+$lang['type']                  = 'Vrsta:';
+$lang['desc']                  = 'Opis:';
+$lang['author']                = 'Avtor:';
+$lang['www']                   = 'Spletna stran:';
+$lang['error']                 = 'Prišlo je do neznane napake.';
+$lang['error_download']        = 'Ni mogoče prejeti datoteke vstavka: %s';
+$lang['error_badurl']          = 'Napaka naslova URL - ni mogoče določiti imena datoteke iz naslova URL';
+$lang['error_dircreate']       = 'Ni mogoče ustvariti začasne mape za prejemanje';
+$lang['error_decompress']      = 'Z upravljalnikom vstavkov ni mogoče razširiti prejetega arhiva vstavka. Najverjetneje je prišlo do napake med prejemanjem datoteke ali pa zapis arhiva ni znan. Poskusite znova ali pa napako odpravite z ročnim nameščanjem vstavka.';
+$lang['error_copy']            = 'Prišlo je do napake med nameščanjem datotek vstavka %s: najverjetneje so težave s prostorom za namestitev ali pa ni ustreznih dovoljenj za nameščanje. Zaradi nepopolne namestitve lahko nastopijo težave v delovanju sistema Wiki.';
+$lang['error_delete']          = 'Prišlo je do napake med brisanjem vstavka %s: najverjetneje ni ustreznih dovoljenj za dostop do datoteke ali mape';
+$lang['enabled']               = 'Vstavek %s je omogočen.';
+$lang['notenabled']            = 'Vstavka %s ni mogoče omogočiti zaradi neustreznih dovoljen.';
+$lang['disabled']              = 'Vstavek %s je onemogočen.';
+$lang['notdisabled']           = 'Vstavka %s ni mogoče onemogočiti zaradi neustreznih dovoljen.';
+$lang['packageinstalled']      = 'Paket vstavka (%d vstavkov: %s) je uspešno nameščen.';
diff --git a/sources/lib/plugins/plugin/lang/sq/admin_plugin.txt b/sources/lib/plugins/plugin/lang/sq/admin_plugin.txt
new file mode 100644
index 0000000..2e1f192
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sq/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Menaxhimi i Plugin-eve ======
+
+Në këtë faqe mund të menaxhoni çdo gjë që ka të bëjë me [[doku>plugins|plugin-et]] Dokuwiki. Që të jetë në gjendje për të shkarkuar dhe instaluar një plugin, dosja e plugin-it duhet të jetë e shkrueshme nga webserver-i.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/sq/lang.php b/sources/lib/plugins/plugin/lang/sq/lang.php
new file mode 100644
index 0000000..9ddcf52
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sq/lang.php
@@ -0,0 +1,50 @@
+%s: disku mund të jetë plotë ose të drejtat për aksesim skedari mund të jenë të gabuara. Kjo mund të ketë shkaktuar një instalim të pjesshëm të plugin-it dhe ta lërë instalimin e wiki-t tënd të paqëndrueshëm.';
+$lang['error_delete']          = 'Ndodhi një gabim gjatë përpjekjes për të fshirë plugin-in %s. Shkaku më i mundshëm është të drejta të pamjaftueshme për aksesim skedari ose dosjeje.';
+$lang['enabled']               = 'Plugini %s u aktivizua.';
+$lang['notenabled']            = 'Plugini %s nuk mundi të aktivizohej, kontrollo të drejtat e aksesit për skedarin.';
+$lang['disabled']              = 'Plugin %s është i paaktivizuar.';
+$lang['notdisabled']           = 'Plugini %s nuk mundi të çaktivizohej, kontrollo të drejtat e aksesit për skedarin.';
diff --git a/sources/lib/plugins/plugin/lang/sr/admin_plugin.txt b/sources/lib/plugins/plugin/lang/sr/admin_plugin.txt
new file mode 100644
index 0000000..6262ece
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sr/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Управљач додацима ======
+
+На овој страни можете управљати са свим у вези DokuWiki [[doku>plugins|додацима]]. Да бисте имали могућност преузимања и инсталирања додатака, фасцикла за додатке мора имати дозволу за писање.
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/sr/lang.php b/sources/lib/plugins/plugin/lang/sr/lang.php
new file mode 100644
index 0000000..bc22770
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sr/lang.php
@@ -0,0 +1,52 @@
+
+ * @author Miroslav Šolti 
+ */
+$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_badurl']          = 'Сумњам на лош УРЛ - немогу да одредим назив датотеке ';
+$lang['error_dircreate']       = 'Немогућност прављења привремене фасцикле за преузимање';
+$lang['error_decompress']      = 'Управљач додацима није у могућности да распакује преузету датотеку. Разлог може да буде лошег преузимања, у том случају пробајте још једном; или је непознат облик компресије, у том случају ручно преузмите и инсталирајте додатак.';
+$lang['error_copy']            = 'Појавила се грешка у копирању у току иснталације додатка %s: складиште је можда пуно или дозволе за уписивање нису постављене како треба. Резултат може бити делимично инсталиран додатак и вики у нестабилном стању.';
+$lang['error_delete']          = 'Појавила се грешка у покушају брисања додатка %s. Нејчешћи узрок је недостатак потребних дозвола за операције са датотекама или фасциклама';
+$lang['enabled']               = 'Додатај %s је укључен.';
+$lang['notenabled']            = 'Додатак %s није могуће укључити, проверите дозволе приступа.';
+$lang['disabled']              = 'Додатај %s је исукључен.';
+$lang['notdisabled']           = 'Додатак %s није могуће исукључити, проверите дозволе приступа.';
diff --git a/sources/lib/plugins/plugin/lang/sv/admin_plugin.txt b/sources/lib/plugins/plugin/lang/sv/admin_plugin.txt
new file mode 100644
index 0000000..e490e5e
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sv/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== Hantera insticksmoduler ======
+
+På den här sidan kan man hantera allting som har att göra med Dokuwikis [[doku>plugins|insticksmoduler]]. För att man ska kunna ladda ned och installera en modul måste katalogen för insticksmoduler vara skrivbar av webbservern.
+
+
diff --git a/sources/lib/plugins/plugin/lang/sv/lang.php b/sources/lib/plugins/plugin/lang/sv/lang.php
new file mode 100644
index 0000000..b7c2374
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/sv/lang.php
@@ -0,0 +1,64 @@
+
+ * @author Nicklas Henriksson 
+ * @author Håkan Sandell 
+ * @author Dennis Karlsson
+ * @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 mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$lang['menu']                  = 'Hantera insticksmoduler';
+$lang['download']              = 'Ladda ned och installera en ny insticksmodul';
+$lang['manage']                = 'Installerade insticksmoduler';
+$lang['btn_info']              = 'info';
+$lang['btn_update']            = 'uppdatera';
+$lang['btn_delete']            = 'radera';
+$lang['btn_settings']          = 'inställningar';
+$lang['btn_download']          = 'Ladda ned';
+$lang['btn_enable']            = 'Spara';
+$lang['url']                   = 'Webbadress';
+$lang['installed']             = 'Installerad:';
+$lang['lastupdate']            = 'Senast uppdaterad:';
+$lang['source']                = 'Källa:';
+$lang['unknown']               = 'okänd';
+$lang['updating']              = 'Uppdaterar ...';
+$lang['updated']               = 'Insticksmodulen %s uppdaterades';
+$lang['updates']               = 'Följande Insticksmoduler har uppdaterats';
+$lang['update_none']           = 'Inga uppdateringar hittades.';
+$lang['deleting']              = 'Raderar ...';
+$lang['deleted']               = 'Insticksmodulen %s raderad.';
+$lang['downloading']           = 'Laddar ned ...';
+$lang['downloaded']            = 'Insticksmodulen %s installerades';
+$lang['downloads']             = 'Följande insticksmoduler har installerats:';
+$lang['download_none']         = 'Inga insticksmoduler hittades, eller så har det uppstått ett okänt fel under nedladdning och installation.';
+$lang['plugin']                = 'Insticksmodul:';
+$lang['components']            = 'Komponenter';
+$lang['noinfo']                = 'Den här insticksmodulen returnerade ingen information, den kan vara ogiltig.';
+$lang['name']                  = 'Namn:';
+$lang['date']                  = 'Datum:';
+$lang['type']                  = 'Typ:';
+$lang['desc']                  = 'Beskrivning:';
+$lang['author']                = 'Författare:';
+$lang['www']                   = 'Webb:';
+$lang['error']                 = 'Ett okänt fel har inträffat.';
+$lang['error_download']        = 'Kan inte ladda ned fil till insticksmodul: %s';
+$lang['error_badurl']          = 'Misstänkt felaktig webbadress - kan inte bestämma filnamnet från webbadressen';
+$lang['error_dircreate']       = 'Kan inte skapa tillfällig katalog för nedladdade filer';
+$lang['error_decompress']      = 'Hanteraren för insticksmoduler kunde inte dekomprimera den nedladdade filen. Detta kan vara resultatet av en misslyckad nedladdning, och i så fall bör du försöka igen; eller så kan det komprimerade formatet vara okänt, och då måste du ladda ned och installera insticksmodulen manuellt.';
+$lang['error_copy']            = 'Ett filkopieringsfel uppstod under försöket att installera filerna till insticksmodulen %s: disken kan vara full eller så kan filskyddet vara felaktigt. Detta kan ha lett till en delvis installerad insticksmodul, och gjort din wiki-installation instabil.';
+$lang['error_delete']          = 'Ett fel uppstod vid försöket att radera insticksmodulen %s.  Den troligaste orsaken är otillräcklig behörighet till filer eller kataloger';
+$lang['enabled']               = 'Tilläggsmodulen %s är aktiverad.';
+$lang['notenabled']            = 'Tilläggsmodulen %s kunde inte aktiveras, kontrollera filrättigheterna.';
+$lang['disabled']              = 'Tiläggsmodulen %s är avaktiverad.';
+$lang['notdisabled']           = 'Tilläggsmodulen %s kunde inte avaktiveras, kontrollera filrättigheterna.';
+$lang['packageinstalled']      = 'Tilläggs paket (%d tillägg: %s) har installerats.';
diff --git a/sources/lib/plugins/plugin/lang/th/admin_plugin.txt b/sources/lib/plugins/plugin/lang/th/admin_plugin.txt
new file mode 100644
index 0000000..8611654
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/th/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== ตัวจัดการโปรแกรมเสริม ======
+
+ในหน้านี้คุณสามารถจัดการทุกๆอย่างที่จะต้องทำงานกับ [[doku>plugins|plugins]]โดกุวิกิ เพื่อที่จะสามารถดาวน์โหลดและติดตั้งโปรแกรมเสริม ตัวโฟลเดอร์โปรแกรมเสริม(plugin) จะต้องสามารถเขียนได้โดยเว็บเซิร์ฟเวอร์
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/th/lang.php b/sources/lib/plugins/plugin/lang/th/lang.php
new file mode 100644
index 0000000..dab094b
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/th/lang.php
@@ -0,0 +1,50 @@
+
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Arthit Suriyawongkul 
+ * @author Kittithat Arnontavilas 
+ * @author Thanasak Sompaisansin 
+ */
+$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 --git a/sources/lib/plugins/plugin/lang/tr/admin_plugin.txt b/sources/lib/plugins/plugin/lang/tr/admin_plugin.txt
new file mode 100644
index 0000000..956d701
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/tr/admin_plugin.txt
@@ -0,0 +1,3 @@
+====== Eklenti Yönetimi ======
+
+Bu sayfada DokuWiki [[doku>plugins|eklentileri]] ile ilgili herşeyi düzenleyebilirsiniz. Eklenti kurup indirmek için, eklenti dizininin yazılabilir olması gerekmektedir.
diff --git a/sources/lib/plugins/plugin/lang/tr/lang.php b/sources/lib/plugins/plugin/lang/tr/lang.php
new file mode 100644
index 0000000..a4feea8
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/tr/lang.php
@@ -0,0 +1,55 @@
+
+ * @author Cihan Kahveci 
+ * @author Yavuz Selim 
+ * @author Caleb Maclennan 
+ * @author farukerdemoncel@gmail.com
+ */
+$lang['menu']                  = 'Eklenti Yönetimi';
+$lang['download']              = 'Yeni bir eklenti indirip kur';
+$lang['manage']                = 'Kurulmuş Eklentiler';
+$lang['btn_info']              = 'bilgi';
+$lang['btn_update']            = 'güncelle';
+$lang['btn_delete']            = 'sil';
+$lang['btn_settings']          = 'Ayarlar';
+$lang['btn_download']          = 'İndir';
+$lang['btn_enable']            = 'Kaydet';
+$lang['url']                   = 'Web Adresi';
+$lang['installed']             = 'Kuruldu:';
+$lang['lastupdate']            = 'Son güncelleştirme:';
+$lang['source']                = 'Kaynak:';
+$lang['unknown']               = 'bilinmiyor';
+$lang['updating']              = 'Güncelleştiriyor ...';
+$lang['updated']               = '%s eklentisi başarıyla güncellendi';
+$lang['updates']               = 'Şu eklentiler başarıyla güncellendi';
+$lang['update_none']           = 'Yeni bir güncelleme bulunamadı.';
+$lang['deleting']              = 'Siliniyor ...';
+$lang['deleted']               = '%s eklentisi silindi.';
+$lang['downloading']           = 'İndiriyor ...';
+$lang['downloaded']            = '%s eklentisi başarıyla kuruldu';
+$lang['downloads']             = 'Şu eklentiler başarıyla kuruldu:';
+$lang['download_none']         = 'Eklenti bulunamadı veya indirirken/kurarken bilinmeyen bir hata oluştu.';
+$lang['plugin']                = 'Eklenti:';
+$lang['components']            = 'Parçalar';
+$lang['noinfo']                = 'Bu eklentinin bilgileri alınamadı, geçerli bir eklenti olmayabilir.';
+$lang['name']                  = 'Ad:';
+$lang['date']                  = 'Tarih:';
+$lang['type']                  = 'Tür:';
+$lang['desc']                  = 'Açıklama:';
+$lang['author']                = 'Yazar:';
+$lang['www']                   = 'Web Adresi:';
+$lang['error']                 = 'Bilinmeyen bir hata oluştu.';
+$lang['error_download']        = 'Şu eklenti indirilemedi: %s';
+$lang['error_badurl']          = 'Yanlış adres olabilir - verilen adresten dosya adı alınamadı';
+$lang['error_dircreate']       = 'İndirmek için geçici klasör oluşturulamadı';
+$lang['error_decompress']      = 'Eklenti yöneticisi indirilen sıkıştırılmış dosyayı açamadı. Bu yanlış indirmeden kaynaklanabilir (bu durumda tekrar denemelisiniz). Ya da indirilen dosyanın sıkıştırma biçimi bilinmemektedir (bu durumda eklentiyi indirerek kendiniz kurmalısınız).';
+$lang['error_copy']            = '%s eklentisi dosyalarını kurmaya çalışırken kopyalama hatası ortaya çıktı. Sürücü dolu olabilir veya yazma yetkisi bulunmuyor olabilir. Bunun sebebi tam kurulmamış bir eklentinin wiki kurulumunu bozması olabilir.';
+$lang['error_delete']          = '%s eklentisini silerken bir hata oluştu. Bu hata yetersiz dosya/klasör erişim yetkisinden kaynaklanabilir.';
+$lang['enabled']               = '%s eklentisi etkinleştirildi.';
+$lang['notenabled']            = '%s eklentisi etkinleştirilemedi, dosya yetkilerini kontrol edin.';
+$lang['disabled']              = '%s eklentisi devre dışı bırakıldı.';
+$lang['notdisabled']           = '%s eklentisi devre dışı bırakılamadı, dosya yetkilerini kontrol edin.';
diff --git a/sources/lib/plugins/plugin/lang/uk/admin_plugin.txt b/sources/lib/plugins/plugin/lang/uk/admin_plugin.txt
new file mode 100644
index 0000000..7bdf8e5
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/uk/admin_plugin.txt
@@ -0,0 +1,7 @@
+====== Керування доданками ======
+
+Тут ви можете керувати [[doku>plugins|доданками]] ДокуВікі. Для того, щоб завантажувати та встановлювати доданки, папка доданків повинна бути доступна для запису веб-сервером.
+
+
+
+
diff --git a/sources/lib/plugins/plugin/lang/uk/lang.php b/sources/lib/plugins/plugin/lang/uk/lang.php
new file mode 100644
index 0000000..c6d5990
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/uk/lang.php
@@ -0,0 +1,58 @@
+
+ * @author Uko uko@uar.net
+ * @author Ulrikhe Lukoie  .com
+ * @author Kate Arzamastseva pshns@ukr.net
+ */
+$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_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. Перевірте права доступу до файлу.';
+$lang['packageinstalled']      = 'Пакет плагінів (%d plugin(s): %s) успішно встановлений.';
diff --git a/sources/lib/plugins/plugin/lang/vi/lang.php b/sources/lib/plugins/plugin/lang/vi/lang.php
new file mode 100644
index 0000000..2933d88
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/vi/lang.php
@@ -0,0 +1,5 @@
+plugins|附加元件]] 相關的選項。若要正常下載及安裝附加元件，附加元件所在的資料夾必須允許網頁伺服器寫入。
\ No newline at end of file
diff --git a/sources/lib/plugins/plugin/lang/zh-tw/lang.php b/sources/lib/plugins/plugin/lang/zh-tw/lang.php
new file mode 100644
index 0000000..bc84059
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/zh-tw/lang.php
@@ -0,0 +1,60 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San 
+ * @author Li-Jiun Huang 
+ * @author Cheng-Wei Chien 
+ * @author Danny Lin
+ * @author Shuo-Ting Jian 
+ * @author syaoranhinata@gmail.com
+ * @author Ichirou Uchiki 
+ */
+$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 可能有問題 —— 從 URL 中無法得知文件名';
+$lang['error_dircreate']       = '無法建立暫存目錄來接收下載的內容';
+$lang['error_decompress']      = '附加元件管理器無法把下載的文件解壓，這可能是由於下載出現錯誤。遇到這種情況，請您再次嘗試。此外，無法識別壓縮格式也可能導致無法解壓。若是如此，您需要手動下載並安裝該附加元件。';
+$lang['error_copy']            = '嘗試安裝附加元件 %s 的相關文件時，發生複製錯誤。這可能是磁碟空間不足，或檔案存取權限錯誤。未安裝好的附加元件，也許會令wiki系統不穩定。';
+$lang['error_delete']          = '嘗試刪除附加元件 %s 時發生錯誤。最有可能原因是檔案或目錄存取權限不足';
+$lang['enabled']               = '附加元件 %s 已啟用。';
+$lang['notenabled']            = '附加元件 %s 無法啟用，請檢查檔案權限。';
+$lang['disabled']              = '附加元件 %s 已停用。';
+$lang['notdisabled']           = '附加元件 %s 無法停用，請檢查檔案權限。';
+$lang['packageinstalled']      = '附加元件 (%d 附加元件: %s) 已安裝好。';
diff --git a/sources/lib/plugins/plugin/lang/zh/admin_plugin.txt b/sources/lib/plugins/plugin/lang/zh/admin_plugin.txt
new file mode 100644
index 0000000..1618071
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/zh/admin_plugin.txt
@@ -0,0 +1,5 @@
+====== 插件管理器 ======
+
+本页中您可以管理与 Dokuwiki [[doku>plugins|插件]] 相关的选项。 要通过插件管理器正常下载并安装插件，插件所在的文件夹必须可写。
+
+
diff --git a/sources/lib/plugins/plugin/lang/zh/lang.php b/sources/lib/plugins/plugin/lang/zh/lang.php
new file mode 100644
index 0000000..b39c6b0
--- /dev/null
+++ b/sources/lib/plugins/plugin/lang/zh/lang.php
@@ -0,0 +1,64 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton guxd@163.com
+ * @author Simon zhan 
+ * @author mr.jinyi@gmail.com
+ * @author ben 
+ * @author lainme 
+ * @author caii 
+ * @author Hiphen Lee 
+ * @author caii, patent agent in China 
+ * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian 
+ * @author anjianshi 
+ */
+$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 可能有问题 - 从 URL 中无法得知文件名';
+$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插件禁用失败，请检查文件权限。';
+$lang['packageinstalled']      = '插件  (%d 插件: %s) 已成功安装。';
diff --git a/sources/lib/plugins/plugin/plugin.info.txt b/sources/lib/plugins/plugin/plugin.info.txt
new file mode 100644
index 0000000..cdf8668
--- /dev/null
+++ b/sources/lib/plugins/plugin/plugin.info.txt
@@ -0,0 +1,7 @@
+base   plugin
+author Christopher Smith
+email  chris@jalakai.co.uk
+date   2013-02-20
+name   Plugin Manager plugin
+desc   Manage and install plugins
+url    http://www.dokuwiki.org/plugin:plugin
diff --git a/sources/lib/plugins/plugin/style.css b/sources/lib/plugins/plugin/style.css
new file mode 100644
index 0000000..9433e60
--- /dev/null
+++ b/sources/lib/plugins/plugin/style.css
@@ -0,0 +1,195 @@
+/*
+ * admin plugin extension - style additions
+ *
+ * @author  Christopher Smith  chris@jalakai.co.uk
+ * @link    http://wiki.jalakai.co.uk/dokuwiki/doku.php/tutorials/adminplugin
+ */
+
+#plugin__manager h2 {
+    margin-left: 0;
+}
+
+#plugin__manager form {
+    display: block;
+    margin: 0;
+    padding: 0;
+}
+
+#plugin__manager legend {
+    display: none;
+}
+
+#plugin__manager fieldset {
+    width: auto;
+}
+
+#plugin__manager .button {
+    margin: 0;
+}
+
+#plugin__manager p,
+#plugin__manager label {
+    text-align: left;
+}
+
+#plugin__manager .hidden {
+    display: none;
+}
+
+#plugin__manager .new {
+    background: #dee7ec;
+}
+
+/* IE won't understand but doesn't require it */
+#plugin__manager input[disabled] {
+    color: #ccc;
+    border-color: #ccc;
+}
+
+#plugin__manager .pm_menu,
+#plugin__manager .pm_info {
+    margin-left: 0;
+    text-align: left;
+}
+
+[dir=rtl] #plugin__manager .pm_menu,
+[dir=rtl] #plugin__manager .pm_info,
+[dir=rtl] #plugin__manager p,
+[dir=rtl] #plugin__manager label {
+    text-align: right;
+}
+
+#plugin__manager .pm_menu {
+    float: left;
+    width: 48%;
+}
+[dir=rtl] #plugin__manager .pm_menu {
+    float: right;
+}
+
+#plugin__manager .pm_info {
+    float: right;
+    width: 50%;
+}
+[dir=rtl] #plugin__manager .pm_info {
+    float: left;
+}
+
+#plugin__manager .common fieldset {
+    margin: 0;
+    padding: 0 0 1.0em 0;
+    text-align: left;
+    border: none;
+}
+[dir=rtl] #plugin__manager .common fieldset {
+    text-align: right;
+}
+
+#plugin__manager .common label {
+    padding: 0 0 0.5em 0;
+}
+
+#plugin__manager .common input.edit {
+    width: 24em;
+    margin: 0.5em;
+}
+
+#plugin__manager .plugins fieldset {
+    color: #000;
+    background: #fff;
+    text-align: right;
+    border-top: none;
+    border-right: none;
+    border-left: none;
+}
+
+#plugin__manager .plugins fieldset.protected {
+    background: #fdd;
+    color: #000;
+}
+
+#plugin__manager .plugins fieldset.disabled {
+    background: #e0e0e0;
+    color: #a8a8a8;
+}
+
+#plugin__manager .plugins .legend {
+    color: #000;
+    background: inherit;
+    display: block;
+    margin: 0;
+    padding: 0;
+    font-size: 1em;
+    line-height: 1.4em;
+    font-weight: normal;
+    text-align: left;
+    float: left;
+    padding: 0;
+    clear: none;
+}
+[dir=rtl] #plugin__manager .plugins .legend {
+    text-align: right;
+    float: right;
+}
+
+#plugin__manager .plugins .button {
+    font-size: 95%;
+}
+
+#plugin__manager .plugins fieldset.buttons {
+    border: none;
+}
+
+#plugin__manager .plugins fieldset.buttons .button {
+    float: left;
+}
+[dir=rtl] #plugin__manager .plugins .button {
+    float: left;
+    margin-right: 0.5em;
+}
+[dir=rtl] #plugin__manager .plugins fieldset.buttons .button {
+    float: right;
+}
+
+#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;
+}
+[dir=rtl] #plugin__manager .pm_info dt {
+    float: right;
+    clear: right;
+}
+
+#plugin__manager .pm_info dd {
+    margin: 0 0 0 7em;
+    padding: 0;
+    background: none;
+}
+[dir=rtl] #plugin__manager .pm_info dd {
+    margin: 0 7em 0 0;
+}
+
+#plugin__manager .plugins .enable {
+    float: left;
+    width: auto;
+    margin-right: 0.5em;
+}
+[dir=rtl] #plugin__manager .plugins .enable {
+    float: right;
+    margin-right: 0;
+    margin-left: 0.5em;
+}
+
+/* end admin plugin styles */
diff --git a/sources/lib/plugins/popularity/action.php b/sources/lib/plugins/popularity/action.php
new file mode 100644
index 0000000..9e2e78d
--- /dev/null
+++ b/sources/lib/plugins/popularity/action.php
@@ -0,0 +1,60 @@
+helper = $this->loadHelper('popularity', false);
+    }
+
+    /**
+     * Register its handlers with the dokuwiki's event controller
+     */
+    function register(Doku_Event_Handler $controller) {
+        $controller->register_hook('INDEXER_TASKS_RUN', 'AFTER',  $this, '_autosubmit', array());
+    }
+
+    function _autosubmit(Doku_Event &$event, $param){
+        //Do we have to send the data now
+        if ( !$this->helper->isAutosubmitEnabled() || $this->_isTooEarlyToSubmit() ){
+            return;
+        }
+
+        //Actually send it
+        $status = $this->helper->sendData( $this->helper->gatherAsString() );
+
+        if ( $status !== '' ){
+            //If an error occured, log it
+            io_saveFile( $this->helper->autosubmitErrorFile, $status );
+        } else {
+            //If the data has been sent successfully, previous log of errors are useless
+            @unlink($this->helper->autosubmitErrorFile);
+            //Update the last time we sent data
+            touch ( $this->helper->autosubmitFile );
+        }
+
+        $event->stopPropagation();
+        $event->preventDefault();
+    }
+
+    /**
+     * Check if it's time to send autosubmit data
+     * (we should have check if autosubmit is enabled first)
+     */
+    function _isTooEarlyToSubmit(){
+        $lastSubmit = $this->helper->lastSentTime();
+        return $lastSubmit + 24*60*60*30 > time();
+    }
+}
diff --git a/sources/lib/plugins/popularity/admin.php b/sources/lib/plugins/popularity/admin.php
new file mode 100644
index 0000000..bd2d090
--- /dev/null
+++ b/sources/lib/plugins/popularity/admin.php
@@ -0,0 +1,152 @@
+
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * All DokuWiki plugins to extend the admin function
+ * need to inherit from this class
+ */
+class admin_plugin_popularity extends DokuWiki_Admin_Plugin {
+
+    /**
+     * @var helper_plugin_popularity
+     */
+    var $helper;
+    var $sentStatus = null;
+
+    function admin_plugin_popularity(){
+        $this->helper = $this->loadHelper('popularity', false);
+    }
+
+    /**
+     * return prompt for admin menu
+     */
+    function getMenuText($language) {
+        return $this->getLang('name');
+    }
+
+    /**
+     * return sort order for position in admin menu
+     */
+    function getMenuSort() {
+        return 2000;
+    }
+
+    /**
+     * Accessible for managers
+     */
+    function forAdminOnly() {
+        return false;
+    }
+
+
+    /**
+     * handle user request
+     */
+    function handle() {
+        global $INPUT;
+
+        //Send the data
+        if ( $INPUT->has('data') ){
+            $this->sentStatus = $this->helper->sendData( $INPUT->str('data') );
+            if ( $this->sentStatus === '' ){
+                //Update the last time we sent the data
+                touch ( $this->helper->popularityLastSubmitFile );
+            }
+            //Deal with the autosubmit option
+            $this->_enableAutosubmit( $INPUT->has('autosubmit') );
+        }
+    }
+
+    /**
+     * Enable or disable autosubmit
+     * @param bool $enable If TRUE, it will enable autosubmit. Else, it will disable it.
+     */
+    function _enableAutosubmit( $enable ){
+        if ( $enable ){
+            io_saveFile( $this->helper->autosubmitFile, ' ');
+        } else {
+            @unlink($this->helper->autosubmitFile);
+        }
+    }
+
+    /**
+     * Output HTML form
+     */
+    function html() {
+        global $INPUT;
+
+        if ( ! $INPUT->has('data') ){
+            echo $this->locale_xhtml('intro');
+
+            //If there was an error the last time we tried to autosubmit, warn the user
+            if ( $this->helper->isAutoSubmitEnabled() ){
+                if ( @file_exists($this->helper->autosubmitErrorFile) ){
+                    echo $this->getLang('autosubmitError');
+                    echo io_readFile( $this->helper->autosubmitErrorFile );
+                }
+            }
+
+            flush();
+            echo $this->buildForm('server');
+
+            //Print the last time the data was sent
+            $lastSent = $this->helper->lastSentTime();
+            if ( $lastSent !== 0 ){
+                echo $this->getLang('lastSent') . ' ' . datetime_h($lastSent);
+            }
+        } else {
+            //If we just submitted the form
+            if ( $this->sentStatus === '' ){
+                //If we successfully sent the data
+                echo $this->locale_xhtml('submitted');
+            } else {
+                //If we failed to submit the data, try directly with the browser
+                echo $this->getLang('submissionFailed') . $this->sentStatus . '
        ';
+                echo $this->getLang('submitDirectly');
+                echo $this->buildForm('browser', $INPUT->str('data'));
+            }
+        }
+    }
+
+
+    /**
+     * Build the form which presents the data to be sent
+     * @param string $submissionMode How is the data supposed to be sent? (may be: 'browser' or 'server')
+     * @param string $data   The popularity data, if it has already been computed. NULL otherwise.
+     * @return string The form, as an html string
+     */
+    function buildForm($submissionMode, $data = null){
+        $url = ($submissionMode === 'browser' ? $this->helper->submitUrl : script());
+        if ( is_null($data) ){
+            $data = $this->helper->gatherAsString();
+        }
+
+        $form = '
        '
+            .'
        '
+            .'
        ';
+
+        //If we submit via the server, we give the opportunity to suscribe to the autosubmission option
+        if ( $submissionMode !== 'browser' ){
+            $form .= ''
+                .''
+                .'';
+        }
+        $form .= ''
+            .'
        '
+            .'
        ';
+        return $form;
+    }
+}
diff --git a/sources/lib/plugins/popularity/helper.php b/sources/lib/plugins/popularity/helper.php
new file mode 100644
index 0000000..eacde06
--- /dev/null
+++ b/sources/lib/plugins/popularity/helper.php
@@ -0,0 +1,310 @@
+autosubmitFile = $conf['cachedir'].'/autosubmit.txt';
+        $this->autosubmitErrorFile = $conf['cachedir'].'/autosubmitError.txt';
+        $this->popularityLastSubmitFile = $conf['cachedir'].'/lastSubmitTime.txt';
+    }
+
+    /**
+     * Return methods of this helper
+     *
+     * @return array with methods description
+     */
+    function getMethods(){
+        $result = array();
+        $result[] = array(
+                'name'   => 'isAutoSubmitEnabled',
+                'desc'   => 'Check if autosubmit is enabled',
+                'params' => array(),
+                'return' => array('result' => 'bool')
+                );
+        $result[] = array(
+                'name'   => 'sendData',
+                'desc'   => 'Send the popularity data',
+                'params' => array('data' => 'string'),
+                'return' => array()
+                );
+        $result[] = array(
+                'name' => 'gatherAsString',
+                'desc' => 'Gather the popularity data',
+                'params' => array(),
+                'return' => array('data' => 'string')
+                );
+        $result[] = array(
+                'name'   => 'lastSentTime',
+                'desc'   => 'Compute the last time popularity data was sent',
+                'params' => array(),
+                'return' => array('data' => 'int')
+                );
+        return $result;
+
+    }
+
+    /**
+     * Check if autosubmit is enabled
+     * @return boolean TRUE if we should send data once a month, FALSE otherwise
+     */
+    function isAutoSubmitEnabled(){
+        return @file_exists($this->autosubmitFile);
+    }
+
+    /**
+     * Send the data, to the submit url
+     * @param string $data The popularity data
+     * @return string An empty string if everything worked fine, a string describing the error otherwise
+     */
+    function sendData($data){
+        $error = '';
+        $httpClient = new DokuHTTPClient();
+        $status = $httpClient->sendRequest($this->submitUrl, array('data' => $data), 'POST');
+        if ( ! $status ){
+            $error = $httpClient->error;
+        }
+        return $error;
+    }
+
+    /**
+     * Compute the last time the data was sent. If it has never been sent, we return 0.
+     */
+    function lastSentTime(){
+        $manualSubmission = @filemtime($this->popularityLastSubmitFile);
+        $autoSubmission   = @filemtime($this->autosubmitFile);
+
+        return max((int) $manualSubmission, (int) $autoSubmission);
+    }
+
+    /**
+     * Gather all information
+     * @return string The popularity data as a string
+     */
+    function gatherAsString(){
+        $data = $this->_gather();
+        $string = '';
+        foreach($data as $key => $val){
+            if(is_array($val)) foreach($val as $v){
+                $string .=  hsc($key)."\t".hsc($v)."\n";
+            }else{
+                $string .= hsc($key)."\t".hsc($val)."\n";
+            }
+        }
+        return $string;
+    }
+
+    /**
+     * Gather all information
+     * @return array The popularity data as an array
+     */
+    function _gather(){
+        global $conf;
+        /** @var $auth DokuWiki_Auth_Plugin */
+        global $auth;
+        $data = array();
+        $phptime = ini_get('max_execution_time');
+        @set_time_limit(0);
+        $pluginInfo = $this->getInfo();
+
+        // version
+        $data['anon_id'] = md5(auth_cookiesalt());
+        $data['version'] = getVersion();
+        $data['popversion'] = $pluginInfo['date'];
+        $data['language'] = $conf['lang'];
+        $data['now']      = time();
+        $data['popauto']  = (int) $this->isAutoSubmitEnabled();
+
+        // some config values
+        $data['conf_useacl']   = $conf['useacl'];
+        $data['conf_authtype'] = $conf['authtype'];
+        $data['conf_template'] = $conf['template'];
+
+        // number and size of pages
+        $list = array();
+        search($list,$conf['datadir'],array($this,'_search_count'),array('all'=>false),'');
+        $data['page_count']    = $list['file_count'];
+        $data['page_size']     = $list['file_size'];
+        $data['page_biggest']  = $list['file_max'];
+        $data['page_smallest'] = $list['file_min'];
+        $data['page_nscount']  = $list['dir_count'];
+        $data['page_nsnest']   = $list['dir_nest'];
+        if($list['file_count']) $data['page_avg'] = $list['file_size'] / $list['file_count'];
+        $data['page_oldest']   = $list['file_oldest'];
+        unset($list);
+
+        // number and size of media
+        $list = array();
+        search($list,$conf['mediadir'],array($this,'_search_count'),array('all'=>true));
+        $data['media_count']    = $list['file_count'];
+        $data['media_size']     = $list['file_size'];
+        $data['media_biggest']  = $list['file_max'];
+        $data['media_smallest'] = $list['file_min'];
+        $data['media_nscount']  = $list['dir_count'];
+        $data['media_nsnest']   = $list['dir_nest'];
+        if($list['file_count']) $data['media_avg'] = $list['file_size'] / $list['file_count'];
+        unset($list);
+
+        // number and size of cache
+        $list = array();
+        search($list,$conf['cachedir'],array($this,'_search_count'),array('all'=>true));
+        $data['cache_count']    = $list['file_count'];
+        $data['cache_size']     = $list['file_size'];
+        $data['cache_biggest']  = $list['file_max'];
+        $data['cache_smallest'] = $list['file_min'];
+        if($list['file_count']) $data['cache_avg'] = $list['file_size'] / $list['file_count'];
+        unset($list);
+
+        // number and size of index
+        $list = array();
+        search($list,$conf['indexdir'],array($this,'_search_count'),array('all'=>true));
+        $data['index_count']    = $list['file_count'];
+        $data['index_size']     = $list['file_size'];
+        $data['index_biggest']  = $list['file_max'];
+        $data['index_smallest'] = $list['file_min'];
+        if($list['file_count']) $data['index_avg'] = $list['file_size'] / $list['file_count'];
+        unset($list);
+
+        // number and size of meta
+        $list = array();
+        search($list,$conf['metadir'],array($this,'_search_count'),array('all'=>true));
+        $data['meta_count']    = $list['file_count'];
+        $data['meta_size']     = $list['file_size'];
+        $data['meta_biggest']  = $list['file_max'];
+        $data['meta_smallest'] = $list['file_min'];
+        if($list['file_count']) $data['meta_avg'] = $list['file_size'] / $list['file_count'];
+        unset($list);
+
+        // number and size of attic
+        $list = array();
+        search($list,$conf['olddir'],array($this,'_search_count'),array('all'=>true));
+        $data['attic_count']    = $list['file_count'];
+        $data['attic_size']     = $list['file_size'];
+        $data['attic_biggest']  = $list['file_max'];
+        $data['attic_smallest'] = $list['file_min'];
+        if($list['file_count']) $data['attic_avg'] = $list['file_size'] / $list['file_count'];
+        $data['attic_oldest']   = $list['file_oldest'];
+        unset($list);
+
+        // user count
+        if($auth && $auth->canDo('getUserCount')){
+            $data['user_count'] = $auth->getUserCount();
+        }
+
+        // calculate edits per day
+        $list = @file($conf['metadir'].'/_dokuwiki.changes');
+        $count = count($list);
+        if($count > 2){
+            $first = (int) substr(array_shift($list),0,10);
+            $last  = (int) substr(array_pop($list),0,10);
+            $dur = ($last - $first)/(60*60*24); // number of days in the changelog
+            $data['edits_per_day'] = $count/$dur;
+        }
+        unset($list);
+
+        // plugins
+        $data['plugin'] = plugin_list();
+
+        // pcre info
+        if(defined('PCRE_VERSION')) $data['pcre_version'] = PCRE_VERSION;
+        $data['pcre_backtrack'] = ini_get('pcre.backtrack_limit');
+        $data['pcre_recursion'] = ini_get('pcre.recursion_limit');
+
+        // php info
+        $data['os'] = PHP_OS;
+        $data['webserver'] = $_SERVER['SERVER_SOFTWARE'];
+        $data['php_version'] = phpversion();
+        $data['php_sapi'] = php_sapi_name();
+        $data['php_memory'] = $this->_to_byte(ini_get('memory_limit'));
+        $data['php_exectime'] = $phptime;
+        $data['php_extension'] = get_loaded_extensions();
+
+        return $data;
+    }
+
+    /**
+     * Callback to search and count the content of directories in DokuWiki
+     *
+     * @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 string $type  Type either 'd' for directory or 'f' for file
+     * @param int    $lvl   Current recursion depht
+     * @param array  $opts  option array as given to search()
+     * @return bool
+     */
+    function _search_count(&$data,$base,$file,$type,$lvl,$opts){
+        // traverse
+        if($type == 'd'){
+            if($data['dir_nest'] < $lvl) $data['dir_nest'] = $lvl;
+            $data['dir_count']++;
+            return true;
+        }
+
+        //only search txt files if 'all' option not set
+        if($opts['all'] || substr($file,-4) == '.txt'){
+            $size = filesize($base.'/'.$file);
+            $date = filemtime($base.'/'.$file);
+            $data['file_count']++;
+            $data['file_size'] += $size;
+            if(!isset($data['file_min']) || $data['file_min'] > $size) $data['file_min'] = $size;
+            if($data['file_max'] < $size) $data['file_max'] = $size;
+            if(!isset($data['file_oldest']) || $data['file_oldest'] > $date) $data['file_oldest'] = $date;
+        }
+
+        return false;
+    }
+
+    /**
+     * Convert php.ini shorthands to byte
+     *
+     * @author 
+     * @link   http://de3.php.net/manual/en/ini.core.php#79564
+     */
+    function _to_byte($v){
+        $l = substr($v, -1);
+        $ret = substr($v, 0, -1);
+        switch(strtoupper($l)){
+            case 'P':
+                $ret *= 1024;
+            case 'T':
+                $ret *= 1024;
+            case 'G':
+                $ret *= 1024;
+            case 'M':
+                $ret *= 1024;
+            case 'K':
+                $ret *= 1024;
+            break;
+        }
+        return $ret;
+    }
+}
diff --git a/sources/lib/plugins/popularity/lang/af/lang.php b/sources/lib/plugins/popularity/lang/af/lang.php
new file mode 100644
index 0000000..ab5e4f6
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/af/lang.php
@@ -0,0 +1,6 @@
+
+ * @author Usama Akkad 
+ * @author uahello@gmail.com
+ */
+$lang['name']                  = 'رد الشعبية (قد يأخذ بعض الوقت ليحمل)';
+$lang['submit']                = 'أرسل البيانات';
+$lang['autosubmit']            = 'ارسل البيانات آليا كل شهر';
+$lang['submissionFailed']      = 'تعذر إرسال البيانات بسبب الخطأ التالي:';
+$lang['submitDirectly']        = 'يمكنك إرسال البيانات يدويا بارسال النموذج التالي.';
+$lang['autosubmitError']       = 'فشلت آخر محاولة للإرسال، بسبب الخطأ التالي:';
+$lang['lastSent']              = 'أرسلت البيانات';
diff --git a/sources/lib/plugins/popularity/lang/ar/submitted.txt b/sources/lib/plugins/popularity/lang/ar/submitted.txt
new file mode 100644
index 0000000..085e3bd
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ar/submitted.txt
@@ -0,0 +1,3 @@
+====== رد الشعبية ======
+
+أرسلت البيانات بنجاح.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/bg/intro.txt b/sources/lib/plugins/popularity/lang/bg/intro.txt
new file mode 100644
index 0000000..35023b8
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/bg/intro.txt
@@ -0,0 +1,9 @@
+====== Обратна връзка ======
+
+Инструментът събира данни за вашето Wiki и ви позволява да ги изпратите да разработчиците на DokuWiki. Информацията ще им помогне да разберат как DokuWiki се ползва от потребителите и че статистиката е в подкрепа на поетата насока за развитие.
+
+Моля, ползвайте функцията, от време на време, когато уебстраницата ви се разраства, за да информирате разработчиците. Изпратените данни ще бъдат идентифицирани с анонимен идентификатор.
+
+Събираните данни съдържат информация като версията на DokuWiki, броя и размера на вашите страници и файлове, инсталирани приставки и информация за локалната инсталация на PHP.
+
+Данните, които ще бъдат изпратени са изобразени отдолу. Моля, натиснете бутона "Изпращане на данните", за да бъдат изпратени.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/bg/lang.php b/sources/lib/plugins/popularity/lang/bg/lang.php
new file mode 100644
index 0000000..ba731c0
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/bg/lang.php
@@ -0,0 +1,14 @@
+
+ * @author Kiril 
+ */
+$lang['name']                  = 'Обратна връзка (зареждането изисква време)';
+$lang['submit']                = 'Изпращане на данните';
+$lang['autosubmit']            = 'Автоматично изпращане на данните веднъж в месеца';
+$lang['submissionFailed']      = 'Данните не могат да бъдат изпратени поради следната грешка:';
+$lang['submitDirectly']        = 'Можете да изпратите данните ръчно чрез следния формуляр.';
+$lang['autosubmitError']       = 'Последното автоматично изпращане се провали, поради следната грешка:';
+$lang['lastSent']              = 'Данните са изпратени';
diff --git a/sources/lib/plugins/popularity/lang/bg/submitted.txt b/sources/lib/plugins/popularity/lang/bg/submitted.txt
new file mode 100644
index 0000000..3ecd24f
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/bg/submitted.txt
@@ -0,0 +1,3 @@
+====== Обратна връзка ======
+
+Данните са изпратени успешно.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ca-valencia/intro.txt b/sources/lib/plugins/popularity/lang/ca-valencia/intro.txt
new file mode 100644
index 0000000..cf14e08
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ca-valencia/intro.txt
@@ -0,0 +1,9 @@
+====== 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 cóm utilisen DokuWiki els usuaris i assegura que les decisions futures de desenroll estaran recolzades per estadístiques d'us real.
+
+L'animem a que repetixca este procés de tant en tant per a mantindre informats als desenrolladors quan el wiki creixca. Els seus conjunts reiteratius de senyes 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, utilise el botó "Enviar senyes" per a transferir l'informació.
diff --git a/sources/lib/plugins/popularity/lang/ca-valencia/lang.php b/sources/lib/plugins/popularity/lang/ca-valencia/lang.php
new file mode 100644
index 0000000..1bbe5e5
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ca-valencia/lang.php
@@ -0,0 +1,9 @@
+
+ * @author Bernat Arlandis 
+ */
+$lang['name']                  = 'Retro-alimentació de popularitat (pot tardar un poc en carregar)';
+$lang['submit']                = 'Enviar senyes';
diff --git a/sources/lib/plugins/popularity/lang/ca/intro.txt b/sources/lib/plugins/popularity/lang/ca/intro.txt
new file mode 100644
index 0000000..f5ded3f
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ca/intro.txt
@@ -0,0 +1,9 @@
+====== Retroacció sobre popularitat ======
+
+Aquesta eina recull dades anònimes sobre el vostre wiki i us permet enviar-les als desenvolupadors de DokuWiki. Això els ajudarà a entendre com utilitzen DokuWiki els usuaris i farà que futures decisions de desenvolupament es prenguin sobre la base d'estadístiques d'ús reals.
+
+Els desenvolupadors de DokuWiki us preguen que repetiu aquest pas de tant en tant per tal de mantenir-los ben informats a mesura que creix el vostre wiki. Els conjunts de dades que envieu al llarg del temps quedaran identificats per un ID anònim.
+
+Les dades que es recullen contenen informació com ara la vostra versió de DokuWiki, el nombre i la mida de pàgines i fitxers, els connectors instal·lats i informació sobre la vostra instal·lació de PHP.
+
+Més avall es mostren les dades crues que s'enviaran. Feu servir el botó "Envia dades" per transferir aquesta informació.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ca/lang.php b/sources/lib/plugins/popularity/lang/ca/lang.php
new file mode 100644
index 0000000..b308461
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ca/lang.php
@@ -0,0 +1,11 @@
+
+ * @author Carles Bellver 
+ * @author carles.bellver@cent.uji.es
+ * @author daniel@6temes.cat
+ */
+$lang['name']                  = 'Retroacció sobre popularitat (pot trigar una mica a carregar)';
+$lang['submit']                = 'Envia dades';
diff --git a/sources/lib/plugins/popularity/lang/cs/intro.txt b/sources/lib/plugins/popularity/lang/cs/intro.txt
new file mode 100644
index 0000000..4b38656
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/cs/intro.txt
@@ -0,0 +1,9 @@
+===== Průzkum používání =====
+
+Tento nástroj jednorázově shromáždí anonymní data o vaší wiki a umožní vám odeslat je vývojářům DokuWiki. To jim pomůže lépe porozumět, jak uživatelé DokuWiki používají, a jejich rozhodnutí při dalším vývoji budou založena na statistikách z reálného používání DokuWiki.
+
+Chcete-li pomoci vývojářům, čas od času, jak vaše wiki poroste, použijte tento nástroj. Vaše data budou pokaždé označena stejným anonymním identifikátorem.
+
+Shromážděná data budou obsahovat informace, jako je instalovaná verze DokuWiki, počet a velikosti stránek a souborů, instalované pluginy a informace o nainstalovaném PHP.
+
+Čistá data, která se odešlou, budou vidět níže. K odeslání informací použijte prosím tlačítko "Odeslat data".
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/cs/lang.php b/sources/lib/plugins/popularity/lang/cs/lang.php
new file mode 100644
index 0000000..4ab5916
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/cs/lang.php
@@ -0,0 +1,22 @@
+
+ * @author tomas@valenta.cz
+ * @author Marek Sacha 
+ * @author Lefty 
+ * @author Vojta Beran 
+ * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
+ * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
+ */
+$lang['name']                  = 'Průzkum používání (může chviličku trvat, než se natáhne)';
+$lang['submit']                = 'Odeslat data';
+$lang['autosubmit']            = 'Automaticky odesílat data jednou měsíčně';
+$lang['submissionFailed']      = 'Data nemohla být odeslána kvůli následující chybě:';
+$lang['submitDirectly']        = 'Data můžete odeslat ručně zasláním následujícího formuláře.';
+$lang['autosubmitError']       = 'Poslední automatické odeslání selhalo kvůli následující chybě:';
+$lang['lastSent']              = 'Data byla odeslána.';
diff --git a/sources/lib/plugins/popularity/lang/cs/submitted.txt b/sources/lib/plugins/popularity/lang/cs/submitted.txt
new file mode 100644
index 0000000..ff1f41c
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/cs/submitted.txt
@@ -0,0 +1,3 @@
+===== Průzkum používání =====
+
+Data byla úspěšně odeslána.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/da/intro.txt b/sources/lib/plugins/popularity/lang/da/intro.txt
new file mode 100644
index 0000000..e2122c9
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/da/intro.txt
@@ -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.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/da/lang.php b/sources/lib/plugins/popularity/lang/da/lang.php
new file mode 100644
index 0000000..78c4471
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/da/lang.php
@@ -0,0 +1,21 @@
+
+ * @author Esben Laursen 
+ * @author Harith 
+ * @author Daniel Ejsing-Duun 
+ * @author Erik Bjørn Pedersen 
+ * @author rasmus@kinnerup.com
+ * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig 
+ */
+$lang['name']                  = 'Tilbagemelding om popularitet (vil måske tage en del tid at indlæse)';
+$lang['submit']                = 'Send data';
+$lang['autosubmit']            = 'Automatisk sende data en gang om måneden';
+$lang['submissionFailed']      = 'Dataene kunne ikke sendes pga. følgende fejl:';
+$lang['submitDirectly']        = 'Du kan sende dataene manuelt ved at sende følgende formular.';
+$lang['autosubmitError']       = 'Den sidste automatiske fremsendelse fejlede pga. følgende fejl:';
+$lang['lastSent']              = 'Dataene er blevet sendt.';
diff --git a/sources/lib/plugins/popularity/lang/da/submitted.txt b/sources/lib/plugins/popularity/lang/da/submitted.txt
new file mode 100644
index 0000000..88e9ba0
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/da/submitted.txt
@@ -0,0 +1,3 @@
+====== Popularitetsfeedback ======
+
+Dataene er blevet sendt.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/de-informal/intro.txt b/sources/lib/plugins/popularity/lang/de-informal/intro.txt
new file mode 100644
index 0000000..a414b66
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/de-informal/intro.txt
@@ -0,0 +1,9 @@
+===== Rückmeldung zur Zufriedenheit =====
+
+Dieses Werkzeug sammelt anonym Daten über dein Wiki und erlaubt es dir diese an die Entwickler von DokuWiki zu senden. Dies hilft ihnen zu verstehen, wie DokuWiki von den Benutzern verwendet wird und stellt somit sicher, dass Entscheidungen für zukünftige Entwicklungen mit reellen Nutzungsstatistiken belegbar sind.
+
+Bitte wiederhole diesen Schritt von Zeit zu Zeit, um die Entwickler zu informieren wenn dein Wiki wächst. Deine aktuelleren Datensätze werden anhand einer anonymen Identifikationsnummer zugeordnet.
+
+Die gesammelten Daten enthalten Informationen über deine Version von DokuWiki, die Anzahl und Größe der Seiten und Dateien, installierte Erweiterungen und Informationen über deine PHP-Version.
+
+Die Rohdaten die gesendet werden, werden unten gezeigt. Bitte nutze den "Sende Daten" Knopf um die Informationen zu übermitteln.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/de-informal/lang.php b/sources/lib/plugins/popularity/lang/de-informal/lang.php
new file mode 100644
index 0000000..69efa74
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/de-informal/lang.php
@@ -0,0 +1,21 @@
+
+ * @author Juergen Schwarzer 
+ * @author Marcel Metz 
+ * @author Matthias Schulte 
+ * @author Christian Wichmann 
+ * @author Pierre Corell 
+ * @author Frank Loizzi 
+ * @author Volker Bödker 
+ */
+$lang['name']                  = 'Popularitätsrückmeldung (kann eine Weile dauern, bis es fertig geladen wurde)';
+$lang['submit']                = 'Sende Daten';
+$lang['autosubmit']            = 'Daten einmal im Monat automatisch senden';
+$lang['submissionFailed']      = 'Die Daten konnten aufgrund des folgenden Fehlers nicht gesendet werden: ';
+$lang['submitDirectly']        = 'Du kannst die Daten durch Betätigung des Buttons manuell versenden.';
+$lang['autosubmitError']       = 'Beim letzten automatischen Versuch die Daten zu senden, ist folgender Fehler aufgetreten: ';
+$lang['lastSent']              = 'Die Daten wurden gesendet';
diff --git a/sources/lib/plugins/popularity/lang/de-informal/submitted.txt b/sources/lib/plugins/popularity/lang/de-informal/submitted.txt
new file mode 100644
index 0000000..e7b45b5
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/de-informal/submitted.txt
@@ -0,0 +1,3 @@
+====== Popularitäts-Feedback ======
+
+Die Daten wurden erfolgreich versandt.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/de/intro.txt b/sources/lib/plugins/popularity/lang/de/intro.txt
new file mode 100644
index 0000000..ba88ce2
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/de/intro.txt
@@ -0,0 +1,11 @@
+====== Popularitäts-Feedback ======
+
+Dieses [[doku>popularity|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 Benutzerdaten 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 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 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 --git a/sources/lib/plugins/popularity/lang/de/lang.php b/sources/lib/plugins/popularity/lang/de/lang.php
new file mode 100644
index 0000000..a86fce5
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/de/lang.php
@@ -0,0 +1,26 @@
+
+ * @author Florian Anderiasch 
+ * @author Robin Kluth 
+ * @author Arne Pelka 
+ * @author Andreas Gohr 
+ * @author Dirk Einecke 
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider 
+ * @author Robert Bogenschneider 
+ * @author Niels Lange 
+ * @author Christian Wichmann 
+ * @author Paul Lachewsky 
+ * @author Pierre Corell 
+ */
+$lang['name']                  = 'Popularitäts-Feedback (Eventuell längere Ladezeit)';
+$lang['submit']                = 'Daten senden';
+$lang['autosubmit']            = 'Daten einmal im Monat automatisch senden';
+$lang['submissionFailed']      = 'Die Daten konnten aufgrund des folgenden Fehlers nicht gesendet werden: ';
+$lang['submitDirectly']        = 'Sie können die Daten durch Betätigung des Buttons manuell versenden.';
+$lang['autosubmitError']       = 'Beim letzten automatischen Versuch die Daten zu senden, ist folgender Fehler aufgetreten: ';
+$lang['lastSent']              = 'Die Daten wurden gesendet';
diff --git a/sources/lib/plugins/popularity/lang/de/submitted.txt b/sources/lib/plugins/popularity/lang/de/submitted.txt
new file mode 100644
index 0000000..e7b45b5
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/de/submitted.txt
@@ -0,0 +1,3 @@
+====== Popularitäts-Feedback ======
+
+Die Daten wurden erfolgreich versandt.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/el/intro.txt b/sources/lib/plugins/popularity/lang/el/intro.txt
new file mode 100644
index 0000000..22d5429
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/el/intro.txt
@@ -0,0 +1,9 @@
+====== Αναφορά Δημοτικότητας ======
+
+Το εργαλείο αυτό συλλέγει ανώνυμα δεδομένα για το wiki σας και σας επιτρέπει να τα στείλετε στους δημιουργούς της εφαρμογής DokuWiki. Αυτό τους βοηθά να καταλάβουν με ποιούς τρόπους χρησιμοποιείται η εφαρμογή DokuWiki από τους χρήστες της και εξασφαλίζει ότι οι μελλοντικές αποφάσεις σχεδίασης θα στηρίζονται σε πραγματικά δεδομένα χρήσης.
+
+Σας προτρέπουμε να επαναλαμβάνετε αυτή τη διαδικασία κατά διαστήματα ώστε οι δημιουργοί της εφαρμογής DokuWiki να μένουν ενήμεροι όταν το wiki σας μεγαλώνει. Τα διαδοχικά σύνολα δεδομένων που αποστέλλετε αναγνωρίζονται από έναν ανώνυμο κωδικό.
+
+Τα δεδομένα περιέχουν πληροφορίες όπως η έκδοση του DokuWiki σας, ο αριθμός και το μέγεθος των σελίδων και αρχείων σας, οι εγκατεστημένες επεκτάσεις και στοιχεία για την PHP που χρησιμοποιείτε.
+
+Τα ακριβή δεδομένα τα οποία θα αποσταλούν εμφανίζονται παρακάτω. Παρακαλούμε πατήστε στο κουμπί "Αποστολή Δεδομένων" για να τα αποστείλετε.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/el/lang.php b/sources/lib/plugins/popularity/lang/el/lang.php
new file mode 100644
index 0000000..37a0369
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/el/lang.php
@@ -0,0 +1,17 @@
+
+ * @author George Petsagourakis 
+ * @author Petros Vidalis 
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
+ */
+$lang['name']                  = 'Αναφορά Δημοτικότητας (ίσως αργήσει λίγο να εμφανιστεί)';
+$lang['submit']                = 'Αποστολή Δεδομένων';
+$lang['autosubmit']            = 'Να αποστέλονται τα δεδομένα αυτόματα μια φορά το μήνα.';
+$lang['submissionFailed']      = 'Τα δεδομένα δεν ήταν δυνατό να αποσταλλούν λόγω του παρακάτω σφάλματος:';
+$lang['submitDirectly']        = 'Μπορείτε να αποστείλλετε τα δεδομένα χειροκίνητα με την υποβολή της παρακάτω φόρμας.';
+$lang['autosubmitError']       = 'Η τελευταία αυτόματη υποβολή των δεδομένων απέτυχε με το παρακάτω μήνυμα σφάλματος:';
+$lang['lastSent']              = 'Τα δεδομένα έχουν σταλεί.';
diff --git a/sources/lib/plugins/popularity/lang/el/submitted.txt b/sources/lib/plugins/popularity/lang/el/submitted.txt
new file mode 100644
index 0000000..8004f99
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/el/submitted.txt
@@ -0,0 +1,3 @@
+====== Αποτέλεσμα Υποβολής Δημοσιότητας ======
+
+Τα δεδομένα στάλθηκαν επιτυχώς.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/en/intro.txt b/sources/lib/plugins/popularity/lang/en/intro.txt
new file mode 100644
index 0000000..e1d6d94
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/en/intro.txt
@@ -0,0 +1,11 @@
+====== Popularity Feedback ======
+
+This [[doku>popularity|tool]] gathers anonymous data about your wiki and allows you to send it back to the DokuWiki developers. This helps them to understand them how DokuWiki is used by its users and makes sure future development decisions are backed up by real world usage statistics.
+
+You are encouraged to repeat this step from time to time to keep developers informed when your wiki grows. Your repeated data sets will be identified by an anonymous ID.
+
+Data collected contains information like your DokuWiki version, the number and size of your pages and files, installed plugins and information about your PHP install.
+
+The raw data that will be send is shown below. Please use the "Send Data" button to transfer the information.
+
+
diff --git a/sources/lib/plugins/popularity/lang/en/lang.php b/sources/lib/plugins/popularity/lang/en/lang.php
new file mode 100644
index 0000000..af6797c
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/en/lang.php
@@ -0,0 +1,9 @@
+
+ * @author Felipe Castro 
+ * @author Robert Bogenschneider 
+ * @author Erik Pedersen 
+ * @author Erik Pedersen 
+ * @author Robert Bogenschneider 
+ */
+$lang['name']                  = 'Populareca enketo (eble la ŝargo prokrastos iomete)';
+$lang['submit']                = 'Sendi datumaron';
+$lang['autosubmit']            = 'Aŭtomate sendi datumaron monate';
+$lang['submissionFailed']      = 'La datumaro ne povis esti sendata tial:';
+$lang['submitDirectly']        = 'Vi povas sendi vi mem la datumaron per la sekva informilo.';
+$lang['autosubmitError']       = 'La lasta aŭtomata sendo malsukcesis, tial:';
+$lang['lastSent']              = 'La datumaro sendiĝis';
diff --git a/sources/lib/plugins/popularity/lang/eo/submitted.txt b/sources/lib/plugins/popularity/lang/eo/submitted.txt
new file mode 100644
index 0000000..095439b
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/eo/submitted.txt
@@ -0,0 +1,3 @@
+====== Enketo pri Populareco ======
+
+La datumoj sendiĝis sukcese.
diff --git a/sources/lib/plugins/popularity/lang/es/intro.txt b/sources/lib/plugins/popularity/lang/es/intro.txt
new file mode 100644
index 0000000..cc776a3
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/es/intro.txt
@@ -0,0 +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.
+
+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 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 --git a/sources/lib/plugins/popularity/lang/es/lang.php b/sources/lib/plugins/popularity/lang/es/lang.php
new file mode 100644
index 0000000..337a8ea
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/es/lang.php
@@ -0,0 +1,32 @@
+
+ * @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 
+ * @author Victor Castelan 
+ * @author Mauro Javier Giamberardino 
+ * @author Oscar M. Lage 
+ * @author emezeta 
+ * @author Oscar Ciudad 
+ * @author Ruben Figols 
+ * @author Gerardo Zamudio 
+ * @author Mercè López mercelz@gmail.com
+ */
+$lang['name']                  = 'Retroinformación (Feedback) plugin Popularity';
+$lang['submit']                = 'Enviar datos';
+$lang['autosubmit']            = 'Enviar automáticamente datos una vez al mes';
+$lang['submissionFailed']      = 'Los datos no se pudo enviar debido al error siguiente:';
+$lang['submitDirectly']        = 'Puede enviar los datos de forma manual mediante la presentación de la siguiente forma.';
+$lang['autosubmitError']       = 'El último auto no pudo presentar, debido al error siguiente:';
+$lang['lastSent']              = 'Los datos se han enviado';
diff --git a/sources/lib/plugins/popularity/lang/es/submitted.txt b/sources/lib/plugins/popularity/lang/es/submitted.txt
new file mode 100644
index 0000000..bb1754c
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/es/submitted.txt
@@ -0,0 +1,3 @@
+====== Retroinformación Popularity ======
+
+Los datos se han enviado con éxito.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/et/lang.php b/sources/lib/plugins/popularity/lang/et/lang.php
new file mode 100644
index 0000000..ca1410a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/et/lang.php
@@ -0,0 +1,7 @@
+
+ */
diff --git a/sources/lib/plugins/popularity/lang/eu/intro.txt b/sources/lib/plugins/popularity/lang/eu/intro.txt
new file mode 100644
index 0000000..2d2846f
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/eu/intro.txt
@@ -0,0 +1,9 @@
+====== 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.
+
+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.
+
+Jasotako datuek daramaten informazioa DokuWiki bertsioa, zure orri eta fitxategien kopuru eta tamaina, instalatutako plugin-ak, zure PHP instalazioari buruzko informazioa eta antzerako informazioa da.
+
+Bidaliko diren prozesatu gabeko datuak behean erakusten dira. Mesedez, erabili "Datuak Bidali" botoia informazioa bidaltzeko.
diff --git a/sources/lib/plugins/popularity/lang/eu/lang.php b/sources/lib/plugins/popularity/lang/eu/lang.php
new file mode 100644
index 0000000..b52ccae
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/eu/lang.php
@@ -0,0 +1,14 @@
+
+ * @author Zigor Astarbe 
+ */
+$lang['name']                  = 'Popularitate Feedback-a (denbora dezente iraun dezake kargatzen)';
+$lang['submit']                = 'Datuak Bidali';
+$lang['autosubmit']            = 'Automatikoki bidali informazioa hilabetean behin';
+$lang['submissionFailed']      = 'Informazioa ezin izan da bidali ondorengo errorea dela eta:';
+$lang['submitDirectly']        = 'Informazioa eskuz bidali dezakezu ondorengo formularioa bidaliz.';
+$lang['autosubmitError']       = 'Azken bidalketa automatikoak huts egin zuen ondorengo errorea dela eta:';
+$lang['lastSent']              = 'Informazioa bidalia izan da';
diff --git a/sources/lib/plugins/popularity/lang/eu/submitted.txt b/sources/lib/plugins/popularity/lang/eu/submitted.txt
new file mode 100644
index 0000000..94c81a5
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/eu/submitted.txt
@@ -0,0 +1,3 @@
+====== Popularitate Feedback-a ======
+
+Informazioa arrakastaz bidalia izan da.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/fa/intro.txt b/sources/lib/plugins/popularity/lang/fa/intro.txt
new file mode 100644
index 0000000..e8521af
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fa/intro.txt
@@ -0,0 +1,9 @@
+====== بازخورد محبوبیت ======
+
+این ابزار اطلاعات ناشناسی از ویکی شما را برای توسعه‌دهندگان DokuWiki ارسال می‌کند. این اطلاعات به توسعه‌دهندگان کمک می‌کند تا بفهمند کاربران DokuWiki از آن چگونه استفاده می‌کنند تا بتوانند در نسخه‌های آتی، تصمیمات بهتری اتخاذ کنند.
+
+ما امیدواریم شما این حرکت را در زمان‌های مختلف که ویکی‌تان بزرگ‌تر شد، انجام دهید و این اطلاعات ناشناس ارسال خواهد شد.
+
+اطلاعات جمع‌آوری شده حامل اطلاعاتی مثل نسخه‌ی DokuWiki، تعداد و حجم صفحات و فایل‌ها، افزونه‌های نصب شده و اطلاعات PHP سرور می‌باشد.
+
+اطلاعات خامی که ارسال می‌شود در زیر آمده است. خواهشمندیم از دکمه‌ی «ارسال اطلاعات» برای فرستاده شدن استفاده کنید.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/fa/lang.php b/sources/lib/plugins/popularity/lang/fa/lang.php
new file mode 100644
index 0000000..d2f071b
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fa/lang.php
@@ -0,0 +1,20 @@
+
+ * @author omidmr@gmail.com
+ * @author Omid Mottaghi 
+ * @author Mohammad Reza Shoaei 
+ * @author Milad DZand 
+ * @author AmirH Hassaneini 
+ */
+$lang['name']                  = 'بازخورد محبوبیت (ممکن است اندکی زمان ببرد)';
+$lang['submit']                = 'ارسال اطلاعات';
+$lang['autosubmit']            = 'ارسال خودکار اطلاعات به صورت ماهیانه';
+$lang['submissionFailed']      = 'اطلاعات به علت بروز خطای زیر قابل ارسال نیستند:';
+$lang['submitDirectly']        = 'شما میتوانید اطلاعات را با تکمیل این فرم به صورت دستی ارسال کنید.';
+$lang['autosubmitError']       = 'آخرین ارسال خودکار با خطای مواجه شد, به علت زیر:';
+$lang['lastSent']              = 'اطلاعات ارسال شد.';
diff --git a/sources/lib/plugins/popularity/lang/fa/submitted.txt b/sources/lib/plugins/popularity/lang/fa/submitted.txt
new file mode 100644
index 0000000..63eec47
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fa/submitted.txt
@@ -0,0 +1,2 @@
+====== بازخورد محبوبیت ======
+اطلاعات ارسال شد.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/fi/intro.txt b/sources/lib/plugins/popularity/lang/fi/intro.txt
new file mode 100644
index 0000000..f68c2b8
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fi/intro.txt
@@ -0,0 +1,9 @@
+====== Suosion palaute ======
+
+Tämä työkalu kerää tietoja wikistäsi ilman tunnistetietoja, jotka voit lähettää DokuWikin kehittäjille. Tämä auttaa heitä ymmärtämään, kuinka DokuWikiä käytetään ja varmistaa, että tulevaisuuden kehityspäätökset tehdään tosielämän käyttökokemusten perusteella.
+
+Toivomme sinun toistavan tämän aiheen silloin tällöin, jotta kehittäjät pysyvät tietoisina, miten wikisi kehittyy. Uudelleenlähettämäsi tiedot identifioidaan tunnisteella, jota ei voida jäljittää takaisin sinuun.
+
+Kerätty tieto pitää sisällään tietoa esimerkiksi DokuWikisi versiosta, sivujen koosta ja lukumäärästä, asennetuista liitännäisistä, sekä PHP asennuksestasi.
+
+Raaka tieto, joka lähetetään näkyy alla. Lähetä tieto painamalla "Lähetä tiedot" nappia.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/fi/lang.php b/sources/lib/plugins/popularity/lang/fi/lang.php
new file mode 100644
index 0000000..ec0fc40
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fi/lang.php
@@ -0,0 +1,16 @@
+
+ * @author Teemu Mattila 
+ * @author Sami Olmari 
+ */
+$lang['name']                  = 'Suosion palaute (voi kestää jonkun aikaa latautua)';
+$lang['submit']                = 'Lähetä tiedot';
+$lang['autosubmit']            = 'Lähetä tiedot automaattisesti kerran kuussa';
+$lang['submissionFailed']      = 'Tietoja ei voitu lähettää seuraavan virheen vuoksi:';
+$lang['submitDirectly']        = 'Voit lähettää tiedot käsin seuraavan kaavakkeen avulla';
+$lang['autosubmitError']       = 'Edellinen automaattilähetys epäonnistui seuraavan virheen vuoksi:';
+$lang['lastSent']              = 'Tiedot on lähetetty';
diff --git a/sources/lib/plugins/popularity/lang/fi/submitted.txt b/sources/lib/plugins/popularity/lang/fi/submitted.txt
new file mode 100644
index 0000000..31059c8
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fi/submitted.txt
@@ -0,0 +1,3 @@
+====== Suosion palaute ======
+
+Tiedot lähetettiin onnistuneesti.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/fr/intro.txt b/sources/lib/plugins/popularity/lang/fr/intro.txt
new file mode 100644
index 0000000..5985234
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fr/intro.txt
@@ -0,0 +1,10 @@
+====== Enquête de popularité ======
+
+Cet [[doku>popularity|outil]] collecte des données anonymes concernant votre wiki et vous permet de les expédier aux développeurs de DokuWiki. Ceci leur permet de mieux comprendre comment DokuWiki est utilisé par ses utilisateurs et d'orienter les décisions sur les développements futurs en tenant compte des statistiques d'usage réel.
+
+Vous êtes encouragé à répéter cette opération de temps à autres afin de tenir informés les développeurs de l'évolution de votre wiki. L'ensemble de vos contributions seront recensées via un identifiant anonyme.
+
+Les données collectées contiennent des informations telles votre version de DokuWiki, le nombre et la taille de vos pages et fichiers, les extensions installées ainsi que des informations sur la version de PHP installée.
+
+Les données brutes qui sont envoyées sont affichées ci dessous. Merci d'utiliser le bouton « Envoyer les données » pour expédier l'information.
+
diff --git a/sources/lib/plugins/popularity/lang/fr/lang.php b/sources/lib/plugins/popularity/lang/fr/lang.php
new file mode 100644
index 0000000..7603b2a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fr/lang.php
@@ -0,0 +1,29 @@
+
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri 
+ * @author Erik Pedersen 
+ * @author olivier duperray 
+ * @author Vincent Feltz 
+ * @author Philippe Bajoit 
+ * @author Florian Gaub 
+ * @author Samuel Dorsaz samuel.dorsaz@novelion.net
+ * @author Johan Guilbaud 
+ * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
+ * @author Yannick Aure 
+ * @author Olivier DUVAL 
+ * @author Anael Mobilia 
+ * @author Bruno Veilleux 
+ */
+$lang['name']                  = 'Enquête de popularité (peut nécessiter un certain temps pour être chargée)';
+$lang['submit']                = 'Envoyer les données';
+$lang['autosubmit']            = 'Envoyer les données automatiquement une fois par mois';
+$lang['submissionFailed']      = 'Les données ne peuvent pas être expédiées à cause des erreurs suivantes :';
+$lang['submitDirectly']        = 'Vous pouvez envoyer les données manuellement en soumettant ce formulaire.';
+$lang['autosubmitError']       = 'La dernière soumission automatique a échoué pour les raisons suivantes :';
+$lang['lastSent']              = 'Les données ont été expédiées';
diff --git a/sources/lib/plugins/popularity/lang/fr/submitted.txt b/sources/lib/plugins/popularity/lang/fr/submitted.txt
new file mode 100644
index 0000000..edb5e21
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/fr/submitted.txt
@@ -0,0 +1,3 @@
+====== Enquête de popularité ======
+
+Les données ont été expédiées avec succès.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/gl/intro.txt b/sources/lib/plugins/popularity/lang/gl/intro.txt
new file mode 100644
index 0000000..72f03e0
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/gl/intro.txt
@@ -0,0 +1,10 @@
+====== 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.
+
+Animámoste a levar a cabo este proceso de cando en vez para manteres informados aos desenvolvedores a medida que o teu wiki vaia medrando. Os teus xogos de datos repetidos seran identificados por un ID anónimo.
+
+Os datos recompilados conteñen información como a versión do teu Dokuwiki, o número e tamaño das túas páxinas e arquivos, as extensións instaladas e información verbo da túa instalación do PHP.
+
+Os datos en bruto que serán enviados amósanse embaixo. Por favor, emprega o botón "Enviar Datos" para transferires a información.
+
diff --git a/sources/lib/plugins/popularity/lang/gl/lang.php b/sources/lib/plugins/popularity/lang/gl/lang.php
new file mode 100644
index 0000000..86cd34d
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/gl/lang.php
@@ -0,0 +1,15 @@
+
+ * @author Oscar M. Lage 
+ * @author Rodrigo Rega 
+ */
+$lang['name']                  = 'Resposta de Popularidade (pode demorar un tempo a cargar)';
+$lang['submit']                = 'Enviar Datos';
+$lang['autosubmit']            = 'Enviar datos automáticamente unha vez por mes';
+$lang['submissionFailed']      = 'Os datos non se poden enviar debido ao seguinte erro:';
+$lang['submitDirectly']        = 'Podes enviar os datos de forma manual co seguinte formulario.';
+$lang['autosubmitError']       = 'O último envío automático fallou debido ao seguinte erro:';
+$lang['lastSent']              = 'Os datos foron enviados';
diff --git a/sources/lib/plugins/popularity/lang/gl/submitted.txt b/sources/lib/plugins/popularity/lang/gl/submitted.txt
new file mode 100644
index 0000000..0dec55e
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/gl/submitted.txt
@@ -0,0 +1,3 @@
+====== Resposta de Popularidade ======
+
+Os datos foron enviados satisfactoriamente.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/he/intro.txt b/sources/lib/plugins/popularity/lang/he/intro.txt
new file mode 100644
index 0000000..1f2e318
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/he/intro.txt
@@ -0,0 +1,9 @@
+====== משוב פופלריות ======
+
+כלי זה אוסף מידע אנונימי אודות הויקי שלך ומאפשר לך לשלוח אותו חזרה למפתחי דוקוויקי. מידע זה יסיע להם להבין את השימוש שעושים משתמשי דוקוויקי במערכת ויבטיח שהחלטות עתידיות לגבי הפיתוח יתבססו על סטטיסטיקות שימוש אמיתי.
+
+נודה אם תחזור על הפעולה מהעת לעת כדי לודא המפתחים מיודעים כשהויקי שלך גדל. המידע שישלח יזוהה על ידי תג אנונימי.
+
+המידע שנאסף כולל פרטים כמו גרסת הדוקוויקי, מספר וגודל הדפים והקבצים שלך, הרחבות מותקנות ומידע אודות התקנת ה-PHP שלך.
+
+המידע הגולמי שישלח מופיע מטה. נא השתמש בכפתור "שלח מידע" כדי להעבירו.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/he/lang.php b/sources/lib/plugins/popularity/lang/he/lang.php
new file mode 100644
index 0000000..5434163
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/he/lang.php
@@ -0,0 +1,12 @@
+
+ * @author Moshe Kaplan 
+ * @author Yaron Yogev 
+ * @author Yaron Shahrabani 
+ */
+$lang['name']                  = 'משוב פופולריות (יתכן זמן טעינה ארוך)';
+$lang['submit']                = 'שלח מידע';
diff --git a/sources/lib/plugins/popularity/lang/hi/lang.php b/sources/lib/plugins/popularity/lang/hi/lang.php
new file mode 100644
index 0000000..c818c7a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/hi/lang.php
@@ -0,0 +1,9 @@
+
+ * @author yndesai@gmail.com
+ */
+$lang['submit']                = 'डेटा भेजे';
diff --git a/sources/lib/plugins/popularity/lang/hr/lang.php b/sources/lib/plugins/popularity/lang/hr/lang.php
new file mode 100644
index 0000000..96f1d6a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/hr/lang.php
@@ -0,0 +1,8 @@
+
+ * @author Dražen Odobašić 
+ * @author Dejan Igrec dejan.igrec@gmail.com
+ */
diff --git a/sources/lib/plugins/popularity/lang/hu/intro.txt b/sources/lib/plugins/popularity/lang/hu/intro.txt
new file mode 100644
index 0000000..17bb6fc
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/hu/intro.txt
@@ -0,0 +1,9 @@
+====== Visszajelzés a DokuWiki használatáról ======
+
+Ez az eszköz anonimizált adatokat gyűjt a wikidről, és lehetővé teszi, hogy elküldd a DokuWiki fejlesztőinek. Ez segít meglátni, hogy a felhasználók hogyan használják a DokuWikijüket, ezáltal biztosítja, hogy a későbbi fejlesztési döntések hátterében valós használati statisztikák álljanak.
+
+Szeretnénk megkérni, hogy időről időre ismételd meg ezt a műveletet, hogy a fejlesztők értesülhessenek, hogyan nő a wikid mérete. Az ismételt adatküldéseid egy anoním ID-vel lesznek azonosítva.
+
+Ilyen és hasonló információkat gyűjtünk: DokuWiki verziószáma, a lapok, fájlok mérete és darabszáma, feltelepített bővítmények, PHP installáció adatai.
+
+Az elküldendő nyers adat lent látható. Kérjük, az "Adatok elküldése" gombbal juttasd el hozzánk!
diff --git a/sources/lib/plugins/popularity/lang/hu/lang.php b/sources/lib/plugins/popularity/lang/hu/lang.php
new file mode 100644
index 0000000..213d226
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/hu/lang.php
@@ -0,0 +1,20 @@
+
+ * @author Siaynoq Mage 
+ * @author schilling.janos@gmail.com
+ * @author Szabó Dávid 
+ * @author Sándor TIHANYI 
+ * @author David Szabo 
+ * @author Marton Sebok 
+ */
+$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';
+$lang['autosubmit']            = 'Adatok havonkénti automatikus elküldése.';
+$lang['submissionFailed']      = 'Az adatok a következő hiba miatt nem kerültek elküldésre:';
+$lang['submitDirectly']        = 'Az adatokat a következő űrlap segítségével lehet elküldeni.';
+$lang['autosubmitError']       = 'Az adatok a következő hiba miatt nem kerültek automatikusan elküldésre:';
+$lang['lastSent']              = 'Az adatokat elküldtük.';
diff --git a/sources/lib/plugins/popularity/lang/hu/submitted.txt b/sources/lib/plugins/popularity/lang/hu/submitted.txt
new file mode 100644
index 0000000..30ab8bd
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/hu/submitted.txt
@@ -0,0 +1,3 @@
+====== Visszajelzés a DokuWiki használatáról ======
+
+Az adatokat sikeresen elküldtük.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ia/intro.txt b/sources/lib/plugins/popularity/lang/ia/intro.txt
new file mode 100644
index 0000000..d31c365
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ia/intro.txt
@@ -0,0 +1,9 @@
+====== Datos de popularitate ======
+
+Iste instrumento collige datos anonyme super tu wiki e te permitte inviar los retro al disveloppatores de DokuWiki. Isto les adjuta de comprender como DokuWiki es usate per su usatores e assecura que le decisiones super le disveloppamento futur si basate super statisticas de uso ex le mundo real.
+
+Tu es incoragiate a repeter iste procedura de tempore a tempore pro continuar a informar le disveloppatores quando tu wiki cresce. Tu collectiones repetite de datos essera identificate per un ID anonyme.
+
+Le datos colligite contine informationes como tu version de DokuWiki, le numero e dimension de tu paginas e files, plug-ins installate e information super tu installation de PHP.
+
+Le datos crude que essera inviate es monstrate hic infra. Per favor usa le button "Inviar datos" pro transferer le informationes.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ia/lang.php b/sources/lib/plugins/popularity/lang/ia/lang.php
new file mode 100644
index 0000000..4a45f04
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ia/lang.php
@@ -0,0 +1,9 @@
+
+ * @author Martijn Dekker 
+ */
+$lang['name']                  = 'Datos de popularitate (pote prender alcun tempore pro cargar)';
+$lang['submit']                = 'Inviar datos';
diff --git a/sources/lib/plugins/popularity/lang/id-ni/intro.txt b/sources/lib/plugins/popularity/lang/id-ni/intro.txt
new file mode 100644
index 0000000..fb23709
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/id-ni/intro.txt
@@ -0,0 +1,7 @@
+====== Popularitas-Fangombakha ======
+
+Fakake anonyme da'e i'owuloi ngawalö data moroi ba Wiki khöu awö wanehegöu wama'ohe'ö DokuWiki ba zangahaogö. Data da'e aoha wangehaogö ba wombohouni mangawuli ba DokuWiki ba biziso miföna abölö aoha wangirö'ö ya'ia bakha ba nahia wamake statistik.
+
+Tola öfa'ohe'ö mangawuli data ero-ero soginötö ba wangehaogö ba bawamohouni Wiki khöndra samazökhi.  Data nifa'ohe'öu ifareso dania anonyme ID.
+
+...
diff --git a/sources/lib/plugins/popularity/lang/id-ni/lang.php b/sources/lib/plugins/popularity/lang/id-ni/lang.php
new file mode 100644
index 0000000..d9a36f2
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/id-ni/lang.php
@@ -0,0 +1,9 @@
+
+ * @author Yustinus Waruwu 
+ */
+$lang['name']                  = 'Sabölö teturia (sito\'ölönia ara ginötö wamokai)';
+$lang['submit']                = 'Fa\'ohe\'ö data';
diff --git a/sources/lib/plugins/popularity/lang/id/lang.php b/sources/lib/plugins/popularity/lang/id/lang.php
new file mode 100644
index 0000000..1867f0f
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/id/lang.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/popularity/lang/is/lang.php b/sources/lib/plugins/popularity/lang/is/lang.php
new file mode 100644
index 0000000..9add4ca
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/is/lang.php
@@ -0,0 +1,9 @@
+
+ * @author Ólafur Gunnlaugsson 
+ * @author Erik Bjørn Pedersen 
+ */
+$lang['submit']                = 'Senda gögn';
diff --git a/sources/lib/plugins/popularity/lang/it/intro.txt b/sources/lib/plugins/popularity/lang/it/intro.txt
new file mode 100644
index 0000000..f65310a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/it/intro.txt
@@ -0,0 +1,9 @@
+====== Raccolta dati sul wiki ======
+
+Questo strumento raccoglie dati anonimi sul tuo wiki e ti permette di inviarli agli sviluppatori di Dokuwiki. Questo aiuta loro a capire come Dokuwiki viene utilizzato dagli utenti e prendere decisioni future sullo sviluppo in base a quelle che sono le reali statistiche di utilizzo da parte degli utenti.
+
+Ti incoraggiamo a ripetere ogni tanto questa operazione per mantenere informati gli sviluppatori sulla crescita del tuo wiki. L'insieme dei dati raccolti saranno identificati tramite un ID anonimo.
+
+I dati raccolti contengono informazioni come la versione di DokuWiki, il numero e le dimensioni delle pagine e dei file, i plugin installati e informazioni sulla versione di PHP presente nel sistema.
+
+A continuazione puoi vedere un'anteprima dei dati che saranno inviati. Utilizza il pulsante "Invia dati" per trasferire le informazioni.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/it/lang.php b/sources/lib/plugins/popularity/lang/it/lang.php
new file mode 100644
index 0000000..9edefba
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/it/lang.php
@@ -0,0 +1,22 @@
+
+ * @author snarchio@alice.it
+ * @author robocap 
+ * @author Osman Tekin osman.tekin93@hotmail.it
+ * @author Jacopo Corbetta 
+ * @author Matteo Pasotti 
+ * @author snarchio@gmail.com
+ */
+$lang['name']                  = 'Raccolta dati sul wiki (può impiegare del tempo per caricarsi)';
+$lang['submit']                = 'Invia dati';
+$lang['autosubmit']            = 'Invia automaticamente i dati una volta al mese';
+$lang['submissionFailed']      = 'È stato impossibile inviare i dati a causa del seguente errore:';
+$lang['submitDirectly']        = 'È possibile inviare i dati manualmente utilizzando il pulsante sottostante.';
+$lang['autosubmitError']       = 'L\'ultimo invio automatico non è andato a buon fine a causa del seguente errore:';
+$lang['lastSent']              = 'I dati sono stati inviati';
diff --git a/sources/lib/plugins/popularity/lang/it/submitted.txt b/sources/lib/plugins/popularity/lang/it/submitted.txt
new file mode 100644
index 0000000..7824715
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/it/submitted.txt
@@ -0,0 +1,3 @@
+====== Raccolta dati sul wiki ======
+
+I dati sono stati inviati correttamente.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ja/intro.txt b/sources/lib/plugins/popularity/lang/ja/intro.txt
new file mode 100644
index 0000000..09886f4
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ja/intro.txt
@@ -0,0 +1,9 @@
+====== 利用状況調査 ======
+
+このツールは、ご利用中のwikiの情報を収集し、それをDokuWikiの開発者へ匿名で送信するものです。開発者はこのツールにより、DokuWikiが実際にどの様に利用されているかを理解し、そして実際の利用状況に基づいて今後の開発方針の決定することができます。
+
+お使いのwikiの規模が大きくなってきたときは、このステップを定期的に繰り返すことを推奨しています。また、送信されたデータは匿名のIDで識別されます。
+
+DokuWikiのバージョン、ページとファイルの数とサイズ、インストール済みプラグイン、そしてお使いのPHPに関する情報が、送信されるデータに含まれます。
+
+以下に表示されているデータが実際に送信されるデータとなります。"データ送信"ボタンを押して情報を送信してください。
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ja/lang.php b/sources/lib/plugins/popularity/lang/ja/lang.php
new file mode 100644
index 0000000..50346c7
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ja/lang.php
@@ -0,0 +1,19 @@
+
+ * @author Daniel Dupriest 
+ * @author Kazutaka Miyasaka 
+ * @author Yuji Takenaka 
+ * @author Taisuke Shimamoto 
+ * @author Satoshi Sahara 
+ */
+$lang['name']                  = '利用状況調査（ロードに少し時間が掛かります）';
+$lang['submit']                = 'データ送信';
+$lang['autosubmit']            = '月に一度は自動的にデータを送付';
+$lang['submissionFailed']      = '次のエラーによりデータが送信できませんでした：';
+$lang['submitDirectly']        = '次のフォームを使ってデータを手動で送信することができます。';
+$lang['autosubmitError']       = '以下のエラーにより最後の自動送信に失敗しました：';
+$lang['lastSent']              = 'データを送信しました。';
diff --git a/sources/lib/plugins/popularity/lang/ja/submitted.txt b/sources/lib/plugins/popularity/lang/ja/submitted.txt
new file mode 100644
index 0000000..604f8e5
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ja/submitted.txt
@@ -0,0 +1,3 @@
+====== 利用状況調査 ======
+
+データの送信に成功しました。
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/kk/lang.php b/sources/lib/plugins/popularity/lang/kk/lang.php
new file mode 100644
index 0000000..dde5b95
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/kk/lang.php
@@ -0,0 +1,6 @@
+ko:popularity|도구]]는 도쿠위키가 실제 사용자에게 어떻게 사용되는지 도쿠위키 개발자에게 알려줌으로써 이 후 개발 시 참고가 됩니다.
+
+설치된 위키가 커짐에 따라서 이 과정을 반복할 필요가 있습니다. 반복된 데이터는 익명 ID로 구별되어집니다.
+
+보내려는 데이터는 설치 도쿠위키 버전, 문서와 파일 수, 크기, 설치 플러그인, 설치 PHP 정보등을 포함하고 있습니다.
+
+실제 보내질 자료는 아래와 같습니다. 정보를 보내려면 "자료 보내기" 버튼을 클릭하세요.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ko/lang.php b/sources/lib/plugins/popularity/lang/ko/lang.php
new file mode 100644
index 0000000..f8cf452
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ko/lang.php
@@ -0,0 +1,20 @@
+
+ * @author Seung-Chul Yoo 
+ * @author erial2@gmail.com
+ * @author Myeongjin 
+ * @author Garam 
+ */
+$lang['name']                  = '인기도 조사 (불러오는 데 시간이 걸릴 수 있습니다)';
+$lang['submit']                = '자료 보내기';
+$lang['autosubmit']            = '자료를 자동으로 한 달에 한 번씩 보내기';
+$lang['submissionFailed']      = '다음과 같은 이유로 자료 보내기에 실패했습니다:';
+$lang['submitDirectly']        = '아래의 양식에 맞춰 수동으로 작성된 자료를 보낼 수 있습니다.';
+$lang['autosubmitError']       = '다음과 같은 이유로 자동 자료 보내기에 실패했습니다:';
+$lang['lastSent']              = '자료를 보냈습니다';
diff --git a/sources/lib/plugins/popularity/lang/ko/submitted.txt b/sources/lib/plugins/popularity/lang/ko/submitted.txt
new file mode 100644
index 0000000..37cfbd8
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ko/submitted.txt
@@ -0,0 +1,3 @@
+====== 인기도 조사 ======
+
+자료를 성공적으로 보냈습니다.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/la/intro.txt b/sources/lib/plugins/popularity/lang/la/intro.txt
new file mode 100644
index 0000000..c3029ca
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/la/intro.txt
@@ -0,0 +1,10 @@
+====== Index Fauoris Popularis ======
+
+Haoc instrumentum fauorem popularem mittis sic ut creatores uicis meliorem illum facere possint.
+
+Rursum te fauorem mittere experamus sic ut si mutationes meliores uel peiores esse uidere possimus.
+
+Res mittendae tua forma in usu, numerus et pondus paginarum et aliarum rerum, addenda in usu et de PHP.
+
+Res rudes mittendae subter ostenduntur. "Res mittere" premas ut eas transferas.
+
diff --git a/sources/lib/plugins/popularity/lang/la/lang.php b/sources/lib/plugins/popularity/lang/la/lang.php
new file mode 100644
index 0000000..c7f307c
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/la/lang.php
@@ -0,0 +1,13 @@
+
+ */
+$lang['name']                  = 'Index fauoris popularis (multum tempus quaerere potest)';
+$lang['submit']                = 'Missum die';
+$lang['autosubmit']            = 'Constanter res omni mense mittuntur';
+$lang['submissionFailed']      = 'Res non mittuntur ea causa:';
+$lang['submitDirectly']        = 'Res tu mittere potes cum hoc exemplar compleas.';
+$lang['autosubmitError']       = 'Extrema missio lapsa est ea causa:';
+$lang['lastSent']              = 'Res missae sunt';
diff --git a/sources/lib/plugins/popularity/lang/la/submitted.txt b/sources/lib/plugins/popularity/lang/la/submitted.txt
new file mode 100644
index 0000000..2b2faf4
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/la/submitted.txt
@@ -0,0 +1,3 @@
+====== Index fauoris popularis ======
+
+Res feliciter missae sunt.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/lb/lang.php b/sources/lib/plugins/popularity/lang/lb/lang.php
new file mode 100644
index 0000000..59acdf7
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/lb/lang.php
@@ -0,0 +1,6 @@
+
+ */
+$lang['name']                  = 'Populiarumo apklausa (gali užtrukti pakrovimas)';
+$lang['submit']                = 'Pateikti';
diff --git a/sources/lib/plugins/popularity/lang/lv/intro.txt b/sources/lib/plugins/popularity/lang/lv/intro.txt
new file mode 100644
index 0000000..dd43f96
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/lv/intro.txt
@@ -0,0 +1,9 @@
+====== Popularitātes atsauksme ======
+
+Šis rīks savāc anonīmus datus par tavu wiki sistēmu un piedāvā tos nodot DokuWiki izstrādātājiem. Tas ļauj zināt kā izmanto DokuWiki un palīdz tālāko attīstību balstīt patiesas izmantošanas statistikā .
+
+Ierosinām laiku pa laikam atkārtoti nosūtīt datus, lai izstrādātāji zinātu, ka tavs wiki aug. Atkārtotos sūtījumus identificēs pēc anonīmā ID.
+
+Savāktie dati satur ziņas par DokuWiki versiju, lapu skaitu un apjomu, instalētajiem spraudņiem un par PHP instalāciju.
+
+Nosūtāmie dati redzami zemāk. Nospied pogu "Nosūtīt datus", lai nodotu ziņas.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/lv/lang.php b/sources/lib/plugins/popularity/lang/lv/lang.php
new file mode 100644
index 0000000..f0c940b
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/lv/lang.php
@@ -0,0 +1,13 @@
+
+ */
+$lang['name']                  = 'Popularitātes atsauksmes (ielāde var aizņemt kādu laiku)';
+$lang['submit']                = 'Nosūtīt datus';
+$lang['autosubmit']            = 'Automātiski reizi mēnesī nosūtīt datus';
+$lang['submissionFailed']      = 'Datus nevar nosūtīt kļūdas dēļ:';
+$lang['submitDirectly']        = 'Jūs pats varat pats nosūtīt datus no šīs veidlapas.';
+$lang['autosubmitError']       = 'Pēdējā automātiskā nosūtīšana kļūdas dēļ:';
+$lang['lastSent']              = 'Dati nosūtīti';
diff --git a/sources/lib/plugins/popularity/lang/lv/submitted.txt b/sources/lib/plugins/popularity/lang/lv/submitted.txt
new file mode 100644
index 0000000..c31338a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/lv/submitted.txt
@@ -0,0 +1,3 @@
+====== Popularitātes atsauksmes ======
+
+Dati veiksmīgi nosūtīti
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/mk/lang.php b/sources/lib/plugins/popularity/lang/mk/lang.php
new file mode 100644
index 0000000..6d4530f
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/mk/lang.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/popularity/lang/mr/intro.txt b/sources/lib/plugins/popularity/lang/mr/intro.txt
new file mode 100644
index 0000000..df912e4
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/mr/intro.txt
@@ -0,0 +1,8 @@
+====== लोकप्रियता फीडबॅक ======
+हे टूल तुमच्या विकी संबंधी माहिती गुप्तपणे गोळा करते आणि डॉक्युविकीच्या निर्मात्याना पाठवते. याद्वारे त्यांना डॉक्युविकी प्रत्यक्ष कशी वापरली जाते व त्यानुसार प्रत्यक्ष माहितीवर आधारित पुढील सुधारणा करण्यास मदत होते.
+
+तुम्ही हे टूल ठराविक अंतराने परत वापरत राहिल्यास अधिक चांगले ,कारण तुमची विकी जसजशी वाढेल तसे डेवलपर लोकाना त्याबद्दल माहिती कळण्यास मदत होइल. तुमचा डेटा गुप्त निर्देशकाद्वारे ओळखला जाइल.
+
+या डेटा मधे पुढील प्रकारची माहिती असेल : तुमच्या डॉक्युविकीची आवृत्ति, त्यातील पानांची संख्या व साइज़, इन्स्टॉल केलेले    प्लगइन आणि तुमच्या PHP ची आवृत्ति.
+
+जो डेटा प्रत्यक्ष पाठवला जाइल तो खाली दाखवला आहे. "Send Data" बटन वर क्लिक करून हा डेटा पाठवा. 
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/mr/lang.php b/sources/lib/plugins/popularity/lang/mr/lang.php
new file mode 100644
index 0000000..abf7dd5
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/mr/lang.php
@@ -0,0 +1,11 @@
+
+ * @author Padmanabh Kulkarni
+ * @author shantanoo@gmail.com
+ */
+$lang['name']                  = 'लोकप्रियता फीडबॅक ( लोड होण्यास थोडा वेळ लागेल )';
+$lang['submit']                = 'माहीती पाठवा';
diff --git a/sources/lib/plugins/popularity/lang/ms/lang.php b/sources/lib/plugins/popularity/lang/ms/lang.php
new file mode 100644
index 0000000..77ad2a1
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ms/lang.php
@@ -0,0 +1,6 @@
+
+ * @author SarojKumar Dhakal 
+ * @author Saroj Dhakal
+ */
+$lang['submit']                = 'सामग्री पठाउनुहोस् ';
diff --git a/sources/lib/plugins/popularity/lang/nl/intro.txt b/sources/lib/plugins/popularity/lang/nl/intro.txt
new file mode 100644
index 0000000..3c045c4
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/nl/intro.txt
@@ -0,0 +1,9 @@
+====== Populariteitsfeedback ======
+
+Dit onderdeel verzamelt anonieme gegevens over uw wiki en stelt u in staat deze te versturen naar de ontwikkelaars van DokuWiki.  Dit helpt hen te begrijpen hoe DokuWiki wordt gebruikt door de gebruikers en zorgt er ook voor dat toekomstige ontwikkelkeuzes kunnen worden gestaafd door echte gebruikersstatistieken.
+
+U wordt verzocht deze stap van tijd tot tijd te herhalen om ontwikkelaars op de hoogte te houden terwijl uw wiki groeit. De herhaalde data zal worden geïdentificeerd door een uniek, anoniem ID.
+
+De verzamelde gegevens bevat onder andere gegevens over uw versie van DokuWiki, het aantal- en de grootte van de pagina's en bestanden, geïnstalleerde plugins en informatie over PHP.
+
+De ruwe data die verzonden worden staan hieronder. Gebruik de knop "Verstuur" om de informatie te verzenden.
diff --git a/sources/lib/plugins/popularity/lang/nl/lang.php b/sources/lib/plugins/popularity/lang/nl/lang.php
new file mode 100644
index 0000000..6ffa71e
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/nl/lang.php
@@ -0,0 +1,25 @@
+
+ * @author Niels Schoot 
+ * @author Dion Nicolaas 
+ * @author Danny Rotsaert 
+ * @author Marijn Hofstra hofstra.m@gmail.com
+ * @author Matthias Carchon webmaster@c-mattic.be
+ * @author Marijn Hofstra 
+ * @author Timon Van Overveldt 
+ * @author Jeroen
+ * @author Ricardo Guijt 
+ * @author Gerrit 
+ * @author Remon 
+ */
+$lang['name']                  = 'Populariteitsfeedback (kan even duren om in te laden)';
+$lang['submit']                = 'Verstuur gegevens';
+$lang['autosubmit']            = 'Gegevens automatisch maandelijks verzenden';
+$lang['submissionFailed']      = 'De gegevens konden niet verstuurd worden vanwege de volgende fout:';
+$lang['submitDirectly']        = 'Je kan de gegevens handmatig sturen door het onderstaande formulier te verzenden.';
+$lang['autosubmitError']       = 'De laatste automatische verzending is mislukt vanwege de volgende fout:';
+$lang['lastSent']              = 'De gegevens zijn verstuurd.';
diff --git a/sources/lib/plugins/popularity/lang/nl/submitted.txt b/sources/lib/plugins/popularity/lang/nl/submitted.txt
new file mode 100644
index 0000000..219d80f
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/nl/submitted.txt
@@ -0,0 +1,3 @@
+===== Populariteitsfeedback =====
+
+Het versturen van de gegevens is gelukt.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/no/intro.txt b/sources/lib/plugins/popularity/lang/no/intro.txt
new file mode 100644
index 0000000..a0f3601
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/no/intro.txt
@@ -0,0 +1,9 @@
+====== Popularitetsfeedback ======
+
+Dette verktøyet samler anonyme data om din wiki og lar deg sende det tilbake til DokuWikis utviklere. Dette hjelper utviklerne å forstå hvordan DokuWiki blir brukt av brukerne, og gjør at fremtidig beslutninger om videre utvikling kan baseres på statistikk fra virkelig bruk.
+
+Du oppfordres herved til å gjenta dette skrittet fra tid til annen for å holde utviklerne informert når din wiki vokser. Ditt gjentatte datasett blir identifisert vha en anonym ID.
+
+De data som samles inn inneholder informasjon som din DokuWiki-versjon, antallet og størrelsen på sider og filer, installerte plugins og informasjon om din installerte PHP.
+
+Rådata som blir sendt vises nedenfor. Bruk knappen "Send data" for å overføre informasjonen.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/no/lang.php b/sources/lib/plugins/popularity/lang/no/lang.php
new file mode 100644
index 0000000..dfa99d8
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/no/lang.php
@@ -0,0 +1,24 @@
+
+ * @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 
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Thomas Nygreen 
+ * @author Jon Bøe 
+ * @author Egil Hansen 
+ */
+$lang['name']                  = 'Popularitetsfeedback (kan ta litt tid å laste)';
+$lang['submit']                = 'Send data';
+$lang['autosubmit']            = 'Send data automatisk en gang i måneden';
+$lang['submissionFailed']      = 'Kunne ikke sende dataene på grunn av følgende feil:';
+$lang['submitDirectly']        = 'Du kan sende dataene manuelt ved å sende inn dette skjemaet.';
+$lang['autosubmitError']       = 'Den siste automatiske innsendingen feilet på grunn av følgende feil:';
+$lang['lastSent']              = 'Dataene er sendt';
diff --git a/sources/lib/plugins/popularity/lang/no/submitted.txt b/sources/lib/plugins/popularity/lang/no/submitted.txt
new file mode 100644
index 0000000..ccec767
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/no/submitted.txt
@@ -0,0 +1,3 @@
+====== Tilbakemelding om popularitet ======
+
+Innsending av dataene var vellykket.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/pl/intro.txt b/sources/lib/plugins/popularity/lang/pl/intro.txt
new file mode 100644
index 0000000..d95e7f7
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pl/intro.txt
@@ -0,0 +1,9 @@
+====== Informacja o popularności ======
+
+To narzędzie zbiera anonimowe dane o Twoim wiki i wysyła je do twórców DokuWiki. Zbieranie tych informacji pozwala na lepsze zrozumienie sposobów korzystania z DokuWiki i ułatwia podejmowanie przyszłych decyzji projektowych w oparciu o rzeczywiste dane statystyczne.
+
+Zachęcamy do uruchamiania tej funkcji co pewien czas, by poinformować programistów DokuWiki o rozwoju Twojego wiki. Informacje przesyłane przez Ciebie będą oznaczone anonimowym identyfikatorem.
+
+Zbierane dane zawierają informacje o wersji DokuWiki, ilości i rozmiarze stron i plików, zainstalowanych wtyczkach oraz informację o oprogramowaniu PHP.
+
+Wysyłane dane przedstawione są poniżej. Naciśnij przycisk "Wyślij dane" w celu przesłania informacji.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/pl/lang.php b/sources/lib/plugins/popularity/lang/pl/lang.php
new file mode 100644
index 0000000..045574a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pl/lang.php
@@ -0,0 +1,24 @@
+
+ * @author Mariusz Kujawski 
+ * @author Maciej Kurczewski 
+ * @author Sławomir Boczek 
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski 
+ * @author maros 
+ * @author Grzegorz Widła 
+ * @author Łukasz Chmaj 
+ * @author Begina Felicysym 
+ * @author Aoi Karasu 
+ */
+$lang['name']                  = 'Informacja o popularności (ładowanie może zająć dłuższą chwilę)';
+$lang['submit']                = 'Wyślij dane';
+$lang['autosubmit']            = 'Automatycznie wysyłaj dane raz na miesiąc';
+$lang['submissionFailed']      = 'Dane nie mogły być przesłane ze względu na następujące błędy:';
+$lang['submitDirectly']        = 'Możesz wysłać dane ręcznie poprzez następujący formularz:';
+$lang['autosubmitError']       = 'Ostatnie wysyłanie automatyczne nie powiodło się ze względu na następujące błędy:';
+$lang['lastSent']              = 'Dane zostały wysłane:';
diff --git a/sources/lib/plugins/popularity/lang/pl/submitted.txt b/sources/lib/plugins/popularity/lang/pl/submitted.txt
new file mode 100644
index 0000000..195e813
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pl/submitted.txt
@@ -0,0 +1,3 @@
+====== Informacje o popularności ======
+
+Wysyłanie danych powiodło się.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/pt-br/intro.txt b/sources/lib/plugins/popularity/lang/pt-br/intro.txt
new file mode 100644
index 0000000..e07aa0a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pt-br/intro.txt
@@ -0,0 +1,9 @@
+====== Retorno de Popularidade ======
+
+Essa [[doku>popularity|ferramenta]] coleta dados anônimos sobre o seu wiki e permite que você os envie para os desenvolvedores do DokuWiki. Isso ajuda-os a compreender como o DokuWiki é utilizado pelos seus usuários e garante que decisões para futuros desenvolvimentos sejam respaldadas por estatísticas de uso real.
+
+Você é encorajado a repetir esse procedimento de tempos em tempos, para manter os desenvolvedores informados quando o seu wiki for alterado. Seus pacotes de dados repetidos serão categorizados por uma identificação anônima.
+
+Os dados coletados contém informações do tipo: a versão do seu DokuWiki, o número e tamanho das suas páginas e arquivos, plug-ins instalados e informações sobre a sua instalação do PHP.
+
+Os dados brutos que serão enviados serão exibidos abaixo. Por favor, utilize o botão "Enviar dados" para transferir a informação.
diff --git a/sources/lib/plugins/popularity/lang/pt-br/lang.php b/sources/lib/plugins/popularity/lang/pt-br/lang.php
new file mode 100644
index 0000000..280f072
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pt-br/lang.php
@@ -0,0 +1,27 @@
+
+ * @author Lucien Raven 
+ * @author Enrico Nicoletto 
+ * @author Flávio Veras 
+ * @author Jeferson Propheta 
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas 
+ * @author Frederico Guimarães 
+ * @author Jair Henrique 
+ * @author Luis Dantas 
+ * @author Sergio Motta sergio@cisne.com.br
+ * @author Isaias Masiero Filho 
+ * @author Balaco Baco 
+ * @author Victor Westmann 
+ */
+$lang['name']                  = 'Retorno de popularidade (pode demorar um pouco para carregar)';
+$lang['submit']                = 'Enviar dados';
+$lang['autosubmit']            = 'Enviar os dados automaticamente uma vez por mês';
+$lang['submissionFailed']      = 'Os dados não puderam ser enviados devido ao seguinte erro:';
+$lang['submitDirectly']        = 'Você pode enviar os dados manualmente, submetendo o formulário baixo.';
+$lang['autosubmitError']       = 'Ocorreu uma falha na última submissão automática, devido ao seguinte erro:';
+$lang['lastSent']              = 'Os dados foram enviados';
diff --git a/sources/lib/plugins/popularity/lang/pt-br/submitted.txt b/sources/lib/plugins/popularity/lang/pt-br/submitted.txt
new file mode 100644
index 0000000..7c0cea8
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pt-br/submitted.txt
@@ -0,0 +1,3 @@
+====== Retorno de popularidade ======
+
+Os dados foram enviados com sucesso.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/pt/intro.txt b/sources/lib/plugins/popularity/lang/pt/intro.txt
new file mode 100644
index 0000000..9ec37e2
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pt/intro.txt
@@ -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.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/pt/lang.php b/sources/lib/plugins/popularity/lang/pt/lang.php
new file mode 100644
index 0000000..e30b9d6
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pt/lang.php
@@ -0,0 +1,17 @@
+
+ * @author Fil 
+ * @author André Neves 
+ * @author José Campos zecarlosdecampos@gmail.com
+ */
+$lang['name']                  = 'Retorno (feedback) de Popularidade (pode levar algum tempo a carregar)';
+$lang['submit']                = 'Enviar Dados';
+$lang['autosubmit']            = 'Enviar dados automáticamente uma vez por mês';
+$lang['submissionFailed']      = 'Os dados não foram enviados devido ao seguinte erro:';
+$lang['submitDirectly']        = 'Pode enviar os dados manualmente, submetendo o seguinte formulário.';
+$lang['autosubmitError']       = 'A última auto-submissão falhou, por causa do seguinte erro:';
+$lang['lastSent']              = 'Os dados foram enviados';
diff --git a/sources/lib/plugins/popularity/lang/pt/submitted.txt b/sources/lib/plugins/popularity/lang/pt/submitted.txt
new file mode 100644
index 0000000..d2bb2b7
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/pt/submitted.txt
@@ -0,0 +1,3 @@
+====== Retorno de Popularidade ======
+
+Os dados foram enviados com sucesso.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ro/intro.txt b/sources/lib/plugins/popularity/lang/ro/intro.txt
new file mode 100644
index 0000000..b2dfcba
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ro/intro.txt
@@ -0,0 +1,9 @@
+====== Feedback de popularitate ======
+
+Această unealtă colectează date anonime despre wiki-ul dvs. şi vă permite să le trimiteţi înapoi către dezvoltatorii DokuWiki. Aceasta îi ajută să înţeleagă cum este folosit DokuWiki de către utilizatori şi asigură faptul că viitoarele decizii privind dezvoltarea sunt bazate pe statistici ale utilizării în condiţii reale.
+
+Sunteţi încurajat să repetaţi acest pas din când în când pentru a ţine dezvoltatorii la curent cu dezvoltarea wiki-ului dvs. Seturile de date trimise in mod repetat vor fi identificate printr-un ID anonim.
+
+Datele colectate conţin informaţii precum versiunea DokuWiki, numărul şi mărimea paginilor şi a fişierelor dvs., plugin-urile instalate şi informaţii despre versiunea PHP instalată.
+
+Datele brute ce vor fi trimise sunt afişate mai jos. Vă rugăm utilizaţi butonul "Trimite datele" pentru a transfera informaţiile.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ro/lang.php b/sources/lib/plugins/popularity/lang/ro/lang.php
new file mode 100644
index 0000000..8ba119d
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ro/lang.php
@@ -0,0 +1,19 @@
+
+ * @author Emanuel-Emeric Andrași 
+ * @author Emanuel-Emeric Andraşi 
+ * @author Emanuel-Emeric Andrasi 
+ * @author Marius OLAR 
+ * @author Marius Olar 
+ * @author Emanuel-Emeric Andrași 
+ */
+$lang['name']                  = 'Feedback de popularitate (încărcarea poate dura mai mult)';
+$lang['submit']                = 'Trimite datele';
+$lang['autosubmit']            = 'Trimite datele automat o dată pe lună';
+$lang['submissionFailed']      = 'Datele nu au fost trimise din cauza următoarei erori:';
+$lang['submitDirectly']        = 'Puteți trimite datele manual prin completarea următorului formular.';
+$lang['autosubmitError']       = 'Ultima trimitere automată a eșuat din cauza următoarei erori:';
+$lang['lastSent']              = 'Datele au fost trimise';
diff --git a/sources/lib/plugins/popularity/lang/ro/submitted.txt b/sources/lib/plugins/popularity/lang/ro/submitted.txt
new file mode 100644
index 0000000..214ffb7
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ro/submitted.txt
@@ -0,0 +1,3 @@
+====== Feedback de popularitate ======
+
+Datele au fost trimise cu succes.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/ru/intro.txt b/sources/lib/plugins/popularity/lang/ru/intro.txt
new file mode 100644
index 0000000..52f5a0a
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ru/intro.txt
@@ -0,0 +1,10 @@
+====== Сбор информации о популярности ======
+
+Этот [[doku>popularity|инструмент]] собирает анонимные данные о вашей вики и позволяет вам отправить их разработчикам «ДокуВики». Эти данные помогут им понять, как именно используется «ДокуВики», и удостовериться, что принимаемые проектные решения соответствуют жизненным реалиям.
+
+Отправляйте данные время от времени для того, чтобы сообщать разработчикам о том, что ваша вики «подросла». Отправленные вами данные будут идентифицированы по анонимному ID.
+
+Собранные данные содержат такую информацию, как: версия «ДокуВики», количество и размер ваших страниц и файлов, установленные плагины, информацию об установленном PHP.
+
+Данные, которые будут отосланы, представлены ниже. Пожалуйста, используйте кнопку «Отправить данные», чтобы передать информацию.
+
diff --git a/sources/lib/plugins/popularity/lang/ru/lang.php b/sources/lib/plugins/popularity/lang/ru/lang.php
new file mode 100644
index 0000000..9c03ccd
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ru/lang.php
@@ -0,0 +1,26 @@
+
+ * @author Alexei Tereschenko 
+ * @author Irina Ponomareva irinaponomareva@webperfectionist.com
+ * @author Alexander Sorkin 
+ * @author Kirill Krasnov 
+ * @author Vlad Tsybenko 
+ * @author Aleksey Osadchiy 
+ * @author Aleksandr Selivanov 
+ * @author Ladyko Andrey 
+ * @author Eugene 
+ * @author Johnny Utah 
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ */
+$lang['name']                  = 'Сбор информации о популярности (для загрузки может потребоваться некоторое время)';
+$lang['submit']                = 'Отправить данные';
+$lang['autosubmit']            = 'Автоматически отправлять данные один раз в месяц';
+$lang['submissionFailed']      = 'Данные не могут быть отправлены из-за ошибки:';
+$lang['submitDirectly']        = 'Вы можете отправлять данные вручную, заполнив форму:';
+$lang['autosubmitError']       = 'Последнее автоотправление данных не удалось из-за ошибки:';
+$lang['lastSent']              = 'Данные отправлены';
diff --git a/sources/lib/plugins/popularity/lang/ru/submitted.txt b/sources/lib/plugins/popularity/lang/ru/submitted.txt
new file mode 100644
index 0000000..8454101
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/ru/submitted.txt
@@ -0,0 +1,3 @@
+====== Сбор информации о популярности ======
+
+Данные были успешно отправлены.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/sk/intro.txt b/sources/lib/plugins/popularity/lang/sk/intro.txt
new file mode 100644
index 0000000..7f580d9
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/sk/intro.txt
@@ -0,0 +1,9 @@
+====== Prieskum používania ======
+
+Tento nástroj získa anonymné dáta o Vašej wiki a ponúkne Vám možnosť odoslať ich späť k vývojárom DokuWiki. Týmto spôsobom im umožníte lepšie porozumieť, ako je používaná DokuWiki, a podporiť ich budúce rozhodnutia o ďalšom vývoji informáciami z reálneho používania DokuWiki.
+
+Doporučujeme Vám opakovať tento krok z času na čas pri napredovaní Vašej wiki a tak pomôcť vývojárom DokuWiki. Vaše dáta budú označené anonymným ID.
+
+Zozbierané dáta obsahujú informácie ako verziu DokuWiki, počet a veľkosť Vašich stránok a súborov, inštalované pluginy a informácie o inštalovanom PHP.
+
+Dáta, ktoré budú poslané sú zobrazené nižšie. Prosím použite tlačidlo "Poslať dáta" na odoslanie týchto informácií.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/sk/lang.php b/sources/lib/plugins/popularity/lang/sk/lang.php
new file mode 100644
index 0000000..ab7accf
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/sk/lang.php
@@ -0,0 +1,16 @@
+
+ * @author exusik@gmail.com
+ * @author Martin Michalek 
+ */
+$lang['name']                  = 'Prieskum používania (môže chvíľu trvať)';
+$lang['submit']                = 'Poslať dáta';
+$lang['autosubmit']            = 'Automaticky zaslať dáta raz mesačne';
+$lang['submissionFailed']      = 'Dáta nemohli byť odoslané z nasledujúceho dôdovu:';
+$lang['submitDirectly']        = 'Dáta môžu byť zaslané manuálne nasledujúcim formulárom:';
+$lang['autosubmitError']       = 'Posledné automatické odoslanie dát zlyhalo z nasledujúceho dôvodu:';
+$lang['lastSent']              = 'Dáta boli odoslané.';
diff --git a/sources/lib/plugins/popularity/lang/sk/submitted.txt b/sources/lib/plugins/popularity/lang/sk/submitted.txt
new file mode 100644
index 0000000..f99fb9f
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/sk/submitted.txt
@@ -0,0 +1,3 @@
+====== Prieskum používania ======
+
+Dáta boli úspešne odoslané.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/sl/intro.txt b/sources/lib/plugins/popularity/lang/sl/intro.txt
new file mode 100644
index 0000000..2c029db
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/sl/intro.txt
@@ -0,0 +1,9 @@
+====== Poročilo o uporabi ======
+
+To orodje je namenjeno zbiranju brezimnih podatkov o postavljeni DokuWiki strani in omogoča pošiljanje nekaterih podatkov neposredno razvijalcem sistema. S temi podatki lahko razvijalci razumejo načine uporabe sistema, zahteve uporabnikov in pogostost uporabe, kar s statističnimi podatki vpliva tudi na nadaljnji razvoj sistema.
+
+Priporočeno je, da poročilo o uporabi pošljete vsake toliko časa, saj lahko le tako razvijalci dobijo podatke o hitrosti rasti spletišča in pogostosti uporabe. Vsi podatki so poslani označeni s posebno vpisno številko, ki omogoča brezimno sledenje.
+
+Zbrani podatki vsebujejo podrobnosti o različici uporabljenega sistema DokuWiki, število in velikost wiki strani, datotekah, ki so naložene na sistem in podatke o vstavkih ter PHP namestitvi in različici.
+
+Surovi podatki, ki bodo poslani so prikazani spodaj. S pritiskom na gumb "Pošlji podatke", bodo ti poslani na strežnik razvijalcev.
diff --git a/sources/lib/plugins/popularity/lang/sl/lang.php b/sources/lib/plugins/popularity/lang/sl/lang.php
new file mode 100644
index 0000000..abde655
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/sl/lang.php
@@ -0,0 +1,14 @@
+
+ * @author Miroslav Šolti 
+ */
+$lang['name']                  = 'Мерење популарности (може потрајати док се не учита)';
+$lang['submit']                = 'Пошаљи податке';
diff --git a/sources/lib/plugins/popularity/lang/sv/intro.txt b/sources/lib/plugins/popularity/lang/sv/intro.txt
new file mode 100644
index 0000000..2f00c01
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/sv/intro.txt
@@ -0,0 +1,11 @@
+====== Popularitetsfeedback ======
+
+Detta verktyg samlar anonyma data om din wiki och låter dig skicka dessa till DokuWikis utvecklare. Det hjälper utvecklarna att förstå hur DokuWiki används och gör att framtida beslut om DokuWikis utveckling kan grundas på statistik från verkligt bruk.
+
+Upprepa gärna detta steg då och då allteftersom din Wiki växer. Dina rapporter kommer att bli identifierade med hjälp av ett anonymt id.
+
+Data som samlas in innehåller information om bland annat din DokuWiki-version, antalet och storleken på sidorna, installerade plugins samt information om din PHP-installation.
+
+Rådata som kommer att sändas visas här nedanför. Vänligen använd knappen "Sänd data" för att överföra informationen.
+
+
diff --git a/sources/lib/plugins/popularity/lang/sv/lang.php b/sources/lib/plugins/popularity/lang/sv/lang.php
new file mode 100644
index 0000000..942a708
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/sv/lang.php
@@ -0,0 +1,24 @@
+
+ * @author Dennis Karlsson
+ * @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 mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
+ */
+$lang['name']                  = 'Popularitets-feedback (det kan ta en stund att ladda sidan)';
+$lang['submit']                = 'Sänd data';
+$lang['autosubmit']            = 'Skicka data automatiskt varje månad';
+$lang['submissionFailed']      = 'Datan kunde inte skickas för att:';
+$lang['submitDirectly']        = 'Du kan skicka datan manuellt genom att fylla i följande formulär.';
+$lang['autosubmitError']       = 'Senaste automatiska sändning av datan misslyckades för att:';
+$lang['lastSent']              = 'Datan har skickats';
diff --git a/sources/lib/plugins/popularity/lang/sv/submitted.txt b/sources/lib/plugins/popularity/lang/sv/submitted.txt
new file mode 100644
index 0000000..fb8eab7
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/sv/submitted.txt
@@ -0,0 +1,3 @@
+====== Popularitetsfeedback ======
+
+Datan har skickats utan problem.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/th/lang.php b/sources/lib/plugins/popularity/lang/th/lang.php
new file mode 100644
index 0000000..3ae8a78
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/th/lang.php
@@ -0,0 +1,11 @@
+
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Kittithat Arnontavilas 
+ * @author Thanasak Sompaisansin 
+ */
+$lang['name']                  = 'ส่งข้อมูลความนิยมกลับ (อาจใช้เวลาในการโหลด)';
+$lang['submit']                = 'ส่งข้อมูล';
diff --git a/sources/lib/plugins/popularity/lang/tr/intro.txt b/sources/lib/plugins/popularity/lang/tr/intro.txt
new file mode 100644
index 0000000..a855ff3
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/tr/intro.txt
@@ -0,0 +1,9 @@
+====== 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.
+
+Gönderilecek işlenmemiş veriler aşağıda gösterilmektedir. Lütfen "Verileri Gönder" butonuna tıklayarak bilgileri gönderin.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/tr/lang.php b/sources/lib/plugins/popularity/lang/tr/lang.php
new file mode 100644
index 0000000..696ee38
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/tr/lang.php
@@ -0,0 +1,14 @@
+
+ * @author Cihan Kahveci 
+ * @author Yavuz Selim 
+ * @author Caleb Maclennan 
+ * @author farukerdemoncel@gmail.com
+ */
+$lang['name']                  = 'Popülerlik Geribeslemesi (yüklemesi uzun sürebilir)';
+$lang['submit']                = 'Verileri Gönder';
+$lang['lastSent']              = 'Bilgiler gönderildi';
diff --git a/sources/lib/plugins/popularity/lang/uk/intro.txt b/sources/lib/plugins/popularity/lang/uk/intro.txt
new file mode 100644
index 0000000..3ceb882
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/uk/intro.txt
@@ -0,0 +1,9 @@
+====== Відгук популярності ======
+
+Цей інструмент збирає анонімні дані про вашу вікі і відсилає її розробникам системи. Це допоможе їм зрозуміти, як саме користувачі використовують ДокуВікі і дозволяє врахувати потреби користувачів при подальшому удосконаленні системи.
+
+Ви можете повторно відсилати відгуки час від часу, щоб повідомляти розробників про розвиток вашої ДокуВікі. Повторні відгуки будуть ідентифіковані по анонімному ID.
+
+У зібраних даних є інформація про версію ДокуВікі, кількість і розмір сторінок в ній, встановлені додатки і інформація про налаштування вашого PHP.
+
+Дані, які буде надіслано показано нижче. Для передачі інформації натисніть будь-ласка кнопку "Передати дані"
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/uk/lang.php b/sources/lib/plugins/popularity/lang/uk/lang.php
new file mode 100644
index 0000000..9d67c11
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/uk/lang.php
@@ -0,0 +1,19 @@
+
+ * @author Uko uko@uar.net
+ * @author Ulrikhe Lukoie  .com
+ * @author Kate Arzamastseva pshns@ukr.net
+ */
+$lang['name']                  = 'Відгук популярності (може зайняти деякий час)';
+$lang['submit']                = 'Передати дані';
+$lang['autosubmit']            = 'Автоматично надсилати дані один раз на місяць';
+$lang['submissionFailed']      = 'Дані не можуть бути відправлені через таку помилку:';
+$lang['submitDirectly']        = 'Ви можете надіслати дані вручну, відправивши наступну форму.';
+$lang['autosubmitError']       = 'Останнє автоматичне відправлення не вдалося через таку помилку:';
+$lang['lastSent']              = 'Дані були відправлені';
diff --git a/sources/lib/plugins/popularity/lang/uk/submitted.txt b/sources/lib/plugins/popularity/lang/uk/submitted.txt
new file mode 100644
index 0000000..9021385
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/uk/submitted.txt
@@ -0,0 +1,2 @@
+====== Відгук популярності ======
+Дані були успішно відправлені.
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/vi/lang.php b/sources/lib/plugins/popularity/lang/vi/lang.php
new file mode 100644
index 0000000..2933d88
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/vi/lang.php
@@ -0,0 +1,5 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San 
+ * @author Li-Jiun Huang 
+ * @author Cheng-Wei Chien 
+ * @author Danny Lin
+ * @author Shuo-Ting Jian 
+ * @author syaoranhinata@gmail.com
+ * @author Ichirou Uchiki 
+ */
+$lang['name']                  = '人氣回饋 (可能需要一些時間載入) ';
+$lang['submit']                = '發送資料';
+$lang['autosubmit']            = '每月自動發送';
+$lang['submissionFailed']      = '由於以下原因，資料無法發送：';
+$lang['submitDirectly']        = '你可以利用以下的表單來發手動發送資料。';
+$lang['autosubmitError']       = '由於以下原因，上次自動發送無法進行：';
+$lang['lastSent']              = '資料已發送';
diff --git a/sources/lib/plugins/popularity/lang/zh-tw/submitted.txt b/sources/lib/plugins/popularity/lang/zh-tw/submitted.txt
new file mode 100644
index 0000000..430a8a4
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/zh-tw/submitted.txt
@@ -0,0 +1,3 @@
+====== 人氣回饋 ======
+
+資料已發送。
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/zh/intro.txt b/sources/lib/plugins/popularity/lang/zh/intro.txt
new file mode 100644
index 0000000..40e93dc
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/zh/intro.txt
@@ -0,0 +1,9 @@
+====== 人气反馈 ======
+
+本工具收集关于您维基站点的匿名信息，并允许您将其发送给 DokuWiki 的开发者。这样做有助于我们了解用户是如何使用 DokuWiki 的，并能使我们未来的开发决策建立在现实使用数据上。
+
+我们鼓励您不时重复该步骤，以便我们能了解您的维基站点发展进度。您的数据集将被匿名 ID 标识。
+
+收集的数据包括 DokuWiki 版本、您的页面数量以及文件大小、已安装的插件、服务器上的 PHP 相关信息。
+
+将被发送的原始数据如下所示。请点击“发送数据”按扭进行传输。
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/lang/zh/lang.php b/sources/lib/plugins/popularity/lang/zh/lang.php
new file mode 100644
index 0000000..532abb8
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/zh/lang.php
@@ -0,0 +1,25 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton guxd@163.com
+ * @author Simon zhan 
+ * @author mr.jinyi@gmail.com
+ * @author ben 
+ * @author lainme 
+ * @author caii 
+ * @author Hiphen Lee 
+ * @author caii, patent agent in China 
+ * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian 
+ */
+$lang['name']                  = '人气反馈（载入可能需要一些时间）';
+$lang['submit']                = '发送数据';
+$lang['autosubmit']            = '每月自动发送';
+$lang['submissionFailed']      = '数据由于以下原因不恩你给发送：';
+$lang['submitDirectly']        = '你可以手动提交下面的表单来发送数据。';
+$lang['autosubmitError']       = '印以下原因，上一次自动提交失败：';
+$lang['lastSent']              = '数据已发送';
diff --git a/sources/lib/plugins/popularity/lang/zh/submitted.txt b/sources/lib/plugins/popularity/lang/zh/submitted.txt
new file mode 100644
index 0000000..6039b70
--- /dev/null
+++ b/sources/lib/plugins/popularity/lang/zh/submitted.txt
@@ -0,0 +1,3 @@
+====== 人气反馈 ======
+
+数据发送成功。
\ No newline at end of file
diff --git a/sources/lib/plugins/popularity/plugin.info.txt b/sources/lib/plugins/popularity/plugin.info.txt
new file mode 100644
index 0000000..4dc971d
--- /dev/null
+++ b/sources/lib/plugins/popularity/plugin.info.txt
@@ -0,0 +1,7 @@
+base    popularity
+author  Andreas Gohr
+email   andi@splitbrain.org
+date    2012-11-29
+name    Popularity Feedback Plugin
+desc    Send anonymous data about your wiki to the DokuWiki developers
+url     http://www.dokuwiki.org/plugin:popularity
diff --git a/sources/lib/plugins/remote.php b/sources/lib/plugins/remote.php
new file mode 100644
index 0000000..a51f701
--- /dev/null
+++ b/sources/lib/plugins/remote.php
@@ -0,0 +1,21 @@
+api = new RemoteAPI();
+    }
+
+    /**
+     * @abstract
+     * @return array Information to all provided methods. {@see RemoteAPI}.
+     */
+    public abstract function _getMethods();
+
+    protected function getApi() {
+        return $this->api;
+    }
+
+}
diff --git a/sources/lib/plugins/revert/admin.php b/sources/lib/plugins/revert/admin.php
new file mode 100644
index 0000000..423d674
--- /dev/null
+++ b/sources/lib/plugins/revert/admin.php
@@ -0,0 +1,183 @@
+setupLocale();
+    }
+
+    /**
+     * access for managers
+     */
+    function forAdminOnly(){
+        return false;
+    }
+
+    /**
+     * return sort order for position in admin menu
+     */
+    function getMenuSort() {
+        return 40;
+    }
+
+    /**
+     * handle user request
+     */
+    function handle() {
+    }
+
+    /**
+     * output appropriate html
+     */
+    function html() {
+        global $INPUT;
+
+        echo $this->locale_xhtml('intro');
+
+        $this->_searchform();
+
+        if(is_array($INPUT->param('revert')) && checkSecurityToken()){
+            $this->_revert($INPUT->arr('revert'),$INPUT->str('filter'));
+        }elseif($INPUT->has('filter')){
+            $this->_list($INPUT->str('filter'));
+        }
+    }
+
+    /**
+     * Display the form for searching spam pages
+     */
+    function _searchform(){
+        global $lang, $INPUT;
+        echo '
        ';
+        echo '';
+        echo '';
+        echo ' ';
+        echo ' '.$this->getLang('note1').'';
+        echo '


        ';
+    }
+
+    /**
+     * Start the reversion process
+     */
+    function _revert($revert,$filter){
+        echo '

        ';
+        echo '
        '.$this->getLang('revstart').'
        ';
+
+        echo '
          ';
+        foreach($revert as $id){
+            global $REV;
+
+            // find the last non-spammy revision
+            $data = '';
+            $old  = getRevisions($id, 0, $this->max_revs);
+            if(count($old)){
+                foreach($old as $REV){
+                    $data = rawWiki($id,$REV);
+                    if(strpos($data,$filter) === false) break;
+                }
+            }
+
+            if($data){
+                saveWikiText($id,$data,'old revision restored',false);
+                printf('
        • '.$this->getLang('reverted').'
          • ',$id,$REV);
+            }else{
+                saveWikiText($id,'','',false);
+                printf('
        • '.$this->getLang('removed').'
          • ',$id);
+            }
+            @set_time_limit(10);
+            flush();
+        }
+        echo '
        ';
+
+        echo '
        '.$this->getLang('revstop').'
        ';
+    }
+
+    /**
+     * List recent edits matching the given filter
+     */
+    function _list($filter){
+        global $conf;
+        global $lang;
+        echo '

        ';
+        echo '
        ';
+        echo '';
+        formSecurityToken();
+
+        $recents = getRecents(0,$this->max_lines);
+        echo '';
+
+        echo '
        ';
+        echo ' ';
+        printf($this->getLang('note2'),hsc($filter));
+        echo '
        ';
+
+        echo '
        ';
+    }
+
+}
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/plugins/revert/lang/af/lang.php b/sources/lib/plugins/revert/lang/af/lang.php
new file mode 100644
index 0000000..1fff08d
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/af/lang.php
@@ -0,0 +1,5 @@
+
+ * @author Usama Akkad 
+ * @author uahello@gmail.com
+ * @author Ahmad Abd-Elghany 
+ */
+$lang['menu']                  = 'مدير الاسترجاع';
+$lang['filter']                = 'ابحث في الصفحات المتأذاة';
+$lang['revert']                = 'استرجع الصفحات المحددة';
+$lang['reverted']              = '%s استرجعت للاصدار %s';
+$lang['removed']               = 'حُذفت %s ';
+$lang['revstart']              = 'بدأت عملية الاستعادة. قد يستغرق ذلك وقتا طويلا. إذا كان وقت النص البرمجي ينفذ قبل النهاية، عليك استرجاع أجزاء أصغر.
+';
+$lang['revstop']               = 'عملية الاستعادة انتهت بنجاح.';
+$lang['note1']                 = 'لاحظ: البحث حساس لحالة الأحرف';
+$lang['note2']                 = 'لاحظ: ستسترجع الصفحة إلى آخر اصدار لا يحوي شروط الغثاء %s.';
diff --git a/sources/lib/plugins/revert/lang/bg/intro.txt b/sources/lib/plugins/revert/lang/bg/intro.txt
new file mode 100644
index 0000000..44d5a09
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/bg/intro.txt
@@ -0,0 +1,4 @@
+====== Възстановяване ======
+
+Страницата помага за автоматично възстановяване след SPAM атака. За да намерите спамнатите страници, въведете текст за търсене (напр. линк от SPAM съобщението), след това потвърдете, че намерените страници са наистина SPAM и възстановете старите им версии.
+
diff --git a/sources/lib/plugins/revert/lang/bg/lang.php b/sources/lib/plugins/revert/lang/bg/lang.php
new file mode 100644
index 0000000..0819de0
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/bg/lang.php
@@ -0,0 +1,16 @@
+
+ * @author Viktor Usunov 
+ * @author Kiril 
+ */
+$lang['menu']                  = 'Възстановяване';
+$lang['filter']                = 'Търсене на спамнати страници';
+$lang['revert']                = 'Възстанови избраните страници';
+$lang['reverted']              = '%s върната до версия %s';
+$lang['removed']               = '%s премахната';
+$lang['revstart']              = 'Процесът на възстановяване започна. Това може да отнеме много време. Ако скриптът се просрочи преди да завърши, трябва да възстановявате на по-малки парчета.';
+$lang['revstop']               = 'Процесът на възстановяване завърши успешно.';
+$lang['note1']                 = 'Бележка: при търсенето се различават малки от големи букви';
+$lang['note2']                 = 'Бележка: страницата ще бъде върната към стара версия без SPAM терминa %s.';
diff --git a/sources/lib/plugins/revert/lang/ca-valencia/intro.txt b/sources/lib/plugins/revert/lang/ca-valencia/intro.txt
new file mode 100644
index 0000000..fed2cb9
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ca-valencia/intro.txt
@@ -0,0 +1,4 @@
+====== 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 --git a/sources/lib/plugins/revert/lang/ca-valencia/lang.php b/sources/lib/plugins/revert/lang/ca-valencia/lang.php
new file mode 100644
index 0000000..77dd580
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ca-valencia/lang.php
@@ -0,0 +1,15 @@
+
+ * @author Bernat Arlandis 
+ */
+$lang['menu']                  = 'Gestor de reversions';
+$lang['filter']                = 'Buscar pàgines en spam';
+$lang['revert']                = 'Revertir pàgines seleccionades';
+$lang['reverted']              = '%s revertides a la versió %s';
+$lang['removed']               = '%s llevades';
+$lang['revstart']              = 'El procés de reversió ha començat. Açò pot dur prou de temps. Si es talla abans d\'acabar, haurà de revertir per parts.';
+$lang['revstop']               = 'El procés de reversió ha finalisat correctament.';
+$lang['note1']                 = 'Nota: esta busca és sensible a mayúscules';
+$lang['note2']                 = 'Nota: esta pàgina es revertirà a l\'última versió que no continga el spam definit pel terme %s.';
diff --git a/sources/lib/plugins/revert/lang/ca/intro.txt b/sources/lib/plugins/revert/lang/ca/intro.txt
new file mode 100644
index 0000000..0af2e8e
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ca/intro.txt
@@ -0,0 +1,3 @@
+====== Gestió de reversions ======
+
+Aquesta pàgina us ajuda a revertir automàticament els canvis que siguin 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.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/ca/lang.php b/sources/lib/plugins/revert/lang/ca/lang.php
new file mode 100644
index 0000000..4f4d518
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ca/lang.php
@@ -0,0 +1,19 @@
+
+ * @author carles.bellver@gmail.com
+ * @author carles.bellver@cent.uji.es
+ * @author Carles Bellver 
+ * @author daniel@6temes.cat
+ */
+$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: aquesta cerca distingeix entre majúscules i minúscules.';
+$lang['note2']                 = 'Nota: la pàgina es revertirà a la darrera versió que no contingui el terme brossa especificat %s.';
diff --git a/sources/lib/plugins/revert/lang/cs/intro.txt b/sources/lib/plugins/revert/lang/cs/intro.txt
new file mode 100644
index 0000000..1e1cd0f
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/cs/intro.txt
@@ -0,0 +1,3 @@
+====== Obnova zaspamovaných stránek ======
+
+Tato stránka pomůže při automatické obnově po spamovém útoku.  Pro nalezení seznamu zaspamovaných stránek nejdříve zadejte hledaný výraz (např. spamové URL) a pak potvrďte, že nalezené stránky opravdu obsahují spam a mohou být obnoveny.
diff --git a/sources/lib/plugins/revert/lang/cs/lang.php b/sources/lib/plugins/revert/lang/cs/lang.php
new file mode 100644
index 0000000..b9e7284
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/cs/lang.php
@@ -0,0 +1,30 @@
+
+ * @author Zbynek Krivka 
+ * @author tomas@valenta.cz
+ * @author Marek Sacha 
+ * @author Lefty 
+ * @author Vojta Beran 
+ * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
+ * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
+ * @author Zbyněk Křivka 
+ * @author Gerrit Uitslag 
+ */
+$lang['menu']                  = 'Obnova zaspamovaných stránek';
+$lang['filter']                = 'Hledat zaspamované stránky';
+$lang['revert']                = 'Obnovit vybrané stránky';
+$lang['reverted']              = '%s vrácena do verze %s';
+$lang['removed']               = '%s odstraněna';
+$lang['revstart']              = 'Obnova stránek začala. Tento proces může trvat dlouho. Pokud
+skriptu vyprší čas, budete muset obnovovat po menších blocích
+stránek.';
+$lang['revstop']               = 'Proces obnovy stránek byl úspěšně dokončen.';
+$lang['note1']                 = 'Poznámka: toto vyhledávání je citlivé na velikost písmen';
+$lang['note2']                 = 'Poznámka: tato stránka bude obnovena na poslední verzi, která
+neobsahovala dané spamové slovo %s.';
diff --git a/sources/lib/plugins/revert/lang/da/intro.txt b/sources/lib/plugins/revert/lang/da/intro.txt
new file mode 100644
index 0000000..fdb0c5f
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/da/intro.txt
@@ -0,0 +1,3 @@
+===== Gendannelsesstyring =====
+
+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.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/da/lang.php b/sources/lib/plugins/revert/lang/da/lang.php
new file mode 100644
index 0000000..bb311f1
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/da/lang.php
@@ -0,0 +1,23 @@
+
+ * @author Esben Laursen 
+ * @author Harith 
+ * @author Daniel Ejsing-Duun 
+ * @author Erik Bjørn Pedersen 
+ * @author rasmus@kinnerup.com
+ * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig 
+ */
+$lang['menu']                  = 'Gendannelsesstyring';
+$lang['filter']                = 'Søg efter uønskede sider';
+$lang['revert']                = 'Gendan valgte sider';
+$lang['reverted']              = '%s gendannet til ændring %s';
+$lang['removed']               = '%s fjernet';
+$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 --git a/sources/lib/plugins/revert/lang/de-informal/intro.txt b/sources/lib/plugins/revert/lang/de-informal/intro.txt
new file mode 100644
index 0000000..a1733af
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/de-informal/intro.txt
@@ -0,0 +1,3 @@
+====== Seiten wiederherstellen ======
+
+Dieses Plugin dient der automatischen Wiederherstellung von Seiten nach einem Spam-Angriff. Gib zunächst einen Suchbegriff (z. B. eine Spam-URL) ein um eine Liste betroffener Seiten zu erhalten. Nachdem du dich vergewissert hast, dass die gefundenen Seiten wirklich Spam enthalten, kannst du die Seiten wiederherstellen.
diff --git a/sources/lib/plugins/revert/lang/de-informal/lang.php b/sources/lib/plugins/revert/lang/de-informal/lang.php
new file mode 100644
index 0000000..93a9329
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/de-informal/lang.php
@@ -0,0 +1,24 @@
+
+ * @author Juergen Schwarzer 
+ * @author Marcel Metz 
+ * @author Matthias Schulte 
+ * @author Christian Wichmann 
+ * @author Pierre Corell 
+ * @author Frank Loizzi 
+ * @author Volker Bödker 
+ * @author Matthias Schulte 
+ */
+$lang['menu']                  = 'Seiten wiederherstellen';
+$lang['filter']                = 'Durchsuche als Spam markierte Seiten';
+$lang['revert']                = 'Setze ausgewählte Seiten zurück.';
+$lang['reverted']              = '%s zu Revision %s wiederhergestellt';
+$lang['removed']               = '%s entfernt';
+$lang['revstart']              = 'Wiederherstellung gestartet. Dies kann eine längere Zeit dauern. Wenn das Skript vor Fertigstellung stoppt, solltest du es in kleineren Stücken versuchen.';
+$lang['revstop']               = 'Wiederherstellung erfolgreich beendet.';
+$lang['note1']                 = 'Beachte: Diese Suche berücksichtigt Groß- und Kleinschreibung';
+$lang['note2']                 = 'Beachte: Diese Seite wird wiederhergestellt auf die letzte Version, die nicht den Spam-Begriff %s enthält.';
diff --git a/sources/lib/plugins/revert/lang/de/intro.txt b/sources/lib/plugins/revert/lang/de/intro.txt
new file mode 100644
index 0000000..fe74461
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/de/intro.txt
@@ -0,0 +1,3 @@
+====== Seiten wiederherstellen ======
+
+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 wiederherstellen.
diff --git a/sources/lib/plugins/revert/lang/de/lang.php b/sources/lib/plugins/revert/lang/de/lang.php
new file mode 100644
index 0000000..7d0b243
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/de/lang.php
@@ -0,0 +1,30 @@
+
+ * @author Leo Moll 
+ * @author Florian Anderiasch 
+ * @author Robin Kluth 
+ * @author Arne Pelka 
+ * @author Andreas Gohr 
+ * @author Dirk Einecke 
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider 
+ * @author Robert Bogenschneider 
+ * @author Niels Lange 
+ * @author Christian Wichmann 
+ * @author Paul Lachewsky 
+ * @author Pierre Corell 
+ * @author Matthias Schulte 
+ */
+$lang['menu']                  = 'Seiten wiederherstellen';
+$lang['filter']                = 'Nach betroffenen Seiten suchen';
+$lang['revert']                = 'Ausgewählte Seiten wiederherstellen';
+$lang['reverted']              = '%s wieder hergestellt zu Version %s';
+$lang['removed']               = '%s entfernt';
+$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 wiederhergestellt auf die letzte Version, die nicht den angegebenen Spam Begriff %s enthält.';
diff --git a/sources/lib/plugins/revert/lang/el/intro.txt b/sources/lib/plugins/revert/lang/el/intro.txt
new file mode 100644
index 0000000..9b583bc
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/el/intro.txt
@@ -0,0 +1,3 @@
+====== Αποκατάσταση κακόβουλων αλλαγών σελίδων ======
+
+Αυτή η σελίδα σας βοηθά να αποκαταστήσετε αυτόματα τις κακόβουλες αλλαγές σελίδων που προκαλούν οι επιθέσεις spam. Για να βρείτε τις σελίδες που πρέπει να τροποποιηθούν, πρώτα δώστε έναν όρο αναζήτησης (π.χ. έναν σύνδεσμο spam) και έπειτα επιβεβαιώστε ότι οι σελίδες που θα βρεθούν όντως περιέχουν spam και προχωρήστε στην αποκατάστασή τους.
diff --git a/sources/lib/plugins/revert/lang/el/lang.php b/sources/lib/plugins/revert/lang/el/lang.php
new file mode 100644
index 0000000..4c93ee5
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/el/lang.php
@@ -0,0 +1,21 @@
+
+ * @author Αθανάσιος Νταής 
+ * @author Konstantinos Koryllos 
+ * @author George Petsagourakis 
+ * @author Petros Vidalis 
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
+ */
+$lang['menu']                  = 'Αποκατάσταση κακόβουλων αλλαγών σελίδων';
+$lang['filter']                = 'Αναζήτηση σελίδων που περιέχουν spam';
+$lang['revert']                = 'Επαναφορά παλαιότερων εκδόσεων των επιλεγμένων σελίδων';
+$lang['reverted']              = 'Η σελίδα %s επεναφέρθηκε στην έκδοση %s';
+$lang['removed']               = 'Η σελίδα %s διαγράφηκε';
+$lang['revstart']              = 'Η διαδικασία αποκατάστασης άρχισε. Αυτό ίσως πάρει αρκετό χρόνο. Εάν η εφαρμογή υπερβεί το διαθέσιμο χρονικό όριο και τερματιστεί πριν τελειώσει, θα χρειαστεί να επαναλάβετε αυτή τη διαδικασία για μικρότερα τμήματα.';
+$lang['revstop']               = 'Η διαδικασία αποκατάστασης ολοκληρώθηκε με επιτυχία.';
+$lang['note1']                 = '
        Σημείωση: η αναζήτηση επηρεάζεται από το εάν οι χαρακτήρες είναι πεζοί ή κεφαλαίοι';
+$lang['note2']                 = '
        Σημείωση: η σελίδα θα επαναφερθεί στην πλέον πρόσφατη έκδοση που δεν περιέχει τον όρο %s.';
diff --git a/sources/lib/plugins/revert/lang/en/intro.txt b/sources/lib/plugins/revert/lang/en/intro.txt
new file mode 100644
index 0000000..b8f3558
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/en/intro.txt
@@ -0,0 +1,3 @@
+====== Revert Manager ======
+
+This page helps you with the automatic reversion of a spam attack. To find a list of spammy pages first enter a search string (eg. a spam URL), then confirm that the found pages are really spam and revert the edits.
diff --git a/sources/lib/plugins/revert/lang/en/lang.php b/sources/lib/plugins/revert/lang/en/lang.php
new file mode 100644
index 0000000..6bf867d
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/en/lang.php
@@ -0,0 +1,23 @@
+%s.';
+
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/plugins/revert/lang/eo/intro.txt b/sources/lib/plugins/revert/lang/eo/intro.txt
new file mode 100644
index 0000000..14e8314
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/eo/intro.txt
@@ -0,0 +1,3 @@
+====== Administro de Restarigo ======
+
+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 --git a/sources/lib/plugins/revert/lang/eo/lang.php b/sources/lib/plugins/revert/lang/eo/lang.php
new file mode 100644
index 0000000..2d0b0f2
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/eo/lang.php
@@ -0,0 +1,23 @@
+
+ * @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['filter']                = 'Serĉi spamecajn paĝojn';
+$lang['revert']                = 'Restarigi la elektitajn paĝojn';
+$lang['reverted']              = '%s estas restarigita al revizio %s';
+$lang['removed']               = '%s estas forigita';
+$lang['revstart']              = 'Restariga procezo ekis. Tio povas daŭri longan tempon. Se la skripto tro prokrastos antaŭ plenumo, vi restarigu po pli etaj blokoj.';
+$lang['revstop']               = 'Restariga procezo plenumiĝis sukcese.';
+$lang['note1']                 = 'Rimarko: tiu ĉi serĉo distingas usklecon';
+$lang['note2']                 = 'Rimarko: la paĝo restariĝos al la lasta versio ne enhavanta la menditan spaman terminon %s.';
diff --git a/sources/lib/plugins/revert/lang/es/intro.txt b/sources/lib/plugins/revert/lang/es/intro.txt
new file mode 100644
index 0000000..39c5b04
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/es/intro.txt
@@ -0,0 +1,3 @@
+====== Restaurador ======
+
+Esta página te ayuda con la restauración de ataques spam. Para encontrar una lista de páginas con spam introduce una cadena , luego confirma que las páginas encontradas son realmente un spam y restaura la edición.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/es/lang.php b/sources/lib/plugins/revert/lang/es/lang.php
new file mode 100644
index 0000000..599ffe0
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/es/lang.php
@@ -0,0 +1,35 @@
+
+ * @author Gabriel Castillo 
+ * @author oliver@samera.com.py
+ * @author Enrico Nicoletto 
+ * @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 
+ * @author Victor Castelan 
+ * @author Mauro Javier Giamberardino 
+ * @author emezeta 
+ * @author Oscar Ciudad 
+ * @author Ruben Figols 
+ * @author Gerardo Zamudio 
+ * @author Mercè López mercelz@gmail.com
+ */
+$lang['menu']                  = 'Restaurador';
+$lang['filter']                = 'Buscar páginas con spam';
+$lang['revert']                = 'Restaurar las páginas seleccionadas';
+$lang['reverted']              = '%s ha restaurado la revisión %s';
+$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 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 --git a/sources/lib/plugins/revert/lang/et/lang.php b/sources/lib/plugins/revert/lang/et/lang.php
new file mode 100644
index 0000000..ca1410a
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/et/lang.php
@@ -0,0 +1,7 @@
+
+ */
diff --git a/sources/lib/plugins/revert/lang/eu/intro.txt b/sources/lib/plugins/revert/lang/eu/intro.txt
new file mode 100644
index 0000000..c5a5a5a
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/eu/intro.txt
@@ -0,0 +1,3 @@
+====== Berrezartze Kudeatzailea ======
+
+Orri honek spam eraso baten berrezartze automatikoarekin laguntzen dizu. Spam-a duten orriak bilatzeko, lehenik sartu bilaketa katea (adb. spam URL bat), eta ondoren baieztatu bilatutako orriak benetan spam-a dutela, gero aldaketak berrezartzeko.
diff --git a/sources/lib/plugins/revert/lang/eu/lang.php b/sources/lib/plugins/revert/lang/eu/lang.php
new file mode 100644
index 0000000..d3532c0
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/eu/lang.php
@@ -0,0 +1,18 @@
+
+ * @author Zigor Astarbe 
+ */
+$lang['menu']                  = 'Berrezartze Kudeatzailea';
+$lang['filter']                = 'Bilatu spam duten orriak';
+$lang['revert']                = 'Berrezarri aukeratutako orriak';
+$lang['reverted']              = '%s berrezarria %s berrikuspenera';
+$lang['removed']               = '%s ezabatua';
+$lang['revstart']              = 'Berrezartze prozesua hasi da. Honek denbora luzea eraman dezake.
+Script-a denbora mugara iristen bada, zati txikiagotan berrezarri
+beharko duzu. ';
+$lang['revstop']               = 'Berrezartze prozesua arrakastaz bukatu da.';
+$lang['note1']                 = 'Oharra: bilaketa honek maiuskulak eta minuskulak bereizten ditu';
+$lang['note2']                 = 'Oharra: orria azken bertsiora berrezarriko da, emandako %s spam terminorik ez duelarik.';
diff --git a/sources/lib/plugins/revert/lang/fa/intro.txt b/sources/lib/plugins/revert/lang/fa/intro.txt
new file mode 100644
index 0000000..0ccdb08
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/fa/intro.txt
@@ -0,0 +1,3 @@
+====== مدیریت برگشت‌ها ======
+
+این صفحه، در بازیابی صفحاتی که به آن‌ها اسپم ارسال شده است کمک می‌رساند. برای مشاهده‌ی صفحات اسپم شده، ابتدا جستجو کنید، سپس از اسپم شدن صفحه‌ی مورد نظر اطمینان حاصل کنید و تغییرات اعمال شده را برگردانید.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/fa/lang.php b/sources/lib/plugins/revert/lang/fa/lang.php
new file mode 100644
index 0000000..c6ce617
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/fa/lang.php
@@ -0,0 +1,22 @@
+
+ * @author omidmr@gmail.com
+ * @author Omid Mottaghi 
+ * @author Mohammad Reza Shoaei 
+ * @author Milad DZand 
+ * @author AmirH Hassaneini 
+ */
+$lang['menu']                  = 'مدیریت برگشت‌ها';
+$lang['filter']                = 'جستجوی صفحات اسپم شده';
+$lang['revert']                = 'بازگردانی صفحات انتخاب شده';
+$lang['reverted']              = '%s به نگارش %s بازگردانده شد';
+$lang['removed']               = '%s حذف شد';
+$lang['revstart']              = 'در حال بازگرداندن. ممکن است مدتی زمان ببرد. اگر اجرای برنامه، پیش از اتمام به پایان رسید، باید در بخش‌های کوچک‌تری بازگردانی را انجام دهید.';
+$lang['revstop']               = 'بازگرداندن با موفقیت به پایان رسید.';
+$lang['note1']                 = 'توجه: جستجو حساس به حروف کوچک و بزرگ است';
+$lang['note2']                 = 'توجه: صفحه به آخرین نسخه‌ای که حاوی اسپم %s نیست بازگردانده خواهد شد.';
diff --git a/sources/lib/plugins/revert/lang/fi/intro.txt b/sources/lib/plugins/revert/lang/fi/intro.txt
new file mode 100644
index 0000000..3b3ce5d
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/fi/intro.txt
@@ -0,0 +1,3 @@
+====== Palautuksenhallinta ======
+
+Tämä sivu auttaa sinua automaattisen palautuksenhallinnan kanssa spam hyökkäyksen jälkeen. Löytääksesi listan spammatyistä sivuista anna ensin hakusana (esim. spm URL), sen jälkeen varmista, että löytyneet sivut todella ovat spammia ja palauta sitten sivut.
diff --git a/sources/lib/plugins/revert/lang/fi/lang.php b/sources/lib/plugins/revert/lang/fi/lang.php
new file mode 100644
index 0000000..d14f527
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/fi/lang.php
@@ -0,0 +1,19 @@
+
+ * @author Teemu Mattila 
+ * @author Sami Olmari 
+ */
+$lang['menu']                  = 'Palautuksenhallinta';
+$lang['filter']                = 'Etsi spammattyjä sivuja';
+$lang['revert']                = 'Palauta valitut sivut';
+$lang['reverted']              = '%s palautettu versioon %s';
+$lang['removed']               = '%s poistettu';
+$lang['revstart']              = 'Palautusprosessi käynnistetty. Tämä voi viedä pidemmän aikaa. Jos ajo katkeaa aikakatkaisuun ennen loppua, niin sinun pitää palauttaa pienemmissä osissa.';
+$lang['revstop']               = 'Palautusprosessi lopetti onnistuneesti.';
+$lang['note1']                 = 'Huomioi: tämä haku on kirjainkoosta riippuva';
+$lang['note2']                 = 'Huomioi: tämä sivu palautetaan viimeiseen versioon, jossa ei ole annettua spamtermiä %s';
diff --git a/sources/lib/plugins/revert/lang/fr/intro.txt b/sources/lib/plugins/revert/lang/fr/intro.txt
new file mode 100644
index 0000000..30e6d8a
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/fr/intro.txt
@@ -0,0 +1,3 @@
+====== Gestionnaire des réversions ======
+
+Cette page vous aide à restaurer des pages après une attaque de spam. Pour trouver la liste des pages vandalisées, entrez un motif de recherche (par exemple : une URL de spam), puis confirmez que les pages trouvées contiennent du spam et annulez leur modifications.
diff --git a/sources/lib/plugins/revert/lang/fr/lang.php b/sources/lib/plugins/revert/lang/fr/lang.php
new file mode 100644
index 0000000..4ba6c19
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/fr/lang.php
@@ -0,0 +1,33 @@
+
+ * @author Maurice A. LeBlanc 
+ * @author Guy Brand 
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri 
+ * @author Erik Pedersen 
+ * @author olivier duperray 
+ * @author Vincent Feltz 
+ * @author Philippe Bajoit 
+ * @author Florian Gaub 
+ * @author Samuel Dorsaz samuel.dorsaz@novelion.net
+ * @author Johan Guilbaud 
+ * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
+ * @author Yannick Aure 
+ * @author Olivier DUVAL 
+ * @author Anael Mobilia 
+ * @author Bruno Veilleux 
+ */
+$lang['menu']                  = 'Gestionnaire des réversions';
+$lang['filter']                = 'Trouver les pages spammées ';
+$lang['revert']                = 'Annuler les modifications sélectionnées';
+$lang['reverted']              = '%s restauré à la révision %s';
+$lang['removed']               = '%s supprimé';
+$lang['revstart']              = 'Processus de réversion démarré. Ceci peut durer longtemps. Si le script dépasse le délai d\'exécution avant de finir, 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 sensible à la casse';
+$lang['note2']                 = 'Note : cette page sera restaurée à la dernière version ne contenant pas le terme « spam » %s.';
diff --git a/sources/lib/plugins/revert/lang/gl/intro.txt b/sources/lib/plugins/revert/lang/gl/intro.txt
new file mode 100644
index 0000000..6327249
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/gl/intro.txt
@@ -0,0 +1,3 @@
+====== Xestor de Reversión ======
+
+Esta páxina axudarache a revertir automaticamente un ataque de correo-lixo. Para atopares unha listaxe de páxinas que conteñan correo-lixo, primeiro debes inserir unha cadea de procura (p.e. un URL do correo-lixo), e logo confirmares que as páxinas atopadas conteñen realmente o tal correo-lixo e reverter as edicións.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/gl/lang.php b/sources/lib/plugins/revert/lang/gl/lang.php
new file mode 100644
index 0000000..0e376d9
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/gl/lang.php
@@ -0,0 +1,17 @@
+
+ * @author Oscar M. Lage 
+ * @author Rodrigo Rega 
+ */
+$lang['menu']                  = 'Xestor de Reversión';
+$lang['filter']                = 'Procurar páxinas con correo-lixo';
+$lang['revert']                = 'Revertir as páxinas seleccionadas';
+$lang['reverted']              = '%s revertido á revisión %s';
+$lang['removed']               = '%s eliminado';
+$lang['revstart']              = 'Proceso de reversión iniciado. Isto podería demorar un anaco longo. Se o script fallar por superar o seu límite de tempo denantes de rematar, terás que facer a reversión en anacos máis pequenos.';
+$lang['revstop']               = 'O proceso de reversión rematou correctamente.';
+$lang['note1']                 = 'Nota: esta procura distingue entre maiúsculas e minúsculas';
+$lang['note2']                 = 'Nota: a páxina revertirase á última versión que non conteña o termo de correo-lixo %s indicado.';
diff --git a/sources/lib/plugins/revert/lang/he/intro.txt b/sources/lib/plugins/revert/lang/he/intro.txt
new file mode 100644
index 0000000..44b78df
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/he/intro.txt
@@ -0,0 +1,3 @@
+====== מנהל השחזור ======
+
+דף זה יסיע בידך לשחזר באופן אוטומטי אחרי התקפת ספאם. כדי לקבל את רשימת הדפים עם הספאם עליך ראשית מחרוזת לחיפוש (לדוגמה כתובת ספאם) אחר כך עליך לאשר שהדפים שנמצאו באמת מכילים ספאם ולשחזר את העריכות.
diff --git a/sources/lib/plugins/revert/lang/he/lang.php b/sources/lib/plugins/revert/lang/he/lang.php
new file mode 100644
index 0000000..2f49856
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/he/lang.php
@@ -0,0 +1,19 @@
+
+ * @author Moshe Kaplan 
+ * @author Yaron Yogev 
+ * @author Yaron Shahrabani 
+ */
+$lang['menu']                  = 'מנהל שחזור';
+$lang['filter']                = 'חפש דפים עם ספאם';
+$lang['revert']                = 'שחזר את הדפים הנבחרים';
+$lang['reverted']              = '%s שוחזרו לגרסה %s';
+$lang['removed']               = '%s הוסרו';
+$lang['revstart']              = 'תהליך השחזור החל. התהליך עלול להיות ממושך. אם תסריט מגיע למגבלת פסק הזמן לפני שהסתיים התהליך יהיה צורך לבצע את השחזור במקטעים קטנים יותר.';
+$lang['revstop']               = 'תהליך השחזור הושלם בהצלחה.';
+$lang['note1']                 = 'לתשומת לבך: החיפוש ער לגודל האותיות הלועזיות.';
+$lang['note2']                 = 'לתשות לבך: הדף ישוחזר לגרסה האחרונה שאינה מכילה את מונח הספאם %s';
diff --git a/sources/lib/plugins/revert/lang/hi/lang.php b/sources/lib/plugins/revert/lang/hi/lang.php
new file mode 100644
index 0000000..d6f78ff
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/hi/lang.php
@@ -0,0 +1,7 @@
+
+ * @author yndesai@gmail.com
+ */
diff --git a/sources/lib/plugins/revert/lang/hr/lang.php b/sources/lib/plugins/revert/lang/hr/lang.php
new file mode 100644
index 0000000..96f1d6a
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/hr/lang.php
@@ -0,0 +1,8 @@
+
+ * @author Dražen Odobašić 
+ * @author Dejan Igrec dejan.igrec@gmail.com
+ */
diff --git a/sources/lib/plugins/revert/lang/hu/intro.txt b/sources/lib/plugins/revert/lang/hu/intro.txt
new file mode 100644
index 0000000..e2c2dad
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/hu/intro.txt
@@ -0,0 +1,3 @@
+====== Visszaállítás kezelő ======
+
+Segítséget nyújtunk SPAM támadások utáni automatikus visszaállításhoz. A fertőzött oldalak kereséséhez meg kell adni egy karaktersorozatot (pl. egy SPAM URL-t). A találatok közül kiválasztva a valóban SPAM-et tartalmazó oldakat, visszaállítjuk őket a lehetséges utolsó SPAM mentes állapotra.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/hu/lang.php b/sources/lib/plugins/revert/lang/hu/lang.php
new file mode 100644
index 0000000..d16764a
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/hu/lang.php
@@ -0,0 +1,22 @@
+
+ * @author Siaynoq Mage 
+ * @author schilling.janos@gmail.com
+ * @author Szabó Dávid 
+ * @author Sándor TIHANYI 
+ * @author David Szabo 
+ * @author Marton Sebok 
+ */
+$lang['menu']                  = 'Visszaállítás kezelő (anti-SPAM)';
+$lang['filter']                = 'SPAM tartalmú oldalak keresése';
+$lang['revert']                = 'Kiválasztott oldalak visszaállítása';
+$lang['reverted']              = '%s a következő változatra lett visszaállítva: %s';
+$lang['removed']               = '%s törölve';
+$lang['revstart']              = 'A visszaállítási folyamat elindult. Ez hosszú ideig eltarthat. Ha időtúllépés miatt nem tud lefutni, kisebb darabbal kell próbálkozni.';
+$lang['revstop']               = 'A visszaállítási folyamat sikeresen befejeződött.';
+$lang['note1']                 = 'Megjegyzés: a keresés kisbetű-nagybetű érzékeny';
+$lang['note2']                 = 'Megjegyzés: Az oldalt az utolsó olyan változatra állítjuk vissza, ami nem tartalmazza a megadott spam kifejezést: %s.';
diff --git a/sources/lib/plugins/revert/lang/ia/intro.txt b/sources/lib/plugins/revert/lang/ia/intro.txt
new file mode 100644
index 0000000..ae548e9
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ia/intro.txt
@@ -0,0 +1,3 @@
+====== Gestion de reversiones ======
+
+Iste pagina te adjuta con le reversion automatic de un attacco de spam. Pro cercar un lista de paginas spammose, primo entra un texto a cercar (p.ex. un URL de spam), postea confirma que le paginas trovate es realmente spam e reverte le modificationes.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/ia/lang.php b/sources/lib/plugins/revert/lang/ia/lang.php
new file mode 100644
index 0000000..bec2eca
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ia/lang.php
@@ -0,0 +1,16 @@
+
+ * @author Martijn Dekker 
+ */
+$lang['menu']                  = 'Gestion de reversiones';
+$lang['filter']                = 'Cercar paginas spammose';
+$lang['revert']                = 'Reverter le paginas seligite';
+$lang['reverted']              = '%s revertite al version %s';
+$lang['removed']               = '%s removite';
+$lang['revstart']              = 'Le processo de reversion ha comenciate. Isto pote durar multo. Si le script expira ante de finir, tu debe divider le reversiones in blocos minor.';
+$lang['revstop']               = 'Le processo de reversion ha succedite.';
+$lang['note1']                 = 'Nota: iste recerca distingue inter majusculas e minusculas.';
+$lang['note2']                 = 'Nota: le pagina essera revertite al ultime version que non contine le termino de spam specificate, %s.';
diff --git a/sources/lib/plugins/revert/lang/id-ni/lang.php b/sources/lib/plugins/revert/lang/id-ni/lang.php
new file mode 100644
index 0000000..d367340
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/id-ni/lang.php
@@ -0,0 +1,7 @@
+
+ * @author Yustinus Waruwu 
+ */
diff --git a/sources/lib/plugins/revert/lang/id/lang.php b/sources/lib/plugins/revert/lang/id/lang.php
new file mode 100644
index 0000000..c3d4859
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/id/lang.php
@@ -0,0 +1,7 @@
+
+ * @author Yustinus Waruwu 
+ */
diff --git a/sources/lib/plugins/revert/lang/is/lang.php b/sources/lib/plugins/revert/lang/is/lang.php
new file mode 100644
index 0000000..9de4049
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/is/lang.php
@@ -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 --git a/sources/lib/plugins/revert/lang/it/intro.txt b/sources/lib/plugins/revert/lang/it/intro.txt
new file mode 100644
index 0000000..a5ef146
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/it/intro.txt
@@ -0,0 +1,3 @@
+====== Gestore di ripristini ======
+
+Questa pagina aiuta il controllo automatico degli attacchi spam. Per cercare una lista delle pagine con spam, inserisci innanzitutto una stringa di ricerca (ad esempio l'URL di un sito di spam), quindi Verifica che le pagine trovate contengano realmente spam e ripristinale ad una versione precedente.
diff --git a/sources/lib/plugins/revert/lang/it/lang.php b/sources/lib/plugins/revert/lang/it/lang.php
new file mode 100644
index 0000000..d2f7b6d
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/it/lang.php
@@ -0,0 +1,25 @@
+
+ * @author snarchio@alice.it
+ * @author robocap 
+ * @author Osman Tekin osman.tekin93@hotmail.it
+ * @author Jacopo Corbetta 
+ * @author Matteo Pasotti 
+ * @author snarchio@gmail.com
+ */
+$lang['menu']                  = 'Gestore di ripristini';
+$lang['filter']                = 'Cerca pagine con spam';
+$lang['revert']                = 'Ripristina le pagine selezionate';
+$lang['reverted']              = '%s ripristinata alla versione %s';
+$lang['removed']               = '%s rimossa';
+$lang['revstart']              = 'Processo di ripristino avviato. Può essere necessario molto tempo. Se lo script non fa in tempo a finire, sarà necessario ripristinare in blocchi più piccoli.';
+$lang['revstop']               = 'Processo di ripristino finito con successo.';
+$lang['note1']                 = 'Nota: questa ricerca distingue le maiuscole';
+$lang['note2']                 = 'Nota: la pagina verrà ripristinata all\'ultima versione non contenente la parola di spam data %s.';
diff --git a/sources/lib/plugins/revert/lang/ja/intro.txt b/sources/lib/plugins/revert/lang/ja/intro.txt
new file mode 100644
index 0000000..995a57f
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ja/intro.txt
@@ -0,0 +1,3 @@
+====== 復元管理 ======
+
+このページは、スパムにより編集されたページを自動的に復元するための機能を管理します。 スパムを受けたページを検索するため、スパムURLなどのキーワードを入力してください。 その後、検索結果に含まれているページがスパムされていることを確認してから復元を行います。
diff --git a/sources/lib/plugins/revert/lang/ja/lang.php b/sources/lib/plugins/revert/lang/ja/lang.php
new file mode 100644
index 0000000..9253ff5
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ja/lang.php
@@ -0,0 +1,21 @@
+
+ * @author Ikuo Obataya 
+ * @author Daniel Dupriest 
+ * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
+ * @author Satoshi Sahara 
+ */
+$lang['menu']                  = '復元管理';
+$lang['filter']                = 'スパムを受けたページを検索';
+$lang['revert']                = '選択したページを検索';
+$lang['reverted']              = '%s はリビジョン %s へ復元されました';
+$lang['removed']               = '%s は削除されました';
+$lang['revstart']              = '復元処理中です。時間が掛かる可能性がありますが、もしタイムアウトした場合は、復元を複数回に分けて行ってください。';
+$lang['revstop']               = '復元処理が正しく完了しました。';
+$lang['note1']                 = '注意：検索語句は大文字・小文字を区別します';
+$lang['note2']                 = '注意：最新の内容に検索したスパムキーワード %s が含まれていないページが復元されます。';
diff --git a/sources/lib/plugins/revert/lang/kk/lang.php b/sources/lib/plugins/revert/lang/kk/lang.php
new file mode 100644
index 0000000..dde5b95
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/kk/lang.php
@@ -0,0 +1,6 @@
+
+ * @author Seung-Chul Yoo 
+ * @author erial2@gmail.com
+ * @author Myeongjin 
+ */
+$lang['menu']                  = '되돌리기 관리자';
+$lang['filter']                = '스팸 문서 검색';
+$lang['revert']                = '선택한 문서 되돌리기';
+$lang['reverted']              = '%s 판을 %s 판으로 되돌림';
+$lang['removed']               = '%s 제거됨';
+$lang['revstart']              = '되돌리기 작업을 시작합니다. 오랜 시간이 걸릴 수 있습니다. 완료되기 전에 스크립트 시간 초과가 발생한다면 더 작은 작업으로 나누어서 되돌리시기 바랍니다.';
+$lang['revstop']               = '되돌리기 작업이 성공적으로 끝났습니다.';
+$lang['note1']                 = '참고: 대소문자를 구별해 찾습니다';
+$lang['note2']                 = '참고: 문서는 %s 스팸 단어를 포함하지 않은 최신 판으로 되돌립니다. ';
diff --git a/sources/lib/plugins/revert/lang/la/intro.txt b/sources/lib/plugins/revert/lang/la/intro.txt
new file mode 100644
index 0000000..99a206f
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/la/intro.txt
@@ -0,0 +1,3 @@
+====== Restituendi Administrator ======
+
+Haec pagina contra mala interretialia paginas restituta. Vt paginas aegras quaeras, malum VRL scribe, deinde paginas malas eligas.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/la/lang.php b/sources/lib/plugins/revert/lang/la/lang.php
new file mode 100644
index 0000000..af42034
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/la/lang.php
@@ -0,0 +1,15 @@
+
+ */
+$lang['menu']                  = 'Restituendi administrator';
+$lang['filter']                = 'Malas paginas quaerere';
+$lang['revert']                = 'Electas paginas restituere';
+$lang['reverted']              = '%s restitutur ut %s recenseas';
+$lang['removed']               = '%s deletur';
+$lang['revstart']              = 'Restitutio agens. Hic multo tempore agere potest. Si nimium tempus transit, manu restituis.';
+$lang['revstop']               = 'Restitutio feliciter perfecta.';
+$lang['note1']                 = 'Caue: litteras maiores et minores discernit';
+$lang['note2']                 = 'Caue: pagina in recentiori forma sine malis uerbis "%s" restituetur';
diff --git a/sources/lib/plugins/revert/lang/lb/intro.txt b/sources/lib/plugins/revert/lang/lb/intro.txt
new file mode 100644
index 0000000..59c5dfc
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/lb/intro.txt
@@ -0,0 +1,3 @@
+====== Revert Manager ======
+
+Dës Säit hëlleft bei der automatescher zerécksetzung no enger Spamattack. Fir eng Lëscht vun zougespamte Säiten ze fannen, gëff fir d'éischt e Sichbegrëff an (z.B. eng Spamadress). Konfirméier dann dass déi Säite wierklech zougespamt goufen a setz se dann zréck.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/lb/lang.php b/sources/lib/plugins/revert/lang/lb/lang.php
new file mode 100644
index 0000000..59acdf7
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/lb/lang.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/revert/lang/lv/intro.txt b/sources/lib/plugins/revert/lang/lv/intro.txt
new file mode 100644
index 0000000..edcdab2
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/lv/intro.txt
@@ -0,0 +1,3 @@
+====== Piemēsloto lapu atjaunotājs ======
+
+Šī lapa palīdzēs automātiski atjaunot saturu pēc huligānisma . Lai atrastu piedrazotās lapas ieraksti meklējamo izteiksmi (piem. smaperu URL), tad apstiprini, ka atrastās ir "mēslapas" un atcel izdarītās izmaiņas .
diff --git a/sources/lib/plugins/revert/lang/lv/lang.php b/sources/lib/plugins/revert/lang/lv/lang.php
new file mode 100644
index 0000000..012d6cc
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/lv/lang.php
@@ -0,0 +1,15 @@
+
+ */
+$lang['menu']                  = 'Piemēsloto lapu atjaunotājs';
+$lang['filter']                = 'Meklēt piemēslotās lapas';
+$lang['revert']                = 'Atjaunot norādītās lapas ';
+$lang['reverted']              = '%s atjaunots uz %s stāvokli';
+$lang['removed']               = '%s dzēsts';
+$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 versiju, kas nesatur uzdoto spama vārdu %s.';
diff --git a/sources/lib/plugins/revert/lang/mk/lang.php b/sources/lib/plugins/revert/lang/mk/lang.php
new file mode 100644
index 0000000..6d4530f
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/mk/lang.php
@@ -0,0 +1,6 @@
+
+ */
diff --git a/sources/lib/plugins/revert/lang/mr/intro.txt b/sources/lib/plugins/revert/lang/mr/intro.txt
new file mode 100644
index 0000000..efca243
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/mr/intro.txt
@@ -0,0 +1,5 @@
+====== फेरबदल व्यवस्थापक ======
+
+ह्या पानाद्वारे तुम्ही भंकस हल्ल्याद्वारे झालेले बदल आपोआप फेरबदल करू शकता.
+भंकस पानांची यादी बनवण्यासाठी प्रथम एखादा शब्दसमूह टाका ( उदा. एखादं भंकस URL ),
+मग जी पाने सापडतील टी भंकस असल्याचे नक्की करा आणि त्यातील बदल रद्द करा.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/mr/lang.php b/sources/lib/plugins/revert/lang/mr/lang.php
new file mode 100644
index 0000000..3912bb9
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/mr/lang.php
@@ -0,0 +1,18 @@
+
+ * @author Padmanabh Kulkarni
+ * @author shantanoo@gmail.com
+ */
+$lang['menu']                  = 'फेर बदल व्यवस्थापक';
+$lang['filter']                = 'भंकस पाने शोधा';
+$lang['revert']                = 'निवडलेली पानातील बदल रद्द करा';
+$lang['reverted']              = '%s फेरबदलून %s आवृत्तिमधे आणला आहे';
+$lang['removed']               = '%s काढला आहे.';
+$lang['revstart']              = 'फेरबदलाची प्रक्रिया चालु झाली आहे.याला बराच वेळ लागू शकतो. जर स्क्रिप्ट सम्पण्याआधि त्याची कालमर्यादा उलटून गेली तर छोट्या-छोट्या तुकड्यांमधे फेरबदल करा.';
+$lang['revstop']               = 'फेरबदलाची प्रक्रिया यशस्वीरीत्या पूर्ण झाली.';
+$lang['note1']                 = 'टीप : हा शोध केस-सेंसिटिव आहे ( फ़क्त इंग्रजीसाठी लागू )';
+$lang['note2']                 = 'टीप : हे पान फेरबदल करून ज्या शेवटच्या आवृत्तिमधे %s हा दिलेला भंकस शब्द नाही त्यात बदलले जाईल.';
diff --git a/sources/lib/plugins/revert/lang/ms/lang.php b/sources/lib/plugins/revert/lang/ms/lang.php
new file mode 100644
index 0000000..77ad2a1
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ms/lang.php
@@ -0,0 +1,6 @@
+
+ * @author SarojKumar Dhakal 
+ * @author Saroj Dhakal
+ */
+$lang['menu']                  = 'पूर्वस्थिती व्यवस्थापक';
+$lang['filter']                = 'स्प्यामयुक्त पृष्ठहरु खोज्नुहोस् ';
+$lang['revert']                = 'छानिएक पृष्ठहरुलाई पूर्वस्थितिमा फर्काउनुहोस् ।';
+$lang['reverted']              = '%s लाई  %s संस्करणमा फर्काइयो ।';
+$lang['removed']               = '%s लाई हटाइयो ।';
+$lang['revstart']              = 'पूर्वस्थितिमा फर्काउने कार्य सुरु भयो । यसले लामो समय लिन सक्छ। यदि स्क्रिप्टको समय का्र्य सकिनु पूर्व सकियो भने । तपाईले सानो सानो टुक्रा लिएर पुर्वरुपमा फर्काउनु पर्ने हुन्छ ।';
+$lang['revstop']               = 'पूर्वस्थितिमा फर्काउने कार्य सफलतापूर्वक सकियो ।';
+$lang['note1']                 = 'नोट: यो खोज वर्ण सम्वेदनशील छ';
diff --git a/sources/lib/plugins/revert/lang/nl/intro.txt b/sources/lib/plugins/revert/lang/nl/intro.txt
new file mode 100644
index 0000000..db8f5a0
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/nl/intro.txt
@@ -0,0 +1,3 @@
+===== Herstelmanager =====
+
+Deze pagina helpt u bij het herstellen van pagina's na een spam-aanval. Vul een zoekterm in (bijvoorbeeld een spam url) om een lijst te krijgen van bekladde pagina's, bevestig dat de pagina's inderdaad spam bevatten en herstel de wijzigingen.
diff --git a/sources/lib/plugins/revert/lang/nl/lang.php b/sources/lib/plugins/revert/lang/nl/lang.php
new file mode 100644
index 0000000..ee8678e
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/nl/lang.php
@@ -0,0 +1,28 @@
+
+ * @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
+ * @author Marijn Hofstra 
+ * @author Timon Van Overveldt 
+ * @author Jeroen
+ * @author Ricardo Guijt 
+ * @author Gerrit 
+ * @author Remon 
+ */
+$lang['menu']                  = 'Herstelmanager';
+$lang['filter']                = 'Zoek naar bekladde pagina\'s';
+$lang['revert']                = 'Herstel geselecteerde pagina\'s';
+$lang['reverted']              = '%s hersteld naar revisie %s';
+$lang['removed']               = '%s verwijderd';
+$lang['revstart']              = 'Herstelproces is begonnen. Dit kan een lange tijd duren. Als het script een timeout genereert voor het klaar is, moet je in kleinere delen herstellen.';
+$lang['revstop']               = 'Herstelproces succesvol afgerond.';
+$lang['note1']                 = 'NB: deze zoekopdracht is hoofdlettergevoelig';
+$lang['note2']                 = 'NB: de pagina zal hersteld worden naar de laatste versie waar de opgegeven spam-term %s niet op voorkomt.';
diff --git a/sources/lib/plugins/revert/lang/no/intro.txt b/sources/lib/plugins/revert/lang/no/intro.txt
new file mode 100644
index 0000000..f48b987
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/no/intro.txt
@@ -0,0 +1,3 @@
+====== Tilbakestillingsbehandler ======
+
+Denne siden hjelper deg å automatisk reversere forsøpling av sidene. For å finne en liste over forsøplede sider, skriv inn en søkestreng (f.eks. en søppel-URL). Bekreft deretter at de funnede sidene virkelig er forsøplet og tilbakestill endringene.
diff --git a/sources/lib/plugins/revert/lang/no/lang.php b/sources/lib/plugins/revert/lang/no/lang.php
new file mode 100644
index 0000000..c58300d
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/no/lang.php
@@ -0,0 +1,32 @@
+
+ * @author Arild Burud 
+ * @author Torkill Bruland 
+ * @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 
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Jon Bøe 
+ * @author Egil Hansen 
+ * @author Thomas Juberg 
+ * @author Boris 
+ */
+$lang['menu']                  = 'Tilbakestillingsbehandler';
+$lang['filter']                = 'Søk etter søppelmeldinger';
+$lang['revert']                = 'Tilbakestill valgte sider';
+$lang['reverted']              = '%s tilbakestilt til revisjon %s';
+$lang['removed']               = '%s fjernet';
+$lang['revstart']              = 'Prosessen med tilbakestilling er startet. Hvis det skjer et
+tidsavbrudd før prosessen er ferdig, må du tilbakestille
+færre sider om gangen.';
+$lang['revstop']               = 'Tilbakestillingen er fullført.';
+$lang['note1']                 = 'Merk: søket skiller mellom store og små bokstaver';
+$lang['note2']                 = 'Merk: siden vil bli tilbakestilt til den siste versjonen som ikke inneholder det oppgitte søppel-ordet %s.';
diff --git a/sources/lib/plugins/revert/lang/pl/intro.txt b/sources/lib/plugins/revert/lang/pl/intro.txt
new file mode 100644
index 0000000..410948a
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/pl/intro.txt
@@ -0,0 +1,3 @@
+====== Menadżer przywracania ======
+
+Menadżer przywracania przeznaczony jest do automatycznego naprawiania stron, które uległy wandalizmom. W celu naprawienia uszkodzonych stron, wyszukaj je a następnie oznacz i przywróć poprzednie wersje.
diff --git a/sources/lib/plugins/revert/lang/pl/lang.php b/sources/lib/plugins/revert/lang/pl/lang.php
new file mode 100644
index 0000000..d2d53b8
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/pl/lang.php
@@ -0,0 +1,26 @@
+
+ * @author Mariusz Kujawski 
+ * @author Maciej Kurczewski 
+ * @author Sławomir Boczek 
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski 
+ * @author maros 
+ * @author Grzegorz Widła 
+ * @author Łukasz Chmaj 
+ * @author Begina Felicysym 
+ * @author Aoi Karasu 
+ */
+$lang['menu']                  = 'Menadżer przywracania';
+$lang['filter']                = 'Wyszukaj uszkodzone strony';
+$lang['revert']                = 'Napraw zaznaczone strony';
+$lang['reverted']              = 'Stronę %s zastąpiono wersją %s';
+$lang['removed']               = 'Stronę %s usunięto';
+$lang['revstart']              = 'Naprawa rozpoczęta. To może zająć kilka minut. Jeśli strona przestanie się ładować, spróbuj ponownie zaznaczając mniejszą liczbę stron.';
+$lang['revstop']               = 'Naprawa zakończona pomyślnie!';
+$lang['note1']                 = 'Uwaga: duże i małe litery są rozróżniane';
+$lang['note2']                 = 'Uwaga: zostanie przywrócona ostatnia wersja strony niezawierająca wyrażenia %s.';
diff --git a/sources/lib/plugins/revert/lang/pt-br/intro.txt b/sources/lib/plugins/revert/lang/pt-br/intro.txt
new file mode 100644
index 0000000..5ce9890
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/pt-br/intro.txt
@@ -0,0 +1,3 @@
+====== Gerenciador de Reversões ======
+
+Essa página ajuda a reverter automaticamente um ataque de spam. Para encontrar as páginas que sofreram ataque, primeiro entre com um termo na busca (ex.: a URL do spam), então confirme que as páginas encontradas são realmente spam e reverta as edições.
diff --git a/sources/lib/plugins/revert/lang/pt-br/lang.php b/sources/lib/plugins/revert/lang/pt-br/lang.php
new file mode 100644
index 0000000..1039704
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/pt-br/lang.php
@@ -0,0 +1,30 @@
+
+ * @author Felipe Castro 
+ * @author Lucien Raven 
+ * @author Enrico Nicoletto 
+ * @author Flávio Veras 
+ * @author Jeferson Propheta 
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas 
+ * @author Frederico Guimarães 
+ * @author Jair Henrique 
+ * @author Luis Dantas 
+ * @author Sergio Motta sergio@cisne.com.br
+ * @author Isaias Masiero Filho 
+ * @author Balaco Baco 
+ * @author Victor Westmann 
+ */
+$lang['menu']                  = 'Gerenciador de reversões';
+$lang['filter']                = 'Procura por páginas com spam';
+$lang['revert']                = 'Reverte as páginas selecionadas';
+$lang['reverted']              = '%s revertida para a revisão %s';
+$lang['removed']               = '%s 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: 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 --git a/sources/lib/plugins/revert/lang/pt/intro.txt b/sources/lib/plugins/revert/lang/pt/intro.txt
new file mode 100644
index 0000000..7adfe5f
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/pt/intro.txt
@@ -0,0 +1,3 @@
+====== Gerir Reversões ======
+
+Esta página ajuda a reverter automaticamente de um ataque spam. Para encontrar as páginas afectadas insira primeiro um texto de pesquisa (i.e spam URL), confirme as páginas encontradas como sendo resultantes de um ataque spam e reverta essas edições.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/pt/lang.php b/sources/lib/plugins/revert/lang/pt/lang.php
new file mode 100644
index 0000000..f87f77d
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/pt/lang.php
@@ -0,0 +1,20 @@
+
+ * @author Enrico Nicoletto 
+ * @author Fil 
+ * @author André Neves 
+ * @author José Campos zecarlosdecampos@gmail.com
+ */
+$lang['menu']                  = 'Gestor de Reversões';
+$lang['filter']                = 'Pesquisar por páginas "spammy"';
+$lang['revert']                = 'Reverter páginas seleccionadas';
+$lang['reverted']              = '%s revertida para revisão %s';
+$lang['removed']               = '%s removidas.';
+$lang['revstart']              = 'Processo de reversão iniciado. A sua execução pode demorar. Se der timeout antes de terminar então é preciso escolher quantidades menores de páginas a reverter.';
+$lang['revstop']               = 'Processo de reversão bem sucedido.';
+$lang['note1']                 = 'Nota: a pesquisa é case-sensitive';
+$lang['note2']                 = 'Nota: a página será revertida para a versão anterior que não contém os termos spam pesquisados: %s.';
diff --git a/sources/lib/plugins/revert/lang/ro/intro.txt b/sources/lib/plugins/revert/lang/ro/intro.txt
new file mode 100644
index 0000000..3a03035
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ro/intro.txt
@@ -0,0 +1,3 @@
+====== Manager Reveniri ======
+
+Această pagină ajută revenirea automată în cazul unui atac spam. Pentru a găsi o listă a paginilor cu spam, întroduceţi mai întâi un şir de căutat (de ex. Un URL spam), apoi confirmaţi dacă paginile găsite conţin într-adevăr spam şi anulaţi editările.
diff --git a/sources/lib/plugins/revert/lang/ro/lang.php b/sources/lib/plugins/revert/lang/ro/lang.php
new file mode 100644
index 0000000..5ea8025
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ro/lang.php
@@ -0,0 +1,23 @@
+
+ * @author s_baltariu@yahoo.com
+ * @author Emanuel-Emeric Andrasi 
+ * @author Emanuel-Emeric Andrași 
+ * @author Emanuel-Emeric Andraşi 
+ * @author Emanuel-Emeric Andrasi 
+ * @author Marius OLAR 
+ * @author Marius Olar 
+ * @author Emanuel-Emeric Andrași 
+ */
+$lang['menu']                  = 'Manager Reveniri';
+$lang['filter']                = 'Caută pagini cu posibil spam';
+$lang['revert']                = 'Revenire pentru paginile selectate';
+$lang['reverted']              = '%s revenită la versiunea %s';
+$lang['removed']               = '%s eliminată';
+$lang['revstart']              = 'Procesul de revenire a început. Acesta poate dura mult timp.Dacă scriptul expiră înainte de finalizare, trebuie să reveniţi în paşi mai mici.';
+$lang['revstop']               = 'Procesul de revenire s-a finalizat cu succes.';
+$lang['note1']                 = 'Notă: această căutare este sensibilă la majuscule.';
+$lang['note2']                 = 'Notă: pagina va reveni la ultima versiune ce nu conţine termenul de spam %s.';
diff --git a/sources/lib/plugins/revert/lang/ru/intro.txt b/sources/lib/plugins/revert/lang/ru/intro.txt
new file mode 100644
index 0000000..52d1f8d
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ru/intro.txt
@@ -0,0 +1,3 @@
+====== Менеджер откаток ======
+
+Эта страница поможет вам в автоматической откатке изменений после спам-атаки. Для того, чтобы найти спам-страницы, введите ключевые слова и произведите поиск (например, по URL спамера). Затем убедитесь, что найденные страницы действительно содержат спам и сделайте откатку изменений.
diff --git a/sources/lib/plugins/revert/lang/ru/lang.php b/sources/lib/plugins/revert/lang/ru/lang.php
new file mode 100644
index 0000000..73d69b3
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/ru/lang.php
@@ -0,0 +1,30 @@
+
+ * @author Andrew Pleshakov 
+ * @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 
+ * @author Aleksey Osadchiy 
+ * @author Aleksandr Selivanov 
+ * @author Ladyko Andrey 
+ * @author Eugene 
+ * @author Johnny Utah 
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ */
+$lang['menu']                  = 'Менеджер откаток';
+$lang['filter']                = 'Поиск спам-страниц';
+$lang['revert']                = 'Откатить изменения для выбранных страниц';
+$lang['reverted']              = '%s возвращена к версии %s';
+$lang['removed']               = '%s удалена';
+$lang['revstart']              = 'Начат процесс откатки. Он может занять много времени. Если скрипт не успевает завершить работу и выдаёт ошибку, необходимо произвести откатку более маленькими частями.';
+$lang['revstop']               = 'Процесс откатки успешно завершён.';
+$lang['note1']                 = 'Замечание: поиск с учётом регистра';
+$lang['note2']                 = 'Замечание: страница будет восстановлена до последней версии, не содержащей спам-термин %s.';
diff --git a/sources/lib/plugins/revert/lang/sk/intro.txt b/sources/lib/plugins/revert/lang/sk/intro.txt
new file mode 100644
index 0000000..aa75a2c
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sk/intro.txt
@@ -0,0 +1,3 @@
+====== Obnova dát ======
+
+Táto stránka slúži na automatické obnovenie obsahu stránok po útoku spamom. Pre identifikáciu napadnutých stránok zadajte vyhľadávací reťazec (napr. spam URL), potom potvrďte, že nájdené stránky sú skutočne napadnuté, a zrušte posledné zmeny.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/sk/lang.php b/sources/lib/plugins/revert/lang/sk/lang.php
new file mode 100644
index 0000000..7ab21f2
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sk/lang.php
@@ -0,0 +1,18 @@
+
+ * @author exusik@gmail.com
+ * @author Martin Michalek 
+ */
+$lang['menu']                  = 'Obnova dát';
+$lang['filter']                = 'Hľadať spamerské stránky';
+$lang['revert']                = 'Vrátiť vybrané stránky';
+$lang['reverted']              = '%s vrátená na revíziu %s';
+$lang['removed']               = '%s odstránená';
+$lang['revstart']              = 'Proces reverzie bol spustený. Toto môže trvať dlhý čas. Ak skript prekročí daný maximálny časový interval pred tým, ako skončí, musíte urobiť reverziu v menších dávkach.';
+$lang['revstop']               = 'Proces reverzie sa úspešne skončil.';
+$lang['note1']                 = 'Poznámka: vyhľadávanie rozlišuje medzi veľkými a malými písmenami';
+$lang['note2']                 = 'Poznámka: táto stránka bude vrátená do poslednej verzie, ktorá neobsahuje spamový výraz %s.';
diff --git a/sources/lib/plugins/revert/lang/sl/intro.txt b/sources/lib/plugins/revert/lang/sl/intro.txt
new file mode 100644
index 0000000..4e2cabf
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sl/intro.txt
@@ -0,0 +1,3 @@
+====== Povrnitev okvarjene vsebine ======
+
+Na tej strani je mogoče povrniti vsebino wiki strani na izvorne vrednosti po napadu na stran in vpisu neželenih vsebin. Za iskanje strani z neželeno vsebino, uporabite iskalnik z ustreznim nizom (npr. naslov URL), potem pa potrdite, da so najdene strani res z neželeno vsebino in nato povrnite stanje na zadnjo pravo različico.
diff --git a/sources/lib/plugins/revert/lang/sl/lang.php b/sources/lib/plugins/revert/lang/sl/lang.php
new file mode 100644
index 0000000..df778fd
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sl/lang.php
@@ -0,0 +1,16 @@
+%s.';
diff --git a/sources/lib/plugins/revert/lang/sq/intro.txt b/sources/lib/plugins/revert/lang/sq/intro.txt
new file mode 100644
index 0000000..25e16b6
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sq/intro.txt
@@ -0,0 +1,3 @@
+====== Menaxhuesi Rikthimit ======
+
+Kjo faqe ndihmon për rikthimin automatik në rast të një sulmi spam. Për të gjetur një listë me faqe spam në fillim fut një varg kërkimi (psh një URL spam), dhe pastaj konfirmo që faqet e gjetura janë me të vërtetë spam dhe rikthe redaktimet.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/sq/lang.php b/sources/lib/plugins/revert/lang/sq/lang.php
new file mode 100644
index 0000000..45ae499
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sq/lang.php
@@ -0,0 +1,15 @@
+%s.';
diff --git a/sources/lib/plugins/revert/lang/sr/intro.txt b/sources/lib/plugins/revert/lang/sr/intro.txt
new file mode 100644
index 0000000..8c288e7
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sr/intro.txt
@@ -0,0 +1,3 @@
+====== Управљач за враћање ======
+
+Ова страна вам помаже од напада спама аутоматским враћањем на старе верзије страница.  Да бисте пронашли спамоване странице откуцајте реч за претрагу (тј. реч која се појављује у спаму), затим потврдите да се на пронађеним страницама стварно налази спам и онда вратите на стање пре промена.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/sr/lang.php b/sources/lib/plugins/revert/lang/sr/lang.php
new file mode 100644
index 0000000..62c712a
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sr/lang.php
@@ -0,0 +1,17 @@
+
+ * @author Miroslav Šolti 
+ */
+$lang['menu']                  = 'Управљач за враћање';
+$lang['filter']                = 'Претрага спам страница';
+$lang['revert']                = 'Врати одабране странице';
+$lang['reverted']              = '%s враћена на ревизију %s';
+$lang['removed']               = '%s је уклоњена';
+$lang['revstart']              = 'Процес враћања је покренут. Може потрајати дуже време. Ако истекне време пре завршетка потребно је да покренете у мањим деловима.';
+$lang['revstop']               = 'Процес враћања је успешно завршен.';
+$lang['note1']                 = 'Напомена: ова претрага разликује велика и мала слова';
+$lang['note2']                 = 'Напомена: страница ће бити враћена на последњу верзију која не садржи спам израз %s.';
diff --git a/sources/lib/plugins/revert/lang/sv/intro.txt b/sources/lib/plugins/revert/lang/sv/intro.txt
new file mode 100644
index 0000000..cd7f322
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sv/intro.txt
@@ -0,0 +1,3 @@
+====== Hantera återställningar ======
+
+Den här sidan hjälper till med automatiskt återställning efter en spamattack. För att hitta spammade sidor, ange först en söksträng (till exempel en webbadress). Kontrollera sedan att sidorna som hittades verkligen är spam, och återställ sedan redigeringarna.
diff --git a/sources/lib/plugins/revert/lang/sv/lang.php b/sources/lib/plugins/revert/lang/sv/lang.php
new file mode 100644
index 0000000..c30f82d
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/sv/lang.php
@@ -0,0 +1,32 @@
+
+ * @author Nicklas Henriksson 
+ * @author Håkan Sandell 
+ * @author Dennis Karlsson
+ * @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 mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
+ * @author Henrik 
+ * @author Tor Härnqvist 
+ */
+$lang['menu']                  = 'Hantera återställningar';
+$lang['filter']                = 'Sök efter spamsidor';
+$lang['revert']                = 'Återställ markerade redigeringar';
+$lang['reverted']              = '%s återställd till version %s';
+$lang['removed']               = '%s borttagen';
+$lang['revstart']              = 'Återställningen startad. Detta kan ta lång tid. Om
+                     skriptet får en timeout innan det är färdigt måste du köra återställningen
+                     med färre sidor åt gången.';
+$lang['revstop']               = 'Återställningen avslutades utan problem.';
+$lang['note1']                 = 'OBS: sökningen skiljer på stora och små bokstäver';
+$lang['note2']                 = 'OBS: sidan kommer att återställas till den senaste versionen som inte innehåller den angivna söksträngen %s.';
diff --git a/sources/lib/plugins/revert/lang/th/intro.txt b/sources/lib/plugins/revert/lang/th/intro.txt
new file mode 100644
index 0000000..2bfd27e
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/th/intro.txt
@@ -0,0 +1,3 @@
+====== ตัวจัดการกู้คืนสภาพเอกสาร ======
+
+หน้านี้จะช่วยคุณด้วยการกู้คืนหน้าที่ถูกแสปมโดยอัตโนมัติ เพื่อที่จะค้นหารายการหน้าที่ถูกสแปม อันดับแรกให้กรอกข้อความสืบค้น (เช่น URL เว็บโฆษณาที่มาสแปมไว้), จากนั้นให้ยืนยันว่าเพจที่พบนั้นถูกสแปมจริงๆ แล้วจึงสั่งคืนสภาพต้นฉบับ
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/th/lang.php b/sources/lib/plugins/revert/lang/th/lang.php
new file mode 100644
index 0000000..86e4f9c
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/th/lang.php
@@ -0,0 +1,19 @@
+
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Arthit Suriyawongkul 
+ * @author Kittithat Arnontavilas 
+ * @author Thanasak Sompaisansin 
+ */
+$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 --git a/sources/lib/plugins/revert/lang/tr/intro.txt b/sources/lib/plugins/revert/lang/tr/intro.txt
new file mode 100644
index 0000000..ff12399
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/tr/intro.txt
@@ -0,0 +1,3 @@
+====== Eskiye Döndürme Yöneticisi ======
+
+Bu sayfa spam saldırılarına karşı otomatik eski haline çevirim yapmanızı sağlar. Spam içerikli sayfayı bulmak için bir anahtar kelime girin (mesela spam URLsi), daha sonra spame maruz kalan sayfalar olduğundan emin olup eski haline çevirin.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/tr/lang.php b/sources/lib/plugins/revert/lang/tr/lang.php
new file mode 100644
index 0000000..52d28c6
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/tr/lang.php
@@ -0,0 +1,20 @@
+
+ * @author Cihan Kahveci 
+ * @author Yavuz Selim 
+ * @author Caleb Maclennan 
+ * @author farukerdemoncel@gmail.com
+ */
+$lang['menu']                  = 'Eskiye Döndürme';
+$lang['filter']                = 'Spam bulunan sayfaları ara';
+$lang['revert']                = 'Seçili sayfaları eskiye döndür';
+$lang['reverted']              = '%s  %s sürümüne geri çevrildi.  ';
+$lang['removed']               = '%s kaldırıldı';
+$lang['revstart']              = 'Eskiye döndürme işlemi başlatıldı. Bu işlem uzun sürebilir. Eğer script işlemi tamamlayamadan zaman aşımına uğrarsa küçük parçalar halinde işlemi uygulayın.';
+$lang['revstop']               = 'Eskiye döndürme işlemi başarıyla tamamlandı.';
+$lang['note1']                 = 'Not: bu aramada küçük harf büyük harf ayrımı vardır.';
+$lang['note2']                 = 'Not: bu sayfa %s spam kelimelerini içermeyen son haline geri çevirilecektir.';
diff --git a/sources/lib/plugins/revert/lang/uk/intro.txt b/sources/lib/plugins/revert/lang/uk/intro.txt
new file mode 100644
index 0000000..7bf5dfc
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/uk/intro.txt
@@ -0,0 +1,3 @@
+====== Менеджер відновлення ======
+
+Ця сторінка дозволяє вам автоматично відновлюватися після спамерських атак. Для створення списку зіпсутих сторінок спочатку введіть рядок (напр. спамерське посилання), а потім підтвердіть, що знайдена сторінка дійсно є спамом і відновіть редагування.
\ No newline at end of file
diff --git a/sources/lib/plugins/revert/lang/uk/lang.php b/sources/lib/plugins/revert/lang/uk/lang.php
new file mode 100644
index 0000000..2c9774f
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/uk/lang.php
@@ -0,0 +1,21 @@
+
+ * @author Uko uko@uar.net
+ * @author Ulrikhe Lukoie  .com
+ * @author Kate Arzamastseva pshns@ukr.net
+ */
+$lang['menu']                  = 'Менеджер відновлення';
+$lang['filter']                = 'Пошук спамних сторінок';
+$lang['revert']                = 'Відновити обрані сторінки';
+$lang['reverted']              = '%s відновлено до версії %s';
+$lang['removed']               = '%s вилучено';
+$lang['revstart']              = 'Розпочато процес відновлення. Це може зайняти багато часу. Якщо скрипт не закінчує роботу до таймауту, необхідно відновлювати меншими частинами.';
+$lang['revstop']               = 'Процес відновлення успішно закінчено.';
+$lang['note1']                 = 'Увага: пошук залежить від регістру символів';
+$lang['note2']                 = 'Увага: сторінку буде відновлено до останньої версії, яка не містить спамерського терміну %s.';
diff --git a/sources/lib/plugins/revert/lang/vi/lang.php b/sources/lib/plugins/revert/lang/vi/lang.php
new file mode 100644
index 0000000..2933d88
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/vi/lang.php
@@ -0,0 +1,5 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San 
+ * @author Li-Jiun Huang 
+ * @author Cheng-Wei Chien 
+ * @author Danny Lin 
+ * @author Shuo-Ting Jian 
+ * @author syaoranhinata@gmail.com
+ * @author Ichirou Uchiki 
+ */
+$lang['menu']                  = '還原管理';
+$lang['filter']                = '搜索包含垃圾訊息的頁面';
+$lang['revert']                = '還原選取的頁面';
+$lang['reverted']              = '%s 已還原成版本 %s';
+$lang['removed']               = '%s 已移除';
+$lang['revstart']              = '已開始還原操作。有可能需要很長時間。如果程式執行逾時，請嘗試分次還原少量內容。';
+$lang['revstop']               = '還原程序已完成。';
+$lang['note1']                 = '注意：搜尋區分大小寫';
+$lang['note2']                 = '注意：我們將把此頁面還原作最後一個不含垃圾訊息 %s 的版本。';
diff --git a/sources/lib/plugins/revert/lang/zh/intro.txt b/sources/lib/plugins/revert/lang/zh/intro.txt
new file mode 100644
index 0000000..c697f8a
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/zh/intro.txt
@@ -0,0 +1,3 @@
+====== 还原管理器 ======
+
+该页面能帮助您的页面从垃圾信息的攻击中自动还原过来。 请先输入关键词搜索包含垃圾信息的页面（如某个垃圾信息的 URL），然后请确定搜索结果的确包含垃圾信息，并将其还原至先前的修订版。
diff --git a/sources/lib/plugins/revert/lang/zh/lang.php b/sources/lib/plugins/revert/lang/zh/lang.php
new file mode 100644
index 0000000..44a72f5
--- /dev/null
+++ b/sources/lib/plugins/revert/lang/zh/lang.php
@@ -0,0 +1,27 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton guxd@163.com
+ * @author Simon zhan 
+ * @author mr.jinyi@gmail.com
+ * @author ben 
+ * @author lainme 
+ * @author caii 
+ * @author Hiphen Lee 
+ * @author caii, patent agent in China 
+ * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian 
+ */
+$lang['menu']                  = '还原管理器';
+$lang['filter']                = '搜索包含垃圾信息的页面';
+$lang['revert']                = '还原选中的页面';
+$lang['reverted']              = '%s 还原至修订版 %s';
+$lang['removed']               = '%s 已移除';
+$lang['revstart']              = '已开始还原操作。有可能需要很长时间。如果计时器在还原操作完成前停止了，请尝试还原较少的内容。';
+$lang['revstop']               = '还原操作成功完成。';
+$lang['note1']                 = '请注意：本次搜索区分大小写';
+$lang['note2']                 = '请注意：本页面将被还原至不包含给定垃圾信息 %s 的最近的修订版。';
diff --git a/sources/lib/plugins/revert/plugin.info.txt b/sources/lib/plugins/revert/plugin.info.txt
new file mode 100644
index 0000000..482b68d
--- /dev/null
+++ b/sources/lib/plugins/revert/plugin.info.txt
@@ -0,0 +1,7 @@
+base   revert
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2013-03-09
+name   Revert Manager
+desc   Allows you to mass revert recent edits to remove Spam or vandalism
+url    http://dokuwiki.org/plugin:revert
diff --git a/sources/lib/plugins/safefnrecode/action.php b/sources/lib/plugins/safefnrecode/action.php
new file mode 100644
index 0000000..9127f8d
--- /dev/null
+++ b/sources/lib/plugins/safefnrecode/action.php
@@ -0,0 +1,68 @@
+
+ */
+
+// must be run within Dokuwiki
+if (!defined('DOKU_INC')) die();
+
+require_once DOKU_PLUGIN.'action.php';
+
+class action_plugin_safefnrecode extends DokuWiki_Action_Plugin {
+
+    public function register(Doku_Event_Handler $controller) {
+
+        $controller->register_hook('INDEXER_TASKS_RUN', 'BEFORE', $this, 'handle_indexer_tasks_run');
+
+    }
+
+    public function handle_indexer_tasks_run(Doku_Event &$event, $param) {
+        global $conf;
+        if($conf['fnencode'] != 'safe') return;
+
+        if(!file_exists($conf['datadir'].'_safefn.recoded')){
+            $this->recode($conf['datadir']);
+            touch($conf['datadir'].'_safefn.recoded');
+        }
+
+        if(!file_exists($conf['olddir'].'_safefn.recoded')){
+            $this->recode($conf['olddir']);
+            touch($conf['olddir'].'_safefn.recoded');
+        }
+
+        if(!file_exists($conf['metadir'].'_safefn.recoded')){
+            $this->recode($conf['metadir']);
+            touch($conf['metadir'].'_safefn.recoded');
+        }
+
+        if(!file_exists($conf['mediadir'].'_safefn.recoded')){
+            $this->recode($conf['mediadir']);
+            touch($conf['mediadir'].'_safefn.recoded');
+        }
+
+    }
+
+    /**
+     * Recursive function to rename all safe encoded files to use the new
+     * square bracket post indicator
+     */
+    private function recode($dir){
+        $dh = opendir($dir);
+        if(!$dh) return;
+        while (($file = readdir($dh)) !== false) {
+            if($file == '.' || $file == '..') continue;           # cur and upper dir
+            if(is_dir("$dir/$file")) $this->recode("$dir/$file"); #recurse
+            if(strpos($file,'%') === false) continue;             # no encoding used
+            $new = preg_replace('/(%[^\]]*?)\./','\1]',$file);    # new post indicator
+            if(preg_match('/%[^\]]+$/',$new)) $new .= ']';        # fix end FS#2122
+            rename("$dir/$file","$dir/$new");                     # rename it
+        }
+        closedir($dh);
+    }
+
+}
+
+// vim:ts=4:sw=4:et:
diff --git a/sources/lib/plugins/safefnrecode/plugin.info.txt b/sources/lib/plugins/safefnrecode/plugin.info.txt
new file mode 100644
index 0000000..3c6249d
--- /dev/null
+++ b/sources/lib/plugins/safefnrecode/plugin.info.txt
@@ -0,0 +1,7 @@
+base   safefnrecode
+author Andreas Gohr
+email  andi@splitbrain.org
+date   2012-07-28
+name   safefnrecode plugin
+desc   Changes existing page and foldernames for the change in the safe filename encoding
+url    http://www.dokuwiki.org/plugin:safefnrecode
diff --git a/sources/lib/plugins/syntax.php b/sources/lib/plugins/syntax.php
new file mode 100644
index 0000000..8df5abb
--- /dev/null
+++ b/sources/lib/plugins/syntax.php
@@ -0,0 +1,310 @@
+
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+/**
+ * All DokuWiki plugins to extend the parser/rendering mechanism
+ * need to inherit from this class
+ */
+class DokuWiki_Syntax_Plugin extends Doku_Parser_Mode {
+
+    var $allowedModesSetup = false;
+    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);
+        return array();
+    }
+
+    /**
+     * Syntax Type
+     *
+     * Needs to return one of the mode types defined in $PARSER_MODES in parser.php
+     */
+    function getType(){
+        trigger_error('getType() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    /**
+     * Allowed Mode Types
+     *
+     * Defines the mode types for other dokuwiki markup that maybe nested within the
+     * plugin's own markup. Needs to return an array of one or more of the mode types
+     * defined in $PARSER_MODES in parser.php
+     */
+    function getAllowedTypes() {
+        return array();
+    }
+
+    /**
+     * Paragraph Type
+     *
+     * Defines how this syntax is handled regarding paragraphs. This is important
+     * for correct XHTML nesting. Should return one of the following:
+     *
+     * 'normal' - The plugin can be used inside paragraphs
+     * 'block'  - Open paragraphs need to be closed before plugin output
+     * 'stack'  - Special case. Plugin wraps other paragraphs.
+     *
+     * @see Doku_Handler_Block
+     */
+    function getPType(){
+        return 'normal';
+    }
+
+    /**
+     * Handler to prepare matched data for the rendering process
+     *
+     * This function can only pass data to render() via its return value - render()
+     * may be not be run during the object's current life.
+     *
+     * Usually you should only need the $match param.
+     *
+     * @param   string       $match   The text matched by the patterns
+     * @param   int          $state   The lexer state for the match
+     * @param   int          $pos     The character position of the matched text
+     * @param   Doku_Handler $handler Reference to the Doku_Handler object
+     * @return  array Return an array with all data you want to use in render
+     */
+    function handle($match, $state, $pos, Doku_Handler &$handler){
+        trigger_error('handle() not implemented in '.get_class($this), E_USER_WARNING);
+    }
+
+    /**
+     * Handles the actual output creation.
+     *
+     * The function must not assume any other of the classes methods have been run
+     * during the object's current life. The only reliable data it receives are its
+     * parameters.
+     *
+     * The function should always check for the given output format and return false
+     * when a format isn't supported.
+     *
+     * $renderer contains a reference to the renderer object which is
+     * currently handling the rendering. You need to use it for writing
+     * the output. How this is done depends on the renderer used (specified
+     * by $format
+     *
+     * The contents of the $data array depends on what the handler() function above
+     * created
+     *
+     * @param   $format   string        output format being rendered
+     * @param   $renderer Doku_Renderer reference to the current renderer object
+     * @param   $data     array         data created by handler()
+     * @return  boolean                 rendered correctly?
+     */
+    function render($format, Doku_Renderer &$renderer, $data) {
+        trigger_error('render() not implemented in '.get_class($this), E_USER_WARNING);
+
+    }
+
+    /**
+     *  There should be no need to override these functions
+     */
+    function accepts($mode) {
+
+        if (!$this->allowedModesSetup) {
+            global $PARSER_MODES;
+
+            $allowedModeTypes = $this->getAllowedTypes();
+            foreach($allowedModeTypes as $mt) {
+                $this->allowedModes = array_merge($this->allowedModes, $PARSER_MODES[$mt]);
+            }
+
+            $idx = array_search(substr(get_class($this), 7), (array) $this->allowedModes);
+            if ($idx !== false) {
+                unset($this->allowedModes[$idx]);
+            }
+            $this->allowedModesSetup = true;
+        }
+
+        return parent::accepts($mode);
+    }
+
+    // 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; }
+
+    /**
+     * Get the name of the component of the current class
+     *
+     * @return string component name
+     */
+    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   string $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 wiki page and pass to xhtml renderer for display
+     * plugin equivalent of p_locale_xhtml()
+     *
+     * @param   string  $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_CONF.'/plugin_lang/'.$plugin.'/'.$conf['lang'].'/'.$id.'.txt';
+        if (!@file_exists($file)){
+            $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   string $name   name of plugin to load
+     * @param   bool   $msg    if a message should be displayed in case the plugin is not available
+     *
+     * @return  object  helper plugin object
+     */
+    function loadHelper($name, $msg = true) {
+        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;
+    }
+
+    /**
+     * Allow the plugin to prevent DokuWiki from reusing an instance
+     *
+     * @return bool   false if the plugin has to be instantiated
+     */
+    function isSingleton() {
+        return true;
+    }
+
+}
+//Setup VIM: ex: et ts=4 :
diff --git a/sources/lib/plugins/testing/action.php b/sources/lib/plugins/testing/action.php
new file mode 100644
index 0000000..a242ab0
--- /dev/null
+++ b/sources/lib/plugins/testing/action.php
@@ -0,0 +1,20 @@
+
+ */
+class action_plugin_testing extends DokuWiki_Action_Plugin {
+
+    function register(Doku_Event_Handler $controller) {
+        $controller->register_hook('DOKUWIKI_STARTED', 'AFTER', $this, 'dokuwikiStarted');
+    }
+
+    function dokuwikiStarted() {
+        $param = array();
+        trigger_event('TESTING_PLUGIN_INSTALLED', $param);
+        msg('The testing plugin is enabled and should be disabled.',-1);
+    }
+}
diff --git a/sources/lib/plugins/testing/plugin.info.txt b/sources/lib/plugins/testing/plugin.info.txt
new file mode 100644
index 0000000..64ab0b6
--- /dev/null
+++ b/sources/lib/plugins/testing/plugin.info.txt
@@ -0,0 +1,7 @@
+base   testing
+author Tobias Sarnowski
+email  tobias@trustedco.de
+date   2012-07-28
+name   Testing Plugin
+desc   Used to test the test framework. Should always be disabled.
+url    http://www.dokuwiki.org/plugin:testing
diff --git a/sources/lib/plugins/usermanager/admin.php b/sources/lib/plugins/usermanager/admin.php
new file mode 100644
index 0000000..156037f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/admin.php
@@ -0,0 +1,1012 @@
+
+ *  @author  Chris Smith 
+ */
+// must be run within Dokuwiki
+if(!defined('DOKU_INC')) die();
+
+if(!defined('DOKU_PLUGIN_IMAGES')) define('DOKU_PLUGIN_IMAGES',DOKU_BASE.'lib/plugins/usermanager/images/');
+
+/**
+ * All DokuWiki plugins to extend the admin function
+ * need to inherit from this class
+ */
+class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
+
+    protected $_auth = null;        // auth object
+    protected $_user_total = 0;     // number of registered users
+    protected $_filter = array();   // user selection filter(s)
+    protected $_start = 0;          // index of first user to be displayed
+    protected $_last = 0;           // index of the last user to be displayed
+    protected $_pagesize = 20;      // number of users to list on one page
+    protected $_edit_user = '';     // set to user selected for editing
+    protected $_edit_userdata = array();
+    protected $_disabled = '';      // if disabled set to explanatory string
+    protected $_import_failures = array();
+
+    /**
+     * Constructor
+     */
+    public function admin_plugin_usermanager(){
+        /** @var DokuWiki_Auth_Plugin $auth */
+        global $auth;
+
+        $this->setupLocale();
+
+        if (!isset($auth)) {
+            $this->_disabled = $this->lang['noauth'];
+        } else if (!$auth->canDo('getUsers')) {
+            $this->_disabled = $this->lang['nosupport'];
+        } else {
+
+            // we're good to go
+            $this->_auth = & $auth;
+
+        }
+
+        // attempt to retrieve any import failures from the session
+        if ($_SESSION['import_failures']){
+            $this->_import_failures = $_SESSION['import_failures'];
+        }
+    }
+
+     /**
+      * Return prompt for admin menu
+      */
+    public function getMenuText($language) {
+
+        if (!is_null($this->_auth))
+          return parent::getMenuText($language);
+
+        return $this->getLang('menu').' '.$this->_disabled;
+    }
+
+    /**
+     * return sort order for position in admin menu
+     */
+    public function getMenuSort() {
+        return 2;
+    }
+
+    /**
+     * Handle user request
+     */
+    public function handle() {
+        global $INPUT;
+        if (is_null($this->_auth)) return false;
+
+        // extract the command and any specific parameters
+        // submit button name is of the form - fn[cmd][param(s)]
+        $fn   = $INPUT->param('fn');
+
+        if (is_array($fn)) {
+            $cmd = key($fn);
+            $param = is_array($fn[$cmd]) ? key($fn[$cmd]) : null;
+        } else {
+            $cmd = $fn;
+            $param = null;
+        }
+
+        if ($cmd != "search") {
+            $this->_start = $INPUT->int('start', 0);
+            $this->_filter = $this->_retrieveFilter();
+        }
+
+        switch($cmd){
+            case "add"    : $this->_addUser(); break;
+            case "delete" : $this->_deleteUser(); break;
+            case "modify" : $this->_modifyUser(); break;
+            case "edit"   : $this->_editUser($param); break;
+            case "search" : $this->_setFilter($param);
+                            $this->_start = 0;
+                            break;
+            case "export" : $this->_export(); break;
+            case "import" : $this->_import(); break;
+            case "importfails" : $this->_downloadImportFailures(); break;
+        }
+
+        $this->_user_total = $this->_auth->canDo('getUserCount') ? $this->_auth->getUserCount($this->_filter) : -1;
+
+        // page handling
+        switch($cmd){
+            case 'start' : $this->_start = 0; break;
+            case 'prev'  : $this->_start -= $this->_pagesize; break;
+            case 'next'  : $this->_start += $this->_pagesize; break;
+            case 'last'  : $this->_start = $this->_user_total; break;
+        }
+        $this->_validatePagination();
+        return true;
+    }
+
+    /**
+     * Output appropriate html
+     */
+    public function html() {
+        global $ID;
+
+        if(is_null($this->_auth)) {
+            print $this->lang['badauth'];
+            return false;
+        }
+
+        $user_list = $this->_auth->retrieveUsers($this->_start, $this->_pagesize, $this->_filter);
+
+        $page_buttons = $this->_pagination();
+        $delete_disable = $this->_auth->canDo('delUser') ? '' : 'disabled="disabled"';
+
+        $editable = $this->_auth->canDo('UserMod');
+        $export_label = empty($this->_filter) ? $this->lang['export_all'] : $this->lang['export_filtered'];
+
+        print $this->locale_xhtml('intro');
+        print $this->locale_xhtml('list');
+
+        ptln("
        ");
+        ptln("
        ");
+
+        if ($this->_user_total > 0) {
+            ptln("
        ".sprintf($this->lang['summary'],$this->_start+1,$this->_last,$this->_user_total,$this->_auth->getUserCount())."
        ");
+        } else {
+            if($this->_user_total < 0) {
+                $allUserTotal = 0;
+            } else {
+                $allUserTotal = $this->_auth->getUserCount();
+            }
+            ptln("
        ".sprintf($this->lang['nonefound'], $allUserTotal)."
        ");
+        }
+        ptln("
        ");
+        formSecurityToken();
+        ptln("  
        ");
+        ptln("  ");
+        ptln("    ");
+        ptln("      ");
+        ptln("        ");
+        ptln("      ");
+
+        ptln("      ");
+        ptln("        ");
+        ptln("        ");
+        ptln("        ");
+        ptln("        ");
+        ptln("        ");
+        ptln("      ");
+        ptln("    ");
+
+        if ($this->_user_total) {
+            ptln("    ");
+            foreach ($user_list as $user => $userinfo) {
+                extract($userinfo);
+                /**
+                 * @var string $name
+                 * @var string $pass
+                 * @var string $mail
+                 * @var array  $grps
+                 */
+                $groups = join(', ',$grps);
+                ptln("    ");
+                ptln("      ");
+                if ($editable) {
+                    ptln("    ");
+                } else {
+                    ptln("    ");
+                }
+                ptln("      ");
+                ptln("    ");
+            }
+            ptln("    ");
+        }
+
+        ptln("    ");
+        ptln("      ");
+        ptln("    ");
+        ptln("  
         ".$this->lang["user_id"]."".$this->lang["user_name"]."".$this->lang["user_mail"]."".$this->lang["user_groups"]."
        lang['search_prompt']."\" alt=\"".$this->lang['search']."\" class=\"button\" />_htmlFilter('user')."\" />_htmlFilter('name')."\" />_htmlFilter('mail')."\" />_htmlFilter('grps')."\" />
         1,
+                                                           'do' => 'admin',
+                                                           'page' => 'usermanager',
+                                                           'sectok' => getSecurityToken())).
+                         "\" title=\"".$this->lang['edit_prompt']."\">".hsc($user)."".hsc($user)."".hsc($name)."".hsc($mail)."".hsc($groups)."
        ");
+        ptln("        ");
+        ptln("          lang['delete_selected']."\" id=\"usrmgr__del\" />");
+        ptln("        ");
+        ptln("        ");
+        ptln("          lang['start']."\" />");
+        ptln("          lang['prev']."\" />");
+        ptln("          lang['next']."\" />");
+        ptln("          lang['last']."\" />");
+        ptln("        ");
+        if (!empty($this->_filter)) {
+            ptln("    lang['clear']."\" />");
+        }
+        ptln("        ");
+        ptln("        ");
+        ptln("        ");
+
+        $this->_htmlFilterSettings(2);
+
+        ptln("      
        ");
+        ptln("  
        ");
+
+        ptln("
        ");
+        ptln("
        ");
+
+        $style = $this->_edit_user ? " class=\"edit_user\"" : "";
+
+        if ($this->_auth->canDo('addUser')) {
+            ptln("");
+            print $this->locale_xhtml('add');
+            ptln("  
        ");
+
+            $this->_htmlUserForm('add',null,array(),4);
+
+            ptln("  
        ");
+            ptln("
        ");
+        }
+
+        if($this->_edit_user  && $this->_auth->canDo('UserMod')){
+            ptln("");
+            print $this->locale_xhtml('edit');
+            ptln("  
        ");
+
+            $this->_htmlUserForm('modify',$this->_edit_user,$this->_edit_userdata,4);
+
+            ptln("  
        ");
+            ptln("");
+        }
+
+        if ($this->_auth->canDo('addUser')) {
+            $this->_htmlImportForm();
+        }
+        ptln("");
+        return true;
+    }
+
+    /**
+     * Display form to add or modify a user
+     *
+     * @param string $cmd 'add' or 'modify'
+     * @param string $user id of user
+     * @param array  $userdata array with name, mail, pass and grps
+     * @param int    $indent
+     */
+    protected function _htmlUserForm($cmd,$user='',$userdata=array(),$indent=0) {
+        global $conf;
+        global $ID;
+
+        $name = $mail = $groups = '';
+        $notes = array();
+
+        if ($user) {
+            extract($userdata);
+            if (!empty($grps)) $groups = join(',',$grps);
+        } else {
+            $notes[] = sprintf($this->lang['note_group'],$conf['defaultgroup']);
+        }
+
+        ptln("
        ",$indent);
+        formSecurityToken();
+        ptln("  
        ",$indent);
+        ptln("  ",$indent);
+        ptln("    ",$indent);
+        ptln("      ",$indent);
+        ptln("    ",$indent);
+        ptln("    ",$indent);
+
+        $this->_htmlInputField($cmd."_userid",    "userid",    $this->lang["user_id"],    $user,  $this->_auth->canDo("modLogin"), $indent+6);
+        $this->_htmlInputField($cmd."_userpass",  "userpass",  $this->lang["user_pass"],  "",     $this->_auth->canDo("modPass"),  $indent+6);
+        $this->_htmlInputField($cmd."_username",  "username",  $this->lang["user_name"],  $name,  $this->_auth->canDo("modName"),  $indent+6);
+        $this->_htmlInputField($cmd."_usermail",  "usermail",  $this->lang["user_mail"],  $mail,  $this->_auth->canDo("modMail"),  $indent+6);
+        $this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6);
+
+        if ($this->_auth->canDo("modPass")) {
+            if ($cmd == 'add') {
+                $notes[] = $this->lang['note_pass'];
+            }
+            if ($user) {
+                $notes[] = $this->lang['note_notify'];
+            }
+
+            ptln("", $indent);
+        }
+
+        ptln("    ",$indent);
+        ptln("    ",$indent);
+        ptln("      ",$indent);
+        ptln("        ",$indent);
+        ptln("      ",$indent);
+        ptln("    ",$indent);
+        ptln("  
        ".$this->lang["field"]."".$this->lang["value"]."
        ",$indent);
+        ptln("          ",$indent);
+        ptln("          ",$indent);
+
+        // save current $user, we need this to access details if the name is changed
+        if ($user)
+          ptln("          ",$indent);
+
+        $this->_htmlFilterSettings($indent+10);
+
+        ptln("          lang[$cmd]."\" />",$indent);
+        ptln("        
        ",$indent);
+
+        if ($notes) {
+            ptln("    
          ");
+            foreach ($notes as $note) {
+                ptln("      
        • ".$note."
          • ",$indent);
+            }
+            ptln("    
        ");
+        }
+        ptln("  
        ",$indent);
+        ptln("
        ",$indent);
+    }
+
+    /**
+     * Prints a inputfield
+     *
+     * @param string $id
+     * @param string $name
+     * @param string $label
+     * @param string $value
+     * @param bool   $cando whether auth backend is capable to do this action
+     * @param int $indent
+     */
+    protected function _htmlInputField($id, $name, $label, $value, $cando, $indent=0) {
+        $class = $cando ? '' : ' class="disabled"';
+        echo str_pad('',$indent);
+
+        if($name == 'userpass'){
+            $fieldtype = 'password';
+            $autocomp  = 'autocomplete="off"';
+        }elseif($name == 'usermail'){
+            $fieldtype = 'email';
+            $autocomp  = '';
+        }else{
+            $fieldtype = 'text';
+            $autocomp  = '';
+        }
+
+        echo "";
+        echo "";
+        echo "";
+        if($cando){
+            echo "";
+        }else{
+            echo "";
+            echo "";
+        }
+        echo "";
+        echo "";
+    }
+
+    /**
+     * Returns htmlescaped filter value
+     *
+     * @param string $key name of search field
+     * @return string html escaped value
+     */
+    protected function _htmlFilter($key) {
+        if (empty($this->_filter)) return '';
+        return (isset($this->_filter[$key]) ? hsc($this->_filter[$key]) : '');
+    }
+
+    /**
+     * Print hidden inputs with the current filter values
+     *
+     * @param int $indent
+     */
+    protected function _htmlFilterSettings($indent=0) {
+
+        ptln("_start."\" />",$indent);
+
+        foreach ($this->_filter as $key => $filter) {
+            ptln("",$indent);
+        }
+    }
+
+    /**
+     * Print import form and summary of previous import
+     *
+     * @param int $indent
+     */
+    protected function _htmlImportForm($indent=0) {
+        global $ID;
+
+        $failure_download_link = wl($ID,array('do'=>'admin','page'=>'usermanager','fn[importfails]'=>1));
+
+        ptln('
        ',$indent);
+        print $this->locale_xhtml('import');
+        ptln('  
        ',$indent);
+        formSecurityToken();
+        ptln('    ',$indent);
+        ptln('    ',$indent);
+        ptln('    ',$indent);
+        ptln('    ',$indent);
+
+        $this->_htmlFilterSettings($indent+4);
+        ptln('  
        ',$indent);
+        ptln('
        ');
+
+        // list failures from the previous import
+        if ($this->_import_failures) {
+            $digits = strlen(count($this->_import_failures));
+            ptln('
        ',$indent);
+            ptln('  
        '.$this->lang['import_header'].'
        ');
+            ptln('  ',$indent);
+            ptln('    ',$indent);
+            ptln('      ',$indent);
+            ptln('        ',$indent);
+            ptln('        ',$indent);
+            ptln('        ',$indent);
+            ptln('        ',$indent);
+            ptln('        ',$indent);
+            ptln('        ',$indent);
+            ptln('      ',$indent);
+            ptln('    ',$indent);
+            ptln('    ',$indent);
+            foreach ($this->_import_failures as $line => $failure) {
+                ptln('      ',$indent);
+                ptln('        ',$indent);
+                ptln('        ', $indent);
+                ptln('        ',$indent);
+                ptln('        ',$indent);
+                ptln('        ',$indent);
+                ptln('        ',$indent);
+                ptln('      ',$indent);
+            }
+            ptln('    ',$indent);
+            ptln('  
        '.$this->lang['line'].''.$this->lang['error'].''.$this->lang['user_id'].''.$this->lang['user_name'].''.$this->lang['user_mail'].''.$this->lang['user_groups'].'
         '.sprintf('%0'.$digits.'d',$line).' ' .$failure['error'].'  '.hsc($failure['user'][0]).'  '.hsc($failure['user'][2]).'  '.hsc($failure['user'][3]).'  '.hsc($failure['user'][4]).' 
        ',$indent);
+            ptln('  
        '.$this->lang['import_downloadfailures'].'
        ');
+            ptln('
        ');
+        }
+
+    }
+
+    /**
+     * Add an user to auth backend
+     *
+     * @return bool whether succesful
+     */
+    protected function _addUser(){
+        global $INPUT;
+        if (!checkSecurityToken()) return false;
+        if (!$this->_auth->canDo('addUser')) return false;
+
+        list($user,$pass,$name,$mail,$grps) = $this->_retrieveUser();
+        if (empty($user)) return false;
+
+        if ($this->_auth->canDo('modPass')){
+            if (empty($pass)){
+                if($INPUT->has('usernotify')){
+                    $pass = auth_pwgen($user);
+                } else {
+                    msg($this->lang['add_fail'], -1);
+                    return false;
+                }
+            }
+        } else {
+            if (!empty($pass)){
+                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))) {
+
+            msg($this->lang['add_ok'], 1);
+
+            if ($INPUT->has('usernotify') && $pass) {
+                $this->_notifyUser($user,$pass);
+            }
+        } else {
+            msg($this->lang['add_fail'], -1);
+        }
+
+        return $ok;
+    }
+
+    /**
+     * Delete user from auth backend
+     *
+     * @return bool whether succesful
+     */
+    protected function _deleteUser(){
+        global $conf, $INPUT;
+
+        if (!checkSecurityToken()) return false;
+        if (!$this->_auth->canDo('delUser')) return false;
+
+        $selected = $INPUT->arr('delete');
+        if (empty($selected)) return false;
+        $selected = array_keys($selected);
+
+        if(in_array($_SERVER['REMOTE_USER'], $selected)) {
+            msg("You can't delete yourself!", -1);
+            return false;
+        }
+
+        $count = $this->_auth->triggerUserMod('delete', array($selected));
+        if ($count == count($selected)) {
+            $text = str_replace('%d', $count, $this->lang['delete_ok']);
+            msg("$text.", 1);
+        } else {
+            $part1 = str_replace('%d', $count, $this->lang['delete_ok']);
+            $part2 = str_replace('%d', (count($selected)-$count), $this->lang['delete_fail']);
+            msg("$part1, $part2",-1);
+        }
+
+        // invalidate all sessions
+        io_saveFile($conf['cachedir'].'/sessionpurge',time());
+
+        return true;
+    }
+
+    /**
+     * Edit user (a user has been selected for editing)
+     *
+     * @param string $param id of the user
+     * @return bool whether succesful
+     */
+    protected function _editUser($param) {
+        if (!checkSecurityToken()) return false;
+        if (!$this->_auth->canDo('UserMod')) return false;
+        $user = $this->_auth->cleanUser(preg_replace('/.*[:\/]/','',$param));
+        $userdata = $this->_auth->getUserData($user);
+
+        // no user found?
+        if (!$userdata) {
+            msg($this->lang['edit_usermissing'],-1);
+            return false;
+        }
+
+        $this->_edit_user = $user;
+        $this->_edit_userdata = $userdata;
+
+        return true;
+    }
+
+    /**
+     * Modify user in the auth backend (modified user data has been recieved)
+     *
+     * @return bool whether succesful
+     */
+    protected function _modifyUser(){
+        global $conf, $INPUT;
+
+        if (!checkSecurityToken()) return false;
+        if (!$this->_auth->canDo('UserMod')) return false;
+
+        // get currently valid  user data
+        $olduser = $this->_auth->cleanUser(preg_replace('/.*[:\/]/','',$INPUT->str('userid_old')));
+        $oldinfo = $this->_auth->getUserData($olduser);
+
+        // get new user data subject to change
+        list($newuser,$newpass,$newname,$newmail,$newgrps) = $this->_retrieveUser();
+        if (empty($newuser)) return false;
+
+        $changes = array();
+        if ($newuser != $olduser) {
+
+            if (!$this->_auth->canDo('modLogin')) {        // sanity check, shouldn't be possible
+                msg($this->lang['update_fail'],-1);
+                return false;
+            }
+
+            // check if $newuser already exists
+            if ($this->_auth->getUserData($newuser)) {
+                msg(sprintf($this->lang['update_exists'],$newuser),-1);
+                $re_edit = true;
+            } else {
+                $changes['user'] = $newuser;
+            }
+        }
+
+        // generate password if left empty and notification is on
+        if($INPUT->has('usernotify') && empty($newpass)){
+            $newpass = auth_pwgen($olduser);
+        }
+
+        if (!empty($newpass) && $this->_auth->canDo('modPass'))
+          $changes['pass'] = $newpass;
+        if (!empty($newname) && $this->_auth->canDo('modName') && $newname != $oldinfo['name'])
+          $changes['name'] = $newname;
+        if (!empty($newmail) && $this->_auth->canDo('modMail') && $newmail != $oldinfo['mail'])
+          $changes['mail'] = $newmail;
+        if (!empty($newgrps) && $this->_auth->canDo('modGroups') && $newgrps != $oldinfo['grps'])
+          $changes['grps'] = $newgrps;
+
+        if ($ok = $this->_auth->triggerUserMod('modify', array($olduser, $changes))) {
+            msg($this->lang['update_ok'],1);
+
+            if ($INPUT->has('usernotify') && $newpass) {
+                $notify = empty($changes['user']) ? $olduser : $newuser;
+                $this->_notifyUser($notify,$newpass);
+            }
+
+            // invalidate all sessions
+            io_saveFile($conf['cachedir'].'/sessionpurge',time());
+
+        } else {
+            msg($this->lang['update_fail'],-1);
+        }
+
+        if (!empty($re_edit)) {
+            $this->_editUser($olduser);
+        }
+
+        return $ok;
+    }
+
+    /**
+     * Send password change notification email
+     *
+     * @param string $user         id of user
+     * @param string $password     plain text
+     * @param bool   $status_alert whether status alert should be shown
+     * @return bool whether succesful
+     */
+    protected function _notifyUser($user, $password, $status_alert=true) {
+
+        if ($sent = auth_sendPassword($user,$password)) {
+            if ($status_alert) {
+                msg($this->lang['notify_ok'], 1);
+            }
+        } else {
+            if ($status_alert) {
+                msg($this->lang['notify_fail'], -1);
+            }
+        }
+
+        return $sent;
+    }
+
+    /**
+     * Retrieve & clean user data from the form
+     *
+     * @param bool $clean whether the cleanUser method of the authentication backend is applied
+     * @return array (user, password, full name, email, array(groups))
+     */
+    protected function _retrieveUser($clean=true) {
+        /** @var DokuWiki_Auth_Plugin $auth */
+        global $auth;
+        global $INPUT;
+
+        $user[0] = ($clean) ? $auth->cleanUser($INPUT->str('userid')) : $INPUT->str('userid');
+        $user[1] = $INPUT->str('userpass');
+        $user[2] = $INPUT->str('username');
+        $user[3] = $INPUT->str('usermail');
+        $user[4] = explode(',',$INPUT->str('usergroups'));
+
+        $user[4] = array_map('trim',$user[4]);
+        if($clean) $user[4] = array_map(array($auth,'cleanGroup'),$user[4]);
+        $user[4] = array_filter($user[4]);
+        $user[4] = array_unique($user[4]);
+        if(!count($user[4])) $user[4] = null;
+
+        return $user;
+    }
+
+    /**
+     * Set the filter with the current search terms or clear the filter
+     *
+     * @param string $op 'new' or 'clear'
+     */
+    protected function _setFilter($op) {
+
+        $this->_filter = array();
+
+        if ($op == 'new') {
+            list($user,$pass,$name,$mail,$grps) = $this->_retrieveUser(false);
+
+            if (!empty($user)) $this->_filter['user'] = $user;
+            if (!empty($name)) $this->_filter['name'] = $name;
+            if (!empty($mail)) $this->_filter['mail'] = $mail;
+            if (!empty($grps)) $this->_filter['grps'] = join('|',$grps);
+        }
+    }
+
+    /**
+     * Get the current search terms
+     *
+     * @return array
+     */
+    protected function _retrieveFilter() {
+        global $INPUT;
+
+        $t_filter = $INPUT->arr('filter');
+
+        // messy, but this way we ensure we aren't getting any additional crap from malicious users
+        $filter = array();
+
+        if (isset($t_filter['user'])) $filter['user'] = $t_filter['user'];
+        if (isset($t_filter['name'])) $filter['name'] = $t_filter['name'];
+        if (isset($t_filter['mail'])) $filter['mail'] = $t_filter['mail'];
+        if (isset($t_filter['grps'])) $filter['grps'] = $t_filter['grps'];
+
+        return $filter;
+    }
+
+    /**
+     * Validate and improve the pagination values
+     */
+    protected function _validatePagination() {
+
+        if ($this->_start >= $this->_user_total) {
+            $this->_start = $this->_user_total - $this->_pagesize;
+        }
+        if ($this->_start < 0) $this->_start = 0;
+
+        $this->_last = min($this->_user_total, $this->_start + $this->_pagesize);
+    }
+
+    /**
+     * Return an array of strings to enable/disable pagination buttons
+     *
+     * @return array with enable/disable attributes
+     */
+    protected function _pagination() {
+
+        $disabled = 'disabled="disabled"';
+
+        $buttons['start'] = $buttons['prev'] = ($this->_start == 0) ? $disabled : '';
+
+        if ($this->_user_total == -1) {
+            $buttons['last'] = $disabled;
+            $buttons['next'] = '';
+        } else {
+            $buttons['last'] = $buttons['next'] = (($this->_start + $this->_pagesize) >= $this->_user_total) ? $disabled : '';
+        }
+
+        return $buttons;
+    }
+
+    /**
+     * Export a list of users in csv format using the current filter criteria
+     */
+    protected function _export() {
+        // list of users for export - based on current filter criteria
+        $user_list = $this->_auth->retrieveUsers(0, 0, $this->_filter);
+        $column_headings = array(
+            $this->lang["user_id"],
+            $this->lang["user_name"],
+            $this->lang["user_mail"],
+            $this->lang["user_groups"]
+        );
+
+        // ==============================================================================================
+        // GENERATE OUTPUT
+        // normal headers for downloading...
+        header('Content-type: text/csv;charset=utf-8');
+        header('Content-Disposition: attachment; filename="wikiusers.csv"');
+#       // for debugging assistance, send as text plain to the browser
+#       header('Content-type: text/plain;charset=utf-8');
+
+        // output the csv
+        $fd = fopen('php://output','w');
+        fputcsv($fd, $column_headings);
+        foreach ($user_list as $user => $info) {
+            $line = array($user, $info['name'], $info['mail'], join(',',$info['grps']));
+            fputcsv($fd, $line);
+        }
+        fclose($fd);
+        if (defined('DOKU_UNITTEST')){ return; }
+
+        die;
+    }
+
+    /**
+     * Import a file of users in csv format
+     *
+     * csv file should have 4 columns, user_id, full name, email, groups (comma separated)
+     *
+     * @return bool whether successful
+     */
+    protected function _import() {
+        // check we are allowed to add users
+        if (!checkSecurityToken()) return false;
+        if (!$this->_auth->canDo('addUser')) return false;
+
+        // check file uploaded ok.
+        if (empty($_FILES['import']['size']) || !empty($_FILES['import']['error']) && $this->_isUploadedFile($_FILES['import']['tmp_name'])) {
+            msg($this->lang['import_error_upload'],-1);
+            return false;
+        }
+        // retrieve users from the file
+        $this->_import_failures = array();
+        $import_success_count = 0;
+        $import_fail_count = 0;
+        $line = 0;
+        $fd = fopen($_FILES['import']['tmp_name'],'r');
+        if ($fd) {
+            while($csv = fgets($fd)){
+                if (!utf8_check($csv)) {
+                    $csv = utf8_encode($csv);
+                }
+                $raw = $this->_getcsv($csv);
+                $error = '';                        // clean out any errors from the previous line
+                // data checks...
+                if (1 == ++$line) {
+                    if ($raw[0] == 'user_id' || $raw[0] == $this->lang['user_id']) continue;    // skip headers
+                }
+                if (count($raw) < 4) {                                        // need at least four fields
+                    $import_fail_count++;
+                    $error = sprintf($this->lang['import_error_fields'], count($raw));
+                    $this->_import_failures[$line] = array('error' => $error, 'user' => $raw, 'orig' => $csv);
+                    continue;
+                }
+                array_splice($raw,1,0,auth_pwgen());                          // splice in a generated password
+                $clean = $this->_cleanImportUser($raw, $error);
+                if ($clean && $this->_addImportUser($clean, $error)) {
+                    $sent = $this->_notifyUser($clean[0],$clean[1],false);
+                    if (!$sent){
+                        msg(sprintf($this->lang['import_notify_fail'],$clean[0],$clean[3]),-1);
+                    }
+                    $import_success_count++;
+                } else {
+                    $import_fail_count++;
+                    array_splice($raw, 1, 1);                                  // remove the spliced in password
+                    $this->_import_failures[$line] = array('error' => $error, 'user' => $raw, 'orig' => $csv);
+                }
+            }
+            msg(sprintf($this->lang['import_success_count'], ($import_success_count+$import_fail_count), $import_success_count),($import_success_count ? 1 : -1));
+            if ($import_fail_count) {
+                msg(sprintf($this->lang['import_failure_count'], $import_fail_count),-1);
+            }
+        } else {
+            msg($this->lang['import_error_readfail'],-1);
+        }
+
+        // save import failures into the session
+        if (!headers_sent()) {
+            session_start();
+            $_SESSION['import_failures'] = $this->_import_failures;
+            session_write_close();
+        }
+        return true;
+    }
+
+    /**
+     * Returns cleaned user data
+     *
+     * @param array $candidate raw values of line from input file
+     * @param $error
+     * @return array|bool cleaned data or false
+     */
+    protected function _cleanImportUser($candidate, & $error){
+        global $INPUT;
+
+        // kludgy ....
+        $INPUT->set('userid', $candidate[0]);
+        $INPUT->set('userpass', $candidate[1]);
+        $INPUT->set('username', $candidate[2]);
+        $INPUT->set('usermail', $candidate[3]);
+        $INPUT->set('usergroups', $candidate[4]);
+
+        $cleaned = $this->_retrieveUser();
+        list($user,$pass,$name,$mail,$grps) = $cleaned;
+        if (empty($user)) {
+            $error = $this->lang['import_error_baduserid'];
+            return false;
+        }
+
+        // no need to check password, handled elsewhere
+
+        if (!($this->_auth->canDo('modName') xor empty($name))){
+            $error = $this->lang['import_error_badname'];
+            return false;
+        }
+
+        if ($this->_auth->canDo('modMail')) {
+            if (empty($mail) || !mail_isvalid($mail)) {
+                $error = $this->lang['import_error_badmail'];
+                return false;
+            }
+        } else {
+            if (!empty($mail)) {
+                $error = $this->lang['import_error_badmail'];
+                return false;
+            }
+        }
+
+        return $cleaned;
+    }
+
+    /**
+     * Adds imported user to auth backend
+     *
+     * Required a check of canDo('addUser') before
+     *
+     * @param array  $user   data of user
+     * @param string &$error reference catched error message
+     * @return bool whether successful
+     */
+    protected function _addImportUser($user, & $error){
+        if (!$this->_auth->triggerUserMod('create', $user)) {
+            $error = $this->lang['import_error_create'];
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Downloads failures as csv file
+     */
+    protected function _downloadImportFailures(){
+
+        // ==============================================================================================
+        // GENERATE OUTPUT
+        // normal headers for downloading...
+        header('Content-type: text/csv;charset=utf-8');
+        header('Content-Disposition: attachment; filename="importfails.csv"');
+#       // for debugging assistance, send as text plain to the browser
+#       header('Content-type: text/plain;charset=utf-8');
+
+        // output the csv
+        $fd = fopen('php://output','w');
+        foreach ($this->_import_failures as $fail) {
+            fputs($fd, $fail['orig']);
+        }
+        fclose($fd);
+        die;
+    }
+
+    /**
+     * wrapper for is_uploaded_file to facilitate overriding by test suite
+     */
+    protected function _isUploadedFile($file) {
+        return is_uploaded_file($file);
+    }
+
+    /**
+     * wrapper for str_getcsv() to simplify maintaining compatibility with php 5.2
+     *
+     * @deprecated    remove when dokuwiki php requirement increases to 5.3+
+     *                also associated unit test & mock access method
+     */
+    protected function _getcsv($csv) {
+        return function_exists('str_getcsv') ? str_getcsv($csv) : $this->str_getcsv($csv);
+    }
+
+    /**
+     * replacement str_getcsv() function for php < 5.3
+     * loosely based on www.php.net/str_getcsv#88311
+     *
+     * @deprecated    remove when dokuwiki php requirement increases to 5.3+
+     */
+    protected function str_getcsv($str) {
+        $fp = fopen("php://temp/maxmemory:1048576", 'r+');    // 1MiB
+        fputs($fp, $str);
+        rewind($fp);
+
+        $data = fgetcsv($fp);
+
+        fclose($fp);
+        return $data;
+    }
+}
diff --git a/sources/lib/plugins/usermanager/images/search.png b/sources/lib/plugins/usermanager/images/search.png
new file mode 100644
index 0000000..e9dabc1
Binary files /dev/null and b/sources/lib/plugins/usermanager/images/search.png differ
diff --git a/sources/lib/plugins/usermanager/lang/af/lang.php b/sources/lib/plugins/usermanager/lang/af/lang.php
new file mode 100644
index 0000000..9a6c566
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/af/lang.php
@@ -0,0 +1,14 @@
+
+ * @author Usama Akkad 
+ * @author uahello@gmail.com
+ */
+$lang['menu']                  = 'مدير المستخدمين';
+$lang['noauth']                = '(مصادقة المستخدمين غير متوفرة)';
+$lang['nosupport']             = '(إدارة المستخدمين غير متوفرة)';
+$lang['badauth']               = 'آلية مصادقة غير صالحة';
+$lang['user_id']               = 'اسم المستخدم';
+$lang['user_pass']             = 'كلمة السر';
+$lang['user_name']             = 'الاسم الحقيقي';
+$lang['user_mail']             = 'البريد الالكتروني';
+$lang['user_groups']           = 'المجموعات';
+$lang['field']                 = 'حقل';
+$lang['value']                 = 'القيمة';
+$lang['add']                   = 'إضافة';
+$lang['delete']                = 'حذف';
+$lang['delete_selected']       = 'حذف المختار';
+$lang['edit']                  = 'تحرير';
+$lang['edit_prompt']           = 'حرر هذا المستخدم';
+$lang['modify']                = 'حفظ التعديلات';
+$lang['search']                = 'بحث';
+$lang['search_prompt']         = 'ابدأ البحث';
+$lang['clear']                 = 'صفّر مرشح البحث';
+$lang['filter']                = 'المرشّح';
+$lang['summary']               = 'عرض المستخدمين %1$d-%2$d of %3$d وجد. %4$d مستخدم كلي.';
+$lang['nonefound']             = 'لم يوجد مستخدمين. %d مستخدم كليا.';
+$lang['delete_ok']             = '%d مستخدم حذفوا';
+$lang['delete_fail']           = '%d فشل حذفهم.';
+$lang['update_ok']             = 'حُدث المستخدم بنجاح';
+$lang['update_fail']           = 'فشل تحديث المستخدم';
+$lang['update_exists']         = 'لقد فشل تغيير اسم المستخدم , اسم المستخدم المحدد (%s) غير متاح . ( سيتم تطبيق أي تغييرات أخرى )';
+$lang['start']                 = 'ابدأ';
+$lang['prev']                  = 'السابق';
+$lang['next']                  = 'التالي';
+$lang['last']                  = 'الأخير';
+$lang['edit_usermissing']      = 'لم يعثر على المستخدم المحدد، يحتمل أن اسم المستخدم قد حذف أو غُير في مكان آخر.';
+$lang['user_notify']           = 'أشعر المستخدم';
+$lang['note_notify']           = 'بريد الاشعار يرسل فقط إن اعطي المستخدم كلمة سر جديدة.';
+$lang['note_group']            = 'المستخدمون الجدد سيضافون للمجموعة الافتراضية (%s)  إن لم تُحدد لهم مجموعة.';
+$lang['note_pass']             = 'ستولد كلمة المرور تلقائيا إن تُرك الحقل فارغا مع تمكين إشعار المستخدم.';
+$lang['add_ok']                = 'اضيف المستخدم بنجاح';
+$lang['add_fail']              = 'فشلت إضافة المستخدم';
+$lang['notify_ok']             = 'ارسلت رسالة الاشعار';
+$lang['notify_fail']           = 'تعذر ارسال بريد الاشعار';
diff --git a/sources/lib/plugins/usermanager/lang/ar/list.txt b/sources/lib/plugins/usermanager/lang/ar/list.txt
new file mode 100644
index 0000000..02e9a03
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ar/list.txt
@@ -0,0 +1 @@
+===== قائمة المستخدمين =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/bg/add.txt b/sources/lib/plugins/usermanager/lang/bg/add.txt
new file mode 100644
index 0000000..e067819
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/bg/add.txt
@@ -0,0 +1 @@
+===== Добавяне на потребител =====
diff --git a/sources/lib/plugins/usermanager/lang/bg/delete.txt b/sources/lib/plugins/usermanager/lang/bg/delete.txt
new file mode 100644
index 0000000..aa60fc3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/bg/delete.txt
@@ -0,0 +1 @@
+===== Изтриване на потребител =====
diff --git a/sources/lib/plugins/usermanager/lang/bg/edit.txt b/sources/lib/plugins/usermanager/lang/bg/edit.txt
new file mode 100644
index 0000000..652d036
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/bg/edit.txt
@@ -0,0 +1 @@
+===== Редактиране на потребител  =====
diff --git a/sources/lib/plugins/usermanager/lang/bg/intro.txt b/sources/lib/plugins/usermanager/lang/bg/intro.txt
new file mode 100644
index 0000000..0a9afd5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/bg/intro.txt
@@ -0,0 +1 @@
+====== Управление на потребителите ======
diff --git a/sources/lib/plugins/usermanager/lang/bg/lang.php b/sources/lib/plugins/usermanager/lang/bg/lang.php
new file mode 100644
index 0000000..9ed27f4
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/bg/lang.php
@@ -0,0 +1,49 @@
+
+ * @author Viktor Usunov 
+ * @author Kiril 
+ */
+$lang['menu']                  = 'Диспечер на потребителите';
+$lang['noauth']                = '(удостоверяването на потребители не е налично)';
+$lang['nosupport']             = '(управлението на потребители не се поддържа)';
+$lang['badauth']               = 'невалиден механизъм за удостоверяване';
+$lang['user_id']               = 'Потребител';
+$lang['user_pass']             = 'Парола';
+$lang['user_name']             = 'Истинско име';
+$lang['user_mail']             = 'Електронна поща';
+$lang['user_groups']           = 'Групи';
+$lang['field']                 = 'Поле';
+$lang['value']                 = 'Стойност';
+$lang['add']                   = 'Добави';
+$lang['delete']                = 'Изтрий';
+$lang['delete_selected']       = 'Изтрий избраните';
+$lang['edit']                  = 'Редактирай';
+$lang['edit_prompt']           = 'Редактиране на потребителя';
+$lang['modify']                = 'Запиши промените';
+$lang['search']                = 'Търсене';
+$lang['search_prompt']         = 'Търси';
+$lang['clear']                 = 'Обновяване на търсенето';
+$lang['filter']                = 'Филтър';
+$lang['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 --git a/sources/lib/plugins/usermanager/lang/bg/list.txt b/sources/lib/plugins/usermanager/lang/bg/list.txt
new file mode 100644
index 0000000..106856c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/bg/list.txt
@@ -0,0 +1 @@
+===== Списък на потребителите  =====
diff --git a/sources/lib/plugins/usermanager/lang/ca-valencia/add.txt b/sources/lib/plugins/usermanager/lang/ca-valencia/add.txt
new file mode 100644
index 0000000..df5ba92
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca-valencia/add.txt
@@ -0,0 +1 @@
+===== Afegir usuari =====
diff --git a/sources/lib/plugins/usermanager/lang/ca-valencia/delete.txt b/sources/lib/plugins/usermanager/lang/ca-valencia/delete.txt
new file mode 100644
index 0000000..f386b58
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca-valencia/delete.txt
@@ -0,0 +1 @@
+===== Borrar usuari =====
diff --git a/sources/lib/plugins/usermanager/lang/ca-valencia/edit.txt b/sources/lib/plugins/usermanager/lang/ca-valencia/edit.txt
new file mode 100644
index 0000000..6b78c12
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca-valencia/edit.txt
@@ -0,0 +1 @@
+===== Editar usuari =====
diff --git a/sources/lib/plugins/usermanager/lang/ca-valencia/intro.txt b/sources/lib/plugins/usermanager/lang/ca-valencia/intro.txt
new file mode 100644
index 0000000..540a070
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca-valencia/intro.txt
@@ -0,0 +1 @@
+====== Gestor d'usuaris ======
diff --git a/sources/lib/plugins/usermanager/lang/ca-valencia/lang.php b/sources/lib/plugins/usermanager/lang/ca-valencia/lang.php
new file mode 100644
index 0000000..c39c2f9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca-valencia/lang.php
@@ -0,0 +1,49 @@
+
+ * @author Bernat Arlandis 
+ * @author Bernat Arlandis 
+ */
+$lang['menu']                  = 'Gestor d\'usuaris';
+$lang['noauth']                = '(autenticació d\'usuaris no disponible)';
+$lang['nosupport']             = '(gestió d\'usuaris no admesa)';
+$lang['badauth']               = 'mecanisme d\'autenticació no vàlit';
+$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']                   = '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 (%s), 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';
+$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 correus de notificació només s\'envien si a l\'usuari se li assigna una contrasenya nova.';
+$lang['note_group']            = 'Els usuaris nous s\'afegiran al grup predeterminat (%s) si no se n\'especifica atre.';
+$lang['note_pass']             = 'Si es deixa el camp buit i la notificació a l\'usuari està desactivada s\'autogenerarà la contrasenya.';
+$lang['add_ok']                = 'Usuari 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 --git a/sources/lib/plugins/usermanager/lang/ca-valencia/list.txt b/sources/lib/plugins/usermanager/lang/ca-valencia/list.txt
new file mode 100644
index 0000000..15af2d5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca-valencia/list.txt
@@ -0,0 +1 @@
+===== Llista d'usuaris =====
diff --git a/sources/lib/plugins/usermanager/lang/ca/add.txt b/sources/lib/plugins/usermanager/lang/ca/add.txt
new file mode 100644
index 0000000..07c5994
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca/add.txt
@@ -0,0 +1 @@
+===== Nou usuari =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ca/delete.txt b/sources/lib/plugins/usermanager/lang/ca/delete.txt
new file mode 100644
index 0000000..90878e5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca/delete.txt
@@ -0,0 +1 @@
+===== Supressió d'usuari =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ca/edit.txt b/sources/lib/plugins/usermanager/lang/ca/edit.txt
new file mode 100644
index 0000000..f7dc8cb
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca/edit.txt
@@ -0,0 +1 @@
+===== Edició d'usuari =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ca/intro.txt b/sources/lib/plugins/usermanager/lang/ca/intro.txt
new file mode 100644
index 0000000..864aa10
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca/intro.txt
@@ -0,0 +1 @@
+======= Gestió d'usuaris ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ca/lang.php b/sources/lib/plugins/usermanager/lang/ca/lang.php
new file mode 100644
index 0000000..6debd73
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca/lang.php
@@ -0,0 +1,51 @@
+
+ * @author carles.bellver@gmail.com
+ * @author carles.bellver@cent.uji.es
+ * @author Carles Bellver 
+ * @author daniel@6temes.cat
+ */
+$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']                   = 'Afegeix';
+$lang['delete']                = 'Suprimeix';
+$lang['delete_selected']       = 'Suprimeix els seleccionats';
+$lang['edit']                  = 'Edita';
+$lang['edit_prompt']           = 'Edita aquest usuari';
+$lang['modify']                = 'Desa 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 aquest 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 --git a/sources/lib/plugins/usermanager/lang/ca/list.txt b/sources/lib/plugins/usermanager/lang/ca/list.txt
new file mode 100644
index 0000000..22e1587
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ca/list.txt
@@ -0,0 +1 @@
+===== Llista d'usuaris =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/cs/add.txt b/sources/lib/plugins/usermanager/lang/cs/add.txt
new file mode 100644
index 0000000..39b14d5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/cs/add.txt
@@ -0,0 +1 @@
+===== Přidat uživatele =====
diff --git a/sources/lib/plugins/usermanager/lang/cs/delete.txt b/sources/lib/plugins/usermanager/lang/cs/delete.txt
new file mode 100644
index 0000000..a8790d8
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/cs/delete.txt
@@ -0,0 +1 @@
+===== Smazat uživatele =====
diff --git a/sources/lib/plugins/usermanager/lang/cs/edit.txt b/sources/lib/plugins/usermanager/lang/cs/edit.txt
new file mode 100644
index 0000000..d8ba386
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/cs/edit.txt
@@ -0,0 +1 @@
+===== Upravit uživatele =====
diff --git a/sources/lib/plugins/usermanager/lang/cs/import.txt b/sources/lib/plugins/usermanager/lang/cs/import.txt
new file mode 100644
index 0000000..c264ae1
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/cs/import.txt
@@ -0,0 +1,9 @@
+===== Hromadný import uživatelů =====
+
+Vyžaduje CSV soubor s uživateli obsahující alespoň 4 sloupce.
+Sloupce obsahují (v daném pořadí): user-id, celé jméno, emailovou adresu, seznam skupin.
+Položky CSV musí být odděleny čárkou (,) a řetězce umístěny v uvozovkách (""). Zpětné lomítko (\) lze použít pro escapování.
+Pro získání příkladu takového souboru využijte funkci "Exportovat uživatele" výše.
+Záznamy s duplicitním user-id budou ignorovány.
+
+Hesla budou vygenerována a zaslána e-mailem všem úspěšně importovaným uživatelům.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/cs/intro.txt b/sources/lib/plugins/usermanager/lang/cs/intro.txt
new file mode 100644
index 0000000..5b8f6e9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/cs/intro.txt
@@ -0,0 +1 @@
+====== Správa uživatelů ======
diff --git a/sources/lib/plugins/usermanager/lang/cs/lang.php b/sources/lib/plugins/usermanager/lang/cs/lang.php
new file mode 100644
index 0000000..bbb5606
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/cs/lang.php
@@ -0,0 +1,74 @@
+
+ * @author Zbynek Krivka 
+ * @author Bohumir Zamecnik 
+ * @author tomas@valenta.cz
+ * @author Marek Sacha 
+ * @author Lefty 
+ * @author Vojta Beran 
+ * @author zbynek.krivka@seznam.cz
+ * @author Bohumir Zamecnik 
+ * @author Jakub A. Těšínský (j@kub.cz)
+ * @author mkucera66@seznam.cz
+ * @author Zbyněk Křivka 
+ */
+$lang['menu']                  = 'Správa uživatelů';
+$lang['noauth']                = '(autentizace uživatelů není k dispozici)';
+$lang['nosupport']             = '(správa uživatelů není podporována)';
+$lang['badauth']               = 'chybná metoda autentizace';
+$lang['user_id']               = 'Uživatel';
+$lang['user_pass']             = 'Heslo';
+$lang['user_name']             = 'Celé jméno';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Skupiny';
+$lang['field']                 = 'Položka';
+$lang['value']                 = 'Hodnota';
+$lang['add']                   = 'Přidat';
+$lang['delete']                = 'Smazat';
+$lang['delete_selected']       = 'Smazat vybrané';
+$lang['edit']                  = 'Upravit';
+$lang['edit_prompt']           = 'Upravit uživatele';
+$lang['modify']                = 'Uložit změny';
+$lang['search']                = 'Hledání';
+$lang['search_prompt']         = 'Prohledat';
+$lang['clear']                 = 'Zrušit vyhledávací filtr';
+$lang['filter']                = 'Filtr';
+$lang['export_all']            = 'Exportovat všechny uživatele (CSV)';
+$lang['export_filtered']       = 'Exportovat filtrovaný seznam uživatelů (CSV)';
+$lang['import']                = 'Importovat nové uživatele';
+$lang['line']                  = 'Řádek č.';
+$lang['error']                 = 'Chybová zpráva';
+$lang['summary']               = 'Zobrazuji uživatele %1$d-%2$d z %3$d nalezených. Celkem %4$d uživatelů.';
+$lang['nonefound']             = 'Žadný uživatel nenalezen. Celkem %d uživatelů.';
+$lang['delete_ok']             = '%d uživatelů smazáno';
+$lang['delete_fail']           = '%d uživatelů nelze smazat.';
+$lang['update_ok']             = 'Uživatel upraven';
+$lang['update_fail']           = 'Úprava uživatele selhala';
+$lang['update_exists']         = 'Jméno nelze změnit, jelikož zadané uživatelské jméno (%s) již existuje (ostatní změny ale budou provedeny).';
+$lang['start']                 = 'první';
+$lang['prev']                  = 'předchozí';
+$lang['next']                  = 'další';
+$lang['last']                  = 'poslední';
+$lang['edit_usermissing']      = 'Vybraný uživatel nebyl nalezen, zadané uživatelského mohlo být smazáno nebo změněno.';
+$lang['user_notify']           = 'Upozornit uživatele';
+$lang['note_notify']           = 'Maily s upozorněním se budou posílat pouze, když uživatel dostává nové heslo.';
+$lang['note_group']            = 'Noví uživatelé budou přidáváni do této výchozí skupiny (%s), pokud pro ně není uvedena žádná skupina.';
+$lang['note_pass']             = 'Heslo bude automaticky vygenerováno, pokud je pole ponecháno prázdné a je zapnuto upozornění uživatele.';
+$lang['add_ok']                = 'Uživatel úspěšně vytvořen';
+$lang['add_fail']              = 'Vytvoření uživatele selhalo';
+$lang['notify_ok']             = 'Odeslán mail s upozorněním';
+$lang['notify_fail']           = 'Mail s upozorněním nebylo možno odeslat';
+$lang['import_success_count']  = 'Import uživatelů: nalezeno %d uživatelů, %d úspěšně importováno.';
+$lang['import_failure_count']  = 'Import uživatelů: %d selhalo. Seznam chybných je níže.';
+$lang['import_error_fields']   = 'Nedostatek položek, nalezena/y %d, požadovány 4.';
+$lang['import_error_baduserid'] = 'Chybí User-id';
+$lang['import_error_badname']  = 'Špatné jméno';
+$lang['import_error_badmail']  = 'Špatná emailová adresa';
+$lang['import_error_upload']   = 'Import selhal. CSV soubor nemohl být nahrán nebo je prázdný.';
+$lang['import_error_readfail'] = 'Import selhal. Nelze číst nahraný soubor.';
+$lang['import_error_create']   = 'Nelze vytvořit uživatele';
+$lang['import_notify_fail']    = 'Importovanému uživateli %s s emailem %s nemohlo být zasláno upozornění.';
diff --git a/sources/lib/plugins/usermanager/lang/cs/list.txt b/sources/lib/plugins/usermanager/lang/cs/list.txt
new file mode 100644
index 0000000..36b87fe
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/cs/list.txt
@@ -0,0 +1 @@
+===== Seznam uživatelů =====
diff --git a/sources/lib/plugins/usermanager/lang/da/add.txt b/sources/lib/plugins/usermanager/lang/da/add.txt
new file mode 100644
index 0000000..d97de42
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/da/add.txt
@@ -0,0 +1 @@
+===== Tilføj bruger =====
diff --git a/sources/lib/plugins/usermanager/lang/da/delete.txt b/sources/lib/plugins/usermanager/lang/da/delete.txt
new file mode 100644
index 0000000..dff0545
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/da/delete.txt
@@ -0,0 +1 @@
+===== Slet bruger =====
diff --git a/sources/lib/plugins/usermanager/lang/da/edit.txt b/sources/lib/plugins/usermanager/lang/da/edit.txt
new file mode 100644
index 0000000..05d63b7
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/da/edit.txt
@@ -0,0 +1 @@
+===== Rediger bruger =====
diff --git a/sources/lib/plugins/usermanager/lang/da/intro.txt b/sources/lib/plugins/usermanager/lang/da/intro.txt
new file mode 100644
index 0000000..3f597a2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/da/intro.txt
@@ -0,0 +1 @@
+====== Brugerstyring ======
diff --git a/sources/lib/plugins/usermanager/lang/da/lang.php b/sources/lib/plugins/usermanager/lang/da/lang.php
new file mode 100644
index 0000000..47d7efe
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/da/lang.php
@@ -0,0 +1,74 @@
+
+ * @author Kalle Sommer Nielsen 
+ * @author Esben Laursen 
+ * @author Harith 
+ * @author Daniel Ejsing-Duun 
+ * @author Erik Bjørn Pedersen 
+ * @author rasmus@kinnerup.com
+ * @author Michael Pedersen subben@gmail.com
+ * @author Mikael Lyngvig 
+ * @author soer9648 
+ */
+$lang['menu']                  = 'Brugerstyring';
+$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';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Grupper';
+$lang['field']                 = 'Felt';
+$lang['value']                 = 'Værdi';
+$lang['add']                   = 'Tilføj';
+$lang['delete']                = 'Slet';
+$lang['delete_selected']       = 'Slet valgte';
+$lang['edit']                  = 'Rediger';
+$lang['edit_prompt']           = 'Rediger denne bruger';
+$lang['modify']                = 'Gem ændringer';
+$lang['search']                = 'Søg';
+$lang['search_prompt']         = 'Udfør søgning';
+$lang['clear']                 = 'Nulstil søgefilter';
+$lang['filter']                = 'Filter';
+$lang['export_all']            = 'Eksportér Alle Brugere (CSV)';
+$lang['export_filtered']       = 'Eksportér Filtrerede Brugerliste (CSV)';
+$lang['import']                = 'Importér Nye Brugere';
+$lang['line']                  = 'Linje nr.';
+$lang['error']                 = 'Fejlmeddelelse';
+$lang['summary']               = 'Viser brugerne %1$d-%2$d ud af %3$d fundne. %4$d brugere totalt.';
+$lang['nonefound']             = 'Ingen brugere fundet. %d brugere totalt.';
+$lang['delete_ok']             = '%d brugere slettet';
+$lang['delete_fail']           = '%d kunne ikke slettes.';
+$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']                 = '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['user_notify']           = 'Meddel bruger';
+$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';
+$lang['import_userlistcsv']    = 'Brugerlistefil (CSV):';
+$lang['import_header']         = 'Nyeste Import - Fejl';
+$lang['import_success_count']  = 'Bruger-Import: %d brugere fundet, %d importeret med succes.';
+$lang['import_failure_count']  = 'Bruger-Import: %d fejlet. Fejl er listet nedenfor.';
+$lang['import_error_fields']   = 'Utilstrækkelige felter, fandt %d, påkrævet 4.';
+$lang['import_error_baduserid'] = 'Bruger-id mangler';
+$lang['import_error_badname']  = 'Ugyldigt navn';
+$lang['import_error_badmail']  = 'Ugyldig email-adresse';
+$lang['import_error_upload']   = 'Import Fejlet. CSV-filen kunne ikke uploades eller er tom.';
+$lang['import_error_readfail'] = 'Import Fejlet. Ikke muligt at læse uploadede fil.';
+$lang['import_error_create']   = 'Ikke muligt at oprette brugeren';
+$lang['import_notify_fail']    = 'Notifikationsmeddelelse kunne ikke sendes for importerede bruger %s, med emailen %s.';
diff --git a/sources/lib/plugins/usermanager/lang/da/list.txt b/sources/lib/plugins/usermanager/lang/da/list.txt
new file mode 100644
index 0000000..11d1710
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/da/list.txt
@@ -0,0 +1 @@
+===== Brugerliste =====
diff --git a/sources/lib/plugins/usermanager/lang/de-informal/add.txt b/sources/lib/plugins/usermanager/lang/de-informal/add.txt
new file mode 100644
index 0000000..1fc34c9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de-informal/add.txt
@@ -0,0 +1 @@
+===== Benutzer hinzufügen =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/de-informal/delete.txt b/sources/lib/plugins/usermanager/lang/de-informal/delete.txt
new file mode 100644
index 0000000..778396a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de-informal/delete.txt
@@ -0,0 +1 @@
+===== Benutzer gelöscht =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/de-informal/edit.txt b/sources/lib/plugins/usermanager/lang/de-informal/edit.txt
new file mode 100644
index 0000000..291b0f1
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de-informal/edit.txt
@@ -0,0 +1 @@
+===== Benutzer bearbeiten =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/de-informal/import.txt b/sources/lib/plugins/usermanager/lang/de-informal/import.txt
new file mode 100644
index 0000000..6fd6b8d
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de-informal/import.txt
@@ -0,0 +1,7 @@
+===== Massenimport von Benutzern =====
+
+Dieser Import benötigt eine CSV-Datei mit mindestens vier Spalten. Diese Spalten müssen die folgenden Daten (in dieser Reihenfolge) enthalten: Benutzername, Name, E-Mailadresse und Gruppenzugehörigkeit.
+Die CSV-Felder müssen durch ein Komma (,) getrennt sein. Die Zeichenfolgen müssen von Anführungszeichen ("") umgeben sein. Ein Backslash (\) kann zum Maskieren benutzt werden.
+Für eine Beispieldatei kannst Du die "Benutzer exportieren"-Funktion oben benutzen. Doppelte Benutzername werden ignoriert.
+
+Ein Passwort wird generiert und den einzelnen, erfolgreich importierten Benutzern zugemailt.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/de-informal/intro.txt b/sources/lib/plugins/usermanager/lang/de-informal/intro.txt
new file mode 100644
index 0000000..a5927a8
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de-informal/intro.txt
@@ -0,0 +1 @@
+===== Benutzerverwaltung =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/de-informal/lang.php b/sources/lib/plugins/usermanager/lang/de-informal/lang.php
new file mode 100644
index 0000000..bea4159
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de-informal/lang.php
@@ -0,0 +1,71 @@
+
+ * @author Juergen Schwarzer 
+ * @author Marcel Metz 
+ * @author Matthias Schulte 
+ * @author Christian Wichmann 
+ * @author Pierre Corell 
+ * @author Frank Loizzi 
+ * @author Volker Bödker 
+ * @author Dennis Plöger 
+ */
+$lang['menu']                  = 'Benutzerverwaltung';
+$lang['noauth']                = '(Benutzeranmeldung ist nicht verfügbar)';
+$lang['nosupport']             = '(Benutzerverwaltung wird nicht unterstützt)';
+$lang['badauth']               = 'Ungültige Authentifizierung';
+$lang['user_id']               = 'Benutzer';
+$lang['user_pass']             = 'Passwort';
+$lang['user_name']             = 'Echter Name';
+$lang['user_mail']             = 'E-Mail';
+$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']                  = 'Bearbeiten';
+$lang['edit_prompt']           = 'Bearbeite diesen Benutzer';
+$lang['modify']                = 'Änderungen speichern';
+$lang['search']                = 'Suchen';
+$lang['search_prompt']         = 'Suche ausführen';
+$lang['clear']                 = 'Suchfilter zurücksetzen';
+$lang['filter']                = 'Filter';
+$lang['export_all']            = 'Alle Benutzer exportieren (CSV)';
+$lang['export_filtered']       = 'Gefilterte Benutzerliste exportieren (CSV)';
+$lang['import']                = 'Neue Benutzer importieren';
+$lang['line']                  = 'Zeile Nr.';
+$lang['error']                 = 'Fehlermeldung';
+$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']           = 'Benachrichtigungsmails 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']             = 'Benachrichtigungsmail wurde versendet';
+$lang['notify_fail']           = 'Benachrichtigungsemail konnte nicht gesendet werden';
+$lang['import_success_count']  = 'Benutzerimport: %d Benutzer gefunden, %d erfolgreich importiert.';
+$lang['import_failure_count']  = 'Benutzerimport: %d Benutzerimporte fehlgeschalten. Alle Fehler werden unten angezeigt.';
+$lang['import_error_fields']   = 'Falsche Anzahl Felder. Gefunden: %d. Benötigt: 4.';
+$lang['import_error_baduserid'] = 'Benutzername fehlt';
+$lang['import_error_badname']  = 'Ungültiger Name';
+$lang['import_error_badmail']  = 'Ungültige E-Mailadresse';
+$lang['import_error_upload']   = 'Import fehlgeschlagen. Die CSV-Datei konnte nicht hochgeladen werden oder ist leer.';
+$lang['import_error_readfail'] = 'Import fehlgeschlagen. Konnte die hochgeladene Datei nicht lesen.';
+$lang['import_error_create']   = 'Konnte den Benutzer nicht erzeugen';
+$lang['import_notify_fail']    = 'Benachrichtigung konnte an Benutzer %s (%s) nicht geschickt werden.';
diff --git a/sources/lib/plugins/usermanager/lang/de-informal/list.txt b/sources/lib/plugins/usermanager/lang/de-informal/list.txt
new file mode 100644
index 0000000..0a62012
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de-informal/list.txt
@@ -0,0 +1 @@
+===== Benutzerliste =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/de/add.txt b/sources/lib/plugins/usermanager/lang/de/add.txt
new file mode 100644
index 0000000..925fa50
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de/add.txt
@@ -0,0 +1 @@
+===== Benutzer hinzufügen =====
diff --git a/sources/lib/plugins/usermanager/lang/de/delete.txt b/sources/lib/plugins/usermanager/lang/de/delete.txt
new file mode 100644
index 0000000..4f3bbbd
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de/delete.txt
@@ -0,0 +1 @@
+===== Benutzer löschen =====
diff --git a/sources/lib/plugins/usermanager/lang/de/edit.txt b/sources/lib/plugins/usermanager/lang/de/edit.txt
new file mode 100644
index 0000000..9419200
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de/edit.txt
@@ -0,0 +1 @@
+===== Benutzer ändern =====
diff --git a/sources/lib/plugins/usermanager/lang/de/import.txt b/sources/lib/plugins/usermanager/lang/de/import.txt
new file mode 100644
index 0000000..bf0d292
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de/import.txt
@@ -0,0 +1,8 @@
+===== Benutzer-Massenimport =====
+
+Um mehrere Benutzer gleichzeitig zu importieren, wird eine CSV-Datei mit den folgenden vier Spalten benötigt (In dieser Reihenfolge): Benutzer-ID, Voller Name, E-Mail-Adresse und Gruppen.
+Die CSV-Felder sind Kommata-separiert (,) und mit Anführungszeichen eingefasst ("). Mit Backslashes (\) können Sonderzeichen maskiert werden.
+Ein Beispiel für eine gültige Datei kann mit der Benutzer-Export-Funktion oben generiert werden.
+Doppelte Benutzer-IDs werden ignoriert.
+
+Für jeden importierten Benutzer wird ein Passwort generiert und dem Benutzer per Mail zugestellt.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/de/intro.txt b/sources/lib/plugins/usermanager/lang/de/intro.txt
new file mode 100644
index 0000000..a5837b8
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de/intro.txt
@@ -0,0 +1 @@
+====== Benutzer-Manager ======
diff --git a/sources/lib/plugins/usermanager/lang/de/lang.php b/sources/lib/plugins/usermanager/lang/de/lang.php
new file mode 100644
index 0000000..4b297b0
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de/lang.php
@@ -0,0 +1,84 @@
+
+ * @author Andreas Gohr 
+ * @author Michael Klier 
+ * @author Leo Moll 
+ * @author Florian Anderiasch 
+ * @author Robin Kluth 
+ * @author Arne Pelka 
+ * @author Dirk Einecke 
+ * @author Blitzi94@gmx.de
+ * @author Robert Bogenschneider 
+ * @author Niels Lange 
+ * @author Christian Wichmann 
+ * @author Paul Lachewsky 
+ * @author Pierre Corell 
+ * @author Matthias Schulte 
+ * @author Sven 
+ * @author christian studer 
+ * @author Ben Fey 
+ * @author Jonas Gröger 
+ */
+$lang['menu']                  = 'Benutzerverwaltung';
+$lang['noauth']                = '(Authentifizierungssystem nicht verfügbar)';
+$lang['nosupport']             = '(Benutzerverwaltung nicht unterstützt)';
+$lang['badauth']               = 'Ungültige Methode zur Authentifizierung';
+$lang['user_id']               = 'Benutzername';
+$lang['user_pass']             = 'Passwort';
+$lang['user_name']             = 'Voller Name';
+$lang['user_mail']             = 'E-Mail';
+$lang['user_groups']           = 'Gruppen';
+$lang['field']                 = 'Feld';
+$lang['value']                 = 'Wert';
+$lang['add']                   = 'Hinzufügen';
+$lang['delete']                = 'Löschen';
+$lang['delete_selected']       = 'Ausgewählte löschen';
+$lang['edit']                  = 'Ändern';
+$lang['edit_prompt']           = 'Benutzerdaten ändern';
+$lang['modify']                = 'Speichern';
+$lang['search']                = 'Suchen';
+$lang['search_prompt']         = 'Benutzerdaten filtern';
+$lang['clear']                 = 'Filter zurücksetzen';
+$lang['filter']                = 'Filter';
+$lang['export_all']            = 'Alle User exportieren (CSV)';
+$lang['export_filtered']       = 'Exportiere gefilterte Userliste (CSV)';
+$lang['import']                = 'Importiere neue User';
+$lang['line']                  = 'Zeilennr.';
+$lang['error']                 = 'Fehlermeldung';
+$lang['summary']               = 'Zeige Benutzer %1$d-%2$d von %3$d gefundenen. %4$d Benutzer insgesamt.';
+$lang['nonefound']             = 'Keine Benutzer gefunden. %d Benutzer insgesamt.';
+$lang['delete_ok']             = '%d Benutzer gelöscht';
+$lang['delete_fail']           = '%d konnten nicht gelöscht werden.';
+$lang['update_ok']             = 'Benutzerdaten erfolgreich geändert.';
+$lang['update_fail']           = 'Änderung der Benutzerdaten fehlgeschlagen.';
+$lang['update_exists']         = 'Benutzername konnte nicht geändert werden, weil der angegebene Benutzer (%s) bereits existiert (alle anderen Änderungen wurden durchgeführt).';
+$lang['start']                 = 'Anfang';
+$lang['prev']                  = 'Vorherige';
+$lang['next']                  = 'Nächste';
+$lang['last']                  = 'Ende';
+$lang['edit_usermissing']      = 'Der ausgewählte Benutzer wurde nicht gefunden. Möglicherweise wurde er gelöscht oder der Benutzer wurde anderswo geändert.';
+$lang['user_notify']           = 'Nutzer benachrichtigen';
+$lang['note_notify']           = 'Benachrichtigungs-E-Mails werden nur versandt, wenn ein neues Passwort vergeben wurde.';
+$lang['note_group']            = 'Neue Benutzer werden der Standard-Gruppe (%s) hinzugefügt, wenn keine Gruppe angegeben wurde.';
+$lang['note_pass']             = 'Das Passwort wird automatisch generiert, wenn das entsprechende Feld leergelassen wird und die Benachrichtigung des Benutzers aktiviert ist.';
+$lang['add_ok']                = 'Nutzer erfolgreich angelegt';
+$lang['add_fail']              = 'Nutzer konnte nicht angelegt werden';
+$lang['notify_ok']             = 'Benachrichtigungsmail wurde versandt';
+$lang['notify_fail']           = 'Benachrichtigungsmail konnte nicht versandt werden';
+$lang['import_userlistcsv']    = 'Benutzerliste (CSV-Datei):';
+$lang['import_header']         = 'Letzte Fehler bei Import';
+$lang['import_success_count']  = 'User-Import: %d User gefunden, %d erfolgreich importiert.';
+$lang['import_failure_count']  = 'User-Import: %d fehlgeschlagen. Fehlgeschlagene User sind nachfolgend aufgelistet.';
+$lang['import_error_fields']   = 'Unzureichende Anzahl an Feldern: %d gefunden, benötigt sind 4.';
+$lang['import_error_baduserid'] = 'User-Id fehlt';
+$lang['import_error_badname']  = 'Ungültiger Name';
+$lang['import_error_badmail']  = 'Ungültige E-Mail';
+$lang['import_error_upload']   = 'Import fehlgeschlagen. Die CSV-Datei konnte nicht hochgeladen werden, oder ist leer.';
+$lang['import_error_readfail'] = 'Import fehlgeschlagen. Die hochgeladene Datei konnte nicht gelesen werden.';
+$lang['import_error_create']   = 'User konnte nicht angelegt werden';
+$lang['import_notify_fail']    = 'Notifikation konnte nicht an den importierten Benutzer %s (E-Mail: %s) gesendet werden.';
+$lang['import_downloadfailures'] = 'Fehler als CSV-Datei zur Korrektur herunterladen';
diff --git a/sources/lib/plugins/usermanager/lang/de/list.txt b/sources/lib/plugins/usermanager/lang/de/list.txt
new file mode 100644
index 0000000..8d6d5fb
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/de/list.txt
@@ -0,0 +1 @@
+===== Benutzerliste =====
diff --git a/sources/lib/plugins/usermanager/lang/el/add.txt b/sources/lib/plugins/usermanager/lang/el/add.txt
new file mode 100644
index 0000000..0616f8c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/el/add.txt
@@ -0,0 +1 @@
+===== Προσθήκη Χρήστη =====
diff --git a/sources/lib/plugins/usermanager/lang/el/delete.txt b/sources/lib/plugins/usermanager/lang/el/delete.txt
new file mode 100644
index 0000000..baf9bc0
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/el/delete.txt
@@ -0,0 +1 @@
+===== Διαγραφή Χρήστη =====
diff --git a/sources/lib/plugins/usermanager/lang/el/edit.txt b/sources/lib/plugins/usermanager/lang/el/edit.txt
new file mode 100644
index 0000000..dec59ef
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/el/edit.txt
@@ -0,0 +1 @@
+===== Τροποποίηση Χρήστη =====
diff --git a/sources/lib/plugins/usermanager/lang/el/intro.txt b/sources/lib/plugins/usermanager/lang/el/intro.txt
new file mode 100644
index 0000000..874c13b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/el/intro.txt
@@ -0,0 +1 @@
+====== Διαχείριση Χρηστών ======
diff --git a/sources/lib/plugins/usermanager/lang/el/lang.php b/sources/lib/plugins/usermanager/lang/el/lang.php
new file mode 100644
index 0000000..e14aa61
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/el/lang.php
@@ -0,0 +1,54 @@
+
+ * @author Thanos Massias 
+ * @author Αθανάσιος Νταής 
+ * @author Konstantinos Koryllos 
+ * @author George Petsagourakis 
+ * @author Petros Vidalis 
+ * @author Vasileios Karavasilis vasileioskaravasilis@gmail.com
+ */
+$lang['menu']                  = 'Διαχείριση Χρηστών';
+$lang['noauth']                = '(η είσοδος χρηστών δεν είναι δυνατή)';
+$lang['nosupport']             = '(δεν υποστηρίζεται η διαχείριση χρηστών)';
+$lang['badauth']               = 'μη επιτρεπτός μηχανισμός πιστοποίησης';
+$lang['user_id']               = 'Χρήστης';
+$lang['user_pass']             = 'Κωδικός';
+$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['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-mails στέλνονται μόνο όταν δίνεται νέος κωδικός στον χρήστη.';
+$lang['note_group']            = 'Οι νέοι χρήστες θα ανήκουν στην ομάδα (%s) αν δεν οριστεί άλλη ομάδα.';
+$lang['note_pass']             = 'Ο κωδικός θα δημιουργηθεί αυτόματα εάν το πεδίο μείνει κενό και έχει επιλεγεί η αποστολή ειδοποίησης χρήστη.';
+$lang['add_ok']                = 'Επιτυχημένη εγγραφή  χρήστη';
+$lang['add_fail']              = 'Η εγγραφή του χρήστη απέτυχε';
+$lang['notify_ok']             = 'Εστάλη ενημερωτικό e-mail';
+$lang['notify_fail']           = 'Δεν ήταν δυνατή η αποστολή του ενημερωτικού e-mail';
diff --git a/sources/lib/plugins/usermanager/lang/el/list.txt b/sources/lib/plugins/usermanager/lang/el/list.txt
new file mode 100644
index 0000000..adb5c21
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/el/list.txt
@@ -0,0 +1 @@
+===== Κατάλογος Χρηστών =====
diff --git a/sources/lib/plugins/usermanager/lang/en/add.txt b/sources/lib/plugins/usermanager/lang/en/add.txt
new file mode 100644
index 0000000..9afecb5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/en/add.txt
@@ -0,0 +1 @@
+===== Add user =====
diff --git a/sources/lib/plugins/usermanager/lang/en/delete.txt b/sources/lib/plugins/usermanager/lang/en/delete.txt
new file mode 100644
index 0000000..c3ca90d
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/en/delete.txt
@@ -0,0 +1 @@
+===== Delete user =====
diff --git a/sources/lib/plugins/usermanager/lang/en/edit.txt b/sources/lib/plugins/usermanager/lang/en/edit.txt
new file mode 100644
index 0000000..4d02dfd
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/en/edit.txt
@@ -0,0 +1 @@
+===== Edit user =====
diff --git a/sources/lib/plugins/usermanager/lang/en/import.txt b/sources/lib/plugins/usermanager/lang/en/import.txt
new file mode 100644
index 0000000..2087083
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/en/import.txt
@@ -0,0 +1,9 @@
+===== Bulk User Import =====
+
+Requires a CSV file of users with at least four columns.
+The columns must contain, in order: user-id, full name, email address and groups.
+The CSV fields should be separated by commas (,) and strings delimited by quotation marks ("").  Backslash (\) can be used for escaping.
+For an example of a suitable file, try the "Export Users" function above.  
+Duplicate user-ids will be ignored.
+
+A password will be generated and emailed to each successfully imported user.
diff --git a/sources/lib/plugins/usermanager/lang/en/intro.txt b/sources/lib/plugins/usermanager/lang/en/intro.txt
new file mode 100644
index 0000000..73bf556
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/en/intro.txt
@@ -0,0 +1 @@
+====== User Manager ======
diff --git a/sources/lib/plugins/usermanager/lang/en/lang.php b/sources/lib/plugins/usermanager/lang/en/lang.php
new file mode 100644
index 0000000..f87c77a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/en/lang.php
@@ -0,0 +1,79 @@
+
+ */
+
+$lang['menu'] = 'User Manager';
+
+// custom language strings for the plugin
+$lang['noauth']      = '(user authentication not available)';
+$lang['nosupport']   = '(user management not supported)';
+
+$lang['badauth']     = 'invalid auth mechanism';     // should never be displayed!
+
+$lang['user_id']     = 'User';
+$lang['user_pass']   = 'Password';
+$lang['user_name']   = 'Real Name';
+$lang['user_mail']   = 'Email';
+$lang['user_groups'] = 'Groups';
+
+$lang['field']       = 'Field';
+$lang['value']       = 'Value';
+$lang['add']         = 'Add';
+$lang['delete']      = 'Delete';
+$lang['delete_selected'] = 'Delete Selected';
+$lang['edit']        = 'Edit';
+$lang['edit_prompt'] = 'Edit this user';
+$lang['modify']      = 'Save Changes';
+$lang['search']      = 'Search';
+$lang['search_prompt'] = 'Perform search';
+$lang['clear']       = 'Reset Search Filter';
+$lang['filter']      = 'Filter';
+$lang['export_all']  = 'Export All Users (CSV)';
+$lang['export_filtered'] = 'Export Filtered User list (CSV)';
+$lang['import']      = 'Import New Users';
+$lang['line']        = 'Line no.';
+$lang['error']       = 'Error message';
+
+$lang['summary']     = 'Displaying users %1$d-%2$d of %3$d found. %4$d users total.';
+$lang['nonefound']   = 'No users found. %d users total.';
+$lang['delete_ok']   = '%d users deleted';
+$lang['delete_fail'] = '%d failed deleting.';
+$lang['update_ok']   = 'User updated successfully';
+$lang['update_fail'] = 'User update failed';
+$lang['update_exists'] = 'User name change failed, the specified user name (%s) already exists (any other changes will be applied).';
+
+$lang['start']  = 'start';
+$lang['prev']   = 'previous';
+$lang['next']   = 'next';
+$lang['last']   = 'last';
+
+// added after 2006-03-09 release
+$lang['edit_usermissing'] = 'Selected user not found, the specified user name may have been deleted or changed elsewhere.';
+$lang['user_notify'] = 'Notify user';
+$lang['note_notify'] = 'Notification emails are only sent if the user is given a new password.';
+$lang['note_group'] = 'New users will be added to the default group (%s) if no group is specified.';
+$lang['note_pass'] = 'The password will be autogenerated if the field is left empty and notification of the user is enabled.';
+$lang['add_ok'] = 'User added successfully';
+$lang['add_fail'] = 'User addition failed';
+$lang['notify_ok'] = 'Notification email sent';
+$lang['notify_fail'] = 'Notification email could not be sent';
+
+// import & errors
+$lang['import_userlistcsv'] = 'User list file (CSV):  ';
+$lang['import_header'] = 'Most Recent Import - Failures';
+$lang['import_success_count'] = 'User Import: %d users found, %d imported successfully.';
+$lang['import_failure_count'] = 'User Import: %d failed. Failures are listed below.';
+$lang['import_error_fields']  = "Insufficient fields, found %d, require 4.";
+$lang['import_error_baduserid'] = "User-id missing";
+$lang['import_error_badname'] = 'Bad name';
+$lang['import_error_badmail'] = 'Bad email address';
+$lang['import_error_upload']  = 'Import Failed. The csv file could not be uploaded or is empty.';
+$lang['import_error_readfail'] = 'Import Failed. Unable to read uploaded file.';
+$lang['import_error_create']  = 'Unable to create the user';
+$lang['import_notify_fail']   = 'Notification message could not be sent for imported user, %s with email %s.';
+$lang['import_downloadfailures'] = 'Download Failures as CSV for correction';
+
+
diff --git a/sources/lib/plugins/usermanager/lang/en/list.txt b/sources/lib/plugins/usermanager/lang/en/list.txt
new file mode 100644
index 0000000..54c45ca
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/en/list.txt
@@ -0,0 +1 @@
+===== User List =====
diff --git a/sources/lib/plugins/usermanager/lang/eo/add.txt b/sources/lib/plugins/usermanager/lang/eo/add.txt
new file mode 100644
index 0000000..8775ff8
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eo/add.txt
@@ -0,0 +1 @@
+===== Aldoni uzanton =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/eo/delete.txt b/sources/lib/plugins/usermanager/lang/eo/delete.txt
new file mode 100644
index 0000000..0d94f81
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eo/delete.txt
@@ -0,0 +1 @@
+===== Forigi uzanton =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/eo/edit.txt b/sources/lib/plugins/usermanager/lang/eo/edit.txt
new file mode 100644
index 0000000..2ced16e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eo/edit.txt
@@ -0,0 +1 @@
+===== Modifi uzanton =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/eo/import.txt b/sources/lib/plugins/usermanager/lang/eo/import.txt
new file mode 100644
index 0000000..61c2c74
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eo/import.txt
@@ -0,0 +1,9 @@
+===== Amasa importo de uzantoj =====
+
+Tio ĉi postulas CSV-dosiero de uzantoj kun minimume kvar kolumnoj.
+La kolumnoj devas enhavi, laŭorde: uzant-id, kompleta nomo, retadreso kaj grupoj.
+La CSV-kampoj devos esti apartitaj per komoj (,) kaj ĉenoj devas esti limigitaj per citiloj (""). Retroklino (\) povas esti uzata por eskapo.
+Por ekzemplo de taŭga dosiero, provu la funkcion "Eksporti uzantojn" supre.
+Duobligitaj uzant-id estos preteratentataj.
+
+Pasvorto estos generata kaj retsendata al ĉiu sukecse importita uzanto.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/eo/intro.txt b/sources/lib/plugins/usermanager/lang/eo/intro.txt
new file mode 100644
index 0000000..5b5a940
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eo/intro.txt
@@ -0,0 +1 @@
+====== Administrado de uzantoj ======
diff --git a/sources/lib/plugins/usermanager/lang/eo/lang.php b/sources/lib/plugins/usermanager/lang/eo/lang.php
new file mode 100644
index 0000000..ff7818e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eo/lang.php
@@ -0,0 +1,74 @@
+
+ * @author Felipe Castro 
+ * @author Felipe Castro 
+ * @author Felipo Kastro 
+ * @author Robert Bogenschneider 
+ * @author Erik Pedersen 
+ * @author Erik Pedersen 
+ * @author Robert Bogenschneider 
+ * @author Felipe Castro 
+ */
+$lang['menu']                  = 'Administrado de uzantoj';
+$lang['noauth']                = '(identiĝo de uzantoj ne disponeblas)';
+$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_mail']             = 'Retpoŝtadreso';
+$lang['user_groups']           = 'Grupoj';
+$lang['field']                 = 'Kampo';
+$lang['value']                 = 'Valoro';
+$lang['add']                   = 'Aldoni';
+$lang['delete']                = 'Forigi';
+$lang['delete_selected']       = 'Forigi elektitan';
+$lang['edit']                  = 'Modifi';
+$lang['edit_prompt']           = 'Modifi tiun ĉi uzanton';
+$lang['modify']                = 'Registri modifojn';
+$lang['search']                = 'Serĉi';
+$lang['search_prompt']         = 'Fari serĉon';
+$lang['clear']                 = 'Refari serĉan filtron';
+$lang['filter']                = 'Filtro';
+$lang['export_all']            = 'Eksporti ĉiujn uzantojn (CSV)';
+$lang['export_filtered']       = 'Eksporti filtritan uzant-liston (CSV)';
+$lang['import']                = 'Importi novajn uzantojn';
+$lang['line']                  = 'Lini-num.';
+$lang['error']                 = 'Erar-mesaĝo';
+$lang['summary']               = 'Montriĝas uzantoj %1$d-%2$d el %3$d trovitaj. %4$d uzantoj entute.';
+$lang['nonefound']             = 'Neniuj uzantoj troviĝas. %d uzantoj entute.';
+$lang['delete_ok']             = '%d uzantoj forigiĝis';
+$lang['delete_fail']           = '%d malsukcesis esti forigitaj.';
+$lang['update_ok']             = 'Tiu uzanto sukcese ĝisdatiĝis';
+$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';
+$lang['prev']                  = 'antaŭe';
+$lang['next']                  = 'sekve';
+$lang['last']                  = 'laste';
+$lang['edit_usermissing']      = 'La elektita uzanto ne troviĝis: tiu nomo povis esti forigita aŭ ŝanĝita aliloke.';
+$lang['user_notify']           = 'Avizi uzanton';
+$lang['note_notify']           = 'Avizantaj mesaĝoj estos sendataj nur se la uzanto ekhavos novan pasvorton.';
+$lang['note_group']            = 'Novaj uzantoj estos aldonitaj al la komuna grupo (%s) se neniu alia estos specifita.';
+$lang['note_pass']             = 'La pasvorto estos aŭtomate kreita se la kampo estos lasita malplena kaj \'avizo al uzantoj\' estos ebligita.';
+$lang['add_ok']                = 'La uzanto sukcese aldoniĝis';
+$lang['add_fail']              = 'Ne eblis aldoni uzanton';
+$lang['notify_ok']             = 'Avizanta mesaĝo sendiĝis';
+$lang['notify_fail']           = 'La avizanta mesaĝo ne povis esti sendita';
+$lang['import_userlistcsv']    = 'Dosiero kun listo de uzantoj (CSV):';
+$lang['import_header']         = 'Plej lastaj Import-eraroj';
+$lang['import_success_count']  = 'Uzant-importo: %d uzantoj trovataj, %d sukcese importitaj.';
+$lang['import_failure_count']  = 'Uzant-importo: %d fiaskis. Fiaskoj estas sube listitaj.';
+$lang['import_error_fields']   = 'Nesufiĉe da kampoj, ni trovis %d, necesas 4.';
+$lang['import_error_baduserid'] = 'Mankas uzant-id';
+$lang['import_error_badname']  = 'Malĝusta nomo';
+$lang['import_error_badmail']  = 'Malĝusta retadreso';
+$lang['import_error_upload']   = 'Importo fiaskis. La csv-dosiero ne povis esti alŝutata aŭ ĝi estas malplena.';
+$lang['import_error_readfail'] = 'Importo fiaskis. Ne eblas legi alŝutitan dosieron.';
+$lang['import_error_create']   = 'Ne eblas krei la uzanton';
+$lang['import_notify_fail']    = 'Averta mesaĝo ne povis esti sendata al la importita uzanto %s, kun retdreso %s.';
+$lang['import_downloadfailures'] = 'Elŝut-eraroj por korektado (CSV)';
diff --git a/sources/lib/plugins/usermanager/lang/eo/list.txt b/sources/lib/plugins/usermanager/lang/eo/list.txt
new file mode 100644
index 0000000..5be7222
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eo/list.txt
@@ -0,0 +1 @@
+===== Listo de uzantoj =====
diff --git a/sources/lib/plugins/usermanager/lang/es/add.txt b/sources/lib/plugins/usermanager/lang/es/add.txt
new file mode 100644
index 0000000..90c56e3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/es/add.txt
@@ -0,0 +1 @@
+===== Agregar un usuario =====
diff --git a/sources/lib/plugins/usermanager/lang/es/delete.txt b/sources/lib/plugins/usermanager/lang/es/delete.txt
new file mode 100644
index 0000000..4c552a9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/es/delete.txt
@@ -0,0 +1 @@
+=====  Eliminar un usuario  =====
diff --git a/sources/lib/plugins/usermanager/lang/es/edit.txt b/sources/lib/plugins/usermanager/lang/es/edit.txt
new file mode 100644
index 0000000..ccdd26f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/es/edit.txt
@@ -0,0 +1 @@
+===== Editar datos del usuario =====
diff --git a/sources/lib/plugins/usermanager/lang/es/intro.txt b/sources/lib/plugins/usermanager/lang/es/intro.txt
new file mode 100644
index 0000000..e558d3a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/es/intro.txt
@@ -0,0 +1 @@
+====== Administración de usuarios  ======
diff --git a/sources/lib/plugins/usermanager/lang/es/lang.php b/sources/lib/plugins/usermanager/lang/es/lang.php
new file mode 100644
index 0000000..26e4200
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/es/lang.php
@@ -0,0 +1,68 @@
+
+ * @author Oscar M. Lage 
+ * @author Gabriel Castillo 
+ * @author oliver@samera.com.py
+ * @author Enrico Nicoletto 
+ * @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 
+ * @author Victor Castelan 
+ * @author Mauro Javier Giamberardino 
+ * @author emezeta 
+ * @author Oscar Ciudad 
+ * @author Ruben Figols 
+ * @author Gerardo Zamudio 
+ * @author Mercè López mercelz@gmail.com
+ */
+$lang['menu']                  = 'Administración de usuarios';
+$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';
+$lang['user_pass']             = 'Contraseña';
+$lang['user_name']             = 'Nombre';
+$lang['user_mail']             = 'Correo electrónico';
+$lang['user_groups']           = 'Grupos';
+$lang['field']                 = 'Campo';
+$lang['value']                 = 'Valor';
+$lang['add']                   = 'Agregar';
+$lang['delete']                = 'Eliminar';
+$lang['delete_selected']       = 'Eliminar seleccionados';
+$lang['edit']                  = 'Editar';
+$lang['edit_prompt']           = 'Editar datos de este usuario';
+$lang['modify']                = 'Guardar los cambios';
+$lang['search']                = 'Buscar';
+$lang['search_prompt']         = 'Realizar la búsqueda';
+$lang['clear']                 = 'Limpiar los filtros de la búsqueda';
+$lang['filter']                = 'Filtrar';
+$lang['summary']               = 'Mostrando los usuarios %1$d-%2$d de %3$d encontrados. Cantidad total de usuarios %4$d.';
+$lang['nonefound']             = 'No se encontraron usuarios que coincidan con los párametros de la búsqueda. Cantidad total de usuarios %d.';
+$lang['delete_ok']             = '%d usuarios eliminados';
+$lang['delete_fail']           = '%d no se pudieron eliminar.';
+$lang['update_ok']             = 'Los datos del usuario se actualizaron exitosamente ';
+$lang['update_fail']           = 'Los datos del usuario no se actualizaron';
+$lang['update_exists']         = 'El cambio de nombre de usuario falló, el nombre especificado (%s) ya está en uso (los otros cambios se aplicaron).';
+$lang['start']                 = 'primera';
+$lang['prev']                  = 'anterior';
+$lang['next']                  = 'siguiente';
+$lang['last']                  = 'última';
+$lang['edit_usermissing']      = 'El usuario seleccionado no ha sido encontrado; el usuario especificado puede haber sido eliminado o cambiado en algún otro lugar.';
+$lang['user_notify']           = 'Notificar al usuario';
+$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_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 --git a/sources/lib/plugins/usermanager/lang/es/list.txt b/sources/lib/plugins/usermanager/lang/es/list.txt
new file mode 100644
index 0000000..d0d32b9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/es/list.txt
@@ -0,0 +1 @@
+===== Lista de usuarios =====
diff --git a/sources/lib/plugins/usermanager/lang/et/lang.php b/sources/lib/plugins/usermanager/lang/et/lang.php
new file mode 100644
index 0000000..2161df9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/et/lang.php
@@ -0,0 +1,30 @@
+
+ */
+$lang['menu']                  = 'Kasutajate haldamine';
+$lang['user_id']               = 'Kasutaja';
+$lang['user_pass']             = 'Parool';
+$lang['user_name']             = 'Tegelik nimi';
+$lang['user_mail']             = 'E-post';
+$lang['user_groups']           = 'Grupid';
+$lang['field']                 = 'Väli';
+$lang['value']                 = 'Väärtus';
+$lang['add']                   = 'Lisa';
+$lang['delete']                = 'Kustuta';
+$lang['delete_selected']       = 'Kustuta valitud';
+$lang['edit']                  = 'Muuda';
+$lang['edit_prompt']           = 'Muuda seda kasutajat';
+$lang['modify']                = 'Salvesta muudatused';
+$lang['search']                = 'Otsi';
+$lang['search_prompt']         = 'Soorita otsing';
+$lang['filter']                = 'Filtreeri';
+$lang['update_fail']           = 'Kasutaja uuendamine ebaõnnestus';
+$lang['start']                 = 'esimesed';
+$lang['prev']                  = 'eelmine';
+$lang['next']                  = 'järgmine';
+$lang['last']                  = 'viimased';
+$lang['user_notify']           = 'Teavita kasutajat';
diff --git a/sources/lib/plugins/usermanager/lang/eu/add.txt b/sources/lib/plugins/usermanager/lang/eu/add.txt
new file mode 100644
index 0000000..855c432
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eu/add.txt
@@ -0,0 +1 @@
+===== Erabiltzailea gehitu =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/eu/delete.txt b/sources/lib/plugins/usermanager/lang/eu/delete.txt
new file mode 100644
index 0000000..987b98f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eu/delete.txt
@@ -0,0 +1 @@
+===== Erabiltzailea ezabatu =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/eu/edit.txt b/sources/lib/plugins/usermanager/lang/eu/edit.txt
new file mode 100644
index 0000000..82b92af
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eu/edit.txt
@@ -0,0 +1 @@
+====== Editatu erabiltzailea ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/eu/intro.txt b/sources/lib/plugins/usermanager/lang/eu/intro.txt
new file mode 100644
index 0000000..848b3da
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eu/intro.txt
@@ -0,0 +1 @@
+====== Erabiltzaile Kudeatzailea ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/eu/lang.php b/sources/lib/plugins/usermanager/lang/eu/lang.php
new file mode 100644
index 0000000..5d3a01f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eu/lang.php
@@ -0,0 +1,48 @@
+
+ * @author Zigor Astarbe 
+ */
+$lang['menu']                  = 'Erabiltzaile Kudeatzailea';
+$lang['noauth']                = '(erabiltzaile kautotzea ez dago erabilgarri)';
+$lang['nosupport']             = '(erabiltzaile kudeaketa ez dago erabilgarri)';
+$lang['badauth']               = 'kautotze mekanismo baliogabea';
+$lang['user_id']               = 'Erabiltzailea';
+$lang['user_pass']             = 'Pasahitza';
+$lang['user_name']             = 'Benetako Izena';
+$lang['user_mail']             = 'Posta-e';
+$lang['user_groups']           = 'Taldeak';
+$lang['field']                 = 'Eremu';
+$lang['value']                 = 'Balioa';
+$lang['add']                   = 'Gehitu';
+$lang['delete']                = 'Ezabatu';
+$lang['delete_selected']       = 'Ezabatu Hautatutakoak';
+$lang['edit']                  = 'Editatu';
+$lang['edit_prompt']           = 'Editatu erabiltzaile hau';
+$lang['modify']                = 'Gorde Aldaketak';
+$lang['search']                = 'Bilatu';
+$lang['search_prompt']         = 'Egin bilaketa';
+$lang['clear']                 = 'Berrasieratu Bilaketa Iragazkia';
+$lang['filter']                = 'Iragazi';
+$lang['summary']               = 'Erakusten diren erabiltzaileak %1$d-%2$d bilatutako %3$d erabiltzailetatik. %4$d erabiltzaile guztira.';
+$lang['nonefound']             = 'Ez da erabiltzailerik aurkitu. %d erabiltzaile guztira.';
+$lang['delete_ok']             = '%d erabiltzaile ezabatuak';
+$lang['delete_fail']           = '%d huts ezabatzean.';
+$lang['update_ok']             = 'Erabiltzailea arrakastaz eguneratuak';
+$lang['update_fail']           = 'Erabiltzaile eguneratzeak huts egin du ';
+$lang['update_exists']         = 'Erabiltzaile izen aldaketak huts egin du, zehaztutako erabiltzaile izena (%s) lehendik existitzen zen (beste edozein aldaketa ezarri egingo da).';
+$lang['start']                 = 'hasi';
+$lang['prev']                  = 'aurrekoa';
+$lang['next']                  = 'hurrengoa';
+$lang['last']                  = 'azkena';
+$lang['edit_usermissing']      = 'Aukeratutako erabiltzailea ez da aurkitu, zehaztutako erabiltzaile izena beste nonbait ezabatua edo aldatua izana gerta zitekeen.';
+$lang['user_notify']           = 'Erabiltzailea jakinarazi';
+$lang['note_notify']           = 'Jakinarazpen postak erabiltzaileari pasahitz berria ematen bazaio bakarrik bidaltzen dira.';
+$lang['note_group']            = 'Erabiltzaile berriak (%s) talde lehenetsira gehituko dira ez bada talderik zehazten.';
+$lang['note_pass']             = 'Pasahitza automatikoki sortuko da eremua hutsik uzten bada eta erabiltzailearen jakinarazpena gaitua badago.';
+$lang['add_ok']                = 'Erabiltzailea arrakastaz gehitua';
+$lang['add_fail']              = 'Erabiltzaile gehitzeak huts egin du';
+$lang['notify_ok']             = 'Jakinarazpen posta-e bidalia';
+$lang['notify_fail']           = 'Jakinarazpen posta-e ezin izan da bidali';
diff --git a/sources/lib/plugins/usermanager/lang/eu/list.txt b/sources/lib/plugins/usermanager/lang/eu/list.txt
new file mode 100644
index 0000000..fb80b14
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/eu/list.txt
@@ -0,0 +1 @@
+====== Erabiltzaile zerrenda ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fa/add.txt b/sources/lib/plugins/usermanager/lang/fa/add.txt
new file mode 100644
index 0000000..32d604e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fa/add.txt
@@ -0,0 +1 @@
+===== افزودن کاربر =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fa/delete.txt b/sources/lib/plugins/usermanager/lang/fa/delete.txt
new file mode 100644
index 0000000..f8a59ff
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fa/delete.txt
@@ -0,0 +1 @@
+===== حذف کاربر =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fa/edit.txt b/sources/lib/plugins/usermanager/lang/fa/edit.txt
new file mode 100644
index 0000000..33fe5b5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fa/edit.txt
@@ -0,0 +1 @@
+===== ویرایش کاربر =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fa/intro.txt b/sources/lib/plugins/usermanager/lang/fa/intro.txt
new file mode 100644
index 0000000..ffb8501
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fa/intro.txt
@@ -0,0 +1 @@
+===== مدیریت کاربران =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fa/lang.php b/sources/lib/plugins/usermanager/lang/fa/lang.php
new file mode 100644
index 0000000..a6a4844
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fa/lang.php
@@ -0,0 +1,54 @@
+
+ * @author omidmr@gmail.com
+ * @author Omid Mottaghi 
+ * @author Mohammad Reza Shoaei 
+ * @author Milad DZand 
+ * @author AmirH Hassaneini 
+ */
+$lang['menu']                  = 'مدیریت کاربر';
+$lang['noauth']                = '(معتبرسازی کاربر ممکن نیست)';
+$lang['nosupport']             = '(مدیریت کاربر پشتیبانی نمی‌شود)';
+$lang['badauth']               = 'روش معتبرسازی اشتباه است';
+$lang['user_id']               = 'کاربر';
+$lang['user_pass']             = 'گذرواژه';
+$lang['user_name']             = 'نام حقیقی';
+$lang['user_mail']             = 'ایمیل';
+$lang['user_groups']           = 'گروه‌ها';
+$lang['field']                 = 'فیلد';
+$lang['value']                 = 'ارزش';
+$lang['add']                   = 'اضافه کردن';
+$lang['delete']                = 'حذف';
+$lang['delete_selected']       = 'حذف انتخاب شده‌ها';
+$lang['edit']                  = 'ویرایش';
+$lang['edit_prompt']           = 'ویرایش این کاربر';
+$lang['modify']                = 'ذخیره تغییرات';
+$lang['search']                = 'جستجو';
+$lang['search_prompt']         = 'انجام جستجو';
+$lang['clear']                 = 'بازنویسی فیلترهای جستجو';
+$lang['filter']                = 'فیلتر';
+$lang['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 --git a/sources/lib/plugins/usermanager/lang/fa/list.txt b/sources/lib/plugins/usermanager/lang/fa/list.txt
new file mode 100644
index 0000000..b539bf1
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fa/list.txt
@@ -0,0 +1 @@
+===== لیست کاربران =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fi/add.txt b/sources/lib/plugins/usermanager/lang/fi/add.txt
new file mode 100644
index 0000000..5c4ee0a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fi/add.txt
@@ -0,0 +1 @@
+===== Lisää käyttäjä =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fi/delete.txt b/sources/lib/plugins/usermanager/lang/fi/delete.txt
new file mode 100644
index 0000000..2203a20
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fi/delete.txt
@@ -0,0 +1 @@
+===== Poista käyttäjä =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fi/edit.txt b/sources/lib/plugins/usermanager/lang/fi/edit.txt
new file mode 100644
index 0000000..53e0b41
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fi/edit.txt
@@ -0,0 +1 @@
+===== Muokkaa käyttäjää =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fi/intro.txt b/sources/lib/plugins/usermanager/lang/fi/intro.txt
new file mode 100644
index 0000000..2ef0bb5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fi/intro.txt
@@ -0,0 +1 @@
+====== Käyttäjähallinta ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fi/lang.php b/sources/lib/plugins/usermanager/lang/fi/lang.php
new file mode 100644
index 0000000..de24313
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fi/lang.php
@@ -0,0 +1,51 @@
+
+ * @author Teemu Mattila 
+ * @author Sami Olmari 
+ */
+$lang['menu']                  = 'Käyttäjähallinta';
+$lang['noauth']                = '(autentikointi ei ole käytössä)';
+$lang['nosupport']             = '(käyttäjähallinta ei ole tuettu)';
+$lang['badauth']               = 'Viallinen autentikointimenetelmä';
+$lang['user_id']               = 'Käyttäjä';
+$lang['user_pass']             = 'Salasana';
+$lang['user_name']             = 'Oikea nimi';
+$lang['user_mail']             = 'Sähköposti';
+$lang['user_groups']           = 'Ryhmät';
+$lang['field']                 = 'Kenttä';
+$lang['value']                 = 'Arvo';
+$lang['add']                   = 'Lisää';
+$lang['delete']                = 'Poista';
+$lang['delete_selected']       = 'Poista valittu';
+$lang['edit']                  = 'Muokkaa';
+$lang['edit_prompt']           = 'Muokkaa ryhmää';
+$lang['modify']                = 'Tallenna muutokset';
+$lang['search']                = 'Hae';
+$lang['search_prompt']         = 'Tee haku';
+$lang['clear']                 = 'Tyhjennä hakusuodatin';
+$lang['filter']                = 'Suodatin';
+$lang['summary']               = 'Näytetään käyttäjät %1$d-%2$d / %3$d löytynyttä. %4$d käyttäjää yhteensä.';
+$lang['nonefound']             = 'Ei löytynyt käyttäjiä. %d käyttäjää yhteensä.';
+$lang['delete_ok']             = '%d käyttäjää poistettu';
+$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 onnistuivat)';
+$lang['start']                 = 'alku';
+$lang['prev']                  = 'edellinen';
+$lang['next']                  = 'seuraava';
+$lang['last']                  = 'viimeinen';
+$lang['edit_usermissing']      = 'Valittua käyttäjää ei löytynyt. Käyttäjä on voitu päivittää tai poistaa muualta.';
+$lang['user_notify']           = 'Tiedota käyttäjälle';
+$lang['note_notify']           = 'Tiedotus lähetetään vain, jos käyttäjälle on määritelty uusi salasana.';
+$lang['note_group']            = 'Uudelle käyttäjälle määritellään oletusryhmä (%s), jos ryhmää ei erikseen määritellä.';
+$lang['note_pass']             = 'Salasana luodaan automaattisesti, mikäli kenttä jätetään tyhjäksi ja jos käyttäjän tiedotus on päällä.';
+$lang['add_ok']                = 'Käyttäjä lisätty onnistuneesti';
+$lang['add_fail']              = 'Käyttäjän lisäys epäonnistui';
+$lang['notify_ok']             = 'Ilmoitus sähköpostilla lähetetty';
+$lang['notify_fail']           = 'Ilmoitusta sähköpostilla ei voitu lähettää';
diff --git a/sources/lib/plugins/usermanager/lang/fi/list.txt b/sources/lib/plugins/usermanager/lang/fi/list.txt
new file mode 100644
index 0000000..5ecf2ff
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fi/list.txt
@@ -0,0 +1 @@
+===== Käyttäjälista =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fr/add.txt b/sources/lib/plugins/usermanager/lang/fr/add.txt
new file mode 100644
index 0000000..e60b8b8
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fr/add.txt
@@ -0,0 +1 @@
+===== Ajouter un utilisateur =====
diff --git a/sources/lib/plugins/usermanager/lang/fr/delete.txt b/sources/lib/plugins/usermanager/lang/fr/delete.txt
new file mode 100644
index 0000000..778f441
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fr/delete.txt
@@ -0,0 +1 @@
+===== Supprimer un utilisateur =====
diff --git a/sources/lib/plugins/usermanager/lang/fr/edit.txt b/sources/lib/plugins/usermanager/lang/fr/edit.txt
new file mode 100644
index 0000000..e667989
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fr/edit.txt
@@ -0,0 +1 @@
+===== Modifier l'utilisateur =====
diff --git a/sources/lib/plugins/usermanager/lang/fr/import.txt b/sources/lib/plugins/usermanager/lang/fr/import.txt
new file mode 100644
index 0000000..191bb83
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fr/import.txt
@@ -0,0 +1,11 @@
+===== Importation d'utilisateurs par lot =====
+
+Requière un fichier [[wpfr>CSV]] d'utilisateurs avec un minimum de quatre colonnes.
+Les colonnes doivent comporter, dans l'ordre : identifiant, nom complet, adresse de courriel et groupes.
+
+Les champs doivent être séparés par une virgule (,), les chaînes sont délimitées par des guillemets (""). On peut utiliser la balance inverse (\) comme caractère d'échappement.
+Pour obtenir un exemple de fichier acceptable, essayer la fonction "Exporter les utilisateurs" ci dessus.
+
+Les identifiants dupliqués seront ignorés.
+
+L'importation générera un mot de passe et l'enverra à chaque utilisateur correctement importé.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/fr/intro.txt b/sources/lib/plugins/usermanager/lang/fr/intro.txt
new file mode 100644
index 0000000..84987b0
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fr/intro.txt
@@ -0,0 +1 @@
+====== Gestion des utilisateurs ======
diff --git a/sources/lib/plugins/usermanager/lang/fr/lang.php b/sources/lib/plugins/usermanager/lang/fr/lang.php
new file mode 100644
index 0000000..dd0e64f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fr/lang.php
@@ -0,0 +1,86 @@
+
+ * @author Delassaux Julien 
+ * @author Maurice A. LeBlanc 
+ * @author stephane.gully@gmail.com
+ * @author Guillaume Turri 
+ * @author Erik Pedersen 
+ * @author olivier duperray 
+ * @author Vincent Feltz 
+ * @author Philippe Bajoit 
+ * @author Florian Gaub 
+ * @author Samuel Dorsaz samuel.dorsaz@novelion.net
+ * @author Johan Guilbaud 
+ * @author schplurtz@laposte.net
+ * @author skimpax@gmail.com
+ * @author Yannick Aure 
+ * @author Olivier DUVAL 
+ * @author Anael Mobilia 
+ * @author Bruno Veilleux 
+ * @author Antoine Turmel 
+ * @author schplurtz 
+ * @author Jérôme Brandt 
+ */
+$lang['menu']                  = 'Gestion des utilisateurs';
+$lang['noauth']                = '(authentification de l\'utilisateur non disponible)';
+$lang['nosupport']             = '(gestion de l\'utilisateur non supportée)';
+$lang['badauth']               = 'mécanisme d\'authentification invalide';
+$lang['user_id']               = 'Identifiant ';
+$lang['user_pass']             = 'Mot de passe ';
+$lang['user_name']             = 'Nom ';
+$lang['user_mail']             = 'Courriel ';
+$lang['user_groups']           = 'Groupes ';
+$lang['field']                 = 'Champ';
+$lang['value']                 = 'Valeur';
+$lang['add']                   = 'Ajouter';
+$lang['delete']                = 'Supprimer';
+$lang['delete_selected']       = 'Supprimer la sélection';
+$lang['edit']                  = 'Modifier';
+$lang['edit_prompt']           = 'Modifier cet utilisateur';
+$lang['modify']                = 'Enregistrer les modifications';
+$lang['search']                = 'Rechercher';
+$lang['search_prompt']         = 'Effectuer la recherche';
+$lang['clear']                 = 'Réinitialiser la recherche';
+$lang['filter']                = 'Filtre';
+$lang['export_all']            = 'Exporter tous les utilisateurs (CSV)';
+$lang['export_filtered']       = 'Exporter la liste d\'utilisateurs filtrés (CSV)';
+$lang['import']                = 'Importer de nouveaux utilisateurs';
+$lang['line']                  = 'Ligne n°';
+$lang['error']                 = 'Message d\'erreur';
+$lang['summary']               = 'Affichage des utilisateurs %1$d-%2$d parmi %3$d trouvés. %4$d utilisateurs au total.';
+$lang['nonefound']             = 'Aucun utilisateur trouvé. %d utilisateurs au total.';
+$lang['delete_ok']             = '%d utilisateurs effacés';
+$lang['delete_fail']           = '%d effacements échoués.';
+$lang['update_ok']             = 'Utilisateur mis à jour avec succès';
+$lang['update_fail']           = 'Échec lors de la mise à jour de l\'utilisateur';
+$lang['update_exists']         = 'Échec lors du changement du nom d\'utilisateur : le nom spécifié (%s) existe déjà (toutes les autres modifications seront effectuées).';
+$lang['start']                 = 'Début';
+$lang['prev']                  = 'Précédent';
+$lang['next']                  = 'Suivant';
+$lang['last']                  = 'Fin';
+$lang['edit_usermissing']      = 'Utilisateur sélectionné non trouvé, cet utilisateur a peut-être été supprimé ou modifié ailleurs.';
+$lang['user_notify']           = 'Notifier l\'utilisateur ';
+$lang['note_notify']           = 'Expédition de notification par courriel uniquement lorsque l\'utilisateur fourni un nouveau mot de passe.';
+$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['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é';
+$lang['notify_fail']           = 'Échec de l\'expédition du courriel de notification';
+$lang['import_userlistcsv']    = 'Liste utilisateur (fichier CSV)';
+$lang['import_header']         = 'Erreurs d\'import les plus récentes';
+$lang['import_success_count']  = 'Import d’utilisateurs : %d utilisateurs trouvés, %d utilisateurs importés avec succès.';
+$lang['import_failure_count']  = 'Import d\'utilisateurs : %d ont échoué. Les erreurs sont listées ci-dessous.';
+$lang['import_error_fields']   = 'Nombre de champs insuffisant, %d trouvé, 4 requis.';
+$lang['import_error_baduserid'] = 'Identifiant de l\'utilisateur manquant';
+$lang['import_error_badname']  = 'Mauvais nom';
+$lang['import_error_badmail']  = 'Mauvaise adresse e-mail';
+$lang['import_error_upload']   = 'L\'import a échoué. Le fichier csv n\'a pas pu être téléchargé ou bien il est vide.';
+$lang['import_error_readfail'] = 'L\'import a échoué. Impossible de lire le fichier téléchargé.';
+$lang['import_error_create']   = 'Impossible de créer l\'utilisateur';
+$lang['import_notify_fail']    = 'Impossible d\'expédier une notification à l\'utilisateur importé %s, adresse %s.';
+$lang['import_downloadfailures'] = 'Télécharger les erreurs au format CSV pour correction';
diff --git a/sources/lib/plugins/usermanager/lang/fr/list.txt b/sources/lib/plugins/usermanager/lang/fr/list.txt
new file mode 100644
index 0000000..2d708fe
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/fr/list.txt
@@ -0,0 +1 @@
+===== Liste des utilisateurs =====
diff --git a/sources/lib/plugins/usermanager/lang/gl/add.txt b/sources/lib/plugins/usermanager/lang/gl/add.txt
new file mode 100644
index 0000000..7602c36
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/gl/add.txt
@@ -0,0 +1 @@
+===== Engadir usuario =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/gl/delete.txt b/sources/lib/plugins/usermanager/lang/gl/delete.txt
new file mode 100644
index 0000000..4262a0c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/gl/delete.txt
@@ -0,0 +1 @@
+===== Eliminar usuario =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/gl/edit.txt b/sources/lib/plugins/usermanager/lang/gl/edit.txt
new file mode 100644
index 0000000..11ef62c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/gl/edit.txt
@@ -0,0 +1 @@
+===== Editar usuario =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/gl/intro.txt b/sources/lib/plugins/usermanager/lang/gl/intro.txt
new file mode 100644
index 0000000..77675e9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/gl/intro.txt
@@ -0,0 +1 @@
+====== Xestor de Usuarios ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/gl/lang.php b/sources/lib/plugins/usermanager/lang/gl/lang.php
new file mode 100644
index 0000000..f3a7ef2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/gl/lang.php
@@ -0,0 +1,49 @@
+
+ * @author Oscar M. Lage 
+ * @author Rodrigo Rega 
+ */
+$lang['menu']                  = 'Xestor de Usuarios';
+$lang['noauth']                = '(autenticación de usuarios non dispoñible)';
+$lang['nosupport']             = '(xestión de usuarios non soportada)';
+$lang['badauth']               = 'mecanismo de autenticación non válido';
+$lang['user_id']               = 'Usuario';
+$lang['user_pass']             = 'Contrasinal';
+$lang['user_name']             = 'Nome Real';
+$lang['user_mail']             = 'Correo-e';
+$lang['user_groups']           = 'Grupos';
+$lang['field']                 = 'Campo';
+$lang['value']                 = 'Valor';
+$lang['add']                   = 'Engadir';
+$lang['delete']                = 'Eliminar';
+$lang['delete_selected']       = 'Eliminar Seleccionados';
+$lang['edit']                  = 'Editar';
+$lang['edit_prompt']           = 'Editar este usuario';
+$lang['modify']                = 'Gardar Trocos';
+$lang['search']                = 'Procurar';
+$lang['search_prompt']         = 'Facer procura';
+$lang['clear']                 = 'Reiniciar 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['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';
diff --git a/sources/lib/plugins/usermanager/lang/gl/list.txt b/sources/lib/plugins/usermanager/lang/gl/list.txt
new file mode 100644
index 0000000..013b2d7
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/gl/list.txt
@@ -0,0 +1 @@
+===== Lista de Usuarios =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/he/add.txt b/sources/lib/plugins/usermanager/lang/he/add.txt
new file mode 100644
index 0000000..e2d1cb7
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/he/add.txt
@@ -0,0 +1 @@
+===== הוספת משתמש =====
diff --git a/sources/lib/plugins/usermanager/lang/he/delete.txt b/sources/lib/plugins/usermanager/lang/he/delete.txt
new file mode 100644
index 0000000..42d738b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/he/delete.txt
@@ -0,0 +1 @@
+===== מחיקת משתמש =====
diff --git a/sources/lib/plugins/usermanager/lang/he/edit.txt b/sources/lib/plugins/usermanager/lang/he/edit.txt
new file mode 100644
index 0000000..af90af3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/he/edit.txt
@@ -0,0 +1 @@
+===== עריכת משתמש =====
diff --git a/sources/lib/plugins/usermanager/lang/he/intro.txt b/sources/lib/plugins/usermanager/lang/he/intro.txt
new file mode 100644
index 0000000..232c515
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/he/intro.txt
@@ -0,0 +1 @@
+====== מנהל משתמשים ======
diff --git a/sources/lib/plugins/usermanager/lang/he/lang.php b/sources/lib/plugins/usermanager/lang/he/lang.php
new file mode 100644
index 0000000..1820258
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/he/lang.php
@@ -0,0 +1,51 @@
+
+ * @author Dotan Kamber 
+ * @author Moshe Kaplan 
+ * @author Yaron Yogev 
+ * @author Yaron Shahrabani 
+ */
+$lang['menu']                  = 'מנהל משתמשים';
+$lang['noauth']                = '(אימות משתמשים אינו זמין)';
+$lang['nosupport']             = '(ניהול משתמשים אינו נתמך)';
+$lang['badauth']               = 'מנגנון אימות לא תקף';
+$lang['user_id']               = 'שם משתמש';
+$lang['user_pass']             = 'סיסמה';
+$lang['user_name']             = 'שם אמיתי';
+$lang['user_mail']             = 'דוא"ל';
+$lang['user_groups']           = 'קבוצות';
+$lang['field']                 = 'שדה';
+$lang['value']                 = 'ערך';
+$lang['add']                   = 'הוספה';
+$lang['delete']                = 'מחיקה';
+$lang['delete_selected']       = 'מחיקת הבחירה';
+$lang['edit']                  = 'עריכה';
+$lang['edit_prompt']           = 'עריכת משתמש זה';
+$lang['modify']                = 'שמירת שינוים';
+$lang['search']                = 'חיפוש';
+$lang['search_prompt']         = 'בצע חיפוש';
+$lang['clear']                 = 'אתחל סינון חיפוש';
+$lang['filter']                = 'סינון';
+$lang['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['add_ok']                = 'משתמש הוסף בהצלחה';
+$lang['add_fail']              = 'הוספת המשתמש כשלה';
+$lang['notify_ok']             = 'הודעה נשלחה';
+$lang['notify_fail']           = 'לא ניתן היה לשלוח הודעה';
diff --git a/sources/lib/plugins/usermanager/lang/he/list.txt b/sources/lib/plugins/usermanager/lang/he/list.txt
new file mode 100644
index 0000000..9308fbe
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/he/list.txt
@@ -0,0 +1 @@
+===== רשימת משתמשים =====
diff --git a/sources/lib/plugins/usermanager/lang/hi/lang.php b/sources/lib/plugins/usermanager/lang/hi/lang.php
new file mode 100644
index 0000000..d6f78ff
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hi/lang.php
@@ -0,0 +1,7 @@
+
+ * @author yndesai@gmail.com
+ */
diff --git a/sources/lib/plugins/usermanager/lang/hr/lang.php b/sources/lib/plugins/usermanager/lang/hr/lang.php
new file mode 100644
index 0000000..96f1d6a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hr/lang.php
@@ -0,0 +1,8 @@
+
+ * @author Dražen Odobašić 
+ * @author Dejan Igrec dejan.igrec@gmail.com
+ */
diff --git a/sources/lib/plugins/usermanager/lang/hu/add.txt b/sources/lib/plugins/usermanager/lang/hu/add.txt
new file mode 100644
index 0000000..70a44c4
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hu/add.txt
@@ -0,0 +1,2 @@
+===== Felhasználó hozzáadása =====
+
diff --git a/sources/lib/plugins/usermanager/lang/hu/delete.txt b/sources/lib/plugins/usermanager/lang/hu/delete.txt
new file mode 100644
index 0000000..963d2e7
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hu/delete.txt
@@ -0,0 +1,2 @@
+===== Felhasználó törlése =====
+
diff --git a/sources/lib/plugins/usermanager/lang/hu/edit.txt b/sources/lib/plugins/usermanager/lang/hu/edit.txt
new file mode 100644
index 0000000..f827460
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hu/edit.txt
@@ -0,0 +1,2 @@
+===== Felhasználó szerkesztése =====
+
diff --git a/sources/lib/plugins/usermanager/lang/hu/import.txt b/sources/lib/plugins/usermanager/lang/hu/import.txt
new file mode 100644
index 0000000..5a4bc8b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hu/import.txt
@@ -0,0 +1,9 @@
+==== Felhasználók tömeges importálása ====
+
+Egy, legalább 4 oszlopot tartalmazó, felhasználóikat tartalmazó fájl szükséges hozzá.
+Az oszlopok kötelező tartalma, megfelelő sorrendben: felhasználói azonosító, teljes név, e-mailcím és csoportjai.
+A CSV mezőit vesszővel (,) kell elválasztani, a szövegeket idézőjelek ("") közé kell foglalni. 
+Mintafájl megtekintéséhez próbáld ki a fenti, "Felhasználók exportálása" funkciót. A fordított törtvonallal (\) lehet kilépni.
+Megegyező felhasználói azonosítók esetén, nem kerülnek feldolgozásra.
+
+Minden sikeresen importált felhasználó kap egy e-mailt, amiben megtalálja a generált jelszavát.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/hu/intro.txt b/sources/lib/plugins/usermanager/lang/hu/intro.txt
new file mode 100644
index 0000000..150aff8
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hu/intro.txt
@@ -0,0 +1,2 @@
+====== Felhasználók kezelése ======
+
diff --git a/sources/lib/plugins/usermanager/lang/hu/lang.php b/sources/lib/plugins/usermanager/lang/hu/lang.php
new file mode 100644
index 0000000..dd76bfd
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hu/lang.php
@@ -0,0 +1,73 @@
+
+ * @author Siaynoq Mage 
+ * @author schilling.janos@gmail.com
+ * @author Szabó Dávid 
+ * @author Sándor TIHANYI 
+ * @author David Szabo 
+ * @author Marton Sebok 
+ * @author Serenity87HUN 
+ */
+$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 autentikációs technika';
+$lang['user_id']               = 'Felhasználói azonosító';
+$lang['user_pass']             = 'Jelszó';
+$lang['user_name']             = 'Név';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Csoportok';
+$lang['field']                 = 'Mező';
+$lang['value']                 = 'Érték';
+$lang['add']                   = 'Hozzáadás';
+$lang['delete']                = 'Törlés';
+$lang['delete_selected']       = 'Kiválasztottak törlése';
+$lang['edit']                  = 'Szerkesztés';
+$lang['edit_prompt']           = 'A felhasználó szerkesztése';
+$lang['modify']                = 'Változások mentése';
+$lang['search']                = 'Keresés';
+$lang['search_prompt']         = 'Keresés';
+$lang['clear']                 = 'Keresési szűrés törlése';
+$lang['filter']                = 'Szűrés';
+$lang['export_all']            = 'Összes felhasználó exportálása (CSV)';
+$lang['export_filtered']       = 'Kiválasztott felhasználók exportálása (CSV)';
+$lang['import']                = 'Új felhasználók importálása';
+$lang['line']                  = 'Sor száma';
+$lang['error']                 = 'Hibaüzenet';
+$lang['summary']               = '%1$d-%2$d. felhasználók megjelenítése a(z) %3$d megtalált felhasználóból. %4$d felhasználó van összesen.';
+$lang['nonefound']             = 'Nincs ilyen felhasználó. %d felhasználó van összesen.';
+$lang['delete_ok']             = '%d felhasználó törölve.';
+$lang['delete_fail']           = '%d felhasználót nem sikerült törölni.';
+$lang['update_ok']             = 'A felhasználó adatait sikeresen elmentettem.';
+$lang['update_fail']           = 'A felhasználó adatainak mentése nem sikerült.';
+$lang['update_exists']         = 'A felhasználói azonosító változtatása nem sikerült, a megadott azonosító (%s) már létezik. (A többi változtatás mentve.)';
+$lang['start']                 = 'első';
+$lang['prev']                  = 'előző';
+$lang['next']                  = 'következő';
+$lang['last']                  = 'utolsó';
+$lang['edit_usermissing']      = 'A kiválasztott felhasználót nem találom, a felhasználói nevét törölték vagy megváltoztatták.';
+$lang['user_notify']           = 'Felhasználó értesítése';
+$lang['note_notify']           = 'Csak akkor küld értesítő e-mailt, ha a felhasználó új jelszót kapott.';
+$lang['note_group']            = 'Ha nincs csoport meghatározva, az új felhasználó az alapértelmezett csoportba (%s) kerül.';
+$lang['note_pass']             = 'Ha a baloldali mező üres és a felhasználó értesítés aktív, akkor a jelszót a rendszer generálja.';
+$lang['add_ok']                = 'A felhasználó sikeresen hozzáadva.';
+$lang['add_fail']              = 'A felhasználó hozzáadása nem sikerült.';
+$lang['notify_ok']             = 'Értesítő levél elküldve.';
+$lang['notify_fail']           = 'Nem sikerült az értesítő levelet elküldeni.';
+$lang['import_userlistcsv']    = 'Felhasználók listája fájl (CSV)';
+$lang['import_header']         = 'Legutóbbi importálás - Hibák';
+$lang['import_success_count']  = 'Felhasználók importálása: %d felhasználót találtunk, ebből %d sikeresen importálva.';
+$lang['import_failure_count']  = 'Felhasználók importálása: %d sikertelen. A sikertelenség okait lejjebb találod.';
+$lang['import_error_fields']   = 'Túl kevés mezőt adtál meg, %d darabot találtunk, legalább 4-re van szükség.';
+$lang['import_error_baduserid'] = 'Felhasználói azonosító hiányzik';
+$lang['import_error_badname']  = 'Nem megfelelő név';
+$lang['import_error_badmail']  = 'Nem megfelelő e-mailcím';
+$lang['import_error_upload']   = 'Sikertelen importálás. A csv fájl nem feltölthető vagy üres.';
+$lang['import_error_readfail'] = 'Sikertelen importálás. A feltöltött fájl nem olvasható.';
+$lang['import_error_create']   = 'Ez a felhasználó nem hozható létre';
+$lang['import_notify_fail']    = 'Az értesítő e-mail nem küldhető el az alábbi importált felhasználónak: %s e-mailcíme: %s.';
+$lang['import_downloadfailures'] = 'Töltsd le a hibákat tartalmazó fájlt CSV formátumban, hogy ki tudd javítani a hibákat';
diff --git a/sources/lib/plugins/usermanager/lang/hu/list.txt b/sources/lib/plugins/usermanager/lang/hu/list.txt
new file mode 100644
index 0000000..9da7320
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/hu/list.txt
@@ -0,0 +1,2 @@
+===== Felhasználók listája =====
+
diff --git a/sources/lib/plugins/usermanager/lang/ia/add.txt b/sources/lib/plugins/usermanager/lang/ia/add.txt
new file mode 100644
index 0000000..4695834
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ia/add.txt
@@ -0,0 +1 @@
+===== Adder usator =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ia/delete.txt b/sources/lib/plugins/usermanager/lang/ia/delete.txt
new file mode 100644
index 0000000..db1b4c0
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ia/delete.txt
@@ -0,0 +1 @@
+===== Deler usator =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ia/edit.txt b/sources/lib/plugins/usermanager/lang/ia/edit.txt
new file mode 100644
index 0000000..2fcf023
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ia/edit.txt
@@ -0,0 +1 @@
+===== Modificar usator =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ia/intro.txt b/sources/lib/plugins/usermanager/lang/ia/intro.txt
new file mode 100644
index 0000000..f4fafcb
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ia/intro.txt
@@ -0,0 +1 @@
+====== Gestion de usatores ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ia/lang.php b/sources/lib/plugins/usermanager/lang/ia/lang.php
new file mode 100644
index 0000000..a8b8f45
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ia/lang.php
@@ -0,0 +1,49 @@
+
+ * @author Martijn Dekker 
+ */
+$lang['menu']                  = 'Gestion de usatores';
+$lang['noauth']                = '(authentication de usatores non disponibile)';
+$lang['nosupport']             = '(gestion de usatores non supportate)';
+$lang['badauth']               = 'mechanismo de authentication invalide';
+$lang['user_id']               = 'Usator';
+$lang['user_pass']             = 'Contrasigno';
+$lang['user_name']             = 'Nomine real';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Gruppos';
+$lang['field']                 = 'Campo';
+$lang['value']                 = 'Valor';
+$lang['add']                   = 'Adder';
+$lang['delete']                = 'Deler';
+$lang['delete_selected']       = 'Deler seligite';
+$lang['edit']                  = 'Modificar';
+$lang['edit_prompt']           = 'Modificar iste usator';
+$lang['modify']                = 'Salveguardar cambios';
+$lang['search']                = 'Cercar';
+$lang['search_prompt']         = 'Executar recerca';
+$lang['clear']                 = 'Reinitialisar filtro de recerca';
+$lang['filter']                = 'Filtro';
+$lang['summary']               = 'Presentation del usatores %1$d-%2$d de %3$d trovate. %4$d usatores in total.';
+$lang['nonefound']             = 'Nulle usator trovate. %d usatores in total.';
+$lang['delete_ok']             = '%d usatores delite';
+$lang['delete_fail']           = 'Deletion de %d usatores fallite.';
+$lang['update_ok']             = 'Actualisation del usator succedite';
+$lang['update_fail']           = 'Actualisation del usator fallite';
+$lang['update_exists']         = 'Le modification del nomine del usator ha fallite; le usator specificate (%s) ja existe. (Omne altere modificationes essera applicate.)
+';
+$lang['start']                 = 'initio';
+$lang['prev']                  = 'precedente';
+$lang['next']                  = 'sequente';
+$lang['last']                  = 'fin';
+$lang['edit_usermissing']      = 'Le usator seligite non ha essite trovate. Es possibile que le nomine de usator specificate ha essite delite o cambiate alterubi.';
+$lang['user_notify']           = 'Notificar usator';
+$lang['note_notify']           = 'Le messages de notification es solmente inviate un nove contrasigno es date al usator.';
+$lang['note_group']            = 'Nove usatores essera addite al gruppo predefinite (%s) si nulle gruppo es specificate.';
+$lang['note_pass']             = 'Le contrasigno essera automaticamente generate si le campo es lassate vacue e le notification del usator es activate.';
+$lang['add_ok']                = 'Addition del usator succedite';
+$lang['add_fail']              = 'Addition del usator fallite';
+$lang['notify_ok']             = 'Message de notification inviate';
+$lang['notify_fail']           = 'Le message de notification non poteva esser inviate';
diff --git a/sources/lib/plugins/usermanager/lang/ia/list.txt b/sources/lib/plugins/usermanager/lang/ia/list.txt
new file mode 100644
index 0000000..f545f06
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ia/list.txt
@@ -0,0 +1 @@
+===== Lista de usatores =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/id-ni/lang.php b/sources/lib/plugins/usermanager/lang/id-ni/lang.php
new file mode 100644
index 0000000..d367340
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/id-ni/lang.php
@@ -0,0 +1,7 @@
+
+ * @author Yustinus Waruwu 
+ */
diff --git a/sources/lib/plugins/usermanager/lang/id/add.txt b/sources/lib/plugins/usermanager/lang/id/add.txt
new file mode 100644
index 0000000..eae407c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/id/add.txt
@@ -0,0 +1 @@
+===== Tambah User =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/id/delete.txt b/sources/lib/plugins/usermanager/lang/id/delete.txt
new file mode 100644
index 0000000..99e53c9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/id/delete.txt
@@ -0,0 +1 @@
+===== Hapus User =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/id/edit.txt b/sources/lib/plugins/usermanager/lang/id/edit.txt
new file mode 100644
index 0000000..6d14f4f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/id/edit.txt
@@ -0,0 +1 @@
+===== Edit User =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/id/intro.txt b/sources/lib/plugins/usermanager/lang/id/intro.txt
new file mode 100644
index 0000000..de053f2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/id/intro.txt
@@ -0,0 +1 @@
+===== Manajemen User =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/id/lang.php b/sources/lib/plugins/usermanager/lang/id/lang.php
new file mode 100644
index 0000000..425b2ff
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/id/lang.php
@@ -0,0 +1,48 @@
+
+ * @author Yustinus Waruwu 
+ */
+$lang['menu']                  = 'Manajemen User';
+$lang['noauth']                = '(autentikasi tidak tersedia)';
+$lang['nosupport']             = '(manajemen user tidak didukung)';
+$lang['badauth']               = 'mekanisme autentikasi invali';
+$lang['user_id']               = 'User';
+$lang['user_pass']             = 'Password';
+$lang['user_name']             = 'Nama Lengkap';
+$lang['user_mail']             = 'Email';
+$lang['user_groups']           = 'Grup';
+$lang['field']                 = 'Field';
+$lang['value']                 = 'Nilai';
+$lang['add']                   = 'Tambah';
+$lang['delete']                = 'Hapus';
+$lang['delete_selected']       = 'Hapus pilihan';
+$lang['edit']                  = 'Edit';
+$lang['edit_prompt']           = 'Edit user ini';
+$lang['modify']                = 'Simpan Perubahan';
+$lang['search']                = 'Pencarian';
+$lang['search_prompt']         = 'Lakukan pencarian';
+$lang['clear']                 = 'Reset Filter Pencarian';
+$lang['filter']                = 'Filter';
+$lang['summary']               = 'Menampilkan user %1$d-%2$d dari %3$d user yang ditemukan. Total semua user %4$d.';
+$lang['nonefound']             = 'User tidak ditemukan. Total semua user %d. ';
+$lang['delete_ok']             = 'User %d dihapus';
+$lang['delete_fail']           = 'User %d tidak berhasil dihapus';
+$lang['update_ok']             = 'User berhasil diubah';
+$lang['update_fail']           = 'Perubahan user tidak berhasil';
+$lang['update_exists']         = 'Perubahan username tidak berhasil, Username (%s) sudah ada (perubahan lain tetap dilakukan)';
+$lang['start']                 = 'awal';
+$lang['prev']                  = 'sebelumnya';
+$lang['next']                  = 'berikutnya';
+$lang['last']                  = 'terakhir';
+$lang['edit_usermissing']      = 'User yang dipilih tida ditemukan, username tersebut mungkin sudah dihapus atau diubah ditempat lain.';
+$lang['user_notify']           = 'Beritahu user';
+$lang['note_notify']           = 'Email notifikasi hanya dikirim jika user diberikan password baru';
+$lang['note_group']            = 'User baru akan ditambahkan ke grup default (%s) jika tidak ada grup yang diisi.';
+$lang['add_ok']                = 'User telah berhasil ditambahkan';
+$lang['add_fail']              = 'Penambahan user tidak berhasil.';
+$lang['notify_ok']             = 'Email notifikasi berhasil terkirim.';
+$lang['notify_fail']           = 'Email notifikasi tidak berhasil terkirim.';
diff --git a/sources/lib/plugins/usermanager/lang/id/list.txt b/sources/lib/plugins/usermanager/lang/id/list.txt
new file mode 100644
index 0000000..9b70bc1
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/id/list.txt
@@ -0,0 +1 @@
+===== Daftar User =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/is/delete.txt b/sources/lib/plugins/usermanager/lang/is/delete.txt
new file mode 100644
index 0000000..5640065
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/is/delete.txt
@@ -0,0 +1 @@
+===== Eyða notanda =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/is/lang.php b/sources/lib/plugins/usermanager/lang/is/lang.php
new file mode 100644
index 0000000..cabf83d
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/is/lang.php
@@ -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 --git a/sources/lib/plugins/usermanager/lang/it/add.txt b/sources/lib/plugins/usermanager/lang/it/add.txt
new file mode 100644
index 0000000..9ce4c6e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/it/add.txt
@@ -0,0 +1 @@
+===== Aggiungi utente =====
diff --git a/sources/lib/plugins/usermanager/lang/it/delete.txt b/sources/lib/plugins/usermanager/lang/it/delete.txt
new file mode 100644
index 0000000..270061f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/it/delete.txt
@@ -0,0 +1 @@
+===== Elimina utente =====
diff --git a/sources/lib/plugins/usermanager/lang/it/edit.txt b/sources/lib/plugins/usermanager/lang/it/edit.txt
new file mode 100644
index 0000000..39767bf
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/it/edit.txt
@@ -0,0 +1 @@
+===== Modifica utente =====
diff --git a/sources/lib/plugins/usermanager/lang/it/intro.txt b/sources/lib/plugins/usermanager/lang/it/intro.txt
new file mode 100644
index 0000000..3421709
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/it/intro.txt
@@ -0,0 +1 @@
+====== Gestione Utenti ======
diff --git a/sources/lib/plugins/usermanager/lang/it/lang.php b/sources/lib/plugins/usermanager/lang/it/lang.php
new file mode 100644
index 0000000..6c67894
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/it/lang.php
@@ -0,0 +1,62 @@
+
+ * @author Silvia Sargentoni 
+ * @author Pietro Battiston toobaz@email.it
+ * @author Diego Pierotto ita.translations@tiscali.it
+ * @author ita.translations@tiscali.it
+ * @author Lorenzo Breda 
+ * @author snarchio@alice.it
+ * @author robocap 
+ * @author Osman Tekin osman.tekin93@hotmail.it
+ * @author Jacopo Corbetta 
+ * @author Matteo Pasotti 
+ * @author snarchio@gmail.com
+ * @author Claudio Lanconelli 
+ */
+$lang['menu']                  = 'Gestione Utenti';
+$lang['noauth']                = '(autenticazione non disponibile)';
+$lang['nosupport']             = '(gestione utenti non supportata)';
+$lang['badauth']               = 'sistema di autenticazione non valido';
+$lang['user_id']               = 'ID utente';
+$lang['user_pass']             = 'Password';
+$lang['user_name']             = 'Nome completo';
+$lang['user_mail']             = 'Email';
+$lang['user_groups']           = 'Gruppi';
+$lang['field']                 = 'Campo';
+$lang['value']                 = 'Valore';
+$lang['add']                   = 'Aggiungi';
+$lang['delete']                = 'Elimina';
+$lang['delete_selected']       = 'Elimina selezionati';
+$lang['edit']                  = 'Modifica';
+$lang['edit_prompt']           = 'Modifica questo utente';
+$lang['modify']                = 'Salva modifiche';
+$lang['search']                = 'Cerca';
+$lang['search_prompt']         = 'Esegui ricerca';
+$lang['clear']                 = 'Azzera filtro di ricerca';
+$lang['filter']                = 'Filtro';
+$lang['export_all']            = 'Esporta tutti gli utenti (CSV)';
+$lang['export_filtered']       = 'Esporta elenco utenti filtrati (CSV)';
+$lang['summary']               = 'Visualizzazione utenti %1$d-%2$d di %3$d trovati. %4$d utenti totali.';
+$lang['nonefound']             = 'Nessun utente trovato. %d utenti totali.';
+$lang['delete_ok']             = '%d utenti eliminati';
+$lang['delete_fail']           = 'Eliminazione %d fallita.';
+$lang['update_ok']             = 'Aggiornamento utente riuscito';
+$lang['update_fail']           = 'Aggiornamento utente fallito';
+$lang['update_exists']         = 'Modifica nome utente fallita, il nome utente specificato (%s) esiste già (qualunque altra modifica sarà  applicata).';
+$lang['start']                 = 'primo';
+$lang['prev']                  = 'precedente';
+$lang['next']                  = 'successivo';
+$lang['last']                  = 'ultimo';
+$lang['edit_usermissing']      = 'Utente selezionato non trovato, il nome utente specificato potrebbe essere stato eliminato o modificato altrove.';
+$lang['user_notify']           = 'Notifica utente';
+$lang['note_notify']           = 'Le email di notifica sono inviate soltanto se all\'utente è stata assegnata una nuova password.';
+$lang['note_group']            = 'Se non si specifica alcun gruppo, i nuovi utenti saranno aggiunti al gruppo predefinito (%s).';
+$lang['note_pass']             = 'La password verrà generata automaticamente qualora il campo di inserimento relativo venisse lasciato vuoto e le notifiche all\'utente fossero abilitate.';
+$lang['add_ok']                = 'Utente aggiunto correttamente';
+$lang['add_fail']              = 'Aggiunta utente fallita';
+$lang['notify_ok']             = 'Email di notifica inviata';
+$lang['notify_fail']           = 'L\'email di notifica non può essere inviata';
diff --git a/sources/lib/plugins/usermanager/lang/it/list.txt b/sources/lib/plugins/usermanager/lang/it/list.txt
new file mode 100644
index 0000000..91e27a9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/it/list.txt
@@ -0,0 +1 @@
+===== Elenco Utenti =====
diff --git a/sources/lib/plugins/usermanager/lang/ja/add.txt b/sources/lib/plugins/usermanager/lang/ja/add.txt
new file mode 100644
index 0000000..87b30e0
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ja/add.txt
@@ -0,0 +1 @@
+===== ユーザー作成 =====
diff --git a/sources/lib/plugins/usermanager/lang/ja/delete.txt b/sources/lib/plugins/usermanager/lang/ja/delete.txt
new file mode 100644
index 0000000..67ef23e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ja/delete.txt
@@ -0,0 +1 @@
+===== ユーザー削除 =====
diff --git a/sources/lib/plugins/usermanager/lang/ja/edit.txt b/sources/lib/plugins/usermanager/lang/ja/edit.txt
new file mode 100644
index 0000000..e7695e3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ja/edit.txt
@@ -0,0 +1 @@
+===== ユーザー編集 =====
diff --git a/sources/lib/plugins/usermanager/lang/ja/import.txt b/sources/lib/plugins/usermanager/lang/ja/import.txt
new file mode 100644
index 0000000..751e515
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ja/import.txt
@@ -0,0 +1,10 @@
+===== 一括ユーザーインポート =====
+
+少なくとも４列のユーザーCSVファイルが必要です。
+列の順序：ユーザーID、氏名、電子メールアドレス、グループ。
+CSVフィールドはカンマ（,）区切り、文字列は引用符（""）区切りです。
+エスケープにバックスラッシュ（\）を使用できます。
+適切なファイル例は、上記の"エクスポートユーザー"機能で試して下さい。 
+重複するユーザーIDは無視されます。
+
+正常にインポートされたユーザー毎に、パスワードを作成し、電子メールで送付します。
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ja/intro.txt b/sources/lib/plugins/usermanager/lang/ja/intro.txt
new file mode 100644
index 0000000..5dbe51c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ja/intro.txt
@@ -0,0 +1 @@
+====== ユーザー管理 ======
diff --git a/sources/lib/plugins/usermanager/lang/ja/lang.php b/sources/lib/plugins/usermanager/lang/ja/lang.php
new file mode 100644
index 0000000..23109f2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ja/lang.php
@@ -0,0 +1,74 @@
+
+ * @author Chris Smith 
+ * @author Ikuo Obataya 
+ * @author Daniel Dupriest 
+ * @author Kazutaka Miyasaka 
+ * @author Taisuke Shimamoto 
+ * @author Satoshi Sahara 
+ * @author Hideaki SAWADA 
+ * @author Hideaki SAWADA 
+ */
+$lang['menu']                  = 'ユーザー管理';
+$lang['noauth']                = '（ユーザー認証が無効です）';
+$lang['nosupport']             = '（ユーザー管理はサポートされていません）';
+$lang['badauth']               = '認証のメカニズムが無効です';
+$lang['user_id']               = 'ユーザー';
+$lang['user_pass']             = 'パスワード';
+$lang['user_name']             = '氏名';
+$lang['user_mail']             = 'メールアドレス';
+$lang['user_groups']           = 'グループ';
+$lang['field']                 = '項目';
+$lang['value']                 = '値';
+$lang['add']                   = '追加';
+$lang['delete']                = '削除';
+$lang['delete_selected']       = '選択したユーザーを削除';
+$lang['edit']                  = '編集';
+$lang['edit_prompt']           = 'このユーザーを編集';
+$lang['modify']                = '変更を保存';
+$lang['search']                = '検索';
+$lang['search_prompt']         = '検索を実行';
+$lang['clear']                 = '検索フィルターをリセット';
+$lang['filter']                = 'フィルター';
+$lang['export_all']            = '全ユーザーのエクスポート（CSV）';
+$lang['export_filtered']       = '抽出したユーザー一覧のエクスポート（CSV）';
+$lang['import']                = '新規ユーザーのインポート';
+$lang['line']                  = '行番号';
+$lang['error']                 = 'エラーメッセージ';
+$lang['summary']               = 'ユーザー %1$d-%2$d / %3$d, 総ユーザー数 %4$d';
+$lang['nonefound']             = 'ユーザーが見つかりません, 総ユーザー数 %d';
+$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']           = '通知メールを送信できませんでした';
+$lang['import_userlistcsv']    = 'ユーザー一覧ファイル（CSV）：';
+$lang['import_header']         = '最新インポート - 失敗';
+$lang['import_success_count']  = 'ユーザーインポート：ユーザーが%d件あり、%d件正常にインポートされました。';
+$lang['import_failure_count']  = 'ユーザーインポート：%d件が失敗しました。失敗は次のとおりです。';
+$lang['import_error_fields']   = '列の不足（４列必要）が%d件ありました。';
+$lang['import_error_baduserid'] = '欠落したユーザーID';
+$lang['import_error_badname']  = '不正な氏名';
+$lang['import_error_badmail']  = '不正な電子メールアドレス';
+$lang['import_error_upload']   = 'インポートが失敗しました。CSVファイルをアップロードできなかったか、ファイルが空です。';
+$lang['import_error_readfail'] = 'インポートが失敗しました。アップロードされたファイルが読込できません。';
+$lang['import_error_create']   = 'ユーザーが作成できません。';
+$lang['import_notify_fail']    = '通知メッセージがインポートされたユーザー（%s）・電子メールアドレス（%s）に送信できませんでした。';
+$lang['import_downloadfailures'] = '修正用に失敗を CSVファイルとしてダウンロードする。';
diff --git a/sources/lib/plugins/usermanager/lang/ja/list.txt b/sources/lib/plugins/usermanager/lang/ja/list.txt
new file mode 100644
index 0000000..182cc19
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ja/list.txt
@@ -0,0 +1 @@
+===== ユーザーリスト =====
diff --git a/sources/lib/plugins/usermanager/lang/kk/lang.php b/sources/lib/plugins/usermanager/lang/kk/lang.php
new file mode 100644
index 0000000..b1bbd39
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/kk/lang.php
@@ -0,0 +1,9 @@
+
+ * @author Seung-Chul Yoo 
+ * @author erial2@gmail.com
+ * @author Myeongjin 
+ * @author Gerrit Uitslag 
+ * @author Garam 
+ */
+$lang['menu']                  = '사용자 관리자';
+$lang['noauth']                = '(사용자 인증이 불가능합니다)';
+$lang['nosupport']             = '(사용자 관리가 지원되지 않습니다)';
+$lang['badauth']               = '인증 메커니즘이 잘못되었습니다';
+$lang['user_id']               = '사용자';
+$lang['user_pass']             = '비밀번호';
+$lang['user_name']             = '실명';
+$lang['user_mail']             = '이메일 ';
+$lang['user_groups']           = '그룹';
+$lang['field']                 = '항목';
+$lang['value']                 = '값';
+$lang['add']                   = '추가';
+$lang['delete']                = '삭제';
+$lang['delete_selected']       = '선택 삭제';
+$lang['edit']                  = '편집';
+$lang['edit_prompt']           = '이 사용자 편집';
+$lang['modify']                = '바뀜 저장';
+$lang['search']                = '검색';
+$lang['search_prompt']         = '검색 수행';
+$lang['clear']                 = '검색 필터 재설정';
+$lang['filter']                = '필터';
+$lang['export_all']            = '모든 사용자 목록 내보내기 (CSV)';
+$lang['export_filtered']       = '필터된 사용자 목록 내보내기 (CSV)';
+$lang['import']                = '새 사용자 목록 가져오기';
+$lang['line']                  = '줄 번호';
+$lang['error']                 = '오류 메시지';
+$lang['summary']               = '찾은 사용자 %3$d 중 %1$d-%2$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']           = '알림 이메일을 보낼 수 없습니다';
+$lang['import_userlistcsv']    = '사용자 목록 파일 (CSV):';
+$lang['import_header']         = '가장 최근 가져오기 - 실패';
+$lang['import_success_count']  = '사용자 가져오기: 사용자 %d명을 찾았고, %d명을 성공적으로 가져왔습니다.';
+$lang['import_failure_count']  = '사용자 가져오기: %d명을 가져오지 못했습니다. 실패는 아래에 나타나 있습니다.';
+$lang['import_error_fields']   = '충분하지 않은 필드로, %d개를 찾았고, 4개가 필요합니다.';
+$lang['import_error_baduserid'] = '사용자 id 없음';
+$lang['import_error_badname']  = '잘못된 이름';
+$lang['import_error_badmail']  = '잘못된 이메일 주소';
+$lang['import_error_upload']   = '가져오기를 실패했습니다. csv 파일을 올릴 수 없거나 비어 있습니다.';
+$lang['import_error_readfail'] = '가져오기를 실패했습니다. 올린 파일을 읽을 수 없습니다.';
+$lang['import_error_create']   = '사용자를 만들 수 없습니다.';
+$lang['import_notify_fail']    = '알림 메시지를 가져온 %s (이메일: %s) 사용자에게 보낼 수 없습니다.';
+$lang['import_downloadfailures'] = '교정을 위한 CSV로 다운로드 실패';
diff --git a/sources/lib/plugins/usermanager/lang/ko/list.txt b/sources/lib/plugins/usermanager/lang/ko/list.txt
new file mode 100644
index 0000000..2a1b45b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ko/list.txt
@@ -0,0 +1 @@
+===== 사용자 목록 =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/la/add.txt b/sources/lib/plugins/usermanager/lang/la/add.txt
new file mode 100644
index 0000000..beb797c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/la/add.txt
@@ -0,0 +1 @@
+===== Sodalem addere =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/la/delete.txt b/sources/lib/plugins/usermanager/lang/la/delete.txt
new file mode 100644
index 0000000..1eb5e1f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/la/delete.txt
@@ -0,0 +1 @@
+===== Sodalem delere =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/la/edit.txt b/sources/lib/plugins/usermanager/lang/la/edit.txt
new file mode 100644
index 0000000..4e3d3b2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/la/edit.txt
@@ -0,0 +1 @@
+===== Sodalem recensere =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/la/intro.txt b/sources/lib/plugins/usermanager/lang/la/intro.txt
new file mode 100644
index 0000000..7f5c011
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/la/intro.txt
@@ -0,0 +1 @@
+====== Sodalis Tabella ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/la/lang.php b/sources/lib/plugins/usermanager/lang/la/lang.php
new file mode 100644
index 0000000..52c8487
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/la/lang.php
@@ -0,0 +1,47 @@
+
+ */
+$lang['menu']                  = 'Sodalis Tabella';
+$lang['noauth']                = '(Sodalis confirmatio deest)';
+$lang['nosupport']             = '(Sodalis administratio deest)';
+$lang['badauth']               = 'Confirmatio fieri non potest.';
+$lang['user_id']               = 'Sodalis';
+$lang['user_pass']             = 'Tessera';
+$lang['user_name']             = 'Nomen uerum';
+$lang['user_mail']             = 'Cursus Interretialis';
+$lang['user_groups']           = 'Grex';
+$lang['field']                 = 'Campus';
+$lang['value']                 = 'Vis';
+$lang['add']                   = 'Addere';
+$lang['delete']                = 'Delere';
+$lang['delete_selected']       = 'Electa delere';
+$lang['edit']                  = 'Recensere';
+$lang['edit_prompt']           = 'Sodalem recensere';
+$lang['modify']                = 'Mutata seruare';
+$lang['search']                = 'Quaerere';
+$lang['search_prompt']         = 'Agentem quaerere';
+$lang['clear']                 = 'Colum quaerendi abrogare';
+$lang['filter']                = 'Colum';
+$lang['summary']               = 'Sodales %1$d-%2$d inter %3$d ostenduntur. Numerus Sodalium. %4$d.';
+$lang['nonefound']             = 'Sodalis non repertus. Numerus sodalium: %d';
+$lang['delete_ok']             = '%d Sodales delentur.';
+$lang['delete_fail']           = '%d non deleri possunt.';
+$lang['update_ok']             = 'Sodalis feliciter nouatus\a';
+$lang['update_fail']           = 'Sodalis infeliciter nouatus\a';
+$lang['update_exists']         = 'Nomen Sodalis non mutatur, eo quod hoc nomen (%s) iam electum est.';
+$lang['start']                 = 'in primis';
+$lang['prev']                  = 'antea';
+$lang['next']                  = 'postea';
+$lang['last']                  = 'in extremis';
+$lang['edit_usermissing']      = 'Hic Sodalis non inuenitur, eo quod nomen iam deletum uel mutatum est.';
+$lang['user_notify']           = 'Sodalem adnotare';
+$lang['note_notify']           = 'Adnotationes cursu interretiali missae solum si noua tessera petitur.';
+$lang['note_group']            = 'Noui\ae Sodales communi Gregi adduntur (%s) si Grex non elegitur.';
+$lang['note_pass']             = 'Tessera non generata nisi campus uacuos est et Sodalis adnotationes aptae faciuntur.';
+$lang['add_ok']                = 'Sodalis feliciter additur.';
+$lang['add_fail']              = 'Sodalis infeliciter additur.';
+$lang['notify_ok']             = 'Adnotationes cursu interretiali missae';
+$lang['notify_fail']           = 'Adnotationes cursu interretiali non missae';
diff --git a/sources/lib/plugins/usermanager/lang/la/list.txt b/sources/lib/plugins/usermanager/lang/la/list.txt
new file mode 100644
index 0000000..b470d2e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/la/list.txt
@@ -0,0 +1 @@
+===== Sodalis index =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/lb/lang.php b/sources/lib/plugins/usermanager/lang/lb/lang.php
new file mode 100644
index 0000000..59acdf7
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/lb/lang.php
@@ -0,0 +1,6 @@
+
+ * @author audrius.klevas@gmail.com
+ * @author Arunas Vaitekunas 
+ */
+$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 --git a/sources/lib/plugins/usermanager/lang/lt/list.txt b/sources/lib/plugins/usermanager/lang/lt/list.txt
new file mode 100644
index 0000000..87be628
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/lt/list.txt
@@ -0,0 +1,2 @@
+===== Vartotojų sąrašas =====
+
diff --git a/sources/lib/plugins/usermanager/lang/lv/add.txt b/sources/lib/plugins/usermanager/lang/lv/add.txt
new file mode 100644
index 0000000..06fd700
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/lv/add.txt
@@ -0,0 +1 @@
+===== Pievienot lietotāju =====
diff --git a/sources/lib/plugins/usermanager/lang/lv/delete.txt b/sources/lib/plugins/usermanager/lang/lv/delete.txt
new file mode 100644
index 0000000..5f59af7
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/lv/delete.txt
@@ -0,0 +1 @@
+===== Dzēst lietotāju =====
diff --git a/sources/lib/plugins/usermanager/lang/lv/edit.txt b/sources/lib/plugins/usermanager/lang/lv/edit.txt
new file mode 100644
index 0000000..efb0b04
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/lv/edit.txt
@@ -0,0 +1 @@
+===== Labot lietotāju =====
diff --git a/sources/lib/plugins/usermanager/lang/lv/intro.txt b/sources/lib/plugins/usermanager/lang/lv/intro.txt
new file mode 100644
index 0000000..b248ddc
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/lv/intro.txt
@@ -0,0 +1 @@
+====== Lietotāju pārvaldnieks ======
diff --git a/sources/lib/plugins/usermanager/lang/lv/lang.php b/sources/lib/plugins/usermanager/lang/lv/lang.php
new file mode 100644
index 0000000..620678f
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/lv/lang.php
@@ -0,0 +1,48 @@
+
+ * @author Aivars Miška 
+ */
+$lang['menu']                  = 'Lietotāju pārvaldnieks';
+$lang['noauth']                = '(lietotāju autentifikācijas nav)';
+$lang['nosupport']             = '(lietotāju pārvaldība netiek uzturēta)';
+$lang['badauth']               = 'nederīgs autentifikācijas mehānisms';
+$lang['user_id']               = 'Lietotājs';
+$lang['user_pass']             = 'Parole';
+$lang['user_name']             = 'Vārds/uzvārds';
+$lang['user_mail']             = 'Epasts';
+$lang['user_groups']           = 'Grupas';
+$lang['field']                 = 'Lauks';
+$lang['value']                 = 'Vērtība';
+$lang['add']                   = 'Pielikt';
+$lang['delete']                = 'Dzēst';
+$lang['delete_selected']       = 'Dzēst izvēlēto';
+$lang['edit']                  = 'Labot';
+$lang['edit_prompt']           = 'Labot šo lietotāju';
+$lang['modify']                = 'Saglabāt izmaiņas';
+$lang['search']                = 'Meklēšana';
+$lang['search_prompt']         = 'Meklēt';
+$lang['clear']                 = 'Noņemt meklēšanas filtru';
+$lang['filter']                = 'Filtrs';
+$lang['summary']               = 'Lietotāji %1$d.- %2$d. no %3$d atrastajiem. Pavisam %4$d lietotāji.';
+$lang['nonefound']             = 'Neviens nav atrasts. Pavisam %d lietotāju.';
+$lang['delete_ok']             = 'Dzēsti %d lietotāji';
+$lang['delete_fail']           = '%d neizdevās izdzēst.';
+$lang['update_ok']             = 'Lietotāja dati saglabāti';
+$lang['update_fail']           = 'Lietotāja dati nav saglabāti';
+$lang['update_exists']         = 'Lietotāja vārds nav nomainīts, norādīto vārdu (%s) kāds jau izmanto (pārējās izmaiņas tiks saglabātas).';
+$lang['start']                 = 'sākums';
+$lang['prev']                  = 'iepriekšējais';
+$lang['next']                  = 'nākamais';
+$lang['last']                  = 'pēdējais';
+$lang['edit_usermissing']      = 'Norādītais lietotājs nav atrasts, varbūt tas ir dzēst vai mainīts citur.';
+$lang['user_notify']           = 'Paziņot lietotājam';
+$lang['note_notify']           = 'Paziņojumus izsūta tikai tad, ja lietotājam dod jaunu paroli.';
+$lang['note_group']            = 'Ja nenorāda grupu, lietotāju pievieno noklusētajai grupai (%s).';
+$lang['note_pass']             = 'Ja paroles lauku atstāj tukšu un atzīmē paziņošanu lietotājam, parole tiks ģenerēta automātiski.';
+$lang['add_ok']                = 'Lietotājs veiksmīgi pievienots';
+$lang['add_fail']              = 'Lietotājs nav pievienots.';
+$lang['notify_ok']             = 'Paziņojums izsūtīts.';
+$lang['notify_fail']           = 'Nevar izsūtīt paziņojumu.';
diff --git a/sources/lib/plugins/usermanager/lang/lv/list.txt b/sources/lib/plugins/usermanager/lang/lv/list.txt
new file mode 100644
index 0000000..44a10d9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/lv/list.txt
@@ -0,0 +1 @@
+===== Lietotāju saraksts =====
diff --git a/sources/lib/plugins/usermanager/lang/mk/add.txt b/sources/lib/plugins/usermanager/lang/mk/add.txt
new file mode 100644
index 0000000..c90121d
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mk/add.txt
@@ -0,0 +1 @@
+===== Додај корисник =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mk/delete.txt b/sources/lib/plugins/usermanager/lang/mk/delete.txt
new file mode 100644
index 0000000..8a6b5e9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mk/delete.txt
@@ -0,0 +1 @@
+===== Избриши корисник =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mk/edit.txt b/sources/lib/plugins/usermanager/lang/mk/edit.txt
new file mode 100644
index 0000000..da63061
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mk/edit.txt
@@ -0,0 +1 @@
+===== Уреди корисник =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mk/intro.txt b/sources/lib/plugins/usermanager/lang/mk/intro.txt
new file mode 100644
index 0000000..747d009
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mk/intro.txt
@@ -0,0 +1 @@
+===== Менаџер за корисник =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mk/lang.php b/sources/lib/plugins/usermanager/lang/mk/lang.php
new file mode 100644
index 0000000..97ef513
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mk/lang.php
@@ -0,0 +1,38 @@
+
+ */
+$lang['menu']                  = 'Менаџер за корисник';
+$lang['noauth']                = '(автентикација на корисник не е достапна)';
+$lang['nosupport']             = '(менаџирање на корисник не е поддржано)';
+$lang['badauth']               = 'невалиден механизам за автентикација';
+$lang['user_id']               = 'Корисник';
+$lang['user_pass']             = 'Лозинка';
+$lang['user_name']             = 'Вистинско име';
+$lang['user_mail']             = 'Е-пошта';
+$lang['user_groups']           = 'Групи';
+$lang['field']                 = 'Поле';
+$lang['value']                 = 'Вредност';
+$lang['add']                   = 'Додај';
+$lang['delete']                = 'Избриши';
+$lang['delete_selected']       = 'Избриши ги избраните';
+$lang['edit']                  = 'Уреди';
+$lang['edit_prompt']           = 'Уреди го овој корисник';
+$lang['modify']                = 'Зачувај промени';
+$lang['search']                = 'Барај';
+$lang['search_prompt']         = 'Изврши пребарување';
+$lang['clear']                 = 'Ресетирај го филтерот за пребарување';
+$lang['filter']                = 'Филтер';
+$lang['delete_ok']             = '%d корисници се избришани';
+$lang['delete_fail']           = '%d не успееја да се избришат.';
+$lang['update_ok']             = 'Корисникот е успешно ажуриран';
+$lang['update_fail']           = 'Корисникот не е успешно ажуриран';
+$lang['start']                 = 'почеток';
+$lang['prev']                  = 'претходна';
+$lang['next']                  = 'следна';
+$lang['last']                  = 'последна';
+$lang['user_notify']           = 'Извести го корисникот';
+$lang['add_ok']                = 'Корисникот е успешно додаден';
+$lang['add_fail']              = 'Додавањето на корисникот не е успешно';
diff --git a/sources/lib/plugins/usermanager/lang/mk/list.txt b/sources/lib/plugins/usermanager/lang/mk/list.txt
new file mode 100644
index 0000000..651462e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mk/list.txt
@@ -0,0 +1 @@
+===== Листа со корисници =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mr/add.txt b/sources/lib/plugins/usermanager/lang/mr/add.txt
new file mode 100644
index 0000000..fc3a877
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mr/add.txt
@@ -0,0 +1 @@
+====== सदस्य नोंद करा ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mr/delete.txt b/sources/lib/plugins/usermanager/lang/mr/delete.txt
new file mode 100644
index 0000000..cf0e485
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mr/delete.txt
@@ -0,0 +1 @@
+====== सदस्य डिलीट करा ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mr/edit.txt b/sources/lib/plugins/usermanager/lang/mr/edit.txt
new file mode 100644
index 0000000..2d3d649
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mr/edit.txt
@@ -0,0 +1 @@
+====== सदस्य बदला ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mr/intro.txt b/sources/lib/plugins/usermanager/lang/mr/intro.txt
new file mode 100644
index 0000000..9253b32
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mr/intro.txt
@@ -0,0 +1 @@
+====== सदस्य व्यवस्थापक ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/mr/lang.php b/sources/lib/plugins/usermanager/lang/mr/lang.php
new file mode 100644
index 0000000..8915678
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mr/lang.php
@@ -0,0 +1,50 @@
+
+ * @author Padmanabh Kulkarni
+ * @author shantanoo@gmail.com
+ */
+$lang['menu']                  = 'सदस्य व्यवस्थापक';
+$lang['noauth']                = '( सदस्य अधिकृत करण्याची सुविधा नाही )';
+$lang['nosupport']             = '( सदस्य व्यवस्थापन उपलब्ध नाही )';
+$lang['badauth']               = 'अधिकृत करण्याची व्यवस्था अवैध';
+$lang['user_id']               = 'सदस्य';
+$lang['user_pass']             = 'पासवर्ड';
+$lang['user_name']             = 'खरे नाव';
+$lang['user_mail']             = 'ईमेल';
+$lang['user_groups']           = 'गट';
+$lang['field']                 = 'रकाना';
+$lang['value']                 = 'किम्मत';
+$lang['add']                   = 'जोड़ा';
+$lang['delete']                = 'डिलीट';
+$lang['delete_selected']       = 'निवडलेले डिलीट करा';
+$lang['edit']                  = 'संपादन';
+$lang['edit_prompt']           = 'या सदस्याची माहिती बदला';
+$lang['modify']                = 'बदल सुरक्षित करा';
+$lang['search']                = 'शोध';
+$lang['search_prompt']         = 'शोध करा';
+$lang['clear']                 = 'शोधाचे निकष बदला';
+$lang['filter']                = 'निकष';
+$lang['summary']               = 'सापडलेल्या %3$d सदस्यापैकी %1$d ते %2$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 --git a/sources/lib/plugins/usermanager/lang/mr/list.txt b/sources/lib/plugins/usermanager/lang/mr/list.txt
new file mode 100644
index 0000000..ab69067
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/mr/list.txt
@@ -0,0 +1 @@
+====== सदस्य यादी ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ms/lang.php b/sources/lib/plugins/usermanager/lang/ms/lang.php
new file mode 100644
index 0000000..77ad2a1
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ms/lang.php
@@ -0,0 +1,6 @@
+
+ * @author SarojKumar Dhakal 
+ * @author Saroj Dhakal
+ */
+$lang['menu']                  = 'प्रयोगकर्ता व्यवस्थापक';
+$lang['noauth']                = '(प्रयोगकर्ता  प्रमाणिकरण  उपलब्ध छैन)';
+$lang['nosupport']             = '(प्रयोगकर्ता व्यवस्थापन समर्थित छैन)';
+$lang['badauth']               = 'अमान्य प्रमाणिकरण विधि';
+$lang['user_id']               = 'प्रयोगकर्ता';
+$lang['user_pass']             = 'प्रवेशशब्द';
+$lang['user_name']             = 'वास्तविक नाम';
+$lang['user_mail']             = 'इमेल';
+$lang['user_groups']           = 'समूह ';
+$lang['field']                 = 'क्षेत्र';
+$lang['value']                 = 'मान ';
+$lang['add']                   = 'थप्नुहोस्';
+$lang['delete']                = 'मेट्नुहोस्';
+$lang['delete_selected']       = 'सेलेक्ट गरिएको मेट्नुहोस्';
+$lang['edit']                  = 'सम्पादन गर्नुहोस्';
+$lang['edit_prompt']           = 'यो प्रयोगकर्ता सम्पादन गर्नुहोस् ';
+$lang['modify']                = 'परिवर्तन वचत गर्नुहोस्';
+$lang['search']                = 'खोज';
+$lang['search_prompt']         = 'खोज्नुहोस्';
+$lang['clear']                 = 'खोज फिल्टर पूर्वरुपमा फर्काउनुहोस्';
+$lang['filter']                = 'फिल्टर ';
+$lang['summary']               = 'देखाउदै  %1$d-%2$d of %3$d भेटिएका   %4$d कुल प्रयोगकर्ता मध्येबाट ।';
+$lang['nonefound']             = '%d कुल प्रयोगकर्ता। कुनै पनि प्रयोगकर्ता भेटिएन ।';
+$lang['delete_ok']             = '%d प्रयोगकर्ता मेटिए';
+$lang['delete_fail']           = '%d प्रयोगकर्ता हटाउन सकिएन ';
+$lang['update_ok']             = 'प्रयोगकर्ता सफलतापूर्वक अध्यावधिक गरियो ';
+$lang['update_fail']           = 'प्रयोगकर्ता अध्यावधिक कार्य असफल';
+$lang['update_exists']         = 'पर्ययोगकर्ताको नाम परिवर्तन असफल, दिइएको प्रयोगकर्ता नाम( %s) पहिले देखि रहेको छ। ( यसबाहेकका परिवर्रनहरू गरिएका छन्)';
+$lang['start']                 = 'सुरु गर्नुहोस्';
+$lang['prev']                  = 'पहिलेको ';
+$lang['next']                  = 'पछिको';
+$lang['last']                  = 'अन्तिम';
+$lang['edit_usermissing']      = 'छानिएको प्रयोगकर्ता भेटिएन,  खुलाइएको प्रयोगकर्ता मेटिएको या कतै परिवर्तन गरिएको हुनसक्छ।';
+$lang['user_notify']           = 'प्रयोगकर्तालाई जानकारी दिनुहोस् ';
+$lang['note_notify']           = 'जानकारी इमेल तब मात्र पठाइन्छ जब प्रयोगकर्तालाई नयाँ प्रवेश शब्द दिइन्छ।';
+$lang['note_group']            = 'नयाँ प्रयोगकर्तालाई पूर्वनिर्धारित समूह नखुलाएमा (%s) मा समावेश गराइनेछ ।';
+$lang['note_pass']             = 'प्रवेश शव्द क्षेत्र खाली राखेमा प्रवेश शव्द स्वत: निर्माण हुनेछ र प्रयोगकर्तालाई जानकारी पठइने छ ।';
+$lang['add_ok']                = 'प्रोगकर्ता सफलतापूर्वक थपियो';
+$lang['add_fail']              = 'प्रयोगकर्ता थप्ने कार्य असफल';
+$lang['notify_ok']             = 'जानकारी पत्र पठाइयो';
+$lang['notify_fail']           = 'जानकारी पत्र पठाउन सकिएन ';
diff --git a/sources/lib/plugins/usermanager/lang/ne/list.txt b/sources/lib/plugins/usermanager/lang/ne/list.txt
new file mode 100644
index 0000000..ece94b3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ne/list.txt
@@ -0,0 +1 @@
+===== प्रयोगकर्ता सुची =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/nl/add.txt b/sources/lib/plugins/usermanager/lang/nl/add.txt
new file mode 100644
index 0000000..992d9f3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/nl/add.txt
@@ -0,0 +1 @@
+===== Nieuwe gebruiker =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/nl/delete.txt b/sources/lib/plugins/usermanager/lang/nl/delete.txt
new file mode 100644
index 0000000..ad26e05
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/nl/delete.txt
@@ -0,0 +1 @@
+===== Verwijder gebruiker =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/nl/edit.txt b/sources/lib/plugins/usermanager/lang/nl/edit.txt
new file mode 100644
index 0000000..0d58e48
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/nl/edit.txt
@@ -0,0 +1 @@
+===== Gebruiker wijzigen =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/nl/import.txt b/sources/lib/plugins/usermanager/lang/nl/import.txt
new file mode 100644
index 0000000..2678910
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/nl/import.txt
@@ -0,0 +1,8 @@
+===== Massa-import van gebruikers =====
+
+Hiervoor is een CSV-bestand nodig van de gebruikers met minstens vier kolommen. De kolommen moeten bevatten, in deze volgorde: gebruikers-id, complete naam, e-mailadres en groepen.
+Het CSV-velden moeten worden gescheiden met komma's (,) en de teksten moeten worden omringd met dubbele aanhalingstekens (""). Backslash (\) kan worden gebruikt om te escapen.
+Voor een voorbeeld van een werkend bestand, probeer de "Exporteer Gebruikers" functie hierboven.
+Dubbele gebruikers-id's zullen worden genegeerd.
+
+Een wachtwoord zal worden gegenereerd en gemaild naar elke gebruiker die succesvol is geïmporteerd.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/nl/intro.txt b/sources/lib/plugins/usermanager/lang/nl/intro.txt
new file mode 100644
index 0000000..7df09db
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/nl/intro.txt
@@ -0,0 +1 @@
+==== Gebruikersmanager =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/nl/lang.php b/sources/lib/plugins/usermanager/lang/nl/lang.php
new file mode 100644
index 0000000..5cebede
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/nl/lang.php
@@ -0,0 +1,77 @@
+
+ * @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
+ * @author Marijn Hofstra 
+ * @author Timon Van Overveldt 
+ * @author Jeroen
+ * @author Ricardo Guijt 
+ * @author Gerrit Uitslag 
+ */
+$lang['menu']                  = 'Gebruikersmanager';
+$lang['noauth']                = '(gebruikersauthenticatie niet beschikbaar)';
+$lang['nosupport']             = '(gebruikersbeheer niet ondersteund)';
+$lang['badauth']               = 'ongeldige authenticatiemethode';
+$lang['user_id']               = 'Gebruiker';
+$lang['user_pass']             = 'Wachtwoord';
+$lang['user_name']             = 'Volledige naam';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Groepen';
+$lang['field']                 = 'Veld';
+$lang['value']                 = 'Waarde';
+$lang['add']                   = 'Toevoegen';
+$lang['delete']                = 'Verwijder';
+$lang['delete_selected']       = 'Verwijder geselecteerden';
+$lang['edit']                  = 'Wijzigen';
+$lang['edit_prompt']           = 'Wijzig deze gebruiker';
+$lang['modify']                = 'Wijzigingen opslaan';
+$lang['search']                = 'Zoek';
+$lang['search_prompt']         = 'Voer zoekopdracht uit';
+$lang['clear']                 = 'Verwijder zoekfilter';
+$lang['filter']                = 'Filter';
+$lang['export_all']            = 'Exporteer Alle Gebruikers (CSV)';
+$lang['export_filtered']       = 'Exporteer Gefilterde Gebruikers (CSV)';
+$lang['import']                = 'Importeer Nieuwe Gebruikers';
+$lang['line']                  = 'Regelnummer';
+$lang['error']                 = 'Foutmelding';
+$lang['summary']               = 'Weergegeven gebruikers %1$d-%2$d van %3$d gevonden. %4$d gebruikers in totaal.';
+$lang['nonefound']             = 'Geen gebruikers gevonden. %d gebruikers in totaal.';
+$lang['delete_ok']             = '%d gebruikers verwijderd';
+$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 aanpassingen worden wel doorgevoerd).';
+$lang['start']                 = 'start';
+$lang['prev']                  = 'vorige';
+$lang['next']                  = 'volgende';
+$lang['last']                  = 'laatste';
+$lang['edit_usermissing']      = 'Geselecteerde gebruiker niet gevonden, de opgegeven gebruikersnaam kan verwijderd zijn of elders aangepast.';
+$lang['user_notify']           = 'Gebruiker notificeren';
+$lang['note_notify']           = 'Notificatie-e-mails worden alleen verstuurd wanneer de gebruiker een nieuw wachtwoord wordt toegekend.';
+$lang['note_group']            = 'Nieuwe gebruikers zullen aan de standaard groep (%s) worden toegevoegd als er geen groep opgegeven is.';
+$lang['note_pass']             = 'Het wachtwoord wordt automatisch gegenereerd als het veld wordt leeggelaten en gebruikersnotificaties aanstaan.';
+$lang['add_ok']                = 'Gebruiker succesvol toegevoegd';
+$lang['add_fail']              = 'Gebruiker kon niet worden toegevoegd';
+$lang['notify_ok']             = 'Notificatie-e-mail verzonden';
+$lang['notify_fail']           = 'Notificatie-e-mail kon niet worden verzonden';
+$lang['import_userlistcsv']    = 'Gebruikerslijst (CSV-bestand):';
+$lang['import_header']         = 'Meest recente import - Gevonden fouten';
+$lang['import_success_count']  = 'Gebruikers importeren: %d gebruikers gevonden, %d geïmporteerd';
+$lang['import_failure_count']  = 'Gebruikers importeren: %d mislukt. Fouten zijn hieronder weergegeven.';
+$lang['import_error_fields']   = 'Onvoldoende velden, gevonden %d, nodig 4.';
+$lang['import_error_baduserid'] = 'Gebruikers-id mist';
+$lang['import_error_badname']  = 'Verkeerde naam';
+$lang['import_error_badmail']  = 'Verkeerd e-mailadres';
+$lang['import_error_upload']   = 'Importeren mislukt. Het CSV bestand kon niet worden geüpload of is leeg.';
+$lang['import_error_readfail'] = 'Importeren mislukt. Lezen van het geüploade bestand is mislukt.';
+$lang['import_error_create']   = 'Aanmaken van de gebruiker was niet mogelijk.';
+$lang['import_notify_fail']    = 'Notificatiebericht kon niet naar de geïmporteerde gebruiker worden verstuurd, %s met e-mail %s.';
+$lang['import_downloadfailures'] = 'Download de gevonden fouten als CSV voor correctie';
diff --git a/sources/lib/plugins/usermanager/lang/nl/list.txt b/sources/lib/plugins/usermanager/lang/nl/list.txt
new file mode 100644
index 0000000..a9aac84
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/nl/list.txt
@@ -0,0 +1 @@
+===== Gebruikerslijst =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/no/add.txt b/sources/lib/plugins/usermanager/lang/no/add.txt
new file mode 100644
index 0000000..4fb9cf2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/no/add.txt
@@ -0,0 +1 @@
+===== Legg til bruker =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/no/delete.txt b/sources/lib/plugins/usermanager/lang/no/delete.txt
new file mode 100644
index 0000000..5501018
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/no/delete.txt
@@ -0,0 +1 @@
+===== Slett bruker =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/no/edit.txt b/sources/lib/plugins/usermanager/lang/no/edit.txt
new file mode 100644
index 0000000..3dff0c9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/no/edit.txt
@@ -0,0 +1 @@
+===== Rediger bruker =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/no/intro.txt b/sources/lib/plugins/usermanager/lang/no/intro.txt
new file mode 100644
index 0000000..c9e1e5b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/no/intro.txt
@@ -0,0 +1 @@
+===== Behandle brukere =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/no/lang.php b/sources/lib/plugins/usermanager/lang/no/lang.php
new file mode 100644
index 0000000..83823b2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/no/lang.php
@@ -0,0 +1,60 @@
+
+ * @author Arild Burud 
+ * @author Torkill Bruland 
+ * @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 
+ * @author Rune Rasmussen syntaxerror.no@gmail.com
+ * @author Jon Bøe 
+ * @author Egil Hansen 
+ */
+$lang['menu']                  = 'Behandle brukere';
+$lang['noauth']                = '(autentisering av brukere ikke tilgjengelig)';
+$lang['nosupport']             = '(behandling av brukere støttes ikke)';
+$lang['badauth']               = 'ugyldig autentiseringsmekanisme';
+$lang['user_id']               = 'Bruker';
+$lang['user_pass']             = 'Passord';
+$lang['user_name']             = 'Fullt navn';
+$lang['user_mail']             = 'E-post';
+$lang['user_groups']           = 'Grupper';
+$lang['field']                 = 'Felt';
+$lang['value']                 = 'Verdi';
+$lang['add']                   = 'Legg til';
+$lang['delete']                = 'Slett';
+$lang['delete_selected']       = 'Slett valgte';
+$lang['edit']                  = 'Rediger';
+$lang['edit_prompt']           = 'Rediger denne brukeren';
+$lang['modify']                = 'Lagre endringer';
+$lang['search']                = 'Søk';
+$lang['search_prompt']         = 'Start søk';
+$lang['clear']                 = 'Tilbakestill søkefilter';
+$lang['filter']                = 'Filter';
+$lang['summary']               = 'Viser brukere %1$d-%2$d av %3$d. %4$d users total.';
+$lang['nonefound']             = 'Ingen brukere funnet. %d brukere totalt.';
+$lang['delete_ok']             = '%d brukere slettet.';
+$lang['delete_fail']           = '%d kunne ikke slettes.';
+$lang['update_ok']             = 'Brukeren ble oppdatert';
+$lang['update_fail']           = 'Oppdatering av brukeren feilet';
+$lang['update_exists']         = 'Endring av brukernavn feilet. Det oppgitte brukernavnet (%s) eksisterer allerede (alle andre endringer vil bli gjort).';
+$lang['start']                 = 'første';
+$lang['prev']                  = 'forrige';
+$lang['next']                  = 'neste';
+$lang['last']                  = 'siste';
+$lang['edit_usermissing']      = 'Fant ikke valgte brukere. Det oppgitte brukernavnet kan ha blitt slettet eller endret et annet sted.';
+$lang['user_notify']           = 'Varsle bruker';
+$lang['note_notify']           = 'E-post med varsling blir bare sendt hvis brukeren blir gitt nytt passord.';
+$lang['note_group']            = 'Nye brukere vil bli lagt til standardgruppen (%s) hvis ingen gruppe oppgis.';
+$lang['note_pass']             = 'Passordet vil bli autogenerert dersom feltet er tomt og varsle bruker er valgt.';
+$lang['add_ok']                = 'Brukeren ble lagt til';
+$lang['add_fail']              = 'Brukeren kunne ikke legges til';
+$lang['notify_ok']             = 'Varsling sendt';
+$lang['notify_fail']           = 'Varsling kunne ikke sendes';
diff --git a/sources/lib/plugins/usermanager/lang/no/list.txt b/sources/lib/plugins/usermanager/lang/no/list.txt
new file mode 100644
index 0000000..40de64b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/no/list.txt
@@ -0,0 +1 @@
+===== Brukerliste =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pl/add.txt b/sources/lib/plugins/usermanager/lang/pl/add.txt
new file mode 100644
index 0000000..a33f3ba
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pl/add.txt
@@ -0,0 +1 @@
+===== Dodawanie użytkownika =====
diff --git a/sources/lib/plugins/usermanager/lang/pl/delete.txt b/sources/lib/plugins/usermanager/lang/pl/delete.txt
new file mode 100644
index 0000000..72dd338
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pl/delete.txt
@@ -0,0 +1 @@
+===== Usuwanie użytkownika =====
diff --git a/sources/lib/plugins/usermanager/lang/pl/edit.txt b/sources/lib/plugins/usermanager/lang/pl/edit.txt
new file mode 100644
index 0000000..3c9d898
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pl/edit.txt
@@ -0,0 +1 @@
+===== Edycja użytkownika =====
diff --git a/sources/lib/plugins/usermanager/lang/pl/intro.txt b/sources/lib/plugins/usermanager/lang/pl/intro.txt
new file mode 100644
index 0000000..da1cfea
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pl/intro.txt
@@ -0,0 +1 @@
+====== Menadżer użytkowników ======
diff --git a/sources/lib/plugins/usermanager/lang/pl/lang.php b/sources/lib/plugins/usermanager/lang/pl/lang.php
new file mode 100644
index 0000000..2e063d2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pl/lang.php
@@ -0,0 +1,58 @@
+
+ * @author Mariusz Kujawski 
+ * @author Maciej Kurczewski 
+ * @author Sławomir Boczek 
+ * @author sleshek@wp.pl
+ * @author Leszek Stachowski 
+ * @author maros 
+ * @author Grzegorz Widła 
+ * @author Łukasz Chmaj 
+ * @author Begina Felicysym 
+ * @author Aoi Karasu 
+ */
+$lang['menu']                  = 'Menadżer użytkowników';
+$lang['noauth']                = '(uwierzytelnienie użytkownika niemożliwe)';
+$lang['nosupport']             = '(zarządzanie użytkownikami niemożliwe)';
+$lang['badauth']               = 'błędny mechanizm uwierzytelniania';
+$lang['user_id']               = 'Nazwa użytkownika';
+$lang['user_pass']             = 'Hasło';
+$lang['user_name']             = 'Użytkownik';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Grupy';
+$lang['field']                 = 'Pole';
+$lang['value']                 = 'Wartość';
+$lang['add']                   = 'Dodaj';
+$lang['delete']                = 'Usuń';
+$lang['delete_selected']       = 'Usuń zaznaczone';
+$lang['edit']                  = 'Edytuj';
+$lang['edit_prompt']           = 'Edytuj użytkownika';
+$lang['modify']                = 'Zapisz zmiany';
+$lang['search']                = 'Szukaj';
+$lang['search_prompt']         = 'Rozpocznij przeszukiwanie';
+$lang['clear']                 = 'Resetuj filtr przeszukiwania';
+$lang['filter']                = 'Filtr';
+$lang['summary']               = 'Użytkownicy %1$d-%2$d z %3$d znalezionych. Całkowita ilość użytkowników %4$d.';
+$lang['nonefound']             = 'Nie znaleziono użytkowników. Całkowita ilość użytkowników %d.';
+$lang['delete_ok']             = 'Usunięto %d użytkowników.';
+$lang['delete_fail']           = 'Błąd przy usuwaniu %d użytkowników.';
+$lang['update_ok']             = 'Dane użytkownika zostały zmienione!';
+$lang['update_fail']           = 'Błąd przy zmianie danych użytkownika!';
+$lang['update_exists']         = 'Błąd przy zmianie nazwy użytkownika, użytkownik o tej nazwie (%s) już istnieje (inne zmiany zostały wprowadzone).';
+$lang['start']                 = 'początek';
+$lang['prev']                  = 'poprzedni';
+$lang['next']                  = 'następny';
+$lang['last']                  = 'ostatni';
+$lang['edit_usermissing']      = 'Nie znaleziono wybranego użytkownika, nazwa użytkownika mogła zostać zmieniona lub usunięta.';
+$lang['user_notify']           = 'Powiadamianie użytkownika';
+$lang['note_notify']           = 'Powiadomienia wysyłane są tylko jeżeli zmieniono hasło użytkownika.';
+$lang['note_group']            = 'Nowy użytkownik zostanie dodany do grupy domyślnej (%s) jeśli nie podano innej grupy.';
+$lang['note_pass']             = 'Jeśli pole będzie puste i powiadamianie użytkownika jest włączone, hasło zostanie automatyczne wygenerowane.';
+$lang['add_ok']                = 'Dodano użytkownika';
+$lang['add_fail']              = 'Dodawanie użytkownika nie powiodło się';
+$lang['notify_ok']             = 'Powiadomienie zostało wysłane';
+$lang['notify_fail']           = 'Wysyłanie powiadomienia nie powiodło się';
diff --git a/sources/lib/plugins/usermanager/lang/pl/list.txt b/sources/lib/plugins/usermanager/lang/pl/list.txt
new file mode 100644
index 0000000..57da2e6
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pl/list.txt
@@ -0,0 +1 @@
+===== Lista użytkowników =====
diff --git a/sources/lib/plugins/usermanager/lang/pt-br/add.txt b/sources/lib/plugins/usermanager/lang/pt-br/add.txt
new file mode 100644
index 0000000..759ed68
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt-br/add.txt
@@ -0,0 +1 @@
+===== Adicionar usuário =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt-br/delete.txt b/sources/lib/plugins/usermanager/lang/pt-br/delete.txt
new file mode 100644
index 0000000..9d18d58
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt-br/delete.txt
@@ -0,0 +1 @@
+===== Excluir usuário =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt-br/edit.txt b/sources/lib/plugins/usermanager/lang/pt-br/edit.txt
new file mode 100644
index 0000000..a1be1c8
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt-br/edit.txt
@@ -0,0 +1 @@
+===== Editar usuário =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt-br/intro.txt b/sources/lib/plugins/usermanager/lang/pt-br/intro.txt
new file mode 100644
index 0000000..5f33996
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt-br/intro.txt
@@ -0,0 +1 @@
+====== Gerenciamento de Usuários ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt-br/lang.php b/sources/lib/plugins/usermanager/lang/pt-br/lang.php
new file mode 100644
index 0000000..356d139
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt-br/lang.php
@@ -0,0 +1,83 @@
+
+ * @author Felipe Castro 
+ * @author Lucien Raven 
+ * @author Enrico Nicoletto 
+ * @author Flávio Veras 
+ * @author Jeferson Propheta 
+ * @author jair.henrique@gmail.com
+ * @author Luis Dantas 
+ * @author Frederico Guimarães 
+ * @author Jair Henrique 
+ * @author Luis Dantas 
+ * @author Sergio Motta sergio@cisne.com.br
+ * @author Isaias Masiero Filho 
+ * @author Balaco Baco 
+ * @author Victor Westmann 
+ * @author Leone Lisboa Magevski 
+ * @author Dário Estevão 
+ * @author Juliano Marconi Lanigra 
+ */
+$lang['menu']                  = 'Gerenciamento de Usuários';
+$lang['noauth']                = '(o gerenciamento de usuários não está disponível)';
+$lang['nosupport']             = '(o gerenciamento de usuários não é suportado)';
+$lang['badauth']               = 'mecanismo de autenticação inválido';
+$lang['user_id']               = 'Usuário';
+$lang['user_pass']             = 'Senha';
+$lang['user_name']             = 'Nome real';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Grupos';
+$lang['field']                 = 'Campo';
+$lang['value']                 = 'Valor';
+$lang['add']                   = 'Adicionar';
+$lang['delete']                = 'Excluir';
+$lang['delete_selected']       = 'Excluir a seleção';
+$lang['edit']                  = 'Editar';
+$lang['edit_prompt']           = 'Editar esse usuário';
+$lang['modify']                = 'Salvar as alterações';
+$lang['search']                = 'Pesquisar';
+$lang['search_prompt']         = 'Executar a pesquisa';
+$lang['clear']                 = 'Limpar o filtro de pesquisa';
+$lang['filter']                = 'Filtro';
+$lang['export_all']            = 'Exportar Todos Usuários (CSV)';
+$lang['export_filtered']       = 'Exportar lista de Usuários Filtrados (CSV)';
+$lang['import']                = 'Importar Novos Usuários';
+$lang['line']                  = 'Linha Nº.';
+$lang['error']                 = 'Mensagem de Erro';
+$lang['summary']               = 'Exibindo usuários %1$d-%2$d de %3$d encontrados. %4$d usuários no total.';
+$lang['nonefound']             = 'Nenhum usuário encontrado. %d usuários no total.';
+$lang['delete_ok']             = '%d usuários excluídos';
+$lang['delete_fail']           = 'Erro na exclusão de %d usuários.';
+$lang['update_ok']             = 'Usuário atualizado com sucesso';
+$lang['update_fail']           = 'Não foi possível atualizar o usuário';
+$lang['update_exists']         = 'Não foi possível mudar o nome do usuário. O nome especificado (%s) já existe (as outras mudanças serão aplicadas).';
+$lang['start']                 = 'primeira';
+$lang['prev']                  = 'anterior';
+$lang['next']                  = 'próxima';
+$lang['last']                  = 'última';
+$lang['edit_usermissing']      = 'O usuário selecionado não foi encontrado, ele foi excluído ou teve o seu nome modificado.';
+$lang['user_notify']           = 'Notificar o usuário';
+$lang['note_notify']           = 'E-mails de notificação são enviados apenas se o usuário digitar uma nova senha.';
+$lang['note_group']            = 'Novos usuários serão adicionados ao grupo padrão (%s), caso nenhum grupo seja especificado.';
+$lang['note_pass']             = 'A senha será gerada automaticamente se o campo for deixado em branco e a notificação de usuário estiver habilitada.';
+$lang['add_ok']                = 'O usuário foi adicionado com sucesso';
+$lang['add_fail']              = 'O usuário não foi adicionado';
+$lang['notify_ok']             = 'O e-mail de notificação foi enviado';
+$lang['notify_fail']           = 'Não foi possível enviar o e-mail de notificação';
+$lang['import_userlistcsv']    = 'Arquivo de lista de usuários (CSV):';
+$lang['import_header']         = 'Importações Mais Recentes - Falhas';
+$lang['import_success_count']  = 'Importação de Usuário: %d usuário (s) encontrado (s), %d importado (s) com sucesso.';
+$lang['import_failure_count']  = 'Importação de Usuário: %d falhou. As falhas estão listadas abaixo.';
+$lang['import_error_fields']   = 'Campos insuficientes, encontrado (s) %d, necessário 4.';
+$lang['import_error_baduserid'] = 'Id do usuário não encontrado.';
+$lang['import_error_badname']  = 'Nome errado';
+$lang['import_error_badmail']  = 'Endereço de email errado';
+$lang['import_error_upload']   = 'Falha na Importação: O arquivo csv não pode ser carregado ou está vazio.';
+$lang['import_error_readfail'] = 'Falha na Importação: Habilitar para ler o arquivo a ser carregado.';
+$lang['import_error_create']   = 'Habilitar para criar o usuário.';
+$lang['import_notify_fail']    = 'Mensagem de notificação não pode ser enviada para o usuário importado, %s com email %s.';
+$lang['import_downloadfailures'] = 'Falhas no Download como CSV para correção';
diff --git a/sources/lib/plugins/usermanager/lang/pt-br/list.txt b/sources/lib/plugins/usermanager/lang/pt-br/list.txt
new file mode 100644
index 0000000..e5f79fb
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt-br/list.txt
@@ -0,0 +1 @@
+===== Lista de usuários =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt/add.txt b/sources/lib/plugins/usermanager/lang/pt/add.txt
new file mode 100644
index 0000000..a4c2672
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt/add.txt
@@ -0,0 +1 @@
+===== Adicionar Utilizador =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt/delete.txt b/sources/lib/plugins/usermanager/lang/pt/delete.txt
new file mode 100644
index 0000000..95bffc1
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt/delete.txt
@@ -0,0 +1 @@
+===== Remover Utilizador =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt/edit.txt b/sources/lib/plugins/usermanager/lang/pt/edit.txt
new file mode 100644
index 0000000..1767984
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt/edit.txt
@@ -0,0 +1 @@
+===== Editar Utilizador =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt/import.txt b/sources/lib/plugins/usermanager/lang/pt/import.txt
new file mode 100644
index 0000000..3a60403
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt/import.txt
@@ -0,0 +1,9 @@
+===== Importação de Utilizadores em Massa =====
+
+Requer um ficheiro CSV de utilizadores com pelo menos quatro colunas.
+As colunas têm de conter, em ordem: id de utilizador, nome completo, endereço de email e grupos.
+Os campos CSV devem ser separados por vírgulas (,) e as strings delimitadas por aspas (""). A contra-barra (\) pode ser usada para escapar.
+Para um exemplo de um ficheiro adequado, tente a função "Exportar Utilizadores" acima.
+Ids de utilizador duplicados serão ignorados.
+
+Uma senha será gerada e enviada por email a cada utilizador importado com sucesso.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt/intro.txt b/sources/lib/plugins/usermanager/lang/pt/intro.txt
new file mode 100644
index 0000000..27985de
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt/intro.txt
@@ -0,0 +1 @@
+===== Gerir Utilizadores =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/pt/lang.php b/sources/lib/plugins/usermanager/lang/pt/lang.php
new file mode 100644
index 0000000..b59649a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt/lang.php
@@ -0,0 +1,64 @@
+
+ * @author Enrico Nicoletto 
+ * @author Fil 
+ * @author André Neves 
+ * @author José Campos zecarlosdecampos@gmail.com
+ */
+$lang['menu']                  = 'Gestor de Perfis';
+$lang['noauth']                = '(autenticação indisponível)';
+$lang['nosupport']             = '(gestão de utilizadores não suportada)';
+$lang['badauth']               = 'Mecanismo de autenticação inválido';
+$lang['user_id']               = 'Utilizador';
+$lang['user_pass']             = 'Senha';
+$lang['user_name']             = 'Nome Real';
+$lang['user_mail']             = 'E-mail';
+$lang['user_groups']           = 'Grupos';
+$lang['field']                 = 'Campo';
+$lang['value']                 = 'Valor';
+$lang['add']                   = 'Adicionar';
+$lang['delete']                = 'Remover';
+$lang['delete_selected']       = 'Remover Seleccionado(s)';
+$lang['edit']                  = 'Editar';
+$lang['edit_prompt']           = 'Editar utilizador';
+$lang['modify']                = 'Gravar Alterações';
+$lang['search']                = 'Pesquisar';
+$lang['search_prompt']         = 'Pesquisar';
+$lang['clear']                 = 'Limpar Filtro de Pesquisa';
+$lang['filter']                = 'Filtro';
+$lang['export_all']            = 'Exportar Todos os Utilizadores (CSV)';
+$lang['export_filtered']       = 'Exportar a lista de utilizadores filtrada (CSV)';
+$lang['import']                = 'Importar Novos Utilizadores';
+$lang['error']                 = 'Mensagem de erro';
+$lang['summary']               = 'Apresentar utilizadores %1$d-%2$d de %3$d encontrados. %4$d inscritos.';
+$lang['nonefound']             = 'Nenhum utilizador encontrado. %d inscritos.';
+$lang['delete_ok']             = '%d utilizadores removidos';
+$lang['delete_fail']           = '%d remoções falhadas.';
+$lang['update_ok']             = 'Utilizador actualizado';
+$lang['update_fail']           = 'Utilizador não actualizado';
+$lang['update_exists']         = 'Falhou a alteração do nome, porque o utilizador (%s) já existe (as restantes alterações serão aplicadas).';
+$lang['start']                 = 'primeiro';
+$lang['prev']                  = 'anterior';
+$lang['next']                  = 'seguinte';
+$lang['last']                  = 'último';
+$lang['edit_usermissing']      = 'Utilizador seleccionado não encontrado. Terá já sido removido ou alterado entretanto?';
+$lang['user_notify']           = 'Notificar utilizador';
+$lang['note_notify']           = 'Notificações só são enviadas se for atribuída uma nova senha ao utilizador.';
+$lang['note_group']            = 'Os novos utilizadores são adicionados ao grupo por omissão (%s) se não for especificado nenhum grupo.';
+$lang['note_pass']             = 'A password será automáticamente gerada se o campo esquerdo estiver vazio e a notificação de utilizador estiver activada.';
+$lang['add_ok']                = 'Utilizador adicionado.';
+$lang['add_fail']              = 'Utilizador não adicionado.';
+$lang['notify_ok']             = 'Mensagem de notificação enviada.';
+$lang['notify_fail']           = 'Não foi possível enviar mensagem de notificação';
+$lang['import_success_count']  = 'Importar Utilizadores: %d utiliyadores encontrados, %d importados com sucesso.';
+$lang['import_failure_count']  = 'Importar Utilizadores: %d falharam. As falhas estão listadas abaixo.';
+$lang['import_error_fields']   = 'Campos insuficientes, encontrados %d mas requeridos 4.';
+$lang['import_error_baduserid'] = 'Falta id de utilizador';
+$lang['import_error_upload']   = 'Falhou a importação. O ficheiro csv não pôde ser importado ou está vazio.';
+$lang['import_error_readfail'] = 'Falhou a importação. Não foi possível ler o ficheiro submetido.';
+$lang['import_error_create']   = 'Não foi possível criar o utilizador.';
+$lang['import_notify_fail']    = 'A mensagem de notificação não pôde ser enviada para o utilizador importado, %s com email %s.';
diff --git a/sources/lib/plugins/usermanager/lang/pt/list.txt b/sources/lib/plugins/usermanager/lang/pt/list.txt
new file mode 100644
index 0000000..01a0460
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/pt/list.txt
@@ -0,0 +1 @@
+===== Lista de Utilizadores =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ro/add.txt b/sources/lib/plugins/usermanager/lang/ro/add.txt
new file mode 100644
index 0000000..9a5c45e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ro/add.txt
@@ -0,0 +1 @@
+===== Adaugă utilizator =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ro/delete.txt b/sources/lib/plugins/usermanager/lang/ro/delete.txt
new file mode 100644
index 0000000..ea65fa9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ro/delete.txt
@@ -0,0 +1 @@
+===== Şterge utilizator =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ro/edit.txt b/sources/lib/plugins/usermanager/lang/ro/edit.txt
new file mode 100644
index 0000000..b7f8a42
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ro/edit.txt
@@ -0,0 +1 @@
+===== Editează utilizator =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ro/intro.txt b/sources/lib/plugins/usermanager/lang/ro/intro.txt
new file mode 100644
index 0000000..f3c6626
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ro/intro.txt
@@ -0,0 +1 @@
+===== Manager Utilizatori =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ro/lang.php b/sources/lib/plugins/usermanager/lang/ro/lang.php
new file mode 100644
index 0000000..1b33cc4
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ro/lang.php
@@ -0,0 +1,55 @@
+
+ * @author s_baltariu@yahoo.com
+ * @author Emanuel-Emeric Andrasi 
+ * @author Emanuel-Emeric Andrași 
+ * @author Emanuel-Emeric Andraşi 
+ * @author Emanuel-Emeric Andrasi 
+ * @author Marius OLAR 
+ * @author Marius Olar 
+ * @author Emanuel-Emeric Andrași 
+ */
+$lang['menu']                  = 'Manager Utilizatori';
+$lang['noauth']                = '(autentificarea utilizatorilor nu este disponibilă)';
+$lang['nosupport']             = '(menegementul utilizatorilor nu e suportat)';
+$lang['badauth']               = 'mecanism de autentificare invalid';
+$lang['user_id']               = 'Utilizator';
+$lang['user_pass']             = 'Parolă';
+$lang['user_name']             = 'Nume Real';
+$lang['user_mail']             = 'Email';
+$lang['user_groups']           = 'Grupuri';
+$lang['field']                 = 'Câmp';
+$lang['value']                 = 'Valoare';
+$lang['add']                   = 'Adaugă';
+$lang['delete']                = 'Şterge';
+$lang['delete_selected']       = 'Şterge selecţia';
+$lang['edit']                  = 'Editează';
+$lang['edit_prompt']           = 'Editează acest utilizator';
+$lang['modify']                = 'Salvează Modificările';
+$lang['search']                = 'Caută';
+$lang['search_prompt']         = 'Se caută';
+$lang['clear']                 = 'Resetează Filtrul de Căutare';
+$lang['filter']                = 'Filtru';
+$lang['summary']               = 'Afişarea utilizatorilor %1$d-%2$d din %3$d găsită. %4$d utilizatori în total.';
+$lang['nonefound']             = 'Nici un utilizator nu a fost găsit. %d utilizatori în total.';
+$lang['delete_ok']             = '%d utilizatori şterşi';
+$lang['delete_fail']           = '%d eşuat la ştergere.';
+$lang['update_ok']             = 'Utilizatorul a fost actualizat cu succes';
+$lang['update_fail']           = 'Actualizarea utilizatorului a eşuat';
+$lang['update_exists']         = 'Modificarea numelui de utilizator a eşuat. Numele de utilizator specificat (%s) există deja (orice altă modificare se va aplica)';
+$lang['start']                 = 'început';
+$lang['prev']                  = 'anterior';
+$lang['next']                  = 'urmator';
+$lang['last']                  = 'sfârşit';
+$lang['edit_usermissing']      = 'Utilizatorul selectat nu a fost găsit. E posibil ca numele de utilizator specificat să fi fost şters sau modificat în altă parte.';
+$lang['user_notify']           = 'Notificare utilizator';
+$lang['note_notify']           = 'Emailurile de notificare sunt trimise numai dacă utilizatorului îi este dată o nouă parolă.';
+$lang['note_group']            = 'Noii utilizatori vor fi adăugaţi la grupul implicit (%s) dacă nu se specifică grupul.';
+$lang['note_pass']             = 'Parola va fi regenerată automat dacă câmpul este lăsat gol şi notificarea utilizatorului este activată.';
+$lang['add_ok']                = 'Utilizator adăugat cu succes';
+$lang['add_fail']              = 'Adăugarea utilizatorului a eşuat';
+$lang['notify_ok']             = 'Emailul de notificare a fost trimis';
+$lang['notify_fail']           = 'Emailul de notificare nu a putut fi trimis';
diff --git a/sources/lib/plugins/usermanager/lang/ro/list.txt b/sources/lib/plugins/usermanager/lang/ro/list.txt
new file mode 100644
index 0000000..6c05634
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ro/list.txt
@@ -0,0 +1 @@
+===== Listă utilizatori =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ru/add.txt b/sources/lib/plugins/usermanager/lang/ru/add.txt
new file mode 100644
index 0000000..3cb4264
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ru/add.txt
@@ -0,0 +1 @@
+===== Добавить пользователя =====
diff --git a/sources/lib/plugins/usermanager/lang/ru/delete.txt b/sources/lib/plugins/usermanager/lang/ru/delete.txt
new file mode 100644
index 0000000..80f874e
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ru/delete.txt
@@ -0,0 +1 @@
+===== Удалить пользователя =====
diff --git a/sources/lib/plugins/usermanager/lang/ru/edit.txt b/sources/lib/plugins/usermanager/lang/ru/edit.txt
new file mode 100644
index 0000000..d447c40
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ru/edit.txt
@@ -0,0 +1 @@
+===== Редактировать пользователя =====
diff --git a/sources/lib/plugins/usermanager/lang/ru/import.txt b/sources/lib/plugins/usermanager/lang/ru/import.txt
new file mode 100644
index 0000000..3a25f34
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ru/import.txt
@@ -0,0 +1,9 @@
+===== Импорт нескольких пользователей =====
+
+Потребуется список пользователей в файле формата CSV, состоящий из 4 столбцов. 
+Столбцы должны быть заполнены следующим образом: user-id, полное имя, эл. почта, группы.
+Поля CSV должны быть отделены запятой (,), а строки должны быть заключены в кавычки (""). Обратный слэш используется как прерывание.
+В качестве примера можете взять список пользователей, экспортированный через «Экспорт пользователей».
+Повторяющиеся идентификаторы user-id будут игнорироваться.
+
+Пароль доступа будет сгенерирован и отправлен по почте удачно импортированному пользователю.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/ru/intro.txt b/sources/lib/plugins/usermanager/lang/ru/intro.txt
new file mode 100644
index 0000000..3a3e260
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ru/intro.txt
@@ -0,0 +1 @@
+====== Управление пользователями ======
diff --git a/sources/lib/plugins/usermanager/lang/ru/lang.php b/sources/lib/plugins/usermanager/lang/ru/lang.php
new file mode 100644
index 0000000..3102ac3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ru/lang.php
@@ -0,0 +1,78 @@
+
+ * @author Andrew Pleshakov 
+ * @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 
+ * @author Aleksey Osadchiy 
+ * @author Aleksandr Selivanov 
+ * @author Ladyko Andrey 
+ * @author Eugene 
+ * @author Johnny Utah 
+ * @author Ivan I. Udovichenko (sendtome@mymailbox.pp.ua)
+ * @author Pavel 
+ */
+$lang['menu']                  = 'Управление пользователями';
+$lang['noauth']                = '(авторизация пользователей недоступна)';
+$lang['nosupport']             = '(управление пользователями не поддерживается)';
+$lang['badauth']               = 'некорректный механизм аутентификации';
+$lang['user_id']               = 'Логин';
+$lang['user_pass']             = 'Пароль';
+$lang['user_name']             = 'Полное имя';
+$lang['user_mail']             = 'Эл. адрес';
+$lang['user_groups']           = 'Группы';
+$lang['field']                 = 'Поле';
+$lang['value']                 = 'Значение';
+$lang['add']                   = 'Добавить';
+$lang['delete']                = 'Удалить';
+$lang['delete_selected']       = 'Удалить выбранные';
+$lang['edit']                  = 'Редактировать';
+$lang['edit_prompt']           = 'Редактировать этого пользователя';
+$lang['modify']                = 'Сохранить изменения';
+$lang['search']                = 'Поиск';
+$lang['search_prompt']         = 'Искать';
+$lang['clear']                 = 'Сброс фильтра поиска';
+$lang['filter']                = 'Фильтр';
+$lang['export_all']            = 'Экспорт всех пользователей (CSV)';
+$lang['export_filtered']       = 'Экспорт пользователей с фильтрацией списка (CSV)';
+$lang['import']                = 'Импорт новых пользователей';
+$lang['line']                  = 'Строка №';
+$lang['error']                 = 'Ошибка';
+$lang['summary']               = 'Показаны пользователи %1$d–%2$d из %3$d найденных. Всего пользователей: %4$d.';
+$lang['nonefound']             = 'Не найдено ни одного пользователя. Всего пользователей: %d.';
+$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']           = 'Не удалось отправить письмо с уведомлением';
+$lang['import_success_count']  = 'Импорт пользователей: %d пользователей найдено, %d импортировано успешно.';
+$lang['import_failure_count']  = 'Импорт пользователей: %d не удалось. Список ошибок прочтите ниже.';
+$lang['import_error_fields']   = 'Не все поля заполнены. Найдено %d, а нужно 4.';
+$lang['import_error_baduserid'] = 'Отсутствует идентификатор пользователя';
+$lang['import_error_badname']  = 'Имя не годится';
+$lang['import_error_badmail']  = 'Адрес электронной почты не годится';
+$lang['import_error_upload']   = 'Импорт не удался. CSV файл не загружен или пуст.';
+$lang['import_error_readfail'] = 'Импорт не удался. Невозможно прочесть загруженный файл.';
+$lang['import_error_create']   = 'Невозможно создать пользователя';
+$lang['import_notify_fail']    = 'Оповещение не может быть отправлено импортированному пользователю %s по электронной почте %s.';
diff --git a/sources/lib/plugins/usermanager/lang/ru/list.txt b/sources/lib/plugins/usermanager/lang/ru/list.txt
new file mode 100644
index 0000000..26c0cbe
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/ru/list.txt
@@ -0,0 +1 @@
+===== Список пользователей =====
diff --git a/sources/lib/plugins/usermanager/lang/sk/add.txt b/sources/lib/plugins/usermanager/lang/sk/add.txt
new file mode 100644
index 0000000..e2e1060
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sk/add.txt
@@ -0,0 +1,2 @@
+===== Pridanie užívateľa =====
+
diff --git a/sources/lib/plugins/usermanager/lang/sk/delete.txt b/sources/lib/plugins/usermanager/lang/sk/delete.txt
new file mode 100644
index 0000000..c7d6a3c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sk/delete.txt
@@ -0,0 +1,2 @@
+===== Zmazanie užívateľa =====
+
diff --git a/sources/lib/plugins/usermanager/lang/sk/edit.txt b/sources/lib/plugins/usermanager/lang/sk/edit.txt
new file mode 100644
index 0000000..28af5b5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sk/edit.txt
@@ -0,0 +1,2 @@
+===== Zmena užívateľa =====
+
diff --git a/sources/lib/plugins/usermanager/lang/sk/import.txt b/sources/lib/plugins/usermanager/lang/sk/import.txt
new file mode 100644
index 0000000..91fa3e3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sk/import.txt
@@ -0,0 +1,9 @@
+===== Hromadný import používateľov =====
+
+Vyžaduje CSV súbor používateľov s minimálne 4 stĺpcami.
+Stĺpce musia obsahovať postupne: ID používateľa, meno a priezvisko, emailová adresa a skupiny.
+CVS záznamy by mali byť oddelené čiarkou (,) a reťazce uzavreté úvodzovkami (""). Znak (\) sa používa v spojení so špeciálnymi znakmi.
+Príklad vhodného súboru je možné získať funkciou "Export používateľov".
+Duplicitné ID používateľov budú ignorované.
+
+Každému úspešne importovanému používateľovi bude vygenerované heslo a zaslaný email.
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sk/intro.txt b/sources/lib/plugins/usermanager/lang/sk/intro.txt
new file mode 100644
index 0000000..0a626de
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sk/intro.txt
@@ -0,0 +1,2 @@
+====== Správa používateľov ======
+
diff --git a/sources/lib/plugins/usermanager/lang/sk/lang.php b/sources/lib/plugins/usermanager/lang/sk/lang.php
new file mode 100644
index 0000000..9aadbb5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sk/lang.php
@@ -0,0 +1,69 @@
+
+ * @author Michal Mesko 
+ * @author exusik@gmail.com
+ * @author Martin Michalek 
+ */
+$lang['menu']                  = 'Správa používateľov';
+$lang['noauth']                = '(autentifikácia užívateľov nie je dostupná)';
+$lang['nosupport']             = '(správa užívateľov nie je podporovaná)';
+$lang['badauth']               = 'neplatný autorizačný mechanizmus';
+$lang['user_id']               = 'Užívateľ';
+$lang['user_pass']             = 'Heslo';
+$lang['user_name']             = 'Skutočné meno';
+$lang['user_mail']             = 'Email';
+$lang['user_groups']           = 'Skupiny';
+$lang['field']                 = 'Pole';
+$lang['value']                 = 'Hodnota';
+$lang['add']                   = 'Pridať';
+$lang['delete']                = 'Zmazať';
+$lang['delete_selected']       = 'Zmazať vybrané';
+$lang['edit']                  = 'Zmeniť';
+$lang['edit_prompt']           = 'Zmeniť tohoto užívateľa';
+$lang['modify']                = 'Uložiť zmeny';
+$lang['search']                = 'Hľadať';
+$lang['search_prompt']         = 'Vykonať vyhľadávanie';
+$lang['clear']                 = 'Vynulovať vyhľadávací filter';
+$lang['filter']                = 'Filter';
+$lang['export_all']            = 'Export všetkých používateľov (CSV)';
+$lang['export_filtered']       = 'Export zoznamu používateľov na základe filtra (CSV)';
+$lang['import']                = 'Import nových používateľov';
+$lang['line']                  = 'Riadok č.';
+$lang['error']                 = 'Chybová správa';
+$lang['summary']               = 'Zobrazenie užívateľov %1$d-%2$d z %3$d nájdených. %4$d užívateľov celkom.';
+$lang['nonefound']             = 'Žiadni užívatelia nenájdení. %d užívateľov celkom.';
+$lang['delete_ok']             = '%d užívateľov zmazaných';
+$lang['delete_fail']           = '%d chýb vymazania.';
+$lang['update_ok']             = 'Užívateľ úspešne zmenený';
+$lang['update_fail']           = 'Chyba zmeny užívateľa';
+$lang['update_exists']         = 'Chyba zmeny užívateľa, užívateľské meno (%s) už existuje (iné zmeny budú zaznamenané).';
+$lang['start']                 = 'prvé';
+$lang['prev']                  = 'predošlé';
+$lang['next']                  = 'ďalšie';
+$lang['last']                  = 'posledné';
+$lang['edit_usermissing']      = 'Vybraný užívateľ nebol nájdený, mohol byť zmazaný alebo zmenený iným spôsobom.';
+$lang['user_notify']           = 'Upozorniť užívateľa';
+$lang['note_notify']           = 'Notifikačné e-maily iba vtedy, ak dostane užívateľ nové heslo';
+$lang['note_group']            = 'Noví užívatelia budú pridaní do východzej skupiny (%s), ak nie je pre nich špecifikovaná iná skupina.';
+$lang['note_pass']             = 'Heslo bude vygenerované automaticky, ak bude pole prázdne a je zapnutá notifikácia používateľa.';
+$lang['add_ok']                = 'Používateľ úspešne pridaný';
+$lang['add_fail']              = 'Pridávanie užívateľa nebolo úspešné';
+$lang['notify_ok']             = 'Notifikačný e-mail bol poslaný';
+$lang['notify_fail']           = 'Notifikačný e-mail nemohol byť poslaný';
+$lang['import_userlistcsv']    = 'Súbor so zoznamov používateľov (CSV):';
+$lang['import_header']         = 'Chyby pri poslednom importe';
+$lang['import_success_count']  = 'Import používateľov: %d nájdených, %d úspešne importovaných.';
+$lang['import_failure_count']  = 'Import používateľov: %d neúspešných. Problámy  vypísané nižšie.';
+$lang['import_error_fields']   = 'Neúplné záznamy, %d nájdené, 4 požadované.';
+$lang['import_error_baduserid'] = 'Chýba ID používateľa';
+$lang['import_error_badname']  = 'Nesprávne meno';
+$lang['import_error_badmail']  = 'Nesprávna emailová adresa';
+$lang['import_error_upload']   = 'Import neúspešný. CSV súbor nemohol byť nahraný alebo je prázdny.';
+$lang['import_error_readfail'] = 'Import neúspešný. Nie je možné prečítať nahraný súbor.';
+$lang['import_error_create']   = 'Nie je možné vytvoriť pouzívateľa';
+$lang['import_notify_fail']    = 'Správa nemohla byť zaslaná importovanému používatelovi, %s s emailom %s.';
+$lang['import_downloadfailures'] = 'Stiahnuť chyby vo formáte CSV za účelom opravy';
diff --git a/sources/lib/plugins/usermanager/lang/sk/list.txt b/sources/lib/plugins/usermanager/lang/sk/list.txt
new file mode 100644
index 0000000..6f15331
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sk/list.txt
@@ -0,0 +1,2 @@
+===== Zoznam užívateľov =====
+
diff --git a/sources/lib/plugins/usermanager/lang/sl/add.txt b/sources/lib/plugins/usermanager/lang/sl/add.txt
new file mode 100644
index 0000000..c1d8913
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sl/add.txt
@@ -0,0 +1 @@
+===== Dodajanje uporabnika =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sl/delete.txt b/sources/lib/plugins/usermanager/lang/sl/delete.txt
new file mode 100644
index 0000000..1fd4fff
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sl/delete.txt
@@ -0,0 +1 @@
+===== Izbris uporabnika =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sl/edit.txt b/sources/lib/plugins/usermanager/lang/sl/edit.txt
new file mode 100644
index 0000000..e80bc85
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sl/edit.txt
@@ -0,0 +1 @@
+===== Urejanje uporabnikov =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sl/intro.txt b/sources/lib/plugins/usermanager/lang/sl/intro.txt
new file mode 100644
index 0000000..a4729a8
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sl/intro.txt
@@ -0,0 +1 @@
+====== Upravljanje uporabnikov ======
diff --git a/sources/lib/plugins/usermanager/lang/sl/lang.php b/sources/lib/plugins/usermanager/lang/sl/lang.php
new file mode 100644
index 0000000..dc2de37
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sl/lang.php
@@ -0,0 +1,63 @@
+
+ * @author Boštjan Seničar 
+ * @author Gregor Skumavc (grega.skumavc@gmail.com)
+ * @author Matej Urbančič (mateju@svn.gnome.org)
+ * @author Matej Urbančič 
+ */
+$lang['menu']                  = 'Upravljanje uporabnikov';
+$lang['noauth']                = '(overjanje istovetnosti uporabnikov ni na voljo)';
+$lang['nosupport']             = '(upravljanje računov uporabnikov ni podprto)';
+$lang['badauth']               = 'neveljaven način overjanja';
+$lang['user_id']               = 'Uporabnik';
+$lang['user_pass']             = 'Geslo';
+$lang['user_name']             = 'Pravo ime';
+$lang['user_mail']             = 'Elektronski naslov';
+$lang['user_groups']           = 'Skupine';
+$lang['field']                 = 'Polje';
+$lang['value']                 = 'Vrednost';
+$lang['add']                   = 'Dodaj';
+$lang['delete']                = 'Izbriši';
+$lang['delete_selected']       = 'Izbriši izbrano';
+$lang['edit']                  = 'Uredi';
+$lang['edit_prompt']           = 'Uredi tega uporabnika';
+$lang['modify']                = 'Shrani spremembe';
+$lang['search']                = 'Iskanje';
+$lang['search_prompt']         = 'Poišči';
+$lang['clear']                 = 'Počisti filter iskanja';
+$lang['filter']                = 'Filter';
+$lang['import']                = 'Uvozi nove uporabnike';
+$lang['line']                  = 'Številka vrstice';
+$lang['error']                 = 'Sporočilo napake';
+$lang['summary']               = 'Izpisani so uporabniki %1$d-%2$d od skupno %3$d. Vseh uporabnikov je %4$d.';
+$lang['nonefound']             = 'Ni najdenih uporabnikov. Vseh uporabnikov je %d.';
+$lang['delete_ok']             = '%d uporabnikov je izbrisanih';
+$lang['delete_fail']           = '%d ni bilo mogoče izbrisati';
+$lang['update_ok']             = 'Uporabniški račun je uspešno posodobljen';
+$lang['update_fail']           = 'Posodobitev uporabniškega računa je spodletela';
+$lang['update_exists']         = 'Spreminjanje imena uporabnika je spodletelo. Navedeno uporabniško ime (%s) že obstaja (vse ostale spremembe bodo uveljavljene).';
+$lang['start']                 = 'Začetni';
+$lang['prev']                  = 'Predhodni';
+$lang['next']                  = 'Naslednji';
+$lang['last']                  = 'Končni';
+$lang['edit_usermissing']      = 'Izbranega uporabnika ni mogoče najti. Navedeno uporabniško ime je morda izbrisano ali spremenjeno.';
+$lang['user_notify']           = 'Obvesti uporabnika';
+$lang['note_notify']           = 'Obvestilna sporočila so poslana le, če uporabnik prejme novo geslo za dostop do strani.';
+$lang['note_group']            = 'Nov uporabnik bo dodan k privzeti skupini (%s), v kolikor ni navedene druge skupine.';
+$lang['note_pass']             = 'Geslo bo ustvarjeno samodejno, v kolikor je polje izpuščeno in je omogočeno obveščanje uporabnika.';
+$lang['add_ok']                = 'Uporabnik je uspešno dodan';
+$lang['add_fail']              = 'Dodajanje uporabnika je spodletelo';
+$lang['notify_ok']             = 'Obvestilno sporočilo je poslano.';
+$lang['notify_fail']           = 'Obvestilnega sporočila ni mogoče poslati.';
+$lang['import_error_fields']   = 'Neustrezno število polj; najdenih je %d, zahtevana pa so 4.';
+$lang['import_error_baduserid'] = 'Manjka ID uporabnika';
+$lang['import_error_badname']  = 'Napačno navedeno ime';
+$lang['import_error_badmail']  = 'Napačno naveden elektronski naslov';
+$lang['import_error_upload']   = 'Uvoz je spodletel. Datoteke CSV ni mogoče naložiti ali pa je prazna.';
+$lang['import_error_readfail'] = 'Uvoz je spodletel. Ni mogoče prebrati vsebine datoteke.';
+$lang['import_error_create']   = 'Ni mogoče ustvariti računa uporabnika';
+$lang['import_notify_fail']    = 'Obvestilnega sporočila za uvoženega uporabnika %s z elektronskim naslovom %s ni mogoče poslati.';
diff --git a/sources/lib/plugins/usermanager/lang/sl/list.txt b/sources/lib/plugins/usermanager/lang/sl/list.txt
new file mode 100644
index 0000000..1aa8b7a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sl/list.txt
@@ -0,0 +1 @@
+===== Seznam uporabnikov =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sq/add.txt b/sources/lib/plugins/usermanager/lang/sq/add.txt
new file mode 100644
index 0000000..4c66aaf
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sq/add.txt
@@ -0,0 +1 @@
+===== Shto Përdorues =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sq/delete.txt b/sources/lib/plugins/usermanager/lang/sq/delete.txt
new file mode 100644
index 0000000..34cb491
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sq/delete.txt
@@ -0,0 +1 @@
+===== Fshi përdorues =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sq/edit.txt b/sources/lib/plugins/usermanager/lang/sq/edit.txt
new file mode 100644
index 0000000..6313103
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sq/edit.txt
@@ -0,0 +1 @@
+===== Redakto Përdorues =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sq/intro.txt b/sources/lib/plugins/usermanager/lang/sq/intro.txt
new file mode 100644
index 0000000..e1ebea6
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sq/intro.txt
@@ -0,0 +1 @@
+===== Menaxhuesi i Përdoruesit =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sq/lang.php b/sources/lib/plugins/usermanager/lang/sq/lang.php
new file mode 100644
index 0000000..bddf54d
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sq/lang.php
@@ -0,0 +1,48 @@
+
+ * @author Miroslav Šolti 
+ */
+$lang['menu']                  = 'Управљач корисницима';
+$lang['noauth']                = '(корисничка провера није доступна)';
+$lang['nosupport']             = '(уптављање корисницима није подржано)';
+$lang['badauth']               = 'неисправан механизам провере';
+$lang['user_id']               = 'Корисник';
+$lang['user_pass']             = 'Лозинка';
+$lang['user_name']             = 'Име и презиме';
+$lang['user_mail']             = 'Е-адреса';
+$lang['user_groups']           = 'Групе';
+$lang['field']                 = 'Поље';
+$lang['value']                 = 'Вредност';
+$lang['add']                   = 'Додај';
+$lang['delete']                = 'Обриши';
+$lang['delete_selected']       = 'Обриши одабране';
+$lang['edit']                  = 'Измени';
+$lang['edit_prompt']           = 'Измени корисника';
+$lang['modify']                = 'Сачувај измене';
+$lang['search']                = 'Претрага';
+$lang['search_prompt']         = 'Изведи претрагу';
+$lang['clear']                 = 'Поништи филтер претраге';
+$lang['filter']                = 'Филтер';
+$lang['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 --git a/sources/lib/plugins/usermanager/lang/sr/list.txt b/sources/lib/plugins/usermanager/lang/sr/list.txt
new file mode 100644
index 0000000..9484442
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sr/list.txt
@@ -0,0 +1 @@
+===== Списак корисника =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/sv/add.txt b/sources/lib/plugins/usermanager/lang/sv/add.txt
new file mode 100644
index 0000000..2ff1ee6
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sv/add.txt
@@ -0,0 +1 @@
+===== Lägg till användare =====
diff --git a/sources/lib/plugins/usermanager/lang/sv/delete.txt b/sources/lib/plugins/usermanager/lang/sv/delete.txt
new file mode 100644
index 0000000..5664a59
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sv/delete.txt
@@ -0,0 +1 @@
+===== Radera användare =====
diff --git a/sources/lib/plugins/usermanager/lang/sv/edit.txt b/sources/lib/plugins/usermanager/lang/sv/edit.txt
new file mode 100644
index 0000000..f1a7f4a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sv/edit.txt
@@ -0,0 +1 @@
+===== Redigera användare =====
diff --git a/sources/lib/plugins/usermanager/lang/sv/intro.txt b/sources/lib/plugins/usermanager/lang/sv/intro.txt
new file mode 100644
index 0000000..bd13b81
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sv/intro.txt
@@ -0,0 +1 @@
+====== Hantera användare ======
diff --git a/sources/lib/plugins/usermanager/lang/sv/lang.php b/sources/lib/plugins/usermanager/lang/sv/lang.php
new file mode 100644
index 0000000..3408865
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sv/lang.php
@@ -0,0 +1,73 @@
+
+ * @author Nicklas Henriksson 
+ * @author Håkan Sandell 
+ * @author Dennis Karlsson
+ * @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 mikael@mallander.net
+ * @author Smorkster Andersson smorkster@gmail.com
+ * @author Tor Härnqvist 
+ */
+$lang['menu']                  = 'Hantera användare';
+$lang['noauth']                = '(användarautentisering ej tillgänlig)';
+$lang['nosupport']             = '(användarhantering stödjs ej)';
+$lang['badauth']               = 'ogiltig autentiseringsmekanism';
+$lang['user_id']               = 'Användare';
+$lang['user_pass']             = 'Lösenord';
+$lang['user_name']             = 'Namn';
+$lang['user_mail']             = 'E-post';
+$lang['user_groups']           = 'Grupper';
+$lang['field']                 = 'Fält';
+$lang['value']                 = 'Värde';
+$lang['add']                   = 'Lägg till';
+$lang['delete']                = 'Radera';
+$lang['delete_selected']       = 'Radera markerade';
+$lang['edit']                  = 'Redigera';
+$lang['edit_prompt']           = 'Redigera användaren';
+$lang['modify']                = 'Spara ändringar';
+$lang['search']                = 'Sök';
+$lang['search_prompt']         = 'Utför sökning';
+$lang['clear']                 = 'Återställ sökfilter';
+$lang['filter']                = 'Filter';
+$lang['export_all']            = 'Exportera alla användare (CSV)';
+$lang['export_filtered']       = 'Exportera filtrerade användarlistningen (CSV)';
+$lang['import']                = 'Importera nya användare';
+$lang['error']                 = 'Error-meddelande';
+$lang['summary']               = 'Visar användare %1$d-%2$d av %3$d funna. %4$d användare totalt.';
+$lang['nonefound']             = 'Inga användare hittades. %d användare totalt.';
+$lang['delete_ok']             = '%d användare raderade';
+$lang['delete_fail']           = '%d kunde inte raderas.';
+$lang['update_ok']             = 'Användaren uppdaterad';
+$lang['update_fail']           = 'Användaruppdatering misslyckades';
+$lang['update_exists']         = 'Kunde inte ändra användarnamn,, det angivna användarnamnet (%s) finns redan (andra ändringar kommer att utföras).';
+$lang['start']                 = 'start';
+$lang['prev']                  = 'föregående';
+$lang['next']                  = 'nästa';
+$lang['last']                  = 'sista';
+$lang['edit_usermissing']      = 'Vald användare hittades inte. Den angivna användaren kan ha blivit raderad, eller ändrats någon annanstans.';
+$lang['user_notify']           = 'Meddela användaren';
+$lang['note_notify']           = 'E-postmeddelanden skickas bara om användaren har fått ett nytt lösenord.';
+$lang['note_group']            = 'Nya användare läggs till i standardgruppen (%s) om inga grupper anges.';
+$lang['note_pass']             = 'Lösenordet kommer att autogenereras om fältet är tomt och e-postmeddelanden till användaren är påslaget.';
+$lang['add_ok']                = 'Användaren tillagd';
+$lang['add_fail']              = 'Användare kunde inte läggas till';
+$lang['notify_ok']             = 'E-postmeddelande skickat';
+$lang['notify_fail']           = 'E-postmeddelande kunde inte skickas';
+$lang['import_success_count']  = 'Användar-import: %d användare funna, %d importerade framgångsrikt.';
+$lang['import_failure_count']  = 'Användar-import: %d misslyckades. Misslyckandena listas nedan.';
+$lang['import_error_baduserid'] = 'Användar-id saknas';
+$lang['import_error_badname']  = 'Felaktigt namn';
+$lang['import_error_badmail']  = 'Felaktig e-postadress';
+$lang['import_error_upload']   = 'Import misslyckades. Csv-filen kunde inte laddas upp eller är tom.';
+$lang['import_error_readfail'] = 'Import misslyckades. Den uppladdade filen gick inte att läsa.';
+$lang['import_error_create']   = 'Misslyckades att skapa användaren.';
diff --git a/sources/lib/plugins/usermanager/lang/sv/list.txt b/sources/lib/plugins/usermanager/lang/sv/list.txt
new file mode 100644
index 0000000..e07c452
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/sv/list.txt
@@ -0,0 +1 @@
+===== Användarlista =====
diff --git a/sources/lib/plugins/usermanager/lang/th/add.txt b/sources/lib/plugins/usermanager/lang/th/add.txt
new file mode 100644
index 0000000..6a5f098
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/th/add.txt
@@ -0,0 +1 @@
+====== เพิ่มผู้ใช้ ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/th/delete.txt b/sources/lib/plugins/usermanager/lang/th/delete.txt
new file mode 100644
index 0000000..4dbc82b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/th/delete.txt
@@ -0,0 +1 @@
+====== ลบผู้ใช้ ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/th/edit.txt b/sources/lib/plugins/usermanager/lang/th/edit.txt
new file mode 100644
index 0000000..c36e8dd
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/th/edit.txt
@@ -0,0 +1 @@
+====== แก้ไขผู้ใช้ ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/th/intro.txt b/sources/lib/plugins/usermanager/lang/th/intro.txt
new file mode 100644
index 0000000..0f6a0c3
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/th/intro.txt
@@ -0,0 +1 @@
+====== ตัวจัดการผู้ใช้ ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/th/lang.php b/sources/lib/plugins/usermanager/lang/th/lang.php
new file mode 100644
index 0000000..eb88d7b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/th/lang.php
@@ -0,0 +1,47 @@
+
+ * @author Kittithat Arnontavilas mrtomyum@gmail.com
+ * @author Kittithat Arnontavilas 
+ * @author Thanasak Sompaisansin 
+ */
+$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 --git a/sources/lib/plugins/usermanager/lang/th/list.txt b/sources/lib/plugins/usermanager/lang/th/list.txt
new file mode 100644
index 0000000..fdf65b5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/th/list.txt
@@ -0,0 +1 @@
+====== รายชื่อผู้ใช้ ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/tr/add.txt b/sources/lib/plugins/usermanager/lang/tr/add.txt
new file mode 100644
index 0000000..beedc0b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/tr/add.txt
@@ -0,0 +1 @@
+===== Kullanıcı ekleme ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/tr/delete.txt b/sources/lib/plugins/usermanager/lang/tr/delete.txt
new file mode 100644
index 0000000..adb8e91
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/tr/delete.txt
@@ -0,0 +1 @@
+===== Kullanıcı silme =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/tr/edit.txt b/sources/lib/plugins/usermanager/lang/tr/edit.txt
new file mode 100644
index 0000000..d9f3b71
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/tr/edit.txt
@@ -0,0 +1 @@
+===== Kullanıcı Düzenleme =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/tr/intro.txt b/sources/lib/plugins/usermanager/lang/tr/intro.txt
new file mode 100644
index 0000000..1edcb2c
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/tr/intro.txt
@@ -0,0 +1 @@
+====== Kullanıcı Yöneticisi ======
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/tr/lang.php b/sources/lib/plugins/usermanager/lang/tr/lang.php
new file mode 100644
index 0000000..6329803
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/tr/lang.php
@@ -0,0 +1,52 @@
+
+ * @author Cihan Kahveci 
+ * @author Yavuz Selim 
+ * @author Caleb Maclennan 
+ * @author farukerdemoncel@gmail.com
+ */
+$lang['menu']                  = 'Kullanıcı Yönetimi';
+$lang['noauth']                = '(kullanıcı onaylaması yoktur)';
+$lang['nosupport']             = '(kullanıcı yönetimi desteklenmemektedir)';
+$lang['badauth']               = 'yanlış onaylama metodu';
+$lang['user_id']               = 'Kullanıcı';
+$lang['user_pass']             = 'Şifre';
+$lang['user_name']             = 'Gerçek İsim';
+$lang['user_mail']             = 'Email';
+$lang['user_groups']           = 'Gruplar';
+$lang['field']                 = 'Alan';
+$lang['value']                 = 'Değer';
+$lang['add']                   = 'Ekle';
+$lang['delete']                = 'Sil';
+$lang['delete_selected']       = 'Seçilenleri Sil';
+$lang['edit']                  = 'Düzenle';
+$lang['edit_prompt']           = 'Bu kullanıcıyı düzenle';
+$lang['modify']                = 'Değişiklikleri kaydet';
+$lang['search']                = 'Arama';
+$lang['search_prompt']         = 'Aramayı Gerçekleştir';
+$lang['clear']                 = 'Arama ayarlarını sıfırla';
+$lang['filter']                = 'Filtre';
+$lang['summary']               = 'Bulunan %3$d kullanıcının %1$d-%2$d gösterilmektedir. Toplam %4$d kullanıcı bulunmaktadır.';
+$lang['nonefound']             = 'Hiç kullanıcı bulunamadı. Toplam %d kullanıcı bulunmaktadır.';
+$lang['delete_ok']             = '%d kullanıcılar silindi';
+$lang['delete_fail']           = '%d silinemedi.';
+$lang['update_ok']             = 'Kullanıcı başarı ile güncelleştirildi';
+$lang['update_fail']           = 'Kullanıcı güncelleştirilemedi';
+$lang['update_exists']         = 'Kullanıcı adı değiştirilemedi. Belirtilen kullanıcı adı (%s) zaten bulunmaktadır (yapılan diğer değişiklikler uygulanacaktır).';
+$lang['start']                 = 'başla';
+$lang['prev']                  = 'önceki';
+$lang['next']                  = 'sonraki';
+$lang['last']                  = 'sonuncu';
+$lang['edit_usermissing']      = 'Seçili kullanıcılar bulunamadı, belirtilen kullanıcı silinmiş ya da değiştirilmiş olabilir.';
+$lang['user_notify']           = 'Kullanıcıyı bilgilendir';
+$lang['note_notify']           = 'Bilgilendirme e-postaları sadece kullanıcıya yeni bir parola verildiğinde gönderilmektedir.';
+$lang['note_group']            = 'Yeni kullanıcılar bir grup belirtilmezse varsayılan (%s) gruba eklenecektir.';
+$lang['note_pass']             = 'Eğer alan boş bırakılırsa parola otomatik oluşturulacaktır ve kullanıcı bilgilendirme etkinleştirilecektir. ';
+$lang['add_ok']                = 'Kullanıcı başarı ile eklendi';
+$lang['add_fail']              = 'Kullanıcı ekleme başarısız';
+$lang['notify_ok']             = 'Bildirim emaili gönderildi';
+$lang['notify_fail']           = 'Bildirim emaili gönderilemedi';
diff --git a/sources/lib/plugins/usermanager/lang/tr/list.txt b/sources/lib/plugins/usermanager/lang/tr/list.txt
new file mode 100644
index 0000000..2314eb2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/tr/list.txt
@@ -0,0 +1 @@
+===== Kullanıcı Listesi =====
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/uk/add.txt b/sources/lib/plugins/usermanager/lang/uk/add.txt
new file mode 100644
index 0000000..bc34697
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/uk/add.txt
@@ -0,0 +1 @@
+===== Додати користувача =====
diff --git a/sources/lib/plugins/usermanager/lang/uk/delete.txt b/sources/lib/plugins/usermanager/lang/uk/delete.txt
new file mode 100644
index 0000000..739340b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/uk/delete.txt
@@ -0,0 +1 @@
+===== Видалення користувача =====
diff --git a/sources/lib/plugins/usermanager/lang/uk/edit.txt b/sources/lib/plugins/usermanager/lang/uk/edit.txt
new file mode 100644
index 0000000..efc84be
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/uk/edit.txt
@@ -0,0 +1 @@
+===== Редагувати користувача =====
diff --git a/sources/lib/plugins/usermanager/lang/uk/intro.txt b/sources/lib/plugins/usermanager/lang/uk/intro.txt
new file mode 100644
index 0000000..b658aff
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/uk/intro.txt
@@ -0,0 +1 @@
+====== Керування користувачами ======
diff --git a/sources/lib/plugins/usermanager/lang/uk/lang.php b/sources/lib/plugins/usermanager/lang/uk/lang.php
new file mode 100644
index 0000000..3afb7b7
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/uk/lang.php
@@ -0,0 +1,53 @@
+
+ * @author serg_stetsuk@ukr.net
+ * @author okunia@gmail.com
+ * @author Oleksandr Kunytsia 
+ * @author Uko uko@uar.net
+ * @author Ulrikhe Lukoie  .com
+ */
+$lang['menu']                  = 'Керування користувачами';
+$lang['noauth']                = '(автентифікація користувачів не	доступна)';
+$lang['nosupport']             = '(керування користувачами не підтримується)';
+$lang['badauth']               = 'невірний механізм автентифікації';
+$lang['user_id']               = 'Ім’я користувача';
+$lang['user_pass']             = 'Пароль';
+$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['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 --git a/sources/lib/plugins/usermanager/lang/uk/list.txt b/sources/lib/plugins/usermanager/lang/uk/list.txt
new file mode 100644
index 0000000..76013a9
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/uk/list.txt
@@ -0,0 +1 @@
+===== Список користувачів =====
diff --git a/sources/lib/plugins/usermanager/lang/vi/lang.php b/sources/lib/plugins/usermanager/lang/vi/lang.php
new file mode 100644
index 0000000..2933d88
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/vi/lang.php
@@ -0,0 +1,5 @@
+
+ * @author Li-Jiun Huang 
+ * @author http://www.chinese-tools.com/tools/converter-simptrad.html
+ * @author Wayne San 
+ * @author Li-Jiun Huang 
+ * @author Cheng-Wei Chien 
+ * @author Shuo-Ting Jian 
+ * @author syaoranhinata@gmail.com
+ * @author Ichirou Uchiki 
+ * @author tsangho 
+ * @author Danny Lin 
+ */
+$lang['menu']                  = '帳號管理器';
+
+// custom language strings for the plugin
+$lang['noauth']                = '(帳號認證尚未開放)';
+$lang['nosupport']             = '(尚不支援帳號管理)';
+
+$lang['badauth']               = '錯誤的認證機制';
+
+$lang['user_id']               = '帳號';
+$lang['user_pass']             = '密碼';
+$lang['user_name']             = '名稱';
+$lang['user_mail']             = '電郵';
+$lang['user_groups']           = '群組';
+
+$lang['field']                 = '欄位';
+$lang['value']                 = '設定值';
+$lang['add']                   = '增加';
+$lang['delete']                = '刪除';
+$lang['delete_selected']       = '刪除所選的';
+$lang['edit']                  = '修改';
+$lang['edit_prompt']           = '修改該帳號';
+$lang['modify']                = '儲存變更';
+$lang['search']                = '搜尋';
+$lang['search_prompt']         = '開始搜尋';
+$lang['clear']                 = '重設篩選條件';
+$lang['filter']                = '篩選條件 (Filter)';
+$lang['export_all']            = '匯出所有使用者 (CSV)';
+$lang['export_filtered']       = '匯出篩選後的使用者列表 (CSV)';
+$lang['import']                = '匯入新使用者';
+$lang['line']                  = '列號';
+$lang['error']                 = '錯誤訊息';
+
+$lang['summary']               = '顯示帳號 %1$d-%2$d，共 %3$d 筆符合。共有 %4$d 個帳號。';
+$lang['nonefound']             = '找不到帳號。共有 %d 個帳號。';
+$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']                  = '最後一頁';
+
+// added after 2006-03-09 release
+$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']           = '通知信無法寄出';
+
+// import & errors
+$lang['import_userlistcsv']    = '使用者列表檔案 (CSV):  ';
+$lang['import_header']         = '最近一次匯入 - 失敗';
+$lang['import_success_count']  = '使用者匯入：找到 %d 個使用者，已成功匯入 %d 個。';
+$lang['import_failure_count']  = '使用者匯入：%d 個匯入失敗，列出於下。';
+$lang['import_error_fields']   = '欄位不足，需要 4 個，找到 %d 個。';
+$lang['import_error_baduserid'] = '使用者帳號遺失';
+$lang['import_error_badname']  = '名稱不正確';
+$lang['import_error_badmail']  = '電郵位址不正確';
+$lang['import_error_upload']   = '匯入失敗，CSV 檔案內容空白或無法匯入。';
+$lang['import_error_readfail'] = '匯入錯誤，無法讀取上傳的檔案';
+$lang['import_error_create']   = '無法建立使用者';
+$lang['import_notify_fail']    = '通知訊息無法寄給已匯入的使用者 %s（電郵 %s）';
+$lang['import_downloadfailures'] = '下載失敗項的 CSV 檔案以供修正';
diff --git a/sources/lib/plugins/usermanager/lang/zh-tw/list.txt b/sources/lib/plugins/usermanager/lang/zh-tw/list.txt
new file mode 100644
index 0000000..1e539bd
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/zh-tw/list.txt
@@ -0,0 +1 @@
+===== 帳號清單 =====
diff --git a/sources/lib/plugins/usermanager/lang/zh/add.txt b/sources/lib/plugins/usermanager/lang/zh/add.txt
new file mode 100644
index 0000000..fd3b1e5
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/zh/add.txt
@@ -0,0 +1 @@
+===== 添加用户 =====
diff --git a/sources/lib/plugins/usermanager/lang/zh/delete.txt b/sources/lib/plugins/usermanager/lang/zh/delete.txt
new file mode 100644
index 0000000..dc6b7fc
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/zh/delete.txt
@@ -0,0 +1 @@
+===== 删除用户 =====
diff --git a/sources/lib/plugins/usermanager/lang/zh/edit.txt b/sources/lib/plugins/usermanager/lang/zh/edit.txt
new file mode 100644
index 0000000..83b72df
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/zh/edit.txt
@@ -0,0 +1 @@
+===== 编辑用户 =====
diff --git a/sources/lib/plugins/usermanager/lang/zh/import.txt b/sources/lib/plugins/usermanager/lang/zh/import.txt
new file mode 100644
index 0000000..eacce5a
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/zh/import.txt
@@ -0,0 +1,7 @@
+===== 批量导入用户 =====
+
+需要至少有 4 列的 CSV 格式用户列表文件。列必须按顺序包括：用户ID、全名、电子邮件地址和组。
+CSV 域需要用逗号 (,) 分隔，字符串用英文双引号 ("") 分开。反斜杠可以用来转义。
+可以尝试上面的“导入用户”功能来查看示例文件。重复的用户ID将被忽略。
+
+密码生成后会通过电子邮件发送给每个成功导入的用户。
\ No newline at end of file
diff --git a/sources/lib/plugins/usermanager/lang/zh/intro.txt b/sources/lib/plugins/usermanager/lang/zh/intro.txt
new file mode 100644
index 0000000..5f254be
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/zh/intro.txt
@@ -0,0 +1 @@
+====== 用户管理器 ======
diff --git a/sources/lib/plugins/usermanager/lang/zh/lang.php b/sources/lib/plugins/usermanager/lang/zh/lang.php
new file mode 100644
index 0000000..25eb1a2
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/zh/lang.php
@@ -0,0 +1,78 @@
+
+ * @author http://www.chinese-tools.com/tools/converter-tradsimp.html
+ * @author George Sheraton guxd@163.com
+ * @author Simon zhan 
+ * @author mr.jinyi@gmail.com
+ * @author ben 
+ * @author lainme 
+ * @author caii 
+ * @author Hiphen Lee 
+ * @author caii, patent agent in China 
+ * @author lainme993@gmail.com
+ * @author Shuo-Ting Jian 
+ * @author Rachel 
+ * @author Yangyu Huang 
+ */
+$lang['menu']                  = '用户管理器';
+$lang['noauth']                = '（用户认证不可用）';
+$lang['nosupport']             = '（用户管理不支持）';
+$lang['badauth']               = '非法的认证结构';
+$lang['user_id']               = '用户名';
+$lang['user_pass']             = '密码';
+$lang['user_name']             = '真实姓名';
+$lang['user_mail']             = 'Email';
+$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['export_all']            = '导出所有用户（CSV）';
+$lang['export_filtered']       = '导出已筛选的用户列表（CSV）';
+$lang['import']                = '请输入新用户名';
+$lang['line']                  = '行号';
+$lang['error']                 = '信息错误';
+$lang['summary']               = '找到 %3$d 名用户，显示其中第 %1$d 至 %2$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']           = '通知邮件无法发送';
+$lang['import_userlistcsv']    = '用户列表文件（CSV）';
+$lang['import_header']         = '最近一次导入 - 失败';
+$lang['import_success_count']  = '用户导入：找到了 %d 个用户，%d 个用户被成功导入。';
+$lang['import_failure_count']  = '用户导入：%d 个用户导入失败。下面列出了失败的用户。';
+$lang['import_error_fields']   = '域的数目不足，发现 %d 个，需要 4 个。';
+$lang['import_error_baduserid'] = '用户ID丢失';
+$lang['import_error_badname']  = '名称错误';
+$lang['import_error_badmail']  = '邮件地址错误';
+$lang['import_error_upload']   = '导入失败。CSV 文件无法上传或是空的。';
+$lang['import_error_readfail'] = '导入失败。无法读取上传的文件。';
+$lang['import_error_create']   = '不能创建新用户';
+$lang['import_notify_fail']    = '通知消息无法发送到导入的用户 %s，电子邮件地址是 %s。';
diff --git a/sources/lib/plugins/usermanager/lang/zh/list.txt b/sources/lib/plugins/usermanager/lang/zh/list.txt
new file mode 100644
index 0000000..e62a85b
--- /dev/null
+++ b/sources/lib/plugins/usermanager/lang/zh/list.txt
@@ -0,0 +1 @@
+===== 用户列表 =====
diff --git a/sources/lib/plugins/usermanager/plugin.info.txt b/sources/lib/plugins/usermanager/plugin.info.txt
new file mode 100644
index 0000000..3154591
--- /dev/null
+++ b/sources/lib/plugins/usermanager/plugin.info.txt
@@ -0,0 +1,7 @@
+base   usermanager
+author Chris Smith
+email  chris@jalakai.co.uk
+date   2013-02-20
+name   User Manager
+desc   Manage DokuWiki user accounts
+url    http://dokuwiki.org/plugin:usermanager
diff --git a/sources/lib/plugins/usermanager/script.js b/sources/lib/plugins/usermanager/script.js
new file mode 100644
index 0000000..de01324
--- /dev/null
+++ b/sources/lib/plugins/usermanager/script.js
@@ -0,0 +1,8 @@
+/**
+ * Add JavaScript confirmation to the User Delete button
+ */
+jQuery(function(){
+    jQuery('#usrmgr__del').click(function(){
+        return confirm(LANG.del_confirm);
+    });
+});
diff --git a/sources/lib/plugins/usermanager/style.css b/sources/lib/plugins/usermanager/style.css
new file mode 100644
index 0000000..d119b19
--- /dev/null
+++ b/sources/lib/plugins/usermanager/style.css
@@ -0,0 +1,33 @@
+/* User Manager specific styles */
+#user__manager tr.disabled {
+  color: #6f6f6f;
+  background: #e4e4e4;
+}
+#user__manager tr.user_info {
+  vertical-align: top;
+}
+#user__manager div.edit_user {
+  width: 46%;
+  float: left;
+}
+#user__manager table {
+  margin-bottom: 1em;
+}
+#user__manager ul.notes {
+  padding-left: 0;
+  padding-right: 1.4em;
+}
+#user__manager input.button[disabled] {
+  color: #ccc!important;
+  border-color: #ccc!important;
+}
+#user__manager .import_users {
+  margin-top: 1.4em;
+}
+#user__manager .import_failures {
+  margin-top: 1.4em;
+}
+#user__manager .import_failures td.lineno {
+  text-align: center;
+}
+/* IE won't understand but doesn't require it */
diff --git a/sources/lib/scripts/behaviour.js b/sources/lib/scripts/behaviour.js
new file mode 100644
index 0000000..85ddf50
--- /dev/null
+++ b/sources/lib/scripts/behaviour.js
@@ -0,0 +1,182 @@
+/**
+ * Hides elements with a slide animation
+ *
+ * @param fn optional callback to run after hiding
+ * @author Adrian Lang 
+ */
+jQuery.fn.dw_hide = function(fn) {
+    this.attr('aria-expanded', 'false');
+    return this.slideUp('fast', fn);
+};
+
+/**
+ * Unhides elements with a slide animation
+ *
+ * @param fn optional callback to run after hiding
+ * @author Adrian Lang 
+ */
+jQuery.fn.dw_show = function(fn) {
+    this.attr('aria-expanded', 'true');
+    return this.slideDown('fast', fn);
+};
+
+/**
+ * Toggles visibility of an element using a slide element
+ *
+ * @param bool the current state of the element (optional)
+ */
+jQuery.fn.dw_toggle = function(bool, fn) {
+    return this.each(function() {
+        var $this = jQuery(this);
+        if (typeof bool === 'undefined') {
+            bool = $this.is(':hidden');
+        }
+        $this[bool ? "dw_show" : "dw_hide" ](fn);
+    });
+};
+
+/**
+ * Automatic behaviours
+ *
+ * This class wraps various JavaScript functionalities that are triggered
+ * automatically whenever a certain object is in the DOM or a certain CSS
+ * class was found
+ */
+var dw_behaviour = {
+
+    init: function(){
+        dw_behaviour.focusMarker();
+        dw_behaviour.scrollToMarker();
+        dw_behaviour.removeHighlightOnClick();
+        dw_behaviour.quickSelect();
+        dw_behaviour.checkWindowsShares();
+        dw_behaviour.subscription();
+
+        dw_behaviour.revisionBoxHandler();
+        jQuery(document).on('click','#page__revisions input[type=checkbox]',
+            dw_behaviour.revisionBoxHandler
+        );
+    },
+
+    /**
+     * Looks for an element with the ID scroll__here at scrolls to it
+     */
+    scrollToMarker: function(){
+        var $obj = jQuery('#scroll__here');
+        if($obj.length) {
+            $obj[0].scrollIntoView();
+        }
+    },
+
+    /**
+     * Looks for an element with the ID focus__this at sets focus to it
+     */
+    focusMarker: function(){
+        jQuery('#focus__this').focus();
+    },
+
+    /**
+     * Remove all search highlighting when clicking on a highlighted term
+     *
+     * @FIXME would be nice to have it fade out
+     */
+    removeHighlightOnClick: function(){
+        jQuery('span.search_hit').click(
+            function(e){
+                jQuery(e.target).removeClass('search_hit');
+            }
+        );
+    },
+
+    /**
+     * Autosubmit quick select forms
+     *
+     * When a ' +
+            '  ' +
+            '' +
+            '',
+
+        // template for one item in file list
+        fileTemplate: '
      13. ' +
+              '' +
+            '  ' +
+            '  ' +
+            '  ' +
+            '  ' + LANG.media_cancel + '' +
+            '  Failed' +
+            '
        14. ',
+
+        classes: {
+            // used to get elements from templates
+            button: 'qq-upload-button',
+            drop: 'qq-upload-drop-area',
+            dropActive: 'qq-upload-drop-area-active',
+            list: 'qq-upload-list',
+            nameInput: 'qq-upload-name-input',
+            overwriteInput: 'qq-overwrite-check',
+            uploadButton: 'qq-upload-action',
+            file: 'qq-upload-file',
+
+            spinner: 'qq-upload-spinner',
+            size: 'qq-upload-size',
+            cancel: 'qq-upload-cancel',
+
+            // added to list item when upload completes
+            // used in css to hide progress spinner
+            success: 'qq-upload-success',
+            fail: 'qq-upload-fail',
+            failedText: 'qq-upload-failed-text'
+        }
+    });
+
+    qq.extend(this._options, o);
+
+    this._element = this._options.element;
+    this._element.innerHTML = this._options.template;
+    this._listElement = this._options.listElement || this._find(this._element, 'list');
+
+    this._classes = this._options.classes;
+
+    this._button = this._createUploadButton(this._find(this._element, 'button'));
+
+    this._bindCancelEvent();
+    this._bindUploadEvent();
+    this._setupDragDrop();
+};
+
+qq.extend(qq.FileUploaderExtended.prototype, qq.FileUploader.prototype);
+
+qq.extend(qq.FileUploaderExtended.prototype, {
+    _bindUploadEvent: function(){
+        var self = this,
+            list = this._listElement;
+
+        qq.attach(document.getElementById('mediamanager__upload_button'), 'click', function(e){
+            e = e || window.event;
+            var target = e.target || e.srcElement;
+            qq.preventDefault(e);
+            self._handler._options.onUpload();
+
+            jQuery(".qq-upload-name-input").each(function (i) {
+                jQuery(this).attr('disabled', 'disabled');
+            });
+        });
+    },
+
+    _onComplete: function(id, fileName, result){
+        this._filesInProgress--;
+
+        // mark completed
+        var item = this._getItemByFileId(id);
+        qq.remove(this._find(item, 'cancel'));
+        qq.remove(this._find(item, 'spinner'));
+
+        var nameInput = this._find(item, 'nameInput');
+        var fileElement = this._find(item, 'file');
+        qq.setText(fileElement, nameInput.value);
+        qq.removeClass(fileElement, 'hidden');
+        qq.remove(nameInput);
+        jQuery('.qq-upload-button, #mediamanager__upload_button').remove();
+        jQuery('.dw__ow').parent().hide();
+        jQuery('.qq-upload-drop-area').remove();
+
+        if (result.success){
+            qq.addClass(item, this._classes.success);
+            $link = '' + nameInput.value + '';
+            jQuery(fileElement).html($link);
+
+        } else {
+            qq.addClass(item, this._classes.fail);
+            var fail = this._find(item, 'failedText');
+            if (result.error) qq.setText(fail, result.error);
+        }
+
+        if (document.getElementById('media__content') && !document.getElementById('mediamanager__done_form')) {
+            var action = document.location.href;
+            var i = action.indexOf('?');
+            if (i) action = action.substr(0, i);
+            var button = '
        ';
+            button += '';
+            button += '';
+            button += '
        ';
+            jQuery('#mediamanager__uploader').append(button);
+        }
+    }
+
+});
+
+qq.extend(qq.UploadHandlerForm.prototype, {
+    uploadAll: function(params){
+        this._uploadAll(params);
+    },
+
+    getName: function(id){
+        var file = this._inputs[id];
+        var name = document.getElementById('mediamanager__upload_item'+id);
+        if (name != null) {
+            return name.value;
+        } else {
+            if (file != null) {
+                // get input value and remove path to normalize
+                return file.value.replace(/.*(\/|\\)/, "");
+            } else {
+                return null;
+            }
+        }
+    },
+
+    _uploadAll: function(params){
+         jQuery(".qq-upload-spinner").each(function (i) {
+            jQuery(this).removeClass('hidden');
+        });
+        for (key in this._inputs) {
+            this.upload(key, params);
+        }
+
+    },
+
+    _upload: function(id, params){
+        var input = this._inputs[id];
+
+        if (!input){
+            throw new Error('file with passed id was not added, or already uploaded or cancelled');
+        }
+
+        var fileName = this.getName(id);
+
+        var iframe = this._createIframe(id);
+        var form = this._createForm(iframe, params);
+        form.appendChild(input);
+
+        var nameInput = qq.toElement('');
+        form.appendChild(nameInput);
+
+        var checked = jQuery('.dw__ow').attr('checked');
+        var owCheckbox = jQuery('.dw__ow').clone();
+        owCheckbox.attr('checked', checked);
+        jQuery(form).append(owCheckbox);
+
+        var self = this;
+        this._attachLoadEvent(iframe, function(){
+            self.log('iframe loaded');
+
+            var response = self._getIframeContentJSON(iframe);
+
+            self._options.onComplete(id, fileName, response);
+            self._dequeue(id);
+
+            delete self._inputs[id];
+            // timeout added to fix busy state in FF3.6
+            setTimeout(function(){
+                qq.remove(iframe);
+            }, 1);
+        });
+
+        form.submit();
+        qq.remove(form);
+
+        return id;
+    }
+});
+
+qq.extend(qq.UploadHandlerXhr.prototype, {
+    uploadAll: function(params){
+        this._uploadAll(params);
+    },
+
+    getName: function(id){
+        var file = this._files[id];
+        var name = document.getElementById('mediamanager__upload_item'+id);
+        if (name != null) {
+            return name.value;
+        } else {
+            if (file != null) {
+                // fix missing name in Safari 4
+                return file.fileName != null ? file.fileName : file.name;
+            } else {
+                return null;
+            }
+        }
+    },
+
+    getSize: function(id){
+        var file = this._files[id];
+        if (file == null) return null;
+        return file.fileSize != null ? file.fileSize : file.size;
+    },
+
+    _upload: function(id, params){
+        var file = this._files[id],
+            name = this.getName(id),
+            size = this.getSize(id);
+        if (name == null || size == null) return;
+
+        this._loaded[id] = 0;
+
+        var xhr = this._xhrs[id] = new XMLHttpRequest();
+        var self = this;
+
+        xhr.upload.onprogress = function(e){
+            if (e.lengthComputable){
+                self._loaded[id] = e.loaded;
+                self._options.onProgress(id, name, e.loaded, e.total);
+            }
+        };
+
+        xhr.onreadystatechange = function(){
+            if (xhr.readyState == 4){
+                self._onComplete(id, xhr);
+            }
+        };
+
+        // build query string
+        params = params || {};
+        params['qqfile'] = name;
+        params['ow'] = jQuery('.dw__ow').attr('checked');
+        var queryString = qq.obj2url(params, this._options.action);
+
+        xhr.open("POST", queryString, true);
+        xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+        xhr.setRequestHeader("X-File-Name", encodeURIComponent(name));
+        xhr.setRequestHeader("Content-Type", "application/octet-stream");
+        xhr.send(file);
+    },
+
+    _uploadAll: function(params){
+        jQuery(".qq-upload-spinner").each(function (i) {
+            jQuery(this).removeClass('hidden');
+        });
+        for (key in this._files) {
+            this.upload(key, params);
+        }
+
+    }
+});
diff --git a/sources/lib/scripts/helpers.js b/sources/lib/scripts/helpers.js
new file mode 100644
index 0000000..0b32e87
--- /dev/null
+++ b/sources/lib/scripts/helpers.js
@@ -0,0 +1,66 @@
+/**
+ * Various helper functions
+ */
+
+/**
+ * A PHP-style substr_replace
+ *
+ * Supports negative start and length and omitting length, but not
+ * str and replace arrays.
+ * See http://php.net/substr-replace for further documentation.
+ */
+function substr_replace(str, replace, start, length) {
+    var a2, b1;
+    a2 = (start < 0 ? str.length : 0) + start;
+    if (typeof length === 'undefined') {
+        length = str.length - a2;
+    } else if (length < 0 && start < 0 && length <= start) {
+        length = 0;
+    }
+    b1 = (length < 0 ? str.length : a2) + length;
+    return str.substring(0, a2) + replace + str.substring(b1);
+}
+
+/**
+ * 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 Aps = Array.prototype.slice,
+    // Store passed arguments in this scope.
+    // Since arguments is no Array nor has an own slice method,
+    // we have to apply the slice method from the Array.prototype
+        static_args = Aps.call(arguments, 1);
+
+    // Return a function evaluating the passed function with the
+    // given args and optional arguments passed on invocation.
+    return function (/* ... */) {
+        // Same here, but we use Array.prototype.slice solely for
+        // converting arguments to an Array.
+        return fnc.apply(this,
+                         static_args.concat(Aps.call(arguments, 0)));
+    };
+}
+
+/**
+ * Report an error from a JS file to the console
+ *
+ * @param e    The error object
+ * @param file The file in which the error occurred
+ */
+function logError(e, file) {
+    if (window.console && console.error) {
+        console.error('The error "%s: %s" occurred in file "%s". ' +
+            'If this is in a plugin try updating or disabling the plugin, ' +
+            'if this is in a template try updating the template or switching to the "dokuwiki" template.',
+            e.name, e.message, file);
+    }
+}
diff --git a/sources/lib/scripts/hotkeys.js b/sources/lib/scripts/hotkeys.js
new file mode 100644
index 0000000..bff2853
--- /dev/null
+++ b/sources/lib/scripts/hotkeys.js
@@ -0,0 +1,302 @@
+/**
+ * Some of these scripts were taken from TinyMCE (http://tinymce.moxiecode.com/) and were modified for DokuWiki
+ *
+ * Class handles accesskeys using javascript and also provides ability
+ * to register and use other hotkeys as well.
+ *
+ * @author Marek Sacha 
+ */
+function Hotkeys() {
+
+    this.shortcuts = new Array();
+
+    /**
+     * Set modifier keys, for instance:
+     *  this.modifier = 'ctrl';
+     *  this.modifier = 'ctrl+shift';
+     *  this.modifier = 'ctrl+alt+shift';
+     *  this.modifier = 'alt';
+     *  this.modifier = 'alt+shift';
+     *
+     *  overwritten in intitialize (see below)
+     */
+    this.modifier = 'ctrl+alt';
+
+    /**
+     * Initialization
+     *
+     * This function looks up all the accesskeys used in the current page
+     * (at anchor elements and input elements [type="submit"]) and registers
+     * appropriate shortcuts.
+     *
+     * Secondly, initialization registers listeners on document to catch all
+     * keyboard events.
+     *
+     * @author Marek Sacha 
+     */
+    this.initialize = function() {
+        var t = this;
+
+        //switch modifier key based on OS FS#1958
+        if(is_macos){
+            t.modifier = 'ctrl+alt';
+        }else{
+            t.modifier = 'alt';
+        }
+
+        /**
+         * Lookup all anchors with accesskey and register event - go to anchor
+         * target.
+         */
+        var anchors = document.getElementsByTagName("a");
+        t.each(anchors, function(a) {
+            if (a.accessKey != "") {
+                t.addShortcut(t.modifier + '+' + a.accessKey, function() {
+                    location.href = a.href;
+                });
+                a.accessKey = '';
+            }
+        });
+
+        /**
+         * Lookup all input [type="submit"] with accesskey and register event -
+         * perform "click" on a button.
+         */
+        var inputs = document.getElementsByTagName("input");
+        t.each(inputs, function(i) {
+            if (i.type == "submit" && i.accessKey != "") {
+                t.addShortcut(t.modifier + '+' + i.accessKey, function() {
+                    i.click();
+                });
+                i.accessKey = '';
+            }
+        });
+
+        /**
+         * Lookup all buttons with accesskey and register event -
+         * perform "click" on a button.
+         */
+        var buttons = document.getElementsByTagName("button");
+        t.each(buttons, function(b) {
+            if (b.accessKey != "") {
+                t.addShortcut(t.modifier + '+' + b.accessKey, function() {
+                    b.click();
+                });
+                b.accessKey = '';
+            }
+        });
+
+        /**
+         * Register listeners on document to catch keyboard events.
+         */
+
+        addEvent(document,'keyup',function (e) {
+            return t.onkeyup.call(t,e);
+        });
+
+        addEvent(document,'keypress',function (e) {
+            return t.onkeypress.call(t,e);
+        });
+
+        addEvent(document,'keydown',function (e) {
+            return t.onkeydown.call(t,e);
+        });
+    };
+
+    /**
+     * Keyup processing function
+     * Function returns true if keyboard event has registered handler, and
+     * executes the handler function.
+     *
+     * @param e KeyboardEvent
+     * @author Marek Sacha 
+     * @return b boolean
+     */
+    this.onkeyup = function(e) {
+        var t = this;
+        var v = t.findShortcut(e);
+        if (v != null && v != false) {
+            v.func.call(t);
+            return false;
+        }
+        return true;
+    };
+
+    /**
+     * Keydown processing function
+     * Function returns true if keyboard event has registered handler
+     *
+     * @param e KeyboardEvent
+     * @author Marek Sacha 
+     * @return b boolean
+     */
+    this.onkeydown = function(e) {
+        var t = this;
+        var v = t.findShortcut(e);
+        if (v != null && v != false) {
+            return false;
+        }
+        return true;
+    };
+
+    /**
+     * Keypress processing function
+     * Function returns true if keyboard event has registered handler
+     *
+     * @param e KeyboardEvent
+     * @author Marek Sacha 
+     * @return b
+     */
+    this.onkeypress = function(e) {
+        var t = this;
+        var v = t.findShortcut(e);
+        if (v != null && v != false) {
+            return false;
+        }
+        return true;
+    };
+
+    /**
+     * Register new shortcut
+     *
+     * This function registers new shortcuts, each shortcut is defined by its
+     * modifier keys and a key (with + as delimiter). If shortcut is pressed
+     * cmd_function is performed.
+     *
+     * For example:
+     *  pa = "ctrl+alt+p";
+     *  pa = "shift+alt+s";
+     *
+     * Full example of method usage:
+     *  hotkeys.addShortcut('ctrl+s',function() {
+     *      document.getElementByID('form_1').submit();
+     *  });
+     *
+     * @param pa String description of the shortcut (ctrl+a, ctrl+shift+p, .. )
+     * @param cmd_func Function to be called if shortcut is pressed
+     * @author Marek Sacha 
+     */
+    this.addShortcut = function(pa, cmd_func) {
+        var t = this;
+
+        var o = {
+            func : cmd_func,
+            alt : false,
+            ctrl : false,
+            shift : false
+        };
+
+        t.each(t.explode(pa, '+'), function(v) {
+            switch (v) {
+                case 'alt':
+                case 'ctrl':
+                case 'shift':
+                    o[v] = true;
+                    break;
+
+                default:
+                    o.charCode = v.charCodeAt(0);
+                    o.keyCode = v.toUpperCase().charCodeAt(0);
+            }
+        });
+
+        t.shortcuts.push((o.ctrl ? 'ctrl' : '') + ',' + (o.alt ? 'alt' : '') + ',' + (o.shift ? 'shift' : '') + ',' + o.keyCode,  o);
+
+        return true;
+    };
+
+    /**
+     * @property isMac
+     */
+    this.isMac = is_macos;
+
+    /**
+     * Apply function cb on each element of o in the namespace of s
+     * @param o Array of objects
+     * @param cb Function to be called on each object
+     * @param s Namespace to be used during call of cb (default namespace is o)
+     * @author Marek Sacha 
+     */
+    this.each = function(o, cb, s) {
+        var n, l;
+
+        if (!o)
+            return 0;
+
+        s = s || o;
+
+        if (o.length !== undefined) {
+            // Indexed arrays, needed for Safari
+            for (n=0, l = o.length; n < l; n++) {
+                if (cb.call(s, o[n], n, o) === false)
+                    return 0;
+            }
+        } else {
+            // Hashtables
+            for (n in o) {
+                if (o.hasOwnProperty(n)) {
+                    if (cb.call(s, o[n], n, o) === false)
+                        return 0;
+                }
+            }
+        }
+
+        return 1;
+    };
+
+    /**
+     * Explode string according to delimiter
+     * @param s String
+     * @param d Delimiter (default ',')
+     * @author Marek Sacha 
+     * @return a Array of tokens
+     */
+    this.explode = function(s, d) {
+        return  s.split(d || ',');
+    };
+
+    /**
+     * Find if the shortcut was registered
+     *
+     * @param e KeyboardEvent
+     * @author Marek Sacha 
+     * @return v Shortcut structure or null if not found
+     */
+    this.findShortcut = function (e) {
+        var t = this;
+        var v = null;
+
+        /* No modifier key used - shortcut does not exist */
+        if (!e.altKey && !e.ctrlKey && !e.metaKey) {
+            return v;
+        }
+
+        t.each(t.shortcuts, function(o) {
+            if (o.ctrl != e.ctrlKey)
+                return;
+
+            if (o.alt != e.altKey)
+                return;
+
+            if (o.shift != e.shiftKey)
+                return;
+
+            if (e.keyCode == o.keyCode || (e.charCode && e.charCode == o.charCode)) {
+                v = o;
+                return;
+            }
+        });
+        return v;
+    };
+}
+
+/**
+ * Init function for hotkeys. Called from js.php, to ensure hotkyes are initialized after toolbar.
+ * Call of addInitEvent(initializeHotkeys) is unnecessary now.
+ *
+ * @author Marek Sacha 
+ */
+function initializeHotkeys() {
+    var hotkeys = new Hotkeys();
+    hotkeys.initialize();
+}
diff --git a/sources/lib/scripts/index.html b/sources/lib/scripts/index.html
new file mode 100644
index 0000000..977f90e
--- /dev/null
+++ b/sources/lib/scripts/index.html
@@ -0,0 +1,11 @@
+
+
+
+
+
+nothing here...
+
+
+
+
+
diff --git a/sources/lib/scripts/index.js b/sources/lib/scripts/index.js
new file mode 100644
index 0000000..4b67a0b
--- /dev/null
+++ b/sources/lib/scripts/index.js
@@ -0,0 +1,16 @@
+var dw_index = jQuery('#index__tree').dw_tree({deferInit: true,
+    load_data: function  (show_sublist, $clicky) {
+        jQuery.post(
+            DOKU_BASE + 'lib/exe/ajax.php',
+            $clicky[0].search.substr(1) + '&call=index',
+            show_sublist, 'html'
+        );
+    }
+});
+jQuery(function () {
+    var $tree = jQuery('#index__tree');
+
+    dw_index.$obj = $tree;
+
+    dw_index.init();
+});
diff --git a/sources/lib/scripts/jquery/jquery-migrate.js b/sources/lib/scripts/jquery/jquery-migrate.js
new file mode 100644
index 0000000..942cb8b
--- /dev/null
+++ b/sources/lib/scripts/jquery/jquery-migrate.js
@@ -0,0 +1,511 @@
+/*!
+ * jQuery Migrate - v1.1.1 - 2013-02-16
+ * https://github.com/jquery/jquery-migrate
+ * Copyright 2005, 2013 jQuery Foundation, Inc. and other contributors; Licensed MIT
+ */
+(function( jQuery, window, undefined ) {
+// See http://bugs.jquery.com/ticket/13335
+// "use strict";
+
+
+var warnedAbout = {};
+
+// List of warnings already given; public read only
+jQuery.migrateWarnings = [];
+
+// Set to true to prevent console output; migrateWarnings still maintained
+// jQuery.migrateMute = false;
+
+// Show a message on the console so devs know we're active
+if ( !jQuery.migrateMute && window.console && console.log ) {
+	console.log("JQMIGRATE: Logging is active");
+}
+
+// Set to false to disable traces that appear with warnings
+if ( jQuery.migrateTrace === undefined ) {
+	jQuery.migrateTrace = true;
+}
+
+// Forget any warnings we've already given; public
+jQuery.migrateReset = function() {
+	warnedAbout = {};
+	jQuery.migrateWarnings.length = 0;
+};
+
+function migrateWarn( msg) {
+	if ( !warnedAbout[ msg ] ) {
+		warnedAbout[ msg ] = true;
+		jQuery.migrateWarnings.push( msg );
+		if ( window.console && console.warn && !jQuery.migrateMute ) {
+			console.warn( "JQMIGRATE: " + msg );
+			if ( jQuery.migrateTrace && console.trace ) {
+				console.trace();
+			}
+		}
+	}
+}
+
+function migrateWarnProp( obj, prop, value, msg ) {
+	if ( Object.defineProperty ) {
+		// On ES5 browsers (non-oldIE), warn if the code tries to get prop;
+		// allow property to be overwritten in case some other plugin wants it
+		try {
+			Object.defineProperty( obj, prop, {
+				configurable: true,
+				enumerable: true,
+				get: function() {
+					migrateWarn( msg );
+					return value;
+				},
+				set: function( newValue ) {
+					migrateWarn( msg );
+					value = newValue;
+				}
+			});
+			return;
+		} catch( err ) {
+			// IE8 is a dope about Object.defineProperty, can't warn there
+		}
+	}
+
+	// Non-ES5 (or broken) browser; just set the property
+	jQuery._definePropertyBroken = true;
+	obj[ prop ] = value;
+}
+
+if ( document.compatMode === "BackCompat" ) {
+	// jQuery has never supported or tested Quirks Mode
+	migrateWarn( "jQuery is not compatible with Quirks Mode" );
+}
+
+
+var attrFn = jQuery( "", { size: 1 } ).attr("size") && jQuery.attrFn,
+	oldAttr = jQuery.attr,
+	valueAttrGet = jQuery.attrHooks.value && jQuery.attrHooks.value.get ||
+		function() { return null; },
+	valueAttrSet = jQuery.attrHooks.value && jQuery.attrHooks.value.set ||
+		function() { return undefined; },
+	rnoType = /^(?:input|button)$/i,
+	rnoAttrNodeType = /^[238]$/,
+	rboolean = /^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,
+	ruseDefault = /^(?:checked|selected)$/i;
+
+// jQuery.attrFn
+migrateWarnProp( jQuery, "attrFn", attrFn || {}, "jQuery.attrFn is deprecated" );
+
+jQuery.attr = function( elem, name, value, pass ) {
+	var lowerName = name.toLowerCase(),
+		nType = elem && elem.nodeType;
+
+	if ( pass ) {
+		// Since pass is used internally, we only warn for new jQuery
+		// versions where there isn't a pass arg in the formal params
+		if ( oldAttr.length < 4 ) {
+			migrateWarn("jQuery.fn.attr( props, pass ) is deprecated");
+		}
+		if ( elem && !rnoAttrNodeType.test( nType ) &&
+			(attrFn ? name in attrFn : jQuery.isFunction(jQuery.fn[name])) ) {
+			return jQuery( elem )[ name ]( value );
+		}
+	}
+
+	// Warn if user tries to set `type`, since it breaks on IE 6/7/8; by checking
+	// for disconnected elements we don't warn on $( "").addClass(this._triggerClass).
+					html(!buttonImage ? buttonText : $("").attr(
+					{ src:buttonImage, alt:buttonText, title:buttonText })));
+			input[isRTL ? "before" : "after"](inst.trigger);
+			inst.trigger.click(function() {
+				if ($.datepicker._datepickerShowing && $.datepicker._lastInput === input[0]) {
+					$.datepicker._hideDatepicker();
+				} else if ($.datepicker._datepickerShowing && $.datepicker._lastInput !== input[0]) {
+					$.datepicker._hideDatepicker();
+					$.datepicker._showDatepicker(input[0]);
+				} else {
+					$.datepicker._showDatepicker(input[0]);
+				}
+				return false;
+			});
+		}
+	},
+
+	/* Apply the maximum length for the date format. */
+	_autoSize: function(inst) {
+		if (this._get(inst, "autoSize") && !inst.inline) {
+			var findMax, max, maxI, i,
+				date = new Date(2009, 12 - 1, 20), // Ensure double digits
+				dateFormat = this._get(inst, "dateFormat");
+
+			if (dateFormat.match(/[DM]/)) {
+				findMax = function(names) {
+					max = 0;
+					maxI = 0;
+					for (i = 0; i < names.length; i++) {
+						if (names[i].length > max) {
+							max = names[i].length;
+							maxI = i;
+						}
+					}
+					return maxI;
+				};
+				date.setMonth(findMax(this._get(inst, (dateFormat.match(/MM/) ?
+					"monthNames" : "monthNamesShort"))));
+				date.setDate(findMax(this._get(inst, (dateFormat.match(/DD/) ?
+					"dayNames" : "dayNamesShort"))) + 20 - date.getDay());
+			}
+			inst.input.attr("size", this._formatDate(inst, date).length);
+		}
+	},
+
+	/* Attach an inline date picker to a div. */
+	_inlineDatepicker: function(target, inst) {
+		var divSpan = $(target);
+		if (divSpan.hasClass(this.markerClassName)) {
+			return;
+		}
+		divSpan.addClass(this.markerClassName).append(inst.dpDiv);
+		$.data(target, PROP_NAME, inst);
+		this._setDate(inst, this._getDefaultDate(inst), true);
+		this._updateDatepicker(inst);
+		this._updateAlternate(inst);
+		//If disabled option is true, disable the datepicker before showing it (see ticket #5665)
+		if( inst.settings.disabled ) {
+			this._disableDatepicker( target );
+		}
+		// Set display:block in place of inst.dpDiv.show() which won't work on disconnected elements
+		// http://bugs.jqueryui.com/ticket/7552 - A Datepicker created on a detached div has zero height
+		inst.dpDiv.css( "display", "block" );
+	},
+
+	/* Pop-up the date picker in a "dialog" box.
+	 * @param  input element - ignored
+	 * @param  date	string or Date - the initial date to display
+	 * @param  onSelect  function - the function to call when a date is selected
+	 * @param  settings  object - update the dialog date picker instance's settings (anonymous object)
+	 * @param  pos int[2] - coordinates for the dialog's position within the screen or
+	 *					event - with x/y coordinates or
+	 *					leave empty for default (screen centre)
+	 * @return the manager object
+	 */
+	_dialogDatepicker: function(input, date, onSelect, settings, pos) {
+		var id, browserWidth, browserHeight, scrollX, scrollY,
+			inst = this._dialogInst; // internal instance
+
+		if (!inst) {
+			this.uuid += 1;
+			id = "dp" + this.uuid;
+			this._dialogInput = $("");
+			this._dialogInput.keydown(this._doKeyDown);
+			$("body").append(this._dialogInput);
+			inst = this._dialogInst = this._newInst(this._dialogInput, false);
+			inst.settings = {};
+			$.data(this._dialogInput[0], PROP_NAME, inst);
+		}
+		extendRemove(inst.settings, settings || {});
+		date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
+		this._dialogInput.val(date);
+
+		this._pos = (pos ? (pos.length ? pos : [pos.pageX, pos.pageY]) : null);
+		if (!this._pos) {
+			browserWidth = document.documentElement.clientWidth;
+			browserHeight = document.documentElement.clientHeight;
+			scrollX = document.documentElement.scrollLeft || document.body.scrollLeft;
+			scrollY = document.documentElement.scrollTop || document.body.scrollTop;
+			this._pos = // should use actual width/height below
+				[(browserWidth / 2) - 100 + scrollX, (browserHeight / 2) - 150 + scrollY];
+		}
+
+		// move input on screen for focus, but hidden behind dialog
+		this._dialogInput.css("left", (this._pos[0] + 20) + "px").css("top", this._pos[1] + "px");
+		inst.settings.onSelect = onSelect;
+		this._inDialog = true;
+		this.dpDiv.addClass(this._dialogClass);
+		this._showDatepicker(this._dialogInput[0]);
+		if ($.blockUI) {
+			$.blockUI(this.dpDiv);
+		}
+		$.data(this._dialogInput[0], PROP_NAME, inst);
+		return this;
+	},
+
+	/* Detach a datepicker from its control.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_destroyDatepicker: function(target) {
+		var nodeName,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		$.removeData(target, PROP_NAME);
+		if (nodeName === "input") {
+			inst.append.remove();
+			inst.trigger.remove();
+			$target.removeClass(this.markerClassName).
+				unbind("focus", this._showDatepicker).
+				unbind("keydown", this._doKeyDown).
+				unbind("keypress", this._doKeyPress).
+				unbind("keyup", this._doKeyUp);
+		} else if (nodeName === "div" || nodeName === "span") {
+			$target.removeClass(this.markerClassName).empty();
+		}
+	},
+
+	/* Enable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_enableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = false;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = false; }).end().
+				filter("img").css({opacity: "1.0", cursor: ""});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().removeClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", false);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+	},
+
+	/* Disable the date picker to a jQuery selection.
+	 * @param  target	element - the target input field or division or span
+	 */
+	_disableDatepicker: function(target) {
+		var nodeName, inline,
+			$target = $(target),
+			inst = $.data(target, PROP_NAME);
+
+		if (!$target.hasClass(this.markerClassName)) {
+			return;
+		}
+
+		nodeName = target.nodeName.toLowerCase();
+		if (nodeName === "input") {
+			target.disabled = true;
+			inst.trigger.filter("button").
+				each(function() { this.disabled = true; }).end().
+				filter("img").css({opacity: "0.5", cursor: "default"});
+		} else if (nodeName === "div" || nodeName === "span") {
+			inline = $target.children("." + this._inlineClass);
+			inline.children().addClass("ui-state-disabled");
+			inline.find("select.ui-datepicker-month, select.ui-datepicker-year").
+				prop("disabled", true);
+		}
+		this._disabledInputs = $.map(this._disabledInputs,
+			function(value) { return (value === target ? null : value); }); // delete entry
+		this._disabledInputs[this._disabledInputs.length] = target;
+	},
+
+	/* Is the first field in a jQuery collection disabled as a datepicker?
+	 * @param  target	element - the target input field or division or span
+	 * @return boolean - true if disabled, false if enabled
+	 */
+	_isDisabledDatepicker: function(target) {
+		if (!target) {
+			return false;
+		}
+		for (var i = 0; i < this._disabledInputs.length; i++) {
+			if (this._disabledInputs[i] === target) {
+				return true;
+			}
+		}
+		return false;
+	},
+
+	/* Retrieve the instance data for the target control.
+	 * @param  target  element - the target input field or division or span
+	 * @return  object - the associated instance data
+	 * @throws  error if a jQuery problem getting data
+	 */
+	_getInst: function(target) {
+		try {
+			return $.data(target, PROP_NAME);
+		}
+		catch (err) {
+			throw "Missing instance data for this datepicker";
+		}
+	},
+
+	/* Update or retrieve the settings for a date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 * @param  name	object - the new settings to update or
+	 *				string - the name of the setting to change or retrieve,
+	 *				when retrieving also "all" for all instance settings or
+	 *				"defaults" for all global defaults
+	 * @param  value   any - the new value for the setting
+	 *				(omit if above is an object or to retrieve a value)
+	 */
+	_optionDatepicker: function(target, name, value) {
+		var settings, date, minDate, maxDate,
+			inst = this._getInst(target);
+
+		if (arguments.length === 2 && typeof name === "string") {
+			return (name === "defaults" ? $.extend({}, $.datepicker._defaults) :
+				(inst ? (name === "all" ? $.extend({}, inst.settings) :
+				this._get(inst, name)) : null));
+		}
+
+		settings = name || {};
+		if (typeof name === "string") {
+			settings = {};
+			settings[name] = value;
+		}
+
+		if (inst) {
+			if (this._curInst === inst) {
+				this._hideDatepicker();
+			}
+
+			date = this._getDateDatepicker(target, true);
+			minDate = this._getMinMaxDate(inst, "min");
+			maxDate = this._getMinMaxDate(inst, "max");
+			extendRemove(inst.settings, settings);
+			// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
+			if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
+				inst.settings.minDate = this._formatDate(inst, minDate);
+			}
+			if (maxDate !== null && settings.dateFormat !== undefined && settings.maxDate === undefined) {
+				inst.settings.maxDate = this._formatDate(inst, maxDate);
+			}
+			if ( "disabled" in settings ) {
+				if ( settings.disabled ) {
+					this._disableDatepicker(target);
+				} else {
+					this._enableDatepicker(target);
+				}
+			}
+			this._attachments($(target), inst);
+			this._autoSize(inst);
+			this._setDate(inst, date);
+			this._updateAlternate(inst);
+			this._updateDatepicker(inst);
+		}
+	},
+
+	// change method deprecated
+	_changeDatepicker: function(target, name, value) {
+		this._optionDatepicker(target, name, value);
+	},
+
+	/* Redraw the date picker attached to an input field or division.
+	 * @param  target  element - the target input field or division or span
+	 */
+	_refreshDatepicker: function(target) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._updateDatepicker(inst);
+		}
+	},
+
+	/* Set the dates for a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  date	Date - the new date
+	 */
+	_setDateDatepicker: function(target, date) {
+		var inst = this._getInst(target);
+		if (inst) {
+			this._setDate(inst, date);
+			this._updateDatepicker(inst);
+			this._updateAlternate(inst);
+		}
+	},
+
+	/* Get the date(s) for the first entry in a jQuery selection.
+	 * @param  target element - the target input field or division or span
+	 * @param  noDefault boolean - true if no default date is to be used
+	 * @return Date - the current date
+	 */
+	_getDateDatepicker: function(target, noDefault) {
+		var inst = this._getInst(target);
+		if (inst && !inst.inline) {
+			this._setDateFromField(inst, noDefault);
+		}
+		return (inst ? this._getDate(inst) : null);
+	},
+
+	/* Handle keystrokes. */
+	_doKeyDown: function(event) {
+		var onSelect, dateStr, sel,
+			inst = $.datepicker._getInst(event.target),
+			handled = true,
+			isRTL = inst.dpDiv.is(".ui-datepicker-rtl");
+
+		inst._keyEvent = true;
+		if ($.datepicker._datepickerShowing) {
+			switch (event.keyCode) {
+				case 9: $.datepicker._hideDatepicker();
+						handled = false;
+						break; // hide on tab out
+				case 13: sel = $("td." + $.datepicker._dayOverClass + ":not(." +
+									$.datepicker._currentClass + ")", inst.dpDiv);
+						if (sel[0]) {
+							$.datepicker._selectDay(event.target, inst.selectedMonth, inst.selectedYear, sel[0]);
+						}
+
+						onSelect = $.datepicker._get(inst, "onSelect");
+						if (onSelect) {
+							dateStr = $.datepicker._formatDate(inst);
+
+							// trigger custom callback
+							onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);
+						} else {
+							$.datepicker._hideDatepicker();
+						}
+
+						return false; // don't submit the form
+				case 27: $.datepicker._hideDatepicker();
+						break; // hide on escape
+				case 33: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							-$.datepicker._get(inst, "stepBigMonths") :
+							-$.datepicker._get(inst, "stepMonths")), "M");
+						break; // previous month/year on page up/+ ctrl
+				case 34: $.datepicker._adjustDate(event.target, (event.ctrlKey ?
+							+$.datepicker._get(inst, "stepBigMonths") :
+							+$.datepicker._get(inst, "stepMonths")), "M");
+						break; // next month/year on page down/+ ctrl
+				case 35: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._clearDate(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // clear on ctrl or command +end
+				case 36: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._gotoToday(event.target);
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // current on ctrl or command +home
+				case 37: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? +1 : -1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// -1 day on ctrl or command +left
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								-$.datepicker._get(inst, "stepBigMonths") :
+								-$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +left on Mac
+						break;
+				case 38: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, -7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // -1 week on ctrl or command +up
+				case 39: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, (isRTL ? -1 : +1), "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						// +1 day on ctrl or command +right
+						if (event.originalEvent.altKey) {
+							$.datepicker._adjustDate(event.target, (event.ctrlKey ?
+								+$.datepicker._get(inst, "stepBigMonths") :
+								+$.datepicker._get(inst, "stepMonths")), "M");
+						}
+						// next month/year on alt +right
+						break;
+				case 40: if (event.ctrlKey || event.metaKey) {
+							$.datepicker._adjustDate(event.target, +7, "D");
+						}
+						handled = event.ctrlKey || event.metaKey;
+						break; // +1 week on ctrl or command +down
+				default: handled = false;
+			}
+		} else if (event.keyCode === 36 && event.ctrlKey) { // display the date picker on ctrl+home
+			$.datepicker._showDatepicker(this);
+		} else {
+			handled = false;
+		}
+
+		if (handled) {
+			event.preventDefault();
+			event.stopPropagation();
+		}
+	},
+
+	/* Filter entered characters - based on date format. */
+	_doKeyPress: function(event) {
+		var chars, chr,
+			inst = $.datepicker._getInst(event.target);
+
+		if ($.datepicker._get(inst, "constrainInput")) {
+			chars = $.datepicker._possibleChars($.datepicker._get(inst, "dateFormat"));
+			chr = String.fromCharCode(event.charCode == null ? event.keyCode : event.charCode);
+			return event.ctrlKey || event.metaKey || (chr < " " || !chars || chars.indexOf(chr) > -1);
+		}
+	},
+
+	/* Synchronise manual entry and field/alternate field. */
+	_doKeyUp: function(event) {
+		var date,
+			inst = $.datepicker._getInst(event.target);
+
+		if (inst.input.val() !== inst.lastVal) {
+			try {
+				date = $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+					(inst.input ? inst.input.val() : null),
+					$.datepicker._getFormatConfig(inst));
+
+				if (date) { // only if valid
+					$.datepicker._setDateFromField(inst);
+					$.datepicker._updateAlternate(inst);
+					$.datepicker._updateDatepicker(inst);
+				}
+			}
+			catch (err) {
+			}
+		}
+		return true;
+	},
+
+	/* Pop-up the date picker for a given input field.
+	 * If false returned from beforeShow event handler do not show.
+	 * @param  input  element - the input field attached to the date picker or
+	 *					event - if triggered by focus
+	 */
+	_showDatepicker: function(input) {
+		input = input.target || input;
+		if (input.nodeName.toLowerCase() !== "input") { // find from button/image trigger
+			input = $("input", input.parentNode)[0];
+		}
+
+		if ($.datepicker._isDisabledDatepicker(input) || $.datepicker._lastInput === input) { // already here
+			return;
+		}
+
+		var inst, beforeShow, beforeShowSettings, isFixed,
+			offset, showAnim, duration;
+
+		inst = $.datepicker._getInst(input);
+		if ($.datepicker._curInst && $.datepicker._curInst !== inst) {
+			$.datepicker._curInst.dpDiv.stop(true, true);
+			if ( inst && $.datepicker._datepickerShowing ) {
+				$.datepicker._hideDatepicker( $.datepicker._curInst.input[0] );
+			}
+		}
+
+		beforeShow = $.datepicker._get(inst, "beforeShow");
+		beforeShowSettings = beforeShow ? beforeShow.apply(input, [input, inst]) : {};
+		if(beforeShowSettings === false){
+			return;
+		}
+		extendRemove(inst.settings, beforeShowSettings);
+
+		inst.lastVal = null;
+		$.datepicker._lastInput = input;
+		$.datepicker._setDateFromField(inst);
+
+		if ($.datepicker._inDialog) { // hide cursor
+			input.value = "";
+		}
+		if (!$.datepicker._pos) { // position below input
+			$.datepicker._pos = $.datepicker._findPos(input);
+			$.datepicker._pos[1] += input.offsetHeight; // add the height
+		}
+
+		isFixed = false;
+		$(input).parents().each(function() {
+			isFixed |= $(this).css("position") === "fixed";
+			return !isFixed;
+		});
+
+		offset = {left: $.datepicker._pos[0], top: $.datepicker._pos[1]};
+		$.datepicker._pos = null;
+		//to avoid flashes on Firefox
+		inst.dpDiv.empty();
+		// determine sizing offscreen
+		inst.dpDiv.css({position: "absolute", display: "block", top: "-1000px"});
+		$.datepicker._updateDatepicker(inst);
+		// fix width for dynamic number of date pickers
+		// and adjust position before showing
+		offset = $.datepicker._checkOffset(inst, offset, isFixed);
+		inst.dpDiv.css({position: ($.datepicker._inDialog && $.blockUI ?
+			"static" : (isFixed ? "fixed" : "absolute")), display: "none",
+			left: offset.left + "px", top: offset.top + "px"});
+
+		if (!inst.inline) {
+			showAnim = $.datepicker._get(inst, "showAnim");
+			duration = $.datepicker._get(inst, "duration");
+			inst.dpDiv.zIndex($(input).zIndex()+1);
+			$.datepicker._datepickerShowing = true;
+
+			if ( $.effects && $.effects.effect[ showAnim ] ) {
+				inst.dpDiv.show(showAnim, $.datepicker._get(inst, "showOptions"), duration);
+			} else {
+				inst.dpDiv[showAnim || "show"](showAnim ? duration : null);
+			}
+
+			if (inst.input.is(":visible") && !inst.input.is(":disabled")) {
+				inst.input.focus();
+			}
+			$.datepicker._curInst = inst;
+		}
+	},
+
+	/* Generate the date picker content. */
+	_updateDatepicker: function(inst) {
+		this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
+		instActive = inst; // for delegate hover events
+		inst.dpDiv.empty().append(this._generateHTML(inst));
+		this._attachHandlers(inst);
+		inst.dpDiv.find("." + this._dayOverClass + " a").mouseover();
+
+		var origyearshtml,
+			numMonths = this._getNumberOfMonths(inst),
+			cols = numMonths[1],
+			width = 17;
+
+		inst.dpDiv.removeClass("ui-datepicker-multi-2 ui-datepicker-multi-3 ui-datepicker-multi-4").width("");
+		if (cols > 1) {
+			inst.dpDiv.addClass("ui-datepicker-multi-" + cols).css("width", (width * cols) + "em");
+		}
+		inst.dpDiv[(numMonths[0] !== 1 || numMonths[1] !== 1 ? "add" : "remove") +
+			"Class"]("ui-datepicker-multi");
+		inst.dpDiv[(this._get(inst, "isRTL") ? "add" : "remove") +
+			"Class"]("ui-datepicker-rtl");
+
+		// #6694 - don't focus the input if it's already focused
+		// this breaks the change event in IE
+		if (inst === $.datepicker._curInst && $.datepicker._datepickerShowing && inst.input &&
+			inst.input.is(":visible") && !inst.input.is(":disabled") && inst.input[0] !== document.activeElement) {
+			inst.input.focus();
+		}
+
+		// deffered render of the years select (to avoid flashes on Firefox)
+		if( inst.yearshtml ){
+			origyearshtml = inst.yearshtml;
+			setTimeout(function(){
+				//assure that inst.yearshtml didn't change.
+				if( origyearshtml === inst.yearshtml && inst.yearshtml ){
+					inst.dpDiv.find("select.ui-datepicker-year:first").replaceWith(inst.yearshtml);
+				}
+				origyearshtml = inst.yearshtml = null;
+			}, 0);
+		}
+	},
+
+	/* Retrieve the size of left and top borders for an element.
+	 * @param  elem  (jQuery object) the element of interest
+	 * @return  (number[2]) the left and top borders
+	 */
+	_getBorders: function(elem) {
+		var convert = function(value) {
+			return {thin: 1, medium: 2, thick: 3}[value] || value;
+		};
+		return [parseFloat(convert(elem.css("border-left-width"))),
+			parseFloat(convert(elem.css("border-top-width")))];
+	},
+
+	/* Check positioning to remain on screen. */
+	_checkOffset: function(inst, offset, isFixed) {
+		var dpWidth = inst.dpDiv.outerWidth(),
+			dpHeight = inst.dpDiv.outerHeight(),
+			inputWidth = inst.input ? inst.input.outerWidth() : 0,
+			inputHeight = inst.input ? inst.input.outerHeight() : 0,
+			viewWidth = document.documentElement.clientWidth + (isFixed ? 0 : $(document).scrollLeft()),
+			viewHeight = document.documentElement.clientHeight + (isFixed ? 0 : $(document).scrollTop());
+
+		offset.left -= (this._get(inst, "isRTL") ? (dpWidth - inputWidth) : 0);
+		offset.left -= (isFixed && offset.left === inst.input.offset().left) ? $(document).scrollLeft() : 0;
+		offset.top -= (isFixed && offset.top === (inst.input.offset().top + inputHeight)) ? $(document).scrollTop() : 0;
+
+		// now check if datepicker is showing outside window viewport - move to a better place if so.
+		offset.left -= Math.min(offset.left, (offset.left + dpWidth > viewWidth && viewWidth > dpWidth) ?
+			Math.abs(offset.left + dpWidth - viewWidth) : 0);
+		offset.top -= Math.min(offset.top, (offset.top + dpHeight > viewHeight && viewHeight > dpHeight) ?
+			Math.abs(dpHeight + inputHeight) : 0);
+
+		return offset;
+	},
+
+	/* Find an object's position on the screen. */
+	_findPos: function(obj) {
+		var position,
+			inst = this._getInst(obj),
+			isRTL = this._get(inst, "isRTL");
+
+		while (obj && (obj.type === "hidden" || obj.nodeType !== 1 || $.expr.filters.hidden(obj))) {
+			obj = obj[isRTL ? "previousSibling" : "nextSibling"];
+		}
+
+		position = $(obj).offset();
+		return [position.left, position.top];
+	},
+
+	/* Hide the date picker from view.
+	 * @param  input  element - the input field attached to the date picker
+	 */
+	_hideDatepicker: function(input) {
+		var showAnim, duration, postProcess, onClose,
+			inst = this._curInst;
+
+		if (!inst || (input && inst !== $.data(input, PROP_NAME))) {
+			return;
+		}
+
+		if (this._datepickerShowing) {
+			showAnim = this._get(inst, "showAnim");
+			duration = this._get(inst, "duration");
+			postProcess = function() {
+				$.datepicker._tidyDialog(inst);
+			};
+
+			// DEPRECATED: after BC for 1.8.x $.effects[ showAnim ] is not needed
+			if ( $.effects && ( $.effects.effect[ showAnim ] || $.effects[ showAnim ] ) ) {
+				inst.dpDiv.hide(showAnim, $.datepicker._get(inst, "showOptions"), duration, postProcess);
+			} else {
+				inst.dpDiv[(showAnim === "slideDown" ? "slideUp" :
+					(showAnim === "fadeIn" ? "fadeOut" : "hide"))]((showAnim ? duration : null), postProcess);
+			}
+
+			if (!showAnim) {
+				postProcess();
+			}
+			this._datepickerShowing = false;
+
+			onClose = this._get(inst, "onClose");
+			if (onClose) {
+				onClose.apply((inst.input ? inst.input[0] : null), [(inst.input ? inst.input.val() : ""), inst]);
+			}
+
+			this._lastInput = null;
+			if (this._inDialog) {
+				this._dialogInput.css({ position: "absolute", left: "0", top: "-100px" });
+				if ($.blockUI) {
+					$.unblockUI();
+					$("body").append(this.dpDiv);
+				}
+			}
+			this._inDialog = false;
+		}
+	},
+
+	/* Tidy up after a dialog display. */
+	_tidyDialog: function(inst) {
+		inst.dpDiv.removeClass(this._dialogClass).unbind(".ui-datepicker-calendar");
+	},
+
+	/* Close date picker if clicked elsewhere. */
+	_checkExternalClick: function(event) {
+		if (!$.datepicker._curInst) {
+			return;
+		}
+
+		var $target = $(event.target),
+			inst = $.datepicker._getInst($target[0]);
+
+		if ( ( ( $target[0].id !== $.datepicker._mainDivId &&
+				$target.parents("#" + $.datepicker._mainDivId).length === 0 &&
+				!$target.hasClass($.datepicker.markerClassName) &&
+				!$target.closest("." + $.datepicker._triggerClass).length &&
+				$.datepicker._datepickerShowing && !($.datepicker._inDialog && $.blockUI) ) ) ||
+			( $target.hasClass($.datepicker.markerClassName) && $.datepicker._curInst !== inst ) ) {
+				$.datepicker._hideDatepicker();
+		}
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustDate: function(id, offset, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+		this._adjustInstDate(inst, offset +
+			(period === "M" ? this._get(inst, "showCurrentAtPos") : 0), // undo positioning
+			period);
+		this._updateDatepicker(inst);
+	},
+
+	/* Action for current link. */
+	_gotoToday: function(id) {
+		var date,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		if (this._get(inst, "gotoCurrent") && inst.currentDay) {
+			inst.selectedDay = inst.currentDay;
+			inst.drawMonth = inst.selectedMonth = inst.currentMonth;
+			inst.drawYear = inst.selectedYear = inst.currentYear;
+		} else {
+			date = new Date();
+			inst.selectedDay = date.getDate();
+			inst.drawMonth = inst.selectedMonth = date.getMonth();
+			inst.drawYear = inst.selectedYear = date.getFullYear();
+		}
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a new month/year. */
+	_selectMonthYear: function(id, select, period) {
+		var target = $(id),
+			inst = this._getInst(target[0]);
+
+		inst["selected" + (period === "M" ? "Month" : "Year")] =
+		inst["draw" + (period === "M" ? "Month" : "Year")] =
+			parseInt(select.options[select.selectedIndex].value,10);
+
+		this._notifyChange(inst);
+		this._adjustDate(target);
+	},
+
+	/* Action for selecting a day. */
+	_selectDay: function(id, month, year, td) {
+		var inst,
+			target = $(id);
+
+		if ($(td).hasClass(this._unselectableClass) || this._isDisabledDatepicker(target[0])) {
+			return;
+		}
+
+		inst = this._getInst(target[0]);
+		inst.selectedDay = inst.currentDay = $("a", td).html();
+		inst.selectedMonth = inst.currentMonth = month;
+		inst.selectedYear = inst.currentYear = year;
+		this._selectDate(id, this._formatDate(inst,
+			inst.currentDay, inst.currentMonth, inst.currentYear));
+	},
+
+	/* Erase the input field and hide the date picker. */
+	_clearDate: function(id) {
+		var target = $(id);
+		this._selectDate(target, "");
+	},
+
+	/* Update the input field with the selected date. */
+	_selectDate: function(id, dateStr) {
+		var onSelect,
+			target = $(id),
+			inst = this._getInst(target[0]);
+
+		dateStr = (dateStr != null ? dateStr : this._formatDate(inst));
+		if (inst.input) {
+			inst.input.val(dateStr);
+		}
+		this._updateAlternate(inst);
+
+		onSelect = this._get(inst, "onSelect");
+		if (onSelect) {
+			onSelect.apply((inst.input ? inst.input[0] : null), [dateStr, inst]);  // trigger custom callback
+		} else if (inst.input) {
+			inst.input.trigger("change"); // fire the change event
+		}
+
+		if (inst.inline){
+			this._updateDatepicker(inst);
+		} else {
+			this._hideDatepicker();
+			this._lastInput = inst.input[0];
+			if (typeof(inst.input[0]) !== "object") {
+				inst.input.focus(); // restore focus
+			}
+			this._lastInput = null;
+		}
+	},
+
+	/* Update any alternate field to synchronise with the main field. */
+	_updateAlternate: function(inst) {
+		var altFormat, date, dateStr,
+			altField = this._get(inst, "altField");
+
+		if (altField) { // update alternate field too
+			altFormat = this._get(inst, "altFormat") || this._get(inst, "dateFormat");
+			date = this._getDate(inst);
+			dateStr = this.formatDate(altFormat, date, this._getFormatConfig(inst));
+			$(altField).each(function() { $(this).val(dateStr); });
+		}
+	},
+
+	/* Set as beforeShowDay function to prevent selection of weekends.
+	 * @param  date  Date - the date to customise
+	 * @return [boolean, string] - is this date selectable?, what is its CSS class?
+	 */
+	noWeekends: function(date) {
+		var day = date.getDay();
+		return [(day > 0 && day < 6), ""];
+	},
+
+	/* Set as calculateWeek to determine the week of the year based on the ISO 8601 definition.
+	 * @param  date  Date - the date to get the week for
+	 * @return  number - the number of the week within the year that contains this date
+	 */
+	iso8601Week: function(date) {
+		var time,
+			checkDate = new Date(date.getTime());
+
+		// Find Thursday of this week starting on Monday
+		checkDate.setDate(checkDate.getDate() + 4 - (checkDate.getDay() || 7));
+
+		time = checkDate.getTime();
+		checkDate.setMonth(0); // Compare with Jan 1
+		checkDate.setDate(1);
+		return Math.floor(Math.round((time - checkDate) / 86400000) / 7) + 1;
+	},
+
+	/* Parse a string value into a date object.
+	 * See formatDate below for the possible formats.
+	 *
+	 * @param  format string - the expected format of the date
+	 * @param  value string - the date in the above format
+	 * @param  settings Object - attributes include:
+	 *					shortYearCutoff  number - the cutoff year for determining the century (optional)
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  Date - the extracted date value or null if value is blank
+	 */
+	parseDate: function (format, value, settings) {
+		if (format == null || value == null) {
+			throw "Invalid arguments";
+		}
+
+		value = (typeof value === "object" ? value.toString() : value + "");
+		if (value === "") {
+			return null;
+		}
+
+		var iFormat, dim, extra,
+			iValue = 0,
+			shortYearCutoffTemp = (settings ? settings.shortYearCutoff : null) || this._defaults.shortYearCutoff,
+			shortYearCutoff = (typeof shortYearCutoffTemp !== "string" ? shortYearCutoffTemp :
+				new Date().getFullYear() % 100 + parseInt(shortYearCutoffTemp, 10)),
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			year = -1,
+			month = -1,
+			day = -1,
+			doy = -1,
+			literal = false,
+			date,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Extract a number from the string value
+			getNumber = function(match) {
+				var isDoubled = lookAhead(match),
+					size = (match === "@" ? 14 : (match === "!" ? 20 :
+					(match === "y" && isDoubled ? 4 : (match === "o" ? 3 : 2)))),
+					digits = new RegExp("^\\d{1," + size + "}"),
+					num = value.substring(iValue).match(digits);
+				if (!num) {
+					throw "Missing number at position " + iValue;
+				}
+				iValue += num[0].length;
+				return parseInt(num[0], 10);
+			},
+			// Extract a name from the string value and convert to an index
+			getName = function(match, shortNames, longNames) {
+				var index = -1,
+					names = $.map(lookAhead(match) ? longNames : shortNames, function (v, k) {
+						return [ [k, v] ];
+					}).sort(function (a, b) {
+						return -(a[1].length - b[1].length);
+					});
+
+				$.each(names, function (i, pair) {
+					var name = pair[1];
+					if (value.substr(iValue, name.length).toLowerCase() === name.toLowerCase()) {
+						index = pair[0];
+						iValue += name.length;
+						return false;
+					}
+				});
+				if (index !== -1) {
+					return index + 1;
+				} else {
+					throw "Unknown name at position " + iValue;
+				}
+			},
+			// Confirm that a literal character matches the string value
+			checkLiteral = function() {
+				if (value.charAt(iValue) !== format.charAt(iFormat)) {
+					throw "Unexpected literal at position " + iValue;
+				}
+				iValue++;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					checkLiteral();
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d":
+						day = getNumber("d");
+						break;
+					case "D":
+						getName("D", dayNamesShort, dayNames);
+						break;
+					case "o":
+						doy = getNumber("o");
+						break;
+					case "m":
+						month = getNumber("m");
+						break;
+					case "M":
+						month = getName("M", monthNamesShort, monthNames);
+						break;
+					case "y":
+						year = getNumber("y");
+						break;
+					case "@":
+						date = new Date(getNumber("@"));
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "!":
+						date = new Date((getNumber("!") - this._ticksTo1970) / 10000);
+						year = date.getFullYear();
+						month = date.getMonth() + 1;
+						day = date.getDate();
+						break;
+					case "'":
+						if (lookAhead("'")){
+							checkLiteral();
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						checkLiteral();
+				}
+			}
+		}
+
+		if (iValue < value.length){
+			extra = value.substr(iValue);
+			if (!/^\s+/.test(extra)) {
+				throw "Extra/unparsed characters found in date: " + extra;
+			}
+		}
+
+		if (year === -1) {
+			year = new Date().getFullYear();
+		} else if (year < 100) {
+			year += new Date().getFullYear() - new Date().getFullYear() % 100 +
+				(year <= shortYearCutoff ? 0 : -100);
+		}
+
+		if (doy > -1) {
+			month = 1;
+			day = doy;
+			do {
+				dim = this._getDaysInMonth(year, month - 1);
+				if (day <= dim) {
+					break;
+				}
+				month++;
+				day -= dim;
+			} while (true);
+		}
+
+		date = this._daylightSavingAdjust(new Date(year, month - 1, day));
+		if (date.getFullYear() !== year || date.getMonth() + 1 !== month || date.getDate() !== day) {
+			throw "Invalid date"; // E.g. 31/02/00
+		}
+		return date;
+	},
+
+	/* Standard date formats. */
+	ATOM: "yy-mm-dd", // RFC 3339 (ISO 8601)
+	COOKIE: "D, dd M yy",
+	ISO_8601: "yy-mm-dd",
+	RFC_822: "D, d M y",
+	RFC_850: "DD, dd-M-y",
+	RFC_1036: "D, d M y",
+	RFC_1123: "D, d M yy",
+	RFC_2822: "D, d M yy",
+	RSS: "D, d M y", // RFC 822
+	TICKS: "!",
+	TIMESTAMP: "@",
+	W3C: "yy-mm-dd", // ISO 8601
+
+	_ticksTo1970: (((1970 - 1) * 365 + Math.floor(1970 / 4) - Math.floor(1970 / 100) +
+		Math.floor(1970 / 400)) * 24 * 60 * 60 * 10000000),
+
+	/* Format a date object into a string value.
+	 * The format can be combinations of the following:
+	 * d  - day of month (no leading zero)
+	 * dd - day of month (two digit)
+	 * o  - day of year (no leading zeros)
+	 * oo - day of year (three digit)
+	 * D  - day name short
+	 * DD - day name long
+	 * m  - month of year (no leading zero)
+	 * mm - month of year (two digit)
+	 * M  - month name short
+	 * MM - month name long
+	 * y  - year (two digit)
+	 * yy - year (four digit)
+	 * @ - Unix timestamp (ms since 01/01/1970)
+	 * ! - Windows ticks (100ns since 01/01/0001)
+	 * "..." - literal text
+	 * '' - single quote
+	 *
+	 * @param  format string - the desired format of the date
+	 * @param  date Date - the date value to format
+	 * @param  settings Object - attributes include:
+	 *					dayNamesShort	string[7] - abbreviated names of the days from Sunday (optional)
+	 *					dayNames		string[7] - names of the days from Sunday (optional)
+	 *					monthNamesShort string[12] - abbreviated names of the months (optional)
+	 *					monthNames		string[12] - names of the months (optional)
+	 * @return  string - the date in the above format
+	 */
+	formatDate: function (format, date, settings) {
+		if (!date) {
+			return "";
+		}
+
+		var iFormat,
+			dayNamesShort = (settings ? settings.dayNamesShort : null) || this._defaults.dayNamesShort,
+			dayNames = (settings ? settings.dayNames : null) || this._defaults.dayNames,
+			monthNamesShort = (settings ? settings.monthNamesShort : null) || this._defaults.monthNamesShort,
+			monthNames = (settings ? settings.monthNames : null) || this._defaults.monthNames,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			},
+			// Format a number, with leading zero if necessary
+			formatNumber = function(match, value, len) {
+				var num = "" + value;
+				if (lookAhead(match)) {
+					while (num.length < len) {
+						num = "0" + num;
+					}
+				}
+				return num;
+			},
+			// Format a name, short or long as requested
+			formatName = function(match, value, shortNames, longNames) {
+				return (lookAhead(match) ? longNames[value] : shortNames[value]);
+			},
+			output = "",
+			literal = false;
+
+		if (date) {
+			for (iFormat = 0; iFormat < format.length; iFormat++) {
+				if (literal) {
+					if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+						literal = false;
+					} else {
+						output += format.charAt(iFormat);
+					}
+				} else {
+					switch (format.charAt(iFormat)) {
+						case "d":
+							output += formatNumber("d", date.getDate(), 2);
+							break;
+						case "D":
+							output += formatName("D", date.getDay(), dayNamesShort, dayNames);
+							break;
+						case "o":
+							output += formatNumber("o",
+								Math.round((new Date(date.getFullYear(), date.getMonth(), date.getDate()).getTime() - new Date(date.getFullYear(), 0, 0).getTime()) / 86400000), 3);
+							break;
+						case "m":
+							output += formatNumber("m", date.getMonth() + 1, 2);
+							break;
+						case "M":
+							output += formatName("M", date.getMonth(), monthNamesShort, monthNames);
+							break;
+						case "y":
+							output += (lookAhead("y") ? date.getFullYear() :
+								(date.getYear() % 100 < 10 ? "0" : "") + date.getYear() % 100);
+							break;
+						case "@":
+							output += date.getTime();
+							break;
+						case "!":
+							output += date.getTime() * 10000 + this._ticksTo1970;
+							break;
+						case "'":
+							if (lookAhead("'")) {
+								output += "'";
+							} else {
+								literal = true;
+							}
+							break;
+						default:
+							output += format.charAt(iFormat);
+					}
+				}
+			}
+		}
+		return output;
+	},
+
+	/* Extract all possible characters from the date format. */
+	_possibleChars: function (format) {
+		var iFormat,
+			chars = "",
+			literal = false,
+			// Check whether a format character is doubled
+			lookAhead = function(match) {
+				var matches = (iFormat + 1 < format.length && format.charAt(iFormat + 1) === match);
+				if (matches) {
+					iFormat++;
+				}
+				return matches;
+			};
+
+		for (iFormat = 0; iFormat < format.length; iFormat++) {
+			if (literal) {
+				if (format.charAt(iFormat) === "'" && !lookAhead("'")) {
+					literal = false;
+				} else {
+					chars += format.charAt(iFormat);
+				}
+			} else {
+				switch (format.charAt(iFormat)) {
+					case "d": case "m": case "y": case "@":
+						chars += "0123456789";
+						break;
+					case "D": case "M":
+						return null; // Accept anything
+					case "'":
+						if (lookAhead("'")) {
+							chars += "'";
+						} else {
+							literal = true;
+						}
+						break;
+					default:
+						chars += format.charAt(iFormat);
+				}
+			}
+		}
+		return chars;
+	},
+
+	/* Get a setting value, defaulting if necessary. */
+	_get: function(inst, name) {
+		return inst.settings[name] !== undefined ?
+			inst.settings[name] : this._defaults[name];
+	},
+
+	/* Parse existing date and initialise date picker. */
+	_setDateFromField: function(inst, noDefault) {
+		if (inst.input.val() === inst.lastVal) {
+			return;
+		}
+
+		var dateFormat = this._get(inst, "dateFormat"),
+			dates = inst.lastVal = inst.input ? inst.input.val() : null,
+			defaultDate = this._getDefaultDate(inst),
+			date = defaultDate,
+			settings = this._getFormatConfig(inst);
+
+		try {
+			date = this.parseDate(dateFormat, dates, settings) || defaultDate;
+		} catch (event) {
+			dates = (noDefault ? "" : dates);
+		}
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		inst.currentDay = (dates ? date.getDate() : 0);
+		inst.currentMonth = (dates ? date.getMonth() : 0);
+		inst.currentYear = (dates ? date.getFullYear() : 0);
+		this._adjustInstDate(inst);
+	},
+
+	/* Retrieve the default date shown on opening. */
+	_getDefaultDate: function(inst) {
+		return this._restrictMinMax(inst,
+			this._determineDate(inst, this._get(inst, "defaultDate"), new Date()));
+	},
+
+	/* A date may be specified as an exact value or a relative one. */
+	_determineDate: function(inst, date, defaultDate) {
+		var offsetNumeric = function(offset) {
+				var date = new Date();
+				date.setDate(date.getDate() + offset);
+				return date;
+			},
+			offsetString = function(offset) {
+				try {
+					return $.datepicker.parseDate($.datepicker._get(inst, "dateFormat"),
+						offset, $.datepicker._getFormatConfig(inst));
+				}
+				catch (e) {
+					// Ignore
+				}
+
+				var date = (offset.toLowerCase().match(/^c/) ?
+					$.datepicker._getDate(inst) : null) || new Date(),
+					year = date.getFullYear(),
+					month = date.getMonth(),
+					day = date.getDate(),
+					pattern = /([+\-]?[0-9]+)\s*(d|D|w|W|m|M|y|Y)?/g,
+					matches = pattern.exec(offset);
+
+				while (matches) {
+					switch (matches[2] || "d") {
+						case "d" : case "D" :
+							day += parseInt(matches[1],10); break;
+						case "w" : case "W" :
+							day += parseInt(matches[1],10) * 7; break;
+						case "m" : case "M" :
+							month += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+						case "y": case "Y" :
+							year += parseInt(matches[1],10);
+							day = Math.min(day, $.datepicker._getDaysInMonth(year, month));
+							break;
+					}
+					matches = pattern.exec(offset);
+				}
+				return new Date(year, month, day);
+			},
+			newDate = (date == null || date === "" ? defaultDate : (typeof date === "string" ? offsetString(date) :
+				(typeof date === "number" ? (isNaN(date) ? defaultDate : offsetNumeric(date)) : new Date(date.getTime()))));
+
+		newDate = (newDate && newDate.toString() === "Invalid Date" ? defaultDate : newDate);
+		if (newDate) {
+			newDate.setHours(0);
+			newDate.setMinutes(0);
+			newDate.setSeconds(0);
+			newDate.setMilliseconds(0);
+		}
+		return this._daylightSavingAdjust(newDate);
+	},
+
+	/* Handle switch to/from daylight saving.
+	 * Hours may be non-zero on daylight saving cut-over:
+	 * > 12 when midnight changeover, but then cannot generate
+	 * midnight datetime, so jump to 1AM, otherwise reset.
+	 * @param  date  (Date) the date to check
+	 * @return  (Date) the corrected date
+	 */
+	_daylightSavingAdjust: function(date) {
+		if (!date) {
+			return null;
+		}
+		date.setHours(date.getHours() > 12 ? date.getHours() + 2 : 0);
+		return date;
+	},
+
+	/* Set the date(s) directly. */
+	_setDate: function(inst, date, noChange) {
+		var clear = !date,
+			origMonth = inst.selectedMonth,
+			origYear = inst.selectedYear,
+			newDate = this._restrictMinMax(inst, this._determineDate(inst, date, new Date()));
+
+		inst.selectedDay = inst.currentDay = newDate.getDate();
+		inst.drawMonth = inst.selectedMonth = inst.currentMonth = newDate.getMonth();
+		inst.drawYear = inst.selectedYear = inst.currentYear = newDate.getFullYear();
+		if ((origMonth !== inst.selectedMonth || origYear !== inst.selectedYear) && !noChange) {
+			this._notifyChange(inst);
+		}
+		this._adjustInstDate(inst);
+		if (inst.input) {
+			inst.input.val(clear ? "" : this._formatDate(inst));
+		}
+	},
+
+	/* Retrieve the date(s) directly. */
+	_getDate: function(inst) {
+		var startDate = (!inst.currentYear || (inst.input && inst.input.val() === "") ? null :
+			this._daylightSavingAdjust(new Date(
+			inst.currentYear, inst.currentMonth, inst.currentDay)));
+			return startDate;
+	},
+
+	/* Attach the onxxx handlers.  These are declared statically so
+	 * they work with static code transformers like Caja.
+	 */
+	_attachHandlers: function(inst) {
+		var stepMonths = this._get(inst, "stepMonths"),
+			id = "#" + inst.id.replace( /\\\\/g, "\\" );
+		inst.dpDiv.find("[data-handler]").map(function () {
+			var handler = {
+				prev: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._adjustDate(id, -stepMonths, "M");
+				},
+				next: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._adjustDate(id, +stepMonths, "M");
+				},
+				hide: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._hideDatepicker();
+				},
+				today: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._gotoToday(id);
+				},
+				selectDay: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._selectDay(id, +this.getAttribute("data-month"), +this.getAttribute("data-year"), this);
+					return false;
+				},
+				selectMonth: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._selectMonthYear(id, this, "M");
+					return false;
+				},
+				selectYear: function () {
+					window["DP_jQuery_" + dpuuid].datepicker._selectMonthYear(id, this, "Y");
+					return false;
+				}
+			};
+			$(this).bind(this.getAttribute("data-event"), handler[this.getAttribute("data-handler")]);
+		});
+	},
+
+	/* Generate the HTML for the current state of the date picker. */
+	_generateHTML: function(inst) {
+		var maxDraw, prevText, prev, nextText, next, currentText, gotoDate,
+			controls, buttonPanel, firstDay, showWeek, dayNames, dayNamesMin,
+			monthNames, monthNamesShort, beforeShowDay, showOtherMonths,
+			selectOtherMonths, defaultDate, html, dow, row, group, col, selectedDate,
+			cornerClass, calender, thead, day, daysInMonth, leadDays, curRows, numRows,
+			printDate, dRow, tbody, daySettings, otherMonth, unselectable,
+			tempDate = new Date(),
+			today = this._daylightSavingAdjust(
+				new Date(tempDate.getFullYear(), tempDate.getMonth(), tempDate.getDate())), // clear time
+			isRTL = this._get(inst, "isRTL"),
+			showButtonPanel = this._get(inst, "showButtonPanel"),
+			hideIfNoPrevNext = this._get(inst, "hideIfNoPrevNext"),
+			navigationAsDateFormat = this._get(inst, "navigationAsDateFormat"),
+			numMonths = this._getNumberOfMonths(inst),
+			showCurrentAtPos = this._get(inst, "showCurrentAtPos"),
+			stepMonths = this._get(inst, "stepMonths"),
+			isMultiMonth = (numMonths[0] !== 1 || numMonths[1] !== 1),
+			currentDate = this._daylightSavingAdjust((!inst.currentDay ? new Date(9999, 9, 9) :
+				new Date(inst.currentYear, inst.currentMonth, inst.currentDay))),
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			drawMonth = inst.drawMonth - showCurrentAtPos,
+			drawYear = inst.drawYear;
+
+		if (drawMonth < 0) {
+			drawMonth += 12;
+			drawYear--;
+		}
+		if (maxDate) {
+			maxDraw = this._daylightSavingAdjust(new Date(maxDate.getFullYear(),
+				maxDate.getMonth() - (numMonths[0] * numMonths[1]) + 1, maxDate.getDate()));
+			maxDraw = (minDate && maxDraw < minDate ? minDate : maxDraw);
+			while (this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1)) > maxDraw) {
+				drawMonth--;
+				if (drawMonth < 0) {
+					drawMonth = 11;
+					drawYear--;
+				}
+			}
+		}
+		inst.drawMonth = drawMonth;
+		inst.drawYear = drawYear;
+
+		prevText = this._get(inst, "prevText");
+		prevText = (!navigationAsDateFormat ? prevText : this.formatDate(prevText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth - stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		prev = (this._canAdjustMonth(inst, -1, drawYear, drawMonth) ?
+			"" + prevText + "" :
+			(hideIfNoPrevNext ? "" : "" + prevText + ""));
+
+		nextText = this._get(inst, "nextText");
+		nextText = (!navigationAsDateFormat ? nextText : this.formatDate(nextText,
+			this._daylightSavingAdjust(new Date(drawYear, drawMonth + stepMonths, 1)),
+			this._getFormatConfig(inst)));
+
+		next = (this._canAdjustMonth(inst, +1, drawYear, drawMonth) ?
+			"" + nextText + "" :
+			(hideIfNoPrevNext ? "" : "" + nextText + ""));
+
+		currentText = this._get(inst, "currentText");
+		gotoDate = (this._get(inst, "gotoCurrent") && inst.currentDay ? currentDate : today);
+		currentText = (!navigationAsDateFormat ? currentText :
+			this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
+
+		controls = (!inst.inline ? "" : "");
+
+		buttonPanel = (showButtonPanel) ? "
        " + (isRTL ? controls : "") +
+			(this._isInRange(inst, gotoDate) ? "" : "") + (isRTL ? "" : controls) + "
        " : "";
+
+		firstDay = parseInt(this._get(inst, "firstDay"),10);
+		firstDay = (isNaN(firstDay) ? 0 : firstDay);
+
+		showWeek = this._get(inst, "showWeek");
+		dayNames = this._get(inst, "dayNames");
+		dayNamesMin = this._get(inst, "dayNamesMin");
+		monthNames = this._get(inst, "monthNames");
+		monthNamesShort = this._get(inst, "monthNamesShort");
+		beforeShowDay = this._get(inst, "beforeShowDay");
+		showOtherMonths = this._get(inst, "showOtherMonths");
+		selectOtherMonths = this._get(inst, "selectOtherMonths");
+		defaultDate = this._getDefaultDate(inst);
+		html = "";
+		dow;
+		for (row = 0; row < numMonths[0]; row++) {
+			group = "";
+			this.maxRows = 4;
+			for (col = 0; col < numMonths[1]; col++) {
+				selectedDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, inst.selectedDay));
+				cornerClass = " ui-corner-all";
+				calender = "";
+				if (isMultiMonth) {
+					calender += "
        ";
+				}
+				calender += "
        " +
+					(/all|left/.test(cornerClass) && row === 0 ? (isRTL ? next : prev) : "") +
+					(/all|right/.test(cornerClass) && row === 0 ? (isRTL ? prev : next) : "") +
+					this._generateMonthYearHeader(inst, drawMonth, drawYear, minDate, maxDate,
+					row > 0 || col > 0, monthNames, monthNamesShort) + // draw month headers
+					"
        " +
+					"";
+				thead = (showWeek ? "" : "");
+				for (dow = 0; dow < 7; dow++) { // days of the week
+					day = (dow + firstDay) % 7;
+					thead += "= 5 ? " class='ui-datepicker-week-end'" : "") + ">" +
+						"" + dayNamesMin[day] + "";
+				}
+				calender += thead + "";
+				daysInMonth = this._getDaysInMonth(drawYear, drawMonth);
+				if (drawYear === inst.selectedYear && drawMonth === inst.selectedMonth) {
+					inst.selectedDay = Math.min(inst.selectedDay, daysInMonth);
+				}
+				leadDays = (this._getFirstDayOfMonth(drawYear, drawMonth) - firstDay + 7) % 7;
+				curRows = Math.ceil((leadDays + daysInMonth) / 7); // calculate the number of rows to generate
+				numRows = (isMultiMonth ? this.maxRows > curRows ? this.maxRows : curRows : curRows); //If multiple months, use the higher number of rows (see #7043)
+				this.maxRows = numRows;
+				printDate = this._daylightSavingAdjust(new Date(drawYear, drawMonth, 1 - leadDays));
+				for (dRow = 0; dRow < numRows; dRow++) { // create date picker rows
+					calender += "";
+					tbody = (!showWeek ? "" : "");
+					for (dow = 0; dow < 7; dow++) { // create date picker days
+						daySettings = (beforeShowDay ?
+							beforeShowDay.apply((inst.input ? inst.input[0] : null), [printDate]) : [true, ""]);
+						otherMonth = (printDate.getMonth() !== drawMonth);
+						unselectable = (otherMonth && !selectOtherMonths) || !daySettings[0] ||
+							(minDate && printDate < minDate) || (maxDate && printDate > maxDate);
+						tbody += ""; // display selectable date
+						printDate.setDate(printDate.getDate() + 1);
+						printDate = this._daylightSavingAdjust(printDate);
+					}
+					calender += tbody + "";
+				}
+				drawMonth++;
+				if (drawMonth > 11) {
+					drawMonth = 0;
+					drawYear++;
+				}
+				calender += "
        " + this._get(inst, "weekHeader") + "
        " +
+						this._get(inst, "calculateWeek")(printDate) + "" + // actions
+							(otherMonth && !showOtherMonths ? " " : // display for other months
+							(unselectable ? "" + printDate.getDate() + "" : "" + printDate.getDate() + "")) + "
        " + (isMultiMonth ? "
        " +
+							((numMonths[0] > 0 && col === numMonths[1]-1) ? "
        " : "") : "");
+				group += calender;
+			}
+			html += group;
+		}
+		html += buttonPanel;
+		inst._keyEvent = false;
+		return html;
+	},
+
+	/* Generate the month and year header. */
+	_generateMonthYearHeader: function(inst, drawMonth, drawYear, minDate, maxDate,
+			secondary, monthNames, monthNamesShort) {
+
+		var inMinYear, inMaxYear, month, years, thisYear, determineYear, year, endYear,
+			changeMonth = this._get(inst, "changeMonth"),
+			changeYear = this._get(inst, "changeYear"),
+			showMonthAfterYear = this._get(inst, "showMonthAfterYear"),
+			html = "
        ",
+			monthHtml = "";
+
+		// month selection
+		if (secondary || !changeMonth) {
+			monthHtml += "" + monthNames[drawMonth] + "";
+		} else {
+			inMinYear = (minDate && minDate.getFullYear() === drawYear);
+			inMaxYear = (maxDate && maxDate.getFullYear() === drawYear);
+			monthHtml += "";
+		}
+
+		if (!showMonthAfterYear) {
+			html += monthHtml + (secondary || !(changeMonth && changeYear) ? " " : "");
+		}
+
+		// year selection
+		if ( !inst.yearshtml ) {
+			inst.yearshtml = "";
+			if (secondary || !changeYear) {
+				html += "" + drawYear + "";
+			} else {
+				// determine range of years to display
+				years = this._get(inst, "yearRange").split(":");
+				thisYear = new Date().getFullYear();
+				determineYear = function(value) {
+					var year = (value.match(/c[+\-].*/) ? drawYear + parseInt(value.substring(1), 10) :
+						(value.match(/[+\-].*/) ? thisYear + parseInt(value, 10) :
+						parseInt(value, 10)));
+					return (isNaN(year) ? thisYear : year);
+				};
+				year = determineYear(years[0]);
+				endYear = Math.max(year, determineYear(years[1] || ""));
+				year = (minDate ? Math.max(year, minDate.getFullYear()) : year);
+				endYear = (maxDate ? Math.min(endYear, maxDate.getFullYear()) : endYear);
+				inst.yearshtml += "";
+
+				html += inst.yearshtml;
+				inst.yearshtml = null;
+			}
+		}
+
+		html += this._get(inst, "yearSuffix");
+		if (showMonthAfterYear) {
+			html += (secondary || !(changeMonth && changeYear) ? " " : "") + monthHtml;
+		}
+		html += "
        "; // Close datepicker_header
+		return html;
+	},
+
+	/* Adjust one of the date sub-fields. */
+	_adjustInstDate: function(inst, offset, period) {
+		var year = inst.drawYear + (period === "Y" ? offset : 0),
+			month = inst.drawMonth + (period === "M" ? offset : 0),
+			day = Math.min(inst.selectedDay, this._getDaysInMonth(year, month)) + (period === "D" ? offset : 0),
+			date = this._restrictMinMax(inst, this._daylightSavingAdjust(new Date(year, month, day)));
+
+		inst.selectedDay = date.getDate();
+		inst.drawMonth = inst.selectedMonth = date.getMonth();
+		inst.drawYear = inst.selectedYear = date.getFullYear();
+		if (period === "M" || period === "Y") {
+			this._notifyChange(inst);
+		}
+	},
+
+	/* Ensure a date is within any min/max bounds. */
+	_restrictMinMax: function(inst, date) {
+		var minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			newDate = (minDate && date < minDate ? minDate : date);
+		return (maxDate && newDate > maxDate ? maxDate : newDate);
+	},
+
+	/* Notify change of month/year. */
+	_notifyChange: function(inst) {
+		var onChange = this._get(inst, "onChangeMonthYear");
+		if (onChange) {
+			onChange.apply((inst.input ? inst.input[0] : null),
+				[inst.selectedYear, inst.selectedMonth + 1, inst]);
+		}
+	},
+
+	/* Determine the number of months to show. */
+	_getNumberOfMonths: function(inst) {
+		var numMonths = this._get(inst, "numberOfMonths");
+		return (numMonths == null ? [1, 1] : (typeof numMonths === "number" ? [1, numMonths] : numMonths));
+	},
+
+	/* Determine the current maximum date - ensure no time components are set. */
+	_getMinMaxDate: function(inst, minMax) {
+		return this._determineDate(inst, this._get(inst, minMax + "Date"), null);
+	},
+
+	/* Find the number of days in a given month. */
+	_getDaysInMonth: function(year, month) {
+		return 32 - this._daylightSavingAdjust(new Date(year, month, 32)).getDate();
+	},
+
+	/* Find the day of the week of the first of a month. */
+	_getFirstDayOfMonth: function(year, month) {
+		return new Date(year, month, 1).getDay();
+	},
+
+	/* Determines if we should allow a "next/prev" month display change. */
+	_canAdjustMonth: function(inst, offset, curYear, curMonth) {
+		var numMonths = this._getNumberOfMonths(inst),
+			date = this._daylightSavingAdjust(new Date(curYear,
+			curMonth + (offset < 0 ? offset : numMonths[0] * numMonths[1]), 1));
+
+		if (offset < 0) {
+			date.setDate(this._getDaysInMonth(date.getFullYear(), date.getMonth()));
+		}
+		return this._isInRange(inst, date);
+	},
+
+	/* Is the given date in the accepted range? */
+	_isInRange: function(inst, date) {
+		var yearSplit, currentYear,
+			minDate = this._getMinMaxDate(inst, "min"),
+			maxDate = this._getMinMaxDate(inst, "max"),
+			minYear = null,
+			maxYear = null,
+			years = this._get(inst, "yearRange");
+			if (years){
+				yearSplit = years.split(":");
+				currentYear = new Date().getFullYear();
+				minYear = parseInt(yearSplit[0], 10);
+				maxYear = parseInt(yearSplit[1], 10);
+				if ( yearSplit[0].match(/[+\-].*/) ) {
+					minYear += currentYear;
+				}
+				if ( yearSplit[1].match(/[+\-].*/) ) {
+					maxYear += currentYear;
+				}
+			}
+
+		return ((!minDate || date.getTime() >= minDate.getTime()) &&
+			(!maxDate || date.getTime() <= maxDate.getTime()) &&
+			(!minYear || date.getFullYear() >= minYear) &&
+			(!maxYear || date.getFullYear() <= maxYear));
+	},
+
+	/* Provide the configuration settings for formatting/parsing. */
+	_getFormatConfig: function(inst) {
+		var shortYearCutoff = this._get(inst, "shortYearCutoff");
+		shortYearCutoff = (typeof shortYearCutoff !== "string" ? shortYearCutoff :
+			new Date().getFullYear() % 100 + parseInt(shortYearCutoff, 10));
+		return {shortYearCutoff: shortYearCutoff,
+			dayNamesShort: this._get(inst, "dayNamesShort"), dayNames: this._get(inst, "dayNames"),
+			monthNamesShort: this._get(inst, "monthNamesShort"), monthNames: this._get(inst, "monthNames")};
+	},
+
+	/* Format the given date for display. */
+	_formatDate: function(inst, day, month, year) {
+		if (!day) {
+			inst.currentDay = inst.selectedDay;
+			inst.currentMonth = inst.selectedMonth;
+			inst.currentYear = inst.selectedYear;
+		}
+		var date = (day ? (typeof day === "object" ? day :
+			this._daylightSavingAdjust(new Date(year, month, day))) :
+			this._daylightSavingAdjust(new Date(inst.currentYear, inst.currentMonth, inst.currentDay)));
+		return this.formatDate(this._get(inst, "dateFormat"), date, this._getFormatConfig(inst));
+	}
+});
+
+/*
+ * Bind hover events for datepicker elements.
+ * Done via delegate so the binding only occurs once in the lifetime of the parent div.
+ * Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
+ */
+function bindHover(dpDiv) {
+	var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
+	return dpDiv.delegate(selector, "mouseout", function() {
+			$(this).removeClass("ui-state-hover");
+			if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+				$(this).removeClass("ui-datepicker-prev-hover");
+			}
+			if (this.className.indexOf("ui-datepicker-next") !== -1) {
+				$(this).removeClass("ui-datepicker-next-hover");
+			}
+		})
+		.delegate(selector, "mouseover", function(){
+			if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
+				$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
+				$(this).addClass("ui-state-hover");
+				if (this.className.indexOf("ui-datepicker-prev") !== -1) {
+					$(this).addClass("ui-datepicker-prev-hover");
+				}
+				if (this.className.indexOf("ui-datepicker-next") !== -1) {
+					$(this).addClass("ui-datepicker-next-hover");
+				}
+			}
+		});
+}
+
+/* jQuery extend now ignores nulls! */
+function extendRemove(target, props) {
+	$.extend(target, props);
+	for (var name in props) {
+		if (props[name] == null) {
+			target[name] = props[name];
+		}
+	}
+	return target;
+}
+
+/* Invoke the datepicker functionality.
+   @param  options  string - a command, optionally followed by additional parameters or
+					Object - settings for attaching new datepicker functionality
+   @return  jQuery object */
+$.fn.datepicker = function(options){
+
+	/* Verify an empty collection wasn't passed - Fixes #6976 */
+	if ( !this.length ) {
+		return this;
+	}
+
+	/* Initialise the date picker. */
+	if (!$.datepicker.initialized) {
+		$(document).mousedown($.datepicker._checkExternalClick);
+		$.datepicker.initialized = true;
+	}
+
+	/* Append datepicker main container to body if not exist. */
+	if ($("#"+$.datepicker._mainDivId).length === 0) {
+		$("body").append($.datepicker.dpDiv);
+	}
+
+	var otherArgs = Array.prototype.slice.call(arguments, 1);
+	if (typeof options === "string" && (options === "isDisabled" || options === "getDate" || options === "widget")) {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	if (options === "option" && arguments.length === 2 && typeof arguments[1] === "string") {
+		return $.datepicker["_" + options + "Datepicker"].
+			apply($.datepicker, [this[0]].concat(otherArgs));
+	}
+	return this.each(function() {
+		typeof options === "string" ?
+			$.datepicker["_" + options + "Datepicker"].
+				apply($.datepicker, [this].concat(otherArgs)) :
+			$.datepicker._attachDatepicker(this, options);
+	});
+};
+
+$.datepicker = new Datepicker(); // singleton instance
+$.datepicker.initialized = false;
+$.datepicker.uuid = new Date().getTime();
+$.datepicker.version = "1.10.2";
+
+// Workaround for #4055
+// Add another global to avoid noConflict issues with inline event handlers
+window["DP_jQuery_" + dpuuid] = $;
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+var sizeRelatedOptions = {
+		buttons: true,
+		height: true,
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true,
+		width: true
+	},
+	resizableRelatedOptions = {
+		maxHeight: true,
+		maxWidth: true,
+		minHeight: true,
+		minWidth: true
+	};
+
+$.widget( "ui.dialog", {
+	version: "1.10.2",
+	options: {
+		appendTo: "body",
+		autoOpen: true,
+		buttons: [],
+		closeOnEscape: true,
+		closeText: "close",
+		dialogClass: "",
+		draggable: true,
+		hide: null,
+		height: "auto",
+		maxHeight: null,
+		maxWidth: null,
+		minHeight: 150,
+		minWidth: 150,
+		modal: false,
+		position: {
+			my: "center",
+			at: "center",
+			of: window,
+			collision: "fit",
+			// Ensure the titlebar is always visible
+			using: function( pos ) {
+				var topOffset = $( this ).css( pos ).offset().top;
+				if ( topOffset < 0 ) {
+					$( this ).css( "top", pos.top - topOffset );
+				}
+			}
+		},
+		resizable: true,
+		show: null,
+		title: null,
+		width: 300,
+
+		// callbacks
+		beforeClose: null,
+		close: null,
+		drag: null,
+		dragStart: null,
+		dragStop: null,
+		focus: null,
+		open: null,
+		resize: null,
+		resizeStart: null,
+		resizeStop: null
+	},
+
+	_create: function() {
+		this.originalCss = {
+			display: this.element[0].style.display,
+			width: this.element[0].style.width,
+			minHeight: this.element[0].style.minHeight,
+			maxHeight: this.element[0].style.maxHeight,
+			height: this.element[0].style.height
+		};
+		this.originalPosition = {
+			parent: this.element.parent(),
+			index: this.element.parent().children().index( this.element )
+		};
+		this.originalTitle = this.element.attr("title");
+		this.options.title = this.options.title || this.originalTitle;
+
+		this._createWrapper();
+
+		this.element
+			.show()
+			.removeAttr("title")
+			.addClass("ui-dialog-content ui-widget-content")
+			.appendTo( this.uiDialog );
+
+		this._createTitlebar();
+		this._createButtonPane();
+
+		if ( this.options.draggable && $.fn.draggable ) {
+			this._makeDraggable();
+		}
+		if ( this.options.resizable && $.fn.resizable ) {
+			this._makeResizable();
+		}
+
+		this._isOpen = false;
+	},
+
+	_init: function() {
+		if ( this.options.autoOpen ) {
+			this.open();
+		}
+	},
+
+	_appendTo: function() {
+		var element = this.options.appendTo;
+		if ( element && (element.jquery || element.nodeType) ) {
+			return $( element );
+		}
+		return this.document.find( element || "body" ).eq( 0 );
+	},
+
+	_destroy: function() {
+		var next,
+			originalPosition = this.originalPosition;
+
+		this._destroyOverlay();
+
+		this.element
+			.removeUniqueId()
+			.removeClass("ui-dialog-content ui-widget-content")
+			.css( this.originalCss )
+			// Without detaching first, the following becomes really slow
+			.detach();
+
+		this.uiDialog.stop( true, true ).remove();
+
+		if ( this.originalTitle ) {
+			this.element.attr( "title", this.originalTitle );
+		}
+
+		next = originalPosition.parent.children().eq( originalPosition.index );
+		// Don't try to place the dialog next to itself (#8613)
+		if ( next.length && next[0] !== this.element[0] ) {
+			next.before( this.element );
+		} else {
+			originalPosition.parent.append( this.element );
+		}
+	},
+
+	widget: function() {
+		return this.uiDialog;
+	},
+
+	disable: $.noop,
+	enable: $.noop,
+
+	close: function( event ) {
+		var that = this;
+
+		if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) {
+			return;
+		}
+
+		this._isOpen = false;
+		this._destroyOverlay();
+
+		if ( !this.opener.filter(":focusable").focus().length ) {
+			// Hiding a focused element doesn't trigger blur in WebKit
+			// so in case we have nothing to focus on, explicitly blur the active element
+			// https://bugs.webkit.org/show_bug.cgi?id=47182
+			$( this.document[0].activeElement ).blur();
+		}
+
+		this._hide( this.uiDialog, this.options.hide, function() {
+			that._trigger( "close", event );
+		});
+	},
+
+	isOpen: function() {
+		return this._isOpen;
+	},
+
+	moveToTop: function() {
+		this._moveToTop();
+	},
+
+	_moveToTop: function( event, silent ) {
+		var moved = !!this.uiDialog.nextAll(":visible").insertBefore( this.uiDialog ).length;
+		if ( moved && !silent ) {
+			this._trigger( "focus", event );
+		}
+		return moved;
+	},
+
+	open: function() {
+		var that = this;
+		if ( this._isOpen ) {
+			if ( this._moveToTop() ) {
+				this._focusTabbable();
+			}
+			return;
+		}
+
+		this._isOpen = true;
+		this.opener = $( this.document[0].activeElement );
+
+		this._size();
+		this._position();
+		this._createOverlay();
+		this._moveToTop( null, true );
+		this._show( this.uiDialog, this.options.show, function() {
+			that._focusTabbable();
+			that._trigger("focus");
+		});
+
+		this._trigger("open");
+	},
+
+	_focusTabbable: function() {
+		// Set focus to the first match:
+		// 1. First element inside the dialog matching [autofocus]
+		// 2. Tabbable element inside the content element
+		// 3. Tabbable element inside the buttonpane
+		// 4. The close button
+		// 5. The dialog itself
+		var hasFocus = this.element.find("[autofocus]");
+		if ( !hasFocus.length ) {
+			hasFocus = this.element.find(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialogButtonPane.find(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialogTitlebarClose.filter(":tabbable");
+		}
+		if ( !hasFocus.length ) {
+			hasFocus = this.uiDialog;
+		}
+		hasFocus.eq( 0 ).focus();
+	},
+
+	_keepFocus: function( event ) {
+		function checkFocus() {
+			var activeElement = this.document[0].activeElement,
+				isActive = this.uiDialog[0] === activeElement ||
+					$.contains( this.uiDialog[0], activeElement );
+			if ( !isActive ) {
+				this._focusTabbable();
+			}
+		}
+		event.preventDefault();
+		checkFocus.call( this );
+		// support: IE
+		// IE <= 8 doesn't prevent moving focus even with event.preventDefault()
+		// so we check again later
+		this._delay( checkFocus );
+	},
+
+	_createWrapper: function() {
+		this.uiDialog = $("
        ")
+			.addClass( "ui-dialog ui-widget ui-widget-content ui-corner-all ui-front " +
+				this.options.dialogClass )
+			.hide()
+			.attr({
+				// Setting tabIndex makes the div focusable
+				tabIndex: -1,
+				role: "dialog"
+			})
+			.appendTo( this._appendTo() );
+
+		this._on( this.uiDialog, {
+			keydown: function( event ) {
+				if ( this.options.closeOnEscape && !event.isDefaultPrevented() && event.keyCode &&
+						event.keyCode === $.ui.keyCode.ESCAPE ) {
+					event.preventDefault();
+					this.close( event );
+					return;
+				}
+
+				// prevent tabbing out of dialogs
+				if ( event.keyCode !== $.ui.keyCode.TAB ) {
+					return;
+				}
+				var tabbables = this.uiDialog.find(":tabbable"),
+					first = tabbables.filter(":first"),
+					last  = tabbables.filter(":last");
+
+				if ( ( event.target === last[0] || event.target === this.uiDialog[0] ) && !event.shiftKey ) {
+					first.focus( 1 );
+					event.preventDefault();
+				} else if ( ( event.target === first[0] || event.target === this.uiDialog[0] ) && event.shiftKey ) {
+					last.focus( 1 );
+					event.preventDefault();
+				}
+			},
+			mousedown: function( event ) {
+				if ( this._moveToTop( event ) ) {
+					this._focusTabbable();
+				}
+			}
+		});
+
+		// We assume that any existing aria-describedby attribute means
+		// that the dialog content is marked up properly
+		// otherwise we brute force the content as the description
+		if ( !this.element.find("[aria-describedby]").length ) {
+			this.uiDialog.attr({
+				"aria-describedby": this.element.uniqueId().attr("id")
+			});
+		}
+	},
+
+	_createTitlebar: function() {
+		var uiDialogTitle;
+
+		this.uiDialogTitlebar = $("
        ")
+			.addClass("ui-dialog-titlebar ui-widget-header ui-corner-all ui-helper-clearfix")
+			.prependTo( this.uiDialog );
+		this._on( this.uiDialogTitlebar, {
+			mousedown: function( event ) {
+				// Don't prevent click on close button (#8838)
+				// Focusing a dialog that is partially scrolled out of view
+				// causes the browser to scroll it into view, preventing the click event
+				if ( !$( event.target ).closest(".ui-dialog-titlebar-close") ) {
+					// Dialog isn't getting focus when dragging (#8063)
+					this.uiDialog.focus();
+				}
+			}
+		});
+
+		this.uiDialogTitlebarClose = $("")
+			.button({
+				label: this.options.closeText,
+				icons: {
+					primary: "ui-icon-closethick"
+				},
+				text: false
+			})
+			.addClass("ui-dialog-titlebar-close")
+			.appendTo( this.uiDialogTitlebar );
+		this._on( this.uiDialogTitlebarClose, {
+			click: function( event ) {
+				event.preventDefault();
+				this.close( event );
+			}
+		});
+
+		uiDialogTitle = $("")
+			.uniqueId()
+			.addClass("ui-dialog-title")
+			.prependTo( this.uiDialogTitlebar );
+		this._title( uiDialogTitle );
+
+		this.uiDialog.attr({
+			"aria-labelledby": uiDialogTitle.attr("id")
+		});
+	},
+
+	_title: function( title ) {
+		if ( !this.options.title ) {
+			title.html(" ");
+		}
+		title.text( this.options.title );
+	},
+
+	_createButtonPane: function() {
+		this.uiDialogButtonPane = $("
        ")
+			.addClass("ui-dialog-buttonpane ui-widget-content ui-helper-clearfix");
+
+		this.uiButtonSet = $("
        ")
+			.addClass("ui-dialog-buttonset")
+			.appendTo( this.uiDialogButtonPane );
+
+		this._createButtons();
+	},
+
+	_createButtons: function() {
+		var that = this,
+			buttons = this.options.buttons;
+
+		// if we already have a button pane, remove it
+		this.uiDialogButtonPane.remove();
+		this.uiButtonSet.empty();
+
+		if ( $.isEmptyObject( buttons ) || ($.isArray( buttons ) && !buttons.length) ) {
+			this.uiDialog.removeClass("ui-dialog-buttons");
+			return;
+		}
+
+		$.each( buttons, function( name, props ) {
+			var click, buttonOptions;
+			props = $.isFunction( props ) ?
+				{ click: props, text: name } :
+				props;
+			// Default to a non-submitting button
+			props = $.extend( { type: "button" }, props );
+			// Change the context for the click callback to be the main element
+			click = props.click;
+			props.click = function() {
+				click.apply( that.element[0], arguments );
+			};
+			buttonOptions = {
+				icons: props.icons,
+				text: props.showText
+			};
+			delete props.icons;
+			delete props.showText;
+			$( "", props )
+				.button( buttonOptions )
+				.appendTo( that.uiButtonSet );
+		});
+		this.uiDialog.addClass("ui-dialog-buttons");
+		this.uiDialogButtonPane.appendTo( this.uiDialog );
+	},
+
+	_makeDraggable: function() {
+		var that = this,
+			options = this.options;
+
+		function filteredUi( ui ) {
+			return {
+				position: ui.position,
+				offset: ui.offset
+			};
+		}
+
+		this.uiDialog.draggable({
+			cancel: ".ui-dialog-content, .ui-dialog-titlebar-close",
+			handle: ".ui-dialog-titlebar",
+			containment: "document",
+			start: function( event, ui ) {
+				$( this ).addClass("ui-dialog-dragging");
+				that._blockFrames();
+				that._trigger( "dragStart", event, filteredUi( ui ) );
+			},
+			drag: function( event, ui ) {
+				that._trigger( "drag", event, filteredUi( ui ) );
+			},
+			stop: function( event, ui ) {
+				options.position = [
+					ui.position.left - that.document.scrollLeft(),
+					ui.position.top - that.document.scrollTop()
+				];
+				$( this ).removeClass("ui-dialog-dragging");
+				that._unblockFrames();
+				that._trigger( "dragStop", event, filteredUi( ui ) );
+			}
+		});
+	},
+
+	_makeResizable: function() {
+		var that = this,
+			options = this.options,
+			handles = options.resizable,
+			// .ui-resizable has position: relative defined in the stylesheet
+			// but dialogs have to use absolute or fixed positioning
+			position = this.uiDialog.css("position"),
+			resizeHandles = typeof handles === "string" ?
+				handles	:
+				"n,e,s,w,se,sw,ne,nw";
+
+		function filteredUi( ui ) {
+			return {
+				originalPosition: ui.originalPosition,
+				originalSize: ui.originalSize,
+				position: ui.position,
+				size: ui.size
+			};
+		}
+
+		this.uiDialog.resizable({
+			cancel: ".ui-dialog-content",
+			containment: "document",
+			alsoResize: this.element,
+			maxWidth: options.maxWidth,
+			maxHeight: options.maxHeight,
+			minWidth: options.minWidth,
+			minHeight: this._minHeight(),
+			handles: resizeHandles,
+			start: function( event, ui ) {
+				$( this ).addClass("ui-dialog-resizing");
+				that._blockFrames();
+				that._trigger( "resizeStart", event, filteredUi( ui ) );
+			},
+			resize: function( event, ui ) {
+				that._trigger( "resize", event, filteredUi( ui ) );
+			},
+			stop: function( event, ui ) {
+				options.height = $( this ).height();
+				options.width = $( this ).width();
+				$( this ).removeClass("ui-dialog-resizing");
+				that._unblockFrames();
+				that._trigger( "resizeStop", event, filteredUi( ui ) );
+			}
+		})
+		.css( "position", position );
+	},
+
+	_minHeight: function() {
+		var options = this.options;
+
+		return options.height === "auto" ?
+			options.minHeight :
+			Math.min( options.minHeight, options.height );
+	},
+
+	_position: function() {
+		// Need to show the dialog to get the actual offset in the position plugin
+		var isVisible = this.uiDialog.is(":visible");
+		if ( !isVisible ) {
+			this.uiDialog.show();
+		}
+		this.uiDialog.position( this.options.position );
+		if ( !isVisible ) {
+			this.uiDialog.hide();
+		}
+	},
+
+	_setOptions: function( options ) {
+		var that = this,
+			resize = false,
+			resizableOptions = {};
+
+		$.each( options, function( key, value ) {
+			that._setOption( key, value );
+
+			if ( key in sizeRelatedOptions ) {
+				resize = true;
+			}
+			if ( key in resizableRelatedOptions ) {
+				resizableOptions[ key ] = value;
+			}
+		});
+
+		if ( resize ) {
+			this._size();
+			this._position();
+		}
+		if ( this.uiDialog.is(":data(ui-resizable)") ) {
+			this.uiDialog.resizable( "option", resizableOptions );
+		}
+	},
+
+	_setOption: function( key, value ) {
+		/*jshint maxcomplexity:15*/
+		var isDraggable, isResizable,
+			uiDialog = this.uiDialog;
+
+		if ( key === "dialogClass" ) {
+			uiDialog
+				.removeClass( this.options.dialogClass )
+				.addClass( value );
+		}
+
+		if ( key === "disabled" ) {
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "appendTo" ) {
+			this.uiDialog.appendTo( this._appendTo() );
+		}
+
+		if ( key === "buttons" ) {
+			this._createButtons();
+		}
+
+		if ( key === "closeText" ) {
+			this.uiDialogTitlebarClose.button({
+				// Ensure that we always pass a string
+				label: "" + value
+			});
+		}
+
+		if ( key === "draggable" ) {
+			isDraggable = uiDialog.is(":data(ui-draggable)");
+			if ( isDraggable && !value ) {
+				uiDialog.draggable("destroy");
+			}
+
+			if ( !isDraggable && value ) {
+				this._makeDraggable();
+			}
+		}
+
+		if ( key === "position" ) {
+			this._position();
+		}
+
+		if ( key === "resizable" ) {
+			// currently resizable, becoming non-resizable
+			isResizable = uiDialog.is(":data(ui-resizable)");
+			if ( isResizable && !value ) {
+				uiDialog.resizable("destroy");
+			}
+
+			// currently resizable, changing handles
+			if ( isResizable && typeof value === "string" ) {
+				uiDialog.resizable( "option", "handles", value );
+			}
+
+			// currently non-resizable, becoming resizable
+			if ( !isResizable && value !== false ) {
+				this._makeResizable();
+			}
+		}
+
+		if ( key === "title" ) {
+			this._title( this.uiDialogTitlebar.find(".ui-dialog-title") );
+		}
+	},
+
+	_size: function() {
+		// If the user has resized the dialog, the .ui-dialog and .ui-dialog-content
+		// divs will both have width and height set, so we need to reset them
+		var nonContentHeight, minContentHeight, maxContentHeight,
+			options = this.options;
+
+		// Reset content sizing
+		this.element.show().css({
+			width: "auto",
+			minHeight: 0,
+			maxHeight: "none",
+			height: 0
+		});
+
+		if ( options.minWidth > options.width ) {
+			options.width = options.minWidth;
+		}
+
+		// reset wrapper sizing
+		// determine the height of all the non-content elements
+		nonContentHeight = this.uiDialog.css({
+				height: "auto",
+				width: options.width
+			})
+			.outerHeight();
+		minContentHeight = Math.max( 0, options.minHeight - nonContentHeight );
+		maxContentHeight = typeof options.maxHeight === "number" ?
+			Math.max( 0, options.maxHeight - nonContentHeight ) :
+			"none";
+
+		if ( options.height === "auto" ) {
+			this.element.css({
+				minHeight: minContentHeight,
+				maxHeight: maxContentHeight,
+				height: "auto"
+			});
+		} else {
+			this.element.height( Math.max( 0, options.height - nonContentHeight ) );
+		}
+
+		if (this.uiDialog.is(":data(ui-resizable)") ) {
+			this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
+		}
+	},
+
+	_blockFrames: function() {
+		this.iframeBlocks = this.document.find( "iframe" ).map(function() {
+			var iframe = $( this );
+
+			return $( "
        " )
+				.css({
+					position: "absolute",
+					width: iframe.outerWidth(),
+					height: iframe.outerHeight()
+				})
+				.appendTo( iframe.parent() )
+				.offset( iframe.offset() )[0];
+		});
+	},
+
+	_unblockFrames: function() {
+		if ( this.iframeBlocks ) {
+			this.iframeBlocks.remove();
+			delete this.iframeBlocks;
+		}
+	},
+
+	_allowInteraction: function( event ) {
+		if ( $( event.target ).closest(".ui-dialog").length ) {
+			return true;
+		}
+
+		// TODO: Remove hack when datepicker implements
+		// the .ui-front logic (#8989)
+		return !!$( event.target ).closest(".ui-datepicker").length;
+	},
+
+	_createOverlay: function() {
+		if ( !this.options.modal ) {
+			return;
+		}
+
+		var that = this,
+			widgetFullName = this.widgetFullName;
+		if ( !$.ui.dialog.overlayInstances ) {
+			// Prevent use of anchors and inputs.
+			// We use a delay in case the overlay is created from an
+			// event that we're going to be cancelling. (#2804)
+			this._delay(function() {
+				// Handle .dialog().dialog("close") (#4065)
+				if ( $.ui.dialog.overlayInstances ) {
+					this.document.bind( "focusin.dialog", function( event ) {
+						if ( !that._allowInteraction( event ) ) {
+							event.preventDefault();
+							$(".ui-dialog:visible:last .ui-dialog-content")
+								.data( widgetFullName )._focusTabbable();
+						}
+					});
+				}
+			});
+		}
+
+		this.overlay = $("
        ")
+			.addClass("ui-widget-overlay ui-front")
+			.appendTo( this._appendTo() );
+		this._on( this.overlay, {
+			mousedown: "_keepFocus"
+		});
+		$.ui.dialog.overlayInstances++;
+	},
+
+	_destroyOverlay: function() {
+		if ( !this.options.modal ) {
+			return;
+		}
+
+		if ( this.overlay ) {
+			$.ui.dialog.overlayInstances--;
+
+			if ( !$.ui.dialog.overlayInstances ) {
+				this.document.unbind( "focusin.dialog" );
+			}
+			this.overlay.remove();
+			this.overlay = null;
+		}
+	}
+});
+
+$.ui.dialog.overlayInstances = 0;
+
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+	// position option with array notation
+	// just override with old implementation
+	$.widget( "ui.dialog", $.ui.dialog, {
+		_position: function() {
+			var position = this.options.position,
+				myAt = [],
+				offset = [ 0, 0 ],
+				isVisible;
+
+			if ( position ) {
+				if ( typeof position === "string" || (typeof position === "object" && "0" in position ) ) {
+					myAt = position.split ? position.split(" ") : [ position[0], position[1] ];
+					if ( myAt.length === 1 ) {
+						myAt[1] = myAt[0];
+					}
+
+					$.each( [ "left", "top" ], function( i, offsetPosition ) {
+						if ( +myAt[ i ] === myAt[ i ] ) {
+							offset[ i ] = myAt[ i ];
+							myAt[ i ] = offsetPosition;
+						}
+					});
+
+					position = {
+						my: myAt[0] + (offset[0] < 0 ? offset[0] : "+" + offset[0]) + " " +
+							myAt[1] + (offset[1] < 0 ? offset[1] : "+" + offset[1]),
+						at: myAt.join(" ")
+					};
+				}
+
+				position = $.extend( {}, $.ui.dialog.prototype.options.position, position );
+			} else {
+				position = $.ui.dialog.prototype.options.position;
+			}
+
+			// need to show the dialog to get the actual offset in the position plugin
+			isVisible = this.uiDialog.is(":visible");
+			if ( !isVisible ) {
+				this.uiDialog.show();
+			}
+			this.uiDialog.position( position );
+			if ( !isVisible ) {
+				this.uiDialog.hide();
+			}
+		}
+	});
+}
+
+}( jQuery ) );
+
+(function( $, undefined ) {
+
+var rvertical = /up|down|vertical/,
+	rpositivemotion = /up|left|vertical|horizontal/;
+
+$.effects.effect.blind = function( o, done ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		direction = o.direction || "up",
+		vertical = rvertical.test( direction ),
+		ref = vertical ? "height" : "width",
+		ref2 = vertical ? "top" : "left",
+		motion = rpositivemotion.test( direction ),
+		animation = {},
+		show = mode === "show",
+		wrapper, distance, margin;
+
+	// if already wrapped, the wrapper's properties are my property. #6245
+	if ( el.parent().is( ".ui-effects-wrapper" ) ) {
+		$.effects.save( el.parent(), props );
+	} else {
+		$.effects.save( el, props );
+	}
+	el.show();
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+
+	distance = wrapper[ ref ]();
+	margin = parseFloat( wrapper.css( ref2 ) ) || 0;
+
+	animation[ ref ] = show ? distance : 0;
+	if ( !motion ) {
+		el
+			.css( vertical ? "bottom" : "right", 0 )
+			.css( vertical ? "top" : "left", "auto" )
+			.css({ position: "absolute" });
+
+		animation[ ref2 ] = show ? margin : distance + margin;
+	}
+
+	// start at 0 if we are showing
+	if ( show ) {
+		wrapper.css( ref, 0 );
+		if ( ! motion ) {
+			wrapper.css( ref2, margin + distance );
+		}
+	}
+
+	// Animate
+	wrapper.animate( animation, {
+		duration: o.duration,
+		easing: o.easing,
+		queue: false,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.bounce = function( o, done ) {
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+
+		// defaults:
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		hide = mode === "hide",
+		show = mode === "show",
+		direction = o.direction || "up",
+		distance = o.distance,
+		times = o.times || 5,
+
+		// number of internal animations
+		anims = times * 2 + ( show || hide ? 1 : 0 ),
+		speed = o.duration / anims,
+		easing = o.easing,
+
+		// utility:
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ),
+		i,
+		upAnim,
+		downAnim,
+
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+
+	// Avoid touching opacity to prevent clearType and PNG issues in IE
+	if ( show || hide ) {
+		props.push( "opacity" );
+	}
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el ); // Create Wrapper
+
+	// default distance for the BIGGEST bounce is the outer Distance / 3
+	if ( !distance ) {
+		distance = el[ ref === "top" ? "outerHeight" : "outerWidth" ]() / 3;
+	}
+
+	if ( show ) {
+		downAnim = { opacity: 1 };
+		downAnim[ ref ] = 0;
+
+		// if we are showing, force opacity 0 and set the initial position
+		// then do the "first" animation
+		el.css( "opacity", 0 )
+			.css( ref, motion ? -distance * 2 : distance * 2 )
+			.animate( downAnim, speed, easing );
+	}
+
+	// start at the smallest distance if we are hiding
+	if ( hide ) {
+		distance = distance / Math.pow( 2, times - 1 );
+	}
+
+	downAnim = {};
+	downAnim[ ref ] = 0;
+	// Bounces up/down/left/right then back to 0 -- times * 2 animations happen here
+	for ( i = 0; i < times; i++ ) {
+		upAnim = {};
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		el.animate( upAnim, speed, easing )
+			.animate( downAnim, speed, easing );
+
+		distance = hide ? distance * 2 : distance / 2;
+	}
+
+	// Last Bounce when Hiding
+	if ( hide ) {
+		upAnim = { opacity: 0 };
+		upAnim[ ref ] = ( motion ? "-=" : "+=" ) + distance;
+
+		el.animate( upAnim, speed, easing );
+	}
+
+	el.queue(function() {
+		if ( hide ) {
+			el.hide();
+		}
+		$.effects.restore( el, props );
+		$.effects.removeWrapper( el );
+		done();
+	});
+
+	// inject all the animations we just queued to be first in line (after "inprogress")
+	if ( queuelen > 1) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	el.dequeue();
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.clip = function( o, done ) {
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "vertical",
+		vert = direction === "vertical",
+		size = vert ? "height" : "width",
+		position = vert ? "top" : "left",
+		animation = {},
+		wrapper, animate, distance;
+
+	// Save & Show
+	$.effects.save( el, props );
+	el.show();
+
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	animate = ( el[0].tagName === "IMG" ) ? wrapper : el;
+	distance = animate[ size ]();
+
+	// Shift
+	if ( show ) {
+		animate.css( size, 0 );
+		animate.css( position, distance / 2 );
+	}
+
+	// Create Animation Object:
+	animation[ size ] = show ? distance : 0;
+	animation[ position ] = show ? 0 : distance / 2;
+
+	// Animate
+	animate.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( !show ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.drop = function( o, done ) {
+
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "opacity", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		direction = o.direction || "left",
+		ref = ( direction === "up" || direction === "down" ) ? "top" : "left",
+		motion = ( direction === "up" || direction === "left" ) ? "pos" : "neg",
+		animation = {
+			opacity: show ? 1 : 0
+		},
+		distance;
+
+	// Adjust
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+
+	distance = o.distance || el[ ref === "top" ? "outerHeight": "outerWidth" ]( true ) / 2;
+
+	if ( show ) {
+		el
+			.css( "opacity", 0 )
+			.css( ref, motion === "pos" ? -distance : distance );
+	}
+
+	// Animation
+	animation[ ref ] = ( show ?
+		( motion === "pos" ? "+=" : "-=" ) :
+		( motion === "pos" ? "-=" : "+=" ) ) +
+		distance;
+
+	// Animate
+	el.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.explode = function( o, done ) {
+
+	var rows = o.pieces ? Math.round( Math.sqrt( o.pieces ) ) : 3,
+		cells = rows,
+		el = $( this ),
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+
+		// show and then visibility:hidden the element before calculating offset
+		offset = el.show().css( "visibility", "hidden" ).offset(),
+
+		// width and height of a piece
+		width = Math.ceil( el.outerWidth() / cells ),
+		height = Math.ceil( el.outerHeight() / rows ),
+		pieces = [],
+
+		// loop
+		i, j, left, top, mx, my;
+
+	// children animate complete:
+	function childComplete() {
+		pieces.push( this );
+		if ( pieces.length === rows * cells ) {
+			animComplete();
+		}
+	}
+
+	// clone the element for each row and cell.
+	for( i = 0; i < rows ; i++ ) { // ===>
+		top = offset.top + i * height;
+		my = i - ( rows - 1 ) / 2 ;
+
+		for( j = 0; j < cells ; j++ ) { // |||
+			left = offset.left + j * width;
+			mx = j - ( cells - 1 ) / 2 ;
+
+			// Create a clone of the now hidden main element that will be absolute positioned
+			// within a wrapper div off the -left and -top equal to size of our pieces
+			el
+				.clone()
+				.appendTo( "body" )
+				.wrap( "
        " )
+				.css({
+					position: "absolute",
+					visibility: "visible",
+					left: -j * width,
+					top: -i * height
+				})
+
+			// select the wrapper - make it overflow: hidden and absolute positioned based on
+			// where the original was located +left and +top equal to the size of pieces
+				.parent()
+				.addClass( "ui-effects-explode" )
+				.css({
+					position: "absolute",
+					overflow: "hidden",
+					width: width,
+					height: height,
+					left: left + ( show ? mx * width : 0 ),
+					top: top + ( show ? my * height : 0 ),
+					opacity: show ? 0 : 1
+				}).animate({
+					left: left + ( show ? 0 : mx * width ),
+					top: top + ( show ? 0 : my * height ),
+					opacity: show ? 1 : 0
+				}, o.duration || 500, o.easing, childComplete );
+		}
+	}
+
+	function animComplete() {
+		el.css({
+			visibility: "visible"
+		});
+		$( pieces ).remove();
+		if ( !show ) {
+			el.hide();
+		}
+		done();
+	}
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.fade = function( o, done ) {
+	var el = $( this ),
+		mode = $.effects.setMode( el, o.mode || "toggle" );
+
+	el.animate({
+		opacity: mode
+	}, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: done
+	});
+};
+
+})( jQuery );
+
+(function( $, undefined ) {
+
+$.effects.effect.fold = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "hide" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		size = o.size || 15,
+		percent = /([0-9]+)%/.exec( size ),
+		horizFirst = !!o.horizFirst,
+		widthFirst = show !== horizFirst,
+		ref = widthFirst ? [ "width", "height" ] : [ "height", "width" ],
+		duration = o.duration / 2,
+		wrapper, distance,
+		animation1 = {},
+		animation2 = {};
+
+	$.effects.save( el, props );
+	el.show();
+
+	// Create Wrapper
+	wrapper = $.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+	distance = widthFirst ?
+		[ wrapper.width(), wrapper.height() ] :
+		[ wrapper.height(), wrapper.width() ];
+
+	if ( percent ) {
+		size = parseInt( percent[ 1 ], 10 ) / 100 * distance[ hide ? 0 : 1 ];
+	}
+	if ( show ) {
+		wrapper.css( horizFirst ? {
+			height: 0,
+			width: size
+		} : {
+			height: size,
+			width: 0
+		});
+	}
+
+	// Animation
+	animation1[ ref[ 0 ] ] = show ? distance[ 0 ] : size;
+	animation2[ ref[ 1 ] ] = show ? distance[ 1 ] : 0;
+
+	// Animate
+	wrapper
+		.animate( animation1, duration, o.easing )
+		.animate( animation2, duration, o.easing, function() {
+			if ( hide ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.highlight = function( o, done ) {
+	var elem = $( this ),
+		props = [ "backgroundImage", "backgroundColor", "opacity" ],
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		animation = {
+			backgroundColor: elem.css( "backgroundColor" )
+		};
+
+	if (mode === "hide") {
+		animation.opacity = 0;
+	}
+
+	$.effects.save( elem, props );
+
+	elem
+		.show()
+		.css({
+			backgroundImage: "none",
+			backgroundColor: o.color || "#ffff99"
+		})
+		.animate( animation, {
+			queue: false,
+			duration: o.duration,
+			easing: o.easing,
+			complete: function() {
+				if ( mode === "hide" ) {
+					elem.hide();
+				}
+				$.effects.restore( elem, props );
+				done();
+			}
+		});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.pulsate = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "show" ),
+		show = mode === "show",
+		hide = mode === "hide",
+		showhide = ( show || mode === "hide" ),
+
+		// showing or hiding leaves of the "last" animation
+		anims = ( ( o.times || 5 ) * 2 ) + ( showhide ? 1 : 0 ),
+		duration = o.duration / anims,
+		animateTo = 0,
+		queue = elem.queue(),
+		queuelen = queue.length,
+		i;
+
+	if ( show || !elem.is(":visible")) {
+		elem.css( "opacity", 0 ).show();
+		animateTo = 1;
+	}
+
+	// anims - 1 opacity "toggles"
+	for ( i = 1; i < anims; i++ ) {
+		elem.animate({
+			opacity: animateTo
+		}, duration, o.easing );
+		animateTo = 1 - animateTo;
+	}
+
+	elem.animate({
+		opacity: animateTo
+	}, duration, o.easing);
+
+	elem.queue(function() {
+		if ( hide ) {
+			elem.hide();
+		}
+		done();
+	});
+
+	// We just queued up "anims" animations, we need to put them next in the queue
+	if ( queuelen > 1 ) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	elem.dequeue();
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.puff = function( o, done ) {
+	var elem = $( this ),
+		mode = $.effects.setMode( elem, o.mode || "hide" ),
+		hide = mode === "hide",
+		percent = parseInt( o.percent, 10 ) || 150,
+		factor = percent / 100,
+		original = {
+			height: elem.height(),
+			width: elem.width(),
+			outerHeight: elem.outerHeight(),
+			outerWidth: elem.outerWidth()
+		};
+
+	$.extend( o, {
+		effect: "scale",
+		queue: false,
+		fade: true,
+		mode: mode,
+		complete: done,
+		percent: hide ? percent : 100,
+		from: hide ?
+			original :
+			{
+				height: original.height * factor,
+				width: original.width * factor,
+				outerHeight: original.outerHeight * factor,
+				outerWidth: original.outerWidth * factor
+			}
+	});
+
+	elem.effect( o );
+};
+
+$.effects.effect.scale = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		options = $.extend( true, {}, o ),
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		percent = parseInt( o.percent, 10 ) ||
+			( parseInt( o.percent, 10 ) === 0 ? 0 : ( mode === "hide" ? 0 : 100 ) ),
+		direction = o.direction || "both",
+		origin = o.origin,
+		original = {
+			height: el.height(),
+			width: el.width(),
+			outerHeight: el.outerHeight(),
+			outerWidth: el.outerWidth()
+		},
+		factor = {
+			y: direction !== "horizontal" ? (percent / 100) : 1,
+			x: direction !== "vertical" ? (percent / 100) : 1
+		};
+
+	// We are going to pass this effect to the size effect:
+	options.effect = "size";
+	options.queue = false;
+	options.complete = done;
+
+	// Set default origin and restore for show/hide
+	if ( mode !== "effect" ) {
+		options.origin = origin || ["middle","center"];
+		options.restore = true;
+	}
+
+	options.from = o.from || ( mode === "show" ? {
+		height: 0,
+		width: 0,
+		outerHeight: 0,
+		outerWidth: 0
+	} : original );
+	options.to = {
+		height: original.height * factor.y,
+		width: original.width * factor.x,
+		outerHeight: original.outerHeight * factor.y,
+		outerWidth: original.outerWidth * factor.x
+	};
+
+	// Fade option to support puff
+	if ( options.fade ) {
+		if ( mode === "show" ) {
+			options.from.opacity = 0;
+			options.to.opacity = 1;
+		}
+		if ( mode === "hide" ) {
+			options.from.opacity = 1;
+			options.to.opacity = 0;
+		}
+	}
+
+	// Animate
+	el.effect( options );
+
+};
+
+$.effects.effect.size = function( o, done ) {
+
+	// Create element
+	var original, baseline, factor,
+		el = $( this ),
+		props0 = [ "position", "top", "bottom", "left", "right", "width", "height", "overflow", "opacity" ],
+
+		// Always restore
+		props1 = [ "position", "top", "bottom", "left", "right", "overflow", "opacity" ],
+
+		// Copy for children
+		props2 = [ "width", "height", "overflow" ],
+		cProps = [ "fontSize" ],
+		vProps = [ "borderTopWidth", "borderBottomWidth", "paddingTop", "paddingBottom" ],
+		hProps = [ "borderLeftWidth", "borderRightWidth", "paddingLeft", "paddingRight" ],
+
+		// Set options
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		restore = o.restore || mode !== "effect",
+		scale = o.scale || "both",
+		origin = o.origin || [ "middle", "center" ],
+		position = el.css( "position" ),
+		props = restore ? props0 : props1,
+		zero = {
+			height: 0,
+			width: 0,
+			outerHeight: 0,
+			outerWidth: 0
+		};
+
+	if ( mode === "show" ) {
+		el.show();
+	}
+	original = {
+		height: el.height(),
+		width: el.width(),
+		outerHeight: el.outerHeight(),
+		outerWidth: el.outerWidth()
+	};
+
+	if ( o.mode === "toggle" && mode === "show" ) {
+		el.from = o.to || zero;
+		el.to = o.from || original;
+	} else {
+		el.from = o.from || ( mode === "show" ? zero : original );
+		el.to = o.to || ( mode === "hide" ? zero : original );
+	}
+
+	// Set scaling factor
+	factor = {
+		from: {
+			y: el.from.height / original.height,
+			x: el.from.width / original.width
+		},
+		to: {
+			y: el.to.height / original.height,
+			x: el.to.width / original.width
+		}
+	};
+
+	// Scale the css box
+	if ( scale === "box" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			props = props.concat( vProps );
+			el.from = $.effects.setTransition( el, vProps, factor.from.y, el.from );
+			el.to = $.effects.setTransition( el, vProps, factor.to.y, el.to );
+		}
+
+		// Horizontal props scaling
+		if ( factor.from.x !== factor.to.x ) {
+			props = props.concat( hProps );
+			el.from = $.effects.setTransition( el, hProps, factor.from.x, el.from );
+			el.to = $.effects.setTransition( el, hProps, factor.to.x, el.to );
+		}
+	}
+
+	// Scale the content
+	if ( scale === "content" || scale === "both" ) {
+
+		// Vertical props scaling
+		if ( factor.from.y !== factor.to.y ) {
+			props = props.concat( cProps ).concat( props2 );
+			el.from = $.effects.setTransition( el, cProps, factor.from.y, el.from );
+			el.to = $.effects.setTransition( el, cProps, factor.to.y, el.to );
+		}
+	}
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+	el.css( "overflow", "hidden" ).css( el.from );
+
+	// Adjust
+	if (origin) { // Calculate baseline shifts
+		baseline = $.effects.getBaseline( origin, original );
+		el.from.top = ( original.outerHeight - el.outerHeight() ) * baseline.y;
+		el.from.left = ( original.outerWidth - el.outerWidth() ) * baseline.x;
+		el.to.top = ( original.outerHeight - el.to.outerHeight ) * baseline.y;
+		el.to.left = ( original.outerWidth - el.to.outerWidth ) * baseline.x;
+	}
+	el.css( el.from ); // set top & left
+
+	// Animate
+	if ( scale === "content" || scale === "both" ) { // Scale the children
+
+		// Add margins/font-size
+		vProps = vProps.concat([ "marginTop", "marginBottom" ]).concat(cProps);
+		hProps = hProps.concat([ "marginLeft", "marginRight" ]);
+		props2 = props0.concat(vProps).concat(hProps);
+
+		el.find( "*[width]" ).each( function(){
+			var child = $( this ),
+				c_original = {
+					height: child.height(),
+					width: child.width(),
+					outerHeight: child.outerHeight(),
+					outerWidth: child.outerWidth()
+				};
+			if (restore) {
+				$.effects.save(child, props2);
+			}
+
+			child.from = {
+				height: c_original.height * factor.from.y,
+				width: c_original.width * factor.from.x,
+				outerHeight: c_original.outerHeight * factor.from.y,
+				outerWidth: c_original.outerWidth * factor.from.x
+			};
+			child.to = {
+				height: c_original.height * factor.to.y,
+				width: c_original.width * factor.to.x,
+				outerHeight: c_original.height * factor.to.y,
+				outerWidth: c_original.width * factor.to.x
+			};
+
+			// Vertical props scaling
+			if ( factor.from.y !== factor.to.y ) {
+				child.from = $.effects.setTransition( child, vProps, factor.from.y, child.from );
+				child.to = $.effects.setTransition( child, vProps, factor.to.y, child.to );
+			}
+
+			// Horizontal props scaling
+			if ( factor.from.x !== factor.to.x ) {
+				child.from = $.effects.setTransition( child, hProps, factor.from.x, child.from );
+				child.to = $.effects.setTransition( child, hProps, factor.to.x, child.to );
+			}
+
+			// Animate children
+			child.css( child.from );
+			child.animate( child.to, o.duration, o.easing, function() {
+
+				// Restore children
+				if ( restore ) {
+					$.effects.restore( child, props2 );
+				}
+			});
+		});
+	}
+
+	// Animate
+	el.animate( el.to, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( el.to.opacity === 0 ) {
+				el.css( "opacity", el.from.opacity );
+			}
+			if( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			if ( !restore ) {
+
+				// we need to calculate our new positioning based on the scaling
+				if ( position === "static" ) {
+					el.css({
+						position: "relative",
+						top: el.to.top,
+						left: el.to.left
+					});
+				} else {
+					$.each([ "top", "left" ], function( idx, pos ) {
+						el.css( pos, function( _, str ) {
+							var val = parseInt( str, 10 ),
+								toRef = idx ? el.to.left : el.to.top;
+
+							// if original was "auto", recalculate the new value from wrapper
+							if ( str === "auto" ) {
+								return toRef + "px";
+							}
+
+							return val + toRef + "px";
+						});
+					});
+				}
+			}
+
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.shake = function( o, done ) {
+
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "height", "width" ],
+		mode = $.effects.setMode( el, o.mode || "effect" ),
+		direction = o.direction || "left",
+		distance = o.distance || 20,
+		times = o.times || 3,
+		anims = times * 2 + 1,
+		speed = Math.round(o.duration/anims),
+		ref = (direction === "up" || direction === "down") ? "top" : "left",
+		positiveMotion = (direction === "up" || direction === "left"),
+		animation = {},
+		animation1 = {},
+		animation2 = {},
+		i,
+
+		// we will need to re-assemble the queue to stack our animations in place
+		queue = el.queue(),
+		queuelen = queue.length;
+
+	$.effects.save( el, props );
+	el.show();
+	$.effects.createWrapper( el );
+
+	// Animation
+	animation[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance;
+	animation1[ ref ] = ( positiveMotion ? "+=" : "-=" ) + distance * 2;
+	animation2[ ref ] = ( positiveMotion ? "-=" : "+=" ) + distance * 2;
+
+	// Animate
+	el.animate( animation, speed, o.easing );
+
+	// Shakes
+	for ( i = 1; i < times; i++ ) {
+		el.animate( animation1, speed, o.easing ).animate( animation2, speed, o.easing );
+	}
+	el
+		.animate( animation1, speed, o.easing )
+		.animate( animation, speed / 2, o.easing )
+		.queue(function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		});
+
+	// inject all the animations we just queued to be first in line (after "inprogress")
+	if ( queuelen > 1) {
+		queue.splice.apply( queue,
+			[ 1, 0 ].concat( queue.splice( queuelen, anims + 1 ) ) );
+	}
+	el.dequeue();
+
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.slide = function( o, done ) {
+
+	// Create element
+	var el = $( this ),
+		props = [ "position", "top", "bottom", "left", "right", "width", "height" ],
+		mode = $.effects.setMode( el, o.mode || "show" ),
+		show = mode === "show",
+		direction = o.direction || "left",
+		ref = (direction === "up" || direction === "down") ? "top" : "left",
+		positiveMotion = (direction === "up" || direction === "left"),
+		distance,
+		animation = {};
+
+	// Adjust
+	$.effects.save( el, props );
+	el.show();
+	distance = o.distance || el[ ref === "top" ? "outerHeight" : "outerWidth" ]( true );
+
+	$.effects.createWrapper( el ).css({
+		overflow: "hidden"
+	});
+
+	if ( show ) {
+		el.css( ref, positiveMotion ? (isNaN(distance) ? "-" + distance : -distance) : distance );
+	}
+
+	// Animation
+	animation[ ref ] = ( show ?
+		( positiveMotion ? "+=" : "-=") :
+		( positiveMotion ? "-=" : "+=")) +
+		distance;
+
+	// Animate
+	el.animate( animation, {
+		queue: false,
+		duration: o.duration,
+		easing: o.easing,
+		complete: function() {
+			if ( mode === "hide" ) {
+				el.hide();
+			}
+			$.effects.restore( el, props );
+			$.effects.removeWrapper( el );
+			done();
+		}
+	});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.effects.effect.transfer = function( o, done ) {
+	var elem = $( this ),
+		target = $( o.to ),
+		targetFixed = target.css( "position" ) === "fixed",
+		body = $("body"),
+		fixTop = targetFixed ? body.scrollTop() : 0,
+		fixLeft = targetFixed ? body.scrollLeft() : 0,
+		endPosition = target.offset(),
+		animation = {
+			top: endPosition.top - fixTop ,
+			left: endPosition.left - fixLeft ,
+			height: target.innerHeight(),
+			width: target.innerWidth()
+		},
+		startPosition = elem.offset(),
+		transfer = $( "
        " )
+			.appendTo( document.body )
+			.addClass( o.className )
+			.css({
+				top: startPosition.top - fixTop ,
+				left: startPosition.left - fixLeft ,
+				height: elem.innerHeight(),
+				width: elem.innerWidth(),
+				position: targetFixed ? "fixed" : "absolute"
+			})
+			.animate( animation, o.duration, o.easing, function() {
+				transfer.remove();
+				done();
+			});
+};
+
+})(jQuery);
+
+(function( $, undefined ) {
+
+$.widget( "ui.menu", {
+	version: "1.10.2",
+	defaultElement: "